From 5e3331dc6f344f38ce49484672c2d591b72a43ea Mon Sep 17 00:00:00 2001
From: Uwais Ashraf <uwaisashraf@google.com>
Date: Mon, 24 Feb 2025 07:24:37 +0000
Subject: [PATCH] Add missing bits of cleanup to TV recycle stage

Bug: 395331030
Flag: com.android.launcher3.enable_refactor_task_thumbnail
Test: Manual heap dump comparison
Change-Id: Ifa40d7bf874b0437fb0dc59a964748366ffe9986
---
 .../com/android/quickstep/task/thumbnail/TaskThumbnailView.kt   | 2 ++
 quickstep/src/com/android/quickstep/views/TaskContainer.kt      | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/quickstep/src/com/android/quickstep/task/thumbnail/TaskThumbnailView.kt b/quickstep/src/com/android/quickstep/task/thumbnail/TaskThumbnailView.kt
index e91073ac7a..0edbacc710 100644
--- a/quickstep/src/com/android/quickstep/task/thumbnail/TaskThumbnailView.kt
+++ b/quickstep/src/com/android/quickstep/task/thumbnail/TaskThumbnailView.kt
@@ -181,8 +181,10 @@ class TaskThumbnailView : FrameLayout, ViewPool.Reusable {
     private fun resetViews() {
         liveTileView.isInvisible = true
         thumbnailView.isInvisible = true
+        thumbnailView.setImageBitmap(null)
         splashBackground.alpha = 0f
         splashIcon.alpha = 0f
+        splashIcon.setImageDrawable(null)
         scrimView.alpha = 0f
         setBackgroundColor(Color.BLACK)
         taskThumbnailViewHeader?.isInvisible = true
diff --git a/quickstep/src/com/android/quickstep/views/TaskContainer.kt b/quickstep/src/com/android/quickstep/views/TaskContainer.kt
index 6339c5e1d3..2b9d0365a9 100644
--- a/quickstep/src/com/android/quickstep/views/TaskContainer.kt
+++ b/quickstep/src/com/android/quickstep/views/TaskContainer.kt
@@ -109,6 +109,8 @@ class TaskContainer(
         overlay.destroy()
         if (enableRefactorTaskThumbnail()) {
             isThumbnailValid = false
+            thumbnailData = null
+            thumbnailView.onRecycle()
         } else {
             thumbnailViewDeprecated.setShowSplashForSplitSelection(false)
         }