From b29f330cb98f253b46ac8db9cfa89b6b18b7ae92 Mon Sep 17 00:00:00 2001
From: Gabriel Luong <gabriel.luong@gmail.com>
Date: Mon, 28 Feb 2022 23:07:07 -0500
Subject: [PATCH] [fenix] For
 https://github.com/mozilla-mobile/fenix/issues/24055 - Replace ?inset with
 Action Primary color Primary Buttons

---
 app/src/main/res/drawable/rounded_button_background.xml | 2 +-
 app/src/main/res/values-night/colors.xml                | 1 -
 app/src/main/res/values/attrs.xml                       | 1 -
 app/src/main/res/values/colors.xml                      | 1 -
 app/src/main/res/values/styles.xml                      | 2 --
 5 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/app/src/main/res/drawable/rounded_button_background.xml b/app/src/main/res/drawable/rounded_button_background.xml
index 61376f409f..63845527d5 100644
--- a/app/src/main/res/drawable/rounded_button_background.xml
+++ b/app/src/main/res/drawable/rounded_button_background.xml
@@ -12,7 +12,7 @@
     </item>
     <item>
         <shape android:shape="rectangle">
-            <solid android:color="?inset" />
+            <solid android:color="?actionPrimary" />
             <corners android:radius="4dp" />
         </shape>
     </item>
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index cc4fb627a3..bcdb92e25a 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -121,7 +121,6 @@
     <color name="fx_mobile_border_color_warning" tools:ignore="UnusedResources">@color/photonRed40</color>
 
     <!-- Normal theme colors for dark mode -->
-    <color name="inset_normal_theme">@color/photonDarkGrey50</color>
     <color name="accent_normal_theme">@color/photonViolet50</color>
     <color name="accent_high_contrast_normal_theme">@color/photonViolet40</color>
     <color name="neutral_normal_theme">@color/photonGrey20</color>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index dbae8eb98d..3fc3f6de5a 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -41,7 +41,6 @@
     <attr name="snackbar" format="reference" />
     <attr name="foundation" format="reference" />
     <attr name="above" format="reference" />
-    <attr name="inset" format="reference" />
     <attr name="neutral" format="reference" />
     <attr name="neutralFaded" format="reference" />
     <attr name="destructive" format="reference"/>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 630aa42cdc..bd7a028965 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -264,7 +264,6 @@
     <color name="prompt_login_edit_text_cursor_color_private_theme">@color/photonViolet50</color>
 
     <!-- Normal theme colors for light mode -->
-    <color name="inset_normal_theme">@color/photonLightGrey30</color>
     <color name="accent_normal_theme">@color/photonInk20</color>
     <color name="accent_high_contrast_normal_theme">@color/photonInk20</color>
     <color name="neutral_normal_theme">@color/photonGrey30</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index e0691455c2..420240680d 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -76,7 +76,6 @@
         <item name="accentHighContrast">@color/accent_high_contrast_normal_theme</item>
         <item name="foundation">@color/fx_mobile_layer_color_1</item>
         <item name="above">@color/fx_mobile_layer_color_2</item>
-        <item name="inset">@color/inset_normal_theme</item>
         <item name="neutral">@color/neutral_normal_theme</item>
         <item name="neutralFaded">@color/neutral_faded_normal_theme</item>
         <item name="destructive">@color/fx_mobile_text_color_warning</item>
@@ -269,7 +268,6 @@
         <item name="accentHighContrast">@color/accent_high_contrast_private_theme</item>
         <item name="foundation">@color/fx_mobile_private_layer_color_1</item>
         <item name="above">@color/fx_mobile_private_layer_color_1</item>
-        <item name="inset">@color/fx_mobile_private_layer_color_1</item>
         <item name="neutral">@color/neutral_private_theme</item>
         <item name="neutralFaded">@color/neutral_faded_private_theme</item>
         <item name="destructive">@color/fx_mobile_private_text_color_warning</item>