summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2013-11-15 10:22:05 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-11-15 10:22:05 -0800
commit4b0badc92d59634d1f52040e8f9d3ed3fa294a07 (patch)
treeb7646ef3f973cd3b0cf5f53388a5f4df8dc2ae55
parent2dc25b186ed0ddbcb117ed8b70409ee467ab2e9a (diff)
parent3a14eeb54eb6f901629b26bf9e2ccf2d5bc564dd (diff)
downloadandroid_packages_apps_Trebuchet-4b0badc92d59634d1f52040e8f9d3ed3fa294a07.tar.gz
android_packages_apps_Trebuchet-4b0badc92d59634d1f52040e8f9d3ed3fa294a07.tar.bz2
android_packages_apps_Trebuchet-4b0badc92d59634d1f52040e8f9d3ed3fa294a07.zip
am 3a14eeb5: Bit of code cleanup (issue 11648206)
* commit '3a14eeb54eb6f901629b26bf9e2ccf2d5bc564dd': Bit of code cleanup (issue 11648206)
-rw-r--r--src/com/android/launcher3/Workspace.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 7466a19bb..d5c0c75b2 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();
}