summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJoe Onorato <joeo@android.com>2010-02-16 18:25:23 -0500
committerJoe Onorato <joeo@android.com>2010-02-16 18:25:23 -0500
commitf0dde0927be6bc64112cb8db09a6b17b5e71bf18 (patch)
treed8a4ba4ed3d0809a3f9529acea12ee5789a005af /src
parent59d5245b0fb8014fc16d4791fb3a031cc29799aa (diff)
downloadandroid_packages_apps_Trebuchet-f0dde0927be6bc64112cb8db09a6b17b5e71bf18.tar.gz
android_packages_apps_Trebuchet-f0dde0927be6bc64112cb8db09a6b17b5e71bf18.tar.bz2
android_packages_apps_Trebuchet-f0dde0927be6bc64112cb8db09a6b17b5e71bf18.zip
Don't do the haptic feedback on workspace items when they're not being picked up.
related to bug 2309687
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher2/Launcher.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 089e5512b..ee92fc725 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -558,6 +558,7 @@ public final class Launcher extends Activity
mWorkspace = (Workspace) dragLayer.findViewById(R.id.workspace);
final Workspace workspace = mWorkspace;
+ workspace.setHapticFeedbackEnabled(false);
DeleteZone deleteZone = (DeleteZone) dragLayer.findViewById(R.id.delete_zone);
mDeleteZone = deleteZone;
@@ -1385,6 +1386,8 @@ public final class Launcher extends Activity
if (cellInfo.valid) {
// User long pressed on empty space
mWorkspace.setAllowLongPress(false);
+ mWorkspace.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS,
+ HapticFeedbackConstants.FLAG_IGNORE_VIEW_SETTING);
showAddDialog(cellInfo);
}
} else {