commit 21b57f7c96fd1fc23fdf1118f35502db6b582cf7
author Jason Mylen <jmylen@google.com> Mon Oct 31 20:37:32 2022 +0000
committer Jason Mylen <jmylen@google.com> Tue Nov 01 13:39:35 2022 +0000
tree a5d1945f63c452cb316fcd779158fedc9dea8952
parent c1fee021cc14739480a1b8f95987904b796d646d

Remove conflicting vibration-only haptic causing inconsistent touch feedback.

Fix: 204162928
Test: manual

Change-Id: I8fb87d634177d070124a03ba360660c763cad454

packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java

diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java
index 3094a8c..0d96272 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java
@@ -1228,6 +1228,9 @@
                 effect = VibrationEffect.get(VibrationEffect.EFFECT_CLICK);
                 break;
             case RINGER_MODE_VIBRATE:
+                // Feedback handled by onStateChange, for feedback both when user toggles
+                // directly in volume dialog, or drags slider to a value of 0 in settings.
+                break;
             default:
                 effect = VibrationEffect.get(VibrationEffect.EFFECT_DOUBLE_CLICK);
         }
@@ -1628,9 +1631,8 @@
                 && mState.ringerModeInternal != -1
                 && mState.ringerModeInternal != state.ringerModeInternal
                 && state.ringerModeInternal == AudioManager.RINGER_MODE_VIBRATE) {
-            mController.vibrate(VibrationEffect.get(VibrationEffect.EFFECT_HEAVY_CLICK));
+            mController.vibrate(VibrationEffect.get(VibrationEffect.EFFECT_DOUBLE_CLICK));
         }
-
         mState = state;
         mDynamic.clear();
         // add any new dynamic rows