Commit 1abafc49 authored by Becky Zhou's avatar Becky Zhou Committed by Commit Bot

[Snowflake] Use sentence case for button styles

+ Use sentence case for buttons
+ Chanage filled button side padding to 24dp
+ Change text button side padding to 8dp
+ Change clear browsing data setting button to filled button

Bug: 900760
Change-Id: Id9c01960464319c5b3ad974564b4637c8d9d0217
Reviewed-on: https://chromium-review.googlesource.com/c/1315214
Commit-Queue: Becky Zhou <huayinz@chromium.org>
Reviewed-by: default avatarTheresa <twellington@chromium.org>
Cr-Commit-Position: refs/heads/master@{#606091}
parent 7a435089
......@@ -22,11 +22,9 @@
android:layout_gravity="end"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="8dp"
android:minHeight="48dp"
android:layout_marginEnd="@dimen/clear_browsing_data_button_margin"
android:layout_margin="@dimen/clear_browsing_data_button_margin"
android:focusable="true"
android:text="@string/clear_data_delete"
style="@style/TextButton" />
style="@style/FilledButton.Flat" />
</LinearLayout>
......@@ -9,12 +9,17 @@
android:orientation="vertical"
android:paddingBottom="8dp" >
<!-- Sets edge padding separately because android:padding doesn't override
android:paddingStart. -->
<org.chromium.ui.widget.ButtonCompat
android:id="@+id/clear_browsing_data_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="top"
android:padding="@dimen/list_item_default_margin"
android:paddingTop="@dimen/list_item_default_margin"
android:paddingBottom="@dimen/list_item_default_margin"
android:paddingStart="@dimen/list_item_default_margin"
android:paddingEnd="@dimen/list_item_default_margin"
android:gravity="center_vertical|start"
android:text="@string/open_clear_browsing_data_dialog_button"
style="@style/TextButton" />
......
......@@ -40,9 +40,6 @@
<!-- Payments UI -->
<dimen name="payments_ui_max_dialog_width">600dp</dimen>
<!-- Clear browsing data preferences dimensions -->
<dimen name="clear_browsing_data_button_margin">16dp</dimen>
<!-- Preferences dimensions -->
<dimen name="pref_spinner_padding_end">16dp</dimen>
......
......@@ -420,7 +420,7 @@
<dimen name="psl_info_tooltip_margin">8dp</dimen>
<!-- Clear browsing data preferences dimensions -->
<dimen name="clear_browsing_data_button_margin">8dp</dimen>
<dimen name="clear_browsing_data_button_margin">16dp</dimen>
<!-- Editor dialog UI -->
<dimen name="editor_dialog_section_small_spacing">8dp</dimen>
......
......@@ -34,6 +34,8 @@
<item name="android:gravity">center_vertical|center_horizontal</item>
</style>
<style name="FilledButton" parent="ButtonCompatBase" tools:ignore="UnusedResources">
<item name="android:paddingStart">24dp</item>
<item name="android:paddingEnd">24dp</item>
<item name="android:textAppearance">@style/WhiteButtonText</item>
<item name="buttonColor">@color/blue_when_enabled</item>
<item name="rippleColor">@color/filled_button_ripple_color</item>
......@@ -43,6 +45,8 @@
<item name="buttonRaised">false</item>
</style>
<style name="TextButton" parent="ButtonCompatBase" tools:ignore="UnusedResources">
<item name="android:paddingStart">8dp</item>
<item name="android:paddingEnd">8dp</item>
<item name="android:textAppearance">@style/BlueButtonText2</item>
<item name="buttonColor">@android:color/transparent</item>
<item name="rippleColor">@color/text_button_ripple_color</item>
......@@ -110,7 +114,6 @@
<style name="BlackButtonText" parent="RobotoMediumStyle" tools:ignore="UnusedResources">
<item name="android:textColor">@color/default_text_color_secondary_list</item>
<item name="android:textSize">@dimen/text_size_medium</item>
<item name="android:textAllCaps">true</item>
</style>
<style name="BlackLink" tools:ignore="UnusedResources">
<item name="android:textColor">@color/default_text_color_secondary_list</item>
......@@ -139,9 +142,7 @@
<item name="android:textColor">@android:color/white</item>
<item name="android:textSize">@dimen/text_size_medium</item>
</style>
<style name="WhiteButtonText" parent="WhiteTitle2" tools:ignore="UnusedResources">
<item name="android:textAllCaps">true</item>
</style>
<style name="WhiteButtonText" parent="WhiteTitle2" />
<style name="WhiteLink" tools:ignore="UnusedResources">
<item name="android:textColor">@android:color/white</item>
<item name="android:textSize">@dimen/text_size_medium</item>
......@@ -152,12 +153,10 @@
<style name="BlueButtonText1" parent="RobotoMediumStyle" tools:ignore="UnusedResources">
<item name="android:textColor">@color/modern_blue_300</item>
<item name="android:textSize">@dimen/text_size_medium</item>
<item name="android:textAllCaps">true</item>
</style>
<style name="BlueButtonText2" parent="RobotoMediumStyle" tools:ignore="UnusedResources">
<style name="BlueButtonText2" parent="RobotoMediumStyle">
<item name="android:textColor">@color/blue_when_enabled</item>
<item name="android:textSize">@dimen/text_size_medium</item>
<item name="android:textAllCaps">true</item>
</style>
<style name="BlueLink1" tools:ignore="UnusedResources">
<item name="android:textColor">@color/blue_when_enabled</item>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment