Merge "Enable controllers to use a custom key." into sc-dev am: 2b8678c5d4 (d8ab9708) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/biometrics/face/FaceProfileStatusPreferenceController.java

+7 −3

Original line number	Original line	Diff line number	Diff line
	@@ -19,16 +19,20 @@ package com.android.settings.biometrics.face;
	import android.content.Context;		import android.content.Context;
	import android.os.UserHandle;		import android.os.UserHandle;

	import com.android.settings.R;

	import androidx.preference.Preference;		import androidx.preference.Preference;

			import com.android.settings.R;

	public class FaceProfileStatusPreferenceController extends FaceStatusPreferenceController {		public class FaceProfileStatusPreferenceController extends FaceStatusPreferenceController {

	private static final String KEY_FACE_SETTINGS = "face_settings_profile";		private static final String KEY_FACE_SETTINGS = "face_settings_profile";

	public FaceProfileStatusPreferenceController(Context context) {		public FaceProfileStatusPreferenceController(Context context) {
	super(context, KEY_FACE_SETTINGS);		this(context, KEY_FACE_SETTINGS);
			}

			public FaceProfileStatusPreferenceController(Context context, String key) {
			super(context, key);
	}		}

	@Override		@Override

src/com/android/settings/biometrics/fingerprint/FingerprintProfileStatusPreferenceController.java

+5 −1

Original line number	Original line	Diff line number	Diff line
	@@ -25,7 +25,11 @@ public class FingerprintProfileStatusPreferenceController
	public static final String KEY_FINGERPRINT_SETTINGS = "fingerprint_settings_profile";		public static final String KEY_FINGERPRINT_SETTINGS = "fingerprint_settings_profile";

	public FingerprintProfileStatusPreferenceController(Context context) {		public FingerprintProfileStatusPreferenceController(Context context) {
	super(context, KEY_FINGERPRINT_SETTINGS);		this(context, KEY_FINGERPRINT_SETTINGS);
			}

			public FingerprintProfileStatusPreferenceController(Context context, String key) {
			super(context, key);
	}		}

	@Override		@Override

src/com/android/settings/enterprise/EnterprisePrivacyPreferenceController.java

+10 −4

Original line number	Original line	Diff line number	Diff line
	@@ -28,17 +28,23 @@ public class EnterprisePrivacyPreferenceController extends AbstractPreferenceCon

	private static final String KEY_ENTERPRISE_PRIVACY = "enterprise_privacy";		private static final String KEY_ENTERPRISE_PRIVACY = "enterprise_privacy";
	private final PrivacyPreferenceControllerHelper mPrivacyPreferenceControllerHelper;		private final PrivacyPreferenceControllerHelper mPrivacyPreferenceControllerHelper;
			private final String mPreferenceKey;

	public EnterprisePrivacyPreferenceController(Context context) {		public EnterprisePrivacyPreferenceController(Context context) {
	this(Objects.requireNonNull(context), new PrivacyPreferenceControllerHelper(context));		this(Objects.requireNonNull(context), KEY_ENTERPRISE_PRIVACY);
			}

			public EnterprisePrivacyPreferenceController(Context context, String key) {
			this(Objects.requireNonNull(context), new PrivacyPreferenceControllerHelper(context), key);
	}		}

	@VisibleForTesting		@VisibleForTesting
	EnterprisePrivacyPreferenceController(		EnterprisePrivacyPreferenceController(Context context,
	Context context, PrivacyPreferenceControllerHelper privacyPreferenceControllerHelper) {		PrivacyPreferenceControllerHelper privacyPreferenceControllerHelper, String key) {
	super(Objects.requireNonNull(context));		super(Objects.requireNonNull(context));
	mPrivacyPreferenceControllerHelper = Objects.requireNonNull(		mPrivacyPreferenceControllerHelper = Objects.requireNonNull(
	privacyPreferenceControllerHelper);		privacyPreferenceControllerHelper);
			this.mPreferenceKey = key;
	}		}

	@Override		@Override
	@@ -54,6 +60,6 @@ public class EnterprisePrivacyPreferenceController extends AbstractPreferenceCon

	@Override		@Override
	public String getPreferenceKey() {		public String getPreferenceKey() {
	return KEY_ENTERPRISE_PRIVACY;		return mPreferenceKey;
	}		}
	}		}

src/com/android/settings/enterprise/FinancedPrivacyPreferenceController.java

+10 −4

Original line number	Original line	Diff line number	Diff line
	@@ -32,17 +32,23 @@ public class FinancedPrivacyPreferenceController extends AbstractPreferenceContr

	private static final String PREF_KEY_FINANCED_PRIVACY = "financed_privacy";		private static final String PREF_KEY_FINANCED_PRIVACY = "financed_privacy";
	private final PrivacyPreferenceControllerHelper mPrivacyPreferenceControllerHelper;		private final PrivacyPreferenceControllerHelper mPrivacyPreferenceControllerHelper;
			private final String mPreferenceKey;

	public FinancedPrivacyPreferenceController(Context context) {		public FinancedPrivacyPreferenceController(Context context) {
	this(Objects.requireNonNull(context), new PrivacyPreferenceControllerHelper(context));		this(Objects.requireNonNull(context), PREF_KEY_FINANCED_PRIVACY);
			}

			public FinancedPrivacyPreferenceController(Context context, String key) {
			this(Objects.requireNonNull(context), new PrivacyPreferenceControllerHelper(context), key);
	}		}

	@VisibleForTesting		@VisibleForTesting
	FinancedPrivacyPreferenceController(		FinancedPrivacyPreferenceController(Context context,
	Context context, PrivacyPreferenceControllerHelper privacyPreferenceControllerHelper) {		PrivacyPreferenceControllerHelper privacyPreferenceControllerHelper, String key) {
	super(Objects.requireNonNull(context));		super(Objects.requireNonNull(context));
	mPrivacyPreferenceControllerHelper = Objects.requireNonNull(		mPrivacyPreferenceControllerHelper = Objects.requireNonNull(
	privacyPreferenceControllerHelper);		privacyPreferenceControllerHelper);
			this.mPreferenceKey = key;
	}		}

	@Override		@Override
	@@ -57,6 +63,6 @@ public class FinancedPrivacyPreferenceController extends AbstractPreferenceContr

	@Override		@Override
	public String getPreferenceKey() {		public String getPreferenceKey() {
	return PREF_KEY_FINANCED_PRIVACY;		return mPreferenceKey;
	}		}
	}		}

src/com/android/settings/security/ChangeProfileScreenLockPreferenceController.java

+9 −1

Original line number	Original line	Diff line number	Diff line
	@@ -37,9 +37,17 @@ public class ChangeProfileScreenLockPreferenceController extends

	private static final String KEY_UNLOCK_SET_OR_CHANGE_PROFILE = "unlock_set_or_change_profile";		private static final String KEY_UNLOCK_SET_OR_CHANGE_PROFILE = "unlock_set_or_change_profile";

			private final String mPreferenceKey;

	public ChangeProfileScreenLockPreferenceController(Context context,		public ChangeProfileScreenLockPreferenceController(Context context,
	SettingsPreferenceFragment host) {		SettingsPreferenceFragment host) {
			this(context, host, KEY_UNLOCK_SET_OR_CHANGE_PROFILE);
			}

			public ChangeProfileScreenLockPreferenceController(Context context,
			SettingsPreferenceFragment host, String key) {
	super(context, host);		super(context, host);
			this.mPreferenceKey = key;
	}		}

	public boolean isAvailable() {		public boolean isAvailable() {
	@@ -65,7 +73,7 @@ public class ChangeProfileScreenLockPreferenceController extends

	@Override		@Override
	public String getPreferenceKey() {		public String getPreferenceKey() {
	return KEY_UNLOCK_SET_OR_CHANGE_PROFILE;		return mPreferenceKey;
	}		}

	@Override		@Override