зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1140210 - Rename MenuItemActionView styles to new name. r=liuche
--HG-- extra : commitid : 2C9M4zQfpaJ extra : rebase_source : 1a87cd9c6f28080e10debaf41ef99a34f4c2f44a
This commit is contained in:
Родитель
01e90d794a
Коммит
6f4aff3f97
|
@ -40,7 +40,7 @@ public class MenuItemSwitcherLayout extends LinearLayout
|
|||
}
|
||||
|
||||
public MenuItemSwitcherLayout(Context context, AttributeSet attrs) {
|
||||
this(context, attrs, R.attr.menuItemActionViewStyle);
|
||||
this(context, attrs, R.attr.menuItemSwitcherLayoutStyle);
|
||||
}
|
||||
|
||||
@TargetApi(14)
|
||||
|
@ -177,7 +177,7 @@ public class MenuItemSwitcherLayout extends LinearLayout
|
|||
* 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() {
|
||||
|
|
|
@ -44,7 +44,7 @@
|
|||
<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>
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
<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>
|
||||
|
|
|
@ -39,7 +39,7 @@
|
|||
<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>
|
||||
|
|
|
@ -16,8 +16,8 @@
|
|||
<!-- 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"/>
|
||||
|
@ -25,7 +25,7 @@
|
|||
<!-- 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 -->
|
||||
|
|
|
@ -99,7 +99,7 @@
|
|||
<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>
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче