summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Android (Google) Code Review <android-gerrit@google.com> 2009-07-20 14:35:10 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2009-07-20 14:35:10 -0700
commit2acbec4918db4ab6eca32cf427ffd771c9efe35f (patch)
treed56e2ef46fbade0b43ae5c7281a6a7b0877723ae
parent9ff71d38a060476ba19deacf12ddaeef3cbac00d (diff)
parent5d22f9bbee623dfdf543365489f559da57838d24 (diff)
Merge change 7941 into donut
* changes: add comment to illuminate why we only dismiss the dialog when launching an intent for in app search
-rw-r--r--core/java/android/app/SearchDialog.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/app/SearchDialog.java b/core/java/android/app/SearchDialog.java
index c7d26d232dae..27c637652d5e 100644
--- a/core/java/android/app/SearchDialog.java
+++ b/core/java/android/app/SearchDialog.java
@@ -1247,6 +1247,9 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS
Log.d(LOG_TAG, "launching " + intent);
getContext().startActivity(intent);
+ // in global search mode, SearchDialogWrapper#performActivityResuming will handle hiding
+ // the dialog when the next activity starts, but for in-app search, we still need to
+ // dismiss the dialog.
if (!mGlobalSearchMode) {
dismiss();
}