diff options
author | Adam Cohen <adamcohen@google.com> | 2013-09-26 13:48:01 -0700 |
---|---|---|
committer | Adam Cohen <adamcohen@google.com> | 2013-09-26 13:53:23 -0700 |
commit | 93c9756e7a64e782e6b78ec978d2f7a5802c277d (patch) | |
tree | 9e3beae977f3e3483f96bfa3076e736e19f03b92 /src/com/android/launcher3/PagedView.java | |
parent | 98928dbed8796458b71b6a89bc48b62d8faf1c7b (diff) | |
download | android_packages_apps_Trebuchet-93c9756e7a64e782e6b78ec978d2f7a5802c277d.tar.gz android_packages_apps_Trebuchet-93c9756e7a64e782e6b78ec978d2f7a5802c277d.tar.bz2 android_packages_apps_Trebuchet-93c9756e7a64e782e6b78ec978d2f7a5802c277d.zip |
Fixing some touch / interaction problems
-> Weird reorder/scroll mode hybrid (issue 10550801)
-> Entering overview mode when we shouldn't (issue 10855389)
Change-Id: Ic936ead8deb3a5d4e00f265d09329528a1517063
Diffstat (limited to 'src/com/android/launcher3/PagedView.java')
-rw-r--r-- | src/com/android/launcher3/PagedView.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java index 1ae2943f6..42f3cace6 100644 --- a/src/com/android/launcher3/PagedView.java +++ b/src/com/android/launcher3/PagedView.java @@ -1316,13 +1316,13 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc */ if (mActivePointerId != INVALID_POINTER) { determineScrollingStart(ev); - break; } // if mActivePointerId is INVALID_POINTER, then we must have missed an ACTION_DOWN // event. in that case, treat the first occurence of a move event as a ACTION_DOWN // i.e. fall through to the next case (don't break) // (We sometimes miss ACTION_DOWN events in Workspace because it ignores all events // while it's small- this was causing a crash before we checked for INVALID_POINTER) + break; } case MotionEvent.ACTION_DOWN: { @@ -2373,7 +2373,10 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc } public boolean startReordering(View v) { - int dragViewIndex = indexOfChild(v);//getPageNearestToCenterOfScreen(); + int dragViewIndex = indexOfChild(v); + + if (mTouchState != TOUCH_STATE_REST) return false; + mTempVisiblePagesRange[0] = 0; mTempVisiblePagesRange[1] = getPageCount() - 1; getOverviewModePages(mTempVisiblePagesRange); |