summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Wickham <twickham@google.com>2017-06-19 21:00:45 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-06-19 21:00:45 +0000
commit663bb990f004137ae0c5a62cf378bed8d19f7db4 (patch)
tree5d3dd59d9fb2f2c48d69dfb763a3fdc6cb0b0534
parentbd80c1e0ab64cf0a0c39d1a28143ea42c1eec40a (diff)
parent234ca84a50bca1326f5ad1e717ce644d6bb6c47c (diff)
downloadandroid_packages_apps_Trebuchet-663bb990f004137ae0c5a62cf378bed8d19f7db4.tar.gz
android_packages_apps_Trebuchet-663bb990f004137ae0c5a62cf378bed8d19f7db4.tar.bz2
android_packages_apps_Trebuchet-663bb990f004137ae0c5a62cf378bed8d19f7db4.zip
Merge "Disable haptic feedback on items in Folders." into ub-launcher3-dorval-polish
-rw-r--r--src/com/android/launcher3/folder/FolderPagedView.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/launcher3/folder/FolderPagedView.java b/src/com/android/launcher3/folder/FolderPagedView.java
index 19a16b18a..898a4e9f3 100644
--- a/src/com/android/launcher3/folder/FolderPagedView.java
+++ b/src/com/android/launcher3/folder/FolderPagedView.java
@@ -247,6 +247,7 @@ public class FolderPagedView extends PagedView {
final BubbleTextView textView = (BubbleTextView) mInflater.inflate(
R.layout.folder_application, null, false);
textView.applyFromShortcutInfo(item);
+ textView.setHapticFeedbackEnabled(false);
textView.setOnClickListener(mFolder);
textView.setOnLongClickListener(mFolder);
textView.setOnFocusChangeListener(mFocusIndicatorHelper);