Merge "Fix Taskbar Recents Item after unlock" into main

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

@@ -16,14 +16,13 @@
 
 package com.android.launcher3.taskbar
 
-import android.content.Context
 import com.android.launcher3.statehandlers.DesktopVisibilityController
 import com.android.launcher3.statehandlers.DesktopVisibilityController.TaskbarDesktopModeListener
 import com.android.launcher3.taskbar.TaskbarBackgroundRenderer.Companion.MAX_ROUNDNESS
 
 /** Handles Taskbar in Desktop Windowing mode. */
 class TaskbarDesktopModeController(
-    private val context: Context,
+    private val taskbarActivityContext: TaskbarActivityContext,
     private val desktopVisibilityController: DesktopVisibilityController,
 ) : TaskbarDesktopModeListener {
     private lateinit var taskbarControllers: TaskbarControllers
@@ -48,14 +47,13 @@ class TaskbarDesktopModeController(
     }
 
     fun shouldShowDesktopTasksInTaskbar(): Boolean {
-        return shouldShowDesktopTasksInTaskbar(context.displayId)
+        return shouldShowDesktopTasksInTaskbar(taskbarActivityContext.displayId)
     }
 
     fun shouldShowDesktopTasksInTaskbar(displayId: Int): Boolean {
-        val activityContext = taskbarControllers.taskbarActivityContext
         return isInDesktopMode(displayId) ||
-            activityContext.showDesktopTaskbarForFreeformDisplay() ||
-            (activityContext.showLockedTaskbarOnHome() &&
+            taskbarActivityContext.showDesktopTaskbarForFreeformDisplay() ||
+            (taskbarActivityContext.showLockedTaskbarOnHome() &&
                 taskbarControllers.taskbarStashController.isOnHome)
     }
 

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

@@ -175,10 +175,11 @@ class TaskbarRecentAppsController(context: Context, private val recentsModel: Re
     private var recentTasksLoaded = false
 
     fun init(taskbarControllers: TaskbarControllers, previousShownTasks: List<GroupTask>) {
+        controllers = taskbarControllers
         if (previousShownTasks.isNotEmpty()) {
             shownTasks = previousShownTasks
+            fetchIcons()
         }
-        controllers = taskbarControllers
         if (canShowRunningApps || canShowRecentApps) {
             recentsModel.registerRecentTasksChangedListener(recentTasksChangedListener)
             controllers.runAfterInit { reloadRecentTasksIfNeeded() }
@@ -279,7 +280,11 @@ class TaskbarRecentAppsController(context: Context, private val recentsModel: Re
         if (!shownTasksChanged) {
             return shownTasksChanged
         }
+        fetchIcons()
+        return shownTasksChanged
+    }
 
+    private fun fetchIcons() {
         for (groupTask in shownTasks) {
             for (task in groupTask.tasks) {
                 val cancellableTask =
@@ -297,7 +302,6 @@ class TaskbarRecentAppsController(context: Context, private val recentsModel: Re
                 }
             }
         }
-        return shownTasksChanged
     }
 
     private fun updateOrderedRunningTaskIds(): MutableList<Int> {