Merge "Fix 3384928: Update "disabled" strings for lock methods"

This commit is contained in:
Jim Miller
2011-02-15 14:33:47 -08:00
committed by Android (Google) Code Review

View File

@@ -738,8 +738,8 @@
<!-- Title for preference that guides the user through creating an unlock password [CHAR LIMIT=45] -->
<string name="unlock_set_unlock_password_summary">Require a password to unlock the screen</string>
<!-- Summary for preference that has been disabled by DevicePolicyAdmin [CHAR LIMIT=45] -->
<string name="unlock_set_unlock_disabled_summary">Disabled by remote device administrator</string>
<!-- Summary for preference that has been disabled by DevicePolicyAdmin [CHAR LIMIT=50] -->
<string name="unlock_set_unlock_disabled_summary">Disabled by administrator or encryption policy</string>
<!-- Summary for "Configure lockscreen" when lock screen is off [CHAR LIMIT=45] -->
<string name="unlock_set_unlock_mode_off">Off</string>