Bug 863379: Update tab icon. [r=mfinkle]
authorSriram Ramasubramanian <sriram@mozilla.com>
Thu, 18 Apr 2013 15:36:08 -0700
changeset 141033 9df37c60263f3d1f933e60915ec06616ddfc0dd1
parent 141032 f554f49e1ffaf06a7ad4b4aefc2282741796fe7a
child 141034 21cd4d9e679ba4829bde4e3d8191a74ee9dd9dd5
push id2579
push userakeybl@mozilla.com
push dateMon, 24 Jun 2013 18:52:47 +0000
treeherdermozilla-beta@b69b7de8a05a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmfinkle
bugs863379
milestone23.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 863379: Update tab icon. [r=mfinkle]
mobile/android/base/BrowserToolbar.java
mobile/android/base/Makefile.in
mobile/android/base/resources/drawable-hdpi/tabs_carat.png
mobile/android/base/resources/drawable-hdpi/tabs_count.png
mobile/android/base/resources/drawable-large-hdpi-v11/tabs_carat.png
mobile/android/base/resources/drawable-large-hdpi-v11/tabs_carat_contracted.png
mobile/android/base/resources/drawable-large-hdpi-v11/tabs_carat_expanded.png
mobile/android/base/resources/drawable-large-land-v11/tabs_level.xml
mobile/android/base/resources/drawable-large-mdpi-v11/tabs_carat.png
mobile/android/base/resources/drawable-large-mdpi-v11/tabs_carat_contracted.png
mobile/android/base/resources/drawable-large-mdpi-v11/tabs_carat_expanded.png
mobile/android/base/resources/drawable-large-xhdpi-v11/tabs_carat.png
mobile/android/base/resources/drawable-large-xhdpi-v11/tabs_carat_contracted.png
mobile/android/base/resources/drawable-large-xhdpi-v11/tabs_carat_expanded.png
mobile/android/base/resources/drawable-mdpi/tabs_carat.png
mobile/android/base/resources/drawable-mdpi/tabs_count.png
mobile/android/base/resources/drawable-xhdpi/tabs_carat.png
mobile/android/base/resources/drawable-xhdpi/tabs_count.png
mobile/android/base/resources/drawable/tabs_level.xml
mobile/android/base/resources/layout-large-v11/browser_toolbar.xml
mobile/android/base/resources/layout/browser_toolbar.xml
mobile/android/base/resources/layout/tabs_counter.xml
--- a/mobile/android/base/BrowserToolbar.java
+++ b/mobile/android/base/BrowserToolbar.java
@@ -902,17 +902,16 @@ public class BrowserToolbar implements V
 
         // A level change will not trigger onMeasure() for the tabs, where the path is created.
         // Manually requesting a layout to re-calculate the path.
         mTabs.requestLayout();
     }
 
     public void setIsSideBar(boolean isSideBar) {
         Resources resources = mActivity.getResources();
-        mTabs.setImageDrawable(resources.getDrawable(R.drawable.tabs_level));
         mTabs.setBackgroundDrawable(resources.getDrawable(R.drawable.shaped_button));
     }
 
     public void setProgressVisibility(boolean visible) {
         // The "Throbber start" and "Throbber stop" log messages in this method
         // are needed by S1/S2 tests (http://mrcote.info/phonedash/#).
         // See discussion in Bug 804457. Bug 805124 tracks paring these down.
         if (visible) {
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -592,17 +592,17 @@ RES_DRAWABLE_MDPI = \
   res/drawable-mdpi/spinner_default.9.png \
   res/drawable-mdpi/spinner_focused.9.png \
   res/drawable-mdpi/spinner_pressed.9.png \
   res/drawable-mdpi/tab_new.png \
   res/drawable-mdpi/tab_new_pb.png \
   res/drawable-mdpi/tab_close.png \
   res/drawable-mdpi/tab_thumbnail_default.png \
   res/drawable-mdpi/tab_thumbnail_shadow.png \
-  res/drawable-mdpi/tabs_carat.png \
+  res/drawable-mdpi/tabs_count.png \
   res/drawable-mdpi/address_bar_url_default.9.png \
   res/drawable-mdpi/address_bar_url_default_pb.9.png \
   res/drawable-mdpi/address_bar_url_pressed.9.png \
   res/drawable-mdpi/address_bar_url_pressed_pb.9.png \
   res/drawable-mdpi/doorhanger_popup_bg.9.png \
   res/drawable-mdpi/find_close.png \
   res/drawable-mdpi/find_next.png \
   res/drawable-mdpi/find_prev.png \
@@ -690,17 +690,17 @@ RES_DRAWABLE_HDPI = \
   res/drawable-hdpi/spinner_default.9.png \
   res/drawable-hdpi/spinner_focused.9.png \
   res/drawable-hdpi/spinner_pressed.9.png \
   res/drawable-hdpi/tab_new.png \
   res/drawable-hdpi/tab_new_pb.png \
   res/drawable-hdpi/tab_close.png \
   res/drawable-hdpi/tab_thumbnail_default.png \
   res/drawable-hdpi/tab_thumbnail_shadow.png \
-  res/drawable-hdpi/tabs_carat.png \
+  res/drawable-hdpi/tabs_count.png \
   res/drawable-hdpi/address_bar_url_default.9.png \
   res/drawable-hdpi/address_bar_url_default_pb.9.png \
   res/drawable-hdpi/address_bar_url_pressed.9.png \
   res/drawable-hdpi/address_bar_url_pressed_pb.9.png \
   res/drawable-hdpi/doorhanger_popup_bg.9.png \
   res/drawable-hdpi/find_close.png \
   res/drawable-hdpi/find_next.png \
   res/drawable-hdpi/find_prev.png \
@@ -777,17 +777,17 @@ RES_DRAWABLE_XHDPI = \
   res/drawable-xhdpi/spinner_default.9.png \
   res/drawable-xhdpi/spinner_focused.9.png \
   res/drawable-xhdpi/spinner_pressed.9.png \
   res/drawable-xhdpi/tab_new.png \
   res/drawable-xhdpi/tab_new_pb.png \
   res/drawable-xhdpi/tab_close.png \
   res/drawable-xhdpi/tab_thumbnail_default.png \
   res/drawable-xhdpi/tab_thumbnail_shadow.png \
-  res/drawable-xhdpi/tabs_carat.png \
+  res/drawable-xhdpi/tabs_count.png \
   res/drawable-xhdpi/doorhanger_popup_bg.9.png \
   res/drawable-xhdpi/find_close.png \
   res/drawable-xhdpi/find_next.png \
   res/drawable-xhdpi/find_prev.png \
   res/drawable-xhdpi/urlbar_stop.png \
   res/drawable-xhdpi/reader.png \
   res/drawable-xhdpi/reader_active.png \
   res/drawable-xhdpi/reading_list.png \
@@ -888,48 +888,35 @@ RES_DRAWABLE_XHDPI_V11 = \
   res/drawable-xhdpi-v11/ic_menu_save_as_pdf.png \
   res/drawable-xhdpi-v11/ic_menu_settings.png \
   res/drawable-xhdpi-v11/ic_menu_share.png \
   res/drawable-xhdpi-v11/ic_menu_tools.png \
   res/drawable-xhdpi-v11/ic_menu_quit.png \
   res/drawable-xhdpi-v11/ic_status_logo.png \
   $(NULL)
 
-RES_DRAWABLE_LARGE_LAND_V11 = \
-  res/drawable-large-land-v11/tabs_level.xml \
-  $(NULL)
-
 RES_DRAWABLE_LARGE_MDPI_V11 = \
   res/drawable-large-mdpi-v11/doorhanger_popup_bg.9.png \
   res/drawable-large-mdpi-v11/ic_menu_reload.png \
   res/drawable-large-mdpi-v11/ic_menu_forward.png \
   res/drawable-large-mdpi-v11/menu.png \
-  res/drawable-large-mdpi-v11/tabs_carat.png \
-  res/drawable-large-mdpi-v11/tabs_carat_contracted.png \
-  res/drawable-large-mdpi-v11/tabs_carat_expanded.png \
   $(NULL)
 
 RES_DRAWABLE_LARGE_HDPI_V11 = \
   res/drawable-large-hdpi-v11/doorhanger_popup_bg.9.png \
   res/drawable-large-hdpi-v11/ic_menu_reload.png \
   res/drawable-large-hdpi-v11/ic_menu_forward.png \
   res/drawable-large-hdpi-v11/menu.png \
-  res/drawable-large-hdpi-v11/tabs_carat.png \
-  res/drawable-large-hdpi-v11/tabs_carat_contracted.png \
-  res/drawable-large-hdpi-v11/tabs_carat_expanded.png \
   $(NULL)
 
 RES_DRAWABLE_LARGE_XHDPI_V11 = \
   res/drawable-large-xhdpi-v11/doorhanger_popup_bg.9.png \
   res/drawable-large-xhdpi-v11/ic_menu_reload.png \
   res/drawable-large-xhdpi-v11/ic_menu_forward.png \
   res/drawable-large-xhdpi-v11/menu.png \
-  res/drawable-large-xhdpi-v11/tabs_carat.png \
-  res/drawable-large-xhdpi-v11/tabs_carat_contracted.png \
-  res/drawable-large-xhdpi-v11/tabs_carat_expanded.png \
   $(NULL)
 
 RES_DRAWABLE_XLARGE_MDPI_V11 = \
   res/drawable-xlarge-mdpi-v11/awesomebar_tab_center.9.png \
   res/drawable-xlarge-mdpi-v11/awesomebar_tab_left.9.png \
   res/drawable-xlarge-mdpi-v11/awesomebar_tab_right.9.png \
   res/drawable-xlarge-mdpi-v11/awesomebar_sep_left.9.png \
   res/drawable-xlarge-mdpi-v11/awesomebar_sep_right.9.png \
@@ -1020,25 +1007,24 @@ MOZ_ANDROID_DRAWABLES += \
   mobile/android/base/resources/drawable/remote_tabs_child_divider.xml          \
   mobile/android/base/resources/drawable/shaped_button.xml                      \
   mobile/android/base/resources/drawable/site_security_level.xml                \
   mobile/android/base/resources/drawable/spinner.xml                            \
   mobile/android/base/resources/drawable/suggestion_selector.xml                \
   mobile/android/base/resources/drawable/tab_new_level.xml                      \
   mobile/android/base/resources/drawable/tab_row.xml                            \
   mobile/android/base/resources/drawable/tab_thumbnail.xml                      \
-  mobile/android/base/resources/drawable/tabs_level.xml                         \
   mobile/android/base/resources/drawable/tabs_panel_indicator.xml               \
   mobile/android/base/resources/drawable/textbox_bg.xml                         \
   mobile/android/base/resources/drawable/webapp_titlebar_bg.xml                 \
   $(NULL)
 
 MOZ_BRANDING_DRAWABLE_MDPI = $(shell if test -e $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/android-resources.mn; then cat $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/android-resources.mn | tr '\n' ' ';  fi)
 
-RESOURCES=$(RES_LAYOUT) $(RES_LAYOUT_LARGE_LAND_V11) $(RES_LAYOUT_LARGE_V11) $(RES_LAYOUT_XLARGE_V11) $(RES_LAYOUT_XLARGE_LAND_V11) $(RES_VALUES) $(RES_VALUES_LAND) $(RES_VALUES_V11) $(RES_VALUES_LARGE_V11) $(RES_VALUES_LARGE_LAND_V11) $(RES_VALUES_XLARGE_V11) $(RES_VALUES_LAND_V14) $(RES_VALUES_V14) $(RES_XML) $(RES_ANIM) $(RES_DRAWABLE_MDPI) $(RES_DRAWABLE_LDPI) $(RES_DRAWABLE_HDPI) $(RES_DRAWABLE_XHDPI) $(RES_DRAWABLE_MDPI_V11) $(RES_DRAWABLE_HDPI_V11) $(RES_DRAWABLE_XHDPI_V11) $(RES_DRAWABLE_LARGE_LAND_V11) $(RES_DRAWABLE_LARGE_MDPI_V11) $(RES_DRAWABLE_LARGE_HDPI_V11) $(RES_DRAWABLE_LARGE_XHDPI_V11) $(RES_DRAWABLE_XLARGE_MDPI_V11) $(RES_DRAWABLE_XLARGE_HDPI_V11) $(RES_DRAWABLE_XLARGE_XHDPI_V11) $(RES_COLOR) $(RES_MENU)
+RESOURCES=$(RES_LAYOUT) $(RES_LAYOUT_LARGE_LAND_V11) $(RES_LAYOUT_LARGE_V11) $(RES_LAYOUT_XLARGE_V11) $(RES_LAYOUT_XLARGE_LAND_V11) $(RES_VALUES) $(RES_VALUES_LAND) $(RES_VALUES_V11) $(RES_VALUES_LARGE_V11) $(RES_VALUES_LARGE_LAND_V11) $(RES_VALUES_XLARGE_V11) $(RES_VALUES_LAND_V14) $(RES_VALUES_V14) $(RES_XML) $(RES_ANIM) $(RES_DRAWABLE_MDPI) $(RES_DRAWABLE_LDPI) $(RES_DRAWABLE_HDPI) $(RES_DRAWABLE_XHDPI) $(RES_DRAWABLE_MDPI_V11) $(RES_DRAWABLE_HDPI_V11) $(RES_DRAWABLE_XHDPI_V11) $(RES_DRAWABLE_LARGE_MDPI_V11) $(RES_DRAWABLE_LARGE_HDPI_V11) $(RES_DRAWABLE_LARGE_XHDPI_V11) $(RES_DRAWABLE_XLARGE_MDPI_V11) $(RES_DRAWABLE_XLARGE_HDPI_V11) $(RES_DRAWABLE_XLARGE_XHDPI_V11) $(RES_COLOR) $(RES_MENU)
 
 RES_DIRS= \
   res/layout                    \
   res/layout-large-v11          \
   res/layout-large-land-v11     \
   res/layout-xlarge-v11         \
   res/layout-xlarge-land-v11    \
   res/values                    \
deleted file mode 100644
index 157f3f8934b04d4b7adce3a3eb98360730999edd..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..c81712cec96ae28ce1eeea8e240ebf5aa4222e2f
GIT binary patch
literal 1235
zc$}S7U1%It6rOfV6H2p2(W0^9by}^3?9NYiXJ^Jtva>U@&0;rAHw!NK;Lgt6WQJsZ
zGIQf@f)7U8LPSMDp+0B}ZG$f@M1)cVr6e>hh~yzsQHfMa$b--~MJcX#;%<~u^5A98
z+<VTP@0@eb&&-buAM4uJvyUK%uELO7!u#QfI``uD9pda+ygh}q3L5psP+booA)8(e
zf`X%u!xGfZnW<Z_pCDqEU9O-?@wjMsPEwC_k`2cvqSZgx@O5JXB2a_lwkwhMzWka5
zwkeUXq>FUXSD<AN%?5CEcDQWJP8fno4i13+hKLO~5b2=dOuC`ikjO2&B0fiAiUeCK
zXhI_Y393>Y0g4wukWTg`44Pp8$0eCmn&X&Wz|ss$(fHvKOiE01BAWrNMPhG(IVP6W
ze9IT+B+^327b&V<uP5t$NiP_u7(oys8!Vf^8i{bmMS3IQhKJe~R2Uk8?IYWBLB#7d
zZyHG?*}j6~7mM45-LRD?oHDAR`xKL;DaWDO+94{zv7NQU@{A9u5)8fRz`*qwJM<q{
zJ3}Ky9F2G)uyIlJN!2r^9q6KhDv|h0(zH!6&u8)slS$DTmgabd;c31vpJN4CP&Ah9
zW7;+zhRw-oT1gACOlK5^(O6!|<Yg@<YbvkiXf4ym7Tgf&t^wOv`(LcEBUV%bs3R{Z
zd){Qb14b+ld7<U`KpEx0i$&eA-AHgWDo`s{7}&2vGaq;k*vhbIKO_QL;OPf%t}-mo
zXL7tIC^@o)HUCf6C>#v+K)bX>xCf)-cJpIqdwigaXC}bI5np|2KSAu;RZ!(}<A>V)
zW^-_<y8E3AadJuiDf?^Jaz5Kjl$5zY&b`@qw%a>$TLvp1#uoXHr1jYH)%lY*Pu=)^
zVa~{AKd7AUwcbz;|JDx%x|W-pAD>xOhKTuMeWe<9v(2Bgci98vcbAAo=D;KG$FkQp
zW8LRszg*7Vf8w>yJG<9{{jo2ed~{E3+<I^0g%$aD>h0&ItZx^tX%~s5>l<JW(*mY5
zCp+F1tu^^Vyyu(vpThSCk#qi;Q|sAR<I@*!RHs&tfls-|A4?~GyxqJtwc61mZc0L2
zJfU=aa%4q5zkdDY9)9EbwaL%(gP)~4=dM1T5(iRu5ANx%68BCIEbdkQ`YQU(6trRW
IO0N3W-??m;qyPW_
deleted file mode 100644
index 46943e9a1301376e912bd3c42c08ef130bdd1fb7..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 35aa47c9718741dc32de8659e1bc3ff9872ca773..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 11a1616352aa78abc87ab2c3cfc4d6b5b4377e01..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
--- a/mobile/android/base/resources/drawable-large-land-v11/tabs_level.xml
+++ /dev/null
@@ -1,14 +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/. -->
-
-<level-list xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:maxLevel="0" android:drawable="@android:color/transparent"/>
-
-    <item android:maxLevel="1" android:drawable="@drawable/tabs_carat_contracted"/>
-
-    <item android:maxLevel="2" android:drawable="@drawable/tabs_carat_expanded"/>
-
-</level-list>
deleted file mode 100644
index 280446aa2b5dbde1a5f0825b72e6dc3bc96b5f10..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index db1170cbb61e665d0752241ecb0319770de8db6e..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 188244904ade3dd4213cbde68c85a24846e561d6..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index a1aba5cff7d3239d256e1cae4a02912684609bc8..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 07d358b10e6a537b3632de026e851336d712a5b6..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 6d3f4d185e9056ec4db4d83b5d5a75cea2745305..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 459160f9d2937a0e911b9cf87f5f29a99429258e..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..ff03864c1774a471e9f024f7bec78fa4019ba8d4
GIT binary patch
literal 1152
zc$}S7O=#3W6i!|1zf#bHdXO<a_=B5d(rz}1jdeHKZ5Q2IwyUleZ8n*9Lz_%YrtY=}
z!HS}I@gj(b_9BXhq99%rR0Ki1c<>;CKkPyDAfh1jAl6CUts>HcLz0>I=KJ1z^X9#r
z?eFVZy<+1EhGACcdW`~|*GKQNCG`8Qs?E@81Id)g03IS$GeAtr#$^O@t~rbf$h60g
zK1E#&6RSAI5-H{Psup%RGs18+*Jq;9)m`&VYXlKcM#GM$v7hffV1Z+6?7>7{$oo2~
zIK2}A8kp!SS`#CdVzb@5Kvzwr23$l;P;*DUP_1d~oL!Z!BQ?*0IS3ii*k3`F^8G-^
z0RjoGBW?*00!iXvXF`(T4j>9p<OTXjaoDLQBvnj;#$c(pz#dWyMz-OLN*Y@s#8-K~
zTCH-`4h{#yJX91VvLT9biin5f9x-ciFKlmGFi>a(j!zuyfk-yXc#LQ)+dP8n=kxQ1
zy|9renlip-`aI+W-gWsVIwS=&v@kj>j{Ar&pb(D*7QK(5_CH)LOpSmv8g*ab&`U8#
z4Q!3M$RjyJW9bfOJGPpYlUWFpokCI+BpE_kkUO$zQAsI!Mie_>)5gEJ=~P0{6N;1)
zk~)MLQPz{$R3@Fu7_yNTGRY=4=Y_=dEY##WzqyG8xvCx@li;9;@o2LG`YV{=u!4P{
z4@h8Z-n1MqQf!MZs1Yj)oMXt&2G|928CIQtL?9@#@b}3LD9Um&EoT%x%{I99|74A)
z!SH{TOH)N_Fj~$RKNaTN2YIw-0@@tb$7ecitm&MQD%M_=zt7Hg$KoyRT6}P6-3QX5
zav%F`mZ^W*egEY8mE{vJPp|6vvAEt<-f@u`8;`YhUq8?WH{UiNeZ73?=)=jL=}l*@
z^>%*V*>*KnzwmrY|I(tKXCFVB>c6$5E{vv({8Z1#%9)DW^7uw;`-@3@=k8$a&djy#
zySZ~~((rZt-P+do$G1G0+_SFaU%9AmIB;rX3@%;1|HC10xb@t=C!62iWR?j``I&I_
T&6hPtqJKgz(`QVl2Pc05Z31%C
deleted file mode 100644
index 78e65eee3b9fdbf25756675dc5a9f8e0320b586a..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..763d0eec4dd4011a05c0a7337d3f491738263c77
GIT binary patch
literal 1319
zc%17D@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%o&*>5hW46K32*3xq68pHF_1f1q>iyV_#8_n4FzjqL7rD
zo|$K>^nUk#C56lsTcvPQUjyF)=hTc$kE){7;3~h6<f`ms%M>MhI|Z8xE1&_nsU?XD
z6}dTi#a0!zN?>!XfNYSkzLEl1NlCV?62wsvz5xo(`9-M;rh3M@$p(go3T9?{h9;(F
zW`;TnMh1pP`UXH`rfX<oWol++WUc@ON<iC+Qqrt~T-=~`0eQAc86_nJR{Hwo<>h+i
z#(Mch>H3D2mX;thjEr=FDs+o0^GXscbn}XpVJ5hw7AF^F7L;V>=P7{riAnjTCALaR
zFfZg5`1-;P&MSrn6fns2D-sLz4fPE4b941!s*6j4Qq%COE)J<INYxKYEzU13N(RP9
znlh4A__cx*0$pR}Uz7=ql*AmD{N&Qy)VvZ;7h5Huj9yA+ij|v%xtpP(xru?fk%5_o
zp`nF=g|VBHk)@-hv#XJju_4S1Y<gYY94#G<jh!3~%$*GlU5zZ9&D|Vbog7_VEL@xn
zT+Ly6J@bl767!N%VR|zWdL8lVwQ?>>O)SYT3dzsUfu(?ejQo=P;*9(P1?ONh1r6WC
z<jg#ffF>w{pl(eq$}CGwaVyHtRRD*uRVEe}7+6{up!?j#(8$8V+{wb#(%DG~syBt4
zP}2uGMjtJ?z=VKl5X6Khejo>)eNyv)d8P=MIbvfOe=smGhI+a<hE&{oGwWd1AqRmr
zb61ffqXqM7IDRt(dGP--*ysD=p!o+zmkj}|@(X@(IoYmYKiV9``gs42IH$|bGUdib
z%=Z&NZuoq3X6&37M+?_j9Pdt&d&A20zvfx9z@8>84Z-)dY}y8l$`e*j+dD;WMKd3V
zj_nCKiQuUd@+~W6^QYJfMES+Jw{BvW>inuM(ZD=iZJp}1+7G8+O8Cw*+v)r7<@?4h
z8I9X4*UCx$njPP~a;N&Y5GJ!p`==J&y}%;)W1)uPeaEF!&fa}e{I2o9oxnA-cN~me
za4dF#ihYKQ0}C9@i+OM)HsN4w!U`k5uFpyzcy}e7TR7*^F|FX{IZl-#7FK7zdnj%w
z(b%v=V1}j0j6jYTj<1h7ezM;D{Vr3L*B{1hVw0~|yT0n@+**Eoc9m^LZTR)V`SWIo
v%3s)^9c&h_mAdEM$#`C%MHR<g8yFe5kJ@(bjEve1D!M#f{an^LB{Ts5XC1|T
deleted file mode 100644
--- a/mobile/android/base/resources/drawable/tabs_level.xml
+++ /dev/null
@@ -1,12 +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/. -->
-
-<level-list xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:maxLevel="0" android:drawable="@android:color/transparent"/>
-
-    <item android:maxLevel="2" android:drawable="@drawable/tabs_carat"/>
-
-</level-list>
--- a/mobile/android/base/resources/layout-large-v11/browser_toolbar.xml
+++ b/mobile/android/base/resources/layout-large-v11/browser_toolbar.xml
@@ -17,25 +17,32 @@
 
     <Gecko.ShapedButton android:id="@+id/tabs"
                         style="@style/AddressBar.ImageButton"
                         android:layout_width="84dip"
                         android:layout_alignParentLeft="true"
                         gecko:curveTowards="left"
                         android:background="@drawable/shaped_button"
                         android:gravity="center_vertical"
-                        android:src="@drawable/tabs_level"
                         android:paddingLeft="6dip"
                         android:paddingRight="38dip"/>
 
+    <!-- The TextSwitcher should be shifted 28dp on the right, to avoid
+         the curve. On a 56dp space, centering 24dp image will leave
+         16dp on all sides. However this image has a perception of
+         2 layers. Hence to center this, an additional 4dp is added to the right.
+         The margins will be 12dp on left, 48dp on right, instead of ideal 16dp
+         and 44dp. -->
     <Gecko.TextSwitcher android:id="@+id/tabs_count"
                         style="@style/AddressBar.ImageButton"
-                        android:layout_width="52dip"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="8dp"
+                        android:layout_width="24dip"
+                        android:layout_height="24dip"
+                        android:layout_marginLeft="12dip"
+                        android:layout_marginRight="48dip"
+                        android:layout_marginTop="16dp"
                         android:layout_alignLeft="@id/tabs"
                         android:gravity="center_horizontal"/>
 
     <FrameLayout android:layout_width="fill_parent"
                  android:layout_height="fill_parent"
                  android:layout_toRightOf="@id/tabs"
                  android:layout_toLeftOf="@id/menu_items"
                  android:layout_marginLeft="-18dp"
--- a/mobile/android/base/resources/layout/browser_toolbar.xml
+++ b/mobile/android/base/resources/layout/browser_toolbar.xml
@@ -66,25 +66,32 @@
     <Gecko.ShapedButton android:id="@+id/tabs"
                         style="@style/AddressBar.ImageButton"
                         android:layout_width="72dip"
                         android:layout_toLeftOf="@id/menu"
                         android:layout_alignWithParentIfMissing="true"
                         gecko:curveTowards="right"
                         android:background="@drawable/shaped_button"
                         android:gravity="center_vertical"
-                        android:src="@drawable/tabs_level"
                         android:paddingLeft="37dip"
                         android:paddingRight="11dip"/>
 
+    <!-- The TextSwitcher should be shifted 24dp on the left, to avoid
+         the curve. On a 48dp space, centering 24dp image will leave
+         12dp on all sides. However this image has a perception of
+         2 layers. Hence to center this, an additional 4dp is added to the left.
+         The margins will be 40dp on left, 8dp on right, instead of ideal 30dp
+         and 12dp. -->
     <Gecko.TextSwitcher android:id="@+id/tabs_count"
                         style="@style/AddressBar.ImageButton"
-                        android:layout_width="44.5dip"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="5dp"
+                        android:layout_width="24dip"
+                        android:layout_height="24dip"
+                        android:layout_marginLeft="40dip"
+                        android:layout_marginRight="8dip"
+                        android:layout_marginTop="12dip"
                         android:layout_alignRight="@id/tabs"
                         android:gravity="center_horizontal"/>
 
     <LinearLayout android:id="@+id/awesome_bar_content"
                   style="@style/AddressBar.Button"
                   android:layout_toLeftOf="@id/tabs"
                   android:layout_marginRight="-24dp"
                   android:orientation="horizontal">
--- a/mobile/android/base/resources/layout/tabs_counter.xml
+++ b/mobile/android/base/resources/layout/tabs_counter.xml
@@ -1,12 +1,17 @@
 <?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/. -->
 
 <Gecko.TextView xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textSize="@dimen/tabs_counter_size"
-                android:textColor="#FFB5B7B9"
+                android:layout_width="24dip"
+                android:layout_height="24dip"
+                android:layout_margin="12dip"
+                android:paddingTop="2dip"
+                android:paddingLeft="4dip"
+                android:background="@drawable/tabs_count"
+                android:textAppearance="@style/TextAppearance.Micro"
+                android:textColor="#FF43484E"
+                android:textStyle="bold"
                 android:duplicateParentState="true"
                 android:gravity="center"/>