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

Commit 446d358a authored by Austin Delgado's avatar Austin Delgado
Browse files

Fix Biometric prompt button bar with 3 button nav 

Sets biometric prompt button bar to top of bottom inset.

Fixes: 338694647
Test: manually verified
Test: atest com.android.systemui.biometrics
Flag: ACONFIG constraint_bp NEXTFOOD
Change-Id: Ic3d318f0dd7f6335853441f0666a3165f753720a
parent df49c809

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

+5 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
        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"
@@ -42,6 +43,7 @@ 
        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"
@@ -55,6 +57,7 @@ 
        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/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)