[BoC Signin] Add fontFamily to TextAppearance to respect A11y bold text setting.
Issue: 1427113
Bug: b/273993527
Change-Id: I57215578af8614a80bb5f9328d45b01d36c9e46c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4365747
Reviewed-by: Theresa Sullivan <twellington@chromium.org>
Reviewed-by: Boris Sazonov <bsazonov@chromium.org>
Commit-Queue: Nick Birnie <birnie@google.com>
Cr-Commit-Position: refs/heads/main@{#1130511}
diff --git a/chrome/browser/ui/android/signin/java/res/layout/account_picker_bottom_sheet_header.xml b/chrome/browser/ui/android/signin/java/res/layout/account_picker_bottom_sheet_header.xml
index 42687ffe..de0c8ab 100644
--- a/chrome/browser/ui/android/signin/java/res/layout/account_picker_bottom_sheet_header.xml
+++ b/chrome/browser/ui/android/signin/java/res/layout/account_picker_bottom_sheet_header.xml
@@ -16,7 +16,6 @@
android:importantForAccessibility="no"
app:srcCompat="@drawable/chrome_sync_logo" />
- <!--- TODO(b/275071728): revert style to android:TextAppearance -->
<TextView
android:id="@+id/account_picker_header_title"
android:layout_width="match_parent"
@@ -24,10 +23,9 @@
android:layout_marginTop="12dp"
android:layout_marginBottom="8dp"
android:gravity="center_horizontal"
- style="@style/TextAppearance.TextLarge.Primary"
+ android:textAppearance="@style/TextAppearance.TextLarge.Primary"
android:text="@string/signin_account_picker_dialog_title" />
- <!--- TODO(b/275071728): revert style to android:TextAppearance -->
<org.chromium.ui.widget.TextViewWithLeading
android:id="@+id/account_picker_header_subtitle"
android:layout_width="match_parent"
@@ -37,7 +35,7 @@
android:layout_marginBottom="16dp"
android:focusable="true"
android:gravity="center_horizontal"
- style="@style/TextAppearance.TextMedium.Secondary"
+ android:textAppearance="@style/TextAppearance.TextMedium.Secondary"
android:text="@string/signin_account_picker_bottom_sheet_subtitle"
app:leading="@dimen/text_size_medium_leading" />
</merge>
diff --git a/chrome/browser/ui/android/signin/java/res/layout/account_picker_new_account_row.xml b/chrome/browser/ui/android/signin/java/res/layout/account_picker_new_account_row.xml
index a23b392..f35075e 100644
--- a/chrome/browser/ui/android/signin/java/res/layout/account_picker_new_account_row.xml
+++ b/chrome/browser/ui/android/signin/java/res/layout/account_picker_new_account_row.xml
@@ -5,7 +5,6 @@
found in the LICENSE file.
-->
-<!--- TODO(b/275071728): revert style to android:TextAppearance -->
<TextView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -19,5 +18,5 @@
android:paddingBottom="4dp"
android:gravity="center_vertical"
android:text="@string/signin_add_account_to_device"
- style="@style/TextAppearance.TextLarge.Primary"
+ android:textAppearance="@style/TextAppearance.TextLarge.Primary"
app:drawableStartCompat="@drawable/ic_person_add_40dp" />
diff --git a/chrome/browser/ui/android/signin/java/res/layout/account_picker_state_auth_error.xml b/chrome/browser/ui/android/signin/java/res/layout/account_picker_state_auth_error.xml
index 2714967..4f64f04 100644
--- a/chrome/browser/ui/android/signin/java/res/layout/account_picker_state_auth_error.xml
+++ b/chrome/browser/ui/android/signin/java/res/layout/account_picker_state_auth_error.xml
@@ -19,7 +19,6 @@
android:importantForAccessibility="no"
app:srcCompat="@drawable/ic_warning_red_24dp" />
- <!--- TODO(b/275071728): revert style to android:TextAppearance -->
<TextView
android:id="@+id/account_picker_auth_error_title"
android:layout_width="match_parent"
@@ -27,10 +26,9 @@
android:layout_marginTop="12dp"
android:layout_marginBottom="8dp"
android:gravity="center_horizontal"
- style="@style/TextAppearance.TextLarge.Primary"
+ android:textAppearance="@style/TextAppearance.TextLarge.Primary"
android:text="@string/signin_account_picker_bottom_sheet_error_title" />
- <!--- TODO(b/275071728): revert style to android:TextAppearance -->
<org.chromium.ui.widget.TextViewWithLeading
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -38,7 +36,7 @@
android:layout_marginEnd="24dp"
android:layout_marginBottom="16dp"
android:gravity="center_horizontal"
- style="@style/TextAppearance.TextMedium.Secondary"
+ android:textAppearance="@style/TextAppearance.TextMedium.Secondary"
android:text="@string/signin_account_picker_auth_error_subtitle"
app:leading="@dimen/text_size_medium_leading" />
diff --git a/chrome/browser/ui/android/signin/java/res/layout/account_picker_state_general_error.xml b/chrome/browser/ui/android/signin/java/res/layout/account_picker_state_general_error.xml
index 1865a5d..9a561012 100644
--- a/chrome/browser/ui/android/signin/java/res/layout/account_picker_state_general_error.xml
+++ b/chrome/browser/ui/android/signin/java/res/layout/account_picker_state_general_error.xml
@@ -19,7 +19,6 @@
android:importantForAccessibility="no"
app:srcCompat="@drawable/ic_warning_red_24dp" />
- <!--- TODO(b/275071728): revert style to android:TextAppearance -->
<TextView
android:id="@+id/account_picker_general_error_title"
android:layout_width="match_parent"
@@ -27,10 +26,9 @@
android:layout_marginTop="12dp"
android:layout_marginBottom="8dp"
android:gravity="center_horizontal"
- style="@style/TextAppearance.TextLarge.Primary"
+ android:textAppearance="@style/TextAppearance.TextLarge.Primary"
android:text="@string/signin_account_picker_bottom_sheet_error_title" />
- <!--- TODO(b/275071728): revert style to android:TextAppearance -->
<org.chromium.ui.widget.TextViewWithLeading
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -38,7 +36,7 @@
android:layout_marginEnd="24dp"
android:layout_marginBottom="16dp"
android:gravity="center_horizontal"
- style="@style/TextAppearance.TextMedium.Secondary"
+ android:textAppearance="@style/TextAppearance.TextMedium.Secondary"
android:text="@string/signin_account_picker_general_error_subtitle"
app:leading="@dimen/text_size_medium_leading" />
diff --git a/chrome/browser/ui/android/signin/java/res/layout/account_picker_state_signin_in_progress.xml b/chrome/browser/ui/android/signin/java/res/layout/account_picker_state_signin_in_progress.xml
index 1600342..859fe65 100644
--- a/chrome/browser/ui/android/signin/java/res/layout/account_picker_state_signin_in_progress.xml
+++ b/chrome/browser/ui/android/signin/java/res/layout/account_picker_state_signin_in_progress.xml
@@ -19,7 +19,6 @@
android:importantForAccessibility="no"
app:srcCompat="@drawable/chrome_sync_logo" />
- <!--- TODO(b/275071728): revert style to android:TextAppearance -->
<TextView
android:id="@+id/account_picker_signin_in_progress_title"
android:layout_width="match_parent"
@@ -27,7 +26,7 @@
android:layout_marginTop="12dp"
android:layout_marginBottom="8dp"
android:gravity="center_horizontal"
- style="@style/TextAppearance.TextLarge.Primary"
+ android:textAppearance="@style/TextAppearance.TextLarge.Primary"
android:text="@string/signin_account_picker_bottom_sheet_signin_title" />
<ProgressBar
diff --git a/chrome/browser/ui/android/signin/java/res/layout/account_row.xml b/chrome/browser/ui/android/signin/java/res/layout/account_row.xml
index b2bd8ba..d5af4829f 100644
--- a/chrome/browser/ui/android/signin/java/res/layout/account_row.xml
+++ b/chrome/browser/ui/android/signin/java/res/layout/account_row.xml
@@ -22,21 +22,19 @@
android:layout_weight="1"
android:orientation="vertical">
- <!--- TODO(b/275071728): revert style to android:TextAppearance -->
<TextView
android:id="@+id/account_text_primary"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="top"
- style="@style/TextAppearance.TextLarge.Primary"
+ android:textAppearance="@style/TextAppearance.TextLarge.Primary"
tools:text="John Doe"/>
- <!--- TODO(b/275071728): revert style to android:TextAppearance -->
<TextView
android:id="@+id/account_text_secondary"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="top"
- style="@style/TextAppearance.TextMedium.Secondary"
+ android:textAppearance="@style/TextAppearance.TextMedium.Secondary"
tools:text="john.doe@example.com"/>
</LinearLayout>
diff --git a/ui/android/java/res/values/styles.xml b/ui/android/java/res/values/styles.xml
index fea730ee..bee93c9 100644
--- a/ui/android/java/res/values/styles.xml
+++ b/ui/android/java/res/values/styles.xml
@@ -66,7 +66,9 @@
</style>
<!-- Used by Chrome and Content -->
- <style name="TextAppearance" parent="android:TextAppearance" tools:ignore="UnusedResources" />
+ <style name="TextAppearance" parent="android:TextAppearance" tools:ignore="UnusedResources">
+ <item name="android:fontFamily">sans-serif</item>
+ </style>
<!-- Used by Chrome and Content -->
<style name="TextAppearance.RobotoMediumStyle" tools:ignore="UnusedResources">
<item name="android:fontFamily">sans-serif-medium</item>
