diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-02-11 12:14:08 -0800 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2010-02-11 14:36:30 -0800 |
| commit | 315ada7fbb9e967c22e87b4921bec720ceb2c73c (patch) | |
| tree | d40fec8ac540b985027bf2334c9d3e8d5d73d942 /core/res | |
| parent | 2870552b412cd8186c6605d108b736832b9b82da (diff) | |
| download | frameworks_base-315ada7fbb9e967c22e87b4921bec720ceb2c73c.zip frameworks_base-315ada7fbb9e967c22e87b4921bec720ceb2c73c.tar.gz frameworks_base-315ada7fbb9e967c22e87b4921bec720ceb2c73c.tar.bz2 | |
Get rid of the limit-unlock policy control.
This is merged with force-lock. These both allow effectively the same thing,
so there is no reason to junk up the user experience with them as separate
entities.
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/res/values/strings.xml | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 7f66111..9e596ef 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -1218,16 +1218,11 @@ <string name="policydesc_resetPassword">Force your password to a new value, requiring the administrator give it to you before you can log in.</string> - <!-- Title of policy access to limiting the user's unlock timeout --> - <string name="policylab_limitUnlock">Limit lock timeout</string> - <!-- Description of policy access to limiting the user's unlock timeout --> - <string name="policydesc_limitUnlock">Restrict the unlock timeout - durations you can select.</string> <!-- Title of policy access to force lock the device --> <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 you re-enter its password.</string> + <string name="policydesc_forceLock">Control when device locks, + requiring 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 --> |