From 5ab2492e0a5d29a865e78ac53cf5781b6340eb23 Mon Sep 17 00:00:00 2001 From: Dimitris Mantzouranis Date: Thu, 8 May 2014 19:13:00 +0200 Subject: [PATCH] keylayout: massive updates and fixes added in missing kcm and pmic8xxx_pwrkey files removed redundant AVRCP removed duplicates, cleanup and updates --- device_pyramid.mk | 9 ++++++--- keylayout/AVRCP.kl | 10 ---------- keylayout/cy8c-touchscreen.kl | 4 +--- keylayout/h2w_headset.kcm | 15 +++++++++++++++ keylayout/keypad_8660.kcm | 15 +++++++++++++++ keylayout/keypad_8660.kl | 2 ++ keylayout/pmic8xxx_pwrkey.kcm | 15 +++++++++++++++ keylayout/pmic8xxx_pwrkey.kl | 1 + keylayout/pyramid-keypad.kl | 9 --------- 9 files changed, 55 insertions(+), 25 deletions(-) delete mode 100644 keylayout/AVRCP.kl create mode 100644 keylayout/h2w_headset.kcm create mode 100644 keylayout/keypad_8660.kcm create mode 100644 keylayout/keypad_8660.kl create mode 100644 keylayout/pmic8xxx_pwrkey.kcm create mode 100644 keylayout/pmic8xxx_pwrkey.kl delete mode 100644 keylayout/pyramid-keypad.kl diff --git a/device_pyramid.mk b/device_pyramid.mk index a64d27bf..4ed697a7 100644 --- a/device_pyramid.mk +++ b/device_pyramid.mk @@ -44,12 +44,15 @@ PRODUCT_PACKAGES += \ offmode_charging \ htcbatt -# Keylayouts +# Keylayouts and Key Character Maps PRODUCT_COPY_FILES += \ - device/htc/pyramid/keylayout/AVRCP.kl:system/usr/keylayout/AVRCP.kl \ + device/htc/pyramid/keylayout/pmic8xxx_pwrkey.kl:system/usr/keylayout/pmic8xxx_pwrkey.kl \ device/htc/pyramid/keylayout/cy8c-touchscreen.kl:system/usr/keylayout/cy8c-touchscreen.kl \ device/htc/pyramid/keylayout/h2w_headset.kl:system/usr/keylayout/h2w_headset.kl \ - device/htc/pyramid/keylayout/pyramid-keypad.kl:system/usr/keylayout/pyramid-keypad.kl + device/htc/pyramid/keylayout/keypad_8660.kl:system/usr/keylayout/keypad_8660.kl \ + device/htc/pyramid/keylayout/pmic8xxx_pwrkey.kcm:system/usr/keychars/pmic8xxx_pwrkey.kcm \ + device/htc/pyramid/keylayout/h2w_headset.kcm:system/usr/keychars/h2w_headset.kcm \ + device/htc/pyramid/keylayout/keypad_8660.kcm:system/usr/keychars/keypad_8660.kcm # Input device config PRODUCT_COPY_FILES += \ diff --git a/keylayout/AVRCP.kl b/keylayout/AVRCP.kl deleted file mode 100644 index ea500afa..00000000 --- a/keylayout/AVRCP.kl +++ /dev/null @@ -1,10 +0,0 @@ -key 200 MEDIA_PLAY_PAUSE WAKE -key 201 MEDIA_PLAY_PAUSE WAKE -key 164 MEDIA_PLAY_PAUSE WAKE -key 166 MEDIA_STOP WAKE -key 128 MEDIA_STOP WAKE -key 163 MEDIA_NEXT WAKE -key 165 MEDIA_PREVIOUS WAKE -key 168 MEDIA_REWIND WAKE -key 208 MEDIA_FAST_FORWARD WAKE -key 159 MEDIA_FAST_FORWARD WAKE diff --git a/keylayout/cy8c-touchscreen.kl b/keylayout/cy8c-touchscreen.kl index 09910ca1..9eb8d9ec 100644 --- a/keylayout/cy8c-touchscreen.kl +++ b/keylayout/cy8c-touchscreen.kl @@ -1,6 +1,4 @@ key 102 HOME key 139 MENU key 158 BACK -key 217 SEARCH - -key 107 ENDCALL WAKE_DROPPED +key 217 ASSIST diff --git a/keylayout/h2w_headset.kcm b/keylayout/h2w_headset.kcm new file mode 100644 index 00000000..28e67889 --- /dev/null +++ b/keylayout/h2w_headset.kcm @@ -0,0 +1,15 @@ +# Copyright (C) 2014 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +type SPECIAL_FUNCTION diff --git a/keylayout/keypad_8660.kcm b/keylayout/keypad_8660.kcm new file mode 100644 index 00000000..28e67889 --- /dev/null +++ b/keylayout/keypad_8660.kcm @@ -0,0 +1,15 @@ +# Copyright (C) 2014 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +type SPECIAL_FUNCTION diff --git a/keylayout/keypad_8660.kl b/keylayout/keypad_8660.kl new file mode 100644 index 00000000..820cb683 --- /dev/null +++ b/keylayout/keypad_8660.kl @@ -0,0 +1,2 @@ +key 114 VOLUME_DOWN WAKE +key 115 VOLUME_UP WAKE diff --git a/keylayout/pmic8xxx_pwrkey.kcm b/keylayout/pmic8xxx_pwrkey.kcm new file mode 100644 index 00000000..28e67889 --- /dev/null +++ b/keylayout/pmic8xxx_pwrkey.kcm @@ -0,0 +1,15 @@ +# Copyright (C) 2014 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +type SPECIAL_FUNCTION diff --git a/keylayout/pmic8xxx_pwrkey.kl b/keylayout/pmic8xxx_pwrkey.kl new file mode 100644 index 00000000..469d7421 --- /dev/null +++ b/keylayout/pmic8xxx_pwrkey.kl @@ -0,0 +1 @@ +key 116 POWER WAKE diff --git a/keylayout/pyramid-keypad.kl b/keylayout/pyramid-keypad.kl deleted file mode 100644 index e7a312d4..00000000 --- a/keylayout/pyramid-keypad.kl +++ /dev/null @@ -1,9 +0,0 @@ -key 116 POWER WAKE -key 114 VOLUME_DOWN WAKE -key 115 VOLUME_UP WAKE -key 102 HOME -key 139 MENU -key 158 BACK -key 217 SEARCH - -key 107 ENDCALL WAKE_DROPPED