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

Commit f4385955 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/30815274',... 

Merge cherrypicks of ['googleplex-android-review.googlesource.com/30815274', 'googleplex-android-review.googlesource.com/30824238'] into 25Q1-release.

Change-Id: Ib15a082911748c50d9ce0269e1d41cd75319b4b8
parents d458d4a6 c8e84e54

res/color/dream_card_color_state_list.xml

+2 −2
Original line number Diff line number Diff line
@@ -17,6 +17,6 @@ 


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

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

    <item android:state_selected="true" android:color="@androidprv:color/materialColorPrimaryContainer"/>

    <item android:color="@androidprv:color/materialColorSurfaceBright"/>

    <item android:state_selected="true" android:color="?androidprv:attr/materialColorPrimaryContainer"/>

    <item android:color="?androidprv:attr/materialColorSurfaceBright"/>

</selector>
 
 No newline at end of file

res/color/dream_card_icon_color_state_list.xml

+2 −2
Original line number Diff line number Diff line
@@ -17,6 +17,6 @@ 


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

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

    <item android:state_selected="true" android:color="@androidprv:color/materialColorOnPrimaryContainer"/>

    <item android:color="@androidprv:color/materialColorPrimary"/>

    <item android:state_selected="true" android:color="?androidprv:attr/materialColorOnPrimaryContainer"/>

    <item android:color="?androidprv:attr/materialColorPrimary"/>

</selector>
 
 No newline at end of file

res/color/dream_card_summary_color_state_list.xml

+2 −2
Original line number Diff line number Diff line
@@ -17,6 +17,6 @@ 


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

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

    <item android:state_selected="true" android:color="@androidprv:color/materialColorOnPrimaryContainer"/>

    <item android:color="@androidprv:color/materialColorOnSurfaceVariant"/>

    <item android:state_selected="true" android:color="?androidprv:attr/materialColorOnPrimaryContainer"/>

    <item android:color="?androidprv:attr/materialColorOnSurfaceVariant"/>

</selector>
 
 No newline at end of file

res/color/dream_card_text_color_state_list.xml

+2 −2
Original line number Diff line number Diff line
@@ -17,6 +17,6 @@ 


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

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

    <item android:state_selected="true" android:color="@androidprv:color/materialColorOnPrimaryContainer"/>

    <item android:color="@androidprv:color/materialColorOnSurface"/>

    <item android:state_selected="true" android:color="?androidprv:attr/materialColorOnPrimaryContainer"/>

    <item android:color="?androidprv:attr/materialColorOnSurface"/>

</selector>
 
 No newline at end of file

res/color/modes_icon_selectable_background.xml

+3 −3
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

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



    <item android:state_pressed="true" android:color="@androidprv:color/materialColorPrimary" />

    <item android:state_selected="true" android:color="@androidprv:color/materialColorPrimary" />

    <item android:color="@androidprv:color/materialColorSecondaryContainer" />

    <item android:state_pressed="true" android:color="?androidprv:attr/materialColorPrimary" />

    <item android:state_selected="true" android:color="?androidprv:attr/materialColorPrimary" />

    <item android:color="?androidprv:attr/materialColorSecondaryContainer" />

</selector>