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

Commit 855b1b5f authored by Tony Wickham's avatar Tony Wickham
Browse files

Add distance threshold for dragged items before accepted by targets. 

With the new spring-loaded workspace, items are often very close to
button drop targets (e.g. App Info) at the start of a drag. This
threshold makes it less likely to accidentally drop on a target.

Bug: 24099531
Change-Id: I4912ceeb0b63958816177c7bde073e825176d987
parent 1f5d3ccc

res/values/dimens.xml

+3 −0
Original line number Diff line number Diff line
@@ -123,6 +123,9 @@ 
    <dimen name="drop_target_drag_padding">14dp</dimen>

    <dimen name="drop_target_text_size">14sp</dimen>



    <!-- the distance an icon must be dragged before button drop targets accept it -->

    <dimen name="drag_distanceThreshold">30dp</dimen>



    <!-- the area at the edge of the screen that makes the workspace go left

         or right while you're dragging. -->

    <dimen name="scroll_zone">20dp</dimen>

src/com/android/launcher3/ButtonDropTarget.java

+8 −3
Original line number Diff line number Diff line
@@ -24,13 +24,13 @@ import android.animation.ValueAnimator.AnimatorUpdateListener; 
import android.annotation.TargetApi;

import android.content.Context;

import android.content.res.ColorStateList;

import android.content.res.Resources;

import android.content.res.TypedArray;

import android.graphics.ColorMatrix;

import android.graphics.ColorMatrixColorFilter;

import android.graphics.PointF;

import android.graphics.Rect;

import android.graphics.drawable.Drawable;

import android.graphics.drawable.InsetDrawable;

import android.os.Build;

import android.util.AttributeSet;

import android.view.View;
@@ -62,6 +62,8 @@ public abstract class ButtonDropTarget extends TextView 


    /** Whether this drop target is active for the current drag */

    protected boolean mActive;

    /** An item must be dragged at least this many pixels before this drop target is enabled. */

    private final int mDragDistanceThreshold;



    /** The paint applied to the drag view on hover */

    protected int mHoverColor = 0;
@@ -78,12 +80,14 @@ public abstract class ButtonDropTarget extends TextView 


    public ButtonDropTarget(Context context, AttributeSet attrs, int defStyle) {

        super(context, attrs, defStyle);

        mBottomDragPadding = getResources().getDimensionPixelSize(R.dimen.drop_target_drag_padding);

        Resources resources = getResources();

        mBottomDragPadding = resources.getDimensionPixelSize(R.dimen.drop_target_drag_padding);



        TypedArray a = context.obtainStyledAttributes(attrs,

                R.styleable.ButtonDropTarget, defStyle, 0);

        mHideParentOnDisable = a.getBoolean(R.styleable.ButtonDropTarget_hideParentOnDisable, false);

        a.recycle();

        mDragDistanceThreshold = resources.getDimensionPixelSize(R.dimen.drag_distanceThreshold);

    }



    @Override
@@ -216,7 +220,8 @@ public abstract class ButtonDropTarget extends TextView 


    @Override

    public boolean isDropEnabled() {

        return mActive;

        return mActive

                && mLauncher.getDragController().getDistanceDragged() >= mDragDistanceThreshold;

    }



    @Override

src/com/android/launcher3/dragndrop/DragController.java

+7 −0
Original line number Diff line number Diff line
@@ -276,6 +276,9 @@ public class DragController implements DragDriver.EventListener { 


        mLauncher.getDragLayer().performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);

        dragView.show(mMotionDownX, mMotionDownY);

        mDistanceSinceScroll = 0;

        mLastTouch[0] = mMotionDownX;

        mLastTouch[1] = mMotionDownY;

        handleMoveEvent(mMotionDownX, mMotionDownY);

        return dragView;

    }
@@ -536,6 +539,10 @@ public class DragController implements DragDriver.EventListener { 
        checkScrollState(x, y);

    }



    public float getDistanceDragged() {

        return mDistanceSinceScroll;

    }



    public void forceTouchMove() {

        int[] dummyCoordinates = mCoordinatesTemp;

        DropTarget dropTarget = findDropTarget(mLastTouch[0], mLastTouch[1], dummyCoordinates);