mobile/android/base/resources/xml-v11/preferences_customize_tablet.xml - Issue 29330952: Issue 3127 - Merge conflicts, base 42.0.1

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
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
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
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
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Unified Diff: mobile/android/base/resources/xml-v11/preferences_customize_tablet.xml

Issue 29330952: Issue 3127 - Merge conflicts, base 42.0.1 (Closed)

Patch Set: Created Nov. 26, 2015, 11:01 a.m.

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: mobile/android/base/resources/xml-v11/preferences_customize_tablet.xml

diff --git a/mobile/android/base/resources/xml-v11/preferences_customize_tablet.xml b/mobile/android/base/resources/xml-v11/preferences_customize_tablet.xml

index 39629f13faeada8c13587420fd0a91b882de329e..20b7f86ca065661f2962b6d41f1d332bc61ecd78 100644

--- a/mobile/android/base/resources/xml-v11/preferences_customize_tablet.xml

+++ b/mobile/android/base/resources/xml-v11/preferences_customize_tablet.xml

@@ -12,9 +12,7 @@

android:title="@string/pref_category_customize"

android:enabled="false">

- <org.mozilla.gecko.preferences.SyncPreference android:key="android.not_a_preference.sync"

- android:title="@string/pref_sync"

- android:persistent="false" />

+

<PreferenceScreen android:key="android.not_a_preference.customize_home"

android:title="@string/pref_category_home"

« no previous file with comments | « mobile/android/base/resources/xml-v11/preferences.xml ('k') | mobile/android/base/resources/xml/preferences.xml » ('j') | no next file with comments »