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

Side by Side Diff: mobile/android/base/tabs/TabStrip.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.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*- 1 /* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
2 /* This Source Code Form is subject to the terms of the Mozilla Public 2 /* This Source Code Form is subject to the terms of the Mozilla Public
3 * License, v. 2.0. If a copy of the MPL was not distributed with this file, 3 * License, v. 2.0. If a copy of the MPL was not distributed with this file,
4 * You can obtain one at http://mozilla.org/MPL/2.0/. */ 4 * You can obtain one at http://mozilla.org/MPL/2.0/. */
5 5
6 package org.mozilla.gecko.tabs; 6 package org.mozilla.gecko.tabs;
7 7
8 import android.content.Context; 8 import android.content.Context;
9 import android.graphics.drawable.Drawable; 9 import android.graphics.drawable.Drawable;
10 import android.graphics.drawable.StateListDrawable; 10 import android.graphics.drawable.StateListDrawable;
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 } 138 }
139 139
140 @Override 140 @Override
141 public void onLightweightThemeChanged() { 141 public void onLightweightThemeChanged() {
142 final Drawable drawable = getTheme().getDrawable(this); 142 final Drawable drawable = getTheme().getDrawable(this);
143 if (drawable == null) { 143 if (drawable == null) {
144 return; 144 return;
145 } 145 }
146 146
147 final StateListDrawable stateList = new StateListDrawable(); 147 final StateListDrawable stateList = new StateListDrawable();
148 stateList.addState(PRIVATE_STATE_SET, getColorDrawable(R.color.text_and_ tabs_tray_grey)); 148 // Using ABB color palette. See https://issues.adblockplus.org/ticket/37 69
149 stateList.addState(PRIVATE_STATE_SET, getColorDrawable(R.color.abb_backg round_light_grey));
149 stateList.addState(EMPTY_STATE_SET, drawable); 150 stateList.addState(EMPTY_STATE_SET, drawable);
150 151
151 setBackgroundDrawable(stateList); 152 setBackgroundDrawable(stateList);
152 } 153 }
153 154
154 @Override 155 @Override
155 public void onLightweightThemeReset() { 156 public void onLightweightThemeReset() {
156 final int defaultBackgroundColor = ColorUtils.getColor(getContext(), R.c olor.text_and_tabs_tray_grey); 157 // Using ABB color palette. See https://issues.adblockplus.org/ticket/37 69
158 final int defaultBackgroundColor = ColorUtils.getColor(getContext(), R.c olor.abb_background_light_grey);
157 setBackgroundColor(defaultBackgroundColor); 159 setBackgroundColor(defaultBackgroundColor);
158 } 160 }
159 } 161 }
OLDNEW
« no previous file with comments | « mobile/android/base/resources/values/themes.xml ('k') | mobile/android/base/tabs/TabsPanel.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld