Dismiss QSB dialog when doing an in-app global search.

This prevents QSB from obscuring the results when they are handled
by the current application.

Bug: 2141208
Change-Id: I6f848aa2003c75b97effe1d3d2af5316ad4fbf92

diff --git a/core/java/android/app/SearchDialog.java b/core/java/android/app/SearchDialog.java
index 6d55f06..4869940 100644 (file)
--- a/core/java/android/app/SearchDialog.java
+++ b/core/java/android/app/SearchDialog.java
@@ -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