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

Rename resource variable names: homepage_* -> contextual_*

Browse Source 
Fixes: 130250419
Test: rebuild
Change-Id: I497f2d8e48fb6b5cd54b40e5f5b0691de0e19b1c
This commit is contained in:
Fan Zhang
2019-04-10 12:25:10 -07:00
parent aa599e737a
commit b64d16dcad
15 changed files with 118 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/values/colors.xml
View File

@@ -98,8 +98,8 @@
<color name="homepage_about_background">#6F86DA</color>
<color name="homepage_privacy_background">#5E97F6</color>
<color name="homepage_card_stroke_color">#1f000000</color>
<color name="homepage_card_dismissal_background">@*android:color/material_grey_100</color>
<color name="contextual_card_stroke_color">#1f000000</color>
<color name="contextual_card_dismissal_background">@*android:color/material_grey_100</color>
<color name="contextual_card_background">@*android:color/background_device_default_light</color>
<!-- End of dashboard/homepage icon background colors -->

86
res/values/dimens.xml
View File

@@ -327,32 +327,32 @@
<dimen name="reset_checkbox_summary_text_size">14sp</dimen>
<!-- Homepage cards size and padding -->
<dimen name="homepage_card_icon_size">24dp</dimen>
<dimen name="homepage_card_vertical_margin">8dp</dimen>
<dimen name="homepage_card_side_margin">4dp</dimen>
<dimen name="homepage_card_icon_padding_start">14dp</dimen>
<dimen name="homepage_card_text_padding_start">16dp</dimen>
<dimen name="homepage_card_padding_end">16dp</dimen>
<dimen name="homepage_card_corner_radius">@*android:dimen/config_dialogCornerRadius</dimen>
<dimen name="homepage_full_card_padding_end">12dp</dimen>
<dimen name="homepage_half_card_padding_top">12dp</dimen>
<dimen name="homepage_half_card_padding_bottom">16dp</dimen>
<dimen name="homepage_half_card_title_margin_top">12dp</dimen>
<dimen name="homepage_deferred_setup_card_padding_top">16dp</dimen>
<dimen name="homepage_deferred_setup_card_padding_bottom">12dp</dimen>
<dimen name="homepage_deferred_setup_card_title_margin_top">12dp</dimen>
<dimen name="homepage_deferred_setup_card_summary_margin_top">2dp</dimen>
<dimen name="homepage_deferred_setup_card_button_margin_top">8dp</dimen>
<dimen name="homepage_deferred_setup_card_button_padding_top">8dp</dimen>
<dimen name="homepage_deferred_setup_card_button_padding_bottom">8dp</dimen>
<dimen name="homepage_deferred_setup_card_button_padding_start">24dp</dimen>
<dimen name="homepage_deferred_setup_card_button_padding_end">24dp</dimen>
<dimen name="contextual_card_icon_size">24dp</dimen>
<dimen name="contextual_card_vertical_margin">8dp</dimen>
<dimen name="contextual_card_side_margin">4dp</dimen>
<dimen name="contextual_card_icon_padding_start">14dp</dimen>
<dimen name="contextual_card_text_padding_start">16dp</dimen>
<dimen name="contextual_card_padding_end">16dp</dimen>
<dimen name="contextual_card_corner_radius">@*android:dimen/config_dialogCornerRadius</dimen>
<dimen name="contextual_full_card_padding_end">12dp</dimen>
<dimen name="contextual_half_card_padding_top">12dp</dimen>
<dimen name="contextual_half_card_padding_bottom">16dp</dimen>
<dimen name="contextual_half_card_title_margin_top">12dp</dimen>
<dimen name="contextual_deferred_setup_card_padding_top">16dp</dimen>
<dimen name="contextual_deferred_setup_card_padding_bottom">12dp</dimen>
<dimen name="contextual_deferred_setup_card_title_margin_top">12dp</dimen>
<dimen name="contextual_deferred_setup_card_summary_margin_top">2dp</dimen>
<dimen name="contextual_deferred_setup_card_button_margin_top">8dp</dimen>
<dimen name="contextual_deferred_setup_card_button_padding_top">8dp</dimen>
<dimen name="contextual_deferred_setup_card_button_padding_bottom">8dp</dimen>
<dimen name="contextual_deferred_setup_card_button_padding_start">24dp</dimen>
<dimen name="contextual_deferred_setup_card_button_padding_end">24dp</dimen>
<!-- Homepage dismissal cards size and padding -->
<dimen name="homepage_card_dismissal_margin_top">12dp</dimen>
<dimen name="homepage_card_dismissal_side_margin">16dp</dimen>
<dimen name="homepage_card_dismissal_button_margin_start">4dp</dimen>
<dimen name="homepage_card_dismissal_button_margin_end">6dp</dimen>
<dimen name="contextual_card_dismissal_margin_top">12dp</dimen>
<dimen name="contextual_card_dismissal_side_margin">16dp</dimen>
<dimen name="contextual_card_dismissal_button_margin_start">4dp</dimen>
<dimen name="contextual_card_dismissal_button_margin_end">6dp</dimen>
<!-- Horizontal divider size and margin -->
<dimen name="horizontal_divider_height">.75dp</dimen>
@@ -364,25 +364,25 @@
<dimen name="signal_strength_icon_size">24dp</dimen>
<!-- Condition cards size and padding -->
<dimen name="homepage_condition_card_title_margin_bottom">2dp</dimen>
<dimen name="homepage_condition_half_card_padding_top">12dp</dimen>
<dimen name="homepage_condition_half_card_title_margin_top">12dp</dimen>
<dimen name="homepage_condition_half_card_summary_margin_bottom">12dp</dimen>
<dimen name="homepage_condition_full_card_padding_start">24dp</dimen>
<dimen name="homepage_condition_full_card_padding_end">16dp</dimen>
<dimen name="homepage_condition_full_card_padding_top">12dp</dimen>
<dimen name="homepage_condition_full_card_padding_bottom">12dp</dimen>
<dimen name="homepage_condition_header_padding_top">10dp</dimen>
<dimen name="homepage_condition_header_padding_bottom">10dp</dimen>
<dimen name="homepage_condition_header_icons_margin_start">14dp</dimen>
<dimen name="homepage_condition_header_indicator_padding_top">4dp</dimen>
<dimen name="homepage_condition_header_indicator_padding_start">16dp</dimen>
<dimen name="homepage_condition_header_indicator_padding_end">16dp</dimen>
<dimen name="homepage_condition_footer_height">48dp</dimen>
<dimen name="homepage_condition_footer_padding_top">10dp</dimen>
<dimen name="homepage_condition_footer_padding_end">10dp</dimen>
<dimen name="homepage_condition_header_icon_width_height">24dp</dimen>
<dimen name="homepage_condition_header_icon_margin_end">24dp</dimen>
<dimen name="contextual_condition_card_title_margin_bottom">2dp</dimen>
<dimen name="contextual_condition_half_card_padding_top">12dp</dimen>
<dimen name="contextual_condition_half_card_title_margin_top">12dp</dimen>
<dimen name="contextual_condition_half_card_summary_margin_bottom">12dp</dimen>
<dimen name="contextual_condition_full_card_padding_start">24dp</dimen>
<dimen name="contextual_condition_full_card_padding_end">16dp</dimen>
<dimen name="contextual_condition_full_card_padding_top">12dp</dimen>
<dimen name="contextual_condition_full_card_padding_bottom">12dp</dimen>
<dimen name="contextual_condition_header_padding_top">10dp</dimen>
<dimen name="contextual_condition_header_padding_bottom">10dp</dimen>
<dimen name="contextual_condition_header_icons_margin_start">14dp</dimen>
<dimen name="contextual_condition_header_indicator_padding_top">4dp</dimen>
<dimen name="contextual_condition_header_indicator_padding_start">16dp</dimen>
<dimen name="contextual_condition_header_indicator_padding_end">16dp</dimen>
<dimen name="contextual_condition_footer_height">48dp</dimen>
<dimen name="contextual_condition_footer_padding_top">10dp</dimen>
<dimen name="contextual_condition_footer_padding_end">10dp</dimen>
<dimen name="contextual_condition_header_icon_width_height">24dp</dimen>
<dimen name="contextual_condition_header_icon_margin_end">24dp</dimen>
<!-- QR code picture size -->
<dimen name="qrcode_size">264dp</dimen>

18
res/values/styles.xml
View File

@@ -414,13 +414,13 @@
</style>
<style name="ContextualCardStyle">
<item name="android:layout_marginBottom">@dimen/homepage_card_vertical_margin</item>
<item name="android:layout_marginStart">@dimen/homepage_card_side_margin</item>
<item name="android:layout_marginEnd">@dimen/homepage_card_side_margin</item>
<item name="android:layout_marginBottom">@dimen/contextual_card_vertical_margin</item>
<item name="android:layout_marginStart">@dimen/contextual_card_side_margin</item>
<item name="android:layout_marginEnd">@dimen/contextual_card_side_margin</item>
<item name="cardBackgroundColor">@color/contextual_card_background</item>
<item name="cardCornerRadius">@dimen/homepage_card_corner_radius</item>
<item name="cardCornerRadius">@dimen/contextual_card_corner_radius</item>
<item name="cardElevation">0dp</item>
<item name="strokeColor">@color/homepage_card_stroke_color</item>
<item name="strokeColor">@color/contextual_card_stroke_color</item>
<item name="strokeWidth">1dp</item>
</style>
@@ -475,10 +475,10 @@
<style name="DeferredSetupCardButton" parent="android:Widget.DeviceDefault.Button.Colored">
<item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item>
<item name="android:paddingBottom">@dimen/homepage_deferred_setup_card_button_padding_bottom</item>
<item name="android:paddingEnd">@dimen/homepage_deferred_setup_card_button_padding_end</item>
<item name="android:paddingStart">@dimen/homepage_deferred_setup_card_button_padding_start</item>
<item name="android:paddingTop">@dimen/homepage_deferred_setup_card_button_padding_top</item>
<item name="android:paddingBottom">@dimen/contextual_deferred_setup_card_button_padding_bottom</item>
<item name="android:paddingEnd">@dimen/contextual_deferred_setup_card_button_padding_end</item>
<item name="android:paddingStart">@dimen/contextual_deferred_setup_card_button_padding_start</item>
<item name="android:paddingTop">@dimen/contextual_deferred_setup_card_button_padding_top</item>
<item name="android:textAllCaps">false</item>
<item name="android:textSize">14sp</item>
</style>