diff options
| author | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-11-05 02:00:43 +0000 |
|---|---|---|
| committer | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-11-05 15:44:26 +0000 |
| commit | 90852d4675c9b7df6faf036efb7fe73b5f816293 (patch) | |
| tree | 18ea2755ab5ea68669a7951d5a07daadc4870b0a /src/com/android/settings/DevelopmentSettings.java | |
| parent | 3dbac3fff036f5a464f6322200c59f9934ebf610 (diff) | |
| parent | 310423e73156dab1c7c8f50dc67fdbc326cd37f7 (diff) | |
| download | packages_apps_Settings-90852d4675c9b7df6faf036efb7fe73b5f816293.zip packages_apps_Settings-90852d4675c9b7df6faf036efb7fe73b5f816293.tar.gz packages_apps_Settings-90852d4675c9b7df6faf036efb7fe73b5f816293.tar.bz2 | |
Merge tag 'android-6.0.0_r26' into HEAD
Android 6.0.0 release 26
Conflicts:
res/values-fr/strings.xml
res/values-it/strings.xml
res/values-ja/strings.xml
res/values-nl/strings.xml
res/values-pl/strings.xml
res/values-ro/strings.xml
res/values-ru/strings.xml
res/values-zh-rCN/strings.xml
res/values/bools.xml
res/values/strings.xml
res/xml/development_prefs.xml
src/com/android/settings/DevelopmentSettings.java
src/com/android/settings/DeviceInfoSettings.java
src/com/android/settings/DisplaySettings.java
Change-Id: I9fd9e793cf6097d950f8a1e30771c8bdf5067906
Diffstat (limited to 'src/com/android/settings/DevelopmentSettings.java')
| -rw-r--r-- | src/com/android/settings/DevelopmentSettings.java | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java index 916788d..d27d89b 100644 --- a/src/com/android/settings/DevelopmentSettings.java +++ b/src/com/android/settings/DevelopmentSettings.java @@ -162,6 +162,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment private static final String USB_CONFIGURATION_KEY = "select_usb_configuration"; private static final String WIFI_LEGACY_DHCP_CLIENT_KEY = "legacy_dhcp_client"; private static final String MOBILE_DATA_ALWAYS_ON = "mobile_data_always_on"; + private static final String KEY_COLOR_MODE = "color_mode"; private static final String INACTIVE_APPS_KEY = "inactive_apps"; @@ -269,6 +270,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment private ListPreference mRootAccess; private Object mSelectedRootValue; private PreferenceScreen mDevelopmentTools; + private ColorModePreference mColorModePreference; private final ArrayList<Preference> mAllPrefs = new ArrayList<Preference>(); @@ -439,6 +441,13 @@ public class DevelopmentSettings extends SettingsPreferenceFragment mDevelopmentTools = (PreferenceScreen) findPreference(DEVELOPMENT_TOOLS); mAllPrefs.add(mDevelopmentTools); + + mColorModePreference = (ColorModePreference) findPreference(KEY_COLOR_MODE); + mColorModePreference.updateCurrentAndSupported(); + if (mColorModePreference.getTransformsCount() < 2) { + removePreference(KEY_COLOR_MODE); + mColorModePreference = null; + } } private ListPreference addListPreference(String prefKey) { @@ -556,6 +565,19 @@ public class DevelopmentSettings extends SettingsPreferenceFragment setPrefsEnabledState(mLastEnabledState); } mSwitchBar.show(); + + if (mColorModePreference != null) { + mColorModePreference.startListening(); + mColorModePreference.updateCurrentAndSupported(); + } + } + + @Override + public void onPause() { + super.onPause(); + if (mColorModePreference != null) { + mColorModePreference.stopListening(); + } } @Override |