diff options
| author | Yorke Lee <yorkelee@google.com> | 2015-07-25 16:53:56 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-25 16:53:56 +0000 |
| commit | 315238720a730fce543e2139dc5f08191da0ac58 (patch) | |
| tree | 449deb75bf28335df94db6677e6d2506c3d666cc /res/values | |
| parent | c46701bc78de081d9d8bdd294758ed6242892ddb (diff) | |
| parent | d28951e41c01652740e01f586e96463de934a831 (diff) | |
am d28951e4: am ad00b313: am ffeb2959: am 036cb573: am 3f468007: Merge "Protect against lack of WRITE_SYSTEM_SETTINGS AppOp" into mnc-dev
* commit 'd28951e41c01652740e01f586e96463de934a831':
Protect against lack of WRITE_SYSTEM_SETTINGS AppOp
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/ids.xml | 1 | ||||
| -rw-r--r-- | res/values/strings.xml | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/res/values/ids.xml b/res/values/ids.xml index 5c00924a8..cb2025aa9 100644 --- a/res/values/ids.xml +++ b/res/values/ids.xml @@ -18,4 +18,5 @@ <item type="id" name="context_menu_copy_to_clipboard" /> <item type="id" name="context_menu_copy_transcript_to_clipboard" /> <item type="id" name="context_menu_edit_before_call" /> + <item type="id" name="settings_header_sounds_and_vibration" /> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index 9cea58310..9dcf72bab 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -819,4 +819,7 @@ <!-- Shown as a prompt to turn on the phone permission to allow a call to be placed --> <string name="permission_place_call">To place a call,\n turn on the Phone permission.</string> + + <!-- Shown as a message that notifies the user that the Phone app cannot write to system settings, which is why the system settings app is being launched directly instead.--> + <string name="toast_cannot_write_system_settings">Phone app does not have permission to write to system settings.</string> </resources> |