chrome/android/java/res/xml/translate_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/translate_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

« no previous file with comments | « chrome/android/java/res/xml/single_website_preferences.xml ('k') | chrome/android/java/res/xml/website_settings_preferences.xml » ('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 2014 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	7

8 <org.chromium.chrome.browser.preferences.ChromeSwitchPreference	8 <org.chromium.chrome.browser.preferences.ChromeSwitchPreference

9 android:key="protected_content_switch"	9 android:key="translate_switch"

10 android:summaryOn="@string/text_on"	10 android:summaryOn="@string/text_on"

11 android:summaryOff="@string/text_off" />	11 android:summaryOff="@string/text_off" />

12	12

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

14 android:title="@string/protected_content_prefs_description" />	14 android:title="@string/translate_prefs_description" />

15

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

17 android:key="protected_content_learn_more"

18 android:title="@string/learn_more" />

19	15

20 <org.chromium.chrome.browser.preferences.ButtonPreference	16 <org.chromium.chrome.browser.preferences.ButtonPreference

21 android:key="reset_device_credentials_button"	17 android:key="reset_translate_button"

22 android:title="@string/reset_device_credentials" />	18 android:title="@string/reset_translate_defaults" />

23	19

24 </PreferenceScreen>	20 </PreferenceScreen>

OLD	NEW