diff -r 000000000000 -r 6474c204b198 mobile/android/base/menu/MenuItemActionView.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mobile/android/base/menu/MenuItemActionView.java	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,165 @@
+/* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.gecko.menu;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.mozilla.gecko.R;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.drawable.Drawable;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.ImageButton;
+import android.widget.LinearLayout;
+import android.os.Build;
+
+public class MenuItemActionView extends LinearLayout
+                                implements GeckoMenuItem.Layout,
+                                           View.OnClickListener {
+    private static final String LOGTAG = "GeckoMenuItemActionView";
+
+    private MenuItemDefault mMenuItem;
+    private MenuItemActionBar mMenuButton;
+    private List<ImageButton> mActionButtons;
+    private List<View.OnClickListener> mActionButtonListeners = new ArrayList<View.OnClickListener>();
+
+    public MenuItemActionView(Context context) {
+        this(context, null);
+    }
+
+    public MenuItemActionView(Context context, AttributeSet attrs) {
+        this(context, attrs, R.attr.menuItemActionViewStyle);
+    }
+
+    @TargetApi(14)
+    public MenuItemActionView(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs);
+
+        // Set these explicitly, since setting a style isn't supported for LinearLayouts until V11.
+        if (Build.VERSION.SDK_INT >= 11) {
+            setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE);
+            setDividerDrawable(getResources().getDrawable(R.drawable.divider_vertical));
+        }
+
+        if (Build.VERSION.SDK_INT >= 14) {
+            setDividerPadding(0);
+        }
+
+        LayoutInflater.from(context).inflate(R.layout.menu_item_action_view, this);
+        mMenuItem = (MenuItemDefault) findViewById(R.id.menu_item);
+        mMenuButton = (MenuItemActionBar) findViewById(R.id.menu_item_button);
+        mActionButtons = new ArrayList<ImageButton>();
+    }
+
+    @Override
+    protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
+        View parent = (View) getParent();
+        final int padding = getPaddingLeft() + getPaddingRight();
+        final int parentPadding = parent.getPaddingLeft() + parent.getPaddingRight();
+        if ((right - left - padding) < (parent.getMeasuredWidth() - parentPadding) || mActionButtons.size() != 0) {
+            // Use the icon.
+            mMenuItem.setVisibility(View.GONE);
+            mMenuButton.setVisibility(View.VISIBLE);
+        } else {
+            // Use the button.
+            mMenuItem.setVisibility(View.VISIBLE);
+            mMenuButton.setVisibility(View.GONE);
+        }
+
+        super.onLayout(changed, left, top, right, bottom);
+    }
+
+    @Override
+    public void initialize(GeckoMenuItem item) {
+        if (item == null)
+            return;
+
+        mMenuItem.initialize(item);
+        mMenuButton.initialize(item);
+        setEnabled(item.isEnabled());
+    }
+
+    @Override
+    public void setEnabled(boolean enabled) {
+        super.setEnabled(enabled);
+        mMenuItem.setEnabled(enabled);
+        mMenuButton.setEnabled(enabled);
+
+        for (ImageButton button : mActionButtons) {
+             button.setEnabled(enabled);
+             button.setAlpha(enabled ? 255 : 99);
+        }
+    }
+
+    public void setMenuItemClickListener(View.OnClickListener listener) {
+        mMenuItem.setOnClickListener(listener);
+        mMenuButton.setOnClickListener(listener);
+    }
+
+    public void addActionButtonClickListener(View.OnClickListener listener) {
+        mActionButtonListeners.add(listener);
+    }
+
+    @Override
+    public void setShowIcon(boolean show) {
+        mMenuItem.setShowIcon(show);
+    }
+
+    public void setIcon(Drawable icon) {
+        mMenuItem.setIcon(icon);
+        mMenuButton.setIcon(icon);
+    }
+
+    public void setIcon(int icon) {
+        mMenuItem.setIcon(icon);
+        mMenuButton.setIcon(icon);
+    }
+
+    public void setTitle(CharSequence title) {
+        mMenuItem.setTitle(title);
+        mMenuButton.setContentDescription(title);
+    }
+
+    public void setSubMenuIndicator(boolean hasSubMenu) {
+        mMenuItem.setSubMenuIndicator(hasSubMenu);
+    }
+
+    public void addActionButton(Drawable drawable) {
+        // If this is the first icon, retain the text.
+        // If not, make the menu item an icon.
+        final int count = mActionButtons.size();
+        mMenuItem.setVisibility(View.GONE);
+        mMenuButton.setVisibility(View.VISIBLE);
+
+        if (drawable != null) {
+            ImageButton button = new ImageButton(getContext(), null, R.attr.menuItemShareActionButtonStyle);
+            button.setImageDrawable(drawable);
+            button.setOnClickListener(this);
+            button.setTag(count);
+
+            final int height = (int) (getResources().getDimension(R.dimen.menu_item_row_height));
+            LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(0, height);
+            params.weight = 1.0f;
+            button.setLayoutParams(params);
+
+            // Fill in the action-buttons to the left of the actual menu button.
+            mActionButtons.add(button);
+            addView(button, count);
+        }
+    }
+
+    @Override
+    public void onClick(View view) {
+        for (View.OnClickListener listener : mActionButtonListeners) {
+            listener.onClick(view);
+        }
+    }
+}