summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/PagedView.java
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2014-06-06 11:52:52 -0700
committerAdam Cohen <adamcohen@google.com>2014-06-06 14:28:10 -0700
commit327acfea13d924293b88c7d204fde4a25748108d (patch)
treef845540751bcb2d49b0f657d44e892c104d53258 /src/com/android/launcher3/PagedView.java
parent5fbdd06489f2d2e3ae166a5705269e05f7dcdfdb (diff)
downloadandroid_packages_apps_Trebuchet-327acfea13d924293b88c7d204fde4a25748108d.tar.gz
android_packages_apps_Trebuchet-327acfea13d924293b88c7d204fde4a25748108d.tar.bz2
android_packages_apps_Trebuchet-327acfea13d924293b88c7d204fde4a25748108d.zip
Fix for regression which made issue 14491953 occur more easily
Change-Id: I27711aad8aae2824a54a043f686918d342ffc5bb
Diffstat (limited to 'src/com/android/launcher3/PagedView.java')
-rw-r--r--src/com/android/launcher3/PagedView.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index 8d5d8dd4d..976312627 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -2482,7 +2482,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
public boolean startReordering(View v) {
int dragViewIndex = indexOfChild(v);
- if (mTouchState != TOUCH_STATE_REST) return false;
+ if (mTouchState != TOUCH_STATE_REST || dragViewIndex == -1) return false;
mTempVisiblePagesRange[0] = 0;
mTempVisiblePagesRange[1] = getPageCount() - 1;