Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6afa3509 authored by Matt Pietal's avatar Matt Pietal Committed by Automerger Merge Worker
Browse files

Merge "Close panel immediately on launch animation end" into tm-dev am: dad4f1c9 am: 9d848fdd 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18912507



Change-Id: Ie8cb758698ad20cbe2ebef4a79a991bf80f87ca6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 01257928 9d848fdd

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

+10 −0
Original line number Diff line number Diff line
@@ -486,6 +486,8 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, 
     */

    private IRemoteAnimationRunner mKeyguardExitAnimationRunner;



    private CentralSurfaces mCentralSurfaces;



    private final DeviceConfig.OnPropertiesChangedListener mOnPropertiesChangedListener =

            new DeviceConfig.OnPropertiesChangedListener() {

            @Override
@@ -846,6 +848,13 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, 
                            + mOccluded);

                }



                @Override

                public void onLaunchAnimationEnd(boolean launchIsFullScreen) {

                    if (launchIsFullScreen) {

                        mCentralSurfaces.instantCollapseNotificationPanel();

                    }

                }



                @NonNull

                @Override

                public ViewGroup getLaunchContainer() {
@@ -2847,6 +2856,7 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, 
            @Nullable PanelExpansionStateManager panelExpansionStateManager,

            BiometricUnlockController biometricUnlockController,

            View notificationContainer, KeyguardBypassController bypassController) {

        mCentralSurfaces = centralSurfaces;

        mKeyguardViewControllerLazy.get().registerCentralSurfaces(

                centralSurfaces,

                panelView,

packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -1581,7 +1581,7 @@ public class CentralSurfacesImpl extends CoreStartable implements 
                        }

                    }

                });

        mStatusBarKeyguardViewManager.registerCentralSurfaces(

        mKeyguardViewMediator.registerCentralSurfaces(

                /* statusBar= */ this,

                mNotificationPanelViewController,

                mPanelExpansionStateManager,