Merge "Remove color and appearance" into nyc-dev

am: c2e8857

* commit 'c2e8857a284433ea83006349bcba204bdd1897cc':
  Remove color and appearance

Change-Id: I7650274e1c3b4167a699e5697aeabeba1ccc898c

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"

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);