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

[Setup] Use SetupWizardLayout

Browse Source 
Use SetupWizardLayout for the screens that show in Settings to get
better visual consistency and new features like showing a progress
bar in list view.

Bug: 19594252
Change-Id: I53ab17a4c2d922a362e3762f1cdccb512f7d8f6e
This commit is contained in:
Maurice Lam
2015-04-18 20:11:59 -07:00
parent c3385dc11b
commit 83301b5256
31 changed files with 355 additions and 1084 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
res/values/dimens.xml
View File

@@ -38,28 +38,10 @@
<dimen name="crypt_clock_size">100sp</dimen>
<dimen name="setup_margin_bottom">0dip</dimen>
<dimen name="setup_title_size">24sp</dimen>
<dimen name="setup_title_margin_bottom">16dp</dimen>
<!-- This is the extra spacing required to make the leading exactly 32sp -->
<dimen name="setup_title_line_spacing_extra">3.67sp</dimen>
<dimen name="setup_title_padding_bottom">2dp</dimen>
<dimen name="setup_title_padding_top">16dp</dimen>
<!-- 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_tablet_illustration_height">256dp</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="setup_wizard_margin_top">24dp</dimen>
<dimen name="setup_wizard_title_area_elevation">3dp</dimen>
<dimen name="divider_height">3dip</dimen>
<dimen name="divider_margin_top">6dip</dimen>

39
res/values/styles.xml
View File

@@ -146,45 +146,6 @@
<item name="android:clickable">false</item>
</style>
<!-- We'd like to have this as 16dip hight including paddingTop/paddingBottom to
be consistent with ProgressBar -->
<style name="TopDivider">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">@dimen/divider_height</item>
<item name="android:background">?attr/setup_divider_color</item>
<item name="android:focusable">false</item>
<item name="android:clickable">false</item>
<item name="android:layout_marginTop">@dimen/divider_margin_top</item>
<item name="android:layout_marginBottom">@dimen/divider_margin_bottom</item>
</style>
<style name="SetupTitle">
<item name="android:layout_marginBottom">@dimen/setup_title_margin_bottom</item>
<item name="android:layout_marginEnd">@dimen/setup_wizard_margin_sides</item>
<item name="android:layout_marginStart">@dimen/setup_wizard_margin_sides</item>
<item name="android:clickable">false</item>
<item name="android:fontFamily">sans-serif</item>
<item name="android:lineSpacingExtra">@dimen/setup_title_line_spacing_extra</item>
<item name="android:longClickable">false</item>
<item name="android:textColor">@android:color/white</item>
<item name="android:textSize">@dimen/setup_title_size</item>
<item name="android:paddingBottom">@dimen/setup_title_padding_bottom</item>
<item name="android:paddingTop">@dimen/setup_title_padding_top</item>
</style>
<!-- Alternate title style used for some tablet layouts -->
<style name="SetupCardTitle">
<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>
<style name="TextAppearance.SetupWizardDescription" parent="@android:style/TextAppearance.Material.Subhead">
</style>

8
res/values/themes.xml
View File

@@ -31,8 +31,8 @@
<style name="SetupWizardTheme" parent="SuwThemeMaterial">
<item name="android:alertDialogTheme">@style/Theme.WifiDialog</item>
<item name="android:listPreferredItemPaddingEnd">@dimen/setup_wizard_margin_sides</item>
<item name="android:listPreferredItemPaddingStart">@dimen/setup_wizard_margin_sides</item>
<item name="android:listPreferredItemPaddingEnd">@dimen/suw_layout_margin_sides</item>
<item name="android:listPreferredItemPaddingStart">@dimen/suw_layout_margin_sides</item>
<item name="android:windowBackground">?android:attr/colorBackground</item>
<item name="@*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
<item name="ic_menu_add">@drawable/ic_menu_add_dark</item>
@@ -52,8 +52,8 @@
<style name="SetupWizardTheme.Light" parent="SuwThemeMaterial.Light">
<item name="android:alertDialogTheme">@style/Theme.Light.WifiDialog</item>
<item name="android:listPreferredItemPaddingEnd">@dimen/setup_wizard_margin_sides</item>
<item name="android:listPreferredItemPaddingStart">@dimen/setup_wizard_margin_sides</item>
<item name="android:listPreferredItemPaddingEnd">@dimen/suw_layout_margin_sides</item>
<item name="android:listPreferredItemPaddingStart">@dimen/suw_layout_margin_sides</item>
<item name="android:windowBackground">?android:attr/colorBackground</item>
<item name="@*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
<item name="ic_menu_add">@drawable/ic_menu_add_light</item>