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

Commit cbd7fa57 authored by Karl Rosaen's avatar Karl Rosaen Committed by Android Git Automerger
Browse files

am 69423302: Remove the menu from the search dialog since there are a couple... 

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.

Merge commit '69423302'

* commit '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.
parents fd055b2d 69423302

core/java/android/app/SearchDialog.java

+0 −33
Original line number Diff line number Diff line
@@ -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

     */