diff options
author | Linux Build Service Account <lnxbuild@localhost> | 2016-06-10 23:15:54 -0700 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-06-10 23:15:54 -0700 |
commit | 2efa365cdd2a1f045ab03acd432b8e9e9a8ffe7b (patch) | |
tree | 8f9a00a677361f926035f9b3546202a6d7c9610f /res | |
parent | 69b71ffdc38b7261c9eabb3a22259da13ed11b02 (diff) | |
parent | f6ced59d086a755d6f720600181c023c29d202ca (diff) | |
download | android_packages_apps_Snap-2efa365cdd2a1f045ab03acd432b8e9e9a8ffe7b.tar.gz android_packages_apps_Snap-2efa365cdd2a1f045ab03acd432b8e9e9a8ffe7b.tar.bz2 android_packages_apps_Snap-2efa365cdd2a1f045ab03acd432b8e9e9a8ffe7b.zip |
Merge "Minimum viable Android M runtime permissions handling for H." into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'res')
-rw-r--r-- | res/values/strings.xml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 2b06e257f..898329a7f 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -171,6 +171,12 @@ <!-- message for the dialog showing the camera is disabled because of security policies. Camera cannot be used. --> <string name="camera_disabled">Camera has been disabled because of security policies.</string> + <!-- message for the dialog showing that the app does not have sufficient permissions [CHAR LIMIT=NONE] --> + <string name="error_permissions">The app does not have critical permissions needed to run. Please check your permissions settings.</string> + + <!-- Dialog "Dismiss" button. Closes the dialog [CHAR LIMIT=12]--> + <string name="dialog_dismiss">Dismiss</string> + <!-- alert to the user to wait for some operation to complete --> <string name="wait">Please wait\u2026</string> |