summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Monk <jmonk@google.com>2015-07-29 22:05:29 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-29 22:05:29 +0000
commitc2e09e70caa091c2c4c488f85ed3ba75df5f63b6 (patch)
tree415c309be3c45c3c4df492bd709b58128baf8094
parentee24af33272473f4d37decd12eeb221e8b9bad17 (diff)
parentfb24901f0e9cb8e7b061ed21736c69d894cf1753 (diff)
downloadandroid_packages_apps_PackageInstaller-c2e09e70caa091c2c4c488f85ed3ba75df5f63b6.tar.gz
android_packages_apps_PackageInstaller-c2e09e70caa091c2c4c488f85ed3ba75df5f63b6.tar.bz2
android_packages_apps_PackageInstaller-c2e09e70caa091c2c4c488f85ed3ba75df5f63b6.zip
am fb24901f: am 389c30c5: am c5706322: am 53481e2c: am 7741e471: Merge "Add string for screen overlay warning." into mnc-dev
* commit 'fb24901f0e9cb8e7b061ed21736c69d894cf1753': Add string for screen overlay warning.
-rw-r--r--res/values/strings.xml6
1 files changed, 6 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index f0b80e05..4fb4055e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -261,4 +261,10 @@
<!-- Title of the permission dialog for accessibility purposes- spoken to the user. [CHAR LIMIT=none] -->
<string name="permission_request_title">Permission request</string>
+ <!-- Toast that warns the user they need to turn off screen overlays
+ before permissions can be changed. The "Settings > Apps" conveys
+ to the user to go to Settings and click on apps, this may
+ need updates in RTL languages. [CHAR LIMIT=NONE] -->
+ <string name="screen_overlay_toast">To set permissions, turn off screen overlay from Settings \u003e Apps</string>
+
</resources>