diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/res/drawable-hdpi/key_hint_num0.9.png (renamed from java/res/drawable-hdpi/keyboard_hint_0.9.png) | bin | 379 -> 379 bytes | |||
| -rw-r--r-- | java/res/drawable-hdpi/key_hint_num1.9.png (renamed from java/res/drawable-hdpi/keyboard_hint_1.9.png) | bin | 301 -> 301 bytes | |||
| -rw-r--r-- | java/res/drawable-hdpi/key_hint_num2.9.png (renamed from java/res/drawable-hdpi/keyboard_hint_2.9.png) | bin | 404 -> 404 bytes | |||
| -rw-r--r-- | java/res/drawable-hdpi/key_hint_num3.9.png (renamed from java/res/drawable-hdpi/keyboard_hint_3.9.png) | bin | 413 -> 413 bytes | |||
| -rw-r--r-- | java/res/drawable-hdpi/key_hint_num4.9.png (renamed from java/res/drawable-hdpi/keyboard_hint_4.9.png) | bin | 341 -> 341 bytes | |||
| -rw-r--r-- | java/res/drawable-hdpi/key_hint_num5.9.png (renamed from java/res/drawable-hdpi/keyboard_hint_5.9.png) | bin | 388 -> 388 bytes | |||
| -rw-r--r-- | java/res/drawable-hdpi/key_hint_num6.9.png (renamed from java/res/drawable-hdpi/keyboard_hint_6.9.png) | bin | 413 -> 413 bytes | |||
| -rw-r--r-- | java/res/drawable-hdpi/key_hint_num7.9.png (renamed from java/res/drawable-hdpi/keyboard_hint_7.9.png) | bin | 367 -> 367 bytes | |||
| -rw-r--r-- | java/res/drawable-hdpi/key_hint_num8.9.png (renamed from java/res/drawable-hdpi/keyboard_hint_8.9.png) | bin | 417 -> 417 bytes | |||
| -rw-r--r-- | java/res/drawable-hdpi/key_hint_num9.9.png (renamed from java/res/drawable-hdpi/keyboard_hint_9.9.png) | bin | 417 -> 417 bytes | |||
| -rw-r--r-- | java/res/drawable-mdpi/key_hint_num0.9.png (renamed from java/res/drawable-mdpi/keyboard_hint_0.9.png) | bin | 307 -> 307 bytes | |||
| -rw-r--r-- | java/res/drawable-mdpi/key_hint_num1.9.png (renamed from java/res/drawable-mdpi/keyboard_hint_1.9.png) | bin | 302 -> 302 bytes | |||
| -rw-r--r-- | java/res/drawable-mdpi/key_hint_num2.9.png (renamed from java/res/drawable-mdpi/keyboard_hint_2.9.png) | bin | 334 -> 334 bytes | |||
| -rw-r--r-- | java/res/drawable-mdpi/key_hint_num3.9.png (renamed from java/res/drawable-mdpi/keyboard_hint_3.9.png) | bin | 327 -> 327 bytes | |||
| -rw-r--r-- | java/res/drawable-mdpi/key_hint_num4.9.png (renamed from java/res/drawable-mdpi/keyboard_hint_4.9.png) | bin | 329 -> 329 bytes | |||
| -rw-r--r-- | java/res/drawable-mdpi/key_hint_num5.9.png (renamed from java/res/drawable-mdpi/keyboard_hint_5.9.png) | bin | 334 -> 334 bytes | |||
| -rw-r--r-- | java/res/drawable-mdpi/key_hint_num6.9.png (renamed from java/res/drawable-mdpi/keyboard_hint_6.9.png) | bin | 329 -> 329 bytes | |||
| -rw-r--r-- | java/res/drawable-mdpi/key_hint_num7.9.png (renamed from java/res/drawable-mdpi/keyboard_hint_7.9.png) | bin | 334 -> 334 bytes | |||
| -rw-r--r-- | java/res/drawable-mdpi/key_hint_num8.9.png (renamed from java/res/drawable-mdpi/keyboard_hint_8.9.png) | bin | 332 -> 332 bytes | |||
| -rw-r--r-- | java/res/drawable-mdpi/key_hint_num9.9.png (renamed from java/res/drawable-mdpi/keyboard_hint_9.9.png) | bin | 339 -> 339 bytes | |||
| -rw-r--r-- | java/res/values-en/whitelist.xml | 38 | ||||
| -rw-r--r-- | java/res/values/attrs.xml | 5 | ||||
| -rw-r--r-- | java/res/values/whitelist.xml | 9 | ||||
| -rw-r--r-- | java/res/xml/kbd_azerty_rows.xml | 20 | ||||
| -rw-r--r-- | java/res/xml/kbd_qwerty_f1.xml | 2 | ||||
| -rw-r--r-- | java/res/xml/kbd_qwerty_row1.xml | 20 | ||||
| -rw-r--r-- | java/res/xml/kbd_qwerty_row4.xml | 4 | ||||
| -rw-r--r-- | java/res/xml/kbd_qwerty_rows_scandinavia.xml | 20 | ||||
| -rw-r--r-- | java/res/xml/kbd_qwertz_rows.xml | 20 | ||||
| -rw-r--r-- | java/res/xml/kbd_ru_rows.xml | 20 | ||||
| -rw-r--r-- | java/res/xml/kbd_sr_rows.xml | 20 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/compat/InputTypeCompatUtils.java | 25 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/KeyboardId.java | 17 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/KeyboardParser.java | 12 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/AutoDictionary.java | 10 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/LatinIME.java | 13 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/Utils.java | 2 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/WhitelistDictionary.java | 1 |
38 files changed, 149 insertions, 109 deletions
diff --git a/java/res/drawable-hdpi/keyboard_hint_0.9.png b/java/res/drawable-hdpi/key_hint_num0.9.png Binary files differindex 271264e92..271264e92 100644 --- a/java/res/drawable-hdpi/keyboard_hint_0.9.png +++ b/java/res/drawable-hdpi/key_hint_num0.9.png diff --git a/java/res/drawable-hdpi/keyboard_hint_1.9.png b/java/res/drawable-hdpi/key_hint_num1.9.png Binary files differindex eaf374262..eaf374262 100644 --- a/java/res/drawable-hdpi/keyboard_hint_1.9.png +++ b/java/res/drawable-hdpi/key_hint_num1.9.png diff --git a/java/res/drawable-hdpi/keyboard_hint_2.9.png b/java/res/drawable-hdpi/key_hint_num2.9.png Binary files differindex 8a1657117..8a1657117 100644 --- a/java/res/drawable-hdpi/keyboard_hint_2.9.png +++ b/java/res/drawable-hdpi/key_hint_num2.9.png diff --git a/java/res/drawable-hdpi/keyboard_hint_3.9.png b/java/res/drawable-hdpi/key_hint_num3.9.png Binary files differindex 34b501109..34b501109 100644 --- a/java/res/drawable-hdpi/keyboard_hint_3.9.png +++ b/java/res/drawable-hdpi/key_hint_num3.9.png diff --git a/java/res/drawable-hdpi/keyboard_hint_4.9.png b/java/res/drawable-hdpi/key_hint_num4.9.png Binary files differindex d4cc250dd..d4cc250dd 100644 --- a/java/res/drawable-hdpi/keyboard_hint_4.9.png +++ b/java/res/drawable-hdpi/key_hint_num4.9.png diff --git a/java/res/drawable-hdpi/keyboard_hint_5.9.png b/java/res/drawable-hdpi/key_hint_num5.9.png Binary files differindex 6a054b42f..6a054b42f 100644 --- a/java/res/drawable-hdpi/keyboard_hint_5.9.png +++ b/java/res/drawable-hdpi/key_hint_num5.9.png diff --git a/java/res/drawable-hdpi/keyboard_hint_6.9.png b/java/res/drawable-hdpi/key_hint_num6.9.png Binary files differindex 66e91400a..66e91400a 100644 --- a/java/res/drawable-hdpi/keyboard_hint_6.9.png +++ b/java/res/drawable-hdpi/key_hint_num6.9.png diff --git a/java/res/drawable-hdpi/keyboard_hint_7.9.png b/java/res/drawable-hdpi/key_hint_num7.9.png Binary files differindex 5eae24f4f..5eae24f4f 100644 --- a/java/res/drawable-hdpi/keyboard_hint_7.9.png +++ b/java/res/drawable-hdpi/key_hint_num7.9.png diff --git a/java/res/drawable-hdpi/keyboard_hint_8.9.png b/java/res/drawable-hdpi/key_hint_num8.9.png Binary files differindex ea7f512fd..ea7f512fd 100644 --- a/java/res/drawable-hdpi/keyboard_hint_8.9.png +++ b/java/res/drawable-hdpi/key_hint_num8.9.png diff --git a/java/res/drawable-hdpi/keyboard_hint_9.9.png b/java/res/drawable-hdpi/key_hint_num9.9.png Binary files differindex 0bf85de93..0bf85de93 100644 --- a/java/res/drawable-hdpi/keyboard_hint_9.9.png +++ b/java/res/drawable-hdpi/key_hint_num9.9.png diff --git a/java/res/drawable-mdpi/keyboard_hint_0.9.png b/java/res/drawable-mdpi/key_hint_num0.9.png Binary files differindex 61ad1b50a..61ad1b50a 100644 --- a/java/res/drawable-mdpi/keyboard_hint_0.9.png +++ b/java/res/drawable-mdpi/key_hint_num0.9.png diff --git a/java/res/drawable-mdpi/keyboard_hint_1.9.png b/java/res/drawable-mdpi/key_hint_num1.9.png Binary files differindex cd7772e71..cd7772e71 100644 --- a/java/res/drawable-mdpi/keyboard_hint_1.9.png +++ b/java/res/drawable-mdpi/key_hint_num1.9.png diff --git a/java/res/drawable-mdpi/keyboard_hint_2.9.png b/java/res/drawable-mdpi/key_hint_num2.9.png Binary files differindex fa5f8b79c..fa5f8b79c 100644 --- a/java/res/drawable-mdpi/keyboard_hint_2.9.png +++ b/java/res/drawable-mdpi/key_hint_num2.9.png diff --git a/java/res/drawable-mdpi/keyboard_hint_3.9.png b/java/res/drawable-mdpi/key_hint_num3.9.png Binary files differindex 0c7336cb7..0c7336cb7 100644 --- a/java/res/drawable-mdpi/keyboard_hint_3.9.png +++ b/java/res/drawable-mdpi/key_hint_num3.9.png diff --git a/java/res/drawable-mdpi/keyboard_hint_4.9.png b/java/res/drawable-mdpi/key_hint_num4.9.png Binary files differindex 73ef06c0e..73ef06c0e 100644 --- a/java/res/drawable-mdpi/keyboard_hint_4.9.png +++ b/java/res/drawable-mdpi/key_hint_num4.9.png diff --git a/java/res/drawable-mdpi/keyboard_hint_5.9.png b/java/res/drawable-mdpi/key_hint_num5.9.png Binary files differindex aea460e1c..aea460e1c 100644 --- a/java/res/drawable-mdpi/keyboard_hint_5.9.png +++ b/java/res/drawable-mdpi/key_hint_num5.9.png diff --git a/java/res/drawable-mdpi/keyboard_hint_6.9.png b/java/res/drawable-mdpi/key_hint_num6.9.png Binary files differindex 16a9237e3..16a9237e3 100644 --- a/java/res/drawable-mdpi/keyboard_hint_6.9.png +++ b/java/res/drawable-mdpi/key_hint_num6.9.png diff --git a/java/res/drawable-mdpi/keyboard_hint_7.9.png b/java/res/drawable-mdpi/key_hint_num7.9.png Binary files differindex 6747a19c0..6747a19c0 100644 --- a/java/res/drawable-mdpi/keyboard_hint_7.9.png +++ b/java/res/drawable-mdpi/key_hint_num7.9.png diff --git a/java/res/drawable-mdpi/keyboard_hint_8.9.png b/java/res/drawable-mdpi/key_hint_num8.9.png Binary files differindex 28be2fb86..28be2fb86 100644 --- a/java/res/drawable-mdpi/keyboard_hint_8.9.png +++ b/java/res/drawable-mdpi/key_hint_num8.9.png diff --git a/java/res/drawable-mdpi/keyboard_hint_9.9.png b/java/res/drawable-mdpi/key_hint_num9.9.png Binary files differindex 731d63b1b..731d63b1b 100644 --- a/java/res/drawable-mdpi/keyboard_hint_9.9.png +++ b/java/res/drawable-mdpi/key_hint_num9.9.png diff --git a/java/res/values-en/whitelist.xml b/java/res/values-en/whitelist.xml new file mode 100644 index 000000000..9395f4c88 --- /dev/null +++ b/java/res/values-en/whitelist.xml @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2011, 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. +*/ +--> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- + An entry of the whitelist word should be: + 1. (int)frequency + 2. (String)before + 3. (String)after + --> + <string-array name="wordlist_whitelist" translatable="false"> + + <item>255</item> + <item>ill</item> + <item>I\'ll</item> + + <item>255</item> + <item>thisd</item> + <item>this\'d</item> + + </string-array> +</resources> diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml index 0e5b38b6b..feb955e86 100644 --- a/java/res/values/attrs.xml +++ b/java/res/values/attrs.xml @@ -184,9 +184,10 @@ <enum name="url" value="1" /> <enum name="email" value="2" /> <enum name="im" value="3" /> - <enum name="web" value="4" /> - <enum name="phone" value="5" /> + <enum name="phone" value="4" /> + <enum name="number" value="5" /> </attr> + <attr name="webInput" format="boolean" /> <attr name="passwordInput" format="boolean" /> <attr name="hasSettingsKey" format="string" /> <attr name="voiceKeyEnabled" format="string" /> diff --git a/java/res/values/whitelist.xml b/java/res/values/whitelist.xml index ced52e70e..d4ecbfaa4 100644 --- a/java/res/values/whitelist.xml +++ b/java/res/values/whitelist.xml @@ -25,14 +25,5 @@ 3. (String)after --> <string-array name="wordlist_whitelist"> - - <item>255</item> - <item>ill</item> - <item>I\'ll</item> - - <item>255</item> - <item>thisd</item> - <item>this\'d</item> - </string-array> </resources> diff --git a/java/res/xml/kbd_azerty_rows.xml b/java/res/xml/kbd_azerty_rows.xml index e805d5b1b..2f2b05495 100644 --- a/java/res/xml/kbd_azerty_rows.xml +++ b/java/res/xml/kbd_azerty_rows.xml @@ -29,44 +29,44 @@ > <Key latin:keyLabel="a" - latin:keyHintIcon="@drawable/keyboard_hint_1" + latin:keyHintIcon="@drawable/key_hint_num1" latin:popupCharacters="@string/alternates_for_a" latin:keyEdgeFlags="left" /> <Key latin:keyLabel="z" - latin:keyHintIcon="@drawable/keyboard_hint_2" + latin:keyHintIcon="@drawable/key_hint_num2" latin:popupCharacters="@string/alternates_for_z" /> <Key latin:keyLabel="e" - latin:keyHintIcon="@drawable/keyboard_hint_3" + latin:keyHintIcon="@drawable/key_hint_num3" latin:popupCharacters="@string/alternates_for_e" /> <Key latin:keyLabel="r" - latin:keyHintIcon="@drawable/keyboard_hint_4" + latin:keyHintIcon="@drawable/key_hint_num4" latin:popupCharacters="@string/alternates_for_r" /> <Key latin:keyLabel="t" - latin:keyHintIcon="@drawable/keyboard_hint_5" + latin:keyHintIcon="@drawable/key_hint_num5" latin:popupCharacters="@string/alternates_for_t" /> <Key latin:keyLabel="y" - latin:keyHintIcon="@drawable/keyboard_hint_6" + latin:keyHintIcon="@drawable/key_hint_num6" latin:popupCharacters="@string/alternates_for_y" /> <Key latin:keyLabel="u" - latin:keyHintIcon="@drawable/keyboard_hint_7" + latin:keyHintIcon="@drawable/key_hint_num7" latin:popupCharacters="@string/alternates_for_u" /> <Key latin:keyLabel="i" - latin:keyHintIcon="@drawable/keyboard_hint_8" + latin:keyHintIcon="@drawable/key_hint_num8" latin:popupCharacters="@string/alternates_for_i" /> <Key latin:keyLabel="o" - latin:keyHintIcon="@drawable/keyboard_hint_9" + latin:keyHintIcon="@drawable/key_hint_num9" latin:popupCharacters="@string/alternates_for_o" /> <Key latin:keyLabel="p" - latin:keyHintIcon="@drawable/keyboard_hint_0" + latin:keyHintIcon="@drawable/key_hint_num0" latin:popupCharacters="@string/alternates_for_p" latin:keyEdgeFlags="right" /> </Row> diff --git a/java/res/xml/kbd_qwerty_f1.xml b/java/res/xml/kbd_qwerty_f1.xml index d0e2884e1..e89d02d91 100644 --- a/java/res/xml/kbd_qwerty_f1.xml +++ b/java/res/xml/kbd_qwerty_f1.xml @@ -46,7 +46,7 @@ </case> <!-- latin:hasVoiceKey="false" --> <case - latin:mode="web" + latin:webInput="true" > <Key latin:keyLabel="." diff --git a/java/res/xml/kbd_qwerty_row1.xml b/java/res/xml/kbd_qwerty_row1.xml index d9249657e..3964d3c3e 100644 --- a/java/res/xml/kbd_qwerty_row1.xml +++ b/java/res/xml/kbd_qwerty_row1.xml @@ -27,44 +27,44 @@ > <Key latin:keyLabel="q" - latin:keyHintIcon="@drawable/keyboard_hint_1" + latin:keyHintIcon="@drawable/key_hint_num1" latin:popupCharacters="@string/alternates_for_q" latin:keyEdgeFlags="left" /> <Key latin:keyLabel="w" - latin:keyHintIcon="@drawable/keyboard_hint_2" + latin:keyHintIcon="@drawable/key_hint_num2" latin:popupCharacters="@string/alternates_for_w" /> <Key latin:keyLabel="e" - latin:keyHintIcon="@drawable/keyboard_hint_3" + latin:keyHintIcon="@drawable/key_hint_num3" latin:popupCharacters="@string/alternates_for_e" /> <Key latin:keyLabel="r" - latin:keyHintIcon="@drawable/keyboard_hint_4" + latin:keyHintIcon="@drawable/key_hint_num4" latin:popupCharacters="@string/alternates_for_r" /> <Key latin:keyLabel="t" - latin:keyHintIcon="@drawable/keyboard_hint_5" + latin:keyHintIcon="@drawable/key_hint_num5" latin:popupCharacters="@string/alternates_for_t" /> <Key latin:keyLabel="y" - latin:keyHintIcon="@drawable/keyboard_hint_6" + latin:keyHintIcon="@drawable/key_hint_num6" latin:popupCharacters="@string/alternates_for_y" /> <Key latin:keyLabel="u" - latin:keyHintIcon="@drawable/keyboard_hint_7" + latin:keyHintIcon="@drawable/key_hint_num7" latin:popupCharacters="@string/alternates_for_u" /> <Key latin:keyLabel="i" - latin:keyHintIcon="@drawable/keyboard_hint_8" + latin:keyHintIcon="@drawable/key_hint_num8" latin:popupCharacters="@string/alternates_for_i" /> <Key latin:keyLabel="o" - latin:keyHintIcon="@drawable/keyboard_hint_9" + latin:keyHintIcon="@drawable/key_hint_num9" latin:popupCharacters="@string/alternates_for_o" /> <Key latin:keyLabel="p" - latin:keyHintIcon="@drawable/keyboard_hint_0" + latin:keyHintIcon="@drawable/key_hint_num0" latin:popupCharacters="@string/alternates_for_p" latin:keyEdgeFlags="right" /> </Row> diff --git a/java/res/xml/kbd_qwerty_row4.xml b/java/res/xml/kbd_qwerty_row4.xml index 82f5a4a92..a8d150e4b 100644 --- a/java/res/xml/kbd_qwerty_row4.xml +++ b/java/res/xml/kbd_qwerty_row4.xml @@ -40,7 +40,7 @@ latin:keyWidth="40%p" /> <switch> <case - latin:mode="web" + latin:webInput="true" > <Key latin:keyHintIcon="@drawable/hint_popup" @@ -90,7 +90,7 @@ latin:keyWidth="30%p" /> <switch> <case - latin:mode="web" + latin:webInput="true" > <Key latin:keyHintIcon="@drawable/hint_popup" diff --git a/java/res/xml/kbd_qwerty_rows_scandinavia.xml b/java/res/xml/kbd_qwerty_rows_scandinavia.xml index 1aae5a0a8..06bb286a2 100644 --- a/java/res/xml/kbd_qwerty_rows_scandinavia.xml +++ b/java/res/xml/kbd_qwerty_rows_scandinavia.xml @@ -29,45 +29,45 @@ > <Key latin:keyLabel="q" - latin:keyHintIcon="@drawable/keyboard_hint_1" + latin:keyHintIcon="@drawable/key_hint_num1" latin:popupCharacters="@string/alternates_for_q" latin:keyWidth="8.75%p" latin:keyEdgeFlags="left" /> <Key latin:keyLabel="w" - latin:keyHintIcon="@drawable/keyboard_hint_2" + latin:keyHintIcon="@drawable/key_hint_num2" latin:popupCharacters="@string/alternates_for_w" /> <Key latin:keyLabel="e" - latin:keyHintIcon="@drawable/keyboard_hint_3" + latin:keyHintIcon="@drawable/key_hint_num3" latin:popupCharacters="@string/alternates_for_e" /> <Key latin:keyLabel="r" - latin:keyHintIcon="@drawable/keyboard_hint_4" + latin:keyHintIcon="@drawable/key_hint_num4" latin:popupCharacters="@string/alternates_for_r" /> <Key latin:keyLabel="t" - latin:keyHintIcon="@drawable/keyboard_hint_5" + latin:keyHintIcon="@drawable/key_hint_num5" latin:popupCharacters="@string/alternates_for_t" /> <Key latin:keyLabel="y" - latin:keyHintIcon="@drawable/keyboard_hint_6" + latin:keyHintIcon="@drawable/key_hint_num6" latin:popupCharacters="@string/alternates_for_y" /> <Key latin:keyLabel="u" - latin:keyHintIcon="@drawable/keyboard_hint_7" + latin:keyHintIcon="@drawable/key_hint_num7" latin:popupCharacters="@string/alternates_for_u" /> <Key latin:keyLabel="i" - latin:keyHintIcon="@drawable/keyboard_hint_8" + latin:keyHintIcon="@drawable/key_hint_num8" latin:popupCharacters="@string/alternates_for_i" /> <Key latin:keyLabel="o" - latin:keyHintIcon="@drawable/keyboard_hint_9" + latin:keyHintIcon="@drawable/key_hint_num9" latin:popupCharacters="@string/alternates_for_o" /> <Key latin:keyLabel="p" - latin:keyHintIcon="@drawable/keyboard_hint_0" + latin:keyHintIcon="@drawable/key_hint_num0" latin:popupCharacters="@string/alternates_for_p" /> <Key latin:keyLabel="å" diff --git a/java/res/xml/kbd_qwertz_rows.xml b/java/res/xml/kbd_qwertz_rows.xml index bb41f067a..7e8f90e32 100644 --- a/java/res/xml/kbd_qwertz_rows.xml +++ b/java/res/xml/kbd_qwertz_rows.xml @@ -29,44 +29,44 @@ > <Key latin:keyLabel="q" - latin:keyHintIcon="@drawable/keyboard_hint_1" + latin:keyHintIcon="@drawable/key_hint_num1" latin:popupCharacters="@string/alternates_for_q" latin:keyEdgeFlags="left" /> <Key latin:keyLabel="w" - latin:keyHintIcon="@drawable/keyboard_hint_2" + latin:keyHintIcon="@drawable/key_hint_num2" latin:popupCharacters="@string/alternates_for_w" /> <Key latin:keyLabel="e" - latin:keyHintIcon="@drawable/keyboard_hint_3" + latin:keyHintIcon="@drawable/key_hint_num3" latin:popupCharacters="@string/alternates_for_e" /> <Key latin:keyLabel="r" - latin:keyHintIcon="@drawable/keyboard_hint_4" + latin:keyHintIcon="@drawable/key_hint_num4" latin:popupCharacters="@string/alternates_for_r" /> <Key latin:keyLabel="t" - latin:keyHintIcon="@drawable/keyboard_hint_5" + latin:keyHintIcon="@drawable/key_hint_num5" latin:popupCharacters="@string/alternates_for_t" /> <Key latin:keyLabel="z" - latin:keyHintIcon="@drawable/keyboard_hint_6" + latin:keyHintIcon="@drawable/key_hint_num6" latin:popupCharacters="@string/alternates_for_z" /> <Key latin:keyLabel="u" - latin:keyHintIcon="@drawable/keyboard_hint_7" + latin:keyHintIcon="@drawable/key_hint_num7" latin:popupCharacters="@string/alternates_for_u" /> <Key latin:keyLabel="i" - latin:keyHintIcon="@drawable/keyboard_hint_8" + latin:keyHintIcon="@drawable/key_hint_num8" latin:popupCharacters="@string/alternates_for_i" /> <Key latin:keyLabel="o" - latin:keyHintIcon="@drawable/keyboard_hint_9" + latin:keyHintIcon="@drawable/key_hint_num9" latin:popupCharacters="@string/alternates_for_o" /> <Key latin:keyLabel="p" - latin:keyHintIcon="@drawable/keyboard_hint_0" + latin:keyHintIcon="@drawable/key_hint_num0" latin:popupCharacters="@string/alternates_for_p" latin:keyEdgeFlags="right" /> </Row> diff --git a/java/res/xml/kbd_ru_rows.xml b/java/res/xml/kbd_ru_rows.xml index fa2af3be0..b99259938 100644 --- a/java/res/xml/kbd_ru_rows.xml +++ b/java/res/xml/kbd_ru_rows.xml @@ -29,45 +29,45 @@ > <Key latin:keyLabel="й" - latin:keyHintIcon="@drawable/keyboard_hint_1" + latin:keyHintIcon="@drawable/key_hint_num1" latin:popupCharacters="1" latin:keyWidth="8.75%p" latin:keyEdgeFlags="left" /> <Key latin:keyLabel="ц" - latin:keyHintIcon="@drawable/keyboard_hint_2" + latin:keyHintIcon="@drawable/key_hint_num2" latin:popupCharacters="2" /> <Key latin:keyLabel="у" - latin:keyHintIcon="@drawable/keyboard_hint_3" + latin:keyHintIcon="@drawable/key_hint_num3" latin:popupCharacters="3" /> <Key latin:keyLabel="к" - latin:keyHintIcon="@drawable/keyboard_hint_4" + latin:keyHintIcon="@drawable/key_hint_num4" latin:popupCharacters="4" /> <Key latin:keyLabel="е" - latin:keyHintIcon="@drawable/keyboard_hint_5" + latin:keyHintIcon="@drawable/key_hint_num5" latin:popupCharacters="@string/alternates_for_cyrillic_e" /> <Key latin:keyLabel="н" - latin:keyHintIcon="@drawable/keyboard_hint_6" + latin:keyHintIcon="@drawable/key_hint_num6" latin:popupCharacters="6" /> <Key latin:keyLabel="г" - latin:keyHintIcon="@drawable/keyboard_hint_7" + latin:keyHintIcon="@drawable/key_hint_num7" latin:popupCharacters="7" /> <Key latin:keyLabel="ш" - latin:keyHintIcon="@drawable/keyboard_hint_8" + latin:keyHintIcon="@drawable/key_hint_num8" latin:popupCharacters="8" /> <Key latin:keyLabel="щ" - latin:keyHintIcon="@drawable/keyboard_hint_9" + latin:keyHintIcon="@drawable/key_hint_num9" latin:popupCharacters="9" /> <Key latin:keyLabel="з" - latin:keyHintIcon="@drawable/keyboard_hint_0" + latin:keyHintIcon="@drawable/key_hint_num0" latin:popupCharacters="0" /> <Key latin:keyLabel="х" diff --git a/java/res/xml/kbd_sr_rows.xml b/java/res/xml/kbd_sr_rows.xml index 8d6b070b2..0aa17d5e4 100644 --- a/java/res/xml/kbd_sr_rows.xml +++ b/java/res/xml/kbd_sr_rows.xml @@ -29,44 +29,44 @@ > <Key latin:keyLabel="љ" - latin:keyHintIcon="@drawable/keyboard_hint_1" + latin:keyHintIcon="@drawable/key_hint_num1" latin:popupCharacters="1" latin:keyEdgeFlags="left" /> <Key latin:keyLabel="њ" - latin:keyHintIcon="@drawable/keyboard_hint_2" + latin:keyHintIcon="@drawable/key_hint_num2" latin:popupCharacters="2" /> <Key latin:keyLabel="е" - latin:keyHintIcon="@drawable/keyboard_hint_3" + latin:keyHintIcon="@drawable/key_hint_num3" latin:popupCharacters="3" /> <Key latin:keyLabel="р" - latin:keyHintIcon="@drawable/keyboard_hint_4" + latin:keyHintIcon="@drawable/key_hint_num4" latin:popupCharacters="4" /> <Key latin:keyLabel="т" - latin:keyHintIcon="@drawable/keyboard_hint_5" + latin:keyHintIcon="@drawable/key_hint_num5" latin:popupCharacters="5" /> <Key latin:keyLabel="з" - latin:keyHintIcon="@drawable/keyboard_hint_6" + latin:keyHintIcon="@drawable/key_hint_num6" latin:popupCharacters="6" /> <Key latin:keyLabel="у" - latin:keyHintIcon="@drawable/keyboard_hint_7" + latin:keyHintIcon="@drawable/key_hint_num7" latin:popupCharacters="7" /> <Key latin:keyLabel="и" - latin:keyHintIcon="@drawable/keyboard_hint_8" + latin:keyHintIcon="@drawable/key_hint_num8" latin:popupCharacters="8" /> <Key latin:keyLabel="о" - latin:keyHintIcon="@drawable/keyboard_hint_9" + latin:keyHintIcon="@drawable/key_hint_num9" latin:popupCharacters="9" /> <Key latin:keyLabel="п" - latin:keyHintIcon="@drawable/keyboard_hint_0" + latin:keyHintIcon="@drawable/key_hint_num0" latin:popupCharacters="0" /> <Key latin:keyLabel="ш" diff --git a/java/src/com/android/inputmethod/compat/InputTypeCompatUtils.java b/java/src/com/android/inputmethod/compat/InputTypeCompatUtils.java index d85174188..6684f6a8f 100644 --- a/java/src/com/android/inputmethod/compat/InputTypeCompatUtils.java +++ b/java/src/com/android/inputmethod/compat/InputTypeCompatUtils.java @@ -37,6 +37,7 @@ public class InputTypeCompatUtils { (Integer) CompatUtils.getFieldValue(null, null, FIELD_InputType_TYPE_NUMBER_VARIATION_PASSWORD); private static final int WEB_TEXT_PASSWORD_INPUT_TYPE; + private static final int WEB_TEXT_EMAIL_ADDRESS_INPUT_TYPE; private static final int NUMBER_PASSWORD_INPUT_TYPE; private static final int TEXT_PASSWORD_INPUT_TYPE = InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD; @@ -45,9 +46,14 @@ public class InputTypeCompatUtils { static { WEB_TEXT_PASSWORD_INPUT_TYPE = - OBJ_InputType_TYPE_TEXT_VARIATION_WEB_PASSWORD != null - ? InputType.TYPE_CLASS_TEXT | OBJ_InputType_TYPE_TEXT_VARIATION_WEB_PASSWORD - : 0; + OBJ_InputType_TYPE_TEXT_VARIATION_WEB_PASSWORD != null + ? InputType.TYPE_CLASS_TEXT | OBJ_InputType_TYPE_TEXT_VARIATION_WEB_PASSWORD + : 0; + WEB_TEXT_EMAIL_ADDRESS_INPUT_TYPE = + OBJ_InputType_TYPE_TEXT_VARIATION_WEB_EMAIL_ADDRESS != null + ? InputType.TYPE_CLASS_TEXT + | OBJ_InputType_TYPE_TEXT_VARIATION_WEB_EMAIL_ADDRESS + : 0; NUMBER_PASSWORD_INPUT_TYPE = OBJ_InputType_TYPE_NUMBER_VARIATION_PASSWORD != null ? InputType.TYPE_CLASS_NUMBER | OBJ_InputType_TYPE_NUMBER_VARIATION_PASSWORD @@ -59,6 +65,11 @@ public class InputTypeCompatUtils { && inputType == WEB_TEXT_PASSWORD_INPUT_TYPE; } + private static boolean isWebEmailAddressInputType(int inputType) { + return WEB_TEXT_EMAIL_ADDRESS_INPUT_TYPE != 0 + && inputType == WEB_TEXT_EMAIL_ADDRESS_INPUT_TYPE; + } + private static boolean isNumberPasswordInputType(int inputType) { return NUMBER_PASSWORD_INPUT_TYPE != 0 && inputType == NUMBER_PASSWORD_INPUT_TYPE; @@ -78,6 +89,14 @@ public class InputTypeCompatUtils { || isWebEmailAddressVariation(variation); } + public static boolean isWebInputType(int inputType) { + final int maskedInputType = + inputType & (InputType.TYPE_MASK_CLASS | InputType.TYPE_MASK_VARIATION); + return maskedInputType == InputType.TYPE_TEXT_VARIATION_WEB_EDIT_TEXT + || isWebPasswordInputType(maskedInputType) + || isWebEmailAddressInputType(maskedInputType); + } + // Please refer to TextView.isPasswordInputType public static boolean isPasswordInputType(int inputType) { final int maskedInputType = diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardId.java b/java/src/com/android/inputmethod/keyboard/KeyboardId.java index 2a5e17771..88d23985a 100644 --- a/java/src/com/android/inputmethod/keyboard/KeyboardId.java +++ b/java/src/com/android/inputmethod/keyboard/KeyboardId.java @@ -34,9 +34,8 @@ public class KeyboardId { public static final int MODE_URL = 1; public static final int MODE_EMAIL = 2; public static final int MODE_IM = 3; - public static final int MODE_WEB = 4; - public static final int MODE_PHONE = 5; - public static final int MODE_NUMBER = 6; + public static final int MODE_PHONE = 4; + public static final int MODE_NUMBER = 5; public final Locale mLocale; public final int mOrientation; @@ -44,6 +43,7 @@ public class KeyboardId { public final int mMode; public final int mXmlId; public final int mColorScheme; + public final boolean mWebInput; public final boolean mPasswordInput; public final boolean mHasSettingsKey; public final boolean mVoiceKeyEnabled; @@ -67,6 +67,7 @@ public class KeyboardId { this.mMode = mode; this.mXmlId = xmlId; this.mColorScheme = colorScheme; + this.mWebInput = InputTypeCompatUtils.isWebInputType(inputType); this.mPasswordInput = InputTypeCompatUtils.isPasswordInputType(inputType) || InputTypeCompatUtils.isVisiblePasswordInputType(inputType); this.mHasSettingsKey = hasSettingsKey; @@ -88,6 +89,7 @@ public class KeyboardId { mode, xmlId, colorScheme, + mWebInput, mPasswordInput, hasSettingsKey, voiceKeyEnabled, @@ -141,6 +143,7 @@ public class KeyboardId { && other.mMode == this.mMode && other.mXmlId == this.mXmlId && other.mColorScheme == this.mColorScheme + && other.mWebInput == this.mWebInput && other.mPasswordInput == this.mPasswordInput && other.mHasSettingsKey == this.mHasSettingsKey && other.mVoiceKeyEnabled == this.mVoiceKeyEnabled @@ -156,18 +159,19 @@ public class KeyboardId { @Override public String toString() { - return String.format("[%s.xml %s %s%d %s %s %s%s%s%s%s%s]", + return String.format("[%s.xml %s %s%d %s %s %s %s%s%s%s%s%s]", mXmlName, mLocale, (mOrientation == 1 ? "port" : "land"), mWidth, modeName(mMode), EditorInfoCompatUtils.imeOptionsName(mImeAction), + colorSchemeName(mColorScheme), + (mWebInput ? " webInput" : ""), (mPasswordInput ? " passwordInput" : ""), (mHasSettingsKey ? " hasSettingsKey" : ""), (mVoiceKeyEnabled ? " voiceKeyEnabled" : ""), (mHasVoiceKey ? " hasVoiceKey" : ""), - (mEnableShiftLock ? " enableShiftLock" : ""), - colorSchemeName(mColorScheme) + (mEnableShiftLock ? " enableShiftLock" : "") ); } @@ -177,7 +181,6 @@ public class KeyboardId { case MODE_URL: return "url"; case MODE_EMAIL: return "email"; case MODE_IM: return "im"; - case MODE_WEB: return "web"; case MODE_PHONE: return "phone"; case MODE_NUMBER: return "number"; } diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardParser.java b/java/src/com/android/inputmethod/keyboard/KeyboardParser.java index 5980f0255..43d9f271f 100644 --- a/java/src/com/android/inputmethod/keyboard/KeyboardParser.java +++ b/java/src/com/android/inputmethod/keyboard/KeyboardParser.java @@ -456,6 +456,8 @@ public class KeyboardParser { try { final boolean modeMatched = matchInteger(a, R.styleable.Keyboard_Case_mode, id.mMode); + final boolean webInputMatched = matchBoolean(a, + R.styleable.Keyboard_Case_webInput, id.mWebInput); final boolean passwordInputMatched = matchBoolean(a, R.styleable.Keyboard_Case_passwordInput, id.mPasswordInput); final boolean settingsKeyMatched = matchBoolean(a, @@ -476,16 +478,18 @@ public class KeyboardParser { R.styleable.Keyboard_Case_languageCode, id.mLocale.getLanguage()); final boolean countryCodeMatched = matchString(a, R.styleable.Keyboard_Case_countryCode, id.mLocale.getCountry()); - final boolean selected = modeMatched && passwordInputMatched && settingsKeyMatched - && voiceEnabledMatched && voiceKeyMatched && colorSchemeMatched - && imeActionMatched && languageCodeMatched && countryCodeMatched; + final boolean selected = modeMatched && webInputMatched && passwordInputMatched + && settingsKeyMatched && voiceEnabledMatched && voiceKeyMatched + && colorSchemeMatched && imeActionMatched && languageCodeMatched + && countryCodeMatched; - if (DEBUG) Log.d(TAG, String.format("<%s%s%s%s%s%s%s%s%s%s> %s", TAG_CASE, + if (DEBUG) Log.d(TAG, String.format("<%s%s%s%s%s%s%s%s%s%s%s> %s", TAG_CASE, textAttr(KeyboardId.modeName( a.getInt(R.styleable.Keyboard_Case_mode, -1)), "mode"), textAttr(KeyboardId.colorSchemeName( viewAttr.getInt( R.styleable.KeyboardView_colorScheme, -1)), "colorSchemeName"), + booleanAttr(a, R.styleable.Keyboard_Case_webInput, "webInput"), booleanAttr(a, R.styleable.Keyboard_Case_passwordInput, "passwordInput"), booleanAttr(a, R.styleable.Keyboard_Case_hasSettingsKey, "hasSettingsKey"), booleanAttr(a, R.styleable.Keyboard_Case_voiceKeyEnabled, "voiceKeyEnabled"), diff --git a/java/src/com/android/inputmethod/latin/AutoDictionary.java b/java/src/com/android/inputmethod/latin/AutoDictionary.java index c2646160d..460930f16 100644 --- a/java/src/com/android/inputmethod/latin/AutoDictionary.java +++ b/java/src/com/android/inputmethod/latin/AutoDictionary.java @@ -41,13 +41,8 @@ public class AutoDictionary extends ExpandableDictionary { static final int FREQUENCY_FOR_PICKED = 3; // Weight added to a user typing a new word that doesn't get corrected (or is reverted) static final int FREQUENCY_FOR_TYPED = 1; - // A word that is frequently typed and gets promoted to the user dictionary, uses this - // frequency. - static final int FREQUENCY_FOR_AUTO_ADD = 250; // If the user touches a typed word 2 times or more, it will become valid. private static final int VALIDITY_THRESHOLD = 2 * FREQUENCY_FOR_PICKED; - // If the user touches a typed word 4 times or more, it will be added to the user dict. - private static final int PROMOTION_THRESHOLD = 4 * FREQUENCY_FOR_PICKED; private LatinIME mIme; // Locale for which this auto dictionary is storing words @@ -151,11 +146,6 @@ public class AutoDictionary extends ExpandableDictionary { freq = freq < 0 ? addFrequency : freq + addFrequency; super.addWord(word, freq); - if (freq >= PROMOTION_THRESHOLD) { - mIme.promoteToUserDictionary(word, FREQUENCY_FOR_AUTO_ADD); - freq = 0; - } - synchronized (mPendingWritesLock) { // Write a null frequency if it is to be deleted from the db mPendingWrites.put(word, freq == 0 ? null : new Integer(freq)); diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index d625951fc..d10ff112a 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -81,7 +81,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar private static final String TAG = LatinIME.class.getSimpleName(); private static final boolean PERF_DEBUG = false; private static final boolean TRACE = false; - private static boolean DEBUG = LatinImeLogger.sDBG; + private static boolean DEBUG; /** * The private IME option used to indicate that no microphone should be @@ -357,6 +357,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar mSubtypeSwitcher = SubtypeSwitcher.getInstance(); mKeyboardSwitcher = KeyboardSwitcher.getInstance(); mRecorrection = Recorrection.getInstance(); + DEBUG = LatinImeLogger.sDBG; loadSettings(); @@ -506,7 +507,8 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar LatinKeyboardView inputView = switcher.getKeyboardView(); if (DEBUG) { - Log.d(TAG, "onStartInputView: " + inputView); + Log.d(TAG, "onStartInputView: inputType=" + ((attribute == null) ? "none" + : String.format("0x%08x", attribute.inputType))); } // In landscape mode, this method gets called without the input view being created. if (inputView == null) { @@ -1635,8 +1637,6 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar /** * Commits the chosen word to the text field and saves it for later * retrieval. - * @param suggestion the suggestion picked by the user to be committed to - * the text field */ private void commitBestWord(CharSequence bestWord) { KeyboardSwitcher switcher = mKeyboardSwitcher; @@ -1924,11 +1924,6 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar } } - public void promoteToUserDictionary(String word, int frequency) { - if (mUserDictionary.isValidWord(word)) return; - mUserDictionary.addWord(word, frequency); - } - public WordComposer getCurrentWord() { return mWord; } diff --git a/java/src/com/android/inputmethod/latin/Utils.java b/java/src/com/android/inputmethod/latin/Utils.java index 5207f38ad..66a6d161b 100644 --- a/java/src/com/android/inputmethod/latin/Utils.java +++ b/java/src/com/android/inputmethod/latin/Utils.java @@ -538,8 +538,6 @@ public class Utils { return KeyboardId.MODE_IM; } else if (variation == InputType.TYPE_TEXT_VARIATION_FILTER) { return KeyboardId.MODE_TEXT; - } else if (variation == InputType.TYPE_TEXT_VARIATION_WEB_EDIT_TEXT) { - return KeyboardId.MODE_WEB; } else { return KeyboardId.MODE_TEXT; } diff --git a/java/src/com/android/inputmethod/latin/WhitelistDictionary.java b/java/src/com/android/inputmethod/latin/WhitelistDictionary.java index 2389d4e3c..4377373d2 100644 --- a/java/src/com/android/inputmethod/latin/WhitelistDictionary.java +++ b/java/src/com/android/inputmethod/latin/WhitelistDictionary.java @@ -39,6 +39,7 @@ public class WhitelistDictionary extends Dictionary { public static WhitelistDictionary init(Context context) { synchronized (sInstance) { if (context != null) { + // Wordlist is initialized by the proper language in Suggestion.java#init sInstance.initWordlist( context.getResources().getStringArray(R.array.wordlist_whitelist)); } else { |
