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

Merge "Don't show the bouncer onPanelExpansionChanged when dozing + not pulsing" into tm-dev am: d70a79df35

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

Change-Id: I0bc68b954bde5b6aa19c5d56fe3bd37e422048aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-05-02 19:15:49 +00:00
committed by Automerger Merge Worker
parent a05638117b d70a79df35
commit aa82ab2b65
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -364,12 +364,15 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
|| mNotificationPanelViewController.isExpanding()); || mNotificationPanelViewController.isExpanding());
// We don't want to translate the bounce when: // We don't want to translate the bounce when:
// • device is dozing and not pulsing
// • 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.
// • The user quickly taps on the display and we show "swipe up to unlock." // • The user quickly taps on the display and we show "swipe up to unlock."
// • Keyguard will be dismissed by an action. a.k.a: FLAG_DISMISS_KEYGUARD_ACTIVITY // • Keyguard will be dismissed by an action. a.k.a: FLAG_DISMISS_KEYGUARD_ACTIVITY
// • Full-screen user switcher is displayed. // • Full-screen user switcher is displayed.
if (mNotificationPanelViewController.isUnlockHintRunning()) { if (mDozing && !mPulsing) {
return;
} else if (mNotificationPanelViewController.isUnlockHintRunning()) {
mBouncer.setExpansion(KeyguardBouncer.EXPANSION_HIDDEN); mBouncer.setExpansion(KeyguardBouncer.EXPANSION_HIDDEN);
} else if (mStatusBarStateController.getState() == StatusBarState.SHADE_LOCKED } else if (mStatusBarStateController.getState() == StatusBarState.SHADE_LOCKED
&& mKeyguardUpdateManager.isUdfpsEnrolled()) { && mKeyguardUpdateManager.isUdfpsEnrolled()) {