PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "FR #14318673 Search - add synonyms"

Browse Source
This commit is contained in:
Fabrice Di Meglio
2014-07-10 22:09:04 +00:00
committed by Android (Google) Code Review
parent 0a3931d8fe e6b336d1a0
commit f7ef68712f
14 changed files with 141 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/search/Index.java
View File

@@ -128,7 +128,8 @@ public class Index {
private static final String[] MATCH_COLUMNS_PRIMARY = {
IndexColumns.DATA_TITLE,
IndexColumns.DATA_TITLE_NORMALIZED
IndexColumns.DATA_TITLE_NORMALIZED,
IndexColumns.DATA_KEYWORDS
};
private static final String[] MATCH_COLUMNS_SECONDARY = {
@@ -136,8 +137,7 @@ public class Index {
IndexColumns.DATA_SUMMARY_ON_NORMALIZED,
IndexColumns.DATA_SUMMARY_OFF,
IndexColumns.DATA_SUMMARY_OFF_NORMALIZED,
IndexColumns.DATA_ENTRIES,
IndexColumns.DATA_KEYWORDS
IndexColumns.DATA_ENTRIES
};
// Max number of saved search queries (who will be used for proposing suggestions)

1
src/com/android/settings/wifi/WifiSettings.java
View File

@@ -940,6 +940,7 @@ public class WifiSettings extends RestrictedSettingsFragment
SearchIndexableRaw data = new SearchIndexableRaw(context);
data.title = res.getString(R.string.wifi_settings);
data.screenTitle = res.getString(R.string.wifi_settings);
data.keywords = res.getString(R.string.keywords_wifi);
result.add(data);
// Add available Wi-Fi access points