Trim search query when initializing installed app searcher.

Change-Id: I502185d4b497b2edac32e4a8368be76d13b68259
Fix: 62885439
Test: make RunSettingsRoboTests
This commit is contained in:
Fan Zhang
2017-06-27 12:47:06 -07:00
parent 2b0ea1c710
commit fbcf4e6e14
5 changed files with 43 additions and 38 deletions

View File

@@ -20,8 +20,8 @@ package com.android.settings.search;
import android.content.Context;
import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
import android.support.annotation.VisibleForTesting;
import android.text.TextUtils;
import com.android.settings.dashboard.SiteMapManager;
import com.android.settings.utils.AsyncLoader;
@@ -97,7 +97,8 @@ public class DatabaseResultLoader extends AsyncLoader<Set<? extends SearchResult
*/
public static final int[] BASE_RANKS = {1, 3, 7, 9};
private final String mQueryText;
@VisibleForTesting
final String mQueryText;
private final Context mContext;
private final CursorToSearchResultConverter mConverter;
private final SiteMapManager mSiteMapManager;
@@ -106,7 +107,7 @@ public class DatabaseResultLoader extends AsyncLoader<Set<? extends SearchResult
super(context);
mSiteMapManager = mapManager;
mContext = context;
mQueryText = cleanQuery(queryText);
mQueryText = queryText;
mConverter = new CursorToSearchResultConverter(context);
}
@@ -136,18 +137,6 @@ public class DatabaseResultLoader extends AsyncLoader<Set<? extends SearchResult
return super.onCancelLoad();
}
/**
* A generic method to make the query suitable for searching the database.
*
* @return the cleaned query string
*/
private static String cleanQuery(String query) {
if (TextUtils.isEmpty(query)) {
return null;
}
return query.trim();
}
/**
* Creates and executes the query which matches prefixes of the first word of the given columns.
*