PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Apply only RING_VIBRATION_INTENSITY to ringtone vibrations" into tm-dev am: 7a4f6a5ba3 am: 54f6f65f13

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17474927

Change-Id: I221b376e3d1f844aa970b84936570d6bfd5c70ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-04-13 00:36:36 +00:00
committed by Automerger Merge Worker
parent 45dccd14f3 54f6f65f13
commit 6a489ca8b7
3 changed files with 10 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/accessibility/RingVibrationPreferenceConfig.java
View File

@@ -41,21 +41,6 @@ public class RingVibrationPreferenceConfig extends VibrationPreferenceConfig {
return true;
}
@Override
public int readIntensity() {
final int vibrateWhenRinging = Settings.System.getInt(mContentResolver,
Settings.System.VIBRATE_WHEN_RINGING, ON);
if ((vibrateWhenRinging == OFF)
&& !mAudioManager.isRampingRingerEnabled()) {
// VIBRATE_WHEN_RINGING is deprecated but should still be applied if the user has
// turned it off and has not enabled the ramping ringer (old three-state setting).
return Vibrator.VIBRATION_INTENSITY_OFF;
}
return super.readIntensity();
}
@Override
public boolean updateIntensity(int intensity) {
final boolean success = super.updateIntensity(intensity);