chrome/android/java/res/xml/site_settings_preferences.xml - Issue 2785913002: [subresource_filter] Add the Content Settings UI for Android

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/android/java/res/xml/site_settings_preferences.xml

Issue 2785913002: [subresource_filter] Add the Content Settings UI for Android (Closed)

Patch Set: nits (trybots prev) Created 3 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« no previous file with comments | « chrome/android/java/res/xml/single_website_preferences.xml ('k') | chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java » ('j') | chrome/browser/ui/android/page_info/page_info_popup_android.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 <?xml version="1.0" encoding="utf-8"?>	1 <?xml version="1.0" encoding="utf-8"?>

2 <!-- Copyright 2015 The Chromium Authors. All rights reserved.	2 <!-- Copyright 2015 The Chromium Authors. All rights reserved.

3 Use of this source code is governed by a BSD-style license that can be	3 Use of this source code is governed by a BSD-style license that can be

4 found in the LICENSE file. -->	4 found in the LICENSE file. -->

5	5

6 <!-- The order of the following items is from: http://crbug.com/610358. -->	6 <!-- The order of the following items is from: http://crbug.com/610358. -->

7 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">	7 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">

8 <!-- All sites -->	8 <!-- All sites -->

9 <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference	9 <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference

10 android:fragment="org.chromium.chrome.browser.preferences.website.Single CategoryPreferences"	10 android:fragment="org.chromium.chrome.browser.preferences.website.Single CategoryPreferences"

(...skipping 58 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
69 android:fragment="org.chromium.chrome.browser.preferences.website.Single CategoryPreferences"	69 android:fragment="org.chromium.chrome.browser.preferences.website.Single CategoryPreferences"

70 android:key="use_storage"	70 android:key="use_storage"

71 android:title="@string/website_settings_storage"	71 android:title="@string/website_settings_storage"

72 android:icon="@drawable/settings_storage" />	72 android:icon="@drawable/settings_storage" />

73 <!-- USB -->	73 <!-- USB -->

74 <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference	74 <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference

75 android:fragment="org.chromium.chrome.browser.preferences.website.UsbCho oserPreferences"	75 android:fragment="org.chromium.chrome.browser.preferences.website.UsbCho oserPreferences"

76 android:key="usb"	76 android:key="usb"

77 android:title="@string/website_settings_usb"	77 android:title="@string/website_settings_usb"

78 android:icon="@drawable/settings_usb" />	78 android:icon="@drawable/settings_usb" />

	79 <!-- SubresourceFilter -->

	80 <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference

	81 android:fragment="org.chromium.chrome.browser.preferences.website.Single CategoryPreferences"

	82 android:key="subresource_filter" />

79 </PreferenceScreen>	83 </PreferenceScreen>

OLD	NEW