diff options
author | Michael Wright <michaelwr@google.com> | 2013-04-23 16:42:13 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-23 16:42:13 -0700 |
commit | 2ea5aebe59b72c034b32c132c35a5c75a7a2bf56 (patch) | |
tree | ebb54346a18bec1240b17e9a1eaeb191336d0168 | |
parent | 6edbfb9cdc4d3a83d424565371e78dcdb9a0bb30 (diff) | |
parent | 51f7ca4521c3508a233eefe97f53092213eacb60 (diff) | |
download | frameworks_base-2ea5aebe59b72c034b32c132c35a5c75a7a2bf56.zip frameworks_base-2ea5aebe59b72c034b32c132c35a5c75a7a2bf56.tar.gz frameworks_base-2ea5aebe59b72c034b32c132c35a5c75a7a2bf56.tar.bz2 |
am 51f7ca45: Merge "Fix keylayouts to use BACK instead of incorrect BUTTON_BACK." into jb-mr2-dev
* commit '51f7ca4521c3508a233eefe97f53092213eacb60':
Fix keylayouts to use BACK instead of incorrect BUTTON_BACK.
-rw-r--r-- | data/keyboards/Vendor_045e_Product_028e.kl | 4 | ||||
-rw-r--r-- | data/keyboards/Vendor_046d_Product_c219.kl | 2 | ||||
-rw-r--r-- | data/keyboards/Vendor_046d_Product_c21f.kl | 4 | ||||
-rw-r--r-- | data/keyboards/Vendor_054c_Product_0268.kl | 2 | ||||
-rw-r--r-- | data/keyboards/Vendor_1689_Product_fd00.kl | 8 | ||||
-rw-r--r-- | data/keyboards/Vendor_1689_Product_fd01.kl | 6 | ||||
-rw-r--r-- | data/keyboards/Vendor_1689_Product_fe00.kl | 4 | ||||
-rw-r--r-- | data/keyboards/Vendor_1bad_Product_f016.kl | 4 | ||||
-rw-r--r-- | data/keyboards/Vendor_1bad_Product_f023.kl | 2 | ||||
-rw-r--r-- | data/keyboards/Vendor_1bad_Product_f027.kl | 4 | ||||
-rw-r--r-- | data/keyboards/Vendor_1bad_Product_f036.kl | 4 | ||||
-rw-r--r-- | data/keyboards/Vendor_1d79_Product_0009.kl | 4 | ||||
-rw-r--r-- | data/keyboards/common.mk | 18 |
13 files changed, 41 insertions, 25 deletions
diff --git a/data/keyboards/Vendor_045e_Product_028e.kl b/data/keyboards/Vendor_045e_Product_028e.kl index ca6fa59..301601a 100644 --- a/data/keyboards/Vendor_045e_Product_028e.kl +++ b/data/keyboards/Vendor_045e_Product_028e.kl @@ -22,9 +22,9 @@ key 307 BUTTON_X key 308 BUTTON_Y key 310 BUTTON_L1 key 311 BUTTON_R1 -key 314 BUTTON_BACK +key 314 BACK key 315 BUTTON_START -key 316 BUTTON_HOME +key 316 HOME key 317 BUTTON_THUMBL key 318 BUTTON_THUMBR diff --git a/data/keyboards/Vendor_046d_Product_c219.kl b/data/keyboards/Vendor_046d_Product_c219.kl index 431dd03..2fa964c 100644 --- a/data/keyboards/Vendor_046d_Product_c219.kl +++ b/data/keyboards/Vendor_046d_Product_c219.kl @@ -23,7 +23,7 @@ key 309 BUTTON_R1 key 310 BUTTON_L2 key 311 BUTTON_R2 key 313 BUTTON_START -key 312 BUTTON_BACK +key 312 BACK key 314 BUTTON_THUMBL key 315 BUTTON_THUMBR diff --git a/data/keyboards/Vendor_046d_Product_c21f.kl b/data/keyboards/Vendor_046d_Product_c21f.kl index 981d864..a9ba378 100644 --- a/data/keyboards/Vendor_046d_Product_c21f.kl +++ b/data/keyboards/Vendor_046d_Product_c21f.kl @@ -21,8 +21,8 @@ key 308 BUTTON_Y key 310 BUTTON_L1 key 311 BUTTON_R1 key 315 BUTTON_START -key 314 BUTTON_BACK -key 316 BUTTON_HOME +key 314 BACK +key 316 HOME key 317 BUTTON_THUMBL key 318 BUTTON_THUMBR diff --git a/data/keyboards/Vendor_054c_Product_0268.kl b/data/keyboards/Vendor_054c_Product_0268.kl index 62c5f4d..7c60137 100644 --- a/data/keyboards/Vendor_054c_Product_0268.kl +++ b/data/keyboards/Vendor_054c_Product_0268.kl @@ -35,7 +35,7 @@ key 0x121 BUTTON_THUMBL key 0x122 BUTTON_THUMBR # PS key -key 0x2d0 BUTTON_HOME +key 0x2d0 HOME # Left Analog Stick axis 0x00 X diff --git a/data/keyboards/Vendor_1689_Product_fd00.kl b/data/keyboards/Vendor_1689_Product_fd00.kl index 6ce14ed..8407b13 100644 --- a/data/keyboards/Vendor_1689_Product_fd00.kl +++ b/data/keyboards/Vendor_1689_Product_fd00.kl @@ -18,11 +18,11 @@ key 304 BUTTON_A key 305 BUTTON_B key 307 BUTTON_X key 308 BUTTON_Y -key 307 BUTTON_L1 -key 308 BUTTON_R1 +key 310 BUTTON_L1 +key 311 BUTTON_R1 key 315 BUTTON_START -key 314 BUTTON_BACK -key 316 BUTTON_HOME +key 314 BACK +key 316 HOME key 317 BUTTON_THUMBL key 318 BUTTON_THUMBR key 706 DPAD_UP diff --git a/data/keyboards/Vendor_1689_Product_fd01.kl b/data/keyboards/Vendor_1689_Product_fd01.kl index 8144515..cacc075 100644 --- a/data/keyboards/Vendor_1689_Product_fd01.kl +++ b/data/keyboards/Vendor_1689_Product_fd01.kl @@ -19,10 +19,10 @@ key 305 BUTTON_B key 307 BUTTON_X key 308 BUTTON_Y key 310 BUTTON_L1 -key 308 BUTTON_R1 +key 311 BUTTON_R1 key 315 BUTTON_START -key 314 BUTTON_BACK -key 316 BUTTON_HOME +key 314 BACK +key 316 HOME key 317 BUTTON_THUMBL key 318 BUTTON_THUMBR diff --git a/data/keyboards/Vendor_1689_Product_fe00.kl b/data/keyboards/Vendor_1689_Product_fe00.kl index 90fe4af..467173f 100644 --- a/data/keyboards/Vendor_1689_Product_fe00.kl +++ b/data/keyboards/Vendor_1689_Product_fe00.kl @@ -21,8 +21,8 @@ key 308 BUTTON_Y key 310 BUTTON_L1 key 311 BUTTON_R1 key 315 BUTTON_START -key 314 BUTTON_BACK -key 316 BUTTON_HOME +key 314 BACK +key 316 HOME key 317 BUTTON_THUMBL key 318 BUTTON_THUMBR diff --git a/data/keyboards/Vendor_1bad_Product_f016.kl b/data/keyboards/Vendor_1bad_Product_f016.kl index b72fd5c..00f8559 100644 --- a/data/keyboards/Vendor_1bad_Product_f016.kl +++ b/data/keyboards/Vendor_1bad_Product_f016.kl @@ -21,8 +21,8 @@ key 308 BUTTON_Y key 310 BUTTON_L1 key 311 BUTTON_R1 key 315 BUTTON_START -key 314 BUTTON_BACK -key 316 BUTTON_HOME +key 314 BACK +key 316 HOME key 317 BUTTON_THUMBL key 318 BUTTON_THUMBR diff --git a/data/keyboards/Vendor_1bad_Product_f023.kl b/data/keyboards/Vendor_1bad_Product_f023.kl index c1588b2..175a523 100644 --- a/data/keyboards/Vendor_1bad_Product_f023.kl +++ b/data/keyboards/Vendor_1bad_Product_f023.kl @@ -21,7 +21,7 @@ key 308 BUTTON_Y key 310 BUTTON_L1 key 311 BUTTON_R1 key 315 BUTTON_START -key 314 BUTTON_BACK +key 314 BACK key 317 BUTTON_THUMBL key 318 BUTTON_THUMBR diff --git a/data/keyboards/Vendor_1bad_Product_f027.kl b/data/keyboards/Vendor_1bad_Product_f027.kl index ea0aa7a..216e3da 100644 --- a/data/keyboards/Vendor_1bad_Product_f027.kl +++ b/data/keyboards/Vendor_1bad_Product_f027.kl @@ -21,8 +21,8 @@ key 308 BUTTON_Y key 310 BUTTON_L1 key 311 BUTTON_R1 key 315 BUTTON_START -key 314 BUTTON_BACK -key 316 BUTTON_HOME +key 314 BACK +key 316 HOME key 317 BUTTON_THUMBL key 318 BUTTON_THUMBR diff --git a/data/keyboards/Vendor_1bad_Product_f036.kl b/data/keyboards/Vendor_1bad_Product_f036.kl index 8cd906a..f27de1c 100644 --- a/data/keyboards/Vendor_1bad_Product_f036.kl +++ b/data/keyboards/Vendor_1bad_Product_f036.kl @@ -21,8 +21,8 @@ key 308 BUTTON_Y key 310 BUTTON_L1 key 311 BUTTON_R1 key 315 BUTTON_START -key 314 BUTTON_BACK -key 316 BUTTON_HOME +key 314 BACK +key 316 HOME key 317 BUTTON_THUMBL key 318 BUTTON_THUMBR diff --git a/data/keyboards/Vendor_1d79_Product_0009.kl b/data/keyboards/Vendor_1d79_Product_0009.kl index 78fe2cd..bbfbc37 100644 --- a/data/keyboards/Vendor_1d79_Product_0009.kl +++ b/data/keyboards/Vendor_1d79_Product_0009.kl @@ -21,8 +21,8 @@ key 308 BUTTON_Y key 310 BUTTON_L1 key 311 BUTTON_R1 key 315 BUTTON_START -key 158 BUTTON_BACK -key 172 BUTTON_HOME +key 158 BACK +key 172 HOME key 317 BUTTON_THUMBL key 318 BUTTON_THUMBR diff --git a/data/keyboards/common.mk b/data/keyboards/common.mk index 335298c..7b36167 100644 --- a/data/keyboards/common.mk +++ b/data/keyboards/common.mk @@ -26,7 +26,23 @@ keylayouts := \ Vendor_046d_Product_c532.kl \ Vendor_054c_Product_0268.kl \ Vendor_05ac_Product_0239.kl \ - Vendor_22b8_Product_093d.kl + Vendor_22b8_Product_093d.kl \ + Vendor_0079_Product_0011.kl \ + Vendor_046d_Product_c219.kl \ + Vendor_046d_Product_c21f.kl \ + Vendor_0583_Product_2060.kl \ + Vendor_0a5c_Product_8502.kl \ + Vendor_1038_Product_1412.kl \ + Vendor_12bd_Product_d015.kl \ + Vendor_1689_Product_fd00.kl \ + Vendor_1689_Product_fd01.kl \ + Vendor_1689_Product_fe00.kl \ + Vendor_1bad_Product_f016.kl \ + Vendor_1bad_Product_f023.kl \ + Vendor_1bad_Product_f027.kl \ + Vendor_1bad_Product_f036.kl \ + Vendor_1d79_Product_0009.kl \ + Vendor_2378_Product_100a.kl keycharmaps := \ Generic.kcm \ |