PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

'Lock Screen Message' option is in enable state for 'None'.

Browse Source 
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
This commit is contained in:
Andrei Stingaceanu
2016-01-07 16:33:16 +00:00
parent c24d360328
commit 7a24019194
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/SecuritySettings.java
View File

@@ -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() {