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

Commit 52bb254e authored by Xin Li's avatar Xin Li
Browse files

Merge Coral/Flame into AOSP master 

Bug: 141248619
Change-Id: I3850f512dadd5e2c6d51af3c8abab1fa5dbc86ad
Merged-In: I46ad5cff3809191483b48fe292dba220a0d699c6
parents f67076da 5eda5a3e

color-check-baseline.xml

+32 −0
Original line number Diff line number Diff line
@@ -3037,4 +3037,36 @@ 
            column="5"/>

    </issue>



    <issue

        id="HardCodedColor"

        severity="Error"

        message="Avoid using hardcoded color"

        category="Correctness"

        priority="4"

        summary="Using hardcoded color"

        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."

        errorLine1="    &lt;color name=&quot;face_intro_outline&quot;>#ffdadce0&lt;/color> &lt;/color>"

        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">

        <location

            file="res/values/colors.xml"

            line="150"

            column="40"/>

    </issue>



    <issue

        id="HardCodedColor"

        severity="Error"

        message="Avoid using hardcoded color"

        category="Correctness"

        priority="4"

        summary="Using hardcoded color"

        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."

        errorLine1="                android:fillColor=&quot;@color/face_intro_outline&quot;"

        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">

        <location

            file="res/drawable/face_enroll_introduction.xml"

            line="25"

            column="40"/>

    </issue>



</issues>

res/drawable-nodpi/color_mode_preview.jpg

+619 KiB (1.2 MiB)
Loading image diff...

res/drawable/face_enroll_introduction.xml

+3 −3
Original line number Diff line number Diff line
@@ -16,13 +16,13 @@ 
  -->



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

    android:width="240dp"

    android:height="240dp"

    android:width="300dp"

    android:height="300dp"

    android:viewportWidth="300"

    android:viewportHeight="300">



    <path

        android:fillColor="#DADCE0"

        android:fillColor="@color/face_intro_outline"

        android:fillType="evenOdd"

        android:pathData="M150,0C67.16,0,0,67.16,0,150s67.16,150,150,150 s150-67.16,150-150S232.84,0,150,0 M150,4c39,0,75.66,15.19,103.24,42.76C280.81,74.34,296,111,296,150s-15.19,75.66-42.76,103.24 C225.66,280.81,189,296,150,296s-75.66-15.19-103.24-42.76C19.19,225.66,4,189,4,150S19.19,74.34,46.76,46.76 C74.34,19.19,111,4,150,4" />

    <path

res/drawable/ic_arrow_down_24dp.xml

+2 −1
Original line number Diff line number Diff line
@@ -16,9 +16,10 @@ 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="24dp"

        android:height="24dp"

        android:tint="?android:attr/colorControlNormal"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:fillColor="?android:attr/colorControlNormal"

        android:fillColor="@android:color/white"

        android:pathData="M12,16.41l-6.71,-6.7l1.42,-1.42l5.29,5.3l5.29,-5.3l1.42,1.42z"/>

</vector>

res/drawable/ic_content_copy_grey600_24dp.xml

+2 −1
Original line number Diff line number Diff line 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="24dp"

    android:height="24dp"

    android:tint="@*android:color/material_grey_600"

    android:viewportWidth="24"

    android:viewportHeight="24">

  <path

      android:pathData="M16,1L4,1c-1.1,0 -2,0.9 -2,2v14h2L4,3h12L16,1zM19,5L8,5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h11c1.1,0 2,-0.9 2,-2L21,7c0,-1.1 -0.9,-2 -2,-2zM19,21L8,21L8,7h11v14z"

      android:fillColor="#757575"/>

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

</vector>