From 7c1e37cce1327a83ff0ad52ecc6e822e7fe02874 Mon Sep 17 00:00:00 2001 From: Samuel Fufa Date: Thu, 28 Jan 2021 06:13:39 -0600 Subject: [PATCH] Migrate Widgets to new Search API Test: Manual Bug: 168321831 Bug: 177223401 Change-Id: Ide276002a47f2345fbe535adbcb3acdc2fbc1233 --- .../res/layout/search_result_widget_live.xml | 42 ++++++++++++- .../search/DeviceSearchAdapterProvider.java | 9 ++- .../launcher3/search/SearchResultIconRow.java | 1 + .../launcher3/search/SearchResultWidget.java | 61 +++++++++++++++---- .../search/SearchResultWidgetPreview.java | 14 ++--- 5 files changed, 103 insertions(+), 24 deletions(-) diff --git a/quickstep/res/layout/search_result_widget_live.xml b/quickstep/res/layout/search_result_widget_live.xml index ffbad55838..f2ac6cde9b 100644 --- a/quickstep/res/layout/search_result_widget_live.xml +++ b/quickstep/res/layout/search_result_widget_live.xml @@ -1,5 +1,43 @@ - \ No newline at end of file + > + + + + + + + + + + \ No newline at end of file diff --git a/quickstep/src/com/android/launcher3/search/DeviceSearchAdapterProvider.java b/quickstep/src/com/android/launcher3/search/DeviceSearchAdapterProvider.java index 1e6243ce76..02be0b94ed 100644 --- a/quickstep/src/com/android/launcher3/search/DeviceSearchAdapterProvider.java +++ b/quickstep/src/com/android/launcher3/search/DeviceSearchAdapterProvider.java @@ -18,10 +18,7 @@ package com.android.launcher3.search; import static com.android.launcher3.allapps.AllAppsGridAdapter.VIEW_TYPE_ICON; -import android.app.search.Query; -import android.app.search.SearchSession; import android.app.search.SearchTarget; -import android.app.search.SearchTargetEvent; import android.util.Log; import android.util.SparseIntArray; import android.view.LayoutInflater; @@ -125,6 +122,7 @@ public class DeviceSearchAdapterProvider extends SearchAdapterProvider { return VIEW_TYPE_SEARCH_SLICE; } Log.w(TAG, "Dropping as LayoutType.ICON_SLICE target doesn't contain sliceUri."); + break; case LayoutType.ICON_DOUBLE_HORIZONTAL_TEXT: case LayoutType.ICON_SINGLE_HORIZONTAL_TEXT: return VIEW_TYPE_SEARCH_ICON_ROW; @@ -133,6 +131,11 @@ public class DeviceSearchAdapterProvider extends SearchAdapterProvider { return VIEW_TYPE_SEARCH_THUMBNAIL; } Log.w(TAG, "Dropping as LayoutType.THUMBNAIL target doesn't contain searchAction."); + break; + case LayoutType.WIDGET_PREVIEW: + return VIEW_TYPE_SEARCH_WIDGET_PREVIEW; + case LayoutType.WIDGET_LIVE: + return VIEW_TYPE_SEARCH_WIDGET_LIVE; } return -1; diff --git a/quickstep/src/com/android/launcher3/search/SearchResultIconRow.java b/quickstep/src/com/android/launcher3/search/SearchResultIconRow.java index 66214f36bf..eafbc73f11 100644 --- a/quickstep/src/com/android/launcher3/search/SearchResultIconRow.java +++ b/quickstep/src/com/android/launcher3/search/SearchResultIconRow.java @@ -102,6 +102,7 @@ public class SearchResultIconRow extends LinearLayout implements SearchTargetHan @Override public void apply(SearchTarget parentTarget, List children) { + showSubtitleIfNeeded(null); mResultIcon.applySearchTarget(parentTarget, children, this::onItemInfoCreated); if (parentTarget.getShortcutInfo() != null) { updateWithShortcutInfo(parentTarget.getShortcutInfo()); diff --git a/quickstep/src/com/android/launcher3/search/SearchResultWidget.java b/quickstep/src/com/android/launcher3/search/SearchResultWidget.java index 69da515152..da1495930e 100644 --- a/quickstep/src/com/android/launcher3/search/SearchResultWidget.java +++ b/quickstep/src/com/android/launcher3/search/SearchResultWidget.java @@ -25,28 +25,34 @@ import android.util.AttributeSet; import android.view.GestureDetector; import android.view.MotionEvent; import android.view.View; -import android.widget.RelativeLayout; +import android.widget.LinearLayout; +import android.widget.TextView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import com.android.launcher3.AppWidgetResizeFrame; +import com.android.launcher3.BubbleTextView; import com.android.launcher3.CheckLongPressHelper; import com.android.launcher3.DeviceProfile; import com.android.launcher3.Launcher; +import com.android.launcher3.R; import com.android.launcher3.allapps.search.SearchWidgetInfoContainer; import com.android.launcher3.dragndrop.DraggableView; +import com.android.launcher3.model.data.PackageItemInfo; import com.android.launcher3.touch.ItemLongClickListener; +import com.android.launcher3.widget.PendingAddWidgetInfo; + +import java.util.List; + /** * displays live version of a widget upon receiving {@link AppWidgetProviderInfo} from Search * provider */ -public class SearchResultWidget extends RelativeLayout implements - SearchTargetHandler, DraggableView { +public class SearchResultWidget extends LinearLayout implements SearchTargetHandler, DraggableView, + View.OnLongClickListener { - private static final String TAG = "SearchResultWidget"; - - public static final String TARGET_TYPE_WIDGET_LIVE = "widget"; private final Rect mWidgetOffset = new Rect(); @@ -56,10 +62,9 @@ public class SearchResultWidget extends RelativeLayout implements private final AppWidgetHostView mHostView; private final float mScaleToFit; - private SearchTarget mSearchTarget; - private AppWidgetProviderInfo mProviderInfo; - private SearchWidgetInfoContainer mInfoContainer; + private BubbleTextView mWidgetProvider; + private TextView mWidgetLabel; public SearchResultWidget(@NonNull Context context) { this(context, null, 0); @@ -80,7 +85,8 @@ public class SearchResultWidget extends RelativeLayout implements // detect tap event on widget container for search target event reporting mClickDetector = new GestureDetector(context, - new ClickListener(() -> handleSelection(SearchTargetEvent.ACTION_LAUNCH_TOUCH))); + new ClickListener( + () -> reportEvent(SearchTargetEvent.ACTION_LAUNCH_TOUCH))); mLongPressHelper = new CheckLongPressHelper(this); mLongPressHelper.setLongPressTimeoutFactor(1); setOnLongClickListener(this); @@ -89,9 +95,42 @@ public class SearchResultWidget extends RelativeLayout implements @Override protected void onFinishInflate() { super.onFinishInflate(); + mWidgetProvider = findViewById(R.id.widget_provider); + mWidgetLabel = findViewById(R.id.widget_label); addView(mHostView); } + @Override + public void apply(SearchTarget parentTarget, List children) { + AppWidgetProviderInfo providerInfo = parentTarget.getAppWidgetProviderInfo(); + removeListener(); + + showWidgetInfo(providerInfo); + mInfoContainer = mLauncher.getLiveSearchManager().getPlaceHolderWidget(providerInfo); + if (mInfoContainer == null) { + setVisibility(GONE); + return; + } + setVisibility(VISIBLE); + mInfoContainer.attachWidget(mHostView); + PendingAddWidgetInfo info = (PendingAddWidgetInfo) mHostView.getTag(); + int[] size = mLauncher.getWorkspace().estimateItemSize(info); + mHostView.getLayoutParams().width = size[0]; + mHostView.getLayoutParams().height = size[1]; + AppWidgetResizeFrame.updateWidgetSizeRanges(mHostView, mLauncher, info.spanX, + info.spanY); + mHostView.requestLayout(); + setTag(info); + } + + private void showWidgetInfo(AppWidgetProviderInfo providerInfo) { + String title = providerInfo.loadLabel(mLauncher.getPackageManager()); + PackageItemInfo pinfo = new PackageItemInfo(providerInfo.provider.getPackageName()); + pinfo.user = providerInfo.getProfile(); + mWidgetProvider.applyFromItemInfoWithIcon(pinfo); + mWidgetLabel.setText(title); + } + /** * Stops hostView from getting updates on a widget provider */ @@ -101,7 +140,7 @@ public class SearchResultWidget extends RelativeLayout implements } } - public void handleSelection(int eventType) { + private void reportEvent(int eventType) { SearchSessionTracker.INSTANCE.get(getContext()).notifyEvent( new SearchTargetEvent.Builder("search target id", eventType).build()); } diff --git a/quickstep/src/com/android/launcher3/search/SearchResultWidgetPreview.java b/quickstep/src/com/android/launcher3/search/SearchResultWidgetPreview.java index c9fc8e17c4..1786baf47c 100644 --- a/quickstep/src/com/android/launcher3/search/SearchResultWidgetPreview.java +++ b/quickstep/src/com/android/launcher3/search/SearchResultWidgetPreview.java @@ -54,9 +54,7 @@ public class SearchResultWidgetPreview extends LinearLayout implements SearchTar private WidgetCell mWidgetCell; private Toast mWidgetToast; - private SearchTarget mSearchTarget; - - + private String mTargetId; public SearchResultWidgetPreview(Context context) { this(context, null, 0); } @@ -83,7 +81,7 @@ public class SearchResultWidgetPreview extends LinearLayout implements SearchTar @Override public void apply(SearchTarget parentTarget, List children) { - mSearchTarget = parentTarget; + mTargetId = parentTarget.getId(); AppWidgetProviderInfo providerInfo = parentTarget.getAppWidgetProviderInfo(); LauncherAppWidgetProviderInfo pInfo = LauncherAppWidgetProviderInfo.fromProviderInfo( getContext(), providerInfo); @@ -114,18 +112,18 @@ public class SearchResultWidgetPreview extends LinearLayout implements SearchTar new PendingItemDragHelper(mWidgetCell).startDrag( imageView.getBitmapBounds(), imageView.getBitmap().getWidth(), imageView.getWidth(), new Point(loc[0], loc[1]), mLauncher.getAppsView(), new DragOptions()); - handleSelection(SearchTargetEvent.ACTION_LONGPRESS); + reportEvent(SearchTargetEvent.ACTION_LONGPRESS); return true; } @Override public void onClick(View view) { mWidgetToast = BaseWidgetSheet.showWidgetToast(getContext(), mWidgetToast); - handleSelection(SearchTargetEvent.ACTION_LAUNCH_TOUCH); + reportEvent(SearchTargetEvent.ACTION_LAUNCH_TOUCH); } - public void handleSelection(int eventType) { + private void reportEvent(int eventType) { SearchSessionTracker.INSTANCE.get(getContext()).notifyEvent( - new SearchTargetEvent.Builder(mSearchTarget.getId(), eventType).build()); + new SearchTargetEvent.Builder(mTargetId, eventType).build()); } }