Merge "Rename panic button in framework settings."

This commit is contained in:
TreeHugger Robot
2020-10-26 20:27:50 +00:00
committed by Android (Google) Code Review
4 changed files with 8 additions and 6 deletions

View File

@@ -113,7 +113,7 @@ public class PanicGesturePreferenceControllerTest {
@Test
public void isChecked_configIsNotSet_shouldReturnTrue() {
// Set the setting to be enabled.
Settings.Secure.putInt(mContentResolver, Settings.Secure.PANIC_GESTURE_ENABLED, ON);
Settings.Secure.putInt(mContentResolver, Settings.Secure.EMERGENCY_GESTURE_ENABLED, ON);
mController = new PanicGesturePreferenceController(mContext, PREF_KEY);
assertThat(mController.isChecked()).isTrue();
@@ -122,7 +122,7 @@ public class PanicGesturePreferenceControllerTest {
@Test
public void isChecked_configIsSet_shouldReturnFalse() {
// Set the setting to be disabled.
Settings.Secure.putInt(mContentResolver, Settings.Secure.PANIC_GESTURE_ENABLED, OFF);
Settings.Secure.putInt(mContentResolver, Settings.Secure.EMERGENCY_GESTURE_ENABLED, OFF);
mController = new PanicGesturePreferenceController(mContext, PREF_KEY);
assertThat(mController.isChecked()).isFalse();

View File

@@ -78,7 +78,8 @@ public class PanicGestureSoundPreferenceControllerTest {
@Test
public void isChecked_configIsSet_shouldReturnTrue() {
// Set the setting to be enabled.
Settings.Secure.putInt(mContentResolver, Settings.Secure.PANIC_SOUND_ENABLED, ON);
Settings.Secure.putInt(mContentResolver, Settings.Secure.EMERGENCY_GESTURE_SOUND_ENABLED,
ON);
assertThat(mController.isChecked()).isTrue();
}
@@ -86,7 +87,8 @@ public class PanicGestureSoundPreferenceControllerTest {
@Test
public void isChecked_configIsSetToFalse_shouldReturnFalse() {
// Set the setting to be disabled.
Settings.Secure.putInt(mContentResolver, Settings.Secure.PANIC_SOUND_ENABLED, OFF);
Settings.Secure.putInt(mContentResolver, Settings.Secure.EMERGENCY_GESTURE_SOUND_ENABLED,
OFF);
assertThat(mController.isChecked()).isFalse();
}