Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 66e7b80e authored by Winson Chung's avatar Winson Chung Committed by Automerger Merge Worker
Browse files

Merge "Cancel unocclude animation on main thread" into tm-qpr-dev am: ac8ef32b 

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



Change-Id: Ida93700627911659957faabe07c2870f2b5d5f4a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 998b368a ac8ef32b

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+5 −3
Original line number Diff line number Diff line
@@ -983,9 +983,11 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, 


                @Override

                public void onAnimationCancelled(boolean isKeyguardOccluded) {

                    mContext.getMainExecutor().execute(() -> {

                        if (mUnoccludeAnimator != null) {

                            mUnoccludeAnimator.cancel();

                        }

                    });



                    setOccluded(isKeyguardOccluded /* isOccluded */, false /* animate */);

                    Log.d(TAG, "Unocclude animation cancelled. Occluded state is now: "