Merge remote-tracking branch 'origin/fenix/116.2.0' into iceraven

android-components

@@ -1 +1 @@
-Subproject commit 3b06ad6808a63083161cbce1cfbdac71afed2e57
+Subproject commit bd45787c0127b0b57e4a526a34f955272a02cdde

app/src/main/java/org/mozilla/fenix/components/metrics/AdjustMetricsService.kt

@@ -30,6 +30,8 @@ class AdjustMetricsService(private val application: Application) : MetricsServic
             return
         }
 
+        System.setProperty(ADJUST_PREINSTALL_SYSTEM_PROPERTY_PATH, "/preload/etc/adjust.preinstall")
+
         val config = AdjustConfig(
             application,
             BuildConfig.ADJUST_TOKEN,

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>

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>
+</resources>

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>

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">

version.txt

@@ -1 +1 @@
-116.0
+116.2.0