Removing redudntant objects from BgDataModel
Bug: 390572144 Flag: EXEMPT refactor Test: Updated model tests Change-Id: Ied8a0bfdbfd324b9fb05724f1fcf67238aa37d16
This commit is contained in:
1 parent
e3220bec92
commit
777324ed15
26 files changed
+451
-512
No files matched your search
@@ -18,6 +18,7 @@ package com.android.launcher3.model;
|
||||
import static com.android.launcher3.Flags.enableCategorizedWidgetSuggestions;
|
||||
import static com.android.launcher3.Flags.enableTieredWidgetsByDefaultInPicker;
|
||||
import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_WIDGETS_PREDICTION;
|
||||
import static com.android.launcher3.model.ModelUtils.WIDGET_FILTER;
|
||||
|
||||
import static java.util.stream.Collectors.groupingBy;
|
||||
import static java.util.stream.Collectors.toMap;
|
||||
@@ -69,9 +70,11 @@ public final class WidgetsPredictionUpdateTask implements ModelUpdateTask {
|
||||
@NonNull AllAppsList apps) {
|
||||
Predicate<WidgetItem> predictedWidgetsFilter = enableTieredWidgetsByDefaultInPicker()
|
||||
? dataModel.widgetsModel.getPredictedWidgetsFilter() : null;
|
||||
Set<ComponentKey> widgetsInWorkspace = dataModel.appWidgets.stream().map(
|
||||
widget -> new ComponentKey(widget.providerName, widget.user)).collect(
|
||||
Collectors.toSet());
|
||||
Set<ComponentKey> widgetsInWorkspace = dataModel.itemsIdMap
|
||||
.stream()
|
||||
.filter(WIDGET_FILTER)
|
||||
.map(item -> new ComponentKey(item.getTargetComponent(), item.user))
|
||||
.collect(Collectors.toSet());
|
||||
|
||||
// Widgets (excluding shortcuts & already added widgets) that belong to apps eligible for
|
||||
// being in predictions.
|
||||
|
||||
Reference in new issue
Block a user