Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-27 06:43:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1193975 - Remove NewTablet from ImageButton style. r=mhaigh

Browse Source 
I feel like there's a better way to do this than using *Base, but
this is our current convention.

--HG--
extra : commitid : 4AFy34jzKw1
extra : rebase_source : 3befc2781abc759fe715e435458965dd296af361
This commit is contained in:
Michael Comella 2015-08-12 16:24:18 -07:00
parent 9141c12711
commit 66e95e3dcb
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mobile/android/base/resources/layout-large-v11/browser_toolbar.xml
View File

@ -56,7 +56,7 @@
android:paddingLeft="18dp"/>
<org.mozilla.gecko.toolbar.BackButton android:id="@id/back"
style="@style/UrlBar.ImageButton.NewTablet"
style="@style/UrlBar.ImageButton"
android:layout_width="@dimen/new_tablet_nav_button_width"
android:layout_height="@dimen/new_tablet_nav_button_width"
android:layout_centerVertical="true"
@ -92,7 +92,7 @@
<org.mozilla.gecko.widget.ThemedImageButton
android:id="@+id/tabs"
style="@style/UrlBar.ImageButton.NewTablet"
style="@style/UrlBar.ImageButton"
android:layout_toLeftOf="@id/menu"
android:layout_alignWithParentIfMissing="true"
android:background="@drawable/browser_toolbar_action_bar_button"/>
@ -111,7 +111,7 @@
<org.mozilla.gecko.widget.ThemedImageButton
android:id="@+id/menu"
style="@style/UrlBar.ImageButton.NewTablet"
style="@style/UrlBar.ImageButton"
android:layout_alignParentRight="true"
android:layout_marginRight="6dp"
android:contentDescription="@string/menu"
@ -120,7 +120,7 @@
<org.mozilla.gecko.widget.ThemedImageView
android:id="@+id/menu_icon"
style="@style/UrlBar.ImageButton.NewTablet"
style="@style/UrlBar.ImageButton"
android:layout_alignLeft="@id/menu"
android:layout_alignRight="@id/menu"
android:src="@drawable/tablet_menu"

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

@ -5,15 +5,12 @@
<resources>
<style name="UrlBar.ImageButton.NewTablet">
<style name="UrlBar.ImageButton" parent="UrlBar.ImageButtonBase">
<item name="android:layout_width">@dimen/new_tablet_browser_toolbar_menu_item_width</item>
</style>
<style name="UrlBar.ImageButton.TabCount.NewTablet">
<item name="android:background">@drawable/tabs_count</item>
<!-- From UrlBar.ImageButton.NewTablet because we can't inherit directly. -->
<item name="android:layout_width">@dimen/new_tablet_browser_toolbar_menu_item_width</item>
</style>
<style name="UrlBar.Button.Container">

7
mobile/android/base/resources/values/styles.xml
View File

@ -478,13 +478,16 @@
</style>
<!-- URL bar - Image Button -->
<style name="UrlBar.ImageButton" parent="UrlBar.Button">
<item name="android:layout_width">@dimen/browser_toolbar_height</item>
<style name="UrlBar.ImageButtonBase" parent="UrlBar.Button">
<item name="android:scaleType">center</item>
<item name="android:layout_gravity">center_vertical</item>
<item name="android:background">@android:color/transparent</item>
</style>
<style name="UrlBar.ImageButton" parent="UrlBar.ImageButtonBase">
<item name="android:layout_width">@dimen/browser_toolbar_height</item>
</style>
<!-- URL bar - Image Button - Icon -->
<style name="UrlBar.ImageButton.Icon">
<item name="android:layout_width">@dimen/browser_toolbar_icon_width</item>