[subresource_filter] Add the Content Settings UI for Android

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

Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/website/ContentSettingsResources.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/ContentSettingsResources.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/ContentSettingsResources.java
index 6c148ea209088a8629119f8e7f37e456c0c162ee..7eaed597bcaa2597f57f9e61c8ab9ac441be0c15 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/ContentSettingsResources.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/ContentSettingsResources.java
@@ -151,6 +151,11 @@ public class ContentSettingsResources {
             localMap.put(ContentSettingsType.CONTENT_SETTINGS_TYPE_USB_CHOOSER_DATA,
                     new ResourceItem(R.drawable.settings_usb, 0, 0, ContentSetting.ASK,
                                  ContentSetting.BLOCK, 0, 0));
+            localMap.put(ContentSettingsType.CONTENT_SETTINGS_TYPE_SUBRESOURCE_FILTER,
+                    new ResourceItem(R.drawable.permission_popups,

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

This is the wrong icon to use. You should consult with UI which icon is correct
for this (they'll know where to pull it from -- likely Google's material design
icon library).

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

Is there a way we can just use an existing icon as a placeholder? The current
icon for launch is not quite ready yet.

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

That's what you are doing now, isn't it? There are no pre-defined placeholders,
if that's what you mean. 

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

Yeah, that was my intention with reusing the popup icon.

+                            R.string.subresource_filter_header_android,
+                            R.string.subresource_filter_header_android, ContentSetting.ALLOW,
+                            ContentSetting.BLOCK, 0, 0));

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

These blocks are alphabetically ordered based on the ContentSettingsType. Move
to line 151 please.

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

Done.

             sResourceInfo = localMap;
         }
         return sResourceInfo;