commit 20e24552cb618294e7c28c111c94cd00667fe862
author Adam Cohen <adamcohen@google.com> Wed Nov 24 17:06:03 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 24 17:06:03 2010 -0800
tree 21047dfaf14b6ff996632f74c8631258b80cc8cc
parent 37132e956ade9d068e43f25b885447c461f81399
parent 73aa9755d3db1a76e9de0f55271ef5984d78ef6f

Merge "Fix workspace outline alpha during scrolling"

src/com/android/launcher2/PagedView.java

diff --git a/src/com/android/launcher2/PagedView.java b/src/com/android/launcher2/PagedView.java
index 09133e0..d24eef4 100644
--- a/src/com/android/launcher2/PagedView.java
+++ b/src/com/android/launcher2/PagedView.java
@@ -356,7 +356,11 @@
             mCurrentPage = Math.max(0, Math.min(mNextPage, getPageCount() - 1));
             mNextPage = INVALID_PAGE;
             notifyPageSwitchListener();
-            pageEndMoving();
+            // We don't want to trigger a page end moving unless the page has settled
+            // and the user has stopped scrolling
+            if (mTouchState == TOUCH_STATE_REST) {
+                pageEndMoving();
+            }
             return true;
         }
         return false;