Merge "Rename resource variable names: homepage_* -> contextual_*" into qt-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
8d9dadb1a2
@@ -18,12 +18,12 @@
|
||||
<LinearLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/homepage_condition_footer_height"
|
||||
android:layout_height="@dimen/contextual_condition_footer_height"
|
||||
android:contentDescription="@string/homepage_condition_footer_content_description"
|
||||
android:gravity="end"
|
||||
android:orientation="horizontal"
|
||||
android:paddingTop="@dimen/homepage_condition_footer_padding_top"
|
||||
android:paddingEnd="@dimen/homepage_condition_footer_padding_end">
|
||||
android:paddingTop="@dimen/contextual_condition_footer_padding_top"
|
||||
android:paddingEnd="@dimen/contextual_condition_footer_padding_end">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/collapse_button"
|
||||
|
@@ -30,32 +30,32 @@
|
||||
android:id="@+id/content"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingStart="@dimen/homepage_card_icon_padding_start"
|
||||
android:paddingEnd="@dimen/homepage_full_card_padding_end"
|
||||
android:paddingTop="@dimen/homepage_condition_full_card_padding_top"
|
||||
android:paddingBottom="@dimen/homepage_condition_full_card_padding_bottom"
|
||||
android:paddingStart="@dimen/contextual_card_icon_padding_start"
|
||||
android:paddingEnd="@dimen/contextual_full_card_padding_end"
|
||||
android:paddingTop="@dimen/contextual_condition_full_card_padding_top"
|
||||
android:paddingBottom="@dimen/contextual_condition_full_card_padding_bottom"
|
||||
android:orientation="horizontal"
|
||||
android:gravity="center_vertical">
|
||||
|
||||
<ImageView
|
||||
android:id="@android:id/icon"
|
||||
android:layout_width="@dimen/homepage_card_icon_size"
|
||||
android:layout_height="@dimen/homepage_card_icon_size"
|
||||
android:layout_width="@dimen/contextual_card_icon_size"
|
||||
android:layout_height="@dimen/contextual_card_icon_size"
|
||||
android:tint="?android:attr/colorAccent"/>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:paddingStart="@dimen/homepage_condition_full_card_padding_start"
|
||||
android:paddingEnd="@dimen/homepage_condition_full_card_padding_end"
|
||||
android:paddingStart="@dimen/contextual_condition_full_card_padding_start"
|
||||
android:paddingEnd="@dimen/contextual_condition_full_card_padding_end"
|
||||
android:orientation="vertical">
|
||||
|
||||
<TextView
|
||||
android:id="@android:id/title"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="@dimen/homepage_condition_card_title_margin_bottom"
|
||||
android:layout_marginBottom="@dimen/contextual_condition_card_title_margin_bottom"
|
||||
android:textAppearance="@style/TextAppearance.ConditionCardTitle"/>
|
||||
|
||||
<TextView
|
||||
|
@@ -25,20 +25,20 @@
|
||||
android:id="@+id/content"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingTop="@dimen/homepage_condition_half_card_padding_top"
|
||||
android:paddingTop="@dimen/contextual_condition_half_card_padding_top"
|
||||
android:orientation="vertical">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingEnd="@dimen/homepage_card_padding_end"
|
||||
android:paddingEnd="@dimen/contextual_card_padding_end"
|
||||
android:orientation="vertical">
|
||||
|
||||
<ImageView
|
||||
android:id="@android:id/icon"
|
||||
android:layout_width="@dimen/homepage_card_icon_size"
|
||||
android:layout_height="@dimen/homepage_card_icon_size"
|
||||
android:layout_marginStart="@dimen/homepage_card_icon_padding_start"
|
||||
android:layout_width="@dimen/contextual_card_icon_size"
|
||||
android:layout_height="@dimen/contextual_card_icon_size"
|
||||
android:layout_marginStart="@dimen/contextual_card_icon_padding_start"
|
||||
android:tint="?android:attr/colorAccent"/>
|
||||
|
||||
<TextView
|
||||
@@ -47,9 +47,9 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:maxLines="1"
|
||||
android:ellipsize="end"
|
||||
android:layout_marginStart="@dimen/homepage_card_text_padding_start"
|
||||
android:layout_marginTop="@dimen/homepage_condition_half_card_title_margin_top"
|
||||
android:layout_marginBottom="@dimen/homepage_condition_card_title_margin_bottom"
|
||||
android:layout_marginStart="@dimen/contextual_card_text_padding_start"
|
||||
android:layout_marginTop="@dimen/contextual_condition_half_card_title_margin_top"
|
||||
android:layout_marginBottom="@dimen/contextual_condition_card_title_margin_bottom"
|
||||
android:textAppearance="@style/TextAppearance.ConditionCardTitle"/>
|
||||
|
||||
<TextView
|
||||
@@ -58,8 +58,8 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:lines="2"
|
||||
android:ellipsize="end"
|
||||
android:layout_marginStart="@dimen/homepage_card_text_padding_start"
|
||||
android:layout_marginBottom="@dimen/homepage_condition_half_card_summary_margin_bottom"
|
||||
android:layout_marginStart="@dimen/contextual_card_text_padding_start"
|
||||
android:layout_marginBottom="@dimen/contextual_condition_half_card_summary_margin_bottom"
|
||||
android:textAppearance="@style/TextAppearance.ConditionCardSummary"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
@@ -25,8 +25,8 @@
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingTop="@dimen/homepage_condition_header_padding_top"
|
||||
android:paddingBottom="@dimen/homepage_condition_header_padding_bottom"
|
||||
android:paddingTop="@dimen/contextual_condition_header_padding_top"
|
||||
android:paddingBottom="@dimen/contextual_condition_header_padding_bottom"
|
||||
android:orientation="horizontal"
|
||||
android:gravity="center_vertical">
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="1"
|
||||
android:layout_marginStart="@dimen/homepage_condition_header_icons_margin_start"
|
||||
android:layout_marginStart="@dimen/contextual_condition_header_icons_margin_start"
|
||||
android:orientation="horizontal"
|
||||
android:gravity="center_vertical"/>
|
||||
|
||||
@@ -43,9 +43,9 @@
|
||||
android:id="@+id/expand_indicator"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
android:paddingTop="@dimen/homepage_condition_header_indicator_padding_top"
|
||||
android:paddingStart="@dimen/homepage_condition_header_indicator_padding_start"
|
||||
android:paddingEnd="@dimen/homepage_condition_header_indicator_padding_end"
|
||||
android:paddingTop="@dimen/contextual_condition_header_indicator_padding_top"
|
||||
android:paddingStart="@dimen/contextual_condition_header_indicator_padding_start"
|
||||
android:paddingEnd="@dimen/contextual_condition_header_indicator_padding_end"
|
||||
android:src="@drawable/ic_expand_more_inverse"
|
||||
android:tint="?android:attr/colorControlNormal"/>
|
||||
|
||||
|
@@ -17,7 +17,7 @@
|
||||
|
||||
<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:id="@android:id/icon"
|
||||
android:layout_width="@dimen/homepage_condition_header_icon_width_height"
|
||||
android:layout_height="@dimen/homepage_condition_header_icon_width_height"
|
||||
android:layout_marginEnd="@dimen/homepage_condition_header_icon_margin_end"
|
||||
android:layout_width="@dimen/contextual_condition_header_icon_width_height"
|
||||
android:layout_height="@dimen/contextual_condition_header_icon_width_height"
|
||||
android:layout_marginEnd="@dimen/contextual_condition_header_icon_margin_end"
|
||||
android:tint="?android:attr/colorAccent"/>
|
@@ -20,15 +20,15 @@
|
||||
android:id="@+id/dismissal_view"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="@color/homepage_card_dismissal_background"
|
||||
android:background="@color/contextual_card_dismissal_background"
|
||||
android:orientation="vertical"
|
||||
android:visibility="gone">
|
||||
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="@dimen/homepage_card_dismissal_side_margin"
|
||||
android:layout_marginTop="@dimen/homepage_card_dismissal_margin_top"
|
||||
android:layout_marginStart="@dimen/contextual_card_dismissal_side_margin"
|
||||
android:layout_marginTop="@dimen/contextual_card_dismissal_margin_top"
|
||||
android:text="@string/contextual_card_dismiss_confirm_message"
|
||||
android:textAppearance="@style/TextAppearance.ContextualCardDismissalText"/>
|
||||
|
||||
@@ -49,8 +49,8 @@
|
||||
style="@style/ContextualCardDismissalButton"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="@dimen/homepage_card_dismissal_button_margin_start"
|
||||
android:layout_marginEnd="@dimen/homepage_card_dismissal_button_margin_end"
|
||||
android:layout_marginStart="@dimen/contextual_card_dismissal_button_margin_start"
|
||||
android:layout_marginEnd="@dimen/contextual_card_dismissal_button_margin_end"
|
||||
android:text="@string/contextual_card_dismiss_remove"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
@@ -27,22 +27,22 @@
|
||||
android:layout_height="match_parent"
|
||||
android:gravity="left"
|
||||
android:orientation="vertical"
|
||||
android:paddingEnd="@dimen/homepage_card_padding_end"
|
||||
android:paddingTop="@dimen/homepage_deferred_setup_card_padding_top"
|
||||
android:paddingBottom="@dimen/homepage_deferred_setup_card_padding_bottom">
|
||||
android:paddingEnd="@dimen/contextual_card_padding_end"
|
||||
android:paddingTop="@dimen/contextual_deferred_setup_card_padding_top"
|
||||
android:paddingBottom="@dimen/contextual_deferred_setup_card_padding_bottom">
|
||||
|
||||
<ImageView
|
||||
android:id="@android:id/icon"
|
||||
android:layout_width="@dimen/homepage_card_icon_size"
|
||||
android:layout_height="@dimen/homepage_card_icon_size"
|
||||
android:layout_marginStart="@dimen/homepage_card_icon_padding_start"/>
|
||||
android:layout_width="@dimen/contextual_card_icon_size"
|
||||
android:layout_height="@dimen/contextual_card_icon_size"
|
||||
android:layout_marginStart="@dimen/contextual_card_icon_padding_start"/>
|
||||
|
||||
<TextView
|
||||
android:id="@android:id/title"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="@dimen/homepage_card_text_padding_start"
|
||||
android:layout_marginTop="@dimen/homepage_deferred_setup_card_title_margin_top"
|
||||
android:layout_marginStart="@dimen/contextual_card_text_padding_start"
|
||||
android:layout_marginTop="@dimen/contextual_deferred_setup_card_title_margin_top"
|
||||
android:ellipsize="end"
|
||||
android:maxLines="2"
|
||||
android:minLines="1"
|
||||
@@ -52,8 +52,8 @@
|
||||
android:id="@android:id/summary"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="@dimen/homepage_card_text_padding_start"
|
||||
android:layout_marginTop="@dimen/homepage_deferred_setup_card_summary_margin_top"
|
||||
android:layout_marginStart="@dimen/contextual_card_text_padding_start"
|
||||
android:layout_marginTop="@dimen/contextual_deferred_setup_card_summary_margin_top"
|
||||
android:ellipsize="end"
|
||||
android:maxLines="2"
|
||||
android:minLines="1"
|
||||
@@ -64,8 +64,8 @@
|
||||
style="@style/DeferredSetupCardButton"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="@dimen/homepage_card_text_padding_start"
|
||||
android:layout_marginTop="@dimen/homepage_deferred_setup_card_button_margin_top"
|
||||
android:layout_marginStart="@dimen/contextual_card_text_padding_start"
|
||||
android:layout_marginTop="@dimen/contextual_deferred_setup_card_button_margin_top"
|
||||
android:text="@string/suggestion_button_text"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
@@ -31,17 +31,17 @@
|
||||
android:id="@+id/content"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:paddingEnd="@dimen/homepage_card_padding_end"
|
||||
android:paddingTop="@dimen/homepage_half_card_padding_top"
|
||||
android:paddingBottom="@dimen/homepage_half_card_padding_bottom"
|
||||
android:paddingEnd="@dimen/contextual_card_padding_end"
|
||||
android:paddingTop="@dimen/contextual_half_card_padding_top"
|
||||
android:paddingBottom="@dimen/contextual_half_card_padding_bottom"
|
||||
android:background="@color/contextual_card_background"
|
||||
android:orientation="vertical">
|
||||
|
||||
<ImageView
|
||||
android:id="@android:id/icon"
|
||||
android:layout_width="@dimen/homepage_card_icon_size"
|
||||
android:layout_height="@dimen/homepage_card_icon_size"
|
||||
android:layout_marginStart="@dimen/homepage_card_icon_padding_start"/>
|
||||
android:layout_width="@dimen/contextual_card_icon_size"
|
||||
android:layout_height="@dimen/contextual_card_icon_size"
|
||||
android:layout_marginStart="@dimen/contextual_card_icon_padding_start"/>
|
||||
|
||||
<TextView
|
||||
android:id="@android:id/title"
|
||||
@@ -50,8 +50,8 @@
|
||||
android:maxLines="2"
|
||||
android:minLines="1"
|
||||
android:ellipsize="end"
|
||||
android:layout_marginStart="@dimen/homepage_card_text_padding_start"
|
||||
android:layout_marginTop="@dimen/homepage_half_card_title_margin_top"
|
||||
android:layout_marginStart="@dimen/contextual_card_text_padding_start"
|
||||
android:layout_marginTop="@dimen/contextual_half_card_title_margin_top"
|
||||
android:textAppearance="@style/TextAppearance.ConditionCardTitle"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
@@ -20,7 +20,7 @@
|
||||
android:id="@+id/dismissal_swipe_background"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="@color/homepage_card_dismissal_background">
|
||||
android:background="@color/contextual_card_dismissal_background">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/dismissal_icon_start"
|
||||
@@ -28,7 +28,7 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:src="@drawable/ic_delete"
|
||||
android:layout_gravity="start|center_vertical"
|
||||
android:layout_marginStart="@dimen/homepage_card_dismissal_side_margin"/>
|
||||
android:layout_marginStart="@dimen/contextual_card_dismissal_side_margin"/>
|
||||
|
||||
<Space
|
||||
android:layout_width="0dp"
|
||||
@@ -41,6 +41,6 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:src="@drawable/ic_delete"
|
||||
android:layout_gravity="end|center_vertical"
|
||||
android:layout_marginEnd="@dimen/homepage_card_dismissal_side_margin"/>
|
||||
android:layout_marginEnd="@dimen/contextual_card_dismissal_side_margin"/>
|
||||
|
||||
</LinearLayout>
|
@@ -36,8 +36,8 @@
|
||||
|
||||
<ImageView
|
||||
android:id="@android:id/icon"
|
||||
android:layout_width="@dimen/homepage_card_icon_size"
|
||||
android:layout_height="@dimen/homepage_card_icon_size"
|
||||
android:layout_width="@dimen/contextual_card_icon_size"
|
||||
android:layout_height="@dimen/contextual_card_icon_size"
|
||||
style="@style/SuggestionCardIcon"
|
||||
android:layout_marginTop="16dp"
|
||||
android:layout_marginBottom="6dp"/>
|
||||
|
@@ -39,8 +39,8 @@
|
||||
android:id="@+id/contextual_cards_content"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="@dimen/homepage_card_side_margin"
|
||||
android:layout_marginEnd="@dimen/homepage_card_side_margin"/>
|
||||
android:layout_marginStart="@dimen/contextual_card_side_margin"
|
||||
android:layout_marginEnd="@dimen/contextual_card_side_margin"/>
|
||||
|
||||
<FrameLayout
|
||||
android:id="@+id/main_content"
|
||||
|
@@ -18,7 +18,7 @@
|
||||
instead of an ImageView -->
|
||||
|
||||
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:id="@+android:id/title"
|
||||
android:id="@android:id/title"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="16dp"
|
||||
|
@@ -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 -->
|
||||
|
||||
|
@@ -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>
|
||||
|
@@ -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>
|
||||
|
Reference in New Issue
Block a user