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

Commit a679d688 authored by Marcelo Arteiro's avatar Marcelo Arteiro Committed by Automerger Merge Worker
Browse files

Merge "Automated Token Alignment Android/Material" into udc-dev am: b93f186d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21480745



Change-Id: I8c749964c8e185437de1890e6386b4794df48422
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 82a351db b93f186d

res/color/dream_card_color_state_list.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,5 +18,5 @@ 
<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:attr/colorAccentPrimary"/>

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

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

</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:attr/textColorOnAccent"/>

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

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

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

</selector>
 
 No newline at end of file

res/color/dream_card_text_color_state_list.xml

+1 −1
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:attr/textColorOnAccent"/>

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

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

</selector>
 
 No newline at end of file

res/drawable/accessibility_text_reading_preview.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,5 +20,5 @@ 
    android:shape="rectangle">



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

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

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

</shape>

res/drawable/broadcast_button_outline.xml

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
            <shape android:shape="rectangle">

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

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

                <stroke android:color="?androidprv:attr/colorAccentPrimaryVariant"

                <stroke android:color="?androidprv:attr/materialColorPrimaryContainer"

                    android:width="1dp"

                    />

                <padding android:left="16dp"