commit 7e52013d02a36652f7125774b9c93f3405303d67
author Adam Cohen <adamcohen@google.com> Fri Nov 01 11:54:36 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Nov 01 11:54:36 2013 -0700
tree 247fa23de26ad72dc6e09b676710f478b8a80f4b
parent 9b8145f774b0bcccd0b98b1a830a6434a39f3aa2
parent 6b149dcf50d2c102f61ea271a096b64cee90d812

am 6b149dcf: am c5481343: Merge "Fix weird page snap bug when long pressing on music controls (issue 11420449)" into klp-dev

* commit '6b149dcf50d2c102f61ea271a096b64cee90d812':
  Fix weird page snap bug when long pressing on music controls (issue 11420449)

packages/Keyguard/src/com/android/keyguard/PagedView.java

diff --git a/packages/Keyguard/src/com/android/keyguard/PagedView.java b/packages/Keyguard/src/com/android/keyguard/PagedView.java
index 1262e07..5df5d07 100644
--- a/packages/Keyguard/src/com/android/keyguard/PagedView.java
+++ b/packages/Keyguard/src/com/android/keyguard/PagedView.java
@@ -2278,11 +2278,11 @@
         mTempVisiblePagesRange[0] = 0;
         mTempVisiblePagesRange[1] = getPageCount() - 1;
         boundByReorderablePages(true, mTempVisiblePagesRange);
-        mReorderingStarted = true;
 
         // Check if we are within the reordering range
         if (mTempVisiblePagesRange[0] <= dragViewIndex &&
                 dragViewIndex <= mTempVisiblePagesRange[1]) {
+            mReorderingStarted = true;
             if (zoomOut()) {
                 // Find the drag view under the pointer
                 mDragView = getChildAt(dragViewIndex);