Issue 7200 - Adjust UI colors

mobile/android/base/java/org/mozilla/gecko/tabs/TabsPanel.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.tabs;
 
 import org.mozilla.gecko.Experiments;
 import org.mozilla.gecko.GeckoApp;
 import org.mozilla.gecko.GeckoApplication;
@@ skipping 276 matching lines @@
         super.onDetachedFromWindow();
         mTheme.removeListener(this);
         if (!HardwareUtils.isTablet()) {
             GeckoSharedPrefs.forApp(getContext()).unregisterOnSharedPreferenceChangeListener(this);
         }
     }
 
     @Override
     @SuppressWarnings("deprecation") // setBackgroundDrawable deprecated by API level 16
     public void onLightweightThemeChanged() {
-        // Using ABB color palette. See https://issues.adblockplus.org/ticket/3769
-        final int background = ContextCompat.getColor(getContext(), R.color.abb_background_light_grey);
+        final int background = ContextCompat.getColor(getContext(), R.color.text_and_tabs_tray_grey);
         final LightweightThemeDrawable drawable = mTheme.getColorDrawable(this, background, true);
         if (drawable == null)
             return;
 
         drawable.setAlpha(34, 0);
         setBackgroundDrawable(drawable);
     }
 
     @Override
     public void onLightweightThemeReset() {
-        // Using ABB color palette. See https://issues.adblockplus.org/ticket/3769
-        setBackgroundColor(ContextCompat.getColor(getContext(), R.color.abb_background_light_grey));
+        setBackgroundColor(ContextCompat.getColor(getContext(), R.color.text_and_tabs_tray_grey));
     }
 
     @Override
     protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
         super.onLayout(changed, left, top, right, bottom);
         onLightweightThemeChanged();
     }
 
     // Tabs Panel Toolbar contains the Buttons
     static class TabsPanelToolbar extends LinearLayout
@@ skipping 13 matching lines @@
 
         @Override
         public void onDetachedFromWindow() {
             super.onDetachedFromWindow();
             mTheme.removeListener(this);
         }
 
         @Override
         @SuppressWarnings("deprecation") // setBackgroundDrawable deprecated by API level 16
         public void onLightweightThemeChanged() {
-            // Using ABB color palette. See https://issues.adblockplus.org/ticket/3769
-            final int background = ContextCompat.getColor(getContext(), R.color.abb_background_light_grey);
+            final int background = ContextCompat.getColor(getContext(), R.color.text_and_tabs_tray_grey);
             final LightweightThemeDrawable drawable = mTheme.getColorDrawable(this, background);
             if (drawable == null)
                 return;
 
             drawable.setAlpha(34, 34);
             setBackgroundDrawable(drawable);
         }
 
         @Override
         public void onLightweightThemeReset() {
-            // Using ABB color palette. See https://issues.adblockplus.org/ticket/3769
-            setBackgroundColor(ContextCompat.getColor(getContext(), R.color.abb_background_light_grey));
+            setBackgroundColor(ContextCompat.getColor(getContext(), R.color.text_and_tabs_tray_grey));
         }
 
         @Override
         protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
             super.onLayout(changed, left, top, right, bottom);
             onLightweightThemeChanged();
         }
     }
 
     public void show(Panel panelToShow) {
@@ skipping 141 matching lines @@
     @UiThread // according to the docs.
     @Override
     public void onSharedPreferenceChanged(final SharedPreferences sharedPreferences, final String key) {
         if (!TextUtils.equals(GeckoPreferences.PREFS_COMPACT_TABS, key)) {
             return;
         }
 
         refresh();
     }
 }