From 0226d1ad79d1f2af4a8a47dc1aa705913cde0c66 Mon Sep 17 00:00:00 2001 From: Steven Ng Date: Mon, 8 Mar 2021 23:34:44 +0000 Subject: [PATCH 1/8] Replace DragView bitmap with drawable This is a preliminary work for local color extraction. In order to apply local colors extracted from wallpaper to AppWidgetHostView during drag, we need to hold a reference of the dragging AppWidgetHostView. In this CL, the following changes are made: 1. Instead of using bitmap image directly for icons, folders, shortcuts, legacy widget drawable preview, a BitmapDrawable wrapper is introduced. 2. Introduce a WidgetHostViewDraggableDrawable which draws LauncherAppWidgetHostView directly to canvas. No more bitmap generation overhead. 3. Remove drag outline from the drag logic because this will be replaced by a new grid color hint UI: https://screenshot.googleplex.com/7jBEVeuxFecFKKT.png Test: Add: add widgets, shortcuts from widgets tray. add icons from all apps. create folder. Drag: drag existing widgets, shortcuts, folders and icons around Bug: 182282587 Change-Id: Ia45ff756ea5bb80cf0761f0727a9453d50c204c0 --- src/com/android/launcher3/Workspace.java | 43 +++++----- .../launcher3/dragndrop/AddItemActivity.java | 4 +- .../dragndrop/AppWidgetHostViewDrawable.java | 79 +++++++++++++++++++ .../launcher3/dragndrop/DragController.java | 29 +++++-- .../android/launcher3/dragndrop/DragView.java | 67 +++++++++------- .../dragndrop/PinItemDragListener.java | 2 +- .../graphics/DragPreviewProvider.java | 23 ++++-- .../ShortcutDragPreviewProvider.java | 23 +++--- .../launcher3/widget/BaseWidgetSheet.java | 7 +- .../widget/PendingItemDragHelper.java | 48 +++++++---- .../android/launcher3/widget/WidgetCell.java | 71 +++++++++++------ .../launcher3/widget/WidgetImageView.java | 22 +++--- 12 files changed, 289 insertions(+), 129 deletions(-) create mode 100644 src/com/android/launcher3/dragndrop/AppWidgetHostViewDrawable.java diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 0cc965c6c6..6da090cd17 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -69,6 +69,7 @@ import com.android.launcher3.anim.Interpolators; import com.android.launcher3.anim.PendingAnimation; import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.dot.FolderDotInfo; +import com.android.launcher3.dragndrop.AppWidgetHostViewDrawable; import com.android.launcher3.dragndrop.DragController; import com.android.launcher3.dragndrop.DragLayer; import com.android.launcher3.dragndrop.DragOptions; @@ -396,15 +397,6 @@ public class Workspace extends PagedView layout.markCellsAsUnoccupiedForView(mDragInfo.cell); } - if (mOutlineProvider != null) { - if (dragObject.dragView != null) { - Bitmap preview = dragObject.dragView.getPreviewBitmap(); - - // The outline is used to visualize where the item will land if dropped - mOutlineProvider.generateDragOutline(preview); - } - } - updateChildrenLayersEnabled(); // Do not add a new page if it is a accessible drag which was not started by the workspace. @@ -1504,10 +1496,10 @@ public class Workspace extends PagedView draggableView = (DraggableView) child; } - // The drag bitmap follows the touch point around on the screen - final Bitmap b = previewProvider.createDragBitmap(); + // The draggable drawable follows the touch point around on the screen + final Drawable drawable = previewProvider.createDrawable(); int halfPadding = previewProvider.previewPadding / 2; - float scale = previewProvider.getScaleAndPosition(b, mTempXY); + float scale = previewProvider.getScaleAndPosition(drawable, mTempXY); int dragLayerX = mTempXY[0]; int dragLayerY = mTempXY[1]; @@ -1533,9 +1525,18 @@ public class Workspace extends PagedView } } - DragView dv = mDragController.startDrag(b, draggableView, dragLayerX, dragLayerY, source, - dragObject, dragVisualizeOffset, dragRect, scale * iconScale, - scale, dragOptions); + DragView dv = mDragController.startDrag( + drawable, + draggableView, + dragLayerX, + dragLayerY, + source, + dragObject, + dragVisualizeOffset, + dragRect, + scale * iconScale, + scale, + dragOptions); dv.setIntrinsicIconScaleFactor(dragOptions.intrinsicIconScaleFactor); return dv; } @@ -2583,7 +2584,11 @@ public class Workspace extends PagedView } - public Bitmap createWidgetBitmap(ItemInfo widgetInfo, View layout) { + private Drawable createWidgetDrawable(ItemInfo widgetInfo, View layout) { + if (layout instanceof LauncherAppWidgetHostView) { + return new AppWidgetHostViewDrawable((LauncherAppWidgetHostView) layout); + } + int[] unScaledSize = estimateItemSize(widgetInfo); int visibility = layout.getVisibility(); layout.setVisibility(VISIBLE); @@ -2595,7 +2600,7 @@ public class Workspace extends PagedView Bitmap b = BitmapRenderer.createHardwareBitmap( unScaledSize[0], unScaledSize[1], layout::draw); layout.setVisibility(visibility); - return b; + return new FastBitmapDrawable(b); } private void getFinalPositionForDropAnimation(int[] loc, float[] scaleXY, @@ -2665,8 +2670,8 @@ public class Workspace extends PagedView boolean isWidget = info.itemType == LauncherSettings.Favorites.ITEM_TYPE_APPWIDGET || info.itemType == LauncherSettings.Favorites.ITEM_TYPE_CUSTOM_APPWIDGET; if ((animationType == ANIMATE_INTO_POSITION_AND_RESIZE || external) && finalView != null) { - Bitmap crossFadeBitmap = createWidgetBitmap(info, finalView); - dragView.setCrossFadeBitmap(crossFadeBitmap); + Drawable crossFadeDrawable = createWidgetDrawable(info, finalView); + dragView.setCrossFadeDrawable(crossFadeDrawable); dragView.crossFade((int) (duration * 0.8f)); } else if (isWidget && external) { scaleXY[0] = scaleXY[1] = Math.min(scaleXY[0], scaleXY[1]); diff --git a/src/com/android/launcher3/dragndrop/AddItemActivity.java b/src/com/android/launcher3/dragndrop/AddItemActivity.java index c972cbbd7e..7bc9865162 100644 --- a/src/com/android/launcher3/dragndrop/AddItemActivity.java +++ b/src/com/android/launcher3/dragndrop/AddItemActivity.java @@ -142,7 +142,7 @@ public class AddItemActivity extends BaseActivity implements OnLongClickListener // If the ImageView doesn't have a drawable yet, the widget preview hasn't been loaded and // we abort the drag. - if (img.getBitmap() == null) { + if (img.getDrawable() == null) { return false; } @@ -151,7 +151,7 @@ public class AddItemActivity extends BaseActivity implements OnLongClickListener // Start home and pass the draw request params PinItemDragListener listener = new PinItemDragListener(mRequest, bounds, - img.getBitmap().getWidth(), img.getWidth()); + img.getDrawable().getIntrinsicWidth(), img.getWidth()); // Start a system drag and drop. We use a transparent bitmap as preview for system drag diff --git a/src/com/android/launcher3/dragndrop/AppWidgetHostViewDrawable.java b/src/com/android/launcher3/dragndrop/AppWidgetHostViewDrawable.java new file mode 100644 index 0000000000..477bc6e316 --- /dev/null +++ b/src/com/android/launcher3/dragndrop/AppWidgetHostViewDrawable.java @@ -0,0 +1,79 @@ +/* + * 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.dragndrop; + +import android.graphics.Canvas; +import android.graphics.ColorFilter; +import android.graphics.Paint; +import android.graphics.PixelFormat; +import android.graphics.drawable.Drawable; + +import com.android.launcher3.widget.LauncherAppWidgetHostView; + +/** A drawable which renders {@link LauncherAppWidgetHostView} to a canvas. */ +public final class AppWidgetHostViewDrawable extends Drawable { + + private final LauncherAppWidgetHostView mAppWidgetHostView; + private Paint mPaint = new Paint(); + + public AppWidgetHostViewDrawable(LauncherAppWidgetHostView appWidgetHostView) { + mAppWidgetHostView = appWidgetHostView; + } + + @Override + public void draw(Canvas canvas) { + int saveCount = canvas.saveLayer(0, 0, getIntrinsicWidth(), getIntrinsicHeight(), mPaint); + mAppWidgetHostView.draw(canvas); + canvas.restoreToCount(saveCount); + } + + @Override + public int getIntrinsicWidth() { + return mAppWidgetHostView.getMeasuredWidth(); + } + + @Override + public int getIntrinsicHeight() { + return mAppWidgetHostView.getMeasuredHeight(); + } + + @Override + public int getOpacity() { + // This is up to app widget provider. We don't know if the host view will cover anything + // behind the drawable. + return PixelFormat.UNKNOWN; + } + + @Override + public void setAlpha(int alpha) { + mPaint.setAlpha(alpha); + } + + @Override + public int getAlpha() { + return mPaint.getAlpha(); + } + + @Override + public void setColorFilter(ColorFilter colorFilter) { + mPaint.setColorFilter(colorFilter); + } + + @Override + public ColorFilter getColorFilter() { + return mPaint.getColorFilter(); + } +} diff --git a/src/com/android/launcher3/dragndrop/DragController.java b/src/com/android/launcher3/dragndrop/DragController.java index 93df599a81..b7a70cb654 100644 --- a/src/com/android/launcher3/dragndrop/DragController.java +++ b/src/com/android/launcher3/dragndrop/DragController.java @@ -25,9 +25,9 @@ import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; import android.animation.ValueAnimator; import android.content.ComponentName; import android.content.res.Resources; -import android.graphics.Bitmap; import android.graphics.Point; import android.graphics.Rect; +import android.graphics.drawable.Drawable; import android.view.DragEvent; import android.view.HapticFeedbackConstants; import android.view.KeyEvent; @@ -129,7 +129,7 @@ public class DragController implements DragDriver.EventListener, TouchController * drop, it is the responsibility of the {@link DropTarget} to exit out of the spring loaded * mode. If the drop was cancelled for some reason, the UI will automatically exit out of this mode. * - * @param b The bitmap to display as the drag image. It will be re-scaled to the + * @param drawable The drawable to be displayed in the drag view. It will be re-scaled to the * enlarged size. * @param originalView The source view (ie. icon, widget etc.) that is being dragged * and which the DragView represents @@ -140,9 +140,18 @@ public class DragController implements DragDriver.EventListener, TouchController * @param dragRegion Coordinates within the bitmap b for the position of item being dragged. * Makes dragging feel more precise, e.g. you can clip out a transparent border */ - public DragView startDrag(Bitmap b, DraggableView originalView, int dragLayerX, int dragLayerY, - DragSource source, ItemInfo dragInfo, Point dragOffset, Rect dragRegion, - float initialDragViewScale, float dragViewScaleOnDrop, DragOptions options) { + public DragView startDrag( + Drawable drawable, + DraggableView originalView, + int dragLayerX, + int dragLayerY, + DragSource source, + ItemInfo dragInfo, + Point dragOffset, + Rect dragRegion, + float initialDragViewScale, + float dragViewScaleOnDrop, + DragOptions options) { if (PROFILE_DRAWING_DURING_DRAG) { android.os.Debug.startMethodTracing("Launcher"); } @@ -173,8 +182,14 @@ public class DragController implements DragDriver.EventListener, TouchController final Resources res = mLauncher.getResources(); final float scaleDps = mIsInPreDrag ? res.getDimensionPixelSize(R.dimen.pre_drag_view_scale) : 0f; - final DragView dragView = mDragObject.dragView = new DragView(mLauncher, b, registrationX, - registrationY, initialDragViewScale, dragViewScaleOnDrop, scaleDps); + final DragView dragView = mDragObject.dragView = new DragView( + mLauncher, + drawable, + registrationX, + registrationY, + initialDragViewScale, + dragViewScaleOnDrop, + scaleDps); dragView.setItemInfo(dragInfo); mDragObject.dragComplete = false; diff --git a/src/com/android/launcher3/dragndrop/DragView.java b/src/com/android/launcher3/dragndrop/DragView.java index 86b93d0aa3..df4d81197a 100644 --- a/src/com/android/launcher3/dragndrop/DragView.java +++ b/src/com/android/launcher3/dragndrop/DragView.java @@ -67,9 +67,9 @@ public class DragView extends View implements StateListener { public static final int COLOR_CHANGE_DURATION = 120; public static final int VIEW_ZOOM_DURATION = 150; - private boolean mDrawBitmap = true; - private Bitmap mBitmap; - private Bitmap mCrossFadeBitmap; + private boolean mShouldDraw = true; + private Drawable mDrawable; + private Drawable mCrossFadeDrawable; @Thunk Paint mPaint; private final int mBlurSizeOutline; private final int mRegistrationX; @@ -114,19 +114,21 @@ public class DragView extends View implements StateListener { * The registration point is the point inside our view that the touch events should * be centered upon. * @param launcher The Launcher instance - * @param bitmap The view that we're dragging around. We scale it up when we draw it. + * @param drawable The view that we're dragging around. We scale it up when we draw it. * @param registrationX The x coordinate of the registration point. * @param registrationY The y coordinate of the registration point. */ - public DragView(Launcher launcher, Bitmap bitmap, int registrationX, int registrationY, - final float initialScale, final float scaleOnDrop, final float finalScaleDps) { + public DragView(Launcher launcher, Drawable drawable, int registrationX, + int registrationY, final float initialScale, final float scaleOnDrop, + final float finalScaleDps) { super(launcher); mLauncher = launcher; mDragLayer = launcher.getDragLayer(); mDragController = launcher.getDragController(); mFirstFrameAnimatorHelper = new FirstFrameAnimatorHelper(this); - final float scale = (bitmap.getWidth() + finalScaleDps) / bitmap.getWidth(); + final float scale = (drawable.getIntrinsicWidth() + finalScaleDps) + / drawable.getIntrinsicWidth(); // Set the initial scale to avoid any jumps setScaleX(initialScale); @@ -144,8 +146,9 @@ public class DragView extends View implements StateListener { } }); - mBitmap = bitmap; - setDragRegion(new Rect(0, 0, bitmap.getWidth(), bitmap.getHeight())); + mDrawable = drawable; + setDragRegion(new Rect(0, 0, drawable.getIntrinsicWidth(), + drawable.getIntrinsicHeight())); // The point in our scaled bitmap that the touch events are located mRegistrationX = registrationX; @@ -197,8 +200,8 @@ public class DragView extends View implements StateListener { @Override public void run() { Object[] outObj = new Object[1]; - int w = mBitmap.getWidth(); - int h = mBitmap.getHeight(); + int w = mDrawable.getIntrinsicWidth(); + int h = mDrawable.getIntrinsicHeight(); Drawable dr = Utilities.getFullDrawable(mLauncher, info, w, h, outObj); if (dr instanceof AdaptiveIconDrawable) { @@ -214,11 +217,11 @@ public class DragView extends View implements StateListener { mBadge.setBounds(badgeBounds); // Do not draw the background in case of folder as its translucent - mDrawBitmap = !(dr instanceof FolderAdaptiveIcon); + mShouldDraw = !(dr instanceof FolderAdaptiveIcon); try (LauncherIcons li = LauncherIcons.obtain(mLauncher)) { Drawable nDr; // drawable to be normalized - if (mDrawBitmap) { + if (mShouldDraw) { nDr = dr; } else { // Since we just want the scale, avoid heavy drawing operations @@ -308,7 +311,7 @@ public class DragView extends View implements StateListener { @Override protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { - setMeasuredDimension(mBitmap.getWidth(), mBitmap.getHeight()); + setMeasuredDimension(mDrawable.getIntrinsicWidth(), mDrawable.getIntrinsicHeight()); } /** Sets the scale of the view over the normal workspace icon size. */ @@ -352,29 +355,37 @@ public class DragView extends View implements StateListener { return mDragRegion; } - public Bitmap getPreviewBitmap() { - return mBitmap; - } - @Override protected void onDraw(Canvas canvas) { mHasDrawn = true; - if (mDrawBitmap) { + if (mShouldDraw) { // Always draw the bitmap to mask anti aliasing due to clipPath - boolean crossFade = mCrossFadeProgress > 0 && mCrossFadeBitmap != null; + boolean crossFade = mCrossFadeProgress > 0 && mCrossFadeDrawable != null; if (crossFade) { int alpha = crossFade ? (int) (255 * (1 - mCrossFadeProgress)) : 255; mPaint.setAlpha(alpha); } - canvas.drawBitmap(mBitmap, 0.0f, 0.0f, mPaint); + mDrawable.setColorFilter(mPaint.getColorFilter()); + mDrawable.setAlpha(mPaint.getAlpha()); + mDrawable.setBounds( + new Rect(0, 0, mDrawable.getIntrinsicWidth(), + mDrawable.getIntrinsicHeight())); + mDrawable.draw(canvas); if (crossFade) { mPaint.setAlpha((int) (255 * mCrossFadeProgress)); final int saveCount = canvas.save(); - float sX = (mBitmap.getWidth() * 1.0f) / mCrossFadeBitmap.getWidth(); - float sY = (mBitmap.getHeight() * 1.0f) / mCrossFadeBitmap.getHeight(); + float sX = ((float) mDrawable.getIntrinsicWidth()) + / mCrossFadeDrawable.getIntrinsicWidth(); + float sY = ((float) mDrawable.getIntrinsicHeight()) + / mCrossFadeDrawable.getIntrinsicHeight(); canvas.scale(sX, sY); - canvas.drawBitmap(mCrossFadeBitmap, 0.0f, 0.0f, mPaint); + mCrossFadeDrawable.setColorFilter(mPaint.getColorFilter()); + mCrossFadeDrawable.setAlpha(mPaint.getAlpha()); + mDrawable.setBounds( + new Rect(0, 0, mDrawable.getIntrinsicWidth(), + mDrawable.getIntrinsicHeight())); + mCrossFadeDrawable.draw(canvas); canvas.restoreToCount(saveCount); } } @@ -390,8 +401,8 @@ public class DragView extends View implements StateListener { } } - public void setCrossFadeBitmap(Bitmap crossFadeBitmap) { - mCrossFadeBitmap = crossFadeBitmap; + public void setCrossFadeDrawable(Drawable crossFadeDrawable) { + mCrossFadeDrawable = crossFadeDrawable; } public void crossFade(int duration) { @@ -469,8 +480,8 @@ public class DragView extends View implements StateListener { // Start the pick-up animation DragLayer.LayoutParams lp = new DragLayer.LayoutParams(0, 0); - lp.width = mBitmap.getWidth(); - lp.height = mBitmap.getHeight(); + lp.width = mDrawable.getIntrinsicWidth(); + lp.height = mDrawable.getIntrinsicHeight(); lp.customPosition = true; setLayoutParams(lp); move(touchX, touchY); diff --git a/src/com/android/launcher3/dragndrop/PinItemDragListener.java b/src/com/android/launcher3/dragndrop/PinItemDragListener.java index 2290473a81..9f12e6ec45 100644 --- a/src/com/android/launcher3/dragndrop/PinItemDragListener.java +++ b/src/com/android/launcher3/dragndrop/PinItemDragListener.java @@ -96,7 +96,7 @@ public class PinItemDragListener extends BaseItemDragListener { PendingItemDragHelper dragHelper = new PendingItemDragHelper(view); if (mRequest.getRequestType() == PinItemRequest.REQUEST_TYPE_APPWIDGET) { - dragHelper.setPreview(getPreview(mRequest)); + dragHelper.setRemoteViewsPreview(getPreview(mRequest)); } return dragHelper; } diff --git a/src/com/android/launcher3/graphics/DragPreviewProvider.java b/src/com/android/launcher3/graphics/DragPreviewProvider.java index 21822a3542..9bc54442a7 100644 --- a/src/com/android/launcher3/graphics/DragPreviewProvider.java +++ b/src/com/android/launcher3/graphics/DragPreviewProvider.java @@ -30,9 +30,11 @@ import android.graphics.drawable.Drawable; import android.view.View; import com.android.launcher3.BubbleTextView; +import com.android.launcher3.FastBitmapDrawable; import com.android.launcher3.Launcher; import com.android.launcher3.R; import com.android.launcher3.config.FeatureFlags; +import com.android.launcher3.dragndrop.AppWidgetHostViewDrawable; import com.android.launcher3.dragndrop.DraggableView; import com.android.launcher3.icons.BitmapRenderer; import com.android.launcher3.util.SafeCloseable; @@ -88,10 +90,14 @@ public class DragPreviewProvider { } /** - * Returns a new bitmap to show when the {@link #mView} is being dragged around. - * Responsibility for the bitmap is transferred to the caller. + * Returns a new drawable to show when the {@link #mView} is being dragged around. + * Responsibility for the drawable is transferred to the caller. */ - public Bitmap createDragBitmap() { + public Drawable createDrawable() { + if (mView instanceof LauncherAppWidgetHostView) { + return new AppWidgetHostViewDrawable((LauncherAppWidgetHostView) mView); + } + int width = 0; int height = 0; // Assume scaleX == scaleY, which is always the case for workspace items. @@ -105,8 +111,9 @@ public class DragPreviewProvider { height = mView.getHeight(); } - return BitmapRenderer.createHardwareBitmap(width + blurSizeOutline, - height + blurSizeOutline, (c) -> drawDragView(c, scale)); + return new FastBitmapDrawable( + BitmapRenderer.createHardwareBitmap(width + blurSizeOutline, + height + blurSizeOutline, (c) -> drawDragView(c, scale))); } public final void generateDragOutline(Bitmap preview) { @@ -129,7 +136,7 @@ public class DragPreviewProvider { return bounds; } - public float getScaleAndPosition(Bitmap preview, int[] outPos) { + public float getScaleAndPosition(Drawable preview, int[] outPos) { float scale = Launcher.getLauncher(mView.getContext()) .getDragLayer().getLocationInDragLayer(mView, outPos); if (mView instanceof LauncherAppWidgetHostView) { @@ -139,8 +146,8 @@ public class DragPreviewProvider { } outPos[0] = Math.round(outPos[0] - - (preview.getWidth() - scale * mView.getWidth() * mView.getScaleX()) / 2); - outPos[1] = Math.round(outPos[1] - (1 - scale) * preview.getHeight() / 2 + (preview.getIntrinsicWidth() - scale * mView.getWidth() * mView.getScaleX()) / 2); + outPos[1] = Math.round(outPos[1] - (1 - scale) * preview.getIntrinsicHeight() / 2 - previewPadding / 2); return scale; } diff --git a/src/com/android/launcher3/shortcuts/ShortcutDragPreviewProvider.java b/src/com/android/launcher3/shortcuts/ShortcutDragPreviewProvider.java index 3e59b612cf..530aaedefc 100644 --- a/src/com/android/launcher3/shortcuts/ShortcutDragPreviewProvider.java +++ b/src/com/android/launcher3/shortcuts/ShortcutDragPreviewProvider.java @@ -23,6 +23,7 @@ import android.graphics.Rect; import android.graphics.drawable.Drawable; import android.view.View; +import com.android.launcher3.FastBitmapDrawable; import com.android.launcher3.Launcher; import com.android.launcher3.Utilities; import com.android.launcher3.config.FeatureFlags; @@ -42,15 +43,16 @@ public class ShortcutDragPreviewProvider extends DragPreviewProvider { } @Override - public Bitmap createDragBitmap() { + public Drawable createDrawable() { if (FeatureFlags.ENABLE_DEEP_SHORTCUT_ICON_CACHE.get()) { int size = Launcher.getLauncher(mView.getContext()).getDeviceProfile().iconSizePx; - return BitmapRenderer.createHardwareBitmap( - size + blurSizeOutline, - size + blurSizeOutline, - (c) -> drawDragViewOnBackground(c, size)); + return new FastBitmapDrawable( + BitmapRenderer.createHardwareBitmap( + size + blurSizeOutline, + size + blurSizeOutline, + (c) -> drawDragViewOnBackground(c, size))); } else { - return createDragBitmapLegacy(); + return new FastBitmapDrawable(createDragBitmapLegacy()); } } @@ -81,7 +83,7 @@ public class ShortcutDragPreviewProvider extends DragPreviewProvider { } @Override - public float getScaleAndPosition(Bitmap preview, int[] outPos) { + public float getScaleAndPosition(Drawable preview, int[] outPos) { Launcher launcher = Launcher.getLauncher(mView.getContext()); int iconSize = getDrawableBounds(mView.getBackground()).width(); float scale = launcher.getDragLayer().getLocationInDragLayer(mView, outPos); @@ -91,9 +93,10 @@ public class ShortcutDragPreviewProvider extends DragPreviewProvider { iconLeft = mView.getWidth() - iconSize - iconLeft; } - outPos[0] += Math.round(scale * iconLeft + (scale * iconSize - preview.getWidth()) / 2 + - mPositionShift.x); - outPos[1] += Math.round((scale * mView.getHeight() - preview.getHeight()) / 2 + outPos[0] += Math.round( + scale * iconLeft + (scale * iconSize - preview.getIntrinsicWidth()) / 2 + + mPositionShift.x); + outPos[1] += Math.round((scale * mView.getHeight() - preview.getIntrinsicHeight()) / 2 + mPositionShift.y); float size = launcher.getDeviceProfile().iconSizePx; return scale * iconSize / size; diff --git a/src/com/android/launcher3/widget/BaseWidgetSheet.java b/src/com/android/launcher3/widget/BaseWidgetSheet.java index 4fe631aa61..fc63af0c45 100644 --- a/src/com/android/launcher3/widget/BaseWidgetSheet.java +++ b/src/com/android/launcher3/widget/BaseWidgetSheet.java @@ -108,17 +108,18 @@ public abstract class BaseWidgetSheet extends AbstractSlideInView // If the ImageView doesn't have a drawable yet, the widget preview hasn't been loaded and // we abort the drag. - if (image.getBitmap() == null) { + if (image.getDrawable() == null) { return false; } PendingItemDragHelper dragHelper = new PendingItemDragHelper(v); - dragHelper.setPreview(v.getPreview()); + dragHelper.setRemoteViewsPreview(v.getPreview()); + dragHelper.setAppWidgetHostViewPreview(v.getAppWidgetHostViewPreview()); int[] loc = new int[2]; getPopupContainer().getLocationInDragLayer(image, loc); - dragHelper.startDrag(image.getBitmapBounds(), image.getBitmap().getWidth(), + dragHelper.startDrag(image.getBitmapBounds(), image.getDrawable().getIntrinsicWidth(), image.getWidth(), new Point(loc[0], loc[1]), this, new DragOptions()); close(true); return true; diff --git a/src/com/android/launcher3/widget/PendingItemDragHelper.java b/src/com/android/launcher3/widget/PendingItemDragHelper.java index 6e8383698d..8961f3642a 100644 --- a/src/com/android/launcher3/widget/PendingItemDragHelper.java +++ b/src/com/android/launcher3/widget/PendingItemDragHelper.java @@ -29,10 +29,12 @@ import androidx.annotation.Nullable; import com.android.launcher3.DeviceProfile; import com.android.launcher3.DragSource; +import com.android.launcher3.FastBitmapDrawable; import com.android.launcher3.Launcher; import com.android.launcher3.LauncherAppState; import com.android.launcher3.PendingAddItemInfo; import com.android.launcher3.R; +import com.android.launcher3.dragndrop.AppWidgetHostViewDrawable; import com.android.launcher3.dragndrop.DragOptions; import com.android.launcher3.dragndrop.DraggableView; import com.android.launcher3.graphics.DragPreviewProvider; @@ -49,15 +51,26 @@ public class PendingItemDragHelper extends DragPreviewProvider { private final PendingAddItemInfo mAddInfo; private int[] mEstimatedCellSize; - @Nullable private RemoteViews mPreview; + @Nullable private RemoteViews mRemoteViewsPreview; + @Nullable private LauncherAppWidgetHostView mAppWidgetHostViewPreview; public PendingItemDragHelper(View view) { super(view); mAddInfo = (PendingAddItemInfo) view.getTag(); } - public void setPreview(@Nullable RemoteViews preview) { - mPreview = preview; + /** + * Sets a {@link RemoteViews} which shows an app widget preview provided by app developers in + * the pin widget flow. + */ + public void setRemoteViewsPreview(@Nullable RemoteViews remoteViewsPreview) { + mRemoteViewsPreview = remoteViewsPreview; + } + + /** Sets a {@link LauncherAppWidgetHostView} which shows a preview layout of an app widget. */ + public void setAppWidgetHostViewPreview( + @Nullable LauncherAppWidgetHostView appWidgetHostViewPreview) { + mAppWidgetHostViewPreview = appWidgetHostViewPreview; } /** @@ -74,7 +87,7 @@ public class PendingItemDragHelper extends DragPreviewProvider { final Launcher launcher = Launcher.getLauncher(mView.getContext()); LauncherAppState app = LauncherAppState.getInstance(launcher); - Bitmap preview = null; + Drawable preview = null; final float scale; final Point dragOffset; final Rect dragRegion; @@ -90,13 +103,19 @@ public class PendingItemDragHelper extends DragPreviewProvider { int[] previewSizeBeforeScale = new int[1]; - if (mPreview != null) { - preview = WidgetCell.generateFromRemoteViews(launcher, mPreview, - createWidgetInfo.info, maxWidth, previewSizeBeforeScale); + if (mRemoteViewsPreview != null) { + preview = new FastBitmapDrawable( + WidgetCell.generateFromRemoteViews(launcher, mRemoteViewsPreview, + createWidgetInfo.info, maxWidth, previewSizeBeforeScale)); + } + if (mAppWidgetHostViewPreview != null) { + preview = new AppWidgetHostViewDrawable(mAppWidgetHostViewPreview); } if (preview == null) { - preview = app.getWidgetCache().generateWidgetPreview(launcher, - createWidgetInfo.info, maxWidth, null, previewSizeBeforeScale).first; + preview = new FastBitmapDrawable( + app.getWidgetCache().generateWidgetPreview(launcher, + createWidgetInfo.info, maxWidth, null, + previewSizeBeforeScale).first); } if (previewSizeBeforeScale[0] < previewBitmapWidth) { @@ -109,7 +128,7 @@ public class PendingItemDragHelper extends DragPreviewProvider { previewBounds.left += padding; previewBounds.right -= padding; } - scale = previewBounds.width() / (float) preview.getWidth(); + scale = previewBounds.width() / (float) preview.getIntrinsicWidth(); launcher.getDragController().addDragListener(new WidgetHostViewLoader(launcher, mView)); dragOffset = null; @@ -119,9 +138,10 @@ public class PendingItemDragHelper extends DragPreviewProvider { PendingAddShortcutInfo createShortcutInfo = (PendingAddShortcutInfo) mAddInfo; Drawable icon = createShortcutInfo.activityInfo.getFullResIcon(app.getIconCache()); LauncherIcons li = LauncherIcons.obtain(launcher); - preview = li.createScaledBitmapWithoutShadow(icon, 0); + preview = new FastBitmapDrawable( + li.createScaledBitmapWithoutShadow(icon, 0)); li.recycle(); - scale = ((float) launcher.getDeviceProfile().iconSizePx) / preview.getWidth(); + scale = ((float) launcher.getDeviceProfile().iconSizePx) / preview.getIntrinsicWidth(); dragOffset = new Point(previewPadding / 2, previewPadding / 2); @@ -149,9 +169,9 @@ public class PendingItemDragHelper extends DragPreviewProvider { launcher.getWorkspace().prepareDragWithProvider(this); int dragLayerX = screenPos.x + previewBounds.left - + (int) ((scale * preview.getWidth() - preview.getWidth()) / 2); + + (int) ((scale * preview.getIntrinsicWidth() - preview.getIntrinsicWidth()) / 2); int dragLayerY = screenPos.y + previewBounds.top - + (int) ((scale * preview.getHeight() - preview.getHeight()) / 2); + + (int) ((scale * preview.getIntrinsicHeight() - preview.getIntrinsicHeight()) / 2); // Start the drag launcher.getDragController().startDrag(preview, draggableView, dragLayerX, dragLayerY, diff --git a/src/com/android/launcher3/widget/WidgetCell.java b/src/com/android/launcher3/widget/WidgetCell.java index 229df50288..5328041d16 100644 --- a/src/com/android/launcher3/widget/WidgetCell.java +++ b/src/com/android/launcher3/widget/WidgetCell.java @@ -18,10 +18,10 @@ package com.android.launcher3.widget; import static com.android.launcher3.Utilities.ATLEAST_S; -import android.appwidget.AppWidgetHostView; import android.content.Context; import android.content.res.Resources; import android.graphics.Bitmap; +import android.graphics.drawable.Drawable; import android.os.CancellationSignal; import android.util.AttributeSet; import android.util.Log; @@ -35,11 +35,15 @@ import android.widget.LinearLayout; import android.widget.RemoteViews; import android.widget.TextView; +import androidx.annotation.Nullable; + import com.android.launcher3.BaseActivity; import com.android.launcher3.CheckLongPressHelper; import com.android.launcher3.DeviceProfile; +import com.android.launcher3.FastBitmapDrawable; import com.android.launcher3.R; import com.android.launcher3.WidgetPreviewLoader; +import com.android.launcher3.dragndrop.AppWidgetHostViewDrawable; import com.android.launcher3.icons.BaseIconFactory; import com.android.launcher3.icons.BitmapRenderer; import com.android.launcher3.model.WidgetItem; @@ -84,14 +88,14 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener { private boolean mAnimatePreview = true; private boolean mApplyBitmapDeferred = false; - private Bitmap mDeferredBitmap; + private Drawable mDeferredDrawable; protected final BaseActivity mActivity; protected final DeviceProfile mDeviceProfile; private final CheckLongPressHelper mLongPressHelper; private RemoteViews mPreview; - private AppWidgetHostView mPreviewAppWidgetHostView; + private LauncherAppWidgetHostView mAppWidgetHostViewPreview; public WidgetCell(Context context) { this(context, null); @@ -147,7 +151,7 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener { Log.d(TAG, "reset called on:" + mWidgetName.getText()); } mWidgetImage.animate().cancel(); - mWidgetImage.setBitmap(null, null); + mWidgetImage.setDrawable(null, null); mWidgetName.setText(null); mWidgetDims.setText(null); mWidgetDescription.setText(null); @@ -159,7 +163,7 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener { mActiveRequest = null; } mPreview = null; - mPreviewAppWidgetHostView = null; + mAppWidgetHostViewPreview = null; } public void applyFromCellItem(WidgetItem item, WidgetPreviewLoader loader) { @@ -194,7 +198,7 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener { && mPreview == null && item.widgetInfo != null && item.widgetInfo.previewLayout != Resources.ID_NULL) { - mPreviewAppWidgetHostView = new AppWidgetHostView(getContext()); + mAppWidgetHostViewPreview = new LauncherAppWidgetHostView(getContext()); LauncherAppWidgetProviderInfo launcherAppWidgetProviderInfo = LauncherAppWidgetProviderInfo.fromProviderInfo(getContext(), item.widgetInfo.clone()); @@ -202,11 +206,11 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener { // rendering a preview layout for work profile apps yet. For non-work profile layout, a // proper solution is to use RemoteViews(PackageName, LayoutId). launcherAppWidgetProviderInfo.initialLayout = item.widgetInfo.previewLayout; - mPreviewAppWidgetHostView.setAppWidget(/* appWidgetId= */ -1, + mAppWidgetHostViewPreview.setAppWidget(/* appWidgetId= */ -1, launcherAppWidgetProviderInfo); - mPreviewAppWidgetHostView.setPadding(/* left= */ 0, /* top= */0, /* right= */ + mAppWidgetHostViewPreview.setPadding(/* left= */ 0, /* top= */0, /* right= */ 0, /* bottom= */ 0); - mPreviewAppWidgetHostView.updateAppWidget(/* remoteViews= */ null); + mAppWidgetHostViewPreview.updateAppWidget(/* remoteViews= */ null); } } @@ -214,6 +218,11 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener { return mWidgetImage; } + @Nullable + public LauncherAppWidgetHostView getAppWidgetHostViewPreview() { + return mAppWidgetHostViewPreview; + } + /** * Sets if applying bitmap preview should be deferred. The UI will still load the bitmap, but * will not cause invalidate, so that when deferring is disabled later, all the bitmaps are @@ -223,9 +232,9 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener { public void setApplyBitmapDeferred(boolean isDeferred) { if (mApplyBitmapDeferred != isDeferred) { mApplyBitmapDeferred = isDeferred; - if (!mApplyBitmapDeferred && mDeferredBitmap != null) { - applyPreview(mDeferredBitmap); - mDeferredBitmap = null; + if (!mApplyBitmapDeferred && mDeferredDrawable != null) { + applyPreview(mDeferredDrawable); + mDeferredDrawable = null; } } } @@ -235,17 +244,21 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener { } public void applyPreview(Bitmap bitmap) { + applyPreview(new FastBitmapDrawable(bitmap)); + } + + private void applyPreview(Drawable drawable) { if (mApplyBitmapDeferred) { - mDeferredBitmap = bitmap; + mDeferredDrawable = drawable; return; } - if (bitmap != null) { + if (drawable != null) { LayoutParams layoutParams = (LayoutParams) mWidgetImage.getLayoutParams(); - layoutParams.width = bitmap.getWidth(); - layoutParams.height = bitmap.getHeight(); + layoutParams.width = drawable.getIntrinsicWidth(); + layoutParams.height = drawable.getIntrinsicHeight(); mWidgetImage.setLayoutParams(layoutParams); - mWidgetImage.setBitmap(bitmap, mWidgetPreviewLoader.getBadgeForUser(mItem.user, + mWidgetImage.setDrawable(drawable, mWidgetPreviewLoader.getBadgeForUser(mItem.user, BaseIconFactory.getBadgeSizeForIconSize(mDeviceProfile.allAppsIconSizePx))); if (mAnimatePreview) { mWidgetImage.setAlpha(0f); @@ -262,18 +275,26 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener { Bitmap preview = generateFromRemoteViews( mActivity, mPreview, mItem.widgetInfo, mPresetPreviewSize, new int[1]); if (preview != null) { - applyPreview(preview); + applyPreview(new FastBitmapDrawable(preview)); return; } } - if (mPreviewAppWidgetHostView != null) { - Bitmap preview = generateFromView(mActivity, mPreviewAppWidgetHostView, - mItem.widgetInfo, mPreviewWidth, new int[1]); - if (preview != null) { - applyPreview(preview); - return; - } + if (mAppWidgetHostViewPreview != null) { + DeviceProfile dp = mActivity.getDeviceProfile(); + int viewWidth = dp.cellWidthPx * mItem.spanX; + int viewHeight = dp.cellHeightPx * mItem.spanY; + + mAppWidgetHostViewPreview.measure( + MeasureSpec.makeMeasureSpec(viewWidth, MeasureSpec.EXACTLY), + MeasureSpec.makeMeasureSpec(viewHeight, MeasureSpec.EXACTLY)); + + viewWidth = mAppWidgetHostViewPreview.getMeasuredWidth(); + viewHeight = mAppWidgetHostViewPreview.getMeasuredHeight(); + mAppWidgetHostViewPreview.layout(0, 0, viewWidth, viewHeight); + Drawable drawable = new AppWidgetHostViewDrawable(mAppWidgetHostViewPreview); + applyPreview(drawable); + return; } if (mActiveRequest != null) { return; diff --git a/src/com/android/launcher3/widget/WidgetImageView.java b/src/com/android/launcher3/widget/WidgetImageView.java index df2bcffc16..39d701ce5b 100644 --- a/src/com/android/launcher3/widget/WidgetImageView.java +++ b/src/com/android/launcher3/widget/WidgetImageView.java @@ -17,9 +17,7 @@ package com.android.launcher3.widget; import android.content.Context; -import android.graphics.Bitmap; import android.graphics.Canvas; -import android.graphics.Paint; import android.graphics.Rect; import android.graphics.RectF; import android.graphics.drawable.Drawable; @@ -35,11 +33,10 @@ import com.android.launcher3.Utilities; */ public class WidgetImageView extends View { - private final Paint mPaint = new Paint(Paint.ANTI_ALIAS_FLAG | Paint.FILTER_BITMAP_FLAG); private final RectF mDstRectF = new RectF(); private final int mBadgeMargin; - private Bitmap mBitmap; + private Drawable mDrawable; private Drawable mBadge; public WidgetImageView(Context context) { @@ -57,21 +54,22 @@ public class WidgetImageView extends View { .getDimensionPixelSize(R.dimen.profile_badge_margin); } - public void setBitmap(Bitmap bitmap, Drawable badge) { - mBitmap = bitmap; + public void setDrawable(Drawable drawable, Drawable badge) { + mDrawable = drawable; mBadge = badge; invalidate(); } - public Bitmap getBitmap() { - return mBitmap; + public Drawable getDrawable() { + return mDrawable; } @Override protected void onDraw(Canvas canvas) { - if (mBitmap != null) { + if (mDrawable != null) { updateDstRectF(); - canvas.drawBitmap(mBitmap, null, mDstRectF, mPaint); + mDrawable.setBounds(getBitmapBounds()); + mDrawable.draw(canvas); // Only draw the badge if a preview was drawn. if (mBadge != null) { @@ -91,11 +89,11 @@ public class WidgetImageView extends View { private void updateDstRectF() { float myWidth = getWidth(); float myHeight = getHeight(); - float bitmapWidth = mBitmap.getWidth(); + float bitmapWidth = mDrawable.getIntrinsicWidth(); final float scale = bitmapWidth > myWidth ? myWidth / bitmapWidth : 1; float scaledWidth = bitmapWidth * scale; - float scaledHeight = mBitmap.getHeight() * scale; + float scaledHeight = mDrawable.getIntrinsicHeight() * scale; mDstRectF.left = (myWidth - scaledWidth) / 2; mDstRectF.right = (myWidth + scaledWidth) / 2; From 1632752a72e7e61ca219b6a97c5f142c07828e33 Mon Sep 17 00:00:00 2001 From: Alina Zaidi Date: Mon, 15 Mar 2021 07:00:49 +0000 Subject: [PATCH 2/8] Have an interface for WidgetsSearchBar so Nexus Launcher can override the search bar. Test: Tested prototype locally. Bug: b/157286785 Change-Id: I263063a451862755efe3d6e4a5a2eb69f2ea29b8 --- res/layout/widgets_search_bar.xml | 7 +- .../launcher3/config/FeatureFlags.java | 3 + .../widget/picker/WidgetsFullSheet.java | 3 +- .../widget/picker/WidgetsRecyclerView.java | 4 +- .../search/LauncherWidgetsSearchBar.java | 77 +++++++++++++++++++ .../picker/search/WidgetsSearchBar.java | 57 ++------------ 6 files changed, 95 insertions(+), 56 deletions(-) create mode 100644 src/com/android/launcher3/widget/picker/search/LauncherWidgetsSearchBar.java diff --git a/res/layout/widgets_search_bar.xml b/res/layout/widgets_search_bar.xml index 252637d9cf..450e5f1ece 100644 --- a/res/layout/widgets_search_bar.xml +++ b/res/layout/widgets_search_bar.xml @@ -1,5 +1,5 @@ - + android:padding="12dp"> - \ No newline at end of file + \ No newline at end of file diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java index 48e41d5fda..c1dd809855 100644 --- a/src/com/android/launcher3/config/FeatureFlags.java +++ b/src/com/android/launcher3/config/FeatureFlags.java @@ -140,6 +140,9 @@ public final class FeatureFlags { public static final BooleanFlag ENABLE_OVERVIEW_SELECTIONS = new DeviceFlag( "ENABLE_OVERVIEW_SELECTIONS", true, "Show Select Mode button in Overview Actions"); + public static final BooleanFlag ENABLE_WIDGETS_PICKER_AIAI_SEARCH = new DeviceFlag( + "ENABLE_WIDGETS_PICKER_AIAI_SEARCH", false, "Enable AiAi search in the widgets picker"); + public static final BooleanFlag ENABLE_OVERVIEW_SHARE = getDebugFlag( "ENABLE_OVERVIEW_SHARE", false, "Show Share button in Overview Actions"); diff --git a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java index 6b3c71ab36..92994be568 100644 --- a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java +++ b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java @@ -439,7 +439,8 @@ public class WidgetsFullSheet extends BaseWidgetSheet public int getHeaderViewHeight() { return measureHeightWithVerticalMargins(mSearchAndRecommendationViewHolder.mCollapseHandle) + measureHeightWithVerticalMargins(mSearchAndRecommendationViewHolder.mHeaderTitle) - + measureHeightWithVerticalMargins(mSearchAndRecommendationViewHolder.mSearchBar); + + measureHeightWithVerticalMargins( + (View) mSearchAndRecommendationViewHolder.mSearchBar); } /** private the height, in pixel, + the vertical margins of a given view. */ diff --git a/src/com/android/launcher3/widget/picker/WidgetsRecyclerView.java b/src/com/android/launcher3/widget/picker/WidgetsRecyclerView.java index 9ab64247a7..12d3f11919 100644 --- a/src/com/android/launcher3/widget/picker/WidgetsRecyclerView.java +++ b/src/com/android/launcher3/widget/picker/WidgetsRecyclerView.java @@ -34,6 +34,7 @@ import com.android.launcher3.views.ActivityContext; import com.android.launcher3.widget.model.WidgetsListBaseEntry; import com.android.launcher3.widget.model.WidgetsListContentEntry; import com.android.launcher3.widget.model.WidgetsListHeaderEntry; +import com.android.launcher3.widget.model.WidgetsListSearchHeaderEntry; /** * The widgets recycler view. @@ -219,7 +220,8 @@ public class WidgetsRecyclerView extends BaseRecyclerView implements OnItemTouch int totalItemsHeight = 0; for (int i = 0; i < untilIndex; i++) { WidgetsListBaseEntry entry = mAdapter.getItems().get(i); - if (entry instanceof WidgetsListHeaderEntry) { + if (entry instanceof WidgetsListHeaderEntry || + entry instanceof WidgetsListSearchHeaderEntry) { totalItemsHeight += mEstimatedWidgetListHeaderHeight; } else if (entry instanceof WidgetsListContentEntry) { totalItemsHeight += mLastVisibleWidgetContentTableHeight; diff --git a/src/com/android/launcher3/widget/picker/search/LauncherWidgetsSearchBar.java b/src/com/android/launcher3/widget/picker/search/LauncherWidgetsSearchBar.java new file mode 100644 index 0000000000..d68e87e3d6 --- /dev/null +++ b/src/com/android/launcher3/widget/picker/search/LauncherWidgetsSearchBar.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.widget.picker.search; + +import android.content.Context; +import android.util.AttributeSet; +import android.widget.EditText; +import android.widget.ImageButton; +import android.widget.LinearLayout; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + +import com.android.launcher3.R; +import com.android.launcher3.search.SearchAlgorithm; +import com.android.launcher3.widget.model.WidgetsListBaseEntry; + +import java.util.List; + +/** + * View for a search bar with an edit text with a cancel button. + */ +public class LauncherWidgetsSearchBar extends LinearLayout implements WidgetsSearchBar { + private WidgetsSearchBarController mController; + private EditText mEditText; + private ImageButton mCancelButton; + + public LauncherWidgetsSearchBar(Context context) { + this(context, null, 0); + } + + public LauncherWidgetsSearchBar(@NonNull Context context, + @Nullable AttributeSet attrs) { + this(context, attrs, 0); + } + + public LauncherWidgetsSearchBar(@NonNull Context context, @Nullable AttributeSet attrs, + int defStyleAttr) { + super(context, attrs, defStyleAttr); + } + + @Override + public void initialize(List allWidgets, + SearchModeListener searchModeListener) { + SearchAlgorithm algo = + new SimpleWidgetsSearchAlgorithm(new SimpleWidgetsSearchPipeline(allWidgets)); + mController = new WidgetsSearchBarController( + algo, mEditText, mCancelButton, searchModeListener); + } + + @Override + protected void onFinishInflate() { + super.onFinishInflate(); + mEditText = findViewById(R.id.widgets_search_bar_edit_text); + mCancelButton = findViewById(R.id.widgets_search_cancel_button); + } + + @Override + protected void onDetachedFromWindow() { + super.onDetachedFromWindow(); + mController.onDestroy(); + } +} diff --git a/src/com/android/launcher3/widget/picker/search/WidgetsSearchBar.java b/src/com/android/launcher3/widget/picker/search/WidgetsSearchBar.java index d8e9733ce5..af6dc48aae 100644 --- a/src/com/android/launcher3/widget/picker/search/WidgetsSearchBar.java +++ b/src/com/android/launcher3/widget/picker/search/WidgetsSearchBar.java @@ -16,64 +16,21 @@ package com.android.launcher3.widget.picker.search; -import android.content.Context; -import android.util.AttributeSet; -import android.widget.EditText; -import android.widget.ImageButton; -import android.widget.LinearLayout; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - -import com.android.launcher3.R; -import com.android.launcher3.search.SearchAlgorithm; import com.android.launcher3.widget.model.WidgetsListBaseEntry; import java.util.List; /** - * View for a search bar with an edit text with a cancel button. + * Interface for a widgets picker search bar. */ -public class WidgetsSearchBar extends LinearLayout { - private WidgetsSearchBarController mController; - private EditText mEditText; - private ImageButton mCancelButton; - - public WidgetsSearchBar(Context context) { - this(context, null, 0); - } - - public WidgetsSearchBar(@NonNull Context context, - @Nullable AttributeSet attrs) { - this(context, attrs, 0); - } - - public WidgetsSearchBar(@NonNull Context context, @Nullable AttributeSet attrs, - int defStyleAttr) { - super(context, attrs, defStyleAttr); - } - +public interface WidgetsSearchBar { /** * Attaches a controller to the search bar which interacts with {@code searchModeListener}. */ - public void initialize(List allWidgets, - SearchModeListener searchModeListener) { - SearchAlgorithm algo = - new SimpleWidgetsSearchAlgorithm(new SimpleWidgetsSearchPipeline(allWidgets)); - mController = new WidgetsSearchBarController( - algo, mEditText, mCancelButton, searchModeListener); - } + void initialize(List allWidgets, SearchModeListener searchModeListener); - @Override - protected void onFinishInflate() { - super.onFinishInflate(); - mEditText = findViewById(R.id.widgets_search_bar_edit_text); - mCancelButton = findViewById(R.id.widgets_search_cancel_button); - } - - @Override - protected void onDetachedFromWindow() { - super.onDetachedFromWindow(); - mController.onDestroy(); - } + /** + * Sets the vertical location, in pixels, of this search bar relative to its top position. + */ + void setTranslationY(float translationY); } From c42e49f535177304aa1a5306a4fc7870660de5b2 Mon Sep 17 00:00:00 2001 From: Yogisha Dixit Date: Mon, 1 Mar 2021 14:07:54 +0000 Subject: [PATCH 3/8] Use targetCell[Width|Height] as default widget size. Test: Created a widget and manually tested the following scenarios - targetCell[Width|Height] not specified - targetCell[Width|Height] larger than maxResize[Width|Height] - targetCell[Width|Height] smaller than minResize[Width|Height] - targetCell[Width|Height] within max/min bounds Bug: 179807199 Change-Id: I55a9dd2f94aa450ba6362301f7ac5ba4ee42f44d --- .../widget/LauncherAppWidgetProviderInfo.java | 47 +++++++++++++++---- 1 file changed, 38 insertions(+), 9 deletions(-) diff --git a/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java b/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java index ce97d2e294..8689fbfd3c 100644 --- a/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java +++ b/src/com/android/launcher3/widget/LauncherAppWidgetProviderInfo.java @@ -1,5 +1,7 @@ package com.android.launcher3.widget; +import static com.android.launcher3.Utilities.ATLEAST_S; + import android.appwidget.AppWidgetHostView; import android.appwidget.AppWidgetProviderInfo; import android.content.ComponentName; @@ -33,6 +35,8 @@ public class LauncherAppWidgetProviderInfo extends AppWidgetProviderInfo public int spanY; public int minSpanX; public int minSpanY; + public int maxSpanX; + public int maxSpanY; public static LauncherAppWidgetProviderInfo fromProviderInfo(Context context, AppWidgetProviderInfo info) { @@ -78,15 +82,40 @@ public class LauncherAppWidgetProviderInfo extends AppWidgetProviderInfo || !idp.portraitProfile.shouldInsetWidgets()) { AppWidgetHostView.getDefaultPaddingForWidget(context, provider, widgetPadding); } - spanX = Math.max(1, (int) Math.ceil( - (minWidth + widgetPadding.left + widgetPadding.right) / smallestCellWidth)); - spanY = Math.max(1, (int) Math.ceil( - (minHeight + widgetPadding.top + widgetPadding.bottom) / smallestCellHeight)); - minSpanX = Math.max(1, (int) Math.ceil( - (minResizeWidth + widgetPadding.left + widgetPadding.right) / smallestCellWidth)); - minSpanY = Math.max(1, (int) Math.ceil( - (minResizeHeight + widgetPadding.top + widgetPadding.bottom) / smallestCellHeight)); + minSpanX = getSpanX(widgetPadding, minResizeWidth, smallestCellWidth); + minSpanY = getSpanY(widgetPadding, minResizeHeight, smallestCellHeight); + + // Use maxResizeWidth/Height if they are defined and we're on S or above. + maxSpanX = + (ATLEAST_S && maxResizeWidth > 0) + ? getSpanX(widgetPadding, maxResizeWidth, smallestCellWidth) + : idp.numColumns; + maxSpanY = + (ATLEAST_S && maxResizeHeight > 0) + ? getSpanY(widgetPadding, maxResizeHeight, smallestCellHeight) + : idp.numRows; + + // Use targetCellWidth/Height if it is within the min/max ranges and we're on S or above. + // Otherwise, fall back to minWidth/Height. + if (ATLEAST_S && targetCellWidth >= minSpanX && targetCellWidth <= maxSpanX + && targetCellHeight >= minSpanY && targetCellHeight <= maxSpanY) { + spanX = targetCellWidth; + spanY = targetCellHeight; + } else { + spanX = getSpanX(widgetPadding, minWidth, smallestCellWidth); + spanY = getSpanY(widgetPadding, minHeight, smallestCellHeight); + } + } + + private int getSpanX(Rect widgetPadding, int widgetWidth, float cellWidth) { + return Math.max(1, (int) Math.ceil( + (widgetWidth + widgetPadding.left + widgetPadding.right) / cellWidth)); + } + + private int getSpanY(Rect widgetPadding, int widgetHeight, float cellHeight) { + return Math.max(1, (int) Math.ceil( + (widgetHeight + widgetPadding.top + widgetPadding.bottom) / cellHeight)); } public String getLabel(PackageManager packageManager) { @@ -124,4 +153,4 @@ public class LauncherAppWidgetProviderInfo extends AppWidgetProviderInfo public Drawable getFullResIcon(IconCache cache) { return cache.getFullResIcon(provider.getPackageName(), icon); } -} +} \ No newline at end of file From ecd12b32c9752662657ce4cab232f6e72782c4aa Mon Sep 17 00:00:00 2001 From: Alex Chau Date: Thu, 11 Mar 2021 20:16:54 +0000 Subject: [PATCH 4/8] Show overview as grid in fallback recents - Replace mShowAsGrid with state specific mOverviewGridEnabled and mCurrentGestureEndTarget - Avoid showing invisible home task in grid - Fix quick switch out of orientation in fallback recents - Add a HOME state to switch to when starting home, to avoid showing grid overview briefly in quick switch - Separate clear all button and overview actions handling - Always maintain first task's fullscreen translation at 0 to avoid jumping when mOverviewFullscreenEnabled changes - Moved fullscreenTranslation calculation to RecentsView - Added GestureEndTarget -> BaseState translation to allow querying displayOverviewAsGrid for a displayOverviewTasksAsGrid Bug: 174464863 Test: Launch overveiw from home, launch overveiw from app, launch into app, test for both small and large screens Change-Id: Iee06d94d3067ea45cadd2051717223ddc0e6e70c --- .../BaseRecentsViewStateController.java | 6 +- .../states/BackgroundAppState.java | 3 +- .../uioverrides/states/OverviewState.java | 6 +- .../android/quickstep/AbsSwipeUpHandler.java | 26 +++-- .../quickstep/BaseActivityInterface.java | 5 + .../quickstep/FallbackActivityInterface.java | 23 ++++ .../quickstep/FallbackSwipeHandler.java | 3 +- .../com/android/quickstep/GestureState.java | 4 +- .../quickstep/LauncherActivityInterface.java | 17 ++- .../quickstep/LauncherSwipeHandlerV2.java | 3 +- .../FallbackRecentsStateController.java | 10 +- .../fallback/FallbackRecentsView.java | 10 +- .../quickstep/fallback/RecentsState.java | 38 +++++- .../inputconsumers/OverviewInputConsumer.java | 3 +- .../quickstep/views/LauncherRecentsView.java | 4 +- .../android/quickstep/views/RecentsView.java | 110 ++++++++++++------ .../com/android/quickstep/views/TaskView.java | 32 ++--- src/com/android/launcher3/LauncherState.java | 7 -- .../launcher3/statemanager/BaseState.java | 9 ++ 19 files changed, 222 insertions(+), 97 deletions(-) diff --git a/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java b/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java index bedaefa5d6..d65c59e067 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java +++ b/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java @@ -76,8 +76,8 @@ public abstract class BaseRecentsViewStateController SCRIM_PROGRESS.set(scrim, state.getOverviewScrimAlpha(mLauncher)); SCRIM_MULTIPLIER.set(scrim, 1f); getTaskModalnessProperty().set(mRecentsView, state.getOverviewModalness()); - RECENTS_GRID_PROGRESS.set(mRecentsView, state.displayOverviewTasksAsGrid(mLauncher) - ? 1f : 0f); + RECENTS_GRID_PROGRESS.set(mRecentsView, + state.displayOverviewTasksAsGrid(mLauncher.getDeviceProfile()) ? 1f : 0f); } @Override @@ -128,7 +128,7 @@ public abstract class BaseRecentsViewStateController toState.getOverviewModalness(), config.getInterpolator(ANIM_OVERVIEW_MODAL, LINEAR)); setter.setFloat(mRecentsView, RECENTS_GRID_PROGRESS, - toState.displayOverviewTasksAsGrid(mLauncher) ? 1f : 0f, LINEAR); + toState.displayOverviewTasksAsGrid(mLauncher.getDeviceProfile()) ? 1f : 0f, LINEAR); } abstract FloatProperty getTaskModalnessProperty(); diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java b/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java index 2ad718b63f..fb58bf6422 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java +++ b/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java @@ -20,6 +20,7 @@ import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_BACKG import android.content.Context; import com.android.launcher3.BaseDraggingActivity; +import com.android.launcher3.DeviceProfile; import com.android.launcher3.Launcher; import com.android.launcher3.allapps.AllAppsTransitionController; import com.android.quickstep.util.LayoutUtils; @@ -76,7 +77,7 @@ public class BackgroundAppState extends OverviewState { } @Override - public boolean displayOverviewTasksAsGrid(Launcher launcher) { + public boolean displayOverviewTasksAsGrid(DeviceProfile deviceProfile) { return false; } diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java index 372784a2c0..5a28cfdc0e 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java +++ b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java @@ -123,7 +123,7 @@ public class OverviewState extends LauncherState { @Override public int getVisibleElements(Launcher launcher) { - return displayOverviewTasksAsGrid(launcher) ? CLEAR_ALL_BUTTON + return displayOverviewTasksAsGrid(launcher.getDeviceProfile()) ? CLEAR_ALL_BUTTON : CLEAR_ALL_BUTTON | OVERVIEW_ACTIONS; } @@ -133,8 +133,8 @@ public class OverviewState extends LauncherState { } @Override - public boolean displayOverviewTasksAsGrid(Launcher launcher) { - return launcher.getDeviceProfile().isTablet && FeatureFlags.ENABLE_OVERVIEW_GRID.get(); + public boolean displayOverviewTasksAsGrid(DeviceProfile deviceProfile) { + return deviceProfile.isTablet && FeatureFlags.ENABLE_OVERVIEW_GRID.get(); } @Override diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java index 7df86b99c7..a2f15f5ff3 100644 --- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java +++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java @@ -80,9 +80,9 @@ import com.android.launcher3.DeviceProfile; import com.android.launcher3.R; import com.android.launcher3.Utilities; import com.android.launcher3.anim.AnimationSuccessListener; -import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.logging.StatsLogManager; import com.android.launcher3.logging.StatsLogManager.StatsLogger; +import com.android.launcher3.statemanager.BaseState; import com.android.launcher3.statemanager.StatefulActivity; import com.android.launcher3.tracing.InputConsumerProto; import com.android.launcher3.tracing.SwipeHandlerProto; @@ -124,14 +124,15 @@ import java.util.function.Consumer; * Handles the navigation gestures when Launcher is the default home activity. */ @TargetApi(Build.VERSION_CODES.R) -public abstract class AbsSwipeUpHandler, Q extends RecentsView> +public abstract class AbsSwipeUpHandler, + Q extends RecentsView, S extends BaseState> extends SwipeUpAnimationLogic implements OnApplyWindowInsetsListener, RecentsAnimationCallbacks.RecentsAnimationListener { private static final String TAG = "AbsSwipeUpHandler"; private static final String[] STATE_NAMES = DEBUG_STATES ? new String[17] : null; - protected final BaseActivityInterface mActivityInterface; + protected final BaseActivityInterface mActivityInterface; protected final InputConsumerProxy mInputConsumerProxy; protected final ActivityInitListener mActivityInitListener; // Callbacks to be made once the recents animation starts @@ -934,9 +935,15 @@ public abstract class AbsSwipeUpHandler, Q extends duration = Math.min(MAX_SWIPE_DURATION, 2 * baseDuration); } } - Interpolator interpolator = - endTarget == RECENTS ? (mDp.isTablet && FeatureFlags.ENABLE_OVERVIEW_GRID.get() - ? ACCEL_DEACCEL : OVERSHOOT_1_2) : DEACCEL; + Interpolator interpolator; + S state = mActivityInterface.stateFromGestureEndTarget(endTarget); + if (state.displayOverviewTasksAsGrid(mActivity.getDeviceProfile())) { + interpolator = ACCEL_DEACCEL; + } else if (endTarget == RECENTS) { + interpolator = OVERSHOOT_1_2; + } else { + interpolator = DEACCEL; + } if (endTarget.isLauncher) { mInputConsumerProxy.enable(); @@ -1126,8 +1133,9 @@ public abstract class AbsSwipeUpHandler, Q extends } }); animatorSet.play(windowAnim); - if (mRecentsView != null && mDp.isTablet && FeatureFlags.ENABLE_OVERVIEW_GRID.get() - && mGestureState.getEndTarget() == RECENTS) { + S state = mActivityInterface.stateFromGestureEndTarget(mGestureState.getEndTarget()); + if (mRecentsView != null && state.displayOverviewTasksAsGrid( + mActivity.getDeviceProfile())) { animatorSet.play(ObjectAnimator.ofFloat(mRecentsView, RECENTS_GRID_PROGRESS, 1)); animatorSet.play(mTaskViewSimulator.gridProgress.animateToValue(0, 1)); } @@ -1756,7 +1764,7 @@ public abstract class AbsSwipeUpHandler, Q extends public interface Factory { - AbsSwipeUpHandler, RecentsView> newHandler( + AbsSwipeUpHandler newHandler( GestureState gestureState, long touchTimeMs, boolean continuingLastGesture); } } diff --git a/quickstep/src/com/android/quickstep/BaseActivityInterface.java b/quickstep/src/com/android/quickstep/BaseActivityInterface.java index 7c1d9fadbb..5942b3aaf4 100644 --- a/quickstep/src/com/android/quickstep/BaseActivityInterface.java +++ b/quickstep/src/com/android/quickstep/BaseActivityInterface.java @@ -306,6 +306,11 @@ public abstract class BaseActivityInterface callback) { + notifyRecentsOfOrientation(deviceState.getRotationTouchHelper()); DefaultAnimationFactory factory = new DefaultAnimationFactory(callback); factory.initUI(); return factory; @@ -154,4 +156,25 @@ public final class FallbackActivityInterface extends } activity.getOverviewPanel().startHome(); } + + @Override + public RecentsState stateFromGestureEndTarget(GestureState.GestureEndTarget endTarget) { + switch (endTarget) { + case RECENTS: + return DEFAULT; + case NEW_TASK: + case LAST_TASK: + return BACKGROUND_APP; + case HOME: + default: + return HOME; + } + } + + private void notifyRecentsOfOrientation(RotationTouchHelper rotationTouchHelper) { + // reset layout on swipe to home + RecentsView recentsView = getCreatedActivity().getOverviewPanel(); + recentsView.setLayoutRotation(rotationTouchHelper.getCurrentActiveRotation(), + rotationTouchHelper.getDisplayRotation()); + } } diff --git a/quickstep/src/com/android/quickstep/FallbackSwipeHandler.java b/quickstep/src/com/android/quickstep/FallbackSwipeHandler.java index a80c111d69..7e4a352d93 100644 --- a/quickstep/src/com/android/quickstep/FallbackSwipeHandler.java +++ b/quickstep/src/com/android/quickstep/FallbackSwipeHandler.java @@ -55,6 +55,7 @@ import com.android.launcher3.anim.AnimatorPlaybackController; import com.android.launcher3.anim.PendingAnimation; import com.android.launcher3.anim.SpringAnimationBuilder; import com.android.quickstep.fallback.FallbackRecentsView; +import com.android.quickstep.fallback.RecentsState; import com.android.quickstep.util.RectFSpringAnim; import com.android.quickstep.util.TransformParams; import com.android.quickstep.util.TransformParams.BuilderProxy; @@ -73,7 +74,7 @@ import java.util.function.Consumer; */ @TargetApi(Build.VERSION_CODES.R) public class FallbackSwipeHandler extends - AbsSwipeUpHandler { + AbsSwipeUpHandler { /** * Message used for receiving gesture nav contract information. We use a static messenger to diff --git a/quickstep/src/com/android/quickstep/GestureState.java b/quickstep/src/com/android/quickstep/GestureState.java index 8d67ee697a..ebdc1e6454 100644 --- a/quickstep/src/com/android/quickstep/GestureState.java +++ b/quickstep/src/com/android/quickstep/GestureState.java @@ -25,6 +25,7 @@ import android.app.ActivityManager; import android.content.Intent; import android.os.Build; +import com.android.launcher3.statemanager.BaseState; import com.android.launcher3.statemanager.StatefulActivity; import com.android.launcher3.tracing.GestureStateProto; import com.android.launcher3.tracing.SwipeHandlerProto; @@ -213,7 +214,8 @@ public class GestureState implements RecentsAnimationCallbacks.RecentsAnimationL /** * @return the interface to the activity handing the UI updates for this gesture. */ - public > BaseActivityInterface getActivityInterface() { + public , + T extends StatefulActivity> BaseActivityInterface getActivityInterface() { return mActivityInterface; } diff --git a/quickstep/src/com/android/quickstep/LauncherActivityInterface.java b/quickstep/src/com/android/quickstep/LauncherActivityInterface.java index 7efbfb8503..ca5765e469 100644 --- a/quickstep/src/com/android/quickstep/LauncherActivityInterface.java +++ b/quickstep/src/com/android/quickstep/LauncherActivityInterface.java @@ -18,6 +18,7 @@ package com.android.quickstep; import static com.android.launcher3.LauncherState.BACKGROUND_APP; import static com.android.launcher3.LauncherState.NORMAL; import static com.android.launcher3.LauncherState.OVERVIEW; +import static com.android.launcher3.LauncherState.QUICK_SWITCH; import static com.android.launcher3.anim.Interpolators.LINEAR; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_IME_SHOWING; @@ -270,7 +271,7 @@ public final class LauncherActivityInterface extends if (taskbarController == null) { return; } - LauncherState toState = endTarget == GestureEndTarget.RECENTS ? OVERVIEW : NORMAL; + LauncherState toState = stateFromGestureEndTarget(endTarget); taskbarController.createAnimToLauncher(toState, duration).start(); } @@ -301,4 +302,18 @@ public final class LauncherActivityInterface extends } return taskbarController.isDraggingItem(); } + + @Override + public LauncherState stateFromGestureEndTarget(GestureEndTarget endTarget) { + switch (endTarget) { + case RECENTS: + return OVERVIEW; + case NEW_TASK: + case LAST_TASK: + return QUICK_SWITCH; + case HOME: + default: + return NORMAL; + } + } } diff --git a/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java b/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java index 842fb84ff9..1ce420178f 100644 --- a/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java +++ b/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java @@ -27,6 +27,7 @@ import android.view.View; import androidx.annotation.NonNull; import com.android.launcher3.BaseQuickstepLauncher; +import com.android.launcher3.LauncherState; import com.android.launcher3.anim.AnimatorPlaybackController; import com.android.launcher3.views.FloatingIconView; import com.android.quickstep.util.RectFSpringAnim; @@ -39,7 +40,7 @@ import com.android.systemui.shared.system.InputConsumerController; * Temporary class to allow easier refactoring */ public class LauncherSwipeHandlerV2 extends - AbsSwipeUpHandler { + AbsSwipeUpHandler { public LauncherSwipeHandlerV2(Context context, RecentsAnimationDeviceState deviceState, TaskAnimationManager taskAnimationManager, GestureState gestureState, long touchTimeMs, diff --git a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java index 24a761066a..54f6ce6dc6 100644 --- a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java +++ b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java @@ -25,6 +25,7 @@ import static com.android.launcher3.states.StateAnimationConfig.PLAY_ATOMIC_OVER import static com.android.launcher3.states.StateAnimationConfig.SKIP_OVERVIEW; import static com.android.quickstep.views.RecentsView.ADJACENT_PAGE_OFFSET; import static com.android.quickstep.views.RecentsView.FULLSCREEN_PROGRESS; +import static com.android.quickstep.views.RecentsView.RECENTS_GRID_PROGRESS; import static com.android.quickstep.views.RecentsView.RECENTS_SCALE_PROPERTY; import static com.android.quickstep.views.RecentsView.TASK_MODALNESS; import static com.android.quickstep.views.RecentsView.TASK_SECONDARY_TRANSLATION; @@ -77,11 +78,12 @@ public class FallbackRecentsStateController implements StateHandler @Override public void startHome() { mActivity.startHome(); + mActivity.getStateManager().goToState(RecentsState.HOME); } /** @@ -154,6 +155,11 @@ public class FallbackRecentsView extends RecentsView super.setRunningTaskHidden(isHidden); } + @Override + protected boolean isHomeTask(TaskView taskView) { + return mHomeTaskInfo != null && taskView.hasTaskId(mHomeTaskInfo.taskId); + } + @Override public void setModalStateEnabled(boolean isModalState) { super.setModalStateEnabled(isModalState); @@ -169,6 +175,8 @@ public class FallbackRecentsView extends RecentsView @Override public void onStateTransitionStart(RecentsState toState) { setOverviewStateEnabled(true); + setOverviewGridEnabled(toState.displayOverviewTasksAsGrid(mActivity.getDeviceProfile())); + setOverviewFullscreenEnabled(toState.isFullScreen()); setFreezeViewVisibility(true); } @@ -183,7 +191,7 @@ public class FallbackRecentsView extends RecentsView super.setOverviewStateEnabled(enabled); if (enabled) { RecentsState state = mActivity.getStateManager().getState(); - setDisallowScrollToClearAll(!state.hasButtons()); + setDisallowScrollToClearAll(!state.hasClearAllButton()); } } } diff --git a/quickstep/src/com/android/quickstep/fallback/RecentsState.java b/quickstep/src/com/android/quickstep/fallback/RecentsState.java index f15a9de6f8..a9856d2dd8 100644 --- a/quickstep/src/com/android/quickstep/fallback/RecentsState.java +++ b/quickstep/src/com/android/quickstep/fallback/RecentsState.java @@ -20,6 +20,8 @@ import static com.android.launcher3.uioverrides.states.OverviewModalTaskState.ge import android.content.Context; +import com.android.launcher3.DeviceProfile; +import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.statemanager.BaseState; import com.android.quickstep.RecentsActivity; @@ -29,14 +31,19 @@ import com.android.quickstep.RecentsActivity; public class RecentsState implements BaseState { private static final int FLAG_MODAL = BaseState.getFlag(0); - private static final int FLAG_HAS_BUTTONS = BaseState.getFlag(1); + private static final int FLAG_CLEAR_ALL_BUTTON = BaseState.getFlag(1); private static final int FLAG_FULL_SCREEN = BaseState.getFlag(2); + private static final int FLAG_OVERVIEW_ACTIONS = BaseState.getFlag(3); + private static final int FLAG_SHOW_AS_GRID = BaseState.getFlag(4); - public static final RecentsState DEFAULT = new RecentsState(0, FLAG_HAS_BUTTONS); + public static final RecentsState DEFAULT = new RecentsState(0, + FLAG_CLEAR_ALL_BUTTON | FLAG_OVERVIEW_ACTIONS | FLAG_SHOW_AS_GRID); public static final RecentsState MODAL_TASK = new ModalState(1, - FLAG_DISABLE_RESTORE | FLAG_HAS_BUTTONS | FLAG_MODAL); + FLAG_DISABLE_RESTORE | FLAG_CLEAR_ALL_BUTTON | FLAG_OVERVIEW_ACTIONS | FLAG_MODAL + | FLAG_SHOW_AS_GRID); public static final RecentsState BACKGROUND_APP = new BackgroundAppState(2, FLAG_DISABLE_RESTORE | FLAG_NON_INTERACTIVE | FLAG_FULL_SCREEN); + public static final RecentsState HOME = new RecentsState(3, 0); public final int ordinal; private final int mFlags; @@ -82,14 +89,35 @@ public class RecentsState implements BaseState { return hasFlag(FLAG_FULL_SCREEN); } - public boolean hasButtons() { - return hasFlag(FLAG_HAS_BUTTONS); + /** + * For this state, whether clear all button should be shown. + */ + public boolean hasClearAllButton() { + return hasFlag(FLAG_CLEAR_ALL_BUTTON); + } + + /** + * For this state, whether overview actions should be shown. + */ + public boolean hasOverviewActions(RecentsActivity activity) { + return hasFlag(FLAG_OVERVIEW_ACTIONS) && !showAsGrid(activity.getDeviceProfile()); } public float[] getOverviewScaleAndOffset(RecentsActivity activity) { return new float[] { NO_SCALE, NO_OFFSET }; } + /** + * For this state, whether tasks should layout as a grid rather than a list. + */ + public boolean displayOverviewTasksAsGrid(DeviceProfile deviceProfile) { + return hasFlag(FLAG_SHOW_AS_GRID) && showAsGrid(deviceProfile); + } + + private boolean showAsGrid(DeviceProfile deviceProfile) { + return deviceProfile.isTablet && FeatureFlags.ENABLE_OVERVIEW_GRID.get(); + } + private static class ModalState extends RecentsState { public ModalState(int id, int flags) { diff --git a/quickstep/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java index cee33639b3..fa9e0ec1ab 100644 --- a/quickstep/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java +++ b/quickstep/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java @@ -24,6 +24,7 @@ import android.view.MotionEvent; import androidx.annotation.Nullable; import com.android.launcher3.Utilities; +import com.android.launcher3.statemanager.BaseState; import com.android.launcher3.statemanager.StatefulActivity; import com.android.launcher3.testing.TestLogging; import com.android.launcher3.testing.TestProtocol; @@ -38,7 +39,7 @@ import com.android.systemui.shared.system.InputMonitorCompat; /** * Input consumer for handling touch on the recents/Launcher activity. */ -public class OverviewInputConsumer> +public class OverviewInputConsumer, T extends StatefulActivity> implements InputConsumer { private final T mActivity; diff --git a/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java b/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java index 9d31190eb6..da24b594b4 100644 --- a/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java +++ b/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java @@ -150,6 +150,8 @@ public class LauncherRecentsView extends RecentsView @Override public void onStateTransitionStart(LauncherState toState) { setOverviewStateEnabled(toState.overviewUi); + setOverviewGridEnabled(toState.displayOverviewTasksAsGrid(mActivity.getDeviceProfile())); + setOverviewFullscreenEnabled(toState.getOverviewFullscreenProgress() == 1); setFreezeViewVisibility(true); } @@ -160,8 +162,6 @@ public class LauncherRecentsView extends RecentsView reset(); } setOverlayEnabled(finalState == OVERVIEW || finalState == OVERVIEW_MODAL_TASK); - setOverviewGridEnabled(finalState.displayOverviewTasksAsGrid(mActivity)); - setOverviewFullscreenEnabled(finalState.getOverviewFullscreenProgress() == 1); setFreezeViewVisibility(false); } diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java index f5b62d5828..8f35ea6e65 100644 --- a/quickstep/src/com/android/quickstep/views/RecentsView.java +++ b/quickstep/src/com/android/quickstep/views/RecentsView.java @@ -337,7 +337,9 @@ public abstract class RecentsView extends PagedView private float mTaskViewsPrimaryTranslation = 0; // Progress from 0 to 1 where 0 is a carousel and 1 is a 2 row grid. private float mGridProgress = 0; - private boolean mShowAsGrid; + + // The GestureEndTarget that is still in progress. + private GestureState.GestureEndTarget mCurrentGestureEndTarget; /** * TODO: Call reloadIdNeeded in onTaskStackChanged. @@ -554,11 +556,6 @@ public abstract class RecentsView extends PagedView mLiveTileTaskViewSimulator.recentsViewScale.value = 1; mLiveTileTaskViewSimulator.setOrientationState(mOrientationState); mLiveTileTaskViewSimulator.setDrawsBelowRecents(true); - - mShowAsGrid = - mActivity.getDeviceProfile().isTablet && FeatureFlags.ENABLE_OVERVIEW_GRID.get(); - mActivity.addOnDeviceProfileChangeListener(newDp -> - mShowAsGrid = newDp.isTablet && FeatureFlags.ENABLE_OVERVIEW_GRID.get()); } public OverScroller getScroller() { @@ -731,7 +728,7 @@ public abstract class RecentsView extends PagedView } public boolean isTaskViewVisible(TaskView tv) { - if (mShowAsGrid) { + if (showAsGrid()) { int screenStart = mOrientationHandler.getPrimaryScroll(this); int screenEnd = screenStart + mOrientationHandler.getMeasuredSize(this); return isTaskViewWithinBounds(tv, screenStart, screenEnd); @@ -743,9 +740,9 @@ public abstract class RecentsView extends PagedView private boolean isTaskViewWithinBounds(TaskView tv, int start, int end) { int taskStart = mOrientationHandler.getChildStart(tv) + (int) tv.getOffsetAdjustment( - mOverviewFullscreenEnabled, mOverviewGridEnabled); + mOverviewFullscreenEnabled, showAsGrid()); int taskSize = (int) (mOrientationHandler.getMeasuredSize(tv) * tv.getSizeAdjustment( - mOverviewFullscreenEnabled, mOverviewGridEnabled)); + mOverviewFullscreenEnabled, showAsGrid())); int taskEnd = taskStart + taskSize; return (taskStart >= start && taskStart <= end) || (taskEnd >= start && taskEnd <= end); @@ -813,7 +810,7 @@ public abstract class RecentsView extends PagedView public boolean onTouchEvent(MotionEvent ev) { super.onTouchEvent(ev); - if (mShowAsGrid) { + if (showAsGrid()) { int taskCount = getTaskViewCount(); for (int i = 0; i < taskCount; i++) { TaskView taskView = getTaskViewAt(i); @@ -880,7 +877,7 @@ public abstract class RecentsView extends PagedView @Override protected boolean snapToPageInFreeScroll() { - return !mShowAsGrid; + return !showAsGrid(); } @Override @@ -1091,14 +1088,35 @@ public abstract class RecentsView extends PagedView * Updates TaskView scaling and translation required to support variable width. */ private void updateTaskSize() { - float accumulatedTranslationX = 0; final int taskCount = getTaskViewCount(); + float accumulatedTranslationX = 0; + float[] fullscreenTranslations = new float[taskCount]; + int firstNonHomeTaskIndex = 0; for (int i = 0; i < taskCount; i++) { TaskView taskView = getTaskViewAt(i); + if (isHomeTask(taskView)) { + if (firstNonHomeTaskIndex == i) { + firstNonHomeTaskIndex++; + } + continue; + } + taskView.updateTaskSize(); - taskView.setAccumulatedFullscreenTranslationX(accumulatedTranslationX); - accumulatedTranslationX += taskView.getFullscreenTranslationX(); + fullscreenTranslations[i] += accumulatedTranslationX; + float widthDiff = + taskView.getLayoutParams().width * (1 - taskView.getFullscreenScale()); + float fullscreenTranslationX = mIsRtl ? widthDiff : -widthDiff; + fullscreenTranslations[i] += fullscreenTranslationX; + accumulatedTranslationX += fullscreenTranslationX; } + + // We need to maintain first non-home task's full screen translation at 0, now shift + // translation of all the TaskViews to achieve that. + for (int i = firstNonHomeTaskIndex; i < taskCount; i++) { + getTaskViewAt(i).setFullscreenTranslationX( + fullscreenTranslations[i] - fullscreenTranslations[firstNonHomeTaskIndex]); + } + updateGridProperties(); } @@ -1204,7 +1222,7 @@ public abstract class RecentsView extends PagedView int upper = 0; int visibleStart = 0; int visibleEnd = 0; - if (mShowAsGrid) { + if (showAsGrid()) { int screenStart = mOrientationHandler.getPrimaryScroll(this); int pageOrientedSize = mOrientationHandler.getMeasuredSize(this); int halfScreenSize = pageOrientedSize / 2; @@ -1224,7 +1242,7 @@ public abstract class RecentsView extends PagedView Task task = taskView.getTask(); int index = indexOfChild(taskView); boolean visible; - if (mShowAsGrid) { + if (showAsGrid()) { visible = isTaskViewWithinBounds(taskView, visibleStart, visibleEnd); } else { visible = lower <= index && index <= upper; @@ -1404,7 +1422,7 @@ public abstract class RecentsView extends PagedView * Called when a gesture from an app has finished, and an end target has been determined. */ public void onGestureEndTargetCalculated(GestureState.GestureEndTarget endTarget) { - + mCurrentGestureEndTarget = endTarget; } /** @@ -1425,9 +1443,11 @@ public abstract class RecentsView extends PagedView animateUpRunningTaskIconScale(); // TODO: This should be tied to whether there is a focus app on overview. - if (!mShowAsGrid) { + if (!showAsGrid()) { animateActionsViewIn(); } + + mCurrentGestureEndTarget = null; } /** @@ -1601,11 +1621,19 @@ public abstract class RecentsView extends PagedView float topAccumulatedTranslationX = 0; float bottomAccumulatedTranslationX = 0; IntSet topSet = new IntSet(); + IntSet bottomSet = new IntSet(); float[] gridTranslations = new float[taskCount]; + int firstNonHomeTaskIndex = 0; for (int i = 0; i < taskCount; i++) { TaskView taskView = getTaskViewAt(i); + if (isHomeTask(taskView)) { + if (firstNonHomeTaskIndex == i) { + firstNonHomeTaskIndex++; + } + continue; + } + taskView.setGridScale(gridScale); - gridTranslations[i] = 0; float scaledWidth = taskView.getLayoutParams().width * gridScale; float taskGridHorizontalDiff; @@ -1639,7 +1667,7 @@ public abstract class RecentsView extends PagedView // Move horizontally into empty space. float widthOffset = 0; - for (int j = i - 1; !topSet.contains(j) && j >= 0; j--) { + for (int j = i - 1; bottomSet.contains(j); j--) { widthOffset += getTaskViewAt(j).getLayoutParams().width * gridScale + mPageSpacing; } @@ -1650,6 +1678,7 @@ public abstract class RecentsView extends PagedView } else { gridTranslations[i] += bottomAccumulatedTranslationX; bottomRowWidth += taskView.getLayoutParams().width * gridScale + mPageSpacing; + bottomSet.add(i); // Move into bottom row. float heightOffset = (boxLength + mTaskTopMargin) * gridScale + mRowSpacing; @@ -1704,31 +1733,33 @@ public abstract class RecentsView extends PagedView clearAllAccumulatedTranslation + clearAllShorterRowCompensation + clearAllShortTotalCompensation; - // We need to maintain first task's grid translation at 0, now shift translation of all - // the TaskViews to achieve that. - for (int i = 0; i < taskCount; i++) { - getTaskViewAt(i).setGridTranslationX(gridTranslations[i] - gridTranslations[0]); + // We need to maintain first non-home task's grid translation at 0, now shift translation + // of all the TaskViews to achieve that. + for (int i = firstNonHomeTaskIndex; i < taskCount; i++) { + getTaskViewAt(i).setGridTranslationX( + gridTranslations[i] - gridTranslations[firstNonHomeTaskIndex]); } - mClearAllButton.setGridTranslationPrimary(clearAllTotalTranslationX - gridTranslations[0]); + mClearAllButton.setGridTranslationPrimary( + clearAllTotalTranslationX - gridTranslations[firstNonHomeTaskIndex]); setGridProgress(mGridProgress); } + protected boolean isHomeTask(TaskView taskView) { + return false; + } + /** * Moves TaskView and ClearAllButton between carousel and 2 row grid. * * @param gridProgress 0 = carousel; 1 = 2 row grid. */ - public void setGridProgress(float gridProgress) { + private void setGridProgress(float gridProgress) { int taskCount = getTaskViewCount(); if (taskCount == 0) { return; } - if (!mShowAsGrid) { - gridProgress = 0; - } - mGridProgress = gridProgress; for (int i = 0; i < taskCount; i++) { @@ -1872,7 +1903,8 @@ public abstract class RecentsView extends PagedView if (animateTaskView) { addDismissedTaskAnimations(taskView, duration, anim); } - } else if (!mShowAsGrid) { // Don't animate other tasks when dismissing in grid for now + } else if (!showAsGrid()) { + // For grid layout, don't animate other tasks when dismissing in grid for now. // If we just take newScroll - oldScroll, everything to the right of dragged task // translates to the left. We need to offset this in some cases: // - In RTL, add page offset to all pages, since we want pages to move to the right @@ -2865,9 +2897,9 @@ public abstract class RecentsView extends PagedView float scrollDiff = 0; if (child instanceof TaskView) { scrollDiff = ((TaskView) child).getScrollAdjustment(mOverviewFullscreenEnabled, - mOverviewGridEnabled); + showAsGrid()); } else if (child instanceof ClearAllButton) { - scrollDiff = ((ClearAllButton) child).getScrollAdjustment(mOverviewGridEnabled); + scrollDiff = ((ClearAllButton) child).getScrollAdjustment(showAsGrid()); } if (scrollDiff != 0) { @@ -2884,9 +2916,9 @@ public abstract class RecentsView extends PagedView View child = getChildAt(index); if (child instanceof TaskView) { childOffset += ((TaskView) child).getOffsetAdjustment(mOverviewFullscreenEnabled, - mOverviewGridEnabled); + showAsGrid()); } else if (child instanceof ClearAllButton) { - childOffset += ((ClearAllButton) child).getOffsetAdjustment(mOverviewGridEnabled); + childOffset += ((ClearAllButton) child).getOffsetAdjustment(showAsGrid()); } return childOffset; } @@ -2898,7 +2930,7 @@ public abstract class RecentsView extends PagedView return super.getChildVisibleSize(index); } return (int) (super.getChildVisibleSize(index) * taskView.getSizeAdjustment( - mOverviewFullscreenEnabled, mOverviewGridEnabled)); + mOverviewFullscreenEnabled, showAsGrid())); } @Override @@ -3109,6 +3141,12 @@ public abstract class RecentsView extends PagedView return mSizeStrategy; } + private boolean showAsGrid() { + return mOverviewGridEnabled || (mCurrentGestureEndTarget != null + && mSizeStrategy.stateFromGestureEndTarget( + mCurrentGestureEndTarget).displayOverviewTasksAsGrid(mActivity.getDeviceProfile())); + } + /** * Used to register callbacks for when our empty message state changes. * diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java index cd8ea7675f..809adcbe21 100644 --- a/quickstep/src/com/android/quickstep/views/TaskView.java +++ b/quickstep/src/com/android/quickstep/views/TaskView.java @@ -27,8 +27,8 @@ import static android.view.Surface.ROTATION_270; import static android.view.Surface.ROTATION_90; import static android.widget.Toast.LENGTH_SHORT; -import static com.android.launcher3.QuickstepTransitionManager.RECENTS_LAUNCH_DURATION; import static com.android.launcher3.LauncherState.OVERVIEW_SPLIT_SELECT; +import static com.android.launcher3.QuickstepTransitionManager.RECENTS_LAUNCH_DURATION; import static com.android.launcher3.Utilities.comp; import static com.android.launcher3.Utilities.getDescendantCoordRelativeToAncestor; import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL; @@ -275,7 +275,6 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable { private float mTaskResistanceTranslationY; // The following translation variables should only be used in the same orientation as Launcher. private float mFullscreenTranslationX; - private float mAccumulatedFullscreenTranslationX; private float mBoxTranslationY; // The following grid translations scales with mGridProgress. private float mGridTranslationX; @@ -750,9 +749,8 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable { @Override public void onRecycle() { - mFullscreenTranslationX = mAccumulatedFullscreenTranslationX = mGridTranslationX = - mGridTranslationY = - mGridOffsetTranslationX = mBoxTranslationY = mNonRtlVisibleOffset = 0f; + mFullscreenTranslationX = mGridTranslationX = mGridTranslationY = + mGridOffsetTranslationX = mBoxTranslationY = mNonRtlVisibleOffset = 0f; resetViewTransforms(); // Clear any references to the thumbnail (it will be re-read either from the cache or the // system on next bind) @@ -864,6 +862,10 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable { applyScale(); } + public float getFullscreenScale() { + return mFullscreenScale; + } + public void setGridScale(float gridScale) { mGridScale = gridScale; applyScale(); @@ -921,20 +923,11 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable { applyTranslationY(); } - private void setFullscreenTranslationX(float fullscreenTranslationX) { + public void setFullscreenTranslationX(float fullscreenTranslationX) { mFullscreenTranslationX = fullscreenTranslationX; applyTranslationX(); } - public float getFullscreenTranslationX() { - return mFullscreenTranslationX; - } - - public void setAccumulatedFullscreenTranslationX(float accumulatedFullscreenTranslationX) { - mAccumulatedFullscreenTranslationX = accumulatedFullscreenTranslationX; - applyTranslationX(); - } - public void setGridTranslationX(float gridTranslationX) { mGridTranslationX = gridTranslationX; applyTranslationX(); @@ -965,7 +958,7 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable { public float getScrollAdjustment(boolean fullscreenEnabled, boolean gridEnabled) { float scrollAdjustment = 0; if (fullscreenEnabled) { - scrollAdjustment += mFullscreenTranslationX + mAccumulatedFullscreenTranslationX; + scrollAdjustment += mFullscreenTranslationX; } if (gridEnabled) { scrollAdjustment += mGridTranslationX; @@ -999,7 +992,7 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable { private void applyTranslationX() { setTranslationX(mDismissTranslationX + mTaskOffsetTranslationX + mTaskResistanceTranslationX - + getFullscreenTrans(mFullscreenTranslationX + mAccumulatedFullscreenTranslationX) + + getFullscreenTrans(mFullscreenTranslationX) + getGridTrans(mGridTranslationX + mGridOffsetTranslationX)); } @@ -1243,10 +1236,6 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable { } setFullscreenScale(fullscreenScale); - float widthDiff = params.width * (1 - mFullscreenScale); - setFullscreenTranslationX( - getLayoutDirection() == LAYOUT_DIRECTION_RTL ? -widthDiff : widthDiff); - if (params.width != expectedWidth || params.height != expectedHeight) { params.width = expectedWidth; params.height = expectedHeight; @@ -1254,7 +1243,6 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable { } } else { setBoxTranslationY(0); - setFullscreenTranslationX(0); setFullscreenScale(1); if (params.width != ViewGroup.LayoutParams.MATCH_PARENT) { params.width = ViewGroup.LayoutParams.MATCH_PARENT; diff --git a/src/com/android/launcher3/LauncherState.java b/src/com/android/launcher3/LauncherState.java index aa97450a2b..ae75b51799 100644 --- a/src/com/android/launcher3/LauncherState.java +++ b/src/com/android/launcher3/LauncherState.java @@ -237,13 +237,6 @@ public abstract class LauncherState implements BaseState { return 0; } - /** - * For this state, whether tasks should layout as a grid rather than a list. - */ - public boolean displayOverviewTasksAsGrid(Launcher launcher) { - return false; - } - /** * For this state, how much additional vertical translation there should be for each of the * child TaskViews. diff --git a/src/com/android/launcher3/statemanager/BaseState.java b/src/com/android/launcher3/statemanager/BaseState.java index daec1d8508..122573cfa1 100644 --- a/src/com/android/launcher3/statemanager/BaseState.java +++ b/src/com/android/launcher3/statemanager/BaseState.java @@ -17,6 +17,8 @@ package com.android.launcher3.statemanager; import android.content.Context; +import com.android.launcher3.DeviceProfile; + /** * Interface representing a state of a StatefulActivity */ @@ -52,4 +54,11 @@ public interface BaseState { * Returns if the state has the provided flag */ boolean hasFlag(int flagMask); + + /** + * For this state, whether tasks should layout as a grid rather than a list. + */ + default boolean displayOverviewTasksAsGrid(DeviceProfile deviceProfile) { + return false; + } } From 45c16f7392054c90e97e830dd72ce5dc2275f8cf Mon Sep 17 00:00:00 2001 From: Samuel Fufa Date: Tue, 16 Mar 2021 12:26:30 -0500 Subject: [PATCH 5/8] [Hotseat] Fix badging for shortcut predictions in hotseat This change also sends shortcutInfo corresponding to AppTargetEvent Screenshot: https://screenshot.googleplex.com/7nN7mNEuMCLkKbY Bug: 159500320 Test: Manual Change-Id: I9c31d7208510c5362039868ae41d098c9eb1e2dd --- .../launcher3/model/AppEventProducer.java | 16 ++++++++++++++++ .../launcher3/uioverrides/PredictedAppIcon.java | 11 ++++++++--- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/quickstep/src/com/android/launcher3/model/AppEventProducer.java b/quickstep/src/com/android/launcher3/model/AppEventProducer.java index 9944270c95..eed493d4cf 100644 --- a/quickstep/src/com/android/launcher3/model/AppEventProducer.java +++ b/quickstep/src/com/android/launcher3/model/AppEventProducer.java @@ -42,6 +42,7 @@ import android.app.prediction.AppTargetEvent; import android.app.prediction.AppTargetId; import android.content.ComponentName; import android.content.Context; +import android.content.pm.ShortcutInfo; import android.os.Build; import android.os.Handler; import android.os.Message; @@ -62,9 +63,11 @@ import com.android.launcher3.logger.LauncherAtom.WorkspaceContainer; import com.android.launcher3.logging.StatsLogManager.EventEnum; import com.android.launcher3.model.data.ItemInfo; import com.android.launcher3.pm.UserCache; +import com.android.launcher3.shortcuts.ShortcutRequest; import com.android.quickstep.logging.StatsLogCompatManager.StatsLogConsumer; import java.util.Locale; +import java.util.Optional; import java.util.function.ObjIntConsumer; import java.util.function.Predicate; @@ -174,6 +177,7 @@ public class AppEventProducer implements StatsLogConsumer { return null; } ComponentName cn = null; + ShortcutInfo shortcutInfo = null; String id = null; switch (info.getItemCase()) { @@ -188,6 +192,14 @@ public class AppEventProducer implements StatsLogConsumer { LauncherAtom.Shortcut si = info.getShortcut(); if (!TextUtils.isEmpty(si.getShortcutId()) && (cn = parseNullable(si.getShortcutName())) != null) { + Optional opt = new ShortcutRequest(mContext, + userHandle).forPackage(cn.getPackageName(), si.getShortcutId()).query( + ShortcutRequest.ALL).stream().findFirst(); + if (opt.isPresent()) { + shortcutInfo = opt.get(); + } else { + return null; + } id = "shortcut:" + si.getShortcutId(); } break; @@ -210,6 +222,9 @@ public class AppEventProducer implements StatsLogConsumer { return createTempFolderTarget(); } if (id != null && cn != null) { + if (shortcutInfo != null) { + return new AppTarget.Builder(new AppTargetId(id), shortcutInfo).build(); + } return new AppTarget.Builder(new AppTargetId(id), cn.getPackageName(), userHandle) .setClassName(cn.getClassName()) .build(); @@ -217,6 +232,7 @@ public class AppEventProducer implements StatsLogConsumer { return null; } + private AppTarget createTempFolderTarget() { return new AppTarget.Builder(new AppTargetId("folder:" + SystemClock.uptimeMillis()), mContext.getPackageName(), Process.myUserHandle()) diff --git a/quickstep/src/com/android/launcher3/uioverrides/PredictedAppIcon.java b/quickstep/src/com/android/launcher3/uioverrides/PredictedAppIcon.java index d330a68adb..b4aa596760 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/PredictedAppIcon.java +++ b/quickstep/src/com/android/launcher3/uioverrides/PredictedAppIcon.java @@ -34,11 +34,11 @@ import androidx.core.graphics.ColorUtils; import com.android.launcher3.CellLayout; import com.android.launcher3.DeviceProfile; import com.android.launcher3.Launcher; +import com.android.launcher3.LauncherSettings; import com.android.launcher3.R; import com.android.launcher3.graphics.IconPalette; import com.android.launcher3.icons.IconNormalizer; import com.android.launcher3.icons.LauncherIcons; -import com.android.launcher3.model.data.ItemInfo; import com.android.launcher3.model.data.WorkspaceItemInfo; import com.android.launcher3.touch.ItemClickHandler; import com.android.launcher3.touch.ItemLongClickListener; @@ -85,8 +85,13 @@ public class PredictedAppIcon extends DoubleShadowBubbleTextView { public void onDraw(Canvas canvas) { int count = canvas.save(); if (!mIsPinned) { - boolean isBadged = getTag() instanceof WorkspaceItemInfo - && !Process.myUserHandle().equals(((ItemInfo) getTag()).user); + boolean isBadged = false; + if (getTag() instanceof WorkspaceItemInfo) { + WorkspaceItemInfo info = (WorkspaceItemInfo) getTag(); + isBadged = !Process.myUserHandle().equals(info.user) + || info.itemType == LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT + || info.itemType == LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT; + } drawEffect(canvas, isBadged); canvas.translate(getWidth() * RING_EFFECT_RATIO, getHeight() * RING_EFFECT_RATIO); canvas.scale(1 - 2 * RING_EFFECT_RATIO, 1 - 2 * RING_EFFECT_RATIO); From f9954cc4cc115db16302208cf23e5dda4d329cac Mon Sep 17 00:00:00 2001 From: Yogisha Dixit Date: Tue, 16 Mar 2021 14:56:42 +0000 Subject: [PATCH 6/8] Fix bug with resize frame disappearing. Currently, if you resize the widget to the top, bottom or right, the resize frame disappears. This is because the AppWidgetResizeFrame code relies on the indices of the child elements to find the drag handles. I updated the code to instead use IDs since that is more robust. Test: manual Bug: 182305670 Change-Id: Iaa9d32c9190fb579101914f03d57bb48dcecb88d --- res/layout/app_widget_resize_frame.xml | 4 ++++ src/com/android/launcher3/AppWidgetResizeFrame.java | 9 ++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/res/layout/app_widget_resize_frame.xml b/res/layout/app_widget_resize_frame.xml index dfce94669c..2e476df6c9 100644 --- a/res/layout/app_widget_resize_frame.xml +++ b/res/layout/app_widget_resize_frame.xml @@ -34,6 +34,7 @@ Date: Tue, 9 Mar 2021 13:08:06 +0000 Subject: [PATCH 7/8] Align task thumbnails to edge when cropped. Align to left edge unless RTL enabled. Do not rotate thumbnails if they would not fit nicely once rotated. Test: manual - Ensure task thumbnails align with left edge if cropped. Bug: 177402412 Change-Id: I6e03715061120deb5a8fde005d676170eed0f819 --- .../quickstep/util/TaskViewSimulator.java | 4 +- .../quickstep/views/TaskThumbnailView.java | 48 +++++++++++-------- src/com/android/launcher3/Utilities.java | 10 ++++ 3 files changed, 42 insertions(+), 20 deletions(-) diff --git a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java index df1229ba05..867b97221b 100644 --- a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java +++ b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java @@ -270,10 +270,12 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy { mSizeStrategy.calculateGridSize(mContext, mDp, mGridRect); mThumbnailData.rotation = mOrientationState.getDisplayRotation(); + // mIsRecentsRtl is the inverse of TaskView RTL. + boolean isRtlEnabled = !mIsRecentsRtl; mPositionHelper.updateThumbnailMatrix( mThumbnailPosition, mThumbnailData, mTaskRect.width(), mTaskRect.height(), - mDp, mOrientationState.getRecentsActivityRotation()); + mDp, mOrientationState.getRecentsActivityRotation(), isRtlEnabled); mPositionHelper.getMatrix().invert(mInversePositionMatrix); PagedOrientationHandler poh = mOrientationState.getOrientationHandler(); diff --git a/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java b/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java index 36a5f036a9..17d075f6c8 100644 --- a/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java +++ b/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java @@ -379,9 +379,10 @@ public class TaskThumbnailView extends View implements PluginListener bound; + } + private static class FixedSizeEmptyDrawable extends ColorDrawable { private final int mSize; From 8e57cce4ee818dfceaf0f59e492e9b4e9f814d05 Mon Sep 17 00:00:00 2001 From: Andras Kloczl Date: Thu, 11 Feb 2021 23:51:19 +0100 Subject: [PATCH 8/8] Two panel & two page swipe & currentPage fixes - Pagespacing set to 0 to have similar design to figma - Added padding to left side of left panel and right side of right panel to match figma - getPageScrolls changed to support two page scrolling - validateNewPage changed so that only even indexed pages can be switched to - getPageWidthSize added for measurements, it returns half screen width when two panel is active - onMeasure changed to use getPageWidthSize - panelCount has been increased from 1 to 2 when two panel is active - add feature flag for two panel home - shouldConsumeTouch changed so not only currentpage is checked but currentpage+1 screen as well - add one more extra check for setDropLayoutForDragObject for currentpage + 2, next to right panel - using new grid option for two panel home screen Test: manual Bug: 174464115 Change-Id: I1bad7eecc67f65fb833608744a5aa5aca65373b4 --- res/values/dimens.xml | 2 + src/com/android/launcher3/DeviceProfile.java | 11 ++- .../launcher3/InvariantDeviceProfile.java | 4 + src/com/android/launcher3/PagedView.java | 76 +++++++++++++++---- src/com/android/launcher3/Workspace.java | 51 +++++++++++-- .../launcher3/config/FeatureFlags.java | 4 + .../dragndrop/SpringLoadedDragController.java | 5 +- 7 files changed, 129 insertions(+), 24 deletions(-) diff --git a/res/values/dimens.xml b/res/values/dimens.xml index d135b43df9..d25cdb644f 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -29,6 +29,8 @@ 5.5dp 8dp + 18dp + 8dp 2dp diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java index 90cc384e86..02571a059e 100644 --- a/src/com/android/launcher3/DeviceProfile.java +++ b/src/com/android/launcher3/DeviceProfile.java @@ -251,7 +251,12 @@ public class DeviceProfile { int cellLayoutPadding = isScalableGrid ? 0 : res.getDimensionPixelSize(R.dimen.dynamic_grid_cell_layout_padding); - if (isLandscape) { + + if (FeatureFlags.ENABLE_TWO_PANEL_HOME.get() && isTablet) { + cellLayoutPaddingLeftRightPx = + res.getDimensionPixelSize(R.dimen.two_panel_home_side_padding); + cellLayoutBottomPaddingPx = 0; + } else if (isLandscape) { cellLayoutPaddingLeftRightPx = 0; cellLayoutBottomPaddingPx = cellLayoutPadding; } else { @@ -660,6 +665,10 @@ public class DeviceProfile { - (2 * inv.numRows * cellHeightPx) - hotseatVerticalPadding); padding.set(availablePaddingX / 2, edgeMarginPx + availablePaddingY / 2, availablePaddingX / 2, paddingBottom + availablePaddingY / 2); + + if (FeatureFlags.ENABLE_TWO_PANEL_HOME.get()) { + padding.set(0, padding.top, 0, padding.bottom); + } } else { // Pad the top and bottom of the workspace with search/hotseat bar sizes padding.set(desiredWorkspaceLeftRightMarginPx, diff --git a/src/com/android/launcher3/InvariantDeviceProfile.java b/src/com/android/launcher3/InvariantDeviceProfile.java index bb60557122..348d9eef2c 100644 --- a/src/com/android/launcher3/InvariantDeviceProfile.java +++ b/src/com/android/launcher3/InvariantDeviceProfile.java @@ -19,6 +19,7 @@ package com.android.launcher3; import static com.android.launcher3.Utilities.getDevicePrefs; import static com.android.launcher3.Utilities.getPointString; import static com.android.launcher3.config.FeatureFlags.ENABLE_FOUR_COLUMNS; +import static com.android.launcher3.config.FeatureFlags.ENABLE_TWO_PANEL_HOME; import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; import static com.android.launcher3.util.PackageManagerHelper.getPackageFilter; @@ -235,6 +236,9 @@ public class InvariantDeviceProfile { } public static String getCurrentGridName(Context context) { + if (ENABLE_TWO_PANEL_HOME.get()) { + return ENABLE_TWO_PANEL_HOME.key; + } if (ENABLE_FOUR_COLUMNS.get()) { return ENABLE_FOUR_COLUMNS.key; } diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java index 50f1e445ed..b084eb1b9b 100644 --- a/src/com/android/launcher3/PagedView.java +++ b/src/com/android/launcher3/PagedView.java @@ -282,7 +282,32 @@ public abstract class PagedView extends ViewGrou private int validateNewPage(int newPage) { newPage = ensureWithinScrollBounds(newPage); // Ensure that it is clamped by the actual set of children in all cases - return Utilities.boundToRange(newPage, 0, getPageCount() - 1); + newPage = Utilities.boundToRange(newPage, 0, getPageCount() - 1); + + if (getPanelCount() > 1) { + // Always return left panel as new page + newPage = getLeftmostVisiblePageForIndex(newPage); + } + return newPage; + } + + private int getLeftmostVisiblePageForIndex(int pageIndex) { + int panelCount = getPanelCount(); + return (pageIndex / panelCount) * panelCount; + } + + /** + * Returns the number of pages that are shown at the same time. + */ + protected int getPanelCount() { + return 1; + } + + /** + * Returns true if the view is on one of the current pages, false otherwise. + */ + public boolean isVisible(View child) { + return getLeftmostVisiblePageForIndex(indexOfChild(child)) == mCurrentPage; } /** @@ -548,6 +573,10 @@ public abstract class PagedView extends ViewGrou super.forceLayout(); } + private int getPageWidthSize(int widthSize) { + return (widthSize - mInsets.left - mInsets.right) / getPanelCount(); + } + @Override protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { if (getChildCount() == 0) { @@ -578,7 +607,7 @@ public abstract class PagedView extends ViewGrou if (DEBUG) Log.d(TAG, "PagedView.onMeasure(): " + widthSize + ", " + heightSize); int myWidthSpec = MeasureSpec.makeMeasureSpec( - widthSize - mInsets.left - mInsets.right, MeasureSpec.EXACTLY); + getPageWidthSize(widthSize), MeasureSpec.EXACTLY); int myHeightSpec = MeasureSpec.makeMeasureSpec( heightSize - mInsets.top - mInsets.bottom, MeasureSpec.EXACTLY); @@ -672,9 +701,11 @@ public abstract class PagedView extends ViewGrou // In case the pages are of different width, align the page to left or right edge // based on the orientation. + // In case we have multiple panels on the screen, scrollOffsetEnd is the scroll + // needed for the whole visible area, so we have to divide it by panelCount. final int pageScroll = mIsRtl - ? (childStart - scrollOffsetStart) - : Math.max(0, childPrimaryEnd - scrollOffsetEnd); + ? (childStart - scrollOffsetStart) + : Math.max(0, childPrimaryEnd - scrollOffsetEnd / getPanelCount()); if (outPageScrolls[i] != pageScroll) { pageScrollChanged = true; outPageScrolls[i] = pageScroll; @@ -682,6 +713,19 @@ public abstract class PagedView extends ViewGrou childStart += primaryDimension + mPageSpacing + getChildGap(); } } + + int panelCount = getPanelCount(); + if (panelCount > 1) { + for (int i = 0; i < childCount; i++) { + // In case we have multiple panels, always use left panel's page scroll for all + // panels on the screen. + int adjustedScroll = outPageScrolls[getLeftmostVisiblePageForIndex(i)]; + if (outPageScrolls[i] != adjustedScroll) { + outPageScrolls[i] = adjustedScroll; + pageScrollChanged = true; + } + } + } return pageScrollChanged; } @@ -794,14 +838,16 @@ public abstract class PagedView extends ViewGrou } if (direction == View.FOCUS_LEFT) { if (getCurrentPage() > 0) { - snapToPage(getCurrentPage() - 1); - getChildAt(getCurrentPage() - 1).requestFocus(direction); + int nextPage = validateNewPage(getCurrentPage() - 1); + snapToPage(nextPage); + getChildAt(nextPage).requestFocus(direction); return true; } } else if (direction == View.FOCUS_RIGHT) { if (getCurrentPage() < getPageCount() - 1) { - snapToPage(getCurrentPage() + 1); - getChildAt(getCurrentPage() + 1).requestFocus(direction); + int nextPage = validateNewPage(getCurrentPage() + 1); + snapToPage(nextPage); + getChildAt(nextPage).requestFocus(direction); return true; } } @@ -820,11 +866,13 @@ public abstract class PagedView extends ViewGrou } if (direction == View.FOCUS_LEFT) { if (mCurrentPage > 0) { - getPageAt(mCurrentPage - 1).addFocusables(views, direction, focusableMode); + int nextPage = validateNewPage(mCurrentPage - 1); + getPageAt(nextPage).addFocusables(views, direction, focusableMode); } - } else if (direction == View.FOCUS_RIGHT){ + } else if (direction == View.FOCUS_RIGHT) { if (mCurrentPage < getPageCount() - 1) { - getPageAt(mCurrentPage + 1).addFocusables(views, direction, focusableMode); + int nextPage = validateNewPage(mCurrentPage + 1); + getPageAt(nextPage).addFocusables(views, direction, focusableMode); } } } @@ -1255,12 +1303,14 @@ public abstract class PagedView extends ViewGrou if (((isSignificantMove && !isDeltaLeft && !isFling) || (isFling && !isVelocityLeft)) && mCurrentPage > 0) { - finalPage = returnToOriginalPage ? mCurrentPage : mCurrentPage - 1; + finalPage = returnToOriginalPage + ? mCurrentPage : mCurrentPage - getPanelCount(); snapToPageWithVelocity(finalPage, velocity); } else if (((isSignificantMove && isDeltaLeft && !isFling) || (isFling && isVelocityLeft)) && mCurrentPage < getChildCount() - 1) { - finalPage = returnToOriginalPage ? mCurrentPage : mCurrentPage + 1; + finalPage = returnToOriginalPage + ? mCurrentPage : mCurrentPage + getPanelCount(); snapToPageWithVelocity(finalPage, velocity); } else { snapToDestination(); diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index a089517b65..5aea45a806 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -312,7 +312,9 @@ public class Workspace extends PagedView // Increase our bottom insets so we don't overlap with the taskbar. mInsets.bottom += grid.nonOverlappingTaskbarInset; - if (mWorkspaceFadeInAdjacentScreens) { + if (isTwoPanelEnabled()) { + setPageSpacing(0); // we have two pages and we don't want any spacing + } else if (mWorkspaceFadeInAdjacentScreens) { // In landscape mode the page spacing is set to the default. setPageSpacing(grid.edgeMarginPx); } else { @@ -324,12 +326,30 @@ public class Workspace extends PagedView setPageSpacing(Math.max(maxInsets, maxPadding)); } - int paddingLeftRight = grid.cellLayoutPaddingLeftRightPx; int paddingBottom = grid.cellLayoutBottomPaddingPx; + int twoPanelLandscapeSidePadding = paddingLeftRight * 2; + int twoPanelPortraitSidePadding = paddingLeftRight / 2; + + int panelCount = getPanelCount(); for (int i = mWorkspaceScreens.size() - 1; i >= 0; i--) { - mWorkspaceScreens.valueAt(i) - .setPadding(paddingLeftRight, 0, paddingLeftRight, paddingBottom); + int paddingLeft = paddingLeftRight; + int paddingRight = paddingLeftRight; + if (panelCount > 1) { + if (i % panelCount == 0) { // left side panel + paddingLeft = grid.isLandscape ? twoPanelLandscapeSidePadding + : twoPanelPortraitSidePadding; + paddingRight = 0; + } else if (i % panelCount == panelCount - 1) { // right side panel + paddingLeft = 0; + paddingRight = grid.isLandscape ? twoPanelLandscapeSidePadding + : twoPanelPortraitSidePadding; + } else { // middle panel + paddingLeft = 0; + paddingRight = 0; + } + } + mWorkspaceScreens.valueAt(i).setPadding(paddingLeft, 0, paddingRight, paddingBottom); } } @@ -445,6 +465,15 @@ public class Workspace extends PagedView .log(LauncherEvent.LAUNCHER_ITEM_DRAG_STARTED); } + private boolean isTwoPanelEnabled() { + return mLauncher.mDeviceProfile.isTablet && FeatureFlags.ENABLE_TWO_PANEL_HOME.get(); + } + + @Override + protected int getPanelCount() { + return isTwoPanelEnabled() ? 2 : super.getPanelCount(); + } + public void deferRemoveExtraEmptyScreen() { mDeferRemoveExtraEmptyScreen = true; } @@ -832,7 +861,7 @@ public class Workspace extends PagedView private boolean shouldConsumeTouch(View v) { return !workspaceIconsCanBeDragged() - || (!workspaceInModalState() && indexOfChild(v) != mCurrentPage); + || (!workspaceInModalState() && !isVisible(v)); } public boolean isSwitchingState() { @@ -2259,19 +2288,27 @@ public class Workspace extends PagedView int nextPage = getNextPage(); if (layout == null && !isPageInTransition()) { - // Check if the item is dragged over left page + // Check if the item is dragged over currentPage - 1 page mTempTouchCoordinates[0] = Math.min(centerX, d.x); mTempTouchCoordinates[1] = d.y; layout = verifyInsidePage(nextPage + (mIsRtl ? 1 : -1), mTempTouchCoordinates); } if (layout == null && !isPageInTransition()) { - // Check if the item is dragged over right page + // Check if the item is dragged over currentPage + 1 page mTempTouchCoordinates[0] = Math.max(centerX, d.x); mTempTouchCoordinates[1] = d.y; layout = verifyInsidePage(nextPage + (mIsRtl ? -1 : 1), mTempTouchCoordinates); } + // If two panel is enabled, users can also drag items to currentPage + 2 + if (isTwoPanelEnabled() && layout == null && !isPageInTransition()) { + // Check if the item is dragged over currentPage + 2 page + mTempTouchCoordinates[0] = Math.max(centerX, d.x); + mTempTouchCoordinates[1] = d.y; + layout = verifyInsidePage(nextPage + (mIsRtl ? -2 : 2), mTempTouchCoordinates); + } + // Always pick the current page. if (layout == null && nextPage >= 0 && nextPage < getPageCount()) { layout = (CellLayout) getChildAt(nextPage); diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java index 48e41d5fda..43123c141d 100644 --- a/src/com/android/launcher3/config/FeatureFlags.java +++ b/src/com/android/launcher3/config/FeatureFlags.java @@ -205,6 +205,10 @@ public final class FeatureFlags { "ENABLE_OVERVIEW_GRID", false, "Uses grid overview layout. " + "Only applicable on large screen devices."); + public static final BooleanFlag ENABLE_TWO_PANEL_HOME = getDebugFlag( + "ENABLE_TWO_PANEL_HOME", false, + "Uses two panel on home screen. Only applicable on large screen devices."); + public static final BooleanFlag ENABLE_SPLIT_SELECT = getDebugFlag( "ENABLE_SPLIT_SELECT", false, "Uses new split screen selection overview UI"); diff --git a/src/com/android/launcher3/dragndrop/SpringLoadedDragController.java b/src/com/android/launcher3/dragndrop/SpringLoadedDragController.java index 37200a6a8b..6325877936 100644 --- a/src/com/android/launcher3/dragndrop/SpringLoadedDragController.java +++ b/src/com/android/launcher3/dragndrop/SpringLoadedDragController.java @@ -56,9 +56,8 @@ public class SpringLoadedDragController implements OnAlarmListener { if (mScreen != null) { // Snap to the screen that we are hovering over now Workspace w = mLauncher.getWorkspace(); - int page = w.indexOfChild(mScreen); - if (page != w.getCurrentPage()) { - w.snapToPage(page); + if (!w.isVisible(mScreen)) { + w.snapToPage(w.indexOfChild(mScreen)); } } else { mLauncher.getDragController().cancelDrag();