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

Commit fa2e75b5 authored Jul 14, 2022 by TreeHugger Robot Committed by Automerger Merge Worker Jul 14, 2022

Merge "Bouncer should dismiss if being tracked when face unlocked" into tm-d1-dev am: e12369e3

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

Change-Id: I9548c4778b9c5ca2ec39c571a99ab93b52123cdf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 184635e5 e12369e3

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -2692,7 +2692,7 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable,
		/** Hides the surface behind the keyguard by re-showing the keyguard/activity lock screen. */
		public void hideSurfaceBehindKeyguard() {
		mSurfaceBehindRemoteAnimationRequested = false;

		mKeyguardStateController.notifyKeyguardGoingAway(false);
		if (mShowing) {
		setShowingLocked(true, true);
		}

packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -397,10 +397,6 @@ public class KeyguardBouncer {
		return mShowingSoon \|\| mExpansion != EXPANSION_HIDDEN && mExpansion != EXPANSION_VISIBLE;
		}

		public boolean getShowingSoon() {
		return mShowingSoon;
		}

		/**
		* @return {@code true} when bouncer's pre-hide animation already started but isn't completely
		* hidden yet, {@code false} otherwise.

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -963,7 +963,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb

		@Override
		public boolean bouncerIsOrWillBeShowing() {
		return isBouncerShowing() \|\| mBouncer.getShowingSoon();
		return isBouncerShowing() \|\| mBouncer.inTransit();
		}

		public boolean isFullscreenBouncer() {

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -380,6 +380,16 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase {
		verify(mAlternateAuthInterceptor).hideAlternateAuthBouncer();
		}

		@Test
		public void testBouncerIsOrWillBeShowing_whenBouncerIsInTransit() {
		when(mBouncer.isShowing()).thenReturn(false);
		when(mBouncer.inTransit()).thenReturn(true);

		assertTrue(
		"Is or will be showing should be true when bouncer is in transit",
		mStatusBarKeyguardViewManager.bouncerIsOrWillBeShowing());
		}

		@Test
		public void testShowAltAuth_unlockingWithBiometricNotAllowed() {
		// GIVEN alt auth exists, unlocking with biometric isn't allowed