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

Merge "Set occluded = false if occlude remote animation is cancelled." into tm-dev am: 13e74f976e

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

Change-Id: I54cd5e44b2af7217d85fbe011118c950d6e0458b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Josh Tsuji
2022-06-07 22:51:26 +00:00
committed by Automerger Merge Worker
parent bb366bc764 13e74f976e
commit 970389cf75
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -840,8 +840,9 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable,
@Override @Override
public void onLaunchAnimationCancelled() { public void onLaunchAnimationCancelled() {
Log.d(TAG, "Occlude launch animation cancelled. " setOccluded(true /* occluded */, false /* animate */);
+ "Occluded state is now: " + mOccluded); Log.d(TAG, "Occlude launch animation cancelled. Occluded state is now: "
+ mOccluded);
} }
@NonNull @NonNull
@@ -904,6 +905,10 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable,
if (mUnoccludeAnimator != null) { if (mUnoccludeAnimator != null) {
mUnoccludeAnimator.cancel(); mUnoccludeAnimator.cancel();
} }
setOccluded(false /* isOccluded */, false /* animate */);
Log.d(TAG, "Unocclude animation cancelled. Occluded state is now: "
+ mOccluded);
} }
@Override @Override