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

Commit 88ea7fbb authored by Austin Delgado's avatar Austin Delgado Committed by Android (Google) Code Review
Browse files

Merge "Update constraint biometric prompt panel sizing" into main

parents 964e75b0 40184f08

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

+14 −20
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ android:layout_height="match_parent"> 
        android:layout_height="wrap_content"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintHorizontal_bias="0.8"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintTop_toTopOf="parent"

        tools:srcCompat="@tools:sample/avatars" />
@@ -60,11 +59,12 @@ android:layout_height="match_parent"> 
        android:id="@+id/scrollView"

        android:layout_width="0dp"

        android:layout_height="0dp"

        android:fillViewport="true"

        android:padding="24dp"

        app:layout_constrainedHeight="true"

        app:layout_constrainedWidth="true"

        app:layout_constraintBottom_toTopOf="@+id/buttonBarrier"

        android:paddingBottom="16dp"

        android:paddingLeft="24dp"

        android:paddingRight="12dp"

        android:paddingTop="24dp"

        android:fadeScrollbars="false"

        app:layout_constraintBottom_toTopOf="@+id/button_bar"

        app:layout_constraintEnd_toStartOf="@+id/midGuideline"

        app:layout_constraintStart_toStartOf="@id/leftGuideline"

        app:layout_constraintTop_toTopOf="@+id/topGuideline">
@@ -91,7 +91,7 @@ android:layout_height="match_parent"> 
                android:layout_width="0dp"

                android:layout_height="wrap_content"

                android:textAlignment="viewStart"

                android:paddingLeft="8dp"

                android:paddingLeft="16dp"

                app:layout_constraintBottom_toBottomOf="@+id/logo"

                app:layout_constraintEnd_toEndOf="parent"

                app:layout_constraintStart_toEndOf="@+id/logo"
@@ -119,7 +119,7 @@ android:layout_height="match_parent"> 
                style="@style/TextAppearance.AuthCredential.Subtitle"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginTop="12dp"

                android:layout_marginTop="16dp"

                android:gravity="@integer/biometric_dialog_text_gravity"

                android:paddingHorizontal="0dp"

                android:textAlignment="viewStart"
@@ -133,6 +133,7 @@ android:layout_height="match_parent"> 
                android:id="@+id/customized_view_container"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_marginTop="24dp"

                android:gravity="center_vertical"

                android:orientation="vertical"

                android:visibility="gone"
@@ -148,6 +149,7 @@ android:layout_height="match_parent"> 
                style="@style/TextAppearance.AuthCredential.Description"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginTop="24dp"

                android:gravity="@integer/biometric_dialog_text_gravity"

                android:paddingHorizontal="0dp"

                android:textAlignment="viewStart"
@@ -179,7 +181,7 @@ android:layout_height="match_parent"> 
        android:fadingEdge="horizontal"

        android:gravity="center_horizontal"

        android:scrollHorizontally="true"

        app:layout_constraintBottom_toTopOf="@+id/buttonBarrier"

        app:layout_constraintBottom_toTopOf="@+id/button_bar"

        app:layout_constraintEnd_toEndOf="@+id/biometric_icon"

        app:layout_constraintStart_toStartOf="@+id/biometric_icon"

        app:layout_constraintTop_toBottomOf="@+id/biometric_icon"
@@ -189,7 +191,7 @@ android:layout_height="match_parent"> 
        android:id="@+id/button_bar"

        layout="@layout/biometric_prompt_button_bar"

        android:layout_width="0dp"

        android:layout_height="0dp"

        android:layout_height="wrap_content"

        app:layout_constraintBottom_toTopOf="@id/bottomGuideline"

        app:layout_constraintEnd_toEndOf="@id/scrollView"

        app:layout_constraintStart_toStartOf="@id/scrollView"
@@ -204,14 +206,6 @@ android:layout_height="match_parent"> 
        app:barrierDirection="top"

        app:constraint_referenced_ids="scrollView" />



    <androidx.constraintlayout.widget.Barrier

        android:id="@+id/buttonBarrier"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        app:barrierAllowsGoneWidgets="false"

        app:barrierDirection="top"

        app:constraint_referenced_ids="button_bar" />



    <androidx.constraintlayout.widget.Guideline

        android:id="@+id/leftGuideline"

        android:layout_width="wrap_content"
@@ -238,13 +232,13 @@ android:layout_height="match_parent"> 
        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:orientation="horizontal"

        app:layout_constraintGuide_end="@dimen/biometric_dialog_border_padding" />

        app:layout_constraintGuide_end="40dp" />



    <androidx.constraintlayout.widget.Guideline

        android:id="@+id/topGuideline"

        android:layout_width="0dp"

        android:layout_height="0dp"

        android:orientation="horizontal"

        app:layout_constraintGuide_begin="@dimen/biometric_dialog_border_padding" />

        app:layout_constraintGuide_begin="0dp" />



</androidx.constraintlayout.widget.ConstraintLayout>

packages/SystemUI/res/layout-sw600dp/biometric_prompt_constraint_layout.xml

+22 −15
Original line number Diff line number Diff line
@@ -29,14 +29,16 @@ 
        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintEnd_toStartOf="@+id/rightGuideline"

        app:layout_constraintStart_toStartOf="@+id/leftGuideline"

        app:layout_constraintTop_toTopOf="@+id/topBarrier" />

        app:layout_constraintTop_toTopOf="@+id/topBarrier"

        app:layout_constraintWidth_max="640dp" />



    <include

        layout="@layout/biometric_prompt_button_bar"

        android:id="@+id/button_bar"

        layout="@layout/biometric_prompt_button_bar"

        android:layout_width="0dp"

        android:layout_height="match_parent"

        app:layout_constraintBottom_toTopOf="@id/bottomGuideline"

        android:layout_height="wrap_content"

        android:layout_marginBottom="40dp"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintEnd_toEndOf="@id/panel"

        app:layout_constraintStart_toStartOf="@id/panel" />
@@ -44,13 +46,14 @@ 
        android:id="@+id/scrollView"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:fadeScrollbars="false"

        android:fillViewport="true"

        android:paddingBottom="36dp"

        android:paddingHorizontal="24dp"

        android:paddingBottom="32dp"

        android:paddingHorizontal="32dp"

        android:paddingTop="24dp"

        app:layout_constrainedHeight="true"

        app:layout_constrainedWidth="true"

        app:layout_constraintBottom_toTopOf="@+id/biometric_icon"

        app:layout_constraintBottom_toTopOf="@+id/scrollBarrier"

        app:layout_constraintEnd_toEndOf="@id/panel"

        app:layout_constraintStart_toStartOf="@id/panel"

        app:layout_constraintTop_toTopOf="@+id/topGuideline"
@@ -63,10 +66,10 @@ 


            <ImageView

                android:id="@+id/logo"

                android:contentDescription="@string/biometric_dialog_logo"

                android:layout_width="@dimen/biometric_prompt_logo_size"

                android:layout_height="@dimen/biometric_prompt_logo_size"

                android:layout_gravity="center"

                android:contentDescription="@string/biometric_dialog_logo"

                android:scaleType="fitXY"

                android:visibility="visible"

                app:layout_constraintBottom_toTopOf="@+id/logo_description"
@@ -79,6 +82,7 @@ 
                style="@style/TextAppearance.AuthCredential.LogoDescription"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:paddingTop="16dp"

                app:layout_constraintBottom_toTopOf="@+id/title"

                app:layout_constraintEnd_toEndOf="parent"

                app:layout_constraintStart_toStartOf="parent"
@@ -114,6 +118,7 @@ 
                android:layout_height="wrap_content"

                android:gravity="center_vertical"

                android:orientation="vertical"

                android:paddingTop="24dp"

                android:visibility="gone"

                app:layout_constraintBottom_toBottomOf="parent"

                app:layout_constraintEnd_toEndOf="parent"
@@ -126,6 +131,8 @@ 
                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:gravity="@integer/biometric_dialog_text_gravity"

                android:paddingTop="16dp"

                android:textAlignment="viewStart"

                app:layout_constraintBottom_toBottomOf="parent"

                app:layout_constraintEnd_toEndOf="parent"

                app:layout_constraintStart_toStartOf="parent"
@@ -153,7 +160,7 @@ 
        android:fadingEdge="horizontal"

        android:gravity="center_horizontal"

        android:scrollHorizontally="true"

        app:layout_constraintBottom_toTopOf="@+id/buttonBarrier"

        app:layout_constraintBottom_toTopOf="@+id/button_bar"

        app:layout_constraintEnd_toEndOf="@+id/panel"

        app:layout_constraintStart_toStartOf="@+id/panel"

        app:layout_constraintTop_toBottomOf="@+id/biometric_icon"
@@ -172,12 +179,12 @@ 


    <!-- Try Again Button -->

    <androidx.constraintlayout.widget.Barrier

        android:id="@+id/buttonBarrier"

        android:id="@+id/scrollBarrier"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        app:barrierAllowsGoneWidgets="false"

        app:barrierDirection="top"

        app:constraint_referenced_ids="button_bar" />

        app:constraint_referenced_ids="biometric_icon, button_bar" />



    <!-- Guidelines for setting panel border -->

    <androidx.constraintlayout.widget.Guideline
@@ -199,14 +206,14 @@ 
        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:orientation="horizontal"

        app:layout_constraintGuide_end="@dimen/biometric_dialog_border_padding" />

        app:layout_constraintGuide_end="40dp" />



    <androidx.constraintlayout.widget.Guideline

        android:id="@+id/topGuideline"

        android:layout_width="0dp"

        android:layout_height="0dp"

        android:orientation="horizontal"

        app:layout_constraintGuide_percent="0.25171" />

        app:layout_constraintGuide_begin="56dp" />



    <com.android.systemui.biometrics.BiometricPromptLottieViewWrapper

        android:id="@+id/biometric_icon"
@@ -216,7 +223,7 @@ 
        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintVertical_bias="0.8"

        app:layout_constraintVertical_bias="1.0"

        tools:srcCompat="@tools:sample/avatars" />



    <com.android.systemui.biometrics.BiometricPromptLottieViewWrapper

packages/SystemUI/res/layout/biometric_prompt_button_bar.xml

+6 −5
Original line number Diff line number Diff line
@@ -17,12 +17,13 @@ 
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:theme="@style/Theme.SystemUI.Dialog"

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



    <!-- Negative Button, reserved for app -->

    <Button

        android:id="@+id/button_negative"

        style="@*android:style/Widget.DeviceDefault.Button.Borderless.Colored"

        style="@style/Widget.Dialog.Button.BorderButton"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center_vertical"
@@ -36,7 +37,7 @@ 
    <!-- Cancel Button, replaces negative button when biometric is accepted -->

    <Button

        android:id="@+id/button_cancel"

        style="@*android:style/Widget.DeviceDefault.Button.Borderless.Colored"

        style="@style/Widget.Dialog.Button.BorderButton"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center_vertical"
@@ -49,7 +50,7 @@ 
    <!-- "Use Credential" Button, replaces if device credential is allowed -->

    <Button

        android:id="@+id/button_use_credential"

        style="@*android:style/Widget.DeviceDefault.Button.Borderless.Colored"

        style="@style/Widget.Dialog.Button.BorderButton"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center_vertical"
@@ -61,7 +62,7 @@ 
    <!-- Positive Button -->

    <Button

        android:id="@+id/button_confirm"

        style="@*android:style/Widget.DeviceDefault.Button.Colored"

        style="@style/Widget.Dialog.Button"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center_vertical"
@@ -76,7 +77,7 @@ 
    <!-- Try Again Button -->

    <Button

        android:id="@+id/button_try_again"

        style="@*android:style/Widget.DeviceDefault.Button.Colored"

        style="@style/Widget.Dialog.Button"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center_vertical"

packages/SystemUI/res/layout/biometric_prompt_constraint_layout.xml

+18 −14
Original line number Diff line number Diff line
@@ -35,24 +35,26 @@ 
        android:id="@+id/button_bar"

        layout="@layout/biometric_prompt_button_bar"

        android:layout_width="0dp"

        android:layout_height="match_parent"

        app:layout_constraintBottom_toTopOf="@id/bottomGuideline"

        android:layout_height="wrap_content"

        android:layout_marginBottom="40dp"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintEnd_toEndOf="@id/panel"

        app:layout_constraintStart_toStartOf="@id/panel" />



    <ScrollView

        android:id="@+id/scrollView"

        android:layout_width="match_parent"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:fillViewport="true"

        android:fadeScrollbars="false"

        android:paddingBottom="36dp"

        android:paddingHorizontal="24dp"

        android:paddingTop="24dp"

        app:layout_constrainedHeight="true"

        app:layout_constrainedWidth="true"

        app:layout_constraintBottom_toTopOf="@+id/biometric_icon"

        app:layout_constraintEnd_toEndOf="@id/rightGuideline"

        app:layout_constraintStart_toStartOf="@id/leftGuideline"

        app:layout_constraintBottom_toTopOf="@+id/scrollBarrier"

        app:layout_constraintEnd_toEndOf="@id/panel"

        app:layout_constraintStart_toStartOf="@id/panel"

        app:layout_constraintTop_toTopOf="@+id/topGuideline"

        app:layout_constraintVertical_bias="1.0">
@@ -79,6 +81,7 @@ 
                style="@style/TextAppearance.AuthCredential.LogoDescription"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:paddingTop="8dp"

                app:layout_constraintBottom_toTopOf="@+id/title"

                app:layout_constraintEnd_toEndOf="parent"

                app:layout_constraintStart_toStartOf="parent"
@@ -114,8 +117,8 @@ 
                android:layout_height="wrap_content"

                android:gravity="center_vertical"

                android:orientation="vertical"

                android:visibility="gone"

                android:paddingTop="24dp"

                android:visibility="gone"

                app:layout_constraintBottom_toBottomOf="parent"

                app:layout_constraintEnd_toEndOf="parent"

                app:layout_constraintStart_toStartOf="parent"
@@ -127,7 +130,8 @@ 
                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:gravity="@integer/biometric_dialog_text_gravity"

                android:paddingTop="24dp"

                android:textAlignment="viewStart"

                android:paddingTop="16dp"

                app:layout_constraintBottom_toBottomOf="parent"

                app:layout_constraintEnd_toEndOf="parent"

                app:layout_constraintStart_toStartOf="parent"
@@ -154,7 +158,7 @@ 
        android:fadingEdge="horizontal"

        android:gravity="center_horizontal"

        android:scrollHorizontally="true"

        app:layout_constraintBottom_toTopOf="@+id/buttonBarrier"

        app:layout_constraintBottom_toTopOf="@+id/button_bar"

        app:layout_constraintEnd_toEndOf="@+id/panel"

        app:layout_constraintStart_toStartOf="@+id/panel"

        app:layout_constraintTop_toBottomOf="@+id/biometric_icon"
@@ -169,12 +173,12 @@ 
        app:constraint_referenced_ids="scrollView" />



    <androidx.constraintlayout.widget.Barrier

        android:id="@+id/buttonBarrier"

        android:id="@+id/scrollBarrier"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        app:barrierAllowsGoneWidgets="false"

        app:barrierDirection="top"

        app:constraint_referenced_ids="button_bar" />

        app:constraint_referenced_ids="biometric_icon, button_bar" />



    <androidx.constraintlayout.widget.Guideline

        android:id="@+id/leftGuideline"
@@ -195,14 +199,14 @@ 
        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:orientation="horizontal"

        app:layout_constraintGuide_end="@dimen/biometric_dialog_border_padding" />

        app:layout_constraintGuide_end="40dp" />



    <androidx.constraintlayout.widget.Guideline

        android:id="@+id/topGuideline"

        android:layout_width="0dp"

        android:layout_height="0dp"

        android:orientation="horizontal"

        app:layout_constraintGuide_percent="0.25" />

        app:layout_constraintGuide_begin="119dp" />



    <com.android.systemui.biometrics.BiometricPromptLottieViewWrapper

        android:id="@+id/biometric_icon"
@@ -212,7 +216,7 @@ 
        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintVertical_bias="0.8"

        app:layout_constraintVertical_bias="1.0"

        tools:srcCompat="@tools:sample/avatars" />



    <com.android.systemui.biometrics.BiometricPromptLottieViewWrapper

packages/SystemUI/res/values/dimens.xml

+17 −1
Original line number Diff line number Diff line
@@ -1091,7 +1091,7 @@ 
    <dimen name="remote_input_history_extra_height">60dp</dimen>



    <!-- Biometric Dialog values -->

    <dimen name="biometric_dialog_face_icon_size">64dp</dimen>

    <dimen name="biometric_dialog_face_icon_size">54dp</dimen>

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

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

    <dimen name="biometric_dialog_button_negative_max_width">160dp</dimen>
@@ -1109,6 +1109,22 @@ 
    <dimen name="biometric_dialog_width">240dp</dimen>

    <dimen name="biometric_dialog_height">240dp</dimen>



    <!-- Dimensions for biometric prompt panel padding -->

    <dimen name="biometric_prompt_small_horizontal_guideline_padding">344dp</dimen>

    <dimen name="biometric_prompt_udfps_horizontal_guideline_padding">114dp</dimen>

    <dimen name="biometric_prompt_udfps_mid_guideline_padding">409dp</dimen>

    <dimen name="biometric_prompt_medium_horizontal_guideline_padding">640dp</dimen>

    <dimen name="biometric_prompt_medium_mid_guideline_padding">330dp</dimen>



    <!-- Dimensions for biometric prompt icon padding -->

    <dimen name="biometric_prompt_portrait_small_bottom_padding">60dp</dimen>

    <dimen name="biometric_prompt_portrait_medium_bottom_padding">160dp</dimen>

    <dimen name="biometric_prompt_portrait_large_screen_bottom_padding">176dp</dimen>

    <dimen name="biometric_prompt_landscape_small_bottom_padding">192dp</dimen>

    <dimen name="biometric_prompt_landscape_small_horizontal_padding">145dp</dimen>

    <dimen name="biometric_prompt_landscape_medium_bottom_padding">148dp</dimen>

    <dimen name="biometric_prompt_landscape_medium_horizontal_padding">125dp</dimen>



    <!-- Dimensions for biometric prompt custom content view. -->

    <dimen name="biometric_prompt_logo_size">32dp</dimen>

    <dimen name="biometric_prompt_content_corner_radius">28dp</dimen>