commit eb74bc98f32c01ae7d11a73e77551833059c7da7
author Siarhei Vishniakou <svv@google.com> Fri May 18 14:04:14 2018 -0700
committer android-build-merger <android-build-merger@google.com> Fri May 18 14:04:14 2018 -0700
tree 280f8a3053f2a5755b3aa118ec3c253029a3d1b7
parent 50bafe9e6ba65add82d2d0f59f39a7f34ff083ec
parent dbca93d55a9714ac5dfac51bcd64a86e914f54a3

Merge "Remap PS key to BUTTON_MODE on DS4 joystick" into pi-dev am: 796fa51c8a
am: dbca93d55a

Change-Id: Ib04a7f55a2f994a389276f8c3f6f32c20710312a

data/keyboards/Vendor_054c_Product_05c4.kl

diff --git a/data/keyboards/Vendor_054c_Product_05c4.kl b/data/keyboards/Vendor_054c_Product_05c4.kl
index f465733..a1284a4 100644
--- a/data/keyboards/Vendor_054c_Product_05c4.kl
+++ b/data/keyboards/Vendor_054c_Product_05c4.kl
@@ -62,6 +62,10 @@
 key 0x139    BUTTON_START
 
 # PS key
-key 0x13c    HOME
+key 0x13c    BUTTON_MODE
+
 # Touchpad press
-key 0x13d   BUTTON_MODE
+# The touchpad for this joystick will become a separate input device in future releases
+# and this button will be equivalent to left mouse button
+# Therefore, map it to KEYCODE_BUTTON_1 here to allow apps to still handle this on earlier versions
+key 0x13d   BUTTON_1

data/keyboards/Vendor_054c_Product_09cc.kl

diff --git a/data/keyboards/Vendor_054c_Product_09cc.kl b/data/keyboards/Vendor_054c_Product_09cc.kl
index f465733..a1284a4 100644
--- a/data/keyboards/Vendor_054c_Product_09cc.kl
+++ b/data/keyboards/Vendor_054c_Product_09cc.kl
@@ -62,6 +62,10 @@
 key 0x139    BUTTON_START
 
 # PS key
-key 0x13c    HOME
+key 0x13c    BUTTON_MODE
+
 # Touchpad press
-key 0x13d   BUTTON_MODE
+# The touchpad for this joystick will become a separate input device in future releases
+# and this button will be equivalent to left mouse button
+# Therefore, map it to KEYCODE_BUTTON_1 here to allow apps to still handle this on earlier versions
+key 0x13d   BUTTON_1