chrome/android/java/res/xml/single_website_preferences.xml - Issue 1068223002: Implement Site Settings \ Images category.

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

Issue 1068223002: Implement Site Settings \ Images category. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Sync and fix merge conflict Created 5 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/content_preferences.xml ('k') | chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java » ('j') | no next file with comments »
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 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">	6 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">

7 <PreferenceCategory	7 <PreferenceCategory

8 android:key="site_heading"	8 android:key="site_heading"

9 android:title="@string/website_settings_site_category" />	9 android:title="@string/website_settings_site_category" />

10 <org.chromium.chrome.browser.preferences.TextMessagePreference	10 <org.chromium.chrome.browser.preferences.TextMessagePreference

(...skipping 11 matching lines...) Expand all Loading...
22 <PreferenceCategory	22 <PreferenceCategory

23 android:key="site_permissions"	23 android:key="site_permissions"

24 android:title="@string/website_settings_permissions_category" />	24 android:title="@string/website_settings_permissions_category" />

25 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference	25 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference

26 android:key="cookies_permission_list" />	26 android:key="cookies_permission_list" />

27 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference	27 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference

28 android:key="voice_and_video_capture_permission_list" />	28 android:key="voice_and_video_capture_permission_list" />

29 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference	29 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference

30 android:key="popup_permission_list" />	30 android:key="popup_permission_list" />

31 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference	31 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference

	32 android:key="images_permission_list" />

	33 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference

32 android:key="javascript_permission_list" />	34 android:key="javascript_permission_list" />

33 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference	35 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference

34 android:key="location_access_list" />	36 android:key="location_access_list" />

35 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference	37 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference

36 android:key="push_notifications_list" />	38 android:key="push_notifications_list" />

37 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference	39 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference

38 android:key="midi_sysex_permission_list" />	40 android:key="midi_sysex_permission_list" />

39 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference	41 <org.chromium.chrome.browser.preferences.ChromeBaseListPreference

40 android:key="protected_media_identifier_permission_list" />	42 android:key="protected_media_identifier_permission_list" />

41 <org.chromium.chrome.browser.preferences.ButtonPreference	43 <org.chromium.chrome.browser.preferences.ButtonPreference

42 android:key="reset_site_button"	44 android:key="reset_site_button"

43 android:title="@string/website_reset" />	45 android:title="@string/website_reset" />

44 </PreferenceScreen>	46 </PreferenceScreen>

OLD	NEW