Update widget predictor to apply prediction filter

When enough widgets are not passing the filter, additional randomly
 selected widgets are added.

The count to decide whether to add more is a configuration, so that,
if some OEMs don't want any suggestions, can override the value to 0.

Bug: 356127021
Flag: com.android.launcher3.enable_tiered_widgets_by_default_in_picker
Test: Unit tests
Change-Id: Iffa8619149a1a4b468d367fc7bbee381be59469d
This commit is contained in:
Shamali P authored and Shamali Patwa committed 2024-11-07 14:01:52 +00:00
1 parent 35a25984c3
commit 531c227c45
3 files changed
+116 -9

No files matched your search

@@ -16,8 +16,12 @@
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 java.util.stream.Collectors.groupingBy;
import static java.util.stream.Collectors.toMap;
import android.app.prediction.AppTarget;
import android.content.ComponentName;
import android.content.Context;
@@ -26,6 +30,7 @@ import android.text.TextUtils;
import androidx.annotation.NonNull;
import com.android.launcher3.LauncherModel.ModelUpdateTask;
import com.android.launcher3.R;
import com.android.launcher3.model.BgDataModel.FixedContainerItems;
import com.android.launcher3.model.QuickstepModelDelegate.PredictorState;
import com.android.launcher3.model.data.ItemInfo;
@@ -34,8 +39,10 @@ import com.android.launcher3.widget.PendingAddWidgetInfo;
import com.android.launcher3.widget.picker.WidgetRecommendationCategoryProvider;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Random;
import java.util.Set;
import java.util.function.Predicate;
import java.util.stream.Collectors;
@@ -60,33 +67,72 @@ public final class WidgetsPredictionUpdateTask implements ModelUpdateTask {
@Override
public void execute(@NonNull ModelTaskController taskController, @NonNull BgDataModel dataModel,
@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());
Predicate<WidgetItem> notOnWorkspace = w -> !widgetsInWorkspace.contains(w);
Map<ComponentKey, WidgetItem> allWidgets =
dataModel.widgetsModel.getWidgetsByComponentKey();
// Widgets (excluding shortcuts & already added widgets) that belong to apps eligible for
// being in predictions.
Map<ComponentKey, WidgetItem> allEligibleWidgets =
dataModel.widgetsModel.getWidgetsByComponentKey()
.entrySet()
.stream()
.filter(entry -> entry.getValue().widgetInfo != null
&& !widgetsInWorkspace.contains(entry.getValue())
&& (predictedWidgetsFilter == null
|| predictedWidgetsFilter.test(entry.getValue()))
).collect(toMap(Map.Entry::getKey, Map.Entry::getValue));
Context context = taskController.getApp().getContext();
List<WidgetItem> servicePredictedItems = new ArrayList<>();
List<String> addedWidgetApps = new ArrayList<>();
for (AppTarget app : mTargets) {
ComponentKey componentKey = new ComponentKey(
new ComponentName(app.getPackageName(), app.getClassName()), app.getUser());
WidgetItem widget = allWidgets.get(componentKey);
if (widget == null) {
WidgetItem widget = allEligibleWidgets.get(componentKey);
if (widget == null) { // widget not eligible.
continue;
}
String className = app.getClassName();
if (!TextUtils.isEmpty(className)) {
if (notOnWorkspace.test(widget)) {
servicePredictedItems.add(widget);
}
servicePredictedItems.add(widget);
addedWidgetApps.add(componentKey.componentName.getPackageName());
}
}
int minPredictionCount = context.getResources().getInteger(
R.integer.widget_predictions_min_count);
if (enableTieredWidgetsByDefaultInPicker()
&& servicePredictedItems.size() < minPredictionCount) {
// Eligible apps that aren't already part of predictions.
Map<String, List<WidgetItem>> eligibleWidgetsByApp =
allEligibleWidgets.values().stream()
.filter(w -> !addedWidgetApps.contains(
w.componentName.getPackageName()))
.collect(groupingBy(w -> w.componentName.getPackageName()));
// Randomize available apps list
List<String> appPackages = new ArrayList<>(eligibleWidgetsByApp.keySet());
Collections.shuffle(appPackages);
int widgetsToAdd = minPredictionCount - servicePredictedItems.size();
for (String appPackage : appPackages) {
if (widgetsToAdd <= 0) break;
List<WidgetItem> widgetsForApp = eligibleWidgetsByApp.get(appPackage);
int index = new Random().nextInt(widgetsForApp.size());
// Add a random widget from the app.
servicePredictedItems.add(widgetsForApp.get(index));
widgetsToAdd--;
}
}
List<ItemInfo> items;
if (enableCategorizedWidgetSuggestions()) {
Context context = taskController.getApp().getContext();
WidgetRecommendationCategoryProvider categoryProvider =
WidgetRecommendationCategoryProvider.newInstance(context);
items = servicePredictedItems.stream()