diff options
| author | zafir <zafir@google.com> | 2015-06-29 00:08:22 -0500 |
|---|---|---|
| committer | Jay Wang <jaywang@codeaurora.org> | 2016-06-02 16:10:01 -0700 |
| commit | f6ced59d086a755d6f720600181c023c29d202ca (patch) | |
| tree | 7633600936f93cebc7e456b3054e97cc2c5b4595 /res | |
| parent | dba00aac4e44a91bc55b0aabca9f191d03994edf (diff) | |
| download | android_packages_apps_Snap-f6ced59d086a755d6f720600181c023c29d202ca.tar.gz android_packages_apps_Snap-f6ced59d086a755d6f720600181c023c29d202ca.tar.bz2 android_packages_apps_Snap-f6ced59d086a755d6f720600181c023c29d202ca.zip | |
Minimum viable Android M runtime permissions handling for H.
Creates new activity for permissions handling: both checking
for permissions and handling error condition when critical
permissions are not present. The reason for creating a
new activity is so the app does not attempt to continue
executing OnCreate, OnResume etc, which opens
the camera while the dialogs are showing. This should
not slow the app down because the permissions activity
will only run when a) the first time the app has
insufficient permissions and b) when a critical
permission is missing and the app needs to shut down.
Bug: 21273463
CRs-Fixed: 1019847
Change-Id: I603acfb3057ba26b9cfa7935eb4cb24b5d547cb5
(cherry picked from commit ad44cda82fe6ec5ee090115129223c6314f9e1bb)
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> |