[subresource_filter] Site Details UI for default state

chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleWebsitePreferences.java

Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleWebsitePreferences.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleWebsitePreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleWebsitePreferences.java
index 5c660be98775f72527417ead0ab6daca461a93d8..762bb30b3492c509a5b0a6c260778c287bdec06d 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleWebsitePreferences.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleWebsitePreferences.java
@@ -64,6 +64,8 @@ public class SingleWebsitePreferences extends PreferenceFragment
     public static final String PREF_OS_PERMISSIONS_WARNING_EXTRA = "os_permissions_warning_extra";
     public static final String PREF_OS_PERMISSIONS_WARNING_DIVIDER =
             "os_permissions_warning_divider";
+    public static final String PREF_EXTRA_INFO = "website_settings_extra_info";
+    public static final String PREF_EXTRA_INFO_DIVIDER = "website_settings_extra_info_divider";
     // Actions at the top (if adding new, see hasUsagePreferences below):
     public static final String PREF_CLEAR_DATA = "clear_data";
     // Buttons:
@@ -269,6 +271,11 @@ public class SingleWebsitePreferences extends PreferenceFragment
     private void displaySitePermissions() {
         addPreferencesFromResource(R.xml.single_website_preferences);
 
+        // This boolean controls how the subresource filter list preference behaves, as well as
+        // gating the extra info header for subresource filtering.
+        boolean subresourceFilterActivated = WebsitePreferenceBridge.getSubresourceFilterActivated(
+                mSite.getAddress().getOrigin());
+
         Set<String> permissionPreferenceKeys =
                 new HashSet<>(Arrays.asList(PERMISSION_PREFERENCE_KEYS));
         int maxPermissionOrder = 0;
@@ -313,7 +320,7 @@ public class SingleWebsitePreferences extends PreferenceFragment
             } else if (PREF_PROTECTED_MEDIA_IDENTIFIER_PERMISSION.equals(preference.getKey())) {
                 setUpListPreference(preference, mSite.getProtectedMediaIdentifierPermission());
             } else if (PREF_SUBRESOURCE_FILTER_PERMISSION.equals(preference.getKey())) {
-                setUpListPreference(preference, mSite.getSubresourceFilterPermission());
+                setUpSubresourceFilterPreference(preference, subresourceFilterActivated);
             }
 
             if (permissionPreferenceKeys.contains(preference.getKey())) {
@@ -358,6 +365,18 @@ public class SingleWebsitePreferences extends PreferenceFragment
             }
         }
 
+        // The subresource filter permission includes a header with some additional information, if
+        // it is being displayed on a site that is activated.
+        Preference extraInfo = preferenceScreen.findPreference(PREF_EXTRA_INFO);
+        Preference extraInfoDivider = preferenceScreen.findPreference(PREF_EXTRA_INFO_DIVIDER);
+        if (getPreferenceScreen().findPreference(PREF_SUBRESOURCE_FILTER_PERMISSION) != null
+                && subresourceFilterActivated) {
+            extraInfo.setTitle(R.string.subresource_filter_permission_extra_info);
+        } else {
+            getPreferenceScreen().removePreference(extraInfo);
+            getPreferenceScreen().removePreference(extraInfoDivider);
+        }
+
         // Remove categories if no sub-items.
         if (!hasUsagePreferences()) {
             Preference heading = preferenceScreen.findPreference(PREF_USAGE);
@@ -496,6 +515,41 @@ public class SingleWebsitePreferences extends PreferenceFragment
         }
     }
 
+    private void setUpSubresourceFilterPreference(Preference preference, boolean activated) {
+        ContentSetting permission = mSite.getSubresourceFilterPermission();
+
+        // The subresource filter permission shows sometimes even if there is no permission set.
+        if (permission == null) {
+            // If there is activation, we want the setting to show BLOCK by default. Set an explicit
+            // exception on the website that isn't backed by an explicit content setting. Note that
+            // this will never trigger an actual update to content settings, as those go through
+            // setSubresourceFilterPermission.
+            if (activated) {
+                permission = ContentSetting.BLOCK;
+                String origin = mSite.getAddress().getOrigin();
+                mSite.setSubresourceFilterException(new ContentSettingException(
+                        ContentSettingsType.CONTENT_SETTINGS_TYPE_SUBRESOURCE_FILTER, origin,
+                        permission, ""));
+            } else {
+                setUpListPreference(preference, null);
+                return;
+            }
+        }
+        assert permission != null;
+        setUpListPreference(preference, permission);
+
+        // The list preference needs custom strings depending on activation state.
+        int blockString = activated ? R.string.subresource_filter_permission_block_active
+                                    : R.string.subresource_filter_permission_block_passive;
+        int allowString = activated ? R.string.subresource_filter_permission_allow_active
+                                    : R.string.website_settings_permissions_allow;

[raymes, 2017/05/17 00:07:43]

nit: Not sure if we need to base this on whether it's activated based on the
discussion from yesterday

[Charlie Harrison, 2017/05/17 00:38:52]

Ah you're right that's my mistake. We don't need to branch on |activated| at all
really, and can reuse the standard Allow string.

+        ListPreference listPreference = (ListPreference) preference;
+        Resources res = getResources();
+        listPreference.setEntries(
+                new String[] {res.getString(allowString), res.getString(blockString)});
+        listPreference.setValueIndex(permission == ContentSetting.ALLOW ? 0 : 1);
+    }
+
     /**
      * Returns true if the current host matches the default search engine host and location for the
      * default search engine is being granted via x-geo.