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

11
src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
View File

@@ -522,22 +522,13 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
* For Search.
*/
public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider() {
new BaseSearchIndexProvider(R.xml.development_settings) {
@Override
protected boolean isPageSearchEnabled(Context context) {
return DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(context);
}
@Override
public List<SearchIndexableResource> getXmlResourcesToIndex(
Context context, boolean enabled) {
final SearchIndexableResource sir = new SearchIndexableResource(context);
sir.xmlResId = R.xml.development_settings;
return Arrays.asList(sir);
}
@Override
public List<AbstractPreferenceController> createPreferenceControllers(Context
context) {

11
src/com/android/settings/development/gamedriver/GameDriverDashboard.java
View File

@@ -76,16 +76,7 @@ public class GameDriverDashboard extends DashboardFragment {
}
public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider() {
@Override
public List<SearchIndexableResource> getXmlResourcesToIndex(
Context context, boolean enabled) {
final List<SearchIndexableResource> result = new ArrayList<>();
final SearchIndexableResource sir = new SearchIndexableResource(context);
sir.xmlResId = R.xml.game_driver_settings;
result.add(sir);
return result;
}
new BaseSearchIndexProvider(R.xml.game_driver_settings) {
@Override
protected boolean isPageSearchEnabled(Context context) {

12
src/com/android/settings/development/qstile/DevelopmentTileConfigFragment.java
View File

@@ -50,17 +50,7 @@ public class DevelopmentTileConfigFragment extends DashboardFragment {
}
public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider() {
@Override
public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
boolean enabled) {
final List<SearchIndexableResource> result = new ArrayList<>();
final SearchIndexableResource sir = new SearchIndexableResource(context);
sir.xmlResId = R.xml.development_tile_settings;
result.add(sir);
return result;
}
new BaseSearchIndexProvider(R.xml.development_tile_settings) {
@Override
protected boolean isPageSearchEnabled(Context context) {