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

Commit 45f754e5 authored by Fabrice Di Meglio's avatar Fabrice Di Meglio
Browse files

Add Indexable.SearchIndexProvider.getNonIndexableKeys(Context) 

- getNonIndexableKeys(Context) allow a SearchIndexProvider to tell which data
he does not want to index by providing a list of the data keys
- use this new API for SoundSettings and removing KEY_EMERGENCY_TONE related
settings if the device is not CDMA
- add a BaseSearchIndexProvider for code simplification

Change-Id: I23633ace1d7e390ee05fac0a5458a33e04e72d8d
parent a9d37050

src/com/android/settings/DataUsageSummary.java

+2 −9
Original line number Diff line number Diff line
@@ -86,7 +86,6 @@ import android.os.ServiceManager; 
import android.os.SystemProperties;

import android.os.UserHandle;

import android.preference.Preference;

import android.provider.SearchIndexableResource;

import android.telephony.TelephonyManager;

import android.text.TextUtils;

import android.text.format.DateUtils;
@@ -134,6 +133,7 @@ import com.android.settings.net.NetworkPolicyEditor; 
import com.android.settings.net.SummaryForAllUidLoader;

import com.android.settings.net.UidDetail;

import com.android.settings.net.UidDetailProvider;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settings.search.Indexable;

import com.android.settings.search.SearchIndexableRaw;

import com.android.settings.widget.ChartDataUsageView;
@@ -2388,14 +2388,7 @@ public class DataUsageSummary extends Fragment implements Indexable { 
     * For search

     */

    public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =

        new SearchIndexProvider() {



            @Override

            public List<SearchIndexableResource> getXmlResourcesToIndex(

                    Context context, boolean enabled) {

                return null;

            }



        new BaseSearchIndexProvider() {

            @Override

            public List<SearchIndexableRaw> getRawDataToIndex(Context context, boolean enabled) {

                final List<SearchIndexableRaw> result = new ArrayList<SearchIndexableRaw>();

src/com/android/settings/SoundSettings.java

+22 −1
Original line number Diff line number Diff line
@@ -47,11 +47,14 @@ import android.provider.MediaStore; 
import android.provider.Settings;

import android.telephony.TelephonyManager;

import android.util.Log;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settings.search.Indexable;



import java.util.ArrayList;

import java.util.List;



public class SoundSettings extends SettingsPreferenceFragment implements

        Preference.OnPreferenceChangeListener {

        Preference.OnPreferenceChangeListener, Indexable {

    private static final String TAG = "SoundSettings";



    private static final int DIALOG_NOT_DOCKED = 1;
@@ -446,5 +449,23 @@ public class SoundSettings extends SettingsPreferenceFragment implements 
        ab.setPositiveButton(android.R.string.ok, null);

        return ab.create();

    }



    public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =

        new BaseSearchIndexProvider() {

            @Override

            public List<String> getNonIndexableKeys(Context context) {

                final List<String> keys = new ArrayList<String>();



                int activePhoneType = TelephonyManager.getDefault().getCurrentPhoneType();



                if (TelephonyManager.PHONE_TYPE_CDMA != activePhoneType) {

                    // device is not CDMA, do not display CDMA emergency_tone

                    keys.add(KEY_EMERGENCY_TONE);

                }



                return keys;

            }

        };



}

src/com/android/settings/WallpaperTypeSettings.java

+2 −8
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ import android.content.pm.ResolveInfo; 
import android.os.Bundle;

import android.preference.Preference;

import android.preference.PreferenceScreen;

import android.provider.SearchIndexableResource;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settings.search.Indexable;

import com.android.settings.search.SearchIndexableRaw;
@@ -65,13 +65,7 @@ public class WallpaperTypeSettings extends SettingsPreferenceFragment implements 
    }



    public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =

        new SearchIndexProvider() {

            @Override

            public List<SearchIndexableResource> getXmlResourcesToIndex(

                    Context context, boolean enabled) {

                return null;

            }



        new BaseSearchIndexProvider() {

            @Override

            public List<SearchIndexableRaw> getRawDataToIndex(Context context, boolean enabled) {

                final List<SearchIndexableRaw> result = new ArrayList<SearchIndexableRaw>();

src/com/android/settings/ZenModeSettings.java

+2 −9
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ import android.os.AsyncTask; 
import android.os.Bundle;

import android.os.Handler;

import android.provider.Settings.Global;

import android.provider.SearchIndexableResource;

import android.util.Log;

import android.util.TypedValue;

import android.view.Gravity;
@@ -45,6 +44,7 @@ import android.widget.RelativeLayout; 
import android.widget.ScrollView;

import android.widget.Switch;

import android.widget.TextView;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settings.search.Indexable;

import com.android.settings.search.SearchIndexableRaw;
@@ -292,14 +292,7 @@ public class ZenModeSettings extends SettingsPreferenceFragment implements Index 


    // Enable indexing of searchable data

    public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =

        new Indexable.SearchIndexProvider() {



            @Override

            public List<SearchIndexableResource> getXmlResourcesToIndex(

                    Context context, boolean enabled) {

                return null;

            }



        new BaseSearchIndexProvider() {

            @Override

            public List<SearchIndexableRaw> getRawDataToIndex(Context context, boolean enabled) {

                final List<SearchIndexableRaw> result = new ArrayList<SearchIndexableRaw>();

src/com/android/settings/bluetooth/BluetoothSettings.java

+2 −9
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ import android.preference.Preference; 
import android.preference.PreferenceCategory;

import android.preference.PreferenceGroup;

import android.preference.PreferenceScreen;

import android.provider.SearchIndexableResource;

import android.util.Log;

import android.view.Gravity;

import android.view.Menu;
@@ -44,6 +43,7 @@ import android.widget.TextView; 


import com.android.settings.R;

import com.android.settings.SettingsActivity;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settings.search.Indexable;

import com.android.settings.search.SearchIndexableRaw;
@@ -418,14 +418,7 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment implem 
    }



    public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =

        new SearchIndexProvider() {



            @Override

            public List<SearchIndexableResource> getXmlResourcesToIndex(

                    Context context, boolean enabled) {

                return null;

            }



        new BaseSearchIndexProvider() {

            @Override

            public List<SearchIndexableRaw> getRawDataToIndex(Context context, boolean enabled) {