Issue 3769 - UI colours gone bad

mobile/android/base/resources/drawable/tab_thumbnail.xml

Index: mobile/android/base/resources/drawable/tab_thumbnail.xml
===================================================================
--- a/mobile/android/base/resources/drawable/tab_thumbnail.xml
+++ b/mobile/android/base/resources/drawable/tab_thumbnail.xml
@@ -1,53 +1,50 @@
 <?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/. -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:gecko="http://schemas.android.com/apk/res-auto">
 
+    <!-- Using ABB color palette. See https://issues.adblockplus.org/ticket/3769 -->
     <item android:state_focused="true">
 
         <shape android:shape="rectangle">
-            <!-- @color/fennec_ui_orange with alpha -->
-            <solid android:color="#B3FF9500"/>
+            <solid android:color="@color/abb_accent_dark_blue_alpha"/>
             <corners android:radius="1dp"/>
         </shape>
 
     </item>
 
     <item android:state_focused="true"
           gecko:state_private="true">
 
         <shape android:shape="rectangle">
-            <!-- @color/private_browsing_purple with alpha -->
-            <solid android:color="#B3CF68FF"/>
+            <solid android:color="@color/abb_private_purple_alpha"/>
             <corners android:radius="1dp"/>
         </shape>
 
     </item>
 
     <item android:state_pressed="true"
           gecko:state_private="true">
 
         <shape android:shape="rectangle">
-            <!-- @color/private_browsing_purple with alpha -->
-            <solid android:color="#B3CF68FF"/>
+            <solid android:color="@color/abb_private_purple_alpha"/>
             <corners android:radius="1dp"/>
         </shape>
 
     </item>
 
     <item android:state_pressed="true">
 
         <shape android:shape="rectangle">
-            <!-- @color/fennec_ui_orange with alpha -->
-            <solid android:color="#B3FF9500"/>
+            <solid android:color="@color/abb_accent_dark_blue_alpha"/>
             <corners android:radius="1dp"/>
         </shape>
 
     </item>
 
     <item gecko:state_recording="true">
 
         <shape android:shape="rectangle">
@@ -77,11 +74,25 @@
 
         <shape android:shape="rectangle">
             <solid android:color="@color/fennec_ui_orange"/>
             <corners android:radius="1dp"/>
         </shape>
 
     </item>
 
-    <item android:drawable="@android:color/transparent"/>
+    <!-- Adding inset border to normal state in order to follow ABB design guide -->
+    <!-- See https://issues.adblockplus.org/ticket/3769 -->
+    <item>
+
+        <inset android:insetBottom="2dp" android:insetLeft="2dp" android:insetRight="2dp"
+            android:insetTop="2dp">
+
+            <shape android:shape="rectangle">
+                <solid android:color="@color/abb_border_grey" />
+                <corners android:radius="1dp" />
+            </shape>
+
+        </inset>
+
+    </item>
 
 </selector>