From 7a24019194b64cb83eb81cee41aac4449fac15c6 Mon Sep 17 00:00:00 2001
From: Andrei Stingaceanu <stg@google.com>
Date: Thu, 7 Jan 2016 16:33:16 +0000
Subject: [PATCH] 'Lock Screen Message' option is in enable state for 'None'.

Also take the 'lock screen enabled' state into account besides
the 'owner info enabled' when deciding if the lock screen message
tile should be enabled or not.

Bug: 26350729
Change-Id: Ic64a64b4757252f2bef3c385c725611de14b2798
---
 src/com/android/settings/SecuritySettings.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index fbe0f1cfc54..4ce76ce4951 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -214,7 +214,8 @@ public class SecuritySettings extends SettingsPreferenceFragment
 
         mOwnerInfoPref = findPreference(KEY_OWNER_INFO_SETTINGS);
         if (mOwnerInfoPref != null) {
-            mOwnerInfoPref.setEnabled(!mLockPatternUtils.isDeviceOwnerInfoEnabled());
+            mOwnerInfoPref.setEnabled(!mLockPatternUtils.isLockScreenDisabled(MY_USER_ID)
+                    && !mLockPatternUtils.isDeviceOwnerInfoEnabled());
 
             if (mOwnerInfoPref.isEnabled()) {
                 mOwnerInfoPref.setOnPreferenceClickListener(new OnPreferenceClickListener() {