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

Commit c8e84e54 authored by Daniel Chapin's avatar Daniel Chapin Committed by Android Build Coastguard Worker
Browse files

Revert "Migrate materialColor* attributes into colors" 

Revert submission 29910036-color-rewrite

Reason for revert: DF Blocking bug:b/383230490 . Reverts will be cherry picked for a .003 release build.

Reverted changes: /q/submissionid:29910036-color-rewrite
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ed8074008f149acf8e1d472866803ff74c7a5d20)
Merged-In: I1229283119cbebb6f6e837b7bbd65480299086c4
Change-Id: I1229283119cbebb6f6e837b7bbd65480299086c4
parent 0dc6180a

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>