| 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 list below All Sites is ordered by privacy-sensitive items first. If | 6 <!-- The order of the following items is from: http://crbug.com/610358. --> |
| 7 you are not sure where to add your item, add it above Storage. --> | |
| 8 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> | 7 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> |
| 9 <!-- All sites --> | 8 <!-- All sites --> |
| 10 <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference | 9 <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference |
| 11 android:fragment="org.chromium.chrome.browser.preferences.website.Single
CategoryPreferences" | 10 android:fragment="org.chromium.chrome.browser.preferences.website.Single
CategoryPreferences" |
| 12 android:key="all_sites" | 11 android:key="all_sites" |
| 13 android:title="@string/all_sites" | 12 android:title="@string/all_sites" |
| 14 android:icon="@drawable/settings_all_sites" /> | 13 android:icon="@drawable/settings_all_sites" /> |
| 15 <!-- Cookies --> | 14 <!-- Cookies --> |
| 16 <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference | 15 <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference |
| 17 android:key="cookies" | 16 android:key="cookies" |
| 18 android:fragment="org.chromium.chrome.browser.preferences.website.Single
CategoryPreferences" /> | 17 android:fragment="org.chromium.chrome.browser.preferences.website.Single
CategoryPreferences" /> |
| 19 <!-- Location --> | 18 <!-- Location --> |
| 20 <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference | 19 <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference |
| 21 android:fragment="org.chromium.chrome.browser.preferences.website.Single
CategoryPreferences" | 20 android:fragment="org.chromium.chrome.browser.preferences.website.Single
CategoryPreferences" |
| 22 android:key="device_location" /> | 21 android:key="device_location" /> |
| 23 <!-- Camera --> | 22 <!-- Camera --> |
| 24 <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference | 23 <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference |
| 25 android:fragment="org.chromium.chrome.browser.preferences.website.Single
CategoryPreferences" | 24 android:fragment="org.chromium.chrome.browser.preferences.website.Single
CategoryPreferences" |
| 26 android:key="camera" /> | 25 android:key="camera" /> |
| 27 <!-- Microphone --> | 26 <!-- Microphone --> |
| 28 <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference | 27 <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference |
| 29 android:fragment="org.chromium.chrome.browser.preferences.website.Single
CategoryPreferences" | 28 android:fragment="org.chromium.chrome.browser.preferences.website.Single
CategoryPreferences" |
| 30 android:key="microphone" /> | 29 android:key="microphone" /> |
| 30 <!-- Notifications --> |
| 31 <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference |
| 32 android:fragment="org.chromium.chrome.browser.preferences.website.Single
CategoryPreferences" |
| 33 android:key="notifications" /> |
| 31 <!-- JavaScript --> | 34 <!-- JavaScript --> |
| 32 <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference | 35 <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference |
| 33 android:fragment="org.chromium.chrome.browser.preferences.website.Single
CategoryPreferences" | 36 android:fragment="org.chromium.chrome.browser.preferences.website.Single
CategoryPreferences" |
| 34 android:key="javascript" /> | 37 android:key="javascript" /> |
| 35 <!-- Popups --> | 38 <!-- Popups --> |
| 36 <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference | 39 <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference |
| 37 android:fragment="org.chromium.chrome.browser.preferences.website.Single
CategoryPreferences" | 40 android:fragment="org.chromium.chrome.browser.preferences.website.Single
CategoryPreferences" |
| 38 android:key="popups" /> | 41 android:key="popups" /> |
| 42 <!-- Background sync --> |
| 43 <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference |
| 44 android:fragment="org.chromium.chrome.browser.preferences.website.Single
CategoryPreferences" |
| 45 android:key="background_sync" /> |
| 39 <!-- Fullscreen --> | 46 <!-- Fullscreen --> |
| 40 <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference | 47 <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference |
| 41 android:fragment="org.chromium.chrome.browser.preferences.website.Single
CategoryPreferences" | 48 android:fragment="org.chromium.chrome.browser.preferences.website.Single
CategoryPreferences" |
| 42 android:key="fullscreen" /> | 49 android:key="fullscreen" /> |
| 43 <!-- Notifications --> | 50 <!-- Protected content --> |
| 44 <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference | 51 <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference |
| 45 android:fragment="org.chromium.chrome.browser.preferences.website.Single
CategoryPreferences" | 52 android:fragment="org.chromium.chrome.browser.preferences.website.Single
CategoryPreferences" |
| 46 android:key="notifications" /> | 53 android:key="protected_content" /> |
| 47 <!-- Autoplay --> | 54 <!-- Autoplay --> |
| 48 <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference | 55 <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference |
| 49 android:fragment="org.chromium.chrome.browser.preferences.website.Single
CategoryPreferences" | 56 android:fragment="org.chromium.chrome.browser.preferences.website.Single
CategoryPreferences" |
| 50 android:key="autoplay" /> | 57 android:key="autoplay" /> |
| 51 <!-- Protected content --> | |
| 52 <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference | |
| 53 android:fragment="org.chromium.chrome.browser.preferences.website.Single
CategoryPreferences" | |
| 54 android:key="protected_content" /> | |
| 55 <!-- Background sync --> | |
| 56 <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference | |
| 57 android:fragment="org.chromium.chrome.browser.preferences.website.Single
CategoryPreferences" | |
| 58 android:key="background_sync" /> | |
| 59 <!-- Language --> | 58 <!-- Language --> |
| 60 <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference | 59 <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference |
| 61 android:fragment="org.chromium.chrome.browser.preferences.website.Langua
gePreferences" | 60 android:fragment="org.chromium.chrome.browser.preferences.website.Langua
gePreferences" |
| 62 android:key="language" | 61 android:key="language" |
| 63 android:title="@string/language" | 62 android:title="@string/language" |
| 64 android:icon="@drawable/settings_language" /> | 63 android:icon="@drawable/settings_language" /> |
| 65 <!-- Storage --> | 64 <!-- Storage --> |
| 66 <!-- TODO(finnur): Move this over to the new Usage screen, once it exists. -
-> | 65 <!-- TODO(finnur): Move this over to the new Usage screen, once it exists. -
-> |
| 67 <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference | 66 <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference |
| 68 android:fragment="org.chromium.chrome.browser.preferences.website.Single
CategoryPreferences" | 67 android:fragment="org.chromium.chrome.browser.preferences.website.Single
CategoryPreferences" |
| 69 android:key="use_storage" | 68 android:key="use_storage" |
| 70 android:title="@string/website_settings_storage" | 69 android:title="@string/website_settings_storage" |
| 71 android:icon="@drawable/settings_storage" /> | 70 android:icon="@drawable/settings_storage" /> |
| 72 </PreferenceScreen> | 71 </PreferenceScreen> |
| OLD | NEW |