Merge "Keep consistency between sound and accessibility settings."

2019-05-23 14:52:48 +00:00
parent 5da97ca816 494071463b
commit cbb6ea5ea4
7 changed files with 150 additions and 13 deletions
--- a/src/com/android/settings/accessibility/RingVibrationPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/RingVibrationPreferenceFragment.java
@@ -46,7 +46,11 @@ public class RingVibrationPreferenceFragment extends VibrationPreferenceFragment

    @Override
    protected String getVibrationEnabledSetting() {
-        return Settings.System.VIBRATE_WHEN_RINGING;
+        if (AccessibilitySettings.isRampingRingerEnabled(getContext())) {
+            return Settings.Global.APPLY_RAMPING_RINGER;
+        } else {
+            return Settings.System.VIBRATE_WHEN_RINGING;
+        }
    }

    @Override