workspace bug fixes
- fixed: pressing home sometimes left workspaces
in shrunken state
- fixed: position of delete zone (trash icon)
- fixed: workspace unshrink sometimes looked weird
when coming from all apps
- fixed: clicking power button and returning left
workspace in shrunken state
Change-Id: Ie974202926e6880ccda26ac9fe967fb587a9b7a3
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 5184f80..008b636 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -1038,9 +1038,15 @@
!= Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT);
boolean allAppsVisible = isAllAppsVisible();
- // TODO: Figure out the right thing to do in XLarge mode here
+ // in all these cases, only animate if we're already on home
+ if (LauncherApplication.isScreenXLarge()) {
+ mWorkspace.unshrink(alreadyOnHome);
+ }
if (!mWorkspace.isDefaultScreenShowing()) {
- mWorkspace.moveToDefaultScreen(alreadyOnHome && !allAppsVisible);
+ // on the phone, we don't animate the change to the workspace if all apps is visible
+ // on xlarge screens, however, we want an animated transition
+ mWorkspace.moveToDefaultScreen(alreadyOnHome &&
+ (LauncherApplication.isScreenXLarge() || !allAppsVisible));
}
closeAllApps(alreadyOnHome && allAppsVisible);
hideCustomizationDrawer();
@@ -2409,6 +2415,7 @@
animate = false;
}
closeAllApps(animate);
+ mWorkspace.unshrink(animate);
}
}
}