diff options
| author |   satok <satok@google.com> | 2011-09-14 02:57:58 -0700 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2011-09-14 02:57:58 -0700 |
| commit | fa52a09f2160d5db52c3b705203de4395a0c3d7d (patch) | |
| tree | a3d77eef15ac2464df7cda04024c7f464b349aaf /java/src | |
| parent | d2738757d2f4cc6286db19aebe28c4cdd37626e0 (diff) | |
| parent | c9c54a84bcd9fc4a7e7a04ba4a800c65b673378e (diff) | |
| download | latinime-fa52a09f2160d5db52c3b705203de4395a0c3d7d.tar.gz latinime-fa52a09f2160d5db52c3b705203de4395a0c3d7d.tar.xz latinime-fa52a09f2160d5db52c3b705203de4395a0c3d7d.zip | |
Merge "Remove experimental settings"
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/Settings.java | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/java/src/com/android/inputmethod/latin/Settings.java b/java/src/com/android/inputmethod/latin/Settings.java index e0eae180d..c97f56712 100644 --- a/java/src/com/android/inputmethod/latin/Settings.java +++ b/java/src/com/android/inputmethod/latin/Settings.java @@ -55,6 +55,8 @@ public class Settings extends InputMethodSettingsActivity DialogInterface.OnDismissListener, OnPreferenceClickListener { private static final String TAG = Settings.class.getSimpleName(); + public static final boolean ENABLE_EXPERIMENTAL_SETTINGS = false; + public static final String PREF_GENERAL_SETTINGS_KEY = "general_settings"; public static final String PREF_VIBRATE_ON = "vibrate_on"; public static final String PREF_SOUND_ON = "sound_on"; @@ -397,6 +399,8 @@ public class Settings extends InputMethodSettingsActivity (PreferenceGroup) findPreference(PREF_GENERAL_SETTINGS_KEY); final PreferenceGroup textCorrectionGroup = (PreferenceGroup) findPreference(PREF_CORRECTION_SETTINGS_KEY); + final PreferenceGroup miscSettings = + (PreferenceGroup) findPreference(PREF_MISC_SETTINGS_KEY); if (!Values.isShowSettingsKeyOption(res)) { generalSettings.removePreference(mShowSettingsKeyPreference); @@ -437,12 +441,6 @@ public class Settings extends InputMethodSettingsActivity } } - final boolean showUsabilityModeStudyOption = res.getBoolean( - R.bool.config_enable_usability_study_mode_option); - if (!showUsabilityModeStudyOption) { - getPreferenceScreen().removePreference(findPreference(PREF_USABILITY_STUDY_MODE)); - } - mKeyPreviewPopupDismissDelay = (ListPreference)findPreference(PREF_KEY_PREVIEW_POPUP_DISMISS_DELAY); final String[] entries = new String[] { @@ -467,6 +465,15 @@ public class Settings extends InputMethodSettingsActivity if (0 >= number) { textCorrectionGroup.removePreference(dictionaryLink); } + + final boolean showUsabilityModeStudyOption = res.getBoolean( + R.bool.config_enable_usability_study_mode_option); + if (!showUsabilityModeStudyOption || !ENABLE_EXPERIMENTAL_SETTINGS) { + final Preference pref = findPreference(PREF_USABILITY_STUDY_MODE); + if (pref != null) { + miscSettings.removePreference(pref); + } + } } @SuppressWarnings("unused") |