Merge "Remove launcher widget onAppWidgetRemoved" into ub-launcher3-qt-future-dev

am: d61f73d935

Change-Id: Ib283b5db54c17dce4b8c09d70e52f10f95a6a315

src/com/android/launcher3/Workspace.java

@@ -2804,6 +2804,23 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
         }
     }
 
+    /**
+     * Removed widget from workspace by appWidgetId
+     * @param appWidgetId
+     */
+    public void removeWidget(int appWidgetId) {
+        mapOverItems((info, view) -> {
+            if (info instanceof LauncherAppWidgetInfo) {
+                LauncherAppWidgetInfo appWidgetInfo = (LauncherAppWidgetInfo) info;
+                if (appWidgetInfo.appWidgetId == appWidgetId) {
+                    mLauncher.removeItem(view, appWidgetInfo, true);
+                    return true;
+                }
+            }
+            return false;
+        });
+    }
+
     /**
      * Removes all folder listeners
      */