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
This commit is contained in:
Jordan Demeulenaere
2022-07-07 12:27:52 +00:00
parent 0251a89274
commit b465763e12

View File

@@ -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()) {