commit 94fbad9098b394949382e03f36405bae7a38f242 parent 49347f1b76a85809f0e8f7fa9bc39670f94380bc Author: Gabriel Luong <gabriel.luong@gmail.com> Date: Wed, 17 Dec 2025 07:03:03 +0000 Bug 2005850 - Part 1: Migrate borderPrimary to outlineVariant M3 color token in XML r=android-reviewers,007 Differential Revision: https://phabricator.services.mozilla.com/D276384 Diffstat:
19 files changed, 42 insertions(+), 61 deletions(-)
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarView.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarView.kt @@ -33,6 +33,7 @@ import org.mozilla.fenix.utils.Settings import org.mozilla.fenix.utils.ToolbarPopupWindow import org.mozilla.fenix.utils.getAppNightMode import java.lang.ref.WeakReference +import com.google.android.material.R as materialR /** * A wrapper over [BrowserToolbar] to allow extra customisation and behavior. @@ -235,7 +236,7 @@ class BrowserToolbarView( ) val separatorColor = ContextCompat.getColor( context, - ThemeManager.resolveAttribute(R.attr.borderPrimary, context), + ThemeManager.resolveAttribute(materialR.attr.colorOutlineVariant, context), ) toolbar.display.colors = toolbar.display.colors.copy( diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_toolbar_expanded_shortcut_preview.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_toolbar_expanded_shortcut_preview.xml @@ -16,26 +16,26 @@ android:pathData="M6,1L298,1A5,5 0,0 1,303 6L303,41.61A5,5 0,0 1,298 46.61L6,46.61A5,5 0,0 1,1 41.61L1,6A5,5 0,0 1,6 1z" android:strokeWidth="2" android:fillColor="@android:color/transparent" - android:strokeColor="@color/fx_mobile_border_color_primary"/> + android:strokeColor="?attr/colorOutlineVariant"/> <group> <clip-path android:pathData="M29,8L52.61,8A4,4 0,0 1,56.61 12L56.61,35.61A4,4 0,0 1,52.61 39.61L29,39.61A4,4 0,0 1,25 35.61L25,12A4,4 0,0 1,29 8z"/> <path android:pathData="M29,8L52.61,8A4,4 0,0 1,56.61 12L56.61,35.61A4,4 0,0 1,52.61 39.61L29,39.61A4,4 0,0 1,25 35.61L25,12A4,4 0,0 1,29 8z" - android:fillColor="@color/fx_mobile_primary_container"/> + android:fillColor="?attr/colorPrimaryContainer"/> </group> <path android:strokeWidth="1" android:pathData="M29,8.5L52.61,8.5A3.5,3.5 0,0 1,56.11 12L56.11,35.61A3.5,3.5 0,0 1,52.61 39.11L29,39.11A3.5,3.5 0,0 1,25.5 35.61L25.5,12A3.5,3.5 0,0 1,29 8.5z" android:fillColor="@android:color/transparent" - android:strokeColor="@color/fx_mobile_text_color_accent"/> + android:strokeColor="?attr/colorTertiary"/> <group> <clip-path android:pathData="M96.65,7.3L96.65,7.3A16.5,16.5 0,0 1,113.16 23.81L113.16,23.81A16.5,16.5 0,0 1,96.65 40.31L96.65,40.31A16.5,16.5 0,0 1,80.15 23.81L80.15,23.81A16.5,16.5 0,0 1,96.65 7.3z"/> <path android:pathData="M98.3,19.27C98.3,17.67 99.6,16.38 101.19,16.38C102.79,16.38 104.08,17.67 104.08,19.27C104.08,20.86 102.79,22.16 101.19,22.16C100.36,22.16 99.61,21.8 99.09,21.24L94.92,23.1C94.97,23.33 95,23.56 95,23.81C95,24.05 94.97,24.29 94.91,24.52L99.08,26.38C99.61,25.81 100.36,25.46 101.19,25.46C102.79,25.46 104.08,26.75 104.08,28.34C104.08,29.94 102.79,31.23 101.19,31.23C99.6,31.23 98.3,29.94 98.3,28.34C98.3,28.1 98.33,27.87 98.39,27.65L94.21,25.79C93.69,26.35 92.94,26.69 92.11,26.69C90.52,26.69 89.23,25.4 89.23,23.81C89.23,22.21 90.52,20.92 92.11,20.92C92.94,20.92 93.69,21.27 94.22,21.83L98.39,19.97C98.33,19.75 98.3,19.51 98.3,19.27ZM101.19,17.82C100.39,17.82 99.75,18.47 99.75,19.27C99.75,20.06 100.39,20.71 101.19,20.71C101.99,20.71 102.64,20.06 102.64,19.27C102.64,18.47 101.99,17.82 101.19,17.82ZM92.11,22.36C91.32,22.36 90.67,23.01 90.67,23.81C90.67,24.6 91.32,25.25 92.11,25.25C92.91,25.25 93.56,24.6 93.56,23.81C93.56,23.01 92.91,22.36 92.11,22.36ZM99.75,28.34C99.75,27.55 100.39,26.9 101.19,26.9C101.99,26.9 102.64,27.55 102.64,28.34C102.64,29.14 101.99,29.79 101.19,29.79C100.39,29.79 99.75,29.14 99.75,28.34Z" android:strokeAlpha="0.8" - android:fillColor="@color/fx_mobile_on_surface_variant" + android:fillColor="?attr/colorOnSurfaceVariant" android:fillType="evenOdd" android:fillAlpha="0.8"/> </group> @@ -45,7 +45,7 @@ <path android:pathData="M151.78,24.53V31.03H153.22V24.53H159.72V23.08H153.22V16.58H151.78V23.08H145.28V24.53H151.78Z" android:strokeAlpha="0.8" - android:fillColor="@color/fx_mobile_on_surface_variant" + android:fillColor="?attr/colorOnSurfaceVariant" android:fillAlpha="0.8"/> </group> <group> @@ -54,13 +54,13 @@ <path android:pathData="M202.15,18.55C201.81,18.55 201.54,18.82 201.54,19.16V28.45C201.54,28.79 201.81,29.07 202.15,29.07H214.54C214.88,29.07 215.15,28.79 215.15,28.45V19.16C215.15,18.82 214.88,18.55 214.54,18.55H202.15ZM200.09,19.16C200.09,18.02 201.01,17.1 202.15,17.1H214.54C215.67,17.1 216.6,18.02 216.6,19.16V28.45C216.6,29.59 215.67,30.51 214.54,30.51H202.15C201.01,30.51 200.09,29.59 200.09,28.45V19.16Z" android:strokeAlpha="0.8" - android:fillColor="@color/fx_mobile_on_surface_variant" + android:fillColor="?attr/colorOnSurfaceVariant" android:fillType="evenOdd" android:fillAlpha="0.8"/> <path android:pathData="M209.43,21.2V27.2H208.16V22.41H208.12L206.75,23.27V22.14L208.23,21.2H209.43Z" android:strokeAlpha="0.8" - android:fillColor="@color/fx_mobile_on_surface_variant" + android:fillColor="?attr/colorOnSurfaceVariant" android:fillAlpha="0.8"/> </group> <group> @@ -69,17 +69,17 @@ <path android:pathData="M264.19,28.34C263.63,28.34 263.16,28.81 263.16,29.38C263.16,29.95 263.63,30.41 264.19,30.41C264.76,30.41 265.23,29.95 265.23,29.38C265.23,28.81 264.76,28.34 264.19,28.34Z" android:strokeAlpha="0.8" - android:fillColor="@color/fx_mobile_on_surface_variant" + android:fillColor="?attr/colorOnSurfaceVariant" android:fillAlpha="0.8"/> <path android:pathData="M264.19,22.77C263.63,22.77 263.16,23.24 263.16,23.81C263.16,24.38 263.63,24.84 264.19,24.84C264.76,24.84 265.23,24.38 265.23,23.81C265.23,23.24 264.76,22.77 264.19,22.77Z" android:strokeAlpha="0.8" - android:fillColor="@color/fx_mobile_on_surface_variant" + android:fillColor="?attr/colorOnSurfaceVariant" android:fillAlpha="0.8"/> <path android:pathData="M264.19,17.2C263.63,17.2 263.16,17.67 263.16,18.24C263.16,18.81 263.63,19.27 264.19,19.27C264.76,19.27 265.23,18.81 265.23,18.24C265.23,17.67 264.76,17.2 264.19,17.2Z" android:strokeAlpha="0.8" - android:fillColor="@color/fx_mobile_on_surface_variant" + android:fillColor="?attr/colorOnSurfaceVariant" android:fillAlpha="0.8"/> </group> </vector> diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_toolbar_simple_shortcut_preview.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_toolbar_simple_shortcut_preview.xml @@ -16,7 +16,7 @@ android:strokeWidth="1" android:pathData="M5,0.5L297,0.5A4.5,4.5 0,0 1,301.5 5L301.5,44.61A4.5,4.5 0,0 1,297 49.11L5,49.11A4.5,4.5 0,0 1,0.5 44.61L0.5,5A4.5,4.5 0,0 1,5 0.5z" android:fillColor="@android:color/transparent" - android:strokeColor="@color/fx_mobile_border_color_primary"/> + android:strokeColor="?attr/colorOutlineVariant"/> <path android:pathData="M7,1.5L295,1.5A5.5,5.5 0,0 1,300.5 7L300.5,42.61A5.5,5.5 0,0 1,295 48.11L7,48.11A5.5,5.5 0,0 1,1.5 42.61L1.5,7A5.5,5.5 0,0 1,7 1.5z" android:fillColor="@color/fx_mobile_layer_color_2"/> @@ -24,7 +24,7 @@ android:pathData="M7,1.5L295,1.5A5.5,5.5 0,0 1,300.5 7L300.5,42.61A5.5,5.5 0,0 1,295 48.11L7,48.11A5.5,5.5 0,0 1,1.5 42.61L1.5,7A5.5,5.5 0,0 1,7 1.5z" android:strokeWidth="3" android:fillColor="@android:color/transparent" - android:strokeColor="@color/fx_mobile_border_color_primary"/> + android:strokeColor="?attr/colorOutlineVariant"/> <group> <clip-path android:pathData="M20.81,9L162.36,9A15.81,15.81 0,0 1,178.16 24.81L178.16,24.81A15.81,15.81 0,0 1,162.36 40.61L20.81,40.61A15.81,15.81 0,0 1,5 24.81L5,24.81A15.81,15.81 0,0 1,20.81 9z"/> @@ -37,26 +37,26 @@ android:pathData="M186.16,9L209.78,9A4,4 0,0 1,213.78 13L213.78,36.61A4,4 0,0 1,209.78 40.61L186.16,40.61A4,4 0,0 1,182.16 36.61L182.16,13A4,4 0,0 1,186.16 9z"/> <path android:pathData="M186.16,9L209.78,9A4,4 0,0 1,213.78 13L213.78,36.61A4,4 0,0 1,209.78 40.61L186.16,40.61A4,4 0,0 1,182.16 36.61L182.16,13A4,4 0,0 1,186.16 9z" - android:fillColor="@color/fx_mobile_primary_container"/> + android:fillColor="?attr/colorPrimaryContainer"/> </group> <path android:strokeWidth="1" android:pathData="M186.16,9.5L209.78,9.5A3.5,3.5 0,0 1,213.28 13L213.28,36.61A3.5,3.5 0,0 1,209.78 40.11L186.16,40.11A3.5,3.5 0,0 1,182.66 36.61L182.66,13A3.5,3.5 0,0 1,186.16 9.5z" android:fillColor="@android:color/transparent" - android:strokeColor="@color/fx_mobile_text_color_accent"/> + android:strokeColor="?attr/colorTertiary"/> <group> <clip-path android:pathData="M237.58,8.3L237.58,8.3A16.5,16.5 0,0 1,254.09 24.81L254.09,24.81A16.5,16.5 0,0 1,237.58 41.31L237.58,41.31A16.5,16.5 0,0 1,221.08 24.81L221.08,24.81A16.5,16.5 0,0 1,237.58 8.3z"/> <path android:pathData="M231.38,19.54C231.05,19.54 230.77,19.82 230.77,20.16V29.45C230.77,29.79 231.05,30.07 231.38,30.07H243.77C244.11,30.07 244.39,29.79 244.39,29.45V20.16C244.39,19.82 244.11,19.54 243.77,19.54H231.38ZM229.33,20.16C229.33,19.02 230.25,18.1 231.38,18.1H243.77C244.91,18.1 245.83,19.02 245.83,20.16V29.45C245.83,30.59 244.91,31.51 243.77,31.51H231.38C230.25,31.51 229.33,30.59 229.33,29.45V20.16Z" android:strokeAlpha="0.8" - android:fillColor="@color/fx_mobile_on_surface_variant" + android:fillColor="?attr/colorOnSurfaceVariant" android:fillType="evenOdd" android:fillAlpha="0.8"/> <path android:pathData="M238.66,22.2V28.2H237.39V23.41H237.36L235.98,24.27V23.14L237.47,22.2H238.66Z" android:strokeAlpha="0.8" - android:fillColor="@color/fx_mobile_on_surface_variant" + android:fillColor="?attr/colorOnSurfaceVariant" android:fillAlpha="0.8"/> </group> <group> @@ -65,17 +65,17 @@ <path android:pathData="M277.19,29.34C276.62,29.34 276.16,29.81 276.16,30.38C276.16,30.95 276.62,31.41 277.19,31.41C277.76,31.41 278.23,30.95 278.23,30.38C278.23,29.81 277.76,29.34 277.19,29.34Z" android:strokeAlpha="0.8" - android:fillColor="@color/fx_mobile_on_surface_variant" + android:fillColor="?attr/colorOnSurfaceVariant" android:fillAlpha="0.8"/> <path android:pathData="M277.19,23.77C276.62,23.77 276.16,24.24 276.16,24.81C276.16,25.38 276.62,25.84 277.19,25.84C277.76,25.84 278.23,25.38 278.23,24.81C278.23,24.24 277.76,23.77 277.19,23.77Z" android:strokeAlpha="0.8" - android:fillColor="@color/fx_mobile_on_surface_variant" + android:fillColor="?attr/colorOnSurfaceVariant" android:fillAlpha="0.8"/> <path android:pathData="M277.19,18.2C276.62,18.2 276.16,18.67 276.16,19.24C276.16,19.81 276.62,20.27 277.19,20.27C277.76,20.27 278.23,19.81 278.23,19.24C278.23,18.67 277.76,18.2 277.19,18.2Z" android:strokeAlpha="0.8" - android:fillColor="@color/fx_mobile_on_surface_variant" + android:fillColor="?attr/colorOnSurfaceVariant" android:fillAlpha="0.8"/> </group> </vector> diff --git a/mobile/android/fenix/app/src/main/res/drawable/rounded_grey_corners_transparent_center.xml b/mobile/android/fenix/app/src/main/res/drawable/rounded_grey_corners_transparent_center.xml @@ -8,6 +8,6 @@ android:radius="4dp"/> <stroke android:width="1dp" - android:color="?borderPrimary"/> + android:color="?attr/colorOutlineVariant"/> <solid android:color="@android:color/transparent"/> </shape> diff --git a/mobile/android/fenix/app/src/main/res/layout/add_new_collection_dialog.xml b/mobile/android/fenix/app/src/main/res/layout/add_new_collection_dialog.xml @@ -14,7 +14,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_marginTop="16dp" - android:background="?borderPrimary" /> + android:background="?attr/colorOutlineVariant" /> <ScrollView android:id="@+id/scroll_view" @@ -33,5 +33,5 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_marginBottom="8dp" - android:background="?borderPrimary" /> + android:background="?attr/colorOutlineVariant" /> </LinearLayout> diff --git a/mobile/android/fenix/app/src/main/res/layout/component_tracking_protection_panel.xml b/mobile/android/fenix/app/src/main/res/layout/component_tracking_protection_panel.xml @@ -199,7 +199,7 @@ android:id="@+id/line_divider" android:layout_width="match_parent" android:layout_height="1dp" - android:background="?borderPrimary" + android:background="?attr/colorOutlineVariant" app:layout_constraintTop_toBottomOf="@id/tracking_content_loaded" /> <TextView @@ -290,7 +290,7 @@ android:layout_height="1dp" android:layout_marginTop="12dp" android:layout_marginBottom="8dp" - android:background="?borderPrimary" + android:background="?attr/colorOutlineVariant" app:layout_constraintTop_toBottomOf="@id/smartblock_learn_more" /> <androidx.appcompat.widget.LinearLayoutCompat diff --git a/mobile/android/fenix/app/src/main/res/layout/fragment_create_shortcut.xml b/mobile/android/fenix/app/src/main/res/layout/fragment_create_shortcut.xml @@ -54,7 +54,7 @@ android:layout_height="wrap_content" android:layout_marginStart="8dp" android:layout_marginEnd="32dp" - android:backgroundTint="?borderPrimary" + android:backgroundTint="?attr/colorOutlineVariant" android:hint="@string/add_to_homescreen_text_placeholder" android:importantForAutofill="no" android:inputType="text" diff --git a/mobile/android/fenix/app/src/main/res/layout/fragment_create_xiaomi_shortcut.xml b/mobile/android/fenix/app/src/main/res/layout/fragment_create_xiaomi_shortcut.xml @@ -54,7 +54,7 @@ android:layout_height="wrap_content" android:layout_marginStart="8dp" android:layout_marginEnd="32dp" - android:backgroundTint="?borderPrimary" + android:backgroundTint="?attr/colorOutlineVariant" android:hint="@string/add_to_homescreen_text_placeholder" android:importantForAutofill="no" android:inputType="text" diff --git a/mobile/android/fenix/app/src/main/res/layout/fragment_quick_settings_dialog_sheet.xml b/mobile/android/fenix/app/src/main/res/layout/fragment_quick_settings_dialog_sheet.xml @@ -34,7 +34,7 @@ android:layout_height="1dp" android:layout_marginTop="8dp" android:layout_marginBottom="8dp" - android:background="?borderPrimary" + android:background="?attr/colorOutlineVariant" app:layout_constraintBottom_toTopOf="@id/websitePermissionsLayout" /> <FrameLayout @@ -49,7 +49,7 @@ android:layout_height="1dp" android:layout_marginTop="8dp" android:layout_marginBottom="8dp" - android:background="?borderPrimary" + android:background="?attr/colorOutlineVariant" app:layout_constraintBottom_toTopOf="@id/trackingProtectionLayout" /> <FrameLayout @@ -64,7 +64,7 @@ android:layout_height="1dp" android:layout_marginTop="8dp" android:layout_marginBottom="8dp" - android:background="?borderPrimary" + android:background="?attr/colorOutlineVariant" app:layout_constraintBottom_toTopOf="@id/clearSiteDataLayout" /> <androidx.constraintlayout.widget.Group diff --git a/mobile/android/fenix/app/src/main/res/layout/fragment_search_dialog.xml b/mobile/android/fenix/app/src/main/res/layout/fragment_search_dialog.xml @@ -40,7 +40,7 @@ android:id="@+id/search_suggestions_hint_divider" android:layout_width="match_parent" android:layout_height="1dp" - android:background="?borderPrimary" + android:background="?attr/colorOutlineVariant" android:visibility="gone" app:layout_constraintBottom_toBottomOf="@id/search_suggestions_hint" app:layout_constraintEnd_toEndOf="parent" @@ -139,13 +139,13 @@ android:id="@+id/fill_link_divider" android:layout_width="match_parent" android:layout_height="1dp" - android:background="?borderPrimary" + android:background="?attr/colorOutlineVariant" app:layout_constraintTop_toBottomOf="@id/fill_link_from_clipboard" /> <View android:id="@+id/keyboard_divider" android:layout_width="match_parent" android:layout_height="1dp" - android:background="?borderPrimary" + android:background="?attr/colorOutlineVariant" app:layout_constraintBottom_toBottomOf="parent" /> </org.mozilla.fenix.perf.SearchDialogFragmentConstraintLayout> diff --git a/mobile/android/fenix/app/src/main/res/layout/fragment_share.xml b/mobile/android/fenix/app/src/main/res/layout/fragment_share.xml @@ -51,7 +51,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_marginTop="8dp" - android:background="?borderPrimary" + android:background="?attr/colorOutlineVariant" app:layout_constraintBottom_toTopOf="@id/appsShareLayout" /> <View @@ -59,7 +59,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_marginTop="8dp" - android:background="?borderPrimary" + android:background="?attr/colorOutlineVariant" app:layout_constraintTop_toBottomOf="@id/appsShareLayout" /> <androidx.compose.ui.platform.ComposeView diff --git a/mobile/android/fenix/app/src/main/res/layout/name_collection_dialog.xml b/mobile/android/fenix/app/src/main/res/layout/name_collection_dialog.xml @@ -26,7 +26,7 @@ android:layout_marginStart="24dp" android:layout_marginEnd="24dp" android:autofillHints="false" - android:backgroundTint="?borderPrimary" + android:backgroundTint="?attr/colorOutlineVariant" android:hint="@string/collection_name_hint" android:inputType="textCapSentences" android:singleLine="true" diff --git a/mobile/android/fenix/app/src/main/res/layout/preference_divider.xml b/mobile/android/fenix/app/src/main/res/layout/preference_divider.xml @@ -13,7 +13,7 @@ android:layout_width="0dp" android:layout_height="1dp" android:layout_marginTop="8dp" - android:background="?borderPrimary" + android:background="?attr/colorOutlineVariant" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/mobile/android/fenix/app/src/main/res/layout/preference_widget_radiobutton_with_info.xml b/mobile/android/fenix/app/src/main/res/layout/preference_widget_radiobutton_with_info.xml @@ -60,7 +60,7 @@ android:id="@+id/vertical_divider" android:layout_width="1dp" android:layout_height="0dp" - android:background="?borderPrimary" + android:background="?attr/colorOutlineVariant" android:paddingStart="1dp" android:paddingEnd="1dp" app:layout_constraintBottom_toBottomOf="parent" diff --git a/mobile/android/fenix/app/src/main/res/layout/top_sites_edit_dialog.xml b/mobile/android/fenix/app/src/main/res/layout/top_sites_edit_dialog.xml @@ -27,7 +27,7 @@ android:layout_marginStart="24dp" android:layout_marginEnd="24dp" android:autofillHints="false" - android:backgroundTint="?borderPrimary" + android:backgroundTint="?attr/colorOutlineVariant" android:hint="@string/shortcut_name_hint" android:inputType="textCapSentences" android:singleLine="true" @@ -58,7 +58,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:autofillHints="false" - android:backgroundTint="?borderPrimary" + android:backgroundTint="?attr/colorOutlineVariant" android:hint="@string/shortcut_url_hint" android:inputType="textUri" android:singleLine="true" /> diff --git a/mobile/android/fenix/app/src/main/res/values-night/colors.xml b/mobile/android/fenix/app/src/main/res/values-night/colors.xml @@ -126,8 +126,6 @@ <color name="fx_mobile_icon_color_gradient_end">@color/photonBlue20</color> <!-- Border --> - <!-- Default, Divider, Dotted --> - <color name="fx_mobile_border_color_primary">@color/photonDarkGrey05</color> <!-- Active tab (Nav), Selected tab, Active form --> <color name="fx_mobile_border_color_accent">@color/photonViolet40</color> diff --git a/mobile/android/fenix/app/src/main/res/values/attrs.xml b/mobile/android/fenix/app/src/main/res/values/attrs.xml @@ -40,10 +40,6 @@ <!-- Icon inverted (on color) --> <attr name="iconOnColor" format="reference" /> - <!-- Border --> - <!-- Default, Divider, Dotted --> - <attr name="borderPrimary" format="reference" /> - <!-- Color palette attributes --> <attr name="accent" format="reference" /> <attr name="accentBright" format="reference" /> diff --git a/mobile/android/fenix/app/src/main/res/values/colors.xml b/mobile/android/fenix/app/src/main/res/values/colors.xml @@ -126,8 +126,6 @@ <color name="fx_mobile_icon_color_gradient_end">@color/photonBlue60</color> <!-- Border --> - <!-- Default, Divider, Dotted --> - <color name="fx_mobile_border_color_primary">@color/photonLightGrey30</color> <!-- Active tab (Nav), Selected tab, Active form --> <color name="fx_mobile_border_color_accent">@color/photonInk20</color> @@ -217,10 +215,6 @@ <color name="fx_mobile_private_icon_color_oncolor">@color/photonLightGrey05</color> <color name="fx_mobile_private_icon_color_critical">@color/photonRed20</color> - <!-- Border --> - <!-- Default, Divider, Dotted --> - <color name="fx_mobile_private_border_color_primary">@color/photonInk05</color> - <!-- Light theme color palette --> <color name="primary_text_light_theme">@color/photonInk80</color> <color name="dark_grey_90_gradient_start">@color/photonDarkGrey90</color> diff --git a/mobile/android/fenix/app/src/main/res/values/styles.xml b/mobile/android/fenix/app/src/main/res/values/styles.xml @@ -126,10 +126,6 @@ <!-- Icon inverted (on color) --> <item name="iconOnColor">@color/fx_mobile_icon_color_oncolor</item> - <!-- Border --> - <!-- Default, Divider, Dotted --> - <item name="borderPrimary">@color/fx_mobile_border_color_primary</item> - <!-- Active thumb color & Active track color (30% transparency) --> <item name="colorControlActivated">@color/accent_high_contrast_normal_theme</item> <!-- Inactive thumb color --> @@ -163,7 +159,7 @@ <item name="mozac_primary_text_color">@color/fx_mobile_text_color_primary</item> <item name="mozac_caption_text_color">@color/fx_mobile_text_color_secondary</item> <item name="mozac_widget_favicon_background_color">@color/fx_mobile_layer_color_2</item> - <item name="mozac_widget_favicon_border_color">@color/fx_mobile_border_color_primary</item> + <item name="mozac_widget_favicon_border_color">@color/fx_mobile_outline_variant</item> <!-- Drawables --> <item name="fenixLogo">@drawable/ic_logo_wordmark_normal</item> @@ -412,10 +408,6 @@ <!-- Icon inverted (on color) --> <item name="iconOnColor">@color/fx_mobile_private_icon_color_oncolor</item> - <!-- Border --> - <!-- Default, Divider, Dotted --> - <item name="borderPrimary">@color/fx_mobile_private_border_color_primary</item> - <!-- Inactive thumb color --> <item name="colorSwitchThumbNormal">@color/toggle_off_knob_dark_theme</item> <!-- Inactive track color(30% transparency) -->