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

Commit 67d34542 authored by Fan Zhang's avatar Fan Zhang
Browse files

Add Panic button sound preference to panic gesture settings page. 

Also renamed emergency_sos_* to panic_*. "emergency sos" is used by
other OEMs.

https://screenshot.googleplex.com/66097f3e-6aa0-4e2f-afb8-22f278bb0ed7.png

Bug: 161394591
Test: robotests
Change-Id: I14a59399fe7192d305d89a86dc93380c1e4c8a1c
parent c8b21a36

res/values/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -461,5 +461,5 @@ 
    <bool name="config_show_smooth_display">false</bool>



    <!-- Whether to show panic button gesture in Settings -->

    <bool name="config_show_emergency_sos_gesture_settings">true</bool>

    <bool name="config_show_panic_gesture_settings">true</bool>

</resources>

res/values/strings.xml

+8 −2
Original line number Diff line number Diff line
@@ -10949,10 +10949,16 @@ 
    <string name="ambient_display_tap_screen_summary">To check time, notifications, and other info, tap your screen.</string>









    <!-- Preference title to enable feature for calling emergency services at panic/distress moments[CHAR_LIMIT=60]-->









    <string name="emergency_sos_gesture_screen_title">Panic button</string>









    <string name="panic_gesture_screen_title">Panic button</string>

















    <!-- Preference summary to enable feature for calling emergency services at panic/distress moments[CHAR_LIMIT=NONE]-->









    <string name="emergency_sos_gesture_screen_summary">Start the emergency SOS actions by pressing the power button quickly 5 times.</string>









    <string name="panic_gesture_screen_summary">Start the emergency SOS actions by pressing the power button quickly 5 times.</string>

















    <!-- Preference title to enable generating noisy sound before calling emergency services at panic/distress moments[CHAR_LIMIT=60]-->









    <string name="panic_gesture_sound_setting_title">Warning sound</string>

















    <!-- Preference summary to enable generating noisy sound before calling emergency services at panic/distress moments[CHAR_LIMIT=NONE]-->









    <string name="panic_gesture_sound_setting_summary">Alert before starting the actions</string>

















    <!-- Title text for swiping downwards on fingerprint sensor for notifications [CHAR LIMIT=80]-->









    <string name="fingerprint_swipe_for_notifications_title">Swipe fingerprint for notifications</string>

























res/xml/gestures.xml



+4
−4






























Original line number
Diff line number
Diff line







@@ -21,10 +21,10 @@







    android:title="@string/gesture_preference_title">



















    <Preference









        android:key="emergency_sos_button_summary"









        android:title="@string/emergency_sos_gesture_screen_title"









        android:fragment="com.android.settings.gestures.EmergencySosGestureSettings"









        settings:controller="com.android.settings.gestures.EmergencySosGesturePreferenceController" />









        android:key="gesture_panic_button_summary"









        android:title="@string/panic_gesture_screen_title"









        android:fragment="com.android.settings.gestures.PanicGestureSettings"









        settings:controller="com.android.settings.gestures.PanicGesturePreferenceController" />



















    <Preference









        android:key="gesture_assist_input_summary"
































res/xml/emergency_sos_gesture_settings.xml→res/xml/panic_gesture_settings.xml



+14
−6






























Original line number
Diff line number
Diff line







@@ -18,19 +18,27 @@







<PreferenceScreen









    xmlns:android="http://schemas.android.com/apk/res/android"









    xmlns:app="http://schemas.android.com/apk/res-auto"









    android:title="@string/emergency_sos_gesture_screen_title">









    android:title="@string/panic_gesture_screen_title">



















    <com.android.settings.widget.VideoPreference









        android:key="gesture_emergency_sos_button_screen_video"









        android:key="panic_button_screen_video"









        app:animation="@raw/gesture_double_tap"









        app:preview="@drawable/gesture_double_tap" />



















    <SwitchPreference









        android:key="gesture_emergency_sos_button"









        android:title="@string/emergency_sos_gesture_screen_title"









        android:summary="@string/emergency_sos_gesture_screen_summary"









        android:key="gesture_panic_button"









        android:title="@string/panic_gesture_screen_title"









        android:summary="@string/panic_gesture_screen_summary"









        app:keywords="@string/keywords_gesture"









        app:controller="com.android.settings.gestures.EmergencySosGesturePreferenceController"









        app:controller="com.android.settings.gestures.PanicGesturePreferenceController"









        app:allowDividerAbove="true" />



















    <SwitchPreference









        android:key="panic_gesture_sound"









        android:title="@string/panic_gesture_sound_setting_title"









        android:summary="@string/panic_gesture_sound_setting_summary"









        app:keywords="@string/keywords_gesture"









        app:controller="com.android.settings.gestures.PanicGestureSoundPreferenceController"









        app:allowDividerAbove="true" />



















</PreferenceScreen>
























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



+5
−5






























Original line number
Diff line number
Diff line







@@ -27,24 +27,24 @@ import com.android.settings.R;







/**









 * Preference controller for emergency sos gesture setting









 */









public class EmergencySosGesturePreferenceController extends GesturePreferenceController {









public class PanicGesturePreferenceController extends GesturePreferenceController {



















    @VisibleForTesting









    static final int ON = 1;









    @VisibleForTesting









    static final int OFF = 0;



















    private static final String PREF_KEY_VIDEO = "gesture_emergency_sos_button_screen_video";









    private static final String PREF_KEY_VIDEO = "panic_button_screen_video";



















    private static final String SECURE_KEY = Settings.Secure.PANIC_GESTURE_ENABLED;



















    public EmergencySosGesturePreferenceController(Context context, String key) {









    public PanicGesturePreferenceController(Context context, String key) {









        super(context, key);









    }



















    private static boolean isGestureAvailable(Context context) {









        return context.getResources()









                .getBoolean(R.bool.config_show_emergency_sos_gesture_settings);









                .getBoolean(R.bool.config_show_panic_gesture_settings);









    }



















    @Override








@@ -54,7 +54,7 @@ public class EmergencySosGesturePreferenceController extends GesturePreferenceCo

















    @Override









    public boolean isSliceable() {









        return TextUtils.equals(getPreferenceKey(), "gesture_emergency_sos_button");









        return TextUtils.equals(getPreferenceKey(), "gesture_panic_button");









    }



















    @Override