summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/Launcher.java
diff options
context:
space:
mode:
authorDanesh M <daneshm90@gmail.com>2014-06-06 19:48:54 -0700
committerDanesh M <daneshm90@gmail.com>2014-06-06 22:54:26 -0700
commit8480544bc9dee83fd0ce3a5f0b78bf5fdae3d9af (patch)
treeb45193cd98d6f17a5d3553a3a1f5183d41255279 /src/com/android/launcher3/Launcher.java
parent0c33cc73fe358a82873a5321319e503b5f8fbeaf (diff)
downloadandroid_packages_apps_Trebuchet-8480544bc9dee83fd0ce3a5f0b78bf5fdae3d9af.tar.gz
android_packages_apps_Trebuchet-8480544bc9dee83fd0ce3a5f0b78bf5fdae3d9af.tar.bz2
android_packages_apps_Trebuchet-8480544bc9dee83fd0ce3a5f0b78bf5fdae3d9af.zip
Revert "Workspace: Extra empty screen both left and right"
This reverts commit d4c825cc639bceae57de6dec2c82d6a7633977f7. Change-Id: I53e036ee56bf7bcd817a01ebc18520021e2b4202
Diffstat (limited to 'src/com/android/launcher3/Launcher.java')
-rw-r--r--src/com/android/launcher3/Launcher.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 9fd831514..0dad0f4f8 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -2240,6 +2240,10 @@ public class Launcher extends Activity
return mWorkspaceLoading || mWaitingForResult;
}
+ public boolean isWorkspaceLoading() {
+ return mWorkspaceLoading;
+ }
+
private void resetAddInfo() {
mPendingAddInfo.container = ItemInfo.NO_ID;
mPendingAddInfo.screenId = -1;
@@ -4004,7 +4008,7 @@ public class Launcher extends Activity
}
// Remove the extra empty screen
- mWorkspace.removeExtraEmptyScreens();
+ mWorkspace.removeExtraEmptyScreen(false, null);
if (!LauncherAppState.isDisableAllApps() &&
addedApps != null && mAppsCustomizeContent != null) {