am 6d1a798c: am 103c3314: am 8be27595: Merge "[WifiSetup] Tablet portrait layout" into lmp-dev

* commit '6d1a798ce5e24fa1de63690f93c1d0fe35b2e852':
  [WifiSetup] Tablet portrait layout
This commit is contained in:
Maurice Lam
2014-08-22 03:14:02 +00:00
committed by Android Git Automerger
6 changed files with 128 additions and 13 deletions

View File

@@ -48,12 +48,15 @@
<!-- Size of padding to give in the wifi list when there is no icon -->
<dimen name="setup_list_no_icon_padding">56dp</dimen>
<dimen name="setup_add_network_item_height">56dp</dimen>
<dimen name="setup_wizard_card_corner_radius">2dp</dimen>
<dimen name="setup_wizard_card_elevation">5dp</dimen>
<dimen name="setup_wizard_card_margin_top">128dp</dimen>
<dimen name="setup_wizard_card_title_margin_top">256dp</dimen>
<dimen name="setup_wizard_card_title_padding_end">32dp</dimen>
<dimen name="setup_wizard_card_title_padding_start">56dp</dimen>
<dimen name="setup_wizard_card_title_padding_top">24dp</dimen>
<dimen name="setup_wizard_card_title_margin_top">0dp</dimen>
<dimen name="setup_wizard_card_title_padding_end">0dp</dimen>
<dimen name="setup_wizard_card_title_padding_start">0dp</dimen>
<dimen name="setup_wizard_card_title_padding_top">16dp</dimen>
<dimen name="setup_wizard_card_title_padding_bottom">28dp</dimen>
<dimen name="setup_wizard_card_port_margin_sides">56dp</dimen>
<dimen name="setup_wizard_card_land_margin_top">128dp</dimen>
<dimen name="setup_wizard_margin_sides">40dp</dimen>
<dimen name="divider_height">3dip</dimen>

View File

@@ -174,15 +174,17 @@
<item name="android:paddingTop">@dimen/setup_title_padding_top</item>
</style>
<!-- Alternate title style used for some tablet-landscape layouts -->
<style name="SetupCardTitle" parent="@android:style/TextAppearance.Material.Display1">
<item name="android:layout_width">0dp</item>
<item name="android:layout_height">wrap_content</item>
<!-- Alternate title style used for some tablet layouts -->
<style name="SetupCardTitle">
<item name="android:layout_marginTop">@dimen/setup_wizard_card_title_margin_top</item>
<item name="android:layout_weight">6</item>
<item name="android:paddingStart">@dimen/setup_wizard_card_title_padding_start</item>
<item name="android:paddingBottom">@dimen/setup_wizard_card_title_padding_bottom</item>
<item name="android:paddingEnd">@dimen/setup_wizard_card_title_padding_end</item>
<item name="android:paddingStart">@dimen/setup_wizard_card_title_padding_start</item>
<item name="android:paddingTop">@dimen/setup_wizard_card_title_padding_top</item>
<item name="android:textAppearance">@style/TextAppearance.SetupWizardCardTitle</item>
</style>
<style name="TextAppearance.SetupWizardCardTitle" parent="@android:style/TextAppearance.Material.Display1">
<item name="android:textColor">@android:color/white</item>
</style>