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

Separate vibration preference controller from accessibility

Browse Source 
Bug: 135056871
Test: manual, robotests
Change-Id: Ic309fd69b68bfa1c3290a696e0987de2621f6dc4
This commit is contained in:
Mill Chen
2019-06-27 22:26:45 +08:00
parent 79ce2c95f4
commit 5aa742bc00
5 changed files with 167 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,12 +22,9 @@ import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import android.content.Context;
import android.os.Vibrator;
import android.provider.DeviceConfig;
import android.provider.Settings;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.testutils.XmlTestUtils;
import com.android.settings.testutils.shadow.ShadowDeviceConfig;
@@ -44,7 +41,6 @@ import java.util.List;
@RunWith(RobolectricTestRunner.class)
public class AccessibilitySettingsTest {
private static final String VIBRATION_PREFERENCE_SCREEN = "vibration_preference_screen";
private Context mContext;
private AccessibilitySettings mSettings;
@@ -67,28 +63,6 @@ public class AccessibilitySettingsTest {
assertThat(keys).containsAllIn(niks);
}
@Test
public void testUpdateVibrationSummary_shouldUpdateSummary() {
final Preference vibrationPreferenceScreen = new Preference(mContext);
doReturn(vibrationPreferenceScreen).when(mSettings).findPreference(
VIBRATION_PREFERENCE_SCREEN);
vibrationPreferenceScreen.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(vibrationPreferenceScreen);
assertThat(vibrationPreferenceScreen.getSummary()).isEqualTo(
VibrationIntensityPreferenceController.getIntensityString(mContext,
Vibrator.VIBRATION_INTENSITY_OFF));
}
@Test
@Config(shadows = {ShadowDeviceConfig.class})
public void testIsRampingRingerEnabled_bothFlagsOn_Enabled() {