summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/Hotseat.java
diff options
context:
space:
mode:
authorTony Wickham <twickham@google.com>2016-12-02 14:47:04 -0800
committerTony Wickham <twickham@google.com>2016-12-12 12:51:27 -0800
commit0c7852f822497a2189bb6fb778cc14ea776f6fe6 (patch)
tree6d98a245dcc3e8c3f12e1a201b562925c4399045 /src/com/android/launcher3/Hotseat.java
parent59dfebcaee57982d032b4dd75fcd6c9cd3752574 (diff)
downloadandroid_packages_apps_Trebuchet-0c7852f822497a2189bb6fb778cc14ea776f6fe6.tar.gz
android_packages_apps_Trebuchet-0c7852f822497a2189bb6fb778cc14ea776f6fe6.tar.bz2
android_packages_apps_Trebuchet-0c7852f822497a2189bb6fb778cc14ea776f6fe6.zip
Allow long-press on workspace immediately after dropping.
Previously the touch was consumed until the transition from spring-loaded to normal workspace finished, leading long presses to trigger on the background rather than on apps. This made it difficult to move multiple icons consecutively. Bug: 29631912 Change-Id: I259e618c81f56bc40d08a5d63ddbbf3c82a76baf
Diffstat (limited to 'src/com/android/launcher3/Hotseat.java')
-rw-r--r--src/com/android/launcher3/Hotseat.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Hotseat.java b/src/com/android/launcher3/Hotseat.java
index 5c96dde43..eecbe349f 100644
--- a/src/com/android/launcher3/Hotseat.java
+++ b/src/com/android/launcher3/Hotseat.java
@@ -168,7 +168,7 @@ public class Hotseat extends FrameLayout
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 or an accessible drag is in progress.
- return mLauncher.getWorkspace().workspaceInModalState() &&
+ return !mLauncher.getWorkspace().workspaceIconsCanBeDragged() &&
!mLauncher.getAccessibilityDelegate().isInAccessibleDrag();
}