Bug 822422: Firefox wordmark should be in white for dark themes. [r=mfinkle] [needs-clobber]
☠☠ backed out by 80bb97dbfbd2 ☠ ☠
authorSriram Ramasubramanian <sriram@mozilla.com>
Tue, 18 Dec 2012 14:57:14 -0800
changeset 116562 51119e80e283943e1f465bf854a1c37045c8944c
parent 116561 1a7f21d5a95aed87cd24852973286cdfd1ba1af6
child 116563 fc3697b75c74bf99a1bf78d44f8114646a686ea2
push id1255
push userpastithas@mozilla.com
push dateFri, 21 Dec 2012 08:30:24 +0000
treeherderfx-team@c965fa0804cf [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmfinkle
bugs822422
milestone20.0a1
Bug 822422: Firefox wordmark should be in white for dark themes. [r=mfinkle] [needs-clobber]
CLOBBER
mobile/android/base/AboutHomeContent.java
mobile/android/base/Makefile.in
mobile/android/base/resources/drawable-hdpi/abouthome_logo.png
mobile/android/base/resources/drawable-hdpi/abouthome_logo_dark.png
mobile/android/base/resources/drawable-hdpi/abouthome_logo_light.png
mobile/android/base/resources/drawable-xhdpi/abouthome_logo.png
mobile/android/base/resources/drawable-xhdpi/abouthome_logo_dark.png
mobile/android/base/resources/drawable-xhdpi/abouthome_logo_light.png
mobile/android/base/resources/drawable/abouthome_logo.png
mobile/android/base/resources/drawable/abouthome_logo.xml.in
mobile/android/base/resources/drawable/abouthome_logo_dark.png
mobile/android/base/resources/drawable/abouthome_logo_light.png
mobile/android/base/resources/layout-xlarge-land-v11/abouthome_content.xml.in
mobile/android/base/resources/layout/abouthome_content.xml.in
--- a/CLOBBER
+++ b/CLOBBER
@@ -10,9 +10,9 @@
 #                  O   <-- Users coming from both parents need to Clobber
 #               /     \
 #          O               O
 #          |               |
 #          O <-- Clobber   O  <-- Clobber
 #
 # Note: The description below will be part of the error message shown to users.
 #
-Bug 816576 - libsoundtouch is now part of libxul and not a separate dynamic library.
+Bug 822422 - Firefox workmark should be white on dark themes.
--- a/mobile/android/base/AboutHomeContent.java
+++ b/mobile/android/base/AboutHomeContent.java
@@ -689,25 +689,27 @@ public class AboutHomeContent extends Sc
 
          drawable.setAlpha(255, 0);
          setBackgroundDrawable(drawable);
 
          boolean isLight = mActivity.getLightweightTheme().isLightTheme();
          mAddons.setTheme(isLight);
          mLastTabs.setTheme(isLight);
          mRemoteTabs.setTheme(isLight);
+         ((GeckoImageView) findViewById(R.id.abouthome_logo)).setTheme(isLight);
          ((GeckoTextView) findViewById(R.id.top_sites_title)).setTheme(isLight);
     }
 
     @Override
     public void onLightweightThemeReset() {
         setBackgroundResource(R.drawable.abouthome_bg_repeat);
         mAddons.resetTheme();
         mLastTabs.resetTheme();
         mRemoteTabs.resetTheme();
+        ((GeckoImageView) findViewById(R.id.abouthome_logo)).resetTheme();
         ((GeckoTextView) findViewById(R.id.top_sites_title)).resetTheme();
     }
 
     @Override
     protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
         super.onLayout(changed, left, top, right, bottom);
         onLightweightThemeChanged();
     }
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -227,16 +227,17 @@ FENNEC_PP_JAVA_FILES = \
   $(NULL)
 
 FENNEC_PP_XML_FILES = \
   res/color/abouthome_section_more_text.xml \
   res/color/abouthome_section_subtitle.xml \
   res/color/abouthome_section_title.xml \
   res/color/awesome_bar_title.xml \
   res/color/awesome_bar_title_hint.xml \
+  res/drawable/abouthome_logo.xml \
   res/drawable/address_bar_bg.xml \
   res/drawable/address_bar_nav_button.xml \
   res/drawable/address_bar_url.xml \
   res/drawable/awesomebar_tabs_bg.xml \
   res/drawable/menu_level.xml \
   res/layout/abouthome_content.xml \
   res/layout/awesomebar_search.xml \
   res/layout/awesomebar_suggestion_row.xml \
@@ -495,17 +496,18 @@ RES_DRAWABLE_NODPI = \
   res/drawable-nodpi/tabs_tray_bg.png \
   res/drawable-nodpi/tabs_tray_selected_bg.png \
   $(NULL)
 
 RES_DRAWABLE_BASE = \
   res/drawable/favicon.png \
   res/drawable/folder.png \
   res/drawable/abouthome_icon.png \
-  res/drawable/abouthome_logo.png \
+  res/drawable/abouthome_logo_dark.png \
+  res/drawable/abouthome_logo_light.png \
   res/drawable/abouthome_promo_box_bg.9.png \
   res/drawable/abouthome_promo_box_pressed_bg.9.png \
   res/drawable/abouthome_promo_logo_apps.png \
   res/drawable/abouthome_promo_logo_sync.png \
   res/drawable/abouthome_thumbnail.png \
   res/drawable/abouthome_thumbnail_bg.png \
   res/drawable/address_bar_bg_shadow.png \
   res/drawable/alert_addon.png \
@@ -584,17 +586,18 @@ RES_DRAWABLE_LDPI = \
   $(NULL)
 
 RES_DRAWABLE_HDPI = \
   res/drawable-hdpi/favicon.png \
   res/drawable-hdpi/folder.png \
   res/drawable-hdpi/home_bg.png \
   res/drawable-hdpi/home_star.png \
   res/drawable-hdpi/abouthome_icon.png \
-  res/drawable-hdpi/abouthome_logo.png \
+  res/drawable-hdpi/abouthome_logo_dark.png \
+  res/drawable-hdpi/abouthome_logo_light.png \
   res/drawable-hdpi/abouthome_promo_box_bg.9.png \
   res/drawable-hdpi/abouthome_promo_box_pressed_bg.9.png \
   res/drawable-hdpi/abouthome_promo_logo_apps.png \
   res/drawable-hdpi/abouthome_promo_logo_sync.png \
   res/drawable-hdpi/abouthome_thumbnail.png \
   res/drawable-hdpi/abouthome_thumbnail_bg.png \
   res/drawable-hdpi/address_bar_bg_shadow.png \
   res/drawable-hdpi/alert_addon.png \
@@ -663,17 +666,18 @@ RES_DRAWABLE_HDPI = \
   res/drawable-hdpi/handle_start.png \
   $(addprefix res/drawable-hdpi/,$(notdir $(SYNC_RES_DRAWABLE_HDPI))) \
   $(NULL)
 
 RES_DRAWABLE_XHDPI = \
   res/drawable-xhdpi/favicon.png \
   res/drawable-xhdpi/folder.png \
   res/drawable-xhdpi/abouthome_icon.png \
-  res/drawable-xhdpi/abouthome_logo.png \
+  res/drawable-xhdpi/abouthome_logo_dark.png \
+  res/drawable-xhdpi/abouthome_logo_light.png \
   res/drawable-xhdpi/abouthome_promo_box_bg.9.png \
   res/drawable-xhdpi/abouthome_promo_box_pressed_bg.9.png \
   res/drawable-xhdpi/abouthome_promo_logo_apps.png \
   res/drawable-xhdpi/abouthome_promo_logo_sync.png \
   res/drawable-xhdpi/abouthome_thumbnail.png \
   res/drawable-xhdpi/abouthome_thumbnail_bg.png \
   res/drawable-xhdpi/address_bar_bg_shadow.png \
   res/drawable-xhdpi/address_bar_texture_port.png \
rename from mobile/android/base/resources/drawable-hdpi/abouthome_logo.png
rename to mobile/android/base/resources/drawable-hdpi/abouthome_logo_dark.png
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..15bdd9280dbe8127875f898e4635cd63a6923265
GIT binary patch
literal 2235
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
rename from mobile/android/base/resources/drawable-xhdpi/abouthome_logo.png
rename to mobile/android/base/resources/drawable-xhdpi/abouthome_logo_dark.png
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..e07197aadbc8af411bc8b6e6241f8f7e03abf324
GIT binary patch
literal 2687
zc$}S9c~nzZ6AvILixo-3CP)Y_5DCdk%*sv{MU4W9f(uJX9wBBW2_*!mfYyoxXecNs
zg0ch`M5Iaq0Tn3<vJ_ENP((QeMbT0%Dz>G;PulN%r>B2>_q_M+ow>i?%-p#%=e&%d
z&FdDM*_%Niki~)PX(9T#O#h-6ndrYc%hfLW$xcZRQ?jHn$^?!ag!uEM(I7lf%;AF}
zAcvP2*8zG#AV#qQc9=4ZxrxG+iaj`U7!Q?L2ALaPzA71qD+HDBXpk?Ecq3k2x{QDe
zc;1LmJQKr|QNdWjdbJ#6sW-E^Y9W`*L-_i@y;Kyv0WqlLz*S<AL_tw`BR<-t=+|><
zGy?t+q7-@~{u5LfGYC$V%0W2Z1Bc>b002%PcmQkh1Ong=$6^318l!&*C}1rGPoQ9l
z@J|Dw_a^7XP(o;oPrme$HzHQ4lu^*=goFf-1e}Ld&PM}eGI`Dh7K_p&P>Mu}lA}UN
z6fW}?XrO{C7s!+XsRTYJbE2j3N^b;W{s>|jllhlniQ-eD^eIEDI5ITgfkBJK=y|k4
z83M-qJ6gd`l!53FP$7+%bM^NT<MLmw{+&7p)JH?vA{Xc{g(IR#x$$C9q70;YBlJ5S
zJOPiwAQ2e=KwOI<Vle~~0FW>w93ucr_9s*6SS${hxABi$43R*m;r(%R5)A<8STYfh
zWl-?}WD=DMkm=ZYZlFY=<Vd*SJXi2Hm;A3>3RMnrlu|icDizIFKv1kyDOJQuWpFBs
z0C#0_xB|(X!foz?KE(>k1z&(XhFmI!f6OpN@DCACvHsWq92KAef1jMjAp0{27!sLG
zpdvnTdH+w=(E4D||5GmWDt!&kE&nQhz3^B2fD(Pr$o0*^6h=isASP!6Y5r{0;EV9A
zxF;0LZIY1GbLk{l5zAn+u`_G|k`!W~OZPJ_FoVNJ*p`>gdQL$uo2i~YoM^8M8_aiy
ziW2#2Iag+8r$g6_PpG_V(Z@&Ft*nm1lD2WDk`3(FJ58R4%+$Gt@=ZqHu_GV{(r>X6
zr+HK4cVji5*-mc$2{yooaLxT5Aio^V9cdX)Eh_39EM3mOU4f1gL9;^hdlv?6LGCEp
zfQ3w<pL8WY&+PnTAbMzP5{8j_<JpNyp~DVCZGY$Lp{d3n>dZT~mEL2el#{h_8>8->
zM8FPrx$K5&W?joy&~v9V+7H;b93Jag`K*`q{^#y8pToQ=dCS3wr23YE#9zX$?K38!
zhWoz9rJbi)lU|+LV5TMWMetf)vgEkWPinW{Qncmt&Y5L=i;OOcrGcipf%uh`0le8u
zaPs`Ag}d*^yy@F+_cTD<o@O$!!q({8xJ&CRpv-t^YlQ4+RK)lfL89^JXOCnXxD#PN
z{>;3zI#t;A<@L$>WAB^Ww_64-`epwE!6u{OX()@|mxu9Lt{z+}+U1jNn%vUob$vV+
z{@Lb(RijYN{U7SV$MAvQ7A8kvcHG);X_%KtuZg@g`*!?fWr0(;Co)4<(p=gz!~X0b
zWwcWP?N%(L4=sHo3|Lt3wWN5eZ}C~!<m<%QT8D&GP0|^`ht%8rpFbGb-K?tRC%HB~
z>Zlmfq%kHn$P=X(#~Q-B6L!g)T^y?HdmSeBqk2<V{lt>-fl?{(GSVJe>DL7vZnt>G
z-(O(5D<o6(i_!X>OSh})m6#Ui(@6ng$M4$1tCwZ3G4!j8FOFD0z3S0O3jKE?=Vb!j
zlWy#QJR-b;>{<bf!*Nbq5+3X`^KjIV4HsFkD^}QrLxK;n#UzW`wUM4CEvK7TUVXMh
zn0mSl_QCVV%W0Hlv5NSV$5CDO>Jd-VCiK2PB8)53k#@ovtHPmPGgI8H0z-Nh(mHR$
z=_NNUw)kg$ju}{rDVAi_joj<V?*6=-pGtBqY!$Ff^UGtT@{>2O2S;^WOwM&O83`<$
zDOl4d%jr3)TQzIu_AYpeN6e=Wxe%VPAEOuxI+SM$zMm{QbF|8c5k8RP-VpB>Q9DzV
zX4hIzhMYvA;-i|ld3&?Vb{=$0>eq}MbG*9D++J0WYul*#W+r2l99m||EOks~4r>Vk
z^l<lEn6&YLn-|}+8)b&yLd&OItk!+VAenD$wN>_B&{iymhltnJyxNe?!uG`;w2F%{
zY}?jVcy()TwbMdti{9U_5#m9+-P)}U!gVp43k`s5zghRIEk`aML#%2uFD<TI1${}e
zbxWYtgdy+(qnjAH<Cq;@_HtA4V*KMHj%RZEqeJr3Xgw*0E?}+p8nb&@>Tuo@6OD8K
z&b=+VF0byK=$T}M`vvX<)5d1ez2J3rD4NKBOcq(wqT7@*{t%WLjFE)RvPR#U^iGt&
z$iW5Dq5bJ*3=QY2MqQIBSCCmK9N2TvUec8DHpye=E?|4=mIq^OyJgec;X%z|lUyIx
z{W?1WPrZazvF|uoKiRPS3Mptv*HiTFMM3ONwE$;rFFhaiW+cwW#k9Js=q%?Lo&@{^
zVNh(T1Kq@uEO!XFvC)AMzQ^I4oV`b0wzPHjI0UQuY4$OPQtZzNovs`RKeWX222Hmv
z=L9{nKyCd@xU#f*uYpGC22GGXNOOkXFH&&*cKA2L{KJ<-E$A!^ALtB)eo-tcHRRHe
z*87o%e9=9{hi}Z}-nocAacpsIFyX|ao?pMUzOH!~ufz7)YD<sW=Vu3gM+ZfDMS;1E
z)5e;O>0)m5*HiqrLFZ8TNCXmtAlW!T(CeKxQb%NWiZ(o|Snyr6XR5aD{1fC;4J4pt
z`yJuw=V%_{;pHhyh1t?e=LY}KT-k+mJFt>mR{S3S`fID{4{E=C>$PNA;vMtLoC))n
z&KHhdXrq~DDWO)Yjh5lKZ-&yoS^;ybbf=iQR>yQ%js^3JBi}t|)@1tYMl%oCG>KeA
zj{~fKjUMQG62Dq|`?}|e?997IUtCIdzIl=Vu-(^J9W!ZickA6)amCr>X1w#gF7wvL
z;3B(<#%UlpUD}FLC_1kW)pN%ao!;l+Z@}^j03y40)vH~RSg-frPao*JTjl8Ns5@kZ
z+S~Z{MU(U~6Y^W(56Lz!UW4l0R&BRyd^@wcw`4o*DWhp*`_|-J@AkTs`|MGP?FBEN
zsp2czQs1SdJ=}M9w%90ib>1eGRn;XH?QX-pCk^Q|h+NX3Ge|o%`{N!%3rJi;=%CT4
RlXC8tFp$2PRvi$P{wEI@T-pEt
new file mode 100644
--- /dev/null
+++ b/mobile/android/base/resources/drawable/abouthome_logo.xml.in
@@ -0,0 +1,19 @@
+#filter substitution
+<?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/@ANDROID_PACKAGE_NAME@">
+
+    <!-- dark theme -->
+    <item gecko:state_dark="true" android:drawable="@drawable/abouthome_logo_light" />
+
+    <!-- light theme -->
+    <item gecko:state_light="true" android:drawable="@drawable/abouthome_logo_dark" />
+
+    <!-- default -->
+    <item android:drawable="@drawable/abouthome_logo_dark" />
+
+</selector>
rename from mobile/android/base/resources/drawable/abouthome_logo.png
rename to mobile/android/base/resources/drawable/abouthome_logo_dark.png
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..6a4bfaad4bde8731ed5d91536fb6e4654198f5d3
GIT binary patch
literal 1774
zc%17D@N?(olHy`uVBq!ia0vp^!9Xm*!3HGTbPuivQj#UE5hcO-X(i=}MX3yqDfvmM
z3ZA)%>8U}fi7AzZCsS=07??9MLn2Bde0{8v^K<nQL2C3Watjzhz{b9!ATc>RwL~E)
zH9a%WR_Xoj{Yna%DYi=CroINg1<t7%nI2U|slio#A<0$Q$(AWf_I3(36;?n4a#KqZ
z6)JLb@`|l0Y?Z*~S^?Q0VSOb9u#%E&TP292B76fBob!uP6-@Pvb(0MY4HeAH^bAc*
z&CCpS6pRcEjr0wG$V}JJ#LCpn%E(*+3Y37h6{VzE1-ZCE?E>;_l`=|73as??%gf94
z%8m8%i_-NCEiElUW*8ai0#)c1SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*@e`BsOG|8(
zlwe-SE%5b)8=O}R4Jcrc=~pBc=o{)8=;!9@!&DcS1f{0oS6v)ZS&*t9lv<o$T9gco
zk2GZ@tMF?DDFnL4%D*TR7%7Q4F8Rr&xv6<2o-VdZKpDN1%oHm(3v)L^Lvs@Yb0Y&Y
z3qwN-0}Ep}CnHNoOJ`RjBV$9D8Cdlin47t}m>L<oTDTY*x*A!Un;N+}n>txqI6E6!
zx*Easdgc|EB<3Zj!t`b$^cv#TYvo*&npl!w6q28x14{t`8Tlpo#Toep3eLf13L3tN
z$(eZ|0ZmW@LEV~Klv$RV;#QQOs{jsRt4u5|a5i!@ax!){bTLHu+{Mk((ap@j!qU>r
zSqZ8)g`7~+2RcR{ExEvifN2oKgeQI=2cCUW^MHA#2$(re<zH_D<~bQp7srr_TW=yS
z7Tz}C39XWIke)L4z$=zz>MN`qUvLWfC!{tl5k4``;T=nm+6L>!yPQw_9t7Eb;5*tV
z@<d~jU6b{kekD%3CI-d}<=0=E?wTlcdgD{$4;Pl`EN?h?@!lsxsm^z6j7r--iZjfP
zHhXcq=z*`qfdd!2pMKT2wWn-x`f0<@w)r|W3fFWczBWYsdmQP0_rF@6DVyztZ`VHY
z-Kk65DRuem?wDEL4AD{7&U{x~;l_UJ&eixuodR3WaET}fu42r-!6(zOA$`tb&Wmq&
zi??57|GMZ5O9kKl8?#J5FfDo|7&L=j<nR8;C-yLCmwyrFdwuA{UWL~=&r(>V^UPn@
zDQ}9my|?7TKD+2R!@q5jryJIExqS|j*y&|-UOdyd<4eqw@M-*wD`KL}Jj&Egn9X^!
z!*$zfAElPoNtri`8Gq+qvotmO6}C*}s#oG>^+c;_WdUj7H!B}($eM6evh#H@Tj2lh
z$0-*$TY}7Fr$kn-(Q$7NHCVoeA>mj;(KToD(uRDgr_(K!tsCtQKkyd(#{4+)PF?W1
z6H7d+Z#vFY-TctvL6ACIgdBtXp`$1JPD&hpP+Z&je3fA3`{j&HcP6n2Rdv3fVQH=Q
zz*9r@t!<=r5>s>&Q;4w6d=IH<lZ&cUd!LE>_x_!>Yj$4RxhLClU!QHw*7f*3J^ju^
z5n0ZzcakX#cNpzji*8G9KJjU;?$l|EpYj$jd3;WG%1-yUq7S-GF5KTDCV%Mca*z5v
z3yG^`D>ifHyg3oWS{rA)y~6KdrTyKOdEbu(sD<A7B`fba<wM@l>j%{g-V3hUoTZiL
z*WC0j@Y`yG0?q!X*#Q!E6<M7-&)+>B@NC|e_sr!Jxgt7U%Csg_vZWTi`^((q=laav
zJMPwR4Rz<*g-7BR)`fFk<ymI7Cv`ze4|AxWpoUt>f-_&k9Go?SD^H!9ynG!nJZBng
z%4QQ^R~K~fzI^3^GWpP%d6y@#cQ!RldvJB$;YX)p-X(CmrQI>hb9={}$yM}5u{ZNr
zZR@8`^Fn0O4{S|VTF#QsTA!Zt;9kg*{C2tR@{*R>{$iWh)>!lg=}G_4KEO~RJb#+8
S^24*B8pzYt&t;ucLK6U*j;Ndf
--- a/mobile/android/base/resources/layout-xlarge-land-v11/abouthome_content.xml.in
+++ b/mobile/android/base/resources/layout-xlarge-land-v11/abouthome_content.xml.in
@@ -13,22 +13,23 @@
 
         <LinearLayout android:orientation="vertical"
                       android:layout_width="0dp"
                       android:layout_height="fill_parent"
                       android:layout_weight="0.6"
                       android:layout_marginLeft="@dimen/abouthome_gutter_large"
                       android:layout_marginRight="@dimen/abouthome_gutter_small">
 
-            <ImageView android:src="@drawable/abouthome_logo"
-                       android:layout_width="wrap_content"
-                       android:layout_height="24dip"
-                       android:layout_marginTop="16dip"
-                       android:layout_marginBottom="10dip"
-                       android:layout_marginLeft="12dip"/>
+            <Gecko.ImageView android:id="@+id/abouthome_logo"
+                             android:src="@drawable/abouthome_logo"
+                             android:layout_width="wrap_content"
+                             android:layout_height="24dip"
+                             android:layout_marginTop="16dip"
+                             android:layout_marginBottom="10dip"
+                             android:layout_marginLeft="12dip"/>
 
             <Gecko.TextView android:id="@+id/top_sites_title"
                             android:text="@string/abouthome_top_sites_title"
                             android:layout_width="fill_parent"
                             android:layout_height="26dip"
                             android:background="#34FFFFFF"
                             android:paddingLeft="12dip"
                             android:textSize="12sp"
--- a/mobile/android/base/resources/layout/abouthome_content.xml.in
+++ b/mobile/android/base/resources/layout/abouthome_content.xml.in
@@ -7,25 +7,25 @@
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
        xmlns:gecko="http://schemas.android.com/apk/res/@ANDROID_PACKAGE_NAME@">
 
     <RelativeLayout android:layout_width="fill_parent"
                     android:layout_height="fill_parent"
                     android:paddingLeft="@dimen/abouthome_gutter_large"
                     android:paddingRight="@dimen/abouthome_gutter_large">
 
-        <ImageView android:id="@+id/abouthome_logo"
-                   android:src="@drawable/abouthome_logo"
-                   android:layout_width="wrap_content"
-                   android:layout_height="24dip"
-                   android:layout_marginTop="16dip"
-                   android:layout_marginBottom="10dip"
-                   android:layout_marginLeft="12dip"
-                   android:layout_alignParentTop="true"
-                   android:layout_alignParentLeft="true"/>
+        <Gecko.ImageView android:id="@+id/abouthome_logo"
+                         android:src="@drawable/abouthome_logo"
+                         android:layout_width="wrap_content"
+                         android:layout_height="24dip"
+                         android:layout_marginTop="16dip"
+                         android:layout_marginBottom="10dip"
+                         android:layout_marginLeft="12dip"
+                         android:layout_alignParentTop="true"
+                         android:layout_alignParentLeft="true"/>
 
         <Gecko.TextView android:id="@+id/top_sites_title"
                         android:text="@string/abouthome_top_sites_title"
                         android:layout_width="fill_parent"
                         android:layout_height="26dip"
                         android:background="#34FFFFFF"
                         android:paddingLeft="12dip"
                         android:textSize="12sp"