Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f0d733d5 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Apply only RING_VIBRATION_INTENSITY to ringtone vibrations" into tm-dev am: 7a4f6a5b 

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



Change-Id: Idf69f945ca458d3abcc71be9a0f98f18193afd2f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1f977b0e 7a4f6a5b

src/com/android/settings/accessibility/RingVibrationPreferenceConfig.java

+0 −15
Original line number Diff line number Diff line
@@ -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);

tests/robotests/src/com/android/settings/accessibility/RingVibrationIntensityPreferenceControllerTest.java

+4 −4
Original line number Diff line number Diff line
@@ -121,22 +121,22 @@ public class RingVibrationIntensityPreferenceControllerTest { 
    }



    @Test

    public void updateState_vibrateWhenRingingAndRampingRingerOff_shouldDisplayAlwaysOff() {

    public void updateState_vibrateWhenRingingAndRampingRingerOff_shouldDisplayRingIntensity() {

        when(mAudioManager.isRampingRingerEnabled()).thenReturn(false);

        updateSetting(Settings.System.VIBRATE_WHEN_RINGING, OFF);



        updateSetting(Settings.System.RING_VIBRATION_INTENSITY, Vibrator.VIBRATION_INTENSITY_HIGH);

        mController.updateState(mPreference);

        assertThat(mPreference.getProgress()).isEqualTo(Vibrator.VIBRATION_INTENSITY_OFF);

        assertThat(mPreference.getProgress()).isEqualTo(Vibrator.VIBRATION_INTENSITY_HIGH);



        updateSetting(Settings.System.RING_VIBRATION_INTENSITY,

                Vibrator.VIBRATION_INTENSITY_MEDIUM);

        mController.updateState(mPreference);

        assertThat(mPreference.getProgress()).isEqualTo(Vibrator.VIBRATION_INTENSITY_OFF);

        assertThat(mPreference.getProgress()).isEqualTo(Vibrator.VIBRATION_INTENSITY_MEDIUM);



        updateSetting(Settings.System.RING_VIBRATION_INTENSITY, Vibrator.VIBRATION_INTENSITY_LOW);

        mController.updateState(mPreference);

        assertThat(mPreference.getProgress()).isEqualTo(Vibrator.VIBRATION_INTENSITY_OFF);

        assertThat(mPreference.getProgress()).isEqualTo(Vibrator.VIBRATION_INTENSITY_LOW);



        updateSetting(Settings.System.RING_VIBRATION_INTENSITY, Vibrator.VIBRATION_INTENSITY_OFF);

        mController.updateState(mPreference);

tests/robotests/src/com/android/settings/accessibility/RingVibrationTogglePreferenceControllerTest.java

+6 −4
Original line number Diff line number Diff line
@@ -116,22 +116,24 @@ public class RingVibrationTogglePreferenceControllerTest { 
    }



    @Test

    public void updateState_vibrateWhenRingingAndRampingRingerOff_shouldDisplayAlwaysOff() {

    public void updateState_vibrateWhenRingingAndRampingRingerOff_shouldIgnoreAndUseIntensity() {

        // VIBRATE_WHEN_RINGING is deprecated and should have no effect on the ring vibration

        // setting. The ramping ringer is also independent now, instead of a 3-state setting.

        when(mAudioManager.isRampingRingerEnabled()).thenReturn(false);

        updateSetting(Settings.System.VIBRATE_WHEN_RINGING, OFF);



        updateSetting(Settings.System.RING_VIBRATION_INTENSITY, Vibrator.VIBRATION_INTENSITY_HIGH);

        mController.updateState(mPreference);

        assertThat(mPreference.isChecked()).isFalse();

        assertThat(mPreference.isChecked()).isTrue();



        updateSetting(Settings.System.RING_VIBRATION_INTENSITY,

                Vibrator.VIBRATION_INTENSITY_MEDIUM);

        mController.updateState(mPreference);

        assertThat(mPreference.isChecked()).isFalse();

        assertThat(mPreference.isChecked()).isTrue();



        updateSetting(Settings.System.RING_VIBRATION_INTENSITY, Vibrator.VIBRATION_INTENSITY_LOW);

        mController.updateState(mPreference);

        assertThat(mPreference.isChecked()).isFalse();

        assertThat(mPreference.isChecked()).isTrue();



        updateSetting(Settings.System.RING_VIBRATION_INTENSITY, Vibrator.VIBRATION_INTENSITY_OFF);

        mController.updateState(mPreference);