commit 02222ba800ba387b974b1a8f06ec694e6fb35dab
author Adam Cohen <adamcohen@google.com> Fri Feb 14 20:53:43 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Feb 14 20:53:43 2014 +0000
tree 4302dfb154d705b2f18a3d7724cee4339ade4315
parent 53cb2ba4218a79b7a739aa195c3c00784e968979
parent 42143d73ab1fe0318a2410a56634992ffc481588

am 42143d73: am e99951bd: am f0f2ffae: Fix issue where extra page hangs around (issue 11634172)

* commit '42143d73ab1fe0318a2410a56634992ffc481588':
  Fix issue where extra page hangs around (issue 11634172)

src/com/android/launcher3/Folder.java

diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java
index bd61010..f26d01f 100644
--- a/src/com/android/launcher3/Folder.java
+++ b/src/com/android/launcher3/Folder.java
@@ -758,6 +758,8 @@
                 }
                 completeDragExit();
             }
+        } else {
+            mLauncher.getWorkspace().removeExtraEmptyScreen(true, null);
         }
 
         mDeleteFolderOnDropCompleted = false;