mobile/android/base/toolbar/BrowserToolbar.java - Issue 29348083: Issue 3769 - UI colours gone bad

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/toolbar/BrowserToolbar.java

Issue 29348083: Issue 3769 - UI colours gone bad (Closed)

Patch Set: Adjusting comments which indicates what has being changed by this issue in upstream code Created Oct. 25, 2016, 12:16 p.m.

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

Jump to:

Index: mobile/android/base/toolbar/BrowserToolbar.java

===================================================================

--- a/mobile/android/base/toolbar/BrowserToolbar.java

+++ b/mobile/android/base/toolbar/BrowserToolbar.java

@@ -198,18 +198,19 @@ public abstract class BrowserToolbar ext

// The focusOrder List should be filled by sub-classes.

focusOrder = new ArrayList<View>();

final Resources res = getResources();

shadowSize = res.getDimensionPixelSize(R.dimen.browser_toolbar_shadow_size);

shadowPaint = new Paint();

- shadowColor = ColorUtils.getColor(context, R.color.url_bar_shadow);

- shadowPrivateColor = ColorUtils.getColor(context, R.color.url_bar_shadow_private);

+ // Using ABB color for toolbar divider. See https://issues.adblockplus.org/ticket/3769

+ shadowColor = ColorUtils.getColor(context, R.color.abb_text_divider_grey);

+ shadowPrivateColor = ColorUtils.getColor(context, R.color.abb_text_divider_grey);

shadowPaint.setColor(shadowColor);

shadowPaint.setStrokeWidth(0.0f);

setUIMode(UIMode.DISPLAY);

prefs = new ToolbarPrefs();

urlDisplayLayout.setToolbarPrefs(prefs);

urlEditLayout.setToolbarPrefs(prefs);

@@ -828,16 +829,18 @@ public abstract class BrowserToolbar ext

@Override

public void setPrivateMode(boolean isPrivate) {

super.setPrivateMode(isPrivate);

tabsButton.setPrivateMode(isPrivate);

menuButton.setPrivateMode(isPrivate);

urlEditLayout.setPrivateMode(isPrivate);

+ // Changing color in private mode. See https://issues.adblockplus.org/ticket/3769

+ menuIcon.setPrivateMode(isPrivate);

shadowPaint.setColor(isPrivate ? shadowPrivateColor : shadowColor);

}

public void show() {

setVisibility(View.VISIBLE);

}