From 3a14eeb54eb6f901629b26bf9e2ccf2d5bc564dd Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Fri, 15 Nov 2013 16:51:22 +0000
Subject: [PATCH] Bit of code cleanup (issue 11648206)

Change-Id: I2d04bbbdb037de089a16da236dadc4f5950504da
---
 src/com/android/launcher3/Workspace.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 7466a19bbe..d5c0c75b27 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -708,7 +708,12 @@ public class Workspace extends SmoothPagedView
                         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();
         }