summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/com/android/settings/SettingsActivity.java9
-rw-r--r--src/com/android/settings/dashboard/SearchResultsSummary.java5
2 files changed, 13 insertions, 1 deletions
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 0680762..b42f2d0 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/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,7 +1230,10 @@ public class SettingsActivity extends Activity
@Override
public boolean onQueryTextChange(String newText) {
mSearchQuery = newText;
- return false;
+ if (TextUtils.isEmpty(newText) && mSearchResultsFragment == null) {
+ return false;
+ }
+ return mSearchResultsFragment.onQueryTextChange(newText);
}
@Override
diff --git a/src/com/android/settings/dashboard/SearchResultsSummary.java b/src/com/android/settings/dashboard/SearchResultsSummary.java
index 94f3778..ba357d1 100644
--- a/src/com/android/settings/dashboard/SearchResultsSummary.java
+++ b/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;