Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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:
Winson Chung
2022-10-07 09:53:48 +00:00
committed by Automerger Merge Worker
parent 998b368a66 ac8ef32b22
commit 66e7b80e89
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
View File

@@ -983,9 +983,11 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable,
@Override @Override
public void onAnimationCancelled(boolean isKeyguardOccluded) { public void onAnimationCancelled(boolean isKeyguardOccluded) {
if (mUnoccludeAnimator != null) { mContext.getMainExecutor().execute(() -> {
mUnoccludeAnimator.cancel(); if (mUnoccludeAnimator != null) {
} mUnoccludeAnimator.cancel();
}
});
setOccluded(isKeyguardOccluded /* isOccluded */, false /* animate */); setOccluded(isKeyguardOccluded /* isOccluded */, false /* animate */);
Log.d(TAG, "Unocclude animation cancelled. Occluded state is now: " Log.d(TAG, "Unocclude animation cancelled. Occluded state is now: "