summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/Hotseat.java
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2016-08-17 11:11:48 -0700
committerSunny Goyal <sunnygoyal@google.com>2016-08-17 11:24:10 -0700
commit4583d09c0560a83bfd0320299482cc41ac460b0c (patch)
tree19c10e2f5bbc647a72bdd6ba069087ee7946364f /src/com/android/launcher3/Hotseat.java
parentb9b41b835ede0d1d3dc0f050e174150ff5084692 (diff)
downloadandroid_packages_apps_Trebuchet-4583d09c0560a83bfd0320299482cc41ac460b0c.tar.gz
android_packages_apps_Trebuchet-4583d09c0560a83bfd0320299482cc41ac460b0c.tar.bz2
android_packages_apps_Trebuchet-4583d09c0560a83bfd0320299482cc41ac460b0c.zip
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
Diffstat (limited to 'src/com/android/launcher3/Hotseat.java')
-rw-r--r--src/com/android/launcher3/Hotseat.java8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/com/android/launcher3/Hotseat.java b/src/com/android/launcher3/Hotseat.java
index 660565425..ceaedef2a 100644
--- a/src/com/android/launcher3/Hotseat.java
+++ b/src/com/android/launcher3/Hotseat.java
@@ -162,11 +162,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