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

Commit 6fef72aa authored by Fan Zhang's avatar Fan Zhang
Browse files

Rename panic button in framework settings. 

Renamed panic to "emergency" or "emergency gesture" to
avoid speculation once source code is accessible to
parties without full context.

The settings string and file names still use the word "panic". This
will be updated in a follow-up CL

Bug: 169946710
Test: rebuild
Change-Id: Ic1a3181145ca2b64ab6ef2a2989224395fa9a6f8
parent 45435fdb

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();

    }