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 am: b4c0589530 am: 110c74846e

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20326199

Change-Id: I0f858a16a84232da96faa8545fdd84fd0f0dc05b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jason Mylen
2022-11-10 15:30:46 +00:00
committed by Automerger Merge Worker
parent e3f805ebbc 110c74846e
commit c27246866e
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

@@ -1230,6 +1230,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);
}
@@ -1630,9 +1633,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