| commit | 452259b937f5e18d9a9c3a4569a65b7819312a6c | [log] [tgz] |
|---|---|---|
| author | Josh Tsuji <tsuji@google.com> | Tue Jun 07 23:17:28 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 07 23:17:28 2022 +0000 |
| tree | 573fde084453f1b1586c797ee78493a9dac0866b | |
| parent | 422f1d8b4e00536491ed1f964ac2de139ca24412 [diff] | |
| parent | c8f8b28ba718d8e745f7b912177d3779535a893d [diff] |
Merge "Set occluded = false if occlude remote animation is cancelled." into tm-dev am: 13e74f976e am: c8f8b28ba7 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18713339 Change-Id: Icf0906af4b84966ed03c60c2b051b350436d5f6f 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