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

Commit 0ed316b7 authored by Jason Monk's avatar Jason Monk Committed by android-build-merger
Browse files

Merge "Change brightness dialog theme" into oc-dev am: 3b5934b2 

am: c4d9ac6d

Change-Id: I648fc03f0fb1395f6ac0e8bd77b7389afa30891b
parents a614d3c8 c4d9ac6d

core/res/res/values/themes_device_defaults.xml

+8 −0
Original line number Diff line number Diff line
@@ -758,6 +758,14 @@ easier. 
        <item name="colorControlNormal">?attr/textColorPrimary</item>

    </style>



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

        <!-- Color palette -->

        <item name="colorPrimary">@color/primary_device_default_settings_light</item>

        <item name="colorPrimaryDark">@color/primary_dark_device_default_settings_light</item>

        <item name="colorSecondary">@color/secondary_device_default_settings_light</item>

        <item name="colorAccent">@color/accent_device_default_light</item>

    </style>



    <!-- Variant of {@link #Theme_DeviceDefault_Settings_Dark} with no action bar -->

    <style name="Theme.DeviceDefault.Settings.Dark.NoActionBar" parent="Theme.Material.NoActionBar">

        <!-- Color palette -->

packages/SystemUI/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -536,7 +536,7 @@ 
        <activity

            android:name=".settings.BrightnessDialog"

            android:label="@string/quick_settings_brightness_dialog_title"

            android:theme="@android:style/Theme.DeviceDefault.Light.Dialog"

            android:theme="@*android:style/Theme.DeviceDefault.QuickSettings.Dialog"

            android:finishOnCloseSystemDialogs="true"

            android:launchMode="singleInstance"

            android:excludeFromRecents="true"