summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-merger <android-merger@google.com>2010-12-23 10:46:55 -0800
committerandroid-merger <android-merger@google.com>2010-12-23 10:46:55 -0800
commit7ff62edc4f856207c3c94b3466685f933161c247 (patch)
tree05ab553c50bdde2dd4558519e72c89dd00f98948
parent86794d119e0d1a7f0d0cba3045dff537aef12c5b (diff)
parent67741380c679e0db60c781899cd0c733ffe42f2f (diff)
downloaddevice_samsung_crespo-7ff62edc4f856207c3c94b3466685f933161c247.zip
device_samsung_crespo-7ff62edc4f856207c3c94b3466685f933161c247.tar.gz
device_samsung_crespo-7ff62edc4f856207c3c94b3466685f933161c247.tar.bz2
Merge remote branch 'goog/gingerbread' into gingerbread-release
-rw-r--r--board-info.txt2
-rw-r--r--device.mk3
-rw-r--r--herring-keypad.kl7
3 files changed, 10 insertions, 2 deletions
diff --git a/board-info.txt b/board-info.txt
index b403d3d..9276759 100644
--- a/board-info.txt
+++ b/board-info.txt
@@ -1,3 +1,3 @@
require board=herring
-require version-bootloader=I9020XXJL2
+require version-bootloader=I9020XXJL3
require version-baseband=I9020XXJL2
diff --git a/device.mk b/device.mk
index 34d4c37..ac7567f 100644
--- a/device.mk
+++ b/device.mk
@@ -55,7 +55,8 @@ PRODUCT_COPY_FILES += \
PRODUCT_COPY_FILES += \
device/samsung/crespo/s3c-keypad.kl:system/usr/keylayout/s3c-keypad.kl \
device/samsung/crespo/cypress-touchkey.kl:system/usr/keylayout/cypress-touchkey.kl \
- device/samsung/crespo/sec_jack.kl:system/usr/keylayout/sec_jack.kl
+ device/samsung/crespo/sec_jack.kl:system/usr/keylayout/sec_jack.kl \
+ device/samsung/crespo/herring-keypad.kl:system/usr/keylayout/herring-keypad.kl
# Generated kcm keymaps
PRODUCT_PACKAGES := \
diff --git a/herring-keypad.kl b/herring-keypad.kl
new file mode 100644
index 0000000..8720050
--- /dev/null
+++ b/herring-keypad.kl
@@ -0,0 +1,7 @@
+key 115 VOLUME_UP WAKE
+key 114 VOLUME_DOWN WAKE
+key 116 POWER WAKE
+key 139 MENU VIRTUAL
+key 102 HOME VIRTUAL
+key 158 BACK VIRTUAL
+key 217 SEARCH VIRTUAL