Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I0e424b8aa4b719c84dd0d0bb5a7713ea4bb4367c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Justin Weir
2023-01-17 16:52:48 +00:00
committed by Automerger Merge Worker
parent 02ca88354d 0900d05462
commit 486d707cbc
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -312,6 +312,7 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces {
private final Context mContext; private final Context mContext;
private final LockscreenShadeTransitionController mLockscreenShadeTransitionController; private final LockscreenShadeTransitionController mLockscreenShadeTransitionController;
private final DeviceStateManager mDeviceStateManager;
private CentralSurfacesCommandQueueCallbacks mCommandQueueCallbacks; private CentralSurfacesCommandQueueCallbacks mCommandQueueCallbacks;
private float mTransitionToFullShadeProgress = 0f; private float mTransitionToFullShadeProgress = 0f;
private NotificationListContainer mNotifListContainer; private NotificationListContainer mNotifListContainer;
@@ -879,8 +880,7 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces {
mMessageRouter.subscribeTo(MSG_LAUNCH_TRANSITION_TIMEOUT, mMessageRouter.subscribeTo(MSG_LAUNCH_TRANSITION_TIMEOUT,
id -> onLaunchTransitionTimeout()); id -> onLaunchTransitionTimeout());
deviceStateManager.registerCallback(mMainExecutor, mDeviceStateManager = deviceStateManager;
new FoldStateListener(mContext, this::onFoldedStateChanged));
wiredChargingRippleController.registerCallbacks(); wiredChargingRippleController.registerCallbacks();
mLightRevealScrimViewModelLazy = lightRevealScrimViewModelLazy; mLightRevealScrimViewModelLazy = lightRevealScrimViewModelLazy;
@@ -1069,6 +1069,8 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces {
} }
}); });
registerCallbacks();
mFalsingManager.addFalsingBeliefListener(mFalsingBeliefListener); mFalsingManager.addFalsingBeliefListener(mFalsingBeliefListener);
mPluginManager.addPluginListener( mPluginManager.addPluginListener(
@@ -1123,6 +1125,14 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces {
requestTopUi, componentTag)))); 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 @VisibleForTesting
void initShadeVisibilityListener() { void initShadeVisibilityListener() {
mShadeController.setVisibilityListener(new ShadeController.ShadeVisibilityListener() { mShadeController.setVisibilityListener(new ShadeController.ShadeVisibilityListener() {

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

@@ -544,6 +544,7 @@ public class CentralSurfacesImplTest extends SysuiTestCase {
mCentralSurfaces.startKeyguard(); mCentralSurfaces.startKeyguard();
mInitController.executePostInitTasks(); mInitController.executePostInitTasks();
notificationLogger.setUpWithContainer(mNotificationListContainer); notificationLogger.setUpWithContainer(mNotificationListContainer);
mCentralSurfaces.registerCallbacks();
} }
@Test @Test