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

Commit e096e5a0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes from topic "auth_credential_pin-tm-qpr-dev" into tm-qpr-dev am: c3910e2e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20152024



Change-Id: Idd695c3273d93af6e6fc1522291d24de2745ee41
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cdb7108a c3910e2e

packages/SystemUI/res/layout-land/auth_credential_password_view.xml

+13 −11
Original line number Diff line number Diff line
@@ -16,45 +16,47 @@ 


<com.android.systemui.biometrics.AuthCredentialPasswordView

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

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="horizontal"

    android:elevation="@dimen/biometric_dialog_elevation">

    android:elevation="@dimen/biometric_dialog_elevation"

    android:theme="?app:attr/lockPinPasswordStyle">



    <RelativeLayout

        android:id="@+id/auth_credential_header"

        style="@style/AuthCredentialHeaderStyle"

        style="?headerStyle"

        android:layout_width="wrap_content"

        android:layout_height="match_parent">



        <ImageView

            android:id="@+id/icon"

            style="@style/TextAppearance.AuthNonBioCredential.Icon"

            style="?headerIconStyle"

            android:layout_alignParentLeft="true"

            android:layout_alignParentTop="true"

            android:contentDescription="@null"/>



        <TextView

            android:id="@+id/title"

            style="@style/TextAppearance.AuthNonBioCredential.Title"

            style="?titleTextAppearance"

            android:layout_below="@id/icon"

            android:layout_width="wrap_content"

            android:layout_width="match_parent"

            android:layout_height="wrap_content" />



        <TextView

            android:id="@+id/subtitle"

            style="@style/TextAppearance.AuthNonBioCredential.Subtitle"

            style="?subTitleTextAppearance"

            android:layout_below="@id/title"

            android:layout_alignParentLeft="true"

            android:layout_width="wrap_content"

            android:layout_width="match_parent"

            android:layout_height="wrap_content" />



        <TextView

            android:id="@+id/description"

            style="@style/TextAppearance.AuthNonBioCredential.Description"

            style="?descriptionTextAppearance"

            android:layout_below="@id/subtitle"

            android:layout_alignParentLeft="true"

            android:layout_width="wrap_content"

            android:layout_width="match_parent"

            android:layout_height="wrap_content" />



    </RelativeLayout>
@@ -67,7 +69,7 @@ 


        <ImeAwareEditText

            android:id="@+id/lockPassword"

            style="@style/TextAppearance.AuthCredential.PasswordEntry"

            style="?passwordTextAppearance"

            android:layout_width="208dp"

            android:layout_height="wrap_content"

            android:layout_gravity="center"
@@ -77,7 +79,7 @@ 


        <TextView

            android:id="@+id/error"

            style="@style/TextAppearance.AuthNonBioCredential.Error"

            style="?errorTextAppearance"

            android:layout_gravity="center"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content" />

packages/SystemUI/res/layout-land/auth_credential_pattern_view.xml

+41 −61
Original line number Diff line number Diff line
@@ -16,91 +16,71 @@ 


<com.android.systemui.biometrics.AuthCredentialPatternView

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

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="horizontal"

    android:elevation="@dimen/biometric_dialog_elevation">

    android:elevation="@dimen/biometric_dialog_elevation"

    android:theme="?app:attr/lockPatternStyle">



    <LinearLayout

    <RelativeLayout

        android:id="@+id/auth_credential_header"

        style="?headerStyle"

        android:layout_width="0dp"

        android:layout_height="match_parent"

        android:layout_weight="1"

        android:gravity="center"

        android:orientation="vertical">



        <Space

            android:layout_width="0dp"

            android:layout_height="0dp"

            android:layout_weight="1"/>

        android:layout_weight="1">



        <ImageView

            android:id="@+id/icon"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"/>

            style="?headerIconStyle"

            android:layout_alignParentLeft="true"

            android:layout_alignParentTop="true"

            android:contentDescription="@null"/>



        <TextView

            android:id="@+id/title"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            style="@style/TextAppearance.AuthCredential.Title"/>

            style="?titleTextAppearance"

            android:layout_below="@id/icon"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"/>



        <TextView

            android:id="@+id/subtitle"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            style="@style/TextAppearance.AuthCredential.Subtitle"/>

            style="?subTitleTextAppearance"

            android:layout_below="@id/title"

            android:layout_alignParentLeft="true"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content" />



        <TextView

            android:id="@+id/description"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            style="@style/TextAppearance.AuthCredential.Description"/>



        <Space

            android:layout_width="0dp"

            android:layout_height="0dp"

            android:layout_weight="1"/>



        <TextView

            android:id="@+id/error"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            style="@style/TextAppearance.AuthCredential.Error"/>



        <Space

            android:layout_width="0dp"

            android:layout_height="0dp"

            android:layout_weight="1"/>



    </LinearLayout>

            style="?descriptionTextAppearance"

            android:layout_below="@id/subtitle"

            android:layout_alignParentLeft="true"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"/>



    <LinearLayout

        android:layout_width="0dp"

        android:layout_height="match_parent"

        android:layout_weight="1"

        android:orientation="vertical"

        android:gravity="center"

        android:paddingLeft="0dp"

        android:paddingRight="0dp"

        android:paddingTop="0dp"

        android:paddingBottom="16dp"

        android:clipToPadding="false">

    </RelativeLayout>



    <FrameLayout

            android:layout_width="wrap_content"

            android:layout_height="0dp"

        android:layout_weight="1"

            style="@style/LockPatternContainerStyle">

        style="?containerStyle"

        android:layout_width="0dp"

        android:layout_height="match_parent">



        <com.android.internal.widget.LockPatternView

            android:id="@+id/lockPattern"

                android:layout_width="match_parent"

                android:layout_height="match_parent"

            android:layout_gravity="center"

                style="@style/LockPatternStyleBiometricPrompt"/>

            android:layout_width="match_parent"

            android:layout_height="match_parent"/>



        </FrameLayout>

        <TextView

            android:id="@+id/error"

            style="?errorTextAppearance"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_gravity="center_horizontal|bottom"/>



    </LinearLayout>

    </FrameLayout>



</com.android.systemui.biometrics.AuthCredentialPatternView>
 
 No newline at end of file

packages/SystemUI/res/layout/auth_credential_password_view.xml

+13 −11
Original line number Diff line number Diff line
@@ -16,43 +16,45 @@ 


<com.android.systemui.biometrics.AuthCredentialPasswordView

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

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:elevation="@dimen/biometric_dialog_elevation"

    android:orientation="vertical">

    android:orientation="vertical"

    android:theme="?app:attr/lockPinPasswordStyle">



    <RelativeLayout

        android:id="@+id/auth_credential_header"

        style="@style/AuthCredentialHeaderStyle"

        style="?headerStyle"

        android:layout_width="match_parent"

        android:layout_height="match_parent">



        <ImageView

            android:id="@+id/icon"

            style="@style/TextAppearance.AuthNonBioCredential.Icon"

            style="?headerIconStyle"

            android:layout_alignParentLeft="true"

            android:layout_alignParentTop="true"

            android:contentDescription="@null"/>



        <TextView

            android:id="@+id/title"

            style="@style/TextAppearance.AuthNonBioCredential.Title"

            style="?titleTextAppearance"

            android:layout_below="@id/icon"

            android:layout_width="wrap_content"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"/>



        <TextView

            android:id="@+id/subtitle"

            style="@style/TextAppearance.AuthNonBioCredential.Subtitle"

            style="?subTitleTextAppearance"

            android:layout_below="@id/title"

            android:layout_width="wrap_content"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"/>



        <TextView

            android:id="@+id/description"

            style="@style/TextAppearance.AuthNonBioCredential.Description"

            style="?descriptionTextAppearance"

            android:layout_below="@id/subtitle"

            android:layout_width="wrap_content"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"/>

    </RelativeLayout>
@@ -64,7 +66,7 @@ 


        <ImeAwareEditText

            android:id="@+id/lockPassword"

            style="@style/TextAppearance.AuthCredential.PasswordEntry"

            style="?passwordTextAppearance"

            android:layout_width="208dp"

            android:layout_height="wrap_content"

            android:layout_gravity="center_horizontal"
@@ -74,7 +76,7 @@ 


        <TextView

            android:id="@+id/error"

            style="@style/TextAppearance.AuthNonBioCredential.Error"

            style="?errorTextAppearance"

            android:layout_gravity="center_horizontal"

            android:layout_width="match_parent"

            android:layout_height="wrap_content" />

packages/SystemUI/res/layout/auth_credential_pattern_view.xml

+49 −70
Original line number Diff line number Diff line
@@ -16,87 +16,66 @@ 


<com.android.systemui.biometrics.AuthCredentialPatternView

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

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical"

    android:gravity="center_horizontal"

    android:elevation="@dimen/biometric_dialog_elevation">

    android:elevation="@dimen/biometric_dialog_elevation"

    android:theme="?app:attr/lockPatternStyle">



    <RelativeLayout

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:orientation="vertical">



        <LinearLayout

        android:id="@+id/auth_credential_header"

            style="@style/AuthCredentialHeaderStyle"

        style="?headerStyle"

        android:layout_width="match_parent"

        android:layout_height="wrap_content">



        <ImageView

            android:id="@+id/icon"

                android:layout_width="48dp"

                android:layout_height="48dp"

            style="?headerIconStyle"

            android:layout_alignParentLeft="true"

            android:layout_alignParentTop="true"

            android:contentDescription="@null"/>



        <TextView

            android:id="@+id/title"

                style="@style/TextAppearance.AuthNonBioCredential.Title"

            style="?titleTextAppearance"

            android:layout_below="@id/icon"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"/>



        <TextView

            android:id="@+id/subtitle"

                style="@style/TextAppearance.AuthNonBioCredential.Subtitle"

            style="?subTitleTextAppearance"

            android:layout_below="@id/title"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"/>



        <TextView

            android:id="@+id/description"

                style="@style/TextAppearance.AuthNonBioCredential.Description"

            style="?descriptionTextAppearance"

            android:layout_below="@id/subtitle"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"/>

        </LinearLayout>



        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_below="@id/auth_credential_header"

            android:gravity="center"

            android:orientation="vertical"

            android:paddingBottom="16dp"

            android:paddingTop="60dp">

    </RelativeLayout>



    <FrameLayout

                style="@style/LockPatternContainerStyle"

                android:layout_width="wrap_content"

                android:layout_height="0dp"

                android:layout_weight="1">

        android:id="@+id/auth_credential_container"

        style="?containerStyle"

        android:layout_width="match_parent"

        android:layout_height="match_parent">



        <com.android.internal.widget.LockPatternView

            android:id="@+id/lockPattern"

                    style="@style/LockPatternStyle"

            android:layout_gravity="center"

            android:layout_width="match_parent"

                    android:layout_height="match_parent"

                    android:layout_gravity="center" />



            </FrameLayout>



        </LinearLayout>



        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_alignParentBottom="true">

            android:layout_height="match_parent"/>



        <TextView

            android:id="@+id/error"

                style="@style/TextAppearance.AuthNonBioCredential.Error"

            style="?errorTextAppearance"

            android:layout_width="match_parent"

                android:layout_height="wrap_content" />



        </LinearLayout>



    </RelativeLayout>

            android:layout_height="wrap_content"

            android:layout_gravity="center_horizontal|bottom"/>

    </FrameLayout>



</com.android.systemui.biometrics.AuthCredentialPatternView>
 
 No newline at end of file

packages/SystemUI/res/values-land/styles.xml

+30 −1
Original line number Diff line number Diff line
@@ -24,7 +24,36 @@ 
        <item name="android:paddingEnd">24dp</item>

        <item name="android:paddingTop">48dp</item>

        <item name="android:paddingBottom">10dp</item>

        <item name="android:gravity">top|center_horizontal</item>

        <item name="android:gravity">top|left</item>

    </style>



    <style name="AuthCredentialPatternContainerStyle">

        <item name="android:gravity">center</item>

        <item name="android:maxHeight">320dp</item>

        <item name="android:maxWidth">320dp</item>

        <item name="android:minHeight">200dp</item>

        <item name="android:minWidth">200dp</item>

        <item name="android:paddingHorizontal">60dp</item>

        <item name="android:paddingVertical">20dp</item>

    </style>



    <style name="TextAppearance.AuthNonBioCredential.Title">

        <item name="android:fontFamily">google-sans</item>

        <item name="android:layout_marginTop">6dp</item>

        <item name="android:textSize">36dp</item>

        <item name="android:focusable">true</item>

    </style>



    <style name="TextAppearance.AuthNonBioCredential.Subtitle">

        <item name="android:fontFamily">google-sans</item>

        <item name="android:layout_marginTop">6dp</item>

        <item name="android:textSize">18sp</item>

    </style>



    <style name="TextAppearance.AuthNonBioCredential.Description">

        <item name="android:fontFamily">google-sans</item>

        <item name="android:layout_marginTop">6dp</item>

        <item name="android:textSize">18sp</item>

    </style>



</resources>