From 646ab430a59c1ddd751ca6fd5efb0acf1a67a94f Mon Sep 17 00:00:00 2001
From: Sriram Ramasubramanian <sriram@mozilla.com>
Date: Fri, 8 Jun 2012 12:43:03 -0700
Subject: [PATCH] Bug 762722: Tab rows should have orange highlight.
 [r=mfinkle]

---
 mobile/android/base/Makefile.in                  |   2 --
 .../drawable-nodpi/tabs_tray_pressed_bg.png      | Bin 1174 -> 0 bytes
 .../drawable/tabs_tray_active_selector.xml       |   2 +-
 .../drawable/tabs_tray_default_selector.xml      |   2 +-
 .../drawable/tabs_tray_pressed_bg_repeat.xml     |   8 --------
 5 files changed, 2 insertions(+), 12 deletions(-)
 delete mode 100644 mobile/android/base/resources/drawable-nodpi/tabs_tray_pressed_bg.png
 delete mode 100644 mobile/android/base/resources/drawable/tabs_tray_pressed_bg_repeat.xml

diff --git a/mobile/android/base/Makefile.in b/mobile/android/base/Makefile.in
index 01fc895b5cb..c6f6ff57eae 100644
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -366,7 +366,6 @@ RES_DRAWABLE_NODPI = \
   res/drawable-nodpi/abouthome_topsites_bg.png \
   res/drawable-nodpi/background.png \
   res/drawable-nodpi/tabs_tray_bg.png \
-  res/drawable-nodpi/tabs_tray_pressed_bg.png \
   res/drawable-nodpi/tabs_tray_selected_bg.png \
   $(NULL)
 
@@ -816,7 +815,6 @@ MOZ_ANDROID_DRAWABLES += \
   mobile/android/base/resources/drawable/tabs_button.xml                        \
   mobile/android/base/resources/drawable/tabs_level.xml                         \
   mobile/android/base/resources/drawable/tabs_tray_bg_repeat.xml                \
-  mobile/android/base/resources/drawable/tabs_tray_pressed_bg_repeat.xml        \
   mobile/android/base/resources/drawable/tabs_tray_selected_bg_repeat.xml       \
   mobile/android/base/resources/drawable/tabs_tray_active_selector.xml          \
   mobile/android/base/resources/drawable/tabs_tray_default_selector.xml         \
diff --git a/mobile/android/base/resources/drawable-nodpi/tabs_tray_pressed_bg.png b/mobile/android/base/resources/drawable-nodpi/tabs_tray_pressed_bg.png
deleted file mode 100644
index d659b922e82503e01af426c0f11a347c17090047..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1174
zcmV;H1Zn$;P)<h;3K|Lk000e1NJLTq001%o001%w0{{R3DdBj70000gP)t-se1V66
zg^PZJih6&AeS(R4e};K}g?)mEdw_>~fQEmBihqQQeuIg8frxd1tH=NV1Sd&EK~#9!
zO;riDBq0a`+`#4j*PR5a-ygf4RcZ(X(H2ovF-2=#hR&s?;u!WGTXpNvm>8O13PZgz
z^}VzKY&CtO(fsOl0m(LH1AKytOlyfgz2oY_X!vq`xDH*ChHd-J52Cq7T8X4N>Jia8
zzS`kLcXBW=(`4HW>cQ@cxdQ+&`an>jcf&9?ris$D@uu`~&~3=yV`%iJgag-}u3?6k
zj!DTzA$`rEZy&uB#wd5B%9U|z(~Z||u4l<22^dq<?g}TX;5$8o^1^+!+u1WgR58>D
z3Kt^-gIHHnqR`gy#w0^tgVuA?F4<%jV>5&2ezZ+F3r;bzVebxkQsE{uoJrS%AD>wI
zGQ0^bzoH0l2%Q;N0VeK(z`8+i=%K&pS07x=R=LQmD;XG4zn0<-g;hFogF8`=;8j`D
zu~SY#z%@OmL)T-rt4Ys_u>H%M@gpj0a{3@;O1!dZoFeIY$gLz-6W}^tN1_8Z2{S_3
zO8;v$I=l9bcou&}_%7u!V{{`lvWNh{BXyi;xi2f4IOYA=-@#`rf-p<k=YMtaMJMnR
z#<+A@irBth)+`5cF5G=-vFe4KPEs1Rt+WnTamITO(|!)&=v-=FDvz9L;WqI#@`&<R
z)Ei6aW#nK9We1n`V~JI(RKZvHEoF>>xU=Bp#!W8tJ@;o1I-mM7@XX`VS$26XOblkR
zlBqh5ov@t>GolBc@s);;L~`7ruUY8p6@@ovc5e1ri<kA<86RgN&vkKM3NTlz3r<dM
zWVR#hJ0L#sf{VM;<1s8AI~q;HPH~i#R7BJWES4xEveRmVPKX1WIptHwB;!cYRk!r%
zWybgYFDKGqG8XHsUu|D;hqedKfNr>rt!!}_@@};Ob=XdY8QLTDRrD&OvXAwhZcMTS
z+33ZpY-jd`lv!H)@010vzEP*vFFcH`F<w@+m-ybje39s2O?&}#HA0`ihSgSl_Sip#
zf`eJ0?i4s%Fi%8lcu34co!F`5J>0p@g>y*I?_jM`q<va7tn$NS1bmfKXwV>~2s%E;
zv~dI1t2B>frWA=(WITh@KVAzXqT1=_VLo%T^NyBxfUo?G>?GOTGJeq<)&J~4Ff;3C
z@-h9aTo$0kVReXn4ZdS#=zaAtE1zDPWv@<U>!XpTqt6^t_TH>0dWFse_!V`&H+}A<
zL96Vk^j>~3txw}jZ4;9w>FL!q4;$BCJd`wyCg<;>rYiYzQzJ%w^1j@*&-2mq{H;T&
zBx&!e*n^2&XTmCR3v6`Dj?nhsL6oS0n7+89ypeY0-*hUQ3FJzhwP`BI=qbx{I3K{P
z*Wh<BT2PHMvh>owX-PSYBV$nBL)3Gv<U14&8AsZYze}~;XP&Gs5t#Q^7YJS6ANM`I
oSJbTSl5JdmIUBOqcfE4yAASua%JKFsJOBUy07*qoM6N<$f<K-<vj6}9

diff --git a/mobile/android/base/resources/drawable/tabs_tray_active_selector.xml b/mobile/android/base/resources/drawable/tabs_tray_active_selector.xml
index aae3f6b8b6e..984a4ba1118 100644
--- a/mobile/android/base/resources/drawable/tabs_tray_active_selector.xml
+++ b/mobile/android/base/resources/drawable/tabs_tray_active_selector.xml
@@ -5,7 +5,7 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:state_pressed="true" android:drawable="@drawable/tabs_tray_pressed_bg_repeat"/>
+    <item android:state_pressed="true" android:drawable="@drawable/highlight"/>
     <item android:drawable="@drawable/tabs_tray_selected_bg_repeat"/>
 
 </selector>
diff --git a/mobile/android/base/resources/drawable/tabs_tray_default_selector.xml b/mobile/android/base/resources/drawable/tabs_tray_default_selector.xml
index 1a749a519a1..cf67f10ef98 100644
--- a/mobile/android/base/resources/drawable/tabs_tray_default_selector.xml
+++ b/mobile/android/base/resources/drawable/tabs_tray_default_selector.xml
@@ -5,7 +5,7 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:state_pressed="true" android:drawable="@drawable/tabs_tray_pressed_bg_repeat"/>
+    <item android:state_pressed="true" android:drawable="@drawable/highlight"/>
     <item android:drawable="@drawable/tabs_tray_bg_repeat"/>
 
 </selector>
diff --git a/mobile/android/base/resources/drawable/tabs_tray_pressed_bg_repeat.xml b/mobile/android/base/resources/drawable/tabs_tray_pressed_bg_repeat.xml
deleted file mode 100644
index c02dda839e7..00000000000
--- a/mobile/android/base/resources/drawable/tabs_tray_pressed_bg_repeat.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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/. -->
-
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@drawable/tabs_tray_pressed_bg"
-        android:tileMode="repeat"/>