From b1bfa7330ff592bdb1cd3db77ed6794dbdab1a6a Mon Sep 17 00:00:00 2001
From: Gabriel Luong <gabriel.luong@gmail.com>
Date: Mon, 17 Jan 2022 01:22:33 -0500
Subject: [PATCH] [fenix] For
 https://github.com/mozilla-mobile/fenix/issues/23957 - Rename toolbarDivider
 attribute to borderPrimary

---
 .../java/org/mozilla/fenix/components/toolbar/BrowserToolbarView.kt | 2 +-
 .../main/res/drawable/inactive_tab_auto_close_border_background.xml | 2 +-
 .../main/res/drawable/rounded_grey_corners_transparent_center.xml   | 2 +-
 .../app/src/main/res/layout/component_bottom_browser_toolbar.xml    | 2 +-
 .../fenix/app/src/main/res/layout/component_browser_top_toolbar.xml | 2 +-
 .../app/src/main/res/layout/fragment_history_search_dialog.xml      | 2 +-
 .../fenix/app/src/main/res/layout/fragment_search_dialog.xml        | 2 +-
 mobile/android/fenix/app/src/main/res/values/attrs.xml              | 3 ++-
 mobile/android/fenix/app/src/main/res/values/styles.xml             | 6 ++++--
 9 files changed, 13 insertions(+), 10 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
index 78fa0a318baf..d20768721e7e 100644
--- 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
@@ -109,7 +109,7 @@ class BrowserToolbarView(
                 )
                 val separatorColor = ContextCompat.getColor(
                     context,
-                    ThemeManager.resolveAttribute(R.attr.toolbarDivider, context)
+                    ThemeManager.resolveAttribute(R.attr.borderPrimary, context)
                 )
 
                 display.urlFormatter = { url -> URLStringUtils.toDisplayUrl(url) }
diff --git a/mobile/android/fenix/app/src/main/res/drawable/inactive_tab_auto_close_border_background.xml b/mobile/android/fenix/app/src/main/res/drawable/inactive_tab_auto_close_border_background.xml
index bc80384e33be..c97d5329d0b9 100644
--- a/mobile/android/fenix/app/src/main/res/drawable/inactive_tab_auto_close_border_background.xml
+++ b/mobile/android/fenix/app/src/main/res/drawable/inactive_tab_auto_close_border_background.xml
@@ -6,7 +6,7 @@
     android:shape="rectangle">
     <stroke
         android:width="1dp"
-        android:color="?toolbarDivider" />
+        android:color="?borderPrimary" />
 
     <corners android:radius="8dp" />
 
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
index e803ff8df186..514a8c2372a9 100644
--- 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="?toolbarDivider"/>
+        android:color="?borderPrimary"/>
     <solid android:color="@android:color/transparent"/>
 </shape>
diff --git a/mobile/android/fenix/app/src/main/res/layout/component_bottom_browser_toolbar.xml b/mobile/android/fenix/app/src/main/res/layout/component_bottom_browser_toolbar.xml
index f1ce15a53183..4842972e0261 100644
--- a/mobile/android/fenix/app/src/main/res/layout/component_bottom_browser_toolbar.xml
+++ b/mobile/android/fenix/app/src/main/res/layout/component_bottom_browser_toolbar.xml
@@ -18,4 +18,4 @@
     app:browserToolbarMenuColor="?primaryText"
     app:browserToolbarProgressBarGravity="top"
     app:browserToolbarSecureColor="?primaryText"
-    app:browserToolbarTrackingProtectionAndSecurityIndicatorSeparatorColor="?toolbarDivider" />
+    app:browserToolbarTrackingProtectionAndSecurityIndicatorSeparatorColor="?borderPrimary" />
diff --git a/mobile/android/fenix/app/src/main/res/layout/component_browser_top_toolbar.xml b/mobile/android/fenix/app/src/main/res/layout/component_browser_top_toolbar.xml
index 0152ecdb1095..0739331bdf8b 100644
--- a/mobile/android/fenix/app/src/main/res/layout/component_browser_top_toolbar.xml
+++ b/mobile/android/fenix/app/src/main/res/layout/component_browser_top_toolbar.xml
@@ -19,4 +19,4 @@
     app:browserToolbarMenuColor="?primaryText"
     app:browserToolbarProgressBarGravity="bottom"
     app:browserToolbarSecureColor="?primaryText"
-    app:browserToolbarTrackingProtectionAndSecurityIndicatorSeparatorColor="?toolbarDivider" />
+    app:browserToolbarTrackingProtectionAndSecurityIndicatorSeparatorColor="?borderPrimary" />
diff --git a/mobile/android/fenix/app/src/main/res/layout/fragment_history_search_dialog.xml b/mobile/android/fenix/app/src/main/res/layout/fragment_history_search_dialog.xml
index 9635b4a47e38..49f862209caa 100644
--- a/mobile/android/fenix/app/src/main/res/layout/fragment_history_search_dialog.xml
+++ b/mobile/android/fenix/app/src/main/res/layout/fragment_history_search_dialog.xml
@@ -26,7 +26,7 @@
         app:browserToolbarMenuColor="?primaryText"
         app:browserToolbarProgressBarGravity="bottom"
         app:browserToolbarSecureColor="?primaryText"
-        app:browserToolbarTrackingProtectionAndSecurityIndicatorSeparatorColor="?toolbarDivider"
+        app:browserToolbarTrackingProtectionAndSecurityIndicatorSeparatorColor="?borderPrimary"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"/>
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
index d4747c157da4..f677ef10c029 100644
--- 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
@@ -25,7 +25,7 @@
         app:browserToolbarMenuColor="?primaryText"
         app:browserToolbarProgressBarGravity="bottom"
         app:browserToolbarSecureColor="?primaryText"
-        app:browserToolbarTrackingProtectionAndSecurityIndicatorSeparatorColor="?toolbarDivider"
+        app:browserToolbarTrackingProtectionAndSecurityIndicatorSeparatorColor="?borderPrimary"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"/>
diff --git a/mobile/android/fenix/app/src/main/res/values/attrs.xml b/mobile/android/fenix/app/src/main/res/values/attrs.xml
index 82c33dc6224e..4e1b6c5afcc6 100644
--- a/mobile/android/fenix/app/src/main/res/values/attrs.xml
+++ b/mobile/android/fenix/app/src/main/res/values/attrs.xml
@@ -10,6 +10,8 @@
     <attr name="textAccent" format="reference" />
     <!-- Active tab -->
     <attr name="iconActive" format="reference" />
+    <!-- Default, Divider, Dotted -->
+    <attr name="borderPrimary" format="reference" />
 
     <!-- Color palette attributes -->
     <attr name="primaryText" format="reference" />
@@ -29,7 +31,6 @@
     <attr name="disabled" format="reference" />
     <attr name="scrimStart" format="reference"/>
     <attr name="scrimEnd" format="reference"/>
-    <attr name="toolbarDivider" format="reference"/>
     <attr name="preferenceSectionHeader" format="reference"/>
 
     <!-- Color used in DefaultToolbarMenu for buttons placed at the end of menu items -->
diff --git a/mobile/android/fenix/app/src/main/res/values/styles.xml b/mobile/android/fenix/app/src/main/res/values/styles.xml
index 936928901912..211eeccb19fb 100644
--- a/mobile/android/fenix/app/src/main/res/values/styles.xml
+++ b/mobile/android/fenix/app/src/main/res/values/styles.xml
@@ -38,6 +38,8 @@
         <item name="textAccent">@color/fx_mobile_text_color_accent</item>
         <!-- Active tab -->
         <item name="iconActive">@color/fx_mobile_icon_color_active</item>
+        <!-- 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>
@@ -69,7 +71,6 @@
         <item name="toolbarStartGradient">@color/fx_mobile_layer_color_1</item>
         <item name="toolbarCenterGradient">@color/fx_mobile_layer_color_1</item>
         <item name="toolbarEndGradient">@color/fx_mobile_layer_color_1</item>
-        <item name="toolbarDivider">@color/fx_mobile_border_color_primary</item>
         <item name="fillLinkFromClipboard">@color/fill_link_from_clipboard_normal_theme</item>
         <item name="syncDisconnected">@color/sync_disconnected_icon_fill_normal_theme</item>
         <item name="syncDisconnectedBackground">@color/sync_disconnected_background_normal_theme</item>
@@ -217,6 +218,8 @@
         <item name="textAccent">@color/fx_mobile_private_text_color_accent</item>
         <!-- Active tab -->
         <item name="iconActive">@color/fx_mobile_private_icon_color_active</item>
+        <!-- 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>
@@ -246,7 +249,6 @@
         <item name="toolbarStartGradient">@color/fx_mobile_private_layer_color_4_start</item>
         <item name="toolbarCenterGradient">@color/fx_mobile_private_layer_color_4_center</item>
         <item name="toolbarEndGradient">@color/fx_mobile_private_layer_color_4_end</item>
-        <item name="toolbarDivider">@color/fx_mobile_private_border_color_primary</item>
         <item name="fillLinkFromClipboard">@color/accent_high_contrast_private_theme</item>
         <item name="syncDisconnected">@color/sync_disconnected_icon_fill_private_theme</item>
         <item name="syncDisconnectedBackground">@color/sync_disconnected_background_private_theme</item>
-- 
2.11.4.GIT