Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ac045fe authored by Tony Wickham's avatar Tony Wickham
Browse files

Update CellLayout.DEBUG_VISUALIZE_OCCUPIED to include drag over targets 

Instead of just drawing the occupied cells in red, now we draw the occupied cells based on drag over regions:
- Dragging over the red regions will reorder the cell
- Dragging over the green regions will create/add to a folder

Test: visual with internal flag on
Bug: 204406063
Change-Id: I62105c1c1a1101b6cd6f9fd222980d03ba6d8b84
parent 00841576

src/com/android/launcher3/CellLayout.java

+45 −13
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.launcher3; 
import static android.animation.ValueAnimator.areAnimatorsEnabled;



import static com.android.launcher3.anim.Interpolators.DEACCEL_1_5;

import static com.android.launcher3.dragndrop.DraggableView.DRAGGABLE_ICON;



import android.animation.Animator;

import android.animation.AnimatorListenerAdapter;
@@ -37,7 +38,6 @@ import android.graphics.Point; 
import android.graphics.PointF;

import android.graphics.Rect;

import android.graphics.RectF;

import android.graphics.drawable.ColorDrawable;

import android.graphics.drawable.Drawable;

import android.os.Parcelable;

import android.util.ArrayMap;
@@ -61,6 +61,7 @@ import com.android.launcher3.LauncherSettings.Favorites; 
import com.android.launcher3.accessibility.DragAndDropAccessibilityDelegate;

import com.android.launcher3.anim.Interpolators;

import com.android.launcher3.config.FeatureFlags;

import com.android.launcher3.dragndrop.DraggableView;

import com.android.launcher3.folder.PreviewBackground;

import com.android.launcher3.model.data.ItemInfo;

import com.android.launcher3.util.CellAndSpan;
@@ -442,18 +443,41 @@ public class CellLayout extends ViewGroup { 
        }



        if (DEBUG_VISUALIZE_OCCUPIED) {

            int[] pt = new int[2];

            ColorDrawable cd = new ColorDrawable(Color.RED);

            cd.setBounds(0, 0,  mCellWidth, mCellHeight);

            for (int i = 0; i < mCountX; i++) {

                for (int j = 0; j < mCountY; j++) {

                    if (mOccupied.cells[i][j]) {

                        cellToPoint(i, j, pt);

            Rect cellBounds = new Rect();

            // Will contain the bounds of the cell including spacing between cells.

            Rect cellBoundsWithSpacing = new Rect();

            int[] cellCenter = new int[2];

            Paint debugPaint = new Paint();

            debugPaint.setStrokeWidth(Utilities.dpToPx(1));

            for (int x = 0; x < mCountX; x++) {

                for (int y = 0; y < mCountY; y++) {

                    if (!mOccupied.cells[x][y]) {

                        continue;

                    }

                    View child = getChildAt(x, y);

                    boolean canCreateFolder = child instanceof DraggableView

                            && ((DraggableView) child).getViewType() == DRAGGABLE_ICON;



                    cellToRect(x, y, 1, 1, cellBounds);

                    cellBoundsWithSpacing.set(cellBounds);

                    cellBoundsWithSpacing.inset(-mBorderSpace.x / 2, -mBorderSpace.y / 2);

                    cellToCenterPoint(x, y, cellCenter);



                    canvas.save();

                        canvas.translate(pt[0], pt[1]);

                        cd.draw(canvas);

                        canvas.restore();

                    canvas.clipRect(cellBoundsWithSpacing);



                    // Draw reorder drag target.

                    debugPaint.setColor(Color.RED);

                    canvas.drawRect(cellBoundsWithSpacing, debugPaint);



                    // Draw folder creation drag target.

                    if (canCreateFolder) {

                        debugPaint.setColor(Color.GREEN);

                        canvas.drawCircle(cellCenter[0], cellCenter[1],

                                getFolderCreationRadius(), debugPaint);

                    }



                    canvas.restore();

                }

            }

        }
@@ -817,7 +841,7 @@ public class CellLayout extends ViewGroup { 
    }



    /**

     * Given a cell coordinate and span return the point that represents the center of the regio

     * Given a cell coordinate and span return the point that represents the center of the region

     *

     * @param cellX X coordinate of the cell

     * @param cellY Y coordinate of the cell
@@ -835,6 +859,14 @@ public class CellLayout extends ViewGroup { 
        return (float) Math.hypot(x - mTmpPoint[0], y - mTmpPoint[1]);

    }



    /**

     * Returns the max distance from the center of a cell that can accept a drop to create a folder.

     */

    public float getFolderCreationRadius() {

        DeviceProfile grid = mActivity.getDeviceProfile();

        return grid.isTablet ? 0.75f * grid.iconSizePx : 0.55f * grid.iconSizePx;

    }



    public int getCellWidth() {

        return mCellWidth;

    }

src/com/android/launcher3/Workspace.java

+5 −8
Original line number Diff line number Diff line
@@ -220,7 +220,6 @@ public class Workspace extends PagedView<WorkspacePageIndicator> 
    private FolderIcon mDragOverFolderIcon = null;

    private boolean mCreateUserFolderOnDrop = false;

    private boolean mAddToExistingFolderOnDrop = false;

    private float mMaxDistanceForFolderCreation;



    // Variables relating to touch disambiguation (scrolling workspace vs. scrolling a widget)

    private float mXDown;
@@ -308,8 +307,6 @@ public class Workspace extends PagedView<WorkspacePageIndicator> 
    public void setInsets(Rect insets) {

        DeviceProfile grid = mLauncher.getDeviceProfile();



        mMaxDistanceForFolderCreation = grid.isTablet

                ? 0.75f * grid.iconSizePx : 0.55f * grid.iconSizePx;

        mWorkspaceFadeInAdjacentScreens = grid.shouldFadeAdjacentWorkspaceScreens();



        Rect padding = grid.workspacePadding;
@@ -1789,7 +1786,7 @@ public class Workspace extends PagedView<WorkspacePageIndicator> 


    boolean willCreateUserFolder(ItemInfo info, CellLayout target, int[] targetCell,

            float distance, boolean considerTimeout) {

        if (distance > mMaxDistanceForFolderCreation) return false;

        if (distance > target.getFolderCreationRadius()) return false;

        View dropOverView = target.getChildAt(targetCell[0], targetCell[1]);

        return willCreateUserFolder(info, dropOverView, considerTimeout);

    }
@@ -1824,7 +1821,7 @@ public class Workspace extends PagedView<WorkspacePageIndicator> 


    boolean willAddToExistingUserFolder(ItemInfo dragInfo, CellLayout target, int[] targetCell,

            float distance) {

        if (distance > mMaxDistanceForFolderCreation) return false;

        if (distance > target.getFolderCreationRadius()) return false;

        View dropOverView = target.getChildAt(targetCell[0], targetCell[1]);

        return willAddToExistingUserFolder(dragInfo, dropOverView);
@@ -1848,7 +1845,7 @@ public class Workspace extends PagedView<WorkspacePageIndicator> 


    boolean createUserFolderIfNecessary(View newView, int container, CellLayout target,

            int[] targetCell, float distance, boolean external, DragObject d) {

        if (distance > mMaxDistanceForFolderCreation) return false;

        if (distance > target.getFolderCreationRadius()) return false;

        View v = target.getChildAt(targetCell[0], targetCell[1]);



        boolean hasntMoved = false;
@@ -1905,7 +1902,7 @@ public class Workspace extends PagedView<WorkspacePageIndicator> 


    boolean addToExistingFolderIfNecessary(View newView, CellLayout target, int[] targetCell,

            float distance, DragObject d, boolean external) {

        if (distance > mMaxDistanceForFolderCreation) return false;

        if (distance > target.getFolderCreationRadius()) return false;



        View dropOverView = target.getChildAt(targetCell[0], targetCell[1]);

        if (!mAddToExistingFolderOnDrop) return false;
@@ -2509,7 +2506,7 @@ public class Workspace extends PagedView<WorkspacePageIndicator> 
    }



    private void manageFolderFeedback(float distance, DragObject dragObject) {

        if (distance > mMaxDistanceForFolderCreation) {

        if (distance > mDragTargetLayout.getFolderCreationRadius()) {

            if ((mDragMode == DRAG_MODE_ADD_TO_FOLDER

                    || mDragMode == DRAG_MODE_CREATE_FOLDER)) {

                setDragMode(DRAG_MODE_NONE);