mobile/android/base/toolbar/NavButton.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/NavButton.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/NavButton.java

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

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

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

@@ -65,17 +65,18 @@ abstract class NavButton extends ShapedB

if (drawable == null) {

return;

}

final StateListDrawable stateList = new StateListDrawable();

stateList.addState(PRIVATE_PRESSED_STATE_SET, getColorDrawable(R.color.placeholder_active_grey));

stateList.addState(PRESSED_ENABLED_STATE_SET, getColorDrawable(R.color.toolbar_grey_pressed));

- stateList.addState(PRIVATE_FOCUSED_STATE_SET, getColorDrawable(R.color.text_and_tabs_tray_grey));

+ // Using ABB color palette. See https://issues.adblockplus.org/ticket/3769

+ stateList.addState(PRIVATE_FOCUSED_STATE_SET, getColorDrawable(R.color.abb_background_light_grey));

stateList.addState(FOCUSED_STATE_SET, getColorDrawable(R.color.tablet_highlight_focused));

stateList.addState(PRIVATE_STATE_SET, getColorDrawable(R.color.tabs_tray_grey_pressed));

stateList.addState(EMPTY_STATE_SET, drawable);

setBackgroundDrawable(stateList);

}

@Override