Merge "Limit searchability of combined biometric Settings" into sc-dev am: cf1f67e54f (0f7ba339) · Commits · e / os / android_packages_apps_Settings

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -61,5 +61,6 @@ public class CombinedBiometricProfileSettings extends BiometricsSettingsBase {
		}

		public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
		new BaseSearchIndexProvider(R.xml.security_settings_combined_biometric_profile);
		new CombinedBiometricSearchIndexProvider(
		R.xml.security_settings_combined_biometric_profile);
		}

0 → 100644

+38 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2021 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.settings.biometrics.combination;

		import android.content.Context;
		import android.content.pm.PackageManager;

		import com.android.settings.search.BaseSearchIndexProvider;

		/**
		* Settings search index provider for the multi-biometric settings pages.
		*/
		public class CombinedBiometricSearchIndexProvider extends BaseSearchIndexProvider {
		public CombinedBiometricSearchIndexProvider(int xmlRes) {
		super(xmlRes);
		}

		@Override
		protected boolean isPageSearchEnabled(Context context) {
		final PackageManager pm = context.getPackageManager();
		return pm.hasSystemFeature(PackageManager.FEATURE_FACE)
		&& pm.hasSystemFeature(PackageManager.FEATURE_FINGERPRINT);
		}
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -64,5 +64,5 @@ public class CombinedBiometricSettings extends BiometricsSettingsBase {
		}

		public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
		new BaseSearchIndexProvider(R.xml.security_settings_combined_biometric);
		new CombinedBiometricSearchIndexProvider(R.xml.security_settings_combined_biometric);
		}