summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Adam Cohen <adamcohen@google.com> 2013-11-01 18:48:42 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2013-11-01 18:48:42 +0000
commitc5481343622e280ef1b2e3574c0cca0640fb172e (patch)
tree00f6f811796e832d05515c31ceb9f34eb946733a
parentb7824a9475d02bc3d96f1fb881a9769843e8f6f3 (diff)
parent3f1c3c7436380678fda634262d02fa171bcf86b5 (diff)
Merge "Fix weird page snap bug when long pressing on music controls (issue 11420449)" into klp-dev
-rw-r--r--packages/Keyguard/src/com/android/keyguard/PagedView.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/Keyguard/src/com/android/keyguard/PagedView.java b/packages/Keyguard/src/com/android/keyguard/PagedView.java
index 1262e074c25f..5df5d0756788 100644
--- a/packages/Keyguard/src/com/android/keyguard/PagedView.java
+++ b/packages/Keyguard/src/com/android/keyguard/PagedView.java
@@ -2278,11 +2278,11 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
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);