Merge "Re-fetch DesktopVisibilityController when needed instead of just once" into main (7f26505f) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/src/com/android/launcher3/taskbar/DesktopTaskbarRunningAppsController.kt

+6 −1

Original line number	Diff line number	Diff line
		@@ -40,12 +40,17 @@ import kotlin.collections.filterNotNull
		*/
		class DesktopTaskbarRunningAppsController(
		private val recentsModel: RecentsModel,
		private val desktopVisibilityController: DesktopVisibilityController?,
		// Pass a provider here instead of the actual DesktopVisibilityController instance since that
		// instance might not be available when this constructor is called.
		private val desktopVisibilityControllerProvider: () -> DesktopVisibilityController?,
		) : TaskbarRecentAppsController() {

		private var apps: Array<AppInfo>? = null
		private var allRunningDesktopAppInfos: List<AppInfo>? = null

		private val desktopVisibilityController: DesktopVisibilityController?
		get() = desktopVisibilityControllerProvider()

		private val isInDesktopMode: Boolean
		get() = desktopVisibilityController?.areDesktopTasksVisible() ?: false

+1 −1

Original line number	Diff line number	Diff line
		@@ -312,7 +312,7 @@ public class TaskbarActivityContext extends BaseTaskbarContext {
		if (enableDesktopWindowingMode() && enableDesktopWindowingTaskbarRunningApps()) {
		return new DesktopTaskbarRunningAppsController(
		RecentsModel.INSTANCE.get(this),
		LauncherActivityInterface.INSTANCE.getDesktopVisibilityController());
		LauncherActivityInterface.INSTANCE::getDesktopVisibilityController);
		}
		return TaskbarRecentAppsController.DEFAULT;
		}

+3 −1

Original line number	Diff line number	Diff line
		@@ -54,7 +54,9 @@ class DesktopTaskbarRunningAppsControllerTest : TaskbarBaseTestCase() {
		super.setup()
		userHandle = Process.myUserHandle()
		taskbarRunningAppsController =
		DesktopTaskbarRunningAppsController(mockRecentsModel, mockDesktopVisibilityController)
		DesktopTaskbarRunningAppsController(mockRecentsModel) {
		mockDesktopVisibilityController
		}
		taskbarRunningAppsController.init(taskbarControllers)
		taskbarRunningAppsController.setApps(
		ALL_APP_PACKAGES.map { createTestAppInfo(packageName = it) }.toTypedArray()