| commit | eaa091da78b5c815dcc7a0aeed8eb725f60d69e5 | [log] [tgz] |
|---|---|---|
| author | Ken Wakasa <kwakasa@google.com> | Mon Jan 31 08:24:53 2011 -0800 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Jan 31 08:24:53 2011 -0800 |
| tree | 751d0f670f783c77fc0de92fc70b9d4671b14ad3 | |
| parent | 7e85cebfcf9611b899968931e3c0bf67e9e34546 [diff] | |
| parent | 435bd31db334a1a7d0b7ad645fd58821992c7ec9 [diff] |
Merge "Fix subtype settings activity string"
diff --git a/java/res/drawable-hdpi/key_hint_colon_holo.9.png b/java/res/drawable-hdpi/key_hint_colon_holo.9.png index 6a724af..e82e41c 100644 --- a/java/res/drawable-hdpi/key_hint_colon_holo.9.png +++ b/java/res/drawable-hdpi/key_hint_colon_holo.9.png Binary files differ
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 index c0c6991..e46845d 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 Binary files differ
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 index ddee76a..e82e41c 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 Binary files differ
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 index cb7e62e..e46845d 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 Binary files differ
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 index 6470ed3..12ce267 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 Binary files differ
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 index bdf4ed5..a51bada 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 Binary files differ
diff --git a/java/res/drawable-mdpi/key_hint_colon_holo.9.png b/java/res/drawable-mdpi/key_hint_colon_holo.9.png index 14c4699..12ce267 100644 --- a/java/res/drawable-mdpi/key_hint_colon_holo.9.png +++ b/java/res/drawable-mdpi/key_hint_colon_holo.9.png Binary files differ
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 index 91e7883..a51bada 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 Binary files differ
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index 8166e0b..5ce1b7e 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -2122,8 +2122,8 @@ 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 @@ 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);
