commit 4b0badc92d59634d1f52040e8f9d3ed3fa294a07
author Adam Cohen <adamcohen@google.com> Fri Nov 15 10:22:05 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Nov 15 10:22:05 2013 -0800
tree b7646ef3f973cd3b0cf5f53388a5f4df8dc2ae55
parent 2dc25b186ed0ddbcb117ed8b70409ee467ab2e9a
parent 3a14eeb54eb6f901629b26bf9e2ccf2d5bc564dd

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

* commit '3a14eeb54eb6f901629b26bf9e2ccf2d5bc564dd':
  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();
         }