diff options
| author | 2022-07-07 12:27:52 +0000 | |
|---|---|---|
| committer | 2022-07-07 12:27:52 +0000 | |
| commit | b465763e12c7edc59ac720b50d7761cfa2ed8e29 (patch) | |
| tree | e9920c861db2e2c4851666456be9e200765023dc | |
| parent | 0251a89274a6b4d641aa1d3d751b80b2130279b1 (diff) | |
Fix notification animation from AOD
This CL fixes the notification animation when launched from the AOD by
making sure that we don't play both the notification animation and the
wake-and-unlock transition.
As shown in b/236487811#comment24, the resulting animation looks better
but still not perfect. A better, longer term fix would probably be to
not wake up the phone at all, do the transition, then instantly hide the
shade/keyguard.
Bug: 236487811
Test: Manual
Change-Id: I4dec3651ea385a74c3564ad7c19fb10802b3464d
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java index 2daa4759457d..6258deda804f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java @@ -2721,7 +2721,8 @@ public class CentralSurfacesImpl extends CoreStartable implements @Override public void dismissKeyguardThenExecute(OnDismissAction action, Runnable cancelAction, boolean afterKeyguardGone) { - if (mWakefulnessLifecycle.getWakefulness() == WAKEFULNESS_ASLEEP + if (!action.willRunAnimationOnKeyguard() + && mWakefulnessLifecycle.getWakefulness() == WAKEFULNESS_ASLEEP && mKeyguardStateController.canDismissLockScreen() && !mStatusBarStateController.leaveOpenOnKeyguardHide() && mDozeServiceHost.isPulsing()) { |