Issue 3769 - UI colours gone bad

mobile/android/base/resources/values/colors.xml

Index: mobile/android/base/resources/values/colors.xml
===================================================================
--- a/mobile/android/base/resources/values/colors.xml
+++ b/mobile/android/base/resources/values/colors.xml
@@ -1,76 +1,82 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 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/. -->
 
 <resources>
+  <!-- Using ABB color palette. See https://issues.adblockplus.org/ticket/3769 -->
   <!-- Fennec color palette (bug 1127517) -->
-  <color name="fennec_ui_orange">#009CD0</color>
+  <color name="fennec_ui_orange">@color/abb_accent_dark_blue</color>
   <color name="affirmative_green">#6FBE4A</color>
   <color name="rejection_red">#D23228</color>
-  <color name="action_orange">#E66000</color>
-  <color name="action_orange_pressed">#DC5600</color>
+  <!-- Using ABB color palette. See https://issues.adblockplus.org/ticket/3769 -->
+  <color name="action_orange">@color/abb_accent_dark_blue</color>
+  <color name="action_orange_pressed">@color/abb_accent_dark_blue</color>
   <color name="link_blue">#0096DD</color>
   <color name="link_blue_pressed">#0082C6</color>
-  <color name="private_browsing_purple">#CF68FF</color>
+  <!-- Using ABB color palette. See https://issues.adblockplus.org/ticket/3769 -->
+  <color name="private_browsing_purple">@color/abb_private_purple</color>
 
   <color name="placeholder_active_grey">#222222</color>
   <color name="placeholder_grey">#777777</color>
-  <color name="private_toolbar_grey">#F8F8F8</color>
-  <color name="text_and_tabs_tray_grey">#F8F8F8</color>
-  <color name="tabs_tray_grey_pressed">#F8F8F8</color>
-  <color name="toolbar_icon_grey">#5F6368</color>
+  <!-- Using ABB color palette. See https://issues.adblockplus.org/ticket/3769 -->
+  <color name="private_toolbar_grey">@color/abb_background_light_grey</color>
+  <color name="text_and_tabs_tray_grey">@color/abb_text_icons_dark_grey</color>
+  <color name="tabs_tray_grey_pressed">@color/abb_background_light_grey</color>
+  <color name="toolbar_icon_grey">@color/abb_text_icons_dark_grey</color>
 
-  <color name="tabs_tray_icon_grey">#AFB1B3</color>
+  <!-- Using ABB color palette. See https://issues.adblockplus.org/ticket/3769 -->
+  <color name="tabs_tray_icon_grey">@color/abb_text_icons_dark_grey</color>
   <color name="disabled_grey">#BFBFBF</color>
-  <color name="toolbar_grey_pressed">#F8F8F8</color>
+  <!-- Using ABB color palette. See https://issues.adblockplus.org/ticket/3769 -->
+  <color name="toolbar_grey_pressed">@color/abb_background_light_grey</color>
   <color name="toolbar_menu_dark_grey">#E1E1E6</color>
-  <color name="toolbar_grey">#F8F8F8</color>
+  <!-- Using ABB color palette. See https://issues.adblockplus.org/ticket/3769 -->
+  <color name="toolbar_grey">@color/abb_background_light_grey</color>
   <color name="about_page_header_grey">#F5F5F5</color>
 
-  <!-- ABB custom colors -->
-  <color name="abb_thumbnail_row_text">#3B3B3B</color>
-
   <color name="url_bar_shadow_private">#7878A5</color>
 
   <!-- Restricted profiles palette -->
 
   <color name="restricted_profile_background_gold">#ffffcb51</color>
   <color name="restricted_profile_background_green">#1aaa86</color>
 
   <!-- Non-palette colors -->
 
   <!-- Synced w/ toolbar_grey -->
   <color name="background_normal_lwt">#DDEBEBF0</color>
 
   <color name="background_tabs">#FF363B40</color>
-  <color name="highlight">#33000000</color>
+  <color name="highlight">#1A000000</color>
   <color name="highlight_focused">#1A000000</color>
-  <color name="highlight_dark">#33FFFFFF</color>
+  <color name="highlight_dark">#1AFFFFFF</color>
   <color name="highlight_dark_focused">#1AFFFFFF</color>
 
   <!-- Synced w/ toolbar_grey_pressed -->
   <color name="tablet_highlight_lwt">#AAD7D7DC</color>
 
   <!-- Synced w/ tabs_tray_grey_pressed -->
   <color name="tablet_highlight_dark_lwt">#AA45494E</color>
 
   <!-- (bug 1077195) Focused state values are temporary. -->
   <color name="tablet_highlight_focused">#C0C9D0</color>
 
+  <!-- Using ABB color palette. See https://issues.adblockplus.org/ticket/3769 -->
   <!-- highlight on shaped button: 20% white over text_and_tabs_tray_grey -->
-  <color name="highlight_shaped">#FFF8F8F8</color>
+  <color name="highlight_shaped">@color/abb_background_light_grey</color>
 
   <!-- highlight-focused on shaped button: 10% white over text_and_tabs_tray_grey -->
   <color name="highlight_shaped_focused">#FF565B60</color>
 
+  <!-- Using ABB color palette. See https://issues.adblockplus.org/ticket/3769 -->
   <!-- highlight on private nav button: 20% white over private_toolbar_grey -->
-  <color name="highlight_nav_pb">#FFF8F8F8</color>
+  <color name="highlight_nav_pb">@color/abb_background_light_grey</color>
 
   <color name="dark_transparent_overlay">#99000000</color>
 
   <!-- Firstrun tour-->
   <color name="firstrun_tabstrip">#1193CB</color>
   <color name="firstrun_pager_background">#16A3DF</color>
 
   <!-- Tab Queue -->
@@ -89,29 +95,31 @@
   <!-- Disabled colors -->
   <color name="text_color_primary_disable_only">#999999</color>
 
   <!-- Hint colors -->
   <color name="text_color_hint">#666666</color>
   <color name="text_color_hint_inverse">#7F828A</color>
   <color name="text_color_hint_floating_focused">#33b5e5</color>
 
+  <!-- Using ABB color palette. See https://issues.adblockplus.org/ticket/3769 -->
   <!-- Highlight colors -->
-  <color name="text_color_highlight_inverse">#D06BFF</color>
+  <color name="text_color_highlight_inverse">@color/abb_private_purple</color>
 
   <!-- Link colors -->
   <color name="text_color_link">#22629E</color>
 
   <!-- Divider colors -->
   <color name="divider_light">#FFD7D9DB</color>
 
   <color name="doorhanger_link">#FF2AA1FE</color>
 
   <color name="validation_message_text">#ffffff</color>
-  <color name="url_bar_text_highlight_pb">#FFD06BFF</color>
+  <!-- Using ABB color palette. See https://issues.adblockplus.org/ticket/3769 -->
+  <color name="url_bar_text_highlight_pb">@color/abb_private_purple</color>
   <color name="tab_row_pressed">#4D000000</color>
 
   <color name="textbox_background">#FFF</color>
   <color name="textbox_background_disabled">#DDD</color>
   <color name="textbox_stroke">#000</color>
   <color name="textbox_stroke_disabled">#666</color>
 
   <color name="url_bar_urltext">#A6A6A6</color>