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

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

Merge changes from topic "bpNegativeButton" into main 

* changes:
  Fix Biometric prompt button bar with 3 button nav
  Update BP negative button style
parents 07a8100b 446d358a

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

+1 −2
Original line number Diff line number Diff line
@@ -33,8 +33,7 @@ 
        layout="@layout/biometric_prompt_button_bar"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_marginBottom="40dp"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintBottom_toBottomOf="@id/bottomGuideline"

        app:layout_constraintEnd_toEndOf="@id/panel"

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

packages/SystemUI/res/layout/biometric_prompt_button_bar.xml

+8 −3
Original line number Diff line number Diff line
@@ -23,11 +23,12 @@ 
    <!-- Negative Button, reserved for app -->

    <Button

        android:id="@+id/button_negative"

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

        style="@style/AuthCredentialNegativeButtonStyle"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center_vertical"

        android:layout_marginStart="24dp"

        android:layout_marginBottom="8dp"

        android:ellipsize="end"

        android:maxLines="2"

        android:visibility="invisible"
@@ -37,11 +38,12 @@ 
    <!-- Cancel Button, replaces negative button when biometric is accepted -->

    <Button

        android:id="@+id/button_cancel"

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

        style="@style/AuthCredentialNegativeButtonStyle"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center_vertical"

        android:layout_marginStart="24dp"

        android:layout_marginBottom="8dp"

        android:text="@string/cancel"

        android:visibility="invisible"

        app:layout_constraintBottom_toBottomOf="parent"
@@ -50,11 +52,12 @@ 
    <!-- "Use Credential" Button, replaces if device credential is allowed -->

    <Button

        android:id="@+id/button_use_credential"

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

        style="@style/AuthCredentialNegativeButtonStyle"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center_vertical"

        android:layout_marginStart="24dp"

        android:layout_marginBottom="8dp"

        android:visibility="invisible"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintStart_toStartOf="parent" />
@@ -67,6 +70,7 @@ 
        android:layout_height="wrap_content"

        android:layout_gravity="center_vertical"

        android:layout_marginEnd="24dp"

        android:layout_marginBottom="8dp"

        android:ellipsize="end"

        android:maxLines="2"

        android:text="@string/biometric_dialog_confirm"
@@ -82,6 +86,7 @@ 
        android:layout_height="wrap_content"

        android:layout_gravity="center_vertical"

        android:layout_marginEnd="24dp"

        android:layout_marginBottom="8dp"

        android:ellipsize="end"

        android:maxLines="2"

        android:text="@string/biometric_dialog_try_again"

packages/SystemUI/res/layout/biometric_prompt_constraint_layout.xml

+1 −2
Original line number Diff line number Diff line
@@ -31,8 +31,7 @@ 
        layout="@layout/biometric_prompt_button_bar"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_marginBottom="40dp"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintBottom_toBottomOf="@id/bottomGuideline"

        app:layout_constraintEnd_toEndOf="@id/panel"

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

packages/SystemUI/res/values/styles.xml

+6 −0
Original line number Diff line number Diff line
@@ -375,6 +375,12 @@ 
        <item name="android:textColor">?androidprv:attr/materialColorPrimary</item>

    </style>



    <style name="AuthCredentialNegativeButtonStyle" parent="TextAppearance.Material3.LabelLarge">

        <item name="android:fontFamily">@*android:string/config_bodyFontFamilyMedium</item>

        <item name="android:background">@color/transparent</item>

        <item name="android:textColor">?androidprv:attr/materialColorPrimary</item>

    </style>



    <style name="DeviceManagementDialogTitle">

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

        <item name="android:textAppearance">@style/TextAppearance.Dialog.Title</item>

packages/SystemUI/src/com/android/systemui/biometrics/ui/binder/BiometricViewSizeBinder.kt

+6 −0
Original line number Diff line number Diff line
@@ -321,6 +321,12 @@ object BiometricViewSizeBinder { 


                    lifecycleScope.launch {

                        viewModel.guidelineBounds.collect { bounds ->

                            val bottomInset =

                                windowManager.maximumWindowMetrics.windowInsets

                                    .getInsets(WindowInsets.Type.navigationBars())

                                    .bottom

                            mediumConstraintSet.setGuidelineEnd(R.id.bottomGuideline, bottomInset)



                            if (bounds.left >= 0) {

                                mediumConstraintSet.setGuidelineBegin(leftGuideline.id, bounds.left)

                                smallConstraintSet.setGuidelineBegin(leftGuideline.id, bounds.left)