diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/ui/binder/BiometricViewBinder.kt b/packages/SystemUI/src/com/android/systemui/biometrics/ui/binder/BiometricViewBinder.kt index 4e26601afe2a7..105fd67d8e919 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/ui/binder/BiometricViewBinder.kt +++ b/packages/SystemUI/src/com/android/systemui/biometrics/ui/binder/BiometricViewBinder.kt @@ -26,6 +26,7 @@ import android.os.Bundle import android.text.method.ScrollingMovementMethod import android.util.Log import android.view.View +import android.view.View.IMPORTANT_FOR_ACCESSIBILITY_NO import android.view.accessibility.AccessibilityManager import android.widget.Button import android.widget.TextView @@ -335,6 +336,13 @@ object BiometricViewBinder { // dismiss prompt when authenticated and confirmed launch { viewModel.isAuthenticated.collect { authState -> + // Disable background view for cancelling authentication once authenticated, + // and remove from talkback + if (authState.isAuthenticated) { + backgroundView.setOnClickListener(null) + backgroundView.importantForAccessibility = + IMPORTANT_FOR_ACCESSIBILITY_NO + } if (authState.isAuthenticatedAndConfirmed) { view.announceForAccessibility( view.resources.getString(R.string.biometric_dialog_authenticated)