Merge "Fix the empty preference after clicking gear icon"

This commit is contained in:
TreeHugger Robot
2018-07-26 03:34:36 +00:00
committed by Android (Google) Code Review
2 changed files with 162 additions and 2 deletions

View File

@@ -84,8 +84,7 @@ public class ChangeScreenLockPreferenceController extends AbstractPreferenceCont
@Override
public void updateState(Preference preference) {
if (mPreference != null && mPreference instanceof GearPreference) {
if (mLockPatternUtils.isSecure(mUserId)
|| !mLockPatternUtils.isLockScreenDisabled(mUserId)) {
if (mLockPatternUtils.isSecure(mUserId)) {
((GearPreference) mPreference).setOnGearClickListener(this);
} else {
((GearPreference) mPreference).setOnGearClickListener(null);