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

Merge "Rename panic button in framework settings." am: 167362d0ca

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12908857

Change-Id: Ibbf612960174c11c43783806142ae939fe6b67a1
This commit is contained in:
TreeHugger Robot
2020-10-26 20:48:28 +00:00
committed by Automerger Merge Worker
parent e55d1878c5 167362d0ca
commit e168d39df5
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/gestures/PanicGesturePreferenceController.java
View File

@@ -50,7 +50,7 @@ public class PanicGesturePreferenceController extends GesturePreferenceControlle
private static final String PREF_KEY_VIDEO = "panic_button_screen_video";
private static final String SECURE_KEY = Settings.Secure.PANIC_GESTURE_ENABLED;
private static final String SECURE_KEY = Settings.Secure.EMERGENCY_GESTURE_ENABLED;
public PanicGesturePreferenceController(Context context, String key) {
super(context, key);

2
src/com/android/settings/gestures/PanicGestureSoundPreferenceController.java
View File

@@ -34,7 +34,7 @@ public class PanicGestureSoundPreferenceController extends TogglePreferenceContr
@VisibleForTesting
static final int OFF = 0;
private static final String SECURE_KEY = Settings.Secure.PANIC_SOUND_ENABLED;
private static final String SECURE_KEY = Settings.Secure.EMERGENCY_GESTURE_SOUND_ENABLED;
public PanicGestureSoundPreferenceController(Context context, String key) {
super(context, key);

4
tests/robotests/src/com/android/settings/gestures/PanicGesturePreferenceControllerTest.java
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();

6
tests/robotests/src/com/android/settings/gestures/PanicGestureSoundPreferenceControllerTest.java
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();
}