diff --git a/quickstep/src/com/android/launcher3/model/WidgetPredictionsRequester.java b/quickstep/src/com/android/launcher3/model/WidgetPredictionsRequester.java index f9cec82834..ada7301b42 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; @@ -202,19 +201,12 @@ public class WidgetPredictionsRequester implements AppPredictor.Callback { * 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 b732cbaff6..0a4b7c8d19 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; @@ -129,20 +128,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/BaseWidgetSheet.java b/src/com/android/launcher3/widget/BaseWidgetSheet.java index fda5175794..af31276ff9 100644 --- a/src/com/android/launcher3/widget/BaseWidgetSheet.java +++ b/src/com/android/launcher3/widget/BaseWidgetSheet.java @@ -16,7 +16,6 @@ package com.android.launcher3.widget; import static com.android.app.animation.Interpolators.EMPHASIZED; -import static com.android.launcher3.Flags.enableWidgetTapToAdd; import static com.android.launcher3.LauncherState.NORMAL; import static com.android.launcher3.anim.AnimatorListeners.forSuccessCallback; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_WIDGET_ADD_BUTTON_TAP; @@ -150,40 +149,36 @@ public abstract class BaseWidgetSheet extends AbstractSlideInView return; } - if (enableWidgetTapToAdd()) { - scrollToWidgetCell(wc); + scrollToWidgetCell(wc); - if (mWidgetCellWithAddButton != null) { - if (mWidgetCellWithAddButton.isShowingAddButton()) { - // If there is a add button currently showing, hide it. - mWidgetCellWithAddButton.hideAddButton(/* animate= */ true); - } else { - // The last recorded widget cell to show an add button is no longer showing it, - // likely because the widget cell has been recycled or lost focus. If this is - // the cell that has been clicked, we will show it below. - mWidgetCellWithAddButton = null; - } - } - - if (mWidgetCellWithAddButton != wc) { - // If click is on a cell not showing an add button, show it now. - final PendingAddItemInfo info = (PendingAddItemInfo) wc.getTag(); - if (mActivityContext instanceof Launcher) { - wc.showAddButton((view) -> addWidget(info)); - } else { - wc.showAddButton((view) -> mActivityContext.getItemOnClickListener() - .onClick(wc)); - } - } - - mWidgetCellWithAddButton = mWidgetCellWithAddButton != wc ? wc : null; - if (mWidgetCellWithAddButton != null) { - mLastSelectedWidgetItem = mWidgetCellWithAddButton.getWidgetItem(); + if (mWidgetCellWithAddButton != null) { + if (mWidgetCellWithAddButton.isShowingAddButton()) { + // If there is a add button currently showing, hide it. + mWidgetCellWithAddButton.hideAddButton(/* animate= */ true); } else { - mLastSelectedWidgetItem = null; + // The last recorded widget cell to show an add button is no longer showing it, + // likely because the widget cell has been recycled or lost focus. If this is + // the cell that has been clicked, we will show it below. + mWidgetCellWithAddButton = null; } + } + + if (mWidgetCellWithAddButton != wc) { + // If click is on a cell not showing an add button, show it now. + final PendingAddItemInfo info = (PendingAddItemInfo) wc.getTag(); + if (mActivityContext instanceof Launcher) { + wc.showAddButton((view) -> addWidget(info)); + } else { + wc.showAddButton((view) -> mActivityContext.getItemOnClickListener() + .onClick(wc)); + } + } + + mWidgetCellWithAddButton = mWidgetCellWithAddButton != wc ? wc : null; + if (mWidgetCellWithAddButton != null) { + mLastSelectedWidgetItem = mWidgetCellWithAddButton.getWidgetItem(); } else { - mActivityContext.getItemOnClickListener().onClick(wc); + mLastSelectedWidgetItem = null; } } diff --git a/src/com/android/launcher3/widget/WidgetCell.java b/src/com/android/launcher3/widget/WidgetCell.java index 7a27bf45ad..130843b1df 100644 --- a/src/com/android/launcher3/widget/WidgetCell.java +++ b/src/com/android/launcher3/widget/WidgetCell.java @@ -18,7 +18,6 @@ package com.android.launcher3.widget; import static android.view.accessibility.AccessibilityNodeInfo.ACTION_CLICK; -import static com.android.launcher3.Flags.enableWidgetTapToAdd; import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_WIDGETS_TRAY; import static com.android.launcher3.widget.util.WidgetSizes.getWidgetItemSizePx; @@ -152,24 +151,22 @@ public class WidgetCell extends LinearLayout { mWidgetTextContainer = findViewById(R.id.widget_text_container); mWidgetAddButton = findViewById(R.id.widget_add_button); - if (enableWidgetTapToAdd()) { - setAccessibilityDelegate(new AccessibilityDelegate() { - @Override - public void onInitializeAccessibilityNodeInfo(View host, - AccessibilityNodeInfo info) { - super.onInitializeAccessibilityNodeInfo(host, info); - if (hasOnClickListeners()) { - String accessibilityLabel = getResources().getString( - mWidgetAddButton.isShown() - ? R.string.widget_cell_tap_to_hide_add_button_label - : R.string.widget_cell_tap_to_show_add_button_label); - info.addAction(new AccessibilityNodeInfo.AccessibilityAction(ACTION_CLICK, - accessibilityLabel)); - } + setAccessibilityDelegate(new AccessibilityDelegate() { + @Override + public void onInitializeAccessibilityNodeInfo(View host, + AccessibilityNodeInfo info) { + super.onInitializeAccessibilityNodeInfo(host, info); + if (hasOnClickListeners()) { + String accessibilityLabel = getResources().getString( + mWidgetAddButton.isShown() + ? R.string.widget_cell_tap_to_hide_add_button_label + : R.string.widget_cell_tap_to_show_add_button_label); + info.addAction(new AccessibilityNodeInfo.AccessibilityAction(ACTION_CLICK, + accessibilityLabel)); } - }); - mWidgetAddButton.setVisibility(INVISIBLE); - } + } + }); + mWidgetAddButton.setVisibility(INVISIBLE); } public void setRemoteViewsPreview(RemoteViews view) { @@ -210,9 +207,7 @@ public class WidgetCell extends LinearLayout { showDescription(true); showDimensions(true); - if (enableWidgetTapToAdd()) { - hideAddButton(/* animate= */ false); - } + hideAddButton(/* animate= */ false); if (mActiveRequest != null) { mActiveRequest.cancel(); diff --git a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java index 7a218aef0f..b0abf230b5 100644 --- a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java +++ b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java @@ -15,9 +15,7 @@ */ 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; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_WIDGETSTRAY_EXPAND_PRESS; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_WIDGETSTRAY_SEARCHED; @@ -82,12 +80,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 +628,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 +772,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 +919,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; } /** 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..9ffaf5100b 100644 --- a/src/com/android/launcher3/widget/picker/WidgetsTwoPaneSheet.java +++ b/src/com/android/launcher3/widget/picker/WidgetsTwoPaneSheet.java @@ -15,9 +15,7 @@ */ 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; import static com.android.launcher3.UtilitiesKt.CLIP_TO_PADDING_FALSE_MODIFIER; import static com.android.launcher3.UtilitiesKt.modifyAttributesOnViewTree; @@ -215,22 +213,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 @@ -257,7 +242,7 @@ public class WidgetsTwoPaneSheet extends WidgetsFullSheet { @Override protected void onLayout(boolean changed, int l, int t, int r, int b) { super.onLayout(changed, l, t, r, b); - if (changed && mDeviceProfile.isTwoPanels && enableUnfoldedTwoPanePicker()) { + if (changed && mDeviceProfile.isTwoPanels) { LinearLayout layout = mContent.findViewById(R.id.linear_layout_container); FrameLayout leftPane = layout.findViewById(R.id.recycler_view_container); LinearLayout.LayoutParams layoutParams = (LayoutParams) leftPane.getLayoutParams(); @@ -427,7 +412,7 @@ public class WidgetsTwoPaneSheet extends WidgetsFullSheet { protected int getAvailableWidthForSuggestions(int pickerAvailableWidth) { int rightPaneWidth = (int) Math.ceil(0.67 * pickerAvailableWidth); - if (mDeviceProfile.isTwoPanels && enableUnfoldedTwoPanePicker()) { + if (mDeviceProfile.isTwoPanels) { // See onLayout int leftPaneWidth = (int) (0.33 * pickerAvailableWidth); @Px int minLeftPaneWidthPx = Utilities.dpToPx(MINIMUM_WIDTH_LEFT_PANE_FOLDABLE_DP); @@ -552,13 +537,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);