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

Commit d48189c5 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use SettingsLib Indexable"

parents d6d299a4 966fa014

src/com/android/settings/DateTimeSettings.java

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ public class DateTimeSettings extends DashboardFragment implements 


    @Override

    protected int getPreferenceScreenResId() {

        return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId();

        return R.xml.date_time_prefs;

    }



    @Override

src/com/android/settings/DisplaySettings.java

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ public class DisplaySettings extends DashboardFragment { 


    @Override

    protected int getPreferenceScreenResId() {

        return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId();

        return R.xml.display_settings;

    }



    @Override

src/com/android/settings/LegalSettings.java

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ public class LegalSettings extends DashboardFragment { 


    @Override

    protected int getPreferenceScreenResId() {

        return SEARCH_INDEX_DATA_PROVIDER.getXmlResourceId();

        return R.xml.about_legal;

    }



    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =

src/com/android/settings/SettingsPreferenceFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ import androidx.recyclerview.widget.RecyclerView; 


import com.android.settings.core.InstrumentedPreferenceFragment;

import com.android.settings.core.instrumentation.InstrumentedDialogFragment;

import com.android.settings.search.Indexable;

import com.android.settings.search.actionbar.SearchMenuController;

import com.android.settings.support.actionbar.HelpMenuController;

import com.android.settings.support.actionbar.HelpResourceProvider;
@@ -53,6 +52,7 @@ import com.android.settings.widget.LoadingViewController; 
import com.android.settingslib.CustomDialogPreferenceCompat;

import com.android.settingslib.CustomEditTextPreferenceCompat;

import com.android.settingslib.core.instrumentation.Instrumentable;

import com.android.settingslib.search.Indexable;

import com.android.settingslib.widget.LayoutPreference;



import java.util.UUID;

src/com/android/settings/TetherSettings.java

+0 −1
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ import androidx.preference.SwitchPreference; 


import com.android.settings.datausage.DataSaverBackend;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settings.search.Indexable;

import com.android.settings.wifi.tether.WifiTetherPreferenceController;

import com.android.settingslib.TetherUtil;

import com.android.settingslib.search.SearchIndexable;