Skip to content

Commit f1df51d

Browse files
committed
Made volume buttons control phone media volume rather than being sent over to VM.
1 parent bb6b573 commit f1df51d

File tree

3 files changed

+12
-2
lines changed

3 files changed

+12
-2
lines changed

eclipse_projects/Opaque/AndroidManifest.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="com.undatech.opaque"
4-
android:versionCode="126"
5-
android:versionName="1.2.6" >
4+
android:versionCode="127"
5+
android:versionName="1.2.7" >
66

77
<uses-sdk
88
android:minSdkVersion="9"

eclipse_projects/Opaque/src/com/undatech/opaque/RemoteCanvasActivity.java

+2
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
import android.database.Cursor;
5353
import android.graphics.Rect;
5454
import android.graphics.drawable.Drawable;
55+
import android.media.AudioManager;
5556
import android.net.Uri;
5657
import android.os.Bundle;
5758
import android.os.Handler;
@@ -123,6 +124,7 @@ public void onCreate(Bundle icicle) {
123124
// TODO: Implement left-icon
124125
//requestWindowFeature(Window.FEATURE_LEFT_ICON);
125126
//setFeatureDrawableResource(Window.FEATURE_LEFT_ICON, R.drawable.icon);
127+
setVolumeControlStream(AudioManager.STREAM_MUSIC);
126128

127129
requestWindowFeature(Window.FEATURE_NO_TITLE);
128130
getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,

eclipse_projects/Opaque/src/com/undatech/opaque/input/RemoteSpiceKeyboard.java

+8
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,14 @@ public boolean keyEvent(int keyCode, KeyEvent event) {
111111
}
112112

113113
public boolean keyEvent(int keyCode, KeyEvent event, int additionalMetaState) {
114+
115+
// Discard volume_up/down key events so to let them control music volume.
116+
if (keyCode == KeyEvent.KEYCODE_VOLUME_UP ||
117+
keyCode == KeyEvent.KEYCODE_VOLUME_DOWN ||
118+
keyCode == KeyEvent.KEYCODE_VOLUME_MUTE) {
119+
return false;
120+
}
121+
114122
android.util.Log.e(TAG, event.toString());
115123
int action = event.getAction();
116124
boolean down = (action == KeyEvent.ACTION_DOWN);

0 commit comments

Comments
 (0)