summaryrefslogtreecommitdiffstats
path: root/packages/Keyguard/res/values
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2014-10-29 11:41:31 -0700
committerAmith Yamasani <yamasani@google.com>2014-11-21 13:57:48 -0800
commit3a3d212a51974ccec6100c1e117225291edc83cc (patch)
tree4fa99070c247606bb5ce38f815c4f1a71251640d /packages/Keyguard/res/values
parent5d3d53aa1361c094f05aa70129e49a04875ab5a6 (diff)
downloadframeworks_base-3a3d212a51974ccec6100c1e117225291edc83cc.zip
frameworks_base-3a3d212a51974ccec6100c1e117225291edc83cc.tar.gz
frameworks_base-3a3d212a51974ccec6100c1e117225291edc83cc.tar.bz2
Different messages when wiping user and not device
There are 3 types of users 1. Primary - device will be wiped 2. Managed profile - profile will be removed 3. Secondary user - user will be removed Show different messages for almost wipe and wipe in each of these 3 cases. Bug: 16843155 Change-Id: Icecfe520622773da9e45465bf2217e8ed38b266e
Diffstat (limited to 'packages/Keyguard/res/values')
-rw-r--r--packages/Keyguard/res/values/strings.xml64
1 files changed, 56 insertions, 8 deletions
diff --git a/packages/Keyguard/res/values/strings.xml b/packages/Keyguard/res/values/strings.xml
index a136acf..21d8dc5 100644
--- a/packages/Keyguard/res/values/strings.xml
+++ b/packages/Keyguard/res/values/strings.xml
@@ -290,28 +290,76 @@
You have incorrectly drawn your unlock pattern <xliff:g id="number">%d</xliff:g> times.
\n\nTry again in <xliff:g id="number">%d</xliff:g> seconds.
</string>
- <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. -->
+
+ <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
<string name="kg_failed_attempts_almost_at_wipe" product="tablet">
You have incorrectly attempted to unlock the tablet <xliff:g id="number">%d</xliff:g> times.
After <xliff:g id="number">%d</xliff:g> more unsuccessful attempts,
- the tablet will be reset to factory default and all user data will be lost.
+ this tablet will be reset, which will delete all its data.
</string>
- <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. -->
+ <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
<string name="kg_failed_attempts_almost_at_wipe" product="default">
You have incorrectly attempted to unlock the phone <xliff:g id="number">%d</xliff:g> times.
After <xliff:g id="number">%d</xliff:g> more unsuccessful attempts,
- the phone will be reset to factory default and all user data will be lost.
+ this phone will be reset, which will delete all its data.
</string>
- <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped -->
+ <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
<string name="kg_failed_attempts_now_wiping" product="tablet">
You have incorrectly attempted to unlock the tablet <xliff:g id="number">%d</xliff:g> times.
- The tablet will now be reset to factory default.
+ This tablet will be reset, which will delete all its data.
</string>
- <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped -->
+ <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
<string name="kg_failed_attempts_now_wiping" product="default">
You have incorrectly attempted to unlock the phone <xliff:g id="number">%d</xliff:g> times.
- The phone will now be reset to factory default.
+ This phone will be reset, which will delete all its data.
+ </string>
+
+ <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
+ <string name="kg_failed_attempts_almost_at_erase_user" product="tablet">
+ You have incorrectly attempted to unlock the tablet <xliff:g id="number">%d</xliff:g> times.
+ After <xliff:g id="number">%d</xliff:g> more unsuccessful attempts,
+ this user will be removed, which will delete all user data.
+ </string>
+ <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
+ <string name="kg_failed_attempts_almost_at_erase_user" product="default">
+ You have incorrectly attempted to unlock the phone <xliff:g id="number">%d</xliff:g> times.
+ After <xliff:g id="number">%d</xliff:g> more unsuccessful attempts,
+ this user will be removed, which will delete all user data.
+ </string>
+ <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
+ <string name="kg_failed_attempts_now_erasing_user" product="tablet">
+ You have incorrectly attempted to unlock the tablet <xliff:g id="number">%d</xliff:g> times.
+ This user will be removed, which will delete all user data.
+ </string>
+ <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
+ <string name="kg_failed_attempts_now_erasing_user" product="default">
+ You have incorrectly attempted to unlock the phone <xliff:g id="number">%d</xliff:g> times.
+ This user will be removed, which will delete all user data.
</string>
+
+ <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
+ <string name="kg_failed_attempts_almost_at_erase_profile" product="tablet">
+ You have incorrectly attempted to unlock the tablet <xliff:g id="number">%d</xliff:g> times.
+ After <xliff:g id="number">%d</xliff:g> more unsuccessful attempts,
+ the work profile will be removed, which will delete all profile data.
+ </string>
+ <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
+ <string name="kg_failed_attempts_almost_at_erase_profile" product="default">
+ You have incorrectly attempted to unlock the phone <xliff:g id="number">%d</xliff:g> times.
+ After <xliff:g id="number">%d</xliff:g> more unsuccessful attempts,
+ the work profile will be removed, which will delete all profile data.
+ </string>
+ <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
+ <string name="kg_failed_attempts_now_erasing_profile" product="tablet">
+ You have incorrectly attempted to unlock the tablet <xliff:g id="number">%d</xliff:g> times.
+ The work profile will be removed, which will delete all profile data.
+ </string>
+ <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
+ <string name="kg_failed_attempts_now_erasing_profile" product="default">
+ You have incorrectly attempted to unlock the phone <xliff:g id="number">%d</xliff:g> times.
+ The work profile will be removed, which will delete all profile data.
+ </string>
+
<!-- Message shown in dialog when user is almost at the limit where they will be
locked out and may have to enter an alternate username/password to unlock the phone -->
<string name="kg_failed_attempts_almost_at_login" product="tablet">