Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove conflicting vibration-only haptic causing inconsistent touch feedback." into tm-qpr-dev

Browse Source
This commit is contained in:
Jason Mylen
2022-11-10 14:43:01 +00:00
committed by Android (Google) Code Review
parent 7515e83e2b 21b57f7c96
commit b4c0589530
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java
View File

@@ -1228,6 +1228,9 @@ public class VolumeDialogImpl implements VolumeDialog,
effect = VibrationEffect.get(VibrationEffect.EFFECT_CLICK); effect = VibrationEffect.get(VibrationEffect.EFFECT_CLICK);
break; break;
case RINGER_MODE_VIBRATE: 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: default:
effect = VibrationEffect.get(VibrationEffect.EFFECT_DOUBLE_CLICK); effect = VibrationEffect.get(VibrationEffect.EFFECT_DOUBLE_CLICK);
} }
@@ -1628,9 +1631,8 @@ public class VolumeDialogImpl implements VolumeDialog,
&& mState.ringerModeInternal != -1 && mState.ringerModeInternal != -1
&& mState.ringerModeInternal != state.ringerModeInternal && mState.ringerModeInternal != state.ringerModeInternal
&& state.ringerModeInternal == AudioManager.RINGER_MODE_VIBRATE) { && state.ringerModeInternal == AudioManager.RINGER_MODE_VIBRATE) {
mController.vibrate(VibrationEffect.get(VibrationEffect.EFFECT_HEAVY_CLICK)); mController.vibrate(VibrationEffect.get(VibrationEffect.EFFECT_DOUBLE_CLICK));
} }
mState = state; mState = state;
mDynamic.clear(); mDynamic.clear();
// add any new dynamic rows // add any new dynamic rows