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	Original line	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.CarVolumeDialogComponent;
	import com.android.systemui.volume.VolumeDialogComponent;		import com.android.systemui.volume.VolumeDialogComponent;

			import java.util.Optional;

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

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

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

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

	@Singleton		@Singleton

packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java

+3 −0

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

packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBarModule.java

+3 −0

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

packages/SystemUI/src/com/android/systemui/Dependency.java

+3 −0

packages/SystemUI/src/com/android/systemui/dagger/SystemUIDefaultModule.java

+5 −2

Original line number	Original line	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.ShadeController;
	import com.android.systemui.statusbar.phone.StatusBar;		import com.android.systemui.statusbar.phone.StatusBar;

			import java.util.Optional;

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

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

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

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

	@Provides		@Provides

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

	@Inject		@Inject
	@@ -519,6 +521,7 @@ public class Dependency {
	mProviders.put(DozeParameters.class, mDozeParameters::get);		mProviders.put(DozeParameters.class, mDozeParameters::get);
	mProviders.put(IWallpaperManager.class, mWallpaperManager::get);		mProviders.put(IWallpaperManager.class, mWallpaperManager::get);
	mProviders.put(CommandQueue.class, mCommandQueue::get);		mProviders.put(CommandQueue.class, mCommandQueue::get);
			mProviders.put(Recents.class, mRecents::get);
	mProviders.put(StatusBar.class, mStatusBar::get);		mProviders.put(StatusBar.class, mStatusBar::get);

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