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

Commit 2dee94da authored by Aaron Liu's avatar Aaron Liu
Browse files

Changes to lockscreen for laying out the 6 digit view 

This CL aims at making changes for laying out the 6 and non 6 digit PIN
view, and also the logic for unlocking automatically after a user sets a
6 digit PIN.

Test: Tested by building and flashing on local
Bug: b/262935304
Change-Id: Ic9bde6d1572a30bbc1c03164b93c4292ca4318d3
parent 79aa1d78

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

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2023 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:width="200dp"

    android:height="200dp"

    android:viewportWidth="200"

    android:viewportHeight="200">

    <path

        android:fillColor="#FF000000"

        android:pathData="M100,100m-100,0a100,100 0,1 1,200 0a100,100 0,1 1,-200 0"/>

</vector>
 
 No newline at end of file

packages/SystemUI/res-keyguard/values/dimens.xml

+9 −0
Original line number Diff line number Diff line
@@ -69,6 +69,10 @@ 


    <!-- The size of the dots in the PIN unlock method. -->

    <dimen name="password_dot_size">9dp</dimen>



    <!-- The size of the shape in the PIN unlock method. -->

    <dimen name="password_shape_size">34dp</dimen>



    <!-- The size of PIN text in the PIN unlock method. -->

    <integer name="scaled_password_text_size">40</integer>
@@ -139,4 +143,9 @@ 


    <!-- Translation y for appear animation -->

    <dimen name="keyguard_host_view_translation_y">80dp</dimen>



    <!-- Attributes for placeholder dots in 6 digit PIN view -->

    <dimen name="default_dot_diameter">34dp</dimen>

    <dimen name="default_dot_spacing">0dp</dimen>



</resources>

packages/SystemUI/res/drawable/pin_dot_avd.xml

0 → 100644
+56 −0
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2023 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:android="http://schemas.android.com/apk/res/android"

    xmlns:aapt="http://schemas.android.com/aapt">

    <target android:name="time_group">

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

            <set android:ordering="together">

                <objectAnimator

                    android:duration="500"

                    android:propertyName="translateX"

                    android:startOffset="0"

                    android:valueFrom="0"

                    android:valueTo="1"

                    android:valueType="floatType" />

            </set>

        </aapt:attr>

    </target>

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

        <vector

            android:width="60dp"

            android:height="61dp"

            android:viewportHeight="60"

            android:viewportWidth="60">

            <group android:name="_R_G">

                <group

                    android:name="_R_G_L_0_G"

                    android:translateX="43.237"

                    android:translateY="38.112">

                    <path

                        android:name="_R_G_L_0_G_D_0_P_0"

                        android:pathData=" M-13.24 -12.11 C-11.03,-12.11 -9.24,-10.32 -9.24,-8.11 C-9.24,-5.9 -11.03,-4.11 -13.24,-4.11 C-15.44,-4.11 -17.24,-5.9 -17.24,-8.11 C-17.24,-10.32 -15.44,-12.11 -13.24,-12.11c "

                        android:strokeAlpha="1"

                        android:strokeColor="#ffffff"

                        android:strokeLineCap="round"

                        android:strokeLineJoin="round"

                        android:strokeWidth="2" />

                </group>

            </group>

            <group android:name="time_group" />

        </vector>

    </aapt:attr>

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

packages/SystemUI/res/layout/keyguard_pin_shape_non_six_digit_view.xml

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

<!--

  ~ Copyright (C) 2023 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

  -->

<com.android.keyguard.PINShapeNonSixDigitView

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

    android:orientation="horizontal"

    android:gravity="center"

    android:layout_width="match_parent"

    android:layout_height="match_parent">

</com.android.keyguard.PINShapeNonSixDigitView>
 
 No newline at end of file

packages/SystemUI/res/layout/keyguard_pin_shape_six_digit_view.xml

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

<!--

  ~ Copyright (C) 2023 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

  -->

<com.android.keyguard.PINShapeSixDigitView

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

    android:orientation="horizontal"

    android:gravity="center"

    android:layout_width="match_parent"

    android:layout_height="match_parent">

</com.android.keyguard.PINShapeSixDigitView>