|
@@ -93,15 +93,15 @@ 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";
|
|
|
-@@ -466,6 +467,7 @@ public class SingleCategoryPreferences extends PreferenceFragment
|
|
|
-
|
|
|
- if (type == SiteSettingsCategory.Type.COOKIES) {
|
|
|
+@@ -468,6 +469,7 @@ public class SingleCategoryPreferences extends PreferenceFragment
|
|
|
+ if (type == SiteSettingsCategory.Type.COOKIES
|
|
|
+ && !FeatureUtilities.isNoTouchModeEnabled()) {
|
|
|
updateThirdPartyCookiesCheckBox();
|
|
|
+ updateCookiesSessionOnlyCheckBox();
|
|
|
} else if (type == SiteSettingsCategory.Type.NOTIFICATIONS) {
|
|
|
updateNotificationsVibrateCheckBox();
|
|
|
}
|
|
|
-@@ -504,6 +506,8 @@ public class SingleCategoryPreferences extends PreferenceFragment
|
|
|
+@@ -506,6 +508,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())) {
|
|
|
-@@ -817,6 +821,8 @@ public class SingleCategoryPreferences extends PreferenceFragment
|
|
|
+@@ -819,6 +823,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);
|
|
|
-@@ -848,6 +854,7 @@ public class SingleCategoryPreferences extends PreferenceFragment
|
|
|
+@@ -850,6 +856,7 @@ public class SingleCategoryPreferences extends PreferenceFragment
|
|
|
|
|
|
if (hideSecondaryToggles) {
|
|
|
screen.removePreference(thirdPartyCookies);
|
|
@@ -127,12 +127,12 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/web
|
|
|
screen.removePreference(notificationsVibrate);
|
|
|
screen.removePreference(explainProtectedMediaKey);
|
|
|
screen.removePreference(allowedGroup);
|
|
|
-@@ -858,14 +865,17 @@ public class SingleCategoryPreferences extends PreferenceFragment
|
|
|
+@@ -860,14 +867,17 @@ public class SingleCategoryPreferences extends PreferenceFragment
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
-- // Configure/hide the third-party cookie toggle, as needed.
|
|
|
-+ // Configure/hide the third-party cookie toggle and session-only cookie toggle, as needed.
|
|
|
+- // Configure/hide the third-party cookies toggle, as needed.
|
|
|
++ // Configure/hide the third-party cookies toggle and session-only cookie toggle, as needed.
|
|
|
// We don't need this toggle in touchless. Refer to crbug/951850.
|
|
|
if (mCategory.showSites(SiteSettingsCategory.Type.COOKIES)
|
|
|
&& !FeatureUtilities.isNoTouchModeEnabled()) {
|
|
@@ -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.
|
|
|
-@@ -972,6 +982,15 @@ public class SingleCategoryPreferences extends PreferenceFragment
|
|
|
+@@ -974,6 +984,15 @@ public class SingleCategoryPreferences extends PreferenceFragment
|
|
|
preference -> PrefServiceBridge.getInstance().isBlockThirdPartyCookiesManaged());
|
|
|
}
|
|
|
|