commit 2be0868a34ac6195f50accf2bc4cd6a1817bcd51
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Feb 24 07:51:33 2025 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Mon Feb 24 07:51:33 2025 -0800
tree ff7e49fd61535fb9b4417b3475bfd54ba6f8ac1b
parent 19db412ca6c80c0392096c19f2768118fdac03b1
parent 5e3331dc6f344f38ce49484672c2d591b72a43ea

Merge "Add missing bits of cleanup to TV recycle stage" into main

quickstep/src/com/android/quickstep/task/thumbnail/TaskThumbnailView.kt

diff --git a/quickstep/src/com/android/quickstep/task/thumbnail/TaskThumbnailView.kt b/quickstep/src/com/android/quickstep/task/thumbnail/TaskThumbnailView.kt
index e91073a..0edbacc 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 @@
     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

quickstep/src/com/android/quickstep/views/TaskContainer.kt

diff --git a/quickstep/src/com/android/quickstep/views/TaskContainer.kt b/quickstep/src/com/android/quickstep/views/TaskContainer.kt
index 6339c5e..2b9d036 100644
--- a/quickstep/src/com/android/quickstep/views/TaskContainer.kt
+++ b/quickstep/src/com/android/quickstep/views/TaskContainer.kt
@@ -109,6 +109,8 @@
         overlay.destroy()
         if (enableRefactorTaskThumbnail()) {
             isThumbnailValid = false
+            thumbnailData = null
+            thumbnailView.onRecycle()
         } else {
             thumbnailViewDeprecated.setShowSplashForSplitSelection(false)
         }