mobile/android/base/home/HomeConfigPrefsBackend.java - 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/home/HomeConfigPrefsBackend.java

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:

Index: mobile/android/base/home/HomeConfigPrefsBackend.java

diff --git a/mobile/android/base/home/HomeConfigPrefsBackend.java b/mobile/android/base/home/HomeConfigPrefsBackend.java

index 7d86566dcf30f663c2064c301b89e0ca3bd4abdf..d1630d162f26e6416f1737bcd05c4b6c272a7fbe 100644

--- a/mobile/android/base/home/HomeConfigPrefsBackend.java

+++ b/mobile/android/base/home/HomeConfigPrefsBackend.java

@@ -76,10 +76,7 @@ class HomeConfigPrefsBackend implements HomeConfigBackend {

panelConfigs.add(createBuiltinPanelConfig(mContext, PanelType.BOOKMARKS));

panelConfigs.add(createBuiltinPanelConfig(mContext, PanelType.HISTORY));

- // We disable Synced Tabs for guest mode / restricted profiles.

- if (RestrictedProfiles.isAllowed(mContext, Restriction.DISALLOW_MODIFY_ACCOUNTS)) {

- panelConfigs.add(createBuiltinPanelConfig(mContext, PanelType.REMOTE_TABS));

- }

+ // We disable Synced/Remote Tabs (see https://issues.adblockplus.org/ticket/2480)

panelConfigs.add(createBuiltinPanelConfig(mContext, PanelType.RECENT_TABS));

panelConfigs.add(createBuiltinPanelConfig(mContext, PanelType.READING_LIST));