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

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

Browser: Squash pref remove to single commit

parent 549708b1

build/e_patches/0001-Disable-Play-services-dependent-password-manager-fea.patch

+1 −1
Original line number Diff line number Diff line 
From a177f67795435619d7c7cbfa0fda4db32773f30a Mon Sep 17 00:00:00 2001

From: fgei <fgei@gmail.com>

Date: Tue, 21 Feb 2023 02:02:40 +0000

Subject: [PATCH 1/3] Disable Play services dependent password manager feature

Subject: [PATCH 1/2] Disable Play services dependent password manager feature

 by default



---

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

+53 −16
Original line number Diff line number Diff line 
From b4c6143fa33d9842a18276796b7ab808255045f8 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

From 10b257327256fa936aef04dc7e7bc5b8e22bcb65 Mon Sep 17 00:00:00 2001

From: althafvly <althafvly@gmail.com>

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

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



---

 .../android/java/res/xml/main_preferences.xml   | 10 ----------

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

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

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

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

 .../privacy/settings/PrivacySettings.java       | 17 ++++++-----------

 .../chrome/browser/settings/MainSettings.java   | 17 -----------------

 ...adio_button_group_third_party_preference.xml |  2 +-

 .../RadioButtonGroupThirdPartyPreference.java   |  2 +-

 7 files changed, 8 insertions(+), 39 deletions(-)

 7 files changed, 8 insertions(+), 54 deletions(-)



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

index d5625671095b6..e8cd2d4ab7393 100644
@@ -42,13 +42,18 @@ index d5625671095b6..e8cd2d4ab7393 100644 
         android:fragment="org.chromium.chrome.browser.about_settings.AboutChromeSettings"

         android:key="about_chrome"

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

index 77aedc4c61273..9bdbe90b3cb64 100644

index 16b037f14068c..a2662d209ab11 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"/>

@@ -100,16 +100,7 @@ found in the LICENSE file.

           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"
@@ -74,10 +79,30 @@ index 832d89291ccc9..e9ed3d4529e11 100644 
         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

index 65d7d279c99e7..69b29d7ed2c45 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

@@ -62,9 +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;

@@ -96,9 +93,7 @@ public class PrivacySettings extends PreferenceFragmentCompat

     // 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();

 

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

         mIncognitoLockSettings = new IncognitoLockSettings(incognitoReauthPreference);

         mIncognitoLockSettings.setUpIncognitoReauthPreference(getActivity());
@@ -86,7 +111,7 @@ index 89f109da09734..50b76bde55038 100644 
         Preference safeBrowsingPreference = findPreference(PREF_SAFE_BROWSING);

         safeBrowsingPreference.setSummary(

                 SafeBrowsingSettingsFragment.getSafeBrowsingSummaryString(getContext()));

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

@@ -174,18 +171,14 @@ public class PrivacySettings extends PreferenceFragmentCompat

             return false;

         });
@@ -94,8 +119,20 @@ index 89f109da09734..50b76bde55038 100644 
+

         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 =

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

                 (ChromeSwitchPreference) findPreference(PREF_CAN_MAKE_PAYMENT);

         canMakePaymentPref.setOnPreferenceChangeListener(this);

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

         Preference syncAndServicesLink = findPreference(PREF_SYNC_AND_SERVICES_LINK);

         syncAndServicesLink.setSummary(buildSyncAndServicesLink());

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

deleted100644 → 0
+0 −123
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_list.txt

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



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

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

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