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

Commit 700a5bb9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Adoption of Dynamic Color tokens" into main

parents 574c44ef 67ef923f

core/res/res/values/themes_device_defaults.xml

+43 −43
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ easier. 
        <item name="progressBarStyleSmallInverse">@style/Widget.DeviceDefault.ProgressBar.Small.Inverse</item>

        <item name="progressBarStyleLargeInverse">@style/Widget.DeviceDefault.ProgressBar.Large.Inverse</item>

        <item name="progressBarCornerRadius">@dimen/config_progressBarCornerRadius</item>

        <item name="colorProgressBackgroundNormal">@color/config_progress_background_tint</item>

        <item name="colorProgressBackgroundNormal">?attr/materialColorOutline</item>

        <item name="seekBarStyle">@style/Widget.DeviceDefault.SeekBar</item>

        <item name="ratingBarStyle">@style/Widget.DeviceDefault.RatingBar</item>

        <item name="ratingBarStyleIndicator">@style/Widget.DeviceDefault.RatingBar.Indicator</item>
@@ -351,7 +351,7 @@ easier. 
        <item name="buttonBarButtonStyle">@style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog</item>



        <!-- Progress bar attributes -->

        <item name="colorProgressBackgroundNormal">@color/config_progress_background_tint</item>

        <item name="colorProgressBackgroundNormal">?attr/materialColorOutline</item>

        <item name="progressBarCornerRadius">@dimen/config_progressBarCornerRadius</item>



        <!-- Toolbar attributes -->
@@ -468,7 +468,7 @@ easier. 
        <item name="buttonBarButtonStyle">@style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog</item>



        <!-- Progress bar attributes -->

        <item name="colorProgressBackgroundNormal">@color/config_progress_background_tint</item>

        <item name="colorProgressBackgroundNormal">?attr/materialColorOutline</item>

        <item name="progressBarCornerRadius">@dimen/config_progressBarCornerRadius</item>



        <!-- Toolbar attributes -->
@@ -587,7 +587,7 @@ easier. 
        <item name="buttonBarButtonStyle">@style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog</item>



        <!-- Progress bar attributes -->

        <item name="colorProgressBackgroundNormal">@color/config_progress_background_tint</item>

        <item name="colorProgressBackgroundNormal">?attr/materialColorOutline</item>

        <item name="progressBarCornerRadius">@dimen/config_progressBarCornerRadius</item>



        <!-- Toolbar attributes -->
@@ -705,7 +705,7 @@ easier. 
        <item name="buttonBarButtonStyle">@style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog</item>



        <!-- Progress bar attributes -->

        <item name="colorProgressBackgroundNormal">@color/config_progress_background_tint</item>

        <item name="colorProgressBackgroundNormal">?attr/materialColorOutline</item>

        <item name="progressBarCornerRadius">@dimen/config_progressBarCornerRadius</item>



        <!-- Toolbar attributes -->
@@ -831,7 +831,7 @@ easier. 
        <item name="alertDialogTheme">@style/Theme.DeviceDefault.Dialog.Alert</item>



        <!-- Progress bar attributes -->

        <item name="colorProgressBackgroundNormal">@color/config_progress_background_tint</item>

        <item name="colorProgressBackgroundNormal">?attr/materialColorOutline</item>

        <item name="progressBarCornerRadius">@dimen/config_progressBarCornerRadius</item>



        <!-- Toolbar attributes -->
@@ -948,7 +948,7 @@ easier. 
        <item name="buttonBarButtonStyle">@style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog</item>



        <!-- Progress bar attributes -->

        <item name="colorProgressBackgroundNormal">@color/config_progress_background_tint</item>

        <item name="colorProgressBackgroundNormal">?attr/materialColorOutline</item>

        <item name="progressBarCornerRadius">@dimen/config_progressBarCornerRadius</item>



        <!-- Toolbar attributes -->
@@ -1064,7 +1064,7 @@ easier. 
        <item name="buttonBarButtonStyle">@style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog</item>



        <!-- Progress bar attributes -->

        <item name="colorProgressBackgroundNormal">@color/config_progress_background_tint</item>

        <item name="colorProgressBackgroundNormal">?attr/materialColorOutline</item>

        <item name="progressBarCornerRadius">@dimen/config_progressBarCornerRadius</item>



        <!-- Toolbar attributes -->
@@ -1181,7 +1181,7 @@ easier. 
        <item name="buttonBarButtonStyle">@style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog</item>



        <!-- Progress bar attributes -->

        <item name="colorProgressBackgroundNormal">@color/config_progress_background_tint</item>

        <item name="colorProgressBackgroundNormal">?attr/materialColorOutline</item>

        <item name="progressBarCornerRadius">@dimen/config_progressBarCornerRadius</item>



        <!-- Toolbar attributes -->
@@ -1314,7 +1314,7 @@ easier. 
        <item name="buttonBarButtonStyle">@style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog</item>



        <!-- Progress bar attributes -->

        <item name="colorProgressBackgroundNormal">@color/config_progress_background_tint</item>

        <item name="colorProgressBackgroundNormal">?attr/materialColorOutline</item>

        <item name="progressBarCornerRadius">@dimen/config_progressBarCornerRadius</item>



        <!-- Toolbar attributes -->
@@ -1432,7 +1432,7 @@ easier. 
        <item name="buttonBarButtonStyle">@style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog</item>



        <!-- Progress bar attributes -->

        <item name="colorProgressBackgroundNormal">@color/config_progress_background_tint</item>

        <item name="colorProgressBackgroundNormal">?attr/materialColorOutline</item>

        <item name="progressBarCornerRadius">@dimen/config_progressBarCornerRadius</item>



        <!-- Toolbar attributes -->
@@ -1548,7 +1548,7 @@ easier. 
        <item name="buttonBarButtonStyle">@style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog</item>



        <!-- Progress bar attributes -->

        <item name="colorProgressBackgroundNormal">@color/config_progress_background_tint</item>

        <item name="colorProgressBackgroundNormal">?attr/materialColorOutline</item>

        <item name="progressBarCornerRadius">@dimen/config_progressBarCornerRadius</item>



        <!-- Toolbar attributes -->
@@ -1666,7 +1666,7 @@ easier. 
        <item name="buttonBarButtonStyle">@style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog</item>



        <!-- Progress bar attributes -->

        <item name="colorProgressBackgroundNormal">@color/config_progress_background_tint</item>

        <item name="colorProgressBackgroundNormal">?attr/materialColorOutline</item>

        <item name="progressBarCornerRadius">@dimen/config_progressBarCornerRadius</item>



        <!-- Toolbar attributes -->
@@ -1783,7 +1783,7 @@ easier. 
        <item name="buttonBarButtonStyle">@style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog</item>



        <!-- Progress bar attributes -->

        <item name="colorProgressBackgroundNormal">@color/config_progress_background_tint</item>

        <item name="colorProgressBackgroundNormal">?attr/materialColorOutline</item>

        <item name="progressBarCornerRadius">@dimen/config_progressBarCornerRadius</item>



        <!-- Toolbar attributes -->
@@ -1900,7 +1900,7 @@ easier. 
        <item name="buttonBarButtonStyle">@style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog</item>



        <!-- Progress bar attributes -->

        <item name="colorProgressBackgroundNormal">@color/config_progress_background_tint</item>

        <item name="colorProgressBackgroundNormal">?attr/materialColorOutline</item>

        <item name="progressBarCornerRadius">@dimen/config_progressBarCornerRadius</item>



        <!-- Toolbar attributes -->
@@ -2017,7 +2017,7 @@ easier. 
        <item name="buttonBarButtonStyle">@style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog</item>



        <!-- Progress bar attributes -->

        <item name="colorProgressBackgroundNormal">@color/config_progress_background_tint</item>

        <item name="colorProgressBackgroundNormal">?attr/materialColorOutline</item>

        <item name="progressBarCornerRadius">@dimen/config_progressBarCornerRadius</item>



        <!-- Toolbar attributes -->
@@ -2134,7 +2134,7 @@ easier. 
        <item name="buttonBarButtonStyle">@style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog</item>



        <!-- Progress bar attributes -->

        <item name="colorProgressBackgroundNormal">@color/config_progress_background_tint</item>

        <item name="colorProgressBackgroundNormal">?attr/materialColorOutline</item>

        <item name="progressBarCornerRadius">@dimen/config_progressBarCornerRadius</item>



        <!-- Toolbar attributes -->
@@ -2251,7 +2251,7 @@ easier. 
        <item name="buttonBarButtonStyle">@style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog</item>



        <!-- Progress bar attributes -->

        <item name="colorProgressBackgroundNormal">@color/config_progress_background_tint</item>

        <item name="colorProgressBackgroundNormal">?attr/materialColorOutline</item>

        <item name="progressBarCornerRadius">@dimen/config_progressBarCornerRadius</item>



        <!-- Toolbar attributes -->
@@ -2373,7 +2373,7 @@ easier. 
        <item name="buttonBarButtonStyle">@style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog</item>



        <!-- Progress bar attributes -->

        <item name="colorProgressBackgroundNormal">@color/config_progress_background_tint</item>

        <item name="colorProgressBackgroundNormal">?attr/materialColorOutline</item>

        <item name="progressBarCornerRadius">@dimen/config_progressBarCornerRadius</item>



        <!-- Toolbar attributes -->
@@ -2488,7 +2488,7 @@ easier. 
        <item name="buttonBarButtonStyle">@style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog</item>



        <!-- Progress bar attributes -->

        <item name="colorProgressBackgroundNormal">@color/config_progress_background_tint</item>

        <item name="colorProgressBackgroundNormal">?attr/materialColorOutline</item>

        <item name="progressBarCornerRadius">@dimen/config_progressBarCornerRadius</item>



        <!-- Toolbar attributes -->
@@ -2642,7 +2642,7 @@ easier. 
        <item name="progressBarStyleSmallInverse">@style/Widget.DeviceDefault.Light.ProgressBar.Small.Inverse</item>

        <item name="progressBarStyleLargeInverse">@style/Widget.DeviceDefault.Light.ProgressBar.Large.Inverse</item>

        <item name="progressBarCornerRadius">@dimen/config_progressBarCornerRadius</item>

        <item name="colorProgressBackgroundNormal">@color/config_progress_background_tint</item>

        <item name="colorProgressBackgroundNormal">?attr/materialColorOutline</item>

        <item name="seekBarStyle">@style/Widget.DeviceDefault.Light.SeekBar</item>

        <item name="ratingBarStyle">@style/Widget.DeviceDefault.Light.RatingBar</item>

        <item name="ratingBarStyleIndicator">@style/Widget.DeviceDefault.Light.RatingBar.Indicator</item>
@@ -2858,7 +2858,7 @@ easier. 
        <item name="buttonBarButtonStyle">@style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog</item>



        <!-- Progress bar attributes -->

        <item name="colorProgressBackgroundNormal">@color/config_progress_background_tint</item>

        <item name="colorProgressBackgroundNormal">?attr/materialColorOutline</item>

        <item name="progressBarCornerRadius">@dimen/config_progressBarCornerRadius</item>



        <!-- Toolbar attributes -->
@@ -2974,7 +2974,7 @@ easier. 
        <item name="buttonBarButtonStyle">@style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog</item>



        <!-- Progress bar attributes -->

        <item name="colorProgressBackgroundNormal">@color/config_progress_background_tint</item>

        <item name="colorProgressBackgroundNormal">?attr/materialColorOutline</item>

        <item name="progressBarCornerRadius">@dimen/config_progressBarCornerRadius</item>



        <!-- Toolbar attributes -->
@@ -3091,7 +3091,7 @@ easier. 
        <item name="buttonBarButtonStyle">@style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog</item>



        <!-- Progress bar attributes -->

        <item name="colorProgressBackgroundNormal">@color/config_progress_background_tint</item>

        <item name="colorProgressBackgroundNormal">?attr/materialColorOutline</item>

        <item name="progressBarCornerRadius">@dimen/config_progressBarCornerRadius</item>



        <!-- Toolbar attributes -->
@@ -3210,7 +3210,7 @@ easier. 
        <item name="buttonBarButtonStyle">@style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog</item>



        <!-- Progress bar attributes -->

        <item name="colorProgressBackgroundNormal">@color/config_progress_background_tint</item>

        <item name="colorProgressBackgroundNormal">?attr/materialColorOutline</item>

        <item name="progressBarCornerRadius">@dimen/config_progressBarCornerRadius</item>



        <!-- Toolbar attributes -->
@@ -3328,7 +3328,7 @@ easier. 
        <item name="buttonBarButtonStyle">@style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog</item>



        <!-- Progress bar attributes -->

        <item name="colorProgressBackgroundNormal">@color/config_progress_background_tint</item>

        <item name="colorProgressBackgroundNormal">?attr/materialColorOutline</item>

        <item name="progressBarCornerRadius">@dimen/config_progressBarCornerRadius</item>



        <!-- Toolbar attributes -->
@@ -3452,7 +3452,7 @@ easier. 
        <item name="colorForegroundInverse">@color/foreground_device_default_dark</item>



        <!-- Progress bar attributes -->

        <item name="colorProgressBackgroundNormal">@color/config_progress_background_tint</item>

        <item name="colorProgressBackgroundNormal">?attr/materialColorOutline</item>

        <item name="progressBarCornerRadius">@dimen/config_progressBarCornerRadius</item>



        <!-- Toolbar attributes -->
@@ -3572,7 +3572,7 @@ easier. 
        <item name="buttonBarButtonStyle">@style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog</item>



        <!-- Progress bar attributes -->

        <item name="colorProgressBackgroundNormal">@color/config_progress_background_tint</item>

        <item name="colorProgressBackgroundNormal">?attr/materialColorOutline</item>

        <item name="progressBarCornerRadius">@dimen/config_progressBarCornerRadius</item>



        <!-- Toolbar attributes -->
@@ -3691,7 +3691,7 @@ easier. 
        <item name="buttonBarButtonStyle">@style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog</item>



        <!-- Progress bar attributes -->

        <item name="colorProgressBackgroundNormal">@color/config_progress_background_tint</item>

        <item name="colorProgressBackgroundNormal">?attr/materialColorOutline</item>

        <item name="progressBarCornerRadius">@dimen/config_progressBarCornerRadius</item>



        <!-- Toolbar attributes -->
@@ -3811,7 +3811,7 @@ easier. 
        <item name="buttonBarButtonStyle">@style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog</item>



        <!-- Progress bar attributes -->

        <item name="colorProgressBackgroundNormal">@color/config_progress_background_tint</item>

        <item name="colorProgressBackgroundNormal">?attr/materialColorOutline</item>

        <item name="progressBarCornerRadius">@dimen/config_progressBarCornerRadius</item>



        <!-- Toolbar attributes -->
@@ -4133,7 +4133,7 @@ easier. 
        <item name="buttonBarButtonStyle">@style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog</item>



        <!-- Progress bar attributes -->

        <item name="colorProgressBackgroundNormal">@color/config_progress_background_tint</item>

        <item name="colorProgressBackgroundNormal">?attr/materialColorOutline</item>

        <item name="progressBarCornerRadius">@dimen/config_progressBarCornerRadius</item>



        <!-- Toolbar attributes -->
@@ -4254,7 +4254,7 @@ easier. 
        <item name="buttonBarButtonStyle">@style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog</item>



        <!-- Progress bar attributes -->

        <item name="colorProgressBackgroundNormal">@color/config_progress_background_tint</item>

        <item name="colorProgressBackgroundNormal">?attr/materialColorOutline</item>

        <item name="progressBarCornerRadius">@dimen/config_progressBarCornerRadius</item>



        <!-- Toolbar attributes -->
@@ -4373,7 +4373,7 @@ easier. 
        <item name="buttonBarButtonStyle">@style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog</item>



        <!-- Progress bar attributes -->

        <item name="colorProgressBackgroundNormal">@color/config_progress_background_tint</item>

        <item name="colorProgressBackgroundNormal">?attr/materialColorOutline</item>

        <item name="progressBarCornerRadius">@dimen/config_progressBarCornerRadius</item>



        <!-- Toolbar attributes -->
@@ -4491,7 +4491,7 @@ easier. 
        <item name="buttonBarButtonStyle">@style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog</item>



        <!-- Progress bar attributes -->

        <item name="colorProgressBackgroundNormal">@color/config_progress_background_tint</item>

        <item name="colorProgressBackgroundNormal">?attr/materialColorOutline</item>

        <item name="progressBarCornerRadius">@dimen/config_progressBarCornerRadius</item>



        <!-- Toolbar attributes -->
@@ -4608,7 +4608,7 @@ easier. 
        <item name="buttonBarButtonStyle">@style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog</item>



        <!-- Progress bar attributes -->

        <item name="colorProgressBackgroundNormal">@color/config_progress_background_tint</item>

        <item name="colorProgressBackgroundNormal">?attr/materialColorOutline</item>

        <item name="progressBarCornerRadius">@dimen/config_progressBarCornerRadius</item>



        <!-- Toolbar attributes -->
@@ -4725,7 +4725,7 @@ easier. 
        <item name="buttonBarButtonStyle">@style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog</item>



        <!-- Progress bar attributes -->

        <item name="colorProgressBackgroundNormal">@color/config_progress_background_tint</item>

        <item name="colorProgressBackgroundNormal">?attr/materialColorOutline</item>

        <item name="progressBarCornerRadius">@dimen/config_progressBarCornerRadius</item>



        <!-- Toolbar attributes -->
@@ -4840,7 +4840,7 @@ easier. 
        <item name="buttonBarButtonStyle">@style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog</item>



        <!-- Progress bar attributes -->

        <item name="colorProgressBackgroundNormal">@color/config_progress_background_tint</item>

        <item name="colorProgressBackgroundNormal">?attr/materialColorOutline</item>

        <item name="progressBarCornerRadius">@dimen/config_progressBarCornerRadius</item>



        <!-- Toolbar attributes -->
@@ -5066,7 +5066,7 @@ easier. 
        <item name="buttonBarButtonStyle">@style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog</item>



        <!-- Progress bar attributes -->

        <item name="colorProgressBackgroundNormal">@color/config_progress_background_tint</item>

        <item name="colorProgressBackgroundNormal">?attr/materialColorOutline</item>

        <item name="progressBarCornerRadius">@dimen/config_progressBarCornerRadius</item>



        <!-- Toolbar attributes -->
@@ -5162,7 +5162,7 @@ easier. 
        <item name="alertDialogTheme">@style/Theme.DeviceDefault.Light.Dialog.Alert</item>



        <!-- Progress bar attributes -->

        <item name="colorProgressBackgroundNormal">@color/config_progress_background_tint</item>

        <item name="colorProgressBackgroundNormal">?attr/materialColorOutline</item>

        <item name="progressBarCornerRadius">@dimen/config_progressBarCornerRadius</item>



        <!-- Toolbar attributes -->
@@ -5280,7 +5280,7 @@ easier. 
        <item name="buttonBarButtonStyle">@style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog</item>



        <!-- Progress bar attributes -->

        <item name="colorProgressBackgroundNormal">@color/config_progress_background_tint</item>

        <item name="colorProgressBackgroundNormal">?attr/materialColorOutline</item>

        <item name="progressBarCornerRadius">@dimen/config_progressBarCornerRadius</item>



        <!-- Toolbar attributes -->
@@ -5471,7 +5471,7 @@ easier. 
        <item name="buttonBarButtonStyle">@style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog</item>



        <!-- Progress bar attributes -->

        <item name="colorProgressBackgroundNormal">@color/config_progress_background_tint</item>

        <item name="colorProgressBackgroundNormal">?attr/materialColorOutline</item>

        <item name="progressBarCornerRadius">@dimen/config_progressBarCornerRadius</item>



        <!-- Toolbar attributes -->
@@ -5522,7 +5522,7 @@ easier. 
        <item name="buttonBarButtonStyle">@style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog</item>



        <!-- Progress bar attributes -->

        <item name="colorProgressBackgroundNormal">@color/config_progress_background_tint</item>

        <item name="colorProgressBackgroundNormal">?attr/materialColorOutline</item>

        <item name="progressBarCornerRadius">@dimen/config_progressBarCornerRadius</item>



        <!-- Toolbar attributes -->
@@ -5641,7 +5641,7 @@ easier. 
        <item name="buttonBarButtonStyle">@style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog</item>



        <!-- Progress bar attributes -->

        <item name="colorProgressBackgroundNormal">@color/config_progress_background_tint</item>

        <item name="colorProgressBackgroundNormal">?attr/materialColorOutline</item>

        <item name="progressBarCornerRadius">@dimen/config_progressBarCornerRadius</item>



        <!-- Toolbar attributes -->

packages/SystemUI/res/color/brightness_slider_track.xml

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?><!--

  ~ Copyright (C) 2024 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->



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

    <item android:color="@android:color/system_neutral2_500" android:lStar="40" />

</selector>
 
 No newline at end of file

packages/SystemUI/res/drawable/brightness_bar.xml

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
        android:viewportHeight="48">

<path

    android:pathData="M2,22L302,22A2,2 0,0 1,304 24L304,24A2,2 0,0 1,302 26L2,26A2,2 0,0 1,0 24L0,24A2,2 0,0 1,2 22z"

    android:fillColor="@color/brightness_slider_track"/>

    android:fillColor="?androidprv:attr/customColorShadeInactive"/>

<path

    android:pathData="M24,0L205.71,0A24,24 0,0 1,229.71 24L229.71,24A24,24 0,0 1,205.71 48L24,48A24,24 0,0 1,0 24L0,24A24,24 0,0 1,24 0z"

    android:fillColor="?attr/shadeActive"/>

packages/SystemUI/res/drawable/brightness_progress_drawable.xml

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

  -->

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

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

            android:paddingMode="stack" >

    <item android:id="@android:id/background"

        android:gravity="center_vertical|fill_horizontal">
@@ -24,7 +25,7 @@ 
            <shape>

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

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

                <solid android:color="@color/brightness_slider_track" />

                <solid android:color="?androidprv:attr/customColorShadeInactive" />

            </shape>

        </inset>

    </item>

packages/SystemUI/res/values-night/colors.xml

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


  NOTE: You might also want to edit: core/res/res/values-night/*.xml

  -->

<resources>

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

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">

    <!-- The dark background color behind the shade -->

    <color name="shade_scrim_background_dark">@androidprv:color/system_under_surface_dark</color>



    <!-- The color of the legacy notifications with customs backgrounds (gingerbread and lollipop.)

    It's fine to override this color since at that point the shade was dark. -->

    <color name="notification_legacy_background_color">@color/GM2_grey_900</color>