diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2016-09-02 19:13:56 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-09-02 19:13:56 +0000 |
commit | d9033f3ae118f928d90dacd03e37d04489a8f6e5 (patch) | |
tree | e2bf16ddb20be1d541df1345e1623328dd018348 /src | |
parent | 7bc4b5bcd479c8065f4c884f9191602fbb80364f (diff) | |
parent | 9be993665398c604dcaed8e90f54893bd164b9df (diff) | |
download | android_packages_apps_Trebuchet-d9033f3ae118f928d90dacd03e37d04489a8f6e5.tar.gz android_packages_apps_Trebuchet-d9033f3ae118f928d90dacd03e37d04489a8f6e5.tar.bz2 android_packages_apps_Trebuchet-d9033f3ae118f928d90dacd03e37d04489a8f6e5.zip |
Merge "Fixing broken accessibility drag" into ub-launcher3-calgary
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/launcher3/ButtonDropTarget.java | 7 | ||||
-rw-r--r-- | src/com/android/launcher3/Hotseat.java | 8 |
2 files changed, 8 insertions, 7 deletions
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); } diff --git a/src/com/android/launcher3/Hotseat.java b/src/com/android/launcher3/Hotseat.java index 7c0ed10d0..c738480fe 100644 --- a/src/com/android/launcher3/Hotseat.java +++ b/src/com/android/launcher3/Hotseat.java @@ -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 |