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

Commit 8556545a authored by Beverly's avatar Beverly
Browse files

Show unlock icon on AOD 

When smart lock is keeping the device unlocked.
When UDFPS was supported, we used to show the
FP icon.

Test: manual
Fixes: 209822382
Change-Id: Id219df31575493a20c95ebd2e63a3fa1266d1d11
parent aebceb03

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

0 → 100644
+44 −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:name="_R_G_L_2_G_D_0_P_0"

              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 " />

    </group>

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

        <path android:name="_R_G_L_1_G_D_0_P_0"

              android:strokeColor="#FF000000"

              android:strokeLineCap="round"

              android:strokeLineJoin="round"

              android:strokeWidth="1.5"

              android:strokeAlpha="1"

              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 " />

    </group>

    <group android:name="_R_G_L_0_G" android:translateX="14" android:translateY="13.5">

        <path android:name="_R_G_L_0_G_D_0_P_0"

              android:strokeColor="#FF000000"

              android:strokeLineCap="round"

              android:strokeLineJoin="round"

              android:strokeWidth="1.5"

              android:strokeAlpha="1"

              android:pathData=" M21.25 14.88 C21.25,14.88 21.25,10.74 21.25,10.74 C21.25,8.59 19.5,7.29 17.44,7.21 C15.24,7.13 13.5,8.47 13.5,10.62 C13.5,10.62 13.5,15.75 13.5,15.75 " />

    </group>

</vector>
 
 No newline at end of file

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

+15 −0
Original line number Diff line number Diff line
@@ -50,6 +50,11 @@ 
        android:state_first="true"

        android:state_single="true"

        android:drawable="@drawable/ic_lock_aod" />

    <item

        android:id="@+id/unlocked_aod"

        android:state_last="true"

        android:state_single="true"

        android:drawable="@drawable/ic_unlocked_aod" />



    <item

        android:id="@+id/no_icon"
@@ -79,4 +84,14 @@ 
        android:fromId="@id/locked"

        android:toId="@id/locked_aod"

        android:drawable="@drawable/lock_ls_to_aod" />



    <transition

        android:fromId="@id/unlocked_aod"

        android:toId="@id/unlocked"

        android:drawable="@drawable/unlocked_aod_to_ls" />



    <transition

        android:fromId="@id/unlocked"

        android:toId="@id/unlocked_aod"

        android:drawable="@drawable/unlocked_ls_to_aod" />

</animated-selector>

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

0 → 100644
+133 −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.

-->

<animated-vector xmlns:aapt="http://schemas.android.com/aapt"

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

    <aapt:attr name="android:drawable">

        <vector 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" android:translateX="23" android:translateY="32.125">

                    <path android:name="_R_G_L_2_G_D_0_P_0"

                          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 " />

                </group>

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

                    <path android:name="_R_G_L_1_G_D_0_P_0"

                          android:strokeColor="#FF000000"

                          android:strokeLineCap="round"

                          android:strokeLineJoin="round"

                          android:strokeWidth="1.5"

                          android:strokeAlpha="1"

                          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 " />

                </group>

                <group android:name="_R_G_L_0_G" android:translateX="14" android:translateY="13.5">

                    <path android:name="_R_G_L_0_G_D_0_P_0"

                          android:strokeColor="#FF000000"

                          android:strokeLineCap="round"

                          android:strokeLineJoin="round"

                          android:strokeWidth="1.5"

                          android:strokeAlpha="1"

                          android:pathData=" M21.25 14.88 C21.25,14.88 21.25,10.74 21.25,10.74 C21.25,8.59 19.5,7.29 17.44,7.21 C15.24,7.13 13.5,8.47 13.5,10.62 C13.5,10.62 13.5,15.75 13.5,15.75 " />

                </group>

            </group>

            <group android:name="time_group" />

        </vector>

    </aapt:attr>

    <target android:name="_R_G_L_2_G_D_0_P_0">

        <aapt:attr name="android:animation">

            <set android:ordering="together">

                <objectAnimator android:propertyName="pathData" android:duration="333" android:startOffset="0" android:valueFrom="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 " android:valueTo="M-0.09 8.63 C1.2,8.63 2.25,7.57 2.25,6.28 C2.25,4.99 1.2,3.94 -0.09,3.94 C-1.39,3.94 -2.44,4.99 -2.44,6.28 C-2.44,7.57 -1.39,8.63 -0.09,8.63c " android:valueType="pathType">

                    <aapt:attr name="android:interpolator">

                        <pathInterpolator android:pathData="M 0.0,0.0 c0.372,0 0.203,1 1.0,1.0" />

                    </aapt:attr>

                </objectAnimator>

            </set>

        </aapt:attr>

    </target>

    <target android:name="_R_G_L_1_G_D_0_P_0">

        <aapt:attr name="android:animation">

            <set android:ordering="together">

                <objectAnimator android:propertyName="strokeWidth"

                                android:duration="333"

                                android:startOffset="0"

                                android:valueFrom="1.5"

                                android:valueTo="2"

                                android:valueType="floatType">

                    <aapt:attr name="android:interpolator">

                        <pathInterpolator android:pathData="M 0.0,0.0 c0.307,0 0.386,1 1.0,1.0" />

                    </aapt:attr>

                </objectAnimator>

            </set>

        </aapt:attr>

    </target>

    <target android:name="_R_G_L_1_G_D_0_P_0">

        <aapt:attr name="android:animation">

            <set android:ordering="together">

                <objectAnimator android:propertyName="pathData"

                                android:duration="333"

                                android:startOffset="0"

                                android:valueFrom="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 " android:valueTo="M11.25 -0.64 C11.25,-0.64 11.25,13.64 11.25,13.64 C11.25,15.22 9.97,16.5 8.39,16.5 C8.39,16.5 -8.39,16.5 -8.39,16.5 C-9.97,16.5 -11.25,15.22 -11.25,13.64 C-11.25,13.64 -11.25,-0.64 -11.25,-0.64 C-11.25,-2.22 -9.97,-3.5 -8.39,-3.5 C-8.39,-3.5 8.39,-3.5 8.39,-3.5 C9.97,-3.5 11.25,-2.22 11.25,-0.64c " android:valueType="pathType">

                    <aapt:attr name="android:interpolator">

                        <pathInterpolator android:pathData="M 0.0,0.0 c0.372,0 0.203,1 1.0,1.0" />

                    </aapt:attr>

                </objectAnimator>

            </set>

        </aapt:attr>

    </target>

    <target android:name="_R_G_L_0_G_D_0_P_0">

        <aapt:attr name="android:animation">

            <set android:ordering="together">

                <objectAnimator android:propertyName="strokeWidth"

                                android:duration="333"

                                android:startOffset="0"

                                android:valueFrom="1.5"

                                android:valueTo="2.5"

                                android:valueType="floatType">

                    <aapt:attr name="android:interpolator">

                        <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" />

                    </aapt:attr>

                </objectAnimator>

            </set>

        </aapt:attr>

    </target>

    <target android:name="_R_G_L_0_G_D_0_P_0">

        <aapt:attr name="android:animation">

            <set android:ordering="together">

                <objectAnimator android:propertyName="pathData"

                                android:duration="333"

                                android:startOffset="0"

                                android:valueFrom="M21.25 14.88 C21.25,14.88 21.25,10.74 21.25,10.74 C21.25,8.59 19.5,7.29 17.44,7.21 C15.24,7.13 13.5,8.47 13.5,10.62 C13.5,10.62 13.5,15.75 13.5,15.75 " android:valueTo="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 " android:valueType="pathType">

                    <aapt:attr name="android:interpolator">

                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.347,1 1.0,1.0" />

                    </aapt:attr>

                </objectAnimator>

            </set>

        </aapt:attr>

    </target>

    <target android:name="time_group">

        <aapt:attr name="android:animation">

            <set android:ordering="together">

                <objectAnimator android:propertyName="translateX"

                                android:duration="517"

                                android:startOffset="0"

                                android:valueFrom="0"

                                android:valueTo="1"

                                android:valueType="floatType" />

            </set>

        </aapt:attr>

    </target>

</animated-vector>
 
 No newline at end of file

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

0 → 100644
+136 −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.

-->

<animated-vector xmlns:aapt="http://schemas.android.com/aapt"

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

    <aapt:attr name="android:drawable">

        <vector 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" android:translateX="23" android:translateY="32.125">

                    <path android:name="_R_G_L_2_G_D_0_P_0"

                          android:fillColor="#FF000000"

                          android:fillAlpha="1"

                          android:fillType="nonZero"

                          android:pathData=" M-0.09 8.63 C1.2,8.63 2.25,7.57 2.25,6.28 C2.25,4.99 1.2,3.94 -0.09,3.94 C-1.39,3.94 -2.44,4.99 -2.44,6.28 C-2.44,7.57 -1.39,8.63 -0.09,8.63c " />

                </group>

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

                    <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=" M11.25 -0.64 C11.25,-0.64 11.25,13.64 11.25,13.64 C11.25,15.22 9.97,16.5 8.39,16.5 C8.39,16.5 -8.39,16.5 -8.39,16.5 C-9.97,16.5 -11.25,15.22 -11.25,13.64 C-11.25,13.64 -11.25,-0.64 -11.25,-0.64 C-11.25,-2.22 -9.97,-3.5 -8.39,-3.5 C-8.39,-3.5 8.39,-3.5 8.39,-3.5 C9.97,-3.5 11.25,-2.22 11.25,-0.64c " />

                </group>

                <group android:name="_R_G_L_0_G" android:translateX="14" android:translateY="13.5">

                    <path android:name="_R_G_L_0_G_D_0_P_0"

                          android:strokeColor="#FF000000"

                          android:strokeLineCap="round"

                          android:strokeLineJoin="round"

                          android:strokeWidth="2.5"

                          android:strokeAlpha="1"

                          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>

            <group android:name="time_group" />

        </vector>

    </aapt:attr>

    <target android:name="_R_G_L_2_G_D_0_P_0">

        <aapt:attr name="android:animation">

            <set android:ordering="together">

                <objectAnimator android:propertyName="pathData"

                                android:duration="333"

                                android:startOffset="0"

                                android:valueFrom="M-0.09 8.63 C1.2,8.63 2.25,7.57 2.25,6.28 C2.25,4.99 1.2,3.94 -0.09,3.94 C-1.39,3.94 -2.44,4.99 -2.44,6.28 C-2.44,7.57 -1.39,8.63 -0.09,8.63c " android:valueTo="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 " android:valueType="pathType">

                    <aapt:attr name="android:interpolator">

                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.347,1 1.0,1.0" />

                    </aapt:attr>

                </objectAnimator>

            </set>

        </aapt:attr>

    </target>

    <target android:name="_R_G_L_1_G_D_0_P_0">

        <aapt:attr name="android:animation">

            <set android:ordering="together">

                <objectAnimator android:propertyName="strokeWidth"

                                android:duration="333"

                                android:startOffset="0"

                                android:valueFrom="2"

                                android:valueTo="1.5"

                                android:valueType="floatType">

                    <aapt:attr name="android:interpolator">

                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.516,1 1.0,1.0" />

                    </aapt:attr>

                </objectAnimator>

            </set>

        </aapt:attr>

    </target>

    <target android:name="_R_G_L_1_G_D_0_P_0">

        <aapt:attr name="android:animation">

            <set android:ordering="together">

                <objectAnimator android:propertyName="pathData"

                                android:duration="333"

                                android:startOffset="0"

                                android:valueFrom="M11.25 -0.64 C11.25,-0.64 11.25,13.64 11.25,13.64 C11.25,15.22 9.97,16.5 8.39,16.5 C8.39,16.5 -8.39,16.5 -8.39,16.5 C-9.97,16.5 -11.25,15.22 -11.25,13.64 C-11.25,13.64 -11.25,-0.64 -11.25,-0.64 C-11.25,-2.22 -9.97,-3.5 -8.39,-3.5 C-8.39,-3.5 8.39,-3.5 8.39,-3.5 C9.97,-3.5 11.25,-2.22 11.25,-0.64c " android:valueTo="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 " android:valueType="pathType">

                    <aapt:attr name="android:interpolator">

                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.347,1 1.0,1.0" />

                    </aapt:attr>

                </objectAnimator>

            </set>

        </aapt:attr>

    </target>

    <target android:name="_R_G_L_0_G_D_0_P_0">

        <aapt:attr name="android:animation">

            <set android:ordering="together">

                <objectAnimator android:propertyName="strokeWidth"

                                android:duration="333"

                                android:startOffset="0"

                                android:valueFrom="2.5"

                                android:valueTo="1.5"

                                android:valueType="floatType">

                    <aapt:attr name="android:interpolator">

                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.516,1 1.0,1.0" />

                    </aapt:attr>

                </objectAnimator>

            </set>

        </aapt:attr>

    </target>

    <target android:name="_R_G_L_0_G_D_0_P_0">

        <aapt:attr name="android:animation">

            <set android:ordering="together">

                <objectAnimator android:propertyName="pathData"

                                android:duration="333"

                                android:startOffset="0"

                                android:valueFrom="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 " android:valueTo="M21.25 14.88 C21.25,14.88 21.25,10.74 21.25,10.74 C21.25,8.59 19.5,7.29 17.44,7.21 C15.24,7.13 13.5,8.47 13.5,10.62 C13.5,10.62 13.5,15.75 13.5,15.75 " android:valueType="pathType">

                    <aapt:attr name="android:interpolator">

                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.347,1 1.0,1.0" />

                    </aapt:attr>

                </objectAnimator>

            </set>

        </aapt:attr>

    </target>

    <target android:name="time_group">

        <aapt:attr name="android:animation">

            <set android:ordering="together">

                <objectAnimator android:propertyName="translateX"

                                android:duration="517"

                                android:startOffset="0"

                                android:valueFrom="0"

                                android:valueTo="1"

                                android:valueType="floatType" />

            </set>

        </aapt:attr>

    </target>

</animated-vector>
 
 No newline at end of file

packages/SystemUI/src/com/android/keyguard/LockIconViewController.java

+10 −38

File changed.

Preview size limit exceeded, changes collapsed.