Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36504833 authored by Andrei Stingaceanu's avatar Andrei Stingaceanu Committed by Android (Google) Code Review
Browse files

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

parents ef7c7fe1 7a240191

src/com/android/settings/SecuritySettings.java

+2 −1
Original line number Diff line number Diff line
@@ -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() {