Merge "Fix talkback not cycling on Biometric Prompt" into main (c2741c79) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -412,7 +412,6 @@ public class AuthContainerView extends LinearLayout
		});

		setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_NO);
		setFocusableInTouchMode(true);
		requestFocus();
		}

		@@ -464,7 +463,8 @@ public class AuthContainerView extends LinearLayout
		}
		}

		private void onBackInvoked() {
		@VisibleForTesting
		public void onBackInvoked() {
		sendEarlyUserCanceled();
		animateAway(AuthDialogCallback.DISMISSED_USER_CANCELED);
		}

+2 −5

Original line number	Diff line number	Diff line
		@@ -35,7 +35,6 @@ import android.os.UserManager
		import android.testing.TestableLooper
		import android.testing.TestableLooper.RunWithLooper
		import android.testing.ViewUtils
		import android.view.KeyEvent
		import android.view.View
		import android.view.WindowInsets
		import android.view.WindowManager
		@@ -202,8 +201,7 @@ open class AuthContainerViewTest : SysuiTestCase() {
		val root = container.rootView

		// Simulate back invocation
		container.dispatchKeyEvent(KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_BACK))
		container.dispatchKeyEvent(KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_BACK))
		container.onBackInvoked()
		waitForIdleSync()

		assertThat(container.parent).isNull()
		@@ -217,8 +215,7 @@ open class AuthContainerViewTest : SysuiTestCase() {
		val root = container.rootView

		// Simulate back invocation
		container.dispatchKeyEvent(KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_BACK))
		container.dispatchKeyEvent(KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_BACK))
		container.onBackInvoked()
		waitForIdleSync()

		assertThat(container.parent).isNull()