From f72c36801748cf0c32d70341f94b895ec8a3b2b7 Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Mon, 11 Jan 2021 13:59:07 -0800 Subject: [PATCH 01/11] Adding quickstep specific permissions to Launcher Bug: 177096054 Test: Manual Change-Id: Ife5d7c8207e70e4b184b18fcfe71548ec9616dd4 --- quickstep/AndroidManifest.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/quickstep/AndroidManifest.xml b/quickstep/AndroidManifest.xml index d95cc01427..9c14b8510e 100644 --- a/quickstep/AndroidManifest.xml +++ b/quickstep/AndroidManifest.xml @@ -31,6 +31,15 @@ + + + + + + + + + From eca678835a0b67c62aa37059a54147755e39be5d Mon Sep 17 00:00:00 2001 From: Hyunyoung Song Date: Thu, 28 Jan 2021 02:47:12 -0800 Subject: [PATCH 02/11] Make Thumbnail search result launch intents Bug: 178454668 Test: Manual Change-Id: If82724d9ddedce205b2f754023dd989d20f49eab --- .../launcher3/search/SearchResultThumbnailView.java | 12 ++++++++++++ .../android/launcher3/search/SearchTargetUtil.java | 1 + 2 files changed, 13 insertions(+) diff --git a/quickstep/src/com/android/launcher3/search/SearchResultThumbnailView.java b/quickstep/src/com/android/launcher3/search/SearchResultThumbnailView.java index b1cbe7d36f..dd9546171e 100644 --- a/quickstep/src/com/android/launcher3/search/SearchResultThumbnailView.java +++ b/quickstep/src/com/android/launcher3/search/SearchResultThumbnailView.java @@ -23,6 +23,7 @@ import android.graphics.Bitmap; import android.graphics.drawable.BitmapDrawable; import android.util.AttributeSet; import android.view.View; +import android.view.ViewGroup; import androidx.core.graphics.drawable.RoundedBitmapDrawable; import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory; @@ -55,6 +56,14 @@ public class SearchResultThumbnailView extends androidx.appcompat.widget.AppComp super(context, attrs, defStyleAttr); } + @Override + protected void onFinishInflate() { + super.onFinishInflate(); + setOnFocusChangeListener(Launcher.getLauncher(getContext()).getFocusHandler()); + setOnClickListener(this); + setOnLongClickListener(this); + } + @Override public void apply(SearchTarget parentTarget, List children) { mSearchTarget = parentTarget; @@ -65,6 +74,9 @@ public class SearchResultThumbnailView extends androidx.appcompat.widget.AppComp parentTarget.getPackageName(), parentTarget.getUserHandle(), parentTarget.getSearchAction().getTitle()); + itemInfo.setIntent(parentTarget.getSearchAction().getIntent()); + itemInfo.setPendingIntent(parentTarget.getSearchAction().getPendingIntent()); + bitmap = ((BitmapDrawable) itemInfo.getIcon() .loadDrawable(getContext())).getBitmap(); // crop diff --git a/quickstep/src/com/android/launcher3/search/SearchTargetUtil.java b/quickstep/src/com/android/launcher3/search/SearchTargetUtil.java index ceef429595..95f4f58a80 100644 --- a/quickstep/src/com/android/launcher3/search/SearchTargetUtil.java +++ b/quickstep/src/com/android/launcher3/search/SearchTargetUtil.java @@ -112,6 +112,7 @@ public class SearchTargetUtil { Intent intent = new Intent(Intent.ACTION_VIEW) .setData(Uri.parse("uri blah blah")) .setType("image/*") + .addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION) .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); Bitmap bitmap = Bitmap.createBitmap(1000, 500, Bitmap.Config.ARGB_8888); From f19a809f72ef8d1595ec82cbef295bec078ea207 Mon Sep 17 00:00:00 2001 From: "[1;3C" Date: Wed, 9 Dec 2020 13:28:22 -0800 Subject: [PATCH 03/11] Map shell transition to recents animation This hooks up the essential start/finish. One thing to note is that it uses the normal startActivity rather than a special startRecents call for shell transitions. Bug: 162503077 Test: Enable shell transit. Open an app, use gesture to open recents. Change-Id: Ia51fa8baeb43bf3fa768b25a840b629ec94e16a1 --- .../quickstep/TaskAnimationManager.java | 23 +++++++++++++++++-- .../quickstep/TouchInteractionService.java | 2 +- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/quickstep/src/com/android/quickstep/TaskAnimationManager.java b/quickstep/src/com/android/quickstep/TaskAnimationManager.java index 6f2f86eac2..02c27636fc 100644 --- a/quickstep/src/com/android/quickstep/TaskAnimationManager.java +++ b/quickstep/src/com/android/quickstep/TaskAnimationManager.java @@ -21,7 +21,10 @@ import static com.android.quickstep.GestureState.GestureEndTarget.RECENTS; import static com.android.quickstep.GestureState.STATE_RECENTS_ANIMATION_INITIALIZED; import static com.android.quickstep.GestureState.STATE_RECENTS_ANIMATION_STARTED; +import android.content.Context; import android.content.Intent; +import android.os.Bundle; +import android.os.SystemProperties; import android.util.Log; import androidx.annotation.UiThread; @@ -30,11 +33,15 @@ import com.android.launcher3.Utilities; import com.android.launcher3.config.FeatureFlags; import com.android.systemui.shared.recents.model.ThumbnailData; import com.android.systemui.shared.system.ActivityManagerWrapper; +import com.android.systemui.shared.system.ActivityOptionsCompat; import com.android.systemui.shared.system.RemoteAnimationTargetCompat; +import com.android.systemui.shared.system.RemoteTransitionCompat; import java.util.function.Consumer; public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAnimationListener { + public static final boolean ENABLE_SHELL_TRANSITIONS = + SystemProperties.getBoolean("persist.debug.shell_transit", false); private RecentsAnimationController mController; private RecentsAnimationCallbacks mCallbacks; @@ -43,7 +50,11 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn private GestureState mLastGestureState; private RemoteAnimationTargetCompat mLastAppearedTaskTarget; private Consumer mLaunchOtherTaskHandler; + private Context mCtx; + TaskAnimationManager(Context ctx) { + mCtx = ctx; + } /** * Preloads the recents animation. */ @@ -122,8 +133,16 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn final long eventTime = gestureState.getSwipeUpStartTimeMs(); mCallbacks.addListener(gestureState); mCallbacks.addListener(listener); - UI_HELPER_EXECUTOR.execute(() -> ActivityManagerWrapper.getInstance() - .startRecentsActivity(intent, eventTime, mCallbacks, null, null)); + + if (ENABLE_SHELL_TRANSITIONS) { + RemoteTransitionCompat transition = new RemoteTransitionCompat(mCallbacks, + mController != null ? mController.getController() : null); + Bundle options = ActivityOptionsCompat.makeRemoteTransition(transition).toBundle(); + mCtx.startActivity(intent, options); + } else { + UI_HELPER_EXECUTOR.execute(() -> ActivityManagerWrapper.getInstance() + .startRecentsActivity(intent, eventTime, mCallbacks, null, null)); + } gestureState.setState(STATE_RECENTS_ANIMATION_INITIALIZED); return mCallbacks; } diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java index 196cae754d..0f409374bb 100644 --- a/quickstep/src/com/android/quickstep/TouchInteractionService.java +++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java @@ -309,7 +309,7 @@ public class TouchInteractionService extends Service implements PluginListener Date: Wed, 27 Jan 2021 16:54:45 -0800 Subject: [PATCH 04/11] Fix incorrect launcher loading. Apps that were installed and downloading incrementally would be shown as fully downloaded on reboot. Updated LoaderTask and AppInfo.updateRuntimeFlagsForActivityTarget to account for this. Fixes: 178528867 Test: manual with hardcoded values Change-Id: I088e43ae886b4157bad9f4fa8d40373cf7f8235a (cherry picked from commit 6d0fec8ac774679eeed95a623bfda863db66fd66) --- src/com/android/launcher3/model/LoaderTask.java | 17 ++++++++--------- .../android/launcher3/model/data/AppInfo.java | 2 +- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/com/android/launcher3/model/LoaderTask.java b/src/com/android/launcher3/model/LoaderTask.java index f74c8b5c1c..8438622dca 100644 --- a/src/com/android/launcher3/model/LoaderTask.java +++ b/src/com/android/launcher3/model/LoaderTask.java @@ -588,27 +588,26 @@ public class LoaderTask implements Runnable { if (isSafeMode && !isSystemApp(context, intent)) { info.runtimeStatusFlags |= FLAG_DISABLED_SAFEMODE; } + LauncherActivityInfo activityInfo = c.getLauncherActivityInfo(); + if (activityInfo != null) { + info.setProgressLevel( + PackageManagerHelper + .getLoadingProgress(activityInfo), + PackageInstallInfo.STATUS_INSTALLED_DOWNLOADING); + } if (c.restoreFlag != 0 && !TextUtils.isEmpty(targetPkg)) { tempPackageKey.update(targetPkg, c.user); SessionInfo si = installingPkgs.get(tempPackageKey); - LauncherActivityInfo activityInfo = - c.getLauncherActivityInfo(); if (si == null) { info.runtimeStatusFlags &= - ~ItemInfoWithIcon.FLAG_INSTALL_SESSION_ACTIVE; + ~ItemInfoWithIcon.FLAG_INSTALL_SESSION_ACTIVE; } else if (activityInfo == null) { int installProgress = (int) (si.getProgress() * 100); info.setProgressLevel( installProgress, PackageInstallInfo.STATUS_INSTALLING); - } else { - info.setProgressLevel( - PackageManagerHelper - .getLoadingProgress(activityInfo), - PackageInstallInfo - .STATUS_INSTALLED_DOWNLOADING); } } diff --git a/src/com/android/launcher3/model/data/AppInfo.java b/src/com/android/launcher3/model/data/AppInfo.java index dde0cf4674..7f70bade3c 100644 --- a/src/com/android/launcher3/model/data/AppInfo.java +++ b/src/com/android/launcher3/model/data/AppInfo.java @@ -179,7 +179,7 @@ public class AppInfo extends ItemInfoWithIcon { // Sets the progress level, installation and incremental download flags. info.setProgressLevel( PackageManagerHelper.getLoadingProgress(lai), - PackageInstallInfo.STATUS_INSTALLED); + PackageInstallInfo.STATUS_INSTALLED_DOWNLOADING); } @Override From d9b6d6a86f28ce757160f10a2bd32d3527516af5 Mon Sep 17 00:00:00 2001 From: Tracy Zhou Date: Thu, 28 Jan 2021 16:16:33 -0800 Subject: [PATCH 05/11] Check whether the running task view is non null before setting it to be not clickable for live tile Fixes: 178746755 Test: N/A Change-Id: Ia8d8bc48a31e4d1babcb948bb27717d14cdb1247 --- quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java index 5a2d6daac0..39a3a7c40c 100644 --- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java +++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java @@ -1451,7 +1451,10 @@ public abstract class AbsSwipeUpHandler, Q extends private void finishCurrentTransitionToRecents() { if (ENABLE_QUICKSTEP_LIVE_TILE.get()) { mStateCallback.setStateOnUiThread(STATE_CURRENT_TASK_FINISHED); - mRecentsView.getRunningTaskView().setIsClickableAsLiveTile(true); + final TaskView runningTaskView = mRecentsView.getRunningTaskView(); + if (runningTaskView != null) { + runningTaskView.setIsClickableAsLiveTile(true); + } } else if (!hasTargets() || mRecentsAnimationController == null) { // If there are no targets or the animation not started, then there is nothing to finish mStateCallback.setStateOnUiThread(STATE_CURRENT_TASK_FINISHED); From b40b98db3a6eb7f75207a835b4c637d2b53de09a Mon Sep 17 00:00:00 2001 From: Schneider Victor-tulias Date: Thu, 21 Jan 2021 14:41:07 -0800 Subject: [PATCH 06/11] Update FloatingIconView to display PreloadIconDrawables during swipe home animations. Swiping up to go home on an app that is downloading incrementally would cause a jittery animation. Updated FloatingIconView to animate directly to a PreloadIconDrawable. Demo: https://drive.google.com/file/d/1ddr8OGR4c1ZneyQ0VkkAAxGpwNcP8Wyn/view?usp=sharing Fixes: 177685929 Test: manual Change-Id: I4cd2daa18f6d3fed42a9b666063e0b1c1c46e5d9 (cherry picked from commit b8cab8d8786a7de6adfcd5b77af9408e832ed0c2) --- src/com/android/launcher3/BubbleTextView.java | 88 ++++++++++++------- .../android/launcher3/FastBitmapDrawable.java | 6 +- .../launcher3/allapps/AllAppsStore.java | 2 +- .../graphics/PreloadIconDrawable.java | 44 +++++++++- .../launcher3/icons/ClockDrawableWrapper.java | 2 +- .../launcher3/views/FloatingIconView.java | 25 +++++- 6 files changed, 124 insertions(+), 43 deletions(-) diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java index 22eb15a8e2..575d6cd8e6 100644 --- a/src/com/android/launcher3/BubbleTextView.java +++ b/src/com/android/launcher3/BubbleTextView.java @@ -301,7 +301,7 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver, verifyHighRes(); if ((info.runtimeStatusFlags & ItemInfoWithIcon.FLAG_SHOW_DOWNLOAD_PROGRESS_MASK) != 0) { - applyProgressLevel(info.getProgressLevel()); + applyProgressLevel(); } applyDotState(info, false /* animate */); } @@ -603,21 +603,20 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver, * with the total download progress. */ public void applyLoadingState(boolean promiseStateChanged) { - if (getTag() instanceof WorkspaceItemInfo) { + if (getTag() instanceof ItemInfoWithIcon) { WorkspaceItemInfo info = (WorkspaceItemInfo) getTag(); - int progressLevel = info.getProgressLevel(); if ((info.runtimeStatusFlags & ItemInfoWithIcon.FLAG_INCREMENTAL_DOWNLOAD_ACTIVE) != 0) { - updateProgressBarUi(progressLevel, progressLevel == 100); + updateProgressBarUi(info.getProgressLevel() == 100); } else if (info.hasPromiseIconUi() || (info.runtimeStatusFlags - & ItemInfoWithIcon.FLAG_INSTALL_SESSION_ACTIVE) != 0) { - updateProgressBarUi(progressLevel, promiseStateChanged); + & ItemInfoWithIcon.FLAG_INSTALL_SESSION_ACTIVE) != 0) { + updateProgressBarUi(promiseStateChanged); } } } - private void updateProgressBarUi(int progressLevel, boolean maybePerformFinishedAnimation) { - PreloadIconDrawable preloadDrawable = applyProgressLevel(progressLevel); + private void updateProgressBarUi(boolean maybePerformFinishedAnimation) { + PreloadIconDrawable preloadDrawable = applyProgressLevel(); if (preloadDrawable != null && maybePerformFinishedAnimation) { preloadDrawable.maybePerformFinishedAnimation(); } @@ -625,38 +624,59 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver, /** Applies the given progress level to the this icon's progress bar. */ @Nullable - public PreloadIconDrawable applyProgressLevel(int progressLevel) { - if (getTag() instanceof ItemInfoWithIcon) { - ItemInfoWithIcon info = (ItemInfoWithIcon) getTag(); - if (progressLevel >= 100) { - setContentDescription(info.contentDescription != null - ? info.contentDescription : ""); - } else if (progressLevel > 0) { - setContentDescription(getContext() - .getString(R.string.app_downloading_title, info.title, - NumberFormat.getPercentInstance().format(progressLevel * 0.01))); + public PreloadIconDrawable applyProgressLevel() { + if (!(getTag() instanceof ItemInfoWithIcon)) { + return null; + } + + ItemInfoWithIcon info = (ItemInfoWithIcon) getTag(); + int progressLevel = info.getProgressLevel(); + if (progressLevel >= 100) { + setContentDescription(info.contentDescription != null + ? info.contentDescription : ""); + } else if (progressLevel > 0) { + setContentDescription(getContext() + .getString(R.string.app_downloading_title, info.title, + NumberFormat.getPercentInstance().format(progressLevel * 0.01))); + } else { + setContentDescription(getContext() + .getString(R.string.app_waiting_download_title, info.title)); + } + if (mIcon != null) { + PreloadIconDrawable preloadIconDrawable; + if (mIcon instanceof PreloadIconDrawable) { + preloadIconDrawable = (PreloadIconDrawable) mIcon; + preloadIconDrawable.setLevel(progressLevel); + preloadIconDrawable.setIsDisabled(!info.isAppStartable()); } else { - setContentDescription(getContext() - .getString(R.string.app_waiting_download_title, info.title)); - } - if (mIcon != null) { - final PreloadIconDrawable preloadDrawable; - if (mIcon instanceof PreloadIconDrawable) { - preloadDrawable = (PreloadIconDrawable) mIcon; - preloadDrawable.setLevel(progressLevel); - preloadDrawable.setIsDisabled(!info.isAppStartable()); - } else { - preloadDrawable = newPendingIcon(getContext(), info); - preloadDrawable.setLevel(progressLevel); - preloadDrawable.setIsDisabled(!info.isAppStartable()); - setIcon(preloadDrawable); - } - return preloadDrawable; + preloadIconDrawable = makePreloadIcon(); + setIcon(preloadIconDrawable); } + return preloadIconDrawable; } return null; } + /** + * Creates a PreloadIconDrawable with the appropriate progress level without mutating this + * object. + */ + @Nullable + public PreloadIconDrawable makePreloadIcon() { + if (!(getTag() instanceof ItemInfoWithIcon)) { + return null; + } + + ItemInfoWithIcon info = (ItemInfoWithIcon) getTag(); + int progressLevel = info.getProgressLevel(); + final PreloadIconDrawable preloadDrawable = newPendingIcon(getContext(), info); + + preloadDrawable.setLevel(progressLevel); + preloadDrawable.setIsDisabled(!info.isAppStartable()); + + return preloadDrawable; + } + public void applyDotState(ItemInfo itemInfo, boolean animate) { if (mIcon instanceof FastBitmapDrawable) { boolean wasDotted = mDotInfo != null; diff --git a/src/com/android/launcher3/FastBitmapDrawable.java b/src/com/android/launcher3/FastBitmapDrawable.java index 139d4a85e4..b1fe4a235c 100644 --- a/src/com/android/launcher3/FastBitmapDrawable.java +++ b/src/com/android/launcher3/FastBitmapDrawable.java @@ -276,15 +276,15 @@ public class FastBitmapDrawable extends Drawable { @Override public ConstantState getConstantState() { - return new MyConstantState(mBitmap, mIconColor, mIsDisabled); + return new FastBitmapConstantState(mBitmap, mIconColor, mIsDisabled); } - protected static class MyConstantState extends ConstantState { + protected static class FastBitmapConstantState extends ConstantState { protected final Bitmap mBitmap; protected final int mIconColor; protected final boolean mIsDisabled; - public MyConstantState(Bitmap bitmap, int color, boolean isDisabled) { + public FastBitmapConstantState(Bitmap bitmap, int color, boolean isDisabled) { mBitmap = bitmap; mIconColor = color; mIsDisabled = isDisabled; diff --git a/src/com/android/launcher3/allapps/AllAppsStore.java b/src/com/android/launcher3/allapps/AllAppsStore.java index 00bdb70c4a..769cb5e31b 100644 --- a/src/com/android/launcher3/allapps/AllAppsStore.java +++ b/src/com/android/launcher3/allapps/AllAppsStore.java @@ -154,7 +154,7 @@ public class AllAppsStore { public void updateProgressBar(AppInfo app) { updateAllIcons((child) -> { if (child.getTag() == app) { - child.applyProgressLevel(app.getProgressLevel()); + child.applyProgressLevel(); } }); } diff --git a/src/com/android/launcher3/graphics/PreloadIconDrawable.java b/src/com/android/launcher3/graphics/PreloadIconDrawable.java index 9971990267..304d49692e 100644 --- a/src/com/android/launcher3/graphics/PreloadIconDrawable.java +++ b/src/com/android/launcher3/graphics/PreloadIconDrawable.java @@ -105,6 +105,10 @@ public class PreloadIconDrawable extends FastBitmapDrawable { private ObjectAnimator mCurrentAnim; public PreloadIconDrawable(ItemInfoWithIcon info, Context context) { + this(info, IconPalette.getPreloadProgressColor(context, info.bitmap.color)); + } + + public PreloadIconDrawable(ItemInfoWithIcon info, int indicatorColor) { super(info.bitmap); mItem = info; mShapePath = getShapePath(); @@ -114,7 +118,7 @@ public class PreloadIconDrawable extends FastBitmapDrawable { mProgressPaint = new Paint(Paint.ANTI_ALIAS_FLAG | Paint.FILTER_BITMAP_FLAG); mProgressPaint.setStyle(Paint.Style.STROKE); mProgressPaint.setStrokeCap(Paint.Cap.ROUND); - mIndicatorColor = IconPalette.getPreloadProgressColor(context, mIconColor); + mIndicatorColor = indicatorColor; setInternalProgress(0); @@ -297,4 +301,42 @@ public class PreloadIconDrawable extends FastBitmapDrawable { public static PreloadIconDrawable newPendingIcon(Context context, ItemInfoWithIcon info) { return new PreloadIconDrawable(info, context); } + + @Override + public ConstantState getConstantState() { + return new PreloadIconConstantState( + mBitmap, mIconColor, !mItem.isAppStartable(), mItem, mIndicatorColor); + } + + protected static class PreloadIconConstantState extends FastBitmapConstantState { + + protected final ItemInfoWithIcon mInfo; + protected final int mIndicatorColor; + protected final int mLevel; + + public PreloadIconConstantState( + Bitmap bitmap, + int iconColor, + boolean isDisabled, + ItemInfoWithIcon info, + int indicatorcolor) { + super(bitmap, iconColor, isDisabled); + mInfo = info; + mIndicatorColor = indicatorcolor; + mLevel = info.getProgressLevel(); + } + + @Override + public PreloadIconDrawable newDrawable() { + PreloadIconDrawable drawable = new PreloadIconDrawable(mInfo, mIndicatorColor); + drawable.setLevel(mLevel); + drawable.setIsDisabled(mIsDisabled); + return drawable; + } + + @Override + public int getChangingConfigurations() { + return 0; + } + } } diff --git a/src/com/android/launcher3/icons/ClockDrawableWrapper.java b/src/com/android/launcher3/icons/ClockDrawableWrapper.java index b7dd092ab4..1bd252ba45 100644 --- a/src/com/android/launcher3/icons/ClockDrawableWrapper.java +++ b/src/com/android/launcher3/icons/ClockDrawableWrapper.java @@ -308,7 +308,7 @@ public class ClockDrawableWrapper extends AdaptiveIconDrawable implements Bitmap return new ClockConstantState(mInfo, isDisabled()); } - private static class ClockConstantState extends MyConstantState { + private static class ClockConstantState extends FastBitmapConstantState { private final ClockBitmapInfo mInfo; diff --git a/src/com/android/launcher3/views/FloatingIconView.java b/src/com/android/launcher3/views/FloatingIconView.java index 1857c5a7b4..23c3722aca 100644 --- a/src/com/android/launcher3/views/FloatingIconView.java +++ b/src/com/android/launcher3/views/FloatingIconView.java @@ -51,8 +51,10 @@ import com.android.launcher3.Utilities; import com.android.launcher3.dragndrop.DragLayer; import com.android.launcher3.dragndrop.FolderAdaptiveIcon; import com.android.launcher3.folder.FolderIcon; +import com.android.launcher3.graphics.PreloadIconDrawable; import com.android.launcher3.icons.LauncherIcons; import com.android.launcher3.model.data.ItemInfo; +import com.android.launcher3.model.data.ItemInfoWithIcon; import com.android.launcher3.popup.SystemShortcut; import com.android.launcher3.shortcuts.DeepShortcutView; @@ -252,12 +254,26 @@ public class FloatingIconView extends FrameLayout implements @SuppressWarnings("WrongThread") private static void getIconResult(Launcher l, View originalView, ItemInfo info, RectF pos, IconLoadResult iconLoadResult) { - Drawable drawable = null; + Drawable drawable; + Drawable btvIcon; Drawable badge = null; boolean supportsAdaptiveIcons = ADAPTIVE_ICON_WINDOW_ANIM.get() && !info.isDisabled(); // Use original icon for disabled icons. - Drawable btvIcon = originalView instanceof BubbleTextView - ? ((BubbleTextView) originalView).getIcon() : null; + + if (originalView instanceof BubbleTextView) { + BubbleTextView btv = (BubbleTextView) originalView; + + if (info instanceof ItemInfoWithIcon + && (((ItemInfoWithIcon) info).runtimeStatusFlags + & ItemInfoWithIcon.FLAG_SHOW_DOWNLOAD_PROGRESS_MASK) != 0) { + btvIcon = btv.makePreloadIcon(); + } else { + btvIcon = btv.getIcon(); + } + } else { + btvIcon = null; + } + if (info instanceof SystemShortcut) { if (originalView instanceof ImageView) { drawable = ((ImageView) originalView).getDrawable(); @@ -266,6 +282,9 @@ public class FloatingIconView extends FrameLayout implements } else { drawable = originalView.getBackground(); } + } else if (btvIcon instanceof PreloadIconDrawable) { + // Force the progress bar to display. + drawable = btvIcon; } else { int width = (int) pos.width(); int height = (int) pos.height(); From 954bb63899e27f1cf85f14896f0597f58661f10e Mon Sep 17 00:00:00 2001 From: Schneider Victor-tulias Date: Wed, 27 Jan 2021 14:03:51 -0800 Subject: [PATCH 07/11] Fix launcher flicker when unlocking on seascape. Test: manual Fixes: 160544577 Launcher flickers if it is locked on portrait, then unlocked on seascape. DisplayController.Info was consistenly being updated late causing launcher to unlock in lanscape then switching to seascape with enough frames in-between for the user to notice. Updated DisplayController to properly update its rotation info and updated DeviceProfile to force an info update when checking if the device is in seascape orientation. demo: https://drive.google.com/file/d/1JBCvK3brLwOSTC4k56GSxeYozl5x0k7X/view?usp=sharing Change-Id: Idce139f0e16cb686684c0d3a460c4ec9e5ae466a --- src/com/android/launcher3/DeviceProfile.java | 5 ++-- .../launcher3/util/DisplayController.java | 24 +++++++++++++++---- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java index 12ce9f3448..f681d75eef 100644 --- a/src/com/android/launcher3/DeviceProfile.java +++ b/src/com/android/launcher3/DeviceProfile.java @@ -607,8 +607,9 @@ public class DeviceProfile { */ public boolean updateIsSeascape(Context context) { if (isVerticalBarLayout()) { - boolean isSeascape = DisplayController.getDefaultDisplay(context).getInfo().rotation - == Surface.ROTATION_270; + // Check an up-to-date info. + boolean isSeascape = DisplayController.getDefaultDisplay(context) + .createInfoForContext(context).rotation == Surface.ROTATION_270; if (mIsSeascape != isSeascape) { mIsSeascape = isSeascape; return true; diff --git a/src/com/android/launcher3/util/DisplayController.java b/src/com/android/launcher3/util/DisplayController.java index 355c949325..3b7bcc285a 100644 --- a/src/com/android/launcher3/util/DisplayController.java +++ b/src/com/android/launcher3/util/DisplayController.java @@ -31,6 +31,8 @@ import android.view.Display; import androidx.annotation.VisibleForTesting; +import com.android.launcher3.Utilities; + import java.util.ArrayList; /** @@ -179,23 +181,35 @@ public class DisplayController implements DisplayListener { return mInfo; } + /** Creates and up-to-date DisplayController.Info for the given context. */ + public Info createInfoForContext(Context context) { + Display display = Utilities.ATLEAST_R + ? context.getDisplay() + : context + .getSystemService(DisplayManager.class) + .getDisplay(mId); + return display == null + ? new Info(context) + : new Info(context, display); + } + protected void handleOnChange() { Info oldInfo = mInfo; - Info info = new Info(mDisplayContext); + Info newInfo = createInfoForContext(mDisplayContext); int change = 0; - if (info.hasDifferentSize(oldInfo)) { + if (newInfo.hasDifferentSize(oldInfo)) { change |= CHANGE_SIZE; } - if (oldInfo.rotation != info.rotation) { + if (newInfo.rotation != oldInfo.rotation) { change |= CHANGE_ROTATION; } - if (info.singleFrameMs != oldInfo.singleFrameMs) { + if (newInfo.singleFrameMs != oldInfo.singleFrameMs) { change |= CHANGE_FRAME_DELAY; } if (change != 0) { - mInfo = info; + mInfo = newInfo; final int flags = change; MAIN_EXECUTOR.execute(() -> notifyChange(flags)); } From f28db55c96716acf443af0b370c6f67646757f8a Mon Sep 17 00:00:00 2001 From: Samuel Fufa Date: Thu, 28 Jan 2021 05:52:25 -0600 Subject: [PATCH 08/11] Support people search results + Introduce temporary workaround icon loading with URLConnection for play results Manual: go/search-action-icon Bug: 177223401 Test: Manual Change-Id: Ie8e7963447640d98abb9830ec05f26b28ec58345 --- .../res/layout/search_result_icon_row.xml | 19 +- .../res/layout/search_result_people_item.xml | 63 ------ .../search/DeviceSearchAdapterProvider.java | 3 +- .../launcher3/search/SearchAdapterItem.java | 8 +- .../launcher3/search/SearchResultIcon.java | 131 ++++++++---- .../launcher3/search/SearchResultIconRow.java | 24 +-- .../search/SearchResultIconSlice.java | 12 -- .../search/SearchResultPeopleView.java | 199 ------------------ .../search/SearchResultThumbnailView.java | 9 +- .../launcher3/search/SearchResultWidget.java | 4 - .../search/SearchResultWidgetPreview.java | 3 +- .../search/SearchSectionHeaderView.java | 12 -- .../search/SearchServicePipeline.java | 4 +- .../launcher3/search/SearchTargetHandler.java | 4 +- .../launcher3/search/SearchTargetUtil.java | 33 ++- .../model/data/SearchActionItemInfo.java | 2 +- .../shared/SearchTargetEventLegacy.java | 2 +- 17 files changed, 144 insertions(+), 388 deletions(-) delete mode 100644 quickstep/res/layout/search_result_people_item.xml delete mode 100644 quickstep/src/com/android/launcher3/search/SearchResultPeopleView.java diff --git a/quickstep/res/layout/search_result_icon_row.xml b/quickstep/res/layout/search_result_icon_row.xml index 2119fc3425..81190cfc56 100644 --- a/quickstep/res/layout/search_result_icon_row.xml +++ b/quickstep/res/layout/search_result_icon_row.xml @@ -57,9 +57,10 @@ style="@style/BaseIcon" android:layout_width="@dimen/deep_shortcut_icon_size" android:layout_height="match_parent" - android:gravity="start|center_vertical" + android:layout_marginStart="4dp" + android:gravity="center" launcher:iconDisplay="shortcut_popup" - android:textSize="@dimen/search_hero_subtitle_size" + android:textSize="@dimen/search_hero_inline_button_size" launcher:iconSizeOverride="@dimen/deep_shortcut_icon_size" launcher:layoutHorizontal="false" /> @@ -68,6 +69,20 @@ style="@style/BaseIcon" android:layout_width="@dimen/deep_shortcut_icon_size" android:layout_height="match_parent" + android:layout_marginStart="4dp" + android:gravity="center" + launcher:iconDisplay="shortcut_popup" + android:textSize="@dimen/search_hero_inline_button_size" + launcher:iconSizeOverride="@dimen/deep_shortcut_icon_size" + launcher:layoutHorizontal="false" /> + + - - - - - - - - - - - - - \ 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 02be0b94ed..acf6c150cf 100644 --- a/quickstep/src/com/android/launcher3/search/DeviceSearchAdapterProvider.java +++ b/quickstep/src/com/android/launcher3/search/DeviceSearchAdapterProvider.java @@ -41,7 +41,6 @@ public class DeviceSearchAdapterProvider extends SearchAdapterProvider { public static final int VIEW_TYPE_SEARCH_SLICE = 1 << 7; public static final int VIEW_TYPE_SEARCH_ICON = (1 << 8) | VIEW_TYPE_ICON; public static final int VIEW_TYPE_SEARCH_ICON_ROW = (1 << 9); - public static final int VIEW_TYPE_SEARCH_PEOPLE = 1 << 11; public static final int VIEW_TYPE_SEARCH_THUMBNAIL = 1 << 12; public static final int VIEW_TYPE_SEARCH_WIDGET_LIVE = 1 << 15; public static final int VIEW_TYPE_SEARCH_WIDGET_PREVIEW = 1 << 16; @@ -59,7 +58,6 @@ public class DeviceSearchAdapterProvider extends SearchAdapterProvider { mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_ICON, R.layout.search_result_icon); mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_ICON_ROW, R.layout.search_result_icon_row); mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_SLICE, R.layout.search_result_slice); - mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_PEOPLE, R.layout.search_result_people_item); mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_THUMBNAIL, R.layout.search_result_thumbnail); mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_WIDGET_LIVE, R.layout.search_result_widget_live); mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_WIDGET_PREVIEW, @@ -125,6 +123,7 @@ public class DeviceSearchAdapterProvider extends SearchAdapterProvider { break; case LayoutType.ICON_DOUBLE_HORIZONTAL_TEXT: case LayoutType.ICON_SINGLE_HORIZONTAL_TEXT: + case LayoutType.ICON_DOUBLE_HORIZONTAL_TEXT_BUTTON: return VIEW_TYPE_SEARCH_ICON_ROW; case LayoutType.THUMBNAIL: if (t.getSearchAction() != null) { diff --git a/quickstep/src/com/android/launcher3/search/SearchAdapterItem.java b/quickstep/src/com/android/launcher3/search/SearchAdapterItem.java index 0eb3edb555..b402f61979 100644 --- a/quickstep/src/com/android/launcher3/search/SearchAdapterItem.java +++ b/quickstep/src/com/android/launcher3/search/SearchAdapterItem.java @@ -18,7 +18,6 @@ package com.android.launcher3.search; import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_ICON; import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_ICON_ROW; -import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_PEOPLE; import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_SLICE; import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_THUMBNAIL; import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_WIDGET_LIVE; @@ -42,9 +41,10 @@ public class SearchAdapterItem extends AllAppsGridAdapter.AdapterItem { private static final int AVAILABLE_FOR_ACCESSIBILITY = - VIEW_TYPE_SEARCH_SLICE | VIEW_TYPE_SEARCH_PEOPLE | VIEW_TYPE_SEARCH_THUMBNAIL - | VIEW_TYPE_SEARCH_ICON_ROW | VIEW_TYPE_SEARCH_ICON - | VIEW_TYPE_SEARCH_WIDGET_PREVIEW | VIEW_TYPE_SEARCH_WIDGET_LIVE; + VIEW_TYPE_SEARCH_SLICE | VIEW_TYPE_SEARCH_THUMBNAIL | VIEW_TYPE_SEARCH_ICON_ROW + | VIEW_TYPE_SEARCH_ICON | VIEW_TYPE_SEARCH_WIDGET_PREVIEW + | VIEW_TYPE_SEARCH_WIDGET_LIVE; + public SearchAdapterItem(SearchTargetLegacy searchTargetLegacy, int type) { mSearchTargetLegacy = searchTargetLegacy; diff --git a/quickstep/src/com/android/launcher3/search/SearchResultIcon.java b/quickstep/src/com/android/launcher3/search/SearchResultIcon.java index 3d89ac5e27..c353d7aa3c 100644 --- a/quickstep/src/com/android/launcher3/search/SearchResultIcon.java +++ b/quickstep/src/com/android/launcher3/search/SearchResultIcon.java @@ -15,12 +15,9 @@ */ package com.android.launcher3.search; -import static com.android.launcher3.model.data.SearchActionItemInfo.FLAG_BADGE_FROM_ICON; +import static com.android.launcher3.model.data.SearchActionItemInfo.FLAG_BADGE_WITH_PACKAGE; import static com.android.launcher3.model.data.SearchActionItemInfo.FLAG_PRIMARY_ICON_FROM_TITLE; -import static com.android.launcher3.search.SearchTargetUtil.BUNDLE_EXTRA_BADGE_FROM_ICON; import static com.android.launcher3.search.SearchTargetUtil.BUNDLE_EXTRA_PRIMARY_ICON_FROM_TITLE; -import static com.android.launcher3.search.SearchTargetUtil.BUNDLE_EXTRA_SHOULD_START; -import static com.android.launcher3.search.SearchTargetUtil.BUNDLE_EXTRA_SHOULD_START_FOR_RESULT; import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; import static com.android.launcher3.util.Executors.MODEL_EXECUTOR; @@ -30,9 +27,14 @@ import android.app.search.SearchTargetEvent; import android.content.ComponentName; import android.content.Context; import android.content.pm.ShortcutInfo; -import android.graphics.drawable.Drawable; +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; +import android.graphics.Paint; +import android.graphics.PorterDuff; +import android.graphics.PorterDuffXfermode; +import android.graphics.Rect; +import android.graphics.RectF; import android.graphics.drawable.Icon; -import android.os.Build; import android.os.Bundle; import android.os.UserHandle; import android.util.AttributeSet; @@ -45,6 +47,7 @@ import com.android.launcher3.Launcher; import com.android.launcher3.LauncherAppState; import com.android.launcher3.allapps.AllAppsStore; import com.android.launcher3.icons.BitmapInfo; +import com.android.launcher3.icons.BitmapRenderer; import com.android.launcher3.icons.LauncherIcons; import com.android.launcher3.model.data.AppInfo; import com.android.launcher3.model.data.ItemInfoWithIcon; @@ -54,14 +57,25 @@ import com.android.launcher3.model.data.WorkspaceItemInfo; import com.android.launcher3.touch.ItemClickHandler; import com.android.launcher3.touch.ItemLongClickListener; import com.android.launcher3.util.ComponentKey; +import com.android.launcher3.util.Themes; +import java.io.IOException; +import java.net.URL; +import java.net.URLConnection; import java.util.List; import java.util.function.Consumer; /** * A {@link BubbleTextView} representing a single cell result in AllApps */ -public class SearchResultIcon extends BubbleTextView implements SearchTargetHandler { +public class SearchResultIcon extends BubbleTextView implements + SearchTargetHandler, View.OnClickListener, + View.OnLongClickListener { + + //Play store thumbnail process workaround + private final Rect mTempRect = new Rect(); + private final Paint mIconPaint = new Paint(); + private static final int BITMAP_CROP_MASK_COLOR = 0xff424242; private final Launcher mLauncher; @@ -99,7 +113,7 @@ public class SearchResultIcon extends BubbleTextView implements SearchTargetHand * Applies {@link SearchTarget} to view. registers a consumer after a corresponding * {@link ItemInfoWithIcon} is created */ - public void applySearchTarget(SearchTarget searchTarget, List inlineItems, + public void apply(SearchTarget searchTarget, List inlineItems, Consumer cb) { mOnItemInfoChanged = cb; apply(searchTarget, inlineItems); @@ -115,8 +129,8 @@ public class SearchResultIcon extends BubbleTextView implements SearchTargetHand prepareUsingSearchAction(parentTarget); mLongPressSupported = false; } else { - prepareUsingApp(new ComponentName(parentTarget.getPackageName(), - parentTarget.getExtras().getString(SearchTargetUtil.EXTRA_CLASS)), + String className = parentTarget.getExtras().getString(SearchTargetUtil.EXTRA_CLASS); + prepareUsingApp(new ComponentName(parentTarget.getPackageName(), className), parentTarget.getUserHandle()); mLongPressSupported = true; } @@ -136,14 +150,17 @@ public class SearchResultIcon extends BubbleTextView implements SearchTargetHand //TODO: remove this after flags are introduced in SearchAction. Settings results require // startActivityForResult boolean isSettingsResult = searchTarget.getResultType() == ResultType.SETTING; - if ((extras != null && extras.getBoolean(BUNDLE_EXTRA_SHOULD_START_FOR_RESULT)) + if ((extras != null && extras.getBoolean( + SearchTargetUtil.BUNDLE_EXTRA_SHOULD_START_FOR_RESULT)) || isSettingsResult) { itemInfo.setFlags(SearchActionItemInfo.FLAG_SHOULD_START_FOR_RESULT); - } else if (extras != null && extras.getBoolean(BUNDLE_EXTRA_SHOULD_START)) { + } else if (extras != null && extras.getBoolean( + SearchTargetUtil.BUNDLE_EXTRA_SHOULD_START)) { itemInfo.setFlags(SearchActionItemInfo.FLAG_SHOULD_START); } - if (extras != null && extras.getBoolean(BUNDLE_EXTRA_BADGE_FROM_ICON)) { - itemInfo.setFlags(FLAG_BADGE_FROM_ICON); + if (extras != null && extras.getBoolean( + SearchTargetUtil.BUNDLE_EXTRA_BADGE_WITH_PACKAGE)) { + itemInfo.setFlags(FLAG_BADGE_WITH_PACKAGE); } if (extras != null && extras.getBoolean(BUNDLE_EXTRA_PRIMARY_ICON_FROM_TITLE)) { itemInfo.setFlags(FLAG_PRIMARY_ICON_FROM_TITLE); @@ -154,39 +171,76 @@ public class SearchResultIcon extends BubbleTextView implements SearchTargetHand MODEL_EXECUTOR.post(() -> { try (LauncherIcons li = LauncherIcons.obtain(getContext())) { Icon icon = searchTarget.getSearchAction().getIcon(); - Drawable d; - // This bitmapInfo can be used as main icon or as a badge - BitmapInfo bitmapInfo; - if (icon == null) { - PackageItemInfo pkgInfo = new PackageItemInfo(searchTarget.getPackageName()); - pkgInfo.user = searchTarget.getUserHandle(); - appState.getIconCache().getTitleAndIconForApp(pkgInfo, false); - bitmapInfo = pkgInfo.bitmap; - } else { - d = itemInfo.getIcon().loadDrawable(getContext()); - bitmapInfo = li.createBadgedIconBitmap(d, itemInfo.user, - Build.VERSION.SDK_INT); - } - - BitmapInfo bitmapMainIcon; + BitmapInfo pkgBitmap = getPackageBitmap(appState, searchTarget); if (itemInfo.hasFlags(FLAG_PRIMARY_ICON_FROM_TITLE)) { - bitmapMainIcon = li.createIconBitmap( - String.valueOf(itemInfo.title.charAt(0)), - bitmapInfo.color); + // create a bitmap with first char if FLAG_PRIMARY_ICON_FROM_TITLE is set + itemInfo.bitmap = li.createIconBitmap(String.valueOf(itemInfo.title.charAt(0)), + pkgBitmap.color); + } else if (icon == null) { + // Use default icon from package name + itemInfo.bitmap = pkgBitmap; } else { - bitmapMainIcon = bitmapInfo; - } - if (itemInfo.hasFlags(FLAG_BADGE_FROM_ICON)) { - itemInfo.bitmap = li.badgeBitmap(bitmapMainIcon.icon, bitmapInfo); - } else { - itemInfo.bitmap = bitmapInfo; + boolean isPlayResult = searchTarget.getResultType() == ResultType.PLAY; + if (isPlayResult) { + Bitmap b = getPlayResultBitmap(searchAction.getIcon()); + itemInfo.bitmap = b == null + ? BitmapInfo.LOW_RES_INFO : BitmapInfo.fromBitmap(b); + } else { + itemInfo.bitmap = li.createBadgedIconBitmap(icon.loadDrawable(getContext()), + itemInfo.user, false); + } } + // badge with package name + if (itemInfo.hasFlags(FLAG_BADGE_WITH_PACKAGE) && itemInfo.bitmap != pkgBitmap) { + itemInfo.bitmap = li.badgeBitmap(itemInfo.bitmap.icon, pkgBitmap); + } } MAIN_EXECUTOR.post(() -> applyFromSearchActionItemInfo(itemInfo)); }); } + private static BitmapInfo getPackageBitmap(LauncherAppState appState, SearchTarget target) { + PackageItemInfo pkgInfo = new PackageItemInfo(target.getPackageName()); + pkgInfo.user = target.getUserHandle(); + appState.getIconCache().getTitleAndIconForApp(pkgInfo, false); + return pkgInfo.bitmap; + } + + private Bitmap getPlayResultBitmap(Icon icon) { + try { + int iconSize = getIconSize(); + URL url = new URL(icon.getUri().toString()); + URLConnection con = url.openConnection(); + con.addRequestProperty("Cache-Control", "max-age: 0"); + con.setUseCaches(true); + Bitmap bitmap = BitmapFactory.decodeStream(con.getInputStream()); + return getRoundedBitmap(Bitmap.createScaledBitmap(bitmap, iconSize, iconSize, false)); + } catch (IOException e) { + e.printStackTrace(); + } + return null; + } + + private Bitmap getRoundedBitmap(Bitmap bitmap) { + final int iconSize = bitmap.getWidth(); + final float radius = Themes.getDialogCornerRadius(getContext()); + + return BitmapRenderer.createHardwareBitmap(iconSize, iconSize, (canvas) -> { + mTempRect.set(0, 0, iconSize, iconSize); + final RectF rectF = new RectF(mTempRect); + + mIconPaint.setAntiAlias(true); + mIconPaint.reset(); + canvas.drawARGB(0, 0, 0, 0); + mIconPaint.setColor(BITMAP_CROP_MASK_COLOR); + canvas.drawRoundRect(rectF, radius, radius, mIconPaint); + + mIconPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_IN)); + canvas.drawBitmap(bitmap, mTempRect, mTempRect, mIconPaint); + }); + } + private void prepareUsingApp(ComponentName componentName, UserHandle userHandle) { AllAppsStore appsStore = mLauncher.getAppsView().getAppsStore(); AppInfo appInfo = appsStore.getApp(new ComponentKey(componentName, userHandle)); @@ -233,7 +287,6 @@ public class SearchResultIcon extends BubbleTextView implements SearchTargetHand } - private void notifyItemInfoChanged(ItemInfoWithIcon itemInfoWithIcon) { if (mOnItemInfoChanged != null) { mOnItemInfoChanged.accept(itemInfoWithIcon); diff --git a/quickstep/src/com/android/launcher3/search/SearchResultIconRow.java b/quickstep/src/com/android/launcher3/search/SearchResultIconRow.java index eafbc73f11..7c3ed69a00 100644 --- a/quickstep/src/com/android/launcher3/search/SearchResultIconRow.java +++ b/quickstep/src/com/android/launcher3/search/SearchResultIconRow.java @@ -23,7 +23,6 @@ import android.content.Context; import android.content.pm.ShortcutInfo; import android.text.TextUtils; import android.util.AttributeSet; -import android.view.View; import android.widget.LinearLayout; import android.widget.TextView; @@ -44,15 +43,15 @@ import java.util.List; */ public class SearchResultIconRow extends LinearLayout implements SearchTargetHandler { - public static final int MAX_INLINE_ITEMS = 2; + public static final int MAX_INLINE_ITEMS = 3; protected final Launcher mLauncher; private final LauncherAppState mLauncherAppState; - private SearchResultIcon mResultIcon; + protected SearchResultIcon mResultIcon; private TextView mTitleView; private TextView mSubTitleView; - private final SearchResultIcon[] mInlineIcons = new SearchResultIcon[MAX_INLINE_ITEMS]; + protected final SearchResultIcon[] mInlineIcons = new SearchResultIcon[MAX_INLINE_ITEMS]; private PackageItemInfo mProviderInfo; @@ -91,9 +90,9 @@ public class SearchResultIconRow extends LinearLayout implements SearchTargetHan mInlineIcons[0] = findViewById(R.id.shortcut_0); mInlineIcons[1] = findViewById(R.id.shortcut_1); + mInlineIcons[2] = findViewById(R.id.shortcut_2); for (SearchResultIcon inlineIcon : mInlineIcons) { inlineIcon.getLayoutParams().width = getIconSize(); - // TODO: inlineIcon.setOnClickListener(); } setOnClickListener(mResultIcon); @@ -103,7 +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); + mResultIcon.apply(parentTarget, children, this::onItemInfoCreated); if (parentTarget.getShortcutInfo() != null) { updateWithShortcutInfo(parentTarget.getShortcutInfo()); } else if (parentTarget.getSearchAction() != null) { @@ -142,7 +141,7 @@ public class SearchResultIconRow extends LinearLayout implements SearchTargetHan protected void showInlineItems(List children) { for (int i = 0; i < MAX_INLINE_ITEMS; i++) { if (i < children.size()) { - mInlineIcons[i].apply(children.get(0), new ArrayList<>()); + mInlineIcons[i].apply(children.get(i), new ArrayList<>()); mInlineIcons[i].setVisibility(VISIBLE); } else { mInlineIcons[i].setVisibility(GONE); @@ -154,15 +153,4 @@ public class SearchResultIconRow extends LinearLayout implements SearchTargetHan setTag(info); mTitleView.setText(info.title); } - - @Override - public void onClick(View view) { - // do nothing. - } - - @Override - public boolean onLongClick(View view) { - // do nothing. - return false; - } } diff --git a/quickstep/src/com/android/launcher3/search/SearchResultIconSlice.java b/quickstep/src/com/android/launcher3/search/SearchResultIconSlice.java index f6e5eba9a3..0ea2f8b86e 100644 --- a/quickstep/src/com/android/launcher3/search/SearchResultIconSlice.java +++ b/quickstep/src/com/android/launcher3/search/SearchResultIconSlice.java @@ -22,7 +22,6 @@ import android.app.search.SearchTargetEvent; import android.content.Context; import android.util.AttributeSet; import android.util.Log; -import android.view.View; import android.widget.LinearLayout; import androidx.annotation.NonNull; @@ -133,15 +132,4 @@ public class SearchResultIconSlice extends LinearLayout implements SearchTargetH public void onSliceAction(@NonNull EventInfo eventInfo, @NonNull SliceItem sliceItem) { notifyEvent(mLauncher, mTargetId, SearchTargetEvent.ACTION_TAP); } - - @Override - public void onClick(View view) { - notifyEvent(mLauncher, mTargetId, SearchTargetEvent.ACTION_LONGPRESS); - } - - @Override - public boolean onLongClick(View view) { - // do nothing - return false; - } } diff --git a/quickstep/src/com/android/launcher3/search/SearchResultPeopleView.java b/quickstep/src/com/android/launcher3/search/SearchResultPeopleView.java deleted file mode 100644 index 99e6aa561c..0000000000 --- a/quickstep/src/com/android/launcher3/search/SearchResultPeopleView.java +++ /dev/null @@ -1,199 +0,0 @@ -/* - * Copyright (C) 2020 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.search; - -import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; -import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR; - -import android.app.search.SearchTargetEvent; -import android.content.Context; -import android.content.Intent; -import android.content.pm.ApplicationInfo; -import android.content.pm.PackageManager; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.drawable.BitmapDrawable; -import android.graphics.drawable.Drawable; -import android.os.Build; -import android.os.Bundle; -import android.os.Process; -import android.util.AttributeSet; -import android.view.View; -import android.widget.ImageButton; -import android.widget.LinearLayout; -import android.widget.TextView; - -import androidx.annotation.Nullable; -import androidx.core.graphics.drawable.RoundedBitmapDrawable; -import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory; - -import com.android.launcher3.DeviceProfile; -import com.android.launcher3.Launcher; -import com.android.launcher3.R; -import com.android.launcher3.icons.BitmapInfo; -import com.android.launcher3.icons.LauncherIcons; -import com.android.systemui.plugins.shared.SearchTargetLegacy; - -import java.util.ArrayList; - -/** - * A view representing a single people search result in all apps - */ -public class SearchResultPeopleView extends LinearLayout implements SearchTargetHandler { - - public static final String TARGET_TYPE_PEOPLE = "people"; - - private final int mIconSize; - private final int mButtonSize; - private final PackageManager mPackageManager; - private View mIconView; - private TextView mTitleView; - private ImageButton[] mProviderButtons = new ImageButton[3]; - private Intent mIntent; - - private SearchTargetLegacy mSearchTarget; - - public SearchResultPeopleView(Context context) { - this(context, null, 0); - } - - public SearchResultPeopleView(Context context, - @Nullable AttributeSet attrs) { - this(context, attrs, 0); - } - - public SearchResultPeopleView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) { - super(context, attrs, defStyleAttr); - DeviceProfile deviceProfile = Launcher.getLauncher(getContext()).getDeviceProfile(); - mPackageManager = getContext().getPackageManager(); - mIconSize = deviceProfile.iconSizePx; - mButtonSize = (int) (deviceProfile.iconSizePx / 1.5f); - } - - @Override - protected void onFinishInflate() { - super.onFinishInflate(); - mIconView = findViewById(R.id.icon); - mIconView.getLayoutParams().height = mIconSize; - mIconView.getLayoutParams().width = mIconSize; - mTitleView = findViewById(R.id.title); - mProviderButtons[0] = findViewById(R.id.provider_0); - mProviderButtons[1] = findViewById(R.id.provider_1); - mProviderButtons[2] = findViewById(R.id.provider_2); - for (ImageButton button : mProviderButtons) { - button.getLayoutParams().width = mButtonSize; - button.getLayoutParams().height = mButtonSize; - } - } - - /* - @Override - public void applySearchTarget(SearchTargetLegacy searchTarget) { - mSearchTarget = searchTarget; - Bundle payload = searchTarget.getExtras(); - mTitleView.setText(payload.getString("title")); - mIntent = payload.getParcelable("intent"); - Bitmap contactIcon = payload.getParcelable("icon"); - try (LauncherIcons li = LauncherIcons.obtain(getContext())) { - BitmapInfo badgeInfo = li.createBadgedIconBitmap( - getAppIcon(mIntent.getPackage()), Process.myUserHandle(), - Build.VERSION.SDK_INT); - setIcon(li.badgeBitmap(roundBitmap(contactIcon), badgeInfo).icon, false); - } catch (Exception e) { - setIcon(contactIcon, true); - } - - ArrayList providers = payload.getParcelableArrayList("providers"); - for (int i = 0; i < mProviderButtons.length; i++) { - ImageButton button = mProviderButtons[i]; - if (providers != null && i < providers.size()) { - Bundle provider = providers.get(i); - Intent intent = provider.getParcelable("intent"); - setupProviderButton(button, provider, intent); - UI_HELPER_EXECUTOR.post(() -> { - String pkg = provider.getString("package_name"); - Drawable appIcon = getAppIcon(pkg); - if (appIcon != null) { - MAIN_EXECUTOR.post(() -> button.setImageDrawable(appIcon)); - } - }); - button.setVisibility(VISIBLE); - } else { - button.setVisibility(GONE); - } - } - } - */ - - /** - * Normalizes the bitmap to look like rounded App Icon - * TODO(b/170234747) to support styling, generate adaptive icon drawable and generate - * bitmap from it. - */ - private Bitmap roundBitmap(Bitmap icon) { - final RoundedBitmapDrawable d = RoundedBitmapDrawableFactory.create(getResources(), icon); - d.setCornerRadius(R.attr.folderIconRadius); - d.setBounds(0, 0, mIconSize, mIconSize); - final Bitmap bitmap = Bitmap.createBitmap(d.getBounds().width(), d.getBounds().height(), - Bitmap.Config.ARGB_8888); - Canvas canvas = new Canvas(bitmap); - d.setBounds(0, 0, canvas.getWidth(), canvas.getHeight()); - d.draw(canvas); - return bitmap; - } - - private void setIcon(Bitmap icon, Boolean round) { - if (round) { - RoundedBitmapDrawable d = RoundedBitmapDrawableFactory.create(getResources(), icon); - d.setCornerRadius(R.attr.folderIconRadius); - d.setBounds(0, 0, mIconSize, mIconSize); - mIconView.setBackground(d); - } else { - mIconView.setBackground(new BitmapDrawable(getResources(), icon)); - } - } - - - private Drawable getAppIcon(String pkg) { - try { - ApplicationInfo applicationInfo = mPackageManager.getApplicationInfo( - pkg, 0); - return applicationInfo.loadIcon(mPackageManager); - } catch (PackageManager.NameNotFoundException ignored) { - return null; - } - } - - private void setupProviderButton(ImageButton button, Bundle provider, Intent intent) { - Launcher launcher = Launcher.getLauncher(getContext()); - button.setOnClickListener(b -> { - launcher.startActivitySafely(b, intent, null); - Bundle bundle = new Bundle(); - bundle.putBundle("provider", provider); - }); - } - - @Override - public void onClick(View view) { - // do nothing. - } - - @Override - public boolean onLongClick(View view) { - // do nothing. - return false; - } -} diff --git a/quickstep/src/com/android/launcher3/search/SearchResultThumbnailView.java b/quickstep/src/com/android/launcher3/search/SearchResultThumbnailView.java index b1cbe7d36f..81e9c758a0 100644 --- a/quickstep/src/com/android/launcher3/search/SearchResultThumbnailView.java +++ b/quickstep/src/com/android/launcher3/search/SearchResultThumbnailView.java @@ -38,10 +38,9 @@ import java.util.List; * A view representing a high confidence app search result that includes shortcuts */ public class SearchResultThumbnailView extends androidx.appcompat.widget.AppCompatImageView - implements SearchTargetHandler { + implements SearchTargetHandler, View.OnClickListener { private SearchTarget mSearchTarget; - private SearchResultIcon mResultIcon; public SearchResultThumbnailView(Context context) { super(context); @@ -90,10 +89,4 @@ public class SearchResultThumbnailView extends androidx.appcompat.widget.AppComp (SearchActionItemInfo) view.getTag()); notifyEvent(getContext(), mSearchTarget.getId(), SearchTargetEvent.ACTION_LAUNCH_TOUCH); } - - @Override - public boolean onLongClick(View view) { - // do nothing. - return false; - } } diff --git a/quickstep/src/com/android/launcher3/search/SearchResultWidget.java b/quickstep/src/com/android/launcher3/search/SearchResultWidget.java index da1495930e..4c64265cc3 100644 --- a/quickstep/src/com/android/launcher3/search/SearchResultWidget.java +++ b/quickstep/src/com/android/launcher3/search/SearchResultWidget.java @@ -186,10 +186,6 @@ public class SearchResultWidget extends LinearLayout implements SearchTargetHand return false; } - @Override - public void onClick(View view) { - // do nothing. - } static class ClickListener extends GestureDetector.SimpleOnGestureListener { private final Runnable mCb; diff --git a/quickstep/src/com/android/launcher3/search/SearchResultWidgetPreview.java b/quickstep/src/com/android/launcher3/search/SearchResultWidgetPreview.java index 1786baf47c..5bf19087d8 100644 --- a/quickstep/src/com/android/launcher3/search/SearchResultWidgetPreview.java +++ b/quickstep/src/com/android/launcher3/search/SearchResultWidgetPreview.java @@ -47,7 +47,8 @@ import java.util.List; /** * displays preview of a widget upon receiving {@link AppWidgetProviderInfo} from Search provider */ -public class SearchResultWidgetPreview extends LinearLayout implements SearchTargetHandler { +public class SearchResultWidgetPreview extends LinearLayout implements SearchTargetHandler, + View.OnClickListener, View.OnLongClickListener { private final Launcher mLauncher; private final LauncherAppState mAppState; diff --git a/quickstep/src/com/android/launcher3/search/SearchSectionHeaderView.java b/quickstep/src/com/android/launcher3/search/SearchSectionHeaderView.java index d7c5c5d157..9276841734 100644 --- a/quickstep/src/com/android/launcher3/search/SearchSectionHeaderView.java +++ b/quickstep/src/com/android/launcher3/search/SearchSectionHeaderView.java @@ -18,7 +18,6 @@ package com.android.launcher3.search; import android.app.search.SearchTarget; import android.content.Context; import android.util.AttributeSet; -import android.view.View; import android.widget.TextView; import androidx.annotation.Nullable; @@ -48,15 +47,4 @@ public class SearchSectionHeaderView extends TextView implements SearchTargetHan setText(parentTarget.getSearchAction().getTitle()); setVisibility(VISIBLE); } - - @Override - public void onClick(View view) { - // do nothing. - } - - @Override - public boolean onLongClick(View view) { - // do nothing. - return false; - } } diff --git a/quickstep/src/com/android/launcher3/search/SearchServicePipeline.java b/quickstep/src/com/android/launcher3/search/SearchServicePipeline.java index 197aecbc28..fac6ba7474 100644 --- a/quickstep/src/com/android/launcher3/search/SearchServicePipeline.java +++ b/quickstep/src/com/android/launcher3/search/SearchServicePipeline.java @@ -15,6 +15,8 @@ */ package com.android.launcher3.search; +import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR; + import android.app.search.Query; import android.app.search.SearchContext; import android.app.search.SearchSession; @@ -39,8 +41,6 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.function.Consumer; -import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR; - /** * Search pipeline utilizing {@link android.app.search.SearchUiManager} */ diff --git a/quickstep/src/com/android/launcher3/search/SearchTargetHandler.java b/quickstep/src/com/android/launcher3/search/SearchTargetHandler.java index 0e7b8f20c9..acf6f8a02a 100644 --- a/quickstep/src/com/android/launcher3/search/SearchTargetHandler.java +++ b/quickstep/src/com/android/launcher3/search/SearchTargetHandler.java @@ -19,15 +19,13 @@ package com.android.launcher3.search; import android.app.search.SearchTarget; import android.app.search.SearchTargetEvent; import android.content.Context; -import android.view.View; import java.util.List; -import java.util.function.Consumer; /** * An interface for supporting dynamic search results */ -public interface SearchTargetHandler extends View.OnClickListener, View.OnLongClickListener { +public interface SearchTargetHandler { /** * Update view using values from {@link SearchTarget} diff --git a/quickstep/src/com/android/launcher3/search/SearchTargetUtil.java b/quickstep/src/com/android/launcher3/search/SearchTargetUtil.java index ceef429595..c036f19f96 100644 --- a/quickstep/src/com/android/launcher3/search/SearchTargetUtil.java +++ b/quickstep/src/com/android/launcher3/search/SearchTargetUtil.java @@ -15,6 +15,13 @@ */ package com.android.launcher3.search; +import static com.android.app.search.LayoutType.ICON_DOUBLE_HORIZONTAL_TEXT; +import static com.android.app.search.LayoutType.ICON_SINGLE_HORIZONTAL_TEXT; +import static com.android.app.search.LayoutType.THUMBNAIL; +import static com.android.app.search.ResultType.ACTION; +import static com.android.app.search.ResultType.SCREENSHOT; +import static com.android.app.search.ResultType.SUGGEST; + import android.app.PendingIntent; import android.app.search.SearchAction; import android.app.search.SearchTarget; @@ -31,18 +38,11 @@ import android.os.UserHandle; import com.android.app.search.ResultType; -import static com.android.app.search.LayoutType.ICON_DOUBLE_HORIZONTAL_TEXT; -import static com.android.app.search.LayoutType.ICON_SINGLE_HORIZONTAL_TEXT; -import static com.android.app.search.LayoutType.THUMBNAIL; -import static com.android.app.search.ResultType.ACTION; -import static com.android.app.search.ResultType.SCREENSHOT; -import static com.android.app.search.ResultType.SUGGEST; - public class SearchTargetUtil { public static final String BUNDLE_EXTRA_SHOULD_START = "should_start"; public static final String BUNDLE_EXTRA_SHOULD_START_FOR_RESULT = "should_start_for_result"; - public static final String BUNDLE_EXTRA_BADGE_FROM_ICON = "badge_from_icon"; + public static final String BUNDLE_EXTRA_BADGE_WITH_PACKAGE = "badge_with_package"; public static final String BUNDLE_EXTRA_PRIMARY_ICON_FROM_TITLE = "primary_icon_from_title"; public static final String EXTRA_CLASS = "class"; @@ -56,10 +56,10 @@ public class SearchTargetUtil { /** * Generate SearchTargetUtil for ICON_DOUBLE_HORIZONTAL_TEXT layout type. * - targets.add(SearchTargetUtil.generateIconDoubleHorizontalText_SearchAction( - mContext, "red", Color.RED)); - targets.add(SearchTargetUtil.generateIconDoubleHorizontalText_SearchAction( - mContext, "yellow", Color.YELLOW)); + * targets.add(SearchTargetUtil.generateIconDoubleHorizontalText_SearchAction( + * mContext, "red", Color.RED)); + * targets.add(SearchTargetUtil.generateIconDoubleHorizontalText_SearchAction( + * mContext, "yellow", Color.YELLOW)); */ public static SearchTarget generateIconDoubleHorizontalText_SearchAction( Context context, String id, int color) { @@ -83,7 +83,7 @@ public class SearchTargetUtil { Bundle b = new Bundle(); b.putBoolean(BUNDLE_EXTRA_SHOULD_START_FOR_RESULT, true); - b.putBoolean(BUNDLE_EXTRA_BADGE_FROM_ICON, true); + b.putBoolean(BUNDLE_EXTRA_BADGE_WITH_PACKAGE, true); b.putBoolean(BUNDLE_EXTRA_PRIMARY_ICON_FROM_TITLE, true); builder.setSearchAction(new SearchAction.Builder(id, id + TITLE) @@ -96,7 +96,7 @@ public class SearchTargetUtil { } /** - * Inside SearchServicePipeline, add following samples to test the search target. + * Inside SearchServicePipeline, add following samples to test the search target. * * targets.add(SearchTargetUtil.generateThumbnail_SearchAction("blue", Color.BLUE)); * targets.add(SearchTargetUtil.generateThumbnail_SearchAction("red", Color.RED)); @@ -129,11 +129,10 @@ public class SearchTargetUtil { } /** - * * targets.add(SearchTargetUtil.generateIconHorizontalText_SearchAction( - * mContext, "red", Color.RED)); + * mContext, "red", Color.RED)); * targets.add(SearchTargetUtil.generateIconHorizontalText_SearchAction( - * mContext, "yellow", Color.YELLOW)); + * mContext, "yellow", Color.YELLOW)); */ public static SearchTarget generateIconHorizontalText_SearchAction( Context context, String id, int color) { diff --git a/src/com/android/launcher3/model/data/SearchActionItemInfo.java b/src/com/android/launcher3/model/data/SearchActionItemInfo.java index 36afe50fa1..8469569c25 100644 --- a/src/com/android/launcher3/model/data/SearchActionItemInfo.java +++ b/src/com/android/launcher3/model/data/SearchActionItemInfo.java @@ -30,7 +30,7 @@ public class SearchActionItemInfo extends ItemInfoWithIcon { public static final int FLAG_SHOULD_START = 1 << 1; public static final int FLAG_SHOULD_START_FOR_RESULT = FLAG_SHOULD_START | 1 << 2; - public static final int FLAG_BADGE_FROM_ICON = 1 << 3; + public static final int FLAG_BADGE_WITH_PACKAGE = 1 << 3; public static final int FLAG_PRIMARY_ICON_FROM_TITLE = 1 << 4; private final String mFallbackPackageName; diff --git a/src_plugins/com/android/systemui/plugins/shared/SearchTargetEventLegacy.java b/src_plugins/com/android/systemui/plugins/shared/SearchTargetEventLegacy.java index 7fbd6ac814..0fc61f04dc 100644 --- a/src_plugins/com/android/systemui/plugins/shared/SearchTargetEventLegacy.java +++ b/src_plugins/com/android/systemui/plugins/shared/SearchTargetEventLegacy.java @@ -20,7 +20,7 @@ import android.os.Bundle; /** * Event used for the feedback loop to the plugin. (and future aiai) * - * @deprecated Use SearchTargetEvent + * @deprecated Use {@link android.app.search.SearchTargetEvent} */ @Deprecated public class SearchTargetEventLegacy { From 170a6b7b984a0eaa88d77c58d4cdf143e7e2a029 Mon Sep 17 00:00:00 2001 From: Darryl Johnson Date: Fri, 29 Jan 2021 20:51:38 +0000 Subject: [PATCH 09/11] Revert "Support people search results" This reverts commit f28db55c96716acf443af0b370c6f67646757f8a. Reason for revert: Possible cause of b/178836393 Change-Id: I0e787f02377a5b8fa723816978c61927af67665a --- .../res/layout/search_result_icon_row.xml | 19 +- .../res/layout/search_result_people_item.xml | 63 ++++++ .../search/DeviceSearchAdapterProvider.java | 3 +- .../launcher3/search/SearchAdapterItem.java | 8 +- .../launcher3/search/SearchResultIcon.java | 131 ++++-------- .../launcher3/search/SearchResultIconRow.java | 24 ++- .../search/SearchResultIconSlice.java | 12 ++ .../search/SearchResultPeopleView.java | 199 ++++++++++++++++++ .../search/SearchResultThumbnailView.java | 9 +- .../launcher3/search/SearchResultWidget.java | 4 + .../search/SearchResultWidgetPreview.java | 3 +- .../search/SearchSectionHeaderView.java | 12 ++ .../search/SearchServicePipeline.java | 4 +- .../launcher3/search/SearchTargetHandler.java | 4 +- .../launcher3/search/SearchTargetUtil.java | 33 +-- .../model/data/SearchActionItemInfo.java | 2 +- .../shared/SearchTargetEventLegacy.java | 2 +- 17 files changed, 388 insertions(+), 144 deletions(-) create mode 100644 quickstep/res/layout/search_result_people_item.xml create mode 100644 quickstep/src/com/android/launcher3/search/SearchResultPeopleView.java diff --git a/quickstep/res/layout/search_result_icon_row.xml b/quickstep/res/layout/search_result_icon_row.xml index 81190cfc56..2119fc3425 100644 --- a/quickstep/res/layout/search_result_icon_row.xml +++ b/quickstep/res/layout/search_result_icon_row.xml @@ -57,10 +57,9 @@ style="@style/BaseIcon" android:layout_width="@dimen/deep_shortcut_icon_size" android:layout_height="match_parent" - android:layout_marginStart="4dp" - android:gravity="center" + android:gravity="start|center_vertical" launcher:iconDisplay="shortcut_popup" - android:textSize="@dimen/search_hero_inline_button_size" + android:textSize="@dimen/search_hero_subtitle_size" launcher:iconSizeOverride="@dimen/deep_shortcut_icon_size" launcher:layoutHorizontal="false" /> @@ -69,20 +68,6 @@ style="@style/BaseIcon" android:layout_width="@dimen/deep_shortcut_icon_size" android:layout_height="match_parent" - android:layout_marginStart="4dp" - android:gravity="center" - launcher:iconDisplay="shortcut_popup" - android:textSize="@dimen/search_hero_inline_button_size" - launcher:iconSizeOverride="@dimen/deep_shortcut_icon_size" - launcher:layoutHorizontal="false" /> - - + + + + + + + + + + + + + \ 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 acf6c150cf..02be0b94ed 100644 --- a/quickstep/src/com/android/launcher3/search/DeviceSearchAdapterProvider.java +++ b/quickstep/src/com/android/launcher3/search/DeviceSearchAdapterProvider.java @@ -41,6 +41,7 @@ public class DeviceSearchAdapterProvider extends SearchAdapterProvider { public static final int VIEW_TYPE_SEARCH_SLICE = 1 << 7; public static final int VIEW_TYPE_SEARCH_ICON = (1 << 8) | VIEW_TYPE_ICON; public static final int VIEW_TYPE_SEARCH_ICON_ROW = (1 << 9); + public static final int VIEW_TYPE_SEARCH_PEOPLE = 1 << 11; public static final int VIEW_TYPE_SEARCH_THUMBNAIL = 1 << 12; public static final int VIEW_TYPE_SEARCH_WIDGET_LIVE = 1 << 15; public static final int VIEW_TYPE_SEARCH_WIDGET_PREVIEW = 1 << 16; @@ -58,6 +59,7 @@ public class DeviceSearchAdapterProvider extends SearchAdapterProvider { mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_ICON, R.layout.search_result_icon); mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_ICON_ROW, R.layout.search_result_icon_row); mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_SLICE, R.layout.search_result_slice); + mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_PEOPLE, R.layout.search_result_people_item); mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_THUMBNAIL, R.layout.search_result_thumbnail); mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_WIDGET_LIVE, R.layout.search_result_widget_live); mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_WIDGET_PREVIEW, @@ -123,7 +125,6 @@ public class DeviceSearchAdapterProvider extends SearchAdapterProvider { break; case LayoutType.ICON_DOUBLE_HORIZONTAL_TEXT: case LayoutType.ICON_SINGLE_HORIZONTAL_TEXT: - case LayoutType.ICON_DOUBLE_HORIZONTAL_TEXT_BUTTON: return VIEW_TYPE_SEARCH_ICON_ROW; case LayoutType.THUMBNAIL: if (t.getSearchAction() != null) { diff --git a/quickstep/src/com/android/launcher3/search/SearchAdapterItem.java b/quickstep/src/com/android/launcher3/search/SearchAdapterItem.java index b402f61979..0eb3edb555 100644 --- a/quickstep/src/com/android/launcher3/search/SearchAdapterItem.java +++ b/quickstep/src/com/android/launcher3/search/SearchAdapterItem.java @@ -18,6 +18,7 @@ package com.android.launcher3.search; import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_ICON; import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_ICON_ROW; +import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_PEOPLE; import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_SLICE; import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_THUMBNAIL; import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_WIDGET_LIVE; @@ -41,10 +42,9 @@ public class SearchAdapterItem extends AllAppsGridAdapter.AdapterItem { private static final int AVAILABLE_FOR_ACCESSIBILITY = - VIEW_TYPE_SEARCH_SLICE | VIEW_TYPE_SEARCH_THUMBNAIL | VIEW_TYPE_SEARCH_ICON_ROW - | VIEW_TYPE_SEARCH_ICON | VIEW_TYPE_SEARCH_WIDGET_PREVIEW - | VIEW_TYPE_SEARCH_WIDGET_LIVE; - + VIEW_TYPE_SEARCH_SLICE | VIEW_TYPE_SEARCH_PEOPLE | VIEW_TYPE_SEARCH_THUMBNAIL + | VIEW_TYPE_SEARCH_ICON_ROW | VIEW_TYPE_SEARCH_ICON + | VIEW_TYPE_SEARCH_WIDGET_PREVIEW | VIEW_TYPE_SEARCH_WIDGET_LIVE; public SearchAdapterItem(SearchTargetLegacy searchTargetLegacy, int type) { mSearchTargetLegacy = searchTargetLegacy; diff --git a/quickstep/src/com/android/launcher3/search/SearchResultIcon.java b/quickstep/src/com/android/launcher3/search/SearchResultIcon.java index c353d7aa3c..3d89ac5e27 100644 --- a/quickstep/src/com/android/launcher3/search/SearchResultIcon.java +++ b/quickstep/src/com/android/launcher3/search/SearchResultIcon.java @@ -15,9 +15,12 @@ */ package com.android.launcher3.search; -import static com.android.launcher3.model.data.SearchActionItemInfo.FLAG_BADGE_WITH_PACKAGE; +import static com.android.launcher3.model.data.SearchActionItemInfo.FLAG_BADGE_FROM_ICON; import static com.android.launcher3.model.data.SearchActionItemInfo.FLAG_PRIMARY_ICON_FROM_TITLE; +import static com.android.launcher3.search.SearchTargetUtil.BUNDLE_EXTRA_BADGE_FROM_ICON; import static com.android.launcher3.search.SearchTargetUtil.BUNDLE_EXTRA_PRIMARY_ICON_FROM_TITLE; +import static com.android.launcher3.search.SearchTargetUtil.BUNDLE_EXTRA_SHOULD_START; +import static com.android.launcher3.search.SearchTargetUtil.BUNDLE_EXTRA_SHOULD_START_FOR_RESULT; import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; import static com.android.launcher3.util.Executors.MODEL_EXECUTOR; @@ -27,14 +30,9 @@ import android.app.search.SearchTargetEvent; import android.content.ComponentName; import android.content.Context; import android.content.pm.ShortcutInfo; -import android.graphics.Bitmap; -import android.graphics.BitmapFactory; -import android.graphics.Paint; -import android.graphics.PorterDuff; -import android.graphics.PorterDuffXfermode; -import android.graphics.Rect; -import android.graphics.RectF; +import android.graphics.drawable.Drawable; import android.graphics.drawable.Icon; +import android.os.Build; import android.os.Bundle; import android.os.UserHandle; import android.util.AttributeSet; @@ -47,7 +45,6 @@ import com.android.launcher3.Launcher; import com.android.launcher3.LauncherAppState; import com.android.launcher3.allapps.AllAppsStore; import com.android.launcher3.icons.BitmapInfo; -import com.android.launcher3.icons.BitmapRenderer; import com.android.launcher3.icons.LauncherIcons; import com.android.launcher3.model.data.AppInfo; import com.android.launcher3.model.data.ItemInfoWithIcon; @@ -57,25 +54,14 @@ import com.android.launcher3.model.data.WorkspaceItemInfo; import com.android.launcher3.touch.ItemClickHandler; import com.android.launcher3.touch.ItemLongClickListener; import com.android.launcher3.util.ComponentKey; -import com.android.launcher3.util.Themes; -import java.io.IOException; -import java.net.URL; -import java.net.URLConnection; import java.util.List; import java.util.function.Consumer; /** * A {@link BubbleTextView} representing a single cell result in AllApps */ -public class SearchResultIcon extends BubbleTextView implements - SearchTargetHandler, View.OnClickListener, - View.OnLongClickListener { - - //Play store thumbnail process workaround - private final Rect mTempRect = new Rect(); - private final Paint mIconPaint = new Paint(); - private static final int BITMAP_CROP_MASK_COLOR = 0xff424242; +public class SearchResultIcon extends BubbleTextView implements SearchTargetHandler { private final Launcher mLauncher; @@ -113,7 +99,7 @@ public class SearchResultIcon extends BubbleTextView implements * Applies {@link SearchTarget} to view. registers a consumer after a corresponding * {@link ItemInfoWithIcon} is created */ - public void apply(SearchTarget searchTarget, List inlineItems, + public void applySearchTarget(SearchTarget searchTarget, List inlineItems, Consumer cb) { mOnItemInfoChanged = cb; apply(searchTarget, inlineItems); @@ -129,8 +115,8 @@ public class SearchResultIcon extends BubbleTextView implements prepareUsingSearchAction(parentTarget); mLongPressSupported = false; } else { - String className = parentTarget.getExtras().getString(SearchTargetUtil.EXTRA_CLASS); - prepareUsingApp(new ComponentName(parentTarget.getPackageName(), className), + prepareUsingApp(new ComponentName(parentTarget.getPackageName(), + parentTarget.getExtras().getString(SearchTargetUtil.EXTRA_CLASS)), parentTarget.getUserHandle()); mLongPressSupported = true; } @@ -150,17 +136,14 @@ public class SearchResultIcon extends BubbleTextView implements //TODO: remove this after flags are introduced in SearchAction. Settings results require // startActivityForResult boolean isSettingsResult = searchTarget.getResultType() == ResultType.SETTING; - if ((extras != null && extras.getBoolean( - SearchTargetUtil.BUNDLE_EXTRA_SHOULD_START_FOR_RESULT)) + if ((extras != null && extras.getBoolean(BUNDLE_EXTRA_SHOULD_START_FOR_RESULT)) || isSettingsResult) { itemInfo.setFlags(SearchActionItemInfo.FLAG_SHOULD_START_FOR_RESULT); - } else if (extras != null && extras.getBoolean( - SearchTargetUtil.BUNDLE_EXTRA_SHOULD_START)) { + } else if (extras != null && extras.getBoolean(BUNDLE_EXTRA_SHOULD_START)) { itemInfo.setFlags(SearchActionItemInfo.FLAG_SHOULD_START); } - if (extras != null && extras.getBoolean( - SearchTargetUtil.BUNDLE_EXTRA_BADGE_WITH_PACKAGE)) { - itemInfo.setFlags(FLAG_BADGE_WITH_PACKAGE); + if (extras != null && extras.getBoolean(BUNDLE_EXTRA_BADGE_FROM_ICON)) { + itemInfo.setFlags(FLAG_BADGE_FROM_ICON); } if (extras != null && extras.getBoolean(BUNDLE_EXTRA_PRIMARY_ICON_FROM_TITLE)) { itemInfo.setFlags(FLAG_PRIMARY_ICON_FROM_TITLE); @@ -171,76 +154,39 @@ public class SearchResultIcon extends BubbleTextView implements MODEL_EXECUTOR.post(() -> { try (LauncherIcons li = LauncherIcons.obtain(getContext())) { Icon icon = searchTarget.getSearchAction().getIcon(); - BitmapInfo pkgBitmap = getPackageBitmap(appState, searchTarget); - if (itemInfo.hasFlags(FLAG_PRIMARY_ICON_FROM_TITLE)) { - // create a bitmap with first char if FLAG_PRIMARY_ICON_FROM_TITLE is set - itemInfo.bitmap = li.createIconBitmap(String.valueOf(itemInfo.title.charAt(0)), - pkgBitmap.color); - } else if (icon == null) { - // Use default icon from package name - itemInfo.bitmap = pkgBitmap; + Drawable d; + // This bitmapInfo can be used as main icon or as a badge + BitmapInfo bitmapInfo; + if (icon == null) { + PackageItemInfo pkgInfo = new PackageItemInfo(searchTarget.getPackageName()); + pkgInfo.user = searchTarget.getUserHandle(); + appState.getIconCache().getTitleAndIconForApp(pkgInfo, false); + bitmapInfo = pkgInfo.bitmap; } else { - boolean isPlayResult = searchTarget.getResultType() == ResultType.PLAY; - if (isPlayResult) { - Bitmap b = getPlayResultBitmap(searchAction.getIcon()); - itemInfo.bitmap = b == null - ? BitmapInfo.LOW_RES_INFO : BitmapInfo.fromBitmap(b); - } else { - itemInfo.bitmap = li.createBadgedIconBitmap(icon.loadDrawable(getContext()), - itemInfo.user, false); - } + d = itemInfo.getIcon().loadDrawable(getContext()); + bitmapInfo = li.createBadgedIconBitmap(d, itemInfo.user, + Build.VERSION.SDK_INT); } - // badge with package name - if (itemInfo.hasFlags(FLAG_BADGE_WITH_PACKAGE) && itemInfo.bitmap != pkgBitmap) { - itemInfo.bitmap = li.badgeBitmap(itemInfo.bitmap.icon, pkgBitmap); + BitmapInfo bitmapMainIcon; + if (itemInfo.hasFlags(FLAG_PRIMARY_ICON_FROM_TITLE)) { + bitmapMainIcon = li.createIconBitmap( + String.valueOf(itemInfo.title.charAt(0)), + bitmapInfo.color); + } else { + bitmapMainIcon = bitmapInfo; } + if (itemInfo.hasFlags(FLAG_BADGE_FROM_ICON)) { + itemInfo.bitmap = li.badgeBitmap(bitmapMainIcon.icon, bitmapInfo); + } else { + itemInfo.bitmap = bitmapInfo; + } + } MAIN_EXECUTOR.post(() -> applyFromSearchActionItemInfo(itemInfo)); }); } - private static BitmapInfo getPackageBitmap(LauncherAppState appState, SearchTarget target) { - PackageItemInfo pkgInfo = new PackageItemInfo(target.getPackageName()); - pkgInfo.user = target.getUserHandle(); - appState.getIconCache().getTitleAndIconForApp(pkgInfo, false); - return pkgInfo.bitmap; - } - - private Bitmap getPlayResultBitmap(Icon icon) { - try { - int iconSize = getIconSize(); - URL url = new URL(icon.getUri().toString()); - URLConnection con = url.openConnection(); - con.addRequestProperty("Cache-Control", "max-age: 0"); - con.setUseCaches(true); - Bitmap bitmap = BitmapFactory.decodeStream(con.getInputStream()); - return getRoundedBitmap(Bitmap.createScaledBitmap(bitmap, iconSize, iconSize, false)); - } catch (IOException e) { - e.printStackTrace(); - } - return null; - } - - private Bitmap getRoundedBitmap(Bitmap bitmap) { - final int iconSize = bitmap.getWidth(); - final float radius = Themes.getDialogCornerRadius(getContext()); - - return BitmapRenderer.createHardwareBitmap(iconSize, iconSize, (canvas) -> { - mTempRect.set(0, 0, iconSize, iconSize); - final RectF rectF = new RectF(mTempRect); - - mIconPaint.setAntiAlias(true); - mIconPaint.reset(); - canvas.drawARGB(0, 0, 0, 0); - mIconPaint.setColor(BITMAP_CROP_MASK_COLOR); - canvas.drawRoundRect(rectF, radius, radius, mIconPaint); - - mIconPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_IN)); - canvas.drawBitmap(bitmap, mTempRect, mTempRect, mIconPaint); - }); - } - private void prepareUsingApp(ComponentName componentName, UserHandle userHandle) { AllAppsStore appsStore = mLauncher.getAppsView().getAppsStore(); AppInfo appInfo = appsStore.getApp(new ComponentKey(componentName, userHandle)); @@ -287,6 +233,7 @@ public class SearchResultIcon extends BubbleTextView implements } + private void notifyItemInfoChanged(ItemInfoWithIcon itemInfoWithIcon) { if (mOnItemInfoChanged != null) { mOnItemInfoChanged.accept(itemInfoWithIcon); diff --git a/quickstep/src/com/android/launcher3/search/SearchResultIconRow.java b/quickstep/src/com/android/launcher3/search/SearchResultIconRow.java index 7c3ed69a00..eafbc73f11 100644 --- a/quickstep/src/com/android/launcher3/search/SearchResultIconRow.java +++ b/quickstep/src/com/android/launcher3/search/SearchResultIconRow.java @@ -23,6 +23,7 @@ import android.content.Context; import android.content.pm.ShortcutInfo; import android.text.TextUtils; import android.util.AttributeSet; +import android.view.View; import android.widget.LinearLayout; import android.widget.TextView; @@ -43,15 +44,15 @@ import java.util.List; */ public class SearchResultIconRow extends LinearLayout implements SearchTargetHandler { - public static final int MAX_INLINE_ITEMS = 3; + public static final int MAX_INLINE_ITEMS = 2; protected final Launcher mLauncher; private final LauncherAppState mLauncherAppState; - protected SearchResultIcon mResultIcon; + private SearchResultIcon mResultIcon; private TextView mTitleView; private TextView mSubTitleView; - protected final SearchResultIcon[] mInlineIcons = new SearchResultIcon[MAX_INLINE_ITEMS]; + private final SearchResultIcon[] mInlineIcons = new SearchResultIcon[MAX_INLINE_ITEMS]; private PackageItemInfo mProviderInfo; @@ -90,9 +91,9 @@ public class SearchResultIconRow extends LinearLayout implements SearchTargetHan mInlineIcons[0] = findViewById(R.id.shortcut_0); mInlineIcons[1] = findViewById(R.id.shortcut_1); - mInlineIcons[2] = findViewById(R.id.shortcut_2); for (SearchResultIcon inlineIcon : mInlineIcons) { inlineIcon.getLayoutParams().width = getIconSize(); + // TODO: inlineIcon.setOnClickListener(); } setOnClickListener(mResultIcon); @@ -102,7 +103,7 @@ public class SearchResultIconRow extends LinearLayout implements SearchTargetHan @Override public void apply(SearchTarget parentTarget, List children) { showSubtitleIfNeeded(null); - mResultIcon.apply(parentTarget, children, this::onItemInfoCreated); + mResultIcon.applySearchTarget(parentTarget, children, this::onItemInfoCreated); if (parentTarget.getShortcutInfo() != null) { updateWithShortcutInfo(parentTarget.getShortcutInfo()); } else if (parentTarget.getSearchAction() != null) { @@ -141,7 +142,7 @@ public class SearchResultIconRow extends LinearLayout implements SearchTargetHan protected void showInlineItems(List children) { for (int i = 0; i < MAX_INLINE_ITEMS; i++) { if (i < children.size()) { - mInlineIcons[i].apply(children.get(i), new ArrayList<>()); + mInlineIcons[i].apply(children.get(0), new ArrayList<>()); mInlineIcons[i].setVisibility(VISIBLE); } else { mInlineIcons[i].setVisibility(GONE); @@ -153,4 +154,15 @@ public class SearchResultIconRow extends LinearLayout implements SearchTargetHan setTag(info); mTitleView.setText(info.title); } + + @Override + public void onClick(View view) { + // do nothing. + } + + @Override + public boolean onLongClick(View view) { + // do nothing. + return false; + } } diff --git a/quickstep/src/com/android/launcher3/search/SearchResultIconSlice.java b/quickstep/src/com/android/launcher3/search/SearchResultIconSlice.java index 0ea2f8b86e..f6e5eba9a3 100644 --- a/quickstep/src/com/android/launcher3/search/SearchResultIconSlice.java +++ b/quickstep/src/com/android/launcher3/search/SearchResultIconSlice.java @@ -22,6 +22,7 @@ import android.app.search.SearchTargetEvent; import android.content.Context; import android.util.AttributeSet; import android.util.Log; +import android.view.View; import android.widget.LinearLayout; import androidx.annotation.NonNull; @@ -132,4 +133,15 @@ public class SearchResultIconSlice extends LinearLayout implements SearchTargetH public void onSliceAction(@NonNull EventInfo eventInfo, @NonNull SliceItem sliceItem) { notifyEvent(mLauncher, mTargetId, SearchTargetEvent.ACTION_TAP); } + + @Override + public void onClick(View view) { + notifyEvent(mLauncher, mTargetId, SearchTargetEvent.ACTION_LONGPRESS); + } + + @Override + public boolean onLongClick(View view) { + // do nothing + return false; + } } diff --git a/quickstep/src/com/android/launcher3/search/SearchResultPeopleView.java b/quickstep/src/com/android/launcher3/search/SearchResultPeopleView.java new file mode 100644 index 0000000000..99e6aa561c --- /dev/null +++ b/quickstep/src/com/android/launcher3/search/SearchResultPeopleView.java @@ -0,0 +1,199 @@ +/* + * Copyright (C) 2020 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.search; + +import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; +import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR; + +import android.app.search.SearchTargetEvent; +import android.content.Context; +import android.content.Intent; +import android.content.pm.ApplicationInfo; +import android.content.pm.PackageManager; +import android.graphics.Bitmap; +import android.graphics.Canvas; +import android.graphics.drawable.BitmapDrawable; +import android.graphics.drawable.Drawable; +import android.os.Build; +import android.os.Bundle; +import android.os.Process; +import android.util.AttributeSet; +import android.view.View; +import android.widget.ImageButton; +import android.widget.LinearLayout; +import android.widget.TextView; + +import androidx.annotation.Nullable; +import androidx.core.graphics.drawable.RoundedBitmapDrawable; +import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory; + +import com.android.launcher3.DeviceProfile; +import com.android.launcher3.Launcher; +import com.android.launcher3.R; +import com.android.launcher3.icons.BitmapInfo; +import com.android.launcher3.icons.LauncherIcons; +import com.android.systemui.plugins.shared.SearchTargetLegacy; + +import java.util.ArrayList; + +/** + * A view representing a single people search result in all apps + */ +public class SearchResultPeopleView extends LinearLayout implements SearchTargetHandler { + + public static final String TARGET_TYPE_PEOPLE = "people"; + + private final int mIconSize; + private final int mButtonSize; + private final PackageManager mPackageManager; + private View mIconView; + private TextView mTitleView; + private ImageButton[] mProviderButtons = new ImageButton[3]; + private Intent mIntent; + + private SearchTargetLegacy mSearchTarget; + + public SearchResultPeopleView(Context context) { + this(context, null, 0); + } + + public SearchResultPeopleView(Context context, + @Nullable AttributeSet attrs) { + this(context, attrs, 0); + } + + public SearchResultPeopleView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) { + super(context, attrs, defStyleAttr); + DeviceProfile deviceProfile = Launcher.getLauncher(getContext()).getDeviceProfile(); + mPackageManager = getContext().getPackageManager(); + mIconSize = deviceProfile.iconSizePx; + mButtonSize = (int) (deviceProfile.iconSizePx / 1.5f); + } + + @Override + protected void onFinishInflate() { + super.onFinishInflate(); + mIconView = findViewById(R.id.icon); + mIconView.getLayoutParams().height = mIconSize; + mIconView.getLayoutParams().width = mIconSize; + mTitleView = findViewById(R.id.title); + mProviderButtons[0] = findViewById(R.id.provider_0); + mProviderButtons[1] = findViewById(R.id.provider_1); + mProviderButtons[2] = findViewById(R.id.provider_2); + for (ImageButton button : mProviderButtons) { + button.getLayoutParams().width = mButtonSize; + button.getLayoutParams().height = mButtonSize; + } + } + + /* + @Override + public void applySearchTarget(SearchTargetLegacy searchTarget) { + mSearchTarget = searchTarget; + Bundle payload = searchTarget.getExtras(); + mTitleView.setText(payload.getString("title")); + mIntent = payload.getParcelable("intent"); + Bitmap contactIcon = payload.getParcelable("icon"); + try (LauncherIcons li = LauncherIcons.obtain(getContext())) { + BitmapInfo badgeInfo = li.createBadgedIconBitmap( + getAppIcon(mIntent.getPackage()), Process.myUserHandle(), + Build.VERSION.SDK_INT); + setIcon(li.badgeBitmap(roundBitmap(contactIcon), badgeInfo).icon, false); + } catch (Exception e) { + setIcon(contactIcon, true); + } + + ArrayList providers = payload.getParcelableArrayList("providers"); + for (int i = 0; i < mProviderButtons.length; i++) { + ImageButton button = mProviderButtons[i]; + if (providers != null && i < providers.size()) { + Bundle provider = providers.get(i); + Intent intent = provider.getParcelable("intent"); + setupProviderButton(button, provider, intent); + UI_HELPER_EXECUTOR.post(() -> { + String pkg = provider.getString("package_name"); + Drawable appIcon = getAppIcon(pkg); + if (appIcon != null) { + MAIN_EXECUTOR.post(() -> button.setImageDrawable(appIcon)); + } + }); + button.setVisibility(VISIBLE); + } else { + button.setVisibility(GONE); + } + } + } + */ + + /** + * Normalizes the bitmap to look like rounded App Icon + * TODO(b/170234747) to support styling, generate adaptive icon drawable and generate + * bitmap from it. + */ + private Bitmap roundBitmap(Bitmap icon) { + final RoundedBitmapDrawable d = RoundedBitmapDrawableFactory.create(getResources(), icon); + d.setCornerRadius(R.attr.folderIconRadius); + d.setBounds(0, 0, mIconSize, mIconSize); + final Bitmap bitmap = Bitmap.createBitmap(d.getBounds().width(), d.getBounds().height(), + Bitmap.Config.ARGB_8888); + Canvas canvas = new Canvas(bitmap); + d.setBounds(0, 0, canvas.getWidth(), canvas.getHeight()); + d.draw(canvas); + return bitmap; + } + + private void setIcon(Bitmap icon, Boolean round) { + if (round) { + RoundedBitmapDrawable d = RoundedBitmapDrawableFactory.create(getResources(), icon); + d.setCornerRadius(R.attr.folderIconRadius); + d.setBounds(0, 0, mIconSize, mIconSize); + mIconView.setBackground(d); + } else { + mIconView.setBackground(new BitmapDrawable(getResources(), icon)); + } + } + + + private Drawable getAppIcon(String pkg) { + try { + ApplicationInfo applicationInfo = mPackageManager.getApplicationInfo( + pkg, 0); + return applicationInfo.loadIcon(mPackageManager); + } catch (PackageManager.NameNotFoundException ignored) { + return null; + } + } + + private void setupProviderButton(ImageButton button, Bundle provider, Intent intent) { + Launcher launcher = Launcher.getLauncher(getContext()); + button.setOnClickListener(b -> { + launcher.startActivitySafely(b, intent, null); + Bundle bundle = new Bundle(); + bundle.putBundle("provider", provider); + }); + } + + @Override + public void onClick(View view) { + // do nothing. + } + + @Override + public boolean onLongClick(View view) { + // do nothing. + return false; + } +} diff --git a/quickstep/src/com/android/launcher3/search/SearchResultThumbnailView.java b/quickstep/src/com/android/launcher3/search/SearchResultThumbnailView.java index 81e9c758a0..b1cbe7d36f 100644 --- a/quickstep/src/com/android/launcher3/search/SearchResultThumbnailView.java +++ b/quickstep/src/com/android/launcher3/search/SearchResultThumbnailView.java @@ -38,9 +38,10 @@ import java.util.List; * A view representing a high confidence app search result that includes shortcuts */ public class SearchResultThumbnailView extends androidx.appcompat.widget.AppCompatImageView - implements SearchTargetHandler, View.OnClickListener { + implements SearchTargetHandler { private SearchTarget mSearchTarget; + private SearchResultIcon mResultIcon; public SearchResultThumbnailView(Context context) { super(context); @@ -89,4 +90,10 @@ public class SearchResultThumbnailView extends androidx.appcompat.widget.AppComp (SearchActionItemInfo) view.getTag()); notifyEvent(getContext(), mSearchTarget.getId(), SearchTargetEvent.ACTION_LAUNCH_TOUCH); } + + @Override + public boolean onLongClick(View view) { + // do nothing. + return false; + } } diff --git a/quickstep/src/com/android/launcher3/search/SearchResultWidget.java b/quickstep/src/com/android/launcher3/search/SearchResultWidget.java index 4c64265cc3..da1495930e 100644 --- a/quickstep/src/com/android/launcher3/search/SearchResultWidget.java +++ b/quickstep/src/com/android/launcher3/search/SearchResultWidget.java @@ -186,6 +186,10 @@ public class SearchResultWidget extends LinearLayout implements SearchTargetHand return false; } + @Override + public void onClick(View view) { + // do nothing. + } static class ClickListener extends GestureDetector.SimpleOnGestureListener { private final Runnable mCb; diff --git a/quickstep/src/com/android/launcher3/search/SearchResultWidgetPreview.java b/quickstep/src/com/android/launcher3/search/SearchResultWidgetPreview.java index 5bf19087d8..1786baf47c 100644 --- a/quickstep/src/com/android/launcher3/search/SearchResultWidgetPreview.java +++ b/quickstep/src/com/android/launcher3/search/SearchResultWidgetPreview.java @@ -47,8 +47,7 @@ import java.util.List; /** * displays preview of a widget upon receiving {@link AppWidgetProviderInfo} from Search provider */ -public class SearchResultWidgetPreview extends LinearLayout implements SearchTargetHandler, - View.OnClickListener, View.OnLongClickListener { +public class SearchResultWidgetPreview extends LinearLayout implements SearchTargetHandler { private final Launcher mLauncher; private final LauncherAppState mAppState; diff --git a/quickstep/src/com/android/launcher3/search/SearchSectionHeaderView.java b/quickstep/src/com/android/launcher3/search/SearchSectionHeaderView.java index 9276841734..d7c5c5d157 100644 --- a/quickstep/src/com/android/launcher3/search/SearchSectionHeaderView.java +++ b/quickstep/src/com/android/launcher3/search/SearchSectionHeaderView.java @@ -18,6 +18,7 @@ package com.android.launcher3.search; import android.app.search.SearchTarget; import android.content.Context; import android.util.AttributeSet; +import android.view.View; import android.widget.TextView; import androidx.annotation.Nullable; @@ -47,4 +48,15 @@ public class SearchSectionHeaderView extends TextView implements SearchTargetHan setText(parentTarget.getSearchAction().getTitle()); setVisibility(VISIBLE); } + + @Override + public void onClick(View view) { + // do nothing. + } + + @Override + public boolean onLongClick(View view) { + // do nothing. + return false; + } } diff --git a/quickstep/src/com/android/launcher3/search/SearchServicePipeline.java b/quickstep/src/com/android/launcher3/search/SearchServicePipeline.java index fac6ba7474..197aecbc28 100644 --- a/quickstep/src/com/android/launcher3/search/SearchServicePipeline.java +++ b/quickstep/src/com/android/launcher3/search/SearchServicePipeline.java @@ -15,8 +15,6 @@ */ package com.android.launcher3.search; -import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR; - import android.app.search.Query; import android.app.search.SearchContext; import android.app.search.SearchSession; @@ -41,6 +39,8 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.function.Consumer; +import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR; + /** * Search pipeline utilizing {@link android.app.search.SearchUiManager} */ diff --git a/quickstep/src/com/android/launcher3/search/SearchTargetHandler.java b/quickstep/src/com/android/launcher3/search/SearchTargetHandler.java index acf6f8a02a..0e7b8f20c9 100644 --- a/quickstep/src/com/android/launcher3/search/SearchTargetHandler.java +++ b/quickstep/src/com/android/launcher3/search/SearchTargetHandler.java @@ -19,13 +19,15 @@ package com.android.launcher3.search; import android.app.search.SearchTarget; import android.app.search.SearchTargetEvent; import android.content.Context; +import android.view.View; import java.util.List; +import java.util.function.Consumer; /** * An interface for supporting dynamic search results */ -public interface SearchTargetHandler { +public interface SearchTargetHandler extends View.OnClickListener, View.OnLongClickListener { /** * Update view using values from {@link SearchTarget} diff --git a/quickstep/src/com/android/launcher3/search/SearchTargetUtil.java b/quickstep/src/com/android/launcher3/search/SearchTargetUtil.java index c036f19f96..ceef429595 100644 --- a/quickstep/src/com/android/launcher3/search/SearchTargetUtil.java +++ b/quickstep/src/com/android/launcher3/search/SearchTargetUtil.java @@ -15,13 +15,6 @@ */ package com.android.launcher3.search; -import static com.android.app.search.LayoutType.ICON_DOUBLE_HORIZONTAL_TEXT; -import static com.android.app.search.LayoutType.ICON_SINGLE_HORIZONTAL_TEXT; -import static com.android.app.search.LayoutType.THUMBNAIL; -import static com.android.app.search.ResultType.ACTION; -import static com.android.app.search.ResultType.SCREENSHOT; -import static com.android.app.search.ResultType.SUGGEST; - import android.app.PendingIntent; import android.app.search.SearchAction; import android.app.search.SearchTarget; @@ -38,11 +31,18 @@ import android.os.UserHandle; import com.android.app.search.ResultType; +import static com.android.app.search.LayoutType.ICON_DOUBLE_HORIZONTAL_TEXT; +import static com.android.app.search.LayoutType.ICON_SINGLE_HORIZONTAL_TEXT; +import static com.android.app.search.LayoutType.THUMBNAIL; +import static com.android.app.search.ResultType.ACTION; +import static com.android.app.search.ResultType.SCREENSHOT; +import static com.android.app.search.ResultType.SUGGEST; + public class SearchTargetUtil { public static final String BUNDLE_EXTRA_SHOULD_START = "should_start"; public static final String BUNDLE_EXTRA_SHOULD_START_FOR_RESULT = "should_start_for_result"; - public static final String BUNDLE_EXTRA_BADGE_WITH_PACKAGE = "badge_with_package"; + public static final String BUNDLE_EXTRA_BADGE_FROM_ICON = "badge_from_icon"; public static final String BUNDLE_EXTRA_PRIMARY_ICON_FROM_TITLE = "primary_icon_from_title"; public static final String EXTRA_CLASS = "class"; @@ -56,10 +56,10 @@ public class SearchTargetUtil { /** * Generate SearchTargetUtil for ICON_DOUBLE_HORIZONTAL_TEXT layout type. * - * targets.add(SearchTargetUtil.generateIconDoubleHorizontalText_SearchAction( - * mContext, "red", Color.RED)); - * targets.add(SearchTargetUtil.generateIconDoubleHorizontalText_SearchAction( - * mContext, "yellow", Color.YELLOW)); + targets.add(SearchTargetUtil.generateIconDoubleHorizontalText_SearchAction( + mContext, "red", Color.RED)); + targets.add(SearchTargetUtil.generateIconDoubleHorizontalText_SearchAction( + mContext, "yellow", Color.YELLOW)); */ public static SearchTarget generateIconDoubleHorizontalText_SearchAction( Context context, String id, int color) { @@ -83,7 +83,7 @@ public class SearchTargetUtil { Bundle b = new Bundle(); b.putBoolean(BUNDLE_EXTRA_SHOULD_START_FOR_RESULT, true); - b.putBoolean(BUNDLE_EXTRA_BADGE_WITH_PACKAGE, true); + b.putBoolean(BUNDLE_EXTRA_BADGE_FROM_ICON, true); b.putBoolean(BUNDLE_EXTRA_PRIMARY_ICON_FROM_TITLE, true); builder.setSearchAction(new SearchAction.Builder(id, id + TITLE) @@ -96,7 +96,7 @@ public class SearchTargetUtil { } /** - * Inside SearchServicePipeline, add following samples to test the search target. + * Inside SearchServicePipeline, add following samples to test the search target. * * targets.add(SearchTargetUtil.generateThumbnail_SearchAction("blue", Color.BLUE)); * targets.add(SearchTargetUtil.generateThumbnail_SearchAction("red", Color.RED)); @@ -129,10 +129,11 @@ public class SearchTargetUtil { } /** + * * targets.add(SearchTargetUtil.generateIconHorizontalText_SearchAction( - * mContext, "red", Color.RED)); + * mContext, "red", Color.RED)); * targets.add(SearchTargetUtil.generateIconHorizontalText_SearchAction( - * mContext, "yellow", Color.YELLOW)); + * mContext, "yellow", Color.YELLOW)); */ public static SearchTarget generateIconHorizontalText_SearchAction( Context context, String id, int color) { diff --git a/src/com/android/launcher3/model/data/SearchActionItemInfo.java b/src/com/android/launcher3/model/data/SearchActionItemInfo.java index 8469569c25..36afe50fa1 100644 --- a/src/com/android/launcher3/model/data/SearchActionItemInfo.java +++ b/src/com/android/launcher3/model/data/SearchActionItemInfo.java @@ -30,7 +30,7 @@ public class SearchActionItemInfo extends ItemInfoWithIcon { public static final int FLAG_SHOULD_START = 1 << 1; public static final int FLAG_SHOULD_START_FOR_RESULT = FLAG_SHOULD_START | 1 << 2; - public static final int FLAG_BADGE_WITH_PACKAGE = 1 << 3; + public static final int FLAG_BADGE_FROM_ICON = 1 << 3; public static final int FLAG_PRIMARY_ICON_FROM_TITLE = 1 << 4; private final String mFallbackPackageName; diff --git a/src_plugins/com/android/systemui/plugins/shared/SearchTargetEventLegacy.java b/src_plugins/com/android/systemui/plugins/shared/SearchTargetEventLegacy.java index 0fc61f04dc..7fbd6ac814 100644 --- a/src_plugins/com/android/systemui/plugins/shared/SearchTargetEventLegacy.java +++ b/src_plugins/com/android/systemui/plugins/shared/SearchTargetEventLegacy.java @@ -20,7 +20,7 @@ import android.os.Bundle; /** * Event used for the feedback loop to the plugin. (and future aiai) * - * @deprecated Use {@link android.app.search.SearchTargetEvent} + * @deprecated Use SearchTargetEvent */ @Deprecated public class SearchTargetEventLegacy { From d683d98b34ffa75111f556f3b6950e89ba1fd13c Mon Sep 17 00:00:00 2001 From: Tony Wickham Date: Wed, 23 Dec 2020 16:12:18 -0600 Subject: [PATCH 10/11] Animate taskbar background alpha and visibility alpha Setup codepath to animate the Taskbar when going to and from Launcher, primarily by listening for pause/resume signals but also hints from gesture nav and AppToOverviewAnimationProvider. Additionally, add TaskbarStateHandler to listen for Launcher state changes if Taskbar is enabled. Combined, the end behavior is: - Background alpha is 0 when Launcher is resumed, and 1 when Launcher is paused (we can make this animation more interesting later). - Taskbar is always visible when Launcher is paused, otherwise its visibility is determined by multiple factors: LauncherState and whether the IME is showing. Bug: 171917176 Change-Id: I7856fc979931c9d12d714dee11d179fd1b5a6968 --- .../launcher3/BaseQuickstepLauncher.java | 20 +++- .../QuickstepAppTransitionManagerImpl.java | 2 +- .../launcher3/taskbar/TaskbarController.java | 97 +++++++++++++++++++ .../taskbar/TaskbarStateHandler.java | 77 +++++++++++++++ .../launcher3/taskbar/TaskbarView.java | 13 +++ .../taskbar/TaskbarVisibilityController.java | 95 ++++++++++++++++++ .../states/BackgroundAppState.java | 4 +- .../uioverrides/states/QuickSwitchState.java | 2 +- .../QuickstepAtomicAnimationFactory.java | 3 + .../android/quickstep/AbsSwipeUpHandler.java | 2 + .../AppToOverviewAnimationProvider.java | 6 ++ .../quickstep/BaseActivityInterface.java | 20 ++++ .../quickstep/LauncherActivityInterface.java | 34 +++++++ .../quickstep/TouchInteractionService.java | 8 +- .../util/StaggeredWorkspaceAnim.java | 4 +- src/com/android/launcher3/LauncherState.java | 3 +- .../launcher3/states/SpringLoadedState.java | 5 + .../states/StateAnimationConfig.java | 8 +- 18 files changed, 392 insertions(+), 11 deletions(-) create mode 100644 quickstep/src/com/android/launcher3/taskbar/TaskbarStateHandler.java create mode 100644 quickstep/src/com/android/launcher3/taskbar/TaskbarVisibilityController.java diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java index 2518f423ca..09a3cfd184 100644 --- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java +++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java @@ -45,6 +45,7 @@ import com.android.launcher3.statehandlers.DepthController; import com.android.launcher3.statemanager.StateManager.StateHandler; import com.android.launcher3.taskbar.TaskbarContainerView; import com.android.launcher3.taskbar.TaskbarController; +import com.android.launcher3.taskbar.TaskbarStateHandler; import com.android.launcher3.uioverrides.RecentsViewStateController; import com.android.launcher3.util.DisplayController; import com.android.launcher3.util.UiThreadHelper; @@ -82,6 +83,7 @@ public abstract class BaseQuickstepLauncher extends Launcher private OverviewActionsView mActionsView; private @Nullable TaskbarController mTaskbarController; + private final TaskbarStateHandler mTaskbarStateHandler = new TaskbarStateHandler(this); @Override protected void onCreate(Bundle savedInstanceState) { @@ -245,13 +247,23 @@ public abstract class BaseQuickstepLauncher extends Launcher getWorkspace(), getDepthController(), new RecentsViewStateController(this), - new BackButtonAlphaHandler(this)}; + new BackButtonAlphaHandler(this), + getTaskbarStateHandler(), + }; } public DepthController getDepthController() { return mDepthController; } + public @Nullable TaskbarController getTaskbarController() { + return mTaskbarController; + } + + public TaskbarStateHandler getTaskbarStateHandler() { + return mTaskbarStateHandler; + } + @Override public void useFadeOutAnimationForLauncherStart(CancellationSignal signal) { QuickstepAppTransitionManagerImpl appTransitionManager = @@ -296,6 +308,12 @@ public abstract class BaseQuickstepLauncher extends Launcher mDepthController.setActivityStarted(isStarted()); } + if ((changeBits & ACTIVITY_STATE_RESUMED) != 0) { + if (mTaskbarController != null) { + mTaskbarController.onLauncherResumedOrPaused(hasBeenResumed()); + } + } + super.onActivityFlagsChanged(changeBits); } diff --git a/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java b/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java index 470a4426ab..36c8bb8b99 100644 --- a/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java +++ b/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java @@ -139,7 +139,7 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans private static final int LAUNCHER_RESUME_START_DELAY = 100; private static final int CLOSING_TRANSITION_DURATION_MS = 250; - protected static final int CONTENT_ALPHA_DURATION = 217; + public static final int CONTENT_ALPHA_DURATION = 217; protected static final int CONTENT_TRANSLATION_DURATION = 350; // Progress = 0: All apps is fully pulled up, Progress = 1: All apps is fully pulled down. diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java index 7be1b9275a..bdf7f8ad08 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java @@ -22,13 +22,22 @@ import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY; import static com.android.systemui.shared.system.WindowManagerWrapper.ITYPE_BOTTOM_TAPPABLE_ELEMENT; import static com.android.systemui.shared.system.WindowManagerWrapper.ITYPE_EXTRA_NAVIGATION_BAR; +import android.animation.Animator; import android.graphics.PixelFormat; import android.graphics.Point; import android.view.Gravity; import android.view.WindowManager; +import androidx.annotation.Nullable; + import com.android.launcher3.BaseQuickstepLauncher; +import com.android.launcher3.LauncherState; +import com.android.launcher3.QuickstepAppTransitionManagerImpl; import com.android.launcher3.R; +import com.android.launcher3.anim.AlphaUpdateListener; +import com.android.launcher3.anim.PendingAnimation; +import com.android.launcher3.states.StateAnimationConfig; +import com.android.quickstep.AnimatedFloat; import com.android.systemui.shared.system.WindowManagerWrapper; /** @@ -44,7 +53,10 @@ public class TaskbarController { private final WindowManager mWindowManager; // Layout width and height of the Taskbar in the default state. private final Point mTaskbarSize; + private final TaskbarStateHandler mTaskbarStateHandler; + private final TaskbarVisibilityController mTaskbarVisibilityController; + // Initialized in init(). private WindowManager.LayoutParams mWindowLayoutParams; public TaskbarController(BaseQuickstepLauncher launcher, @@ -55,6 +67,24 @@ public class TaskbarController { mWindowManager = mLauncher.getWindowManager(); mTaskbarSize = new Point(MATCH_PARENT, mLauncher.getResources().getDimensionPixelSize(R.dimen.taskbar_size)); + mTaskbarStateHandler = mLauncher.getTaskbarStateHandler(); + mTaskbarVisibilityController = new TaskbarVisibilityController(mLauncher, + createTaskbarVisibilityControllerCallbacks()); + } + + private TaskbarVisibilityControllerCallbacks createTaskbarVisibilityControllerCallbacks() { + return new TaskbarVisibilityControllerCallbacks() { + @Override + public void updateTaskbarBackgroundAlpha(float alpha) { + mTaskbarView.setBackgroundAlpha(alpha); + } + + @Override + public void updateTaskbarVisibilityAlpha(float alpha) { + mTaskbarContainerView.setAlpha(alpha); + AlphaUpdateListener.updateVisibility(mTaskbarContainerView); + } + }; } /** @@ -62,6 +92,17 @@ public class TaskbarController { */ public void init() { addToWindowManager(); + mTaskbarStateHandler.setTaskbarCallbacks(createTaskbarStateHandlerCallbacks()); + mTaskbarVisibilityController.init(); + } + + private TaskbarStateHandlerCallbacks createTaskbarStateHandlerCallbacks() { + return new TaskbarStateHandlerCallbacks() { + @Override + public AnimatedFloat getAlphaTarget() { + return mTaskbarVisibilityController.getTaskbarVisibilityForLauncherState(); + } + }; } /** @@ -69,6 +110,8 @@ public class TaskbarController { */ public void cleanup() { removeFromWindowManager(); + mTaskbarStateHandler.setTaskbarCallbacks(null); + mTaskbarVisibilityController.cleanup(); } private void removeFromWindowManager() { @@ -108,4 +151,58 @@ public class TaskbarController { mWindowManager.addView(mTaskbarContainerView, mWindowLayoutParams); } + + /** + * Should be called from onResume() and onPause(), and animates the Taskbar accordingly. + */ + public void onLauncherResumedOrPaused(boolean isResumed) { + long duration = QuickstepAppTransitionManagerImpl.CONTENT_ALPHA_DURATION; + final Animator anim; + if (isResumed) { + anim = createAnimToLauncher(null, duration); + } else { + anim = createAnimToApp(duration); + } + anim.start(); + } + + /** + * Create Taskbar animation when going from an app to Launcher. + * @param toState If known, the state we will end up in when reaching Launcher. + */ + public Animator createAnimToLauncher(@Nullable LauncherState toState, long duration) { + PendingAnimation anim = new PendingAnimation(duration); + anim.add(mTaskbarVisibilityController.createAnimToBackgroundAlpha(0, duration)); + if (toState != null) { + mTaskbarStateHandler.setStateWithAnimation(toState, new StateAnimationConfig(), anim); + } + return anim.buildAnim(); + } + + private Animator createAnimToApp(long duration) { + return mTaskbarVisibilityController.createAnimToBackgroundAlpha(1, duration); + } + + /** + * Should be called when the IME visibility changes, so we can hide/show Taskbar accordingly. + */ + public void setIsImeVisible(boolean isImeVisible) { + mTaskbarVisibilityController.animateToVisibilityForIme(isImeVisible ? 0 : 1); + } + + /** + * Contains methods that TaskbarStateHandler can call to interface with TaskbarController. + */ + protected interface TaskbarStateHandlerCallbacks { + AnimatedFloat getAlphaTarget(); + } + + /** + * Contains methods that TaskbarVisibilityController can call to interface with + * TaskbarController. + */ + protected interface TaskbarVisibilityControllerCallbacks { + void updateTaskbarBackgroundAlpha(float alpha); + void updateTaskbarVisibilityAlpha(float alpha); + } } diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarStateHandler.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarStateHandler.java new file mode 100644 index 0000000000..b4b5d8b3fe --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarStateHandler.java @@ -0,0 +1,77 @@ +/* + * Copyright (C) 2021 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.taskbar; + +import static com.android.launcher3.LauncherState.TASKBAR; +import static com.android.launcher3.states.StateAnimationConfig.ANIM_TASKBAR_FADE; +import static com.android.launcher3.states.StateAnimationConfig.SKIP_TASKBAR; + +import androidx.annotation.Nullable; + +import com.android.launcher3.BaseQuickstepLauncher; +import com.android.launcher3.LauncherState; +import com.android.launcher3.anim.Interpolators; +import com.android.launcher3.anim.PendingAnimation; +import com.android.launcher3.statemanager.StateManager; +import com.android.launcher3.states.StateAnimationConfig; +import com.android.quickstep.AnimatedFloat; + +/** + * StateHandler to animate Taskbar according to Launcher's state machine. Does nothing if Taskbar + * isn't present (i.e. {@link #setTaskbarCallbacks} is never called). + */ +public class TaskbarStateHandler implements StateManager.StateHandler { + + private final BaseQuickstepLauncher mLauncher; + + // Contains Taskbar-related methods and fields we should aniamte. If null, don't do anything. + private @Nullable TaskbarController.TaskbarStateHandlerCallbacks mTaskbarCallbacks = null; + + public TaskbarStateHandler(BaseQuickstepLauncher launcher) { + mLauncher = launcher; + } + + public void setTaskbarCallbacks(TaskbarController.TaskbarStateHandlerCallbacks callbacks) { + mTaskbarCallbacks = callbacks; + } + + @Override + public void setState(LauncherState state) { + if (mTaskbarCallbacks == null) { + return; + } + + AnimatedFloat alphaTarget = mTaskbarCallbacks.getAlphaTarget(); + boolean isTaskbarVisible = (state.getVisibleElements(mLauncher) & TASKBAR) != 0; + alphaTarget.updateValue(isTaskbarVisible ? 1f : 0f); + } + + @Override + public void setStateWithAnimation(LauncherState toState, StateAnimationConfig config, + PendingAnimation animation) { + if (mTaskbarCallbacks == null) { + return; + } + if (config.hasAnimationFlag(SKIP_TASKBAR)) { + return; + } + + AnimatedFloat alphaTarget = mTaskbarCallbacks.getAlphaTarget(); + boolean isTaskbarVisible = (toState.getVisibleElements(mLauncher) & TASKBAR) != 0; + animation.setFloat(alphaTarget, AnimatedFloat.VALUE, isTaskbarVisible ? 1f : 0f, + config.getInterpolator(ANIM_TASKBAR_FADE, Interpolators.LINEAR)); + } +} diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java index 5df8d5f9cc..bf6e946f0d 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java @@ -16,6 +16,7 @@ package com.android.launcher3.taskbar; import android.content.Context; +import android.graphics.drawable.ColorDrawable; import android.util.AttributeSet; import android.widget.LinearLayout; @@ -26,6 +27,9 @@ import androidx.annotation.Nullable; * Hosts the Taskbar content such as Hotseat and Recent Apps. Drawn on top of other apps. */ public class TaskbarView extends LinearLayout { + + private final ColorDrawable mBackgroundDrawable; + public TaskbarView(@NonNull Context context) { this(context, null); } @@ -42,5 +46,14 @@ public class TaskbarView extends LinearLayout { public TaskbarView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr, int defStyleRes) { super(context, attrs, defStyleAttr, defStyleRes); + mBackgroundDrawable = (ColorDrawable) getBackground(); + } + + /** + * Sets the alpha of the background color behind all the Taskbar contents. + * @param alpha 0 is fully transparent, 1 is fully opaque. + */ + public void setBackgroundAlpha(float alpha) { + mBackgroundDrawable.setAlpha((int) (alpha * 255)); } } diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarVisibilityController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarVisibilityController.java new file mode 100644 index 0000000000..4cf55d8771 --- /dev/null +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarVisibilityController.java @@ -0,0 +1,95 @@ +/* + * Copyright (C) 2021 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.taskbar; + +import static com.android.launcher3.LauncherState.TASKBAR; + +import android.animation.Animator; + +import com.android.launcher3.BaseQuickstepLauncher; +import com.android.quickstep.AnimatedFloat; +import com.android.quickstep.SystemUiProxy; +import com.android.systemui.shared.system.QuickStepContract; + +/** + * Works with TaskbarController to update the TaskbarView's alpha based on LauncherState, whether + * Launcher is in the foreground, etc. + */ +public class TaskbarVisibilityController { + + private static final long IME_VISIBILITY_ALPHA_DURATION = 120; + + private final BaseQuickstepLauncher mLauncher; + private final TaskbarController.TaskbarVisibilityControllerCallbacks mTaskbarCallbacks; + + // Background alpha. + private AnimatedFloat mTaskbarBackgroundAlpha = new AnimatedFloat( + this::onTaskbarBackgroundAlphaChanged); + + // Overall visibility. + private AnimatedFloat mTaskbarVisibilityAlphaForLauncherState = new AnimatedFloat( + this::updateVisibilityAlpha); + private AnimatedFloat mTaskbarVisibilityAlphaForIme = new AnimatedFloat( + this::updateVisibilityAlpha); + + public TaskbarVisibilityController(BaseQuickstepLauncher launcher, + TaskbarController.TaskbarVisibilityControllerCallbacks taskbarCallbacks) { + mLauncher = launcher; + mTaskbarCallbacks = taskbarCallbacks; + } + + protected void init() { + mTaskbarBackgroundAlpha.updateValue(mLauncher.hasBeenResumed() ? 0f : 1f); + boolean isVisibleForLauncherState = (mLauncher.getStateManager().getState() + .getVisibleElements(mLauncher) & TASKBAR) != 0; + mTaskbarVisibilityAlphaForLauncherState.updateValue(isVisibleForLauncherState ? 1f : 0f); + boolean isImeVisible = (SystemUiProxy.INSTANCE.get(mLauncher).getLastSystemUiStateFlags() + & QuickStepContract.SYSUI_STATE_IME_SHOWING) != 0; + mTaskbarVisibilityAlphaForIme.updateValue(isImeVisible ? 0f : 1f); + } + + protected void cleanup() { + } + + protected AnimatedFloat getTaskbarVisibilityForLauncherState() { + return mTaskbarVisibilityAlphaForLauncherState; + } + + protected Animator createAnimToBackgroundAlpha(float toAlpha, long duration) { + return mTaskbarBackgroundAlpha.animateToValue(mTaskbarBackgroundAlpha.value, toAlpha) + .setDuration(duration); + } + + protected void animateToVisibilityForIme(float toAlpha) { + mTaskbarVisibilityAlphaForIme.animateToValue(mTaskbarVisibilityAlphaForIme.value, toAlpha) + .setDuration(IME_VISIBILITY_ALPHA_DURATION).start(); + } + + private void onTaskbarBackgroundAlphaChanged() { + mTaskbarCallbacks.updateTaskbarBackgroundAlpha(mTaskbarBackgroundAlpha.value); + updateVisibilityAlpha(); + } + + private void updateVisibilityAlpha() { + // We use mTaskbarBackgroundAlpha as a proxy for whether Launcher is resumed/paused, the + // assumption being that Taskbar should always be visible regardless of the current + // LauncherState if Launcher is paused. + float alphaDueToLauncher = Math.max(mTaskbarBackgroundAlpha.value, + mTaskbarVisibilityAlphaForLauncherState.value); + float alphaDueToOther = mTaskbarVisibilityAlphaForIme.value; + mTaskbarCallbacks.updateTaskbarVisibilityAlpha(alphaDueToLauncher * alphaDueToOther); + } +} diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java b/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java index 4b4f955204..2cf65af3ed 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java +++ b/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java @@ -69,7 +69,9 @@ public class BackgroundAppState extends OverviewState { @Override public int getVisibleElements(Launcher launcher) { return super.getVisibleElements(launcher) - & ~OVERVIEW_BUTTONS & ~VERTICAL_SWIPE_INDICATOR; + & ~OVERVIEW_BUTTONS + & ~VERTICAL_SWIPE_INDICATOR + | TASKBAR; } @Override diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/QuickSwitchState.java b/quickstep/src/com/android/launcher3/uioverrides/states/QuickSwitchState.java index 51e72dacdc..965f474b51 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/states/QuickSwitchState.java +++ b/quickstep/src/com/android/launcher3/uioverrides/states/QuickSwitchState.java @@ -40,6 +40,6 @@ public class QuickSwitchState extends BackgroundAppState { @Override public int getVisibleElements(Launcher launcher) { - return NONE; + return TASKBAR; } } diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java b/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java index efb91c6905..69b8aca3ef 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java +++ b/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java @@ -36,6 +36,7 @@ import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_FA import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_SCALE; import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TRANSLATE_X; import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TRANSLATE_Y; +import static com.android.launcher3.states.StateAnimationConfig.ANIM_TASKBAR_FADE; import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_FADE; import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_SCALE; import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_TRANSLATE; @@ -80,6 +81,7 @@ public class QuickstepAtomicAnimationFactory extends if (toState == NORMAL && fromState == OVERVIEW) { config.setInterpolator(ANIM_WORKSPACE_SCALE, DEACCEL); config.setInterpolator(ANIM_WORKSPACE_FADE, ACCEL); + config.setInterpolator(ANIM_TASKBAR_FADE, ACCEL); config.setInterpolator(ANIM_ALL_APPS_FADE, ACCEL); config.setInterpolator(ANIM_OVERVIEW_SCALE, clampToProgress(ACCEL, 0, 0.9f)); config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X, ACCEL_DEACCEL); @@ -138,6 +140,7 @@ public class QuickstepAtomicAnimationFactory extends config.setInterpolator(ANIM_DEPTH, OVERSHOOT_1_2); config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X, OVERSHOOT_1_2); config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_Y, OVERSHOOT_1_2); + config.setInterpolator(ANIM_TASKBAR_FADE, OVERSHOOT_1_2); } else if (fromState == HINT_STATE && toState == NORMAL) { config.setInterpolator(ANIM_DEPTH, DEACCEL_3); if (mHintToNormalDuration == -1) { diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java index 39a3a7c40c..6bcc4bfdce 100644 --- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java +++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java @@ -1062,6 +1062,8 @@ public abstract class AbsSwipeUpHandler, Q extends if (mGestureState.getEndTarget().isLauncher) { ActivityManagerWrapper.getInstance().registerTaskStackListener( mActivityRestartListener); + + mActivityInterface.onAnimateToLauncher(mGestureState.getEndTarget(), duration); } if (mGestureState.getEndTarget() == HOME) { diff --git a/quickstep/src/com/android/quickstep/AppToOverviewAnimationProvider.java b/quickstep/src/com/android/quickstep/AppToOverviewAnimationProvider.java index efd4530c14..d159fa0904 100644 --- a/quickstep/src/com/android/quickstep/AppToOverviewAnimationProvider.java +++ b/quickstep/src/com/android/quickstep/AppToOverviewAnimationProvider.java @@ -33,6 +33,7 @@ import com.android.launcher3.anim.AnimationSuccessListener; import com.android.launcher3.anim.PendingAnimation; import com.android.launcher3.statehandlers.DepthController; import com.android.launcher3.statemanager.StatefulActivity; +import com.android.launcher3.taskbar.TaskbarController; import com.android.quickstep.util.RemoteAnimationProvider; import com.android.quickstep.util.SurfaceTransactionApplier; import com.android.quickstep.util.TaskViewSimulator; @@ -119,6 +120,11 @@ final class AppToOverviewAnimationProvider> extend OVERVIEW.getDepth(mActivity), TOUCH_RESPONSE_INTERPOLATOR); } + TaskbarController taskbarController = mActivityInterface.getTaskbarController(); + if (taskbarController != null) { + pa.add(taskbarController.createAnimToLauncher(OVERVIEW, getRecentsLaunchDuration())); + } + RemoteAnimationTargets targets = new RemoteAnimationTargets(appTargets, wallpaperTargets, MODE_CLOSING); diff --git a/quickstep/src/com/android/quickstep/BaseActivityInterface.java b/quickstep/src/com/android/quickstep/BaseActivityInterface.java index 5bed929fb4..5f6e59fa11 100644 --- a/quickstep/src/com/android/quickstep/BaseActivityInterface.java +++ b/quickstep/src/com/android/quickstep/BaseActivityInterface.java @@ -45,6 +45,7 @@ import com.android.launcher3.anim.PendingAnimation; import com.android.launcher3.statehandlers.DepthController; import com.android.launcher3.statemanager.BaseState; import com.android.launcher3.statemanager.StatefulActivity; +import com.android.launcher3.taskbar.TaskbarController; import com.android.launcher3.touch.PagedOrientationHandler; import com.android.launcher3.util.WindowBounds; import com.android.quickstep.SysUINavigationMode.Mode; @@ -121,6 +122,11 @@ public abstract class BaseActivityInterface { public static final int ALL_APPS_CONTENT = 1 << 4; public static final int VERTICAL_SWIPE_INDICATOR = 1 << 5; public static final int OVERVIEW_BUTTONS = 1 << 6; + public static final int TASKBAR = 1 << 7; /** Mask of all the items that are contained in the apps view. */ public static final int APPS_VIEW_ITEM_MASK = @@ -186,7 +187,7 @@ public abstract class LauncherState implements BaseState { } public int getVisibleElements(Launcher launcher) { - int flags = HOTSEAT_ICONS | VERTICAL_SWIPE_INDICATOR; + int flags = HOTSEAT_ICONS | VERTICAL_SWIPE_INDICATOR | TASKBAR; if (!FeatureFlags.ENABLE_DEVICE_SEARCH.get() && !launcher.getDeviceProfile().isVerticalBarLayout()) { flags |= HOTSEAT_SEARCH_BOX; diff --git a/src/com/android/launcher3/states/SpringLoadedState.java b/src/com/android/launcher3/states/SpringLoadedState.java index 45172b56ef..44bcc34588 100644 --- a/src/com/android/launcher3/states/SpringLoadedState.java +++ b/src/com/android/launcher3/states/SpringLoadedState.java @@ -90,4 +90,9 @@ public class SpringLoadedState extends LauncherState { public float getWorkspaceScrimAlpha(Launcher launcher) { return 0.3f; } + + @Override + public int getVisibleElements(Launcher launcher) { + return super.getVisibleElements(launcher) & ~TASKBAR; + } } diff --git a/src/com/android/launcher3/states/StateAnimationConfig.java b/src/com/android/launcher3/states/StateAnimationConfig.java index 8b7217709f..ec949ebffd 100644 --- a/src/com/android/launcher3/states/StateAnimationConfig.java +++ b/src/com/android/launcher3/states/StateAnimationConfig.java @@ -37,7 +37,8 @@ public class StateAnimationConfig { PLAY_ATOMIC_OVERVIEW_SCALE, PLAY_ATOMIC_OVERVIEW_PEEK, SKIP_OVERVIEW, - SKIP_DEPTH_CONTROLLER + SKIP_DEPTH_CONTROLLER, + SKIP_TASKBAR, }) @Retention(RetentionPolicy.SOURCE) public @interface AnimationFlags {} @@ -46,6 +47,7 @@ public class StateAnimationConfig { public static final int PLAY_ATOMIC_OVERVIEW_PEEK = 1 << 2; public static final int SKIP_OVERVIEW = 1 << 3; public static final int SKIP_DEPTH_CONTROLLER = 1 << 4; + public static final int SKIP_TASKBAR = 1 << 5; public long duration; public boolean userControlled; @@ -72,6 +74,7 @@ public class StateAnimationConfig { ANIM_OVERVIEW_MODAL, ANIM_DEPTH, ANIM_OVERVIEW_ACTIONS_FADE, + ANIM_TASKBAR_FADE, }) @Retention(RetentionPolicy.SOURCE) public @interface AnimType {} @@ -91,8 +94,9 @@ public class StateAnimationConfig { public static final int ANIM_OVERVIEW_MODAL = 13; public static final int ANIM_DEPTH = 14; public static final int ANIM_OVERVIEW_ACTIONS_FADE = 15; + public static final int ANIM_TASKBAR_FADE = 16; - private static final int ANIM_TYPES_COUNT = 16; + private static final int ANIM_TYPES_COUNT = 17; protected final Interpolator[] mInterpolators = new Interpolator[ANIM_TYPES_COUNT]; From 1ab83de48eb6b5ccc1a2487f7178aba135c0ddc9 Mon Sep 17 00:00:00 2001 From: Samuel Fufa Date: Thu, 28 Jan 2021 05:52:25 -0600 Subject: [PATCH 11/11] Support people search results + Introduce temporary workaround icon loading with URLConnection for play results Manual: go/search-action-icon Bug: 177223401 Test: Manual Change-Id: I3b597faaad38e8cd1419065b80b359720baf52b0 --- .../res/layout/search_result_icon_row.xml | 19 +- .../res/layout/search_result_people_item.xml | 63 ------ .../search/DeviceSearchAdapterProvider.java | 3 +- .../launcher3/search/SearchAdapterItem.java | 8 +- .../launcher3/search/SearchResultIcon.java | 131 ++++++++---- .../launcher3/search/SearchResultIconRow.java | 24 +-- .../search/SearchResultIconSlice.java | 12 -- .../search/SearchResultPeopleView.java | 199 ------------------ .../search/SearchResultThumbnailView.java | 11 +- .../launcher3/search/SearchResultWidget.java | 4 - .../search/SearchResultWidgetPreview.java | 3 +- .../search/SearchSectionHeaderView.java | 12 -- .../search/SearchServicePipeline.java | 4 +- .../launcher3/search/SearchTargetHandler.java | 4 +- .../launcher3/search/SearchTargetUtil.java | 33 ++- .../model/data/SearchActionItemInfo.java | 2 +- .../shared/SearchTargetEventLegacy.java | 2 +- 17 files changed, 144 insertions(+), 390 deletions(-) delete mode 100644 quickstep/res/layout/search_result_people_item.xml delete mode 100644 quickstep/src/com/android/launcher3/search/SearchResultPeopleView.java diff --git a/quickstep/res/layout/search_result_icon_row.xml b/quickstep/res/layout/search_result_icon_row.xml index 2119fc3425..81190cfc56 100644 --- a/quickstep/res/layout/search_result_icon_row.xml +++ b/quickstep/res/layout/search_result_icon_row.xml @@ -57,9 +57,10 @@ style="@style/BaseIcon" android:layout_width="@dimen/deep_shortcut_icon_size" android:layout_height="match_parent" - android:gravity="start|center_vertical" + android:layout_marginStart="4dp" + android:gravity="center" launcher:iconDisplay="shortcut_popup" - android:textSize="@dimen/search_hero_subtitle_size" + android:textSize="@dimen/search_hero_inline_button_size" launcher:iconSizeOverride="@dimen/deep_shortcut_icon_size" launcher:layoutHorizontal="false" /> @@ -68,6 +69,20 @@ style="@style/BaseIcon" android:layout_width="@dimen/deep_shortcut_icon_size" android:layout_height="match_parent" + android:layout_marginStart="4dp" + android:gravity="center" + launcher:iconDisplay="shortcut_popup" + android:textSize="@dimen/search_hero_inline_button_size" + launcher:iconSizeOverride="@dimen/deep_shortcut_icon_size" + launcher:layoutHorizontal="false" /> + + - - - - - - - - - - - - - \ 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 02be0b94ed..acf6c150cf 100644 --- a/quickstep/src/com/android/launcher3/search/DeviceSearchAdapterProvider.java +++ b/quickstep/src/com/android/launcher3/search/DeviceSearchAdapterProvider.java @@ -41,7 +41,6 @@ public class DeviceSearchAdapterProvider extends SearchAdapterProvider { public static final int VIEW_TYPE_SEARCH_SLICE = 1 << 7; public static final int VIEW_TYPE_SEARCH_ICON = (1 << 8) | VIEW_TYPE_ICON; public static final int VIEW_TYPE_SEARCH_ICON_ROW = (1 << 9); - public static final int VIEW_TYPE_SEARCH_PEOPLE = 1 << 11; public static final int VIEW_TYPE_SEARCH_THUMBNAIL = 1 << 12; public static final int VIEW_TYPE_SEARCH_WIDGET_LIVE = 1 << 15; public static final int VIEW_TYPE_SEARCH_WIDGET_PREVIEW = 1 << 16; @@ -59,7 +58,6 @@ public class DeviceSearchAdapterProvider extends SearchAdapterProvider { mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_ICON, R.layout.search_result_icon); mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_ICON_ROW, R.layout.search_result_icon_row); mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_SLICE, R.layout.search_result_slice); - mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_PEOPLE, R.layout.search_result_people_item); mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_THUMBNAIL, R.layout.search_result_thumbnail); mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_WIDGET_LIVE, R.layout.search_result_widget_live); mViewTypeToLayoutMap.put(VIEW_TYPE_SEARCH_WIDGET_PREVIEW, @@ -125,6 +123,7 @@ public class DeviceSearchAdapterProvider extends SearchAdapterProvider { break; case LayoutType.ICON_DOUBLE_HORIZONTAL_TEXT: case LayoutType.ICON_SINGLE_HORIZONTAL_TEXT: + case LayoutType.ICON_DOUBLE_HORIZONTAL_TEXT_BUTTON: return VIEW_TYPE_SEARCH_ICON_ROW; case LayoutType.THUMBNAIL: if (t.getSearchAction() != null) { diff --git a/quickstep/src/com/android/launcher3/search/SearchAdapterItem.java b/quickstep/src/com/android/launcher3/search/SearchAdapterItem.java index 0eb3edb555..b402f61979 100644 --- a/quickstep/src/com/android/launcher3/search/SearchAdapterItem.java +++ b/quickstep/src/com/android/launcher3/search/SearchAdapterItem.java @@ -18,7 +18,6 @@ package com.android.launcher3.search; import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_ICON; import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_ICON_ROW; -import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_PEOPLE; import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_SLICE; import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_THUMBNAIL; import static com.android.launcher3.search.DeviceSearchAdapterProvider.VIEW_TYPE_SEARCH_WIDGET_LIVE; @@ -42,9 +41,10 @@ public class SearchAdapterItem extends AllAppsGridAdapter.AdapterItem { private static final int AVAILABLE_FOR_ACCESSIBILITY = - VIEW_TYPE_SEARCH_SLICE | VIEW_TYPE_SEARCH_PEOPLE | VIEW_TYPE_SEARCH_THUMBNAIL - | VIEW_TYPE_SEARCH_ICON_ROW | VIEW_TYPE_SEARCH_ICON - | VIEW_TYPE_SEARCH_WIDGET_PREVIEW | VIEW_TYPE_SEARCH_WIDGET_LIVE; + VIEW_TYPE_SEARCH_SLICE | VIEW_TYPE_SEARCH_THUMBNAIL | VIEW_TYPE_SEARCH_ICON_ROW + | VIEW_TYPE_SEARCH_ICON | VIEW_TYPE_SEARCH_WIDGET_PREVIEW + | VIEW_TYPE_SEARCH_WIDGET_LIVE; + public SearchAdapterItem(SearchTargetLegacy searchTargetLegacy, int type) { mSearchTargetLegacy = searchTargetLegacy; diff --git a/quickstep/src/com/android/launcher3/search/SearchResultIcon.java b/quickstep/src/com/android/launcher3/search/SearchResultIcon.java index 3d89ac5e27..c353d7aa3c 100644 --- a/quickstep/src/com/android/launcher3/search/SearchResultIcon.java +++ b/quickstep/src/com/android/launcher3/search/SearchResultIcon.java @@ -15,12 +15,9 @@ */ package com.android.launcher3.search; -import static com.android.launcher3.model.data.SearchActionItemInfo.FLAG_BADGE_FROM_ICON; +import static com.android.launcher3.model.data.SearchActionItemInfo.FLAG_BADGE_WITH_PACKAGE; import static com.android.launcher3.model.data.SearchActionItemInfo.FLAG_PRIMARY_ICON_FROM_TITLE; -import static com.android.launcher3.search.SearchTargetUtil.BUNDLE_EXTRA_BADGE_FROM_ICON; import static com.android.launcher3.search.SearchTargetUtil.BUNDLE_EXTRA_PRIMARY_ICON_FROM_TITLE; -import static com.android.launcher3.search.SearchTargetUtil.BUNDLE_EXTRA_SHOULD_START; -import static com.android.launcher3.search.SearchTargetUtil.BUNDLE_EXTRA_SHOULD_START_FOR_RESULT; import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; import static com.android.launcher3.util.Executors.MODEL_EXECUTOR; @@ -30,9 +27,14 @@ import android.app.search.SearchTargetEvent; import android.content.ComponentName; import android.content.Context; import android.content.pm.ShortcutInfo; -import android.graphics.drawable.Drawable; +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; +import android.graphics.Paint; +import android.graphics.PorterDuff; +import android.graphics.PorterDuffXfermode; +import android.graphics.Rect; +import android.graphics.RectF; import android.graphics.drawable.Icon; -import android.os.Build; import android.os.Bundle; import android.os.UserHandle; import android.util.AttributeSet; @@ -45,6 +47,7 @@ import com.android.launcher3.Launcher; import com.android.launcher3.LauncherAppState; import com.android.launcher3.allapps.AllAppsStore; import com.android.launcher3.icons.BitmapInfo; +import com.android.launcher3.icons.BitmapRenderer; import com.android.launcher3.icons.LauncherIcons; import com.android.launcher3.model.data.AppInfo; import com.android.launcher3.model.data.ItemInfoWithIcon; @@ -54,14 +57,25 @@ import com.android.launcher3.model.data.WorkspaceItemInfo; import com.android.launcher3.touch.ItemClickHandler; import com.android.launcher3.touch.ItemLongClickListener; import com.android.launcher3.util.ComponentKey; +import com.android.launcher3.util.Themes; +import java.io.IOException; +import java.net.URL; +import java.net.URLConnection; import java.util.List; import java.util.function.Consumer; /** * A {@link BubbleTextView} representing a single cell result in AllApps */ -public class SearchResultIcon extends BubbleTextView implements SearchTargetHandler { +public class SearchResultIcon extends BubbleTextView implements + SearchTargetHandler, View.OnClickListener, + View.OnLongClickListener { + + //Play store thumbnail process workaround + private final Rect mTempRect = new Rect(); + private final Paint mIconPaint = new Paint(); + private static final int BITMAP_CROP_MASK_COLOR = 0xff424242; private final Launcher mLauncher; @@ -99,7 +113,7 @@ public class SearchResultIcon extends BubbleTextView implements SearchTargetHand * Applies {@link SearchTarget} to view. registers a consumer after a corresponding * {@link ItemInfoWithIcon} is created */ - public void applySearchTarget(SearchTarget searchTarget, List inlineItems, + public void apply(SearchTarget searchTarget, List inlineItems, Consumer cb) { mOnItemInfoChanged = cb; apply(searchTarget, inlineItems); @@ -115,8 +129,8 @@ public class SearchResultIcon extends BubbleTextView implements SearchTargetHand prepareUsingSearchAction(parentTarget); mLongPressSupported = false; } else { - prepareUsingApp(new ComponentName(parentTarget.getPackageName(), - parentTarget.getExtras().getString(SearchTargetUtil.EXTRA_CLASS)), + String className = parentTarget.getExtras().getString(SearchTargetUtil.EXTRA_CLASS); + prepareUsingApp(new ComponentName(parentTarget.getPackageName(), className), parentTarget.getUserHandle()); mLongPressSupported = true; } @@ -136,14 +150,17 @@ public class SearchResultIcon extends BubbleTextView implements SearchTargetHand //TODO: remove this after flags are introduced in SearchAction. Settings results require // startActivityForResult boolean isSettingsResult = searchTarget.getResultType() == ResultType.SETTING; - if ((extras != null && extras.getBoolean(BUNDLE_EXTRA_SHOULD_START_FOR_RESULT)) + if ((extras != null && extras.getBoolean( + SearchTargetUtil.BUNDLE_EXTRA_SHOULD_START_FOR_RESULT)) || isSettingsResult) { itemInfo.setFlags(SearchActionItemInfo.FLAG_SHOULD_START_FOR_RESULT); - } else if (extras != null && extras.getBoolean(BUNDLE_EXTRA_SHOULD_START)) { + } else if (extras != null && extras.getBoolean( + SearchTargetUtil.BUNDLE_EXTRA_SHOULD_START)) { itemInfo.setFlags(SearchActionItemInfo.FLAG_SHOULD_START); } - if (extras != null && extras.getBoolean(BUNDLE_EXTRA_BADGE_FROM_ICON)) { - itemInfo.setFlags(FLAG_BADGE_FROM_ICON); + if (extras != null && extras.getBoolean( + SearchTargetUtil.BUNDLE_EXTRA_BADGE_WITH_PACKAGE)) { + itemInfo.setFlags(FLAG_BADGE_WITH_PACKAGE); } if (extras != null && extras.getBoolean(BUNDLE_EXTRA_PRIMARY_ICON_FROM_TITLE)) { itemInfo.setFlags(FLAG_PRIMARY_ICON_FROM_TITLE); @@ -154,39 +171,76 @@ public class SearchResultIcon extends BubbleTextView implements SearchTargetHand MODEL_EXECUTOR.post(() -> { try (LauncherIcons li = LauncherIcons.obtain(getContext())) { Icon icon = searchTarget.getSearchAction().getIcon(); - Drawable d; - // This bitmapInfo can be used as main icon or as a badge - BitmapInfo bitmapInfo; - if (icon == null) { - PackageItemInfo pkgInfo = new PackageItemInfo(searchTarget.getPackageName()); - pkgInfo.user = searchTarget.getUserHandle(); - appState.getIconCache().getTitleAndIconForApp(pkgInfo, false); - bitmapInfo = pkgInfo.bitmap; - } else { - d = itemInfo.getIcon().loadDrawable(getContext()); - bitmapInfo = li.createBadgedIconBitmap(d, itemInfo.user, - Build.VERSION.SDK_INT); - } - - BitmapInfo bitmapMainIcon; + BitmapInfo pkgBitmap = getPackageBitmap(appState, searchTarget); if (itemInfo.hasFlags(FLAG_PRIMARY_ICON_FROM_TITLE)) { - bitmapMainIcon = li.createIconBitmap( - String.valueOf(itemInfo.title.charAt(0)), - bitmapInfo.color); + // create a bitmap with first char if FLAG_PRIMARY_ICON_FROM_TITLE is set + itemInfo.bitmap = li.createIconBitmap(String.valueOf(itemInfo.title.charAt(0)), + pkgBitmap.color); + } else if (icon == null) { + // Use default icon from package name + itemInfo.bitmap = pkgBitmap; } else { - bitmapMainIcon = bitmapInfo; - } - if (itemInfo.hasFlags(FLAG_BADGE_FROM_ICON)) { - itemInfo.bitmap = li.badgeBitmap(bitmapMainIcon.icon, bitmapInfo); - } else { - itemInfo.bitmap = bitmapInfo; + boolean isPlayResult = searchTarget.getResultType() == ResultType.PLAY; + if (isPlayResult) { + Bitmap b = getPlayResultBitmap(searchAction.getIcon()); + itemInfo.bitmap = b == null + ? BitmapInfo.LOW_RES_INFO : BitmapInfo.fromBitmap(b); + } else { + itemInfo.bitmap = li.createBadgedIconBitmap(icon.loadDrawable(getContext()), + itemInfo.user, false); + } } + // badge with package name + if (itemInfo.hasFlags(FLAG_BADGE_WITH_PACKAGE) && itemInfo.bitmap != pkgBitmap) { + itemInfo.bitmap = li.badgeBitmap(itemInfo.bitmap.icon, pkgBitmap); + } } MAIN_EXECUTOR.post(() -> applyFromSearchActionItemInfo(itemInfo)); }); } + private static BitmapInfo getPackageBitmap(LauncherAppState appState, SearchTarget target) { + PackageItemInfo pkgInfo = new PackageItemInfo(target.getPackageName()); + pkgInfo.user = target.getUserHandle(); + appState.getIconCache().getTitleAndIconForApp(pkgInfo, false); + return pkgInfo.bitmap; + } + + private Bitmap getPlayResultBitmap(Icon icon) { + try { + int iconSize = getIconSize(); + URL url = new URL(icon.getUri().toString()); + URLConnection con = url.openConnection(); + con.addRequestProperty("Cache-Control", "max-age: 0"); + con.setUseCaches(true); + Bitmap bitmap = BitmapFactory.decodeStream(con.getInputStream()); + return getRoundedBitmap(Bitmap.createScaledBitmap(bitmap, iconSize, iconSize, false)); + } catch (IOException e) { + e.printStackTrace(); + } + return null; + } + + private Bitmap getRoundedBitmap(Bitmap bitmap) { + final int iconSize = bitmap.getWidth(); + final float radius = Themes.getDialogCornerRadius(getContext()); + + return BitmapRenderer.createHardwareBitmap(iconSize, iconSize, (canvas) -> { + mTempRect.set(0, 0, iconSize, iconSize); + final RectF rectF = new RectF(mTempRect); + + mIconPaint.setAntiAlias(true); + mIconPaint.reset(); + canvas.drawARGB(0, 0, 0, 0); + mIconPaint.setColor(BITMAP_CROP_MASK_COLOR); + canvas.drawRoundRect(rectF, radius, radius, mIconPaint); + + mIconPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_IN)); + canvas.drawBitmap(bitmap, mTempRect, mTempRect, mIconPaint); + }); + } + private void prepareUsingApp(ComponentName componentName, UserHandle userHandle) { AllAppsStore appsStore = mLauncher.getAppsView().getAppsStore(); AppInfo appInfo = appsStore.getApp(new ComponentKey(componentName, userHandle)); @@ -233,7 +287,6 @@ public class SearchResultIcon extends BubbleTextView implements SearchTargetHand } - private void notifyItemInfoChanged(ItemInfoWithIcon itemInfoWithIcon) { if (mOnItemInfoChanged != null) { mOnItemInfoChanged.accept(itemInfoWithIcon); diff --git a/quickstep/src/com/android/launcher3/search/SearchResultIconRow.java b/quickstep/src/com/android/launcher3/search/SearchResultIconRow.java index eafbc73f11..7c3ed69a00 100644 --- a/quickstep/src/com/android/launcher3/search/SearchResultIconRow.java +++ b/quickstep/src/com/android/launcher3/search/SearchResultIconRow.java @@ -23,7 +23,6 @@ import android.content.Context; import android.content.pm.ShortcutInfo; import android.text.TextUtils; import android.util.AttributeSet; -import android.view.View; import android.widget.LinearLayout; import android.widget.TextView; @@ -44,15 +43,15 @@ import java.util.List; */ public class SearchResultIconRow extends LinearLayout implements SearchTargetHandler { - public static final int MAX_INLINE_ITEMS = 2; + public static final int MAX_INLINE_ITEMS = 3; protected final Launcher mLauncher; private final LauncherAppState mLauncherAppState; - private SearchResultIcon mResultIcon; + protected SearchResultIcon mResultIcon; private TextView mTitleView; private TextView mSubTitleView; - private final SearchResultIcon[] mInlineIcons = new SearchResultIcon[MAX_INLINE_ITEMS]; + protected final SearchResultIcon[] mInlineIcons = new SearchResultIcon[MAX_INLINE_ITEMS]; private PackageItemInfo mProviderInfo; @@ -91,9 +90,9 @@ public class SearchResultIconRow extends LinearLayout implements SearchTargetHan mInlineIcons[0] = findViewById(R.id.shortcut_0); mInlineIcons[1] = findViewById(R.id.shortcut_1); + mInlineIcons[2] = findViewById(R.id.shortcut_2); for (SearchResultIcon inlineIcon : mInlineIcons) { inlineIcon.getLayoutParams().width = getIconSize(); - // TODO: inlineIcon.setOnClickListener(); } setOnClickListener(mResultIcon); @@ -103,7 +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); + mResultIcon.apply(parentTarget, children, this::onItemInfoCreated); if (parentTarget.getShortcutInfo() != null) { updateWithShortcutInfo(parentTarget.getShortcutInfo()); } else if (parentTarget.getSearchAction() != null) { @@ -142,7 +141,7 @@ public class SearchResultIconRow extends LinearLayout implements SearchTargetHan protected void showInlineItems(List children) { for (int i = 0; i < MAX_INLINE_ITEMS; i++) { if (i < children.size()) { - mInlineIcons[i].apply(children.get(0), new ArrayList<>()); + mInlineIcons[i].apply(children.get(i), new ArrayList<>()); mInlineIcons[i].setVisibility(VISIBLE); } else { mInlineIcons[i].setVisibility(GONE); @@ -154,15 +153,4 @@ public class SearchResultIconRow extends LinearLayout implements SearchTargetHan setTag(info); mTitleView.setText(info.title); } - - @Override - public void onClick(View view) { - // do nothing. - } - - @Override - public boolean onLongClick(View view) { - // do nothing. - return false; - } } diff --git a/quickstep/src/com/android/launcher3/search/SearchResultIconSlice.java b/quickstep/src/com/android/launcher3/search/SearchResultIconSlice.java index f6e5eba9a3..0ea2f8b86e 100644 --- a/quickstep/src/com/android/launcher3/search/SearchResultIconSlice.java +++ b/quickstep/src/com/android/launcher3/search/SearchResultIconSlice.java @@ -22,7 +22,6 @@ import android.app.search.SearchTargetEvent; import android.content.Context; import android.util.AttributeSet; import android.util.Log; -import android.view.View; import android.widget.LinearLayout; import androidx.annotation.NonNull; @@ -133,15 +132,4 @@ public class SearchResultIconSlice extends LinearLayout implements SearchTargetH public void onSliceAction(@NonNull EventInfo eventInfo, @NonNull SliceItem sliceItem) { notifyEvent(mLauncher, mTargetId, SearchTargetEvent.ACTION_TAP); } - - @Override - public void onClick(View view) { - notifyEvent(mLauncher, mTargetId, SearchTargetEvent.ACTION_LONGPRESS); - } - - @Override - public boolean onLongClick(View view) { - // do nothing - return false; - } } diff --git a/quickstep/src/com/android/launcher3/search/SearchResultPeopleView.java b/quickstep/src/com/android/launcher3/search/SearchResultPeopleView.java deleted file mode 100644 index 99e6aa561c..0000000000 --- a/quickstep/src/com/android/launcher3/search/SearchResultPeopleView.java +++ /dev/null @@ -1,199 +0,0 @@ -/* - * Copyright (C) 2020 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.search; - -import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; -import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR; - -import android.app.search.SearchTargetEvent; -import android.content.Context; -import android.content.Intent; -import android.content.pm.ApplicationInfo; -import android.content.pm.PackageManager; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.drawable.BitmapDrawable; -import android.graphics.drawable.Drawable; -import android.os.Build; -import android.os.Bundle; -import android.os.Process; -import android.util.AttributeSet; -import android.view.View; -import android.widget.ImageButton; -import android.widget.LinearLayout; -import android.widget.TextView; - -import androidx.annotation.Nullable; -import androidx.core.graphics.drawable.RoundedBitmapDrawable; -import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory; - -import com.android.launcher3.DeviceProfile; -import com.android.launcher3.Launcher; -import com.android.launcher3.R; -import com.android.launcher3.icons.BitmapInfo; -import com.android.launcher3.icons.LauncherIcons; -import com.android.systemui.plugins.shared.SearchTargetLegacy; - -import java.util.ArrayList; - -/** - * A view representing a single people search result in all apps - */ -public class SearchResultPeopleView extends LinearLayout implements SearchTargetHandler { - - public static final String TARGET_TYPE_PEOPLE = "people"; - - private final int mIconSize; - private final int mButtonSize; - private final PackageManager mPackageManager; - private View mIconView; - private TextView mTitleView; - private ImageButton[] mProviderButtons = new ImageButton[3]; - private Intent mIntent; - - private SearchTargetLegacy mSearchTarget; - - public SearchResultPeopleView(Context context) { - this(context, null, 0); - } - - public SearchResultPeopleView(Context context, - @Nullable AttributeSet attrs) { - this(context, attrs, 0); - } - - public SearchResultPeopleView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) { - super(context, attrs, defStyleAttr); - DeviceProfile deviceProfile = Launcher.getLauncher(getContext()).getDeviceProfile(); - mPackageManager = getContext().getPackageManager(); - mIconSize = deviceProfile.iconSizePx; - mButtonSize = (int) (deviceProfile.iconSizePx / 1.5f); - } - - @Override - protected void onFinishInflate() { - super.onFinishInflate(); - mIconView = findViewById(R.id.icon); - mIconView.getLayoutParams().height = mIconSize; - mIconView.getLayoutParams().width = mIconSize; - mTitleView = findViewById(R.id.title); - mProviderButtons[0] = findViewById(R.id.provider_0); - mProviderButtons[1] = findViewById(R.id.provider_1); - mProviderButtons[2] = findViewById(R.id.provider_2); - for (ImageButton button : mProviderButtons) { - button.getLayoutParams().width = mButtonSize; - button.getLayoutParams().height = mButtonSize; - } - } - - /* - @Override - public void applySearchTarget(SearchTargetLegacy searchTarget) { - mSearchTarget = searchTarget; - Bundle payload = searchTarget.getExtras(); - mTitleView.setText(payload.getString("title")); - mIntent = payload.getParcelable("intent"); - Bitmap contactIcon = payload.getParcelable("icon"); - try (LauncherIcons li = LauncherIcons.obtain(getContext())) { - BitmapInfo badgeInfo = li.createBadgedIconBitmap( - getAppIcon(mIntent.getPackage()), Process.myUserHandle(), - Build.VERSION.SDK_INT); - setIcon(li.badgeBitmap(roundBitmap(contactIcon), badgeInfo).icon, false); - } catch (Exception e) { - setIcon(contactIcon, true); - } - - ArrayList providers = payload.getParcelableArrayList("providers"); - for (int i = 0; i < mProviderButtons.length; i++) { - ImageButton button = mProviderButtons[i]; - if (providers != null && i < providers.size()) { - Bundle provider = providers.get(i); - Intent intent = provider.getParcelable("intent"); - setupProviderButton(button, provider, intent); - UI_HELPER_EXECUTOR.post(() -> { - String pkg = provider.getString("package_name"); - Drawable appIcon = getAppIcon(pkg); - if (appIcon != null) { - MAIN_EXECUTOR.post(() -> button.setImageDrawable(appIcon)); - } - }); - button.setVisibility(VISIBLE); - } else { - button.setVisibility(GONE); - } - } - } - */ - - /** - * Normalizes the bitmap to look like rounded App Icon - * TODO(b/170234747) to support styling, generate adaptive icon drawable and generate - * bitmap from it. - */ - private Bitmap roundBitmap(Bitmap icon) { - final RoundedBitmapDrawable d = RoundedBitmapDrawableFactory.create(getResources(), icon); - d.setCornerRadius(R.attr.folderIconRadius); - d.setBounds(0, 0, mIconSize, mIconSize); - final Bitmap bitmap = Bitmap.createBitmap(d.getBounds().width(), d.getBounds().height(), - Bitmap.Config.ARGB_8888); - Canvas canvas = new Canvas(bitmap); - d.setBounds(0, 0, canvas.getWidth(), canvas.getHeight()); - d.draw(canvas); - return bitmap; - } - - private void setIcon(Bitmap icon, Boolean round) { - if (round) { - RoundedBitmapDrawable d = RoundedBitmapDrawableFactory.create(getResources(), icon); - d.setCornerRadius(R.attr.folderIconRadius); - d.setBounds(0, 0, mIconSize, mIconSize); - mIconView.setBackground(d); - } else { - mIconView.setBackground(new BitmapDrawable(getResources(), icon)); - } - } - - - private Drawable getAppIcon(String pkg) { - try { - ApplicationInfo applicationInfo = mPackageManager.getApplicationInfo( - pkg, 0); - return applicationInfo.loadIcon(mPackageManager); - } catch (PackageManager.NameNotFoundException ignored) { - return null; - } - } - - private void setupProviderButton(ImageButton button, Bundle provider, Intent intent) { - Launcher launcher = Launcher.getLauncher(getContext()); - button.setOnClickListener(b -> { - launcher.startActivitySafely(b, intent, null); - Bundle bundle = new Bundle(); - bundle.putBundle("provider", provider); - }); - } - - @Override - public void onClick(View view) { - // do nothing. - } - - @Override - public boolean onLongClick(View view) { - // do nothing. - return false; - } -} diff --git a/quickstep/src/com/android/launcher3/search/SearchResultThumbnailView.java b/quickstep/src/com/android/launcher3/search/SearchResultThumbnailView.java index dd9546171e..8803c9841a 100644 --- a/quickstep/src/com/android/launcher3/search/SearchResultThumbnailView.java +++ b/quickstep/src/com/android/launcher3/search/SearchResultThumbnailView.java @@ -23,7 +23,6 @@ import android.graphics.Bitmap; import android.graphics.drawable.BitmapDrawable; import android.util.AttributeSet; import android.view.View; -import android.view.ViewGroup; import androidx.core.graphics.drawable.RoundedBitmapDrawable; import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory; @@ -39,10 +38,9 @@ import java.util.List; * A view representing a high confidence app search result that includes shortcuts */ public class SearchResultThumbnailView extends androidx.appcompat.widget.AppCompatImageView - implements SearchTargetHandler { + implements SearchTargetHandler, View.OnClickListener { private SearchTarget mSearchTarget; - private SearchResultIcon mResultIcon; public SearchResultThumbnailView(Context context) { super(context); @@ -61,7 +59,6 @@ public class SearchResultThumbnailView extends androidx.appcompat.widget.AppComp super.onFinishInflate(); setOnFocusChangeListener(Launcher.getLauncher(getContext()).getFocusHandler()); setOnClickListener(this); - setOnLongClickListener(this); } @Override @@ -102,10 +99,4 @@ public class SearchResultThumbnailView extends androidx.appcompat.widget.AppComp (SearchActionItemInfo) view.getTag()); notifyEvent(getContext(), mSearchTarget.getId(), SearchTargetEvent.ACTION_LAUNCH_TOUCH); } - - @Override - public boolean onLongClick(View view) { - // do nothing. - return false; - } } diff --git a/quickstep/src/com/android/launcher3/search/SearchResultWidget.java b/quickstep/src/com/android/launcher3/search/SearchResultWidget.java index da1495930e..4c64265cc3 100644 --- a/quickstep/src/com/android/launcher3/search/SearchResultWidget.java +++ b/quickstep/src/com/android/launcher3/search/SearchResultWidget.java @@ -186,10 +186,6 @@ public class SearchResultWidget extends LinearLayout implements SearchTargetHand return false; } - @Override - public void onClick(View view) { - // do nothing. - } static class ClickListener extends GestureDetector.SimpleOnGestureListener { private final Runnable mCb; diff --git a/quickstep/src/com/android/launcher3/search/SearchResultWidgetPreview.java b/quickstep/src/com/android/launcher3/search/SearchResultWidgetPreview.java index 1786baf47c..5bf19087d8 100644 --- a/quickstep/src/com/android/launcher3/search/SearchResultWidgetPreview.java +++ b/quickstep/src/com/android/launcher3/search/SearchResultWidgetPreview.java @@ -47,7 +47,8 @@ import java.util.List; /** * displays preview of a widget upon receiving {@link AppWidgetProviderInfo} from Search provider */ -public class SearchResultWidgetPreview extends LinearLayout implements SearchTargetHandler { +public class SearchResultWidgetPreview extends LinearLayout implements SearchTargetHandler, + View.OnClickListener, View.OnLongClickListener { private final Launcher mLauncher; private final LauncherAppState mAppState; diff --git a/quickstep/src/com/android/launcher3/search/SearchSectionHeaderView.java b/quickstep/src/com/android/launcher3/search/SearchSectionHeaderView.java index d7c5c5d157..9276841734 100644 --- a/quickstep/src/com/android/launcher3/search/SearchSectionHeaderView.java +++ b/quickstep/src/com/android/launcher3/search/SearchSectionHeaderView.java @@ -18,7 +18,6 @@ package com.android.launcher3.search; import android.app.search.SearchTarget; import android.content.Context; import android.util.AttributeSet; -import android.view.View; import android.widget.TextView; import androidx.annotation.Nullable; @@ -48,15 +47,4 @@ public class SearchSectionHeaderView extends TextView implements SearchTargetHan setText(parentTarget.getSearchAction().getTitle()); setVisibility(VISIBLE); } - - @Override - public void onClick(View view) { - // do nothing. - } - - @Override - public boolean onLongClick(View view) { - // do nothing. - return false; - } } diff --git a/quickstep/src/com/android/launcher3/search/SearchServicePipeline.java b/quickstep/src/com/android/launcher3/search/SearchServicePipeline.java index 197aecbc28..fac6ba7474 100644 --- a/quickstep/src/com/android/launcher3/search/SearchServicePipeline.java +++ b/quickstep/src/com/android/launcher3/search/SearchServicePipeline.java @@ -15,6 +15,8 @@ */ package com.android.launcher3.search; +import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR; + import android.app.search.Query; import android.app.search.SearchContext; import android.app.search.SearchSession; @@ -39,8 +41,6 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.function.Consumer; -import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR; - /** * Search pipeline utilizing {@link android.app.search.SearchUiManager} */ diff --git a/quickstep/src/com/android/launcher3/search/SearchTargetHandler.java b/quickstep/src/com/android/launcher3/search/SearchTargetHandler.java index 0e7b8f20c9..acf6f8a02a 100644 --- a/quickstep/src/com/android/launcher3/search/SearchTargetHandler.java +++ b/quickstep/src/com/android/launcher3/search/SearchTargetHandler.java @@ -19,15 +19,13 @@ package com.android.launcher3.search; import android.app.search.SearchTarget; import android.app.search.SearchTargetEvent; import android.content.Context; -import android.view.View; import java.util.List; -import java.util.function.Consumer; /** * An interface for supporting dynamic search results */ -public interface SearchTargetHandler extends View.OnClickListener, View.OnLongClickListener { +public interface SearchTargetHandler { /** * Update view using values from {@link SearchTarget} diff --git a/quickstep/src/com/android/launcher3/search/SearchTargetUtil.java b/quickstep/src/com/android/launcher3/search/SearchTargetUtil.java index 95f4f58a80..0abed036e3 100644 --- a/quickstep/src/com/android/launcher3/search/SearchTargetUtil.java +++ b/quickstep/src/com/android/launcher3/search/SearchTargetUtil.java @@ -15,6 +15,13 @@ */ package com.android.launcher3.search; +import static com.android.app.search.LayoutType.ICON_DOUBLE_HORIZONTAL_TEXT; +import static com.android.app.search.LayoutType.ICON_SINGLE_HORIZONTAL_TEXT; +import static com.android.app.search.LayoutType.THUMBNAIL; +import static com.android.app.search.ResultType.ACTION; +import static com.android.app.search.ResultType.SCREENSHOT; +import static com.android.app.search.ResultType.SUGGEST; + import android.app.PendingIntent; import android.app.search.SearchAction; import android.app.search.SearchTarget; @@ -31,18 +38,11 @@ import android.os.UserHandle; import com.android.app.search.ResultType; -import static com.android.app.search.LayoutType.ICON_DOUBLE_HORIZONTAL_TEXT; -import static com.android.app.search.LayoutType.ICON_SINGLE_HORIZONTAL_TEXT; -import static com.android.app.search.LayoutType.THUMBNAIL; -import static com.android.app.search.ResultType.ACTION; -import static com.android.app.search.ResultType.SCREENSHOT; -import static com.android.app.search.ResultType.SUGGEST; - public class SearchTargetUtil { public static final String BUNDLE_EXTRA_SHOULD_START = "should_start"; public static final String BUNDLE_EXTRA_SHOULD_START_FOR_RESULT = "should_start_for_result"; - public static final String BUNDLE_EXTRA_BADGE_FROM_ICON = "badge_from_icon"; + public static final String BUNDLE_EXTRA_BADGE_WITH_PACKAGE = "badge_with_package"; public static final String BUNDLE_EXTRA_PRIMARY_ICON_FROM_TITLE = "primary_icon_from_title"; public static final String EXTRA_CLASS = "class"; @@ -56,10 +56,10 @@ public class SearchTargetUtil { /** * Generate SearchTargetUtil for ICON_DOUBLE_HORIZONTAL_TEXT layout type. * - targets.add(SearchTargetUtil.generateIconDoubleHorizontalText_SearchAction( - mContext, "red", Color.RED)); - targets.add(SearchTargetUtil.generateIconDoubleHorizontalText_SearchAction( - mContext, "yellow", Color.YELLOW)); + * targets.add(SearchTargetUtil.generateIconDoubleHorizontalText_SearchAction( + * mContext, "red", Color.RED)); + * targets.add(SearchTargetUtil.generateIconDoubleHorizontalText_SearchAction( + * mContext, "yellow", Color.YELLOW)); */ public static SearchTarget generateIconDoubleHorizontalText_SearchAction( Context context, String id, int color) { @@ -83,7 +83,7 @@ public class SearchTargetUtil { Bundle b = new Bundle(); b.putBoolean(BUNDLE_EXTRA_SHOULD_START_FOR_RESULT, true); - b.putBoolean(BUNDLE_EXTRA_BADGE_FROM_ICON, true); + b.putBoolean(BUNDLE_EXTRA_BADGE_WITH_PACKAGE, true); b.putBoolean(BUNDLE_EXTRA_PRIMARY_ICON_FROM_TITLE, true); builder.setSearchAction(new SearchAction.Builder(id, id + TITLE) @@ -96,7 +96,7 @@ public class SearchTargetUtil { } /** - * Inside SearchServicePipeline, add following samples to test the search target. + * Inside SearchServicePipeline, add following samples to test the search target. * * targets.add(SearchTargetUtil.generateThumbnail_SearchAction("blue", Color.BLUE)); * targets.add(SearchTargetUtil.generateThumbnail_SearchAction("red", Color.RED)); @@ -130,11 +130,10 @@ public class SearchTargetUtil { } /** - * * targets.add(SearchTargetUtil.generateIconHorizontalText_SearchAction( - * mContext, "red", Color.RED)); + * mContext, "red", Color.RED)); * targets.add(SearchTargetUtil.generateIconHorizontalText_SearchAction( - * mContext, "yellow", Color.YELLOW)); + * mContext, "yellow", Color.YELLOW)); */ public static SearchTarget generateIconHorizontalText_SearchAction( Context context, String id, int color) { diff --git a/src/com/android/launcher3/model/data/SearchActionItemInfo.java b/src/com/android/launcher3/model/data/SearchActionItemInfo.java index 36afe50fa1..8469569c25 100644 --- a/src/com/android/launcher3/model/data/SearchActionItemInfo.java +++ b/src/com/android/launcher3/model/data/SearchActionItemInfo.java @@ -30,7 +30,7 @@ public class SearchActionItemInfo extends ItemInfoWithIcon { public static final int FLAG_SHOULD_START = 1 << 1; public static final int FLAG_SHOULD_START_FOR_RESULT = FLAG_SHOULD_START | 1 << 2; - public static final int FLAG_BADGE_FROM_ICON = 1 << 3; + public static final int FLAG_BADGE_WITH_PACKAGE = 1 << 3; public static final int FLAG_PRIMARY_ICON_FROM_TITLE = 1 << 4; private final String mFallbackPackageName; diff --git a/src_plugins/com/android/systemui/plugins/shared/SearchTargetEventLegacy.java b/src_plugins/com/android/systemui/plugins/shared/SearchTargetEventLegacy.java index 7fbd6ac814..0fc61f04dc 100644 --- a/src_plugins/com/android/systemui/plugins/shared/SearchTargetEventLegacy.java +++ b/src_plugins/com/android/systemui/plugins/shared/SearchTargetEventLegacy.java @@ -20,7 +20,7 @@ import android.os.Bundle; /** * Event used for the feedback loop to the plugin. (and future aiai) * - * @deprecated Use SearchTargetEvent + * @deprecated Use {@link android.app.search.SearchTargetEvent} */ @Deprecated public class SearchTargetEventLegacy {