diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-01-26 18:01:04 -0800 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2010-01-27 13:51:53 -0800 |
| commit | 8ea138cbf12b140d43fd81f4f12fe1a9234f1f25 (patch) | |
| tree | 65d820bd65d69af867e4558b1fbd407634309eb2 /core/res | |
| parent | 2fc1f4a02957de3fdc785ca3dde414fb8e97bc49 (diff) | |
| download | frameworks_base-8ea138cbf12b140d43fd81f4f12fe1a9234f1f25.zip frameworks_base-8ea138cbf12b140d43fd81f4f12fe1a9234f1f25.tar.gz frameworks_base-8ea138cbf12b140d43fd81f4f12fe1a9234f1f25.tar.bz2 | |
More work on device admins:
- You can now show a dynamic message to the user when asking to
have your DeviceAdmin added.
- A DeviceAdmin can now provide a warning message that is displayed
before a user disables it.
- Better ordering (and text) of the policy warnings.
- New API to set the maximum failed password attempts before the device
wipes itself.
- We now store the number of failed unlock attempts in persistent
storage.
- New managed dialog APIs that will be used by the settings app.
Also a little bit of cleanup as I was working on this - removed the
long unused MailboxNotAvailableException, fixed a java doc in Messenger.
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/res/values/strings.xml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 31f71d3..259398f 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -1192,10 +1192,10 @@ <!-- Title of policy access to watch user login attempts --> <string name="policylab_watchLogin">Watch login attempts</string> <!-- Description of policy access to watch user login attempts --> - <string name="policydesc_watchLogin">Monitor attempts to login to - the device, in particular to respond to failed login attempts.</string> + <string name="policydesc_watchLogin">Monitor failed attempts to login to + the device, to perform some action.</string> <!-- Title of policy access to reset user's password --> - <string name="policylab_resetPassword">Reset your password</string> + <string name="policylab_resetPassword">Reset password</string> <!-- Description of policy access to reset user's password --> <string name="policydesc_resetPassword">Force your password to a new value, requiring the administrator give it to you @@ -1209,12 +1209,12 @@ <string name="policylab_forceLock">Force lock</string> <!-- Description of policy access to limiting the user's password choices --> <string name="policydesc_forceLock">Force the device to immediately lock, - requiring that its password is re-entered.</string> + requiring that you re-enter its password.</string> <!-- Title of policy access to wipe the user's data --> <string name="policylab_wipeData">Erase all data</string> <!-- Description of policy access to wipe the user's data --> <string name="policydesc_wipeData">Perform a factory reset, deleting - all of your data without any confirmation from you.</string> + all of your data without any confirmation.</string> <!-- The order of these is important, don't reorder without changing Contacts.java --> <skip /> <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. --> |