Merge "Final calls to getComponent(Recents.class) removed." (4b07009c) · Commits · e / os / android_frameworks_base

packages/CarSystemUI/src/com/android/systemui/CarSystemUIModule.java

+5 −2

Original line number	Diff line number	Diff line
		@@ -46,10 +46,13 @@ import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;
		import com.android.systemui.volume.CarVolumeDialogComponent;
		import com.android.systemui.volume.VolumeDialogComponent;

		import java.util.Optional;

		import javax.inject.Named;
		import javax.inject.Singleton;

		import dagger.Binds;
		import dagger.Lazy;
		import dagger.Module;
		import dagger.Provides;

		@@ -76,8 +79,8 @@ abstract class CarSystemUIModule {

		@Singleton
		@Provides
		static Divider provideDivider(Context context) {
		return new Divider(context);
		static Divider provideDivider(Context context, Optional<Lazy<Recents>> recentsOptionalLazy) {
		return new Divider(context, recentsOptionalLazy);
		}

		@Singleton

+3 −0

Original line number	Diff line number	Diff line
		@@ -79,6 +79,7 @@ import com.android.systemui.navigationbar.car.CarNavigationBarView;
		import com.android.systemui.plugins.FalsingManager;
		import com.android.systemui.plugins.qs.QS;
		import com.android.systemui.qs.car.CarQSFragment;
		import com.android.systemui.recents.Recents;
		import com.android.systemui.recents.ScreenPinningRequest;
		import com.android.systemui.shared.plugins.PluginManager;
		import com.android.systemui.stackdivider.Divider;
		@@ -300,6 +301,7 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt
		DozeScrimController dozeScrimController,
		VolumeComponent volumeComponent,
		CommandQueue commandQueue,
		Optional<Recents> recents,
		PluginManager pluginManager,
		RemoteInputUriController remoteInputUriController,
		Optional<Divider> dividerOptional,
		@@ -372,6 +374,7 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt
		dozeScrimController,
		volumeComponent,
		commandQueue,
		recents,
		pluginManager,
		remoteInputUriController,
		dividerOptional,

+3 −0

Original line number	Diff line number	Diff line
		@@ -36,6 +36,7 @@ import com.android.systemui.keyguard.ScreenLifecycle;
		import com.android.systemui.keyguard.WakefulnessLifecycle;
		import com.android.systemui.navigationbar.car.CarNavigationBarController;
		import com.android.systemui.plugins.FalsingManager;
		import com.android.systemui.recents.Recents;
		import com.android.systemui.recents.ScreenPinningRequest;
		import com.android.systemui.shared.plugins.PluginManager;
		import com.android.systemui.stackdivider.Divider;
		@@ -169,6 +170,7 @@ public class CarStatusBarModule {
		DozeScrimController dozeScrimController,
		VolumeComponent volumeComponent,
		CommandQueue commandQueue,
		Optional<Recents> recentsOptional,
		PluginManager pluginManager,
		RemoteInputUriController remoteInputUriController,
		Optional<Divider> dividerOptional,
		@@ -239,6 +241,7 @@ public class CarStatusBarModule {
		dozeScrimController,
		volumeComponent,
		commandQueue,
		recentsOptional,
		pluginManager,
		remoteInputUriController,
		dividerOptional,

+3 −0

Original line number	Diff line number	Diff line
		@@ -59,6 +59,7 @@ import com.android.systemui.power.EnhancedEstimates;
		import com.android.systemui.power.PowerUI;
		import com.android.systemui.privacy.PrivacyItemController;
		import com.android.systemui.recents.OverviewProxyService;
		import com.android.systemui.recents.Recents;
		import com.android.systemui.shared.plugins.PluginManager;
		import com.android.systemui.shared.system.ActivityManagerWrapper;
		import com.android.systemui.shared.system.DevicePolicyManagerWrapper;
		@@ -329,6 +330,7 @@ public class Dependency {
		@Inject Lazy<DozeParameters> mDozeParameters;
		@Inject Lazy<IWallpaperManager> mWallpaperManager;
		@Inject Lazy<CommandQueue> mCommandQueue;
		@Inject Lazy<Recents> mRecents;
		@Inject Lazy<StatusBar> mStatusBar;

		@Inject
		@@ -519,6 +521,7 @@ 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);

		// TODO(b/118592525): to support multi-display , we start to add something which is

+5 −2

Original line number	Diff line number	Diff line
		@@ -38,10 +38,13 @@ import com.android.systemui.statusbar.phone.KeyguardEnvironmentImpl;
		import com.android.systemui.statusbar.phone.ShadeController;
		import com.android.systemui.statusbar.phone.StatusBar;

		import java.util.Optional;

		import javax.inject.Named;
		import javax.inject.Singleton;

		import dagger.Binds;
		import dagger.Lazy;
		import dagger.Module;
		import dagger.Provides;

		@@ -86,8 +89,8 @@ abstract class SystemUIDefaultModule {

		@Singleton
		@Provides
		static Divider provideDivider(Context context) {
		return new Divider(context);
		static Divider provideDivider(Context context, Optional<Lazy<Recents>> recentsOptionalLazy) {
		return new Divider(context, recentsOptionalLazy);
		}

		@Provides