From 64aafdcfac49a9ee5040d4a794ce54986d8e828d Mon Sep 17 00:00:00 2001
From: Jim Miller <jaggies@google.com>
Date: Mon, 14 Feb 2011 18:41:29 -0800
Subject: [PATCH] Fix 3384928: Update "disabled" strings for lock methods

This updates the disabled strings to give the user an idea
why the given methods are disabled.  It's either because
the DevicePolicyAdmin disabled it ("administrator") or
because the device is encrypted.

Change-Id: I0e99742a838037d069f686ed98f9622754bafe13
---
 res/values/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index b8bd7b1d75c..7db3027552b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -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>