3cdb32cc1f
Added extra 16dp to the cell height in DeviceProfile as per spec: https://docs.google.com/presentation/d/1dSt-zY_wRrOmd9a9nsQG458CIK0RUqVJsHJxLHP_0Nc/edit#slide=id.g237e909075a_2_6 Updated tests andincluded vertical check to see if two line can be fully rendered without being clipped. Otherwise just show one line. Since existing cell height is 104dp, we add 16dp to be up to spec (120dp) - Clean up FeatureFlag ENABLE_TWOLINE_ALLAPPS and now use aconfig flag bug: 270390937 Test: manually - photos Regular font: https://screenshot.googleplex.com/ArUcgZgHqR4ZWBQ Bigger font than regular that makes text to one line because it wouldve truncate: https://screenshot.googleplex.com/6s8EdMAbBLsYhLi Bigger font than regular with predicted app row (twoline): https://screenshot.googleplex.com/38TEQei5GvPiCc7 Super big font: https://screenshot.googleplex.com/3JUYYprJRQ32Hsq big display and regular font: https://screenshot.googleplex.com/55rBKVQ8htSe9Vc big display and bigger than regular font: https://screenshot.googleplex.com/3atzKzJUbfM7YQW flag: is off Change-Id: I6998ea5da35d3e00ac75327d16b5ca676fb11c1a
262 lines
9.6 KiB
Java
262 lines
9.6 KiB
Java
/*
|
|
* Copyright (C) 2022 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.allapps;
|
|
|
|
import android.content.Context;
|
|
import android.view.LayoutInflater;
|
|
import android.view.View;
|
|
import android.view.View.OnClickListener;
|
|
import android.view.View.OnFocusChangeListener;
|
|
import android.view.View.OnLongClickListener;
|
|
import android.view.ViewGroup;
|
|
import android.widget.TextView;
|
|
|
|
import androidx.recyclerview.widget.RecyclerView;
|
|
|
|
import com.android.launcher3.BubbleTextView;
|
|
import com.android.launcher3.Flags;
|
|
import com.android.launcher3.R;
|
|
import com.android.launcher3.allapps.search.SearchAdapterProvider;
|
|
import com.android.launcher3.config.FeatureFlags;
|
|
import com.android.launcher3.model.data.AppInfo;
|
|
import com.android.launcher3.views.ActivityContext;
|
|
|
|
/**
|
|
* Adapter for all the apps.
|
|
*
|
|
* @param <T> Type of context inflating all apps.
|
|
*/
|
|
public abstract class BaseAllAppsAdapter<T extends Context & ActivityContext> extends
|
|
RecyclerView.Adapter<BaseAllAppsAdapter.ViewHolder> {
|
|
|
|
public static final String TAG = "BaseAllAppsAdapter";
|
|
|
|
// A normal icon
|
|
public static final int VIEW_TYPE_ICON = 1 << 1;
|
|
// The message shown when there are no filtered results
|
|
public static final int VIEW_TYPE_EMPTY_SEARCH = 1 << 2;
|
|
// A divider that separates the apps list and the search market button
|
|
public static final int VIEW_TYPE_ALL_APPS_DIVIDER = 1 << 3;
|
|
|
|
public static final int VIEW_TYPE_WORK_EDU_CARD = 1 << 4;
|
|
public static final int VIEW_TYPE_WORK_DISABLED_CARD = 1 << 5;
|
|
|
|
public static final int NEXT_ID = 6;
|
|
|
|
// Common view type masks
|
|
public static final int VIEW_TYPE_MASK_DIVIDER = VIEW_TYPE_ALL_APPS_DIVIDER;
|
|
public static final int VIEW_TYPE_MASK_ICON = VIEW_TYPE_ICON;
|
|
|
|
protected final SearchAdapterProvider<?> mAdapterProvider;
|
|
|
|
/**
|
|
* ViewHolder for each icon.
|
|
*/
|
|
public static class ViewHolder extends RecyclerView.ViewHolder {
|
|
|
|
public ViewHolder(View v) {
|
|
super(v);
|
|
}
|
|
}
|
|
|
|
/** Sets the number of apps to be displayed in one row of the all apps screen. */
|
|
public abstract void setAppsPerRow(int appsPerRow);
|
|
|
|
/**
|
|
* Info about a particular adapter item (can be either section or app)
|
|
*/
|
|
public static class AdapterItem {
|
|
/** Common properties */
|
|
// The type of this item
|
|
public final int viewType;
|
|
|
|
// The row that this item shows up on
|
|
public int rowIndex;
|
|
// The index of this app in the row
|
|
public int rowAppIndex;
|
|
// The associated ItemInfoWithIcon for the item
|
|
public AppInfo itemInfo = null;
|
|
|
|
public AdapterItem(int viewType) {
|
|
this.viewType = viewType;
|
|
}
|
|
|
|
/**
|
|
* Factory method for AppIcon AdapterItem
|
|
*/
|
|
public static AdapterItem asApp(AppInfo appInfo) {
|
|
AdapterItem item = new AdapterItem(VIEW_TYPE_ICON);
|
|
item.itemInfo = appInfo;
|
|
return item;
|
|
}
|
|
|
|
protected boolean isCountedForAccessibility() {
|
|
return viewType == VIEW_TYPE_ICON;
|
|
}
|
|
|
|
/**
|
|
* Returns true if the items represent the same object
|
|
*/
|
|
public boolean isSameAs(AdapterItem other) {
|
|
return (other.viewType == viewType) && (other.getClass() == getClass());
|
|
}
|
|
|
|
/**
|
|
* This is called only if {@link #isSameAs} returns true to check if the contents are same
|
|
* as well. Returning true will prevent redrawing of thee item.
|
|
*/
|
|
public boolean isContentSame(AdapterItem other) {
|
|
return itemInfo == null && other.itemInfo == null;
|
|
}
|
|
|
|
/** Sets the alpha of the decorator for this item. Returns true if successful. */
|
|
public boolean setDecorationFillAlpha(int alpha) {
|
|
return false;
|
|
}
|
|
}
|
|
|
|
protected final T mActivityContext;
|
|
protected final AlphabeticalAppsList<T> mApps;
|
|
// The text to show when there are no search results and no market search handler.
|
|
protected int mAppsPerRow;
|
|
|
|
protected final LayoutInflater mLayoutInflater;
|
|
protected final OnClickListener mOnIconClickListener;
|
|
protected final OnLongClickListener mOnIconLongClickListener;
|
|
protected OnFocusChangeListener mIconFocusListener;
|
|
|
|
public BaseAllAppsAdapter(T activityContext, LayoutInflater inflater,
|
|
AlphabeticalAppsList<T> apps, SearchAdapterProvider<?> adapterProvider) {
|
|
mActivityContext = activityContext;
|
|
mApps = apps;
|
|
mLayoutInflater = inflater;
|
|
|
|
mOnIconClickListener = mActivityContext.getItemOnClickListener();
|
|
mOnIconLongClickListener = mActivityContext.getAllAppsItemLongClickListener();
|
|
|
|
mAdapterProvider = adapterProvider;
|
|
}
|
|
|
|
/** Checks if the passed viewType represents all apps divider. */
|
|
public static boolean isDividerViewType(int viewType) {
|
|
return isViewType(viewType, VIEW_TYPE_MASK_DIVIDER);
|
|
}
|
|
|
|
/** Checks if the passed viewType represents all apps icon. */
|
|
public static boolean isIconViewType(int viewType) {
|
|
return isViewType(viewType, VIEW_TYPE_MASK_ICON);
|
|
}
|
|
|
|
public void setIconFocusListener(OnFocusChangeListener focusListener) {
|
|
mIconFocusListener = focusListener;
|
|
}
|
|
|
|
/**
|
|
* Returns the layout manager.
|
|
*/
|
|
public abstract RecyclerView.LayoutManager getLayoutManager();
|
|
|
|
@Override
|
|
public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
|
|
switch (viewType) {
|
|
case VIEW_TYPE_ICON:
|
|
int layout = !FeatureFlags.enableTwolineAllapps() ? R.layout.all_apps_icon
|
|
: R.layout.all_apps_icon_twoline;
|
|
BubbleTextView icon = (BubbleTextView) mLayoutInflater.inflate(
|
|
layout, parent, false);
|
|
icon.setLongPressTimeoutFactor(1f);
|
|
icon.setOnFocusChangeListener(mIconFocusListener);
|
|
icon.setOnClickListener(mOnIconClickListener);
|
|
icon.setOnLongClickListener(mOnIconLongClickListener);
|
|
// Ensure the all apps icon height matches the workspace icons in portrait mode.
|
|
icon.getLayoutParams().height =
|
|
mActivityContext.getDeviceProfile().allAppsCellHeightPx;
|
|
return new ViewHolder(icon);
|
|
case VIEW_TYPE_EMPTY_SEARCH:
|
|
return new ViewHolder(mLayoutInflater.inflate(R.layout.all_apps_empty_search,
|
|
parent, false));
|
|
case VIEW_TYPE_ALL_APPS_DIVIDER:
|
|
return new ViewHolder(mLayoutInflater.inflate(
|
|
R.layout.all_apps_divider, parent, false));
|
|
case VIEW_TYPE_WORK_EDU_CARD:
|
|
return new ViewHolder(mLayoutInflater.inflate(
|
|
R.layout.work_apps_edu, parent, false));
|
|
case VIEW_TYPE_WORK_DISABLED_CARD:
|
|
return new ViewHolder(mLayoutInflater.inflate(
|
|
R.layout.work_apps_paused, parent, false));
|
|
default:
|
|
if (mAdapterProvider.isViewSupported(viewType)) {
|
|
return mAdapterProvider.onCreateViewHolder(mLayoutInflater, parent, viewType);
|
|
}
|
|
throw new RuntimeException("Unexpected view type" + viewType);
|
|
}
|
|
}
|
|
|
|
@Override
|
|
public void onBindViewHolder(ViewHolder holder, int position) {
|
|
switch (holder.getItemViewType()) {
|
|
case VIEW_TYPE_ICON: {
|
|
AdapterItem adapterItem = mApps.getAdapterItems().get(position);
|
|
BubbleTextView icon = (BubbleTextView) holder.itemView;
|
|
icon.reset();
|
|
icon.applyFromApplicationInfo(adapterItem.itemInfo);
|
|
break;
|
|
}
|
|
case VIEW_TYPE_EMPTY_SEARCH: {
|
|
AppInfo info = mApps.getAdapterItems().get(position).itemInfo;
|
|
if (info != null) {
|
|
((TextView) holder.itemView).setText(mActivityContext.getString(
|
|
R.string.all_apps_no_search_results, info.title));
|
|
}
|
|
break;
|
|
}
|
|
case VIEW_TYPE_ALL_APPS_DIVIDER:
|
|
case VIEW_TYPE_WORK_DISABLED_CARD:
|
|
// nothing to do
|
|
break;
|
|
case VIEW_TYPE_WORK_EDU_CARD:
|
|
((WorkEduCard) holder.itemView).setPosition(position);
|
|
break;
|
|
default:
|
|
if (mAdapterProvider.isViewSupported(holder.getItemViewType())) {
|
|
mAdapterProvider.onBindView(holder, position);
|
|
}
|
|
}
|
|
}
|
|
|
|
@Override
|
|
public boolean onFailedToRecycleView(ViewHolder holder) {
|
|
// Always recycle and we will reset the view when it is bound
|
|
return true;
|
|
}
|
|
|
|
@Override
|
|
public int getItemCount() {
|
|
return mApps.getAdapterItems().size();
|
|
}
|
|
|
|
@Override
|
|
public int getItemViewType(int position) {
|
|
AdapterItem item = mApps.getAdapterItems().get(position);
|
|
return item.viewType;
|
|
}
|
|
|
|
protected static boolean isViewType(int viewType, int viewTypeMask) {
|
|
return (viewType & viewTypeMask) != 0;
|
|
}
|
|
|
|
}
|