For #24252 - Rename secondaryText attribute to textSecondary

2 years ago · 331dc3a8ec
parent f1e7b49425
commit 331dc3a8ec
42 changed files with 60 additions and 57 deletions
--- a/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt
@ -186,7 +186,7 @@ class AddonsManagementFragment : Fragment(R.layout.fragment_add_ons_management)
        return AddonsManagerAdapter.Style(
            sectionsTextColor = ThemeManager.resolveAttribute(R.attr.textPrimary, context),
            addonNameTextColor = ThemeManager.resolveAttribute(R.attr.textPrimary, context),
-            addonSummaryTextColor = ThemeManager.resolveAttribute(R.attr.secondaryText, context),
+            addonSummaryTextColor = ThemeManager.resolveAttribute(R.attr.textSecondary, context),
            sectionsTypeFace = ResourcesCompat.getFont(context, R.font.metropolis_semibold),
            addonAllowPrivateBrowsingLabelDrawableRes = R.drawable.ic_add_on_private_browsing_label
        )
--- a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarView.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarView.kt
@ -105,7 +105,7 @@ class BrowserToolbarView(
                )
                val secondaryTextColor = ContextCompat.getColor(
                    context,
-                    ThemeManager.resolveAttribute(R.attr.secondaryText, context)
+                    ThemeManager.resolveAttribute(R.attr.textSecondary, context)
                )
                val separatorColor = ContextCompat.getColor(
                    context,
--- a/app/src/main/java/org/mozilla/fenix/library/history/awesomebar/AwesomeBarWrapper.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/history/awesomebar/AwesomeBarWrapper.kt
@ -56,8 +56,8 @@ class AwesomeBarWrapper @JvmOverloads constructor(
                colors = AwesomeBarDefaults.colors(
                    background = Color.Transparent,
                    title = ThemeManager.resolveAttributeColor(R.attr.textPrimary),
-                    description = ThemeManager.resolveAttributeColor(R.attr.secondaryText),
-                    autocompleteIcon = ThemeManager.resolveAttributeColor(R.attr.secondaryText)
+                    description = ThemeManager.resolveAttributeColor(R.attr.textSecondary),
+                    autocompleteIcon = ThemeManager.resolveAttributeColor(R.attr.textSecondary)
                ),
                onSuggestionClicked = { suggestion ->
                    suggestion.onSuggestionClicked?.invoke()
--- a/app/src/main/java/org/mozilla/fenix/library/history/toolbar/ToolbarView.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/history/toolbar/ToolbarView.kt
@ -59,7 +59,7 @@ class ToolbarView(

            edit.colors = edit.colors.copy(
                text = context.getColorFromAttr(R.attr.textPrimary),
-                hint = context.getColorFromAttr(R.attr.secondaryText),
+                hint = context.getColorFromAttr(R.attr.textSecondary),
                suggestionBackground = ContextCompat.getColor(
                    context,
                    R.color.suggestion_highlight_color
--- a/app/src/main/java/org/mozilla/fenix/onboarding/OnboardingRadioButton.kt
+++ b/app/src/main/java/org/mozilla/fenix/onboarding/OnboardingRadioButton.kt
@ -78,7 +78,7 @@ class OnboardingRadioButton(
        if (description != 0) {
            val spannableDescription = SpannableString(resources.getString(description))
            spannableDescription.setTextSize(context, DESCRIPTION_TEXT_SIZE)
-            spannableDescription.setTextColor(context, R.attr.secondaryText)
+            spannableDescription.setTextColor(context, R.attr.textSecondary)
            builder.append("\n")
            builder.append(spannableDescription)
        }
--- a/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarWrapper.kt
+++ b/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarWrapper.kt
@ -56,8 +56,8 @@ class AwesomeBarWrapper @JvmOverloads constructor(
                colors = AwesomeBarDefaults.colors(
                    background = Color.Transparent,
                    title = ThemeManager.resolveAttributeColor(R.attr.textPrimary),
-                    description = ThemeManager.resolveAttributeColor(R.attr.secondaryText),
-                    autocompleteIcon = ThemeManager.resolveAttributeColor(R.attr.secondaryText)
+                    description = ThemeManager.resolveAttributeColor(R.attr.textSecondary),
+                    autocompleteIcon = ThemeManager.resolveAttributeColor(R.attr.textSecondary)
                ),
                onSuggestionClicked = { suggestion ->
                    suggestion.onSuggestionClicked?.invoke()
--- a/app/src/main/java/org/mozilla/fenix/search/toolbar/ToolbarView.kt
+++ b/app/src/main/java/org/mozilla/fenix/search/toolbar/ToolbarView.kt
@ -86,7 +86,7 @@ class ToolbarView(

            edit.colors = edit.colors.copy(
                text = context.getColorFromAttr(R.attr.textPrimary),
-                hint = context.getColorFromAttr(R.attr.secondaryText),
+                hint = context.getColorFromAttr(R.attr.textSecondary),
                suggestionBackground = ContextCompat.getColor(
                    context,
                    R.color.suggestion_highlight_color
--- a/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsManagePhoneFeatureFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsManagePhoneFeatureFragment.kt
@ -246,7 +246,7 @@ class SitePermissionsManagePhoneFeatureFragment : Fragment() {
        val recommendedSpannable = SpannableString(subText)
        val subTextColor = ContextCompat.getColor(
            requireContext(),
-            ThemeManager.resolveAttribute(R.attr.secondaryText, requireContext())
+            ThemeManager.resolveAttribute(R.attr.textSecondary, requireContext())
        )

        recommendedSpannable.setSpan(
--- a/app/src/main/res/color/secondary_state_list_text_color.xml
+++ b/app/src/main/res/color/secondary_state_list_text_color.xml
@ -4,5 +4,5 @@
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
    <item android:state_enabled="false" android:color="?disabled" />
-    <item android:color="?secondaryText"/>
+    <item android:color="?attr/textSecondary"/>
 </selector>
--- a/app/src/main/res/color/tab_checkbox_tint.xml
+++ b/app/src/main/res/color/tab_checkbox_tint.xml
@ -2,6 +2,6 @@
   - License, v. 2.0. If a copy of the MPL was not distributed with this
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="?secondaryText" android:state_checked="false" />
+    <item android:color="?attr/textSecondary" android:state_checked="false" />
    <item android:color="?accent" android:state_checked="true" />
 </selector>
--- a/app/src/main/res/drawable/ic_all_tabs.xml
+++ b/app/src/main/res/drawable/ic_all_tabs.xml
@ -9,6 +9,6 @@
    android:viewportHeight="18">
  <path
      android:pathData="M0,2.5C0,1.119 1.119,0 2.5,0H15.5C16.881,0 18,1.119 18,2.5V10.5C18,11.881 16.881,13 15.5,13H2.5C1.119,13 0,11.881 0,10.5V2.5ZM15.7,11.5L16.5,10.7V2.3L15.7,1.5H2.3L1.5,2.3V10.7L2.3,11.5H15.7ZM1.5,15.7L2.3,16.5H15.7L16.5,15.7V14.75C16.5,14.336 16.836,14 17.25,14C17.664,14 18,14.336 18,14.75V15.5C18,16.881 16.881,18 15.5,18H2.5C1.119,18 0,16.881 0,15.5V14.75C0,14.336 0.336,14 0.75,14C1.164,14 1.5,14.336 1.5,14.75V15.7Z"
-      android:fillColor="?secondaryText"
+      android:fillColor="?attr/textSecondary"
      android:fillType="evenOdd"/>
 </vector>
--- a/app/src/main/res/layout/account_preference.xml
+++ b/app/src/main/res/layout/account_preference.xml
@ -46,7 +46,7 @@
            android:layout_height="wrap_content"
            android:layout_below="@id/displayName"
            android:layout_alignStart="@id/displayName"
-            android:textColor="?secondaryText"
+            android:textColor="?attr/textSecondary"
            android:maxLines="4"
            android:text="@string/preferences_account_default_name" />

--- a/app/src/main/res/layout/collection_tab_list_row.xml
+++ b/app/src/main/res/layout/collection_tab_list_row.xml
@ -43,7 +43,7 @@
            android:layout_marginStart="8dp"
            android:ellipsize="end"
            android:singleLine="true"
-            android:textColor="?secondaryText"
+            android:textColor="?attr/textSecondary"
            android:textSize="12sp"
            android:textStyle="bold"
            app:layout_constraintStart_toEndOf="@id/favicon_image"
--- a/app/src/main/res/layout/collections_list_item.xml
+++ b/app/src/main/res/layout/collections_list_item.xml
@ -56,7 +56,7 @@
            android:ellipsize="end"
            android:maxLines="2"
            android:minLines="2"
-            android:textColor="?secondaryText"
+            android:textColor="?attr/textSecondary"
            app:layout_constraintBottom_toBottomOf="parent"
            app:layout_constraintEnd_toEndOf="@+id/collection_item"
            app:layout_constraintStart_toStartOf="@+id/collection_item"
--- a/app/src/main/res/layout/component_bookmark.xml
+++ b/app/src/main/res/layout/component_bookmark.xml
@ -30,7 +30,7 @@
            android:layout_height="wrap_content"
            android:layout_gravity="center"
            android:text="@string/bookmarks_empty_message"
-            android:textColor="?secondaryText"
+            android:textColor="?attr/textSecondary"
            android:textSize="16sp"
            android:visibility="gone"
            app:layout_constraintBottom_toBottomOf="parent"
--- a/app/src/main/res/layout/component_downloads.xml
+++ b/app/src/main/res/layout/component_downloads.xml
@ -26,7 +26,7 @@
        android:layout_height="0dp"
        android:gravity="center"
        android:text="@string/download_empty_message_1"
-        android:textColor="?secondaryText"
+        android:textColor="?attr/textSecondary"
        android:textSize="16sp"
        android:visibility="gone"
        app:layout_constraintStart_toStartOf="parent"
--- a/app/src/main/res/layout/component_exceptions.xml
+++ b/app/src/main/res/layout/component_exceptions.xml
@ -22,7 +22,7 @@
            android:padding="4dp"
            android:text="@string/exceptions_empty_message_description"
            android:textAlignment="viewStart"
-            android:textColor="?secondaryText"
+            android:textColor="?attr/textSecondary"
            android:textSize="16sp"
            android:visibility="visible"
            app:layout_constraintTop_toTopOf="parent" />
@ -34,7 +34,7 @@
            android:padding="4dp"
            android:text="@string/exceptions_empty_message_learn_more_link"
            android:textAlignment="viewStart"
-            android:textColor="?secondaryText"
+            android:textColor="?attr/textSecondary"
            android:textSize="16sp"
            android:visibility="visible"
            app:layout_constraintTop_toBottomOf="@id/exceptions_empty_message" />
--- a/app/src/main/res/layout/component_history.xml
+++ b/app/src/main/res/layout/component_history.xml
@ -33,7 +33,7 @@
        android:layout_height="0dp"
        android:gravity="center"
        android:text="@string/history_empty_message"
-        android:textColor="?secondaryText"
+        android:textColor="?attr/textSecondary"
        android:textSize="16sp"
        android:visibility="gone"
        app:layout_constraintBottom_toBottomOf="parent"
--- a/app/src/main/res/layout/component_history_metadata_group.xml
+++ b/app/src/main/res/layout/component_history_metadata_group.xml
@ -14,7 +14,7 @@
        android:layout_height="0dp"
        android:gravity="center"
        android:text="@string/history_empty_message"
-        android:textColor="?secondaryText"
+        android:textColor="?attr/textSecondary"
        android:textSize="16sp"
        android:visibility="gone"
        app:layout_constraintBottom_toBottomOf="parent"
--- a/app/src/main/res/layout/component_recently_closed.xml
+++ b/app/src/main/res/layout/component_recently_closed.xml
@ -29,7 +29,7 @@
        android:layout_height="wrap_content"
        android:layout_gravity="center"
        android:text="@string/recently_closed_empty_message"
-        android:textColor="?secondaryText"
+        android:textColor="?attr/textSecondary"
        android:textSize="16sp"
        android:visibility="gone"
        app:layout_constraintBottom_toBottomOf="parent"
--- a/app/src/main/res/layout/component_saved_logins.xml
+++ b/app/src/main/res/layout/component_saved_logins.xml
@ -37,7 +37,7 @@
                android:layout_height="wrap_content"
                android:padding="4dp"
                android:text="@string/preferences_passwords_saved_logins_description_empty_text"
-                android:textColor="?secondaryText"
+                android:textColor="?attr/textSecondary"
                android:textSize="16sp"
                app:layout_constraintTop_toTopOf="parent"
                app:layout_constraintStart_toStartOf="parent" />
@ -48,7 +48,7 @@
                android:layout_height="wrap_content"
                android:padding="4dp"
                android:text="@string/preferences_passwords_saved_logins_description_empty_learn_more_link"
-                android:textColor="?secondaryText"
+                android:textColor="?attr/textSecondary"
                android:textSize="16sp"
                app:layout_constraintTop_toBottomOf="@id/saved_passwords_empty_message" />
        </androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/layout/component_tracking_protection_panel.xml
+++ b/app/src/main/res/layout/component_tracking_protection_panel.xml
@ -236,7 +236,7 @@
            android:layout_height="wrap_content"
            android:layout_marginStart="52dp"
            android:layout_marginEnd="19dp"
-            android:textColor="?secondaryText"
+            android:textColor="?attr/textSecondary"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toBottomOf="@id/category_title"
@ -250,7 +250,7 @@
            android:layout_marginEnd="19dp"
            android:layout_marginTop="8dp"
            android:layout_marginBottom="8dp"
-            android:textColor="?secondaryText"
+            android:textColor="?attr/textSecondary"
            android:visibility="gone"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
--- a/app/src/main/res/layout/credit_card_list_item.xml
+++ b/app/src/main/res/layout/credit_card_list_item.xml
@ -46,7 +46,7 @@
        android:layout_marginEnd="@dimen/credit_cards_saved_cards_item_margin_end"
        android:ellipsize="middle"
        android:singleLine="true"
-        android:textColor="?secondaryText"
+        android:textColor="?attr/textSecondary"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toEndOf="@+id/credit_card_logo"
--- a/app/src/main/res/layout/custom_search_engine.xml
+++ b/app/src/main/res/layout/custom_search_engine.xml
@ -20,8 +20,8 @@
        android:id="@+id/custom_search_engine_name_field"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
-        app:hintTextColor="?secondaryText"
-        android:textColorHint="?secondaryText"
+        app:hintTextColor="?attr/textSecondary"
+        android:textColorHint="?attr/textSecondary"
        app:hintTextAppearance="@style/EngineTextField"
        android:paddingBottom="8dp"
        app:errorEnabled="true">
@ -38,8 +38,8 @@
        android:id="@+id/custom_search_engine_search_string_field"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
-        app:hintTextColor="?secondaryText"
-        android:textColorHint="?secondaryText"
+        app:hintTextColor="?attr/textSecondary"
+        android:textColorHint="?attr/textSecondary"
        app:hintTextAppearance="@style/EngineTextField"
        android:paddingBottom="8dp"
        app:errorEnabled="true">
--- a/app/src/main/res/layout/fragment_add_ons_management.xml
+++ b/app/src/main/res/layout/fragment_add_ons_management.xml
@ -37,7 +37,7 @@
        android:layout_gravity="center"
        android:gravity="center"
        android:text="@string/no_add_ons"
-        android:textColor="?secondaryText"
+        android:textColor="?attr/textSecondary"
        android:textSize="16sp"
        android:visibility="gone"/>

--- a/app/src/main/res/layout/fragment_edit_bookmark.xml
+++ b/app/src/main/res/layout/fragment_edit_bookmark.xml
@ -43,7 +43,7 @@
        android:fadingEdgeLength="8dp"
        android:inputType="textAutoComplete"
        android:requiresFadingEdge="horizontal"
-        android:textColor="?secondaryText"
+        android:textColor="?attr/textSecondary"
        android:textSize="15sp"
        tools:text="Internet for people, not profit -- Mozilla" />

@ -74,7 +74,7 @@
            android:fadingEdgeLength="8dp"
            android:inputType="textUri"
            android:requiresFadingEdge="horizontal"
-            android:textColor="?secondaryText"
+            android:textColor="?attr/textSecondary"
            android:textSize="15sp"
            tools:text="https://www.mozilla.org/en-US/" />

@ -100,7 +100,7 @@
        android:layout_marginTop="8dp"
        android:drawablePadding="10dp"
        android:gravity="center_vertical"
-        android:textColor="?secondaryText"
+        android:textColor="?attr/textSecondary"
        android:textSize="16sp"
        app:drawableStartCompat="@drawable/ic_folder_icon"
        app:drawableTint="?attr/textPrimary"
--- a/app/src/main/res/layout/library_site_item.xml
+++ b/app/src/main/res/layout/library_site_item.xml
@ -62,7 +62,7 @@
            android:ellipsize="end"
            android:singleLine="true"
            android:textAlignment="viewStart"
-            android:textColor="?secondaryText"
+            android:textColor="?attr/textSecondary"
            android:textSize="12sp"
            tools:text="https://example.com/"
            app:layout_constraintEnd_toStartOf="@id/overflow_menu"
--- a/app/src/main/res/layout/locale_settings_item.xml
+++ b/app/src/main/res/layout/locale_settings_item.xml
@ -44,7 +44,7 @@
        android:layout_height="wrap_content"
        android:layout_marginStart="@dimen/locale_item_text_margin_start"
        android:layout_marginEnd="@dimen/locale_item_text_margin_end"
-        android:textColor="?secondaryText"
+        android:textColor="?attr/textSecondary"
        android:textAlignment="viewStart"
        android:textSize="@dimen/locale_item_subtitle_size"
        android:visibility="visible"
--- a/app/src/main/res/layout/logins_item.xml
+++ b/app/src/main/res/layout/logins_item.xml
@ -46,7 +46,7 @@
        android:layout_marginEnd="@dimen/saved_logins_item_margin_end"
        android:ellipsize="middle"
        android:singleLine="true"
-        android:textColor="?secondaryText"
+        android:textColor="?attr/textSecondary"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toEndOf="@+id/favicon_image"
--- a/app/src/main/res/layout/name_collection_dialog.xml
+++ b/app/src/main/res/layout/name_collection_dialog.xml
@ -17,7 +17,7 @@
        android:text="@string/tab_tray_add_new_collection_name"
        android:textAllCaps="true"
        android:textAppearance="@style/Body16TextStyle"
-        android:textColor="?secondaryText" />
+        android:textColor="?attr/textSecondary" />

    <EditText
        android:id="@+id/collection_name"
--- a/app/src/main/res/layout/no_collections_message.xml
+++ b/app/src/main/res/layout/no_collections_message.xml
@ -45,7 +45,7 @@
        android:layout_marginTop="4dp"
        android:text="@string/no_collections_description2"
        android:textAlignment="viewStart"
-        android:textColor="?secondaryText"
+        android:textColor="?attr/textSecondary"
        android:textSize="14sp"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintHorizontal_bias="0.0"
--- a/app/src/main/res/layout/normal_browser_tray_list.xml
+++ b/app/src/main/res/layout/normal_browser_tray_list.xml
@ -20,7 +20,7 @@
        android:gravity="center_horizontal"
        android:paddingTop="80dp"
        android:text="@string/no_open_tabs_description"
-        android:textColor="?secondaryText"
+        android:textColor="?attr/textSecondary"
        android:textSize="16sp"
        android:visibility="visible" />
 </FrameLayout>
--- a/app/src/main/res/layout/private_browser_tray_list.xml
+++ b/app/src/main/res/layout/private_browser_tray_list.xml
@ -20,7 +20,7 @@
        android:gravity="center_horizontal"
        android:paddingTop="80dp"
        android:text="@string/no_open_tabs_description"
-        android:textColor="?secondaryText"
+        android:textColor="?attr/textSecondary"
        android:textSize="16sp"
        android:visibility="visible" />
 </FrameLayout>
--- a/app/src/main/res/layout/recently_closed_nav_item.xml
+++ b/app/src/main/res/layout/recently_closed_nav_item.xml
@ -55,7 +55,7 @@
        android:ellipsize="end"
        android:singleLine="true"
        android:textAlignment="viewStart"
-        android:textColor="?secondaryText"
+        android:textColor="?attr/textSecondary"
        android:textSize="12sp"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
--- a/app/src/main/res/layout/settings_studies.xml
+++ b/app/src/main/res/layout/settings_studies.xml
@ -30,7 +30,7 @@
        android:layout_height="wrap_content"
        android:importantForAccessibility="no"
        android:text="@string/preference_experiments_summary_2"
-        android:textColor="?attr/secondaryText"
+        android:textColor="?attr/textSecondary"
        android:textColorLink="?textAccent"
        app:layout_constraintEnd_toEndOf="@id/studiesTitle"
        app:layout_constraintHorizontal_bias="0.5"
--- a/app/src/main/res/layout/share_to_account_devices.xml
+++ b/app/src/main/res/layout/share_to_account_devices.xml
@ -18,7 +18,7 @@
        android:singleLine="true"
        android:text="@string/share_device_subheader"
        android:textAllCaps="true"
-        android:textColor="?secondaryText"
+        android:textColor="?attr/textSecondary"
        android:textSize="12sp"
        android:textStyle="bold"
        app:layout_constraintStart_toStartOf="parent"
--- a/app/src/main/res/layout/study_item.xml
+++ b/app/src/main/res/layout/study_item.xml
@ -29,7 +29,7 @@
        android:id="@+id/study_description"
        android:layout_width="0dp"
        android:layout_height="wrap_content"
-        android:textColor="?secondaryText"
+        android:textColor="?attr/textSecondary"
        android:textSize="12sp"
        app:layout_constraintEnd_toStartOf="@id/remove_button"
        app:layout_constraintStart_toStartOf="@id/studyTitle"
--- a/app/src/main/res/layout/switch_with_description.xml
+++ b/app/src/main/res/layout/switch_with_description.xml
@ -35,7 +35,7 @@
        android:clickable="false"
        android:focusable="false"
        android:importantForAccessibility="no"
-        android:textColor="?attr/secondaryText"
+        android:textColor="?attr/textSecondary"
        android:layout_marginBottom="4dp"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="@id/trackingProtectionCategoryTitle"
--- a/app/src/main/res/layout/top_sites_rename_dialog.xml
+++ b/app/src/main/res/layout/top_sites_rename_dialog.xml
@ -17,7 +17,7 @@
        android:text="@string/top_sites_rename_dialog_title"
        android:textAllCaps="true"
        android:textAppearance="@style/Body16TextStyle"
-        android:textColor="?secondaryText" />
+        android:textColor="?attr/textSecondary" />

    <EditText
        android:id="@+id/top_site_title"
--- a/app/src/main/res/layout/tracking_protection_category.xml
+++ b/app/src/main/res/layout/tracking_protection_category.xml
@ -33,7 +33,7 @@
        android:layout_marginEnd="@dimen/library_item_icon_margin_horizontal"
        android:layout_marginBottom="@dimen/tracking_protection_item_margin_bottom"
        android:clickable="false"
-        android:textColor="?attr/secondaryText"
+        android:textColor="?attr/textSecondary"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintHorizontal_bias="0.5"
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@ -21,6 +21,8 @@
    <!-- Text -->
    <!-- Primary text -->
    <attr name="textPrimary" format="reference" />
+    <!-- Secondary text -->
+    <attr name="textSecondary" format="reference" />
    <!-- Small heading, Text link -->
    <attr name="textAccent" format="reference" />
    <!-- Action Primary text -->
@ -39,7 +41,6 @@
    <attr name="borderPrimary" format="reference" />

    <!-- Color palette attributes -->
-    <attr name="secondaryText" format="reference" />
    <attr name="contrastText" format="reference" />
    <attr name="accent" format="reference" />
    <attr name="accentBright" format="reference" />
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@ -49,6 +49,8 @@
        <!-- Text -->
        <!-- Primary text -->
        <item name="textPrimary">@color/fx_mobile_text_color_primary</item>
+        <!-- Secondary text -->
+        <item name="textSecondary">@color/fx_mobile_text_color_secondary</item>
        <!-- Small heading, Text link -->
        <item name="textAccent">@color/fx_mobile_text_color_accent</item>
        <!-- Action Primary text -->
@ -76,7 +78,6 @@
        <item name="colorControlNormal">@color/fx_mobile_text_color_primary</item>

        <!-- Updated color attributes -->
-        <item name="secondaryText">@color/fx_mobile_text_color_secondary</item>
        <item name="contrastText">@color/fx_mobile_text_color_oncolor_primary</item>
        <item name="accent">@color/accent_normal_theme</item>
        <item name="accentBright">@color/photonViolet70</item>
@ -242,6 +243,8 @@
        <!-- Text -->
        <!-- Primary text -->
        <item name="textPrimary">@color/fx_mobile_private_text_color_primary</item>
+        <!-- Secondary text -->
+        <item name="textSecondary">@color/fx_mobile_private_text_color_secondary</item>
        <!-- Small heading, Text link -->
        <item name="textAccent">@color/fx_mobile_private_text_color_accent</item>
        <!-- Action Primary text -->
@ -267,7 +270,6 @@
        <item name="colorControlNormal">@color/fx_mobile_private_text_color_primary</item>

        <!-- Updated color attributes -->
-        <item name="secondaryText">@color/fx_mobile_private_text_color_secondary</item>
        <item name="contrastText">@color/fx_mobile_private_text_color_primary</item>
        <item name="accent">@color/accent_private_theme</item>
        <item name="accentBright">@color/photonViolet70</item>
@ -340,7 +342,7 @@
        <item name="android:textAllCaps">false</item>
        <item name="backgroundTint">@color/fx_mobile_action_color_secondary</item>
        <item name="android:textColor">@color/fx_mobile_text_color_action_secondary</item>
-        <item name="rippleColor">?secondaryText</item>
+        <item name="rippleColor">?attr/textSecondary</item>
        <item name="android:letterSpacing">0</item>
        <item name="fontFamily">@font/metropolis_semibold</item>
    </style>
@ -447,7 +449,7 @@
    </style>

    <style name="Subtitle12TextStyle" parent="TextAppearance.MaterialComponents.Body1">
-        <item name="android:textColor">?secondaryText</item>
+        <item name="android:textColor">?attr/textSecondary</item>
        <item name="android:textSize">12sp</item>
        <item name="fontFamily">@font/metropolis_semibold</item>
    </style>
@ -475,7 +477,7 @@
    </style>

    <style name="QuickSettingsSmallText">
-        <item name="android:textColor">?secondaryText</item>
+        <item name="android:textColor">?attr/textSecondary</item>
        <item name="android:textSize">12sp</item>
        <item name="android:paddingEnd">16dp</item>
        <item name="android:gravity">top</item>
@ -557,7 +559,7 @@
    <style name="ShareHeaderTextStyle">
        <item name="android:singleLine">true</item>
        <item name="android:textAllCaps">true</item>
-        <item name="android:textColor">?secondaryText</item>
+        <item name="android:textColor">?attr/textSecondary</item>
        <item name="android:textSize">@dimen/share_header_text_size</item>
        <item name="android:textStyle">bold</item>
        <item name="fontFamily">@font/metropolis_semibold</item>