diff options
author | Adam Cohen <adamcohen@google.com> | 2013-09-17 19:08:21 -0700 |
---|---|---|
committer | Adam Cohen <adamcohen@google.com> | 2013-09-17 19:09:54 -0700 |
commit | 1697b79a86c8244cf2758eec93e0ba299bc107d0 (patch) | |
tree | b66dffa672a43a6420495339b3b37f322ea35cf8 /src/com/android/launcher3/Launcher.java | |
parent | f82f344a672077da64a2d36797a24fdb737dd104 (diff) | |
download | android_packages_apps_Trebuchet-1697b79a86c8244cf2758eec93e0ba299bc107d0.tar.gz android_packages_apps_Trebuchet-1697b79a86c8244cf2758eec93e0ba299bc107d0.tar.bz2 android_packages_apps_Trebuchet-1697b79a86c8244cf2758eec93e0ba299bc107d0.zip |
Fixing up click / long click to enter / exit overview mode
Change-Id: I1ec7ab7f3e5c67add9ae64901e0ea377e265ed84
Diffstat (limited to 'src/com/android/launcher3/Launcher.java')
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index ca1074b5f..d70a3a9fb 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -2175,9 +2175,9 @@ public class Launcher extends Activity return; } - if (v instanceof PageIndicator) { - if (!mWorkspace.isInOverviewMode()) { - mWorkspace.enterOverviewMode(); + if (v instanceof Workspace) { + if (mWorkspace.isInOverviewMode()) { + mWorkspace.exitOverviewMode(true); } return; } @@ -2589,6 +2589,15 @@ public class Launcher extends Activity if (isWorkspaceLocked()) return false; if (mState != State.WORKSPACE) return false; + if (v instanceof Workspace) { + if (!mWorkspace.isInOverviewMode()) { + mWorkspace.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS, + HapticFeedbackConstants.FLAG_IGNORE_VIEW_SETTING); + mWorkspace.enterOverviewMode(); + } + return true; + } + if (!(v instanceof CellLayout)) { v = (View) v.getParent().getParent(); } |