Commit 3b5865d0 authored by Becky Zhou's avatar Becky Zhou Committed by Commit Bot

Create one-off text appearance to avoid pre-submit errors

BUG=903590

Change-Id: Ie7472e49e10f65193706e4483082ebbfc054efcc
Reviewed-on: https://chromium-review.googlesource.com/c/1327572
Commit-Queue: Becky Zhou <huayinz@chromium.org>
Reviewed-by: default avatarTheresa <twellington@chromium.org>
Cr-Commit-Position: refs/heads/master@{#606692}
parent 738ccf6c
...@@ -23,8 +23,7 @@ ...@@ -23,8 +23,7 @@
android:paddingTop="12dp" android:paddingTop="12dp"
android:paddingBottom="15dp" android:paddingBottom="15dp"
android:gravity="start" android:gravity="start"
android:textSize="12sp" android:textAppearance="@style/TextAppearance.AutofillCardErrorMessage"
android:textColor="@color/input_underline_error_color"
android:background="#e0e0e0" android:background="#e0e0e0"
android:visibility="gone" /> android:visibility="gone" />
...@@ -43,8 +42,7 @@ ...@@ -43,8 +42,7 @@
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:textSize="16sp" android:textAppearance="@style/TextAppearance.AutofillCardInstructionsText"
android:textColor="@color/explanation_text_color"
android:lineSpacingMultiplier="1.25" android:lineSpacingMultiplier="1.25"
android:gravity="start" /> android:gravity="start" />
...@@ -115,7 +113,7 @@ ...@@ -115,7 +113,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:singleLine="true"
android:textColor="@color/default_text_color_link" android:textAppearance="@style/BlueLink2"
android:text="@string/autofill_card_unmask_new_card_link" android:text="@string/autofill_card_unmask_new_card_link"
android:visibility="gone" /> android:visibility="gone" />
</LinearLayout> </LinearLayout>
...@@ -127,8 +125,7 @@ ...@@ -127,8 +125,7 @@
android:layout_marginStart="24dp" android:layout_marginStart="24dp"
android:layout_marginEnd="24dp" android:layout_marginEnd="24dp"
android:gravity="start" android:gravity="start"
android:textSize="12sp" android:textAppearance="@style/TextAppearance.AutofillCardErrorMessage"
android:textColor="@color/input_underline_error_color"
android:visibility="gone" /> android:visibility="gone" />
<RelativeLayout <RelativeLayout
...@@ -158,8 +155,7 @@ ...@@ -158,8 +155,7 @@
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginStart="17dp" android:layout_marginStart="17dp"
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:textSize="14sp" android:textAppearance="@style/TextAppearance.AutofillCardCheckBoxText"
android:textColor="@color/explanation_text_color"
android:text="@string/autofill_card_unmask_prompt_storage_checkbox" /> android:text="@string/autofill_card_unmask_prompt_storage_checkbox" />
</RelativeLayout> </RelativeLayout>
...@@ -199,7 +195,6 @@ ...@@ -199,7 +195,6 @@
android:id="@+id/verification_message" android:id="@+id/verification_message"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@color/default_text_color_link" android:textAppearance="@style/BlueTitle2" />
android:textSize="20sp" />
</LinearLayout> </LinearLayout>
</RelativeLayout> </RelativeLayout>
...@@ -547,6 +547,20 @@ ...@@ -547,6 +547,20 @@
<item name="android:textSize">@dimen/text_size_large</item> <item name="android:textSize">@dimen/text_size_large</item>
</style> </style>
<!-- Autofill Card -->
<style name="TextAppearance.AutofillCardErrorMessage">
<item name="android:textColor">@color/input_underline_error_color</item>
<item name="android:textSize">@dimen/text_size_small</item>
</style>
<style name="TextAppearance.AutofillCardInstructionsText">
<item name="android:textColor">@color/explanation_text_color</item>
<item name="android:textSize">@dimen/text_size_large</item>
</style>
<style name="TextAppearance.AutofillCardCheckBoxText">
<item name="android:textColor">@color/explanation_text_color</item>
<item name="android:textSize">@dimen/text_size_medium</item>
</style>
<!-- Misc styles --> <!-- Misc styles -->
<style name="LocationBarButton"> <style name="LocationBarButton">
<item name="android:background">@null</item> <item name="android:background">@null</item>
......
...@@ -151,14 +151,15 @@ ...@@ -151,14 +151,15 @@
</style> </style>
<!-- Blue Text Styles --> <!-- Blue Text Styles -->
<style name="BlueButtonText1" parent="RobotoMediumStyle" tools:ignore="UnusedResources"> <style name="BlueTitle2" parent="RobotoMediumStyle">
<item name="android:textColor">@color/modern_blue_300</item> <item name="android:textColor">@color/blue_when_enabled</item>
<item name="android:textSize">@dimen/text_size_medium</item> <item name="android:textSize">@dimen/text_size_medium</item>
</style> </style>
<style name="BlueButtonText2" parent="RobotoMediumStyle"> <style name="BlueButtonText1" parent="RobotoMediumStyle" tools:ignore="UnusedResources">
<item name="android:textColor">@color/blue_when_enabled</item> <item name="android:textColor">@color/modern_blue_300</item>
<item name="android:textSize">@dimen/text_size_medium</item> <item name="android:textSize">@dimen/text_size_medium</item>
</style> </style>
<style name="BlueButtonText2" parent="BlueTitle2" />
<style name="BlueLink1" tools:ignore="UnusedResources"> <style name="BlueLink1" tools:ignore="UnusedResources">
<item name="android:textColor">@color/blue_when_enabled</item> <item name="android:textColor">@color/blue_when_enabled</item>
<item name="android:textSize">@dimen/text_size_large</item> <item name="android:textSize">@dimen/text_size_large</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