Update Crespo keymaps.

Change-Id: I9b527593a13817420fa153d78c07f1edd3a40c2c

9 files changed, 65 insertions, 95 deletions

diff --git a/crespo-keypad.kl b/crespo-keypad.kl
deleted file mode 100644
index 08a13e2..0000000
--- a/crespo-keypad.kl
+++ /dev/null
@@ -1,3 +0,0 @@
-114   VOLUME_DOWN       WAKE
-115   VOLUME_UP         WAKE
-116   POWER             WAKE
diff --git a/cypress-touchkey.kl b/cypress-touchkey.kl
index 79d6480..c884476 100644
--- a/cypress-touchkey.kl
+++ b/cypress-touchkey.kl
@@ -1,3 +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 139    MENU           VIRTUAL
 key 102    HOME           VIRTUAL
 key 158    BACK           VIRTUAL
diff --git a/device.mk b/device.mk
index f334fff..783ee2c 100644
--- a/device.mk
+++ b/device.mk
@@ -55,8 +55,8 @@ PRODUCT_COPY_FILES += \
 PRODUCT_COPY_FILES += \
 	device/samsung/crespo/s3c-keypad.kl:system/usr/keylayout/s3c-keypad.kl \
 	device/samsung/crespo/s3c-keypad.kcm:system/usr/keychars/s3c-keypad.kcm \
-	device/samsung/crespo/crespo-keypad.kl:system/usr/keylayout/crespo-keypad.kl \
-	device/samsung/crespo/crespo-keypad.kcm:system/usr/keychars/crespo-keypad.kcm \
+	device/samsung/crespo/herring-keypad.kl:system/usr/keylayout/herring-keypad.kl \
+	device/samsung/crespo/herring-keypad.kcm:system/usr/keychars/herring-keypad.kcm \
 	device/samsung/crespo/cypress-touchkey.kl:system/usr/keylayout/cypress-touchkey.kl \
 	device/samsung/crespo/cypress-touchkey.kcm:system/usr/keychars/cypress-touchkey.kcm \
 	device/samsung/crespo/sec_jack.kl:system/usr/keylayout/sec_jack.kl \
diff --git a/crespo-keypad.kcm b/herring-keypad.kcm
index 7ee6e5a..7ee6e5a 100644
--- a/crespo-keypad.kcm
+++ b/herring-keypad.kcm
diff --git a/herring-keypad.kl b/herring-keypad.kl
new file mode 100644
index 0000000..320a340
--- /dev/null
+++ b/herring-keypad.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.
+
+114   VOLUME_DOWN       WAKE
+115   VOLUME_UP         WAKE
+116   POWER             WAKE
diff --git a/mxt224_ts_input.idc b/mxt224_ts_input.idc
index f754999..d258f04 100644
--- a/mxt224_ts_input.idc
+++ b/mxt224_ts_input.idc
@@ -20,6 +20,10 @@
 # Refer to the input device calibration documentation for more details.
 #
 
+# Basic Parameters
+touch.deviceType = touchScreen
+touch.orientationAware = 1
+
 # Touch Size
 touch.touchSize.calibration = pressure
 
diff --git a/qwerty.kl b/qwerty.kl
deleted file mode 100644
index 0b1ea74..0000000
--- a/qwerty.kl
+++ /dev/null
@@ -1,90 +0,0 @@
-key 399   GRAVE
-key 2     1
-key 3     2
-key 4     3
-key 5     4
-key 6     5
-key 7     6
-key 8     7
-key 9     8
-key 10    9
-key 11    0
-key 1     BACK              WAKE_DROPPED
-key 158   BACK              WAKE_DROPPED
-key 230   SOFT_RIGHT        WAKE
-key 60    SOFT_RIGHT        WAKE
-key 107   ENDCALL           WAKE_DROPPED
-key 62    ENDCALL           WAKE_DROPPED
-key 229   MENU              WAKE_DROPPED
-key 139   MENU              WAKE_DROPPED
-key 59    MENU              WAKE_DROPPED
-key 127   SEARCH            WAKE_DROPPED
-key 217   SEARCH            WAKE_DROPPED
-key 228   POUND
-key 227   STAR
-key 231   CALL              WAKE_DROPPED
-key 61    CALL              WAKE_DROPPED
-key 232   DPAD_CENTER       WAKE_DROPPED
-key 108   DPAD_DOWN         WAKE_DROPPED
-key 103   DPAD_UP           WAKE_DROPPED
-key 102   HOME              WAKE
-key 105   DPAD_LEFT         WAKE_DROPPED
-key 106   DPAD_RIGHT        WAKE_DROPPED
-key 115   VOLUME_UP         WAKE
-key 114   VOLUME_DOWN       WAKE
-key 116   POWER             WAKE
-key 212   CAMERA
-
-key 16    Q
-key 17    W
-key 18    E
-key 19    R
-key 20    T
-key 21    Y
-key 22    U
-key 23    I
-key 24    O
-key 25    P
-key 26    LEFT_BRACKET
-key 27    RIGHT_BRACKET
-key 43    BACKSLASH
-
-key 30    A
-key 31    S
-key 32    D
-key 33    F
-key 34    G
-key 35    H
-key 36    J
-key 37    K
-key 38    L
-key 39    SEMICOLON
-key 40    APOSTROPHE
-key 14    DEL
-        
-key 44    Z
-key 45    X
-key 46    C
-key 47    V
-key 48    B
-key 49    N
-key 50    M
-key 51    COMMA
-key 52    PERIOD
-key 53    SLASH
-key 28    ENTER
-        
-key 56    ALT_LEFT
-key 100   ALT_RIGHT
-key 42    SHIFT_LEFT
-key 54    SHIFT_RIGHT
-key 15    TAB
-key 57    SPACE
-key 150   EXPLORER
-key 155   ENVELOPE        
-
-key 12    MINUS
-key 13    EQUALS
-key 215   AT
-
-
diff --git a/s3c-keypad.kl b/s3c-keypad.kl
index 2bcff82..72f3f4e 100644
--- a/s3c-keypad.kl
+++ b/s3c-keypad.kl
@@ -1,3 +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 42    VOLUME_UP         WAKE
 key 58    VOLUME_DOWN       WAKE
 key 50    HOME              WAKE_DROPPED
diff --git a/sec_jack.kl b/sec_jack.kl
index 92d6553..1a421d6 100644
--- a/sec_jack.kl
+++ b/sec_jack.kl
@@ -1,3 +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