am f81ecc1f: Merge change I29232f2a into eclair

Merge commit 'f81ecc1fb7cad523b62c7f2662f4aab3ea0dee54' into eclair-mr2

* commit 'f81ecc1fb7cad523b62c7f2662f4aab3ea0dee54':
  Only dismiss search dialog after launching intent.
This commit is contained in:
Bryan Mawhinney
2009-10-08 01:54:50 -07:00
committed by Android Git Automerger

View File

@@ -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.