Merge "Remove sliceable attribute from biometric preference controllers." into sc-dev (c7a0b63d) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/biometrics/combination/BiometricSettingsAppPreferenceController.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -86,4 +86,9 @@ public class BiometricSettingsAppPreferenceController extends TogglePreferenceCo
		return AVAILABLE_UNSEARCHABLE;
		}
		}

		@Override
		public final boolean isSliceable() {
		return false;
		}
		}

src/com/android/settings/biometrics/combination/BiometricSettingsKeyguardPreferenceController.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -68,4 +68,9 @@ public class BiometricSettingsKeyguardPreferenceController extends TogglePrefere
		}
		return getRestrictingAdmin() != null ? DISABLED_FOR_USER : AVAILABLE;
		}

		@Override
		public final boolean isSliceable() {
		return false;
		}
		}

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

+3 −5

Original line number	Diff line number	Diff line
		@@ -44,7 +44,6 @@ import com.android.settings.overlay.FeatureFactory;
		import com.android.settings.password.ChooseLockSettingsHelper;
		import com.android.settings.search.BaseSearchIndexProvider;
		import com.android.settingslib.core.AbstractPreferenceController;
		import com.android.settingslib.core.lifecycle.Lifecycle;
		import com.android.settingslib.search.SearchIndexable;

		import java.util.ArrayList;
		@@ -290,7 +289,7 @@ public class FaceSettings extends DashboardFragment {
		if (!isFaceHardwareDetected(context)) {
		return null;
		}
		mControllers = buildPreferenceControllers(context, getSettingsLifecycle());
		mControllers = buildPreferenceControllers(context);
		// There's no great way of doing this right now :/
		for (AbstractPreferenceController controller : mControllers) {
		if (controller instanceof FaceSettingsAttentionPreferenceController) {
		@@ -309,8 +308,7 @@ public class FaceSettings extends DashboardFragment {
		return mControllers;
		}

		private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
		Lifecycle lifecycle) {
		private static List<AbstractPreferenceController> buildPreferenceControllers(Context context) {
		final List<AbstractPreferenceController> controllers = new ArrayList<>();
		controllers.add(new FaceSettingsKeyguardPreferenceController(context));
		controllers.add(new FaceSettingsAppPreferenceController(context));
		@@ -328,7 +326,7 @@ public class FaceSettings extends DashboardFragment {
		public List<AbstractPreferenceController> createPreferenceControllers(
		Context context) {
		if (isFaceHardwareDetected(context)) {
		return buildPreferenceControllers(context, null /* lifecycle */);
		return buildPreferenceControllers(context);
		} else {
		return null;
		}

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

+0 −5

Original line number	Diff line number	Diff line
		@@ -116,11 +116,6 @@ public class FaceSettingsAttentionPreferenceController extends FaceSettingsPrefe
		return true;
		}

		@Override
		public boolean isSliceable() {
		return false;
		}

		@Override
		public int getAvailabilityStatus() {
		return AVAILABLE;

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

+5 −0

Original line number	Diff line number	Diff line
		@@ -46,4 +46,9 @@ public abstract class FaceSettingsPreferenceController extends TogglePreferenceC
		return RestrictedLockUtilsInternal.checkIfKeyguardFeaturesDisabled(
		mContext, DevicePolicyManager.KEYGUARD_DISABLE_FACE, mUserId);
		}

		@Override
		public final boolean isSliceable() {
		return false;
		}
		}