Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2e8857a authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "Remove color and appearance" into nyc-dev

parents 20895756 52c66d74

packages/SystemUI/res/xml/tuner_prefs.xml

+2 −0
Original line number Diff line number Diff line
@@ -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

+2 −1
Original line number Diff line number Diff line
@@ -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);