Move all the shared Screen Lock details into a reusable utility class
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.security.ChangeScreenLockPreferenceControllerTest Test: atest SettingsUnitTests:ScreenLockPreferenceDetailsUtilsTest Bug: 215515298 Change-Id: I46543d35ce4dc2fee85ad1c55886b272de113768
This commit is contained in:
Yuri Ufimtsev
@@ -16,40 +16,32 @@
|
||||
|
||||
package com.android.settings.security;
|
||||
|
||||
import android.app.admin.DevicePolicyManager;
|
||||
import android.content.Context;
|
||||
import android.os.UserHandle;
|
||||
import android.os.UserManager;
|
||||
import android.os.storage.StorageManager;
|
||||
import android.text.TextUtils;
|
||||
|
||||
import androidx.preference.Preference;
|
||||
import androidx.preference.PreferenceScreen;
|
||||
|
||||
import com.android.internal.widget.LockPatternUtils;
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.SettingsPreferenceFragment;
|
||||
import com.android.settings.Utils;
|
||||
import com.android.settings.core.PreferenceControllerMixin;
|
||||
import com.android.settings.core.SubSettingLauncher;
|
||||
import com.android.settings.dashboard.DashboardFragment;
|
||||
import com.android.settings.overlay.FeatureFactory;
|
||||
import com.android.settings.password.ChooseLockGeneric;
|
||||
import com.android.settings.security.screenlock.ScreenLockSettings;
|
||||
import com.android.settings.widget.GearPreference;
|
||||
import com.android.settingslib.RestrictedLockUtils;
|
||||
import com.android.settingslib.RestrictedLockUtilsInternal;
|
||||
import com.android.settingslib.RestrictedPreference;
|
||||
import com.android.settingslib.core.AbstractPreferenceController;
|
||||
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
|
||||
import com.android.settingslib.transition.SettingsTransitionHelper;
|
||||
|
||||
public class ChangeScreenLockPreferenceController extends AbstractPreferenceController implements
|
||||
PreferenceControllerMixin, GearPreference.OnGearClickListener {
|
||||
|
||||
private static final String KEY_UNLOCK_SET_OR_CHANGE = "unlock_set_or_change";
|
||||
|
||||
protected final DevicePolicyManager mDPM;
|
||||
protected final SettingsPreferenceFragment mHost;
|
||||
protected final UserManager mUm;
|
||||
protected final LockPatternUtils mLockPatternUtils;
|
||||
@@ -57,24 +49,26 @@ public class ChangeScreenLockPreferenceController extends AbstractPreferenceCont
|
||||
protected final int mUserId = UserHandle.myUserId();
|
||||
protected final int mProfileChallengeUserId;
|
||||
private final MetricsFeatureProvider mMetricsFeatureProvider;
|
||||
private final ScreenLockPreferenceDetailsUtils mScreenLockPreferenceDetailUtils;
|
||||
|
||||
protected RestrictedPreference mPreference;
|
||||
|
||||
public ChangeScreenLockPreferenceController(Context context, SettingsPreferenceFragment host) {
|
||||
super(context);
|
||||
mUm = (UserManager) context.getSystemService(Context.USER_SERVICE);
|
||||
mDPM = (DevicePolicyManager) context.getSystemService(Context.DEVICE_POLICY_SERVICE);
|
||||
mLockPatternUtils = FeatureFactory.getFactory(context)
|
||||
.getSecurityFeatureProvider()
|
||||
.getLockPatternUtils(context);
|
||||
mHost = host;
|
||||
mProfileChallengeUserId = Utils.getManagedProfileId(mUm, mUserId);
|
||||
mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
|
||||
mScreenLockPreferenceDetailUtils =
|
||||
new ScreenLockPreferenceDetailsUtils(context, host.getMetricsCategory());
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isAvailable() {
|
||||
return mContext.getResources().getBoolean(R.bool.config_show_unlock_set_or_change);
|
||||
return mScreenLockPreferenceDetailUtils.isAvailable();
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -91,7 +85,7 @@ public class ChangeScreenLockPreferenceController extends AbstractPreferenceCont
|
||||
@Override
|
||||
public void updateState(Preference preference) {
|
||||
if (mPreference != null && mPreference instanceof GearPreference) {
|
||||
if (mLockPatternUtils.isSecure(mUserId)) {
|
||||
if (mScreenLockPreferenceDetailUtils.shouldShowGearMenu()) {
|
||||
((GearPreference) mPreference).setOnGearClickListener(this);
|
||||
} else {
|
||||
((GearPreference) mPreference).setOnGearClickListener(null);
|
||||
@@ -112,10 +106,7 @@ public class ChangeScreenLockPreferenceController extends AbstractPreferenceCont
|
||||
if (TextUtils.equals(p.getKey(), getPreferenceKey())) {
|
||||
mMetricsFeatureProvider.logClickedPreference(p,
|
||||
p.getExtras().getInt(DashboardFragment.CATEGORY));
|
||||
new SubSettingLauncher(mContext)
|
||||
.setDestination(ScreenLockSettings.class.getName())
|
||||
.setSourceMetricsCategory(mHost.getMetricsCategory())
|
||||
.launch();
|
||||
mScreenLockPreferenceDetailUtils.openScreenLockSettings();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -124,51 +115,11 @@ public class ChangeScreenLockPreferenceController extends AbstractPreferenceCont
|
||||
if (!TextUtils.equals(preference.getKey(), getPreferenceKey())) {
|
||||
return super.handlePreferenceTreeClick(preference);
|
||||
}
|
||||
// TODO(b/35930129): Remove once existing password can be passed into vold directly.
|
||||
// Currently we need this logic to ensure that the QUIET_MODE is off for any work
|
||||
// profile with unified challenge on FBE-enabled devices. Otherwise, vold would not be
|
||||
// able to complete the operation due to the lack of (old) encryption key.
|
||||
if (mProfileChallengeUserId != UserHandle.USER_NULL
|
||||
&& !mLockPatternUtils.isSeparateProfileChallengeEnabled(mProfileChallengeUserId)
|
||||
&& StorageManager.isFileEncryptedNativeOnly()) {
|
||||
if (Utils.startQuietModeDialogIfNecessary(mContext, mUm, mProfileChallengeUserId)) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
new SubSettingLauncher(mContext)
|
||||
.setDestination(ChooseLockGeneric.ChooseLockGenericFragment.class.getName())
|
||||
.setSourceMetricsCategory(mHost.getMetricsCategory())
|
||||
.setTransitionType(SettingsTransitionHelper.TransitionType.TRANSITION_SLIDE)
|
||||
.launch();
|
||||
return true;
|
||||
return mScreenLockPreferenceDetailUtils.openChooseLockGenericFragment();
|
||||
}
|
||||
|
||||
protected void updateSummary(Preference preference, int userId) {
|
||||
if (!mLockPatternUtils.isSecure(userId)) {
|
||||
if (userId == mProfileChallengeUserId
|
||||
|| mLockPatternUtils.isLockScreenDisabled(userId)) {
|
||||
preference.setSummary(R.string.unlock_set_unlock_mode_off);
|
||||
} else {
|
||||
preference.setSummary(R.string.unlock_set_unlock_mode_none);
|
||||
}
|
||||
} else {
|
||||
switch (mLockPatternUtils.getKeyguardStoredPasswordQuality(userId)) {
|
||||
case DevicePolicyManager.PASSWORD_QUALITY_SOMETHING:
|
||||
preference.setSummary(R.string.unlock_set_unlock_mode_pattern);
|
||||
break;
|
||||
case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC:
|
||||
case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX:
|
||||
preference.setSummary(R.string.unlock_set_unlock_mode_pin);
|
||||
break;
|
||||
case DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC:
|
||||
case DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC:
|
||||
case DevicePolicyManager.PASSWORD_QUALITY_COMPLEX:
|
||||
case DevicePolicyManager.PASSWORD_QUALITY_MANAGED:
|
||||
preference.setSummary(R.string.unlock_set_unlock_mode_password);
|
||||
break;
|
||||
}
|
||||
}
|
||||
preference.setSummary(mScreenLockPreferenceDetailUtils.getSummary(userId));
|
||||
mPreference.setEnabled(true);
|
||||
}
|
||||
|
||||
@@ -181,10 +132,7 @@ public class ChangeScreenLockPreferenceController extends AbstractPreferenceCont
|
||||
void disableIfPasswordQualityManaged(int userId) {
|
||||
final RestrictedLockUtils.EnforcedAdmin admin = RestrictedLockUtilsInternal
|
||||
.checkIfPasswordQualityIsSet(mContext, userId);
|
||||
final DevicePolicyManager dpm = (DevicePolicyManager) mContext
|
||||
.getSystemService(Context.DEVICE_POLICY_SERVICE);
|
||||
if (admin != null && dpm.getPasswordQuality(admin.component, userId)
|
||||
== DevicePolicyManager.PASSWORD_QUALITY_MANAGED) {
|
||||
if (mScreenLockPreferenceDetailUtils.isPasswordQualityManaged(userId, admin)) {
|
||||
mPreference.setDisabledByAdmin(admin);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user