diff --git a/src/com/cherish/settings/fragments/About.java b/src/com/cherish/settings/fragments/About.java index ce080fe..e76ab31 100644 --- a/src/com/cherish/settings/fragments/About.java +++ b/src/com/cherish/settings/fragments/About.java @@ -28,11 +28,16 @@ import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; import androidx.preference.Preference.OnPreferenceChangeListener; import android.provider.Settings; - import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import com.android.internal.logging.nano.MetricsProto; +import com.android.settings.search.BaseSearchIndexProvider; +import com.android.settingslib.search.SearchIndexable; +import android.provider.SearchIndexableResource; +import java.util.ArrayList; +import java.util.List; +@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC) public class About extends SettingsPreferenceFragment implements Preference.OnPreferenceChangeListener { @@ -63,5 +68,30 @@ public class About extends SettingsPreferenceFragment implements public boolean onPreferenceChange(Preference preference, Object objValue) { return false; } + + /** + * For Search. + */ + + public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + new BaseSearchIndexProvider() { + + @Override + public List getXmlResourcesToIndex(Context context, + boolean enabled) { + ArrayList result = + new ArrayList(); + SearchIndexableResource sir = new SearchIndexableResource(context); + sir.xmlResId = R.xml.cherish_about; + result.add(sir); + return result; + } + + @Override + public List getNonIndexableKeys(Context context) { + List keys = super.getNonIndexableKeys(context); + return keys; + } + }; } diff --git a/src/com/cherish/settings/fragments/AnimationsSettings.java b/src/com/cherish/settings/fragments/AnimationsSettings.java index 6d8afce..a7a8531 100644 --- a/src/com/cherish/settings/fragments/AnimationsSettings.java +++ b/src/com/cherish/settings/fragments/AnimationsSettings.java @@ -43,11 +43,15 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.cherish.settings.preferences.CustomSeekBarPreference; +import com.android.settings.search.BaseSearchIndexProvider; +import com.android.settingslib.search.SearchIndexable; +import android.provider.SearchIndexableResource; + import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; import java.util.List; - +@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC) public class AnimationsSettings extends SettingsPreferenceFragment implements OnPreferenceChangeListener { @@ -161,4 +165,29 @@ public class AnimationsSettings extends SettingsPreferenceFragment } return false; } + +/** + * For Search. + */ + + public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + new BaseSearchIndexProvider() { + + @Override + public List getXmlResourcesToIndex(Context context, + boolean enabled) { + ArrayList result = + new ArrayList(); + SearchIndexableResource sir = new SearchIndexableResource(context); + sir.xmlResId = R.xml.cherish_settings_animations; + result.add(sir); + return result; + } + + @Override + public List getNonIndexableKeys(Context context) { + List keys = super.getNonIndexableKeys(context); + return keys; + } + }; } \ No newline at end of file diff --git a/src/com/cherish/settings/fragments/BatteryLightSettings.java b/src/com/cherish/settings/fragments/BatteryLightSettings.java index b3718b6..54740d5 100644 --- a/src/com/cherish/settings/fragments/BatteryLightSettings.java +++ b/src/com/cherish/settings/fragments/BatteryLightSettings.java @@ -16,6 +16,7 @@ package com.cherish.settings.fragments; import android.content.ContentResolver; +import android.content.Context; import android.content.res.Resources; import android.os.Bundle; import android.os.UserHandle; @@ -30,9 +31,14 @@ import com.android.internal.logging.nano.MetricsProto; import com.cherish.settings.preferences.SystemSettingSwitchPreference; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; +import com.android.settings.search.BaseSearchIndexProvider; +import com.android.settingslib.search.SearchIndexable; +import android.provider.SearchIndexableResource; +import java.util.ArrayList; +import java.util.List; import net.margaritov.preference.colorpicker.ColorPickerPreference; - +@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC) public class BatteryLightSettings extends SettingsPreferenceFragment implements Preference.OnPreferenceChangeListener { @@ -139,4 +145,29 @@ public class BatteryLightSettings extends SettingsPreferenceFragment implements } return false; } + + /** + * For Search. + */ + + public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + new BaseSearchIndexProvider() { + + @Override + public List getXmlResourcesToIndex(Context context, + boolean enabled) { + ArrayList result = + new ArrayList(); + SearchIndexableResource sir = new SearchIndexableResource(context); + sir.xmlResId = R.xml.battery_light_settings; + result.add(sir); + return result; + } + + @Override + public List getNonIndexableKeys(Context context) { + List keys = super.getNonIndexableKeys(context); + return keys; + } + }; } diff --git a/src/com/cherish/settings/fragments/ButtonSettings.java b/src/com/cherish/settings/fragments/ButtonSettings.java index f24fd76..d4edc60 100644 --- a/src/com/cherish/settings/fragments/ButtonSettings.java +++ b/src/com/cherish/settings/fragments/ButtonSettings.java @@ -42,6 +42,14 @@ import com.android.internal.util.hwkeys.ActionUtils; import com.cherish.settings.preferences.CustomSeekBarPreference; import com.cherish.settings.preferences.ActionFragment; + +import com.android.settings.search.BaseSearchIndexProvider; +import com.android.settingslib.search.SearchIndexable; +import android.provider.SearchIndexableResource; + +import java.util.ArrayList; +import java.util.List; +@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC) public class ButtonSettings extends ActionFragment implements OnPreferenceChangeListener { //Keys @@ -289,5 +297,30 @@ public class ButtonSettings extends ActionFragment implements OnPreferenceChange public int getMetricsCategory() { return MetricsProto.MetricsEvent.CHERISH_SETTINGS; } + + /** + * For Search. + */ + + public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + new BaseSearchIndexProvider() { + + @Override + public List getXmlResourcesToIndex(Context context, + boolean enabled) { + ArrayList result = + new ArrayList(); + SearchIndexableResource sir = new SearchIndexableResource(context); + sir.xmlResId = R.xml.cherish_settings_button; + result.add(sir); + return result; + } + + @Override + public List getNonIndexableKeys(Context context) { + List keys = super.getNonIndexableKeys(context); + return keys; + } + }; } diff --git a/src/com/cherish/settings/fragments/ClockSettings.java b/src/com/cherish/settings/fragments/ClockSettings.java index 002af3c..11c69e7 100644 --- a/src/com/cherish/settings/fragments/ClockSettings.java +++ b/src/com/cherish/settings/fragments/ClockSettings.java @@ -46,8 +46,15 @@ import com.cherish.settings.preferences.CustomSeekBarPreference; import net.margaritov.preference.colorpicker.ColorPickerPreference; import com.android.internal.logging.nano.MetricsProto; +import com.android.settings.search.BaseSearchIndexProvider; +import com.android.settingslib.search.SearchIndexable; +import android.provider.SearchIndexableResource; + +import java.util.ArrayList; +import java.util.List; import java.util.Date; +@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC) public class ClockSettings extends SettingsPreferenceFragment implements OnPreferenceChangeListener { @@ -337,6 +344,31 @@ public class ClockSettings extends SettingsPreferenceFragment implements } mClockDateFormat.setEntries(parsedDateEntries); } + + /** + * For Search. + */ + + public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + new BaseSearchIndexProvider() { + + @Override + public List getXmlResourcesToIndex(Context context, + boolean enabled) { + ArrayList result = + new ArrayList(); + SearchIndexableResource sir = new SearchIndexableResource(context); + sir.xmlResId = R.xml.clock_settings; + result.add(sir); + return result; + } + + @Override + public List getNonIndexableKeys(Context context) { + List keys = super.getNonIndexableKeys(context); + return keys; + } + }; } diff --git a/src/com/cherish/settings/fragments/CustomCarrierLabel.java b/src/com/cherish/settings/fragments/CustomCarrierLabel.java index 35d63be..4cc083f 100644 --- a/src/com/cherish/settings/fragments/CustomCarrierLabel.java +++ b/src/com/cherish/settings/fragments/CustomCarrierLabel.java @@ -17,6 +17,7 @@ package com.cherish.settings.fragments; import android.app.AlertDialog; import android.content.ContentResolver; +import android.content.Context; import android.content.DialogInterface; import android.content.DialogInterface.OnCancelListener; import android.content.Intent; @@ -38,6 +39,14 @@ import net.margaritov.preference.colorpicker.ColorPickerPreference; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; +import com.android.settings.search.BaseSearchIndexProvider; +import com.android.settingslib.search.SearchIndexable; +import android.provider.SearchIndexableResource; + +import java.util.ArrayList; +import java.util.List; + +@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC) public class CustomCarrierLabel extends SettingsPreferenceFragment implements Preference.OnPreferenceChangeListener { @@ -151,4 +160,29 @@ public class CustomCarrierLabel extends SettingsPreferenceFragment mCustomCarrierLabel.setSummary(mCustomCarrierLabelText); } } + + /** + * For Search. + */ + + public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + new BaseSearchIndexProvider() { + + @Override + public List getXmlResourcesToIndex(Context context, + boolean enabled) { + ArrayList result = + new ArrayList(); + SearchIndexableResource sir = new SearchIndexableResource(context); + sir.xmlResId = R.xml.custom_carrier_label; + result.add(sir); + return result; + } + + @Override + public List getNonIndexableKeys(Context context) { + List keys = super.getNonIndexableKeys(context); + return keys; + } + }; } diff --git a/src/com/cherish/settings/fragments/GestureSettings.java b/src/com/cherish/settings/fragments/GestureSettings.java index 9008855..7bfda28 100644 --- a/src/com/cherish/settings/fragments/GestureSettings.java +++ b/src/com/cherish/settings/fragments/GestureSettings.java @@ -3,6 +3,7 @@ package com.cherish.settings.fragments; import com.android.internal.logging.nano.MetricsProto; import android.os.Bundle; +import android.content.Context; import android.provider.Settings; import androidx.preference.Preference; import androidx.preference.ListPreference; @@ -10,7 +11,14 @@ import androidx.preference.ListPreference; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; +import com.android.settings.search.BaseSearchIndexProvider; +import com.android.settingslib.search.SearchIndexable; +import android.provider.SearchIndexableResource; +import java.util.ArrayList; +import java.util.List; + +@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC) public class GestureSettings extends SettingsPreferenceFragment implements Preference.OnPreferenceChangeListener { @@ -54,5 +62,30 @@ public class GestureSettings extends SettingsPreferenceFragment implements public int getMetricsCategory() { return MetricsProto.MetricsEvent.CHERISH_SETTINGS; } + + /** + * For Search. + */ + + public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + new BaseSearchIndexProvider() { + + @Override + public List getXmlResourcesToIndex(Context context, + boolean enabled) { + ArrayList result = + new ArrayList(); + SearchIndexableResource sir = new SearchIndexableResource(context); + sir.xmlResId = R.xml.cherish_settings_gestures; + result.add(sir); + return result; + } + + @Override + public List getNonIndexableKeys(Context context) { + List keys = super.getNonIndexableKeys(context); + return keys; + } + }; } diff --git a/src/com/cherish/settings/fragments/HeadsUpSettings.java b/src/com/cherish/settings/fragments/HeadsUpSettings.java index 3ca3db0..31c1420 100644 --- a/src/com/cherish/settings/fragments/HeadsUpSettings.java +++ b/src/com/cherish/settings/fragments/HeadsUpSettings.java @@ -18,6 +18,7 @@ package com.cherish.settings.fragments; import android.app.AlertDialog; import android.app.Dialog; +import android.content.Context; import android.content.DialogInterface; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; @@ -42,11 +43,16 @@ import com.cherish.settings.preferences.PackageListAdapter; import com.cherish.settings.preferences.PackageListAdapter.PackageItem; import android.provider.Settings; +import com.android.settings.search.BaseSearchIndexProvider; +import com.android.settingslib.search.SearchIndexable; +import android.provider.SearchIndexableResource; + import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC) public class HeadsUpSettings extends SettingsPreferenceFragment implements Preference.OnPreferenceClickListener { @@ -340,6 +346,31 @@ public class HeadsUpSettings extends SettingsPreferenceFragment Settings.System.putString(getContentResolver(), setting, value); } + + /** + * For Search. + */ + + public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + new BaseSearchIndexProvider() { + + @Override + public List getXmlResourcesToIndex(Context context, + boolean enabled) { + ArrayList result = + new ArrayList(); + SearchIndexableResource sir = new SearchIndexableResource(context); + sir.xmlResId = R.xml.heads_up_settings; + result.add(sir); + return result; + } + + @Override + public List getNonIndexableKeys(Context context) { + List keys = super.getNonIndexableKeys(context); + return keys; + } + }; } diff --git a/src/com/cherish/settings/fragments/LockColors.java b/src/com/cherish/settings/fragments/LockColors.java index 051be65..a8701e6 100644 --- a/src/com/cherish/settings/fragments/LockColors.java +++ b/src/com/cherish/settings/fragments/LockColors.java @@ -43,7 +43,14 @@ import com.android.settings.SettingsPreferenceFragment; import com.android.internal.logging.nano.MetricsProto; import net.margaritov.preference.colorpicker.ColorPickerPreference; +import com.android.settings.search.BaseSearchIndexProvider; +import com.android.settingslib.search.SearchIndexable; +import android.provider.SearchIndexableResource; +import java.util.ArrayList; +import java.util.List; + +@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC) public class LockColors extends SettingsPreferenceFragment implements Preference.OnPreferenceChangeListener { private static final String TAG = "LockscreenColors"; @@ -318,4 +325,29 @@ public class LockColors extends SettingsPreferenceFragment implements Preference public int getMetricsCategory() { return MetricsProto.MetricsEvent.CHERISH_SETTINGS; } + + /** + * For Search. + */ + + public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + new BaseSearchIndexProvider() { + + @Override + public List getXmlResourcesToIndex(Context context, + boolean enabled) { + ArrayList result = + new ArrayList(); + SearchIndexableResource sir = new SearchIndexableResource(context); + sir.xmlResId = R.xml.lock_colors; + result.add(sir); + return result; + } + + @Override + public List getNonIndexableKeys(Context context) { + List keys = super.getNonIndexableKeys(context); + return keys; + } + }; } diff --git a/src/com/cherish/settings/fragments/LockScreenSettings.java b/src/com/cherish/settings/fragments/LockScreenSettings.java index c785e31..6b5a277 100644 --- a/src/com/cherish/settings/fragments/LockScreenSettings.java +++ b/src/com/cherish/settings/fragments/LockScreenSettings.java @@ -44,7 +44,14 @@ import com.cherish.settings.preferences.CustomSeekBarPreference; import com.cherish.settings.preferences.SecureSettingListPreference; import com.cherish.settings.preferences.SystemSettingSwitchPreference; import com.cherish.settings.preferences.SystemSettingListPreference; +import com.android.settings.search.BaseSearchIndexProvider; +import com.android.settingslib.search.SearchIndexable; +import android.provider.SearchIndexableResource; +import java.util.ArrayList; +import java.util.List; + +@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC) public class LockScreenSettings extends SettingsPreferenceFragment implements Preference.OnPreferenceChangeListener { @@ -168,5 +175,30 @@ public class LockScreenSettings extends SettingsPreferenceFragment implements public int getMetricsCategory() { return MetricsProto.MetricsEvent.CHERISH_SETTINGS; } + + /** + * For Search. + */ + + public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + new BaseSearchIndexProvider() { + + @Override + public List getXmlResourcesToIndex(Context context, + boolean enabled) { + ArrayList result = + new ArrayList(); + SearchIndexableResource sir = new SearchIndexableResource(context); + sir.xmlResId = R.xml.cherish_settings_lockscreen; + result.add(sir); + return result; + } + + @Override + public List getNonIndexableKeys(Context context) { + List keys = super.getNonIndexableKeys(context); + return keys; + } + }; } \ No newline at end of file diff --git a/src/com/cherish/settings/fragments/Maintainers.java b/src/com/cherish/settings/fragments/Maintainers.java index 4922fd1..ed80eb6 100644 --- a/src/com/cherish/settings/fragments/Maintainers.java +++ b/src/com/cherish/settings/fragments/Maintainers.java @@ -32,7 +32,14 @@ import android.provider.Settings; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import com.android.internal.logging.nano.MetricsProto; +import com.android.settings.search.BaseSearchIndexProvider; +import com.android.settingslib.search.SearchIndexable; +import android.provider.SearchIndexableResource; +import java.util.ArrayList; +import java.util.List; + +@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC) public class Maintainers extends SettingsPreferenceFragment implements Preference.OnPreferenceChangeListener { @@ -63,5 +70,30 @@ public class Maintainers extends SettingsPreferenceFragment implements public boolean onPreferenceChange(Preference preference, Object objValue) { return false; } + + /** + * For Search. + */ + + public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + new BaseSearchIndexProvider() { + + @Override + public List getXmlResourcesToIndex(Context context, + boolean enabled) { + ArrayList result = + new ArrayList(); + SearchIndexableResource sir = new SearchIndexableResource(context); + sir.xmlResId = R.xml.cherish_maintainers; + result.add(sir); + return result; + } + + @Override + public List getNonIndexableKeys(Context context) { + List keys = super.getNonIndexableKeys(context); + return keys; + } + }; } diff --git a/src/com/cherish/settings/fragments/MiscSettings.java b/src/com/cherish/settings/fragments/MiscSettings.java index 5379dac..2067b85 100644 --- a/src/com/cherish/settings/fragments/MiscSettings.java +++ b/src/com/cherish/settings/fragments/MiscSettings.java @@ -34,6 +34,14 @@ import com.android.settings.SettingsPreferenceFragment; import com.cherish.settings.preferences.SystemSettingMasterSwitchPreference; import com.cherish.settings.preferences.SystemSettingListPreference; import com.cherish.settings.preferences.SecureSettingSwitchPreference; +import com.android.settings.search.BaseSearchIndexProvider; +import com.android.settingslib.search.SearchIndexable; +import android.provider.SearchIndexableResource; + +import java.util.ArrayList; +import java.util.List; + +@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC) public class MiscSettings extends SettingsPreferenceFragment implements OnPreferenceChangeListener { @@ -197,4 +205,29 @@ public class MiscSettings extends SettingsPreferenceFragment implements public int getMetricsCategory() { return MetricsProto.MetricsEvent.CHERISH_SETTINGS; } + + /** + * For Search. + */ + + public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + new BaseSearchIndexProvider() { + + @Override + public List getXmlResourcesToIndex(Context context, + boolean enabled) { + ArrayList result = + new ArrayList(); + SearchIndexableResource sir = new SearchIndexableResource(context); + sir.xmlResId = R.xml.cherish_settings_misc; + result.add(sir); + return result; + } + + @Override + public List getNonIndexableKeys(Context context) { + List keys = super.getNonIndexableKeys(context); + return keys; + } + }; } diff --git a/src/com/cherish/settings/fragments/PowerMenuSettings.java b/src/com/cherish/settings/fragments/PowerMenuSettings.java index c903821..bdd7f12 100644 --- a/src/com/cherish/settings/fragments/PowerMenuSettings.java +++ b/src/com/cherish/settings/fragments/PowerMenuSettings.java @@ -35,12 +35,15 @@ import androidx.annotation.NonNull; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.SettingsPreferenceFragment; +import com.android.settings.search.BaseSearchIndexProvider; +import com.android.settingslib.search.SearchIndexable; +import android.provider.SearchIndexableResource; import java.util.Arrays; import java.util.ArrayList; import java.util.List; - +@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC) public class PowerMenuSettings extends SettingsPreferenceFragment implements Preference.OnPreferenceChangeListener { @@ -80,5 +83,30 @@ public class PowerMenuSettings extends SettingsPreferenceFragment public int getMetricsCategory() { return MetricsProto.MetricsEvent.CHERISH_SETTINGS; } + + /** + * For Search. + */ + + public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + new BaseSearchIndexProvider() { + + @Override + public List getXmlResourcesToIndex(Context context, + boolean enabled) { + ArrayList result = + new ArrayList(); + SearchIndexableResource sir = new SearchIndexableResource(context); + sir.xmlResId = R.xml.cherish_settings_power; + result.add(sir); + return result; + } + + @Override + public List getNonIndexableKeys(Context context) { + List keys = super.getNonIndexableKeys(context); + return keys; + } + }; } diff --git a/src/com/cherish/settings/fragments/QsHeader.java b/src/com/cherish/settings/fragments/QsHeader.java index df59d34..7c46b9b 100644 --- a/src/com/cherish/settings/fragments/QsHeader.java +++ b/src/com/cherish/settings/fragments/QsHeader.java @@ -17,6 +17,7 @@ package com.cherish.settings.fragments; import android.app.Activity; import android.content.ContentResolver; +import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; @@ -33,6 +34,9 @@ import com.android.settings.SettingsPreferenceFragment; import com.cherish.settings.preferences.CustomSeekBarPreference; import com.cherish.settings.preferences.SystemSettingSwitchPreference; +import com.android.settings.search.BaseSearchIndexProvider; +import com.android.settingslib.search.SearchIndexable; +import android.provider.SearchIndexableResource; import java.util.ArrayList; import java.util.Collections; @@ -40,6 +44,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC) public class QsHeader extends SettingsPreferenceFragment implements Preference.OnPreferenceChangeListener{ @@ -224,4 +229,29 @@ public class QsHeader extends SettingsPreferenceFragment public int getMetricsCategory() { return MetricsProto.MetricsEvent.CHERISH_SETTINGS; } + + /** + * For Search. + */ + + public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + new BaseSearchIndexProvider() { + + @Override + public List getXmlResourcesToIndex(Context context, + boolean enabled) { + ArrayList result = + new ArrayList(); + SearchIndexableResource sir = new SearchIndexableResource(context); + sir.xmlResId = R.xml.qs_header; + result.add(sir); + return result; + } + + @Override + public List getNonIndexableKeys(Context context) { + List keys = super.getNonIndexableKeys(context); + return keys; + } + }; } diff --git a/src/com/cherish/settings/fragments/QuickSettings.java b/src/com/cherish/settings/fragments/QuickSettings.java index ae21629..e9322df 100644 --- a/src/com/cherish/settings/fragments/QuickSettings.java +++ b/src/com/cherish/settings/fragments/QuickSettings.java @@ -8,6 +8,7 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.os.UserHandle; import android.content.ContentResolver; +import android.content.Context; import android.content.res.Resources; import androidx.preference.ListPreference; import androidx.preference.Preference; @@ -26,9 +27,13 @@ import com.cherish.settings.preferences.SystemSettingSwitchPreference; import com.cherish.settings.preferences.SystemSettingListPreference; import com.cherish.settings.preferences.SystemSettingEditTextPreference; import com.cherish.settings.preferences.SystemSettingMasterSwitchPreference; +import com.android.settings.search.BaseSearchIndexProvider; +import com.android.settingslib.search.SearchIndexable; +import android.provider.SearchIndexableResource; import java.util.List; import java.util.ArrayList; +@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC) public class QuickSettings extends SettingsPreferenceFragment implements OnPreferenceChangeListener { @@ -68,5 +73,30 @@ public class QuickSettings extends SettingsPreferenceFragment implements public int getMetricsCategory() { return MetricsProto.MetricsEvent.CHERISH_SETTINGS; } + + /** + * For Search. + */ + + public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + new BaseSearchIndexProvider() { + + @Override + public List getXmlResourcesToIndex(Context context, + boolean enabled) { + ArrayList result = + new ArrayList(); + SearchIndexableResource sir = new SearchIndexableResource(context); + sir.xmlResId = R.xml.cherish_settings_quicksettings; + result.add(sir); + return result; + } + + @Override + public List getNonIndexableKeys(Context context) { + List keys = super.getNonIndexableKeys(context); + return keys; + } + }; } diff --git a/src/com/cherish/settings/fragments/RecentsSettings.java b/src/com/cherish/settings/fragments/RecentsSettings.java index f7380a3..989cd2a 100644 --- a/src/com/cherish/settings/fragments/RecentsSettings.java +++ b/src/com/cherish/settings/fragments/RecentsSettings.java @@ -16,13 +16,20 @@ import androidx.preference.Preference.OnPreferenceChangeListener; import androidx.preference.SwitchPreference; import android.provider.Settings; import com.android.settings.R; - +import com.android.settings.search.BaseSearchIndexProvider; +import com.android.settingslib.search.SearchIndexable; +import android.provider.SearchIndexableResource; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; import java.util.Arrays; import java.util.HashSet; import com.cherish.settings.preferences.SystemSettingMasterSwitchPreference; import com.android.settings.SettingsPreferenceFragment; +@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC) public class RecentsSettings extends SettingsPreferenceFragment implements OnPreferenceChangeListener { @@ -48,4 +55,29 @@ public class RecentsSettings extends SettingsPreferenceFragment implements public int getMetricsCategory() { return MetricsProto.MetricsEvent.CHERISH_SETTINGS; } + + /** + * For Search. + */ + + public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + new BaseSearchIndexProvider() { + + @Override + public List getXmlResourcesToIndex(Context context, + boolean enabled) { + ArrayList result = + new ArrayList(); + SearchIndexableResource sir = new SearchIndexableResource(context); + sir.xmlResId = R.xml.cherish_settings_recents; + result.add(sir); + return result; + } + + @Override + public List getNonIndexableKeys(Context context) { + List keys = super.getNonIndexableKeys(context); + return keys; + } + }; } \ No newline at end of file diff --git a/src/com/cherish/settings/fragments/StatusBarSettings.java b/src/com/cherish/settings/fragments/StatusBarSettings.java index d757ac4..f396529 100644 --- a/src/com/cherish/settings/fragments/StatusBarSettings.java +++ b/src/com/cherish/settings/fragments/StatusBarSettings.java @@ -8,6 +8,7 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.os.UserHandle; import android.content.ContentResolver; +import android.content.Context; import android.content.res.Resources; import androidx.preference.ListPreference; import androidx.preference.Preference; @@ -33,6 +34,9 @@ import com.cherish.settings.preferences.SystemSettingMasterSwitchPreference; import com.android.settings.Utils; import com.android.internal.util.cherish.CherishUtils; import android.util.Log; +import com.android.settings.search.BaseSearchIndexProvider; +import com.android.settingslib.search.SearchIndexable; +import android.provider.SearchIndexableResource; import java.util.List; import java.util.ArrayList; @@ -40,6 +44,7 @@ import java.util.Map; import java.util.HashMap; import java.util.Collections; +@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC) public class StatusBarSettings extends SettingsPreferenceFragment implements OnPreferenceChangeListener { @@ -88,5 +93,30 @@ public class StatusBarSettings extends SettingsPreferenceFragment implements public int getMetricsCategory() { return MetricsProto.MetricsEvent.CHERISH_SETTINGS; } + + /** + * For Search. + */ + + public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + new BaseSearchIndexProvider() { + + @Override + public List getXmlResourcesToIndex(Context context, + boolean enabled) { + ArrayList result = + new ArrayList(); + SearchIndexableResource sir = new SearchIndexableResource(context); + sir.xmlResId = R.xml.cherish_settings_statusbar; + result.add(sir); + return result; + } + + @Override + public List getNonIndexableKeys(Context context) { + List keys = super.getNonIndexableKeys(context); + return keys; + } + }; } \ No newline at end of file diff --git a/src/com/cherish/settings/fragments/StatusbarLogo.java b/src/com/cherish/settings/fragments/StatusbarLogo.java index b371bad..a00a2d9 100644 --- a/src/com/cherish/settings/fragments/StatusbarLogo.java +++ b/src/com/cherish/settings/fragments/StatusbarLogo.java @@ -28,7 +28,14 @@ import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; +import com.android.settings.search.BaseSearchIndexProvider; +import com.android.settingslib.search.SearchIndexable; +import android.provider.SearchIndexableResource; +import java.util.ArrayList; +import java.util.List; + +@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC) public class StatusbarLogo extends SettingsPreferenceFragment implements OnPreferenceChangeListener { @@ -52,4 +59,29 @@ public class StatusbarLogo extends SettingsPreferenceFragment implements public int getMetricsCategory() { return MetricsProto.MetricsEvent.CHERISH_SETTINGS; } + + /** + * For Search. + */ + + public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + new BaseSearchIndexProvider() { + + @Override + public List getXmlResourcesToIndex(Context context, + boolean enabled) { + ArrayList result = + new ArrayList(); + SearchIndexableResource sir = new SearchIndexableResource(context); + sir.xmlResId = R.xml.statusbar_logo; + result.add(sir); + return result; + } + + @Override + public List getNonIndexableKeys(Context context) { + List keys = super.getNonIndexableKeys(context); + return keys; + } + }; } \ No newline at end of file diff --git a/src/com/cherish/settings/fragments/ThemeSettings.java b/src/com/cherish/settings/fragments/ThemeSettings.java index 2031a66..4947d59 100644 --- a/src/com/cherish/settings/fragments/ThemeSettings.java +++ b/src/com/cherish/settings/fragments/ThemeSettings.java @@ -42,7 +42,7 @@ import com.android.settings.SettingsPreferenceFragment; import java.util.Locale; import android.text.TextUtils; import android.view.View; - +import android.provider.SearchIndexableResource; import java.util.List; import java.util.ArrayList; import java.util.Objects; @@ -52,6 +52,7 @@ import com.android.internal.util.cherish.CherishUtils; import com.cherish.settings.preferences.SystemSettingListPreference; import net.margaritov.preference.colorpicker.ColorPickerPreference; +@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC) public class ThemeSettings extends SettingsPreferenceFragment implements OnPreferenceChangeListener { private static final String BRIGHTNESS_SLIDER_STYLE = "brightness_slider_style"; @@ -370,4 +371,29 @@ private int getOverlayPosition(String[] overlays) { public int getMetricsCategory() { return MetricsProto.MetricsEvent.CHERISH_SETTINGS; } + + /** + * For Search. + */ + + public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + new BaseSearchIndexProvider() { + + @Override + public List getXmlResourcesToIndex(Context context, + boolean enabled) { + ArrayList result = + new ArrayList(); + SearchIndexableResource sir = new SearchIndexableResource(context); + sir.xmlResId = R.xml.cherish_settings_theme; + result.add(sir); + return result; + } + + @Override + public List getNonIndexableKeys(Context context) { + List keys = super.getNonIndexableKeys(context); + return keys; + } + }; } \ No newline at end of file diff --git a/src/com/cherish/settings/fragments/Traffic.java b/src/com/cherish/settings/fragments/Traffic.java index be36bc4..3832463 100644 --- a/src/com/cherish/settings/fragments/Traffic.java +++ b/src/com/cherish/settings/fragments/Traffic.java @@ -36,7 +36,13 @@ import android.view.WindowManagerGlobal; import android.view.IWindowManager; import java.util.regex.Matcher; import java.util.regex.Pattern; - +import com.android.settings.search.BaseSearchIndexProvider; +import com.android.settingslib.search.SearchIndexable; +import android.provider.SearchIndexableResource; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; import java.util.Locale; import android.text.TextUtils; import android.view.View; @@ -50,6 +56,7 @@ import com.cherish.settings.preferences.CustomSeekBarPreference; import com.cherish.settings.preferences.SystemSettingSwitchPreference; import com.cherish.settings.preferences.SystemSettingListPreference; +@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC) public class Traffic extends SettingsPreferenceFragment implements OnPreferenceChangeListener { private static final String NETWORK_TRAFFIC_FONT_SIZE = "network_traffic_font_size"; @@ -196,4 +203,29 @@ public class Traffic extends SettingsPreferenceFragment implements OnPreferenceC break; } } + + /** + * For Search. + */ + + public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + new BaseSearchIndexProvider() { + + @Override + public List getXmlResourcesToIndex(Context context, + boolean enabled) { + ArrayList result = + new ArrayList(); + SearchIndexableResource sir = new SearchIndexableResource(context); + sir.xmlResId = R.xml.traffic; + result.add(sir); + return result; + } + + @Override + public List getNonIndexableKeys(Context context) { + List keys = super.getNonIndexableKeys(context); + return keys; + } + }; } diff --git a/src/com/cherish/settings/fragments/Visualizer.java b/src/com/cherish/settings/fragments/Visualizer.java index 0f44d8e..66808ee 100644 --- a/src/com/cherish/settings/fragments/Visualizer.java +++ b/src/com/cherish/settings/fragments/Visualizer.java @@ -35,7 +35,15 @@ import com.android.settings.SettingsPreferenceFragment; import android.widget.Switch; import com.android.settings.SettingsActivity; import com.android.settings.widget.SwitchBar; +import com.android.settings.search.BaseSearchIndexProvider; +import com.android.settingslib.search.SearchIndexable; +import android.provider.SearchIndexableResource; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC) public class Visualizer extends SettingsPreferenceFragment implements OnPreferenceChangeListener, SwitchBar.OnSwitchChangeListener { @@ -126,4 +134,29 @@ public class Visualizer extends SettingsPreferenceFragment implements public int getMetricsCategory() { return MetricsEvent.CHERISH_SETTINGS; } + + /** + * For Search. + */ + + public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + new BaseSearchIndexProvider() { + + @Override + public List getXmlResourcesToIndex(Context context, + boolean enabled) { + ArrayList result = + new ArrayList(); + SearchIndexableResource sir = new SearchIndexableResource(context); + sir.xmlResId = R.xml.visualizer_settings; + result.add(sir); + return result; + } + + @Override + public List getNonIndexableKeys(Context context) { + List keys = super.getNonIndexableKeys(context); + return keys; + } + }; } diff --git a/src/com/cherish/settings/fragments/VolumeRockerSettings.java b/src/com/cherish/settings/fragments/VolumeRockerSettings.java index a32311e..f66180f 100644 --- a/src/com/cherish/settings/fragments/VolumeRockerSettings.java +++ b/src/com/cherish/settings/fragments/VolumeRockerSettings.java @@ -1,7 +1,7 @@ package com.cherish.settings.fragments; import com.android.internal.logging.nano.MetricsProto; - +import android.content.Context; import android.os.Bundle; import androidx.preference.ListPreference; import androidx.preference.Preference; @@ -11,7 +11,15 @@ import android.provider.Settings.SettingNotFoundException; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; +import com.android.settings.search.BaseSearchIndexProvider; +import com.android.settingslib.search.SearchIndexable; +import android.provider.SearchIndexableResource; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC) public class VolumeRockerSettings extends SettingsPreferenceFragment implements Preference.OnPreferenceChangeListener { @@ -56,4 +64,29 @@ public class VolumeRockerSettings extends SettingsPreferenceFragment implements public int getMetricsCategory() { return MetricsProto.MetricsEvent.CHERISH_SETTINGS; } + + /** + * For Search. + */ + + public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + new BaseSearchIndexProvider() { + + @Override + public List getXmlResourcesToIndex(Context context, + boolean enabled) { + ArrayList result = + new ArrayList(); + SearchIndexableResource sir = new SearchIndexableResource(context); + sir.xmlResId = R.xml.cherish_settings_volume; + result.add(sir); + return result; + } + + @Override + public List getNonIndexableKeys(Context context) { + List keys = super.getNonIndexableKeys(context); + return keys; + } + }; }