PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge similar BaseSearchIndexProvider code together

Browse Source 
Bug: 135053028
Test: robolectric, check search_index.db contains the same items
Change-Id: If3c18a170b0e671690df1fdf26e59a421d2c48cd
This commit is contained in:
Raff Tsai
2019-09-12 10:56:13 +08:00
parent e84a8863d5
commit 1f30b1cd67
75 changed files with 86 additions and 744 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/backup/BackupSettingsFragment.java
View File

@@ -71,8 +71,7 @@ public class BackupSettingsFragment extends DashboardFragment {
// The intention is to index {@link UserBackupSettingsActivity} instead of the fragments,
// therefore leaving this index provider empty.
public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider() {
};
new BaseSearchIndexProvider();
@Override
public int getMetricsCategory() {

9
src/com/android/settings/backup/PrivacySettings.java
View File

@@ -72,14 +72,7 @@ public class PrivacySettings extends DashboardFragment {
}
public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider() {
@Override
public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
boolean enabled) {
final SearchIndexableResource sir = new SearchIndexableResource(context);
sir.xmlResId = R.xml.privacy_settings;
return Arrays.asList(sir);
}
new BaseSearchIndexProvider(R.xml.privacy_settings) {
@Override
protected boolean isPageSearchEnabled(Context context) {