From 553b10d067a423efb17338c955e568e2137e4452 Mon Sep 17 00:00:00 2001
From: Brian Nicholson <bnicholson@mozilla.com>
Date: Tue, 4 Mar 2014 12:57:23 -0800
Subject: [PATCH] Bug 962103 - Make progress bar overlap content. r=lucasr

---
 mobile/android/base/GeckoApp.java              |   5 +++++
 .../resources/drawable-hdpi/progress.9.png     | Bin 315 -> 811 bytes
 .../resources/drawable-mdpi/progress.9.png     | Bin 255 -> 524 bytes
 .../resources/drawable-xhdpi/progress.9.png    | Bin 440 -> 1044 bytes
 .../base/resources/layout/browser_toolbar.xml  |   3 ++-
 .../base/resources/layout/gecko_app.xml        |   5 ++++-
 6 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/mobile/android/base/GeckoApp.java b/mobile/android/base/GeckoApp.java
index 51e6d801845..341343fa1b2 100644
--- a/mobile/android/base/GeckoApp.java
+++ b/mobile/android/base/GeckoApp.java
@@ -1305,6 +1305,11 @@ public abstract class GeckoApp
         mGeckoLayout = (RelativeLayout) findViewById(R.id.gecko_layout);
         mMainLayout = (RelativeLayout) findViewById(R.id.main_layout);
 
+        // Removing the view clipping causes layout issues on < 3.0 (bug 978796).
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB) {
+            mMainLayout.setClipChildren(true);
+        }
+
         // Determine whether we should restore tabs.
         mShouldRestore = getSessionRestoreState(savedInstanceState);
         if (mShouldRestore && savedInstanceState != null) {
diff --git a/mobile/android/base/resources/drawable-hdpi/progress.9.png b/mobile/android/base/resources/drawable-hdpi/progress.9.png
index f3fe0bdaf5a83b22709ba611985b47d399c9cdde..ae39f6583c7ebdc21b64b8e07f169e8b7f5f1e58 100644
GIT binary patch
delta 801
zcmV++1K#|*0;>j)7k?lK1^@s6k8e>v00006VoOIv0RI600RN!9r;`8x010qNS#tmY
z3yA;#3yA?Y$;+((000McNliru-U0>}0v{b50l@$O0=P*;K~z}7?Uy@J+&~b9zrRP)
zE^q?w!4aHt1Ls`9nH~BH&bh%xzJtq&V}~|=Kfp_|Xf^F%Mt@=uyZA{N$~#q4J<_~>
z_2cgr?hfEZzf~>cyM4gMIE_2d?gYrY&^G4YfZTxmomTy|lb$@oclM?EETyoWeF1%E
zg)B2&1kilu9PC{=TI((Z7&c@8*IX8|RWw*Ax^O~PL;yEB4|%PCh}2?g5erN$umqy+
zAC+0qFM;&K-GB1ytpL+Mhmq`iHGo;hG>#r{YDAsq8a%%Pkd}xAFbBR6?3kca;7s#b
zS7_A7<_=dbWzdEJb?#M`%_ZqR0cxU8i9P`)I1NsX`&Mx-;4SbC_>6c(&}+~Kp!1#m
zsG_E*0Q@lz0eE#3KteKvL6%a|m=y9j$@E<1wG~dlsef><a9x<%vu34$vP(oF_&H)h
z6<!dwpJLu3Er1s2#)0$bq8@VaYYHQ+cV!$f2NTFI)|ryNrK=kvaAx<|nm(ttkJ&Q%
zv*`9U)t!JKFv}ri*_)L;SE*kv78A&}tAK4_k}>J#c=Ec+R3p+E#-60qQ<48XPp&d+
zX|8@=#eWM2I!_)oFr+8buTw_^ta^#~3Y=wM^eZ6sARl+QTNhDWMtHrVH+g=V#|>Sa
z(8ejtxJC3WoC+}|dNV{ms`K4T#2nKnOm7MH2I&}B^yI!ylU<?mE=QS-sHmhSD*y+i
zhM*c(gOvQM=SimlZ;<+Z9pV(}1o4ib_rM8ozJF4agTdyrm@|uK_V*E~+elLIs$nuZ
z8K#gqI3U#tm<Lb=14zeMWXhQ%PO}!5DYfqXAT3^#pE=kYr%6URIstDZ#F&5w6VY>a
zDxBSjm}0hA1fu4%ILhCy8!cb@8lb=J@`o`L6=j|9Yn-w9$Jtco{|uyWH2J@Pl)Ix;
ffg0RS{&ClL!BY7Cpr8t`00000NkvXXu0mjfFO_jo

delta 301
zcmZ3@wwq~!cs&~jGXn!dri;5ekYY)9^mSxl*x1kgCy^D%XDkkKcVbv~PUa<$6BXbS
z;tHhyPZIe*TjKv@(f@NKL5xNg5Cejyh=N3b3R>9yHvrW#{BLCV-^%#EiRphc)Bi5!
z|D8<#`&s`_VEf;~^uLGYe@8vjzj}uMO+a<btEL8a0Cn({1o;IsL>MHBnEhrIX9?0x
zx-(ZZIu$6B>gnPb!g0O#yeD6S0f$52oaaglwyv%EpB<IkdvU71PQ;%UhK7z0{Z&1U
zw|E41R$A>e^8C!kz<Bk##*><~ua7ddYXieK##}God3WizWXo<<oAQ}zkw+wy_q?xL
i+Rc+IzHYw!Uq*JPM?6*PU1#rtobT!C=d#Wzp$Py226?Rj

diff --git a/mobile/android/base/resources/drawable-mdpi/progress.9.png b/mobile/android/base/resources/drawable-mdpi/progress.9.png
index 34725059357b87a72a188a8eec29e3457a922944..31d7f0bd004d28cd419ecc14458ab327038d4869 100644
GIT binary patch
delta 511
zcmV<b0RaC00gMEY7k?HA1^@s6)0X`500006VoOIv0RI600RN!9r;`8x010qNS#tmY
z3yA;#3yA?Y$;+((000McNliru-U0>}0wzKkiOB!}0hvieK~zY`?UYT96EP5lzvuq%
zjF3QLG545j<Ob}y0!QEq?B@o#25a`fNbDw&m<B27_G1x8aeqgH!X~qbuvBu{vi<74
zsxr0#oa~|_VO<_5#|&KgczK4`4_KZ(@#*tC35#VOq<{htlS5jAhy;y5)Ub-Yznfjy
zKXiYqjJ1-5^k9+sHKt^WCDApg2G`gPrb0xd0kNS7Yl5CMti}ZD@<iSeXwqB*70{-=
z7U+PM=$<L|M1K}Ic9<T!Pv=KqjrdNhFQ5l6mOqvHy#(+_%)^gND9uGX2yyVEk83$;
zaq@p`%SYb6en$~DzyM5t&!Mx+e&#bOw6`D#;piXYj0SdZFs~BpGez?+4DBPU!dW$>
z_;$qxX-E>!0rdg-{<g?+SS4$+95yM39b@d+PB)D426)jD>9Bi51sG{fAHGuR8}J0g
z=NLv{d(b+o%6u+?ilCB06@(h8K`BtF!a(2`VolH^@LR*ma5ry@b3N$AQYWn>cGJFf
zLJ)R93MtfxGy>B}ANv32eGx!kHAC4((u=UPtv}7pkah$B`1k+-002ovPDHLkV1inn
B<r)A0

delta 240
zcmeBS`Oi2(yq=YVnSp^Jk*nq_kYY)9^mSxl*x1kgCy^D%XDkkKcVbv~PUa<$V;|rX
z;tHhyH!}a9A_`*6k^DbZ^#4>b5Ce!BSpGKvWf}iBG5&96`rpRzzk}g_3*-L@Z2$XM
z|93F|?_yajH$54sldB}iFPPzd_<#9KPakHfw~pO`oIqg@PZ!4!j_ajoErl8kc$gg;
z8y#wn@csF}Rzgc-Q!iJq8-w7ntfVx-z_S6{OV(5~Hoj`VRr$5!g_*wp&-kw0Td(EZ
fx|dql_kfLQF7r_)gN*_}GZ{Qx{an^LB{Ts5Kr34~

diff --git a/mobile/android/base/resources/drawable-xhdpi/progress.9.png b/mobile/android/base/resources/drawable-xhdpi/progress.9.png
index a37de873f1d150b2b0dbeeb093eddef527e25399..f9cfb79c91e5faf762e0d0140b39700b01da8502 100644
GIT binary patch
delta 1036
zcmV+n1oQj21C$7m7k?@U1^@s6_)(}m00006VoOIv0RI600RN!9r;`8x010qNS#tmY
z3yA;#3yA?Y$;+((000McNliru-U0>}0v8j<iSqye1EEPoK~!ko?U`MU<TMmU&v)%q
zH8T?LEPx&KHf9~O1=s;wn0I#2+n7BdBm@W~Bx<^*tEv-U9)Iivmpdt@MK@?#i4-|b
zIgXD%`~IYGcK~nB&-y4#pFhYPoAE-A6>L4$J+>~z6>J4t!B(*U?ugIY`@8qqsl0w8
z0PSzQt^+D3Rh{PEY>=+~jq~<;@zr{YfzNu#Jou%7j=xzs^Y6)x<O0>tI!3~jfB{J5
zbnR~vzzm@4(tiw}b$(vAs#G)cbv>3c;4ZwtBo8Dvq*(e02qSriyFhVzt&|W)P!HSz
zCxY%U4ZsOV+TWxG&g0B1w*Z>ilh(|3m{GwBn3dm+<Z%LX4>%nv?VNyn2WTp@G6Qe~
zKLH<r11<;dfqp6NI#bNQ|H>{5Yy=3^y{>9E)*qJcTYnOPlr}h#<lB6oEg}PEm`&B6
z3e*7H0tetX#Ewn)8Pi9kKZ<I{X3u$CfNf{K1s%(-0o;`Owz?m2wzvn9Uu7`1<=q>c
zkU_m8v6&RiLm6;ViD@^O?hzf%4#yE)QT61n-=Ipp2;kq98$bQBpy`5*k>=Z|x$r4x
zFLtfjx_|91ZFjWFbAug-;RnK(-x6(u>9({!6lEV_?)}o&1Fvk5U+zO*bXUHvC&E<0
zX}OQSzoO@Bl7E4-tyazx`!RoTF|T+i7JLG*$`q-XpsIZMb*4;?Af*VrLR^*c$GIi-
z|3x0-@*P#Wq}H+>(DOtd`b0lJ09NlOKL<;dVt-33!-4w&hS(z=vJ03Twm%+h$#~2f
z3@sZE2ZnJ;wSkmZuovKl&=c)PR2+5oV`)(_eUrN^eysLW@e|E_TfZu0Hv2=`GI*d*
zuSg!t<~PI!h$P?OKDr45bu|uR4;%>gJK~mLzhc^zNaQ#N7cU5(st1NjZmXh#vF-(|
zHh*_x-H;MSz%;fSrU?-dQ&%F745l-KFd*#_2c$odb{HQJAB$>3i5nfR7s0$*w=}*%
zm9Ys;DAmS{p;BB(ITn;6B4Ff@Npwh7qK^Px6j!L;l`!r=17e3yfTyBXKNsnrfmLY*
z4OqJ~`UZ3^ru;h;6NZ)chLMOkR)XCOqJJs)9l^%;IpT;k0C$K}amalm!V{$}W6JXO
z8s5FH1L%KpC&qn(AqkTqL@?!aWt^bKGUc?zD`PQQ!nBZ=xt`TmRcX*nlKI#~lSd?*
zFY%9-^-J&ywt}r-{}Rks#a6Ht?D-OOcSq8T+Gp;rzW^gJak-0#X666@002ovP6b4+
GLSTYGHrgrx

literal 440
zcmeAS@N?(olHy`uVBq!ia0vp^W<bor!3-o@U;i-zQY`6?zK#qG8~eHcB(ehejKx9j
zP7LeL$-D$|CIt9|xB}__GsOSTk%W>!1~Qr?0_8TafD}v-{olg=zmerXP`r`(|76ks
zKyi>D8%VYRXc)u)M#lfmO#fRM|93I}Z({sEf$e__)Bi?>|Lu(bo0$LiF#qph`rpFx
zzmw^I1M~l8mjC^%|NB@$=Jc}u?`Cd2I(Z+^6v>hxzhDM$ITsNLRz?<;Bt@a`HvZRs
zNBoZd9dyUO{{?RjP|-q97sn8Z%X2S0=W8+$X?w_JQSdNq*Mcomc)!<|&l58+Jm^w8
z>0iy{%lwKw7v3L=b6TUZ$e}|=+uL>4GL4Q!AqRy^$~nHBE8FVAv47J>xgw`SEnI9%
z&h4DK`SHoS6}4@LGu0+V70=riniFEW{Pj%x_?n4N_hi4WQ2Jey!eZ_fye#ba&99Gs
z-TQriQljAQ&bcmvGnkKUuxEKxv)^`(;o*7*|Dq#m-ifbbI6wj8>FVdQ&MBb@0FX<)
A!T<mO

diff --git a/mobile/android/base/resources/layout/browser_toolbar.xml b/mobile/android/base/resources/layout/browser_toolbar.xml
index 7f567ff80b3..bd6f15349c0 100644
--- a/mobile/android/base/resources/layout/browser_toolbar.xml
+++ b/mobile/android/base/resources/layout/browser_toolbar.xml
@@ -107,7 +107,8 @@
 
     <org.mozilla.gecko.toolbar.ToolbarProgressView android:id="@+id/progress"
                                                    android:layout_width="fill_parent"
-                                                   android:layout_height="2dp"
+                                                   android:layout_height="16dp"
+                                                   android:layout_marginBottom="-8dp"
                                                    android:layout_alignBottom="@id/shadow"
                                                    android:src="@drawable/progress"
                                                    android:background="@null"
diff --git a/mobile/android/base/resources/layout/gecko_app.xml b/mobile/android/base/resources/layout/gecko_app.xml
index d89fab474c0..96c91ede453 100644
--- a/mobile/android/base/resources/layout/gecko_app.xml
+++ b/mobile/android/base/resources/layout/gecko_app.xml
@@ -17,7 +17,8 @@
          android:id="@+id/main_layout"
          android:layout_width="fill_parent"
          android:layout_height="fill_parent"
-         android:background="@android:color/transparent">
+         android:background="@android:color/transparent"
+         android:clipChildren="false">
 
         <RelativeLayout android:id="@+id/gecko_layout"
                         android:layout_width="fill_parent"
@@ -90,6 +91,7 @@
                 android:layout_width="fill_parent"
                 android:layout_height="@dimen/browser_toolbar_height"
                 android:clickable="true"
+                android:clipChildren="false"
                 android:focusable="true">
 
             <org.mozilla.gecko.toolbar.BrowserToolbar
@@ -99,6 +101,7 @@
                 android:layout_height="@dimen/browser_toolbar_height"
                 android:clickable="true"
                 android:focusable="true"
+                android:clipChildren="false"
                 android:background="@drawable/url_bar_bg"/>
 
             <org.mozilla.gecko.ActionModeCompatView android:id="@+id/actionbar"