PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[WifiSetup] Tablet landscape layout" into lmp-dev

Browse Source
This commit is contained in:
Maurice Lam
2014-07-23 23:00:41 +00:00
committed by Android (Google) Code Review
parent 56fc6a7530 068354a1bb
commit 56d781b32b
8 changed files with 171 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/values/attrs.xml
View File

@@ -21,7 +21,11 @@
<declare-styleable name="IconPreferenceScreen">
<attr name="icon" format="reference" />
</declare-styleable>
<declare-styleable name="SetupWizardIllustration">
<attr name="aspectRatio" format="float" />
</declare-styleable>
<declare-styleable name="BatteryHistoryChart">
<!-- Base text color, typeface, size, and style. -->
<attr name="android:textAppearance" />

6
res/values/dimens.xml
View File

@@ -48,6 +48,12 @@
<!-- 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_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_margin_sides">40dp</dimen>
<dimen name="divider_height">3dip</dimen>

12
res/values/styles.xml
View File

@@ -174,6 +174,18 @@
<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>
<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:paddingEnd">@dimen/setup_wizard_card_title_padding_end</item>
<item name="android:paddingTop">@dimen/setup_wizard_card_title_padding_top</item>
<item name="android:textColor">@android:color/white</item>
</style>
<style name="SetupAddWifiNetwork">
<item name="android:fontFamily">sans-serif-medium</item>
<item name="android:gravity">start|center_vertical</item>