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

Merge "Dialog for emergency info" into nyc-dev

Browse Source
This commit is contained in:
Maria Garcia Puyol
2016-03-15 20:52:17 +00:00
committed by Android (Google) Code Review
parent a1a11d1944 ae49edbdfd
commit 82c512dbd6
3 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/values/strings.xml
View File

@@ -5388,6 +5388,10 @@
<string name="user_exit_guest_confirm_message">All apps and data in this session will be deleted.</string>
<!-- Label for button in confirmation dialog when exiting guest session [CHAR LIMIT=35] -->
<string name="user_exit_guest_dialog_remove">Remove</string>
<!-- Message of dialog to user to confirm that he understands that emergency information is shown in emergency dialer [CHAR LIMIT=none] -->
<string name="user_emergency_info_consent">Information you enter here can help first responders in an emergency. It is stored on your device only, but anyone can read it from the emergency dialer without unlocking your phone.</string>
<!-- Label for button in confirmation dialog when the user clicks on emergency information [CHAR LIMIT=35] -->
<string name="emergency_info_continue">Continue</string>
<!-- Title of preference to enable calling[CHAR LIMIT=40] -->
<string name="user_enable_calling">Turn on phone calls</string>
@@ -5405,8 +5409,6 @@
<string name="user_enable_calling_and_sms_confirm_message">Call and SMS history will be shared with this user.</string>
<!-- Title for the emergency info preference [CHAR LIMIT=40] -->
<string name="emergency_info_title">Emergency information</string>
<!-- Description of the emergency info preference [CHAR LIMIT=none] -->
<string name="emergency_info_subtitle">Accessible by anyone from the emergency dialer without unlocking your phone</string>
<!-- Application Restrictions screen title [CHAR LIMIT=45] -->
<string name="application_restrictions">Allow apps and content</string>