Merge "Allow security controllers to be used in other fragments." into sc-dev
diff --git a/src/com/android/settings/security/ChangeProfileScreenLockPreferenceController.java b/src/com/android/settings/security/ChangeProfileScreenLockPreferenceController.java
index 1da32dc..54b78be 100644
--- a/src/com/android/settings/security/ChangeProfileScreenLockPreferenceController.java
+++ b/src/com/android/settings/security/ChangeProfileScreenLockPreferenceController.java
@@ -26,6 +26,7 @@
import androidx.preference.Preference;
import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.password.ChooseLockGeneric;
@@ -36,7 +37,7 @@
private static final String KEY_UNLOCK_SET_OR_CHANGE_PROFILE = "unlock_set_or_change_profile";
public ChangeProfileScreenLockPreferenceController(Context context,
- SecuritySettings host) {
+ SettingsPreferenceFragment host) {
super(context, host);
}
diff --git a/src/com/android/settings/security/EncryptionStatusPreferenceController.java b/src/com/android/settings/security/EncryptionStatusPreferenceController.java
index ea38068..322be10 100644
--- a/src/com/android/settings/security/EncryptionStatusPreferenceController.java
+++ b/src/com/android/settings/security/EncryptionStatusPreferenceController.java
@@ -29,9 +29,9 @@
public class EncryptionStatusPreferenceController extends BasePreferenceController {
- static final String PREF_KEY_ENCRYPTION_DETAIL_PAGE =
+ public static final String PREF_KEY_ENCRYPTION_DETAIL_PAGE =
"encryption_and_credentials_encryption_status";
- static final String PREF_KEY_ENCRYPTION_SECURITY_PAGE = "encryption_and_credential";
+ public static final String PREF_KEY_ENCRYPTION_SECURITY_PAGE = "encryption_and_credential";
private final UserManager mUserManager;
diff --git a/src/com/android/settings/security/LockUnificationPreferenceController.java b/src/com/android/settings/security/LockUnificationPreferenceController.java
index e8a23b7..98a3c6f 100644
--- a/src/com/android/settings/security/LockUnificationPreferenceController.java
+++ b/src/com/android/settings/security/LockUnificationPreferenceController.java
@@ -33,6 +33,7 @@
import com.android.internal.widget.LockPatternUtils;
import com.android.internal.widget.LockscreenCredential;
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;
@@ -67,7 +68,7 @@
private final DevicePolicyManager mDpm;
private final LockPatternUtils mLockPatternUtils;
private final int mProfileUserId;
- private final SecuritySettings mHost;
+ private final SettingsPreferenceFragment mHost;
private RestrictedSwitchPreference mUnifyProfile;
@@ -82,7 +83,7 @@
mUnifyProfile = screen.findPreference(KEY_UNIFICATION);
}
- public LockUnificationPreferenceController(Context context, SecuritySettings host) {
+ public LockUnificationPreferenceController(Context context, SettingsPreferenceFragment host) {
super(context);
mHost = host;
mUm = context.getSystemService(UserManager.class);
@@ -175,7 +176,10 @@
.launch();
}
- void startUnification() {
+ /**
+ * Unify primary and profile locks.
+ */
+ public void startUnification() {
// Confirm profile lock
final String title = mContext.getString(
R.string.unlock_set_unlock_launch_picker_title_profile);
diff --git a/src/com/android/settings/security/trustagent/TrustAgentListPreferenceController.java b/src/com/android/settings/security/trustagent/TrustAgentListPreferenceController.java
index 5e624cc..dd1d63a 100644
--- a/src/com/android/settings/security/trustagent/TrustAgentListPreferenceController.java
+++ b/src/com/android/settings/security/trustagent/TrustAgentListPreferenceController.java
@@ -31,11 +31,11 @@
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.settings.security.SecurityFeatureProvider;
-import com.android.settings.security.SecuritySettings;
import com.android.settingslib.RestrictedPreference;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -61,7 +61,7 @@
private final LockPatternUtils mLockPatternUtils;
private final TrustAgentManager mTrustAgentManager;
- private final SecuritySettings mHost;
+ private final SettingsPreferenceFragment mHost;
private Intent mTrustAgentClickIntent;
private PreferenceCategory mSecurityCategory;
@@ -69,7 +69,7 @@
@VisibleForTesting
final List<String> mTrustAgentsKeyList;
- public TrustAgentListPreferenceController(Context context, SecuritySettings host,
+ public TrustAgentListPreferenceController(Context context, SettingsPreferenceFragment host,
Lifecycle lifecycle) {
super(context);
final SecurityFeatureProvider provider = FeatureFactory.getFactory(context)