From 3d9dc3551d85623553706a8faaebc25c4d81eb1e Mon Sep 17 00:00:00 2001
From: Sihua Ma <sihua@google.com>
Date: Thu, 9 Mar 2023 21:28:15 -0800
Subject: [PATCH] Remove app widget view when widget id is deleted

Also clearing all the views in clearViews()

Test: N/A
Fix: 272647976
Change-Id: Ia54401279f453a31f392898c4db2dbe199d346dd
---
 .../android/launcher3/uioverrides/QuickstepWidgetHolder.java    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepWidgetHolder.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepWidgetHolder.java
index ff3a2929b6..b318100205 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepWidgetHolder.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepWidgetHolder.java
@@ -168,6 +168,7 @@ public final class QuickstepWidgetHolder extends LauncherWidgetHolder {
     @Override
     public void deleteAppWidgetId(int appWidgetId) {
         super.deleteAppWidgetId(appWidgetId);
+        mViews.remove(appWidgetId);
         sListeners.remove(appWidgetId);
     }
 
@@ -260,6 +261,7 @@ public final class QuickstepWidgetHolder extends LauncherWidgetHolder {
      */
     @Override
     public void clearViews() {
+        mViews.clear();
         for (int i = sListeners.size() - 1; i >= 0; i--) {
             sListeners.valueAt(i).mListeningHolders.remove(this);
         }