Misc search fix
- Remove incorrect summary from set date/time - Remove some unused resources - Remove ability to clear individual search history - Add remove all query history menu item Change-Id: I4383d075310297163fd2206d1a5b9c8f4ed94078 Fix: 62741488 Fix: 31589605 Test: robotests
This commit is contained in:
@@ -21,12 +21,16 @@ import android.app.LoaderManager;
|
||||
import android.content.Context;
|
||||
import android.content.Loader;
|
||||
import android.os.Bundle;
|
||||
import android.view.Menu;
|
||||
import android.view.MenuItem;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.overlay.FeatureFactory;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class SavedQueryController implements LoaderManager.LoaderCallbacks {
|
||||
public class SavedQueryController implements LoaderManager.LoaderCallbacks,
|
||||
MenuItem.OnMenuItemClickListener {
|
||||
|
||||
// TODO: make a generic background task manager to handle one-off tasks like this one.
|
||||
|
||||
@@ -35,6 +39,8 @@ public class SavedQueryController implements LoaderManager.LoaderCallbacks {
|
||||
private static final int LOADER_ID_SAVED_QUERIES = 2;
|
||||
private static final String ARG_QUERY = "remove_query";
|
||||
|
||||
private static final int MENU_SEARCH_HISTORY = 1000;
|
||||
|
||||
private final Context mContext;
|
||||
private final LoaderManager mLoaderManager;
|
||||
private final SearchFeatureProvider mSearchFeatureProvider;
|
||||
@@ -55,7 +61,7 @@ public class SavedQueryController implements LoaderManager.LoaderCallbacks {
|
||||
case LOADER_ID_SAVE_QUERY_TASK:
|
||||
return new SavedQueryRecorder(mContext, args.getString(ARG_QUERY));
|
||||
case LOADER_ID_REMOVE_QUERY_TASK:
|
||||
return new SavedQueryRemover(mContext, args.getString(ARG_QUERY));
|
||||
return new SavedQueryRemover(mContext);
|
||||
case LOADER_ID_SAVED_QUERIES:
|
||||
return mSearchFeatureProvider.getSavedQueryLoader(mContext);
|
||||
}
|
||||
@@ -76,7 +82,21 @@ public class SavedQueryController implements LoaderManager.LoaderCallbacks {
|
||||
|
||||
@Override
|
||||
public void onLoaderReset(Loader loader) {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onMenuItemClick(MenuItem item) {
|
||||
if (item.getItemId() != MENU_SEARCH_HISTORY) {
|
||||
return false;
|
||||
}
|
||||
removeQueries();
|
||||
return true;
|
||||
}
|
||||
|
||||
public void buildMenuItem(Menu menu) {
|
||||
final MenuItem item =
|
||||
menu.add(Menu.NONE, MENU_SEARCH_HISTORY, Menu.NONE, R.string.search_clear_history);
|
||||
item.setOnMenuItemClickListener(this);
|
||||
}
|
||||
|
||||
public void saveQuery(String query) {
|
||||
@@ -85,9 +105,11 @@ public class SavedQueryController implements LoaderManager.LoaderCallbacks {
|
||||
mLoaderManager.restartLoader(LOADER_ID_SAVE_QUERY_TASK, args, this);
|
||||
}
|
||||
|
||||
public void removeQuery(String query) {
|
||||
/**
|
||||
* Remove all saved queries from DB
|
||||
*/
|
||||
public void removeQueries() {
|
||||
final Bundle args = new Bundle();
|
||||
args.putString(ARG_QUERY, query);
|
||||
mLoaderManager.restartLoader(LOADER_ID_REMOVE_QUERY_TASK, args, this);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user