Bug 1007442 - Part 2: Make remote tabs panel buttons more consistent across devices. r=lucasr

This commit is contained in:
Michael Comella 2014-06-11 14:31:20 -07:00
parent d0a58672b0
commit 34faaff77c
7 changed files with 55 additions and 7 deletions

View File

@ -34,14 +34,19 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
<!-- Setting gravity/layout_gravity in portrait is redundant to these elements'
styles, however, it overrides the default left-align behavior in landscape. -->
<Button android:id="@+id/remote_tabs_setup_get_started"
android:layout_width="wrap_content"
android:layout_gravity="center"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/RemoteTabsItem.Button"
android:text="@string/fxaccount_getting_started_get_started"
android:layout_marginBottom="15dp"/>
<TextView android:id="@+id/remote_tabs_setup_old_sync_link"
android:gravity="center"
android:layout_gravity="center"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/RemoteTabsItem.TextAppearance.Linkified"

View File

@ -36,8 +36,10 @@
<style name="RemoteTabsItem.Button" parent="RemoteTabsItem.ButtonBase">
<item name="android:paddingTop">12dp</item>
<item name="android:paddingBottom">12dp</item>
<item name="android:paddingLeft">64dp</item>
<item name="android:paddingRight">64dp</item>
<item name="android:paddingLeft">6dp</item>
<item name="android:paddingRight">6dp</item>
<item name="android:layout_marginLeft">24dp</item>
<item name="android:layout_marginRight">24dp</item>
</style>
<style name="RemoteTabsItem.TextAppearance.Header.FXAccounts">

View File

@ -70,8 +70,10 @@
<style name="RemoteTabsItem.Button" parent="RemoteTabsItem.ButtonBase">
<item name="android:paddingTop">12dp</item>
<item name="android:paddingBottom">12dp</item>
<item name="android:paddingLeft">36dp</item>
<item name="android:paddingRight">36dp</item>
<item name="android:paddingLeft">6dp</item>
<item name="android:paddingRight">6dp</item>
<item name="android:layout_marginLeft">12dp</item>
<item name="android:layout_marginRight">12dp</item>
<item name="android:textSize">16dp</item>
</style>

View File

@ -93,4 +93,19 @@
<item name="android:paddingRight">32dp</item>
</style>
<!-- Tabs panel -->
<style name="RemoteTabsPanelChild" parent="RemoteTabsPanelChildBase">
<item name="android:paddingLeft">84dp</item>
<item name="android:paddingRight">84dp</item>
</style>
<style name="RemoteTabsItem.Button" parent="RemoteTabsItem.ButtonBase">
<item name="android:paddingTop">18dp</item>
<item name="android:paddingBottom">18dp</item>
<item name="android:paddingLeft">9dp</item>
<item name="android:paddingRight">9dp</item>
<item name="android:layout_marginLeft">90dp</item>
<item name="android:layout_marginRight">90dp</item>
</style>
</resources>

View File

@ -28,4 +28,15 @@
<item name="android:paddingTop">30dp</item>
</style>
<!-- Tabs panel -->
<style name="RemoteTabsItem.Button" parent="RemoteTabsItem.ButtonBase">
<item name="android:paddingTop">12dp</item>
<item name="android:paddingBottom">12dp</item>
<item name="android:paddingLeft">6dp</item>
<item name="android:paddingRight">6dp</item>
<item name="android:layout_marginLeft">12dp</item>
<item name="android:layout_marginRight">12dp</item>
<item name="android:textSize">16dp</item>
</style>
</resources>

View File

@ -30,4 +30,14 @@
<item name="android:paddingTop">30dp</item>
</style>
<!-- Tabs panel -->
<style name="RemoteTabsItem.Button" parent="RemoteTabsItem.ButtonBase">
<item name="android:paddingTop">18dp</item>
<item name="android:paddingBottom">18dp</item>
<item name="android:paddingLeft">9dp</item>
<item name="android:paddingRight">9dp</item>
<item name="android:layout_marginLeft">180dp</item>
<item name="android:layout_marginRight">180dp</item>
</style>
</resources>

View File

@ -484,13 +484,16 @@
<item name="android:background">@drawable/remote_tabs_setup_button_background</item>
<item name="android:textColor">#FFFEFF</item>
<item name="android:textSize">20sp</item>
<item name="android:gravity">center</item>
</style>
<style name="RemoteTabsItem.Button" parent="RemoteTabsItem.ButtonBase">
<item name="android:paddingTop">18dp</item>
<item name="android:paddingBottom">18dp</item>
<item name="android:paddingLeft">72dp</item>
<item name="android:paddingRight">72dp</item>
<item name="android:paddingLeft">9dp</item>
<item name="android:paddingRight">9dp</item>
<item name="android:layout_marginLeft">24dp</item>
<item name="android:layout_marginRight">24dp</item>
</style>
<style name="RemoteTabsItem.TextAppearance">