Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce63850f authored by Karl Rosaen's avatar Karl Rosaen Committed by The Android Open Source Project
Browse files

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

Merge commit '53d24af7'

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

core/java/android/app/Dialog.java

+12 −2
Original line number Original line Diff line number Diff line
@@ -20,6 +20,7 @@ import com.android.internal.policy.PolicyManager; 




import android.content.Context;

import android.content.Context;

import android.content.DialogInterface;

import android.content.DialogInterface;

import android.content.ComponentName;

import android.graphics.drawable.Drawable;

import android.graphics.drawable.Drawable;

import android.net.Uri;

import android.net.Uri;

import android.os.Bundle;

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.

     * This hook is called when the user signals the desire to start a search.

     */

     */

    public boolean onSearchRequested() {

    public boolean onSearchRequested() {

        // not during dialogs, no.

        final SearchManager searchManager = (SearchManager) mContext

        return false;

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

    }

    }