Skip to content

Commit

Permalink
keylayout: massive updates and fixes
Browse files Browse the repository at this point in the history
added in missing kcm and pmic8xxx_pwrkey files
removed redundant AVRCP
removed duplicates, cleanup and updates
  • Loading branch information
dexter93 authored and ivanich committed Sep 28, 2014
1 parent ece9e34 commit 5ab2492
Show file tree
Hide file tree
Showing 9 changed files with 55 additions and 25 deletions.
9 changes: 6 additions & 3 deletions device_pyramid.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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 += \
Expand Down
10 changes: 0 additions & 10 deletions keylayout/AVRCP.kl

This file was deleted.

4 changes: 1 addition & 3 deletions keylayout/cy8c-touchscreen.kl
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
key 102 HOME
key 139 MENU
key 158 BACK
key 217 SEARCH

key 107 ENDCALL WAKE_DROPPED
key 217 ASSIST
15 changes: 15 additions & 0 deletions keylayout/h2w_headset.kcm
Original file line number Diff line number Diff line change
@@ -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
15 changes: 15 additions & 0 deletions keylayout/keypad_8660.kcm
Original file line number Diff line number Diff line change
@@ -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
2 changes: 2 additions & 0 deletions keylayout/keypad_8660.kl
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
key 114 VOLUME_DOWN WAKE
key 115 VOLUME_UP WAKE
15 changes: 15 additions & 0 deletions keylayout/pmic8xxx_pwrkey.kcm
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions keylayout/pmic8xxx_pwrkey.kl
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
key 116 POWER WAKE
9 changes: 0 additions & 9 deletions keylayout/pyramid-keypad.kl

This file was deleted.

0 comments on commit 5ab2492

Please sign in to comment.