summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher2/Launcher.java
diff options
context:
space:
mode:
authorPatrick Dubroy <dubroy@google.com>2011-03-01 16:03:43 -0800
committerPatrick Dubroy <dubroy@google.com>2011-03-01 17:04:40 -0800
commite708c5249b26978057acb9370cbfb8f6f747f5b8 (patch)
treebb4e9c9f0f880b6a89314ffbc3c85316f9608e32 /src/com/android/launcher2/Launcher.java
parentfecd3b8e36dc0b785271b7a501ed174247c412a4 (diff)
downloadandroid_packages_apps_Trebuchet-e708c5249b26978057acb9370cbfb8f6f747f5b8.tar.gz
android_packages_apps_Trebuchet-e708c5249b26978057acb9370cbfb8f6f747f5b8.tar.bz2
android_packages_apps_Trebuchet-e708c5249b26978057acb9370cbfb8f6f747f5b8.zip
Fix 3457875: Mini workspace should zoom on tap, not touch down
Change-Id: I2e9bb6267048f2b2fb97070029f3a0ad2a28cc32
Diffstat (limited to 'src/com/android/launcher2/Launcher.java')
-rw-r--r--src/com/android/launcher2/Launcher.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 195b671e0..9cea69b49 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -2245,6 +2245,10 @@ public final class Launcher extends Activity
}
public boolean onLongClick(View v) {
+ if (mState != State.WORKSPACE) {
+ return false;
+ }
+
switch (v.getId()) {
case R.id.previous_screen:
if (mState != State.ALL_APPS) {
@@ -2277,7 +2281,6 @@ public final class Launcher extends Activity
v = (View) v.getParent().getParent();
}
-
resetAddInfo();
CellLayout.CellInfo longClickCellInfo = (CellLayout.CellInfo) v.getTag();
// This happens when long clicking an item with the dpad/trackball