Show info text in cookie settings screen

Screenshot: https://crbug.com/1060118#c9
Bug: 1060118
Change-Id: Ia645b0e54bb959fba678c8acf8c451f7f51c147a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2096765Reviewed-by: Theresa  <twellington@chromium.org>
Reviewed-by: Finnur Thorarinsson <finnur@chromium.org>
Commit-Queue: Christian Dullweber <dullweber@chromium.org>
Cr-Commit-Position: refs/heads/master@{#749353}

chrome/android/java/res/xml/website_preferences.xml

@@ -8,6 +8,11 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:title="@string/all_sites">
 
+    <!-- A text message describing cookie settings. -->
+    <org.chromium.chrome.browser.settings.TextMessagePreference
+        android:key="cookie_info_text"
+        android:summary="@string/website_settings_cookie_info"/>
+
     <!-- A common binary toggle, only shown for specific categories that allow
          turning default values for that category on/off.-->
     <org.chromium.chrome.browser.settings.ChromeSwitchPreference

chrome/android/java/src/org/chromium/chrome/browser/site_settings/SingleCategorySettings.java

@@ -134,6 +134,7 @@ public class SingleCategorySettings extends PreferenceFragmentCompat
     public static final String NOTIFICATIONS_QUIET_UI_TOGGLE_KEY = "notifications_quiet_ui";
     public static final String EXPLAIN_PROTECTED_MEDIA_KEY = "protected_content_learn_more";
     private static final String ADD_EXCEPTION_KEY = "add_exception";
+    public static final String COOKIE_INFO_TEXT_KEY = "cookie_info_text";
 
     // Keys for Allowed/Blocked preference groups/headers.
     private static final String ALLOWED_GROUP = "allowed_group";
@@ -859,6 +860,11 @@ public class SingleCategorySettings extends PreferenceFragmentCompat
             maybeShowOsWarning(screen);
         }
 
+        if (!(mCategory.showSites(SiteSettingsCategory.Type.COOKIES)
+                    && ChromeFeatureList.isEnabled(ChromeFeatureList.IMPROVED_COOKIE_CONTROLS))) {
+            screen.removePreference(screen.findPreference(COOKIE_INFO_TEXT_KEY));
+        }
+
         if (hideSecondaryToggles) {
             screen.removePreference(thirdPartyCookies);
             screen.removePreference(notificationsVibrate);

chrome/browser/ui/android/strings/android_chrome_strings.grd

@@ -936,6 +936,9 @@ Your Google account may have other forms of browsing history like searches and a
       <message name="IDS_WEBSITE_SETTINGS_ADD_SITE_DESCRIPTION_SOUND_BLOCK" desc="The description for the mute sound for website dialog.">
         Mute sound for a specific site.
       </message>
+      <message name="IDS_WEBSITE_SETTINGS_COOKIE_INFO" desc="Text describing cookie and third-party cookie settings.">
+        Cookies are files created by websites you visit. Sites use them to remember your preferences. Third-party cookies are created by other sites. These sites own some of the content, like ads or images, that you see on the webpage you visit.
+      </message>
       <message name="IDS_WEBSITE_SETTINGS_ADD_SITE_SITE_URL" desc="The label for the input field where the user can type a website URL.">
         Site URL
       </message>

chrome/browser/ui/android/strings/android_chrome_strings_grd/IDS_WEBSITE_SETTINGS_COOKIE_INFO.png.sha1

+fdf156f0bd4ccb46204cafbb8f4a753174acbd79
\ No newline at end of file