diff options
author | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-08 04:49:23 -0400 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-08 04:49:23 -0400 |
commit | f81ecc1fb7cad523b62c7f2662f4aab3ea0dee54 (patch) | |
tree | 8d2cf68113188ba1d889d61c5f842f82b741ab53 /core/java/android | |
parent | 8bd04b2000f418c8c6f4f628abc215bb5a688244 (diff) | |
parent | 214b6b9ef91320cd7b2eab592fbe0eec1614f3cb (diff) | |
download | frameworks_base-f81ecc1fb7cad523b62c7f2662f4aab3ea0dee54.zip frameworks_base-f81ecc1fb7cad523b62c7f2662f4aab3ea0dee54.tar.gz frameworks_base-f81ecc1fb7cad523b62c7f2662f4aab3ea0dee54.tar.bz2 |
Merge change I29232f2a into eclair
* changes:
Only dismiss search dialog after launching intent.
Diffstat (limited to 'core/java/android')
-rw-r--r-- | core/java/android/app/SearchDialog.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/SearchDialog.java b/core/java/android/app/SearchDialog.java index 933c2fc..697ac76 100644 --- a/core/java/android/app/SearchDialog.java +++ b/core/java/android/app/SearchDialog.java @@ -1314,13 +1314,13 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS // source. this is because GlobalSearch may not have permission to launch the // intent, and to avoid the extra step of going through GlobalSearch. if (mGlobalSearchMode) { + launchGlobalSearchIntent(intent); if (mStoredComponentName != null) { // If we're embedded in an application, dismiss the dialog. // This ensures that if the intent is handled by the current // activity, it's not obscured by the dialog. dismiss(); } - launchGlobalSearchIntent(intent); } else { // If the intent was created from a suggestion, it will always have an explicit // component here. |