summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2010-08-04 18:53:34 -0700
committerAdam Cohen <adamcohen@google.com>2010-08-04 18:57:04 -0700
commitec1b932159cd6ea5dd5e3aee2554131d175e03d9 (patch)
tree794731748a053ba25949e0c63ba9548772009cff /src
parentd4ede5325bb7b0da58d8a03a6246d8daae31fb97 (diff)
downloadpackages_apps_trebuchet-ec1b932159cd6ea5dd5e3aee2554131d175e03d9.zip
packages_apps_trebuchet-ec1b932159cd6ea5dd5e3aee2554131d175e03d9.tar.gz
packages_apps_trebuchet-ec1b932159cd6ea5dd5e3aee2554131d175e03d9.tar.bz2
Fixing longpress bug on widgets with a ListView
Change-Id: Idca7a8948ca21f1e7a1c332fd56303f903eb122d
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher2/Workspace.java14
1 files changed, 14 insertions, 0 deletions
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index 35a767d..818cedd 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -744,6 +744,20 @@ public class Workspace extends ViewGroup
return super.dispatchTouchEvent(ev);
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void requestDisallowInterceptTouchEvent(boolean disallowIntercept) {
+ if (disallowIntercept) {
+ // We need to make sure to cancel our long press if
+ // a scrollable widget takes over touch events
+ final View currentScreen = getChildAt(mCurrentScreen);
+ currentScreen.cancelLongPress();
+ }
+ super.requestDisallowInterceptTouchEvent(disallowIntercept);
+ }
+
@Override
public boolean onInterceptTouchEvent(MotionEvent ev) {
final boolean workspaceLocked = mLauncher.isWorkspaceLocked();