diff --git a/quickstep/src/com/android/launcher3/model/WidgetPredictionsRequester.java b/quickstep/src/com/android/launcher3/model/WidgetPredictionsRequester.java index d3ac975052..fc5f3392ff 100644 --- a/quickstep/src/com/android/launcher3/model/WidgetPredictionsRequester.java +++ b/quickstep/src/com/android/launcher3/model/WidgetPredictionsRequester.java @@ -16,7 +16,6 @@ package com.android.launcher3.model; -import static com.android.launcher3.Flags.enableCategorizedWidgetSuggestions; import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_WIDGETS_PREDICTION; import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; import static com.android.launcher3.util.Executors.MODEL_EXECUTOR; @@ -200,19 +199,12 @@ public class WidgetPredictionsRequester { * Converts the list of {@link WidgetItem}s to the list of {@link ItemInfo}s. */ private List mapWidgetItemsToItemInfo(List widgetItems) { - List items; - if (enableCategorizedWidgetSuggestions()) { - WidgetRecommendationCategoryProvider categoryProvider = - new WidgetRecommendationCategoryProvider(); - items = widgetItems.stream() - .map(it -> new PendingAddWidgetInfo(it.widgetInfo, CONTAINER_WIDGETS_PREDICTION, - categoryProvider.getWidgetRecommendationCategory(mContext, it))) - .collect(Collectors.toList()); - } else { - items = widgetItems.stream().map(it -> new PendingAddWidgetInfo(it.widgetInfo, - CONTAINER_WIDGETS_PREDICTION)).collect(Collectors.toList()); - } - return items; + WidgetRecommendationCategoryProvider categoryProvider = + new WidgetRecommendationCategoryProvider(); + return widgetItems.stream() + .map(it -> new PendingAddWidgetInfo(it.widgetInfo, CONTAINER_WIDGETS_PREDICTION, + categoryProvider.getWidgetRecommendationCategory(mContext, it))) + .collect(Collectors.toList()); } /** Cleans up any open prediction sessions. */ diff --git a/quickstep/src/com/android/launcher3/model/WidgetsPredictionUpdateTask.java b/quickstep/src/com/android/launcher3/model/WidgetsPredictionUpdateTask.java index 8bd2ba8a3b..f567f67c70 100644 --- a/quickstep/src/com/android/launcher3/model/WidgetsPredictionUpdateTask.java +++ b/quickstep/src/com/android/launcher3/model/WidgetsPredictionUpdateTask.java @@ -15,7 +15,6 @@ */ 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; @@ -134,20 +133,12 @@ public final class WidgetsPredictionUpdateTask implements ModelUpdateTask { } } - List items; - if (enableCategorizedWidgetSuggestions()) { - WidgetRecommendationCategoryProvider categoryProvider = - new WidgetRecommendationCategoryProvider(); - items = servicePredictedItems.stream() - .map(it -> new PendingAddWidgetInfo(it.widgetInfo, CONTAINER_WIDGETS_PREDICTION, - categoryProvider.getWidgetRecommendationCategory(context, it))) - .collect(Collectors.toList()); - } else { - items = servicePredictedItems.stream() - .map(it -> new PendingAddWidgetInfo(it.widgetInfo, - CONTAINER_WIDGETS_PREDICTION)).collect( - Collectors.toList()); - } + WidgetRecommendationCategoryProvider categoryProvider = + new WidgetRecommendationCategoryProvider(); + List items = servicePredictedItems.stream() + .map(it -> new PendingAddWidgetInfo(it.widgetInfo, CONTAINER_WIDGETS_PREDICTION, + categoryProvider.getWidgetRecommendationCategory(context, it))) + .collect(Collectors.toList()); FixedContainerItems fixedContainerItems = new FixedContainerItems(mPredictorState.containerId, items); diff --git a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java index 7a218aef0f..37b010d6ea 100644 --- a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java +++ b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java @@ -15,7 +15,6 @@ */ package com.android.launcher3.widget.picker; -import static com.android.launcher3.Flags.enableCategorizedWidgetSuggestions; import static com.android.launcher3.Flags.enableTieredWidgetsByDefaultInPicker; import static com.android.launcher3.Flags.enableUnfoldedTwoPanePicker; import static com.android.launcher3.allapps.ActivityAllAppsContainerView.AdapterHolder.SEARCH; @@ -82,12 +81,10 @@ import com.android.launcher3.workprofile.PersonalWorkPagedView; import com.android.launcher3.workprofile.PersonalWorkSlidingTabStrip.OnActivePageChangedListener; import java.util.ArrayList; -import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.function.Predicate; -import java.util.stream.Collectors; import java.util.stream.IntStream; /** @@ -632,35 +629,19 @@ public class WidgetsFullSheet extends BaseWidgetSheet if (mIsInSearchMode) { return; } - if (enableCategorizedWidgetSuggestions()) { - // We avoid applying new recommendations when some are already displayed. - if (mRecommendedWidgetsMap.isEmpty()) { - mRecommendedWidgetsMap = - mActivityContext.getWidgetPickerDataProvider().get().getRecommendations(); - } - mRecommendedWidgetsCount = mWidgetRecommendationsView.setRecommendations( - mRecommendedWidgetsMap, - mDeviceProfile, - /* availableHeight= */ getMaxAvailableHeightForRecommendations(), - /* availableWidth= */ mMaxSpanPerRow, - /* cellPadding= */ mWidgetCellHorizontalPadding, - /* requestedPage= */ mRecommendationsCurrentPage - ); - } else { - if (mRecommendedWidgets.isEmpty()) { - mRecommendedWidgets = mActivityContext.getWidgetPickerDataProvider().get() - .getRecommendations() - .values().stream() - .flatMap(Collection::stream).collect(Collectors.toList()); - mRecommendedWidgetsCount = mWidgetRecommendationsView.setRecommendations( - mRecommendedWidgets, - mDeviceProfile, - /* availableHeight= */ getMaxAvailableHeightForRecommendations(), - /* availableWidth= */ mMaxSpanPerRow, - /* cellPadding= */ mWidgetCellHorizontalPadding - ); - } + // We avoid applying new recommendations when some are already displayed. + if (mRecommendedWidgetsMap.isEmpty()) { + mRecommendedWidgetsMap = + mActivityContext.getWidgetPickerDataProvider().get().getRecommendations(); } + mRecommendedWidgetsCount = mWidgetRecommendationsView.setRecommendations( + mRecommendedWidgetsMap, + mDeviceProfile, + /* availableHeight= */ getMaxAvailableHeightForRecommendations(), + /* availableWidth= */ mMaxSpanPerRow, + /* cellPadding= */ mWidgetCellHorizontalPadding, + /* requestedPage= */ mRecommendationsCurrentPage + ); mWidgetRecommendationsContainer.setVisibility( mRecommendedWidgetsCount > 0 ? VISIBLE : GONE); @@ -792,13 +773,7 @@ public class WidgetsFullSheet extends BaseWidgetSheet } private static int getWidgetSheetId(BaseActivity activity) { - boolean isTwoPane = (activity.getDeviceProfile().isTablet - // Enables two pane picker for tablets in all orientations when the - // enableCategorizedWidgetSuggestions flag is on. - && (activity.getDeviceProfile().isLandscape || enableCategorizedWidgetSuggestions()) - && !activity.getDeviceProfile().isTwoPanels) - // Enables two pane picker for unfolded foldables if the flag is on. - || (activity.getDeviceProfile().isTwoPanels && enableUnfoldedTwoPanePicker()); + boolean isTwoPane = activity.getDeviceProfile().isTablet; return isTwoPane ? R.layout.widgets_two_pane_sheet : R.layout.widgets_full_sheet; } @@ -945,16 +920,7 @@ public class WidgetsFullSheet extends BaseWidgetSheet private static boolean shouldRecreateLayout(DeviceProfile oldDp, DeviceProfile newDp) { // When folding/unfolding the foldables, we need to switch between the regular widget picker // and the two pane picker, so we rebuild the picker with the correct layout. - boolean isFoldUnFold = - oldDp.isTwoPanels != newDp.isTwoPanels && enableUnfoldedTwoPanePicker(); - // In tablets, on orientation change we switch between single and two pane picker unless the - // categorized suggestions flag was on. With the categorized suggestions feature, we use a - // two pane picker across all orientations. - boolean useDifferentLayoutOnOrientationChange = - (!enableCategorizedWidgetSuggestions() && (newDp.isTablet && !newDp.isTwoPanels - && oldDp.isLandscape != newDp.isLandscape)); - - return isFoldUnFold || useDifferentLayoutOnOrientationChange; + return oldDp.isTwoPanels != newDp.isTwoPanels && enableUnfoldedTwoPanePicker(); } /** diff --git a/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java b/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java index 216f4d4790..9ee9150031 100644 --- a/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java +++ b/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java @@ -15,7 +15,6 @@ */ package com.android.launcher3.widget.picker; -import static com.android.launcher3.Flags.enableCategorizedWidgetSuggestions; import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_WIDGETS_PREDICTION; import static com.android.launcher3.widget.util.WidgetSizes.getWidgetSizePx; import static com.android.launcher3.widget.util.WidgetsTableUtils.WIDGETS_TABLE_ROW_COUNT_COMPARATOR; @@ -112,10 +111,8 @@ public final class WidgetsRecommendationTableLayout extends TableLayout { WidgetCell widgetCell = addItemCell(tableRow); widgetCell.applyFromCellItem(widgetItem); widgetCell.showAppIconInWidgetTitle(true); - if (enableCategorizedWidgetSuggestions()) { - widgetCell.showDescription(false); - widgetCell.showDimensions(false); - } + widgetCell.showDescription(false); + widgetCell.showDimensions(false); } addView(tableRow); } diff --git a/src/com/android/launcher3/widget/picker/WidgetsTwoPaneSheet.java b/src/com/android/launcher3/widget/picker/WidgetsTwoPaneSheet.java index df76400717..25b594d43e 100644 --- a/src/com/android/launcher3/widget/picker/WidgetsTwoPaneSheet.java +++ b/src/com/android/launcher3/widget/picker/WidgetsTwoPaneSheet.java @@ -15,7 +15,6 @@ */ package com.android.launcher3.widget.picker; -import static com.android.launcher3.Flags.enableCategorizedWidgetSuggestions; import static com.android.launcher3.Flags.enableTieredWidgetsByDefaultInPicker; import static com.android.launcher3.Flags.enableUnfoldedTwoPanePicker; import static com.android.launcher3.UtilitiesKt.CLIP_CHILDREN_FALSE_MODIFIER; @@ -215,22 +214,9 @@ public class WidgetsTwoPaneSheet extends WidgetsFullSheet { @Override protected int getTabletHorizontalMargin(DeviceProfile deviceProfile) { - if (enableCategorizedWidgetSuggestions()) { - // two pane picker is full width for fold as well as tablet. - return getResources().getDimensionPixelSize( - R.dimen.widget_picker_two_panels_left_right_margin); - } - if (deviceProfile.isTwoPanels && enableUnfoldedTwoPanePicker()) { - // enableUnfoldedTwoPanePicker made two pane picker full-width for fold only. - return getResources().getDimensionPixelSize( - R.dimen.widget_picker_two_panels_left_right_margin); - } - if (deviceProfile.isLandscape && !deviceProfile.isTwoPanels) { - // non-fold tablet landscape margins (ag/22163531) - return getResources().getDimensionPixelSize( - R.dimen.widget_picker_landscape_tablet_left_right_margin); - } - return deviceProfile.allAppsLeftRightMargin; + // two pane picker is full width for fold as well as tablet. + return getResources().getDimensionPixelSize( + R.dimen.widget_picker_two_panels_left_right_margin); } @Override @@ -552,13 +538,9 @@ public class WidgetsTwoPaneSheet extends WidgetsFullSheet { } WidgetsListContentEntry contentEntryToBind; - if (enableCategorizedWidgetSuggestions()) { - // Setting max span size enables row to understand how to fit more than one item - // in a row. - contentEntryToBind = contentEntry.withMaxSpanSize(mMaxSpanPerRow); - } else { - contentEntryToBind = contentEntry; - } + // Setting max span size enables row to understand how to fit more than one item + // in a row. + contentEntryToBind = contentEntry.withMaxSpanSize(mMaxSpanPerRow); WidgetsRowViewHolder widgetsRowViewHolder = mWidgetsListTableViewHolderBinder.newViewHolder(mRightPane);