86 lines
4.3 KiB
Diff
86 lines
4.3 KiB
Diff
|
From e55c715cbdf43ad945e800d9f46bad64f80757dd Mon Sep 17 00:00:00 2001
|
||
|
|
From: harvey186 <harvey186@hotmail.com>
|
||
|
|
Date: Thu, 22 Feb 2024 09:45:49 +0100
|
||
|
|
Subject: [PATCH] fenix-patches
|
||
|
|
|
||
|
|
---
|
||
|
|
android-components | 2 +-
|
||
|
|
app/src/main/java/org/mozilla/fenix/FeatureFlags.kt | 2 +-
|
||
|
|
.../main/java/org/mozilla/fenix/settings/SupportUtils.kt | 2 ++
|
||
|
|
.../xml/site_permissions_details_exceptions_preferences.xml | 6 ++++--
|
||
|
|
app/src/main/res/xml/site_permissions_preferences.xml | 1 +
|
||
|
|
5 files changed, 9 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/android-components b/android-components
|
||
|
|
index 868ab5a..2f13593 160000
|
||
|
|
--- a/android-components
|
||
|
|
+++ b/android-components
|
||
|
|
@@ -1 +1 @@
|
||
|
|
-Subproject commit 868ab5a098f62933b83eb70dd41126b3971ef4fc
|
||
|
|
+Subproject commit 2f135938b7842257f108e0b4274a6f5bd0f86189
|
||
|
|
diff --git a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
|
||
|
|
index 805ff66..1e9a4f1 100644
|
||
|
|
--- a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
|
||
|
|
+++ b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
|
||
|
|
@@ -18,7 +18,7 @@ object FeatureFlags {
|
||
|
|
* This feature does not only depend on this flag. It requires the AMO collection override to
|
||
|
|
* be enabled which is behind the Secret Settings.
|
||
|
|
* */
|
||
|
|
- val customExtensionCollectionFeature = Config.channel.isNightlyOrDebug || Config.channel.isBeta
|
||
|
|
+ val customExtensionCollectionFeature = true
|
||
|
|
|
||
|
|
/**
|
||
|
|
* Pull-to-refresh allows you to pull the web content down far enough to have the page to
|
||
|
|
diff --git a/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt b/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt
|
||
|
|
index fdabfeb..3efdfd5 100644
|
||
|
|
--- a/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt
|
||
|
|
+++ b/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt
|
||
|
|
@@ -39,6 +39,8 @@ object SupportUtils {
|
||
|
|
const val GOOGLE_US_URL = "https://www.google.com/webhp?client=firefox-b-1-m&channel=ts"
|
||
|
|
const val GOOGLE_XX_URL = "https://www.google.com/webhp?client=firefox-b-m&channel=ts"
|
||
|
|
const val WHATS_NEW_URL = "https://github.com/LeOS-GSI/LeOS-Ice-browser/releases"
|
||
|
|
+ const val FDROID_URL = "https://f-droid.org/"
|
||
|
|
+ const val EFF_URL = "https://www.eff.org/"
|
||
|
|
|
||
|
|
enum class SumoTopic(internal val topicStr: String) {
|
||
|
|
HELP("faq-android"),
|
||
|
|
diff --git a/app/src/main/res/xml/site_permissions_details_exceptions_preferences.xml b/app/src/main/res/xml/site_permissions_details_exceptions_preferences.xml
|
||
|
|
index 6bb8cfb..1c15b58 100644
|
||
|
|
--- a/app/src/main/res/xml/site_permissions_details_exceptions_preferences.xml
|
||
|
|
+++ b/app/src/main/res/xml/site_permissions_details_exceptions_preferences.xml
|
||
|
|
@@ -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/. -->
|
||
|
|
<androidx.preference.PreferenceScreen
|
||
|
|
- xmlns:android="http://schemas.android.com/apk/res/android">
|
||
|
|
+ xmlns:android="http://schemas.android.com/apk/res/android"
|
||
|
|
+ xmlns:app="http://schemas.android.com/apk/res-auto">
|
||
|
|
<androidx.preference.Preference
|
||
|
|
android:icon="@drawable/ic_camera_enabled"
|
||
|
|
android:key="@string/pref_key_phone_feature_camera"
|
||
|
|
@@ -44,7 +45,8 @@
|
||
|
|
android:icon="@drawable/ic_link"
|
||
|
|
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"/>
|
||
|
|
+ android:summary="@string/preference_option_phone_feature_ask_to_allow"
|
||
|
|
+ app:isPreferenceVisible="false"/>
|
||
|
|
|
||
|
|
<androidx.preference.Preference
|
||
|
|
android:icon="@drawable/ic_autoplay"
|
||
|
|
diff --git a/app/src/main/res/xml/site_permissions_preferences.xml b/app/src/main/res/xml/site_permissions_preferences.xml
|
||
|
|
index 64c90b5..621f184 100644
|
||
|
|
--- a/app/src/main/res/xml/site_permissions_preferences.xml
|
||
|
|
+++ b/app/src/main/res/xml/site_permissions_preferences.xml
|
||
|
|
@@ -64,6 +64,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"
|
||
|
|
+ app:isPreferenceVisible="false"
|
||
|
|
app:allowDividerBelow="true"/>
|
||
|
|
|
||
|
|
<androidx.preference.Preference
|
||
|
|
--
|
||
|
|
2.34.1
|
||
|
|
|