diff options
| author | Roman Birg <roman@cyngn.com> | 2016-02-08 15:59:34 -0800 |
|---|---|---|
| committer | Roman Birg <roman@cyngn.com> | 2016-02-08 18:45:18 -0800 |
| commit | 61cdfc02db3594dca416b96548a39da552b44b5a (patch) | |
| tree | fd5559ecfd705508644698cd85ae9b6963909c02 /packages/SystemUI/res/values | |
| parent | deb5c35ebe59b0ca822b93fbc80df3054f7589da (diff) | |
| download | frameworks_base-61cdfc02db3594dca416b96548a39da552b44b5a.zip frameworks_base-61cdfc02db3594dca416b96548a39da552b44b5a.tar.gz frameworks_base-61cdfc02db3594dca416b96548a39da552b44b5a.tar.bz2 | |
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 <roman@cyngn.com>
Diffstat (limited to 'packages/SystemUI/res/values')
| -rw-r--r-- | packages/SystemUI/res/values/cm_strings.xml | 1 |
1 files changed, 1 insertions, 0 deletions
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 @@ <string name="quick_settings_lockscreen_label">Lock screen</string> <string name="quick_settings_ambient_display_label">Ambient display</string> <string name="quick_settings_lockscreen_label_enforced">Lock screen enforced</string> + <string name="quick_settings_lockscreen_label_locked_by_profile">Disabled by profile</string> <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] --> <string name="accessibility_quick_settings_screen_timeout">Screen timeout: <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string> |