diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java | 4 | ||||
| -rw-r--r-- | packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthContainerViewTest.kt | 7 |
2 files changed, 4 insertions, 7 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java b/packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java index 430ff0716ee0..fcb6c52148e6 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java +++ b/packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java @@ -428,7 +428,6 @@ public class AuthContainerView extends LinearLayout }); setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_NO); - setFocusableInTouchMode(true); requestFocus(); } @@ -480,7 +479,8 @@ public class AuthContainerView extends LinearLayout } } - private void onBackInvoked() { + @VisibleForTesting + public void onBackInvoked() { sendEarlyUserCanceled(); animateAway(AuthDialogCallback.DISMISSED_USER_CANCELED); } diff --git a/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthContainerViewTest.kt b/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthContainerViewTest.kt index 1e3ee280204b..dc69cdadc320 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthContainerViewTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthContainerViewTest.kt @@ -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() |