From f797a48af620f0b065cd55898e5c5351406fa068 Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Tue, 27 Oct 2020 12:01:03 -0700 Subject: [PATCH] Rename panic gesture to emergency gesture in Settings Bug: 171589858 Test: rebuild Change-Id: I23847db82a397bdcd61501758e3ef66a4f088e22 --- res/values/config.xml | 8 ++-- res/values/strings.xml | 10 ++--- ...ngs.xml => emergency_gesture_settings.xml} | 20 +++++----- res/xml/gestures.xml | 8 ++-- ...EmergencyGesturePreferenceController.java} | 32 ++++++++-------- ...ngs.java => EmergencyGestureSettings.java} | 16 ++++---- ...encyGestureSoundPreferenceController.java} | 6 +-- ...gencyGesturePreferenceControllerTest.java} | 37 ++++++++++--------- ...GestureSoundPreferenceControllerTest.java} | 14 +++---- 9 files changed, 76 insertions(+), 75 deletions(-) rename res/xml/{panic_gesture_settings.xml => emergency_gesture_settings.xml} (65%) rename src/com/android/settings/gestures/{PanicGesturePreferenceController.java => EmergencyGesturePreferenceController.java} (77%) rename src/com/android/settings/gestures/{PanicGestureSettings.java => EmergencyGestureSettings.java} (75%) rename src/com/android/settings/gestures/{PanicGestureSoundPreferenceController.java => EmergencyGestureSoundPreferenceController.java} (87%) rename tests/robotests/src/com/android/settings/gestures/{PanicGesturePreferenceControllerTest.java => EmergencyGesturePreferenceControllerTest.java} (73%) rename tests/robotests/src/com/android/settings/gestures/{PanicGestureSoundPreferenceControllerTest.java => EmergencyGestureSoundPreferenceControllerTest.java} (83%) diff --git a/res/values/config.xml b/res/values/config.xml index 218364095f3..9a6e4863b20 100755 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -462,11 +462,11 @@ false - - true + + true - - + + false diff --git a/res/values/strings.xml b/res/values/strings.xml index 706beccc6cc..56f2fc4ba8c 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -11049,19 +11049,19 @@ To check time, notifications, and other info, tap your screen. - Panic button + Emergency SOS - Managed by %1$s + Managed by %1$s - Start the emergency SOS actions by pressing the power button quickly 5 times. + Start the emergency SOS actions by pressing the power button quickly 5 times. - Warning sound + Warning sound - Alert before starting the actions + Alert before starting the actions Swipe fingerprint for notifications diff --git a/res/xml/panic_gesture_settings.xml b/res/xml/emergency_gesture_settings.xml similarity index 65% rename from res/xml/panic_gesture_settings.xml rename to res/xml/emergency_gesture_settings.xml index 77305a025bd..bc07366e822 100644 --- a/res/xml/panic_gesture_settings.xml +++ b/res/xml/emergency_gesture_settings.xml @@ -18,29 +18,29 @@ + android:title="@string/emergency_gesture_screen_title"> diff --git a/res/xml/gestures.xml b/res/xml/gestures.xml index fb519d07a69..2f38d9116c4 100644 --- a/res/xml/gestures.xml +++ b/res/xml/gestures.xml @@ -21,10 +21,10 @@ android:title="@string/gesture_preference_title"> + android:key="gesture_emergency_summary" + android:title="@string/emergency_gesture_screen_title" + android:fragment="com.android.settings.gestures.EmergencyGestureSettings" + settings:controller="com.android.settings.gestures.EmergencyGesturePreferenceController" />