Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 42b7af57: Dismiss QSB dialog when doing an in-app global search.

Browse Source 
Merge commit '42b7af57c59d8b7cb9be3fea713478424b53b7fc' into eclair-plus-aosp

* commit '42b7af57c59d8b7cb9be3fea713478424b53b7fc':
  Dismiss QSB dialog when doing an in-app global search.
This commit is contained in:
Bryan Mawhinney
2009-09-25 04:15:01 -07:00
committed by Android Git Automerger
parent c6cfd0b0cc 42b7af57c5
commit 067e0164ca
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/app/SearchDialog.java
View File

@@ -1304,6 +1304,12 @@ 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) {
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