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

Merge "Prevent the bouncer from showing over dreams when swiping down the shade." into tm-dev

Browse Source
This commit is contained in:
Lucas Silva
2022-04-01 18:50:17 +00:00
committed by Android (Google) Code Review
parent f14e35e47d fc8beb0ae1
commit 07c54de32d
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -355,6 +355,12 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
@Override @Override
public void onPanelExpansionChanged(float fraction, boolean expanded, boolean tracking) { public void onPanelExpansionChanged(float fraction, boolean expanded, boolean tracking) {
// Avoid having the shade and the bouncer open at the same time over a dream.
final boolean hideBouncerOverDream =
mDreamOverlayStateController.isOverlayActive()
&& (mNotificationPanelViewController.isExpanded()
|| mNotificationPanelViewController.isExpanding());
// We don't want to translate the bounce when: // We don't want to translate the bounce when:
// • Keyguard is occluded, because we're in a FLAG_SHOW_WHEN_LOCKED activity and need to // • Keyguard is occluded, because we're in a FLAG_SHOW_WHEN_LOCKED activity and need to
// conserve the original animation. // conserve the original animation.
@@ -371,7 +377,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
return; return;
} else if (bouncerNeedsScrimming()) { } else if (bouncerNeedsScrimming()) {
mBouncer.setExpansion(KeyguardBouncer.EXPANSION_VISIBLE); mBouncer.setExpansion(KeyguardBouncer.EXPANSION_VISIBLE);
} else if (mShowing) { } else if (mShowing && !hideBouncerOverDream) {
if (!isWakeAndUnlocking() if (!isWakeAndUnlocking()
&& !mCentralSurfaces.isInLaunchTransition() && !mCentralSurfaces.isInLaunchTransition()
&& !isUnlockCollapsing()) { && !isUnlockCollapsing()) {