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

Commit bd916b22 authored by Lais Andrade's avatar Lais Andrade
Browse files

Use new Vibrator method to get default intensity per usage 

Bug: 207477604
Test: builds
Change-Id: I031c1c532dac4762e1b74bebb77d773777f418a6
parent 2e8a9b29

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

+2 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.settings.accessibility;



import android.content.Context;

import android.os.VibrationAttributes;

import android.provider.Settings;



import androidx.annotation.VisibleForTesting;
@@ -39,7 +40,7 @@ public class HapticFeedbackIntensityPreferenceController 


    @Override

    protected int getDefaultIntensity() {

        return mVibrator.getDefaultHapticFeedbackIntensity();

        return mVibrator.getDefaultVibrationIntensity(VibrationAttributes.USAGE_TOUCH);

    }



}

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

+2 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.settings.accessibility;



import android.content.Context;

import android.os.VibrationAttributes;

import android.provider.Settings;



import androidx.annotation.VisibleForTesting;
@@ -38,6 +39,6 @@ public class NotificationVibrationIntensityPreferenceController 


    @Override

    protected int getDefaultIntensity() {

        return mVibrator.getDefaultNotificationVibrationIntensity();

        return mVibrator.getDefaultVibrationIntensity(VibrationAttributes.USAGE_NOTIFICATION);

    }

}

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

+2 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ package com.android.settings.accessibility; 


import android.app.settings.SettingsEnums;

import android.media.AudioAttributes;

import android.os.VibrationAttributes;

import android.os.Vibrator;

import android.provider.Settings;
@@ -57,6 +58,6 @@ public class NotificationVibrationPreferenceFragment extends VibrationPreference 
    @Override

    protected int getDefaultVibrationIntensity() {

        Vibrator vibrator = getContext().getSystemService(Vibrator.class);

        return vibrator.getDefaultNotificationVibrationIntensity();

        return vibrator.getDefaultVibrationIntensity(VibrationAttributes.USAGE_NOTIFICATION);

    }

}

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

+2 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.settings.accessibility;



import android.content.Context;

import android.os.VibrationAttributes;

import android.provider.Settings;



import androidx.annotation.VisibleForTesting;
@@ -39,6 +40,6 @@ public class RingVibrationIntensityPreferenceController 


    @Override

    protected int getDefaultIntensity() {

        return mVibrator.getDefaultRingVibrationIntensity();

        return mVibrator.getDefaultVibrationIntensity(VibrationAttributes.USAGE_RINGTONE);

    }

}

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

+2 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ package com.android.settings.accessibility; 


import android.app.settings.SettingsEnums;

import android.media.AudioAttributes;

import android.os.VibrationAttributes;

import android.os.Vibrator;

import android.provider.Settings;
@@ -61,6 +62,6 @@ public class RingVibrationPreferenceFragment extends VibrationPreferenceFragment 
    @Override

    protected int getDefaultVibrationIntensity() {

        Vibrator vibrator = getContext().getSystemService(Vibrator.class);

        return vibrator.getDefaultRingVibrationIntensity();

        return vibrator.getDefaultVibrationIntensity(VibrationAttributes.USAGE_RINGTONE);

    }

}