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

Commit 446638ae authored by Grace Cheng's avatar Grace Cheng Committed by Android (Google) Code Review
Browse files

Merge "Remove fulscreen a11y cancel button in prompt" into main

parents f58dcb4d c54bcfa0

packages/SystemUI/res/layout/biometric_prompt_one_pane_layout.xml

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
        android:layout_width="0dp"

        android:layout_height="0dp"

        android:contentDescription="@string/cancel"

        android:importantForAccessibility="no"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintStart_toStartOf="parent"

packages/SystemUI/res/layout/biometric_prompt_two_pane_layout.xml

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ android:layout_height="match_parent"> 
        android:layout_width="0dp"

        android:layout_height="0dp"

        android:contentDescription="@string/cancel"

        android:importantForAccessibility="no"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintStart_toStartOf="parent"

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

+0 −1
Original line number Diff line number Diff line
@@ -139,7 +139,6 @@ object BiometricViewBinder { 
                    )

                }

            }

        ViewCompat.setAccessibilityDelegate(backgroundView, cancelDelegate)

        ViewCompat.setAccessibilityDelegate(cancelButton, cancelDelegate)



        // TODO(b/330788871): temporary workaround for the unsafe callbacks & legacy controllers