Merge "Search - add "live" search results"

src/com/android/settings/SettingsActivity.java

@@ -616,6 +616,10 @@ public class SettingsActivity extends Activity
         registerReceiver(mBatteryInfoReceiver, new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
 
         mDynamicIndexableContentMonitor.register(this);
+
+        if(!TextUtils.isEmpty(mSearchQuery)) {
+            onQueryTextSubmit(mSearchQuery);
+        }
     }
 
     @Override
@@ -1226,8 +1230,11 @@ public class SettingsActivity extends Activity
     @Override
     public boolean onQueryTextChange(String newText) {
         mSearchQuery = newText;
+        if (TextUtils.isEmpty(newText) && mSearchResultsFragment == null) {
             return false;
         }
+        return mSearchResultsFragment.onQueryTextChange(newText);
+    }
 
     @Override
     public boolean onClose() {

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

@@ -151,6 +151,11 @@ public class SearchResultsSummary extends Fragment {
         return true;
     }
 
+    public boolean onQueryTextChange(String query) {
+        updateSearchResults(query);
+        return true;
+    }
+
     public boolean onClose() {
         clearResults();
         return false;