Merge "Fix bug 4725323 - 'More' shows the icons which are already available in settings"

    private class MenuAdapter extends BaseAdapter {

        public int getCount() {

            ArrayList<MenuItemImpl> items = mMenu.getVisibleItems();

            ArrayList<MenuItemImpl> items = mMenu.getNonActionItems();

            return items.size() - mItemIndexOffset;

        }

        public MenuItemImpl getItem(int position) {

            ArrayList<MenuItemImpl> items = mMenu.getVisibleItems();

            ArrayList<MenuItemImpl> items = mMenu.getNonActionItems();

            return items.get(position + mItemIndexOffset);

        }