tapping home in Launcher now returns you to
default screen instead of going to overview mode
Change-Id: If19f5d6d9324a217211e0ced89dab92eddca385e
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 740e14b..dc0e7e9 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -1163,15 +1163,12 @@
// 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);