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

Commit a333d6dd authored by Marcus Ge's avatar Marcus Ge Committed by Android (Google) Code Review
Browse files

Merge "[Accessibility] Address UX comments for the contrast screen" into main

parents a4babe74 bec24a63

res/drawable/color_contrast_preview_icon_edit_background.xml

+2 −2
Original line number Diff line number Diff line
@@ -17,6 +17,6 @@ 
<shape xmlns:android="http://schemas.android.com/apk/res/android"

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

       android:shape="rectangle" >

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

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

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

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

</shape>
 
 No newline at end of file

res/drawable/color_contrast_preview_icon_group_background.xml

+1 −1
Original line number Diff line number Diff line
@@ -17,6 +17,6 @@ 
<shape xmlns:android="http://schemas.android.com/apk/res/android"

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

       android:shape="oval" >

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

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

    <size android:width="36dp" android:height="36dp" />

</shape>
 
 No newline at end of file

res/drawable/ic_edit_24dp.xml

+1 −1
Original line number Diff line number Diff line
@@ -21,6 +21,6 @@ 
        android:viewportHeight="24"

        android:tint="?attr/colorControlNormal">

<path

    android:fillColor="?androidprv:attr/materialColorOnPrimary"

    android:fillColor="?androidprv:attr/materialColorOnPrimaryContainer"

    android:pathData="M20.41,4.94l-1.35,-1.35c-0.78,-0.78 -2.05,-0.78 -2.83,0L3,16.82L3,21h4.18L20.41,7.77c0.79,-0.78 0.79,-2.05 0,-2.83zM6.41,19.06L5,19v-1.36l9.82,-9.82 1.41,1.41 -9.82,9.83z"/>

</vector>

res/drawable/ic_star_24dp.xml

+1 −1
Original line number Diff line number Diff line
@@ -22,5 +22,5 @@ 
        android:tint="?attr/colorControlNormal">

    <path

        android:fillColor="?androidprv:attr/materialColorOnPrimary"

        android:pathData="M14.43,10l-2.43,-8l-2.43,8l-7.57,0l6.18,4.41l-2.35,7.59l6.17,-4.69l6.18,4.69l-2.35,-7.59l6.17,-4.41z"/>

        android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27z"/>

</vector>

res/layout/accessibility_color_contrast_preview.xml

+5 −2
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ 
        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginLeft="10dp"

        android:paddingHorizontal="4dp"

        android:textColor="?androidprv:attr/materialColorOnSurface"

        android:background="@drawable/color_contrast_preview_tag_background"

        android:textSize="11sp"
@@ -164,7 +165,9 @@ 
        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:src="@drawable/ic_article_filled_24dp"

        android:padding="6dp"

        android:paddingStart="8dp"

        android:paddingEnd="6dp"

        android:paddingVertical="6dp"

        app:layout_constraintStart_toStartOf="@+id/email_title"

        app:layout_constraintTop_toBottomOf="@+id/email_body" />
@@ -172,7 +175,7 @@ 
        android:id="@+id/email_attachment"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:paddingRight="8dp"

        android:paddingEnd="10dp"

        android:textColor="?androidprv:attr/materialColorOnTertiaryContainer"

        android:textSize="12sp"

        app:layout_constraintStart_toEndOf="@+id/ic_article_filled"