diff options
| author | 2016-04-13 15:43:13 +0000 | |
|---|---|---|
| committer | 2016-04-13 15:43:15 +0000 | |
| commit | c2e8857a284433ea83006349bcba204bdd1897cc (patch) | |
| tree | 8b838868da53e2a2840fdb55c5974a2292f5d138 | |
| parent | 2089575686331550138af542dff331e56283cb64 (diff) | |
| parent | 52c66d74d13f26e2aea578f6f4308250cb958f67 (diff) | |
Merge "Remove color and appearance" into nyc-dev
| -rw-r--r-- | packages/SystemUI/res/xml/tuner_prefs.xml | 2 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/tuner/TunerActivity.java | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/packages/SystemUI/res/xml/tuner_prefs.xml b/packages/SystemUI/res/xml/tuner_prefs.xml index a130cf9009a9..1af9075a4e16 100644 --- a/packages/SystemUI/res/xml/tuner_prefs.xml +++ b/packages/SystemUI/res/xml/tuner_prefs.xml @@ -100,10 +100,12 @@ </PreferenceScreen> + <!-- <Preference android:key="color_transform" android:title="@string/color_and_appearance" android:fragment="com.android.systemui.tuner.ColorAndAppearanceFragment" /> + --> <PreferenceScreen android:key="volume_and_do_not_disturb" diff --git a/packages/SystemUI/src/com/android/systemui/tuner/TunerActivity.java b/packages/SystemUI/src/com/android/systemui/tuner/TunerActivity.java index ae104cd968ad..5e5da7423cb6 100644 --- a/packages/SystemUI/src/com/android/systemui/tuner/TunerActivity.java +++ b/packages/SystemUI/src/com/android/systemui/tuner/TunerActivity.java @@ -36,7 +36,8 @@ public class TunerActivity extends SettingsDrawerActivity implements super.onCreate(savedInstanceState); if (getFragmentManager().findFragmentByTag(TAG_TUNER) == null) { - boolean showDemoMode = getIntent().getAction().equals( + final String action = getIntent().getAction(); + boolean showDemoMode = action != null && action.equals( "com.android.settings.action.DEMO_MODE"); boolean showNightMode = getIntent().getBooleanExtra( NightModeFragment.EXTRA_SHOW_NIGHT_MODE, false); |