Merge "Close panel immediately on launch animation end" into tm-dev (dad4f1c9) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -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,

+1 −1

Original line number	Diff line number	Diff line
		@@ -1596,7 +1596,7 @@ public class CentralSurfacesImpl extends CoreStartable implements
		}
		}
		});
		mStatusBarKeyguardViewManager.registerCentralSurfaces(
		mKeyguardViewMediator.registerCentralSurfaces(
		/* statusBar= */ this,
		mNotificationPanelViewController,
		mPanelExpansionStateManager,