From bd916b22a0d2367ddb044d1002056da6fc599f72 Mon Sep 17 00:00:00 2001 From: Lais Andrade Date: Tue, 21 Dec 2021 16:29:44 +0000 Subject: [PATCH] Use new Vibrator method to get default intensity per usage Bug: 207477604 Test: builds Change-Id: I031c1c532dac4762e1b74bebb77d773777f418a6 --- .../HapticFeedbackIntensityPreferenceController.java | 3 ++- ...NotificationVibrationIntensityPreferenceController.java | 3 ++- .../NotificationVibrationPreferenceFragment.java | 3 ++- .../RingVibrationIntensityPreferenceController.java | 3 ++- .../accessibility/RingVibrationPreferenceFragment.java | 3 ++- .../accessibility/TouchVibrationPreferenceFragment.java | 3 ++- .../accessibility/VibrationPreferenceController.java | 7 ++++--- .../RingVibrationIntensityPreferenceControllerTest.java | 5 ++++- 8 files changed, 20 insertions(+), 10 deletions(-) diff --git a/src/com/android/settings/accessibility/HapticFeedbackIntensityPreferenceController.java b/src/com/android/settings/accessibility/HapticFeedbackIntensityPreferenceController.java index a2142a2379e..f3e9b83bbcc 100644 --- a/src/com/android/settings/accessibility/HapticFeedbackIntensityPreferenceController.java +++ b/src/com/android/settings/accessibility/HapticFeedbackIntensityPreferenceController.java @@ -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); } } diff --git a/src/com/android/settings/accessibility/NotificationVibrationIntensityPreferenceController.java b/src/com/android/settings/accessibility/NotificationVibrationIntensityPreferenceController.java index 4ace4c6cdfd..eb396ac87b7 100644 --- a/src/com/android/settings/accessibility/NotificationVibrationIntensityPreferenceController.java +++ b/src/com/android/settings/accessibility/NotificationVibrationIntensityPreferenceController.java @@ -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); } } diff --git a/src/com/android/settings/accessibility/NotificationVibrationPreferenceFragment.java b/src/com/android/settings/accessibility/NotificationVibrationPreferenceFragment.java index 3ca197ffb17..e1d9d47df34 100644 --- a/src/com/android/settings/accessibility/NotificationVibrationPreferenceFragment.java +++ b/src/com/android/settings/accessibility/NotificationVibrationPreferenceFragment.java @@ -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); } } diff --git a/src/com/android/settings/accessibility/RingVibrationIntensityPreferenceController.java b/src/com/android/settings/accessibility/RingVibrationIntensityPreferenceController.java index 4dee34824af..75cbefb4d52 100644 --- a/src/com/android/settings/accessibility/RingVibrationIntensityPreferenceController.java +++ b/src/com/android/settings/accessibility/RingVibrationIntensityPreferenceController.java @@ -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); } } diff --git a/src/com/android/settings/accessibility/RingVibrationPreferenceFragment.java b/src/com/android/settings/accessibility/RingVibrationPreferenceFragment.java index 5d19a9b4166..aa3e313804a 100644 --- a/src/com/android/settings/accessibility/RingVibrationPreferenceFragment.java +++ b/src/com/android/settings/accessibility/RingVibrationPreferenceFragment.java @@ -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); } } diff --git a/src/com/android/settings/accessibility/TouchVibrationPreferenceFragment.java b/src/com/android/settings/accessibility/TouchVibrationPreferenceFragment.java index f6bbbf3f120..b1bd8473df9 100644 --- a/src/com/android/settings/accessibility/TouchVibrationPreferenceFragment.java +++ b/src/com/android/settings/accessibility/TouchVibrationPreferenceFragment.java @@ -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; @@ -52,7 +53,7 @@ public class TouchVibrationPreferenceFragment extends VibrationPreferenceFragmen @Override protected int getDefaultVibrationIntensity() { Vibrator vibrator = getContext().getSystemService(Vibrator.class); - return vibrator.getDefaultHapticFeedbackIntensity(); + return vibrator.getDefaultVibrationIntensity(VibrationAttributes.USAGE_TOUCH); } @Override diff --git a/src/com/android/settings/accessibility/VibrationPreferenceController.java b/src/com/android/settings/accessibility/VibrationPreferenceController.java index 8bfea34ebda..b36106d5db1 100644 --- a/src/com/android/settings/accessibility/VibrationPreferenceController.java +++ b/src/com/android/settings/accessibility/VibrationPreferenceController.java @@ -17,6 +17,7 @@ package com.android.settings.accessibility; import android.content.Context; +import android.os.VibrationAttributes; import android.os.Vibrator; import android.provider.Settings; @@ -41,7 +42,7 @@ public class VibrationPreferenceController extends BasePreferenceController { public CharSequence getSummary() { int ringIntensity = Settings.System.getInt(mContext.getContentResolver(), Settings.System.RING_VIBRATION_INTENSITY, - mVibrator.getDefaultRingVibrationIntensity()); + mVibrator.getDefaultVibrationIntensity(VibrationAttributes.USAGE_RINGTONE)); if (Settings.System.getInt(mContext.getContentResolver(), Settings.System.VIBRATE_WHEN_RINGING, 0) == 0 && !AccessibilitySettings.isRampingRingerEnabled(mContext)) { @@ -52,14 +53,14 @@ public class VibrationPreferenceController extends BasePreferenceController { final int notificationIntensity = Settings.System.getInt(mContext.getContentResolver(), Settings.System.NOTIFICATION_VIBRATION_INTENSITY, - mVibrator.getDefaultNotificationVibrationIntensity()); + mVibrator.getDefaultVibrationIntensity(VibrationAttributes.USAGE_NOTIFICATION)); final CharSequence notificationIntensityString = VibrationIntensityPreferenceController.getIntensityString(mContext, notificationIntensity); int touchIntensity = Settings.System.getInt(mContext.getContentResolver(), Settings.System.HAPTIC_FEEDBACK_INTENSITY, - mVibrator.getDefaultHapticFeedbackIntensity()); + mVibrator.getDefaultVibrationIntensity(VibrationAttributes.USAGE_TOUCH)); if (Settings.System.getInt(mContext.getContentResolver(), Settings.System.HAPTIC_FEEDBACK_ENABLED, 0) == 0) { touchIntensity = Vibrator.VIBRATION_INTENSITY_OFF; diff --git a/tests/robotests/src/com/android/settings/accessibility/RingVibrationIntensityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/RingVibrationIntensityPreferenceControllerTest.java index 0eaf008edef..bd2206fc6fc 100644 --- a/tests/robotests/src/com/android/settings/accessibility/RingVibrationIntensityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/RingVibrationIntensityPreferenceControllerTest.java @@ -20,10 +20,12 @@ import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.google.common.truth.Truth.assertThat; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import android.content.Context; +import android.os.VibrationAttributes; import android.os.Vibrator; import androidx.test.core.app.ApplicationProvider; @@ -59,7 +61,8 @@ public class RingVibrationIntensityPreferenceControllerTest { @Test public void getDefaultIntensity_success() { - doReturn(/* toBeReturned= */ 5).when(mVibrator).getDefaultRingVibrationIntensity(); + doReturn(/* toBeReturned= */ 5).when(mVibrator).getDefaultVibrationIntensity( + eq(VibrationAttributes.USAGE_RINGTONE)); assertThat(mController.getDefaultIntensity()).isEqualTo(/* expected= */ 5); }