From f7fa4cef5bed6d324e32b039855b00deb8cc6914 Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Tue, 6 May 2025 13:32:15 -0700 Subject: [PATCH] Using single pass to update both widgets and shortcuts in BgDataModel Bug: 390572144 Test: Presubmit Flag: EXEMPT refactor Change-Id: I9ead8f7acb9fc3b550f7368474f0402c032dfd12 --- .../android/launcher3/model/BgDataModel.kt | 65 ++++++++++++------- .../launcher3/model/CacheDataUpdatedTask.java | 43 ++++++------ .../model/PackageInstallStateChangedTask.java | 26 +++----- .../launcher3/model/PackageUpdatedTask.java | 37 +++++------ .../launcher3/model/SessionFailureTask.kt | 17 +++-- .../launcher3/model/ShortcutsChangedTask.kt | 51 ++++++++------- 6 files changed, 125 insertions(+), 114 deletions(-) diff --git a/src/com/android/launcher3/model/BgDataModel.kt b/src/com/android/launcher3/model/BgDataModel.kt index c57caf0e16..60cc04898a 100644 --- a/src/com/android/launcher3/model/BgDataModel.kt +++ b/src/com/android/launcher3/model/BgDataModel.kt @@ -37,6 +37,7 @@ import com.android.launcher3.logging.FileLog import com.android.launcher3.model.data.AppInfo import com.android.launcher3.model.data.CollectionInfo import com.android.launcher3.model.data.ItemInfo +import com.android.launcher3.model.data.LauncherAppWidgetInfo import com.android.launcher3.model.data.PredictedContainerInfo import com.android.launcher3.model.data.WorkspaceItemInfo import com.android.launcher3.model.repository.HomeScreenRepository @@ -190,7 +191,7 @@ constructor( if (newItem && item.itemType == ITEM_TYPE_DEEP_SHORTCUT) { updateShortcutPinnedState(context, item.user) } - if (Flags.modelRepository() && repo != null) { + if (newItem && Flags.modelRepository() && repo != null) { repo.dispatchChange(this, AddEvent(listOf(item), owner)) } @@ -259,11 +260,15 @@ constructor( // Collect all model shortcuts val allWorkspaceItems = mutableListOf().apply { - updateAndCollectWorkspaceItemInfos(user) { - if (it.itemType == ITEM_TYPE_DEEP_SHORTCUT) add(ShortcutKey.fromItemInfo(it)) - // We don't care about the returned list - false - } + updateAndCollectWorkspaceItemInfos( + user, + { + if (it.itemType == ITEM_TYPE_DEEP_SHORTCUT) + add(ShortcutKey.fromItemInfo(it)) + // We don't care about the returned list + false + }, + ) } allWorkspaceItems.addAll( ItemInstallQueue.INSTANCE[context].getPendingShortcuts(user).toList() @@ -351,30 +356,40 @@ constructor( } /** - * Calls the [op] for all workspaceItems in the in-memory model (both persisted items and - * dynamic/predicted items for the [userHandle]) and returns a list of updates to be dispatched - * to the callbacks. Note the call is not synchronized over the model, that should be handled by - * the called. + * Calls the [workspaceItemOp] for all workspaceItems [widgetItemOp] for all widget items in the + * in-memory model (both persisted items and dynamic/predicted items for the [userHandle]) and + * returns a list of updates to be dispatched to the callbacks. Note the call is not + * synchronized over the model, that should be handled by the caller. */ + @JvmOverloads fun updateAndCollectWorkspaceItemInfos( userHandle: UserHandle, - op: (WorkspaceItemInfo) -> Boolean, - ): MutableList = - itemsIdMap.filterTo(mutableListOf()) { - when { - it is WorkspaceItemInfo && userHandle == it.user -> op.invoke(it) - it is PredictedContainerInfo -> { - // Do not use filter or any as we want to run the update on every item. If any - // single item was updated, we add the container to the list of updates - it.getContents().count { predictedItem -> - predictedItem is WorkspaceItemInfo && - predictedItem.user == userHandle && - op.invoke(predictedItem) - } > 0 + workspaceItemOp: (WorkspaceItemInfo) -> Boolean, + widgetItemOp: ((LauncherAppWidgetInfo) -> Boolean)? = null, + ): List = + itemsIdMap + .filter { + when { + it is WorkspaceItemInfo && userHandle == it.user -> workspaceItemOp.invoke(it) + widgetItemOp != null && it is LauncherAppWidgetInfo && userHandle == it.user -> + widgetItemOp.invoke(it) + it is PredictedContainerInfo -> { + // Do not use filter or any as we want to run the update on every item. If + // any + // single item was updated, we add the container to the list of updates + it.getContents().count { predictedItem -> + predictedItem is WorkspaceItemInfo && + predictedItem.user == userHandle && + workspaceItemOp.invoke(predictedItem) + } > 0 + } + else -> false } - else -> false } - } + .apply { + // Dispatch an update + if (isNotEmpty()) updateItems(this, null) + } /** An object containing items corresponding to a fixed container */ class FixedContainerItems(@JvmField val containerId: Int, items: List) { diff --git a/src/com/android/launcher3/model/CacheDataUpdatedTask.java b/src/com/android/launcher3/model/CacheDataUpdatedTask.java index 6b9217ce99..fb5710a9bf 100644 --- a/src/com/android/launcher3/model/CacheDataUpdatedTask.java +++ b/src/com/android/launcher3/model/CacheDataUpdatedTask.java @@ -16,7 +16,6 @@ package com.android.launcher3.model; import static com.android.launcher3.icons.cache.CacheLookupFlag.DEFAULT_LOOKUP_FLAG; -import static com.android.launcher3.model.ModelUtils.WIDGET_FILTER; import android.content.ComponentName; import android.os.UserHandle; @@ -27,7 +26,6 @@ import com.android.launcher3.LauncherModel.ModelUpdateTask; import com.android.launcher3.LauncherSettings; import com.android.launcher3.icons.IconCache; import com.android.launcher3.model.data.ItemInfo; -import com.android.launcher3.model.data.LauncherAppWidgetInfo; import com.android.launcher3.model.data.WorkspaceItemInfo; import java.util.HashSet; @@ -63,27 +61,26 @@ public class CacheDataUpdatedTask implements ModelUpdateTask { List updatedItems; synchronized (dataModel) { - updatedItems = dataModel.updateAndCollectWorkspaceItemInfos(mUser, si -> { - ComponentName cn = si.getTargetComponent(); - if (si.itemType == LauncherSettings.Favorites.ITEM_TYPE_APPLICATION - && isValidShortcut(si) && cn != null - && mPackages.contains(cn.getPackageName())) { - iconCache.getTitleAndIcon(si, si.getMatchingLookupFlag()); - return true; - } - return false; - }); - - dataModel.itemsIdMap.stream() - .filter(WIDGET_FILTER) - .filter(item -> mUser.equals(item.user)) - .map(item -> (LauncherAppWidgetInfo) item) - .filter(widget -> mPackages.contains(widget.providerName.getPackageName()) - && widget.pendingItemInfo != null) - .forEach(widget -> { - iconCache.getTitleAndIconForApp( - widget.pendingItemInfo, DEFAULT_LOOKUP_FLAG); - updatedItems.add(widget); + updatedItems = dataModel.updateAndCollectWorkspaceItemInfos( + mUser, + si -> { + ComponentName cn = si.getTargetComponent(); + if (si.itemType == LauncherSettings.Favorites.ITEM_TYPE_APPLICATION + && isValidShortcut(si) && cn != null + && mPackages.contains(cn.getPackageName())) { + iconCache.getTitleAndIcon(si, si.getMatchingLookupFlag()); + return true; + } + return false; + }, + widget -> { + if (mPackages.contains(widget.providerName.getPackageName()) + && widget.pendingItemInfo != null) { + iconCache.getTitleAndIconForApp( + widget.pendingItemInfo, DEFAULT_LOOKUP_FLAG); + return true; + } + return false; }); apps.updateIconsAndLabels(mPackages, mUser); diff --git a/src/com/android/launcher3/model/PackageInstallStateChangedTask.java b/src/com/android/launcher3/model/PackageInstallStateChangedTask.java index 0a10ea48c6..e7192af443 100644 --- a/src/com/android/launcher3/model/PackageInstallStateChangedTask.java +++ b/src/com/android/launcher3/model/PackageInstallStateChangedTask.java @@ -15,8 +15,6 @@ */ package com.android.launcher3.model; -import static com.android.launcher3.model.ModelUtils.WIDGET_FILTER; - import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; @@ -26,7 +24,6 @@ import androidx.annotation.NonNull; import com.android.launcher3.LauncherModel.ModelUpdateTask; import com.android.launcher3.model.data.AppInfo; import com.android.launcher3.model.data.ItemInfo; -import com.android.launcher3.model.data.LauncherAppWidgetInfo; import com.android.launcher3.pm.PackageInstallInfo; import com.android.launcher3.util.InstantAppResolver; @@ -78,26 +75,23 @@ public class PackageInstallStateChangedTask implements ModelUpdateTask { synchronized (dataModel) { final List updates = dataModel.updateAndCollectWorkspaceItemInfos( - mInstallInfo.user, si -> { + mInstallInfo.user, + si -> { if (si.hasPromiseIconUi() && mInstallInfo.packageName.equals(si.getTargetPackage())) { si.setProgressLevel(mInstallInfo); return true; } return false; - }); - - dataModel.itemsIdMap.stream() - .filter(WIDGET_FILTER) - .filter(item -> mInstallInfo.user.equals(item.user)) - .map(item -> (LauncherAppWidgetInfo) item) - .filter(widget -> widget.providerName.getPackageName() - .equals(mInstallInfo.packageName)) - .forEach(widget -> { - widget.installProgress = mInstallInfo.progress; - updates.add(widget); + }, + widget -> { + if (widget.providerName.getPackageName() + .equals(mInstallInfo.packageName)) { + widget.installProgress = mInstallInfo.progress; + return true; + } + return false; }); - if (!updates.isEmpty()) { taskController.bindUpdatedWorkspaceItems(updates); } diff --git a/src/com/android/launcher3/model/PackageUpdatedTask.java b/src/com/android/launcher3/model/PackageUpdatedTask.java index 98d287b083..dc553a14c0 100644 --- a/src/com/android/launcher3/model/PackageUpdatedTask.java +++ b/src/com/android/launcher3/model/PackageUpdatedTask.java @@ -19,7 +19,6 @@ import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_DEEP_SH import static com.android.launcher3.model.BgDataModel.Callbacks.FLAG_PRIVATE_PROFILE_QUIET_MODE_ENABLED; import static com.android.launcher3.model.BgDataModel.Callbacks.FLAG_QUIET_MODE_ENABLED; import static com.android.launcher3.model.BgDataModel.Callbacks.FLAG_WORK_PROFILE_QUIET_MODE_ENABLED; -import static com.android.launcher3.model.ModelUtils.WIDGET_FILTER; import static com.android.launcher3.model.data.ItemInfoWithIcon.FLAG_ARCHIVED; import static com.android.launcher3.model.data.LauncherAppWidgetInfo.FLAG_PROVIDER_NOT_READY; import static com.android.launcher3.model.data.WorkspaceItemInfo.FLAG_AUTOINSTALL_ICON; @@ -350,27 +349,23 @@ public class PackageUpdatedTask implements ModelUpdateTask { taskController.getModelWriter().updateItemInDatabase(itemInfo); } return infoUpdated || shortcutUpdated; + }, widget -> { + if (widget.hasRestoreFlag(FLAG_PROVIDER_NOT_READY) + && packageSet.contains(widget.providerName.getPackageName())) { + widget.restoreStatus &= + ~FLAG_PROVIDER_NOT_READY + & ~LauncherAppWidgetInfo.FLAG_RESTORE_STARTED; + + // adding this flag ensures that launcher shows 'click to setup' + // if the widget has a config activity. In case there is no config + // activity, it will be marked as 'restored' during bind. + widget.restoreStatus |= LauncherAppWidgetInfo.FLAG_UI_NOT_READY; + widget.installProgress = 100; + taskController.getModelWriter().updateItemInDatabase(widget); + return true; + } + return false; }); - - dataModel.itemsIdMap.stream() - .filter(WIDGET_FILTER) - .filter(item -> mUser.equals(item.user)) - .map(item -> (LauncherAppWidgetInfo) item) - .filter(widget -> widget.hasRestoreFlag(FLAG_PROVIDER_NOT_READY) - && packageSet.contains(widget.providerName.getPackageName())) - .forEach(widgetInfo -> { - widgetInfo.restoreStatus &= - ~FLAG_PROVIDER_NOT_READY - & ~LauncherAppWidgetInfo.FLAG_RESTORE_STARTED; - - // adding this flag ensures that launcher shows 'click to setup' - // if the widget has a config activity. In case there is no config - // activity, it will be marked as 'restored' during bind. - widgetInfo.restoreStatus |= LauncherAppWidgetInfo.FLAG_UI_NOT_READY; - widgetInfo.installProgress = 100; - updatedItems.add(widgetInfo); - taskController.getModelWriter().updateItemInDatabase(widgetInfo); - }); } taskController.bindUpdatedWorkspaceItems(updatedItems); diff --git a/src/com/android/launcher3/model/SessionFailureTask.kt b/src/com/android/launcher3/model/SessionFailureTask.kt index f1d328b663..6f34c04897 100644 --- a/src/com/android/launcher3/model/SessionFailureTask.kt +++ b/src/com/android/launcher3/model/SessionFailureTask.kt @@ -45,13 +45,16 @@ class SessionFailureTask(val packageName: String, val user: UserHandle) : ModelU user, ) val updatedItems = - dataModel.updateAndCollectWorkspaceItemInfos(user) { info -> - if (info.isArchived) { - // Refresh icons on the workspace for archived apps. - iconCache.getTitleAndIcon(info, info.matchingLookupFlag) - true - } else false - } + dataModel.updateAndCollectWorkspaceItemInfos( + user, + { info -> + if (info.isArchived) { + // Refresh icons on the workspace for archived apps. + iconCache.getTitleAndIcon(info, info.matchingLookupFlag) + true + } else false + }, + ) if (updatedItems.isNotEmpty()) { taskController.bindUpdatedWorkspaceItems(updatedItems) } diff --git a/src/com/android/launcher3/model/ShortcutsChangedTask.kt b/src/com/android/launcher3/model/ShortcutsChangedTask.kt index 7ce4cdeb5b..42e4e04231 100644 --- a/src/com/android/launcher3/model/ShortcutsChangedTask.kt +++ b/src/com/android/launcher3/model/ShortcutsChangedTask.kt @@ -49,12 +49,15 @@ class ShortcutsChangedTask( // Find WorkspaceItemInfo's that have changed on the workspace. val matchingShortcutIds = mutableSetOf() synchronized(dataModel) { - dataModel.updateAndCollectWorkspaceItemInfos(user) { - if (itemFilter.invoke(it)) matchingShortcutIds.add(it.deepShortcutId) + dataModel.updateAndCollectWorkspaceItemInfos( + user, + { + if (itemFilter.invoke(it)) matchingShortcutIds.add(it.deepShortcutId) - // We don't care about the returned list - false - } + // We don't care about the returned list + false + }, + ) } if (matchingShortcutIds.isNotEmpty()) { @@ -79,25 +82,29 @@ class ShortcutsChangedTask( val updatedWorkspaceItemInfos: List synchronized(dataModel) { updatedWorkspaceItemInfos = - dataModel.updateAndCollectWorkspaceItemInfos(user) { - if (!itemFilter.invoke(it)) return@updateAndCollectWorkspaceItemInfos false - val shortcutId = - it.deepShortcutId ?: return@updateAndCollectWorkspaceItemInfos false - val fullDetails = - pinnedShortcuts[shortcutId] - ?: return@updateAndCollectWorkspaceItemInfos false + dataModel.updateAndCollectWorkspaceItemInfos( + user, + { + if (!itemFilter.invoke(it)) + return@updateAndCollectWorkspaceItemInfos false + val shortcutId = + it.deepShortcutId ?: return@updateAndCollectWorkspaceItemInfos false + val fullDetails = + pinnedShortcuts[shortcutId] + ?: return@updateAndCollectWorkspaceItemInfos false - if (!fullDetails.isPinned && !Flags.restoreArchivedShortcuts()) - return@updateAndCollectWorkspaceItemInfos false + if (!fullDetails.isPinned && !Flags.restoreArchivedShortcuts()) + return@updateAndCollectWorkspaceItemInfos false - nonPinnedIds.remove(shortcutId) - it.updateFromDeepShortcutInfo(fullDetails, context) - taskController.iconCache.getShortcutIcon( - it, - CacheableShortcutInfo(fullDetails, infoWrapper), - ) - true - } + nonPinnedIds.remove(shortcutId) + it.updateFromDeepShortcutInfo(fullDetails, context) + taskController.iconCache.getShortcutIcon( + it, + CacheableShortcutInfo(fullDetails, infoWrapper), + ) + true + }, + ) } taskController.bindUpdatedWorkspaceItems(updatedWorkspaceItemInfos)