Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f30b1cd authored by Raff Tsai's avatar Raff Tsai
Browse files

Merge similar BaseSearchIndexProvider code together 

Bug: 135053028
Test: robolectric, check search_index.db contains the same items
Change-Id: If3c18a170b0e671690df1fdf26e59a421d2c48cd
parent e84a8863

src/com/android/settings/DisplaySettings.java

+1 −11
Original line number Diff line number Diff line
@@ -98,17 +98,7 @@ public class DisplaySettings 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.display_settings;

                    result.add(sir);

                    return result;

                }

            new BaseSearchIndexProvider(R.xml.display_settings) {



                @Override

                public List<AbstractPreferenceController> createPreferenceControllers(

src/com/android/settings/accessibility/AccessibilityControlTimeoutPreferenceFragment.java

+1 −14
Original line number Diff line number Diff line
@@ -105,20 +105,7 @@ public final class AccessibilityControlTimeoutPreferenceFragment extends Dashboa 
    }



    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.accessibility_control_timeout_settings;

                    return Arrays.asList(sir);

                }



                @Override

                public List<String> getNonIndexableKeys(Context context) {

                    final List<String> keys = super.getNonIndexableKeys(context);

                    return keys;

                }

            new BaseSearchIndexProvider(R.xml.accessibility_control_timeout_settings) {



                @Override

                public List<AbstractPreferenceController> createPreferenceControllers(

src/com/android/settings/accessibility/AccessibilitySettings.java

+1 −12
Original line number Diff line number Diff line
@@ -507,16 +507,5 @@ public class AccessibilitySettings extends DashboardFragment { 
    }



    public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =

            new BaseSearchIndexProvider() {



                @Override

                public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,

                        boolean enabled) {

                    List<SearchIndexableResource> indexables = new ArrayList<>();

                    SearchIndexableResource indexable = new SearchIndexableResource(context);

                    indexable.xmlResId = R.xml.accessibility_settings;

                    indexables.add(indexable);

                    return indexables;

                }

            };

            new BaseSearchIndexProvider(R.xml.accessibility_settings);

}

src/com/android/settings/accessibility/MagnificationPreferenceFragment.java

+1 −8
Original line number Diff line number Diff line
@@ -168,14 +168,7 @@ public final class MagnificationPreferenceFragment extends DashboardFragment { 
    }



    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.accessibility_magnification_settings;

                    return Arrays.asList(sir);

                }

            new BaseSearchIndexProvider(R.xml.accessibility_magnification_settings) {



                @Override

                protected boolean isPageSearchEnabled(Context context) {

src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java

+1 −12
Original line number Diff line number Diff line
@@ -188,16 +188,5 @@ public class ToggleAutoclickPreferenceFragment extends ToggleFeaturePreferenceFr 
    }



    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.accessibility_autoclick_settings;

                    result.add(sir);

                    return result;

                }

            };

            new BaseSearchIndexProvider(R.xml.accessibility_autoclick_settings);

}