commit 52b5113e8dd2e0e646b0cc8df6124e52384a56fc
author Andreas Agvard <agvard@google.com> Tue Dec 05 12:48:15 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Dec 05 12:48:15 2023 +0000
tree 20ba78ea1e0c745bb3f288ef0fbb882faa9f1aef
parent e8575dfbe9f81b7ffd804e8790ac5ff11a1c0f7e
parent 973c049fe02b5e7aa197d205699de7e72a62c539

Merge "Adds supportsCommitHaptic" into main

quickstep/src/com/android/quickstep/util/AssistStateManager.java

diff --git a/quickstep/src/com/android/quickstep/util/AssistStateManager.java b/quickstep/src/com/android/quickstep/util/AssistStateManager.java
index a0bb76d..f7437eb 100644
--- a/quickstep/src/com/android/quickstep/util/AssistStateManager.java
+++ b/quickstep/src/com/android/quickstep/util/AssistStateManager.java
@@ -31,6 +31,11 @@
 
     public AssistStateManager() {}
 
+    /** Whether search supports haptic on invocation. */
+    public boolean supportsCommitHaptic() {
+        return false;
+    }
+
     /** Whether search is available. */
     public boolean isSearchAvailable() {
         return false;

src/com/android/launcher3/util/VibratorWrapper.java

diff --git a/src/com/android/launcher3/util/VibratorWrapper.java b/src/com/android/launcher3/util/VibratorWrapper.java
index e32fec2..f283fb6 100644
--- a/src/com/android/launcher3/util/VibratorWrapper.java
+++ b/src/com/android/launcher3/util/VibratorWrapper.java
@@ -240,7 +240,7 @@
 
     /** Indicates that search has been invoked. */
     public void vibrateForSearch() {
-        if (mSearchEffect != null && FeatureFlags.ENABLE_SEARCH_HAPTIC_COMMIT.get()) {
+        if (mSearchEffect != null) {
             vibrate(mSearchEffect);
         }
     }