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

Merge "[WifiSetup] L layout update"

Browse Source
This commit is contained in:
Maurice Lam
2014-07-10 18:22:19 +00:00
committed by Android (Google) Code Review
parent 7568392c00 588e61aa05
commit c8f0e7cf47
17 changed files with 501 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
res/values/colors.xml
View File

@@ -39,6 +39,7 @@
<color name="title_color">@android:color/holo_blue_light</color>
<color name="setup_divider_color_dark">#33ffffff</color>
<color name="setup_divider_color_light">#33000000</color>
<color name="setup_add_wifi_network_text_color">#ff009587</color>
<color name="circle_avatar_frame_color">#ffffffff</color>
<color name="circle_avatar_frame_shadow_color">#80000000</color>

15
res/values/dimens.xml
View File

@@ -38,12 +38,17 @@
<dimen name="crypt_clock_size">100sp</dimen>
<item type="dimen" name="setup_title_height">15%</item>
<item type="dimen" name="setup_border_width">5%</item>
<dimen name="setup_margin_bottom">0dip</dimen>
<dimen name="setup_title_size">25dp</dimen>
<dimen name="setup_button_size">32dip</dimen>
<dimen name="setup_item_margin">16dip</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_margin_sides">40dp</dimen>
<dimen name="divider_height">3dip</dimen>
<dimen name="divider_margin_top">6dip</dimen>

2
res/values/strings.xml
View File

@@ -1375,7 +1375,7 @@
<!-- Wifi Settings. text displayed when user has restriction DISALLOW_CONFIG_WIFI [CHAR LIMIT=NONE]-->
<string name="wifi_empty_list_user_restricted">You don\'t have permission to change the Wi\u2011Fi network.</string>
<!-- Wi-Fi settings. title for setup other network button [CHAR LIMIT=35]-->
<string name="wifi_other_network">Other network\u2026</string>
<string name="wifi_other_network">Add another network</string>
<!-- Wi-Fi settings. content description for more button [CHAR LIMIT=50]-->
<string name="wifi_more">More</string>
<!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->

21
res/values/styles.xml
View File

@@ -152,11 +152,26 @@
</style>
<style name="SetupTitle">
<item name="android:fontFamily">sans-serif-light</item>
<item name="android:textSize">@dimen/setup_title_size</item>
<item name="android:textColor">@color/title_color</item>
<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>
<style name="SetupAddWifiNetwork">
<item name="android:fontFamily">sans-serif-medium</item>
<item name="android:gravity">start|center_vertical</item>
<item name="android:paddingStart">@dimen/setup_list_no_icon_padding</item>
<item name="android:textAllCaps">true</item>
<item name="android:textAppearance">@android:style/TextAppearance.Small</item>
<item name="android:textColor">@color/setup_add_wifi_network_text_color</item>
</style>
<style name="wifi_item">

14
res/values/themes.xml
View File

@@ -22,29 +22,35 @@
<attr name="wifi_signal" format="reference" />
<style name="SetupWizardWifiTheme" parent="android:Theme.Material.NoActionBar">
<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:windowBackground">?android:attr/colorBackground</item>
<item name="android:windowSoftInputMode">adjustPan</item>
<item name="@*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
<item name="android:alertDialogTheme">@style/Theme.WifiDialog</item>
<item name="ic_menu_add">@drawable/ic_menu_add_dark</item>
<item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>
<item name="ic_wps">@drawable/ic_wps_dark</item>
<item name="setup_divider_color">@color/setup_divider_color_dark</item>
<item name="wifi_signal">@drawable/wifi_signal_dark</item>
<item name="switchBarMarginStart">0dip</item>
<item name="switchBarMarginEnd">0dip</item>
<item name="wifi_signal">@drawable/wifi_signal_dark</item>
</style>
<style name="SetupWizardWifiTheme.Light" parent="android:Theme.Material.Light.NoActionBar">
<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:windowBackground">?android:attr/colorBackground</item>
<item name="android:windowSoftInputMode">adjustPan</item>
<item name="@*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
<item name="android:alertDialogTheme">@style/Theme.Light.WifiDialog</item>
<item name="ic_menu_add">@drawable/ic_menu_add_light</item>
<item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>
<item name="ic_wps">@drawable/ic_wps_light</item>
<item name="setup_divider_color">@color/setup_divider_color_light</item>
<item name="wifi_signal">@drawable/wifi_signal_light</item>
<item name="switchBarMarginStart">0dip</item>
<item name="switchBarMarginEnd">0dip</item>
<item name="wifi_signal">@drawable/wifi_signal_light</item>
</style>
<style name="Theme.WifiDialog" parent="@*android:style/Theme.Material.Dialog.Alert">