diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-09-06 20:50:18 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-09-06 20:50:18 -0700 |
| commit | 4495c359ec525b6335353c31f97970ccad851ff6 (patch) | |
| tree | f1ce4734beee25cfd5e7f66e7ca8e889f48e36d3 | |
| parent | 988dc8d740b3b558db4e0097ad5e396a7833d17e (diff) | |
| parent | bfcf1f045283c72227063f68f8df68b786351d18 (diff) | |
| download | android_packages_apps_BluetoothExt-4495c359ec525b6335353c31f97970ccad851ff6.tar.gz android_packages_apps_BluetoothExt-4495c359ec525b6335353c31f97970ccad851ff6.tar.bz2 android_packages_apps_BluetoothExt-4495c359ec525b6335353c31f97970ccad851ff6.zip | |
Merge "HiddTestApp: Use single button for play and pause."
| -rw-r--r-- | hiddtestapp/res/xml/navigation_keyboard.xml | 6 | ||||
| -rw-r--r-- | hiddtestapp/res/xml/numeric_keyboard.xml | 4 | ||||
| -rw-r--r-- | hiddtestapp/src/org/codeaurora/bluetooth/hiddtestapp/HidConsts.java | 8 |
3 files changed, 10 insertions, 8 deletions
diff --git a/hiddtestapp/res/xml/navigation_keyboard.xml b/hiddtestapp/res/xml/navigation_keyboard.xml index ea2d1a2..ec13da7 100644 --- a/hiddtestapp/res/xml/navigation_keyboard.xml +++ b/hiddtestapp/res/xml/navigation_keyboard.xml @@ -28,9 +28,9 @@ --> <Keyboard> <Layout> - <Key keyLabel="Vol Down ⇩" keyCode="0x87"/> - <Key keyLabel="Mute" keyCode="0x85"/> - <Key keyLabel="Vol Up ⇧" keyCode="0x86"/> + <Key keyLabel="Vol Down ⇩" keyCode="0x86"/> + <Key keyLabel="Mute" keyCode="0x84"/> + <Key keyLabel="Vol Up ⇧" keyCode="0x85"/> </Layout> <Layout> <Key keyLabel="Print Screen" keyCode="0x46"/> diff --git a/hiddtestapp/res/xml/numeric_keyboard.xml b/hiddtestapp/res/xml/numeric_keyboard.xml index 2a6ce76..a004f38 100644 --- a/hiddtestapp/res/xml/numeric_keyboard.xml +++ b/hiddtestapp/res/xml/numeric_keyboard.xml @@ -31,8 +31,8 @@ <Key keyLabel="Prev\n⇦" keyCode="0x80"/> <Key keyLabel="Next\n⇨" keyCode="0x81"/> <Key keyLabel="Stop" keyCode="0x82"/> - <Key keyLabel="Play" keyCode="0x83"/> - <Key keyLabel="Pause" keyCode="0x84"/> + <Key keyLabel="Play\nPause" keyCode="0x83"/> + <Key visible="false"/> </Layout> <Layout> <Key keyLabel="Num\nLock" keyCode="0x53"/> diff --git a/hiddtestapp/src/org/codeaurora/bluetooth/hiddtestapp/HidConsts.java b/hiddtestapp/src/org/codeaurora/bluetooth/hiddtestapp/HidConsts.java index 4d5397c..a1b3368 100644 --- a/hiddtestapp/src/org/codeaurora/bluetooth/hiddtestapp/HidConsts.java +++ b/hiddtestapp/src/org/codeaurora/bluetooth/hiddtestapp/HidConsts.java @@ -105,17 +105,19 @@ public class HidConsts { (byte) 0x05, (byte) 0x0c, // USAGE_PAGE (Consumer Devices) (byte) 0x15, (byte) 0x00, // LOGICAL_MINIMUM (0) (byte) 0x25, (byte) 0x01, // LOGICAL_MAXIMUM (1) - (byte) 0x95, (byte) 0x08, // REPORT_COUNT (8) + (byte) 0x95, (byte) 0x07, // REPORT_COUNT (7) (byte) 0x75, (byte) 0x01, // REPORT_SIZE (1) (byte) 0x09, (byte) 0xb6, // USAGE (Scan Previous Track) (byte) 0x09, (byte) 0xb5, // USAGE (Scan Next Track) (byte) 0x09, (byte) 0xb7, // USAGE (Stop) - (byte) 0x09, (byte) 0xb0, // USAGE (Play) - (byte) 0x09, (byte) 0xb1, // USAGE (Pause) + (byte) 0x09, (byte) 0xcd, // USAGE (Play/Pause) (byte) 0x09, (byte) 0xe2, // USAGE (Mute) (byte) 0x09, (byte) 0xe9, // USAGE (Volume Up) (byte) 0x09, (byte) 0xea, // USAGE (Volume Down) (byte) 0x81, (byte) 0x02, // INPUT (Data,Var,Abs) + (byte) 0x95, (byte) 0x01, // REPORT_COUNT (1) + (byte) 0x75, (byte) 0x01, // REPORT_SIZE (1) + (byte) 0x81, (byte) 0x03, // INPUT (Constant,Var,Abs) (byte) 0x05, (byte) 0x07, // USAGE_PAGE (Keyboard) (byte) 0x95, (byte) 0x05, // REPORT_COUNT (5) (byte) 0x75, (byte) 0x01, // REPORT_SIZE (1) |