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

Commit 77792e37 authored Nov 29, 2022 by Matt Pietal Committed by Automerger Merge Worker Nov 29, 2022

Merge "Fix shade over occluded activity" into tm-qpr-dev am: b5285791

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

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

parents 4e29c9d0 b5285791

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -469,6 +469,9 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
		// Don't expand to the bouncer. Instead transition back to the lock screen (see
		// CentralSurfaces#showBouncerOrLockScreenIfKeyguard)
		return;
		} else if (mKeyguardStateController.isOccluded()
		&& !mDreamOverlayStateController.isOverlayActive()) {
		return;
		} else if (needsFullscreenBouncer()) {
		if (mPrimaryBouncer != null) {
		mPrimaryBouncer.setExpansion(KeyguardBouncer.EXPANSION_VISIBLE);

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

+11 −0

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

		@Test
		public void onPanelExpansionChanged_neverTranslatesBouncerWhenOccluded() {
		when(mKeyguardStateController.isOccluded()).thenReturn(true);
		mStatusBarKeyguardViewManager.onPanelExpansionChanged(
		expansionEvent(
		/* fraction= */ KeyguardBouncer.EXPANSION_VISIBLE,
		/* expanded= */ true,
		/* tracking= */ false));
		verify(mPrimaryBouncer, never()).setExpansion(anyFloat());
		}

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