diff options
author | Dima Zavin <dima@android.com> | 2012-01-19 09:27:00 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-01-19 09:27:00 -0800 |
commit | 47e78318449d2047897f77e9112d8aa976a740e4 (patch) | |
tree | 8252748ac6e320609797d52d3a84553ce5886f95 | |
parent | cccc78c41aacdb05ad5cdff3e251dc294e18b553 (diff) | |
parent | f5bee2d844424fceab84dff73ba97001449bfa96 (diff) | |
download | device_samsung_tuna-47e78318449d2047897f77e9112d8aa976a740e4.zip device_samsung_tuna-47e78318449d2047897f77e9112d8aa976a740e4.tar.gz device_samsung_tuna-47e78318449d2047897f77e9112d8aa976a740e4.tar.bz2 |
am f5bee2d8: am 6305434b: Merge "tuna: add headset jack key layout files" into ics-mr1
* commit 'f5bee2d844424fceab84dff73ba97001449bfa96':
tuna: add headset jack key layout files
-rw-r--r-- | device.mk | 4 | ||||
-rw-r--r-- | sec_jack.kcm | 15 | ||||
-rw-r--r-- | sec_jack.kl | 17 |
3 files changed, 35 insertions, 1 deletions
@@ -97,7 +97,9 @@ PRODUCT_PACKAGES += \ # Key maps PRODUCT_COPY_FILES += \ device/samsung/tuna/tuna-gpio-keypad.kl:system/usr/keylayout/tuna-gpio-keypad.kl \ - device/samsung/tuna/tuna-gpio-keypad.kcm:system/usr/keychars/tuna-gpio-keypad.kcm + device/samsung/tuna/tuna-gpio-keypad.kcm:system/usr/keychars/tuna-gpio-keypad.kcm \ + device/samsung/tuna/sec_jack.kl:system/usr/keylayout/sec_jack.kl \ + device/samsung/tuna/sec_jack.kcm:system/usr/keychars/sec_jack.kcm # Input device calibration files PRODUCT_COPY_FILES += \ diff --git a/sec_jack.kcm b/sec_jack.kcm new file mode 100644 index 0000000..7ee6e5a --- /dev/null +++ b/sec_jack.kcm @@ -0,0 +1,15 @@ +# Copyright (C) 2010 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/sec_jack.kl b/sec_jack.kl new file mode 100644 index 0000000..1a421d6 --- /dev/null +++ b/sec_jack.kl @@ -0,0 +1,17 @@ +# Copyright (C) 2010 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. + +key 163 MEDIA_NEXT WAKE +key 165 MEDIA_PREVIOUS WAKE +key 226 HEADSETHOOK WAKE |