diff options
author | Michael Jurka <mikejurka@google.com> | 2010-08-09 21:05:32 -0700 |
---|---|---|
committer | Michael Jurka <mikejurka@google.com> | 2010-08-10 14:10:20 -0700 |
commit | 4cb3724a2c1e5f278e1531d643accc40fcd8e219 (patch) | |
tree | 8b188e770e842eb14f72fd6d5b19d01b13e46bcb /src/com/android/launcher2/Launcher.java | |
parent | 3ec8bdd576e23f6aa783d5377abecac6fda07374 (diff) | |
download | android_packages_apps_Trebuchet-4cb3724a2c1e5f278e1531d643accc40fcd8e219.tar.gz android_packages_apps_Trebuchet-4cb3724a2c1e5f278e1531d643accc40fcd8e219.tar.bz2 android_packages_apps_Trebuchet-4cb3724a2c1e5f278e1531d643accc40fcd8e219.zip |
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
Diffstat (limited to 'src/com/android/launcher2/Launcher.java')
-rw-r--r-- | src/com/android/launcher2/Launcher.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index 5184f80bf..008b6361c 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -1038,9 +1038,15 @@ public final class Launcher extends Activity != 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 @@ public final class Launcher extends Activity animate = false; } closeAllApps(animate); + mWorkspace.unshrink(animate); } } } |