diff options
| -rw-r--r-- | res/layout-xlarge/launcher.xml | 1 | ||||
| -rw-r--r-- | src/com/android/launcher2/Launcher.java | 3 | ||||
| -rw-r--r-- | src/com/android/launcher2/Workspace.java | 10 |
3 files changed, 10 insertions, 4 deletions
diff --git a/res/layout-xlarge/launcher.xml b/res/layout-xlarge/launcher.xml index 3f56b4546..f0564cab8 100644 --- a/res/layout-xlarge/launcher.xml +++ b/res/layout-xlarge/launcher.xml @@ -34,6 +34,7 @@ android:id="@+id/workspace" android:layout_width="match_parent" android:layout_height="match_parent" + launcher:defaultScreen="2" launcher:canonicalDeviceWidth="8" launcher:canonicalDeviceHeight="4"> diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index 8102d19ec..1de318fc5 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -2147,8 +2147,7 @@ public final class Launcher extends Activity void onWorkspaceUnshrink() { if (isAllAppsVisible()) { - // TODO: Make a smoother transition here - closeAllApps(false); + closeAllApps(true); } if (isCustomizationDrawerVisible()) { hideCustomizationDrawer(); diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java index 3e52d7f42..5200dbc87 100644 --- a/src/com/android/launcher2/Workspace.java +++ b/src/com/android/launcher2/Workspace.java @@ -804,7 +804,10 @@ public class Workspace extends ViewGroup @Override public boolean dispatchTouchEvent(MotionEvent ev) { if (ev.getAction() == MotionEvent.ACTION_DOWN) { - if (mLauncher.isWorkspaceLocked() || mLauncher.isAllAppsVisible()) { + // (In XLarge mode, the workspace is shrunken below all apps, and responds to taps + // ie when you click on a mini-screen, it zooms back to that screen) + if (mLauncher.isWorkspaceLocked() || + (!LauncherApplication.isScreenXLarge() && mLauncher.isAllAppsVisible())) { return false; } } @@ -815,7 +818,10 @@ public class Workspace extends ViewGroup public boolean onInterceptTouchEvent(MotionEvent ev) { final boolean workspaceLocked = mLauncher.isWorkspaceLocked(); final boolean allAppsVisible = mLauncher.isAllAppsVisible(); - if (workspaceLocked || allAppsVisible) { + + // (In XLarge mode, the workspace is shrunken below all apps, and responds to taps + // ie when you click on a mini-screen, it zooms back to that screen) + if (workspaceLocked || (!LauncherApplication.isScreenXLarge() && allAppsVisible)) { return false; // We don't want the events. Let them fall through to the all apps view. } |