0ct0pu5/bromite
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move-some-account-settings-back-to-privacy-settings.patch

Browse source
This commit is contained in:
none 2021-03-06 11:28:21 +01:00
parent 668cf97918
commit b0326968f4
1 changed files with 19 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
build/patches/Move-some-account-settings-back-to-privacy-settings.patch
View file

@ -4,18 +4,17 @@ Subject: Move some account settings back to privacy settings
Search suggestions, autofill assistant and contextual search
---
.../java/res/xml/privacy_preferences.xml | 19 ++++++
.../privacy/settings/PrivacySettings.java | 63 ++++++++++++++++++-
2 files changed, 79 insertions(+), 3 deletions(-)
.../java/res/xml/privacy_preferences.xml | 18 ++++++
.../privacy/settings/PrivacySettings.java | 62 ++++++++++++++++++-
2 files changed, 78 insertions(+), 2 deletions(-)
diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
--- a/chrome/android/java/res/xml/privacy_preferences.xml
+++ b/chrome/android/java/res/xml/privacy_preferences.xml
@@ -58,4 +58,23 @@
android:summary="@string/clear_browsing_data_summary"
android:fragment="org.chromium.chrome.browser.browsing_data.ClearBrowsingDataTabsFragment"
android:order="5"/>
+
@@ -63,4 +63,22 @@
android:title="@string/prefs_privacy_sandbox"
android:fragment="org.chromium.chrome.browser.privacy_sandbox.PrivacySandboxSettingsFragment"
android:order="7"/>
+ <PreferenceCategory
+ android:key="services_category"
+ android:title="@string/services_category_title">
@ -38,17 +37,9 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
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
--- 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
@@ -24,7 +24,6 @@ import org.chromium.chrome.browser.preferences.Pref;
import org.chromium.chrome.browser.privacy.secure_dns.SecureDnsSettings;
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.safe_browsing.metrics.SettingsAccessPoint;
-import org.chromium.chrome.browser.safe_browsing.settings.SafeBrowsingSettingsFragment;
import org.chromium.chrome.browser.settings.ChromeManagedPreferenceDelegate;
import org.chromium.chrome.browser.settings.SettingsLauncher;
import org.chromium.chrome.browser.settings.SettingsLauncherImpl;
@@ -40,6 +39,13 @@ import org.chromium.ui.text.SpanApplier;
import org.chromium.base.Log;
@@ -40,6 +40,13 @@ import org.chromium.ui.text.SpanApplier;
import org.chromium.base.ContextUtils;
import android.content.SharedPreferences;
+import androidx.annotation.Nullable;
+import androidx.preference.PreferenceCategory;
@ -60,7 +51,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
/**
* Fragment to keep track of the all the privacy related preferences.
*/
@@ -56,6 +62,18 @@ public class PrivacySettings
@@ -57,6 +64,18 @@ public class PrivacySettings
private static final String PREF_PROXY_OPTIONS = "proxy";
public static final String PREF_INCOGNITO_TAB_HISTORY_ENABLED = "incognito_history_enabled";
@ -78,8 +69,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
+
private static final String[] NEW_PRIVACY_PREFERENCE_ORDER = {PREF_CLEAR_BROWSING_DATA,
PREF_CAN_MAKE_PAYMENT, PREF_NETWORK_PREDICTIONS,
PREF_SECURE_DNS, PREF_DO_NOT_TRACK,
@@ -63,7 +81,8 @@ public class PrivacySettings
PREF_SECURE_DNS, PREF_DO_NOT_TRACK, PREF_PRIVACY_SANDBOX,
@@ -64,7 +83,8 @@ public class PrivacySettings
PREF_INCOGNITO_TAB_HISTORY_ENABLED,
PREF_ALLOW_CUSTOM_TAB_INTENTS,
PREF_CLOSE_TABS_ON_EXIT,
@ -89,7 +80,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
};
private ManagedPreferenceDelegate mManagedPreferenceDelegate;
@@ -89,6 +108,29 @@ public class PrivacySettings
@@ -95,6 +115,29 @@ public class PrivacySettings
mManagedPreferenceDelegate = createManagedPreferenceDelegate();
@ -119,7 +110,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
ChromeSwitchPreference canMakePaymentPref =
(ChromeSwitchPreference) findPreference(PREF_CAN_MAKE_PAYMENT);
canMakePaymentPref.setOnPreferenceChangeListener(this);
@@ -121,6 +163,11 @@ public class PrivacySettings
@@ -127,6 +170,11 @@ public class PrivacySettings
} else if (PREF_CAN_MAKE_PAYMENT.equals(key)) {
UserPrefs.get(Profile.getLastUsedRegularProfile())
.setBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED, (boolean) newValue);
@ -129,9 +120,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
+ mSharedPreferencesManager.writeBoolean(
+ ChromePreferenceKeys.AUTOFILL_ASSISTANT_ENABLED, (boolean) newValue);
} else if (PREF_NETWORK_PREDICTIONS.equals(key)) {
PrivacyPreferencesManager.getInstance().setNetworkPredictionEnabled((boolean) newValue);
} else if (PREF_ALLOW_CUSTOM_TAB_INTENTS.equals(key)) {
@@ -135,6 +182,16 @@ public class PrivacySettings
PrivacyPreferencesManagerImpl.getInstance().setNetworkPredictionEnabled(
(boolean) newValue);
@@ -142,6 +190,16 @@ public class PrivacySettings
return true;
}
@ -148,7 +139,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
@Override
public void onResume() {
super.onResume();
@@ -145,7 +202,7 @@ public class PrivacySettings
@@ -152,7 +210,7 @@ public class PrivacySettings
* Updates the summaries for several preferences.
*/
public void updateSummaries() {