wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1106935 - Remove new tablet branch in MenuItemActionBar. r=mhaigh

Browse Source 
--HG--
extra : rebase_source : 835a06a828f5c70e09282fb45e3447e1191033bb
This commit is contained in:
Michael Comella 2015-02-03 16:31:15 -08:00
parent 448923cc64
commit 172e11b20a
3 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mobile/android/base/menu/MenuItemActionBar.java
View File

@ -22,9 +22,7 @@ public class MenuItemActionBar extends ThemedImageButton
}
public MenuItemActionBar(Context context, AttributeSet attrs) {
// TODO: Remove this branch (and associated attr) when old tablet is removed.
this(context, attrs, (NewTabletUI.isEnabled(context)) ?
R.attr.menuItemActionBarStyleNewTablet : R.attr.menuItemActionBarStyle);
this(context, attrs, R.attr.menuItemActionBarStyle);
}
public MenuItemActionBar(Context context, AttributeSet attrs, int defStyle) {

15
mobile/android/base/resources/values-large-v11/styles.xml
View File

@ -75,23 +75,10 @@
</style>
<style name="Widget.MenuItemActionBar">
<item name="android:layout_width">@dimen/browser_toolbar_height</item>
<item name="android:layout_height">@dimen/browser_toolbar_height</item>
<item name="android:background">@drawable/action_bar_button</item>
<item name="android:scaleType">fitCenter</item>
<!-- We split up padding* because we can't override it in *.NewTablet otherwise. -->
<item name="android:paddingTop">@dimen/browser_toolbar_button_padding</item>
<item name="android:paddingBottom">@dimen/browser_toolbar_button_padding</item>
<item name="android:paddingLeft">@dimen/browser_toolbar_button_padding</item>
<item name="android:paddingRight">@dimen/browser_toolbar_button_padding</item>
</style>
<style name="Widget.MenuItemActionBar.NewTablet">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:scaleType">center</item>
<item name="android:background">@drawable/new_tablet_action_bar_button</item>
<item name="android:scaleType">center</item>
<!-- layout_width/height doesn't work here, likely because it's
an ImageButton, so we use padding instead.

1
mobile/android/base/resources/values-large-v11/themes.xml
View File

@ -14,7 +14,6 @@
<item name="android:windowActionBar">false</item>
<item name="android:windowNoTitle">true</item>
<item name="arrowPopupWidth">400dp</item>
<item name="menuItemActionBarStyleNewTablet">@style/Widget.MenuItemActionBar.NewTablet</item>
</style>
<style name="GeckoStartPane" parent="Gecko.Dialog"/>