aboutsummaryrefslogtreecommitdiffstats
path: root/emulator
diff options
context:
space:
mode:
authorMagnus Karlsson <magnus1.karlsson@sonyericsson.com>2010-08-30 16:54:03 +0200
committerJean-Baptiste Queru <jbq@google.com>2010-08-31 16:35:43 -0700
commit1fc95cae8ec2ccfe134ff279ed9082311ad0d877 (patch)
tree63687cc094d873c5ed952f53959e2de101b5f92f /emulator
parent7a12704dcdebc28cd728f2b2ebc9e8115b9c6985 (diff)
downloadsdk-1fc95cae8ec2ccfe134ff279ed9082311ad0d877.zip
sdk-1fc95cae8ec2ccfe134ff279ed9082311ad0d877.tar.gz
sdk-1fc95cae8ec2ccfe134ff279ed9082311ad0d877.tar.bz2
Fixed problem with keymap files copied to target
Moved Android.mk and keymap files except AVRCP.kl from sdk/emulator/keymaps to build/target/board/generic. This causes the keymap files to copied into the system image of generic and sdk products, but not into the system image of HW products. Originally the qwerty.kl was copied to target no matter if the target had a qwerty keyboard or not, which is the case for e.g. the Nexus One. Change-Id: I6f76bcd4e23b8478f36f213090d22d7d3ea1255b
Diffstat (limited to 'emulator')
-rw-r--r--emulator/keymaps/Android.mk12
-rw-r--r--emulator/keymaps/qwerty.kcm64
-rw-r--r--emulator/keymaps/qwerty.kl91
-rw-r--r--emulator/keymaps/qwerty2.kcm81
4 files changed, 0 insertions, 248 deletions
diff --git a/emulator/keymaps/Android.mk b/emulator/keymaps/Android.mk
index 81ac530..d6d330d 100644
--- a/emulator/keymaps/Android.mk
+++ b/emulator/keymaps/Android.mk
@@ -1,16 +1,4 @@
LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := qwerty.kcm
-include $(BUILD_KEY_CHAR_MAP)
-
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := qwerty2.kcm
-include $(BUILD_KEY_CHAR_MAP)
-
-file := $(TARGET_OUT_KEYLAYOUT)/qwerty.kl
-ALL_PREBUILT += $(file)
-$(file): $(LOCAL_PATH)/qwerty.kl | $(ACP)
- $(transform-prebuilt-to-target)
file := $(TARGET_OUT_KEYLAYOUT)/AVRCP.kl
ALL_PREBUILT += $(file)
diff --git a/emulator/keymaps/qwerty.kcm b/emulator/keymaps/qwerty.kcm
deleted file mode 100644
index 8056364..0000000
--- a/emulator/keymaps/qwerty.kcm
+++ /dev/null
@@ -1,64 +0,0 @@
-[type=QWERTY]
-
-# keycode display number base caps fn caps_fn
-
-A 'A' '2' 'a' 'A' '#' 0x00
-B 'B' '2' 'b' 'B' '<' 0x00
-C 'C' '2' 'c' 'C' '9' 0x00E7
-D 'D' '3' 'd' 'D' '5' 0x00
-E 'E' '3' 'e' 'E' '2' 0x0301
-F 'F' '3' 'f' 'F' '6' 0x00A5
-G 'G' '4' 'g' 'G' '-' '_'
-H 'H' '4' 'h' 'H' '[' '{'
-I 'I' '4' 'i' 'I' '$' 0x0302
-J 'J' '5' 'j' 'J' ']' '}'
-K 'K' '5' 'k' 'K' '"' '~'
-L 'L' '5' 'l' 'L' ''' '`'
-M 'M' '6' 'm' 'M' '!' 0x00
-N 'N' '6' 'n' 'N' '>' 0x0303
-O 'O' '6' 'o' 'O' '(' 0x00
-P 'P' '7' 'p' 'P' ')' 0x00
-Q 'Q' '7' 'q' 'Q' '*' 0x0300
-R 'R' '7' 'r' 'R' '3' 0x20AC
-S 'S' '7' 's' 'S' '4' 0x00DF
-T 'T' '8' 't' 'T' '+' 0x00A3
-U 'U' '8' 'u' 'U' '&' 0x0308
-V 'V' '8' 'v' 'V' '=' '^'
-W 'W' '9' 'w' 'W' '1' 0x00
-X 'X' '9' 'x' 'X' '8' 0xEF00
-Y 'Y' '9' 'y' 'Y' '%' 0x00A1
-Z 'Z' '9' 'z' 'Z' '7' 0x00
-
-# on pc keyboards
-COMMA ',' ',' ',' ';' ';' '|'
-PERIOD '.' '.' '.' ':' ':' 0x2026
-AT '@' '0' '@' '0' '0' 0x2022
-SLASH '/' '/' '/' '?' '?' '\'
-
-SPACE 0x20 0x20 0x20 0x20 0xEF01 0xEF01
-ENTER 0xa 0xa 0xa 0xa 0xa 0xa
-
-TAB 0x9 0x9 0x9 0x9 0x9 0x9
-0 '0' '0' '0' ')' ')' ')'
-1 '1' '1' '1' '!' '!' '!'
-2 '2' '2' '2' '@' '@' '@'
-3 '3' '3' '3' '#' '#' '#'
-4 '4' '4' '4' '$' '$' '$'
-5 '5' '5' '5' '%' '%' '%'
-6 '6' '6' '6' '^' '^' '^'
-7 '7' '7' '7' '&' '&' '&'
-8 '8' '8' '8' '*' '*' '*'
-9 '9' '9' '9' '(' '(' '('
-
-GRAVE '`' '`' '`' '~' '`' '~'
-MINUS '-' '-' '-' '_' '-' '_'
-EQUALS '=' '=' '=' '+' '=' '+'
-LEFT_BRACKET '[' '[' '[' '{' '[' '{'
-RIGHT_BRACKET ']' ']' ']' '}' ']' '}'
-BACKSLASH '\' '\' '\' '|' '\' '|'
-SEMICOLON ';' ';' ';' ':' ';' ':'
-APOSTROPHE ''' ''' ''' '"' ''' '"'
-STAR '*' '*' '*' '*' '*' '*'
-POUND '#' '#' '#' '#' '#' '#'
-PLUS '+' '+' '+' '+' '+' '+'
-
diff --git a/emulator/keymaps/qwerty.kl b/emulator/keymaps/qwerty.kl
deleted file mode 100644
index 692a4ac..0000000
--- a/emulator/keymaps/qwerty.kl
+++ /dev/null
@@ -1,91 +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 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
-key 114 VOLUME_DOWN
-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
-
-# On an AT keyboard: ESC, F10
-key 1 BACK WAKE_DROPPED
-key 68 MENU WAKE_DROPPED
diff --git a/emulator/keymaps/qwerty2.kcm b/emulator/keymaps/qwerty2.kcm
deleted file mode 100644
index 1487fb7..0000000
--- a/emulator/keymaps/qwerty2.kcm
+++ /dev/null
@@ -1,81 +0,0 @@
-[type=QWERTY]
-
-# this keymap is to be used in the emulator only. note
-# that I have liberally modified certain key strokes to
-# make it more usable in this context. the main differences
-# with the reference keyboard image are:
-#
-# - cap-2 produces '@', and not '"', without that, typing
-# email addresses becomes a major pain with a qwerty
-# keyboard. note that you can type '"' with fn-E anyway.
-#
-# - cap-COMMA and cap-PERIOD return '<' and '>', instead
-# of nothing.
-#
-#
-
-# keycode display number base caps fn caps_fn
-
-A 'A' '2' 'a' 'A' 'a' 'A'
-B 'B' '2' 'b' 'B' 'b' 'B'
-C 'C' '2' 'c' 'C' 0x00e7 0x00E7
-D 'D' '3' 'd' 'D' ''' '''
-E 'E' '3' 'e' 'E' '"' 0x0301
-F 'F' '3' 'f' 'F' '[' '['
-G 'G' '4' 'g' 'G' ']' ']'
-H 'H' '4' 'h' 'H' '<' '<'
-I 'I' '4' 'i' 'I' '-' 0x0302
-J 'J' '5' 'j' 'J' '>' '>'
-K 'K' '5' 'k' 'K' ';' '~'
-L 'L' '5' 'l' 'L' ':' '`'
-M 'M' '6' 'm' 'M' '%' 0x00
-N 'N' '6' 'n' 'N' 0x00 0x0303
-O 'O' '6' 'o' 'O' '+' '+'
-P 'P' '7' 'p' 'P' '=' 0x00A5
-Q 'Q' '7' 'q' 'Q' '|' 0x0300
-R 'R' '7' 'r' 'R' '`' 0x20AC
-S 'S' '7' 's' 'S' '\' 0x00DF
-T 'T' '8' 't' 'T' '{' 0x00A3
-U 'U' '8' 'u' 'U' '_' 0x0308
-V 'V' '8' 'v' 'V' 'v' 'V'
-W 'W' '9' 'w' 'W' '~' '~'
-X 'X' '9' 'x' 'X' 'x' 0xEF00
-Y 'Y' '9' 'y' 'Y' '}' 0x00A1
-Z 'Z' '9' 'z' 'Z' 'z' 'Z'
-
-COMMA ',' ',' ',' '<' ',' ','
-PERIOD '.' '.' '.' '>' '.' 0x2026
-AT '@' '@' '@' '@' '@' 0x2022
-SLASH '/' '/' '/' '?' '?' '?'
-
-SPACE 0x20 0x20 0x20 0x20 0xEF01 0xEF01
-ENTER 0xa 0xa 0xa 0xa 0xa 0xa
-
-0 '0' '0' '0' ')' ')' ')'
-1 '1' '1' '1' '!' '!' '!'
-2 '2' '2' '2' '@' '@' '@'
-3 '3' '3' '3' '#' '#' '#'
-4 '4' '4' '4' '$' '$' '$'
-5 '5' '5' '5' '%' '%' '%'
-6 '6' '6' '6' '^' '^' '^'
-7 '7' '7' '7' '&' '&' '&'
-8 '8' '8' '8' '*' '*' '*'
-9 '9' '9' '9' '(' '(' '('
-
-# the rest is for a qwerty keyboard
-#
-TAB 0x9 0x9 0x9 0x9 0x9 0x9
-GRAVE '`' '`' '`' '~' '`' '~'
-MINUS '-' '-' '-' '_' '-' '_'
-EQUALS '=' '=' '=' '+' '=' '+'
-LEFT_BRACKET '[' '[' '[' '{' '[' '{'
-RIGHT_BRACKET ']' ']' ']' '}' ']' '}'
-BACKSLASH '\' '\' '\' '|' '\' '|'
-SEMICOLON ';' ';' ';' ':' ';' ':'
-APOSTROPHE ''' ''' ''' '"' ''' '"'
-STAR '*' '*' '*' '*' '*' '*'
-POUND '#' '#' '#' '#' '#' '#'
-PLUS '+' '+' '+' '+' '+' '+'
-
-
-
generated by cgit v1.1 at 2024-07-08 07:17:35 +0000