diff options
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/Dependency.java')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/Dependency.java | 46 |
1 files changed, 18 insertions, 28 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/Dependency.java b/packages/SystemUI/src/com/android/systemui/Dependency.java index 00b33a416df4..925fc5c3e268 100644 --- a/packages/SystemUI/src/com/android/systemui/Dependency.java +++ b/packages/SystemUI/src/com/android/systemui/Dependency.java @@ -47,6 +47,7 @@ import com.android.systemui.dagger.qualifiers.Background; import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.dock.DockManager; import com.android.systemui.dump.DumpManager; +import com.android.systemui.flags.FeatureFlags; import com.android.systemui.fragments.FragmentService; import com.android.systemui.keyguard.ScreenLifecycle; import com.android.systemui.keyguard.WakefulnessLifecycle; @@ -67,14 +68,12 @@ import com.android.systemui.privacy.PrivacyItemController; import com.android.systemui.qs.ReduceBrightColorsController; import com.android.systemui.qs.tiles.dialog.InternetDialogFactory; import com.android.systemui.recents.OverviewProxyService; -import com.android.systemui.recents.Recents; import com.android.systemui.screenrecord.RecordingController; import com.android.systemui.shared.plugins.PluginManager; import com.android.systemui.shared.system.ActivityManagerWrapper; import com.android.systemui.shared.system.DevicePolicyManagerWrapper; import com.android.systemui.shared.system.PackageManagerWrapper; import com.android.systemui.statusbar.CommandQueue; -import com.android.systemui.statusbar.FeatureFlags; import com.android.systemui.statusbar.NotificationListener; import com.android.systemui.statusbar.NotificationLockscreenUserManager; import com.android.systemui.statusbar.NotificationMediaManager; @@ -90,8 +89,12 @@ import com.android.systemui.statusbar.notification.NotificationEntryManager.Keyg import com.android.systemui.statusbar.notification.NotificationFilter; import com.android.systemui.statusbar.notification.collection.legacy.NotificationGroupManagerLegacy; import com.android.systemui.statusbar.notification.collection.legacy.VisualStabilityManager; +import com.android.systemui.statusbar.notification.collection.render.GroupExpansionManager; +import com.android.systemui.statusbar.notification.collection.render.GroupMembershipManager; import com.android.systemui.statusbar.notification.logging.NotificationLogger; import com.android.systemui.statusbar.notification.row.NotificationGutsManager; +import com.android.systemui.statusbar.notification.stack.AmbientState; +import com.android.systemui.statusbar.notification.stack.NotificationSectionsManager; import com.android.systemui.statusbar.phone.AutoHideController; import com.android.systemui.statusbar.phone.DozeParameters; import com.android.systemui.statusbar.phone.KeyguardDismissUtil; @@ -100,10 +103,9 @@ import com.android.systemui.statusbar.phone.LockscreenGestureLogger; import com.android.systemui.statusbar.phone.ManagedProfileController; import com.android.systemui.statusbar.phone.NotificationGroupAlertTransferHelper; import com.android.systemui.statusbar.phone.ShadeController; -import com.android.systemui.statusbar.phone.StatusBar; import com.android.systemui.statusbar.phone.StatusBarContentInsetsProvider; import com.android.systemui.statusbar.phone.StatusBarIconController; -import com.android.systemui.statusbar.phone.StatusBarWindowController; +import com.android.systemui.statusbar.phone.UnlockedScreenOffAnimationController; import com.android.systemui.statusbar.policy.AccessibilityController; import com.android.systemui.statusbar.policy.AccessibilityManagerWrapper; import com.android.systemui.statusbar.policy.BatteryController; @@ -117,7 +119,6 @@ import com.android.systemui.statusbar.policy.FlashlightController; import com.android.systemui.statusbar.policy.HotspotController; import com.android.systemui.statusbar.policy.KeyguardStateController; import com.android.systemui.statusbar.policy.LocationController; -import com.android.systemui.statusbar.policy.NetworkController; import com.android.systemui.statusbar.policy.NextAlarmController; import com.android.systemui.statusbar.policy.RemoteInputQuickSettingsDisabler; import com.android.systemui.statusbar.policy.RotationLockController; @@ -127,6 +128,7 @@ import com.android.systemui.statusbar.policy.SmartReplyConstants; import com.android.systemui.statusbar.policy.UserInfoController; import com.android.systemui.statusbar.policy.UserSwitcherController; import com.android.systemui.statusbar.policy.ZenModeController; +import com.android.systemui.statusbar.window.StatusBarWindowController; import com.android.systemui.telephony.TelephonyListenerManager; import com.android.systemui.tracing.ProtoTracer; import com.android.systemui.tuner.TunablePadding.TunablePaddingService; @@ -247,7 +249,6 @@ public class Dependency { @Inject Lazy<BluetoothController> mBluetoothController; @Inject Lazy<LocationController> mLocationController; @Inject Lazy<RotationLockController> mRotationLockController; - @Inject Lazy<NetworkController> mNetworkController; @Inject Lazy<ZenModeController> mZenModeController; @Inject Lazy<HotspotController> mHotspotController; @Inject Lazy<CastController> mCastController; @@ -351,8 +352,6 @@ public class Dependency { @Inject Lazy<DozeParameters> mDozeParameters; @Inject Lazy<IWallpaperManager> mWallpaperManager; @Inject Lazy<CommandQueue> mCommandQueue; - @Inject Lazy<Recents> mRecents; - @Inject Lazy<StatusBar> mStatusBar; @Inject Lazy<RecordingController> mRecordingController; @Inject Lazy<ProtoTracer> mProtoTracer; @Inject Lazy<MediaOutputDialogFactory> mMediaOutputDialogFactory; @@ -366,6 +365,11 @@ public class Dependency { @Inject Lazy<FeatureFlags> mFeatureFlagsLazy; @Inject Lazy<StatusBarContentInsetsProvider> mContentInsetsProviderLazy; @Inject Lazy<InternetDialogFactory> mInternetDialogFactory; + @Inject Lazy<NotificationSectionsManager> mNotificationSectionsManagerLazy; + @Inject Lazy<UnlockedScreenOffAnimationController> mUnlockedScreenOffAnimationControllerLazy; + @Inject Lazy<AmbientState> mAmbientStateLazy; + @Inject Lazy<GroupMembershipManager> mGroupMembershipManagerLazy; + @Inject Lazy<GroupExpansionManager> mGroupExpansionManagerLazy; @Inject public Dependency() { @@ -395,8 +399,6 @@ public class Dependency { mProviders.put(RotationLockController.class, mRotationLockController::get); - mProviders.put(NetworkController.class, mNetworkController::get); - mProviders.put(ZenModeController.class, mZenModeController::get); mProviders.put(HotspotController.class, mHotspotController::get); @@ -557,8 +559,6 @@ public class Dependency { mProviders.put(DozeParameters.class, mDozeParameters::get); mProviders.put(IWallpaperManager.class, mWallpaperManager::get); mProviders.put(CommandQueue.class, mCommandQueue::get); - mProviders.put(Recents.class, mRecents::get); - mProviders.put(StatusBar.class, mStatusBar::get); mProviders.put(ProtoTracer.class, mProtoTracer::get); mProviders.put(DeviceConfigProxy.class, mDeviceConfigProxy::get); mProviders.put(TelephonyListenerManager.class, mTelephonyListenerManager::get); @@ -584,6 +584,12 @@ public class Dependency { mProviders.put(UiEventLogger.class, mUiEventLogger::get); mProviders.put(FeatureFlags.class, mFeatureFlagsLazy::get); mProviders.put(StatusBarContentInsetsProvider.class, mContentInsetsProviderLazy::get); + mProviders.put(NotificationSectionsManager.class, mNotificationSectionsManagerLazy::get); + mProviders.put(UnlockedScreenOffAnimationController.class, + mUnlockedScreenOffAnimationControllerLazy::get); + mProviders.put(AmbientState.class, mAmbientStateLazy::get); + mProviders.put(GroupMembershipManager.class, mGroupMembershipManagerLazy::get); + mProviders.put(GroupExpansionManager.class, mGroupExpansionManagerLazy::get); Dependency.setInstance(this); } @@ -607,11 +613,6 @@ public class Dependency { if (obj == null) { obj = createDependency(key); mDependencies.put(key, obj); - - // TODO: Get dependencies to register themselves instead - if (autoRegisterModulesForDump() && obj instanceof Dumpable) { - mDumpManager.registerDumpable(obj.getClass().getName(), (Dumpable) obj); - } } return obj; } @@ -629,17 +630,6 @@ public class Dependency { return provider.createDependency(); } - // Currently, there are situations in tests where we might create more than one instance of a - // thing that should be a singleton: the "real" one (created by Dagger, usually as a result of - // inflating a view), and a mocked one (injected into Dependency). If we register the mocked - // one, the DumpManager will throw an exception complaining (rightly) that we have too many - // things registered with that name. So in tests, we disable the auto-registration until the - // root cause is fixed, i.e. inflated views in tests with Dagger dependencies. - @VisibleForTesting - protected boolean autoRegisterModulesForDump() { - return true; - } - private static Dependency sDependency; /** |