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

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

Browse Source 
Merge commit '53d24af774ad943ff26ef529c949f9c433806421'

* commit '53d24af774ad943ff26ef529c949f9c433806421':
  Respect onSearchRequested in Dialog and actually launch search.  Also dismiss self.
This commit is contained in:
Karl Rosaen
2009-07-14 16:03:39 -07:00
committed by The Android Open Source Project
parent 4764605109 53d24af774
commit ce63850ff0
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/android/app/Dialog.java
View File

@@ -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;
}