Merge "Introduce alarm and media vibration intensity settings"
This commit is contained in:
@@ -0,0 +1,137 @@
|
||||
/*
|
||||
* Copyright (C) 2022 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.settings.accessibility;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.content.Context;
|
||||
import android.os.VibrationAttributes;
|
||||
import android.os.Vibrator;
|
||||
import android.provider.Settings;
|
||||
|
||||
import androidx.preference.PreferenceScreen;
|
||||
import androidx.test.core.app.ApplicationProvider;
|
||||
|
||||
import com.android.settings.core.BasePreferenceController;
|
||||
import com.android.settings.widget.SeekBarPreference;
|
||||
import com.android.settingslib.core.lifecycle.Lifecycle;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
public class AlarmVibrationIntensityPreferenceControllerTest {
|
||||
|
||||
private static final String PREFERENCE_KEY = "preference_key";
|
||||
|
||||
@Mock private PreferenceScreen mScreen;
|
||||
|
||||
private Lifecycle mLifecycle;
|
||||
private Context mContext;
|
||||
private Vibrator mVibrator;
|
||||
private AlarmVibrationIntensityPreferenceController mController;
|
||||
private SeekBarPreference mPreference;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
mLifecycle = new Lifecycle(() -> mLifecycle);
|
||||
mContext = ApplicationProvider.getApplicationContext();
|
||||
mVibrator = mContext.getSystemService(Vibrator.class);
|
||||
mController = new AlarmVibrationIntensityPreferenceController(mContext, PREFERENCE_KEY,
|
||||
Vibrator.VIBRATION_INTENSITY_HIGH);
|
||||
mLifecycle.addObserver(mController);
|
||||
mPreference = new SeekBarPreference(mContext);
|
||||
mPreference.setSummary("Test summary");
|
||||
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
|
||||
mController.displayPreference(mScreen);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void verifyConstants() {
|
||||
assertThat(mController.getPreferenceKey()).isEqualTo(PREFERENCE_KEY);
|
||||
assertThat(mController.getAvailabilityStatus())
|
||||
.isEqualTo(BasePreferenceController.AVAILABLE);
|
||||
assertThat(mController.getMin()).isEqualTo(Vibrator.VIBRATION_INTENSITY_OFF);
|
||||
assertThat(mController.getMax()).isEqualTo(Vibrator.VIBRATION_INTENSITY_HIGH);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void missingSetting_shouldReturnDefault() {
|
||||
Settings.System.putString(mContext.getContentResolver(),
|
||||
Settings.System.ALARM_VIBRATION_INTENSITY, /* value= */ null);
|
||||
|
||||
mController.updateState(mPreference);
|
||||
|
||||
assertThat(mPreference.getProgress()).isEqualTo(
|
||||
mVibrator.getDefaultVibrationIntensity(VibrationAttributes.USAGE_ALARM));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateState_shouldDisplayIntensityInSliderPosition() {
|
||||
updateSetting(Settings.System.ALARM_VIBRATION_INTENSITY, Vibrator.VIBRATION_INTENSITY_HIGH);
|
||||
mController.updateState(mPreference);
|
||||
assertThat(mPreference.getProgress()).isEqualTo(Vibrator.VIBRATION_INTENSITY_HIGH);
|
||||
|
||||
updateSetting(Settings.System.ALARM_VIBRATION_INTENSITY,
|
||||
Vibrator.VIBRATION_INTENSITY_MEDIUM);
|
||||
mController.updateState(mPreference);
|
||||
assertThat(mPreference.getProgress()).isEqualTo(Vibrator.VIBRATION_INTENSITY_MEDIUM);
|
||||
|
||||
updateSetting(Settings.System.ALARM_VIBRATION_INTENSITY, Vibrator.VIBRATION_INTENSITY_LOW);
|
||||
mController.updateState(mPreference);
|
||||
assertThat(mPreference.getProgress()).isEqualTo(Vibrator.VIBRATION_INTENSITY_LOW);
|
||||
|
||||
updateSetting(Settings.System.ALARM_VIBRATION_INTENSITY, Vibrator.VIBRATION_INTENSITY_OFF);
|
||||
mController.updateState(mPreference);
|
||||
assertThat(mPreference.getProgress()).isEqualTo(Vibrator.VIBRATION_INTENSITY_OFF);
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
public void setProgress_updatesIntensitySetting() throws Exception {
|
||||
mController.setSliderPosition(Vibrator.VIBRATION_INTENSITY_OFF);
|
||||
assertThat(readSetting(Settings.System.ALARM_VIBRATION_INTENSITY))
|
||||
.isEqualTo(Vibrator.VIBRATION_INTENSITY_OFF);
|
||||
|
||||
mController.setSliderPosition(Vibrator.VIBRATION_INTENSITY_LOW);
|
||||
assertThat(readSetting(Settings.System.ALARM_VIBRATION_INTENSITY))
|
||||
.isEqualTo(Vibrator.VIBRATION_INTENSITY_LOW);
|
||||
|
||||
mController.setSliderPosition(Vibrator.VIBRATION_INTENSITY_MEDIUM);
|
||||
assertThat(readSetting(Settings.System.ALARM_VIBRATION_INTENSITY))
|
||||
.isEqualTo(Vibrator.VIBRATION_INTENSITY_MEDIUM);
|
||||
|
||||
mController.setSliderPosition(Vibrator.VIBRATION_INTENSITY_HIGH);
|
||||
assertThat(readSetting(Settings.System.ALARM_VIBRATION_INTENSITY))
|
||||
.isEqualTo(Vibrator.VIBRATION_INTENSITY_HIGH);
|
||||
}
|
||||
|
||||
private void updateSetting(String key, int value) {
|
||||
Settings.System.putInt(mContext.getContentResolver(), key, value);
|
||||
}
|
||||
|
||||
private int readSetting(String settingKey) throws Settings.SettingNotFoundException {
|
||||
return Settings.System.getInt(mContext.getContentResolver(), settingKey);
|
||||
}
|
||||
}
|
@@ -0,0 +1,128 @@
|
||||
/*
|
||||
* Copyright (C) 2022 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.settings.accessibility;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.content.Context;
|
||||
import android.os.VibrationAttributes;
|
||||
import android.os.Vibrator;
|
||||
import android.provider.Settings;
|
||||
|
||||
import androidx.preference.PreferenceScreen;
|
||||
import androidx.preference.SwitchPreference;
|
||||
import androidx.test.core.app.ApplicationProvider;
|
||||
|
||||
import com.android.settings.core.BasePreferenceController;
|
||||
import com.android.settingslib.core.lifecycle.Lifecycle;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
public class AlarmVibrationTogglePreferenceControllerTest {
|
||||
|
||||
private static final String PREFERENCE_KEY = "preference_key";
|
||||
|
||||
@Mock private PreferenceScreen mScreen;
|
||||
|
||||
private Lifecycle mLifecycle;
|
||||
private Context mContext;
|
||||
private Vibrator mVibrator;
|
||||
private AlarmVibrationTogglePreferenceController mController;
|
||||
private SwitchPreference mPreference;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
mLifecycle = new Lifecycle(() -> mLifecycle);
|
||||
mContext = ApplicationProvider.getApplicationContext();
|
||||
mVibrator = mContext.getSystemService(Vibrator.class);
|
||||
mController = new AlarmVibrationTogglePreferenceController(mContext, PREFERENCE_KEY);
|
||||
mLifecycle.addObserver(mController);
|
||||
mPreference = new SwitchPreference(mContext);
|
||||
mPreference.setSummary("Test summary");
|
||||
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
|
||||
mController.displayPreference(mScreen);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void verifyConstants() {
|
||||
assertThat(mController.getPreferenceKey()).isEqualTo(PREFERENCE_KEY);
|
||||
assertThat(mController.getAvailabilityStatus())
|
||||
.isEqualTo(BasePreferenceController.AVAILABLE);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void missingSetting_shouldReturnDefault() {
|
||||
Settings.System.putString(mContext.getContentResolver(),
|
||||
Settings.System.ALARM_VIBRATION_INTENSITY, /* value= */ null);
|
||||
|
||||
mController.updateState(mPreference);
|
||||
|
||||
assertThat(mPreference.isChecked()).isTrue();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateState_shouldDisplayOnOffState() {
|
||||
updateSetting(Settings.System.ALARM_VIBRATION_INTENSITY, Vibrator.VIBRATION_INTENSITY_HIGH);
|
||||
mController.updateState(mPreference);
|
||||
assertThat(mPreference.isChecked()).isTrue();
|
||||
|
||||
updateSetting(Settings.System.ALARM_VIBRATION_INTENSITY,
|
||||
Vibrator.VIBRATION_INTENSITY_MEDIUM);
|
||||
mController.updateState(mPreference);
|
||||
assertThat(mPreference.isChecked()).isTrue();
|
||||
|
||||
updateSetting(Settings.System.ALARM_VIBRATION_INTENSITY, Vibrator.VIBRATION_INTENSITY_LOW);
|
||||
mController.updateState(mPreference);
|
||||
assertThat(mPreference.isChecked()).isTrue();
|
||||
|
||||
updateSetting(Settings.System.ALARM_VIBRATION_INTENSITY, Vibrator.VIBRATION_INTENSITY_OFF);
|
||||
mController.updateState(mPreference);
|
||||
assertThat(mPreference.isChecked()).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setChecked_updatesIntensityAndDependentSettings() throws Exception {
|
||||
updateSetting(Settings.System.ALARM_VIBRATION_INTENSITY, Vibrator.VIBRATION_INTENSITY_OFF);
|
||||
mController.updateState(mPreference);
|
||||
assertThat(mPreference.isChecked()).isFalse();
|
||||
|
||||
mController.setChecked(true);
|
||||
assertThat(readSetting(Settings.System.ALARM_VIBRATION_INTENSITY)).isEqualTo(
|
||||
mVibrator.getDefaultVibrationIntensity(VibrationAttributes.USAGE_ALARM));
|
||||
|
||||
mController.setChecked(false);
|
||||
assertThat(readSetting(Settings.System.ALARM_VIBRATION_INTENSITY))
|
||||
.isEqualTo(Vibrator.VIBRATION_INTENSITY_OFF);
|
||||
}
|
||||
|
||||
private void updateSetting(String key, int value) {
|
||||
Settings.System.putInt(mContext.getContentResolver(), key, value);
|
||||
}
|
||||
|
||||
private int readSetting(String settingKey) throws Settings.SettingNotFoundException {
|
||||
return Settings.System.getInt(mContext.getContentResolver(), settingKey);
|
||||
}
|
||||
}
|
@@ -18,7 +18,6 @@ package com.android.settings.accessibility;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.Mockito.spy;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.content.Context;
|
||||
@@ -26,7 +25,6 @@ import android.os.VibrationAttributes;
|
||||
import android.os.Vibrator;
|
||||
import android.provider.Settings;
|
||||
|
||||
import androidx.lifecycle.LifecycleOwner;
|
||||
import androidx.preference.PreferenceScreen;
|
||||
import androidx.test.core.app.ApplicationProvider;
|
||||
|
||||
@@ -49,10 +47,8 @@ public class HapticFeedbackIntensityPreferenceControllerTest {
|
||||
private static final int OFF = 0;
|
||||
private static final int ON = 1;
|
||||
|
||||
@Mock
|
||||
private PreferenceScreen mScreen;
|
||||
@Mock private PreferenceScreen mScreen;
|
||||
|
||||
private LifecycleOwner mLifecycleOwner;
|
||||
private Lifecycle mLifecycle;
|
||||
private Context mContext;
|
||||
private Vibrator mVibrator;
|
||||
@@ -62,16 +58,16 @@ public class HapticFeedbackIntensityPreferenceControllerTest {
|
||||
@Before
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
mLifecycleOwner = () -> mLifecycle;
|
||||
mLifecycle = new Lifecycle(mLifecycleOwner);
|
||||
mContext = spy(ApplicationProvider.getApplicationContext());
|
||||
mLifecycle = new Lifecycle(() -> mLifecycle);
|
||||
mContext = ApplicationProvider.getApplicationContext();
|
||||
mVibrator = mContext.getSystemService(Vibrator.class);
|
||||
mController = new HapticFeedbackIntensityPreferenceController(mContext, PREFERENCE_KEY);
|
||||
mController = new HapticFeedbackIntensityPreferenceController(mContext, PREFERENCE_KEY,
|
||||
Vibrator.VIBRATION_INTENSITY_HIGH);
|
||||
mLifecycle.addObserver(mController);
|
||||
mPreference = new SeekBarPreference(mContext);
|
||||
mPreference.setSummary("Test summary");
|
||||
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
|
||||
showPreference();
|
||||
mController.displayPreference(mScreen);
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -115,27 +111,27 @@ public class HapticFeedbackIntensityPreferenceControllerTest {
|
||||
@Test
|
||||
@Ignore
|
||||
public void setProgress_updatesIntensityAndDependentSettings() throws Exception {
|
||||
mPreference.setProgress(Vibrator.VIBRATION_INTENSITY_OFF);
|
||||
mController.setSliderPosition(Vibrator.VIBRATION_INTENSITY_OFF);
|
||||
assertThat(readSetting(Settings.System.HAPTIC_FEEDBACK_INTENSITY))
|
||||
.isEqualTo(Vibrator.VIBRATION_INTENSITY_OFF);
|
||||
assertThat(readSetting(Settings.System.HAPTIC_FEEDBACK_ENABLED)).isEqualTo(OFF);
|
||||
|
||||
mPreference.setProgress(Vibrator.VIBRATION_INTENSITY_LOW);
|
||||
mController.setSliderPosition(Vibrator.VIBRATION_INTENSITY_LOW);
|
||||
assertThat(readSetting(Settings.System.HAPTIC_FEEDBACK_INTENSITY))
|
||||
.isEqualTo(Vibrator.VIBRATION_INTENSITY_LOW);
|
||||
assertThat(readSetting(Settings.System.HAPTIC_FEEDBACK_ENABLED)).isEqualTo(ON);
|
||||
|
||||
mPreference.setProgress(Vibrator.VIBRATION_INTENSITY_MEDIUM);
|
||||
mController.setSliderPosition(Vibrator.VIBRATION_INTENSITY_MEDIUM);
|
||||
assertThat(readSetting(Settings.System.HAPTIC_FEEDBACK_INTENSITY))
|
||||
.isEqualTo(Vibrator.VIBRATION_INTENSITY_MEDIUM);
|
||||
assertThat(readSetting(Settings.System.HAPTIC_FEEDBACK_ENABLED)).isEqualTo(ON);
|
||||
|
||||
mPreference.setProgress(Vibrator.VIBRATION_INTENSITY_HIGH);
|
||||
mController.setSliderPosition(Vibrator.VIBRATION_INTENSITY_HIGH);
|
||||
assertThat(readSetting(Settings.System.HAPTIC_FEEDBACK_INTENSITY))
|
||||
.isEqualTo(Vibrator.VIBRATION_INTENSITY_HIGH);
|
||||
assertThat(readSetting(Settings.System.HAPTIC_FEEDBACK_ENABLED)).isEqualTo(ON);
|
||||
|
||||
mPreference.setProgress(Vibrator.VIBRATION_INTENSITY_OFF);
|
||||
mController.setSliderPosition(Vibrator.VIBRATION_INTENSITY_OFF);
|
||||
assertThat(readSetting(Settings.System.HAPTIC_FEEDBACK_INTENSITY))
|
||||
.isEqualTo(Vibrator.VIBRATION_INTENSITY_OFF);
|
||||
assertThat(readSetting(Settings.System.HAPTIC_FEEDBACK_ENABLED)).isEqualTo(OFF);
|
||||
@@ -148,8 +144,4 @@ public class HapticFeedbackIntensityPreferenceControllerTest {
|
||||
private int readSetting(String settingKey) throws Settings.SettingNotFoundException {
|
||||
return Settings.System.getInt(mContext.getContentResolver(), settingKey);
|
||||
}
|
||||
|
||||
private void showPreference() {
|
||||
mController.displayPreference(mScreen);
|
||||
}
|
||||
}
|
||||
|
@@ -18,7 +18,6 @@ package com.android.settings.accessibility;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.Mockito.spy;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.content.Context;
|
||||
@@ -26,7 +25,6 @@ import android.os.VibrationAttributes;
|
||||
import android.os.Vibrator;
|
||||
import android.provider.Settings;
|
||||
|
||||
import androidx.lifecycle.LifecycleOwner;
|
||||
import androidx.preference.PreferenceScreen;
|
||||
import androidx.preference.SwitchPreference;
|
||||
import androidx.test.core.app.ApplicationProvider;
|
||||
@@ -49,10 +47,8 @@ public class HapticFeedbackTogglePreferenceControllerTest {
|
||||
private static final int OFF = 0;
|
||||
private static final int ON = 1;
|
||||
|
||||
@Mock
|
||||
private PreferenceScreen mScreen;
|
||||
@Mock private PreferenceScreen mScreen;
|
||||
|
||||
private LifecycleOwner mLifecycleOwner;
|
||||
private Lifecycle mLifecycle;
|
||||
private Context mContext;
|
||||
private Vibrator mVibrator;
|
||||
@@ -62,16 +58,15 @@ public class HapticFeedbackTogglePreferenceControllerTest {
|
||||
@Before
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
mLifecycleOwner = () -> mLifecycle;
|
||||
mLifecycle = new Lifecycle(mLifecycleOwner);
|
||||
mContext = spy(ApplicationProvider.getApplicationContext());
|
||||
mLifecycle = new Lifecycle(() -> mLifecycle);
|
||||
mContext = ApplicationProvider.getApplicationContext();
|
||||
mVibrator = mContext.getSystemService(Vibrator.class);
|
||||
mController = new HapticFeedbackTogglePreferenceController(mContext, PREFERENCE_KEY);
|
||||
mLifecycle.addObserver(mController);
|
||||
mPreference = new SwitchPreference(mContext);
|
||||
mPreference.setSummary("Test summary");
|
||||
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
|
||||
showPreference();
|
||||
mController.displayPreference(mScreen);
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -116,12 +111,12 @@ public class HapticFeedbackTogglePreferenceControllerTest {
|
||||
mController.updateState(mPreference);
|
||||
assertThat(mPreference.isChecked()).isFalse();
|
||||
|
||||
mPreference.setChecked(true);
|
||||
mController.setChecked(true);
|
||||
assertThat(readSetting(Settings.System.HAPTIC_FEEDBACK_INTENSITY))
|
||||
.isEqualTo(mVibrator.getDefaultVibrationIntensity(VibrationAttributes.USAGE_TOUCH));
|
||||
assertThat(readSetting(Settings.System.HAPTIC_FEEDBACK_ENABLED)).isEqualTo(ON);
|
||||
|
||||
mPreference.setChecked(false);
|
||||
mController.setChecked(false);
|
||||
assertThat(readSetting(Settings.System.HAPTIC_FEEDBACK_INTENSITY))
|
||||
.isEqualTo(Vibrator.VIBRATION_INTENSITY_OFF);
|
||||
assertThat(readSetting(Settings.System.HAPTIC_FEEDBACK_ENABLED)).isEqualTo(OFF);
|
||||
@@ -134,8 +129,4 @@ public class HapticFeedbackTogglePreferenceControllerTest {
|
||||
private int readSetting(String settingKey) throws Settings.SettingNotFoundException {
|
||||
return Settings.System.getInt(mContext.getContentResolver(), settingKey);
|
||||
}
|
||||
|
||||
private void showPreference() {
|
||||
mController.displayPreference(mScreen);
|
||||
}
|
||||
}
|
||||
|
@@ -0,0 +1,138 @@
|
||||
/*
|
||||
* Copyright (C) 2022 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.settings.accessibility;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.content.Context;
|
||||
import android.os.VibrationAttributes;
|
||||
import android.os.Vibrator;
|
||||
import android.provider.Settings;
|
||||
|
||||
import androidx.preference.PreferenceScreen;
|
||||
import androidx.test.core.app.ApplicationProvider;
|
||||
|
||||
import com.android.settings.core.BasePreferenceController;
|
||||
import com.android.settings.widget.SeekBarPreference;
|
||||
import com.android.settingslib.core.lifecycle.Lifecycle;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
|
||||
/** Test for {@link MediaVibrationIntensityPreferenceController}. */
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
public class MediaVibrationIntensityPreferenceControllerTest {
|
||||
|
||||
private static final String PREFERENCE_KEY = "preference_key";
|
||||
|
||||
@Mock private PreferenceScreen mScreen;
|
||||
|
||||
private Lifecycle mLifecycle;
|
||||
private Context mContext;
|
||||
private Vibrator mVibrator;
|
||||
private MediaVibrationIntensityPreferenceController mController;
|
||||
private SeekBarPreference mPreference;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
mLifecycle = new Lifecycle(() -> mLifecycle);
|
||||
mContext = ApplicationProvider.getApplicationContext();
|
||||
mVibrator = mContext.getSystemService(Vibrator.class);
|
||||
mController = new MediaVibrationIntensityPreferenceController(mContext, PREFERENCE_KEY,
|
||||
Vibrator.VIBRATION_INTENSITY_HIGH);
|
||||
mLifecycle.addObserver(mController);
|
||||
mPreference = new SeekBarPreference(mContext);
|
||||
mPreference.setSummary("Test summary");
|
||||
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
|
||||
mController.displayPreference(mScreen);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void verifyConstants() {
|
||||
assertThat(mController.getPreferenceKey()).isEqualTo(PREFERENCE_KEY);
|
||||
assertThat(mController.getAvailabilityStatus())
|
||||
.isEqualTo(BasePreferenceController.AVAILABLE);
|
||||
assertThat(mController.getMin()).isEqualTo(Vibrator.VIBRATION_INTENSITY_OFF);
|
||||
assertThat(mController.getMax()).isEqualTo(Vibrator.VIBRATION_INTENSITY_HIGH);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void missingSetting_shouldReturnDefault() {
|
||||
Settings.System.putString(mContext.getContentResolver(),
|
||||
Settings.System.MEDIA_VIBRATION_INTENSITY, /* value= */ null);
|
||||
|
||||
mController.updateState(mPreference);
|
||||
|
||||
assertThat(mPreference.getProgress()).isEqualTo(
|
||||
mVibrator.getDefaultVibrationIntensity(VibrationAttributes.USAGE_MEDIA));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateState_shouldDisplayIntensityInSliderPosition() {
|
||||
updateSetting(Settings.System.MEDIA_VIBRATION_INTENSITY, Vibrator.VIBRATION_INTENSITY_HIGH);
|
||||
mController.updateState(mPreference);
|
||||
assertThat(mPreference.getProgress()).isEqualTo(Vibrator.VIBRATION_INTENSITY_HIGH);
|
||||
|
||||
updateSetting(Settings.System.MEDIA_VIBRATION_INTENSITY,
|
||||
Vibrator.VIBRATION_INTENSITY_MEDIUM);
|
||||
mController.updateState(mPreference);
|
||||
assertThat(mPreference.getProgress()).isEqualTo(Vibrator.VIBRATION_INTENSITY_MEDIUM);
|
||||
|
||||
updateSetting(Settings.System.MEDIA_VIBRATION_INTENSITY, Vibrator.VIBRATION_INTENSITY_LOW);
|
||||
mController.updateState(mPreference);
|
||||
assertThat(mPreference.getProgress()).isEqualTo(Vibrator.VIBRATION_INTENSITY_LOW);
|
||||
|
||||
updateSetting(Settings.System.MEDIA_VIBRATION_INTENSITY, Vibrator.VIBRATION_INTENSITY_OFF);
|
||||
mController.updateState(mPreference);
|
||||
assertThat(mPreference.getProgress()).isEqualTo(Vibrator.VIBRATION_INTENSITY_OFF);
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
public void setProgress_updatesIntensitySetting() throws Exception {
|
||||
mController.setSliderPosition(Vibrator.VIBRATION_INTENSITY_OFF);
|
||||
assertThat(readSetting(Settings.System.MEDIA_VIBRATION_INTENSITY))
|
||||
.isEqualTo(Vibrator.VIBRATION_INTENSITY_OFF);
|
||||
|
||||
mController.setSliderPosition(Vibrator.VIBRATION_INTENSITY_LOW);
|
||||
assertThat(readSetting(Settings.System.MEDIA_VIBRATION_INTENSITY))
|
||||
.isEqualTo(Vibrator.VIBRATION_INTENSITY_LOW);
|
||||
|
||||
mController.setSliderPosition(Vibrator.VIBRATION_INTENSITY_MEDIUM);
|
||||
assertThat(readSetting(Settings.System.MEDIA_VIBRATION_INTENSITY))
|
||||
.isEqualTo(Vibrator.VIBRATION_INTENSITY_MEDIUM);
|
||||
|
||||
mController.setSliderPosition(Vibrator.VIBRATION_INTENSITY_HIGH);
|
||||
assertThat(readSetting(Settings.System.MEDIA_VIBRATION_INTENSITY))
|
||||
.isEqualTo(Vibrator.VIBRATION_INTENSITY_HIGH);
|
||||
}
|
||||
|
||||
private void updateSetting(String key, int value) {
|
||||
Settings.System.putInt(mContext.getContentResolver(), key, value);
|
||||
}
|
||||
|
||||
private int readSetting(String settingKey) throws Settings.SettingNotFoundException {
|
||||
return Settings.System.getInt(mContext.getContentResolver(), settingKey);
|
||||
}
|
||||
}
|
@@ -0,0 +1,129 @@
|
||||
/*
|
||||
* Copyright (C) 2022 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.settings.accessibility;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.content.Context;
|
||||
import android.os.VibrationAttributes;
|
||||
import android.os.Vibrator;
|
||||
import android.provider.Settings;
|
||||
|
||||
import androidx.preference.PreferenceScreen;
|
||||
import androidx.preference.SwitchPreference;
|
||||
import androidx.test.core.app.ApplicationProvider;
|
||||
|
||||
import com.android.settings.core.BasePreferenceController;
|
||||
import com.android.settingslib.core.lifecycle.Lifecycle;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
|
||||
/** Test for {@link MediaVibrationIntensityPreferenceController}. */
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
public class MediaVibrationTogglePreferenceControllerTest {
|
||||
|
||||
private static final String PREFERENCE_KEY = "preference_key";
|
||||
|
||||
@Mock private PreferenceScreen mScreen;
|
||||
|
||||
private Lifecycle mLifecycle;
|
||||
private Context mContext;
|
||||
private Vibrator mVibrator;
|
||||
private MediaVibrationTogglePreferenceController mController;
|
||||
private SwitchPreference mPreference;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
mLifecycle = new Lifecycle(() -> mLifecycle);
|
||||
mContext = ApplicationProvider.getApplicationContext();
|
||||
mVibrator = mContext.getSystemService(Vibrator.class);
|
||||
mController = new MediaVibrationTogglePreferenceController(mContext, PREFERENCE_KEY);
|
||||
mLifecycle.addObserver(mController);
|
||||
mPreference = new SwitchPreference(mContext);
|
||||
mPreference.setSummary("Test summary");
|
||||
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
|
||||
mController.displayPreference(mScreen);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void verifyConstants() {
|
||||
assertThat(mController.getPreferenceKey()).isEqualTo(PREFERENCE_KEY);
|
||||
assertThat(mController.getAvailabilityStatus())
|
||||
.isEqualTo(BasePreferenceController.AVAILABLE);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void missingSetting_shouldReturnDefault() {
|
||||
Settings.System.putString(mContext.getContentResolver(),
|
||||
Settings.System.MEDIA_VIBRATION_INTENSITY, /* value= */ null);
|
||||
|
||||
mController.updateState(mPreference);
|
||||
|
||||
assertThat(mPreference.isChecked()).isTrue();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateState_shouldDisplayOnOffState() {
|
||||
updateSetting(Settings.System.MEDIA_VIBRATION_INTENSITY, Vibrator.VIBRATION_INTENSITY_HIGH);
|
||||
mController.updateState(mPreference);
|
||||
assertThat(mPreference.isChecked()).isTrue();
|
||||
|
||||
updateSetting(Settings.System.MEDIA_VIBRATION_INTENSITY,
|
||||
Vibrator.VIBRATION_INTENSITY_MEDIUM);
|
||||
mController.updateState(mPreference);
|
||||
assertThat(mPreference.isChecked()).isTrue();
|
||||
|
||||
updateSetting(Settings.System.MEDIA_VIBRATION_INTENSITY, Vibrator.VIBRATION_INTENSITY_LOW);
|
||||
mController.updateState(mPreference);
|
||||
assertThat(mPreference.isChecked()).isTrue();
|
||||
|
||||
updateSetting(Settings.System.MEDIA_VIBRATION_INTENSITY, Vibrator.VIBRATION_INTENSITY_OFF);
|
||||
mController.updateState(mPreference);
|
||||
assertThat(mPreference.isChecked()).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setChecked_updatesIntensityAndDependentSettings() throws Exception {
|
||||
updateSetting(Settings.System.MEDIA_VIBRATION_INTENSITY, Vibrator.VIBRATION_INTENSITY_OFF);
|
||||
mController.updateState(mPreference);
|
||||
assertThat(mPreference.isChecked()).isFalse();
|
||||
|
||||
mController.setChecked(true);
|
||||
assertThat(readSetting(Settings.System.MEDIA_VIBRATION_INTENSITY)).isEqualTo(
|
||||
mVibrator.getDefaultVibrationIntensity(VibrationAttributes.USAGE_MEDIA));
|
||||
|
||||
mController.setChecked(false);
|
||||
assertThat(readSetting(Settings.System.MEDIA_VIBRATION_INTENSITY))
|
||||
.isEqualTo(Vibrator.VIBRATION_INTENSITY_OFF);
|
||||
}
|
||||
|
||||
private void updateSetting(String key, int value) {
|
||||
Settings.System.putInt(mContext.getContentResolver(), key, value);
|
||||
}
|
||||
|
||||
private int readSetting(String settingKey) throws Settings.SettingNotFoundException {
|
||||
return Settings.System.getInt(mContext.getContentResolver(), settingKey);
|
||||
}
|
||||
}
|
@@ -18,7 +18,6 @@ package com.android.settings.accessibility;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.Mockito.spy;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.content.Context;
|
||||
@@ -26,7 +25,6 @@ import android.os.VibrationAttributes;
|
||||
import android.os.Vibrator;
|
||||
import android.provider.Settings;
|
||||
|
||||
import androidx.lifecycle.LifecycleOwner;
|
||||
import androidx.preference.PreferenceScreen;
|
||||
import androidx.test.core.app.ApplicationProvider;
|
||||
|
||||
@@ -47,10 +45,8 @@ public class NotificationVibrationIntensityPreferenceControllerTest {
|
||||
|
||||
private static final String PREFERENCE_KEY = "preference_key";
|
||||
|
||||
@Mock
|
||||
private PreferenceScreen mScreen;
|
||||
@Mock private PreferenceScreen mScreen;
|
||||
|
||||
private LifecycleOwner mLifecycleOwner;
|
||||
private Lifecycle mLifecycle;
|
||||
private Context mContext;
|
||||
private Vibrator mVibrator;
|
||||
@@ -60,17 +56,16 @@ public class NotificationVibrationIntensityPreferenceControllerTest {
|
||||
@Before
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
mLifecycleOwner = () -> mLifecycle;
|
||||
mLifecycle = new Lifecycle(mLifecycleOwner);
|
||||
mContext = spy(ApplicationProvider.getApplicationContext());
|
||||
mLifecycle = new Lifecycle(() -> mLifecycle);
|
||||
mContext = ApplicationProvider.getApplicationContext();
|
||||
mVibrator = mContext.getSystemService(Vibrator.class);
|
||||
mController = new NotificationVibrationIntensityPreferenceController(mContext,
|
||||
PREFERENCE_KEY);
|
||||
PREFERENCE_KEY, Vibrator.VIBRATION_INTENSITY_HIGH);
|
||||
mLifecycle.addObserver(mController);
|
||||
mPreference = new SeekBarPreference(mContext);
|
||||
mPreference.setSummary("Test summary");
|
||||
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
|
||||
showPreference();
|
||||
mController.displayPreference(mScreen);
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -118,19 +113,19 @@ public class NotificationVibrationIntensityPreferenceControllerTest {
|
||||
@Test
|
||||
@Ignore
|
||||
public void setProgress_updatesIntensitySetting() throws Exception {
|
||||
mPreference.setProgress(Vibrator.VIBRATION_INTENSITY_OFF);
|
||||
mController.setSliderPosition(Vibrator.VIBRATION_INTENSITY_OFF);
|
||||
assertThat(readSetting(Settings.System.NOTIFICATION_VIBRATION_INTENSITY))
|
||||
.isEqualTo(Vibrator.VIBRATION_INTENSITY_OFF);
|
||||
|
||||
mPreference.setProgress(Vibrator.VIBRATION_INTENSITY_LOW);
|
||||
mController.setSliderPosition(Vibrator.VIBRATION_INTENSITY_LOW);
|
||||
assertThat(readSetting(Settings.System.NOTIFICATION_VIBRATION_INTENSITY))
|
||||
.isEqualTo(Vibrator.VIBRATION_INTENSITY_LOW);
|
||||
|
||||
mPreference.setProgress(Vibrator.VIBRATION_INTENSITY_MEDIUM);
|
||||
mController.setSliderPosition(Vibrator.VIBRATION_INTENSITY_MEDIUM);
|
||||
assertThat(readSetting(Settings.System.NOTIFICATION_VIBRATION_INTENSITY))
|
||||
.isEqualTo(Vibrator.VIBRATION_INTENSITY_MEDIUM);
|
||||
|
||||
mPreference.setProgress(Vibrator.VIBRATION_INTENSITY_HIGH);
|
||||
mController.setSliderPosition(Vibrator.VIBRATION_INTENSITY_HIGH);
|
||||
assertThat(readSetting(Settings.System.NOTIFICATION_VIBRATION_INTENSITY))
|
||||
.isEqualTo(Vibrator.VIBRATION_INTENSITY_HIGH);
|
||||
}
|
||||
@@ -142,8 +137,4 @@ public class NotificationVibrationIntensityPreferenceControllerTest {
|
||||
private int readSetting(String settingKey) throws Settings.SettingNotFoundException {
|
||||
return Settings.System.getInt(mContext.getContentResolver(), settingKey);
|
||||
}
|
||||
|
||||
private void showPreference() {
|
||||
mController.displayPreference(mScreen);
|
||||
}
|
||||
}
|
||||
|
@@ -18,7 +18,6 @@ package com.android.settings.accessibility;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.Mockito.spy;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.content.Context;
|
||||
@@ -26,7 +25,6 @@ import android.os.VibrationAttributes;
|
||||
import android.os.Vibrator;
|
||||
import android.provider.Settings;
|
||||
|
||||
import androidx.lifecycle.LifecycleOwner;
|
||||
import androidx.preference.PreferenceScreen;
|
||||
import androidx.preference.SwitchPreference;
|
||||
import androidx.test.core.app.ApplicationProvider;
|
||||
@@ -47,10 +45,8 @@ public class NotificationVibrationTogglePreferenceControllerTest {
|
||||
|
||||
private static final String PREFERENCE_KEY = "preference_key";
|
||||
|
||||
@Mock
|
||||
private PreferenceScreen mScreen;
|
||||
@Mock private PreferenceScreen mScreen;
|
||||
|
||||
private LifecycleOwner mLifecycleOwner;
|
||||
private Lifecycle mLifecycle;
|
||||
private Context mContext;
|
||||
private Vibrator mVibrator;
|
||||
@@ -60,16 +56,15 @@ public class NotificationVibrationTogglePreferenceControllerTest {
|
||||
@Before
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
mLifecycleOwner = () -> mLifecycle;
|
||||
mLifecycle = new Lifecycle(mLifecycleOwner);
|
||||
mContext = spy(ApplicationProvider.getApplicationContext());
|
||||
mLifecycle = new Lifecycle(() -> mLifecycle);
|
||||
mContext = ApplicationProvider.getApplicationContext();
|
||||
mVibrator = mContext.getSystemService(Vibrator.class);
|
||||
mController = new NotificationVibrationTogglePreferenceController(mContext, PREFERENCE_KEY);
|
||||
mLifecycle.addObserver(mController);
|
||||
mPreference = new SwitchPreference(mContext);
|
||||
mPreference.setSummary("Test summary");
|
||||
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
|
||||
showPreference();
|
||||
mController.displayPreference(mScreen);
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -118,11 +113,11 @@ public class NotificationVibrationTogglePreferenceControllerTest {
|
||||
mController.updateState(mPreference);
|
||||
assertThat(mPreference.isChecked()).isFalse();
|
||||
|
||||
mPreference.setChecked(true);
|
||||
mController.setChecked(true);
|
||||
assertThat(readSetting(Settings.System.NOTIFICATION_VIBRATION_INTENSITY)).isEqualTo(
|
||||
mVibrator.getDefaultVibrationIntensity(VibrationAttributes.USAGE_NOTIFICATION));
|
||||
|
||||
mPreference.setChecked(false);
|
||||
mController.setChecked(false);
|
||||
assertThat(readSetting(Settings.System.NOTIFICATION_VIBRATION_INTENSITY))
|
||||
.isEqualTo(Vibrator.VIBRATION_INTENSITY_OFF);
|
||||
}
|
||||
@@ -134,8 +129,4 @@ public class NotificationVibrationTogglePreferenceControllerTest {
|
||||
private int readSetting(String settingKey) throws Settings.SettingNotFoundException {
|
||||
return Settings.System.getInt(mContext.getContentResolver(), settingKey);
|
||||
}
|
||||
|
||||
private void showPreference() {
|
||||
mController.displayPreference(mScreen);
|
||||
}
|
||||
}
|
||||
|
@@ -18,7 +18,6 @@ package com.android.settings.accessibility;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.Mockito.spy;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.content.Context;
|
||||
@@ -26,7 +25,6 @@ import android.os.VibrationAttributes;
|
||||
import android.os.Vibrator;
|
||||
import android.provider.Settings;
|
||||
|
||||
import androidx.lifecycle.LifecycleOwner;
|
||||
import androidx.preference.PreferenceScreen;
|
||||
import androidx.test.core.app.ApplicationProvider;
|
||||
|
||||
@@ -50,10 +48,8 @@ public class RingVibrationIntensityPreferenceControllerTest {
|
||||
private static final int OFF = 0;
|
||||
private static final int ON = 1;
|
||||
|
||||
@Mock
|
||||
private PreferenceScreen mScreen;
|
||||
@Mock private PreferenceScreen mScreen;
|
||||
|
||||
private LifecycleOwner mLifecycleOwner;
|
||||
private Lifecycle mLifecycle;
|
||||
private Context mContext;
|
||||
private Vibrator mVibrator;
|
||||
@@ -63,16 +59,16 @@ public class RingVibrationIntensityPreferenceControllerTest {
|
||||
@Before
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
mLifecycleOwner = () -> mLifecycle;
|
||||
mLifecycle = new Lifecycle(mLifecycleOwner);
|
||||
mContext = spy(ApplicationProvider.getApplicationContext());
|
||||
mLifecycle = new Lifecycle(() -> mLifecycle);
|
||||
mContext = ApplicationProvider.getApplicationContext();
|
||||
mVibrator = mContext.getSystemService(Vibrator.class);
|
||||
mController = new RingVibrationIntensityPreferenceController(mContext, PREFERENCE_KEY);
|
||||
mController = new RingVibrationIntensityPreferenceController(mContext, PREFERENCE_KEY,
|
||||
Vibrator.VIBRATION_INTENSITY_HIGH);
|
||||
mLifecycle.addObserver(mController);
|
||||
mPreference = new SeekBarPreference(mContext);
|
||||
mPreference.setSummary("Test summary");
|
||||
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
|
||||
showPreference();
|
||||
mController.displayPreference(mScreen);
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -117,27 +113,27 @@ public class RingVibrationIntensityPreferenceControllerTest {
|
||||
@Test
|
||||
@Ignore
|
||||
public void setProgress_updatesIntensityAndDependentSettings() throws Exception {
|
||||
mPreference.setProgress(Vibrator.VIBRATION_INTENSITY_OFF);
|
||||
mController.setSliderPosition(Vibrator.VIBRATION_INTENSITY_OFF);
|
||||
assertThat(readSetting(Settings.System.RING_VIBRATION_INTENSITY))
|
||||
.isEqualTo(Vibrator.VIBRATION_INTENSITY_OFF);
|
||||
assertThat(readSetting(Settings.System.VIBRATE_WHEN_RINGING)).isEqualTo(OFF);
|
||||
|
||||
mPreference.setProgress(Vibrator.VIBRATION_INTENSITY_LOW);
|
||||
mController.setSliderPosition(Vibrator.VIBRATION_INTENSITY_LOW);
|
||||
assertThat(readSetting(Settings.System.RING_VIBRATION_INTENSITY))
|
||||
.isEqualTo(Vibrator.VIBRATION_INTENSITY_LOW);
|
||||
assertThat(readSetting(Settings.System.VIBRATE_WHEN_RINGING)).isEqualTo(ON);
|
||||
|
||||
mPreference.setProgress(Vibrator.VIBRATION_INTENSITY_MEDIUM);
|
||||
mController.setSliderPosition(Vibrator.VIBRATION_INTENSITY_MEDIUM);
|
||||
assertThat(readSetting(Settings.System.RING_VIBRATION_INTENSITY))
|
||||
.isEqualTo(Vibrator.VIBRATION_INTENSITY_MEDIUM);
|
||||
assertThat(readSetting(Settings.System.VIBRATE_WHEN_RINGING)).isEqualTo(ON);
|
||||
|
||||
mPreference.setProgress(Vibrator.VIBRATION_INTENSITY_HIGH);
|
||||
mController.setSliderPosition(Vibrator.VIBRATION_INTENSITY_HIGH);
|
||||
assertThat(readSetting(Settings.System.RING_VIBRATION_INTENSITY))
|
||||
.isEqualTo(Vibrator.VIBRATION_INTENSITY_HIGH);
|
||||
assertThat(readSetting(Settings.System.VIBRATE_WHEN_RINGING)).isEqualTo(ON);
|
||||
|
||||
mPreference.setProgress(Vibrator.VIBRATION_INTENSITY_OFF);
|
||||
mController.setSliderPosition(Vibrator.VIBRATION_INTENSITY_OFF);
|
||||
assertThat(readSetting(Settings.System.RING_VIBRATION_INTENSITY))
|
||||
.isEqualTo(Vibrator.VIBRATION_INTENSITY_OFF);
|
||||
assertThat(readSetting(Settings.System.VIBRATE_WHEN_RINGING)).isEqualTo(OFF);
|
||||
@@ -150,8 +146,4 @@ public class RingVibrationIntensityPreferenceControllerTest {
|
||||
private int readSetting(String settingKey) throws Settings.SettingNotFoundException {
|
||||
return Settings.System.getInt(mContext.getContentResolver(), settingKey);
|
||||
}
|
||||
|
||||
private void showPreference() {
|
||||
mController.displayPreference(mScreen);
|
||||
}
|
||||
}
|
||||
|
@@ -18,7 +18,6 @@ package com.android.settings.accessibility;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.Mockito.spy;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.content.Context;
|
||||
@@ -26,7 +25,6 @@ import android.os.VibrationAttributes;
|
||||
import android.os.Vibrator;
|
||||
import android.provider.Settings;
|
||||
|
||||
import androidx.lifecycle.LifecycleOwner;
|
||||
import androidx.preference.PreferenceScreen;
|
||||
import androidx.preference.SwitchPreference;
|
||||
import androidx.test.core.app.ApplicationProvider;
|
||||
@@ -49,10 +47,8 @@ public class RingVibrationTogglePreferenceControllerTest {
|
||||
private static final int OFF = 0;
|
||||
private static final int ON = 1;
|
||||
|
||||
@Mock
|
||||
private PreferenceScreen mScreen;
|
||||
@Mock private PreferenceScreen mScreen;
|
||||
|
||||
private LifecycleOwner mLifecycleOwner;
|
||||
private Lifecycle mLifecycle;
|
||||
private Context mContext;
|
||||
private Vibrator mVibrator;
|
||||
@@ -62,16 +58,15 @@ public class RingVibrationTogglePreferenceControllerTest {
|
||||
@Before
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
mLifecycleOwner = () -> mLifecycle;
|
||||
mLifecycle = new Lifecycle(mLifecycleOwner);
|
||||
mContext = spy(ApplicationProvider.getApplicationContext());
|
||||
mLifecycle = new Lifecycle(() -> mLifecycle);
|
||||
mContext = ApplicationProvider.getApplicationContext();
|
||||
mVibrator = mContext.getSystemService(Vibrator.class);
|
||||
mController = new RingVibrationTogglePreferenceController(mContext, PREFERENCE_KEY);
|
||||
mLifecycle.addObserver(mController);
|
||||
mPreference = new SwitchPreference(mContext);
|
||||
mPreference.setSummary("Test summary");
|
||||
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
|
||||
showPreference();
|
||||
mController.displayPreference(mScreen);
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -116,12 +111,12 @@ public class RingVibrationTogglePreferenceControllerTest {
|
||||
mController.updateState(mPreference);
|
||||
assertThat(mPreference.isChecked()).isFalse();
|
||||
|
||||
mPreference.setChecked(true);
|
||||
mController.setChecked(true);
|
||||
assertThat(readSetting(Settings.System.RING_VIBRATION_INTENSITY)).isEqualTo(
|
||||
mVibrator.getDefaultVibrationIntensity(VibrationAttributes.USAGE_RINGTONE));
|
||||
assertThat(readSetting(Settings.System.VIBRATE_WHEN_RINGING)).isEqualTo(ON);
|
||||
|
||||
mPreference.setChecked(false);
|
||||
mController.setChecked(false);
|
||||
assertThat(readSetting(Settings.System.RING_VIBRATION_INTENSITY))
|
||||
.isEqualTo(Vibrator.VIBRATION_INTENSITY_OFF);
|
||||
assertThat(readSetting(Settings.System.VIBRATE_WHEN_RINGING)).isEqualTo(OFF);
|
||||
@@ -134,8 +129,4 @@ public class RingVibrationTogglePreferenceControllerTest {
|
||||
private int readSetting(String settingKey) throws Settings.SettingNotFoundException {
|
||||
return Settings.System.getInt(mContext.getContentResolver(), settingKey);
|
||||
}
|
||||
|
||||
private void showPreference() {
|
||||
mController.displayPreference(mScreen);
|
||||
}
|
||||
}
|
||||
|
@@ -0,0 +1,221 @@
|
||||
/*
|
||||
* Copyright (C) 2018 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.settings.accessibility;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.content.Context;
|
||||
import android.os.VibrationAttributes;
|
||||
import android.os.Vibrator;
|
||||
import android.provider.Settings;
|
||||
|
||||
import androidx.preference.PreferenceScreen;
|
||||
import androidx.test.core.app.ApplicationProvider;
|
||||
|
||||
import com.android.settings.widget.SeekBarPreference;
|
||||
import com.android.settingslib.core.lifecycle.Lifecycle;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
public class VibrationIntensityPreferenceControllerTest {
|
||||
|
||||
private static final String SETTING_KEY = Settings.System.NOTIFICATION_VIBRATION_INTENSITY;
|
||||
private static final int VIBRATION_USAGE = VibrationAttributes.USAGE_NOTIFICATION;
|
||||
|
||||
/** Basic implementation of preference controller to test generic behavior. */
|
||||
private static class TestPreferenceController extends VibrationIntensityPreferenceController {
|
||||
|
||||
TestPreferenceController(Context context, int supportedIntensityLevels) {
|
||||
super(context, "preference_key",
|
||||
new VibrationPreferenceConfig(context, SETTING_KEY, VIBRATION_USAGE) {},
|
||||
supportedIntensityLevels);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getAvailabilityStatus() {
|
||||
return AVAILABLE;
|
||||
}
|
||||
}
|
||||
|
||||
@Mock private PreferenceScreen mScreen;
|
||||
|
||||
private Lifecycle mLifecycle;
|
||||
private Context mContext;
|
||||
private Vibrator mVibrator;
|
||||
private SeekBarPreference mPreference;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
mLifecycle = new Lifecycle(() -> mLifecycle);
|
||||
mContext = ApplicationProvider.getApplicationContext();
|
||||
mVibrator = mContext.getSystemService(Vibrator.class);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void missingSetting_shouldReturnDefault() {
|
||||
VibrationIntensityPreferenceController controller = createPreferenceController(3);
|
||||
Settings.System.putString(mContext.getContentResolver(), SETTING_KEY, null);
|
||||
controller.updateState(mPreference);
|
||||
assertThat(mPreference.getProgress())
|
||||
.isEqualTo(mVibrator.getDefaultVibrationIntensity(VIBRATION_USAGE));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateState_allLevelsSupported_shouldDisplayIntensityInSliderPosition() {
|
||||
VibrationIntensityPreferenceController controller = createPreferenceController(3);
|
||||
|
||||
updateSetting(SETTING_KEY, Vibrator.VIBRATION_INTENSITY_HIGH);
|
||||
controller.updateState(mPreference);
|
||||
assertThat(mPreference.getProgress()).isEqualTo(Vibrator.VIBRATION_INTENSITY_HIGH);
|
||||
|
||||
updateSetting(SETTING_KEY, Vibrator.VIBRATION_INTENSITY_MEDIUM);
|
||||
controller.updateState(mPreference);
|
||||
assertThat(mPreference.getProgress()).isEqualTo(Vibrator.VIBRATION_INTENSITY_MEDIUM);
|
||||
|
||||
updateSetting(SETTING_KEY, Vibrator.VIBRATION_INTENSITY_LOW);
|
||||
controller.updateState(mPreference);
|
||||
assertThat(mPreference.getProgress()).isEqualTo(Vibrator.VIBRATION_INTENSITY_LOW);
|
||||
|
||||
updateSetting(SETTING_KEY, Vibrator.VIBRATION_INTENSITY_OFF);
|
||||
controller.updateState(mPreference);
|
||||
assertThat(mPreference.getProgress()).isEqualTo(Vibrator.VIBRATION_INTENSITY_OFF);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateState_twoLevelsSupported_shouldDisplayMediumAndHighAtLastPosition() {
|
||||
VibrationIntensityPreferenceController controller = createPreferenceController(2);
|
||||
|
||||
updateSetting(SETTING_KEY, Vibrator.VIBRATION_INTENSITY_HIGH);
|
||||
controller.updateState(mPreference);
|
||||
assertThat(mPreference.getProgress()).isEqualTo(Vibrator.VIBRATION_INTENSITY_MEDIUM);
|
||||
|
||||
updateSetting(SETTING_KEY, Vibrator.VIBRATION_INTENSITY_MEDIUM);
|
||||
controller.updateState(mPreference);
|
||||
assertThat(mPreference.getProgress()).isEqualTo(Vibrator.VIBRATION_INTENSITY_MEDIUM);
|
||||
|
||||
updateSetting(SETTING_KEY, Vibrator.VIBRATION_INTENSITY_LOW);
|
||||
controller.updateState(mPreference);
|
||||
assertThat(mPreference.getProgress()).isEqualTo(Vibrator.VIBRATION_INTENSITY_LOW);
|
||||
|
||||
updateSetting(SETTING_KEY, Vibrator.VIBRATION_INTENSITY_OFF);
|
||||
controller.updateState(mPreference);
|
||||
assertThat(mPreference.getProgress()).isEqualTo(Vibrator.VIBRATION_INTENSITY_OFF);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateState_oneLevelSupported_shouldDisplayAllAtLastPosition() {
|
||||
VibrationIntensityPreferenceController controller = createPreferenceController(1);
|
||||
|
||||
updateSetting(SETTING_KEY, Vibrator.VIBRATION_INTENSITY_HIGH);
|
||||
controller.updateState(mPreference);
|
||||
assertThat(mPreference.getProgress()).isEqualTo(Vibrator.VIBRATION_INTENSITY_LOW);
|
||||
|
||||
updateSetting(SETTING_KEY, Vibrator.VIBRATION_INTENSITY_MEDIUM);
|
||||
controller.updateState(mPreference);
|
||||
assertThat(mPreference.getProgress()).isEqualTo(Vibrator.VIBRATION_INTENSITY_LOW);
|
||||
|
||||
updateSetting(SETTING_KEY, Vibrator.VIBRATION_INTENSITY_LOW);
|
||||
controller.updateState(mPreference);
|
||||
assertThat(mPreference.getProgress()).isEqualTo(Vibrator.VIBRATION_INTENSITY_LOW);
|
||||
|
||||
updateSetting(SETTING_KEY, Vibrator.VIBRATION_INTENSITY_OFF);
|
||||
controller.updateState(mPreference);
|
||||
assertThat(mPreference.getProgress()).isEqualTo(Vibrator.VIBRATION_INTENSITY_OFF);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setProgress_allSupportedPositions_updatesIntensitySetting() throws Exception {
|
||||
VibrationIntensityPreferenceController controller = createPreferenceController(3);
|
||||
|
||||
controller.setSliderPosition(Vibrator.VIBRATION_INTENSITY_OFF);
|
||||
assertThat(readSetting(SETTING_KEY)).isEqualTo(Vibrator.VIBRATION_INTENSITY_OFF);
|
||||
|
||||
controller.setSliderPosition(Vibrator.VIBRATION_INTENSITY_LOW);
|
||||
assertThat(readSetting(SETTING_KEY)).isEqualTo(Vibrator.VIBRATION_INTENSITY_LOW);
|
||||
|
||||
controller.setSliderPosition(Vibrator.VIBRATION_INTENSITY_MEDIUM);
|
||||
assertThat(readSetting(SETTING_KEY)).isEqualTo(Vibrator.VIBRATION_INTENSITY_MEDIUM);
|
||||
|
||||
controller.setSliderPosition(Vibrator.VIBRATION_INTENSITY_HIGH);
|
||||
assertThat(readSetting(SETTING_KEY)).isEqualTo(Vibrator.VIBRATION_INTENSITY_HIGH);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setProgress_twoSupportedPositions_updatesMediumPositionToHigh() throws Exception {
|
||||
VibrationIntensityPreferenceController controller = createPreferenceController(2);
|
||||
|
||||
controller.setSliderPosition(Vibrator.VIBRATION_INTENSITY_OFF);
|
||||
assertThat(readSetting(SETTING_KEY)).isEqualTo(Vibrator.VIBRATION_INTENSITY_OFF);
|
||||
|
||||
controller.setSliderPosition(Vibrator.VIBRATION_INTENSITY_LOW);
|
||||
assertThat(readSetting(SETTING_KEY)).isEqualTo(Vibrator.VIBRATION_INTENSITY_LOW);
|
||||
|
||||
controller.setSliderPosition(Vibrator.VIBRATION_INTENSITY_MEDIUM);
|
||||
assertThat(readSetting(SETTING_KEY)).isEqualTo(Vibrator.VIBRATION_INTENSITY_HIGH);
|
||||
|
||||
controller.setSliderPosition(Vibrator.VIBRATION_INTENSITY_HIGH);
|
||||
assertThat(readSetting(SETTING_KEY)).isEqualTo(Vibrator.VIBRATION_INTENSITY_HIGH);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setProgress_oneSupportedPosition_updatesOnPositionsToDeviceDefault()
|
||||
throws Exception {
|
||||
int defaultIntensity = mVibrator.getDefaultVibrationIntensity(VIBRATION_USAGE);
|
||||
VibrationIntensityPreferenceController controller = createPreferenceController(1);
|
||||
|
||||
controller.setSliderPosition(Vibrator.VIBRATION_INTENSITY_OFF);
|
||||
assertThat(readSetting(SETTING_KEY)).isEqualTo(Vibrator.VIBRATION_INTENSITY_OFF);
|
||||
|
||||
controller.setSliderPosition(Vibrator.VIBRATION_INTENSITY_LOW);
|
||||
assertThat(readSetting(SETTING_KEY)).isEqualTo(defaultIntensity);
|
||||
|
||||
controller.setSliderPosition(Vibrator.VIBRATION_INTENSITY_MEDIUM);
|
||||
assertThat(readSetting(SETTING_KEY)).isEqualTo(defaultIntensity);
|
||||
|
||||
controller.setSliderPosition(Vibrator.VIBRATION_INTENSITY_HIGH);
|
||||
assertThat(readSetting(SETTING_KEY)).isEqualTo(defaultIntensity);
|
||||
}
|
||||
|
||||
private void updateSetting(String key, int value) {
|
||||
Settings.System.putInt(mContext.getContentResolver(), key, value);
|
||||
}
|
||||
|
||||
private int readSetting(String settingKey) throws Settings.SettingNotFoundException {
|
||||
return Settings.System.getInt(mContext.getContentResolver(), settingKey);
|
||||
}
|
||||
|
||||
private VibrationIntensityPreferenceController createPreferenceController(
|
||||
int supportedIntensityLevels) {
|
||||
VibrationIntensityPreferenceController controller =
|
||||
new TestPreferenceController(mContext, supportedIntensityLevels);
|
||||
mLifecycle.addObserver(controller);
|
||||
mPreference = new SeekBarPreference(mContext);
|
||||
mPreference.setSummary("Test summary");
|
||||
when(mScreen.findPreference(controller.getPreferenceKey())).thenReturn(mPreference);
|
||||
controller.displayPreference(mScreen);
|
||||
return controller;
|
||||
}
|
||||
}
|
@@ -30,11 +30,9 @@ import static org.mockito.Mockito.when;
|
||||
import android.content.Context;
|
||||
import android.media.AudioManager;
|
||||
import android.os.Vibrator;
|
||||
import android.provider.DeviceConfig;
|
||||
import android.provider.Settings;
|
||||
import android.telephony.TelephonyManager;
|
||||
|
||||
import androidx.lifecycle.LifecycleOwner;
|
||||
import androidx.preference.PreferenceScreen;
|
||||
import androidx.preference.SwitchPreference;
|
||||
import androidx.test.core.app.ApplicationProvider;
|
||||
@@ -54,14 +52,12 @@ public class VibrationRampingRingerTogglePreferenceControllerTest {
|
||||
|
||||
private static final String PREFERENCE_KEY = "preference_key";
|
||||
|
||||
@Mock
|
||||
private PreferenceScreen mScreen;
|
||||
@Mock
|
||||
private TelephonyManager mTelephonyManager;
|
||||
@Mock
|
||||
private AudioManager mAudioManager;
|
||||
@Mock private PreferenceScreen mScreen;
|
||||
@Mock private TelephonyManager mTelephonyManager;
|
||||
@Mock private AudioManager mAudioManager;
|
||||
@Mock private VibrationRampingRingerTogglePreferenceController.DeviceConfigProvider
|
||||
mDeviceConfigProvider;
|
||||
|
||||
private LifecycleOwner mLifecycleOwner;
|
||||
private Lifecycle mLifecycle;
|
||||
private Context mContext;
|
||||
private VibrationRampingRingerTogglePreferenceController mController;
|
||||
@@ -70,18 +66,17 @@ public class VibrationRampingRingerTogglePreferenceControllerTest {
|
||||
@Before
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
mLifecycleOwner = () -> mLifecycle;
|
||||
mLifecycle = new Lifecycle(mLifecycleOwner);
|
||||
mLifecycle = new Lifecycle(() -> mLifecycle);
|
||||
mContext = spy(ApplicationProvider.getApplicationContext());
|
||||
when(mContext.getSystemService(Context.TELEPHONY_SERVICE)).thenReturn(mTelephonyManager);
|
||||
when(mContext.getSystemService(Context.AUDIO_SERVICE)).thenReturn(mAudioManager);
|
||||
mController = new VibrationRampingRingerTogglePreferenceController(mContext,
|
||||
PREFERENCE_KEY);
|
||||
PREFERENCE_KEY, mDeviceConfigProvider);
|
||||
mLifecycle.addObserver(mController);
|
||||
mPreference = new SwitchPreference(mContext);
|
||||
mPreference.setSummary("Test summary");
|
||||
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
|
||||
showPreference();
|
||||
mController.displayPreference(mScreen);
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -93,8 +88,7 @@ public class VibrationRampingRingerTogglePreferenceControllerTest {
|
||||
@Ignore
|
||||
public void getAvailabilityStatus_notVoiceCapable_returnUnsupportedOnDevice() {
|
||||
when(mTelephonyManager.isVoiceCapable()).thenReturn(false);
|
||||
DeviceConfig.setProperty(DeviceConfig.NAMESPACE_TELEPHONY,
|
||||
VibrationRampingRingerTogglePreferenceController.DEVICE_CONFIG_KEY, "false", false);
|
||||
when(mDeviceConfigProvider.isRampingRingerEnabledOnTelephonyConfig()).thenReturn(false);
|
||||
|
||||
assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
|
||||
}
|
||||
@@ -103,8 +97,7 @@ public class VibrationRampingRingerTogglePreferenceControllerTest {
|
||||
@Ignore
|
||||
public void getAvailabilityStatus_rampingRingerEnabled_returnUnsupportedOnDevice() {
|
||||
when(mTelephonyManager.isVoiceCapable()).thenReturn(true);
|
||||
DeviceConfig.setProperty(DeviceConfig.NAMESPACE_TELEPHONY,
|
||||
VibrationRampingRingerTogglePreferenceController.DEVICE_CONFIG_KEY, "true", false);
|
||||
when(mDeviceConfigProvider.isRampingRingerEnabledOnTelephonyConfig()).thenReturn(true);
|
||||
|
||||
assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
|
||||
}
|
||||
@@ -113,8 +106,7 @@ public class VibrationRampingRingerTogglePreferenceControllerTest {
|
||||
@Ignore
|
||||
public void getAvailabilityStatus_voiceCapableAndRampingRingerDisabled_returnAvailable() {
|
||||
when(mTelephonyManager.isVoiceCapable()).thenReturn(true);
|
||||
DeviceConfig.setProperty(DeviceConfig.NAMESPACE_TELEPHONY,
|
||||
VibrationRampingRingerTogglePreferenceController.DEVICE_CONFIG_KEY, "false", false);
|
||||
when(mDeviceConfigProvider.isRampingRingerEnabledOnTelephonyConfig()).thenReturn(false);
|
||||
|
||||
assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
|
||||
}
|
||||
@@ -147,8 +139,8 @@ public class VibrationRampingRingerTogglePreferenceControllerTest {
|
||||
public void setChecked_withRingDisabled_ignoresUpdates() {
|
||||
updateSetting(Settings.System.RING_VIBRATION_INTENSITY, Vibrator.VIBRATION_INTENSITY_OFF);
|
||||
|
||||
mPreference.setChecked(true);
|
||||
mPreference.setChecked(false);
|
||||
mController.setChecked(true);
|
||||
mController.setChecked(false);
|
||||
verify(mAudioManager, never()).setRampingRingerEnabled(anyBoolean());
|
||||
}
|
||||
|
||||
@@ -157,18 +149,14 @@ public class VibrationRampingRingerTogglePreferenceControllerTest {
|
||||
public void setChecked_withRingEnabled_updatesSetting() {
|
||||
updateSetting(Settings.System.RING_VIBRATION_INTENSITY, Vibrator.VIBRATION_INTENSITY_HIGH);
|
||||
|
||||
mPreference.setChecked(true);
|
||||
mController.setChecked(true);
|
||||
verify(mAudioManager).setRampingRingerEnabled(true);
|
||||
|
||||
mPreference.setChecked(false);
|
||||
mController.setChecked(false);
|
||||
verify(mAudioManager).setRampingRingerEnabled(false);
|
||||
}
|
||||
|
||||
private void updateSetting(String key, int value) {
|
||||
Settings.System.putInt(mContext.getContentResolver(), key, value);
|
||||
}
|
||||
|
||||
private void showPreference() {
|
||||
mController.displayPreference(mScreen);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user