From 7146e44bad1563ed57eec089e344de3a5050f037 Mon Sep 17 00:00:00 2001
From: t-p-white <towhite@mozilla.com>
Date: Thu, 8 Feb 2024 14:57:06 +0000
Subject: [PATCH] Bug 1813913 - Added support for Custom Tabs setColorScheme &
 setColorSchemeParams API

---
 .../org/mozilla/fenix/customtabs/CustomTabsIntegration.kt | 2 +-
 .../fenix/customtabs/FennecWebAppIntentProcessor.kt       | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabsIntegration.kt b/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabsIntegration.kt
index 35aed4f5aa..ed0c81330e 100644
--- a/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabsIntegration.kt
+++ b/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabsIntegration.kt
@@ -66,7 +66,7 @@ class CustomTabsIntegration(
         window = activity.window,
         shareListener = { onItemTapped.invoke(ToolbarMenu.Item.Share) },
         closeListener = { activity.finishAndRemoveTask() },
-        updateToolbarBackground = !isPrivate,
+        updateTheme = !isPrivate,
         forceActionButtonTinting = isPrivate,
     )
 
diff --git a/app/src/main/java/org/mozilla/fenix/customtabs/FennecWebAppIntentProcessor.kt b/app/src/main/java/org/mozilla/fenix/customtabs/FennecWebAppIntentProcessor.kt
index a990a1128b..c678b1928b 100644
--- a/app/src/main/java/org/mozilla/fenix/customtabs/FennecWebAppIntentProcessor.kt
+++ b/app/src/main/java/org/mozilla/fenix/customtabs/FennecWebAppIntentProcessor.kt
@@ -9,6 +9,8 @@ import android.content.Intent
 import android.content.Intent.FLAG_ACTIVITY_NEW_DOCUMENT
 import androidx.annotation.VisibleForTesting
 import androidx.core.content.ContextCompat
+import mozilla.components.browser.state.state.ColorSchemeParams
+import mozilla.components.browser.state.state.ColorSchemes
 import mozilla.components.browser.state.state.CustomTabConfig
 import mozilla.components.browser.state.state.SessionState
 import mozilla.components.concept.engine.manifest.WebAppManifest
@@ -139,7 +141,11 @@ class FennecWebAppIntentProcessor(
 
     private fun createFallbackCustomTabConfig(): CustomTabConfig {
         return CustomTabConfig(
-            toolbarColor = ContextCompat.getColor(context, R.color.fx_mobile_layer_color_1),
+            colorSchemes = ColorSchemes(
+                defaultColorSchemeParams = ColorSchemeParams(
+                    toolbarColor = ContextCompat.getColor(context, R.color.fx_mobile_layer_color_1),
+                ),
+            ),
         )
     }