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

Commit 35df68a6 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.

Bug: 169946710
Test: rebuild
Change-Id: Ic05405dabb04ae59960ea60ab3618fc8e6a741b2
parent 87177efd

core/java/android/provider/Settings.java

+5 −4
Original line number Diff line number Diff line
@@ -8395,18 +8395,19 @@ public final class Settings { 
        public static final String CAMERA_GESTURE_DISABLED = "camera_gesture_disabled";















        /**













         * Whether the panic button (emergency sos) gesture should be enabled.













         * Whether the emergency gesture should be enabled.















         *















         * @hide















         */













        public static final String PANIC_GESTURE_ENABLED = "panic_gesture_enabled";













        public static final String EMERGENCY_GESTURE_ENABLED = "emergency_gesture_enabled";





























        /**













         * Whether the panic button (emergency sos) sound should be enabled.













         * Whether the emergency gesture sound should be enabled.















         *















         * @hide















         */













        public static final String PANIC_SOUND_ENABLED = "panic_sound_enabled";













        public static final String EMERGENCY_GESTURE_SOUND_ENABLED =













                "emergency_gesture_sound_enabled";





























        /**















         * Whether the camera launch gesture to double tap the power button when the screen is off

































core/proto/android/providers/settings/secure.proto



+4
−2




























Original line number
Diff line number
Diff line








@@ -219,8 +219,10 @@ message SecureSettingsProto {













    optional SettingProto emergency_assistance_application = 22 [ (android.privacy).dest = DEST_AUTOMATIC ];































    message EmergencyResponse {













        optional SettingProto panic_gesture_enabled = 1  [ (android.privacy).dest = DEST_AUTOMATIC ];













        optional SettingProto panic_sound_enabled = 2  [ (android.privacy).dest = DEST_AUTOMATIC ];













        optional SettingProto emergency_gesture_enabled = 3  [ (android.privacy).dest = DEST_AUTOMATIC ];













        optional SettingProto emergency_gesture_sound_enabled = 4  [ (android.privacy).dest = DEST_AUTOMATIC ];



























        reserved 1,2;















    }































    optional EmergencyResponse emergency_response = 83;

































packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java



+2
−2




























Original line number
Diff line number
Diff line








@@ -176,8 +176,8 @@ public class SecureSettings {













        Settings.Secure.ONE_HANDED_MODE_TIMEOUT,















        Settings.Secure.TAPS_APP_TO_EXIT,















        Settings.Secure.SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED,













        Settings.Secure.PANIC_GESTURE_ENABLED,













        Settings.Secure.PANIC_SOUND_ENABLED,













        Settings.Secure.EMERGENCY_GESTURE_ENABLED,













        Settings.Secure.EMERGENCY_GESTURE_SOUND_ENABLED,















        Settings.Secure.ADAPTIVE_CONNECTIVITY_ENABLED,















        Settings.Secure.ASSIST_HANDLES_LEARNING_TIME_ELAPSED_MILLIS,















        Settings.Secure.ASSIST_HANDLES_LEARNING_EVENT_COUNT

































packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java



+2
−2




























Original line number
Diff line number
Diff line








@@ -265,8 +265,8 @@ public class SecureSettingsValidators {













        VALIDATORS.put(Secure.ONE_HANDED_MODE_TIMEOUT, ANY_INTEGER_VALIDATOR);















        VALIDATORS.put(Secure.TAPS_APP_TO_EXIT, BOOLEAN_VALIDATOR);















        VALIDATORS.put(Secure.SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED, BOOLEAN_VALIDATOR);













        VALIDATORS.put(Secure.PANIC_GESTURE_ENABLED, BOOLEAN_VALIDATOR);













        VALIDATORS.put(Secure.PANIC_SOUND_ENABLED, BOOLEAN_VALIDATOR);













        VALIDATORS.put(Secure.EMERGENCY_GESTURE_ENABLED, BOOLEAN_VALIDATOR);













        VALIDATORS.put(Secure.EMERGENCY_GESTURE_SOUND_ENABLED, BOOLEAN_VALIDATOR);















        VALIDATORS.put(Secure.ADAPTIVE_CONNECTIVITY_ENABLED, BOOLEAN_VALIDATOR);















        VALIDATORS.put(















                Secure.ASSIST_HANDLES_LEARNING_TIME_ELAPSED_MILLIS, NONE_NEGATIVE_LONG_VALIDATOR);

































packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java



+4
−4




























Original line number
Diff line number
Diff line








@@ -2038,11 +2038,11 @@ class SettingsProtoDumpUtil {





























        final long emergencyResponseToken = p.start(SecureSettingsProto.EMERGENCY_RESPONSE);















        dumpSetting(s, p,













                Settings.Secure.PANIC_GESTURE_ENABLED,













                SecureSettingsProto.EmergencyResponse.PANIC_GESTURE_ENABLED);













                Settings.Secure.EMERGENCY_GESTURE_ENABLED,













                SecureSettingsProto.EmergencyResponse.EMERGENCY_GESTURE_ENABLED);















        dumpSetting(s, p,













                Settings.Secure.PANIC_SOUND_ENABLED,













                SecureSettingsProto.EmergencyResponse.PANIC_SOUND_ENABLED);













                Settings.Secure.EMERGENCY_GESTURE_SOUND_ENABLED,













                SecureSettingsProto.EmergencyResponse.EMERGENCY_GESTURE_SOUND_ENABLED);















        p.end(emergencyResponseToken);































        dumpSetting(s, p,