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

Commit d6bd332a authored by Justin Weir's avatar Justin Weir Committed by Automerger Merge Worker
Browse files

Merge "Move fold state listener registration from constructor to start()" into... 

Merge "Move fold state listener registration from constructor to start()" into tm-qpr-dev am: 0900d054 am: 486d707c

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



Change-Id: Idf1cf53f9bb724e37a9760b7adc0965e7128e16c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents be71e6a4 486d707c

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

+12 −2
Original line number Diff line number Diff line
@@ -295,6 +295,7 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 


    private final Context mContext;

    private final LockscreenShadeTransitionController mLockscreenShadeTransitionController;

    private final DeviceStateManager mDeviceStateManager;

    private CentralSurfacesCommandQueueCallbacks mCommandQueueCallbacks;

    private float mTransitionToFullShadeProgress = 0f;

    private NotificationListContainer mNotifListContainer;
@@ -862,8 +863,7 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 
        mMessageRouter.subscribeTo(MSG_LAUNCH_TRANSITION_TIMEOUT,

                id -> onLaunchTransitionTimeout());



        deviceStateManager.registerCallback(mMainExecutor,

                new FoldStateListener(mContext, this::onFoldedStateChanged));

        mDeviceStateManager = deviceStateManager;

        wiredChargingRippleController.registerCallbacks();



        mLightRevealScrimViewModelLazy = lightRevealScrimViewModelLazy;
@@ -1052,6 +1052,8 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 
            }

        });



        registerCallbacks();



        mFalsingManager.addFalsingBeliefListener(mFalsingBeliefListener);



        mPluginManager.addPluginListener(
@@ -1106,6 +1108,14 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 
                                requestTopUi, componentTag))));

    }



    @VisibleForTesting

    /** Registers listeners/callbacks with external dependencies. */

    void registerCallbacks() {

        //TODO(b/264502026) move the rest of the listeners here.

        mDeviceStateManager.registerCallback(mMainExecutor,

                new FoldStateListener(mContext, this::onFoldedStateChanged));

    }



    @VisibleForTesting

    void initShadeVisibilityListener() {

        mShadeController.setVisibilityListener(new ShadeController.ShadeVisibilityListener() {

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CentralSurfacesImplTest.java

+1 −0
Original line number Diff line number Diff line
@@ -544,6 +544,7 @@ public class CentralSurfacesImplTest extends SysuiTestCase { 
        mCentralSurfaces.startKeyguard();

        mInitController.executePostInitTasks();

        notificationLogger.setUpWithContainer(mNotificationListContainer);

        mCentralSurfaces.registerCallbacks();

    }



    @Test