mirror/IronFox
1
0
Fork 0
mirror of https://github.com/ironfox-oss/IronFox.git synced 2026-04-19 22:47:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v134.0' into 'main'

Browse Source 
feat: update to v134.0

See merge request ironfox-oss/IronFox!1
This commit is contained in:
Akash Yadav
2025-01-08 04:36:47 +00:00
parent 06b7082fe4 d76cecba94
commit 4e209c4560
32 changed files with 182 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

220
patches/fenix-liberate.patch
View File

@@ -1,6 +1,6 @@
diff -r 0a6479ef0332 mobile/android/android-components/.buildconfig.yml
--- a/mobile/android/android-components/.buildconfig.yml Mon Nov 18 12:58:35 2024 +0000
+++ b/mobile/android/android-components/.buildconfig.yml Tue Nov 19 10:17:20 2024 +0300
diff -r 8c35adfaf5ea mobile/android/android-components/.buildconfig.yml
--- a/mobile/android/android-components/.buildconfig.yml Mon Dec 30 18:43:12 2024 +0000
+++ b/mobile/android/android-components/.buildconfig.yml Tue Dec 31 18:19:42 2024 +0530
@@ -1566,16 +1566,6 @@
- support-base
- support-test
@@ -18,14 +18,14 @@ diff -r 0a6479ef0332 mobile/android/android-components/.buildconfig.yml
lib-state:
description: A library for maintaining application state.
path: components/lib/state
diff -r 0a6479ef0332 mobile/android/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt
--- a/mobile/android/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt Mon Nov 18 12:58:35 2024 +0000
+++ b/mobile/android/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt Tue Nov 19 10:17:20 2024 +0300
@@ -92,13 +92,8 @@
diff -r 8c35adfaf5ea mobile/android/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt
--- a/mobile/android/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt Mon Dec 30 18:43:12 2024 +0000
+++ b/mobile/android/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt Tue Dec 31 18:19:42 2024 +0530
@@ -89,13 +89,8 @@
const val protobuf_plugin = "0.9.4"
object Google {
const val accompanist = "0.36.0"
- const val firebase_messaging = "24.0.3"
- const val firebase_messaging = "24.1.0"
const val material = "1.12.0"
const val osslicenses_plugin = "0.10.6"
- const val play_review = "2.0.1"
@@ -35,7 +35,7 @@ diff -r 0a6479ef0332 mobile/android/android-components/plugins/dependencies/src/
const val protobuf = "4.28.2" // Keep Protobuf in sync with the version used by AppServices.
}
@@ -268,14 +263,8 @@
@@ -272,14 +267,8 @@
const val thirdparty_disklrucache = "com.jakewharton:disklrucache:${Versions.disklrucache}"
const val thirdparty_androidsvg = "com.caverock:androidsvg-aar:${Versions.androidsvg}"
@@ -50,9 +50,9 @@ diff -r 0a6479ef0332 mobile/android/android-components/plugins/dependencies/src/
const val protobuf_compiler = "com.google.protobuf:protoc:${Versions.Google.protobuf}"
const val protobuf_javalite = "com.google.protobuf:protobuf-javalite:${Versions.Google.protobuf}"
}
diff -r 0a6479ef0332 mobile/android/fenix/.buildconfig.yml
--- a/mobile/android/fenix/.buildconfig.yml Mon Nov 18 12:58:35 2024 +0000
+++ b/mobile/android/fenix/.buildconfig.yml Tue Nov 19 10:17:20 2024 +0300
diff -r 8c35adfaf5ea mobile/android/fenix/.buildconfig.yml
--- a/mobile/android/fenix/.buildconfig.yml Mon Dec 30 18:43:12 2024 +0000
+++ b/mobile/android/fenix/.buildconfig.yml Tue Dec 31 18:19:42 2024 +0530
@@ -63,7 +63,6 @@
- lib-crash-sentry
- lib-dataprotect
@@ -61,9 +61,9 @@ diff -r 0a6479ef0332 mobile/android/fenix/.buildconfig.yml
- lib-state
- service-contile
- service-digitalassetlinks
diff -r 0a6479ef0332 mobile/android/fenix/app/build.gradle
--- a/mobile/android/fenix/app/build.gradle Mon Nov 18 12:58:35 2024 +0000
+++ b/mobile/android/fenix/app/build.gradle Tue Nov 19 10:17:20 2024 +0300
diff -r 8c35adfaf5ea mobile/android/fenix/app/build.gradle
--- a/mobile/android/fenix/app/build.gradle Mon Dec 30 18:43:12 2024 +0000
+++ b/mobile/android/fenix/app/build.gradle Tue Dec 31 18:19:42 2024 +0530
@@ -655,7 +655,6 @@
implementation project(':lib-crash')
@@ -86,12 +86,12 @@ diff -r 0a6479ef0332 mobile/android/fenix/app/build.gradle
- implementation ComponentsDependencies.play_review
- implementation ComponentsDependencies.play_review_ktx
-
constraints {
implementation (ComponentsDependencies.androidx_tracing) {
because 'AndroidX Test gets force-downgraded to 1.0.0 and breaks otherwise'
diff -r 0a6479ef0332 mobile/android/fenix/app/proguard-rules.pro
--- a/mobile/android/fenix/app/proguard-rules.pro Mon Nov 18 12:58:35 2024 +0000
+++ b/mobile/android/fenix/app/proguard-rules.pro Tue Nov 19 10:17:20 2024 +0300
androidTestImplementation ComponentsDependencies.testing_fastlane
androidTestImplementation ComponentsDependencies.testing_falcon
diff -r 8c35adfaf5ea mobile/android/fenix/app/proguard-rules.pro
--- a/mobile/android/fenix/app/proguard-rules.pro Mon Dec 30 18:43:12 2024 +0000
+++ b/mobile/android/fenix/app/proguard-rules.pro Tue Dec 31 18:19:42 2024 +0530
@@ -1,23 +1,6 @@
-dontobfuscate
@@ -187,9 +187,9 @@ diff -r 0a6479ef0332 mobile/android/fenix/app/proguard-rules.pro
+-dontwarn org.checkerframework.checker.nullness.qual.EnsuresNonNull
+-dontwarn org.checkerframework.checker.nullness.qual.EnsuresNonNullIf
+-dontwarn org.checkerframework.checker.nullness.qual.RequiresNonNull
diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/AndroidManifest.xml
--- a/mobile/android/fenix/app/src/main/AndroidManifest.xml Mon Nov 18 12:58:35 2024 +0000
+++ b/mobile/android/fenix/app/src/main/AndroidManifest.xml Tue Nov 19 10:17:20 2024 +0300
diff -r 8c35adfaf5ea mobile/android/fenix/app/src/main/AndroidManifest.xml
--- a/mobile/android/fenix/app/src/main/AndroidManifest.xml Mon Dec 30 18:43:12 2024 +0000
+++ b/mobile/android/fenix/app/src/main/AndroidManifest.xml Tue Dec 31 18:19:42 2024 +0530
@@ -32,9 +32,6 @@
<uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.USE_BIOMETRIC" />
@@ -200,9 +200,9 @@ diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/AndroidManifest.xml
<!-- Needed to prompt the user to give permission to install a downloaded apk -->
<uses-permission-sdk-23 android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/com/adjust/sdk/Adjust.java
diff -r 8c35adfaf5ea mobile/android/fenix/app/src/main/java/com/adjust/sdk/Adjust.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mobile/android/fenix/app/src/main/java/com/adjust/sdk/Adjust.java Tue Nov 19 10:17:20 2024 +0300
+++ b/mobile/android/fenix/app/src/main/java/com/adjust/sdk/Adjust.java Tue Dec 31 18:19:42 2024 +0530
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2012-2017 adjust GmbH,
@@ -251,9 +251,9 @@ diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/com/adjust/sdk/Adjus
+ public static void gdprForgetMe(final Context context) {
+ }
+}
diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/com/adjust/sdk/AdjustAttribution.java
diff -r 8c35adfaf5ea mobile/android/fenix/app/src/main/java/com/adjust/sdk/AdjustAttribution.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mobile/android/fenix/app/src/main/java/com/adjust/sdk/AdjustAttribution.java Tue Nov 19 10:17:20 2024 +0300
+++ b/mobile/android/fenix/app/src/main/java/com/adjust/sdk/AdjustAttribution.java Tue Dec 31 18:19:42 2024 +0530
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2012-2017 adjust GmbH,
@@ -304,9 +304,9 @@ diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/com/adjust/sdk/Adjus
+ return "";
+ }
+}
diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/com/adjust/sdk/AdjustConfig.java
diff -r 8c35adfaf5ea mobile/android/fenix/app/src/main/java/com/adjust/sdk/AdjustConfig.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mobile/android/fenix/app/src/main/java/com/adjust/sdk/AdjustConfig.java Tue Nov 19 10:17:20 2024 +0300
+++ b/mobile/android/fenix/app/src/main/java/com/adjust/sdk/AdjustConfig.java Tue Dec 31 18:19:42 2024 +0530
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2012-2017 adjust GmbH,
@@ -357,9 +357,9 @@ diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/com/adjust/sdk/Adjus
+ public void setLogLevel(LogLevel logLevel) {
+ }
+}
diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/com/adjust/sdk/AdjustEvent.java
diff -r 8c35adfaf5ea mobile/android/fenix/app/src/main/java/com/adjust/sdk/AdjustEvent.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mobile/android/fenix/app/src/main/java/com/adjust/sdk/AdjustEvent.java Tue Nov 19 10:17:20 2024 +0300
+++ b/mobile/android/fenix/app/src/main/java/com/adjust/sdk/AdjustEvent.java Tue Dec 31 18:19:42 2024 +0530
@@ -0,0 +1,31 @@
+package com.adjust.sdk;
+
@@ -392,9 +392,9 @@ diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/com/adjust/sdk/Adjus
+ public void setPurchaseToken(String purchaseToken) {
+ }
+}
diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/com/adjust/sdk/Constants.java
diff -r 8c35adfaf5ea mobile/android/fenix/app/src/main/java/com/adjust/sdk/Constants.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mobile/android/fenix/app/src/main/java/com/adjust/sdk/Constants.java Tue Nov 19 10:17:20 2024 +0300
+++ b/mobile/android/fenix/app/src/main/java/com/adjust/sdk/Constants.java Tue Dec 31 18:19:42 2024 +0530
@@ -0,0 +1,18 @@
+//
+// Constants.java
@@ -414,9 +414,9 @@ diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/com/adjust/sdk/Const
+public interface Constants {
+ String ADJUST_PREINSTALL_SYSTEM_PROPERTY_PATH = "adjust.preinstall.path";
+}
diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/com/adjust/sdk/LogLevel.java
diff -r 8c35adfaf5ea mobile/android/fenix/app/src/main/java/com/adjust/sdk/LogLevel.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mobile/android/fenix/app/src/main/java/com/adjust/sdk/LogLevel.java Tue Nov 19 10:17:20 2024 +0300
+++ b/mobile/android/fenix/app/src/main/java/com/adjust/sdk/LogLevel.java Tue Dec 31 18:19:42 2024 +0530
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2012-2017 adjust GmbH,
@@ -461,9 +461,9 @@ diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/com/adjust/sdk/LogLe
+ return androidLogLevel;
+ }
+}
diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/com/adjust/sdk/OnAttributionChangedListener.java
diff -r 8c35adfaf5ea mobile/android/fenix/app/src/main/java/com/adjust/sdk/OnAttributionChangedListener.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mobile/android/fenix/app/src/main/java/com/adjust/sdk/OnAttributionChangedListener.java Tue Nov 19 10:17:20 2024 +0300
+++ b/mobile/android/fenix/app/src/main/java/com/adjust/sdk/OnAttributionChangedListener.java Tue Dec 31 18:19:42 2024 +0530
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2012-2017 adjust GmbH,
@@ -494,9 +494,9 @@ diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/com/adjust/sdk/OnAtt
+public interface OnAttributionChangedListener {
+ void onAttributionChanged(AdjustAttribution attribution);
+}
diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/com/google/firebase/messaging/FirebaseMessagingService.java
diff -r 8c35adfaf5ea mobile/android/fenix/app/src/main/java/com/google/firebase/messaging/FirebaseMessagingService.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mobile/android/fenix/app/src/main/java/com/google/firebase/messaging/FirebaseMessagingService.java Tue Nov 19 10:17:20 2024 +0300
+++ b/mobile/android/fenix/app/src/main/java/com/google/firebase/messaging/FirebaseMessagingService.java Tue Dec 31 18:19:42 2024 +0530
@@ -0,0 +1,42 @@
+// Copyright 2020 Google LLC
+//
@@ -540,9 +540,9 @@ diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/com/google/firebase/
+ }
+
+}
diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/com/google/firebase/messaging/RemoteMessage.java
diff -r 8c35adfaf5ea mobile/android/fenix/app/src/main/java/com/google/firebase/messaging/RemoteMessage.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mobile/android/fenix/app/src/main/java/com/google/firebase/messaging/RemoteMessage.java Tue Nov 19 10:17:20 2024 +0300
+++ b/mobile/android/fenix/app/src/main/java/com/google/firebase/messaging/RemoteMessage.java Tue Dec 31 18:19:42 2024 +0530
@@ -0,0 +1,33 @@
+// Copyright 2020 Google LLC
+//
@@ -577,9 +577,9 @@ diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/com/google/firebase/
+ }
+
+}
diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/mozilla/components/lib/push/firebase/AbstractFirebasePushService.kt
diff -r 8c35adfaf5ea mobile/android/fenix/app/src/main/java/mozilla/components/lib/push/firebase/AbstractFirebasePushService.kt
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mobile/android/fenix/app/src/main/java/mozilla/components/lib/push/firebase/AbstractFirebasePushService.kt Tue Nov 19 10:17:20 2024 +0300
+++ b/mobile/android/fenix/app/src/main/java/mozilla/components/lib/push/firebase/AbstractFirebasePushService.kt Tue Dec 31 18:19:42 2024 +0530
@@ -0,0 +1,32 @@
+/* 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
@@ -613,9 +613,9 @@ diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/mozilla/components/l
+ return false
+ }
+}
diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt Mon Nov 18 12:58:35 2024 +0000
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt Tue Nov 19 10:17:20 2024 +0300
diff -r 8c35adfaf5ea mobile/android/fenix/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt Mon Dec 30 18:43:12 2024 +0000
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt Tue Dec 31 18:19:42 2024 +0530
@@ -18,7 +18,7 @@
* This feature does not only depend on this flag. It requires the AMO collection override to
* be enabled which is behind the Secret Settings.
@@ -634,10 +634,10 @@ diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/org/mozilla/fenix/Fe
}
/**
diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt Mon Nov 18 12:58:35 2024 +0000
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt Tue Nov 19 10:17:20 2024 +0300
@@ -1112,19 +1112,16 @@
diff -r 8c35adfaf5ea mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt Mon Dec 30 18:43:12 2024 +0000
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt Tue Dec 31 18:19:42 2024 +0530
@@ -1105,19 +1105,16 @@
view = view,
)
@@ -667,9 +667,9 @@ diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/org/mozilla/fenix/br
screenOrientationFeature.set(
feature = ScreenOrientationFeature(
diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Components.kt
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Components.kt Mon Nov 18 12:58:35 2024 +0000
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Components.kt Tue Nov 19 10:17:20 2024 +0300
diff -r 8c35adfaf5ea mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Components.kt
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Components.kt Mon Dec 30 18:43:12 2024 +0000
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Components.kt Tue Dec 31 18:19:42 2024 +0530
@@ -10,7 +10,6 @@
import androidx.compose.runtime.Composable
import androidx.compose.ui.platform.LocalContext
@@ -686,10 +686,10 @@ diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/org/mozilla/fenix/co
reviewSettings = FenixReviewSettings(settings),
)
}
diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Core.kt
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Core.kt Mon Nov 18 12:58:35 2024 +0000
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Core.kt Tue Nov 19 10:17:20 2024 +0300
@@ -586,8 +586,14 @@
diff -r 8c35adfaf5ea mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Core.kt
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Core.kt Mon Dec 30 18:43:12 2024 +0000
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Core.kt Tue Dec 31 18:19:42 2024 +0530
@@ -587,8 +587,14 @@
} else {
defaultTopSites.add(
Pair(
@@ -706,9 +706,9 @@ diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/org/mozilla/fenix/co
),
)
diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/ReviewPromptController.kt
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/ReviewPromptController.kt Mon Nov 18 12:58:35 2024 +0000
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/ReviewPromptController.kt Tue Nov 19 10:17:20 2024 +0300
diff -r 8c35adfaf5ea mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/ReviewPromptController.kt
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/ReviewPromptController.kt Mon Dec 30 18:43:12 2024 +0000
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/ReviewPromptController.kt Tue Dec 31 18:19:42 2024 +0530
@@ -6,8 +6,6 @@
import android.app.Activity
@@ -744,30 +744,30 @@ diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/org/mozilla/fenix/co
},
) {
@VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/menu/compose/ToolsSubmenu.kt
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/menu/compose/ToolsSubmenu.kt Mon Nov 18 12:58:35 2024 +0000
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/menu/compose/ToolsSubmenu.kt Tue Nov 19 10:17:20 2024 +0300
@@ -210,7 +210,7 @@
diff -r 8c35adfaf5ea mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/menu/compose/ToolsSubmenu.kt
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/menu/compose/ToolsSubmenu.kt Mon Dec 30 18:43:12 2024 +0000
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/menu/compose/ToolsSubmenu.kt Tue Dec 31 18:19:42 2024 +0530
@@ -212,7 +212,7 @@
enabled = true,
icon = BitmapFactory.decodeResource(
LocalContext.current.resources,
- R.drawable.googleg_standard_color_18,
- R.drawable.mozac_ic_web_extension_default_icon,
+ R.drawable.ic_download,
),
badgeText = "1",
badgeTextColor = Color.White.toArgb(),
@@ -253,7 +253,7 @@
@@ -256,7 +256,7 @@
enabled = true,
icon = BitmapFactory.decodeResource(
LocalContext.current.resources,
- R.drawable.googleg_standard_color_18,
- R.drawable.mozac_ic_web_extension_default_icon,
+ R.drawable.ic_download,
),
badgeText = "1",
badgeTextColor = Color.White.toArgb(),
diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/metrics/InstallReferrerMetricsService.kt
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/metrics/InstallReferrerMetricsService.kt Mon Nov 18 12:58:35 2024 +0000
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/metrics/InstallReferrerMetricsService.kt Tue Nov 19 10:17:20 2024 +0300
diff -r 8c35adfaf5ea mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/metrics/InstallReferrerMetricsService.kt
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/metrics/InstallReferrerMetricsService.kt Mon Dec 30 18:43:12 2024 +0000
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/metrics/InstallReferrerMetricsService.kt Tue Dec 31 18:19:42 2024 +0530
@@ -6,14 +6,10 @@
import android.content.Context
@@ -894,9 +894,9 @@ diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/org/mozilla/fenix/co
+ return
}
}
diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/metrics/MetricsUtils.kt
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/metrics/MetricsUtils.kt Mon Nov 18 12:58:35 2024 +0000
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/metrics/MetricsUtils.kt Tue Nov 19 10:17:20 2024 +0300
diff -r 8c35adfaf5ea mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/metrics/MetricsUtils.kt
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/metrics/MetricsUtils.kt Mon Dec 30 18:43:12 2024 +0000
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/metrics/MetricsUtils.kt Tue Dec 31 18:19:42 2024 +0530
@@ -7,9 +7,6 @@
import android.content.Context
import android.util.Base64
@@ -936,18 +936,18 @@ diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/org/mozilla/fenix/co
}
/**
diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/fake/FakeHomepagePreview.kt
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/fake/FakeHomepagePreview.kt Mon Nov 18 12:58:35 2024 +0000
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/fake/FakeHomepagePreview.kt Tue Nov 19 10:17:20 2024 +0300
@@ -5,7 +5,6 @@
package org.mozilla.fenix.home.fake
diff -r 8c35adfaf5ea mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/fake/FakeHomepagePreview.kt
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/fake/FakeHomepagePreview.kt Mon Dec 30 18:43:12 2024 +0000
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/fake/FakeHomepagePreview.kt Tue Dec 31 18:19:42 2024 +0530
@@ -6,7 +6,6 @@
import android.content.Context
import androidx.compose.runtime.Composable
-import com.google.firebase.util.nextAlphanumericString
import mozilla.components.browser.state.state.ContentState
import mozilla.components.browser.state.state.TabSessionState
import mozilla.components.browser.state.state.recover.RecoverableTab
@@ -235,7 +234,7 @@
@@ -252,7 +251,7 @@
add(
RecentTab.Tab(
TabSessionState(
@@ -956,7 +956,7 @@ diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/org/mozilla/fenix/ho
content = ContentState(
url = URL,
),
@@ -329,9 +328,4 @@
@@ -392,9 +391,4 @@
private const val URL = "mozilla.com"
private fun randomLong() = random.nextLong()
@@ -966,9 +966,9 @@ diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/org/mozilla/fenix/ho
- length = length,
- )
}
diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/topsites/TopSiteItemViewHolder.kt
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/topsites/TopSiteItemViewHolder.kt Mon Nov 18 12:58:35 2024 +0000
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/topsites/TopSiteItemViewHolder.kt Tue Nov 19 10:17:20 2024 +0300
diff -r 8c35adfaf5ea mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/topsites/TopSiteItemViewHolder.kt
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/topsites/TopSiteItemViewHolder.kt Mon Dec 30 18:43:12 2024 +0000
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/topsites/TopSiteItemViewHolder.kt Tue Dec 31 18:19:42 2024 +0530
@@ -161,6 +161,12 @@
SupportUtils.MEITUAN_URL -> {
binding.faviconImage.setImageDrawable(getDrawable(itemView.context, R.drawable.ic_meituan))
@@ -982,9 +982,9 @@ diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/org/mozilla/fenix/ho
else -> {
itemView.context.components.core.icons.loadIntoView(binding.faviconImage, topSite.url)
}
diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt Mon Nov 18 12:58:35 2024 +0000
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt Tue Nov 19 10:17:20 2024 +0300
diff -r 8c35adfaf5ea mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt Mon Dec 30 18:43:12 2024 +0000
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt Tue Dec 31 18:19:42 2024 +0530
@@ -39,6 +39,8 @@
const val GOOGLE_XX_URL = "https://www.google.com/webhp?client=firefox-b-m&channel=ts"
const val WHATS_NEW_URL = "https://www.mozilla.org/firefox/android/notes"
@@ -994,9 +994,9 @@ diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/org/mozilla/fenix/se
// This is locale-less on purpose so that the content negotiation happens on the AMO side because the current
// user language might not be supported by AMO and/or the language might not be exactly what AMO is expecting
diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt Mon Nov 18 12:58:35 2024 +0000
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt Tue Nov 19 10:17:20 2024 +0300
diff -r 8c35adfaf5ea mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt Mon Dec 30 18:43:12 2024 +0000
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt Tue Dec 31 18:19:42 2024 +0530
@@ -340,7 +340,7 @@
var isTelemetryEnabled by booleanPreference(
@@ -1015,7 +1015,7 @@ diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/org/mozilla/fenix/ut
)
var isOverrideTPPopupsForPerformanceTest = false
@@ -1617,7 +1617,7 @@
@@ -1627,7 +1627,7 @@
var showPocketRecommendationsFeature by lazyFeatureFlagPreference(
appContext.getPreferenceKey(R.string.pref_key_pocket_homescreen_recommendations),
featureFlag = FeatureFlags.isPocketRecommendationsFeatureEnabled(appContext),
@@ -1024,7 +1024,7 @@ diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/org/mozilla/fenix/ut
)
/**
@@ -1683,7 +1683,7 @@
@@ -1693,7 +1693,7 @@
*/
var showContileFeature by booleanPreference(
key = appContext.getPreferenceKey(R.string.pref_key_enable_contile),
@@ -1033,9 +1033,9 @@ diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/java/org/mozilla/fenix/ut
)
/**
diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/res/values/static_strings_extra.xml
diff -r 8c35adfaf5ea mobile/android/fenix/app/src/main/res/values/static_strings_extra.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mobile/android/fenix/app/src/main/res/values/static_strings_extra.xml Tue Nov 19 10:17:20 2024 +0300
+++ b/mobile/android/fenix/app/src/main/res/values/static_strings_extra.xml Tue Dec 31 18:19:42 2024 +0530
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
@@ -1045,9 +1045,9 @@ diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/res/values/static_strings
+ <string name="default_top_site_fdroid" translatable="false">F-Droid</string>
+ <string name="default_top_site_eff" translatable="false">EFF</string>
+</resources>
diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/res/xml/preferences.xml
--- a/mobile/android/fenix/app/src/main/res/xml/preferences.xml Mon Nov 18 12:58:35 2024 +0000
+++ b/mobile/android/fenix/app/src/main/res/xml/preferences.xml Tue Nov 19 10:17:20 2024 +0300
diff -r 8c35adfaf5ea mobile/android/fenix/app/src/main/res/xml/preferences.xml
--- a/mobile/android/fenix/app/src/main/res/xml/preferences.xml Mon Dec 30 18:43:12 2024 +0000
+++ b/mobile/android/fenix/app/src/main/res/xml/preferences.xml Tue Dec 31 18:19:42 2024 +0530
@@ -139,11 +139,6 @@
app:iconSpaceReserved="false"
android:title="@string/preferences_notifications" />
@@ -1072,9 +1072,9 @@ diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/res/xml/preferences.xml
android:key="@string/pref_key_about"
app:iconSpaceReserved="false"
android:title="@string/preferences_about" />
diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/res/xml/site_permissions_details_exceptions_preferences.xml
--- a/mobile/android/fenix/app/src/main/res/xml/site_permissions_details_exceptions_preferences.xml Mon Nov 18 12:58:35 2024 +0000
+++ b/mobile/android/fenix/app/src/main/res/xml/site_permissions_details_exceptions_preferences.xml Tue Nov 19 10:17:20 2024 +0300
diff -r 8c35adfaf5ea mobile/android/fenix/app/src/main/res/xml/site_permissions_details_exceptions_preferences.xml
--- a/mobile/android/fenix/app/src/main/res/xml/site_permissions_details_exceptions_preferences.xml Mon Dec 30 18:43:12 2024 +0000
+++ b/mobile/android/fenix/app/src/main/res/xml/site_permissions_details_exceptions_preferences.xml Tue Dec 31 18:19:42 2024 +0530
@@ -3,7 +3,8 @@
- 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/. -->
@@ -1095,10 +1095,10 @@ diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/res/xml/site_permissions_
<androidx.preference.Preference
android:icon="@drawable/ic_autoplay"
diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/res/xml/site_permissions_preferences.xml
--- a/mobile/android/fenix/app/src/main/res/xml/site_permissions_preferences.xml Mon Nov 18 12:58:35 2024 +0000
+++ b/mobile/android/fenix/app/src/main/res/xml/site_permissions_preferences.xml Tue Nov 19 10:17:20 2024 +0300
@@ -81,6 +81,7 @@
diff -r 8c35adfaf5ea mobile/android/fenix/app/src/main/res/xml/site_permissions_preferences.xml
--- a/mobile/android/fenix/app/src/main/res/xml/site_permissions_preferences.xml Mon Dec 30 18:43:12 2024 +0000
+++ b/mobile/android/fenix/app/src/main/res/xml/site_permissions_preferences.xml Tue Dec 31 18:19:42 2024 +0530
@@ -83,6 +83,7 @@
android:key="@string/pref_key_browser_feature_media_key_system_access"
android:title="@string/preference_phone_feature_media_key_system_access"
android:summary="@string/preference_option_phone_feature_ask_to_allow"
@@ -1106,9 +1106,9 @@ diff -r 0a6479ef0332 mobile/android/fenix/app/src/main/res/xml/site_permissions_
app:allowDividerBelow="true"/>
<androidx.preference.Preference
diff -r 0a6479ef0332 mobile/android/fenix/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt
--- a/mobile/android/fenix/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt Mon Nov 18 12:58:35 2024 +0000
+++ b/mobile/android/fenix/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt Tue Nov 19 10:17:20 2024 +0300
diff -r 8c35adfaf5ea mobile/android/fenix/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt
--- a/mobile/android/fenix/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt Mon Dec 30 18:43:12 2024 +0000
+++ b/mobile/android/fenix/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt Tue Dec 31 18:19:42 2024 +0530
@@ -12,17 +12,6 @@
override fun apply(settings: Settings) = Unit
}
@@ -1127,9 +1127,9 @@ diff -r 0a6479ef0332 mobile/android/fenix/plugins/fenixdependencies/src/main/jav
/**
* Functionality to limit specific dependencies to specific repositories. These are typically expected to be used by
* dependency group name (i.e. with `include/excludeGroup`). For additional info, see:
diff -r 0a6479ef0332 mobile/android/focus-android/app/build.gradle
--- a/mobile/android/focus-android/app/build.gradle Mon Nov 18 12:58:35 2024 +0000
+++ b/mobile/android/focus-android/app/build.gradle Tue Nov 19 10:17:20 2024 +0300
diff -r 8c35adfaf5ea mobile/android/focus-android/app/build.gradle
--- a/mobile/android/focus-android/app/build.gradle Mon Dec 30 18:43:12 2024 +0000
+++ b/mobile/android/focus-android/app/build.gradle Tue Dec 31 18:19:42 2024 +0530
@@ -266,10 +266,6 @@
implementation ComponentsDependencies.androidx_transition
implementation ComponentsDependencies.androidx_work_runtime

BIN
patches/fenix-overlay/ic_launcher-web.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

BIN
patches/fenix-overlay/ic_launcher_private-web.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

55
patches/fenix-overlay/res/drawable/ic_launcher_foreground.xml
View File

@@ -1,37 +1,32 @@
<?xml version="1.0" encoding="utf-8" ?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:width="108dp"
android:height="108dp"
android:viewportWidth="32"
android:viewportHeight="32">
<group
android:scaleX="0.45"
android:scaleY="0.45"
android:translateX="8.8"
android:translateY="8.8">
<path android:pathData="M10.425,5.525 L5.535,10.327c-0.118,0.116 -0.215,0.345 -0.213,0.51 0.085,9 5.053,11.624 10.425,15.599 0.133,0.098 0.349,0.099 0.482,0.001 5.476,-3.998 10.333,-6.332 10.449,-15.523 0.002,-0.165 -0.093,-0.394 -0.211,-0.51L21.534,5.526a0.126,0.126 157.511,0 0,-0.215 0.089l-0.028,4.701c-0.001,0.166 -0.136,0.3 -0.302,0.3 -1.605,0 -7.041,0 -10.031,0 -0.166,0 -0.3,-0.134 -0.301,-0.3l-0.017,-4.701a0.127,0.127 22.654,0 0,-0.215 -0.09z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="4.275"
android:endY="5.13"
android:startX="14.089"
android:startY="26.256"
android:type="linear">
<item
android:color="#FFFFD500"
android:offset="0" />
<item
android:color="#AEFF0E00"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path
android:fillColor="#ffffff"
android:pathData="m21.321,15.949c-1.995,3.338 -2.095,3.239 -3.345,1.988" />
<path
android:fillColor="#ffffff"
android:pathData="m10.658,16.105c1.893,3.28 1.987,3.187 3.238,1.936" />
</group>
<group android:scaleX="0.64166665"
android:scaleY="0.64166665"
android:translateX="5.733333"
android:translateY="5.733333">
<path
android:pathData="M10.562,5.498C10.516,5.479 10.462,5.49 10.425,5.525l-4.89,4.803c-0.118,0.116 -0.214,0.344 -0.213,0.51 0.085,9 5.054,11.624 10.426,15.6 0.133,0.098 0.349,0.098 0.482,0 5.476,-3.998 10.332,-6.331 10.447,-15.521 0.002,-0.165 -0.093,-0.395 -0.211,-0.512l-4.931,-4.88c-0.08,-0.08 -0.216,-0.023 -0.215,0.09l-0.029,4.701c-0.001,0.166 -0.135,0.299 -0.301,0.299L10.959,10.615c-0.166,0 -0.3,-0.133 -0.301,-0.299L10.641,5.615c-0,-0.051 -0.031,-0.098 -0.079,-0.117z">
<aapt:attr name="android:fillColor">
<gradient
android:startX="5.322"
android:startY="5.488"
android:endX="26.678"
android:endY="26.512"
android:type="linear">
<item android:offset="0" android:color="#AEFF0E00"/>
<item android:offset="1" android:color="#FFFFD500"/>
</gradient>
</aapt:attr>
</path>
<path
android:pathData="m21.32,15.949c-1.995,3.338 -2.095,3.239 -3.345,1.988"
android:fillColor="#ffffff"/>
<path
android:pathData="m10.627,15.949c1.995,3.338 2.095,3.239 3.345,1.988"
android:fillColor="#ffffff"/>
</group>
</vector>

11
patches/fenix-overlay/res/drawable/ic_launcher_monochrome.xml
View File

@@ -1,15 +1,16 @@
<?xml version="1.0" encoding="utf-8" ?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="32"
android:viewportHeight="32">
<group
android:scaleX="0.45"
android:scaleY="0.45"
android:translateX="8.8"
android:translateY="8.8">
android:scaleX="0.64166665"
android:scaleY="0.64166665"
android:translateX="5.733333"
android:translateY="5.733333">
<path
android:fillColor="#ffffff"
android:pathData="m10.424,6.015a0.127,0.127 0,0 0,-0.137 0.027L5.397,10.845c-0.118,0.116 -0.214,0.344 -0.213,0.51 0.085,9 5.054,11.624 10.426,15.6 0.133,0.098 0.349,0.098 0.482,0 5.476,-3.998 10.332,-6.331 10.447,-15.521 0.002,-0.165 -0.093,-0.395 -0.211,-0.512L21.397,6.042a0.126,0.126 0,0 0,-0.215 0.09l-0.029,4.701c-0.001,0.166 -0.135,0.299 -0.301,0.299 -1.605,0 -7.041,-0 -10.031,0 -0.166,0 -0.3,-0.133 -0.301,-0.299L10.503,6.132A0.127,0.127 0,0 0,10.424 6.015ZM21.182,16.466c-1.995,3.338 -2.093,3.239 -3.344,1.988zM10.52,16.622 L13.758,18.558c-1.251,1.251 -1.345,1.345 -3.238,-1.936z" />
android:pathData="M21.469,5.49C21.397,5.477 21.32,5.53 21.32,5.615L21.292,10.315C21.291,10.481 21.156,10.615 20.99,10.615L10.958,10.615C10.792,10.615 10.66,10.481 10.659,10.315L10.641,5.615C10.64,5.563 10.61,5.517 10.563,5.497C10.516,5.478 10.461,5.49 10.424,5.526L5.536,10.328C5.418,10.444 5.322,10.673 5.323,10.839C5.408,19.839 10.375,22.462 15.747,26.438C15.88,26.535 16.099,26.535 16.232,26.438C21.708,22.44 26.562,20.107 26.677,10.917C26.679,10.752 26.584,10.523 26.466,10.406L21.536,5.526C21.517,5.506 21.493,5.494 21.469,5.49zM10.628,15.948L13.971,17.938C12.721,19.188 12.623,19.286 10.628,15.948zM21.32,15.948C19.325,19.286 19.227,19.188 17.977,17.938L21.32,15.948z" />
</group>
</vector>

55
patches/fenix-overlay/res/drawable/ic_launcher_private_foreground.xml
View File

@@ -1,37 +1,32 @@
<?xml version="1.0" encoding="utf-8" ?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:width="108dp"
android:height="108dp"
android:viewportWidth="32"
android:viewportHeight="32">
<group
android:scaleX="0.45"
android:scaleY="0.45"
android:translateX="8.8"
android:translateY="8.8">
<path android:pathData="M10.437,5.576 L5.547,10.378c-0.118,0.116 -0.215,0.345 -0.213,0.51 0.085,9 5.053,11.624 10.425,15.599 0.133,0.098 0.349,0.099 0.482,0.001 5.476,-3.998 10.333,-6.332 10.449,-15.523 0.002,-0.165 -0.093,-0.394 -0.211,-0.51L21.546,5.577a0.126,0.126 157.511,0 0,-0.215 0.089l-0.028,4.701c-0.001,0.166 -0.136,0.3 -0.302,0.3 -1.605,0 -7.041,0 -10.031,0 -0.166,0 -0.3,-0.134 -0.301,-0.3l-0.017,-4.701a0.127,0.127 22.654,0 0,-0.215 -0.09z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="4.287"
android:endY="5.181"
android:startX="14.101"
android:startY="26.307"
android:type="linear">
<item
android:color="#FF8600FF"
android:offset="0" />
<item
android:color="#AEFF0E00"
android:offset="0.7" />
</gradient>
</aapt:attr>
</path>
<path
android:fillColor="#ffffff"
android:pathData="m21.333,16c-1.995,3.338 -2.095,3.239 -3.345,1.988" />
<path
android:fillColor="#ffffff"
android:pathData="m10.67,16.156c1.893,3.28 1.987,3.187 3.238,1.936" />
</group>
<group android:scaleX="0.64166665"
android:scaleY="0.64166665"
android:translateX="5.733333"
android:translateY="5.733333">
<path
android:pathData="M10.562,5.498C10.516,5.479 10.462,5.49 10.425,5.525l-4.89,4.803c-0.118,0.116 -0.214,0.344 -0.213,0.51 0.085,9 5.054,11.624 10.426,15.6 0.133,0.098 0.349,0.098 0.482,0 5.476,-3.998 10.332,-6.331 10.447,-15.521 0.002,-0.165 -0.093,-0.395 -0.211,-0.512l-4.931,-4.88c-0.08,-0.08 -0.216,-0.023 -0.215,0.09l-0.029,4.701c-0.001,0.166 -0.135,0.299 -0.301,0.299L10.959,10.615c-0.166,0 -0.3,-0.133 -0.301,-0.299L10.641,5.615c-0,-0.051 -0.031,-0.098 -0.079,-0.117z">
<aapt:attr name="android:fillColor">
<gradient
android:startX="5.322"
android:startY="5.488"
android:endX="26.678"
android:endY="26.512"
android:type="linear">
<item android:offset="0" android:color="#AEFF0E00"/>
<item android:offset="1" android:color="#FF8600FF"/>
</gradient>
</aapt:attr>
</path>
<path
android:pathData="m21.32,15.949c-1.995,3.338 -2.095,3.239 -3.345,1.988"
android:fillColor="#ffffff"/>
<path
android:pathData="m10.627,15.949c1.995,3.338 2.095,3.239 3.345,1.988"
android:fillColor="#ffffff"/>
</group>
</vector>

8
patches/fenix-overlay/res/mipmap-anydpi-v26/ic_launcher.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@drawable/ic_launcher_foreground"/>
<monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
</adaptive-icon>
<background android:drawable="@color/ic_launcher_background" />
<foreground android:drawable="@drawable/ic_launcher_foreground" />
<monochrome android:drawable="@drawable/ic_launcher_monochrome" />
</adaptive-icon>

1
patches/fenix-overlay/res/mipmap-anydpi-v26/ic_launcher_private.xml
View File

@@ -2,4 +2,5 @@
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_private_background"/>
<foreground android:drawable="@drawable/ic_launcher_private_foreground"/>
<monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
</adaptive-icon>

1
patches/fenix-overlay/res/mipmap-anydpi-v26/ic_launcher_private_round.xml
View File

@@ -2,4 +2,5 @@
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_private_background"/>
<foreground android:drawable="@drawable/ic_launcher_private_foreground"/>
<monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
</adaptive-icon>

2
patches/fenix-overlay/res/mipmap-anydpi-v26/ic_launcher_round.xml
View File

@@ -3,4 +3,4 @@
<background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@drawable/ic_launcher_foreground"/>
<monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
</adaptive-icon>
</adaptive-icon>

BIN
patches/fenix-overlay/res/mipmap-hdpi/ic_launcher.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
patches/fenix-overlay/res/mipmap-hdpi/ic_launcher_private.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
patches/fenix-overlay/res/mipmap-hdpi/ic_launcher_private_round.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
patches/fenix-overlay/res/mipmap-hdpi/ic_launcher_round.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
patches/fenix-overlay/res/mipmap-mdpi/ic_launcher.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1000 B

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
patches/fenix-overlay/res/mipmap-mdpi/ic_launcher_private.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 954 B

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
patches/fenix-overlay/res/mipmap-mdpi/ic_launcher_private_round.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
patches/fenix-overlay/res/mipmap-mdpi/ic_launcher_round.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
patches/fenix-overlay/res/mipmap-xhdpi/ic_launcher.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
patches/fenix-overlay/res/mipmap-xhdpi/ic_launcher_private.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
patches/fenix-overlay/res/mipmap-xhdpi/ic_launcher_private_round.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

BIN
patches/fenix-overlay/res/mipmap-xhdpi/ic_launcher_round.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

BIN
patches/fenix-overlay/res/mipmap-xxhdpi/ic_launcher.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
patches/fenix-overlay/res/mipmap-xxhdpi/ic_launcher_private.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
patches/fenix-overlay/res/mipmap-xxhdpi/ic_launcher_private_round.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 6.7 KiB

BIN
patches/fenix-overlay/res/mipmap-xxhdpi/ic_launcher_round.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.7 KiB

After

Width:  |  Height:  |  Size: 6.1 KiB

BIN
patches/fenix-overlay/res/mipmap-xxxhdpi/ic_launcher.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

BIN
patches/fenix-overlay/res/mipmap-xxxhdpi/ic_launcher_private.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

BIN
patches/fenix-overlay/res/mipmap-xxxhdpi/ic_launcher_private_round.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.5 KiB

After

Width:  |  Height:  |  Size: 8.9 KiB

BIN
patches/fenix-overlay/res/mipmap-xxxhdpi/ic_launcher_round.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.0 KiB

After

Width:  |  Height:  |  Size: 8.4 KiB

6
scripts/get_sources.sh
View File

@@ -2,11 +2,11 @@
set -euo pipefail
FIREFOX_TAG="FIREFOX-ANDROID_133_0_3_RELEASE"
FIREFOX_TAG="FIREFOX-ANDROID_134_0_RELEASE"
WASI_TAG="wasi-sdk-20"
GLEAN_TAG="v61.2.0"
GLEAN_TAG="v62.0.0"
GMSCORE_TAG="v0.3.6.244735"
APPSERVICES_TAG="v133.0"
APPSERVICES_TAG="v134.0"
# Configuration
ROOTDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"

7
scripts/prebuild.sh
View File

@@ -228,7 +228,7 @@ pushd "$application_services"
chmod +x libs/*.sh
chmod +x automation/publish_to_maven_local_if_modified.py
# Break the dependency on older A-C
sed -i -e '/android-components = /s/131\.0\.2/133.0.3/' gradle/libs.versions.toml
sed -i -e '/android-components = /s/132\.0/134.0/' gradle/libs.versions.toml
echo "rust.targets=linux-x86-64,$rusttarget" >>local.properties
sed -i -e '/NDK ez-install/,/^$/d' libs/verify-android-ci-environment.sh
sed -i -e '/content {/,/}/d' build.gradle
@@ -323,6 +323,11 @@ fi
echo "ac_add_options --with-gradle=$(command -v gradle)"
echo "ac_add_options --with-libclang-path=\"$libclang\""
echo "ac_add_options --with-wasi-sysroot=\"$wasi_install/share/wasi-sysroot\""
if [[ -n ${SB_GAPI_KEY_FILE+x} ]]; then
echo "--with-google-safebrowsing-api-keyfile=${SB_GAPI_KEY_FILE}"
fi
echo "ac_add_options WASM_CC=\"$wasi_install/bin/clang\""
echo "ac_add_options WASM_CXX=\"$wasi_install/bin/clang++\""
echo "ac_add_options CC=\"$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/clang\""