| commit | ceb243b454d4f67593acf5f994e41b18ccd7efe9 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Mar 11 19:25:41 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Mar 11 19:25:41 2021 +0000 |
| tree | 5ed61c9f63b8266df55173ebe2978e593f15c865 | |
| parent | a98c773d7b0ae5227b386782a6293919a3872535 [diff] | |
| parent | ad5ba1af0d0ad6e8afc88c1b52931c4f5fef676b [diff] |
Merge "Disable double haptic when dragging from taskbar hotseat on home" into sc-dev am: ad5ba1af0d Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/13841007 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ifc50428df5f5909d755809e26a28861830a7e082
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); } /**