Merge "Fixing broken accessibility drag" into ub-launcher3-calgary (d9033f3a) · Commits · e / os / BlissLauncher3

src/com/android/launcher3/ButtonDropTarget.java

+5 −2

Original line number	Diff line number	Diff line
		@@ -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);
		}

+3 −5

Original line number	Diff line number	Diff line
		@@ -165,11 +165,9 @@ public class Hotseat extends FrameLayout
		@Override
		public boolean onInterceptTouchEvent(MotionEvent ev) {
		// We don't want any clicks to go through to the hotseat unless the workspace is in
		// the normal state.
		if (mLauncher.getWorkspace().workspaceInModalState()) {
		return true;
		}
		return false;
		// the normal state or an accessible drag is in progress.
		return mLauncher.getWorkspace().workspaceInModalState() &&
		!mLauncher.getAccessibilityDelegate().isInAccessibleDrag();
		}

		@Override