PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update emergency sos gesture string to match mock"

Browse Source
This commit is contained in:
Fan Zhang
2020-11-19 20:33:32 +00:00
committed by Android (Google) Code Review
parent 9f1e79041d b6007e29b0
commit bab12ec15b
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
res/values/strings.xml
View File

@@ -11073,16 +11073,19 @@
<string name="emergency_gesture_screen_title">Emergency SOS</string> <string name="emergency_gesture_screen_title">Emergency SOS</string>
<!-- Preference title to enable feature for calling emergency services at panic/distress moments[CHAR_LIMIT=60]--> <!-- Preference title to enable feature for calling emergency services at panic/distress moments[CHAR_LIMIT=60]-->
<string name="emergency_gesture_switchbar_title">Use esmergency SOS</string>
<!-- Preference summary to enable feature for calling emergency services at panic/distress moments[CHAR_LIMIT=60]-->
<string name="emergency_gesture_entrypoint_summary">Managed by <xliff:g id="app_name" example="Emergency Info">%1$s</xliff:g></string> <string name="emergency_gesture_entrypoint_summary">Managed by <xliff:g id="app_name" example="Emergency Info">%1$s</xliff:g></string>
<!-- Preference summary to enable feature for calling emergency services at panic/distress moments[CHAR_LIMIT=NONE]--> <!-- Preference summary to enable feature for calling emergency services at panic/distress moments[CHAR_LIMIT=NONE]-->
<string name="emergency_gesture_screen_summary">Start the actions below by pressing the power button quickly 5 times or more</string> <string name="emergency_gesture_screen_summary">Start the actions below by pressing the power button quickly 5 times or more</string>
<!-- Preference title to enable generating noisy sound before calling emergency services at panic/distress moments[CHAR_LIMIT=60]--> <!-- Preference title to enable generating noisy sound before calling emergency services at panic/distress moments[CHAR_LIMIT=60]-->
<string name="emergency_gesture_sound_setting_title">Countdown alarm</string> <string name="emergency_gesture_sound_setting_title">Play countdown alarm</string>
<!-- Preference summary to enable generating noisy sound before calling emergency services at panic/distress moments[CHAR_LIMIT=NONE]--> <!-- Preference summary to enable generating noisy sound before calling emergency services at panic/distress moments[CHAR_LIMIT=NONE]-->
<string name="emergency_gesture_sound_setting_summary">Play a loud sound before calling</string> <string name="emergency_gesture_sound_setting_summary">Play a loud sound before notifying for help</string>
<!-- Preference title listing a phone number to call during emergency gesture [CHAR_LIMIT=60]--> <!-- Preference title listing a phone number to call during emergency gesture [CHAR_LIMIT=60]-->
<string name="emergency_gesture_call_for_help_title">Call for help</string> <string name="emergency_gesture_call_for_help_title">Call for help</string>

4
src/com/android/settings/gestures/EmergencyGesturePreferenceController.java
View File

@@ -63,8 +63,8 @@ public class EmergencyGesturePreferenceController extends BasePreferenceControll
super.displayPreference(screen); super.displayPreference(screen);
final LayoutPreference pref = screen.findPreference(mPreferenceKey); final LayoutPreference pref = screen.findPreference(mPreferenceKey);
mSwitchBar = pref.findViewById(R.id.switch_bar); mSwitchBar = pref.findViewById(R.id.switch_bar);
mSwitchBar.setSwitchBarText(R.string.emergency_gesture_screen_title, mSwitchBar.setSwitchBarText(R.string.emergency_gesture_switchbar_title,
R.string.emergency_gesture_screen_title); R.string.emergency_gesture_switchbar_title);
mSwitchBar.addOnSwitchChangeListener(this); mSwitchBar.addOnSwitchChangeListener(this);
mSwitchBar.setChecked(isChecked()); mSwitchBar.setChecked(isChecked());
mSwitchBar.show(); mSwitchBar.show();