diff options
author | Michael Jurka <mikejurka@google.com> | 2010-09-09 11:49:32 -0700 |
---|---|---|
committer | Michael Jurka <mikejurka@google.com> | 2010-09-09 12:10:15 -0700 |
commit | 99229f67d1d00b421003f2795f850b5704c6c7aa (patch) | |
tree | cd7a9152747744a5b3a21be116ce0037d7e64b15 /src/com/android/launcher2/Launcher.java | |
parent | e42cd70f08e1a7f02713f4436309ea508d6c9145 (diff) | |
download | android_packages_apps_Trebuchet-99229f67d1d00b421003f2795f850b5704c6c7aa.tar.gz android_packages_apps_Trebuchet-99229f67d1d00b421003f2795f850b5704c6c7aa.tar.bz2 android_packages_apps_Trebuchet-99229f67d1d00b421003f2795f850b5704c6c7aa.zip |
tapping home in Launcher now returns you to
default screen instead of going to overview mode
Change-Id: If19f5d6d9324a217211e0ced89dab92eddca385e
Diffstat (limited to 'src/com/android/launcher2/Launcher.java')
-rw-r--r-- | src/com/android/launcher2/Launcher.java | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index 740e14b16..dc0e7e93b 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -1163,15 +1163,12 @@ public final class Launcher extends Activity // in all these cases, only animate if we're already on home if (LauncherApplication.isScreenXLarge()) { - if (alreadyOnHome && !mWorkspace.isSmall() && - !allAppsVisible && !customizationDrawerVisible) { - mWorkspace.shrinkToMiddle(); - } else { - mWorkspace.unshrink(alreadyOnHome); - } - } else if (!mWorkspace.isDefaultPageShowing()) { + mWorkspace.unshrink(alreadyOnHome); + } + if (!mWorkspace.isDefaultPageShowing()) { // on the phone, we don't animate the change to the workspace if all apps is visible - mWorkspace.moveToDefaultScreen(alreadyOnHome && !allAppsVisible); + mWorkspace.moveToDefaultScreen( + alreadyOnHome && (LauncherApplication.isScreenXLarge() || !allAppsVisible)); } closeAllApps(alreadyOnHome && allAppsVisible); hideCustomizationDrawer(alreadyOnHome); |