Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Matt Pietal
2022-11-29 20:56:03 +00:00
committed by Automerger Merge Worker
parent 4e29c9d09b b528579107
commit 77792e3739
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -306,6 +306,17 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase {
verify(mPrimaryBouncer, never()).setExpansion(anyFloat()); 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 @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