Merge "Show more menu items on larger devices." into nyc-dev

        android:id="@+id/menu_sort"

        android:title="@string/menu_sort"

        android:icon="@drawable/ic_menu_sortby"

        android:showAsAction="never">

        android:showAsAction="ifRoom">

        <menu>

            <item

                android:id="@+id/menu_sort_name"

        final MenuItem fileSize = menu.findItem(R.id.menu_file_size);

        // Search uses backend ranking; no sorting, recents doesn't support sort.

        sort.setVisible(!inRecents && !mSearchManager.isSearching());

        sort.setEnabled(!inRecents && !mSearchManager.isSearching());

        sortSize.setVisible(mState.showSize); // Only sort by size when file sizes are visible

        fileSize.setVisible(!mState.forceSize);

                return true;

            case R.id.menu_search:

                // SearchViewManager listens for this directly.

                return false;

            case R.id.menu_sort_name:

        assert(canSearchRoot());

        reloadSearch(query);

        invalidateOptionsMenu();

    }

    private void reloadSearch(String query) {