commit d65fb393595cb093936c7d5d0d54b0511430aa9d
author Winson Chung <winsonc@google.com> Tue Dec 10 01:17:46 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Dec 10 01:17:46 2013 +0000
tree dda308a5457480cb631020220850521645f1399e
parent 6de1ba3377dd407e83f682edf9ae742416302772
parent 72b520c956a4bf11f6dbbac7eb5e18001b7a11cb

Merge "Revert "Fixing crash in empty folders. (Bug 11627191)"" into jb-ub-now-jolly-elf

res/values-land/styles.xml

diff --git a/res/values-land/styles.xml b/res/values-land/styles.xml
index ccb5fcb..d18a57b 100644
--- a/res/values-land/styles.xml
+++ b/res/values-land/styles.xml
@@ -27,7 +27,7 @@
     </style>
     <style name="DropTargetButtonContainer">
         <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">0dp</item>
+        <item name="android:layout_height">wrap_content</item>
     </style>
     <style name="DropTargetButton">
         <item name="android:layout_width">wrap_content</item>

src/com/android/launcher3/PagedView.java

diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index 2c7114b..c216f92 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -1398,7 +1398,7 @@
 
                 if (finishedScrolling) {
                     mTouchState = TOUCH_STATE_REST;
-                    if (!mScroller.isFinished()) {
+                    if (!mScroller.isFinished() && !mFreeScroll) {
                         setCurrentPage(getNextPage());
                         pageEndMoving();
                     }