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

Search only matches prefixes rather than any substring

Browse Source 
Test: make RunSettingsRoboTests
Change-Id: I4da7e4c75c461fad96dedf5277ddba02e067928d
Bug: 34688403
This commit is contained in:
Matthew Fritze
2017-01-24 16:25:11 -08:00
parent a1bae0ad7e
commit 314b09eb4b
2 changed files with 90 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/com/android/settings/search2/DatabaseResultLoader.java
View File

@@ -141,9 +141,7 @@ public class DatabaseResultLoader extends AsyncLoader<List<SearchResult>> {
private List<SearchResult> query(String[] matchColumns, int baseRank) {
final String whereClause = buildWhereClause(matchColumns);
final String[] selection = new String[matchColumns.length];
final String query = "%" + mQueryText + "%";
Arrays.fill(selection, query);
final String[] selection = buildQuerySelection(matchColumns.length * 2);
final Cursor resultCursor = mDatabase.query(TABLE_PREFS_INDEX, SELECT_COLUMNS, whereClause,
selection, null, null, null);
@@ -169,6 +167,8 @@ public class DatabaseResultLoader extends AsyncLoader<List<SearchResult>> {
StringBuilder sb = new StringBuilder(" (");
final int count = matchColumns.length;
for (int n = 0; n < count; n++) {
sb.append(matchColumns[n]);
sb.append(" like ? OR ");
sb.append(matchColumns[n]);
sb.append(" like ?");
if (n < count - 1) {
@@ -178,4 +178,23 @@ public class DatabaseResultLoader extends AsyncLoader<List<SearchResult>> {
sb.append(") AND enabled = 1");
return sb.toString();
}
/**
* Fills out the selection array to match the query as the prefix of a word.
*
* @param size is twice the number of columns to be matched. The first match is for the prefix
* of the first word in the column. The second match is for any subsequent word
* prefix match.
*/
private String[] buildQuerySelection(int size) {
String[] selection = new String[size];
final String query = mQueryText + "%";
final String subStringQuery = "% " + mQueryText + "%";
for(int i = 0; i < (size - 1); i += 2) {
selection[i] = query;
selection[i + 1] = subStringQuery;
}
return selection;
}
}