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

Commit 5a959a3f authored May 26, 2023 by Treehugger Robot Committed by Automerger Merge Worker May 26, 2023

Merge "Prevent bouncer from showing during unlock animation" into udc-dev am: 557775c4

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

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

parents c92b8f86 557775c4

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

+1 −0

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

	return mKeyguardStateController.isShowing()		return mKeyguardStateController.isShowing()
	&& !primaryBouncerIsOrWillBeShowing()		&& !primaryBouncerIsOrWillBeShowing()
			&& !mKeyguardStateController.isKeyguardGoingAway()
	&& isUserTrackingStarted		&& isUserTrackingStarted
	&& !hideBouncerOverDream		&& !hideBouncerOverDream
	&& !mKeyguardStateController.isOccluded()		&& !mKeyguardStateController.isOccluded()

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

+11 −0

Original line number	Original line	Diff line number	Diff line
	@@ -351,6 +351,17 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase {
	verify(mPrimaryBouncerInteractor, never()).setPanelExpansion(anyFloat());		verify(mPrimaryBouncerInteractor, never()).setPanelExpansion(anyFloat());
	}		}

			@Test
			public void onPanelExpansionChanged_neverTranslatesBouncerWhenGoingAway() {
			when(mKeyguardStateController.isKeyguardGoingAway()).thenReturn(true);
			mStatusBarKeyguardViewManager.onPanelExpansionChanged(
			expansionEvent(
			/* fraction= */ EXPANSION_VISIBLE,
			/* expanded= */ true,
			/* tracking= */ false));
			verify(mPrimaryBouncerInteractor, never()).setPanelExpansion(anyFloat());
			}

	@Test		@Test
	public void onPanelExpansionChanged_neverTranslatesBouncerWhenShowBouncer() {		public void onPanelExpansionChanged_neverTranslatesBouncerWhenShowBouncer() {
	// Since KeyguardBouncer.EXPANSION_VISIBLE = 0 panel expansion, if the unlock is dismissing		// Since KeyguardBouncer.EXPANSION_VISIBLE = 0 panel expansion, if the unlock is dismissing