| commit | 7f2ac96380e306828e201a207d0608f2ae74c0b9 | [log] [tgz] |
|---|---|---|
| author | Chris Li <lihongyu@google.com> | Tue Jul 27 16:30:36 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jul 27 16:30:36 2021 +0000 |
| tree | cfc701170111acaa1810b8b175ab8c9b51414a37 | |
| parent | 82eef5791fc2b0a8a4fd623ad27905426b6f42ea [diff] | |
| parent | b2aca4718f6166b9c424b2db1feb8c346c1693ad [diff] |
Merge "Hide Keyguard view after remote animation" into sc-v2-dev am: b2aca4718f Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15365824 Change-Id: Ief1b1efa9c4d50e5ee193af1a4e2c53e71911727
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java index c7c2590..d12c763 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
@@ -2369,7 +2369,7 @@ final boolean wasShowing = mShowing; onKeyguardExitFinished(); - if (mKeyguardStateController.isDismissingFromSwipe() || !wasShowing) { + if (mKeyguardStateController.isDismissingFromSwipe() || wasShowing) { mKeyguardUnlockAnimationControllerLazy.get().hideKeyguardViewAfterRemoteAnimation(); }