summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2016-09-02 19:13:06 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-09-02 19:13:06 +0000
commit7bc4b5bcd479c8065f4c884f9191602fbb80364f (patch)
tree577d853ab023a7b2bf0b2bcbcf0d7fab7520d639 /src
parent6cf1e0f36bda6839563df6c8131a6e34eaf0b11d (diff)
parent538b54c4679a51a6416959b24f4066756c3d0cc3 (diff)
downloadandroid_packages_apps_Trebuchet-7bc4b5bcd479c8065f4c884f9191602fbb80364f.tar.gz
android_packages_apps_Trebuchet-7bc4b5bcd479c8065f4c884f9191602fbb80364f.tar.bz2
android_packages_apps_Trebuchet-7bc4b5bcd479c8065f4c884f9191602fbb80364f.zip
Merge "Fixing overlay scroll state not getting reset properly when scrolling is was cancelled" into ub-launcher3-calgary
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/PagedView.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index 2758a7cd4..bea55d215 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -1800,6 +1800,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
case MotionEvent.ACTION_CANCEL:
if (mTouchState == TOUCH_STATE_SCROLLING) {
snapToDestination();
+ onScrollInteractionEnd();
}
resetTouchState();
break;