Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa4c8c1f authored Jun 06, 2014 by Adam Cohen

Fix for regression which made issue 14491953 occur more easily

Change-Id: I27711aad8aae2824a54a043f686918d342ffc5bb
(cherry picked from commit 327acfea)

parent 17937015

src/com/android/launcher3/Launcher.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -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 {

src/com/android/launcher3/PagedView.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;