| commit | 87a3ef00104bb401eae808f0979fea04b9d0c8fe | [log] [tgz] |
|---|---|---|
| author | Josh Tsuji <tsuji@google.com> | Tue Jun 07 23:42:31 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 07 23:42:31 2022 +0000 |
| tree | 825988749d22b2ed85b33e74e01f8bfa44e281d2 | |
| parent | 44b6cb625ff200572dc8e14f9c885450c66a7b3b [diff] | |
| parent | 452259b937f5e18d9a9c3a4569a65b7819312a6c [diff] |
Merge "Set occluded = false if occlude remote animation is cancelled." into tm-dev am: 13e74f976e am: c8f8b28ba7 am: 452259b937 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18713339 Change-Id: If43599b854ef155baba922fe048002d1970b1796 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java index 6e2707c..c5f6b78 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
@@ -841,8 +841,9 @@ @Override public void onLaunchAnimationCancelled() { - Log.d(TAG, "Occlude launch animation cancelled. " - + "Occluded state is now: " + mOccluded); + setOccluded(true /* occluded */, false /* animate */); + Log.d(TAG, "Occlude launch animation cancelled. Occluded state is now: " + + mOccluded); } @NonNull @@ -905,6 +906,10 @@ if (mUnoccludeAnimator != null) { mUnoccludeAnimator.cancel(); } + + setOccluded(false /* isOccluded */, false /* animate */); + Log.d(TAG, "Unocclude animation cancelled. Occluded state is now: " + + mOccluded); } @Override