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

Commit c8c9cf6f authored by Beverly's avatar Beverly Committed by Beverly Tai
Browse files

Devices with UDPFS shows lock icon on AOD 

...when biometrics aren't available due to lockdown/reboot, etc.

Note: on devices with udfps, if the device is unlocked (ie: smart unlock),
then we still show the udfps icon on AOD to prevent from advertising the
device's unlocked state.

Main changes in this CL:
  - use super_lock_icon.xml for both static icons and the transitions
  between the icon states
  - move icon resources to res-keyguard
  - add AOD lock icon resource + transition from AOD <=> lock screen
  - add logic to show a lock icon on AOD (previously would show fp)
Test: manual, atest SystemUITests
Fixes: 194183870
Fixes: 199562477

Change-Id: I7239cc768e3725aa61797f8b0a0fb3d28760962d
parent d43e521e

packages/SystemUI/res/anim/fp_to_unlock.xml→packages/SystemUI/res-keyguard/drawable/fp_to_unlock.xml

+5 −5
Original line number Diff line number Diff line
@@ -19,15 +19,15 @@ 
      <group android:name="_R_G">

        <group android:name="_R_G_L_1_G_N_7_T_0" android:translateX="-27" android:translateY="-17.5">

          <group android:name="_R_G_L_1_G" android:translateX="30.75" android:translateY="25.75">

            <path android:name="_R_G_L_1_G_D_0_P_0" android:strokeColor="#b7f29f" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="2" android:strokeAlpha="1" android:pathData=" M27.52 38.98 C26.49,39.95 25.29,40.73 23.98,41.29 C23.17,41.65 22.31,41.91 21.41,42.07 C20.74,42.19 20.05,42.25 19.34,42.25 C18.44,42.25 17.56,42.15 16.72,41.96 C15.93,41.77 15.16,41.51 14.43,41.18 C13.23,40.63 12.13,39.88 11.16,38.98 " />

            <path android:name="_R_G_L_1_G_D_1_P_0" android:strokeColor="#b7f29f" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="2" android:strokeAlpha="1" android:pathData=" M8.64 34.07 C7.89,31.97 7.89,29.85 7.89,29.85 C7.89,24.05 12.81,19.34 19.34,19.34 C25.87,19.34 30.8,24.05 30.8,29.85 C30.8,29.85 30.8,30.16 30.8,30.16 C30.8,32.32 29.04,34.07 26.89,34.07 C25.28,34.07 23.86,33.1 23.27,31.61 C23.27,31.61 21.96,28.34 21.96,28.34 C21.37,26.85 19.93,25.89 18.34,25.89 C16.18,25.89 14.43,27.64 14.43,29.8 C14.43,31.42 14.87,32.99 15.68,34.36 C16.22,35.26 16.93,36.08 17.77,36.75 C17.77,36.75 18.52,37.34 18.52,37.34 " />

            <path android:name="_R_G_L_1_G_D_2_P_0" android:strokeColor="#b7f29f" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="2" android:strokeAlpha="1" android:pathData=" M6.25 19.34 C7.48,17.3 9.46,15.58 11.9,14.42 C12.93,13.94 14.03,13.55 15.2,13.27 C16.51,12.96 17.9,12.8 19.34,12.8 C20.77,12.8 22.14,12.96 23.45,13.26 C24.9,13.6 26.26,14.12 27.48,14.78 C29.6,15.92 31.32,17.5 32.43,19.34 " />

            <path android:name="_R_G_L_1_G_D_3_P_0" android:strokeColor="#b7f29f" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="2" android:strokeAlpha="1" android:pathData=" M9.52 8.7 C10.98,7.91 12.58,7.28 14.28,6.86 C15.89,6.46 17.58,6.25 19.34,6.25 C21.06,6.25 22.72,6.45 24.3,6.83 C26.04,7.25 27.67,7.89 29.16,8.7 " />

            <path android:name="_R_G_L_1_G_D_0_P_0" android:strokeColor="#FF000000" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="2" android:strokeAlpha="1" android:pathData=" M27.52 38.98 C26.49,39.95 25.29,40.73 23.98,41.29 C23.17,41.65 22.31,41.91 21.41,42.07 C20.74,42.19 20.05,42.25 19.34,42.25 C18.44,42.25 17.56,42.15 16.72,41.96 C15.93,41.77 15.16,41.51 14.43,41.18 C13.23,40.63 12.13,39.88 11.16,38.98 " />

            <path android:name="_R_G_L_1_G_D_1_P_0" android:strokeColor="#FF000000" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="2" android:strokeAlpha="1" android:pathData=" M8.64 34.07 C7.89,31.97 7.89,29.85 7.89,29.85 C7.89,24.05 12.81,19.34 19.34,19.34 C25.87,19.34 30.8,24.05 30.8,29.85 C30.8,29.85 30.8,30.16 30.8,30.16 C30.8,32.32 29.04,34.07 26.89,34.07 C25.28,34.07 23.86,33.1 23.27,31.61 C23.27,31.61 21.96,28.34 21.96,28.34 C21.37,26.85 19.93,25.89 18.34,25.89 C16.18,25.89 14.43,27.64 14.43,29.8 C14.43,31.42 14.87,32.99 15.68,34.36 C16.22,35.26 16.93,36.08 17.77,36.75 C17.77,36.75 18.52,37.34 18.52,37.34 " />

            <path android:name="_R_G_L_1_G_D_2_P_0" android:strokeColor="#FF000000" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="2" android:strokeAlpha="1" android:pathData=" M6.25 19.34 C7.48,17.3 9.46,15.58 11.9,14.42 C12.93,13.94 14.03,13.55 15.2,13.27 C16.51,12.96 17.9,12.8 19.34,12.8 C20.77,12.8 22.14,12.96 23.45,13.26 C24.9,13.6 26.26,14.12 27.48,14.78 C29.6,15.92 31.32,17.5 32.43,19.34 " />

            <path android:name="_R_G_L_1_G_D_3_P_0" android:strokeColor="#FF000000" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="2" android:strokeAlpha="1" android:pathData=" M9.52 8.7 C10.98,7.91 12.58,7.28 14.28,6.86 C15.89,6.46 17.58,6.25 19.34,6.25 C21.06,6.25 22.72,6.45 24.3,6.83 C26.04,7.25 27.67,7.89 29.16,8.7 " />

          </group>

        </group>

        <group android:name="_R_G_L_0_G_N_7_T_0" android:translateX="-27" android:translateY="-17.5">

          <group android:name="_R_G_L_0_G" android:translateX="47.357" android:translateY="53.25" android:pivotX="2.75" android:pivotY="2.75" android:scaleX="1.41866" android:scaleY="1.41866">

            <path android:name="_R_G_L_0_G_D_0_P_0" android:fillColor="#b7f29f" android:fillAlpha="0" android:fillType="nonZero" android:pathData=" M2.75 5.25 C4.13,5.25 5.25,4.13 5.25,2.75 C5.25,1.37 4.13,0.25 2.75,0.25 C1.37,0.25 0.25,1.37 0.25,2.75 C0.25,4.13 1.37,5.25 2.75,5.25c " />

            <path android:name="_R_G_L_0_G_D_0_P_0" android:fillColor="#FF000000" android:fillAlpha="0" android:fillType="nonZero" android:pathData=" M2.75 5.25 C4.13,5.25 5.25,4.13 5.25,2.75 C5.25,1.37 4.13,0.25 2.75,0.25 C1.37,0.25 0.25,1.37 0.25,2.75 C0.25,4.13 1.37,5.25 2.75,5.25c " />

          </group>

        </group>

      </group>

packages/SystemUI/res-keyguard/drawable/ic_fingerprint.xml

0 → 100644
+48 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2021 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

  -->

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

        android:height="65dp"

        android:width="46dp"

        android:viewportHeight="65"

        android:viewportWidth="46">

    <group android:name="_R_G_L_0_G" android:translateX="3.75" android:translateY="8.25">

        <path

            android:strokeColor="#FF000000"

            android:strokeLineCap="round"

            android:strokeLineJoin="round"

            android:strokeWidth="2.5"

            android:pathData="M27.52 38.98 C26.49,39.95 25.29,40.73 23.98,41.29 C23.17,41.65 22.31,41.91 21.41,42.07 C20.74,42.19 20.05,42.25 19.34,42.25 C18.44,42.25 17.56,42.15 16.72,41.96 C15.93,41.77 15.16,41.51 14.43,41.18 C13.23,40.63 12.13,39.88 11.16,38.98 " />

        <path

            android:strokeColor="#FF000000"

            android:strokeLineCap="round"

            android:strokeLineJoin="round"

            android:strokeWidth="2.5"

            android:pathData="M8.64 34.07 C7.89,31.97 7.89,29.85 7.89,29.85 C7.89,24.05 12.81,19.34 19.34,19.34 C25.87,19.34 30.8,24.05 30.8,29.85 C30.8,29.85 30.8,30.16 30.8,30.16 C30.8,32.32 29.04,34.07 26.89,34.07 C25.28,34.07 23.86,33.1 23.27,31.61 C23.27,31.61 21.96,28.34 21.96,28.34 C21.37,26.85 19.93,25.89 18.34,25.89 C16.18,25.89 14.43,27.64 14.43,29.8 C14.43,31.42 14.87,32.99 15.68,34.36 C16.22,35.26 16.93,36.08 17.77,36.75 C17.77,36.75 18.52,37.34 18.52,37.34 " />

        <path

            android:strokeColor="#FF000000"

            android:strokeLineCap="round"

            android:strokeLineJoin="round"

            android:strokeWidth="2.5"

            android:pathData="M6.25 19.34 C7.48,17.3 9.46,15.58 11.9,14.42 C12.93,13.94 14.03,13.55 15.2,13.27 C16.51,12.96 17.9,12.8 19.34,12.8 C20.77,12.8 22.14,12.96 23.45,13.26 C24.9,13.6 26.26,14.12 27.48,14.78 C29.6,15.92 31.32,17.5 32.43,19.34 " />

        <path

            android:strokeColor="#FF000000"

            android:strokeLineCap="round"

            android:strokeLineJoin="round"

            android:strokeWidth="2.5"

            android:pathData="M9.52 8.7 C10.98,7.91 12.58,7.28 14.28,6.86 C15.89,6.46 17.58,6.25 19.34,6.25 C21.06,6.25 22.72,6.45 24.3,6.83 C26.04,7.25 27.67,7.89 29.16,8.7 " />

    </group>

</vector>
 
 No newline at end of file

packages/SystemUI/res-keyguard/drawable/ic_lock.xml

0 → 100644
+95 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2021 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

  -->

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

        android:height="65dp"

        android:width="46dp"

        android:viewportHeight="65"

        android:viewportWidth="46">

    <group android:name="_R_G">

        <group android:name="_R_G_L_2_G_N_10_N_11_T_0"

               android:translateX="-27.5"

               android:translateY="-17.5">

            <group android:name="_R_G_L_2_G_N_10_T_1"

                   android:translateX="50.25"

                   android:translateY="61">

                <group android:name="_R_G_L_2_G_N_10_T_0"

                       android:translateX="-13.75"

                       android:translateY="-7.5">

                    <group android:name="_R_G_L_2_G"

                           android:translateX="-0.375"

                           android:translateY="-22.375">

                        <path android:name="_R_G_L_2_G_D_0_P_0"

                              android:strokeColor="#FF000000"

                              android:strokeLineCap="round"

                              android:strokeLineJoin="round"

                              android:strokeWidth="2"

                              android:strokeAlpha="1"

                              android:pathData=" M4.75 15 C4.75,15 23.25,15 23.25,15 C24.35,15 25.25,15.9 25.25,17 C25.25,17 25.25,33 25.25,33 C25.25,34.1 24.35,35 23.25,35 C23.25,35 4.75,35 4.75,35 C3.65,35 2.75,34.1 2.75,33 C2.75,33 2.75,17 2.75,17 C2.75,15.9 3.65,15 4.75,15c "/>

                    </group>

                </group>

            </group>

        </group>

        <group android:name="_R_G_L_1_G_N_10_N_11_T_0"

               android:translateX="-27.5"

               android:translateY="-17.5">

            <group android:name="_R_G_L_1_G_N_10_T_1"

                   android:translateX="50.25"

                   android:translateY="61">

                <group android:name="_R_G_L_1_G_N_10_T_0"

                       android:translateX="-13.75"

                       android:translateY="-7.5">

                    <group android:name="_R_G_L_1_G"

                           android:translateX="5"

                           android:translateY="-22.5">

                        <path android:name="_R_G_L_1_G_D_0_P_0"

                              android:strokeColor="#FF000000"

                              android:strokeLineCap="round"

                              android:strokeLineJoin="round"

                              android:strokeWidth="2"

                              android:strokeAlpha="1"

                              android:pathData=" M2.5 15 C2.5,15 2.5,8.61 2.5,8.61 C2.5,5.24 5.3,2.5 8.75,2.5 C12.2,2.5 15,5.24 15,8.61 C15,8.61 15,15 15,15 "/>

                    </group>

                </group>

            </group>

        </group>

        <group android:name="_R_G_L_0_G_N_10_N_11_T_0"

               android:translateX="-27.5"

               android:translateY="-17.5">

            <group android:name="_R_G_L_0_G_N_10_T_1"

                   android:translateX="50.25"

                   android:translateY="61">

                <group android:name="_R_G_L_0_G_N_10_T_0"

                       android:translateX="-13.75"

                       android:translateY="-7.5">

                    <group android:name="_R_G_L_0_G"

                           android:translateX="11"

                           android:translateY="-0.25"

                           android:pivotX="2.75"

                           android:pivotY="2.75"

                           android:scaleX="1"

                           android:scaleY="1">

                        <path android:name="_R_G_L_0_G_D_0_P_0"

                              android:fillColor="#FF000000"

                              android:fillAlpha="1"

                              android:fillType="nonZero"

                              android:pathData=" M2.75 5.25 C4.13,5.25 5.25,4.13 5.25,2.75 C5.25,1.37 4.13,0.25 2.75,0.25 C1.37,0.25 0.25,1.37 0.25,2.75 C0.25,4.13 1.37,5.25 2.75,5.25c "/>

                    </group>

                </group>

            </group>

        </group>

    </group>

</vector>

packages/SystemUI/res-keyguard/drawable/ic_lock_aod.xml

0 → 100644
+41 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2021 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

  -->

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

        android:height="65dp"

        android:width="46dp"

        android:viewportHeight="65"

        android:viewportWidth="46">

    <group android:name="_R_G_L_2_G" android:translateX="23" android:translateY="32.125">

        <path

            android:fillColor="#FF000000"

            android:fillAlpha="1"

            android:fillType="nonZero"

            android:pathData=" M0 6.13 C0.97,6.13 1.75,5.34 1.75,4.38 C1.75,3.41 0.97,2.63 0,2.63 C-0.97,2.63 -1.75,3.41 -1.75,4.38 C-1.75,5.34 -0.97,6.13 0,6.13c " />

        <path

            android:strokeColor="#FF000000"

            android:strokeLineCap="round"

            android:strokeLineJoin="round"

            android:strokeWidth="1.5"

            android:pathData=" M7.88 -0.62 C7.88,-0.62 7.88,9.38 7.88,9.38 C7.88,10.48 6.98,11.38 5.88,11.38 C5.88,11.38 -5.87,11.38 -5.87,11.38 C-6.98,11.38 -7.87,10.48 -7.87,9.38 C-7.87,9.38 -7.87,-0.62 -7.87,-0.62 C-7.87,-1.73 -6.98,-2.62 -5.87,-2.62 C-5.87,-2.62 5.88,-2.62 5.88,-2.62 C6.98,-2.62 7.88,-1.73 7.88,-0.62c " />

        <path

            android:strokeColor="#FF000000"

            android:strokeLineCap="round"

            android:strokeLineJoin="round"

            android:strokeWidth="1.5"

            android:pathData=" M4.38 -2.62 C4.38,-2.62 4.38,-7.1 4.38,-7.1 C4.38,-9.46 2.42,-11.37 0,-11.37 C-2.42,-11.37 -4.37,-9.46 -4.37,-7.1 C-4.37,-7.1 -4.37,-2.62 -4.37,-2.62 " />

    </group>

</vector>
 
 No newline at end of file

packages/SystemUI/res-keyguard/drawable/ic_unlocked.xml

0 → 100644
+48 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2021 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

  -->

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

        android:height="65dp"

        android:width="46dp"

        android:viewportHeight="65"

        android:viewportWidth="46">

    <group android:translateX="8.625"

           android:translateY="13.625">

        <path

            android:strokeColor="#FF000000"

            android:strokeLineCap="round"

            android:strokeLineJoin="round"

            android:strokeWidth="2.5"

            android:pathData="M4.75 15 C4.75,15 23.25,15 23.25,15 C24.35,15 25.25,15.9 25.25,17 C25.25,17 25.25,33 25.25,33 C25.25,34.1 24.35,35 23.25,35 C23.25,35 4.75,35 4.75,35 C3.65,35 2.75,34.1 2.75,33 C2.75,33 2.75,17 2.75,17 C2.75,15.9 3.65,15 4.75,15c "/>

    </group>

    <group android:translateX="14"

           android:translateY="13.5">

        <path

            android:strokeColor="#FF000000"

            android:strokeLineCap="round"

            android:strokeLineJoin="round"

            android:strokeWidth="2.5"

            android:pathData="M27.19 14.81 C27.19,14.81 27.19,8.3 27.19,8.3 C27.19,4.92 24.44,2.88 21.19,2.75 C17.74,2.62 15,4.74 15,8.11 C15,8.11 15,15 15,15 "/>

    </group>

    <group android:translateX="20"

           android:translateY="35.75">

        <path

            android:fillColor="#FF000000"

            android:fillAlpha="1"

            android:fillType="nonZero"

            android:pathData=" M2.75 5.25 C4.13,5.25 5.25,4.13 5.25,2.75 C5.25,1.37 4.13,0.25 2.75,0.25 C1.37,0.25 0.25,1.37 0.25,2.75 C0.25,4.13 1.37,5.25 2.75,5.25c "/>

    </group>

</vector>