Merge "Added SearchIndexable to FP pref controller" into main

This commit is contained in:
Joshua Mccloskey
2023-09-25 20:23:43 +00:00
committed by Android (Google) Code Review

View File

@@ -24,12 +24,16 @@ import android.provider.Settings;
import androidx.preference.Preference; import androidx.preference.Preference;
import com.android.internal.annotations.VisibleForTesting; import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.R;
import com.android.settings.Utils; import com.android.settings.Utils;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.SearchIndexable;
/** /**
* Preference controller that controls whether a SFPS device is required to be interactive for * Preference controller that controls whether a SFPS device is required to be interactive for
* fingerprint authentication to unlock the device. * fingerprint authentication to unlock the device.
*/ */
@SearchIndexable
public class FingerprintSettingsRequireScreenOnToAuthPreferenceController public class FingerprintSettingsRequireScreenOnToAuthPreferenceController
extends FingerprintSettingsPreferenceController { extends FingerprintSettingsPreferenceController {
private static final String TAG = private static final String TAG =
@@ -104,4 +108,6 @@ public class FingerprintSettingsRequireScreenOnToAuthPreferenceController
return UserHandle.of(getUserId()).getIdentifier(); return UserHandle.of(getUserId()).getIdentifier();
} }
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.security_settings_fingerprint) {};
} }