summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jason Mylen <jmylen@google.com> 2022-10-31 20:37:32 +0000
committer Jason Mylen <jmylen@google.com> 2022-11-01 13:39:35 +0000
commit21b57f7c96fd1fc23fdf1118f35502db6b582cf7 (patch)
treea5d1945f63c452cb316fcd779158fedc9dea8952
parentc1fee021cc14739480a1b8f95987904b796d646d (diff)
Remove conflicting vibration-only haptic causing inconsistent touch feedback.
Fix: 204162928 Test: manual Change-Id: I8fb87d634177d070124a03ba360660c763cad454
-rw-r--r--packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java
index 3094a8c2eb1b..0d9627248a28 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 @@ public class VolumeDialogImpl implements VolumeDialog,
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 @@ public class VolumeDialogImpl implements VolumeDialog,
&& 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