From 6c381b38cc19cc8174a7620e5726314a79ed7e43 Mon Sep 17 00:00:00 2001 From: Jean Chalard Date: Tue, 18 Jan 2011 15:20:35 +0900 Subject: [PATCH] Remove the keyboard popup option by default. Add an option to mask the sound on keypress preference, and make it false on xlarge terminals by default. bug: 3282448 Change-Id: I747272d9edf854dc229aa620836cfa35a437d13f --- java/res/values-xlarge/config.xml | 1 + java/res/values/config.xml | 1 + java/src/com/android/inputmethod/latin/Settings.java | 6 ++++++ 3 files changed, 8 insertions(+) diff --git a/java/res/values-xlarge/config.xml b/java/res/values-xlarge/config.xml index 410b5e19e..912971793 100644 --- a/java/res/values-xlarge/config.xml +++ b/java/res/values-xlarge/config.xml @@ -22,6 +22,7 @@ false false false + false false false false diff --git a/java/res/values/config.xml b/java/res/values/config.xml index 11b92e7c3..e5821075e 100644 --- a/java/res/values/config.xml +++ b/java/res/values/config.xml @@ -25,6 +25,7 @@ true true true + true true true true 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