am 53d24af7: Respect onSearchRequested in Dialog and actually launch search. Also dismiss self.

Merge commit '53d24af774ad943ff26ef529c949f9c433806421'

* commit '53d24af774ad943ff26ef529c949f9c433806421':
  Respect onSearchRequested in Dialog and actually launch search.  Also dismiss self.

1 files changed, 12 insertions, 2 deletions

diff --git a/core/java/android/app/Dialog.java b/core/java/android/app/Dialog.java
index 1330912..444f222 100644
--- a/core/java/android/app/Dialog.java
+++ b/core/java/android/app/Dialog.java
@@ -20,6 +20,7 @@ import com.android.internal.policy.PolicyManager;
 
 import android.content.Context;
 import android.content.DialogInterface;
+import android.content.ComponentName;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
@@ -784,8 +785,17 @@ public class Dialog implements DialogInterface, Window.Callback,
      * This hook is called when the user signals the desire to start a search.
      */
     public boolean onSearchRequested() {
-        // not during dialogs, no.
-        return false;
+        final SearchManager searchManager = (SearchManager) mContext
+                .getSystemService(Context.SEARCH_SERVICE);
+
+        // associate search with owner activity if possible (otherwise it will default to
+        // global search).
+        final ComponentName appName = mOwnerActivity == null ? null
+                : mOwnerActivity.getComponentName();
+        final boolean globalSearch = (appName == null);
+        searchManager.startSearch(null, false, appName, null, globalSearch);
+        dismiss();
+        return true;
     }