From 1a4670eeffc165c823a7bbc0a772b086a111888d Mon Sep 17 00:00:00 2001 From: Steven Ng Date: Tue, 16 Mar 2021 19:30:04 +0000 Subject: [PATCH] Only clear widgets list upon all widgets & shortcuts update Test: Install BBC News. Then, quickly go to all widgets tray. BBC News widgets is added to the all widgets tray without removing other widgets. Bug: 182897740 Change-Id: I17b50f5128e24c346354b8fb7817a318a94efb62 --- .../com/android/launcher3/model/WidgetsModel.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java b/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java index 3ea47660b0..f82f2cc47a 100644 --- a/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java +++ b/src_shortcuts_overrides/com/android/launcher3/model/WidgetsModel.java @@ -132,7 +132,7 @@ public class WidgetsModel { widgetsAndShortcuts.add(new WidgetItem(info, app.getIconCache(), pm)); updatedItems.add(info); } - setWidgetsAndShortcuts(widgetsAndShortcuts, app); + setWidgetsAndShortcuts(widgetsAndShortcuts, app, packageUser); } catch (Exception e) { if (!FeatureFlags.IS_STUDIO_BUILD && Utilities.isBinderSizeError(e)) { // the returned value may be incomplete and will not be refreshed until the next @@ -149,7 +149,7 @@ public class WidgetsModel { } private synchronized void setWidgetsAndShortcuts(ArrayList rawWidgetsShortcuts, - LauncherAppState app) { + LauncherAppState app, @Nullable PackageUserKey packageUser) { if (DEBUG) { Log.d(TAG, "addWidgetsAndShortcuts, widgetsShortcuts#=" + rawWidgetsShortcuts.size()); } @@ -158,8 +158,12 @@ public class WidgetsModel { // {@link mPackageItemInfos} to locate the key to be used for {@link #mWidgetsList} HashMap tmpPackageItemInfos = new HashMap<>(); - // clear the lists. - mWidgetsList.clear(); + // Clear the lists only if this is an update on all widgets and shortcuts. If packageUser + // isn't null, only updates the shortcuts and widgets for the app represented in + // packageUser. + if (packageUser == null) { + mWidgetsList.clear(); + } // add and update. mWidgetsList.putAll(rawWidgetsShortcuts.stream() .filter(new WidgetValidityCheck(app))