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

9
src/com/android/settings/notification/ConfigureNotificationSettings.java
View File

@@ -218,14 +218,7 @@ public class ConfigureNotificationSettings extends DashboardFragment implements
* For Search.
*/
public static final Indexable.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.configure_notification_settings;
return Arrays.asList(sir);
}
new BaseSearchIndexProvider(R.xml.configure_notification_settings) {
@Override
public List<AbstractPreferenceController> createPreferenceControllers(

13
src/com/android/settings/notification/NotificationAccessSettings.java
View File

@@ -191,16 +191,5 @@ public class NotificationAccessSettings extends ManagedServiceSettings {
}
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.notification_access_settings;
result.add(sir);
return result;
}
};
new BaseSearchIndexProvider(R.xml.notification_access_settings);
}

13
src/com/android/settings/notification/NotificationAssistantPicker.java
View File

@@ -129,18 +129,7 @@ public class NotificationAssistantPicker extends DefaultAppPickerFragment implem
}
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.notification_assistant_settings;
result.add(sir);
return result;
}
};
new BaseSearchIndexProvider(R.xml.notification_assistant_settings);
public static class CandidateNone extends CandidateInfo {

9
src/com/android/settings/notification/SoundSettings.java
View File

@@ -286,14 +286,7 @@ public class SoundSettings extends DashboardFragment implements OnActivityResult
// === Indexing ===
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider() {
public List<SearchIndexableResource> getXmlResourcesToIndex(
Context context, boolean enabled) {
final SearchIndexableResource sir = new SearchIndexableResource(context);
sir.xmlResId = R.xml.sound_settings;
return Arrays.asList(sir);
}
new BaseSearchIndexProvider(R.xml.sound_settings) {
@Override
public List<AbstractPreferenceController> createPreferenceControllers(

13
src/com/android/settings/notification/ZenAccessSettings.java
View File

@@ -160,16 +160,5 @@ public class ZenAccessSettings extends EmptyTextSettings implements
}
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.zen_access_settings;
result.add(sir);
return result;
}
};
new BaseSearchIndexProvider(R.xml.zen_access_settings);
}

13
src/com/android/settings/notification/ZenModeAutomationSettings.java
View File

@@ -149,18 +149,7 @@ public class ZenModeAutomationSettings extends ZenModeSettingsBase {
* For Search.
*/
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.zen_mode_automation_settings;
result.add(sir);
return result;
}
new BaseSearchIndexProvider(R.xml.zen_mode_automation_settings) {
@Override
public List<String> getNonIndexableKeys(Context context) {

12
src/com/android/settings/notification/ZenModeBlockedEffectsSettings.java
View File

@@ -94,17 +94,7 @@ public class ZenModeBlockedEffectsSettings extends ZenModeSettingsBase implement
* For Search.
*/
public static final 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.zen_mode_block_settings;
result.add(sir);
return result;
}
new BaseSearchIndexProvider(R.xml.zen_mode_block_settings) {
@Override
public List<AbstractPreferenceController> createPreferenceControllers(Context context) {

13
src/com/android/settings/notification/ZenModeBypassingAppsSettings.java
View File

@@ -76,18 +76,7 @@ public class ZenModeBypassingAppsSettings extends ZenModeSettingsBase implements
* For Search.
*/
public static final 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.zen_mode_bypassing_apps;
result.add(sir);
return result;
}
new BaseSearchIndexProvider(R.xml.zen_mode_bypassing_apps) {
@Override
public List<AbstractPreferenceController> createPreferenceControllers(

13
src/com/android/settings/notification/ZenModeCallsSettings.java
View File

@@ -68,18 +68,7 @@ public class ZenModeCallsSettings extends ZenModeSettingsBase implements Indexab
* For Search.
*/
public static final 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.zen_mode_calls_settings;
result.add(sir);
return result;
}
new BaseSearchIndexProvider(R.xml.zen_mode_calls_settings) {
@Override
public List<AbstractPreferenceController> createPreferenceControllers(

13
src/com/android/settings/notification/ZenModeMessagesSettings.java
View File

@@ -65,18 +65,7 @@ public class ZenModeMessagesSettings extends ZenModeSettingsBase implements Inde
* For Search.
*/
public static final 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.zen_mode_messages_settings;
result.add(sir);
return result;
}
new BaseSearchIndexProvider(R.xml.zen_mode_messages_settings) {
@Override
public List<AbstractPreferenceController> createPreferenceControllers(

12
src/com/android/settings/notification/ZenModeRestrictNotificationsSettings.java
View File

@@ -78,17 +78,7 @@ public class ZenModeRestrictNotificationsSettings extends ZenModeSettingsBase im
* For Search.
*/
public static final 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.zen_mode_restrict_notifications_settings;
result.add(sir);
return result;
}
new BaseSearchIndexProvider(R.xml.zen_mode_restrict_notifications_settings) {
@Override
public List<AbstractPreferenceController> createPreferenceControllers(Context context) {

10
src/com/android/settings/notification/ZenModeSettings.java
View File

@@ -314,15 +314,7 @@ public class ZenModeSettings extends ZenModeSettingsBase {
* For Search.
*/
public static final Indexable.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.zen_mode_settings;
return Arrays.asList(sir);
}
new BaseSearchIndexProvider(R.xml.zen_mode_settings) {
@Override
public List<String> getNonIndexableKeys(Context context) {

13
src/com/android/settings/notification/ZenModeSoundVibrationSettings.java
View File

@@ -71,18 +71,7 @@ public class ZenModeSoundVibrationSettings extends ZenModeSettingsBase implement
* For Search.
*/
public static final 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.zen_mode_sound_vibration_settings;
result.add(sir);
return result;
}
new BaseSearchIndexProvider(R.xml.zen_mode_sound_vibration_settings) {
@Override
public List<String> getNonIndexableKeys(Context context) {