Bug 838807: Flatten all icons. [r=mfinkle]

--HG--
rename : mobile/android/base/resources/drawable-large-hdpi-v11/ic_menu_bookmark_add.png => mobile/android/base/resources/drawable-xlarge-hdpi-v11/ic_menu_bookmark_add.png
rename : mobile/android/base/resources/drawable-large-hdpi-v11/ic_menu_bookmark_remove.png => mobile/android/base/resources/drawable-xlarge-hdpi-v11/ic_menu_bookmark_remove.png
rename : mobile/android/base/resources/drawable-large-mdpi-v11/ic_menu_bookmark_add.png => mobile/android/base/resources/drawable-xlarge-mdpi-v11/ic_menu_bookmark_add.png
rename : mobile/android/base/resources/drawable-large-mdpi-v11/ic_menu_bookmark_remove.png => mobile/android/base/resources/drawable-xlarge-mdpi-v11/ic_menu_bookmark_remove.png
rename : mobile/android/base/resources/drawable-large-xhdpi-v11/ic_menu_bookmark_add.png => mobile/android/base/resources/drawable-xlarge-xhdpi-v11/ic_menu_bookmark_add.png
rename : mobile/android/base/resources/drawable-large-xhdpi-v11/ic_menu_bookmark_remove.png => mobile/android/base/resources/drawable-xlarge-xhdpi-v11/ic_menu_bookmark_remove.png

mobile/android/base/Makefile.in

@@ -585,7 +585,6 @@ RES_DRAWABLE_BASE = \
   res/drawable/menu_item_uncheck.png \
   res/drawable/site_security_identified.png \
   res/drawable/site_security_verified.png \
-  res/drawable/tabs_menu.png \
   res/drawable/tabs_normal.png \
   res/drawable/tabs_private.png \
   res/drawable/tabs_synced.png \
@@ -686,7 +685,6 @@ RES_DRAWABLE_HDPI = \
   res/drawable-hdpi/menu_item_uncheck.png \
   res/drawable-hdpi/site_security_identified.png \
   res/drawable-hdpi/site_security_verified.png \
-  res/drawable-hdpi/tabs_menu.png \
   res/drawable-hdpi/tabs_normal.png \
   res/drawable-hdpi/tabs_private.png \
   res/drawable-hdpi/tabs_synced.png \
@@ -781,7 +779,6 @@ RES_DRAWABLE_XHDPI = \
   res/drawable-xhdpi/tab_indicator_selected_focused.9.png \
   res/drawable-xhdpi/site_security_identified.png \
   res/drawable-xhdpi/site_security_verified.png \
-  res/drawable-xhdpi/tabs_menu.png \
   res/drawable-xhdpi/tabs_normal.png \
   res/drawable-xhdpi/tabs_private.png \
   res/drawable-xhdpi/tabs_synced.png \
@@ -884,16 +881,11 @@ RES_DRAWABLE_LAND_MDPI_V14 = \
   res/drawable-land-mdpi-v14/address_bar_url_pressed_pb.9.png \
   res/drawable-land-mdpi-v14/remote_tabs_off.png \
   res/drawable-land-mdpi-v14/remote_tabs_on.png \
-  res/drawable-land-mdpi-v14/tab_new.png \
-  res/drawable-land-mdpi-v14/tab_new_pb.png \
   res/drawable-land-mdpi-v14/tabs_carat.png \
   res/drawable-land-mdpi-v14/urlbar_stop.png \
-  res/drawable-land-mdpi-v14/menu.png \
-  res/drawable-land-mdpi-v14/menu_pb.png \
   res/drawable-land-mdpi-v14/reader.png \
   res/drawable-land-mdpi-v14/site_security_identified.png \
   res/drawable-land-mdpi-v14/site_security_verified.png \
-  res/drawable-land-mdpi-v14/tabs_menu.png \
   $(NULL)
 
 RES_DRAWABLE_LAND_HDPI_V14 = \
@@ -907,16 +899,11 @@ RES_DRAWABLE_LAND_HDPI_V14 = \
   res/drawable-land-hdpi-v14/address_bar_url_pressed_pb.9.png \
   res/drawable-land-hdpi-v14/remote_tabs_off.png \
   res/drawable-land-hdpi-v14/remote_tabs_on.png \
-  res/drawable-land-hdpi-v14/tab_new.png \
-  res/drawable-land-hdpi-v14/tab_new_pb.png \
   res/drawable-land-hdpi-v14/tabs_carat.png \
   res/drawable-land-hdpi-v14/urlbar_stop.png \
-  res/drawable-land-hdpi-v14/menu.png \
-  res/drawable-land-hdpi-v14/menu_pb.png \
   res/drawable-land-hdpi-v14/reader.png \
   res/drawable-land-hdpi-v14/site_security_identified.png \
   res/drawable-land-hdpi-v14/site_security_verified.png \
-  res/drawable-land-hdpi-v14/tabs_menu.png \
   $(NULL)
 
 RES_DRAWABLE_LAND_XHDPI_V14 = \
@@ -930,16 +917,11 @@ RES_DRAWABLE_LAND_XHDPI_V14 = \
   res/drawable-land-xhdpi-v14/address_bar_url_pressed_pb.9.png \
   res/drawable-land-xhdpi-v14/remote_tabs_off.png \
   res/drawable-land-xhdpi-v14/remote_tabs_on.png \
-  res/drawable-land-xhdpi-v14/tab_new.png \
-  res/drawable-land-xhdpi-v14/tab_new_pb.png \
   res/drawable-land-xhdpi-v14/tabs_carat.png \
   res/drawable-land-xhdpi-v14/urlbar_stop.png \
-  res/drawable-land-xhdpi-v14/menu.png \
-  res/drawable-land-xhdpi-v14/menu_pb.png \
   res/drawable-land-xhdpi-v14/reader.png \
   res/drawable-land-xhdpi-v14/site_security_identified.png \
   res/drawable-land-xhdpi-v14/site_security_verified.png \
-  res/drawable-land-xhdpi-v14/tabs_menu.png \
   $(NULL)
 
 RES_DRAWABLE_LARGE_MDPI_V11 = \
@@ -953,22 +935,15 @@ RES_DRAWABLE_LARGE_MDPI_V11 = \
   res/drawable-large-mdpi-v11/address_bar_url_pressed_pb.9.png \
   res/drawable-large-mdpi-v11/ic_awesomebar_go.png \
   res/drawable-large-mdpi-v11/ic_awesomebar_search.png \
-  res/drawable-large-mdpi-v11/ic_menu_bookmark_add.png \
-  res/drawable-large-mdpi-v11/ic_menu_bookmark_remove.png \
   res/drawable-large-mdpi-v11/ic_menu_reload.png \
   res/drawable-large-mdpi-v11/ic_menu_forward.png \
   res/drawable-large-mdpi-v11/remote_tabs_off.png \
   res/drawable-large-mdpi-v11/remote_tabs_on.png \
-  res/drawable-large-mdpi-v11/tab_new.png \
-  res/drawable-large-mdpi-v11/tab_new_pb.png \
   res/drawable-large-mdpi-v11/urlbar_stop.png \
   res/drawable-large-mdpi-v11/reader.png \
   res/drawable-large-mdpi-v11/site_security_identified.png \
   res/drawable-large-mdpi-v11/site_security_verified.png \
-  res/drawable-large-mdpi-v11/menu.png \
-  res/drawable-large-mdpi-v11/menu_pb.png \
   res/drawable-large-mdpi-v11/tabs_carat.png \
-  res/drawable-large-mdpi-v11/tabs_menu.png \
   res/drawable-large-mdpi-v11/tabs_normal.png \
   res/drawable-large-mdpi-v11/tabs_private.png \
   res/drawable-large-mdpi-v11/tabs_synced.png \
@@ -983,22 +958,15 @@ RES_DRAWABLE_LARGE_HDPI_V11 = \
   res/drawable-large-hdpi-v11/address_bar_url_pressed_pb.9.png \
   res/drawable-large-hdpi-v11/ic_awesomebar_go.png \
   res/drawable-large-hdpi-v11/ic_awesomebar_search.png \
-  res/drawable-large-hdpi-v11/ic_menu_bookmark_add.png \
-  res/drawable-large-hdpi-v11/ic_menu_bookmark_remove.png \
   res/drawable-large-hdpi-v11/ic_menu_reload.png \
   res/drawable-large-hdpi-v11/ic_menu_forward.png \
   res/drawable-large-hdpi-v11/remote_tabs_off.png \
   res/drawable-large-hdpi-v11/remote_tabs_on.png \
-  res/drawable-large-hdpi-v11/tab_new.png \
-  res/drawable-large-hdpi-v11/tab_new_pb.png \
   res/drawable-large-hdpi-v11/urlbar_stop.png \
   res/drawable-large-hdpi-v11/reader.png \
   res/drawable-large-hdpi-v11/site_security_identified.png \
   res/drawable-large-hdpi-v11/site_security_verified.png \
-  res/drawable-large-hdpi-v11/menu.png \
-  res/drawable-large-hdpi-v11/menu_pb.png \
   res/drawable-large-hdpi-v11/tabs_carat.png \
-  res/drawable-large-hdpi-v11/tabs_menu.png \
   res/drawable-large-hdpi-v11/tabs_normal.png \
   res/drawable-large-hdpi-v11/tabs_private.png \
   res/drawable-large-hdpi-v11/tabs_synced.png \
@@ -1013,22 +981,15 @@ RES_DRAWABLE_LARGE_XHDPI_V11 = \
   res/drawable-large-xhdpi-v11/address_bar_url_pressed_pb.9.png \
   res/drawable-large-xhdpi-v11/ic_awesomebar_go.png \
   res/drawable-large-xhdpi-v11/ic_awesomebar_search.png \
-  res/drawable-large-xhdpi-v11/ic_menu_bookmark_add.png \
-  res/drawable-large-xhdpi-v11/ic_menu_bookmark_remove.png \
   res/drawable-large-xhdpi-v11/ic_menu_reload.png \
   res/drawable-large-xhdpi-v11/ic_menu_forward.png \
   res/drawable-large-xhdpi-v11/remote_tabs_on.png \
   res/drawable-large-xhdpi-v11/remote_tabs_off.png \
-  res/drawable-large-xhdpi-v11/tab_new.png \
-  res/drawable-large-xhdpi-v11/tab_new_pb.png \
   res/drawable-large-xhdpi-v11/urlbar_stop.png \
   res/drawable-large-xhdpi-v11/reader.png \
   res/drawable-large-xhdpi-v11/site_security_identified.png \
   res/drawable-large-xhdpi-v11/site_security_verified.png \
-  res/drawable-large-xhdpi-v11/menu.png \
-  res/drawable-large-xhdpi-v11/menu_pb.png \
   res/drawable-large-xhdpi-v11/tabs_carat.png \
-  res/drawable-large-xhdpi-v11/tabs_menu.png \
   res/drawable-large-xhdpi-v11/tabs_normal.png \
   res/drawable-large-xhdpi-v11/tabs_private.png \
   res/drawable-large-xhdpi-v11/tabs_synced.png \
@@ -1038,32 +999,38 @@ RES_DRAWABLE_XLARGE_MDPI_V11 = \
   res/drawable-xlarge-mdpi-v11/awesomebar_tab_center.9.png \
   res/drawable-xlarge-mdpi-v11/awesomebar_tab_left.9.png \
   res/drawable-xlarge-mdpi-v11/awesomebar_tab_right.9.png \
+  res/drawable-xlarge-mdpi-v11/ic_menu_bookmark_add.png \
+  res/drawable-xlarge-mdpi-v11/ic_menu_bookmark_remove.png \
   res/drawable-xlarge-mdpi-v11/menu.png \
-  res/drawable-xlarge-mdpi-v11/menu_pb.png \
   res/drawable-xlarge-mdpi-v11/tabs_button.xml \
-  res/drawable-xlarge-mdpi-v11/tabs_level.xml \
   res/drawable-xlarge-mdpi-v11/tabs_carat_contracted.png \
   res/drawable-xlarge-mdpi-v11/tabs_carat_expanded.png \
+  res/drawable-xlarge-mdpi-v11/tabs_level.xml \
+  res/drawable-xlarge-mdpi-v11/tabs_menu.png \
   $(NULL)
 
 RES_DRAWABLE_XLARGE_HDPI_V11 = \
   res/drawable-xlarge-hdpi-v11/awesomebar_tab_center.9.png \
   res/drawable-xlarge-hdpi-v11/awesomebar_tab_left.9.png \
   res/drawable-xlarge-hdpi-v11/awesomebar_tab_right.9.png \
+  res/drawable-xlarge-hdpi-v11/ic_menu_bookmark_add.png \
+  res/drawable-xlarge-hdpi-v11/ic_menu_bookmark_remove.png \
   res/drawable-xlarge-hdpi-v11/menu.png \
-  res/drawable-xlarge-hdpi-v11/menu_pb.png \
   res/drawable-xlarge-hdpi-v11/tabs_carat_contracted.png \
   res/drawable-xlarge-hdpi-v11/tabs_carat_expanded.png \
+  res/drawable-xlarge-hdpi-v11/tabs_menu.png \
   $(NULL)
 
 RES_DRAWABLE_XLARGE_XHDPI_V11 = \
   res/drawable-xlarge-xhdpi-v11/awesomebar_tab_center.9.png \
   res/drawable-xlarge-xhdpi-v11/awesomebar_tab_left.9.png \
   res/drawable-xlarge-xhdpi-v11/awesomebar_tab_right.9.png \
+  res/drawable-xlarge-xhdpi-v11/ic_menu_bookmark_add.png \
+  res/drawable-xlarge-xhdpi-v11/ic_menu_bookmark_remove.png \
   res/drawable-xlarge-xhdpi-v11/menu.png \
-  res/drawable-xlarge-xhdpi-v11/menu_pb.png \
   res/drawable-xlarge-xhdpi-v11/tabs_carat_contracted.png \
   res/drawable-xlarge-xhdpi-v11/tabs_carat_expanded.png \
+  res/drawable-xlarge-xhdpi-v11/tabs_menu.png \
   $(NULL)
 
 RES_COLOR = \

mobile/android/base/MenuItemActionBar.java

@@ -22,7 +22,7 @@ public class MenuItemActionBar extends ImageButton
         int size = (int) (context.getResources().getDimension(R.dimen.browser_toolbar_height));
         setLayoutParams(new ViewGroup.LayoutParams(size, size));
 
-        int padding = size / 4;
+        int padding = (int) (context.getResources().getDimension(R.dimen.browser_toolbar_button_padding));
         setPadding(padding, padding, padding, padding);
         setBackgroundResource(R.drawable.action_bar_button);
         setScaleType(ImageView.ScaleType.FIT_CENTER);