| OLD | NEW |
| 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.ArrayList; | 8 import java.util.ArrayList; |
| 9 import java.util.EnumSet; | 9 import java.util.EnumSet; |
| 10 import java.util.List; | 10 import java.util.List; |
| (...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 200 | 200 |
| 201 menuButton = findViewById(R.id.menu); | 201 menuButton = findViewById(R.id.menu); |
| 202 | 202 |
| 203 // The focusOrder List should be filled by sub-classes. | 203 // The focusOrder List should be filled by sub-classes. |
| 204 focusOrder = new ArrayList<View>(); | 204 focusOrder = new ArrayList<View>(); |
| 205 | 205 |
| 206 final Resources res = getResources(); | 206 final Resources res = getResources(); |
| 207 shadowSize = res.getDimensionPixelSize(R.dimen.browser_toolbar_shadow_si
ze); | 207 shadowSize = res.getDimensionPixelSize(R.dimen.browser_toolbar_shadow_si
ze); |
| 208 | 208 |
| 209 shadowPaint = new Paint(); | 209 shadowPaint = new Paint(); |
| 210 // Using ABB color for toolbar divider. See https://issues.adblockplus.o
rg/ticket/3769 | 210 shadowColor = ContextCompat.getColor(context, R.color.url_bar_shadow); |
| 211 shadowColor = ContextCompat.getColor(context, R.color.abb_text_divider_g
rey); | 211 shadowPrivateColor = ContextCompat.getColor(context, R.color.url_bar_sha
dow_private); |
| 212 shadowPrivateColor = ContextCompat.getColor(context, R.color.abb_text_di
vider_grey); | |
| 213 shadowPaint.setColor(shadowColor); | 212 shadowPaint.setColor(shadowColor); |
| 214 shadowPaint.setStrokeWidth(0.0f); | 213 shadowPaint.setStrokeWidth(0.0f); |
| 215 | 214 |
| 216 setUIMode(UIMode.DISPLAY); | 215 setUIMode(UIMode.DISPLAY); |
| 217 | 216 |
| 218 prefs = new ToolbarPrefs(); | 217 prefs = new ToolbarPrefs(); |
| 219 urlDisplayLayout.setToolbarPrefs(prefs); | 218 urlDisplayLayout.setToolbarPrefs(prefs); |
| 220 urlEditLayout.setToolbarPrefs(prefs); | 219 urlEditLayout.setToolbarPrefs(prefs); |
| 221 | 220 |
| 222 // ScrollViews are allowed to have only one child. | 221 // ScrollViews are allowed to have only one child. |
| (...skipping 778 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1001 | 1000 |
| 1002 public boolean isBrowserSearchShown() { | 1001 public boolean isBrowserSearchShown() { |
| 1003 return isBrowserSearchShown; | 1002 return isBrowserSearchShown; |
| 1004 } | 1003 } |
| 1005 | 1004 |
| 1006 public void setIsBrowserSearchShown(final boolean isShown) { | 1005 public void setIsBrowserSearchShown(final boolean isShown) { |
| 1007 isBrowserSearchShown = isShown; | 1006 isBrowserSearchShown = isShown; |
| 1008 } | 1007 } |
| 1009 } | 1008 } |
| 1010 } | 1009 } |
| OLD | NEW |