Index: mobile/android/base/java/org/mozilla/gecko/tabs/TabsPanel.java |
=================================================================== |
--- a/mobile/android/base/java/org/mozilla/gecko/tabs/TabsPanel.java |
+++ b/mobile/android/base/java/org/mozilla/gecko/tabs/TabsPanel.java |
@@ -289,30 +289,28 @@ |
if (!HardwareUtils.isTablet()) { |
GeckoSharedPrefs.forApp(getContext()).unregisterOnSharedPreferenceChangeListener(this); |
} |
} |
@Override |
@SuppressWarnings("deprecation") // setBackgroundDrawable deprecated by API level 16 |
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 drawable = mTheme.getColorDrawable(this, background, true); |
if (drawable == null) |
return; |
drawable.setAlpha(34, 0); |
setBackgroundDrawable(drawable); |
} |
@Override |
public void onLightweightThemeReset() { |
- // Using ABB color palette. See https://issues.adblockplus.org/ticket/3769 |
- setBackgroundColor(ContextCompat.getColor(getContext(), R.color.abb_background_light_grey)); |
+ setBackgroundColor(ContextCompat.getColor(getContext(), R.color.text_and_tabs_tray_grey)); |
} |
@Override |
protected void onLayout(boolean changed, int left, int top, int right, int bottom) { |
super.onLayout(changed, left, top, right, bottom); |
onLightweightThemeChanged(); |
} |
@@ -336,30 +334,28 @@ |
public void onDetachedFromWindow() { |
super.onDetachedFromWindow(); |
mTheme.removeListener(this); |
} |
@Override |
@SuppressWarnings("deprecation") // setBackgroundDrawable deprecated by API level 16 |
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 drawable = mTheme.getColorDrawable(this, background); |
if (drawable == null) |
return; |
drawable.setAlpha(34, 34); |
setBackgroundDrawable(drawable); |
} |
@Override |
public void onLightweightThemeReset() { |
- // Using ABB color palette. See https://issues.adblockplus.org/ticket/3769 |
- setBackgroundColor(ContextCompat.getColor(getContext(), R.color.abb_background_light_grey)); |
+ setBackgroundColor(ContextCompat.getColor(getContext(), R.color.text_and_tabs_tray_grey)); |
} |
@Override |
protected void onLayout(boolean changed, int left, int top, int right, int bottom) { |
super.onLayout(changed, left, top, right, bottom); |
onLightweightThemeChanged(); |
} |
} |