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

Merge "Use new Vibrator method to get default intensity per usage"

Browse Source
This commit is contained in:
Lais Andrade
2022-01-11 15:16:30 +00:00
committed by Android (Google) Code Review
parent ac06c38866 bd916b22a0
commit a6e74db8c5
8 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/accessibility/HapticFeedbackIntensityPreferenceController.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.accessibility; package com.android.settings.accessibility;
import android.content.Context; import android.content.Context;
import android.os.VibrationAttributes;
import android.provider.Settings; import android.provider.Settings;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
@@ -39,7 +40,7 @@ public class HapticFeedbackIntensityPreferenceController
@Override @Override
protected int getDefaultIntensity() { protected int getDefaultIntensity() {
return mVibrator.getDefaultHapticFeedbackIntensity(); return mVibrator.getDefaultVibrationIntensity(VibrationAttributes.USAGE_TOUCH);
} }
} }

3
src/com/android/settings/accessibility/NotificationVibrationIntensityPreferenceController.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.accessibility; package com.android.settings.accessibility;
import android.content.Context; import android.content.Context;
import android.os.VibrationAttributes;
import android.provider.Settings; import android.provider.Settings;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
@@ -38,6 +39,6 @@ public class NotificationVibrationIntensityPreferenceController
@Override @Override
protected int getDefaultIntensity() { protected int getDefaultIntensity() {
return mVibrator.getDefaultNotificationVibrationIntensity(); return mVibrator.getDefaultVibrationIntensity(VibrationAttributes.USAGE_NOTIFICATION);
} }
} }

3
src/com/android/settings/accessibility/NotificationVibrationPreferenceFragment.java
View File

@@ -17,6 +17,7 @@ package com.android.settings.accessibility;
import android.app.settings.SettingsEnums; import android.app.settings.SettingsEnums;
import android.media.AudioAttributes; import android.media.AudioAttributes;
import android.os.VibrationAttributes;
import android.os.Vibrator; import android.os.Vibrator;
import android.provider.Settings; import android.provider.Settings;
@@ -57,6 +58,6 @@ public class NotificationVibrationPreferenceFragment extends VibrationPreference
@Override @Override
protected int getDefaultVibrationIntensity() { protected int getDefaultVibrationIntensity() {
Vibrator vibrator = getContext().getSystemService(Vibrator.class); Vibrator vibrator = getContext().getSystemService(Vibrator.class);
return vibrator.getDefaultNotificationVibrationIntensity(); return vibrator.getDefaultVibrationIntensity(VibrationAttributes.USAGE_NOTIFICATION);
} }
} }

3
src/com/android/settings/accessibility/RingVibrationIntensityPreferenceController.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.accessibility; package com.android.settings.accessibility;
import android.content.Context; import android.content.Context;
import android.os.VibrationAttributes;
import android.provider.Settings; import android.provider.Settings;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
@@ -39,6 +40,6 @@ public class RingVibrationIntensityPreferenceController
@Override @Override
protected int getDefaultIntensity() { protected int getDefaultIntensity() {
return mVibrator.getDefaultRingVibrationIntensity(); return mVibrator.getDefaultVibrationIntensity(VibrationAttributes.USAGE_RINGTONE);
} }
} }

3
src/com/android/settings/accessibility/RingVibrationPreferenceFragment.java
View File

@@ -17,6 +17,7 @@ package com.android.settings.accessibility;
import android.app.settings.SettingsEnums; import android.app.settings.SettingsEnums;
import android.media.AudioAttributes; import android.media.AudioAttributes;
import android.os.VibrationAttributes;
import android.os.Vibrator; import android.os.Vibrator;
import android.provider.Settings; import android.provider.Settings;
@@ -61,6 +62,6 @@ public class RingVibrationPreferenceFragment extends VibrationPreferenceFragment
@Override @Override
protected int getDefaultVibrationIntensity() { protected int getDefaultVibrationIntensity() {
Vibrator vibrator = getContext().getSystemService(Vibrator.class); Vibrator vibrator = getContext().getSystemService(Vibrator.class);
return vibrator.getDefaultRingVibrationIntensity(); return vibrator.getDefaultVibrationIntensity(VibrationAttributes.USAGE_RINGTONE);
} }
} }

3
src/com/android/settings/accessibility/TouchVibrationPreferenceFragment.java
View File

@@ -17,6 +17,7 @@ package com.android.settings.accessibility;
import android.app.settings.SettingsEnums; import android.app.settings.SettingsEnums;
import android.media.AudioAttributes; import android.media.AudioAttributes;
import android.os.VibrationAttributes;
import android.os.Vibrator; import android.os.Vibrator;
import android.provider.Settings; import android.provider.Settings;
@@ -52,7 +53,7 @@ public class TouchVibrationPreferenceFragment extends VibrationPreferenceFragmen
@Override @Override
protected int getDefaultVibrationIntensity() { protected int getDefaultVibrationIntensity() {
Vibrator vibrator = getContext().getSystemService(Vibrator.class); Vibrator vibrator = getContext().getSystemService(Vibrator.class);
return vibrator.getDefaultHapticFeedbackIntensity(); return vibrator.getDefaultVibrationIntensity(VibrationAttributes.USAGE_TOUCH);
} }
@Override @Override

7
src/com/android/settings/accessibility/VibrationPreferenceController.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.accessibility; package com.android.settings.accessibility;
import android.content.Context; import android.content.Context;
import android.os.VibrationAttributes;
import android.os.Vibrator; import android.os.Vibrator;
import android.provider.Settings; import android.provider.Settings;
@@ -41,7 +42,7 @@ public class VibrationPreferenceController extends BasePreferenceController {
public CharSequence getSummary() { public CharSequence getSummary() {
int ringIntensity = Settings.System.getInt(mContext.getContentResolver(), int ringIntensity = Settings.System.getInt(mContext.getContentResolver(),
Settings.System.RING_VIBRATION_INTENSITY, Settings.System.RING_VIBRATION_INTENSITY,
mVibrator.getDefaultRingVibrationIntensity()); mVibrator.getDefaultVibrationIntensity(VibrationAttributes.USAGE_RINGTONE));
if (Settings.System.getInt(mContext.getContentResolver(), if (Settings.System.getInt(mContext.getContentResolver(),
Settings.System.VIBRATE_WHEN_RINGING, 0) == 0 Settings.System.VIBRATE_WHEN_RINGING, 0) == 0
&& !AccessibilitySettings.isRampingRingerEnabled(mContext)) { && !AccessibilitySettings.isRampingRingerEnabled(mContext)) {
@@ -52,14 +53,14 @@ public class VibrationPreferenceController extends BasePreferenceController {
final int notificationIntensity = Settings.System.getInt(mContext.getContentResolver(), final int notificationIntensity = Settings.System.getInt(mContext.getContentResolver(),
Settings.System.NOTIFICATION_VIBRATION_INTENSITY, Settings.System.NOTIFICATION_VIBRATION_INTENSITY,
mVibrator.getDefaultNotificationVibrationIntensity()); mVibrator.getDefaultVibrationIntensity(VibrationAttributes.USAGE_NOTIFICATION));
final CharSequence notificationIntensityString = final CharSequence notificationIntensityString =
VibrationIntensityPreferenceController.getIntensityString(mContext, VibrationIntensityPreferenceController.getIntensityString(mContext,
notificationIntensity); notificationIntensity);
int touchIntensity = Settings.System.getInt(mContext.getContentResolver(), int touchIntensity = Settings.System.getInt(mContext.getContentResolver(),
Settings.System.HAPTIC_FEEDBACK_INTENSITY, Settings.System.HAPTIC_FEEDBACK_INTENSITY,
mVibrator.getDefaultHapticFeedbackIntensity()); mVibrator.getDefaultVibrationIntensity(VibrationAttributes.USAGE_TOUCH));
if (Settings.System.getInt(mContext.getContentResolver(), if (Settings.System.getInt(mContext.getContentResolver(),
Settings.System.HAPTIC_FEEDBACK_ENABLED, 0) == 0) { Settings.System.HAPTIC_FEEDBACK_ENABLED, 0) == 0) {
touchIntensity = Vibrator.VIBRATION_INTENSITY_OFF; touchIntensity = Vibrator.VIBRATION_INTENSITY_OFF;

5
tests/robotests/src/com/android/settings/accessibility/RingVibrationIntensityPreferenceControllerTest.java
View File

@@ -20,10 +20,12 @@ import static com.android.settings.core.BasePreferenceController.AVAILABLE;
import static com.google.common.truth.Truth.assertThat; 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.doReturn;
import static org.mockito.Mockito.spy; import static org.mockito.Mockito.spy;
import android.content.Context; import android.content.Context;
import android.os.VibrationAttributes;
import android.os.Vibrator; import android.os.Vibrator;
import androidx.test.core.app.ApplicationProvider; import androidx.test.core.app.ApplicationProvider;
@@ -59,7 +61,8 @@ public class RingVibrationIntensityPreferenceControllerTest {
@Test @Test
public void getDefaultIntensity_success() { 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); assertThat(mController.getDefaultIntensity()).isEqualTo(/* expected= */ 5);
} }