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

Merge "Update Accessbility vibration settings." into pi-dev

Browse Source
This commit is contained in:
AL HO
2018-05-11 07:11:14 +00:00
committed by Android (Google) Code Review
parent 9e629edb09 92216ae148
commit 204dcfdb4c
4 changed files with 77 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
View File

@@ -18,7 +18,16 @@ package com.android.settings.accessibility;
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;
@@ -26,6 +35,8 @@ import com.android.settings.testutils.XmlTestUtils;
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;
@@ -38,11 +49,38 @@ public class AccessibilitySettingsTest {
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);
}
}
@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));
}
}