From 00c79e6b37a55715366b7a323453c6a63bd9d7d4 Mon Sep 17 00:00:00 2001
From: Brian Nicholson <bnicholson@mozilla.com>
Date: Thu, 27 Feb 2014 14:12:11 -0800
Subject: [PATCH] Bug 962103 - Make progress bar overlap content. r=lucasr

---
 .../base/resources/drawable-hdpi/progress.9.png | Bin 315 -> 451 bytes
 .../base/resources/drawable-mdpi/progress.9.png | Bin 255 -> 426 bytes
 .../resources/drawable-xhdpi/progress.9.png     | Bin 440 -> 572 bytes
 .../layout-large-v11/browser_toolbar.xml        |   3 ++-
 .../base/resources/layout/browser_toolbar.xml   |   3 ++-
 .../android/base/resources/layout/gecko_app.xml |   9 ++++++++-
 6 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/mobile/android/base/resources/drawable-hdpi/progress.9.png b/mobile/android/base/resources/drawable-hdpi/progress.9.png
index f3fe0bdaf5a83b22709ba611985b47d399c9cdde..42566ff2e3322f62ecb36bb3b6b8a4f094abc11e 100644
GIT binary patch
delta 438
zcmV;n0ZIP50>cB47k?lK1^@s6k8e>v0000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+
zQe|Oed2z{QJOBUzWl2OqR9M69n9EATKoo|*X?n4^bLV^XA>8;9g7k&lWbd1}Ev^Mo
z#7#voUO>f5=6BJPc1TlgW3?&GfuEC^keqK0XU@PlNjT@k#D5$WGD$c<RRha&){x7D
zth&{ZHDnF>r;tg1HH16yEXa5;^8Ma;oSgQ`#&LlffwI`%l$zJKkUHL-8R`CHxF|>z
z_)IOJX=)hI2k>fo13p90GLS_ep)!D0;4`&N9rKZ8?-@vdJK)h^(<w+DO_!=PVv;7~
zr?b=rK<$FyTYsjmDSYnc=9`we1h@t+fg$h!yca=g9!PvJ_8_Yuc?TXOo3nTF8vD_=
zf>iboo0pL13hBT=Z!MdZg9K?0I0tTkmnuSDARYdc$=}vwC#cDyS}dy5XrY>1((cah
z>{+`zTU2E2X1?9M#6H=`DeINZ+(OFtN#X(8-Y*0Be=jG_dY#?t3b{h7AvX`QzQNcW
g$bzfCY7t8A3*22<3^#-}+5i9m07*qoM6N<$g0Ozhi~s-t

delta 301
zcmX@iyqjr)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$PyQx_QC?

diff --git a/mobile/android/base/resources/drawable-mdpi/progress.9.png b/mobile/android/base/resources/drawable-mdpi/progress.9.png
index 34725059357b87a72a188a8eec29e3457a922944..370898c4a4b6460acca43de7c87a5b11bf83d18c 100644
GIT binary patch
delta 413
zcmV;O0b>6D0jdL#7k?HA1^@s6)0X`50000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+
zQe|Oed2z{QJOBUzOi4sRR7l6&mO)O#Fc3xG#3`lQT#`F*1}=~l7vT&n*dnoDQ-nkX
zi&9l>=CkOyvZ6o>sIAnIzJBB=|9d=RJ0=M;6Pqv&7?LnRhkrIIJx^kI%s7$Z?CLmf
zP5VDXD^L~4tLA|&So;_biKc=xMnD~?q7hfXBCrJ3O^av4A<+_9Y*cW@MPMA9BC9zt
z1KxlSV9~U!OT#RFF(7mqm;}n_NpHN4jAp<y@B~bO_oiiO0IQq&4w<RL<Wz{t-4Y#@
zM3O7vBssNQTYttaNlJ9utcs}Q7*Z!OMY;tZ!t}Li`OJnwh8*OZ3dju{q!^2La%~wm
zBta*n{GC7w9bE(Wz$5U|w9J2#VJ#=gmHF=({!qhlQNy9y4b?U6tl^F>?RV&RU79DD
zfc35}-L(&^9`atSdz0FGA0GFlIs4n<%y0bOPt;-EBo_MuM)&poTSYvV00000NkvXX
Hu0mjfg{`=9

delta 240
zcmZ3*{GV}xcs(lzGXn!dB3I2<AjOjI=<CS9u(6-}Pa-Rj&sZGf?!>U}oXkrg$3DO(
z#1%;YZ)E;IMHIxCBl&--=>Mr=AO;XMu>5ZT$};|MV*KCC^uLYae+R?=7RLV**#7si
z{_kM^-^H?6ZhA6MCs#?3UogY_@c;6eo<7V{Zymb>If23+o-U3d9M?<FS_(B7@Gv_x
zHagTC;rsJ{t%R1wre3aIHwM9DSxISvfoB7@m#nE~Y<$&ztMY5d3p0KHpYdJ0w_eM+
fbuYE9?*SXrT;`)p1{(!{W-@rX`njxgN@xNATU=XJ

diff --git a/mobile/android/base/resources/drawable-xhdpi/progress.9.png b/mobile/android/base/resources/drawable-xhdpi/progress.9.png
index a37de873f1d150b2b0dbeeb093eddef527e25399..93546b15fb9bc0cd40c8ccd80ddf1270f24ca226 100644
GIT binary patch
delta 560
zcmV-00?+-p1H1%~7k?@U1^@s6_)(}m0000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+
zQe|Oed2z{QJOBUz-bqA3RA}Dqn!Qp2F%ZYI$DI~d+VLK?K7fVK!4p{e7B=+0fiK{U
zjfJI^mD;G|2!0_tj9E8#8_31naexSiyEA__At9GvlG!W+fPaVz08r%(RE;fVGQRF0
zAvOUMuq6UpMH4Uq6EFc2Faew0+UMC*Huh2vz2jVc7E8x!ZO;jeCmtMmn#pU-<R?Or
z5rpB4{RH&DycO=A-q!96ZnXnoc+|{w`a>{q6tTeZHmB93FUR8|z`*fQiMMK$C}Nla
z>4Vf~Kj8N<2!Do$<?+RQ>gfU@u!?HT<QsuW#|8C-%dWR&3ub_xNsngTNpGZ2)3&+O
z1lkCk2&|hyMf{N1d6=s>FgbsMp|aJQqjj&|;G_3KGRNqKbVYg~y_%gX0>g1TmUcyz
zFAqKULp7>vr%kI-oAx|4pmzHqA1?I9!(o5&XH?i{IDfNy{Z#=og<X2RB;AvG0=DE}
zCsa77aulZx9&Xf&3!+*wCgRz^krV`v#0efIBHod%D+P~=_gE<0hZIe4KgA`B5(mQl
zJHvHY<>7vg7c~6R1#L5r0pDfSF6afPRAsvkUP^_0ByC!yE2UH`n*{sTY1NMFpM%xd
y1WdpLOew&o2a{hk1x&!^2v+b1mU>gsSNm`1d+`kRa$@2D0000<MNUMnLSTXny8tWz

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-large-v11/browser_toolbar.xml b/mobile/android/base/resources/layout-large-v11/browser_toolbar.xml
index 27292bd01fe..0f4400e69d5 100644
--- a/mobile/android/base/resources/layout-large-v11/browser_toolbar.xml
+++ b/mobile/android/base/resources/layout-large-v11/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="14dp"
+                                                   android:layout_marginBottom="-7dp"
                                                    android:layout_alignBottom="@id/shadow"
                                                    android:src="@drawable/progress"
                                                    android:background="@null"
diff --git a/mobile/android/base/resources/layout/browser_toolbar.xml b/mobile/android/base/resources/layout/browser_toolbar.xml
index 7f567ff80b3..bd481c9a171 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="14dp"
+                                                   android:layout_marginBottom="-7dp"
                                                    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..4f136f0933f 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,8 +91,13 @@
                 android:layout_width="fill_parent"
                 android:layout_height="@dimen/browser_toolbar_height"
                 android:clickable="true"
+                android:clipChildren="false"
                 android:focusable="true">
 
+            <!-- clipChildren="false" allows the child ToolbarProgressView to be drawn
+                 outside of BrowserToolbar's boundaries. Likewise, we need this property
+                 on BrowserToolbar's parent ViewFlipper, then on its parent MainLayout
+                 to allow the progress to overlap the content LayerView. -->
             <org.mozilla.gecko.toolbar.BrowserToolbar
                 android:id="@+id/browser_toolbar"
                 style="@style/BrowserToolbar"
@@ -99,6 +105,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"