diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/res/drawable-hdpi/key_hint_colon_holo.9.png | bin | 355 -> 511 bytes | |||
| -rw-r--r-- | java/res/drawable-hdpi/key_hint_colon_large_holo.9.png | bin | 568 -> 498 bytes | |||
| -rw-r--r-- | java/res/drawable-land-hdpi/key_hint_colon_holo.9.png | bin | 385 -> 511 bytes | |||
| -rw-r--r-- | java/res/drawable-land-hdpi/key_hint_colon_large_holo.9.png | bin | 756 -> 498 bytes | |||
| -rw-r--r-- | java/res/drawable-land-mdpi/key_hint_colon_holo.9.png | bin | 1262 -> 1279 bytes | |||
| -rw-r--r-- | java/res/drawable-land-mdpi/key_hint_colon_large_holo.9.png | bin | 1836 -> 1318 bytes | |||
| -rw-r--r-- | java/res/drawable-mdpi/key_hint_colon_holo.9.png | bin | 1219 -> 1279 bytes | |||
| -rw-r--r-- | java/res/drawable-mdpi/key_hint_colon_large_holo.9.png | bin | 360 -> 1318 bytes | |||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/LatinIME.java | 12 |
9 files changed, 10 insertions, 2 deletions
diff --git a/java/res/drawable-hdpi/key_hint_colon_holo.9.png b/java/res/drawable-hdpi/key_hint_colon_holo.9.png Binary files differindex 6a724af1a..e82e41c94 100644 --- a/java/res/drawable-hdpi/key_hint_colon_holo.9.png +++ b/java/res/drawable-hdpi/key_hint_colon_holo.9.png diff --git a/java/res/drawable-hdpi/key_hint_colon_large_holo.9.png b/java/res/drawable-hdpi/key_hint_colon_large_holo.9.png Binary files differindex c0c699157..e46845dbd 100644 --- a/java/res/drawable-hdpi/key_hint_colon_large_holo.9.png +++ b/java/res/drawable-hdpi/key_hint_colon_large_holo.9.png diff --git a/java/res/drawable-land-hdpi/key_hint_colon_holo.9.png b/java/res/drawable-land-hdpi/key_hint_colon_holo.9.png Binary files differindex ddee76ad2..e82e41c94 100644 --- a/java/res/drawable-land-hdpi/key_hint_colon_holo.9.png +++ b/java/res/drawable-land-hdpi/key_hint_colon_holo.9.png diff --git a/java/res/drawable-land-hdpi/key_hint_colon_large_holo.9.png b/java/res/drawable-land-hdpi/key_hint_colon_large_holo.9.png Binary files differindex cb7e62ece..e46845dbd 100644 --- a/java/res/drawable-land-hdpi/key_hint_colon_large_holo.9.png +++ b/java/res/drawable-land-hdpi/key_hint_colon_large_holo.9.png diff --git a/java/res/drawable-land-mdpi/key_hint_colon_holo.9.png b/java/res/drawable-land-mdpi/key_hint_colon_holo.9.png Binary files differindex 6470ed391..12ce26758 100644 --- a/java/res/drawable-land-mdpi/key_hint_colon_holo.9.png +++ b/java/res/drawable-land-mdpi/key_hint_colon_holo.9.png diff --git a/java/res/drawable-land-mdpi/key_hint_colon_large_holo.9.png b/java/res/drawable-land-mdpi/key_hint_colon_large_holo.9.png Binary files differindex bdf4ed574..a51bada57 100644 --- a/java/res/drawable-land-mdpi/key_hint_colon_large_holo.9.png +++ b/java/res/drawable-land-mdpi/key_hint_colon_large_holo.9.png diff --git a/java/res/drawable-mdpi/key_hint_colon_holo.9.png b/java/res/drawable-mdpi/key_hint_colon_holo.9.png Binary files differindex 14c46990d..12ce26758 100644 --- a/java/res/drawable-mdpi/key_hint_colon_holo.9.png +++ b/java/res/drawable-mdpi/key_hint_colon_holo.9.png diff --git a/java/res/drawable-mdpi/key_hint_colon_large_holo.9.png b/java/res/drawable-mdpi/key_hint_colon_large_holo.9.png Binary files differindex 91e788323..a51bada57 100644 --- a/java/res/drawable-mdpi/key_hint_colon_large_holo.9.png +++ b/java/res/drawable-mdpi/key_hint_colon_large_holo.9.png diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index 8166e0b4e..5ce1b7e95 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -2122,8 +2122,8 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen mVibrateOn = vibrator != null && vibrator.hasVibrator() && prefs.getBoolean(Settings.PREF_VIBRATE_ON, false); mSoundOn = prefs.getBoolean(Settings.PREF_SOUND_ON, false); - mPopupOn = prefs.getBoolean(Settings.PREF_POPUP_ON, - mResources.getBoolean(R.bool.config_default_popup_preview)); + + mPopupOn = isPopupEnabled(prefs); mAutoCap = prefs.getBoolean(Settings.PREF_AUTO_CAP, true); mQuickFixes = isQuickFixesEnabled(prefs); @@ -2174,6 +2174,14 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen mSuggest.setAutoCorrectionThreshold(autoCorrectionThreshold); } + private boolean isPopupEnabled(SharedPreferences sp) { + final boolean showPopupOption = getResources().getBoolean( + R.bool.config_enable_show_popup_on_keypress_option); + if (!showPopupOption) return mResources.getBoolean(R.bool.config_default_popup_preview); + return sp.getBoolean(Settings.PREF_POPUP_ON, + mResources.getBoolean(R.bool.config_default_popup_preview)); + } + private boolean isQuickFixesEnabled(SharedPreferences sp) { final boolean showQuickFixesOption = mResources.getBoolean( R.bool.config_enable_quick_fixes_option); |
