Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: mobile/android/base/java/org/mozilla/gecko/toolbar/ShapedButton.java

Issue 29986555: Issue 7200 - Adjust UI colors (Closed)
Patch Set: Created Jan. 21, 2019, 6:56 p.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/java/org/mozilla/gecko/toolbar/ShapedButton.java
===================================================================
--- a/mobile/android/base/java/org/mozilla/gecko/toolbar/ShapedButton.java
+++ b/mobile/android/base/java/org/mozilla/gecko/toolbar/ShapedButton.java
@@ -62,30 +62,28 @@
@Override
public void defaultDraw(Canvas canvas) {
super.draw(canvas);
}
// The drawable is constructed as per @drawable/shaped_button.
@Override
public void onLightweightThemeChanged() {
- // Using ABB color palette. See https://issues.adblockplus.org/ticket/3769
- final int background = ContextCompat.getColor(getContext(), R.color.abb_background_light_grey);
+ final int background = ContextCompat.getColor(getContext(), R.color.text_and_tabs_tray_grey);
final LightweightThemeDrawable lightWeight = getTheme().getColorDrawable(this, background);
if (lightWeight == null)
return;
lightWeight.setAlpha(34, 34);
final StateListDrawable stateList = new StateListDrawable();
stateList.addState(PRESSED_ENABLED_STATE_SET, getColorDrawable(R.color.highlight_shaped));
stateList.addState(FOCUSED_STATE_SET, getColorDrawable(R.color.highlight_shaped_focused));
- // Using ABB color palette. See https://issues.adblockplus.org/ticket/3769
- stateList.addState(PRIVATE_STATE_SET, getColorDrawable(R.color.abb_background_light_grey));
+ stateList.addState(PRIVATE_STATE_SET, getColorDrawable(R.color.text_and_tabs_tray_grey));
stateList.addState(EMPTY_STATE_SET, lightWeight);
setBackgroundDrawable(stateList);
}
@Override
public void onLightweightThemeReset() {
setBackgroundResource(R.drawable.shaped_button);

Powered by Google App Engine
This is Rietveld