Picker rebinds recommendations when size constraints change or fold/unfold, but recommendations from popup provider may have changed. This is an attempt at trying to maintain currently shown items as much possible. Also, align the pagination and title to the top in two pane picker (confirmed with David that we prefer this version) Additionally, we don't show the widgets count for suggestions. Bug: 318410881 Flag: ACONFIG com.android.launcher3.enable_categorized_widget_recommendations DEVELOPMENT Test: Manual Change-Id: I60799f9ad38da913c3e084d758f5b82c79cd641c
289 lines
12 KiB
Java
289 lines
12 KiB
Java
/*
|
|
* Copyright (C) 2024 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
package com.android.launcher3.widget.picker;
|
|
|
|
import static com.android.launcher3.widget.util.WidgetsTableUtils.groupWidgetItemsUsingRowPxWithoutReordering;
|
|
|
|
import android.content.Context;
|
|
import android.util.AttributeSet;
|
|
import android.view.LayoutInflater;
|
|
import android.view.View;
|
|
import android.view.ViewGroup;
|
|
import android.widget.TextView;
|
|
|
|
import androidx.annotation.Nullable;
|
|
import androidx.annotation.Px;
|
|
|
|
import com.android.launcher3.DeviceProfile;
|
|
import com.android.launcher3.PagedView;
|
|
import com.android.launcher3.R;
|
|
import com.android.launcher3.model.WidgetItem;
|
|
import com.android.launcher3.pageindicators.PageIndicatorDots;
|
|
|
|
import java.util.ArrayList;
|
|
import java.util.List;
|
|
import java.util.Map;
|
|
import java.util.TreeMap;
|
|
import java.util.function.Consumer;
|
|
|
|
/**
|
|
* A {@link PagedView} that displays widget recommendations in categories with dots as paged
|
|
* indicators.
|
|
*/
|
|
public final class WidgetRecommendationsView extends PagedView<PageIndicatorDots> {
|
|
private @Px float mAvailableHeight = Float.MAX_VALUE;
|
|
private static final int MAX_CATEGORIES = 3;
|
|
private TextView mRecommendationPageTitle;
|
|
private final List<String> mCategoryTitles = new ArrayList<>();
|
|
|
|
/** Callbacks to run when page changes */
|
|
private final List<Consumer<Integer>> mPageSwitchListeners = new ArrayList<>();
|
|
|
|
@Nullable
|
|
private OnLongClickListener mWidgetCellOnLongClickListener;
|
|
@Nullable
|
|
private OnClickListener mWidgetCellOnClickListener;
|
|
|
|
public WidgetRecommendationsView(Context context) {
|
|
this(context, /* attrs= */ null);
|
|
}
|
|
|
|
public WidgetRecommendationsView(Context context, AttributeSet attrs) {
|
|
this(context, attrs, /* defStyleAttr= */ 0);
|
|
}
|
|
|
|
public WidgetRecommendationsView(Context context, AttributeSet attrs, int defStyle) {
|
|
super(context, attrs, defStyle);
|
|
}
|
|
|
|
@Override
|
|
public void initParentViews(View parent) {
|
|
super.initParentViews(parent);
|
|
mRecommendationPageTitle = parent.findViewById(R.id.recommendations_page_title);
|
|
}
|
|
|
|
/** Sets a {@link android.view.View.OnLongClickListener} for all widget cells in this table. */
|
|
public void setWidgetCellLongClickListener(OnLongClickListener onLongClickListener) {
|
|
mWidgetCellOnLongClickListener = onLongClickListener;
|
|
}
|
|
|
|
/** Sets a {@link android.view.View.OnClickListener} for all widget cells in this table. */
|
|
public void setWidgetCellOnClickListener(OnClickListener widgetCellOnClickListener) {
|
|
mWidgetCellOnClickListener = widgetCellOnClickListener;
|
|
}
|
|
|
|
/**
|
|
* Add a callback to run when the current displayed page changes.
|
|
*/
|
|
public void addPageSwitchListener(Consumer<Integer> pageChangeListener) {
|
|
mPageSwitchListeners.add(pageChangeListener);
|
|
}
|
|
|
|
/**
|
|
* Displays all the provided recommendations in a single table if they fit.
|
|
*
|
|
* @param recommendedWidgets list of widgets to be displayed in recommendation section.
|
|
* @param deviceProfile the current {@link DeviceProfile}
|
|
* @param availableHeight height in px that can be used to display the recommendations;
|
|
* recommendations that don't fit in this height won't be shown
|
|
* @param availableWidth width in px that the recommendations should display in
|
|
* @param cellPadding padding in px that should be applied to each widget in the
|
|
* recommendations
|
|
* @return number of recommendations that could fit in the available space.
|
|
*/
|
|
public int setRecommendations(
|
|
List<WidgetItem> recommendedWidgets, DeviceProfile deviceProfile,
|
|
final @Px float availableHeight, final @Px int availableWidth,
|
|
final @Px int cellPadding) {
|
|
this.mAvailableHeight = availableHeight;
|
|
clear();
|
|
|
|
int displayedWidgets = maybeDisplayInTable(recommendedWidgets, deviceProfile,
|
|
availableWidth, cellPadding);
|
|
updateTitleAndIndicator(/* requestedPage= */ 0);
|
|
return displayedWidgets;
|
|
}
|
|
|
|
/**
|
|
* Displays the recommendations grouped by categories as pages.
|
|
* <p>In case of a single category, no title is displayed for it.</p>
|
|
*
|
|
* @param recommendations a map of widget items per recommendation category
|
|
* @param deviceProfile the current {@link DeviceProfile}
|
|
* @param availableHeight height in px that can be used to display the recommendations;
|
|
* recommendations that don't fit in this height won't be shown
|
|
* @param availableWidth width in px that the recommendations should display in
|
|
* @param cellPadding padding in px that should be applied to each widget in the
|
|
* recommendations
|
|
* @param requestedPage page number to display initially.
|
|
* @return number of recommendations that could fit in the available space.
|
|
*/
|
|
public int setRecommendations(
|
|
Map<WidgetRecommendationCategory, List<WidgetItem>> recommendations,
|
|
DeviceProfile deviceProfile, final @Px float availableHeight,
|
|
final @Px int availableWidth, final @Px int cellPadding, final int requestedPage) {
|
|
this.mAvailableHeight = availableHeight;
|
|
Context context = getContext();
|
|
// For purpose of recommendations section, we don't want paging dots to be halved in two
|
|
// pane display, so, we always provide isTwoPanels = "false".
|
|
mPageIndicator.setPauseScroll(/*pause=*/true, /*isTwoPanels=*/ false);
|
|
clear();
|
|
|
|
int displayedCategories = 0;
|
|
int totalDisplayedWidgets = 0;
|
|
|
|
// Render top MAX_CATEGORIES in separate tables. Each table becomes a page.
|
|
for (Map.Entry<WidgetRecommendationCategory, List<WidgetItem>> entry :
|
|
new TreeMap<>(recommendations).entrySet()) {
|
|
// If none of the recommendations for the category could fit in the mAvailableHeight, we
|
|
// don't want to add that category; and we look for the next one.
|
|
int displayedCount = maybeDisplayInTable(entry.getValue(), deviceProfile,
|
|
availableWidth, cellPadding);
|
|
if (displayedCount > 0) {
|
|
mCategoryTitles.add(
|
|
context.getResources().getString(entry.getKey().categoryTitleRes));
|
|
displayedCategories++;
|
|
totalDisplayedWidgets += displayedCount;
|
|
}
|
|
|
|
if (displayedCategories == MAX_CATEGORIES) {
|
|
break;
|
|
}
|
|
}
|
|
|
|
updateTitleAndIndicator(requestedPage);
|
|
// For purpose of recommendations section, we don't want paging dots to be halved in two
|
|
// pane display, so, we always provide isTwoPanels = "false".
|
|
mPageIndicator.setPauseScroll(/*pause=*/false, /*isTwoPanels=*/false);
|
|
return totalDisplayedWidgets;
|
|
}
|
|
|
|
private void clear() {
|
|
mCategoryTitles.clear();
|
|
removeAllViews();
|
|
setCurrentPage(0);
|
|
mPageIndicator.setActiveMarker(0);
|
|
}
|
|
|
|
/** Displays the page title and paging indicator if there are multiple pages. */
|
|
private void updateTitleAndIndicator(int requestedPage) {
|
|
boolean showPaginatedView = getPageCount() > 1;
|
|
int titleAndIndicatorVisibility = showPaginatedView ? View.VISIBLE : View.GONE;
|
|
mRecommendationPageTitle.setVisibility(titleAndIndicatorVisibility);
|
|
mPageIndicator.setVisibility(titleAndIndicatorVisibility);
|
|
if (showPaginatedView) {
|
|
if (requestedPage <= 0 || requestedPage >= getPageCount()) {
|
|
requestedPage = 0;
|
|
}
|
|
setCurrentPage(requestedPage);
|
|
mPageIndicator.setActiveMarker(requestedPage);
|
|
mRecommendationPageTitle.setText(mCategoryTitles.get(requestedPage));
|
|
}
|
|
}
|
|
|
|
@Override
|
|
protected void notifyPageSwitchListener(int prevPage) {
|
|
if (getPageCount() > 1) {
|
|
// Since the title is outside the paging scroll, we update the title on page switch.
|
|
int nextPage = getNextPage();
|
|
mRecommendationPageTitle.setText(mCategoryTitles.get(nextPage));
|
|
mPageSwitchListeners.forEach(listener -> listener.accept(nextPage));
|
|
super.notifyPageSwitchListener(prevPage);
|
|
}
|
|
}
|
|
|
|
@Override
|
|
protected boolean canScroll(float absVScroll, float absHScroll) {
|
|
// Allow only horizontal scroll.
|
|
return (absHScroll > absVScroll) && super.canScroll(absVScroll, absHScroll);
|
|
}
|
|
|
|
@Override
|
|
protected void onScrollChanged(int l, int t, int oldl, int oldt) {
|
|
super.onScrollChanged(l, t, oldl, oldt);
|
|
mPageIndicator.setScroll(l, mMaxScroll);
|
|
}
|
|
|
|
@Override
|
|
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
|
|
boolean hasMultiplePages = getChildCount() > 0;
|
|
|
|
if (hasMultiplePages) {
|
|
int finalWidth = MeasureSpec.getSize(widthMeasureSpec);
|
|
int desiredHeight = 0;
|
|
|
|
for (int i = 0; i < getChildCount(); i++) {
|
|
View child = getChildAt(i);
|
|
measureChild(child, widthMeasureSpec, heightMeasureSpec);
|
|
// Use height of tallest child as we have limited height.
|
|
desiredHeight = Math.max(desiredHeight, child.getMeasuredHeight());
|
|
}
|
|
|
|
int finalHeight = resolveSizeAndState(desiredHeight, heightMeasureSpec, 0);
|
|
setMeasuredDimension(finalWidth, finalHeight);
|
|
} else {
|
|
super.onMeasure(widthMeasureSpec, heightMeasureSpec);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Groups the provided recommendations into rows and displays them in a table if at least one
|
|
* fits.
|
|
* <p>Returns false if none of the recommendations could fit.</p>
|
|
*/
|
|
private int maybeDisplayInTable(List<WidgetItem> recommendedWidgets,
|
|
DeviceProfile deviceProfile,
|
|
final @Px int availableWidth, final @Px int cellPadding) {
|
|
Context context = getContext();
|
|
LayoutInflater inflater = LayoutInflater.from(context);
|
|
|
|
// Since we are limited by space, we don't sort recommendations - to show most relevant
|
|
// (if possible).
|
|
List<ArrayList<WidgetItem>> rows = groupWidgetItemsUsingRowPxWithoutReordering(
|
|
recommendedWidgets,
|
|
context,
|
|
deviceProfile,
|
|
availableWidth,
|
|
cellPadding);
|
|
|
|
WidgetsRecommendationTableLayout recommendationsTable =
|
|
(WidgetsRecommendationTableLayout) inflater.inflate(
|
|
R.layout.widget_recommendations_table,
|
|
/* root=*/ this,
|
|
/* attachToRoot=*/ false);
|
|
recommendationsTable.setWidgetCellOnClickListener(mWidgetCellOnClickListener);
|
|
recommendationsTable.setWidgetCellLongClickListener(mWidgetCellOnLongClickListener);
|
|
|
|
int displayedCount = recommendationsTable.setRecommendedWidgets(rows,
|
|
deviceProfile, mAvailableHeight);
|
|
if (displayedCount > 0) {
|
|
addView(recommendationsTable);
|
|
}
|
|
|
|
return displayedCount;
|
|
}
|
|
|
|
/** Returns location of a widget cell for displaying the "touch and hold" education tip. */
|
|
public View getViewForEducationTip() {
|
|
if (getChildCount() > 0) {
|
|
// first page (a table layout) -> first item (a widget cell).
|
|
return ((ViewGroup) getChildAt(0)).getChildAt(0);
|
|
}
|
|
return null;
|
|
}
|
|
}
|