diff options
| author | Yorke Lee <yorkelee@google.com> | 2015-07-25 16:21:33 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-25 16:21:33 +0000 |
| commit | ad00b3137a9c982030caf42ec48fb828b40b2e19 (patch) | |
| tree | f27d1abd8bb6e57306bcc632ae09606a9cbc166d /res | |
| parent | 8ccf62e2ca9d2647b2366cc7382e72fc4ada42b6 (diff) | |
| parent | ffeb2959e177a7f94321ca9ca3b3e55726fd7df2 (diff) | |
am ffeb2959: am 036cb573: am 3f468007: Merge "Protect against lack of WRITE_SYSTEM_SETTINGS AppOp" into mnc-dev
* commit 'ffeb2959e177a7f94321ca9ca3b3e55726fd7df2':
Protect against lack of WRITE_SYSTEM_SETTINGS AppOp
Diffstat (limited to 'res')
| -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 e2f0ff593..d8f4aa877 100644 --- a/res/values/ids.xml +++ b/res/values/ids.xml @@ -17,4 +17,5 @@ <resources> <item type="id" name="context_menu_copy_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 eec9b0ca7..5e2476db0 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -813,4 +813,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> |