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

Commit 01c23b6c authored by Austin Delgado's avatar Austin Delgado
Browse files

Update Biometric Prompt Credential screen styling 

Adds a back button for the credential only case and updates the edit text styling

Test: Verified manually
Test: atest CredentialPatternViewScreenshotTest
CredentialPasswordViewScreenshotTest
Bug: 437413510
Flag: EXEMPT bugfix

Change-Id: Ia7b175c2129abff9f7823a2d6836f830f24c4e82
parent c39538c7

packages/SystemUI/res/drawable/auth_credential_back_button_background.xml

0 → 100644
+5 −0
Original line number Diff line number Diff line 
<shape xmlns:android="http://schemas.android.com/apk/res/android"

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

    android:shape="oval">

    <solid android:color="@androidprv:color/materialColorSurfaceContainerHighest" />

</shape>

packages/SystemUI/res/drawable/edit_text_outline.xml

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

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

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

    android:shape="rectangle">

    <stroke

        android:width="1dp"

        android:color="@androidprv:color/materialColorOutline" />

    <corners

        android:radius="4dp" />

    <solid

        android:color="@android:color/transparent" />

</shape>

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

+119 −95
Original line number Diff line number Diff line
@@ -16,26 +16,33 @@ 


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



    <FrameLayout

        android:layout_width="0dp"

        android:layout_height="match_parent"

        android:layout_weight="1">



        <ScrollView

            android:layout_width="match_parent"

            android:layout_height="match_parent">



            <RelativeLayout

    android:id="@+id/auth_credential_header"

                style="?headerStyle"

    android:layout_width="0dp"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

    android:layout_weight="1">

                android:paddingTop="24dp">



                <ImageView

                    android:id="@+id/icon"

                    style="?headerIconStyle"

        android:layout_centerInParent="true"

        android:layout_alignParentTop="true"

                    android:layout_centerHorizontal="true"

                    android:contentDescription="@null"/>



                <TextView

                    android:id="@+id/title"

                    style="?titleTextAppearance"

        android:layout_below="@id/icon"

                    android:layout_width="match_parent"

        android:layout_height="wrap_content" />

                    android:layout_height="wrap_content"

                    android:layout_below="@id/icon"/>



                <TextView

                    android:id="@+id/subtitle"
@@ -60,7 +67,8 @@ 
                    android:layout_below="@id/subtitle"

                    android:layout_alignParentLeft="true"

                    android:layout_width="match_parent"

        android:layout_height="wrap_content" />

                    android:layout_height="wrap_content"

                    android:layout_marginTop="16dp" />



                <Button

                    android:id="@+id/fallback_button"
@@ -70,29 +78,44 @@ 
                    android:layout_below="@id/description"

                    android:visibility="gone" />

            </RelativeLayout>

        </ScrollView>



  <FrameLayout

        <ImageButton

            android:id="@+id/back_button"

            style="@style/AuthCredentialBackButton"

            android:layout_marginTop="24dp"

            android:layout_marginStart="48dp"

            android:src="@drawable/ic_arrow_back"

            android:contentDescription="@string/accessibility_back" />



    </FrameLayout>



    <RelativeLayout

        android:id="@+id/auth_credential_input"

        android:paddingHorizontal="24dp"

        android:layout_width="0dp"

        android:layout_height="match_parent"

        android:layout_weight="1"

        android:orientation="vertical">



        <LinearLayout

        android:layout_width="wrap_content"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

        android:layout_gravity="center"

            android:layout_alignParentTop="true"

            android:layout_centerHorizontal="true"

            android:layout_marginTop="80dp"

            android:orientation="vertical">



            <ImeAwareEditText

                android:id="@+id/lockPassword"

          style="?passwordTextAppearance"

          android:layout_width="208dp"

          android:layout_height="wrap_content"

                android:layout_width="match_parent"

                android:layout_height="56dp"

                android:layout_gravity="center_horizontal"

                android:imeOptions="actionNext|flagNoFullscreen|flagForceAscii"

                android:inputType="textPassword"

          android:minHeight="48dp"/>

                android:paddingStart="12dp"

                android:paddingEnd="12dp"

                style="@style/Widget.AuthCredential.Password"/>



            <TextView

                android:id="@+id/error"
@@ -108,10 +131,11 @@ 
            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:visibility="gone"

        android:layout_gravity="center_horizontal|bottom"

            android:layout_alignParentBottom="true"

            android:layout_centerHorizontal="true"

            android:layout_marginTop="12dp"

            android:layout_marginBottom="12dp"

            android:text="@string/work_challenge_emergency_button_text"/>

  </FrameLayout>

    </RelativeLayout>



</merge>

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

+75 −57
Original line number Diff line number Diff line
@@ -23,26 +23,33 @@ 
    android:elevation="@dimen/biometric_dialog_elevation"

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



    <RelativeLayout

        android:id="@+id/auth_credential_header"

        style="?headerStyle"

    <FrameLayout

        android:layout_width="0dp"

        android:layout_height="match_parent"

        android:layout_weight="1">



        <ScrollView

            android:layout_width="match_parent"

            android:layout_height="match_parent">



            <RelativeLayout

                style="?headerStyle"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:paddingTop="24dp">



                <ImageView

                    android:id="@+id/icon"

                    style="?headerIconStyle"

            android:layout_centerInParent="true"

            android:layout_alignParentTop="true"

                    android:layout_centerHorizontal="true"

                    android:contentDescription="@null"/>



                <TextView

                    android:id="@+id/title"

                    style="?titleTextAppearance"

            android:layout_below="@id/icon"

                    android:layout_width="wrap_content"

            android:layout_height="wrap_content"/>

                    android:layout_height="wrap_content"

                    android:layout_below="@id/icon"/>



                <TextView

                    android:id="@+id/subtitle"
@@ -67,7 +74,8 @@ 
                    android:layout_below="@id/subtitle"

                    android:layout_alignParentLeft="true"

                    android:layout_width="match_parent"

            android:layout_height="wrap_content" />

                    android:layout_height="wrap_content"

                    android:layout_marginTop="16dp" />



                <Button

                    android:id="@+id/fallback_button"
@@ -80,12 +88,22 @@ 
                <TextView

                    android:id="@+id/error"

                    style="?errorTextAppearanceLand"

            android:layout_below="@id/description"

                    android:layout_below="@id/fallback_button"

                    android:layout_alignParentLeft="true"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"/>



            </RelativeLayout>

        </ScrollView>



        <ImageButton

            android:id="@+id/back_button"

            style="@style/AuthCredentialBackButton"

            android:layout_marginTop="24dp"

            android:layout_marginStart="48dp"

            android:src="@drawable/ic_arrow_back"

            android:contentDescription="@string/accessibility_back" />



    </FrameLayout>



    <RelativeLayout

        android:layout_weight="1"
@@ -110,7 +128,7 @@ 
            style="@style/AuthNonBioCredentialEmergencyButtonStyle"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginBottom="35dp"

            android:layout_marginBottom="48dp"

            android:visibility="gone"

            android:layout_alignParentBottom="true"

            android:layout_centerHorizontal="true"

packages/SystemUI/res/layout/auth_credential_password_pin_content_view.xml

+99 −97
Original line number Diff line number Diff line
@@ -16,85 +16,77 @@ 


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



    <RelativeLayout

        android:layout_width="match_parent"

        android:layout_height="match_parent">



        <ScrollView

            android:layout_width="match_parent"

    android:layout_height="wrap_content">

            android:layout_height="match_parent"

            android:layout_above="@+id/emergencyCallButton">



    <RelativeLayout

      android:id="@+id/auth_credential_header"

            <LinearLayout

                style="?headerStyle"

                android:paddingTop="0dp"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

      android:paddingBottom="0dp">

                android:orientation="vertical">



                <ImageView

                    android:id="@+id/icon"

                    style="?headerIconStyle"

          android:layout_centerInParent="true"

          android:layout_alignParentTop="true"

                    android:layout_gravity="center_horizontal"

                    android:contentDescription="@null"/>



                <TextView

                    android:id="@+id/title"

                    style="?titleTextAppearance"

                    android:layout_width="match_parent"

          android:layout_height="wrap_content"

          android:layout_below="@id/icon" />

                    android:layout_height="wrap_content" />



                <TextView

                    android:id="@+id/subtitle"

                    style="?subTitleTextAppearance"

                    android:layout_width="match_parent"

          android:layout_height="wrap_content"

          android:layout_below="@id/title" />

                    android:layout_height="wrap_content" />



                <TextView

                    android:id="@+id/description"

                    style="?descriptionTextAppearance"

                    android:layout_width="match_parent"

          android:layout_height="wrap_content"

          android:layout_below="@id/subtitle" />

                    android:layout_height="wrap_content" />



                <LinearLayout

                    android:id="@+id/customized_view_container"

                    android:orientation="vertical"

                    android:gravity="center_vertical"

          android:layout_below="@id/subtitle"

                    android:layout_width="match_parent"

          android:layout_height="wrap_content" />

                    android:layout_height="wrap_content"

                    android:layout_marginTop="16dp" />



                <Button

                    android:id="@+id/fallback_button"

                    style="@style/AuthNonBioCredentialFallbackButtonStyle"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

          android:layout_below="@id/description"

                    android:visibility="gone" />

    </RelativeLayout>



  </ScrollView>



  <FrameLayout

      android:id="@+id/auth_credential_input"

      android:layout_width="match_parent"

      android:layout_height="match_parent"

      android:orientation="vertical">



                <LinearLayout

                    android:id="@+id/auth_credential_input"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

        android:layout_gravity="center"

                    android:layout_marginTop="32dp"

                    android:orientation="vertical">



                    <ImeAwareEditText

                        android:id="@+id/lockPassword"

          style="?passwordTextAppearance"

          android:layout_width="208dp"

          android:layout_height="wrap_content"

          android:layout_gravity="center_horizontal"

                        android:layout_width="match_parent"

                        android:layout_height="56dp"

                        android:imeOptions="actionNext|flagNoFullscreen|flagForceAscii"

                        android:inputType="textPassword"

          android:minHeight="48dp"/>

                        android:paddingStart="12dp"

                        android:paddingEnd="12dp"

                        style="@style/Widget.AuthCredential.Password"/>



                    <TextView

                        android:id="@+id/error"
@@ -103,6 +95,8 @@ 
                        android:layout_width="match_parent"

                        android:layout_height="wrap_content"/>

                </LinearLayout>

            </LinearLayout>

        </ScrollView>



        <Button

            android:id="@+id/emergencyCallButton"
@@ -110,10 +104,18 @@ 
            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:visibility="gone"

        android:layout_gravity="center_horizontal|bottom"

            android:layout_alignParentBottom="true"

            android:layout_centerHorizontal="true"

            android:layout_marginTop="12dp"

            android:layout_marginBottom="12dp"

            android:text="@string/work_challenge_emergency_button_text"/>

  </FrameLayout>



        <ImageButton

            android:id="@+id/back_button"

            style="@style/AuthCredentialBackButton"

            android:layout_marginStart="24dp"

            android:src="@drawable/ic_arrow_back"

            android:contentDescription="@string/accessibility_back" />



    </RelativeLayout>

</merge>