aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2011-01-18 08:49:42 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-01-18 08:49:42 -0800
commitec23ffdac82082b5453f771b0f51e55246fc9872 (patch)
treef0f7ad489f108ab63fc9b1aa1c07df0dc71b10a6 /java/src
parent5327e9a32cc6774189f87d0a9a3e2bb8889dc0f2 (diff)
parent626f897977f09b7fa458a63d907df20fa4c43043 (diff)
downloadlatinime-ec23ffdac82082b5453f771b0f51e55246fc9872.tar.gz
latinime-ec23ffdac82082b5453f771b0f51e55246fc9872.tar.xz
latinime-ec23ffdac82082b5453f771b0f51e55246fc9872.zip
am 626f8979: am 6c381b38: Remove the keyboard popup option by default.
* commit '626f897977f09b7fa458a63d907df20fa4c43043': Remove the keyboard popup option by default.
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/inputmethod/latin/Settings.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/java/src/com/android/inputmethod/latin/Settings.java b/java/src/com/android/inputmethod/latin/Settings.java
index 064a80fe1..5db63b719 100644
--- a/java/src/com/android/inputmethod/latin/Settings.java
+++ b/java/src/com/android/inputmethod/latin/Settings.java
@@ -134,6 +134,12 @@ public class Settings extends PreferenceActivity
if (!showSubtypeSettings) {
getPreferenceScreen().removePreference(findPreference(PREF_SUBTYPES));
}
+
+ final boolean showPopupOption = getResources().getBoolean(
+ R.bool.config_enable_show_popup_on_keypress_option);
+ if (!showPopupOption) {
+ getPreferenceScreen().removePreference(findPreference(PREF_POPUP_ON));
+ }
}
@Override