From ae5f90854346a59d6b7c83b1e66a696d49a63af9 Mon Sep 17 00:00:00 2001 From: t-p-white Date: Wed, 28 Feb 2024 16:06:12 +0000 Subject: [PATCH] Bug 1882308 - Updated custom tab to support private mode (cherry picked from commit de4214bda7dc5298098fc99e10ec5a077c29043d) --- app/src/main/java/org/mozilla/fenix/HomeActivity.kt | 4 ++-- .../java/org/mozilla/fenix/browser/BaseBrowserFragment.kt | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt index eb59219bef..2ec05881fb 100644 --- a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt +++ b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt @@ -879,8 +879,8 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity { private fun setupTheme() { themeManager = createThemeManager() - // ExternalAppBrowserActivity handles it's own theming as it can be customized. - if (this !is ExternalAppBrowserActivity) { + // ExternalAppBrowserActivity exclusively handles it's own theming unless in private mode. + if (this !is ExternalAppBrowserActivity || browsingModeManager.mode.isPrivate) { themeManager.setActivityTheme(this) themeManager.applyStatusBarTheme(this) } diff --git a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt index ae27629bb8..5476a21c46 100644 --- a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt @@ -266,8 +266,8 @@ abstract class BaseBrowserFragment : _binding = FragmentBrowserBinding.inflate(inflater, container, false) val activity = activity as HomeActivity - // ExternalAppBrowserActivity handles it's own theming as it can be customized. - if (activity !is ExternalAppBrowserActivity) { + // ExternalAppBrowserActivity exclusively handles it's own theming unless in private mode. + if (activity !is ExternalAppBrowserActivity || activity.browsingModeManager.mode.isPrivate) { activity.themeManager.applyStatusBarTheme(activity) } @@ -1574,8 +1574,8 @@ abstract class BaseBrowserFragment : activity?.exitImmersiveMode() (view as? SwipeGestureLayout)?.isSwipeEnabled = true (activity as? HomeActivity)?.let { activity -> - // ExternalAppBrowserActivity handles it's own theming as it can be customized. - if (activity !is ExternalAppBrowserActivity) { + // ExternalAppBrowserActivity exclusively handles it's own theming unless in private mode. + if (activity !is ExternalAppBrowserActivity || activity.browsingModeManager.mode.isPrivate) { activity.themeManager.applyStatusBarTheme(activity) } }