Merge "Fix bug #14323469 Settings crash on selecting keyword from recent searches ... after changing orientation"

src/com/android/settings/SettingsActivity.java

@@ -410,6 +410,10 @@ public class SettingsActivity extends Activity
             return false;
         }
 
+        if (mSearchResultsFragment != null) {
+            mSearchResultsFragment.setSearchView(mSearchView);
+        }
+
         mSearchMenuItem.setOnActionExpandListener(this);
         mSearchView.setOnQueryTextListener(this);
         mSearchView.setOnCloseListener(this);

src/com/android/settings/dashboard/SearchResultsSummary.java

@@ -51,6 +51,8 @@ public class SearchResultsSummary extends Fragment {
     private static final String EMPTY_QUERY = "";
     private static char ELLIPSIS = '\u2026';
 
+    private static final String SAVE_KEY_SHOW_ONLY_RESULTS = ":settings:show_only_results";
+
     private SearchView mSearchView;
 
     private ListView mResultsListView;
@@ -66,6 +68,8 @@ public class SearchResultsSummary extends Fragment {
 
     private String mQuery;
 
+    private boolean mShowOnlyResults;
+
     /**
      * A basic AsyncTask for updating the query results cursor
      */
@@ -110,6 +114,17 @@ public class SearchResultsSummary extends Fragment {
 
         mResultsAdapter = new SearchResultsAdapter(getActivity());
         mSuggestionsAdapter = new SuggestionsAdapter(getActivity());
+
+        if (savedInstanceState != null) {
+            mShowOnlyResults = savedInstanceState.getBoolean(SAVE_KEY_SHOW_ONLY_RESULTS);
+        }
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+
+        outState.putBoolean(SAVE_KEY_SHOW_ONLY_RESULTS, mShowOnlyResults);
     }
 
     @Override
@@ -197,6 +212,7 @@ public class SearchResultsSummary extends Fragment {
                 mQuery = cursor.getString(0);
                 mSearchView.setQuery(mQuery, false);
                 setSuggestionsVisibility(false);
+                mShowOnlyResults = true;
             }
         });
 
@@ -207,8 +223,10 @@ public class SearchResultsSummary extends Fragment {
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
+        if (!mShowOnlyResults) {
             showSomeSuggestions();
         }
+    }
 
     public void setSearchView(SearchView searchView) {
         mSearchView = searchView;
@@ -232,13 +250,30 @@ public class SearchResultsSummary extends Fragment {
 
     public boolean onQueryTextSubmit(String query) {
         mQuery = getFilteredQueryString(query);
+        setSuggestionsVisibility(!mShowOnlyResults);
         updateSearchResults();
         return true;
     }
 
     public boolean onQueryTextChange(String query) {
-        mQuery = getFilteredQueryString(query);
+        final String newQuery = getFilteredQueryString(query);
+
+        boolean isNewQuery;
+        if (!TextUtils.isEmpty(mQuery)) {
+            isNewQuery = !mQuery.equals(query);
+        } else {
+            isNewQuery = !TextUtils.isEmpty(query);
+        }
+
+        mQuery = newQuery;
+
+        if (isNewQuery) {
+            mShowOnlyResults = false;
+        }
+        if (!mShowOnlyResults) {
             updateSuggestions();
+        }
+
         updateSearchResults();
         return true;
     }