Issue 3769 - UI colours gone bad

mobile/android/base/toolbar/BrowserToolbar.java

 /* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 package org.mozilla.gecko.toolbar;
 
 import java.util.ArrayList;
 import java.util.EnumSet;
 import java.util.List;
@@ skipping 185 matching lines @@
         menuIcon = (ThemedImageView) findViewById(R.id.menu_icon);
         hasSoftMenuButton = !HardwareUtils.hasMenuButton();
 
         // The focusOrder List should be filled by sub-classes.
         focusOrder = new ArrayList<View>();
 
         final Resources res = getResources();
         shadowSize = res.getDimensionPixelSize(R.dimen.browser_toolbar_shadow_size);
 
         shadowPaint = new Paint();
-        shadowColor = ColorUtils.getColor(context, R.color.url_bar_shadow);
-        shadowPrivateColor = ColorUtils.getColor(context, R.color.url_bar_shadow_private);
+        // Using ABB color for toolbar divider. See https://issues.adblockplus.org/ticket/3769
+        shadowColor = ColorUtils.getColor(context, R.color.abb_text_divider_grey);
+        shadowPrivateColor = ColorUtils.getColor(context, R.color.abb_text_divider_grey);
         shadowPaint.setColor(shadowColor);
         shadowPaint.setStrokeWidth(0.0f);
 
         setUIMode(UIMode.DISPLAY);
 
         prefs = new ToolbarPrefs();
         urlDisplayLayout.setToolbarPrefs(prefs);
         urlEditLayout.setToolbarPrefs(prefs);
 
         setOnCreateContextMenuListener(new View.OnCreateContextMenuListener() {
@@ skipping 608 matching lines @@
         return url;
     }
 
     @Override
     public void setPrivateMode(boolean isPrivate) {
         super.setPrivateMode(isPrivate);
 
         tabsButton.setPrivateMode(isPrivate);
         menuButton.setPrivateMode(isPrivate);
         urlEditLayout.setPrivateMode(isPrivate);
+        // Changing color in private mode. See https://issues.adblockplus.org/ticket/3769
+        menuIcon.setPrivateMode(isPrivate);
 
         shadowPaint.setColor(isPrivate ? shadowPrivateColor : shadowColor);
     }
 
     public void show() {
         setVisibility(View.VISIBLE);
     }
 
     public void hide() {
         setVisibility(View.GONE);
@@ skipping 96 matching lines @@
 
         public boolean isBrowserSearchShown() {
             return isBrowserSearchShown;
         }
 
         public void setIsBrowserSearchShown(final boolean isShown) {
             isBrowserSearchShown = isShown;
         }
     }
 }