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

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

Browse Source
This commit is contained in:
Andrei Stingaceanu
2016-01-08 10:25:52 +00:00
committed by Android (Google) Code Review
parent ef7c7fe196 7a24019194
commit 36504833e0
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); mOwnerInfoPref = findPreference(KEY_OWNER_INFO_SETTINGS);
if (mOwnerInfoPref != null) { if (mOwnerInfoPref != null) {
mOwnerInfoPref.setEnabled(!mLockPatternUtils.isDeviceOwnerInfoEnabled()); mOwnerInfoPref.setEnabled(!mLockPatternUtils.isLockScreenDisabled(MY_USER_ID)
&& !mLockPatternUtils.isDeviceOwnerInfoEnabled());
if (mOwnerInfoPref.isEnabled()) { if (mOwnerInfoPref.isEnabled()) {
mOwnerInfoPref.setOnPreferenceClickListener(new OnPreferenceClickListener() { mOwnerInfoPref.setOnPreferenceClickListener(new OnPreferenceClickListener() {