Merge "After keyguard exit animation, finish before notifying" into udc-dev am: c6be7237a5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22419118 Change-Id: Ia10f77a51ba5987dfc1f4fdd5cd6df821948bef9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -2856,14 +2856,14 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
|
|||||||
+ " wasShowing=" + wasShowing);
|
+ " wasShowing=" + wasShowing);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
mKeyguardUnlockAnimationControllerLazy.get()
|
||||||
|
.notifyFinishedKeyguardExitAnimation(cancelled);
|
||||||
finishSurfaceBehindRemoteAnimation(cancelled);
|
finishSurfaceBehindRemoteAnimation(cancelled);
|
||||||
|
|
||||||
// Dispatch the callback on animation finishes.
|
// Dispatch the callback on animation finishes.
|
||||||
mUpdateMonitor.dispatchKeyguardDismissAnimationFinished();
|
mUpdateMonitor.dispatchKeyguardDismissAnimationFinished();
|
||||||
});
|
});
|
||||||
|
|
||||||
mKeyguardUnlockAnimationControllerLazy.get().notifyFinishedKeyguardExitAnimation(
|
|
||||||
cancelled);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Reference in New Issue
Block a user