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

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

Issue 2888473003: [subresource_filter] Site Details UI for default state (Closed)
Patch Set: raymes review: remove some strings 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
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 xmlns:android="http://schemas.android.com/apk/res/android">
7 <org.chromium.chrome.browser.preferences.ChromeBasePreference 7 <org.chromium.chrome.browser.preferences.ChromeBasePreference
8 android:key="os_permissions_warning" /> 8 android:key="os_permissions_warning" />
9 <org.chromium.chrome.browser.preferences.ChromeBasePreference 9 <org.chromium.chrome.browser.preferences.ChromeBasePreference
10 android:key="os_permissions_warning_extra" /> 10 android:key="os_permissions_warning_extra" />
11 <Preference 11 <Preference
12 android:key="os_permissions_warning_divider" 12 android:key="os_permissions_warning_divider"
13 android:layout="@layout/divider_preference" /> 13 android:layout="@layout/divider_preference" />
14 <org.chromium.chrome.browser.preferences.ChromeBasePreference
15 android:key="website_settings_extra_info"
16 android:icon="@drawable/btn_info" />
17 <Preference
18 android:key="website_settings_extra_info_divider"
19 android:layout="@layout/divider_preference" />
Finnur 2017/05/23 15:37:13 I think it would lessen the cognitive overload for
Charlie Harrison 2017/05/23 17:12:18 I'm fine with adding a second subtitle which we di
raymes 2017/05/23 22:29:01 I chatted with Charlie offline. I'm ok not showing
14 <PreferenceCategory 20 <PreferenceCategory
15 android:key="site_heading" 21 android:key="site_heading"
16 android:title="@string/website_settings_site_category" /> 22 android:title="@string/website_settings_site_category" />
17 <org.chromium.chrome.browser.preferences.TextMessagePreference 23 <org.chromium.chrome.browser.preferences.TextMessagePreference
18 android:key="site_title" /> 24 android:key="site_title" />
19 <PreferenceCategory 25 <PreferenceCategory
20 android:key="site_usage" 26 android:key="site_usage"
21 android:title="@string/website_settings_usage_category" /> 27 android:title="@string/website_settings_usage_category" />
22 <org.chromium.chrome.browser.preferences.website.ClearWebsiteStorage 28 <org.chromium.chrome.browser.preferences.website.ClearWebsiteStorage
23 android:key="clear_data" 29 android:key="clear_data"
(...skipping 15 matching lines...) Expand all
39 android:key="camera_permission_list" /> 45 android:key="camera_permission_list" />
40 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference 46 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference
41 android:key="microphone_permission_list" /> 47 android:key="microphone_permission_list" />
42 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference 48 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference
43 android:key="push_notifications_list" /> 49 android:key="push_notifications_list" />
44 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference 50 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference
45 android:key="javascript_permission_list" /> 51 android:key="javascript_permission_list" />
46 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference 52 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference
47 android:key="popup_permission_list" /> 53 android:key="popup_permission_list" />
48 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference 54 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference
49 android:key="subresource_filter_permission_list" /> 55 android:key="subresource_filter_permission_list" />
Finnur 2017/05/23 15:37:13 Friendly reminder to replace the use of the... I t
Charlie Harrison 2017/05/23 17:12:18 Got it. The icons should be ready but we aren't re
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

Powered by Google App Engine
This is Rietveld 408576698