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

Commit 5eccd5e4 authored by Grace Cheng's avatar Grace Cheng Committed by Automerger Merge Worker
Browse files

Merge "Disable background view after authenticated" into udc-d1-dev am:... 

Merge "Disable background view after authenticated" into udc-d1-dev am: 6c8a4894 am: 698ea27d am: 0c1c53ca

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24168800



Change-Id: Ia4a136e3171271d8f4cb47a1c9e03fb50a5f7ee0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6dc25f4b 0c1c53ca

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

+8 −0
Original line number Diff line number Diff line
@@ -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)