summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/DisplaySettings.java
diff options
context:
space:
mode:
authorJason Monk <jmonk@google.com>2015-05-21 16:46:24 -0400
committerJason Monk <jmonk@google.com>2015-05-21 16:46:24 -0400
commitdf283601c571e74015c9c79c7d2d5865d1a8c9ee (patch)
treeb5df1df3d8646b7384819d4cb2b0601aba2bf861 /src/com/android/settings/DisplaySettings.java
parent462e70083fbdd12da55b6a6b98a59750d250f40d (diff)
downloadpackages_apps_Settings-df283601c571e74015c9c79c7d2d5865d1a8c9ee.zip
packages_apps_Settings-df283601c571e74015c9c79c7d2d5865d1a8c9ee.tar.gz
packages_apps_Settings-df283601c571e74015c9c79c7d2d5865d1a8c9ee.tar.bz2
Banish Theme setting to developer options
Bug: 21320576 Change-Id: I7e3fd7437409ac2dd061a36803e082eada5b30b1
Diffstat (limited to 'src/com/android/settings/DisplaySettings.java')
-rw-r--r--src/com/android/settings/DisplaySettings.java12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index d9b6447..e0a3489 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -185,11 +185,13 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
}
mNightModePreference = (ListPreference) findPreference(KEY_NIGHT_MODE);
- final UiModeManager uiManager = (UiModeManager) getSystemService(
- Context.UI_MODE_SERVICE);
- final int currentNightMode = uiManager.getNightMode();
- mNightModePreference.setValue(String.valueOf(currentNightMode));
- mNightModePreference.setOnPreferenceChangeListener(this);
+ if (mNightModePreference != null) {
+ final UiModeManager uiManager = (UiModeManager) getSystemService(
+ Context.UI_MODE_SERVICE);
+ final int currentNightMode = uiManager.getNightMode();
+ mNightModePreference.setValue(String.valueOf(currentNightMode));
+ mNightModePreference.setOnPreferenceChangeListener(this);
+ }
}
private static boolean allowAllRotations(Context context) {