Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 167362d0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Rename panic button in framework settings."

parents 76c9a32d 6fef72aa

src/com/android/settings/gestures/PanicGesturePreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

src/com/android/settings/gestures/PanicGestureSoundPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

tests/robotests/src/com/android/settings/gestures/PanicGesturePreferenceControllerTest.java

+2 −2
Original line number Diff line number Diff line
@@ -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();

tests/robotests/src/com/android/settings/gestures/PanicGestureSoundPreferenceControllerTest.java

+4 −2
Original line number Diff line number Diff line
@@ -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();

    }