summaryrefslogtreecommitdiffstats
path: root/quickstep
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2018-02-26 21:23:12 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-02-26 21:23:12 +0000
commitee5de5d13d4f6dd92d2097c09bb57949a428e347 (patch)
treebca7b17db912d56fba29347aaab9bafc38d6995c /quickstep
parent790822ab2209115d5a449a5df4258e7e4131239c (diff)
parent37bbe39dc0d5f7f002a35bbfa0e22e08022b2267 (diff)
downloadandroid_packages_apps_Trebuchet-ee5de5d13d4f6dd92d2097c09bb57949a428e347.tar.gz
android_packages_apps_Trebuchet-ee5de5d13d4f6dd92d2097c09bb57949a428e347.tar.bz2
android_packages_apps_Trebuchet-ee5de5d13d4f6dd92d2097c09bb57949a428e347.zip
Merge "Using window touch slop for gesture instead of normal touch slop This would prevent intercepting taps on the home button" into ub-launcher3-master
Diffstat (limited to 'quickstep')
-rw-r--r--quickstep/src/com/android/quickstep/OtherActivityTouchConsumer.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/quickstep/src/com/android/quickstep/OtherActivityTouchConsumer.java b/quickstep/src/com/android/quickstep/OtherActivityTouchConsumer.java
index db50a0068..353bd9c24 100644
--- a/quickstep/src/com/android/quickstep/OtherActivityTouchConsumer.java
+++ b/quickstep/src/com/android/quickstep/OtherActivityTouchConsumer.java
@@ -157,7 +157,7 @@ public class OtherActivityTouchConsumer extends ContextWrapper implements TouchC
mActivePointerId = ev.getPointerId(0);
mDownPos.set(ev.getX(), ev.getY());
mLastPos.set(mDownPos);
- mTouchSlop = ViewConfiguration.get(this).getScaledTouchSlop();
+ mTouchSlop = ViewConfiguration.get(this).getScaledPagingTouchSlop();
mTouchThresholdCrossed = false;
// Start the window animation on down to give more time for launcher to draw if the