am c8f08b83: am e55785e6: New flag for the internal settings

* commit 'c8f08b83cf0b25c49da5dfce7f65ce175f78cce6':
  New flag for the internal settings
main
Satoshi Kataoka 2012-09-18 10:12:25 -07:00 committed by Android Git Automerger
commit 88dfd6bf9f
2 changed files with 3 additions and 2 deletions

View File

@ -44,7 +44,7 @@ import com.android.inputmethodcommon.InputMethodSettingsFragment;
public class Settings extends InputMethodSettingsFragment public class Settings extends InputMethodSettingsFragment
implements SharedPreferences.OnSharedPreferenceChangeListener { implements SharedPreferences.OnSharedPreferenceChangeListener {
public static final boolean ENABLE_EXPERIMENTAL_SETTINGS = false; public static final boolean ENABLE_INTERNAL_SETTINGS = ProductionFlag.IS_INTERNAL;
// In the same order as xml/prefs.xml // In the same order as xml/prefs.xml
public static final String PREF_GENERAL_SETTINGS = "general_settings"; public static final String PREF_GENERAL_SETTINGS = "general_settings";
@ -220,7 +220,7 @@ public class Settings extends InputMethodSettingsFragment
final boolean showUsabilityStudyModeOption = final boolean showUsabilityStudyModeOption =
res.getBoolean(R.bool.config_enable_usability_study_mode_option) res.getBoolean(R.bool.config_enable_usability_study_mode_option)
|| ProductionFlag.IS_EXPERIMENTAL || ENABLE_EXPERIMENTAL_SETTINGS; || ProductionFlag.IS_EXPERIMENTAL || ENABLE_INTERNAL_SETTINGS;
final Preference usabilityStudyPref = findPreference(PREF_USABILITY_STUDY_MODE); final Preference usabilityStudyPref = findPreference(PREF_USABILITY_STUDY_MODE);
if (!showUsabilityStudyModeOption) { if (!showUsabilityStudyModeOption) {
if (usabilityStudyPref != null) { if (usabilityStudyPref != null) {

View File

@ -22,4 +22,5 @@ public final class ProductionFlag {
} }
public static final boolean IS_EXPERIMENTAL = false; public static final boolean IS_EXPERIMENTAL = false;
public static final boolean IS_INTERNAL = false;
} }