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

am 69423302: Remove the menu from the search dialog since there are a couple of issues with it we don\'t have time to fix for donut.

Browse Source 
Merge commit '6942330251cd778f85169c6265c584648b42428d'

* commit '6942330251cd778f85169c6265c584648b42428d':
  Remove the menu from the search dialog since there are a couple of issues with it we don't have time to fix for donut.
This commit is contained in:
Karl Rosaen
2009-08-05 10:41:25 -07:00
committed by Android Git Automerger
parent fd055b2d7c 6942330251
commit cbd7fa57ee
1 changed files with 0 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -693,39 +693,6 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS
return mLaunchComponent.flattenToShortString().startsWith("com.android.browser/");
}
/*
* Menu.
*/
@Override
public boolean onCreateOptionsMenu(Menu menu) {
// Show search settings menu item if anyone handles the intent for it
Intent settingsIntent = new Intent(SearchManager.INTENT_ACTION_SEARCH_SETTINGS);
settingsIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
PackageManager pm = getContext().getPackageManager();
ActivityInfo activityInfo = settingsIntent.resolveActivityInfo(pm, 0);
if (activityInfo != null) {
settingsIntent.setClassName(activityInfo.applicationInfo.packageName,
activityInfo.name);
CharSequence label = activityInfo.loadLabel(getContext().getPackageManager());
menu.add(Menu.NONE, Menu.NONE, Menu.NONE, label)
.setIcon(android.R.drawable.ic_menu_preferences)
.setAlphabeticShortcut('P')
.setIntent(settingsIntent);
return true;
}
return super.onCreateOptionsMenu(menu);
}
@Override
public boolean onMenuOpened(int featureId, Menu menu) {
// The menu shows up above the IME, regardless of whether it is in front
// of the drop-down or not. This looks weird when there is no IME, so
// we make sure it is visible.
mSearchAutoComplete.ensureImeVisible();
return super.onMenuOpened(featureId, menu);
}
/**
* Listeners of various types
*/