diff --git a/src/com/android/settings/notification/zen/ZenModeAutomationSettings.java b/src/com/android/settings/notification/zen/ZenModeAutomationSettings.java index 5f317814b22..904b554e28d 100644 --- a/src/com/android/settings/notification/zen/ZenModeAutomationSettings.java +++ b/src/com/android/settings/notification/zen/ZenModeAutomationSettings.java @@ -30,18 +30,15 @@ import android.view.MenuItem; import androidx.fragment.app.Fragment; import com.android.settings.R; -import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.utils.ManagedServiceSettings; import com.android.settings.utils.ZenServiceListing; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; -import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.List; import java.util.Map; -@SearchIndexable public class ZenModeAutomationSettings extends ZenModeSettingsBase { public static final String DELETE = "DELETE_RULE"; protected final ManagedServiceSettings.Config CONFIG = getConditionProviderConfig(); @@ -133,25 +130,4 @@ public class ZenModeAutomationSettings extends ZenModeSettingsBase { return super.onOptionsItemSelected(item); } } - - /** - * For Search. - */ - public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider(R.xml.zen_mode_automation_settings) { - - @Override - public List getNonIndexableKeys(Context context) { - final List keys = super.getNonIndexableKeys(context); - keys.add(ZenModeAddAutomaticRulePreferenceController.KEY); - keys.add(ZenModeAutomaticRulesPreferenceController.KEY); - return keys; - } - - @Override - public List createPreferenceControllers( - Context context) { - return buildPreferenceControllers(context, null, null, null); - } - }; } diff --git a/src/com/android/settings/notification/zen/ZenModeBlockedEffectsSettings.java b/src/com/android/settings/notification/zen/ZenModeBlockedEffectsSettings.java index c2962dc83bc..2e5d33fca7a 100644 --- a/src/com/android/settings/notification/zen/ZenModeBlockedEffectsSettings.java +++ b/src/com/android/settings/notification/zen/ZenModeBlockedEffectsSettings.java @@ -29,16 +29,13 @@ import android.content.Context; import android.os.Bundle; import com.android.settings.R; -import com.android.settings.search.BaseSearchIndexProvider; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.search.Indexable; -import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.List; -@SearchIndexable public class ZenModeBlockedEffectsSettings extends ZenModeSettingsBase implements Indexable { @Override @@ -88,16 +85,4 @@ public class ZenModeBlockedEffectsSettings extends ZenModeSettingsBase implement public int getMetricsCategory() { return SettingsEnums.ZEN_WHAT_TO_BLOCK; } - - /** - * For Search. - */ - public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider(R.xml.zen_mode_block_settings) { - - @Override - public List createPreferenceControllers(Context context) { - return buildPreferenceControllers(context, null); - } - }; } diff --git a/src/com/android/settings/notification/zen/ZenModeBypassingAppsSettings.java b/src/com/android/settings/notification/zen/ZenModeBypassingAppsSettings.java index 89a80f06b6a..64489cb4e98 100644 --- a/src/com/android/settings/notification/zen/ZenModeBypassingAppsSettings.java +++ b/src/com/android/settings/notification/zen/ZenModeBypassingAppsSettings.java @@ -25,15 +25,12 @@ import androidx.fragment.app.Fragment; import com.android.settings.R; import com.android.settings.notification.NotificationBackend; -import com.android.settings.search.BaseSearchIndexProvider; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.search.Indexable; -import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.List; -@SearchIndexable public class ZenModeBypassingAppsSettings extends ZenModeSettingsBase implements Indexable { private final String TAG = "ZenBypassingApps"; @@ -74,17 +71,4 @@ public class ZenModeBypassingAppsSettings extends ZenModeSettingsBase implements public int getMetricsCategory() { return SettingsEnums.NOTIFICATION_ZEN_MODE_OVERRIDING_APPS; } - - /** - * For Search. - */ - public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider(R.xml.zen_mode_bypassing_apps) { - - @Override - public List createPreferenceControllers( - Context context) { - return buildPreferenceControllers(context, null, null, null); - } - }; } diff --git a/src/com/android/settings/notification/zen/ZenModeCallsSettings.java b/src/com/android/settings/notification/zen/ZenModeCallsSettings.java index 93e97b1d2cd..76c6fef50c8 100644 --- a/src/com/android/settings/notification/zen/ZenModeCallsSettings.java +++ b/src/com/android/settings/notification/zen/ZenModeCallsSettings.java @@ -18,14 +18,11 @@ package com.android.settings.notification.zen; import android.app.settings.SettingsEnums; import android.content.Context; -import android.provider.SearchIndexableResource; import com.android.settings.R; import com.android.settings.notification.NotificationBackend; -import com.android.settings.search.BaseSearchIndexProvider; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; -import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.List; @@ -33,7 +30,6 @@ import java.util.List; /** * DND Calls Settings page to determine which priority senders can bypass DND. */ -@SearchIndexable public class ZenModeCallsSettings extends ZenModeSettingsBase { @Override @@ -64,27 +60,4 @@ public class ZenModeCallsSettings extends ZenModeSettingsBase { public int getMetricsCategory() { return SettingsEnums.DND_CALLS; } - - /** - * For Search. - */ - public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider() { - @Override - public List getXmlResourcesToIndex(Context context, - boolean enabled) { - final ArrayList result = new ArrayList<>(); - - final SearchIndexableResource sir = new SearchIndexableResource(context); - sir.xmlResId = R.xml.zen_mode_calls_settings; - result.add(sir); - return result; - } - - @Override - public List createPreferenceControllers( - Context context) { - return buildPreferenceControllers(context, null); - } - }; } diff --git a/src/com/android/settings/notification/zen/ZenModeMessagesSettings.java b/src/com/android/settings/notification/zen/ZenModeMessagesSettings.java index 3405c435ba3..d05016e3a3a 100644 --- a/src/com/android/settings/notification/zen/ZenModeMessagesSettings.java +++ b/src/com/android/settings/notification/zen/ZenModeMessagesSettings.java @@ -18,14 +18,11 @@ package com.android.settings.notification.zen; import android.app.settings.SettingsEnums; import android.content.Context; -import android.provider.SearchIndexableResource; import com.android.settings.R; import com.android.settings.notification.NotificationBackend; -import com.android.settings.search.BaseSearchIndexProvider; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; -import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.List; @@ -34,7 +31,6 @@ import java.util.List; * DND Messages Settings page to determine which priority senders can bypass DND. * "Messages" include SMS, MMS, and messaging apps. */ -@SearchIndexable public class ZenModeMessagesSettings extends ZenModeSettingsBase { @Override @@ -62,27 +58,4 @@ public class ZenModeMessagesSettings extends ZenModeSettingsBase { public int getMetricsCategory() { return SettingsEnums.DND_MESSAGES; } - - /** - * For Search. - */ - public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider() { - @Override - public List getXmlResourcesToIndex(Context context, - boolean enabled) { - final ArrayList result = new ArrayList<>(); - - final SearchIndexableResource sir = new SearchIndexableResource(context); - sir.xmlResId = R.xml.zen_mode_messages_settings; - result.add(sir); - return result; - } - - @Override - public List createPreferenceControllers( - Context context) { - return buildPreferenceControllers(context, null); - } - }; } diff --git a/src/com/android/settings/notification/zen/ZenModePeopleSettings.java b/src/com/android/settings/notification/zen/ZenModePeopleSettings.java index 2b66482584b..ec491d8358a 100644 --- a/src/com/android/settings/notification/zen/ZenModePeopleSettings.java +++ b/src/com/android/settings/notification/zen/ZenModePeopleSettings.java @@ -26,16 +26,13 @@ import androidx.fragment.app.FragmentManager; import com.android.settings.R; import com.android.settings.notification.NotificationBackend; -import com.android.settings.search.BaseSearchIndexProvider; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.search.Indexable; -import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.List; -@SearchIndexable public class ZenModePeopleSettings extends ZenModeSettingsBase implements Indexable { @Override @@ -74,18 +71,4 @@ public class ZenModePeopleSettings extends ZenModeSettingsBase implements Indexa public int getMetricsCategory() { return SettingsEnums.DND_PEOPLE; } - - /** - * For Search. - */ - public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider(R.xml.zen_mode_people_settings) { - - @Override - public List createPreferenceControllers( - Context context) { - return buildPreferenceControllers(context, null, null, null, - null, null); - } - }; } diff --git a/src/com/android/settings/notification/zen/ZenModeRestrictNotificationsSettings.java b/src/com/android/settings/notification/zen/ZenModeRestrictNotificationsSettings.java index f121430738a..162f3a01aab 100644 --- a/src/com/android/settings/notification/zen/ZenModeRestrictNotificationsSettings.java +++ b/src/com/android/settings/notification/zen/ZenModeRestrictNotificationsSettings.java @@ -21,17 +21,14 @@ import android.content.Context; import android.os.Bundle; import com.android.settings.R; -import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settingslib.search.Indexable; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; -import com.android.settingslib.search.SearchIndexable; +import com.android.settingslib.search.Indexable; import com.android.settingslib.widget.FooterPreference; import java.util.ArrayList; import java.util.List; -@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC) public class ZenModeRestrictNotificationsSettings extends ZenModeSettingsBase implements Indexable { @Override @@ -72,16 +69,4 @@ public class ZenModeRestrictNotificationsSettings extends ZenModeSettingsBase im public int getMetricsCategory() { return SettingsEnums.SETTINGS_ZEN_NOTIFICATIONS; } - - /** - * For Search. - */ - public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider(R.xml.zen_mode_restrict_notifications_settings) { - - @Override - public List createPreferenceControllers(Context context) { - return buildPreferenceControllers(context, null); - } - }; } diff --git a/src/com/android/settings/notification/zen/ZenModeSettings.java b/src/com/android/settings/notification/zen/ZenModeSettings.java index a707e534d74..368528cd294 100644 --- a/src/com/android/settings/notification/zen/ZenModeSettings.java +++ b/src/com/android/settings/notification/zen/ZenModeSettings.java @@ -42,10 +42,8 @@ import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; import com.android.settings.R; -import com.android.settings.search.BaseSearchIndexProvider; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; -import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.HashMap; @@ -55,7 +53,6 @@ import java.util.Map; import java.util.Map.Entry; import java.util.function.Predicate; -@SearchIndexable public class ZenModeSettings extends ZenModeSettingsBase { @Override public void onResume() { @@ -354,25 +351,4 @@ public class ZenModeSettings extends ZenModeSettingsBase { return ""; } } - - /** - * For Search. - */ - public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider(R.xml.zen_mode_settings) { - - @Override - public List getNonIndexableKeys(Context context) { - List keys = super.getNonIndexableKeys(context); - keys.add(ZenModeDurationPreferenceController.KEY); - return keys; - } - - @Override - public List createPreferenceControllers(Context - context) { - return buildPreferenceControllers(context, null, null, - null, null); - } - }; } diff --git a/src/com/android/settings/notification/zen/ZenModeSoundVibrationSettings.java b/src/com/android/settings/notification/zen/ZenModeSoundVibrationSettings.java index 61e84fcb2c7..8863677533a 100644 --- a/src/com/android/settings/notification/zen/ZenModeSoundVibrationSettings.java +++ b/src/com/android/settings/notification/zen/ZenModeSoundVibrationSettings.java @@ -20,11 +20,9 @@ import android.app.settings.SettingsEnums; import android.content.Context; import com.android.settings.R; -import com.android.settings.search.BaseSearchIndexProvider; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.search.Indexable; -import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.List; @@ -32,7 +30,6 @@ import java.util.List; /** * Settings > Sound > Do Not Disturb > Alarms & Other Interruptions */ -@SearchIndexable public class ZenModeSoundVibrationSettings extends ZenModeSettingsBase implements Indexable { @Override @@ -61,22 +58,4 @@ public class ZenModeSoundVibrationSettings extends ZenModeSettingsBase implement public int getMetricsCategory() { return SettingsEnums.NOTIFICATION_ZEN_MODE_PRIORITY; } - - /** - * For Search. - */ - public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider(R.xml.zen_mode_sound_vibration_settings) { - - @Override - public List getNonIndexableKeys(Context context) { - final List keys = super.getNonIndexableKeys(context); - return keys; - } - - @Override - public List createPreferenceControllers(Context context) { - return buildPreferenceControllers(context, null); - } - }; } diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenModeSettingsTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModeSettingsTest.java index 27c4ec41774..22d69634cb9 100644 --- a/tests/robotests/src/com/android/settings/notification/zen/ZenModeSettingsTest.java +++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModeSettingsTest.java @@ -98,13 +98,4 @@ public class ZenModeSettingsTest { assertThat(mBuilder.getCallsSettingSummary(policy)) .isEqualTo("Starred contacts and repeat callers"); } - - @Test - public void searchProvider_shouldIndexDefaultXml() { - final List sir = ZenModeSettings.SEARCH_INDEX_DATA_PROVIDER - .getXmlResourcesToIndex(mContext, true /* enabled */); - - assertThat(sir).hasSize(1); - assertThat(sir.get(0).xmlResId).isEqualTo(R.xml.zen_mode_settings); - } }