summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHyunyoung Song <hyunyoungs@google.com>2016-09-30 23:21:04 (GMT)
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-09-30 23:21:05 (GMT)
commit70a421e2243fd0e89b694e888adf0a628a30c42d (patch)
tree607fd1a4956789fadaaa2cd15302aad99f011284
parent37ecabc88ec4be34744d312dbf0b4b1a2977e119 (diff)
parent035a516e182090b2cee11d11579df432b7fcf02a (diff)
downloadandroid_packages_apps_Trebuchet-70a421e2243fd0e89b694e888adf0a628a30c42d.zip
android_packages_apps_Trebuchet-70a421e2243fd0e89b694e888adf0a628a30c42d.tar.gz
android_packages_apps_Trebuchet-70a421e2243fd0e89b694e888adf0a628a30c42d.tar.bz2
Merge "Consume ACTION_UP when fling is detected on top of icon" into ub-launcher3-calgary-polish
-rw-r--r--src/com/android/launcher3/Workspace.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index ea5401e..fc35064 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -599,6 +599,7 @@ public class Workspace extends PagedView
if (shouldConsumeTouch(v)) return true;
if (super.onTouch(v, ev)) {
mLauncher.startSearch("", false, null, false);
+ return true;
}
return false;
}
@@ -610,6 +611,7 @@ public class Workspace extends PagedView
if (shouldConsumeTouch(v)) return true;
if (super.onTouch(v, ev)) {
mLauncher.startSearch("", false, null, false);
+ return true;
}
return false;
}