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

Side by Side Diff: chrome/android/java/res/xml/content_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 | « no previous file | chrome/android/java/res/xml/single_website_preferences.xml » ('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 xmlns:android="http://schemas.android.com/apk/res/android">
7 <!-- All sites --> 7 <!-- All sites -->
8 <Preference 8 <Preference
9 android:fragment="org.chromium.chrome.browser.preferences.website.Websit ePreferences" 9 android:fragment="org.chromium.chrome.browser.preferences.website.Websit ePreferences"
10 android:key="website_settings" 10 android:key="website_settings"
11 android:title="@string/all_sites" 11 android:title="@string/all_sites"
12 android:icon="@drawable/settings_all_sites" /> 12 android:icon="@drawable/settings_all_sites" />
13 <!-- Cookies --> 13 <!-- Cookies -->
14 <Preference 14 <Preference
15 android:key="cookies" 15 android:key="cookies"
16 android:fragment="org.chromium.chrome.browser.preferences.website.Websit ePreferences" /> 16 android:fragment="org.chromium.chrome.browser.preferences.website.Websit ePreferences" />
17 <!-- Location --> 17 <!-- Location -->
18 <Preference 18 <Preference
19 android:fragment="org.chromium.chrome.browser.preferences.website.Websit ePreferences" 19 android:fragment="org.chromium.chrome.browser.preferences.website.Websit ePreferences"
20 android:key="device_location" /> 20 android:key="device_location" />
21 <!-- Media --> 21 <!-- Media -->
22 <Preference 22 <Preference
23 android:fragment="org.chromium.chrome.browser.preferences.website.Websit ePreferences" 23 android:fragment="org.chromium.chrome.browser.preferences.website.Websit ePreferences"
24 android:key="use_camera_or_mic" /> 24 android:key="use_camera_or_mic" />
25 <!-- Notifications --> 25 <!-- Notifications -->
26 <Preference 26 <Preference
27 android:fragment="org.chromium.chrome.browser.preferences.website.Websit ePreferences" 27 android:fragment="org.chromium.chrome.browser.preferences.website.Websit ePreferences"
28 android:key="push_notifications" /> 28 android:key="push_notifications" />
29 <!-- Images -->
30 <Preference
31 android:fragment="org.chromium.chrome.browser.preferences.website.Websit ePreferences"
32 android:key="images" />
29 <!-- JavaScript --> 33 <!-- JavaScript -->
30 <Preference 34 <Preference
31 android:fragment="org.chromium.chrome.browser.preferences.website.Websit ePreferences" 35 android:fragment="org.chromium.chrome.browser.preferences.website.Websit ePreferences"
32 android:key="javascript" /> 36 android:key="javascript" />
33 <!-- Popups --> 37 <!-- Popups -->
34 <Preference 38 <Preference
35 android:fragment="org.chromium.chrome.browser.preferences.website.Websit ePreferences" 39 android:fragment="org.chromium.chrome.browser.preferences.website.Websit ePreferences"
36 android:key="popups" /> 40 android:key="popups" />
37 <!-- Fullscreen --> 41 <!-- Fullscreen -->
38 <Preference 42 <Preference
(...skipping 10 matching lines...) Expand all
49 android:title="@string/google_translate" 53 android:title="@string/google_translate"
50 android:icon="@drawable/settings_translate" /> 54 android:icon="@drawable/settings_translate" />
51 <!-- Storage --> 55 <!-- Storage -->
52 <!-- TODO(finnur): Move this over to the new Usage screen, once it exists. - -> 56 <!-- TODO(finnur): Move this over to the new Usage screen, once it exists. - ->
53 <Preference 57 <Preference
54 android:fragment="org.chromium.chrome.browser.preferences.website.Websit ePreferences" 58 android:fragment="org.chromium.chrome.browser.preferences.website.Websit ePreferences"
55 android:key="use_storage" 59 android:key="use_storage"
56 android:title="@string/website_settings_storage" 60 android:title="@string/website_settings_storage"
57 android:icon="@drawable/settings_storage" /> 61 android:icon="@drawable/settings_storage" />
58 </PreferenceScreen> 62 </PreferenceScreen>
OLDNEW
« no previous file with comments | « no previous file | chrome/android/java/res/xml/single_website_preferences.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698