Merge "Stop biometric prompt dismissal animation from cancelling" into main (ff0bd87d) · Commits · e / os / android_frameworks_base

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -489,6 +489,10 @@ public class AuthContainerView extends LinearLayout
		public void onAttachedToWindow() {
		super.onAttachedToWindow();

		if (mContainerState == STATE_ANIMATING_OUT) {
		return;
		}

		mWakefulnessLifecycle.addObserver(this);
		mPanelInteractionDetector.enable(
		() -> animateAway(AuthDialogCallback.DISMISSED_USER_CANCELED));

+11 −0

Original line number	Diff line number	Diff line
		@@ -54,6 +54,7 @@ import com.android.systemui.flags.FakeFeatureFlags
		import com.android.systemui.flags.Flags
		import com.android.systemui.keyguard.WakefulnessLifecycle
		import com.android.systemui.statusbar.VibratorHelper
		import com.android.systemui.statusbar.events.ANIMATING_OUT
		import com.android.systemui.util.concurrency.FakeExecutor
		import com.android.systemui.util.time.FakeSystemClock
		import com.google.common.truth.Truth.assertThat
		@@ -210,6 +211,16 @@ open class AuthContainerViewTest : SysuiTestCase() {
		)
		}

		@Test
		fun testIgnoresAnimatedInWhenDialogAnimatingOut() {
		val container = initializeFingerprintContainer(addToView = false)
		container.mContainerState = ANIMATING_OUT
		container.addToView()
		waitForIdleSync()

		verify(callback, never()).onDialogAnimatedIn(anyLong(), anyBoolean())
		}

		@Test
		fun testDismissBeforeIntroEnd() {
		val container = initializeFingerprintContainer()