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

Commit 1fbd8ed9 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: f0cc36f3 

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



Change-Id: Ic2e55647665daa8ab75e41d47b8cadda502f4e3b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents deb27cb1 f0cc36f3

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,

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

+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,