Update Accessibility vibration settings.
- Get notification vibration and haptic feedback intensity respectively. - Use xliffs to compose these strings. - Use the version that passed in Vibrator.class to get Vibrator instance. - Refactor switch/case part in getSummary() of VibrationIntensityPreferenceController. Let AccessibilitySettings and VibrationIntensityPreferenceController both call it. - Add robolectric test for method: updateVibrationSummary(). - Refine test method, use real preference and test summary value. - Remove redundancy. Bug: 75322064 Test: make ROBOTEST_FILTER=AccessibilitySettingsTest RunSettingsRoboTests Change-Id: Ia3c7447b1ab1e336b36ad439800b673821417e48 Merged-In: Ia3c7447b1ab1e336b36ad439800b673821417e48
This commit is contained in:
@@ -33,6 +33,7 @@ import android.os.UserHandle;
|
||||
import android.os.Vibrator;
|
||||
import android.provider.SearchIndexableResource;
|
||||
import android.provider.Settings;
|
||||
import androidx.annotation.VisibleForTesting;
|
||||
import androidx.preference.SwitchPreference;
|
||||
import androidx.core.content.ContextCompat;
|
||||
import androidx.preference.ListPreference;
|
||||
@@ -749,12 +750,34 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
|
||||
pref.setSummary(entries[index]);
|
||||
}
|
||||
|
||||
private void updateVibrationSummary(Preference pref) {
|
||||
Vibrator vibrator = getContext().getSystemService(Vibrator.class);
|
||||
final int intensity = Settings.System.getInt(getContext().getContentResolver(),
|
||||
@VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
|
||||
void updateVibrationSummary(Preference pref) {
|
||||
final Context context = getContext();
|
||||
final Vibrator vibrator = context.getSystemService(Vibrator.class);
|
||||
|
||||
final int ringIntensity = Settings.System.getInt(context.getContentResolver(),
|
||||
Settings.System.NOTIFICATION_VIBRATION_INTENSITY,
|
||||
vibrator.getDefaultNotificationVibrationIntensity());
|
||||
mVibrationPreferenceScreen.setSummary(getVibrationSummary(getContext(), intensity));
|
||||
CharSequence ringIntensityString =
|
||||
VibrationIntensityPreferenceController.getIntensityString(context, ringIntensity);
|
||||
|
||||
final int touchIntensity = Settings.System.getInt(context.getContentResolver(),
|
||||
Settings.System.HAPTIC_FEEDBACK_INTENSITY,
|
||||
vibrator.getDefaultHapticFeedbackIntensity());
|
||||
CharSequence touchIntensityString =
|
||||
VibrationIntensityPreferenceController.getIntensityString(context, touchIntensity);
|
||||
|
||||
if (mVibrationPreferenceScreen == null) {
|
||||
mVibrationPreferenceScreen = findPreference(VIBRATION_PREFERENCE_SCREEN);
|
||||
}
|
||||
|
||||
if (ringIntensity == touchIntensity) {
|
||||
mVibrationPreferenceScreen.setSummary(ringIntensityString);
|
||||
} else {
|
||||
mVibrationPreferenceScreen.setSummary(
|
||||
getString(R.string.accessibility_vibration_summary,
|
||||
ringIntensityString, touchIntensityString));
|
||||
}
|
||||
}
|
||||
|
||||
private String getVibrationSummary(Context context, @VibrationIntensity int intensity) {
|
||||
|
@@ -77,16 +77,19 @@ public abstract class VibrationIntensityPreferenceController extends BasePrefere
|
||||
public CharSequence getSummary() {
|
||||
final int intensity = Settings.System.getInt(mContext.getContentResolver(),
|
||||
mSettingKey, getDefaultIntensity());
|
||||
return getIntensityString(mContext, intensity);
|
||||
}
|
||||
|
||||
public static CharSequence getIntensityString(Context context, int intensity) {
|
||||
switch (intensity) {
|
||||
case Vibrator.VIBRATION_INTENSITY_OFF:
|
||||
return mContext.getText(R.string.accessibility_vibration_intensity_off);
|
||||
return context.getText(R.string.accessibility_vibration_intensity_off);
|
||||
case Vibrator.VIBRATION_INTENSITY_LOW:
|
||||
return mContext.getText(R.string.accessibility_vibration_intensity_low);
|
||||
return context.getText(R.string.accessibility_vibration_intensity_low);
|
||||
case Vibrator.VIBRATION_INTENSITY_MEDIUM:
|
||||
return mContext.getText(R.string.accessibility_vibration_intensity_medium);
|
||||
return context.getText(R.string.accessibility_vibration_intensity_medium);
|
||||
case Vibrator.VIBRATION_INTENSITY_HIGH:
|
||||
return mContext.getText(R.string.accessibility_vibration_intensity_high);
|
||||
return context.getText(R.string.accessibility_vibration_intensity_high);
|
||||
default:
|
||||
return "";
|
||||
}
|
||||
|
Reference in New Issue
Block a user