Merge "Cancel unocclude animation on main thread" into tm-qpr-dev am: ac8ef32b22
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20129961 Change-Id: Ida93700627911659957faabe07c2870f2b5d5f4a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -983,9 +983,11 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable,
|
||||
|
||||
@Override
|
||||
public void onAnimationCancelled(boolean isKeyguardOccluded) {
|
||||
if (mUnoccludeAnimator != null) {
|
||||
mUnoccludeAnimator.cancel();
|
||||
}
|
||||
mContext.getMainExecutor().execute(() -> {
|
||||
if (mUnoccludeAnimator != null) {
|
||||
mUnoccludeAnimator.cancel();
|
||||
}
|
||||
});
|
||||
|
||||
setOccluded(isKeyguardOccluded /* isOccluded */, false /* animate */);
|
||||
Log.d(TAG, "Unocclude animation cancelled. Occluded state is now: "
|
||||
|
||||
Reference in New Issue
Block a user