diff options
| author | 2022-06-16 16:37:49 +0000 | |
|---|---|---|
| committer | 2022-06-16 16:37:49 +0000 | |
| commit | 9d848fdd7ac5b8a82b211aeca65ef09014c22c0f (patch) | |
| tree | 530ef2979554d4e03493918f99d01bdb5441d778 | |
| parent | 4444acb77439771b376c054095a556b7bf563110 (diff) | |
| parent | dad4f1c9e868a5d1cc094cb6ddc695cd315d984a (diff) | |
Merge "Close panel immediately on launch animation end" into tm-dev am: dad4f1c9e8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18912507
Change-Id: Ic9462e49f25516bb4b977e8394997c533ebdcdf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java | 10 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java index 80ad93fd84e7..3ad43ac32185 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java @@ -485,6 +485,8 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, */ private IRemoteAnimationRunner mKeyguardExitAnimationRunner; + private CentralSurfaces mCentralSurfaces; + private final DeviceConfig.OnPropertiesChangedListener mOnPropertiesChangedListener = new DeviceConfig.OnPropertiesChangedListener() { @Override @@ -845,6 +847,13 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, + mOccluded); } + @Override + public void onLaunchAnimationEnd(boolean launchIsFullScreen) { + if (launchIsFullScreen) { + mCentralSurfaces.instantCollapseNotificationPanel(); + } + } + @NonNull @Override public ViewGroup getLaunchContainer() { @@ -2846,6 +2855,7 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, @Nullable PanelExpansionStateManager panelExpansionStateManager, BiometricUnlockController biometricUnlockController, View notificationContainer, KeyguardBypassController bypassController) { + mCentralSurfaces = centralSurfaces; mKeyguardViewControllerLazy.get().registerCentralSurfaces( centralSurfaces, panelView, diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java index 367684faa621..705de9b43ed0 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java @@ -1596,7 +1596,7 @@ public class CentralSurfacesImpl extends CoreStartable implements } } }); - mStatusBarKeyguardViewManager.registerCentralSurfaces( + mKeyguardViewMediator.registerCentralSurfaces( /* statusBar= */ this, mNotificationPanelViewController, mPanelExpansionStateManager, |