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

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

Merge "Fix colors and themes in QS" into sc-dev am: b4f9164e 

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

Change-Id: I9a59872431ea59efc57122fa8c94e62457811078
parents 78f59939 b4f9164e

packages/SystemUI/AndroidManifest.xml

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

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

            android:label="@string/quick_settings_brightness_dialog_title"

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

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

            android:finishOnCloseSystemDialogs="true"

            android:launchMode="singleInstance"

            android:excludeFromRecents="true"

packages/SystemUI/res/drawable/brightness_mirror_background.xml

+1 −1
Original line number Diff line number Diff line
@@ -15,6 +15,6 @@ 
  ~ limitations under the License

  -->

<shape xmlns:android="http://schemas.android.com/apk/res/android">

    <solid android:color="?android:attr/colorBackgroundFloating" />

    <solid android:color="?attr/underSurfaceColor" />

    <corners android:radius="8dp" />

</shape>

packages/SystemUI/res/drawable/brightness_progress_drawable.xml

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
            <shape>

                <size android:height="@dimen/rounded_slider_track_width" />

                <corners android:radius="@dimen/rounded_slider_track_corner_radius" />

                <solid android:color="?android:attr/textColorPrimary" />

                <solid android:color="?attr/offStateColor" />

            </shape>

        </inset>

    </item>

packages/SystemUI/res/drawable/brightness_progress_full_drawable.xml

+2 −1
Original line number Diff line number Diff line
@@ -16,12 +16,13 @@ 
  -->



<layer-list xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:priv-android="http://schemas.android.com/apk/prv/res/android"

    android:autoMirrored="true">

    <item android:id="@+id/slider_foreground"

        android:height="@dimen/rounded_slider_height">

        <shape>

            <size android:height="@dimen/rounded_slider_height" />

            <solid android:color="?android:attr/colorControlActivated" />

            <solid android:color="?priv-android:attr/colorAccentPrimary" />

            <corners android:radius="@dimen/rounded_slider_corner_radius"/>

        </shape>

    </item>

packages/SystemUI/res/drawable/qs_background_primary.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
  -->

<inset xmlns:android="http://schemas.android.com/apk/res/android">

    <shape>

        <solid android:color="?android:attr/colorBackground"/>

        <solid android:color="?attr/underSurfaceColor"/>

        <corners android:radius="@dimen/notification_corner_radius" />

    </shape>

</inset>
 
 No newline at end of file