summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/Workspace.java
diff options
context:
space:
mode:
authorRicardo Cerqueira <cyanogenmod@cerqueira.org>2014-01-26 01:31:09 +0000
committerRicardo Cerqueira <cyanogenmod@cerqueira.org>2014-01-26 01:33:35 +0000
commit15b78d46fc17b5557373ffd1de03eeb70f26d52a (patch)
tree0bf75c29d895fae70f80a503b80667788b042b55 /src/com/android/launcher3/Workspace.java
parente86f3cb065b3901133b7fa05a9e847456f9d0939 (diff)
downloadandroid_packages_apps_Trebuchet-15b78d46fc17b5557373ffd1de03eeb70f26d52a.tar.gz
android_packages_apps_Trebuchet-15b78d46fc17b5557373ffd1de03eeb70f26d52a.tar.bz2
android_packages_apps_Trebuchet-15b78d46fc17b5557373ffd1de03eeb70f26d52a.zip
Don't forcefully disable haptic on hotseat items
This made Launcher.getHapticFeedbackTouchListener a no-op. Rely on the shortcut generation code to set (or not) an onTouch listener Fixes lack of feedback on migrated AllApps shortcuts Change-Id: I3ddda470ec7500a7d30097143edcdcf0daf82666
Diffstat (limited to 'src/com/android/launcher3/Workspace.java')
-rw-r--r--src/com/android/launcher3/Workspace.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index a4b625185..de0a3f3fe 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -928,7 +928,9 @@ public class Workspace extends SmoothPagedView
}
if (!(child instanceof Folder)) {
- child.setHapticFeedbackEnabled(false);
+ if (container != LauncherSettings.Favorites.CONTAINER_HOTSEAT) {
+ child.setHapticFeedbackEnabled(false);
+ }
child.setOnLongClickListener(mLongClickListener);
}
if (child instanceof DropTarget) {