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

Commit 106bf64f authored by Sunny Goyal's avatar Sunny Goyal
Browse files

Some cleanup around drag and drop 

 > Instead of resizing the rect for dragoutline in onDrow, store the resized rect itself
 > Remove unnecessary inverse matrix calculation

Change-Id: If13c3c5aaecba5a1d3a4f5d39199ed82e9662c62
parent e88491d6

src/com/android/launcher3/CellLayout.java

+44 −43
Original line number Diff line number Diff line
@@ -448,12 +448,9 @@ public class CellLayout extends ViewGroup implements BubbleTextShadowHandler { 
        for (int i = 0; i < mDragOutlines.length; i++) {

            final float alpha = mDragOutlineAlphas[i];

            if (alpha > 0) {

                final Rect r = mDragOutlines[i];

                mTempRect.set(r);

                Utilities.scaleRectAboutCenter(mTempRect, getChildrenScale());

                final Bitmap b = (Bitmap) mDragOutlineAnims[i].getTag();

                paint.setAlpha((int)(alpha + .5f));

                canvas.drawBitmap(b, null, mTempRect, paint);

                canvas.drawBitmap(b, null, mDragOutlines[i], paint);

            }

        }
@@ -1031,6 +1028,15 @@ public class CellLayout extends ViewGroup implements BubbleTextShadowHandler { 
        if (cellX != oldDragCellX || cellY != oldDragCellY) {

            mDragCell[0] = cellX;

            mDragCell[1] = cellY;



            final int oldIndex = mDragOutlineCurrent;

            mDragOutlineAnims[oldIndex].animateOut();

            mDragOutlineCurrent = (oldIndex + 1) % mDragOutlines.length;

            Rect r = mDragOutlines[mDragOutlineCurrent];



            if (resize) {

                cellToRect(cellX, cellY, spanX, spanY, r);

            } else {

                // Find the top left corner of the rect the object will occupy

                final int[] topLeft = mTmpPoint;

                cellToPoint(cellX, cellY, topLeft);
@@ -1069,15 +1075,10 @@ public class CellLayout extends ViewGroup implements BubbleTextShadowHandler { 
                                - dragOutline.getHeight()) / 2;

                    }

                }

            final int oldIndex = mDragOutlineCurrent;

            mDragOutlineAnims[oldIndex].animateOut();

            mDragOutlineCurrent = (oldIndex + 1) % mDragOutlines.length;

            Rect r = mDragOutlines[mDragOutlineCurrent];

                r.set(left, top, left + dragOutline.getWidth(), top + dragOutline.getHeight());

            if (resize) {

                cellToRect(cellX, cellY, spanX, spanY, r);

            }



            Utilities.scaleRectAboutCenter(r, getChildrenScale());

            mDragOutlineAnims[mDragOutlineCurrent].setTag(dragOutline);

            mDragOutlineAnims[mDragOutlineCurrent].animateIn();

        }

src/com/android/launcher3/PagedView.java

+1 −1
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc 
    private Runnable mPostReorderingPreZoomInRunnable;



    // Convenience/caching

    protected static final Matrix sTmpInvMatrix = new Matrix();

    private static final Matrix sTmpInvMatrix = new Matrix();

    private static final float[] sTmpPoint = new float[2];

    private static final int[] sTmpIntPoint = new int[2];

    private static final Rect sTmpRect = new Rect();

src/com/android/launcher3/Utilities.java

+12 −14
Original line number Diff line number Diff line
@@ -354,15 +354,6 @@ public final class Utilities { 
                localY < (v.getHeight() + slop);

    }



    public static void scaleRect(Rect r, float scale) {

        if (scale != 1.0f) {

            r.left = (int) (r.left * scale + 0.5f);

            r.top = (int) (r.top * scale + 0.5f);

            r.right = (int) (r.right * scale + 0.5f);

            r.bottom = (int) (r.bottom * scale + 0.5f);

        }

    }



    public static int[] getCenterDeltaInScreenSpace(View v0, View v1, int[] delta) {

        v0.getLocationInWindow(sLoc0);

        v1.getLocationInWindow(sLoc1);
@@ -383,12 +374,19 @@ public final class Utilities { 
    }



    public static void scaleRectAboutCenter(Rect r, float scale) {

        if (scale != 1.0f) {

            int cx = r.centerX();

            int cy = r.centerY();

            r.offset(-cx, -cy);

        Utilities.scaleRect(r, scale);



            r.left = (int) (r.left * scale + 0.5f);

            r.top = (int) (r.top * scale + 0.5f);

            r.right = (int) (r.right * scale + 0.5f);

            r.bottom = (int) (r.bottom * scale + 0.5f);



            r.offset(cx, cy);

        }

    }



    public static void startActivityForResultSafely(

            Activity activity, Intent intent, int requestCode) {

src/com/android/launcher3/Workspace.java

+9 −20
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ import android.content.res.Resources; 
import android.content.res.TypedArray;

import android.graphics.Bitmap;

import android.graphics.Canvas;

import android.graphics.Matrix;

import android.graphics.Paint;

import android.graphics.Point;

import android.graphics.PointF;
@@ -2131,19 +2130,17 @@ public class Workspace extends PagedView 
     * @param padding the horizontal and vertical padding to use when drawing

     */

    private static void drawDragView(View v, Canvas destCanvas, int padding) {

        final Rect clipRect = sTempRect;

        v.getDrawingRect(clipRect);



        boolean textVisible = false;



        destCanvas.save();

        if (v instanceof TextView) {

            Drawable d = getTextViewIcon((TextView) v);

            Rect bounds = getDrawableBounds(d);

            clipRect.set(0, 0, bounds.width() + padding, bounds.height() + padding);

            destCanvas.translate(padding / 2 - bounds.left, padding / 2 - bounds.top);

            d.draw(destCanvas);

        } else {

            final Rect clipRect = sTempRect;

            v.getDrawingRect(clipRect);



            boolean textVisible = false;

            if (v instanceof FolderIcon) {

                // For FolderIcons the text can bleed into the icon area, and so we need to

                // hide the text completely (which can't be achieved by clipping).
@@ -2413,7 +2410,7 @@ public class Workspace extends PagedView 
            if (mLauncher.isHotseatLayout(dropTargetLayout)) {

                mapPointFromSelfToHotseatLayout(mLauncher.getHotseat(), mDragViewVisualCenter);

            } else {

                mapPointFromSelfToChild(dropTargetLayout, mDragViewVisualCenter, null);

                mapPointFromSelfToChild(dropTargetLayout, mDragViewVisualCenter);

            }



            int spanX = 1;
@@ -2619,7 +2616,7 @@ public class Workspace extends PagedView 
            if (mLauncher.isHotseatLayout(dropTargetLayout)) {

                mapPointFromSelfToHotseatLayout(mLauncher.getHotseat(), mDragViewVisualCenter);

            } else {

                mapPointFromSelfToChild(dropTargetLayout, mDragViewVisualCenter, null);

                mapPointFromSelfToChild(dropTargetLayout, mDragViewVisualCenter);

            }

        }
@@ -3027,13 +3024,8 @@ public class Workspace extends PagedView 
    *

    * Convert the 2D coordinate xy from the parent View's coordinate space to this CellLayout's

    * coordinate space. The argument xy is modified with the return result.

    *

    * if cachedInverseMatrix is not null, this method will just use that matrix instead of

    * computing it itself; we use this to avoid redundant matrix inversions in

    * findMatchingPageForDragOver

    *

    */

   void mapPointFromSelfToChild(View v, float[] xy, Matrix cachedInverseMatrix) {

   void mapPointFromSelfToChild(View v, float[] xy) {

       xy[0] = xy[0] - v.getLeft();

       xy[1] = xy[1] - v.getTop();

   }
@@ -3098,10 +3090,7 @@ public class Workspace extends PagedView 
            CellLayout cl = (CellLayout) getChildAt(i);



            final float[] touchXy = {originX, originY};

            // Transform the touch coordinates to the CellLayout's local coordinates

            // If the touch point is within the bounds of the cell layout, we can return immediately

            cl.getMatrix().invert(sTmpInvMatrix);

            mapPointFromSelfToChild(cl, touchXy, sTmpInvMatrix);

            mapPointFromSelfToChild(cl, touchXy);



            if (touchXy[0] >= 0 && touchXy[0] <= cl.getWidth() &&

                    touchXy[1] >= 0 && touchXy[1] <= cl.getHeight()) {
@@ -3202,7 +3191,7 @@ public class Workspace extends PagedView 
            if (mLauncher.isHotseatLayout(mDragTargetLayout)) {

                mapPointFromSelfToHotseatLayout(mLauncher.getHotseat(), mDragViewVisualCenter);

            } else {

                mapPointFromSelfToChild(mDragTargetLayout, mDragViewVisualCenter, null);

                mapPointFromSelfToChild(mDragTargetLayout, mDragViewVisualCenter);

            }



            ItemInfo info = d.dragInfo;