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

Commit f8beac53 authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Automerger Merge Worker
Browse files

Merge "Fix theme of BrightnessDialog" into udc-qpr-dev am: 4867d4e1 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23892818



Change-Id: I48c105e9dd1bc1dada0d1f0f30582a7c97cd3a49
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ebc3a051 4867d4e1

packages/SystemUI/AndroidManifest.xml

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

            android:name=".settings.brightness.BrightnessDialog"

            android:label="@string/quick_settings_brightness_dialog_title"

            android:theme="@style/Theme.SystemUI.QuickSettings.BrightnessDialog"

            android:theme="@style/BrightnessDialog"

            android:finishOnCloseSystemDialogs="true"

            android:launchMode="singleInstance"

            android:excludeFromRecents="true"

packages/SystemUI/res/values/styles.xml

+2 −1
Original line number Diff line number Diff line
@@ -398,7 +398,8 @@ 
        <item name="android:itemTextAppearance">@style/Control.MenuItem</item>

    </style>



    <style name="Theme.SystemUI.QuickSettings.BrightnessDialog" parent="@android:style/Theme.DeviceDefault.Dialog">

    <!-- Cannot double inherit. Use Theme.SystemUI.QuickSettings in code to match -->

    <style name="BrightnessDialog" parent="@android:style/Theme.DeviceDefault.Dialog">

        <item name="android:windowBackground">@android:color/transparent</item>

    </style>

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

+1 −0
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ public class BrightnessDialog extends Activity { 
        window.getDecorView();

        window.setLayout(

                WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.WRAP_CONTENT);

        getTheme().applyStyle(R.style.Theme_SystemUI_QuickSettings, false);



        setContentView(R.layout.brightness_mirror_container);

        FrameLayout frame = findViewById(R.id.brightness_mirror_container);