Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(24)

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

Issue 2880953003: [subresource_filter] Revamp Site Details page (Closed)
Patch Set: Created 3 years, 7 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 | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleWebsitePreferences.java » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> 6 <PreferenceScreen
7 xmlns:android="http://schemas.android.com/apk/res/android"
8 xmlns:chrome="http://schemas.android.com/apk/res-auto">
7 <org.chromium.chrome.browser.preferences.ChromeBasePreference 9 <org.chromium.chrome.browser.preferences.ChromeBasePreference
8 android:key="os_permissions_warning" /> 10 android:key="os_permissions_warning" />
9 <org.chromium.chrome.browser.preferences.ChromeBasePreference 11 <org.chromium.chrome.browser.preferences.ChromeBasePreference
10 android:key="os_permissions_warning_extra" /> 12 android:key="os_permissions_warning_extra" />
11 <Preference 13 <Preference
12 android:key="os_permissions_warning_divider" 14 android:key="os_permissions_warning_divider"
13 android:layout="@layout/divider_preference" /> 15 android:layout="@layout/divider_preference" />
14 <PreferenceCategory 16 <PreferenceCategory
15 android:key="site_heading" 17 android:key="site_heading"
16 android:title="@string/website_settings_site_category" /> 18 android:title="@string/website_settings_site_category" />
(...skipping 21 matching lines...) Expand all
38 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference 40 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference
39 android:key="camera_permission_list" /> 41 android:key="camera_permission_list" />
40 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference 42 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference
41 android:key="microphone_permission_list" /> 43 android:key="microphone_permission_list" />
42 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference 44 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference
43 android:key="push_notifications_list" /> 45 android:key="push_notifications_list" />
44 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference 46 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference
45 android:key="javascript_permission_list" /> 47 android:key="javascript_permission_list" />
46 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference 48 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference
47 android:key="popup_permission_list" /> 49 android:key="popup_permission_list" />
48 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference 50 <org.chromium.chrome.browser.preferences.website.SubresourceFilterListPrefer ence
49 android:key="subresource_filter_permission_list" /> 51 android:key="subresource_filter_permission_list"
52 chrome:passiveAllowText="@string/website_settings_permissions_allow"
53 chrome:activeAllowText="@string/subresource_filter_permission_allow_active "
54 chrome:passiveBlockText="@string/subresource_filter_permission_block_passi ve"
55 chrome:activeBlockText="@string/subresource_filter_permission_block_active " />
50 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference 56 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference
51 android:key="background_sync_permission_list" /> 57 android:key="background_sync_permission_list" />
52 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference 58 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference
53 android:key="protected_media_identifier_permission_list" /> 59 android:key="protected_media_identifier_permission_list" />
54 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference 60 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference
55 android:key="autoplay_permission_list" /> 61 android:key="autoplay_permission_list" />
56 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference 62 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference
57 android:key="midi_sysex_permission_list" /> 63 android:key="midi_sysex_permission_list" />
58 64
59 <org.chromium.chrome.browser.preferences.ButtonPreference 65 <org.chromium.chrome.browser.preferences.ButtonPreference
60 android:key="reset_site_button" 66 android:key="reset_site_button"
61 android:title="@string/website_reset" /> 67 android:title="@string/website_reset" />
62 </PreferenceScreen> 68 </PreferenceScreen>
OLDNEW
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleWebsitePreferences.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698