Rename default_text_color_tertiary to ..._disabled and replace uses

This CL renames default_text_color_tertiary to
default_text_color_disabled and replaces any uses that aren't disabled
with default_text_color_secondary. It also updates
TextAppearance.*.Tertiary and its uses accordingly.

Bug: 1097357
Change-Id: Ib14fdfbaa3941f4c4ab3aaa6ee8175d25758a565
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2360559
Commit-Queue: Sinan Sahin <sinansahin@google.com>
Reviewed-by: Lijin Shen <lazzzis@google.com>
Reviewed-by: Theresa  <twellington@chromium.org>
Cr-Commit-Position: refs/heads/master@{#799474}

chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/details/AssistantDetailsViewBinder.java

@@ -207,10 +207,11 @@ class AssistantDetailsViewBinder
                 details.getHighlightLine1(), R.style.TextAppearance_TextMedium_Secondary);
         setTextStyle(viewHolder.mDescriptionLine2View, details.getUserApprovalRequired(),
                 details.getHighlightLine2(), R.style.TextAppearance_TextMedium_Secondary);
+        // TODO(crbug.com/1118226): Update the styles that use *_Disabled with UX guidance.
         setTextStyle(viewHolder.mDescriptionLine3View, details.getUserApprovalRequired(),
-                details.getHighlightLine3(), R.style.TextAppearance_TextSmall_Tertiary);
+                details.getHighlightLine3(), R.style.TextAppearance_TextSmall_Disabled);
         setTextStyle(viewHolder.mPriceAttributionView, details.getUserApprovalRequired(),
-                details.getHighlightLine3(), R.style.TextAppearance_TextSmall_Tertiary);
+                details.getHighlightLine3(), R.style.TextAppearance_TextSmall_Disabled);
         setTextStyle(viewHolder.mTotalPriceLabelView, details.getUserApprovalRequired(),
                 /* highlight= */ false, R.style.TextAppearance_TextMedium_Secondary);
         setTextStyle(viewHolder.mTotalPriceView, details.getUserApprovalRequired(),

chrome/android/java/res/layout/data_reduction_stats_layout.xml

@@ -15,7 +15,7 @@
         android:layout_gravity="center"
         android:drawablePadding="3dp"
         android:text="@string/data_reduction_initial_title"
-        android:textAppearance="@style/TextAppearance.TextLarge.Tertiary" />
+        android:textAppearance="@style/TextAppearance.TextLarge.Secondary" />
 
     <LinearLayout
         android:id="@+id/data_reduction_stats_container"

chrome/android/java/res/layout/find_in_page.xml

@@ -32,7 +32,7 @@
         android:layout_marginEnd="16dp"
         android:background="@null"
         android:singleLine="true"
-        android:textAppearance="@style/TextAppearance.TextLarge.Tertiary" />
+        android:textAppearance="@style/TextAppearance.TextLarge.Secondary" />
     <View
         android:id="@+id/find_separator"
         android:layout_width="1dp"

chrome/android/java/src/org/chromium/chrome/browser/contacts_picker/ContactsPickerToolbar.java

@@ -112,7 +112,7 @@ public class ContactsPickerToolbar extends SelectableListToolbar<ContactDetails>
                     done, R.style.TextAppearance_TextMedium_Primary_Inverse);
         } else {
             ApiCompatibilityUtils.setTextAppearance(
-                    done, R.style.TextAppearance_TextMedium_Tertiary);
+                    done, R.style.TextAppearance_TextMedium_Disabled);
             if (contactsSelected) {
                 setNavigationButton(NAVIGATION_BUTTON_SELECTION_BACK);
             } else {

chrome/android/java/src/org/chromium/chrome/browser/findinpage/FindToolbar.java

@@ -778,7 +778,7 @@ public class FindToolbar extends LinearLayout {
      */
     protected int getStatusColor(boolean failed, boolean incognito) {
         int colorResourceId = failed ? R.color.find_in_page_failed_results_status_color
-                                     : R.color.default_text_color_tertiary;
+                                     : R.color.default_text_color_secondary;
         return ApiCompatibilityUtils.getColor(getContext().getResources(), colorResourceId);
     }
 

chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/answer/AnswerTextNewLayout.java

@@ -155,7 +155,7 @@ class AnswerTextNewLayout extends AnswerText {
                 break;
 
             case AnswerTextType.SUGGESTION_SECONDARY_TEXT_MEDIUM:
-                res = R.style.TextAppearance_TextSmall_Tertiary;
+                res = R.style.TextAppearance_TextSmall_Secondary;
                 break;
 
             case AnswerTextType.SUGGESTION:

chrome/android/java/src/org/chromium/chrome/browser/photo_picker/PhotoPickerToolbar.java

@@ -86,7 +86,7 @@ public class PhotoPickerToolbar extends SelectableListToolbar<PickerBitmap> {
                     done, R.style.TextAppearance_TextMedium_Primary_Inverse);
         } else {
             ApiCompatibilityUtils.setTextAppearance(
-                    done, R.style.TextAppearance_TextMedium_Tertiary);
+                    done, R.style.TextAppearance_TextMedium_Disabled);
 
             showBackArrow();
         }

chrome/android/junit/src/org/chromium/chrome/browser/omnibox/suggestions/base/SuggestionSpannableUnitTest.java

@@ -265,7 +265,7 @@ public class SuggestionSpannableUnitTest {
         SuggestionSpannable c1 = new SuggestionSpannable("test string");
         SuggestionSpannable c2 = new SuggestionSpannable("test string");
 
-        c1.setSpan(new TextAppearanceSpan(mActivity, R.style.TextAppearance_TextSmall_Tertiary), 3,
+        c1.setSpan(new TextAppearanceSpan(mActivity, R.style.TextAppearance_TextSmall_Disabled), 3,
                 5, Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
         c2.setSpan(new TextAppearanceSpan(mActivity, R.style.TextAppearance_TextMedium_Secondary),
                 3, 5, Spanned.SPAN_INCLUSIVE_EXCLUSIVE);

chrome/browser/download/android/java/res/layout/download_storage_summary.xml

@@ -10,7 +10,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:singleLine="true"
-    android:textAppearance="@style/TextAppearance.TextSmall.Tertiary"
+    android:textAppearance="@style/TextAppearance.TextSmall.Secondary"
     android:textAlignment="viewStart"
     android:maxLines="1"
     android:paddingTop="8dp"

ui/android/java/res/values-night/colors.xml

@@ -8,7 +8,7 @@
     <color name="default_text_color">@color/default_text_color_light</color>
     <color name="default_text_color_inverse">@color/default_text_color_dark</color>
     <color name="default_text_color_secondary">@color/default_text_color_secondary_light</color>
-    <color name="default_text_color_tertiary">@color/default_text_color_tertiary_light</color>
+    <color name="default_text_color_disabled">@color/default_text_color_disabled_light</color>
     <color name="default_text_color_link">@color/default_text_color_link_light</color>
     <color name="default_text_color_link_disabled">@color/default_text_color_link_disabled_light</color>
     <color name="default_text_color_error">@color/default_text_color_error_light</color>

ui/android/java/res/values-v17/styles.xml

@@ -158,8 +158,8 @@
         <item name="android:textColor">@color/default_text_color_secondary_list</item>
     </style>
 
-    <style name="TextAppearance.TextLarge.Tertiary">
-        <item name="android:textColor">@color/default_text_color_tertiary</item>
+    <style name="TextAppearance.TextLarge.Disabled">
+        <item name="android:textColor">@color/default_text_color_disabled</item>
     </style>
 
     <style name="TextAppearance.TextMediumThick.Primary">
@@ -182,8 +182,8 @@
         <item name="android:textColor">@color/default_text_color_secondary_list</item>
     </style>
 
-    <style name="TextAppearance.TextMedium.Tertiary">
-        <item name="android:textColor">@color/default_text_color_tertiary</item>
+    <style name="TextAppearance.TextMedium.Disabled">
+        <item name="android:textColor">@color/default_text_color_disabled</item>
     </style>
 
     <style name="TextAppearance.TextSmall.Primary">
@@ -194,8 +194,8 @@
         <item name="android:textColor">@color/default_text_color_secondary_list</item>
     </style>
 
-    <style name="TextAppearance.TextSmall.Tertiary">
-        <item name="android:textColor">@color/default_text_color_tertiary</item>
+    <style name="TextAppearance.TextSmall.Disabled">
+        <item name="android:textColor">@color/default_text_color_disabled</item>
     </style>
 
     <style name="TextAppearance.BlackLink" tools:ignore="UnusedResources">
@@ -234,11 +234,11 @@
         <item name="android:textColor">@color/default_text_color_secondary_light_list</item>
     </style>
 
-    <style name="TextAppearance.TextLarge.Tertiary.Light" tools:ignore="UnusedResources">
-        <item name="android:textColor">@color/default_text_color_tertiary_light</item>
+    <style name="TextAppearance.TextLarge.Disabled.Light" tools:ignore="UnusedResources">
+        <item name="android:textColor">@color/default_text_color_disabled_light</item>
     </style>
-    <style name="TextAppearance.TextSmall.Tertiary.Light" tools:ignore="UnusedResources">
-        <item name="android:textColor">@color/default_text_color_tertiary_light</item>
+    <style name="TextAppearance.TextSmall.Disabled.Light" tools:ignore="UnusedResources">
+        <item name="android:textColor">@color/default_text_color_disabled_light</item>
     </style>
 
     <style name="TextAppearance.WhiteLink" tools:ignore="UnusedResources">
@@ -274,14 +274,14 @@
         <item name="android:textColor">@color/default_text_color_secondary_dark</item>
     </style>
 
-    <style name="TextAppearance.TextLarge.Tertiary.Dark" tools:ignore="UnusedResources">
-        <item name="android:textColor">@color/default_text_color_tertiary_dark</item>
+    <style name="TextAppearance.TextLarge.Disabled.Dark" tools:ignore="UnusedResources">
+        <item name="android:textColor">@color/default_text_color_disabled_dark</item>
     </style>
-    <style name="TextAppearance.TextMedium.Tertiary.Dark" tools:ignore="UnusedResources">
-        <item name="android:textColor">@color/default_text_color_tertiary_dark</item>
+    <style name="TextAppearance.TextMedium.Disabled.Dark" tools:ignore="UnusedResources">
+        <item name="android:textColor">@color/default_text_color_disabled_dark</item>
     </style>
-    <style name="TextAppearance.TextSmall.Tertiary.Dark" tools:ignore="UnusedResources">
-        <item name="android:textColor">@color/default_text_color_tertiary_dark</item>
+    <style name="TextAppearance.TextSmall.Disabled.Dark" tools:ignore="UnusedResources">
+        <item name="android:textColor">@color/default_text_color_disabled_dark</item>
     </style>
 
     <!-- Inverse text styles -->

ui/android/java/res/values/semantic_colors_adaptive.xml

@@ -11,7 +11,7 @@
     <!-- Text color used on dark background on light theme, and light background on dark theme. -->
     <color name="default_text_color_inverse">@color/default_text_color_light</color>
     <color name="default_text_color_secondary">@color/default_text_color_secondary_dark</color>
-    <color name="default_text_color_tertiary">@color/default_text_color_tertiary_dark</color>
+    <color name="default_text_color_disabled">@color/default_text_color_disabled_dark</color>
     <!-- Text color for non-clickable blue text. -->
     <color name="default_text_color_blue" tools:ignore="UnusedResources">@color/default_text_color_link</color>
     <!-- Text color for clickable text. -->

ui/android/java/res/values/semantic_colors_non_adaptive.xml

@@ -19,8 +19,8 @@
     <color name="default_text_color_light">@color/modern_white</color>
     <color name="default_text_color_secondary_dark">@color/modern_grey_700</color>
     <color name="default_text_color_secondary_light">@color/white_alpha_70</color>
-    <color name="default_text_color_tertiary_light">@color/white_alpha_50</color>
-    <color name="default_text_color_tertiary_dark">@color/modern_grey_900_alpha_38</color>
+    <color name="default_text_color_disabled_light">@color/white_alpha_50</color>
+    <color name="default_text_color_disabled_dark">@color/modern_grey_900_alpha_38</color>
     <color name="default_text_color_link_dark">@color/modern_blue_600</color>
     <color name="default_text_color_link_light">@color/modern_blue_300</color>
     <color name="default_text_color_error_light">@color/google_red_300</color>