From 3044f52d0826a8c238fa2abac0c6c09216caf8ad Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Fri, 4 Aug 2023 17:26:43 -0400
Subject: [PATCH] =?UTF-8?q?Bug=201843244=20=E2=80=93=C2=A0fixed=20notch=20?=
 =?UTF-8?q?background=20color=20(#3077)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 7c523f85e33674b5c3de6aedf53cc9d05d6b4178)

Co-authored-by: mike a <mavduevskiy@gmail.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
---
 app/src/main/res/values-night-v27/styles.xml | 13 +++++++++++++
 app/src/main/res/values-v23/styles.xml       |  2 +-
 app/src/main/res/values-v24/styles.xml       |  2 --
 app/src/main/res/values-v27/styles.xml       |  9 +++++++++
 4 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 app/src/main/res/values-night-v27/styles.xml

diff --git a/app/src/main/res/values-night-v27/styles.xml b/app/src/main/res/values-night-v27/styles.xml
new file mode 100644
index 000000000..ce769d9e9
--- /dev/null
+++ b/app/src/main/res/values-night-v27/styles.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <style name="NormalTheme" parent="NormalThemeBase" >
+        <!-- We have to pull in the changes from night/styles.xml to make
+            sure we also get them in night-v27+ -->
+        <item name="fenixWordmarkText">@drawable/ic_wordmark_text_private</item>
+        
+        <item name="android:windowLayoutInDisplayCutoutMode">default</item>
+    </style>
+</resources>
diff --git a/app/src/main/res/values-v23/styles.xml b/app/src/main/res/values-v23/styles.xml
index 69ae406ce..6e7879ba0 100644
--- a/app/src/main/res/values-v23/styles.xml
+++ b/app/src/main/res/values-v23/styles.xml
@@ -20,4 +20,4 @@
         <!-- Style the navigation bar -->
         <item name="android:navigationBarColor">?attr/layer1</item>
     </style>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-v24/styles.xml b/app/src/main/res/values-v24/styles.xml
index 563556ad7..8418254bc 100644
--- a/app/src/main/res/values-v24/styles.xml
+++ b/app/src/main/res/values-v24/styles.xml
@@ -5,7 +5,5 @@
 <resources>
     <style name="SplashScreen" parent="SplashScreenThemeBase">
         <item name="windowSplashScreenAnimatedIcon">@drawable/animated_splash_screen</item>
-        <!-- Splash screen is animated to maximum 12 seconds -->
-        <item name="windowSplashScreenAnimationDuration">12000</item>
     </style>
 </resources>
diff --git a/app/src/main/res/values-v27/styles.xml b/app/src/main/res/values-v27/styles.xml
index cd4dccd1a..4e0eddedc 100644
--- a/app/src/main/res/values-v27/styles.xml
+++ b/app/src/main/res/values-v27/styles.xml
@@ -12,6 +12,7 @@
         <!-- Style the navigation bar -->
         <item name="android:navigationBarDividerColor">@android:color/transparent</item>
         <item name="android:windowLightNavigationBar">@bool/theme_is_light</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">default</item>
     </style>
 
     <style name="PrivateTheme" parent="PrivateThemeBase">
@@ -23,6 +24,14 @@
         <!-- Style the navigation bar -->
         <item name="android:navigationBarDividerColor">@android:color/transparent</item>
         <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">default</item>
+    </style>
+
+    <style name="SplashScreen" parent="SplashScreenThemeBase">
+        <item name="windowSplashScreenAnimatedIcon">@drawable/animated_splash_screen</item>
+        <!-- Splash screen is animated to maximum 12 seconds -->
+        <item name="windowSplashScreenAnimationDuration">12000</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">default</item>
     </style>
 
     <style name="BottomSheetPrivate" parent="BottomSheetBasePrivate">