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

Commit 34483748 authored by Fabrice Di Meglio's avatar Fabrice Di Meglio
Browse files

Fix bug #14324070 Settings search does not include any of wifi sub-settings 

- add AdvancedWifiSettings to the Index
- bump the database version to force a re-indexing at the first start

Change-Id: I45aacfe6e0bb38a1209ea8dd2c4ccf0f1b90a526
parent 075a2963

src/com/android/settings/search/IndexDatabaseHelper.java

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ public class IndexDatabaseHelper extends SQLiteOpenHelper { 
    private static final String TAG = "IndexDatabaseHelper";



    private static final String DATABASE_NAME = "search_index.db";

    private static final int DATABASE_VERSION = 112;

    private static final int DATABASE_VERSION = 113;



    public interface Tables {

        public static final String TABLE_PREFS_INDEX = "prefs_index";

src/com/android/settings/search/SearchIndexableResources.java

+7 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ import com.android.settings.notification.NotificationSettings; 
import com.android.settings.notification.ZenModeSettings;

import com.android.settings.print.PrintSettingsFragment;

import com.android.settings.users.UserSettings;

import com.android.settings.wifi.AdvancedWifiSettings;

import com.android.settings.wifi.WifiSettings;



import java.util.Collection;
@@ -82,6 +83,12 @@ public final class SearchIndexableResources { 
                        WifiSettings.class.getName(),

                        R.drawable.ic_settings_wireless));



        sResMap.put(WifiSettings.class.getName(),

                new SearchIndexableResource(RANK_WIFI,

                        R.xml.wifi_advanced_settings,

                        AdvancedWifiSettings.class.getName(),

                        R.drawable.ic_settings_wireless));



        sResMap.put(BluetoothSettings.class.getName(),

                new SearchIndexableResource(RANK_BT,

                        NO_DATA_RES_ID,