commit e99951bd94babf5d4143dd0a94e4928e54c98c0b
author Adam Cohen <adamcohen@google.com> Thu Nov 14 11:59:37 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Nov 14 11:59:37 2013 -0800
tree 7de8b0b0ee394406a790dd4fa199926a19d04b6b
parent 5b34b3ae6d330ffc0fd9996cf21fbe3b7622c526
parent f0f2ffaedc39b4657a3b7e24a4a3a90e08ed087f

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

* commit 'f0f2ffaedc39b4657a3b7e24a4a3a90e08ed087f':
  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;