diff --git a/quickstep/res/values/config.xml b/quickstep/res/values/config.xml
index 5c80575568..f3c94678ac 100644
--- a/quickstep/res/values/config.xml
+++ b/quickstep/res/values/config.xml
@@ -52,6 +52,11 @@
23
+
+ 6
+
diff --git a/quickstep/src/com/android/launcher3/model/WidgetsPredictionUpdateTask.java b/quickstep/src/com/android/launcher3/model/WidgetsPredictionUpdateTask.java
index 0395d32c13..9d9054eda9 100644
--- a/quickstep/src/com/android/launcher3/model/WidgetsPredictionUpdateTask.java
+++ b/quickstep/src/com/android/launcher3/model/WidgetsPredictionUpdateTask.java
@@ -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 predictedWidgetsFilter = enableTieredWidgetsByDefaultInPicker()
+ ? dataModel.widgetsModel.getPredictedWidgetsFilter() : null;
Set widgetsInWorkspace = dataModel.appWidgets.stream().map(
widget -> new ComponentKey(widget.providerName, widget.user)).collect(
Collectors.toSet());
- Predicate notOnWorkspace = w -> !widgetsInWorkspace.contains(w);
- Map allWidgets =
- dataModel.widgetsModel.getWidgetsByComponentKey();
+
+ // Widgets (excluding shortcuts & already added widgets) that belong to apps eligible for
+ // being in predictions.
+ Map 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 servicePredictedItems = new ArrayList<>();
+ List 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> eligibleWidgetsByApp =
+ allEligibleWidgets.values().stream()
+ .filter(w -> !addedWidgetApps.contains(
+ w.componentName.getPackageName()))
+ .collect(groupingBy(w -> w.componentName.getPackageName()));
+
+ // Randomize available apps list
+ List appPackages = new ArrayList<>(eligibleWidgetsByApp.keySet());
+ Collections.shuffle(appPackages);
+
+ int widgetsToAdd = minPredictionCount - servicePredictedItems.size();
+ for (String appPackage : appPackages) {
+ if (widgetsToAdd <= 0) break;
+
+ List 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 items;
if (enableCategorizedWidgetSuggestions()) {
- Context context = taskController.getApp().getContext();
WidgetRecommendationCategoryProvider categoryProvider =
WidgetRecommendationCategoryProvider.newInstance(context);
items = servicePredictedItems.stream()
diff --git a/quickstep/tests/src/com/android/launcher3/model/WidgetsPredicationUpdateTaskTest.java b/quickstep/tests/src/com/android/launcher3/model/WidgetsPredicationUpdateTaskTest.java
index 7b57c81b74..c53c177827 100644
--- a/quickstep/tests/src/com/android/launcher3/model/WidgetsPredicationUpdateTaskTest.java
+++ b/quickstep/tests/src/com/android/launcher3/model/WidgetsPredicationUpdateTaskTest.java
@@ -33,6 +33,7 @@ import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
import android.app.prediction.AppTarget;
import android.app.prediction.AppTargetId;
@@ -42,6 +43,8 @@ import android.content.ComponentName;
import android.content.pm.ApplicationInfo;
import android.content.pm.LauncherApps;
import android.os.UserHandle;
+import android.platform.test.annotations.DisableFlags;
+import android.platform.test.annotations.EnableFlags;
import android.platform.test.flag.junit.SetFlagsRule;
import android.text.TextUtils;
@@ -62,15 +65,22 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
import java.util.Arrays;
import java.util.List;
+import java.util.Set;
+import java.util.function.Predicate;
import java.util.stream.Collectors;
@SmallTest
@RunWith(AndroidJUnit4.class)
public final class WidgetsPredicationUpdateTaskTest {
+ @Rule
+ public final MockitoRule mocks = MockitoJUnit.rule();
+
@Rule
public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
@@ -145,6 +155,7 @@ public final class WidgetsPredicationUpdateTaskTest {
}
@Test
+ @DisableFlags(Flags.FLAG_ENABLE_TIERED_WIDGETS_BY_DEFAULT_IN_PICKER) // Flag off
public void widgetsRecommendationRan_shouldOnlyReturnNotAddedWidgetsInAppPredictionOrder() {
// Run on model executor so that no other task runs in the middle.
runOnExecutorSync(MODEL_EXECUTOR, () -> {
@@ -184,6 +195,7 @@ public final class WidgetsPredicationUpdateTaskTest {
}
@Test
+ @DisableFlags(Flags.FLAG_ENABLE_TIERED_WIDGETS_BY_DEFAULT_IN_PICKER) // Flag off
public void widgetsRecommendationRan_shouldReturnEmptyWidgetsWhenEmpty() {
runOnExecutorSync(MODEL_EXECUTOR, () -> {
@@ -213,6 +225,50 @@ public final class WidgetsPredicationUpdateTaskTest {
});
}
+ @Test
+ @EnableFlags(Flags.FLAG_ENABLE_TIERED_WIDGETS_BY_DEFAULT_IN_PICKER)
+ public void widgetsRecommendationRan_keepsWidgetsNotOnWorkspace_addsWidgetsFromEligibleApps() {
+ runOnExecutorSync(MODEL_EXECUTOR, () -> {
+ WidgetsFilterDataProvider spiedFilterProvider = spy(
+ mModelHelper.getModel().getWidgetsFilterDataProvider());
+ doAnswer(i -> new Predicate() {
+ @Override
+ public boolean test(WidgetItem widgetItem) {
+ // app5's widget is already on workspace, but, app2 is not.
+ // And app4's second widget is also not on workspace.
+ return Set.of("app5", "app2", "app4").contains(
+ widgetItem.componentName.getPackageName());
+ }
+ }).when(spiedFilterProvider).getPredictedWidgetsFilter();
+ mModelHelper.getBgDataModel().widgetsModel.updateWidgetFilters(spiedFilterProvider);
+ // App5's widget that's already on workspace.
+ AppTarget widget1 = new AppTarget(new AppTargetId("app5"), "app5", "provider1",
+ mUserHandle);
+ // App4's widget eligible and not on workspace.
+ AppTarget widget2 = new AppTarget(new AppTargetId("app4"), "app4", "provider2",
+ mUserHandle);
+
+ mCallback.mRecommendedWidgets = null;
+ mModelHelper.getModel().enqueueModelUpdateTask(
+ newWidgetsPredicationTask(List.of(widget1, widget2)));
+ runOnExecutorSync(MAIN_EXECUTOR, () -> {
+ });
+
+ List recommendedWidgets = mCallback.mRecommendedWidgets.items
+ .stream()
+ .map(itemInfo -> (PendingAddWidgetInfo) itemInfo)
+ .collect(Collectors.toList());
+ assertThat(recommendedWidgets).hasSize(2);
+ List componentNames = recommendedWidgets.stream().map(
+ w -> w.componentName).toList();
+ assertThat(componentNames).containsExactly(
+ // Locally added, not on workspace, eligible app per filter
+ mApp2Provider1.provider,
+ // From prediction service, not on workspace, eligible app per filter
+ mApp4Provider2.provider);
+ });
+ }
+
private void assertWidgetInfo(
LauncherAppWidgetProviderInfo actual, AppWidgetProviderInfo expected) {
assertThat(actual.provider).isEqualTo(expected.provider);