diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/res/values-land/dimens.xml | 2 | ||||
| -rw-r--r-- | java/res/values-sw600dp/dimens.xml | 2 | ||||
| -rw-r--r-- | java/res/values-sw768dp/dimens.xml | 2 | ||||
| -rw-r--r-- | java/res/values/dimens.xml | 2 | ||||
| -rw-r--r-- | java/res/values/styles.xml | 1 | ||||
| -rw-r--r-- | java/res/xml-sw600dp/rows_symbols.xml | 8 | ||||
| -rw-r--r-- | java/res/xml-sw768dp/rows_symbols.xml | 8 | ||||
| -rw-r--r-- | java/res/xml/rows_symbols.xml | 4 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/Key.java | 4 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/LatinIME.java | 16 |
10 files changed, 42 insertions, 7 deletions
diff --git a/java/res/values-land/dimens.xml b/java/res/values-land/dimens.xml index b9be1aa20..73192d944 100644 --- a/java/res/values-land/dimens.xml +++ b/java/res/values-land/dimens.xml @@ -57,6 +57,8 @@ <dimen name="key_preview_offset">0.08in</dimen> <dimen name="key_preview_offset_ics">0.01in</dimen> + <!-- popup_key_height x -0.5 --> + <dimen name="more_keys_keyboard_vertical_correction_ics">-0.140in</dimen> <dimen name="suggestions_strip_height">36dip</dimen> <dimen name="more_suggestions_row_height">36dip</dimen> diff --git a/java/res/values-sw600dp/dimens.xml b/java/res/values-sw600dp/dimens.xml index 64948b368..a86102421 100644 --- a/java/res/values-sw600dp/dimens.xml +++ b/java/res/values-sw600dp/dimens.xml @@ -65,6 +65,8 @@ <dimen name="key_preview_height_ics">15.0mm</dimen> <dimen name="key_preview_offset_ics">0.05in</dimen> + <!-- popup_key_height x -0.5 --> + <dimen name="more_keys_keyboard_vertical_correction_ics">-5mm</dimen> <dimen name="suggestions_strip_height">44dip</dimen> <dimen name="more_suggestions_row_height">44dip</dimen> diff --git a/java/res/values-sw768dp/dimens.xml b/java/res/values-sw768dp/dimens.xml index c520095c7..a9ad030fe 100644 --- a/java/res/values-sw768dp/dimens.xml +++ b/java/res/values-sw768dp/dimens.xml @@ -68,6 +68,8 @@ <dimen name="key_preview_height_ics">15.0mm</dimen> <dimen name="key_preview_offset_ics">0.05in</dimen> + <!-- popup_key_height x -0.5 --> + <dimen name="more_keys_keyboard_vertical_correction_ics">-5mm</dimen> <dimen name="suggestions_strip_height">44dip</dimen> <dimen name="more_suggestions_row_height">44dip</dimen> diff --git a/java/res/values/dimens.xml b/java/res/values/dimens.xml index 87bab4429..37720ce72 100644 --- a/java/res/values/dimens.xml +++ b/java/res/values/dimens.xml @@ -77,6 +77,8 @@ <dimen name="key_preview_height_ics">80sp</dimen> <dimen name="key_preview_offset_ics">0.05in</dimen> + <!-- popup_key_height x -0.5 --> + <dimen name="more_keys_keyboard_vertical_correction_ics">-0.165in</dimen> <dimen name="suggestions_strip_height">40dip</dimen> <dimen name="more_suggestions_key_horizontal_padding">12dip</dimen> diff --git a/java/res/values/styles.xml b/java/res/values/styles.xml index b9e8b26a3..325ee9a79 100644 --- a/java/res/values/styles.xml +++ b/java/res/values/styles.xml @@ -335,6 +335,7 @@ > <item name="android:background">@null</item> <item name="keyBackground">@drawable/btn_keyboard_key_popup_ics</item> + <item name="verticalCorrection">@dimen/more_keys_keyboard_vertical_correction_ics</item> </style> <style name="MoreKeysKeyboardPanelStyle.IceCreamSandwich"> <item name="android:background">@drawable/keyboard_popup_panel_background_holo</item> diff --git a/java/res/xml-sw600dp/rows_symbols.xml b/java/res/xml-sw600dp/rows_symbols.xml index 96695e837..96503e886 100644 --- a/java/res/xml-sw600dp/rows_symbols.xml +++ b/java/res/xml-sw600dp/rows_symbols.xml @@ -89,9 +89,11 @@ <Key latin:keyLabel="*" latin:moreKeys="@string/more_keys_for_star" /> + <!-- U+2013: "–" EN DASH + U+2014: "—" EM DASH --> <Key latin:keyLabel="-" - latin:moreKeys="_,–,—" /> + latin:moreKeys="_,–,—" /> <Key latin:keyLabel="+" latin:moreKeys="@string/more_keys_for_plus" /> @@ -110,9 +112,11 @@ latin:keyWidth="10.0%p" /> <include latin:keyboardLayout="@xml/keys_less_greater" /> + <!-- U+2260: "≠" NOT EQUAL TO + U+2248: "≈" ALMOST EQUAL TO --> <Key latin:keyLabel="=" - latin:moreKeys="≠,≈" /> + latin:moreKeys="≠,≈" /> <switch> <case latin:mode="url" diff --git a/java/res/xml-sw768dp/rows_symbols.xml b/java/res/xml-sw768dp/rows_symbols.xml index 96a86ec7c..a19af2265 100644 --- a/java/res/xml-sw768dp/rows_symbols.xml +++ b/java/res/xml-sw768dp/rows_symbols.xml @@ -96,9 +96,11 @@ <Key latin:keyLabel="*" latin:moreKeys="@string/more_keys_for_star" /> + <!-- U+2013: "–" EN DASH + U+2014: "—" EM DASH --> <Key latin:keyLabel="-" - latin:moreKeys="_,–,—" /> + latin:moreKeys="_,–,—" /> <Key latin:keyLabel="+" latin:moreKeys="@string/more_keys_for_plus" /> @@ -117,9 +119,11 @@ latin:keyWidth="13.829%p" /> <include latin:keyboardLayout="@xml/keys_less_greater" /> + <!-- U+2260: "≠" NOT EQUAL TO + U+2248: "≈" ALMOST EQUAL TO --> <Key latin:keyLabel="=" - latin:moreKeys="≠,≈" /> + latin:moreKeys="≠,≈" /> <switch> <case latin:mode="url" diff --git a/java/res/xml/rows_symbols.xml b/java/res/xml/rows_symbols.xml index 21f7d1d27..6d0467c6f 100644 --- a/java/res/xml/rows_symbols.xml +++ b/java/res/xml/rows_symbols.xml @@ -87,9 +87,11 @@ <Key latin:keyLabel="*" latin:moreKeys="@string/more_keys_for_star" /> + <!-- U+2013: "–" EN DASH + U+2014: "—" EM DASH --> <Key latin:keyLabel="-" - latin:moreKeys="_,–,—" /> + latin:moreKeys="_,–,—" /> <Key latin:keyLabel="+" latin:moreKeys="@string/more_keys_for_plus" /> diff --git a/java/src/com/android/inputmethod/keyboard/Key.java b/java/src/com/android/inputmethod/keyboard/Key.java index 79c7ce0fd..f3923834b 100644 --- a/java/src/com/android/inputmethod/keyboard/Key.java +++ b/java/src/com/android/inputmethod/keyboard/Key.java @@ -108,8 +108,8 @@ public class Key { private static final int MORE_KEYS_COLUMN_MASK = 0x000000ff; private static final int MORE_KEYS_FLAGS_FIXED_COLUMN_ORDER = 0x80000000; private static final int MORE_KEYS_FLAGS_HAS_LABELS = 0x40000000; - private static final int MORE_KEYS_FLAGS_NEEDS_DIVIDERS = 0x40000000; - private static final int MORE_KEYS_FLAGS_EMBEDDED_MORE_KEY = 0x20000000; + private static final int MORE_KEYS_FLAGS_NEEDS_DIVIDERS = 0x20000000; + private static final int MORE_KEYS_FLAGS_EMBEDDED_MORE_KEY = 0x10000000; private static final String MORE_KEYS_AUTO_COLUMN_ORDER = "!autoColumnOrder!"; private static final String MORE_KEYS_FIXED_COLUMN_ORDER = "!fixedColumnOrder!"; private static final String MORE_KEYS_HAS_LABELS = "!hasLabels!"; diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index 04f1d8ade..1858db949 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -1946,6 +1946,14 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar mVoiceProxy.flushAndLogAllTextModificationCounters(index, suggestion, mSettingsValues.mWordSeparators); + if (SPACE_STATE_PHANTOM == mSpaceState && suggestion.length() > 0) { + int firstChar = Character.codePointAt(suggestion, 0); + if ((!mSettingsValues.isWeakSpaceStripper(firstChar)) + && (!mSettingsValues.isWeakSpaceSwapper(firstChar))) { + sendKeyCodePoint(Keyboard.CODE_SPACE); + } + } + if (mInputAttributes.mApplicationSpecifiedCompletionOn && mApplicationSpecifiedCompletions != null && index >= 0 && index < mApplicationSpecifiedCompletions.length) { @@ -2317,6 +2325,14 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar } initSuggest(); loadSettings(); + // Since we just changed languages, we should re-evaluate suggestions with whatever word + // we are currently composing. If we are not composing anything, we may want to display + // predictions or punctuation signs (which is done by updateBigramPredictions anyway). + if (isCursorTouchingWord()) { + mHandler.postUpdateSuggestions(); + } else { + mHandler.postUpdateBigramPredictions(); + } } public void hapticAndAudioFeedback(int primaryCode) { |