- Get notification vibration and haptic feedback intensity repectively.
- 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
<item quantity="other">Very long delay (<xliff:g id="click_delay_label" example="200">%1$d</xliff:g> ms)</item>
</plurals>
+ <!-- Summary for vibration settings preference when notification vibration and haptic feedback intensity are set. [CHAR LIMIT=32] -->
+ <string name="accessibility_vibration_summary">Ring <xliff:g id="summary_ring" example="Medium">%1$s</xliff:g>, touch <xliff:g id="summary_touch" example="High">%2$s</xliff:g></string>
+
<!-- Summary for vibration settings preference when ring & notification are set to off-->
<string name="accessibility_vibration_summary_off">Ring & notification set to off</string>
import android.os.Vibrator;
import android.provider.SearchIndexableResource;
import android.provider.Settings;
+import android.support.annotation.VisibleForTesting;
import android.support.v14.preference.SwitchPreference;
import android.support.v4.content.ContextCompat;
import android.support.v7.preference.ListPreference;
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) {
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 "";
}
import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
import android.content.Context;
+import android.os.Bundle;
+import android.os.Vibrator;
+import android.provider.Settings;
+import android.support.v7.preference.Preference;
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import java.util.ArrayList;
public void testNonIndexableKeys_existInXmlLayout() {
final Context context = RuntimeEnvironment.application;
final List<String> niks = AccessibilitySettings.SEARCH_INDEX_DATA_PROVIDER
- .getNonIndexableKeys(context);
+ .getNonIndexableKeys(context);
final List<String> keys = new ArrayList<>();
keys.addAll(XmlTestUtils.getKeysFromPreferenceXml(context, R.xml.accessibility_settings));
assertThat(keys).containsAllIn(niks);
}
-}
\ No newline at end of file
+
+ @Test
+ public void testUpdateVibrationSummary_shouldUpdateSummary() {
+ MockitoAnnotations.initMocks(this);
+ final Context mContext = RuntimeEnvironment.application;
+ final AccessibilitySettings mSettings = spy(new AccessibilitySettings());
+
+ final Preference mVibrationPreferenceScreen = new Preference(mContext);
+ doReturn(mVibrationPreferenceScreen).when(mSettings).findPreference(anyString());
+
+ doReturn(mContext).when(mSettings).getContext();
+
+ mVibrationPreferenceScreen.setKey("vibration_preference_screen");
+
+ Settings.System.putInt(mContext.getContentResolver(),
+ Settings.System.NOTIFICATION_VIBRATION_INTENSITY,
+ Vibrator.VIBRATION_INTENSITY_OFF);
+
+ Settings.System.putInt(mContext.getContentResolver(),
+ Settings.System.HAPTIC_FEEDBACK_INTENSITY,
+ Vibrator.VIBRATION_INTENSITY_OFF);
+
+ mSettings.updateVibrationSummary(mVibrationPreferenceScreen);
+ assertThat(mVibrationPreferenceScreen.getSummary()).isEqualTo(
+ VibrationIntensityPreferenceController.getIntensityString(mContext,
+ Vibrator.VIBRATION_INTENSITY_OFF));
+ }
+}