Using single pass to update both widgets and shortcuts in BgDataModel
Bug: 390572144 Test: Presubmit Flag: EXEMPT refactor Change-Id: I9ead8f7acb9fc3b550f7368474f0402c032dfd12
This commit is contained in:
1 parent
53cc9a7806
commit
f7fa4cef5b
6 files changed
+125
-114
No files matched your search
@@ -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);
|
||||
|
||||
Reference in new issue
Block a user