From 7449a72feb99aa92fa12ac109a4532c7ba60b49f Mon Sep 17 00:00:00 2001
From: Gabriel Luong <gabriel.luong@gmail.com>
Date: Thu, 23 Dec 2021 14:08:47 -0500
Subject: [PATCH] [fenix] For
 https://github.com/mozilla-mobile/fenix/issues/22965 - Remove Control Dark
 design color token

---
 .../app/src/main/java/org/mozilla/fenix/theme/FirefoxTheme.kt     | 8 --------
 mobile/android/fenix/app/src/main/res/values-night/colors.xml     | 2 --
 mobile/android/fenix/app/src/main/res/values/colors.xml           | 2 --
 3 files changed, 12 deletions(-)

diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/theme/FirefoxTheme.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/theme/FirefoxTheme.kt
index 8271eb541d01..7bc51d0935c0 100644
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/theme/FirefoxTheme.kt
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/theme/FirefoxTheme.kt
@@ -57,7 +57,6 @@ private val darkColorPalette = FirefoxColors(
     formSelected = PhotonColors.Violet40,
     formSurface = PhotonColors.DarkGrey05,
     formDisabled = PhotonColors.DarkGrey05,
-    controlDark = PhotonColors.Violet40A30,
     controlActive = PhotonColors.LightGrey90,
     textPrimary = PhotonColors.LightGrey05,
     textSecondary = PhotonColors.LightGrey40,
@@ -104,7 +103,6 @@ private val lightColorPalette = FirefoxColors(
     formSelected = PhotonColors.Violet90,
     formSurface = PhotonColors.LightGrey50,
     formDisabled = PhotonColors.LightGrey50,
-    controlDark = PhotonColors.Violet40A30,
     controlActive = PhotonColors.LightGrey50,
     textPrimary = PhotonColors.DarkGrey90,
     textSecondary = PhotonColors.DarkGrey05,
@@ -156,7 +154,6 @@ class FirefoxColors(
     formSelected: Color,
     formSurface: Color,
     formDisabled: Color,
-    controlDark: Color,
     controlActive: Color,
     textPrimary: Color,
     textSecondary: Color,
@@ -235,9 +232,6 @@ class FirefoxColors(
     // Checkbox disabled, Radio disabled
     var formDisabled by mutableStateOf(formDisabled)
         private set
-    // Switch background ON
-    var controlDark by mutableStateOf(controlDark)
-        private set
     // Indicator active
     var controlActive by mutableStateOf(controlActive)
         private set
@@ -339,7 +333,6 @@ class FirefoxColors(
         formSelected = other.formSelected
         formSurface = other.formSurface
         formDisabled = other.formDisabled
-        controlDark = other.controlDark
         controlActive = other.controlActive
         textPrimary = other.textPrimary
         textSecondary = other.textSecondary
@@ -386,7 +379,6 @@ class FirefoxColors(
         formSelected = formSelected,
         formSurface = formSurface,
         formDisabled = formDisabled,
-        controlDark = controlDark,
         controlActive = controlActive,
         textPrimary = textPrimary,
         textSecondary = textSecondary,
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
index 94ecb215fe80..5e0b9f5dd7cf 100644
--- a/mobile/android/fenix/app/src/main/res/values-night/colors.xml
+++ b/mobile/android/fenix/app/src/main/res/values-night/colors.xml
@@ -37,8 +37,6 @@
     <color name="fx_mobile_action_color_form_surface" tools:ignore="UnusedResources">@color/photonDarkGrey05</color>
     <!-- Checkbox disabled, Radio disabled -->
     <color name="fx_mobile_action_color_form_disabled" tools:ignore="UnusedResources">@color/photonDarkGrey05</color>
-    <!-- Switch background ON -->
-    <color name="fx_mobile_action_color_control_dark" tools:ignore="UnusedResources">@color/photonViolet40A30</color>
     <!-- Indicator active -->
     <color name="fx_mobile_action_color_control_active" tools:ignore="UnusedResources">@color/photonLightGrey90</color>
 
diff --git a/mobile/android/fenix/app/src/main/res/values/colors.xml b/mobile/android/fenix/app/src/main/res/values/colors.xml
index 7a7b95f6dde3..8dddc3570c17 100644
--- a/mobile/android/fenix/app/src/main/res/values/colors.xml
+++ b/mobile/android/fenix/app/src/main/res/values/colors.xml
@@ -37,8 +37,6 @@
     <color name="fx_mobile_action_color_form_surface" tools:ignore="UnusedResources">@color/photonLightGrey50</color>
     <!-- Checkbox disabled, Radio disabled -->
     <color name="fx_mobile_action_color_form_disabled" tools:ignore="UnusedResources">@color/photonLightGrey50</color>
-    <!-- Switch background ON -->
-    <color name="fx_mobile_action_color_control_dark" tools:ignore="UnusedResources">@color/photonViolet40A30</color>
     <!-- Indicator active -->
     <color name="fx_mobile_action_color_control_active" tools:ignore="UnusedResources">@color/photonLightGrey50</color>
 
-- 
2.11.4.GIT