drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change I29232f2a into eclair

Browse Source 
* changes:
  Only dismiss search dialog after launching intent.
This commit is contained in:
Android (Google) Code Review
2009-10-08 04:49:23 -04:00
parent 8bd04b2000 214b6b9ef9
commit f81ecc1fb7
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/app/SearchDialog.java
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 // source. this is because GlobalSearch may not have permission to launch the
// intent, and to avoid the extra step of going through GlobalSearch. // intent, and to avoid the extra step of going through GlobalSearch.
if (mGlobalSearchMode) { if (mGlobalSearchMode) {
launchGlobalSearchIntent(intent);
if (mStoredComponentName != null) { if (mStoredComponentName != null) {
// If we're embedded in an application, dismiss the dialog. // If we're embedded in an application, dismiss the dialog.
// This ensures that if the intent is handled by the current // This ensures that if the intent is handled by the current
// activity, it's not obscured by the dialog. // activity, it's not obscured by the dialog.
dismiss(); dismiss();
} }
launchGlobalSearchIntent(intent);
} else { } else {
// If the intent was created from a suggestion, it will always have an explicit // If the intent was created from a suggestion, it will always have an explicit
// component here. // component here.