Bug 937829: Make QuickShare aware of the history to choose the icons. [r=mfinkle]

--HG--
extra : rebase_source : 9a6d15dc3e4355c9063a4d49cae02259cf3d4cb3

mobile/android/base/menu/MenuItemActionView.java

@@ -41,8 +41,6 @@ public class MenuItemActionView extends LinearLayout
     public MenuItemActionView(Context context, AttributeSet attrs, int defStyle) {
         super(context, attrs, defStyle);
 
-        setWeightSum(3.0f);
-
         Resources res = context.getResources();
         int width = res.getDimensionPixelSize(R.dimen.menu_item_row_width);
         int height = res.getDimensionPixelSize(R.dimen.menu_item_row_height);

mobile/android/base/widget/GeckoActionProvider.java

@@ -53,13 +53,14 @@ public class GeckoActionProvider extends ActionProvider {
         MenuItemActionView view = new MenuItemActionView(mContext, null);
         view.setActionButtonClickListener(mCallbacks);
 
-        if (dataModel.getHistorySize() > 0) {
-            PackageManager packageManager = mContext.getPackageManager();
-            ResolveInfo defaultActivity = dataModel.getDefaultActivity();
-            view.addActionButton(defaultActivity == null ? null : defaultActivity.loadIcon(packageManager));
-            if (dataModel.getActivityCount() >= 2) {
-                view.addActionButton(dataModel.getActivity(1).loadIcon(packageManager));
-            }
+        final PackageManager packageManager = mContext.getPackageManager();
+        int historySize = dataModel.getHistorySize();
+        if (historySize > 2) {
+            historySize = 2;
+        }
+
+        for (int i = 0; i < historySize; i++) {
+            view.addActionButton(dataModel.getActivity(i).loadIcon(packageManager));
         }
 
         return view;