author | Michael Comella <michael.l.comella@gmail.com> |
Tue, 30 Sep 2014 12:08:40 -0700 (2014-09-30) | |
changeset 208105 | 911d32969372b13d2ee4fb06d8c7f99189838a66 |
parent 208041 | be045ef85f3f531e2d2f665c15e828fc4f630297 |
child 208106 | 407a8fb5579dcbccdcb1545c01622cd2e4a0981d |
push id | 27576 |
push user | cbook@mozilla.com |
push date | Wed, 01 Oct 2014 13:00:38 +0000 (2014-10-01) |
treeherder | mozilla-central@1a550125928f [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | lucasr |
bugs | 1072466 |
milestone | 35.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
|
--- a/mobile/android/base/menu/MenuItemActionBar.java +++ b/mobile/android/base/menu/MenuItemActionBar.java @@ -1,31 +1,34 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ package org.mozilla.gecko.menu; +import org.mozilla.gecko.NewTabletUI; import org.mozilla.gecko.R; import android.content.Context; import android.graphics.drawable.Drawable; import android.util.AttributeSet; import android.widget.ImageButton; public class MenuItemActionBar extends ImageButton implements GeckoMenuItem.Layout { private static final String LOGTAG = "GeckoMenuItemActionBar"; public MenuItemActionBar(Context context) { this(context, null); } public MenuItemActionBar(Context context, AttributeSet attrs) { - this(context, attrs, R.attr.menuItemActionBarStyle); + // TODO: Remove this branch (and associated attr) when old tablet is removed. + this(context, attrs, (NewTabletUI.isEnabled(context)) ? + R.attr.menuItemActionBarStyleNewTablet : R.attr.menuItemActionBarStyle); } public MenuItemActionBar(Context context, AttributeSet attrs, int defStyle) { super(context, attrs, defStyle); } @Override public void initialize(GeckoMenuItem item) {
--- a/mobile/android/base/resources/layout-large-v11/new_tablet_browser_toolbar.xml +++ b/mobile/android/base/resources/layout-large-v11/new_tablet_browser_toolbar.xml @@ -46,22 +46,20 @@ <!-- Values of marginLeft are used to animate the forward button so don't change its value. --> <org.mozilla.gecko.toolbar.ToolbarDisplayLayout android:id="@+id/display_layout" style="@style/UrlBar.Button.Container" android:layout_toRightOf="@id/back" android:layout_toLeftOf="@id/menu_items" android:paddingLeft="6dip" android:paddingRight="4dip"/> - <!-- TODO: The reload asset is too small (bug 1072466) so we have white-space above and below the menu item. - We add marginTop to center and compensate: remove this when the final asset is added. --> <LinearLayout android:id="@+id/menu_items" android:layout_width="wrap_content" android:layout_height="match_parent" - android:layout_marginTop="2dp" + android:gravity="center_vertical" android:layout_marginLeft="6dp" android:orientation="horizontal" android:layout_toLeftOf="@id/tabs"/> <org.mozilla.gecko.widget.ThemedImageButton android:id="@+id/tabs" style="@style/UrlBar.ImageButton" android:layout_toLeftOf="@id/menu"
--- a/mobile/android/base/resources/values-large-v11/dimens.xml +++ b/mobile/android/base/resources/values-large-v11/dimens.xml @@ -10,14 +10,16 @@ <!-- If you update one of these values, update the other. --> <dimen name="back_button_width">42dp</dimen> <dimen name="back_button_width_half">21dp</dimen> <dimen name="forward_default_offset">-13dip</dimen> <dimen name="new_tablet_forward_default_offset">-6dp</dimen> + <dimen name="new_tablet_browser_toolbar_menu_item_padding">19dp</dimen> + <dimen name="tabs_counter_size">26sp</dimen> <dimen name="panel_grid_view_column_width">200dp</dimen> <dimen name="tab_strip_favicon_size">16dp</dimen> </resources>
--- a/mobile/android/base/resources/values-large-v11/styles.xml +++ b/mobile/android/base/resources/values-large-v11/styles.xml @@ -65,16 +65,23 @@ <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:padding">@dimen/browser_toolbar_button_padding</item> <item name="android:background">@drawable/action_bar_button</item> <item name="android:scaleType">fitCenter</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:padding">@dimen/new_tablet_browser_toolbar_menu_item_padding</item> + <item name="android:scaleType">center</item> + </style> + <style name="Widget.BookmarksListView" parent="Widget.HomeListView"> <item name="android:scrollbarStyle">outsideOverlay</item> </style> <style name="Widget.TopSitesGridView" parent="Widget.GridView"> <item name="android:paddingLeft">5dp</item> <item name="android:paddingRight">5dp</item> <item name="android:paddingBottom">30dp</item>
--- a/mobile/android/base/resources/values/attrs.xml +++ b/mobile/android/base/resources/values/attrs.xml @@ -10,16 +10,19 @@ <!-- Style for GeckoMenu ListView --> <attr name="geckoMenuListViewStyle" format="reference"/> <!-- Style for MenuItemActionBar --> <attr name="menuItemActionBarStyle" format="reference"/> <!-- Style for MenuItemActionBar --> + <attr name="menuItemActionBarStyleNewTablet" format="reference"/> + + <!-- Style for MenuItemActionBar --> <attr name="menuItemActionModeStyle" format="reference"/> <!-- Style for MenuItemActionView --> <attr name="menuItemActionViewStyle" format="reference"/> <!-- Style for MenuItemDefault --> <attr name="menuItemDefaultStyle" format="reference"/>
--- a/mobile/android/base/resources/values/themes.xml +++ b/mobile/android/base/resources/values/themes.xml @@ -88,16 +88,17 @@ <item name="android:spinnerStyle">@style/Widget.Spinner</item> <item name="android:windowBackground">@android:color/white</item> <item name="bookmarksListViewStyle">@style/Widget.BookmarksListView</item> <item name="floatingHintEditTextStyle">@style/FloatingHintEditText</item> <item name="tabGridLayoutViewStyle">@style/Widget.TabsGridLayout</item> <item name="geckoMenuListViewStyle">@style/Widget.GeckoMenuListView</item> <item name="homeListViewStyle">@style/Widget.HomeListView</item> <item name="menuItemActionBarStyle">@style/Widget.MenuItemActionBar</item> + <item name="menuItemActionBarStyleNewTablet">@style/Widget.MenuItemActionBar.NewTablet</item> <item name="menuItemActionModeStyle">@style/GeckoActionBar.Button</item> <item name="menuItemShareActionButtonStyle">@style/Widget.MenuItemSecondaryActionBar</item> <item name="panelGridViewStyle">@style/Widget.PanelGridView</item> <item name="topSitesGridItemViewStyle">@style/Widget.TopSitesGridItemView</item> <item name="topSitesGridViewStyle">@style/Widget.TopSitesGridView</item> <item name="topSitesThumbnailViewStyle">@style/Widget.TopSitesThumbnailView</item> </style>