commit ad5ba1af0d0ad6e8afc88c1b52931c4f5fef676b
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Mar 11 18:59:45 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 11 18:59:45 2021 +0000
tree 5ed61c9f63b8266df55173ebe2978e593f15c865
parent 8e5a0a71f72a9f588db83d9dbb5f52b5bd3d213c
parent 84140bec6d30071fa6ae0ebf01268ec507695915

Merge "Disable double haptic when dragging from taskbar hotseat on home" into sc-dev

quickstep/src/com/android/launcher3/taskbar/TaskbarDragListener.java

diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarDragListener.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarDragListener.java
index 9d203fb..dc27df1 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarDragListener.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarDragListener.java
@@ -56,11 +56,14 @@
     protected void init(DragLayer dragLayer) {
         mDragLayer = dragLayer;
         mDragLayer.setOnDragListener(this);
+        // Temporarily disable haptics, as system will already play one when drag and drop starts.
+        mDragLayer.setHapticFeedbackEnabled(false);
     }
 
     private void cleanup() {
         mDragLayer.setOnDragListener(null);
         mLauncher.setNextWorkspaceDragOptions(null);
+        mDragLayer.setHapticFeedbackEnabled(true);
     }
 
     /**