Remove conflicting vibration-only haptic causing inconsistent touch feedback.

Fix: 204162928
Test: manual

Change-Id: I8fb87d634177d070124a03ba360660c763cad454
This commit is contained in:
Jason Mylen
2022-10-31 20:37:32 +00:00
parent c1fee021cc
commit 21b57f7c96

View File

@@ -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