Merge "Limit searchability of combined biometric Settings" into sc-dev am: cf1f67e54f am: dca7bb5d4d

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15302136

Change-Id: I6149ef3fcf34d5bbf474cab29611ebb02a83f8f8
This commit is contained in:
TreeHugger Robot
2021-07-15 19:58:02 +00:00
committed by Automerger Merge Worker
3 changed files with 41 additions and 2 deletions

View File

@@ -61,5 +61,6 @@ public class CombinedBiometricProfileSettings extends BiometricsSettingsBase {
} }
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = 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);
} }

View File

@@ -0,0 +1,38 @@
/*
* 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);
}
}

View File

@@ -64,5 +64,5 @@ public class CombinedBiometricSettings extends BiometricsSettingsBase {
} }
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.security_settings_combined_biometric); new CombinedBiometricSearchIndexProvider(R.xml.security_settings_combined_biometric);
} }