commit 422a7208d186ce9af4a9a59466a9773179f844fd
author Adam Cohen <adamcohen@google.com> Fri Feb 14 20:37:56 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Feb 14 20:37:56 2014 +0000
tree 5dda249c0cb66aa5f8b6e0602a9b25b5521cf527
parent 6521be4f9272d12f907108d871a79852ce9e6183
parent 4b0badc92d59634d1f52040e8f9d3ed3fa294a07

am 4b0badc9: am 3a14eeb5: Bit of code cleanup (issue 11648206)

* commit '4b0badc92d59634d1f52040e8f9d3ed3fa294a07':
  Bit of code cleanup (issue 11648206)

src/com/android/launcher3/Workspace.java

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 7466a19..d5c0c75 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -708,7 +708,12 @@
                         onComplete, stripEmptyScreens);
             }
             return;
+        } else if (stripEmptyScreens) {
+            // If we're not going to strip the empty screens after removing
+            // the extra empty screen, do it right away.
+            stripEmptyScreens();
         }
+
         if (onComplete != null) {
             onComplete.run();
         }