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

Commit dbfdca37 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Lockscreen fingerprint icon error color matches error text." into nyc-mr1-dev

parents 74a9b454 debdc8d9

packages/SystemUI/res/drawable/lockscreen_fingerprint_error_state_to_fp.xml

+3 −3
Original line number Diff line number Diff line
@@ -98,11 +98,11 @@ 
            <path

                android:name="path_2"

                android:pathData="M 1.35900878906,6.76104736328 c 0.0,0.0 -2.69998168945,0.0 -2.69998168945,0.0 c 0.0,0.0 0.0,-2.69995117188 0.0,-2.69995117188 c 0.0,0.0 2.69998168945,0.0 2.69998168945,0.0 c 0.0,0.0 0.0,2.69995117188 0.0,2.69995117188 Z"

                android:fillColor="#FFF2501D" />

                android:fillColor="@*android:color/system_error" />

            <path

                android:name="path_1"

                android:pathData="M 1.35363769531,1.36633300781 c 0.0,0.0 -2.69998168945,0.0 -2.69998168945,0.0 c 0.0,0.0 0.0,-8.09997558594 0.0,-8.09997558594 c 0.0,0.0 2.69998168945,0.0 2.69998168945,0.0 c 0.0,0.0 0.0,8.09997558594 0.0,8.09997558594 Z"

                android:fillColor="#FFF2501D" />

                android:fillColor="@*android:color/system_error" />

        </group>

    </group>

    <group
@@ -117,7 +117,7 @@ 
            <path

                android:name="path_3"

                android:pathData="M 0.0101470947266,10.8087768555 c -5.96701049805,0.0 -10.8000183105,-4.8330078125 -10.8000183105,-10.8000488281 c 0.0,-5.96691894531 4.8330078125,-10.7999267578 10.8000183105,-10.7999267578 c 5.96697998047,0.0 10.799987793,4.8330078125 10.799987793,10.7999267578 c 0.0,5.96704101562 -4.8330078125,10.8000488281 -10.799987793,10.8000488281 Z"

                android:strokeColor="#FFF2501D"

                android:strokeColor="@*android:color/system_error"

                android:strokeWidth="2"

                android:trimPathStart="0"

                android:trimPathEnd="1" />

packages/SystemUI/res/drawable/lockscreen_fingerprint_fp_to_error_state.xml

+8 −8
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ 
                <path

                    android:name="ridge_5_path_0"

                    android:pathData="M -25.3591003418,-24.4138946533 c -0.569000244141,0.106399536133 -1.12660217285,0.140594482422 -1.45460510254,0.140594482422 c -1.29689025879,0.0 -2.53239440918,-0.343307495117 -3.62019348145,-1.12400817871 c -1.67700195312,-1.20349121094 -2.76950073242,-3.17008972168 -2.76950073242,-5.39189147949"

                    android:strokeColor="#FFF2501D"

                    android:strokeColor="@*android:color/system_error"

                    android:strokeWidth="1.45"

                    android:strokeLineCap="round"

                    android:trimPathEnd="0" />
@@ -106,7 +106,7 @@ 
                <path

                    android:name="ridge_7_path_0"

                    android:pathData="M -36.1409912109,-21.7843475342 c -1.00540161133,-1.19300842285 -1.57499694824,-1.9181060791 -2.36520385742,-3.50170898438 c -0.827560424805,-1.65869140625 -1.31352233887,-3.49159240723 -1.31352233887,-5.48489379883 c 0.0,-3.66279602051 2.96932983398,-6.63220214844 6.63221740723,-6.63220214844 c 3.6628112793,0.0 6.63220214844,2.96940612793 6.63220214844,6.63220214844"

                    android:strokeColor="#FFF2501D"

                    android:strokeColor="@*android:color/system_error"

                    android:strokeWidth="1.45"

                    android:strokeLineCap="round"

                    android:trimPathEnd="0" />
@@ -116,7 +116,7 @@ 
                <path

                    android:name="ridge_6_path_0"

                    android:pathData="M -42.1907958984,-25.6756896973 c -0.758117675781,-2.14370727539 -0.896545410156,-3.86891174316 -0.896545410156,-5.12921142578 c 0.0,-1.46069335938 0.249176025391,-2.84799194336 0.814682006836,-4.09748840332 c 1.56153869629,-3.45030212402 5.03434753418,-5.85076904297 9.0679473877,-5.85076904297 c 5.49430847168,0.0 9.94830322266,4.4539642334 9.94830322266,9.94825744629 c 0.0,1.83151245117 -1.48460388184,3.31610107422 -3.31610107422,3.31610107422 c -1.83149719238,0.0 -3.31610107422,-1.48469543457 -3.31610107422,-3.31610107422 c 0.0,-1.83139038086 -1.48458862305,-3.31610107422 -3.31610107422,-3.31610107422 c -1.83149719238,0.0 -3.31610107422,1.48471069336 -3.31610107422,3.31610107422 c 0.0,2.57020568848 0.989517211914,4.88710021973 2.60510253906,6.5865020752 c 1.22210693359,1.28550720215 2.43139648438,2.09950256348 4.47590637207,2.69030761719"

                    android:strokeColor="#FFF2501D"

                    android:strokeColor="@*android:color/system_error"

                    android:strokeWidth="1.45"

                    android:strokeLineCap="round"

                    android:trimPathEnd="0" />
@@ -126,7 +126,7 @@ 
                <path

                    android:name="ridge_2_path_0"

                    android:pathData="M -44.0646514893,-38.1672973633 c 1.19026184082,-1.77430725098 2.67503356934,-3.24531555176 4.55902099609,-4.27278137207 c 1.88395690918,-1.0274810791 4.04466247559,-1.61137390137 6.34175109863,-1.61137390137 c 2.28761291504,0.0 4.43991088867,0.579071044922 6.31831359863,1.59861755371 c 1.8784942627,1.01954650879 3.36059570312,2.4796295166 4.55279541016,4.24153137207"

                    android:strokeColor="#FFF2501D"

                    android:strokeColor="@*android:color/system_error"

                    android:strokeWidth="1.45"

                    android:strokeLineCap="round"

                    android:trimPathStart="1" />
@@ -138,7 +138,7 @@ 
                <path

                    android:name="ridge_1_path_0"

                    android:pathData="M 71.7812347412,97.0507202148 c -2.27149963379,-1.31344604492 -4.71360778809,-2.07006835938 -7.56221008301,-2.07006835938 c -2.84869384766,0.0 -5.23320007324,0.779556274414 -7.34411621094,2.07006835938"

                    android:strokeColor="#FFF2501D"

                    android:strokeColor="@*android:color/system_error"

                    android:strokeWidth="1.45"

                    android:strokeLineCap="round"

                    android:trimPathEnd="0" />
@@ -157,11 +157,11 @@ 
            <path

                android:name="path_2"

                android:pathData="M -1.3705291748,4.06730651855 c 0.0,0.0 0.036376953125,-0.0102386474609 0.036376953125,-0.0102386474609 c 0.0,0.0 -0.00682067871094,0.0040283203125 -0.00682067871093,0.0040283203125 c 0.0,0.0 -0.0161437988281,0.00479125976562 -0.0161437988281,0.00479125976563 c 0.0,0.0 -0.0134124755859,0.00141906738281 -0.0134124755859,0.00141906738281 Z"

                android:fillColor="#FFF2501D" />

                android:fillColor="@*android:color/system_error" />

            <path

                android:name="path_1"

                android:pathData="M -1.3737487793,-6.77532958984 c 0.0,0.0 0.00604248046875,0.0166625976562 0.00604248046876,0.0166625976562 c 0.0,0.0 0.0213623046875,0.0250244140625 0.0213623046875,0.0250244140625 c 0.0,0.0 -0.00604248046875,-0.0166625976562 -0.00604248046876,-0.0166625976562 c 0.0,0.0 -0.0213623046875,-0.0250244140625 -0.0213623046875,-0.0250244140625 Z"

                android:fillColor="#FFF2501D" />

                android:fillColor="@*android:color/system_error" />

        </group>

    </group>

    <group
@@ -176,7 +176,7 @@ 
            <path

                android:name="path_3"

                android:pathData="M 0.0101470947266,10.8087768555 c -5.96701049805,0.0 -10.8000183105,-4.8330078125 -10.8000183105,-10.8000488281 c 0.0,-5.96691894531 4.8330078125,-10.7999267578 10.8000183105,-10.7999267578 c 5.96697998047,0.0 10.799987793,4.8330078125 10.799987793,10.7999267578 c 0.0,5.96704101562 -4.8330078125,10.8000488281 -10.799987793,10.8000488281 Z"

                android:strokeColor="#FFF2501D"

                android:strokeColor="@*android:color/system_error"

                android:strokeWidth="2"

                android:trimPathStart="1" />

        </group>