Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca626f72 authored by Mohammed Althaf T's avatar Mohammed Althaf T 😊
Browse files

Browser: Update patches

parent 4f0ef124

build/e_patches/0002-Browser-Remove-some-preferences-from-UI.patch

deleted100644 → 0
+0 −52
Original line number Diff line number Diff line 
From e3e119fd25fc4dc8c8fca92eac8c94345454c0e0 Mon Sep 17 00:00:00 2001

From: fgei <fgei@gmail.com>

Date: Fri, 15 Oct 2021 13:49:33 +0000

Subject: [PATCH 2/3] Browser: Remove some preferences from UI



---

 .../chrome/browser/privacy/settings/PrivacySettings.java  | 8 ++++++++

 1 file changed, 8 insertions(+)



diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java

index 65d7d279c99e7..3f414adb320b5 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java

@@ -165,6 +165,8 @@ public class PrivacySettings extends PreferenceFragmentCompat

         mIncognitoLockSettings = new IncognitoLockSettings(incognitoReauthPreference);

         mIncognitoLockSettings.setUpIncognitoReauthPreference(getActivity());

 

+        getPreferenceScreen().removePreference(findPreference(PREF_PRIVACY_SANDBOX));

+

         Preference safeBrowsingPreference = findPreference(PREF_SAFE_BROWSING);

         safeBrowsingPreference.setSummary(

                 SafeBrowsingSettingsFragment.getSafeBrowsingSummaryString(getContext()));

@@ -174,6 +176,8 @@ public class PrivacySettings extends PreferenceFragmentCompat

             return false;

         });

 

+        getPreferenceScreen().removePreference(findPreference(PREF_SAFE_BROWSING));

+

         setHasOptionsMenu(true);

 

         mSearchSuggestions = (ChromeSwitchPreference) findPreference(PREF_SEARCH_SUGGESTIONS);

@@ -186,6 +190,8 @@ public class PrivacySettings extends PreferenceFragmentCompat

         mContextualSearch.setSummary(

                 isContextualSearchEnabled ? R.string.text_on : R.string.text_off);

 

+        getPreferenceScreen().removePreference(findPreference(PREF_CONTEXTUAL_SEARCH));

+

         ChromeSwitchPreference canMakePaymentPref =

                 (ChromeSwitchPreference) findPreference(PREF_CAN_MAKE_PAYMENT);

         canMakePaymentPref.setOnPreferenceChangeListener(this);

@@ -222,6 +228,8 @@ public class PrivacySettings extends PreferenceFragmentCompat

         Preference syncAndServicesLink = findPreference(PREF_SYNC_AND_SERVICES_LINK);

         syncAndServicesLink.setSummary(buildSyncAndServicesLink());

 

+        getPreferenceScreen().removePreference(findPreference(PREF_SYNC_AND_SERVICES_LINK));

+

         // set up history expire days threshold preference

         List<TimeFrequencySpinnerOption> options = new ArrayList<>();

         options.add(new TimeFrequencySpinnerOption(0,

-- 

2.34.1

build/e_patches/0002-Revert-Move-some-account-settings-back-to-privacy-se.patch

0 → 100644
+123 −0
Original line number Diff line number Diff line 
From 3688ac4144cd388d12e797502f93042c8e86dec4 Mon Sep 17 00:00:00 2001

From: althafvly <althafvly@gmail.com>

Date: Mon, 9 Oct 2023 12:41:18 +0530

Subject: [PATCH 2/3] Revert "Move some account settings back to privacy

 settings"



This reverts commit 0556337f041c88accb24e9c9c195e96c60a602b3.

---

 .../java/res/xml/privacy_preferences.xml      | 13 ---------

 .../privacy/settings/PrivacySettings.java     | 29 -------------------

 .../strings/android_chrome_strings.grd        |  4 ---

 3 files changed, 46 deletions(-)



diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml

index 16b037f14068c..77aedc4c61273 100644

--- a/chrome/android/java/res/xml/privacy_preferences.xml

+++ b/chrome/android/java/res/xml/privacy_preferences.xml

@@ -92,19 +92,6 @@ found in the LICENSE file.

         android:key="privacy_sandbox"

         android:title="@string/prefs_privacy_sandbox"

         android:fragment="org.chromium.chrome.browser.privacy_sandbox.PrivacySandboxSettingsFragmentV3"/>

-    <PreferenceCategory

-        android:key="services_category"

-        android:title="@string/services_category_title">

-      <org.chromium.components.browser_ui.settings.ChromeSwitchPreference

-          android:key="search_suggestions"

-          android:title="@string/improve_search_suggestions_title"

-          android:summary="@string/improve_search_suggestions_summary"

-          android:persistent="false"/>

-      <org.chromium.components.browser_ui.settings.ChromeBasePreference

-          android:key="contextual_search"

-          android:title="@string/contextual_search_title"

-          android:fragment="org.chromium.chrome.browser.contextualsearch.ContextualSearchPreferenceFragment"/>

-    </PreferenceCategory>

     <Preference

         android:key="phone_as_a_security_key"

         android:title="@string/cablev2_paask_title"

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java

index 65d7d279c99e7..89f109da09734 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java

@@ -62,10 +62,6 @@ import org.chromium.components.user_prefs.UserPrefs;

 import org.chromium.ui.text.NoUnderlineClickableSpan;

 import org.chromium.ui.text.SpanApplier;

 

-import androidx.annotation.Nullable;

-import androidx.preference.PreferenceCategory;

-import org.chromium.chrome.browser.contextualsearch.ContextualSearchManager;

-import org.chromium.chrome.browser.preferences.SharedPreferencesManager;

 import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;

 import org.chromium.components.browser_ui.settings.ManagedPreferenceDelegate;

 

@@ -92,16 +88,6 @@ public class PrivacySettings extends PreferenceFragmentCompat

     private static final String PREF_PRIVACY_GUIDE = "privacy_guide";

     private static final String PREF_INCOGNITO_LOCK = "incognito_lock";

     private static final String PREF_THIRD_PARTY_COOKIES = "third_party_cookies";

-

-    // moved from SyncAndServicesSettings.java

-    private static final String PREF_SERVICES_CATEGORY = "services_category";

-    private static final String PREF_SEARCH_SUGGESTIONS = "search_suggestions";

-    private static final String PREF_CONTEXTUAL_SEARCH = "contextual_search";

-    private ChromeSwitchPreference mSearchSuggestions;

-    private @Nullable Preference mContextualSearch;

-    private final SharedPreferencesManager mSharedPreferencesManager =

-            SharedPreferencesManager.getInstance();

-

     private static final String PREF_CLOSE_TABS_ON_EXIT = "close_tabs_on_exit";

 

     private ManagedPreferenceDelegate mManagedPreferenceDelegate;

@@ -176,16 +162,6 @@ public class PrivacySettings extends PreferenceFragmentCompat

 

         setHasOptionsMenu(true);

 

-        mSearchSuggestions = (ChromeSwitchPreference) findPreference(PREF_SEARCH_SUGGESTIONS);

-        mSearchSuggestions.setOnPreferenceChangeListener(this);

-        mSearchSuggestions.setManagedPreferenceDelegate(mManagedPreferenceDelegate);

-

-        mContextualSearch = findPreference(PREF_CONTEXTUAL_SEARCH);

-        boolean isContextualSearchEnabled =

-                !ContextualSearchManager.isContextualSearchDisabled();

-        mContextualSearch.setSummary(

-                isContextualSearchEnabled ? R.string.text_on : R.string.text_off);

-

         ChromeSwitchPreference canMakePaymentPref =

                 (ChromeSwitchPreference) findPreference(PREF_CAN_MAKE_PAYMENT);

         canMakePaymentPref.setOnPreferenceChangeListener(this);

@@ -305,9 +281,6 @@ public class PrivacySettings extends PreferenceFragmentCompat

             UserPrefs.get(mProfile).setBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED, (boolean) newValue);

         } else if (PREF_HTTPS_FIRST_MODE.equals(key)) {

             UserPrefs.get(mProfile).setBoolean(Pref.HTTPS_ONLY_MODE_ENABLED, (boolean) newValue);

-        } else if (PREF_SEARCH_SUGGESTIONS.equals(key)) {

-            UserPrefs.get(Profile.getLastUsedRegularProfile())

-                    .setBoolean(Pref.SEARCH_SUGGEST_ENABLED, (boolean) newValue);

         } else if (PREF_ALLOW_CUSTOM_TAB_INTENTS.equals(key)) {

             SharedPreferences.Editor sharedPreferencesEditor = ContextUtils.getAppSharedPreferences().edit();

             sharedPreferencesEditor.putBoolean(PREF_ALLOW_CUSTOM_TAB_INTENTS, (boolean)newValue);

@@ -330,8 +303,6 @@ public class PrivacySettings extends PreferenceFragmentCompat

      * Updates the preferences.

      */

     public void updatePreferences() {

-        mSearchSuggestions.setChecked(UserPrefs.get(mProfile).getBoolean(Pref.SEARCH_SUGGEST_ENABLED));

-

         ChromeSwitchPreference canMakePaymentPref =

                 (ChromeSwitchPreference) findPreference(PREF_CAN_MAKE_PAYMENT);

         if (canMakePaymentPref != null) {

diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd

index 6b65d720af3d3..173e045e7f312 100644

--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd

+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd

@@ -528,10 +528,6 @@ CHAR_LIMIT guidelines:

         No statistics or crash reports are sent to Google

       </message>

 

-      <message name="IDS_SERVICES_CATEGORY_TITLE" desc="Title for the group of preferences that control non-personalized Google services. This group contains preferences for data that is not tied to user's Google Account.">

-        Other services

-      </message>

-

       <!-- Search engine settings -->

       <message name="IDS_SEARCH_ENGINE_SETTINGS" desc="Title for Search Engine settings. [CHAR_LIMIT=32]">

         Search engine

-- 

2.34.1

build/e_patches/0003-Browser-Disable-dev-options-in-any-build-by-default.patch

deleted100644 → 0
+0 −28
Original line number Diff line number Diff line 
From 495928e16a716a16d297d72f94b2d3551fe10a55 Mon Sep 17 00:00:00 2001

From: althafvly <althafvly@gmail.com>

Date: Fri, 6 Oct 2023 11:14:46 +0530

Subject: [PATCH 3/3] Browser: Disable dev options in any build by default



---

 .../chrome/browser/tracing/settings/DeveloperSettings.java    | 4 ++--

 1 file changed, 2 insertions(+), 2 deletions(-)



diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/DeveloperSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/DeveloperSettings.java

index 2aea7f1bfbb84..4d390aa3ac4b5 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/DeveloperSettings.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/DeveloperSettings.java

@@ -31,9 +31,9 @@ public class DeveloperSettings extends PreferenceFragmentCompat {

     public static boolean shouldShowDeveloperSettings() {

         // Always enabled on canary, dev and local builds, otherwise can be enabled by tapping the

         // Chrome version in Settings>About multiple times.

-        if (sIsEnabledForTests != null) return sIsEnabledForTests;

+        // if (sIsEnabledForTests != null) return sIsEnabledForTests;

 

-        if (VersionConstants.CHANNEL <= Channel.DEV) return true;

+        // if (VersionConstants.CHANNEL <= Channel.DEV) return true;

         return SharedPreferencesManager.getInstance().readBoolean(

                 ChromePreferenceKeys.SETTINGS_DEVELOPER_ENABLED, false);

     }

-- 

2.34.1

build/e_patches/0003-Browser-Remove-some-preferences-from-UI.patch

0 → 100644
+106 −0
Original line number Diff line number Diff line 
From e9efa24945b062aac79acc7a10ef77300c9476bc Mon Sep 17 00:00:00 2001

From: fgei <fgei@gmail.com>

Date: Fri, 15 Oct 2021 13:49:33 +0000

Subject: [PATCH 3/3] Browser: Remove some preferences from UI



---

 chrome/android/java/res/xml/privacy_preferences.xml         | 5 -----

 chrome/android/java/res/xml/privacy_preferences_v2.xml      | 5 -----

 .../chrome/browser/privacy/settings/PrivacySettings.java    | 6 ++++++

 .../org/chromium/chrome/browser/settings/MainSettings.java  | 3 +++

 .../options/RadioButtonGroupThirdPartyPreference.java       | 2 +-

 5 files changed, 10 insertions(+), 11 deletions(-)



diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml

index 77aedc4c61273..9bdbe90b3cb64 100644

--- a/chrome/android/java/res/xml/privacy_preferences.xml

+++ b/chrome/android/java/res/xml/privacy_preferences.xml

@@ -92,11 +92,6 @@ found in the LICENSE file.

         android:key="privacy_sandbox"

         android:title="@string/prefs_privacy_sandbox"

         android:fragment="org.chromium.chrome.browser.privacy_sandbox.PrivacySandboxSettingsFragmentV3"/>

-    <Preference

-        android:key="phone_as_a_security_key"

-        android:title="@string/cablev2_paask_title"

-        android:summary="@string/cablev2_paask_body"

-        android:fragment="org.chromium.chrome.browser.webauthn.PrivacySettingsFragment"/>

     <org.chromium.components.browser_ui.settings.TextMessagePreference

         android:key="sync_and_services_link"

         android:summary="@string/privacy_sync_and_services_link_legacy"

diff --git a/chrome/android/java/res/xml/privacy_preferences_v2.xml b/chrome/android/java/res/xml/privacy_preferences_v2.xml

index 832d89291ccc9..e9ed3d4529e11 100644

--- a/chrome/android/java/res/xml/privacy_preferences_v2.xml

+++ b/chrome/android/java/res/xml/privacy_preferences_v2.xml

@@ -61,11 +61,6 @@ found in the LICENSE file.

         android:key="secure_dns"

         android:title="@string/settings_secure_dns_title"

         android:fragment="org.chromium.chrome.browser.privacy.secure_dns.SecureDnsSettings" />

-    <Preference

-        android:key="phone_as_a_security_key"

-        android:title="@string/cablev2_paask_title"

-        android:summary="@string/cablev2_paask_body"

-        android:fragment="org.chromium.chrome.browser.webauthn.PrivacySettingsFragment" />

     <org.chromium.components.browser_ui.settings.ChromeSwitchPreference

         android:key="can_make_payment"

         android:title="@string/can_make_payment_title"

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java

index 89f109da09734..50b76bde55038 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java

@@ -151,6 +151,8 @@ public class PrivacySettings extends PreferenceFragmentCompat

         mIncognitoLockSettings = new IncognitoLockSettings(incognitoReauthPreference);

         mIncognitoLockSettings.setUpIncognitoReauthPreference(getActivity());

 

+        getPreferenceScreen().removePreference(findPreference(PREF_PRIVACY_SANDBOX));

+

         Preference safeBrowsingPreference = findPreference(PREF_SAFE_BROWSING);

         safeBrowsingPreference.setSummary(

                 SafeBrowsingSettingsFragment.getSafeBrowsingSummaryString(getContext()));

@@ -160,6 +162,8 @@ public class PrivacySettings extends PreferenceFragmentCompat

             return false;

         });

 

+        getPreferenceScreen().removePreference(findPreference(PREF_SAFE_BROWSING));

+

         setHasOptionsMenu(true);

 

         ChromeSwitchPreference canMakePaymentPref =

@@ -198,6 +202,8 @@ public class PrivacySettings extends PreferenceFragmentCompat

         Preference syncAndServicesLink = findPreference(PREF_SYNC_AND_SERVICES_LINK);

         syncAndServicesLink.setSummary(buildSyncAndServicesLink());

 

+        getPreferenceScreen().removePreference(findPreference(PREF_SYNC_AND_SERVICES_LINK));

+

         // set up history expire days threshold preference

         List<TimeFrequencySpinnerOption> options = new ArrayList<>();

         options.add(new TimeFrequencySpinnerOption(0,

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java

index ee4bd26f4fc5a..59e785ae11ecc 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java

@@ -266,6 +266,9 @@ public class MainSettings extends PreferenceFragmentCompat

         } else {

             removePreferenceIfPresent(PREF_DEVELOPER);

         }

+

+        removePreferenceIfPresent(PREF_AUTOFILL_OPTIONS);

+        removePreferenceIfPresent(PREF_DEVELOPER);

     }

 

     private Preference addPreferenceIfAbsent(String key) {

diff --git a/chrome/browser/autofill/android/java/src/org/chromium/chrome/browser/autofill/options/RadioButtonGroupThirdPartyPreference.java b/chrome/browser/autofill/android/java/src/org/chromium/chrome/browser/autofill/options/RadioButtonGroupThirdPartyPreference.java

index 99b0e21ea331b..55d54506560a8 100644

--- a/chrome/browser/autofill/android/java/src/org/chromium/chrome/browser/autofill/options/RadioButtonGroupThirdPartyPreference.java

+++ b/chrome/browser/autofill/android/java/src/org/chromium/chrome/browser/autofill/options/RadioButtonGroupThirdPartyPreference.java

@@ -40,7 +40,7 @@ public final class RadioButtonGroupThirdPartyPreference extends Preference {

 

     private @Nullable RadioButtonWithDescription mDefaultOption;

     private @Nullable RadioButtonWithDescription mOptInOption;

-    private @ThirdPartyOption int mSelectedOption = getPersistedInt(ThirdPartyOption.DEFAULT);

+    private @ThirdPartyOption int mSelectedOption = getPersistedInt(ThirdPartyOption.USE_OTHER_PROVIDER);

 

     public RadioButtonGroupThirdPartyPreference(Context context, AttributeSet attrs) {

         super(context, attrs);

-- 

2.34.1

build/e_patches_list.txt

+2 −2
Original line number Diff line number Diff line
@@ -54,5 +54,5 @@ 
0035-Change-accent-and-switch-to-match-our-palette.patch



0001-Disable-Play-services-dependent-password-manager-fea.patch

0002-Browser-Remove-some-preferences-from-UI.patch

0003-Browser-Disable-dev-options-in-any-build-by-default.patch
 
0002-Revert-Move-some-account-settings-back-to-privacy-se.patch

0003-Browser-Remove-some-preferences-from-UI.patch