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

Commit d0931a56 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: I4eff2ba40e1178994be69c0705917d3f52c4b978
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 90567929 557775c4

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

+1 −0

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

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

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

+11 −0

Original line number	Diff line number	Diff line
		@@ -351,6 +351,17 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase {
		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
		public void onPanelExpansionChanged_neverTranslatesBouncerWhenShowBouncer() {
		// Since KeyguardBouncer.EXPANSION_VISIBLE = 0 panel expansion, if the unlock is dismissing