Skip to content

Commit

Permalink
mako: cleanup unused kl, idc, kcm
Browse files Browse the repository at this point in the history
- do not use mako-keypad, so remove related files.
- add keylayout and kcm for keypad_8064 and pmic8xxx_pwrkey.

Change-Id: I44d8b64b58904064ff2fa6903b7e092ce8daee05
  • Loading branch information
hopemini authored and Iliyan Malchev committed Jun 22, 2012
1 parent 2ae60a2 commit 46ec5fe
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 56 deletions.
13 changes: 5 additions & 8 deletions device.mk
Expand Up @@ -61,20 +61,17 @@ PRODUCT_COPY_FILES += \
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 \
Expand Down
26 changes: 0 additions & 26 deletions 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
Expand Down
File renamed without changes.
2 changes: 2 additions & 0 deletions keypad_8064.kl
@@ -0,0 +1,2 @@
key 114 VOLUME_DOWN WAKE
key 115 VOLUME_UP WAKE
8 changes: 0 additions & 8 deletions mako-keypad.kl

This file was deleted.

12 changes: 1 addition & 11 deletions keypad_8064.idc → pmic8xxx_pwrkey.kcm
Expand Up @@ -12,14 +12,4 @@
# 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
type SPECIAL_FUNCTION
1 change: 1 addition & 0 deletions pmic8xxx_pwrkey.kl
@@ -0,0 +1 @@
key 116 POWER WAKE
3 changes: 0 additions & 3 deletions touch_dev.idc
Expand Up @@ -45,6 +45,3 @@ touch.orientation.calibration = none

touch.distance.calibration = none
touch.distance.scale = 1

keyboard.layout = mako-keypad
keyboard.characterMap = mako-keypad

0 comments on commit 46ec5fe

Please sign in to comment.