Android/packages_apps_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

9
src/com/android/settings/security/LockscreenDashboardFragment.java
View File

@@ -131,14 +131,7 @@ public class LockscreenDashboardFragment 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.security_lockscreen_settings;
return Arrays.asList(sir);
}
new BaseSearchIndexProvider(R.xml.security_lockscreen_settings) {
@Override
public List<AbstractPreferenceController> createPreferenceControllers(

13
src/com/android/settings/security/SecuritySettings.java
View File

@@ -139,18 +139,7 @@ public class SecuritySettings extends DashboardFragment {
* For Search. Please keep it in sync when updating "createPreferenceHierarchy()"
*/
public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider() {
@Override
public List<SearchIndexableResource> getXmlResourcesToIndex(
Context context, boolean enabled) {
final List<SearchIndexableResource> index = new ArrayList<>();
// Append the rest of the settings
final SearchIndexableResource sir = new SearchIndexableResource(context);
sir.xmlResId = R.xml.security_dashboard_settings;
index.add(sir);
return index;
}
new BaseSearchIndexProvider(R.xml.security_dashboard_settings) {
@Override
public List<AbstractPreferenceController> createPreferenceControllers(Context

12
src/com/android/settings/security/screenlock/ScreenLockSettings.java
View File

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

12
src/com/android/settings/security/trustagent/TrustAgentSettings.java
View File

@@ -54,15 +54,5 @@ public class TrustAgentSettings 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.trust_agent_settings;
result.add(sir);
return result;
}
};
new BaseSearchIndexProvider(R.xml.trust_agent_settings);
}