From 61cdfc02db3594dca416b96548a39da552b44b5a Mon Sep 17 00:00:00 2001 From: Roman Birg Date: Mon, 8 Feb 2016 15:59:34 -0800 Subject: SystemUI: improve lockscreen tile behavior with profiles Disable (grey out) the lock screen tile when a profile is already disabling it. Profiles takes precedence over the internal setting. Also simplify lockscreen disable logic - using a null'd Boolean without synchonization will lead to things falling out of place. Ref: CYNGNOS-1930 Change-Id: Ia4cb7926e418a4d72426be65e5bfb11dc44bee5e Signed-off-by: Roman Birg --- packages/SystemUI/res/values/cm_strings.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'packages/SystemUI/res/values') diff --git a/packages/SystemUI/res/values/cm_strings.xml b/packages/SystemUI/res/values/cm_strings.xml index dcd02a2..c5fb1b2 100644 --- a/packages/SystemUI/res/values/cm_strings.xml +++ b/packages/SystemUI/res/values/cm_strings.xml @@ -121,6 +121,7 @@ Lock screen Ambient display Lock screen enforced + Disabled by profile Screen timeout: %s. -- cgit v1.1