From 1906cc33f9c6a8b58f3f260d184cfb5ac1b225fc Mon Sep 17 00:00:00 2001 From: Tony Wickham Date: Thu, 11 Feb 2021 11:55:24 -0800 Subject: [PATCH] Refactor Folder to use ActivityContext and BaseDragLayer These are the more generic versions of Launcher and DragLayer, so that Folders can be used in other surfaces. Test: Open and close Folders on home screen, ensure works properly Bug: 171917176 Change-Id: I39b9aedbd8319ca61ea0e776bc95eab585e023d5 --- src/com/android/launcher3/BaseActivity.java | 3 +- src/com/android/launcher3/Launcher.java | 38 ++++++++ src/com/android/launcher3/folder/Folder.java | 89 ++++++++----------- .../folder/FolderAnimationManager.java | 12 ++- .../android/launcher3/folder/FolderIcon.java | 14 +-- .../launcher3/folder/FolderPagedView.java | 5 +- .../launcher3/views/ActivityContext.java | 25 +++++- 7 files changed, 109 insertions(+), 77 deletions(-) diff --git a/src/com/android/launcher3/BaseActivity.java b/src/com/android/launcher3/BaseActivity.java index 8a03facbf2..062ab7112f 100644 --- a/src/com/android/launcher3/BaseActivity.java +++ b/src/com/android/launcher3/BaseActivity.java @@ -31,7 +31,6 @@ import android.graphics.Rect; import android.os.Bundle; import android.os.UserHandle; import android.util.Log; -import android.view.ContextThemeWrapper; import androidx.annotation.IntDef; @@ -333,7 +332,7 @@ public abstract class BaseActivity extends Activity implements ActivityContext { public static T fromContext(Context context) { if (context instanceof BaseActivity) { return (T) context; - } else if (context instanceof ContextThemeWrapper) { + } else if (context instanceof ContextWrapper) { return fromContext(((ContextWrapper) context).getBaseContext()); } else { throw new IllegalArgumentException("Cannot find BaseActivity in parent tree"); diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 51e7c7d175..1d6301ba25 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -74,6 +74,7 @@ import android.content.pm.PackageManager; import android.content.res.Configuration; import android.database.sqlite.SQLiteDatabase; import android.graphics.Bitmap; +import android.graphics.Rect; import android.os.Build; import android.os.Bundle; import android.os.CancellationSignal; @@ -1797,6 +1798,43 @@ public class Launcher extends StatefulActivity implements Launche return newFolder; } + @Override + public Rect getFolderBoundingBox() { + // We need to bound the folder to the currently visible workspace area + Rect folderBoundingBox = new Rect(); + getWorkspace().getPageAreaRelativeToDragLayer(folderBoundingBox); + return folderBoundingBox; + } + + @Override + public void updateOpenFolderPosition(int[] inOutPosition, Rect bounds, int width, int height) { + int left = inOutPosition[0]; + int top = inOutPosition[1]; + DeviceProfile grid = getDeviceProfile(); + int distFromEdgeOfScreen = getWorkspace().getPaddingLeft(); + if (grid.isPhone && (grid.availableWidthPx - width) < 4 * distFromEdgeOfScreen) { + // Center the folder if it is very close to being centered anyway, by virtue of + // filling the majority of the viewport. ie. remove it from the uncanny valley + // of centeredness. + left = (grid.availableWidthPx - width) / 2; + } else if (width >= bounds.width()) { + // If the folder doesn't fit within the bounds, center it about the desired bounds + left = bounds.left + (bounds.width() - width) / 2; + } + if (height >= bounds.height()) { + // Folder height is greater than page height, center on page + top = bounds.top + (bounds.height() - height) / 2; + } else { + // Folder height is less than page height, so bound it to the absolute open folder + // bounds if necessary + Rect folderBounds = grid.getAbsoluteOpenFolderBounds(); + left = Math.max(folderBounds.left, Math.min(left, folderBounds.right - width)); + top = Math.max(folderBounds.top, Math.min(top, folderBounds.bottom - height)); + } + inOutPosition[0] = left; + inOutPosition[1] = top; + } + /** * Unbinds the view for the specified item, and removes the item and all its children. * diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java index 74d8dca98d..9efbc7dcab 100644 --- a/src/com/android/launcher3/folder/Folder.java +++ b/src/com/android/launcher3/folder/Folder.java @@ -46,6 +46,7 @@ import android.util.Log; import android.util.Pair; import android.view.FocusFinder; import android.view.KeyEvent; +import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.View; import android.view.ViewDebug; @@ -82,7 +83,6 @@ import com.android.launcher3.accessibility.FolderAccessibilityHelper; import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.dragndrop.DragController; import com.android.launcher3.dragndrop.DragController.DragListener; -import com.android.launcher3.dragndrop.DragLayer; import com.android.launcher3.dragndrop.DragOptions; import com.android.launcher3.logger.LauncherAtom.FromState; import com.android.launcher3.logger.LauncherAtom.ToState; @@ -96,6 +96,8 @@ import com.android.launcher3.model.data.WorkspaceItemInfo; import com.android.launcher3.pageindicators.PageIndicatorDots; import com.android.launcher3.util.Executors; import com.android.launcher3.util.Thunk; +import com.android.launcher3.views.ActivityContext; +import com.android.launcher3.views.BaseDragLayer; import com.android.launcher3.views.ClipPathView; import com.android.launcher3.widget.PendingAddShortcutInfo; @@ -165,7 +167,11 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo private AnimatorSet mCurrentAnimator; private boolean mIsAnimatingClosed = false; + // Folder can be displayed in Launcher's activity or a separate window (e.g. Taskbar). + // Anything specific to Launcher should use mLauncher, otherwise should use mActivityContext. protected final Launcher mLauncher; + protected final ActivityContext mActivityContext; + protected DragController mDragController; public FolderInfo mInfo; private CharSequence mFromTitle; @@ -228,6 +234,7 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo setAlwaysDrawnWithCacheEnabled(false); mLauncher = Launcher.getLauncher(context); + mActivityContext = ActivityContext.lookupContext(context); mStatsLogManager = StatsLogManager.newInstance(context); // We need this view to be focusable in touch mode so that when text editing of the folder // name is complete, we have something to focus on, thus hiding the cursor and giving @@ -457,9 +464,9 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo Collections.sort(children, ITEM_POS_COMPARATOR); updateItemLocationsInDatabaseBatch(true); - DragLayer.LayoutParams lp = (DragLayer.LayoutParams) getLayoutParams(); + BaseDragLayer.LayoutParams lp = (BaseDragLayer.LayoutParams) getLayoutParams(); if (lp == null) { - lp = new DragLayer.LayoutParams(0, 0); + lp = new BaseDragLayer.LayoutParams(0, 0); lp.customPosition = true; setLayoutParams(lp); } @@ -513,13 +520,14 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo /** * Creates a new UserFolder, inflated from R.layout.user_folder. * - * @param launcher The main activity. + * @param activityContext The main ActivityContext in which to inflate this Folder. It must also + * be an instance or ContextWrapper around the Launcher activity context. * * @return A new UserFolder. */ @SuppressLint("InflateParams") - static Folder fromXml(Launcher launcher) { - return (Folder) launcher.getLayoutInflater() + static Folder fromXml(T activityContext) { + return (Folder) LayoutInflater.from(activityContext).cloneInContext(activityContext) .inflate(R.layout.user_folder_icon_normalized, null); } @@ -597,7 +605,7 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo * is played. */ private void animateOpen(List items, int pageNo) { - Folder openFolder = getOpen(mLauncher); + Folder openFolder = getOpen(mActivityContext); if (openFolder != null && openFolder != this) { // Close any open folder before opening a folder. openFolder.close(true); @@ -610,7 +618,7 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo mIsOpen = true; - DragLayer dragLayer = mLauncher.getDragLayer(); + BaseDragLayer dragLayer = mActivityContext.getDragLayer(); // Just verify that the folder hasn't already been added to the DragLayer. // There was a one-off crash where the folder had a parent already. if (getParent() == null) { @@ -724,7 +732,7 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo // Notify the accessibility manager that this folder "window" has disappeared and no // longer occludes the workspace items - mLauncher.getDragLayer().sendAccessibilityEvent( + mActivityContext.getDragLayer().sendAccessibilityEvent( AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED); } @@ -772,7 +780,7 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo private void closeComplete(boolean wasAnimated) { // TODO: Clear all active animations. - DragLayer parent = (DragLayer) getParent(); + BaseDragLayer parent = (BaseDragLayer) getParent(); if (parent != null) { parent.removeView(this); } @@ -1011,7 +1019,7 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo private void updateItemLocationsInDatabaseBatch(boolean isBind) { FolderGridOrganizer verifier = new FolderGridOrganizer( - mLauncher.getDeviceProfile().inv).setFolderInfo(mInfo); + mActivityContext.getDeviceProfile().inv).setFolderInfo(mInfo); ArrayList items = new ArrayList<>(); int total = mInfo.contents.size(); @@ -1048,10 +1056,8 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo } private void centerAboutIcon() { - DeviceProfile grid = mLauncher.getDeviceProfile(); - - DragLayer.LayoutParams lp = (DragLayer.LayoutParams) getLayoutParams(); - DragLayer parent = mLauncher.getDragLayer(); + BaseDragLayer.LayoutParams lp = (BaseDragLayer.LayoutParams) getLayoutParams(); + BaseDragLayer parent = mActivityContext.getDragLayer(); int width = getFolderWidth(); int height = getFolderHeight(); @@ -1061,38 +1067,13 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo int centeredLeft = centerX - width / 2; int centeredTop = centerY - height / 2; - // We need to bound the folder to the currently visible workspace area - if (mLauncher.getStateManager().getState().overviewUi) { - parent.getDescendantRectRelativeToSelf(mLauncher.getOverviewPanel(), sTempRect); - } else { - mLauncher.getWorkspace().getPageAreaRelativeToDragLayer(sTempRect); - } - int left = Math.min(Math.max(sTempRect.left, centeredLeft), - sTempRect.right- width); - int top = Math.min(Math.max(sTempRect.top, centeredTop), - sTempRect.bottom - height); - - int distFromEdgeOfScreen = mLauncher.getWorkspace().getPaddingLeft() + getPaddingLeft(); - - if (grid.isPhone && (grid.availableWidthPx - width) < 4 * distFromEdgeOfScreen) { - // Center the folder if it is very close to being centered anyway, by virtue of - // filling the majority of the viewport. ie. remove it from the uncanny valley - // of centeredness. - left = (grid.availableWidthPx - width) / 2; - } else if (width >= sTempRect.width()) { - // If the folder doesn't fit within the bounds, center it about the desired bounds - left = sTempRect.left + (sTempRect.width() - width) / 2; - } - if (height >= sTempRect.height()) { - // Folder height is greater than page height, center on page - top = sTempRect.top + (sTempRect.height() - height) / 2; - } else { - // Folder height is less than page height, so bound it to the absolute open folder - // bounds if necessary - Rect folderBounds = grid.getAbsoluteOpenFolderBounds(); - left = Math.max(folderBounds.left, Math.min(left, folderBounds.right - width)); - top = Math.max(folderBounds.top, Math.min(top, folderBounds.bottom - height)); - } + sTempRect.set(mActivityContext.getFolderBoundingBox()); + int left = Utilities.boundToRange(centeredLeft, sTempRect.left, sTempRect.right - width); + int top = Utilities.boundToRange(centeredTop, sTempRect.top, sTempRect.bottom - height); + int[] inOutPosition = new int[] {left, top}; + mActivityContext.updateOpenFolderPosition(inOutPosition, sTempRect, width, height); + left = inOutPosition[0]; + top = inOutPosition[1]; int folderPivotX = width / 2 + (centeredLeft - left); int folderPivotY = height / 2 + (centeredTop - top); @@ -1106,7 +1087,7 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo } protected int getContentAreaHeight() { - DeviceProfile grid = mLauncher.getDeviceProfile(); + DeviceProfile grid = mActivityContext.getDeviceProfile(); int maxContentAreaHeight = grid.availableHeightPx - grid.getTotalWorkspacePadding().y - mFooterHeight; int height = Math.min(maxContentAreaHeight, @@ -1384,7 +1365,7 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo @Override public void onAdd(WorkspaceItemInfo item, int rank) { FolderGridOrganizer verifier = new FolderGridOrganizer( - mLauncher.getDeviceProfile().inv).setFolderInfo(mInfo); + mActivityContext.getDeviceProfile().inv).setFolderInfo(mInfo); verifier.updateRankAndPos(item, rank); mLauncher.getModelWriter().addOrMoveItemInDatabase(item, mInfo.id, 0, item.cellX, item.cellY); @@ -1591,8 +1572,8 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo /** * Returns a folder which is already open or null */ - public static Folder getOpen(Launcher launcher) { - return getOpenView(launcher, TYPE_FOLDER); + public static Folder getOpen(ActivityContext activityContext) { + return getOpenView(activityContext, TYPE_FOLDER); } /** @@ -1611,7 +1592,7 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo @Override public boolean onControllerInterceptTouchEvent(MotionEvent ev) { if (ev.getAction() == MotionEvent.ACTION_DOWN) { - DragLayer dl = mLauncher.getDragLayer(); + BaseDragLayer dl = (BaseDragLayer) getParent(); if (isEditingName()) { if (!dl.isEventOverView(mFolderName, ev)) { @@ -1663,9 +1644,9 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo /** Returns the height of the current folder's bottom edge from the bottom of the screen. */ private int getHeightFromBottom() { - DragLayer.LayoutParams layoutParams = (DragLayer.LayoutParams) getLayoutParams(); + BaseDragLayer.LayoutParams layoutParams = (BaseDragLayer.LayoutParams) getLayoutParams(); int folderBottomPx = layoutParams.y + layoutParams.height; - int windowBottomPx = mLauncher.getDeviceProfile().heightPx; + int windowBottomPx = mActivityContext.getDeviceProfile().heightPx; return windowBottomPx - folderBottomPx; } diff --git a/src/com/android/launcher3/folder/FolderAnimationManager.java b/src/com/android/launcher3/folder/FolderAnimationManager.java index 3d72b49b44..1cac31eb18 100644 --- a/src/com/android/launcher3/folder/FolderAnimationManager.java +++ b/src/com/android/launcher3/folder/FolderAnimationManager.java @@ -39,14 +39,13 @@ import androidx.core.graphics.ColorUtils; import com.android.launcher3.BubbleTextView; import com.android.launcher3.CellLayout; -import com.android.launcher3.Launcher; import com.android.launcher3.R; import com.android.launcher3.ResourceUtils; import com.android.launcher3.ShortcutAndWidgetContainer; import com.android.launcher3.Utilities; import com.android.launcher3.anim.PropertyResetListener; -import com.android.launcher3.dragndrop.DragLayer; import com.android.launcher3.util.Themes; +import com.android.launcher3.views.BaseDragLayer; import java.util.List; @@ -69,7 +68,6 @@ public class FolderAnimationManager { private PreviewBackground mPreviewBackground; private Context mContext; - private Launcher mLauncher; private final boolean mIsOpening; @@ -92,8 +90,7 @@ public class FolderAnimationManager { mPreviewBackground = mFolderIcon.mBackground; mContext = folder.getContext(); - mLauncher = folder.mLauncher; - mPreviewVerifier = new FolderGridOrganizer(mLauncher.getDeviceProfile().inv); + mPreviewVerifier = new FolderGridOrganizer(folder.mActivityContext.getDeviceProfile().inv); mIsOpening = isOpening; @@ -114,14 +111,15 @@ public class FolderAnimationManager { * Prepares the Folder for animating between open / closed states. */ public AnimatorSet getAnimator() { - final DragLayer.LayoutParams lp = (DragLayer.LayoutParams) mFolder.getLayoutParams(); + final BaseDragLayer.LayoutParams lp = + (BaseDragLayer.LayoutParams) mFolder.getLayoutParams(); mFolderIcon.getPreviewItemManager().recomputePreviewDrawingParams(); ClippedFolderIconLayoutRule rule = mFolderIcon.getLayoutRule(); final List itemsInPreview = getPreviewIconsOnPage(0); // Match position of the FolderIcon final Rect folderIconPos = new Rect(); - float scaleRelativeToDragLayer = mLauncher.getDragLayer() + float scaleRelativeToDragLayer = mFolder.mActivityContext.getDragLayer() .getDescendantRectRelativeToSelf(mFolderIcon, folderIconPos); int scaledRadius = mPreviewBackground.getScaledRadius(); float initialSize = (scaledRadius * 2) * scaleRelativeToDragLayer; diff --git a/src/com/android/launcher3/folder/FolderIcon.java b/src/com/android/launcher3/folder/FolderIcon.java index 6477de3757..65a4fba63c 100644 --- a/src/com/android/launcher3/folder/FolderIcon.java +++ b/src/com/android/launcher3/folder/FolderIcon.java @@ -166,19 +166,19 @@ public class FolderIcon extends FrameLayout implements FolderListener, IconLabel mDotParams = new DotRenderer.DrawParams(); } - public static FolderIcon inflateFolderAndIcon(int resId, Launcher launcher, ViewGroup group, - FolderInfo folderInfo) { - Folder folder = Folder.fromXml(launcher); - folder.setDragController(launcher.getDragController()); + public static FolderIcon inflateFolderAndIcon(int resId, + T activityContext, ViewGroup group, FolderInfo folderInfo) { + Folder folder = Folder.fromXml(activityContext); + folder.setDragController(folder.mLauncher.getDragController()); - FolderIcon icon = inflateIcon(resId, launcher, group, folderInfo); + FolderIcon icon = inflateIcon(resId, activityContext, group, folderInfo); folder.setFolderIcon(icon); folder.bind(folderInfo); icon.setFolder(folder); - icon.setOnFocusChangeListener(launcher.getFocusHandler()); + icon.setOnFocusChangeListener(folder.mLauncher.getFocusHandler()); icon.mBackground.paddingY = icon.isInHotseat() - ? 0 : launcher.getDeviceProfile().cellYPaddingPx; + ? 0 : activityContext.getDeviceProfile().cellYPaddingPx; return icon; } diff --git a/src/com/android/launcher3/folder/FolderPagedView.java b/src/com/android/launcher3/folder/FolderPagedView.java index df3e92cf1e..0235dfac2f 100644 --- a/src/com/android/launcher3/folder/FolderPagedView.java +++ b/src/com/android/launcher3/folder/FolderPagedView.java @@ -36,7 +36,6 @@ import com.android.launcher3.BubbleTextView; import com.android.launcher3.CellLayout; import com.android.launcher3.DeviceProfile; import com.android.launcher3.InvariantDeviceProfile; -import com.android.launcher3.Launcher; import com.android.launcher3.LauncherAppState; import com.android.launcher3.PagedView; import com.android.launcher3.R; @@ -230,7 +229,7 @@ public class FolderPagedView extends PagedView { } private CellLayout createAndAddNewPage() { - DeviceProfile grid = Launcher.getLauncher(getContext()).getDeviceProfile(); + DeviceProfile grid = mFolder.mActivityContext.getDeviceProfile(); CellLayout page = mViewCache.getView(R.layout.folder_page, getContext(), this); page.setCellDimensions(grid.folderCellWidthPx, grid.folderCellHeightPx); page.getShortcutsAndWidgets().setMotionEventSplittingEnabled(false); @@ -624,7 +623,7 @@ public class FolderPagedView extends PagedView { @Override protected boolean canScroll(float absVScroll, float absHScroll) { - return AbstractFloatingView.getTopOpenViewWithType(mFolder.mLauncher, + return AbstractFloatingView.getTopOpenViewWithType(mFolder.mActivityContext, TYPE_ALL & ~TYPE_FOLDER) == null; } diff --git a/src/com/android/launcher3/views/ActivityContext.java b/src/com/android/launcher3/views/ActivityContext.java index ae459e1847..505c6cea42 100644 --- a/src/com/android/launcher3/views/ActivityContext.java +++ b/src/com/android/launcher3/views/ActivityContext.java @@ -17,7 +17,7 @@ package com.android.launcher3.views; import android.content.Context; import android.content.ContextWrapper; -import android.view.ContextThemeWrapper; +import android.graphics.Rect; import android.view.View.AccessibilityDelegate; import com.android.launcher3.DeviceProfile; @@ -49,6 +49,23 @@ public interface ActivityContext { return null; } + default Rect getFolderBoundingBox() { + return getDeviceProfile().getAbsoluteOpenFolderBounds(); + } + + /** + * After calling {@link #getFolderBoundingBox()}, we calculate a (left, top) position for a + * Folder of size width x height to be within those bounds. However, the chosen position may + * not be visually ideal (e.g. uncanny valley of centeredness), so here's a chance to update it. + * @param inOutPosition A 2-size array where the first element is the left position of the open + * folder and the second element is the top position. Should be updated in place if desired. + * @param bounds The bounds that the open folder should fit inside. + * @param width The width of the open folder. + * @param height The height of the open folder. + */ + default void updateOpenFolderPosition(int[] inOutPosition, Rect bounds, int width, int height) { + } + /** * The root view to support drag-and-drop and popup support. */ @@ -56,10 +73,10 @@ public interface ActivityContext { DeviceProfile getDeviceProfile(); - static ActivityContext lookupContext(Context context) { + static T lookupContext(Context context) { if (context instanceof ActivityContext) { - return (ActivityContext) context; - } else if (context instanceof ContextThemeWrapper) { + return (T) context; + } else if (context instanceof ContextWrapper) { return lookupContext(((ContextWrapper) context).getBaseContext()); } else { throw new IllegalArgumentException("Cannot find ActivityContext in parent tree");