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

Commit ac3e0d09 authored by Raff Tsai's avatar Raff Tsai
Browse files

Directly use BaseIndexableProvider 

- Add function getXmlResourceId, Fragments don't need to write
xml resource id twice.
- Remove getPreferenceControllers from Indexable.java. Because it will
move to SettingsLib later for other apps which don't need this function

Bug: 135053028
Test: robolectric
Change-Id: I1e74519aecdea3dde64a5aea79f08d766dbc0003
parent 5ff9517f

src/com/android/settings/DateTimeSettings.java

+3 −20
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import android.app.Dialog; 
import android.app.settings.SettingsEnums;

import android.content.Context;

import android.content.Intent;

import android.provider.SearchIndexableResource;



import com.android.settings.dashboard.DashboardFragment;

import com.android.settings.dashboard.SummaryLoader;
@@ -34,7 +33,6 @@ import com.android.settings.datetime.TimeFormatPreferenceController; 
import com.android.settings.datetime.TimePreferenceController;

import com.android.settings.datetime.TimeZonePreferenceController;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settings.search.Indexable;

import com.android.settingslib.core.AbstractPreferenceController;

import com.android.settingslib.datetime.ZoneGetter;

import com.android.settingslib.search.SearchIndexable;
@@ -64,7 +62,7 @@ public class DateTimeSettings extends DashboardFragment implements 


    @Override

    protected int getPreferenceScreenResId() {

        return R.xml.date_time_prefs;

        return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId();

    }



    @Override
@@ -176,21 +174,6 @@ public class DateTimeSettings extends DashboardFragment implements 
    };





    public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =

            new DateTimeSearchIndexProvider();



    private static class DateTimeSearchIndexProvider extends BaseSearchIndexProvider {



        @Override

        public List<SearchIndexableResource> getXmlResourcesToIndex(

                Context context, boolean enabled) {

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



            SearchIndexableResource sir = new SearchIndexableResource(context);

            sir.xmlResId = R.xml.date_time_prefs;

            result.add(sir);



            return result;

        }

    }

    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =

            new BaseSearchIndexProvider(R.xml.date_time_prefs);

}

src/com/android/settings/DisplaySettings.java

+2 −4
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.settings; 
import android.app.settings.SettingsEnums;

import android.content.Context;

import android.os.Bundle;

import android.provider.SearchIndexableResource;



import com.android.settings.dashboard.DashboardFragment;

import com.android.settings.display.BrightnessLevelPreferenceController;
@@ -35,7 +34,6 @@ import com.android.settings.display.ThemePreferenceController; 
import com.android.settings.display.TimeoutPreferenceController;

import com.android.settings.display.VrDisplayPreferenceController;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settings.search.Indexable;

import com.android.settingslib.core.AbstractPreferenceController;

import com.android.settingslib.core.lifecycle.Lifecycle;

import com.android.settingslib.search.SearchIndexable;
@@ -61,7 +59,7 @@ public class DisplaySettings extends DashboardFragment { 


    @Override

    protected int getPreferenceScreenResId() {

        return R.xml.display_settings;

        return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId();

    }



    @Override
@@ -97,7 +95,7 @@ public class DisplaySettings extends DashboardFragment { 
        return controllers;

    }



    public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =

    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =

            new BaseSearchIndexProvider(R.xml.display_settings) {



                @Override

src/com/android/settings/LegalSettings.java

+3 −18
Original line number Diff line number Diff line
@@ -17,17 +17,11 @@ 
package com.android.settings;



import android.app.settings.SettingsEnums;

import android.content.Context;

import android.provider.SearchIndexableResource;



import com.android.settings.dashboard.DashboardFragment;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settings.search.Indexable;

import com.android.settingslib.search.SearchIndexable;



import java.util.Arrays;

import java.util.List;



@SearchIndexable

public class LegalSettings extends DashboardFragment {
@@ -45,18 +39,9 @@ public class LegalSettings extends DashboardFragment { 


    @Override

    protected int getPreferenceScreenResId() {

        return R.xml.about_legal;

        return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId();

    }



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

                    return Arrays.asList(sir);

                }

            };

    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =

            new BaseSearchIndexProvider(R.xml.about_legal);

}

src/com/android/settings/TetherSettings.java

+1 −1
Original line number Diff line number Diff line
@@ -441,7 +441,7 @@ public class TetherSettings extends RestrictedSettingsFragment 
        }

    };



    public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =

    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =

            new BaseSearchIndexProvider() {

                @Override

                public List<SearchIndexableResource> getXmlResourcesToIndex(

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

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ public final class AccessibilityControlTimeoutPreferenceFragment extends Dashboa 
        return sControllers;

    }



    public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =

    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =

            new BaseSearchIndexProvider(R.xml.accessibility_control_timeout_settings) {



                @Override