diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2011-12-14 01:59:46 -0800 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2011-12-14 01:59:46 -0800 |
| commit | a042150a697715ca0b65fcc1a03fcc3491c488a2 (patch) | |
| tree | e90a668e8e8b55f9ede5835286d78a9639a9d686 /java | |
| parent | 9750165c9a134a8981747f1ca1d279f0086829e5 (diff) | |
| parent | 623d0155b6a316fdc9335370cdd4005bbb474ef3 (diff) | |
| download | latinime-a042150a697715ca0b65fcc1a03fcc3491c488a2.tar.gz latinime-a042150a697715ca0b65fcc1a03fcc3491c488a2.tar.xz latinime-a042150a697715ca0b65fcc1a03fcc3491c488a2.zip | |
Merge "Just ignore settings/shortcut key while typing on tablet"
Diffstat (limited to 'java')
| -rw-r--r-- | java/res/values/keycodes.xml | 1 | ||||
| -rw-r--r-- | java/res/xml-sw600dp/kbd_key_styles.xml | 4 | ||||
| -rw-r--r-- | java/res/xml-sw768dp/kbd_key_styles.xml | 4 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/Keyboard.java | 3 |
4 files changed, 8 insertions, 4 deletions
diff --git a/java/res/values/keycodes.xml b/java/res/values/keycodes.xml index 59cc07531..4f8bfed58 100644 --- a/java/res/values/keycodes.xml +++ b/java/res/values/keycodes.xml @@ -23,6 +23,7 @@ <integer name="key_tab">9</integer> <integer name="key_return">10</integer> <integer name="key_space">32</integer> + <integer name="key_dummy">0</integer> <integer name="key_shift">-1</integer> <integer name="key_switch_alpha_symbol">-2</integer> <integer name="key_delete">-5</integer> diff --git a/java/res/xml-sw600dp/kbd_key_styles.xml b/java/res/xml-sw600dp/kbd_key_styles.xml index aba1a8029..e0171b030 100644 --- a/java/res/xml-sw600dp/kbd_key_styles.xml +++ b/java/res/xml-sw600dp/kbd_key_styles.xml @@ -78,14 +78,14 @@ latin:code="@integer/key_shortcut" latin:keyIcon="iconShortcutKey" latin:keyActionFlags="noKeyPreview|altCodeWhileTyping" - latin:altCode="@integer/key_space" + latin:altCode="@integer/key_dummy" latin:parentStyle="f2PopupStyle" /> <key-style latin:styleName="settingsKeyStyle" latin:code="@integer/key_settings" latin:keyIcon="iconSettingsKey" latin:keyActionFlags="noKeyPreview|altCodeWhileTyping" - latin:altCode="@integer/key_space" + latin:altCode="@integer/key_dummy" latin:backgroundType="functional" /> <key-style latin:styleName="tabKeyStyle" diff --git a/java/res/xml-sw768dp/kbd_key_styles.xml b/java/res/xml-sw768dp/kbd_key_styles.xml index e6ec53dd1..d9266508e 100644 --- a/java/res/xml-sw768dp/kbd_key_styles.xml +++ b/java/res/xml-sw768dp/kbd_key_styles.xml @@ -60,14 +60,14 @@ latin:code="@integer/key_shortcut" latin:keyIcon="iconShortcutKey" latin:keyActionFlags="noKeyPreview|altCodeWhileTyping" - latin:altCode="@integer/key_space" + latin:altCode="@integer/key_dummy" latin:backgroundType="functional" /> <key-style latin:styleName="settingsKeyStyle" latin:code="@integer/key_settings" latin:keyIcon="iconSettingsKey" latin:keyActionFlags="noKeyPreview|altCodeWhileTyping" - latin:altCode="@integer/key_space" + latin:altCode="@integer/key_dummy" latin:backgroundType="functional" /> <key-style latin:styleName="tabKeyStyle" diff --git a/java/src/com/android/inputmethod/keyboard/Keyboard.java b/java/src/com/android/inputmethod/keyboard/Keyboard.java index e267aa65c..e3f219162 100644 --- a/java/src/com/android/inputmethod/keyboard/Keyboard.java +++ b/java/src/com/android/inputmethod/keyboard/Keyboard.java @@ -151,6 +151,9 @@ public class Keyboard { } public Key getKey(int code) { + if (code == CODE_DUMMY) { + return null; + } final Integer keyCode = code; if (mKeyCache.containsKey(keyCode)) { return mKeyCache.get(keyCode); |