mako: cleanup unused kl, idc, kcm
- do not use mako-keypad, so remove related files.
- add keylayout and kcm for keypad_8064 and pmic8xxx_pwrkey.
Change-Id: I44d8b64b58904064ff2fa6903b7e092ce8daee05
diff --git a/device.mk b/device.mk
index da61ff1..092017a 100644
--- a/device.mk
+++ b/device.mk
@@ -61,20 +61,17 @@
PRODUCT_COPY_FILES += \
device/lge/mako/apq8064-tabla-snd-card_Button_Jack.kl:system/usr/keylayout/apq8064-tabla-snd-card_Button_Jack.kl \
device/lge/mako/hs_detect.kl:system/usr/keylayout/hs_detect.kl \
+ device/lge/mako/pmic8xxx_pwrkey.kl:system/usr/keylayout/pmic8xxx_pwrkey.kl \
+ device/lge/mako/keypad_8064.kl:system/usr/keylayout/keypad_8064.kl \
device/lge/mako/apq8064-tabla-snd-card_Button_Jack.kcm:system/usr/keychars/apq8064-tabla-snd-card_Button_Jack.kcm \
- device/lge/mako/hs_detect.kcm:system/usr/keychars/hs_detect.kcm
+ device/lge/mako/hs_detect.kcm:system/usr/keychars/hs_detect.kcm \
+ device/lge/mako/keypad_8064.kcm:system/usr/keychars/keypad_8064.kcm \
+ device/lge/mako/pmic8xxx_pwrkey.kcm:system/usr/keychars/pmic8xxx_pwrkey.kcm
# Prebuilt input device calibration files
PRODUCT_COPY_FILES += \
device/lge/mako/touch_dev.idc:system/usr/idc/touch_dev.idc
-ifeq (0,1)
-PRODUCT_COPY_FILES += \
- device/lge/mako/mako-keypad.kl:system/usr/keylayout/mako-keypad.kl \
- device/lge/mako/mako-keypad.kcm:system/usr/keychars/mako-keypad.kcm \
- device/lge/mako/keypad_8064.idc:system/usr/idc/keypad_8064.idc
-endif
-
# These are the hardware-specific features
PRODUCT_COPY_FILES += \
frameworks/native/data/etc/handheld_core_hardware.xml:system/etc/permissions/handheld_core_hardware.xml \
diff --git a/hs_detect.kl b/hs_detect.kl
index e583a46..7fb56ab 100644
--- a/hs_detect.kl
+++ b/hs_detect.kl
@@ -1,29 +1,3 @@
-# Copyright (c) 2009, Code Aurora Forum. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-# * Neither the name of Code Aurora nor
-# the names of its contributors may be used to endorse or promote
-# products derived from this software without specific prior written
-# permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NON-INFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
key 226 HEADSETHOOK WAKE
key 116 POWER WAKE
key 107 ENDCALL WAKE_DROPPED
diff --git a/keypad_8064.idc b/keypad_8064.idc
deleted file mode 100644
index f3fc638..0000000
--- a/keypad_8064.idc
+++ /dev/null
@@ -1,25 +0,0 @@
-# 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.
-
-#
-# Emulator keyboard configuration file #1.
-#
-
-keyboard.layout = mako-keypad
-keyboard.characterMap = mako-keypad
-keyboard.orientationAware = 0
-keyboard.builtIn = 0
-
-cursor.mode = pointer
-cursor.orientationAware = 0
diff --git a/mako-keypad.kcm b/keypad_8064.kcm
similarity index 100%
rename from mako-keypad.kcm
rename to keypad_8064.kcm
diff --git a/keypad_8064.kl b/keypad_8064.kl
new file mode 100644
index 0000000..03ac948
--- /dev/null
+++ b/keypad_8064.kl
@@ -0,0 +1,2 @@
+key 114 VOLUME_DOWN WAKE
+key 115 VOLUME_UP WAKE
diff --git a/mako-keypad.kl b/mako-keypad.kl
deleted file mode 100644
index c3e640d..0000000
--- a/mako-keypad.kl
+++ /dev/null
@@ -1,8 +0,0 @@
-key 114 VOLUME_DOWN
-key 115 VOLUME_UP
-key 116 POWER WAKE
-
-key 158 BACK VIRTUAL
-key 172 HOME VIRTUAL
-key 139 MENU VIRTUAL
-key 217 SEARCH VIRTUAL
diff --git a/mako-keypad.kcm b/pmic8xxx_pwrkey.kcm
similarity index 100%
copy from mako-keypad.kcm
copy to pmic8xxx_pwrkey.kcm
diff --git a/pmic8xxx_pwrkey.kl b/pmic8xxx_pwrkey.kl
new file mode 100644
index 0000000..469d742
--- /dev/null
+++ b/pmic8xxx_pwrkey.kl
@@ -0,0 +1 @@
+key 116 POWER WAKE
diff --git a/touch_dev.idc b/touch_dev.idc
index 469cf16..8ed3039 100644
--- a/touch_dev.idc
+++ b/touch_dev.idc
@@ -45,6 +45,3 @@
touch.distance.calibration = none
touch.distance.scale = 1
-
-keyboard.layout = mako-keypad
-keyboard.characterMap = mako-keypad
