Adjust description and position

This commit is contained in:
csagan5 2020-08-15 23:17:27 +02:00
parent bec74e52f4
commit 90a40e41a8

View file

@ -1,6 +1,6 @@
From: uazo <uazo@users.noreply.github.com>
Date: Thu, 6 Aug 2020 14:02:57 +0000
Subject: Session only cookies v2
Subject: Session-only cookies support
---
base/android/application_status_listener.cc | 1 +
@ -135,9 +135,9 @@ old mode 100644
new mode 100755
--- a/components/browser_ui/site_settings/android/java/res/layout/four_state_cookie_settings_preference.xml
+++ b/components/browser_ui/site_settings/android/java/res/layout/four_state_cookie_settings_preference.xml
@@ -25,6 +25,13 @@
app:primaryText="@string/website_settings_category_cookie_allow_title"
app:descriptionText="@string/website_settings_category_cookie_allow_addition" />
@@ -39,6 +39,13 @@
app:primaryText="@string/website_settings_category_cookie_block_third_party_title"
app:descriptionText="@string/website_settings_category_cookie_block_third_party_addition" />
+ <org.chromium.components.browser_ui.widget.RadioButtonWithDescription
+ android:id="@+id/session_only"
@ -147,7 +147,7 @@ new mode 100755
+ app:descriptionText="@string/website_settings_category_cookie_session_only_addition" />
+
<org.chromium.components.browser_ui.widget.RadioButtonWithDescription
android:id="@+id/block_third_party_incognito"
android:id="@+id/block"
android:layout_width="match_parent"
diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/ContentSettingsResources.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/ContentSettingsResources.java
old mode 100644
@ -195,7 +195,7 @@ new mode 100755
// Whether third-party blocking is enforced.
public boolean thirdPartyBlockingEnforced;
+
+ // Whether session only cookies is enabled.
+ // Whether session-only cookies are enabled.
+ public boolean sessionOnlyCookies;
}
@ -437,11 +437,11 @@ new mode 100755
</message>
- <!-- JavaScript -->
+ <message name="IDS_WEBSITE_SETTINGS_CATEGORY_COOKIE_SESSION_ONLY_TITLE" desc="Text used to explain the sessiononly cookies in settings">
+ Session Only Cookies
+ <message name="IDS_WEBSITE_SETTINGS_CATEGORY_COOKIE_SESSION_ONLY_TITLE" desc="Text used to explain the session-only cookies in settings">
+ Session-only cookies
+ </message>
+ <message name="IDS_WEBSITE_SETTINGS_CATEGORY_COOKIE_SESSION_ONLY_ADDITION" desc="Additional text used to explain the sessiononly cookies option in settings">
+ Cookies are availables until the browser is closed.
+ <message name="IDS_WEBSITE_SETTINGS_CATEGORY_COOKIE_SESSION_ONLY_ADDITION" desc="Additional text used to explain the session-only cookies option in settings">
+ Cookies are availables only until the browser is closed. Third-party cookies will be blocked.
+ </message>
+ <!-- JavaScript -->