Patches for 141 (no changes)
This commit is contained in:
@@ -78,7 +78,7 @@ 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
|
||||
@@ -102,6 +102,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
|
||||
@@ -101,6 +101,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
|
||||
private static final String PREF_PASSWORD_LEAK_DETECTION = "password_leak_detection";
|
||||
private static final String PREF_SYNC_AND_SERVICES_LINK = "sync_and_services_link";
|
||||
private static final String PREF_PRIVACY_SANDBOX = "privacy_sandbox";
|
||||
|
||||
@@ -239,7 +239,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
|
||||
import android.os.Bundle;
|
||||
import android.text.SpannableString;
|
||||
import android.text.style.ClickableSpan;
|
||||
@@ -80,6 +81,15 @@ import org.chromium.ui.text.SpanApplier;
|
||||
@@ -79,6 +80,15 @@ import org.chromium.ui.text.SpanApplier;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import java.util.function.Consumer;
|
||||
|
||||
@@ -255,7 +255,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
|
||||
import androidx.preference.PreferenceCategory;
|
||||
import org.chromium.chrome.browser.contextualsearch.ContextualSearchManager;
|
||||
import org.chromium.base.shared_preferences.SharedPreferencesManager;
|
||||
@@ -154,6 +164,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
|
||||
@@ -153,6 +163,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
|
||||
startTag, endTag, new ChromeClickableSpan(context, onClickCallback));
|
||||
}
|
||||
|
||||
@@ -265,7 +265,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
|
||||
@Override
|
||||
public void onCreatePreferencesCromite(@Nullable Bundle savedInstanceState, @Nullable String rootKey) {
|
||||
mPageTitle.set(getString(R.string.prefs_privacy_security));
|
||||
@@ -385,6 +398,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
|
||||
@@ -384,6 +397,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
|
||||
new SpanApplier.SpanInfo("<link2>", "</link2>", servicesLink));
|
||||
}
|
||||
|
||||
@@ -275,7 +275,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
|
||||
@Override
|
||||
public boolean onPreferenceChange(Preference preference, Object newValue) {
|
||||
String key = preference.getKey();
|
||||
@@ -405,6 +421,31 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
|
||||
@@ -404,6 +420,31 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
|
||||
} else if (PREF_SEARCH_SUGGESTIONS.equals(key)) {
|
||||
UserPrefs.get(getProfile())
|
||||
.setBoolean(Pref.SEARCH_SUGGEST_ENABLED, (boolean) newValue);
|
||||
@@ -307,7 +307,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
|
||||
}
|
||||
return true;
|
||||
}
|
||||
@@ -437,6 +478,16 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
|
||||
@@ -436,6 +477,16 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
|
||||
UserPrefs.get(getProfile()).getBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED));
|
||||
}
|
||||
|
||||
|
||||
@@ -105,7 +105,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
|
||||
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
|
||||
@@ -29,6 +29,7 @@ import org.chromium.base.ContextUtils;
|
||||
@@ -28,6 +28,7 @@ import org.chromium.base.ContextUtils;
|
||||
import org.chromium.base.IntentUtils;
|
||||
import org.chromium.base.metrics.RecordHistogram;
|
||||
import org.chromium.base.metrics.RecordUserAction;
|
||||
@@ -113,7 +113,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
|
||||
import org.chromium.base.supplier.ObservableSupplier;
|
||||
import org.chromium.base.supplier.ObservableSupplierImpl;
|
||||
import org.chromium.build.annotations.NullMarked;
|
||||
@@ -99,13 +100,27 @@ import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
|
||||
@@ -98,13 +99,27 @@ import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
|
||||
import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
|
||||
import org.chromium.components.browser_ui.settings.ManagedPreferenceDelegate;
|
||||
|
||||
@@ -142,7 +142,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
|
||||
private static final String PREF_CAN_MAKE_PAYMENT = "can_make_payment";
|
||||
private static final String PREF_PRELOAD_PAGES = "preload_pages";
|
||||
private static final String PREF_HTTPS_FIRST_MODE = "https_first_mode";
|
||||
@@ -217,6 +232,21 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
|
||||
@@ -216,6 +231,21 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
|
||||
}
|
||||
}
|
||||
|
||||
@@ -164,7 +164,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
|
||||
Preference privacyGuidePreference = findPreference(PREF_PRIVACY_GUIDE);
|
||||
// Record the launch of PG from the S&P link-row entry point
|
||||
privacyGuidePreference.setOnPreferenceClickListener(
|
||||
@@ -442,6 +472,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
|
||||
@@ -441,6 +471,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
|
||||
|
||||
public static final String PREF_ALLOW_CUSTOM_TAB_INTENTS = "allow_custom_tab_intents";
|
||||
public static final String PREF_OPEN_EXTERNAL_LINKS_INCOGNITO = "open_external_links_incognito";
|
||||
@@ -172,7 +172,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
|
||||
|
||||
@Override
|
||||
public boolean onPreferenceChange(Preference preference, Object newValue) {
|
||||
@@ -488,6 +519,13 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
|
||||
@@ -487,6 +518,13 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
|
||||
SharedPreferences.Editor sharedPreferencesEditor = ContextUtils.getAppSharedPreferences().edit();
|
||||
sharedPreferencesEditor.putBoolean(PREF_OPEN_EXTERNAL_LINKS_INCOGNITO, (boolean)newValue);
|
||||
sharedPreferencesEditor.apply();
|
||||
@@ -186,7 +186,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
|
||||
}
|
||||
return true;
|
||||
}
|
||||
@@ -538,6 +576,10 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
|
||||
@@ -537,6 +575,10 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
|
||||
: R.string.text_off);
|
||||
}
|
||||
|
||||
|
||||
@@ -82,7 +82,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
|
||||
import org.chromium.chrome.browser.read_later.ReadingListBackPressHandler;
|
||||
import org.chromium.chrome.browser.recent_tabs.CrossDevicePaneFactory;
|
||||
import org.chromium.chrome.browser.reengagement.ReengagementNotificationController;
|
||||
@@ -2156,7 +2157,11 @@ public class ChromeTabbedActivity extends ChromeActivity {
|
||||
@@ -2157,7 +2158,11 @@ public class ChromeTabbedActivity extends ChromeActivity {
|
||||
Intent intent = getIntent();
|
||||
|
||||
boolean hadCipherData =
|
||||
|
||||
@@ -247,7 +247,7 @@ new file mode 100644
|
||||
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
|
||||
@@ -195,7 +195,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
|
||||
@@ -194,7 +194,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
|
||||
public void onCreatePreferencesCromite(@Nullable Bundle savedInstanceState, @Nullable String rootKey) {
|
||||
mPageTitle.set(getString(R.string.prefs_privacy_security));
|
||||
|
||||
@@ -256,7 +256,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
|
||||
|
||||
Preference incognitoTrackingProtectionsPreference =
|
||||
findPreference(PREF_INCOGNITO_TRACKING_PROTECTIONS);
|
||||
@@ -291,7 +291,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
|
||||
@@ -290,7 +290,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
|
||||
|
||||
ChromeSwitchPreference passwordLeakTogglePref =
|
||||
(ChromeSwitchPreference) findPreference(PREF_PASSWORD_LEAK_DETECTION);
|
||||
|
||||
@@ -178,7 +178,7 @@ new file mode 100644
|
||||
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
|
||||
@@ -128,6 +128,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
|
||||
@@ -127,6 +127,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
|
||||
private static final String PREF_HTTPS_FIRST_MODE_LEGACY = "https_first_mode_legacy";
|
||||
private static final String PREF_SECURE_DNS = "secure_dns";
|
||||
private static final String PREF_USAGE_STATS = "usage_stats_reporting";
|
||||
@@ -186,7 +186,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
|
||||
private static final String PREF_SAFE_BROWSING = "safe_browsing";
|
||||
private static final String PREF_PASSWORD_LEAK_DETECTION = "password_leak_detection";
|
||||
private static final String PREF_SYNC_AND_SERVICES_LINK = "sync_and_services_link";
|
||||
@@ -576,6 +577,14 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
|
||||
@@ -575,6 +576,14 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
|
||||
: R.string.text_off);
|
||||
}
|
||||
|
||||
|
||||
@@ -56,7 +56,7 @@ 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
|
||||
@@ -64,6 +64,7 @@ import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
|
||||
@@ -63,6 +63,7 @@ import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
|
||||
import org.chromium.components.browser_ui.settings.SettingsFragment;
|
||||
import org.chromium.components.browser_ui.settings.SettingsNavigation;
|
||||
import org.chromium.components.browser_ui.settings.SettingsUtils;
|
||||
@@ -64,7 +64,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
|
||||
import org.chromium.components.browser_ui.site_settings.ContentSettingsResources;
|
||||
import org.chromium.components.browser_ui.site_settings.SingleCategorySettings;
|
||||
import org.chromium.components.browser_ui.site_settings.WebsitePreferenceBridge;
|
||||
@@ -97,6 +98,9 @@ import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
|
||||
@@ -96,6 +97,9 @@ import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
|
||||
import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
|
||||
import org.chromium.components.browser_ui.settings.ManagedPreferenceDelegate;
|
||||
|
||||
@@ -74,7 +74,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. */
|
||||
@NullMarked
|
||||
public class PrivacySettings extends ChromeBaseSettingsFragment
|
||||
@@ -167,6 +171,8 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
|
||||
@@ -166,6 +170,8 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
|
||||
private ChromeSwitchPreference allowCustomTabIntentsPref;
|
||||
private ChromeSwitchPreference openExternalLinksPref;
|
||||
|
||||
@@ -83,7 +83,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
|
||||
@Override
|
||||
public void onCreatePreferencesCromite(@Nullable Bundle savedInstanceState, @Nullable String rootKey) {
|
||||
mPageTitle.set(getString(R.string.prefs_privacy_security));
|
||||
@@ -318,6 +324,40 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
|
||||
@@ -317,6 +323,40 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
|
||||
Preference syncAndServicesLink = findPreference(PREF_SYNC_AND_SERVICES_LINK);
|
||||
syncAndServicesLink.setSummary(buildFooterString());
|
||||
|
||||
@@ -124,7 +124,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
|
||||
Preference thirdPartyCookies = findPreference(PREF_THIRD_PARTY_COOKIES);
|
||||
if (showTrackingProtectionUi()) {
|
||||
if (thirdPartyCookies != null) thirdPartyCookies.setVisible(false);
|
||||
@@ -650,6 +690,29 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
|
||||
@@ -649,6 +689,29 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
|
||||
|| ((System.currentTimeMillis() - updateTimeMs) < TimeUnit.DAYS.toMillis(90));
|
||||
}
|
||||
|
||||
|
||||
@@ -170,7 +170,7 @@ new file mode 100644
|
||||
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
|
||||
@@ -41,6 +41,7 @@ import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
|
||||
@@ -40,6 +40,7 @@ import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
|
||||
import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
|
||||
import org.chromium.chrome.browser.preferences.Pref;
|
||||
import org.chromium.chrome.browser.prefetch.settings.PreloadPagesSettingsFragment;
|
||||
@@ -178,7 +178,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
|
||||
import org.chromium.chrome.browser.privacy.secure_dns.SecureDnsSettings;
|
||||
import org.chromium.chrome.browser.privacy_guide.PrivacyGuideInteractions;
|
||||
import org.chromium.chrome.browser.privacy_sandbox.PrivacySandboxBridge;
|
||||
@@ -115,6 +116,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
|
||||
@@ -114,6 +115,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
|
||||
private static final String PREF_SAFE_BROWSING = "safe_browsing";
|
||||
private static final String PREF_PASSWORD_LEAK_DETECTION = "password_leak_detection";
|
||||
private static final String PREF_SYNC_AND_SERVICES_LINK = "sync_and_services_link";
|
||||
@@ -186,7 +186,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
|
||||
private static final String PREF_PRIVACY_SANDBOX = "privacy_sandbox";
|
||||
private static final String PREF_PROXY_OPTIONS = "proxy";
|
||||
private static final String PREF_PRIVACY_GUIDE = "privacy_guide";
|
||||
@@ -536,6 +538,10 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
|
||||
@@ -535,6 +537,10 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
|
||||
: R.string.text_off);
|
||||
}
|
||||
|
||||
|
||||
@@ -104,7 +104,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeInactivit
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
|
||||
@@ -3040,6 +3040,8 @@ public class ChromeTabbedActivity extends ChromeActivity {
|
||||
@@ -3041,6 +3041,8 @@ public class ChromeTabbedActivity extends ChromeActivity {
|
||||
mInactivityTracker =
|
||||
new ChromeInactivityTracker(
|
||||
ChromePreferenceKeys.TABBED_ACTIVITY_LAST_BACKGROUNDED_TIME_MS_PREF);
|
||||
|
||||
Reference in New Issue
Block a user