diff options
author | Adam Cohen <adamcohen@google.com> | 2014-06-06 11:52:52 -0700 |
---|---|---|
committer | Adam Cohen <adamcohen@google.com> | 2014-06-06 14:28:10 -0700 |
commit | 327acfea13d924293b88c7d204fde4a25748108d (patch) | |
tree | f845540751bcb2d49b0f657d44e892c104d53258 | |
parent | 5fbdd06489f2d2e3ae166a5705269e05f7dcdfdb (diff) | |
download | android_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
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 3 | ||||
-rw-r--r-- | src/com/android/launcher3/PagedView.java | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 0044d7ae6..9ebb9970a 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -2937,6 +2937,8 @@ public class Launcher extends Activity } else { return false; } + } else { + return false; } } @@ -2958,7 +2960,6 @@ public class Launcher extends Activity // User long pressed on empty space mWorkspace.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS, HapticFeedbackConstants.FLAG_IGNORE_VIEW_SETTING); - // Disabling reordering until we sort out some issues. if (mWorkspace.isInOverviewMode()) { mWorkspace.startReordering(v); } else { 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; |