From 4583d09c0560a83bfd0320299482cc41ac460b0c Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Wed, 17 Aug 2016 11:11:48 -0700 Subject: Fixing broken accessibility drag > Allow touch events on hotseat while in accessible drag as drag now happens in spring loaded state. > Allow drop target buttons to ignore thershold check when in accessibility drag Bug: 30900444 Change-Id: I88274367983fc027b2ddde3a719ca943f4f48587 --- src/com/android/launcher3/ButtonDropTarget.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/com/android/launcher3/ButtonDropTarget.java') diff --git a/src/com/android/launcher3/ButtonDropTarget.java b/src/com/android/launcher3/ButtonDropTarget.java index 5a4ed2f54..0f6073eee 100644 --- a/src/com/android/launcher3/ButtonDropTarget.java +++ b/src/com/android/launcher3/ButtonDropTarget.java @@ -62,6 +62,8 @@ public abstract class ButtonDropTarget extends TextView /** Whether this drop target is active for the current drag */ protected boolean mActive; + /** Whether an accessible drag is in progress */ + private boolean mAccessibleDrag; /** An item must be dragged at least this many pixels before this drop target is enabled. */ private final int mDragDistanceThreshold; @@ -218,8 +220,8 @@ public abstract class ButtonDropTarget extends TextView @Override public boolean isDropEnabled() { - return mActive - && mLauncher.getDragController().getDistanceDragged() >= mDragDistanceThreshold; + return mActive && (mAccessibleDrag || + mLauncher.getDragController().getDistanceDragged() >= mDragDistanceThreshold); } @Override @@ -307,6 +309,7 @@ public abstract class ButtonDropTarget extends TextView } public void enableAccessibleDrag(boolean enable) { + mAccessibleDrag = enable; setOnClickListener(enable ? this : null); } -- cgit v1.2.3