From aa4c8c1fea577431e218a927ae8ba6c47e51bfdb Mon Sep 17 00:00:00 2001 From: Adam Cohen Date: Fri, 6 Jun 2014 11:52:52 -0700 Subject: [PATCH] Fix for regression which made issue 14491953 occur more easily Change-Id: I27711aad8aae2824a54a043f686918d342ffc5bb (cherry picked from commit 327acfea13d924293b88c7d204fde4a25748108d) --- src/com/android/launcher3/Launcher.java | 3 ++- 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 e154e57e0..90856084c 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -2890,6 +2890,8 @@ public class Launcher extends Activity } else { return false; } + } else { + return false; } } @@ -2911,7 +2913,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; -- 2.11.0