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

Side by Side Diff: mobile/android/base/toolbar/BrowserToolbarPhoneBase.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 3 * License, v. 2.0. If a copy of the MPL was not distributed with this
4 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ 4 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
5 5
6 package org.mozilla.gecko.toolbar; 6 package org.mozilla.gecko.toolbar;
7 7
8 import java.util.Arrays; 8 import java.util.Arrays;
9 9
10 import org.mozilla.gecko.R; 10 import org.mozilla.gecko.R;
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 focusOrder.addAll(Arrays.asList(tabsButton, menuButton)); 57 focusOrder.addAll(Arrays.asList(tabsButton, menuButton));
58 58
59 roundCornerShape = new Path(); 59 roundCornerShape = new Path();
60 roundCornerShape.moveTo(0, 0); 60 roundCornerShape.moveTo(0, 0);
61 roundCornerShape.lineTo(30, 0); 61 roundCornerShape.lineTo(30, 0);
62 roundCornerShape.cubicTo(0, 0, 0, 0, 0, 30); 62 roundCornerShape.cubicTo(0, 0, 0, 0, 0, 30);
63 roundCornerShape.lineTo(0, 0); 63 roundCornerShape.lineTo(0, 0);
64 64
65 roundCornerPaint = new Paint(); 65 roundCornerPaint = new Paint();
66 roundCornerPaint.setAntiAlias(true); 66 roundCornerPaint.setAntiAlias(true);
67 roundCornerPaint.setColor(ColorUtils.getColor(context, R.color.text_and_ tabs_tray_grey)); 67 // Using ABB color palette. See https://issues.adblockplus.org/ticket/37 69
68 roundCornerPaint.setColor(ColorUtils.getColor(context, R.color.abb_backg round_light_grey));
68 roundCornerPaint.setStrokeWidth(0.0f); 69 roundCornerPaint.setStrokeWidth(0.0f);
69 } 70 }
70 71
71 @Override 72 @Override
72 public void onAttachedToWindow() { 73 public void onAttachedToWindow() {
73 super.onAttachedToWindow(); 74 super.onAttachedToWindow();
74 75
75 editCancel.setOnClickListener(new OnClickListener() { 76 editCancel.setOnClickListener(new OnClickListener() {
76 @Override 77 @Override
77 public void onClick(View v) { 78 public void onClick(View v) {
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 super.onLightweightThemeChanged(); 217 super.onLightweightThemeChanged();
217 editCancel.onLightweightThemeChanged(); 218 editCancel.onLightweightThemeChanged();
218 } 219 }
219 220
220 @Override 221 @Override
221 public void onLightweightThemeReset() { 222 public void onLightweightThemeReset() {
222 super.onLightweightThemeReset(); 223 super.onLightweightThemeReset();
223 editCancel.onLightweightThemeReset(); 224 editCancel.onLightweightThemeReset();
224 } 225 }
225 } 226 }
OLDNEW
« no previous file with comments | « mobile/android/base/toolbar/BrowserToolbar.java ('k') | mobile/android/base/toolbar/NavButton.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld