[subresource_filter] Add the Content Settings UI for Android

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

Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java
index 6f516e75aece032d5c863a8d1044fac2ba55400c..6d3621a80ba2f2f6370b2709025f56adcd67bcc3 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java
@@ -48,6 +48,7 @@ public class SiteSettingsPreferences extends PreferenceFragment
     static final String STORAGE_KEY = "use_storage";
     static final String TRANSLATE_KEY = "translate";
     static final String USB_KEY = "usb";
+    static final String SUBRESOURCE_FILTER_KEY = "subresource_filter";
 
     // Whether the Protected Content menu is available for display.
     boolean mProtectedContentMenuAvailable;
@@ -97,6 +98,8 @@ public class SiteSettingsPreferences extends PreferenceFragment
             return ContentSettingsType.CONTENT_SETTINGS_TYPE_POPUPS;
         } else if (PROTECTED_CONTENT_KEY.equals(key)) {
             return ContentSettingsType.CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER;
+        } else if (SUBRESOURCE_FILTER_KEY.equals(key)) {
+            return ContentSettingsType.CONTENT_SETTINGS_TYPE_SUBRESOURCE_FILTER;
         }
         return -1;
     }
@@ -118,6 +121,7 @@ public class SiteSettingsPreferences extends PreferenceFragment
             getPreferenceScreen().removePreference(findPreference(STORAGE_KEY));
             getPreferenceScreen().removePreference(findPreference(TRANSLATE_KEY));
             getPreferenceScreen().removePreference(findPreference(USB_KEY));
+            getPreferenceScreen().removePreference(findPreference(SUBRESOURCE_FILTER_KEY));

[Finnur, 2017/03/31 10:22:34]

Move up one line.

[Charlie Harrison, 2017/03/31 13:21:42]

Done.

         } else {
             // If both Autoplay and Protected Content menus are available, they'll be tucked under
             // the Media key. Otherwise, we can remove the Media menu entry.
@@ -129,6 +133,9 @@ public class SiteSettingsPreferences extends PreferenceFragment
                 getPreferenceScreen().removePreference(findPreference(AUTOPLAY_KEY));
                 getPreferenceScreen().removePreference(findPreference(PROTECTED_CONTENT_KEY));
             }
+            if (!SiteSettingsCategory.subresourceFilterCategoryEnabled()) {
+                getPreferenceScreen().removePreference(findPreference(SUBRESOURCE_FILTER_KEY));
+            }

[Finnur, 2017/03/31 10:22:34]

I don't think this is necessary. Isn't this taken care of by line 169-171?

[Charlie Harrison, 2017/03/31 13:21:42]

I'm not 100% certain why, but without this line we just get an empty row in the
site settings page.

[Finnur, 2017/03/31 13:47:23]

That seems like something you should investigate. It would indicate that the new
setting isn't specified the way the others are, because they don't need to be
manually removed. I would compare it to one of the pre-existing permission,
say... popups and see if you are defining everything the same way.

[Charlie Harrison, 2017/03/31 14:56:46]

My understanding is that onCreate calls addPreferencesFromResource which
initializes the preference screen with everything in
site_settings_preferences.xml.

Therefore, since we don't want our preference showing up without the flag I
think we have to remove it from the preference screen. I'm not sure other
preferences like popups have this requirement. They just always show up (unless
we're in the media sub menu).

If we only have the check below, the preference is still in the preference
screen, it just never has its title or click listener initialized.

[Finnur, 2017/04/03 10:36:17]

Hmm... maybe they should all be hidden to begin with and show on demand. 

But fair enough, I'm OK with this as is as long as
subresourceFilterCategoryEnabled is temporary and this call will eventually be
removed during that cleanup. At most a TODO(csharrison) is needed.

[Charlie Harrison, 2017/04/03 14:01:48]

Added a TODO.

         }
     }
 
@@ -158,6 +165,10 @@ public class SiteSettingsPreferences extends PreferenceFragment
             websitePrefs.add(MICROPHONE_KEY);
             websitePrefs.add(NOTIFICATIONS_KEY);
             websitePrefs.add(POPUPS_KEY);
+
+            if (SiteSettingsCategory.subresourceFilterCategoryEnabled()) {
+                websitePrefs.add(SUBRESOURCE_FILTER_KEY);
+            }
         }
 
         // Initialize the summary and icon for all preferences that have an
@@ -185,6 +196,8 @@ public class SiteSettingsPreferences extends PreferenceFragment
                 checked = PrefServiceBridge.getInstance().popupsEnabled();
             } else if (PROTECTED_CONTENT_KEY.equals(prefName)) {
                 checked = PrefServiceBridge.getInstance().isProtectedMediaIdentifierEnabled();
+            } else if (SUBRESOURCE_FILTER_KEY.equals(prefName)) {
+                checked = PrefServiceBridge.getInstance().subresourceFilterEnabled();
             }
 
             int contentType = keyToContentSettingsType(prefName);