|
@@ -85,7 +85,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Pre
|
|
|
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java
|
|
|
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java
|
|
|
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java
|
|
|
-@@ -125,6 +125,7 @@ public class SingleCategoryPreferences extends PreferenceFragment
|
|
|
+@@ -127,6 +127,7 @@ public class SingleCategoryPreferences extends PreferenceFragment
|
|
|
|
|
|
// Keys for category-specific preferences (toggle, link, button etc.), dynamically shown.
|
|
|
public static final String THIRD_PARTY_COOKIES_TOGGLE_KEY = "third_party_cookies";
|
|
@@ -93,7 +93,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/web
|
|
|
public static final String NOTIFICATIONS_VIBRATE_TOGGLE_KEY = "notifications_vibrate";
|
|
|
public static final String EXPLAIN_PROTECTED_MEDIA_KEY = "protected_content_learn_more";
|
|
|
private static final String ADD_EXCEPTION_KEY = "add_exception";
|
|
|
-@@ -468,6 +469,7 @@ public class SingleCategoryPreferences extends PreferenceFragment
|
|
|
+@@ -470,6 +471,7 @@ public class SingleCategoryPreferences extends PreferenceFragment
|
|
|
if (type == SiteSettingsCategory.Type.COOKIES
|
|
|
&& !FeatureUtilities.isNoTouchModeEnabled()) {
|
|
|
updateThirdPartyCookiesCheckBox();
|
|
@@ -101,7 +101,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/web
|
|
|
} else if (type == SiteSettingsCategory.Type.NOTIFICATIONS) {
|
|
|
updateNotificationsVibrateCheckBox();
|
|
|
}
|
|
|
-@@ -506,6 +508,8 @@ public class SingleCategoryPreferences extends PreferenceFragment
|
|
|
+@@ -508,6 +510,8 @@ public class SingleCategoryPreferences extends PreferenceFragment
|
|
|
int setting = (int) newValue;
|
|
|
prefServiceBridge.setContentSetting(mCategory.getContentSettingsType(), setting);
|
|
|
getInfoForOrigins();
|
|
@@ -110,7 +110,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/web
|
|
|
} else if (THIRD_PARTY_COOKIES_TOGGLE_KEY.equals(preference.getKey())) {
|
|
|
prefServiceBridge.setBlockThirdPartyCookiesEnabled(((boolean) newValue));
|
|
|
} else if (NOTIFICATIONS_VIBRATE_TOGGLE_KEY.equals(preference.getKey())) {
|
|
|
-@@ -819,6 +823,8 @@ public class SingleCategoryPreferences extends PreferenceFragment
|
|
|
+@@ -821,6 +825,8 @@ public class SingleCategoryPreferences extends PreferenceFragment
|
|
|
TriStateSiteSettingsPreference triStateToggle =
|
|
|
(TriStateSiteSettingsPreference) screen.findPreference(TRI_STATE_TOGGLE_KEY);
|
|
|
Preference thirdPartyCookies = screen.findPreference(THIRD_PARTY_COOKIES_TOGGLE_KEY);
|
|
@@ -119,7 +119,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/web
|
|
|
Preference notificationsVibrate = screen.findPreference(NOTIFICATIONS_VIBRATE_TOGGLE_KEY);
|
|
|
Preference explainProtectedMediaKey = screen.findPreference(EXPLAIN_PROTECTED_MEDIA_KEY);
|
|
|
PreferenceGroup allowedGroup = (PreferenceGroup) screen.findPreference(ALLOWED_GROUP);
|
|
|
-@@ -850,6 +856,7 @@ public class SingleCategoryPreferences extends PreferenceFragment
|
|
|
+@@ -852,6 +858,7 @@ public class SingleCategoryPreferences extends PreferenceFragment
|
|
|
|
|
|
if (hideSecondaryToggles) {
|
|
|
screen.removePreference(thirdPartyCookies);
|
|
@@ -127,7 +127,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/web
|
|
|
screen.removePreference(notificationsVibrate);
|
|
|
screen.removePreference(explainProtectedMediaKey);
|
|
|
screen.removePreference(allowedGroup);
|
|
|
-@@ -860,14 +867,17 @@ public class SingleCategoryPreferences extends PreferenceFragment
|
|
|
+@@ -862,14 +869,17 @@ public class SingleCategoryPreferences extends PreferenceFragment
|
|
|
return;
|
|
|
}
|
|
|
|
|
@@ -146,7 +146,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/web
|
|
|
}
|
|
|
|
|
|
// Configure/hide the notifications vibrate toggle, as needed.
|
|
|
-@@ -974,6 +984,15 @@ public class SingleCategoryPreferences extends PreferenceFragment
|
|
|
+@@ -981,6 +991,15 @@ public class SingleCategoryPreferences extends PreferenceFragment
|
|
|
preference -> PrefServiceBridge.getInstance().isBlockThirdPartyCookiesManaged());
|
|
|
}
|
|
|
|