Bug 1140210 - Rename MenuItemActionView styles to new name. r=liuche
authorMichael Comella <michael.l.comella@gmail.com>
Thu, 15 Oct 2015 14:55:28 -0700
changeset 304776 623b15184f2a3da0e2b339a70fbdf49595b19b80
parent 304775 156585c07b3da57636bb01213ecfad506060553c
child 304777 8b9afb8ee3dfbb355f022c01d75acbdd1ee28bd9
push id1001
push userraliiev@mozilla.com
push dateMon, 18 Jan 2016 19:06:03 +0000
treeherdermozilla-release@8b89261f3ac4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersliuche
bugs1140210
milestone44.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1140210 - Rename MenuItemActionView styles to new name. r=liuche
mobile/android/base/menu/MenuItemSwitcherLayout.java
mobile/android/base/resources/values-v11/themes.xml
mobile/android/base/resources/values-v14/themes.xml
mobile/android/base/resources/values-v21/themes.xml
mobile/android/base/resources/values/attrs.xml
mobile/android/base/resources/values/styles.xml
--- a/mobile/android/base/menu/MenuItemSwitcherLayout.java
+++ b/mobile/android/base/menu/MenuItemSwitcherLayout.java
@@ -35,17 +35,17 @@ public class MenuItemSwitcherLayout exte
     private final List<ImageButton> mActionButtons;
     private final List<View.OnClickListener> mActionButtonListeners = new ArrayList<View.OnClickListener>();
 
     public MenuItemSwitcherLayout(Context context) {
         this(context, null);
     }
 
     public MenuItemSwitcherLayout(Context context, AttributeSet attrs) {
-        this(context, attrs, R.attr.menuItemActionViewStyle);
+        this(context, attrs, R.attr.menuItemSwitcherLayoutStyle);
     }
 
     @TargetApi(14)
     public MenuItemSwitcherLayout(Context context, AttributeSet attrs, int defStyle) {
         super(context, attrs);
 
         LayoutInflater.from(context).inflate(R.layout.menu_item_switcher_layout, this);
         mMenuItem = (MenuItemDefault) findViewById(R.id.menu_item);
@@ -172,17 +172,17 @@ public class MenuItemSwitcherLayout exte
             listener.onClick(view);
         }
     }
 
     /**
      * Update the styles if this view is being used in the context menus.
      *
      * Ideally, we just use different layout files and styles to set this, but
-     * MenuItemActionView is too integrated into GeckoActionProvider to provide
+     * MenuItemSwitcherLayout is too integrated into GeckoActionProvider to provide
      * an easy separation so instead I provide this hack. I'm sorry.
      */
     public void initContextMenuStyles() {
         final int defaultContextMenuPadding = getContext().getResources().getDimensionPixelOffset(
                 R.dimen.context_menu_item_horizontal_padding);
         mMenuItem.setPadding(defaultContextMenuPadding, getPaddingTop(),
                 defaultContextMenuPadding, getPaddingBottom());
     }
--- a/mobile/android/base/resources/values-v11/themes.xml
+++ b/mobile/android/base/resources/values-v11/themes.xml
@@ -39,15 +39,15 @@
         <item name="android:actionButtonStyle">@style/GeckoActionBar.Button</item>
         <item name="android:actionModeCopyDrawable">@drawable/ab_copy</item>
         <item name="android:actionModeCutDrawable">@drawable/ab_cut</item>
         <item name="android:actionModePasteDrawable">@drawable/ab_paste</item>
         <item name="android:listViewStyle">@style/Widget.ListView</item>
         <item name="android:panelBackground">@drawable/menu_panel_bg</item>
         <item name="android:spinnerDropDownItemStyle">@style/Widget.DropDownItem.Spinner</item>
         <item name="android:spinnerItemStyle">@style/Widget.TextView.SpinnerItem</item>
-        <item name="menuItemActionViewStyle">@style/Widget.MenuItemActionView</item>
+        <item name="menuItemSwitcherLayoutStyle">@style/Widget.MenuItemSwitcherLayout</item>
         <item name="menuItemDefaultStyle">@style/Widget.MenuItemDefault</item>
         <item name="menuItemSecondaryActionBarStyle">@style/Widget.MenuItemSecondaryActionBar</item>
         <item name="tabGridLayoutViewStyle">@style/Widget.TabsGridLayout</item>
     </style>
 
 </resources>
--- a/mobile/android/base/resources/values-v14/themes.xml
+++ b/mobile/android/base/resources/values-v14/themes.xml
@@ -15,14 +15,14 @@
         <item name="android:actionModeCutDrawable">@drawable/ab_cut</item>
         <item name="android:actionModePasteDrawable">@drawable/ab_paste</item>
         <item name="android:actionModeSelectAllDrawable">@drawable/ab_select_all</item>
         <item name="android:actionModeStyle">@style/GeckoActionBar</item>
         <item name="android:listViewStyle">@style/Widget.ListView</item>
         <item name="android:panelBackground">@drawable/menu_panel_bg</item>
         <item name="android:spinnerDropDownItemStyle">@style/Widget.DropDownItem.Spinner</item>
         <item name="android:spinnerItemStyle">@style/Widget.TextView.SpinnerItem</item>
-        <item name="menuItemActionViewStyle">@style/Widget.MenuItemActionView</item>
+        <item name="menuItemSwitcherLayoutStyle">@style/Widget.MenuItemSwitcherLayout</item>
         <item name="menuItemDefaultStyle">@style/Widget.MenuItemDefault</item>
         <item name="menuItemSecondaryActionBarStyle">@style/Widget.MenuItemSecondaryActionBar</item>
     </style>
 
 </resources>
--- a/mobile/android/base/resources/values-v21/themes.xml
+++ b/mobile/android/base/resources/values-v21/themes.xml
@@ -34,15 +34,15 @@
     </style>
 
     <style name="GeckoAppBase" parent="Gecko">
         <item name="android:actionButtonStyle">@style/GeckoActionBar.Button</item>
         <item name="android:listViewStyle">@style/Widget.ListView</item>
         <item name="android:panelBackground">@drawable/menu_panel_bg</item>
         <item name="android:spinnerDropDownItemStyle">@style/Widget.DropDownItem.Spinner</item>
         <item name="android:spinnerItemStyle">@style/Widget.TextView.SpinnerItem</item>
-        <item name="menuItemActionViewStyle">@style/Widget.MenuItemActionView</item>
+        <item name="menuItemSwitcherLayoutStyle">@style/Widget.MenuItemSwitcherLayout</item>
         <item name="menuItemDefaultStyle">@style/Widget.MenuItemDefault</item>
         <item name="menuItemSecondaryActionBarStyle">@style/Widget.MenuItemSecondaryActionBar</item>
         <item name="tabGridLayoutViewStyle">@style/Widget.TabsGridLayout</item>
     </style>
 
 </resources>
--- a/mobile/android/base/resources/values/attrs.xml
+++ b/mobile/android/base/resources/values/attrs.xml
@@ -11,26 +11,26 @@
         <attr name="geckoMenuListViewStyle" format="reference"/>
 
         <!-- Style for MenuItemActionBar -->
         <attr name="menuItemActionBarStyle" format="reference"/>
 
         <!-- Style for MenuItemActionBar -->
         <attr name="menuItemActionModeStyle" format="reference"/>
 
-        <!-- Style for MenuItemActionView -->
-        <attr name="menuItemActionViewStyle" format="reference"/>
+        <!-- Style for MenuItemSwitcherLayout -->
+        <attr name="menuItemSwitcherLayoutStyle" format="reference"/>
 
         <!-- Style for MenuItemDefault -->
         <attr name="menuItemDefaultStyle" format="reference"/>
 
         <!-- Style for MenuItemActionBar when shown in SecondaryActionBar -->
         <attr name="menuItemSecondaryActionBarStyle" format="reference"/>
 
-        <!-- Style for MenuItemActionView's ShareActionButton -->
+        <!-- Style for MenuItemSwitcherLayout's ShareActionButton -->
         <attr name="menuItemShareActionButtonStyle" format="reference"/>
 
         <!-- Default style for the BookmarksListView -->
         <attr name="bookmarksListViewStyle" format="reference" />
 
         <!-- Default style for the TopSitesGridItemView -->
         <attr name="topSitesGridItemViewStyle" format="reference" />
 
--- a/mobile/android/base/resources/values/styles.xml
+++ b/mobile/android/base/resources/values/styles.xml
@@ -94,17 +94,17 @@
 
     <style name="Widget.MenuItemSecondaryActionBar">
         <item name="android:padding">8dip</item>
         <item name="android:background">@drawable/menu_item_action_bar_bg</item>
         <item name="android:scaleType">centerInside</item>
         <item name="drawableTintList">@color/action_bar_secondary_menu_item_colors</item>
     </style>
 
-    <style name="Widget.MenuItemActionView">
+    <style name="Widget.MenuItemSwitcherLayout">
         <item name="android:gravity">left</item>
     </style>
 
     <style name="Widget.MenuItemDefault">
         <item name="android:paddingLeft">15dip</item>
         <item name="android:paddingRight">10dip</item>
         <item name="android:drawablePadding">6dip</item>
         <item name="android:gravity">center_vertical</item>