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

Unified Diff: mobile/android/base/tabs/TabsPanel.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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mobile/android/base/tabs/TabStrip.java ('k') | mobile/android/base/toolbar/BrowserToolbar.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mobile/android/base/tabs/TabsPanel.java
===================================================================
--- a/mobile/android/base/tabs/TabsPanel.java
+++ b/mobile/android/base/tabs/TabsPanel.java
@@ -258,28 +258,30 @@ public class TabsPanel extends LinearLay
public void onDetachedFromWindow() {
super.onDetachedFromWindow();
mTheme.removeListener(this);
}
@Override
@SuppressWarnings("deprecation") // setBackgroundDrawable deprecated by API level 16
public void onLightweightThemeChanged() {
- final int background = ColorUtils.getColor(getContext(), R.color.text_and_tabs_tray_grey);
+ // Using ABB color palette. See https://issues.adblockplus.org/ticket/3769
+ final int background = ColorUtils.getColor(getContext(), R.color.abb_background_light_grey);
final LightweightThemeDrawable drawable = mTheme.getColorDrawable(this, background, true);
if (drawable == null)
return;
drawable.setAlpha(34, 0);
setBackgroundDrawable(drawable);
}
@Override
public void onLightweightThemeReset() {
- setBackgroundColor(ColorUtils.getColor(getContext(), R.color.text_and_tabs_tray_grey));
+ // Using ABB color palette. See https://issues.adblockplus.org/ticket/3769
+ setBackgroundColor(ColorUtils.getColor(getContext(), R.color.abb_background_light_grey));
}
@Override
protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
super.onLayout(changed, left, top, right, bottom);
onLightweightThemeChanged();
}
@@ -303,28 +305,30 @@ public class TabsPanel extends LinearLay
public void onDetachedFromWindow() {
super.onDetachedFromWindow();
mTheme.removeListener(this);
}
@Override
@SuppressWarnings("deprecation") // setBackgroundDrawable deprecated by API level 16
public void onLightweightThemeChanged() {
- final int background = ColorUtils.getColor(getContext(), R.color.text_and_tabs_tray_grey);
+ // Using ABB color palette. See https://issues.adblockplus.org/ticket/3769
+ final int background = ColorUtils.getColor(getContext(), R.color.abb_background_light_grey);
final LightweightThemeDrawable drawable = mTheme.getColorDrawable(this, background);
if (drawable == null)
return;
drawable.setAlpha(34, 34);
setBackgroundDrawable(drawable);
}
@Override
public void onLightweightThemeReset() {
- setBackgroundColor(ColorUtils.getColor(getContext(), R.color.text_and_tabs_tray_grey));
+ // Using ABB color palette. See https://issues.adblockplus.org/ticket/3769
+ setBackgroundColor(ColorUtils.getColor(getContext(), R.color.abb_background_light_grey));
}
@Override
protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
super.onLayout(changed, left, top, right, bottom);
onLightweightThemeChanged();
}
}
« no previous file with comments | « mobile/android/base/tabs/TabStrip.java ('k') | mobile/android/base/toolbar/BrowserToolbar.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld