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

Commit 27fd83c4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Make settings brightness mirror dark"

parents 728f4093 ee7bdf69

core/res/res/values-night/values.xml

+2 −0
Original line number Original line Diff line number Diff line
@@ -32,6 +32,8 @@ 
        <item name="panelColorBackground">@color/material_grey_800</item>

        <item name="panelColorBackground">@color/material_grey_800</item>

    </style>

    </style>





    <style name="Theme.DeviceDefault.QuickSettings.Dialog" parent="Theme.DeviceDefault.Dialog" />



    <style name="TextAppearance.Material.Notification">

    <style name="TextAppearance.Material.Notification">

        <item name="textColor">@color/notification_secondary_text_color_dark</item>

        <item name="textColor">@color/notification_secondary_text_color_dark</item>

        <item name="textSize">@dimen/notification_text_size</item>

        <item name="textSize">@dimen/notification_text_size</item>

packages/SystemUI/res/values/styles.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -279,7 +279,7 @@ 
        <item name="android:fontFamily">sans-serif</item>

        <item name="android:fontFamily">sans-serif</item>

    </style>

    </style>





    <style name="BaseBrightnessDialogContainer">

    <style name="BaseBrightnessDialogContainer" parent="@style/Theme.SystemUI">

        <item name="android:layout_width">match_parent</item>

        <item name="android:layout_width">match_parent</item>

        <item name="android:layout_height">wrap_content</item>

        <item name="android:layout_height">wrap_content</item>

    </style>

    </style>

packages/SystemUI/src/com/android/systemui/settings/BrightnessDialog.java

+1 −5
Original line number Original line Diff line number Diff line
@@ -46,11 +46,7 @@ public class BrightnessDialog extends Activity { 
        window.clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);

        window.clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);

        window.requestFeature(Window.FEATURE_NO_TITLE);

        window.requestFeature(Window.FEATURE_NO_TITLE);





        // Use a dialog theme as the activity theme, but inflate the content as

        View v = LayoutInflater.from(this).inflate(

        // the QS content.

        ContextThemeWrapper themedContext = new ContextThemeWrapper(this,

                com.android.internal.R.style.Theme_DeviceDefault_QuickSettings);

        View v = LayoutInflater.from(themedContext).inflate(

                R.layout.quick_settings_brightness_dialog, null);

                R.layout.quick_settings_brightness_dialog, null);

        setContentView(v);

        setContentView(v);