chrome/android/java/res/xml/main_preferences.xml - Issue 1178323005: Move remaining resources from java_staging/res to java/res.

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/main_preferences.xml

Issue 1178323005: Move remaining resources from java_staging/res to java/res. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@res_default

Patch Set: renamed conflicting resource in chrome shell Created 5 years, 6 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/file_paths.xml ('k') | chrome/android/java_staging/res/anim/snackbar_in.xml » ('j') | no next file with comments »

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	7

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

9 android:key="sign_in"	9 android:key="sign_in"

10 android:title="@string/sign_in_to_chrome" />	10 android:title="@string/sign_in_to_chrome" />

(...skipping 37 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
48 <org.chromium.chrome.browser.preferences.ChromeBasePreference	48 <org.chromium.chrome.browser.preferences.ChromeBasePreference

49 android:fragment="org.chromium.chrome.browser.preferences.bandwidth.Band widthReductionPreferences"	49 android:fragment="org.chromium.chrome.browser.preferences.bandwidth.Band widthReductionPreferences"

50 android:key="reduce_data_usage"	50 android:key="reduce_data_usage"

51 android:title="@string/reduce_data_usage_title" />	51 android:title="@string/reduce_data_usage_title" />

52 <Preference	52 <Preference

53 android:fragment="org.chromium.chrome.browser.preferences.AboutChromePre ferences"	53 android:fragment="org.chromium.chrome.browser.preferences.AboutChromePre ferences"

54 android:key="about_chrome"	54 android:key="about_chrome"

55 android:title="@string/prefs_about_chrome" />	55 android:title="@string/prefs_about_chrome" />

56	56

57 </PreferenceScreen>	57 </PreferenceScreen>

OLD	NEW