chrome/android/java/res/xml/content_preferences.xml - Issue 850813002: Upstream Site Settings.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 850813002: Upstream Site Settings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@location_settings_singleton

Patch Set: use findbugs annotations; fix test Created 5 years, 11 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

OLD	NEW
(Empty)
	1 <?xml version="1.0" encoding="utf-8"?>

	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

	4 found in the LICENSE file. -->

	5

	6 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">

	7 <!-- All sites -->

	8 <Preference

	9 android:fragment="org.chromium.chrome.browser.preferences.website.Websit ePreferences"

	10 android:key="website_settings"

	11 android:title="@string/all_sites"

	12 android:icon="@drawable/settings_all_sites" />

	13 <!-- Cookies -->

	14 <Preference

	15 android:key="cookies"

	16 android:fragment="org.chromium.chrome.browser.preferences.website.Websit ePreferences" />

	17 <!-- Location -->

	18 <Preference

	19 android:fragment="org.chromium.chrome.browser.preferences.website.Websit ePreferences"

	20 android:key="device_location" />

	21 <!-- Media -->

	22 <Preference

	23 android:fragment="org.chromium.chrome.browser.preferences.website.Websit ePreferences"

	24 android:key="use_camera_or_mic" />

	25 <!-- Notifications -->

	26 <Preference

	27 android:fragment="org.chromium.chrome.browser.preferences.website.Websit ePreferences"

	28 android:key="push_notifications" />

	29 <!-- JavaScript -->

	30 <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference

	31 android:key="enable_javascript"

	32 android:title="@string/enable_javascript_title"

	33 android:summary="@string/enable_javascript_summary"

	34 android:defaultValue="true"

	35 android:icon="@drawable/permission_javascript" />

	36 <!-- Popups -->

	37 <Preference

	38 android:fragment="org.chromium.chrome.browser.preferences.website.Websit ePreferences"

	39 android:key="popups" />

	40 <!-- Protected content -->

	41 <Preference

	42 android:fragment="org.chromium.chrome.browser.preferences.ProtectedConte ntPreferences"

	43 android:key="protected_content" />

	44 <!-- Google Translate -->

	45 <Preference

	46 android:fragment="org.chromium.chrome.browser.preferences.website.Transl atePreferences"

	47 android:key="translate"

	48 android:title="@string/google_translate"

	49 android:icon="@drawable/settings_translate" />

	50 <!-- Storage -->

	51 <!-- TODO(finnur): Move this over to the new Usage screen, once it exists. - ->

	52 <Preference

	53 android:fragment="org.chromium.chrome.browser.preferences.website.Websit ePreferences"

	54 android:key="use_storage"

	55 android:title="@string/website_settings_storage"

	56 android:icon="@drawable/settings_storage" />

	57 </PreferenceScreen>

OLD	NEW

« no previous file with comments | « chrome/android/java/res/values/values.xml ('k') | chrome/android/java/res/xml/single_website_preferences.xml » ('j') | no next file with comments »