From d10a576791675628a014c0488c3d054371d4d63a Mon Sep 17 00:00:00 2001
From: Romain Guy <romainguy@android.com>
Date: Tue, 28 Jul 2009 11:18:14 -0700
Subject: [PATCH] Fixes 2017393. Correctly apply gravity in RelativeLayout.

RL was applying a horizontal offset to its children even when the gravity was only
specified for the vertical axis (and vice-versa.)

Also fix the ExpandableListView icons.
---
 core/java/android/widget/RelativeLayout.java  |  14 +++++++++-----
 .../res/drawable/expander_ic_maximized.9.png  | Bin 1149 -> 1150 bytes
 .../res/drawable/expander_ic_minimized.9.png  | Bin 1172 -> 1167 bytes
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/core/java/android/widget/RelativeLayout.java b/core/java/android/widget/RelativeLayout.java
index 24c0e2a4a2d9b..e19a93dc64ea5 100644
--- a/core/java/android/widget/RelativeLayout.java
+++ b/core/java/android/widget/RelativeLayout.java
@@ -432,7 +432,7 @@ public class RelativeLayout extends ViewGroup {
             width = resolveSize(width, widthMeasureSpec);
 
             if (offsetHorizontalAxis) {
-                    for (int i = 0; i < count; i++) {
+                for (int i = 0; i < count; i++) {
                     View child = getChildAt(i);
                     if (child.getVisibility() != GONE) {
                         LayoutParams params = (LayoutParams) child.getLayoutParams();
@@ -486,10 +486,14 @@ public class RelativeLayout extends ViewGroup {
                     View child = getChildAt(i);
                     if (child.getVisibility() != GONE && child != ignore) {
                         LayoutParams params = (LayoutParams) child.getLayoutParams();
-                        params.mLeft += horizontalOffset;
-                        params.mRight += horizontalOffset;
-                        params.mTop += verticalOffset;
-                        params.mBottom += verticalOffset;
+                        if (horizontalGravity) {
+                            params.mLeft += horizontalOffset;
+                            params.mRight += horizontalOffset;
+                        }
+                        if (verticalGravity) {
+                            params.mTop += verticalOffset;
+                            params.mBottom += verticalOffset;
+                        }
                     }
                 }
             }
diff --git a/core/res/res/drawable/expander_ic_maximized.9.png b/core/res/res/drawable/expander_ic_maximized.9.png
index 778255ae27c83ae6f2a94b9c4616c2bbc1db8f26..465cabd7e929b61c4f0d7c8bd34e026b1449e33e 100644
GIT binary patch
delta 1092
zcmV-K1iSnF2>u9=Nq-<oL_t(|+U!_cNK{)G{zpfvQB(7RPL^rNq#lR}0#BeXNr6wA
zFX6+Xhu%WGAb8|(kO+DbQG1V`f*=ihI0ZeVSV0m)P+pKkk7m)>jB_zB<K=wcZZF$s
z=ja~KiRqyQAOD)Q{{P$GT6?X3tvw=N%BIAoY@&!wuh?QFLVs*Fo5aydj7yyS0OhBM
zA4-IM53BhQOcp?!0yy-p&p;6H0v_x*@Bc0W56^}<M)dXd)f`93$jCUHoSdA&{!l3N
z3FX~el<Mm0UieR;c?x1a?#iuajNJsBfGHgu9K2dmQgS9SG0|bjHe35$mDSbN&m$uv
zFUrfyZ{p`0_<xM;lqYr-0jHBNrza;TucfD_AGRo3vp%2iU14G2pQye>%&R?#fWt2^
zXQ!v9ZzLrprCSkT7P7dw=*!Q~{~gt*h<zQE2y{AOE{u+jUdOx7rH@qs|9Sv`wer5W
zxcCn=Jp{+xc4<3OIo03ae<dv~Eq85gO^EgN^{AlY$bUgDa$4RU`YgCgOG{6ZWG}N|
zo(*!56Lq(FHX_Z0tEZ>ue0+TT0X3TK5NYJwfn4Myx7Cb!w4k8i2!q4num(le-rg>C
zb#>zR`?vZO*v3BkD1T!-ImvBRL^c*<wpl<^Q<J#eZV3be($dl*3kwTdeXO&Mee|KP
zSqM4FZGTlns>9(pXeLQXNs+9qEO9!WGCw~rt*x!h1sYgq8~f-(U-KZyNp7oY+s=2q
zv9X~+Ey}L0E~&4tm$|t)LE;jR$0KcRZCan#>y^yROj%i3(S*=<W@hH=HjIl?Ja(%y
z5yt33N`%7f?5swflanLM%gfw)nl;whM<4o{<A2FXZmS}K7_CojO+~_~B{^2PxLht-
zT3X_&*T6d4*he4w8fTIqr+(5}67gYdY;4{<5(0;lAdO3RcehklR%#C?SZ5pi=(Alc
zImvD56vaC%gZXV>VBm5>LPDZ(G{$qGsHjLfJ3F;{V`HOCOiX-pva0ofnOUu<sJMmZ
z+kfbPZcJv87A6mxso~+_>9Vr2BC`lpFfwUqXxOSp%9aGV$f<K%yH6nS9L&Yu-rh@C
z^{HkdJDj}V%mTKqzow?<4w~;F?r}5+*f8Km@S|WbxMaMv7=;*N7RMOIl7n12r}c|2
z$ow!5fEQI&RevET1nhRZwi7tIoj@P@GJl4#<RF*M8QpCgLGNMi0#9mdYwr&Y4gHM;
z7FJ@EHP&hALtn-)mK-|Qf4XDl!u-l>9#Gue++2d3keZj5myFE0U%$#NBR_=3$H)C0
z9UUWR8s)VPc($VeD|bwTbE<yT=f&hW;M9K~)LjC+>I1whyw%r$C(<j}lL$i)zdbe5
z4Bs64^sW`dx5olFgO)En(Tez9e+~Tn7F8lPW3D2W>p_)&1Q-BS$T{_nUqxd80000<
KMNUMnLSTXb9~$8R

delta 1091
zcmV-J1ibtH2>l3<Nq-+nL_t(|+U!?LNL*JK{vAhCM~zN>U?#R!MW)q)gh0R+bW`cV
zmDWvgQL@Ochz|tgqLpsC5>dMkSp@>oU=|_JMHQ1mqzr+?Q6!?#n51K8oQKcx(eJyt
zcY3**8IOr!T;#y#e>~^^zxmGVKj+%yO*xd*l|wuKproZrL4O*GjaE`zY;p?9M-it=
zg#8_M^QSOH0BtVd(7QH)FyIG#IC1_H7l9uyhWUaR8yjn>L@6jJIG>Y~Q^5X6B=RrH
zi)Sd!&CR3mUqtgF#Qbw4x4cOdM+x{6re<<-@~7(R>PwlKnT}Yd(PQBg^WWXw-JF@3
zc~oCt|2zJD3V)y3B-}@ffKx5Z#f621U!6|pc}3Bh4Fm!&Dk>^|M)hyRJbot;aQGVL
z+oh$Y-?Fo_ohkyXLN+!w0%c`o*HC?c*eCJ)Y)MF5Fqgbu?=M+dS<e0aec9XF6IvA*
zzKkUYxpdBB9nlNp<KtKJ^YhP<@Hhg@LI`q@i=4`*Lw{H7uBoZ1B?*^6bs6HWIY2IQ
zqV56Ls>)2bM@B}zPft(JGDZ^*iAEj|<RT}zRhQ%Q^78V}7#xj8H5g?5{r%F`)+WJV
zFxF>)ZS13u;ct#7C%IKc6eAH8TLpA=b&1F0kx(ckJv}|LzP=voW1Vg6qYr(pLdZ#O
zRS|g(hkxU&l_WPeSBi>?#N~3y+S;1*_VzLtXkeXf?4u8Tt%D#ZxmDA)oojq>aG=51
zltV*9(%#-KtE;Pm#3eqTPx|`$v_8MzFNKALva_?J38C-u^78+=z-BXe?5Z;n#poi2
z2m>oCD;jx8Nr`N4Z}aGB)?8;FedueACnvd8MSp}b+JJF14H8Z*$+64D?RLx7))sfY
z2G-feKKjttJd*@D^_x~n#H-oa*){7(2wYBrG%mx#!_wH;sQoy>I@{PspLnt4B)8Hn
ziZ!f*`Eg=m;z~wFMy7c*=6j*4s!9e22eo=<XQ#~1&%brE8v6k=v)j<na2?Gz(Epb?
znSUkPn7n8fr>Ccv>gwvMtRjqpkx55KN35PGTN30Vr_QbRo<QJtFh7irj$X#D&$9|i
za`V153pl#LmX?;AXugfOKa_7#lxe_&;QQflc+31~F$*!nDvmLXB?q~5PW4+9WI>p_
zz@w(7rhCW<A-mnKodk|98R$b_#xRx~<bTpRkN4U}&`X$Gz@M$Ht#_uTrk-PiMGY~A
zHP>nBLtn-)mK-|Qd%ZEw!F<DK9`IFncXu^%LSAWUX$~^yC;C%v8~GtJH#Zj?7#NsA
zlb6pr;9*h$DsN1abDsXx=fk8DaOwY_)m=h->H~Z$Jk$4pFVPaH9MMF3B#5Bbusr#u
zZ;ms%%Z};WV;%nC5BBk+lZWL5%g1lgQ};o9m}X9gDJcI5FaUsAQ!pK>?6?2`002ov
JPDHLkV1iZPBlZ9Q

diff --git a/core/res/res/drawable/expander_ic_minimized.9.png b/core/res/res/drawable/expander_ic_minimized.9.png
index 5235c18f31af5b0f54acde3d52524b4eb2dc8ee9..9967ecbd6c1e32cc74d7289e7ae6d028f9b2c7da 100644
GIT binary patch
delta 1109
zcmV-b1giU#36BYoNq;d(L_t(|+U!?bOJi3QUeTa4(I(y!$c)zNJfv!2kb(~__)?(-
z>4O(6{Q-R|iYQ7!iWH>}qIfC#6G{u!Vv+Wtg(9}#$RLH*`-qC;h}vi-aU6}8e&6mn
z<s>G$W2dAKv*BZ%oU_(<zO23X+Utn?JuW0U;{ro$#)VCiIDb-rqzbUvY)VAZ$4e3a
zD-re^ETkM5H$eLe;4mIN1A>4b*u{?Xzi<(Fxd-MoVr*=z_8vxVZtmU8%*<Rq4~0U1
zVmy9?QBzYh3ja0SUW1sOYq^bzah-tIVag^aCqFJNEv-mPOLJJN%|Bbs9499y&*tXl
z9#mFVeu1BVz<+1qsx5l02sqt`d2@Aj^|S2k?7NzxmEGUpe_UK#{3$LUBIdUniGaf!
zFmJD~uYaDAk&&$<AX>=b;o*K^Vc{pZ`~|VUCnN$7@4&n_KR@4vx%bjXS3txI0IZcK
zB_$;txb*`#wi2nB<>TYyA7y1_c~4JIg*ZDqi$Fs|gMZZ3)kz=_xb%!L<H$iSa%$HJ
zBMZK=va<UoQ8fDc`nV&QZfR_6l!Jo<iRVj@i<}0xR<ZI84Gq1Unwok$9_jY>w&dmI
ziP!6u-Q8VjZf;f?iRVu)a*|tD#H&R`MFk8Fhr<fdqyqy3;&!{a9hI1!ogL}y?7ZY>
zjVC9$b$>;8uoyk@1Q7i9{r&yo@pzPwoSYn4T3V8xo}Rcu$VqNp5iW<r;fyA+;`sPj
zO$jrCe<<hY=i+oaWqNvA1_uWtd`%v5l3TZI+qt?)OvKxoBwk)#R*RC^z`XNCN(`Sx
zY{QfklgF-`i7={N$P^I|!C+9@+uH@TL<KQBRex1g($>}%)1RE=))f)l+S=MT3sfvZ
zZqJU64z(ar2UOZ|u1Hf;li&=C@HKhJX`HlLBDNP67WS^nLRVLp`2Buyxm;>0^7Hf6
zy_J=fxH04;x2}lg?(Xi{qobn}lfYU5d0k#!F6rs%Dgy-t1u{H5EE^jem;B6la*>nV
zx_=^g(5%hO%&f<n4wARFwyKvCBO@bf3YZb=i>=c^E^->&di?}ebQMh9=;-K&C`K;p
z+?p{J6&31wc6L@}#Cm#~hZlFn-rioIwzl?5-2Mh}KPGaDazB3nyfZN|@jg1J+p&bi
zI=-y}uz-)MtE<1m?Vo_J5EIZoMGa>LKYswp_o$Fh?RLAW1th-;^r0_f7)uUvMGMgC
zwh{CM=4;^R`uh5Br>3ShkoK@C#<bRJTKdqJF^naL!S%0tOfSq^Z1aGUmX?-MpU>yQ
zw#-D!cgtwyo^Nh$h87nW1HHYybGXF{_7M2>N&z}OX4D#S8;!|5;EwUzX}COPt4<HF
zb9%(}YP9}=YrC&R`bHy&-x^t#Z;o{1(Xr**;{cpN?G`Xm5ih^W|7#H!Nmp@`?}-;Z
b{t{pSvCWy?&A@x<00000NkvXXu0mjfK7J=G

delta 1114
zcmV-g1f~0r36u$tNq;s;L_t(|+U!_cOI%kJUZaC1qn+_K1Cwa2=3$}+f&_eM!Iugx
zNFTgl=?~~zQAAM+Qluz-5XDQ-pHNz;7K^kGEflc@BS8wS_lSxyqGra)jIlau`h7d+
zgfrueZqpWh$cAs$nX}jW&NutA_Btc-vb~VYYcFj4K(k$z0)Ly$CP}n%$t_8)Kzk$N
zN{O()#%j)jaRan(0S=?<IS>N;z&3WA|34RjhkIb&Ax1_<s&AoXXJ_9`PfyQge>fa|
ziuU*sT2)omF#K0=dj(>)&gGVuiQ+r~w_!@g$HzY_E-o%hNl9_M$}~nS_q*8+4-cQu
z%*;F}FE783uYZ5RXYQ;#ajpnB-G#ZgyuAEnW@hG1P0`8*0)fYcg@s?>@*!gWcr6id
zxC8Uv>gwuOX=!PhIs#&a?CtFZ^7HdQ$K`K`{qsU1(0K#q!`a!{4$QrmKDq*;9sppi
zJSi$FYQwFcz_Af8Z6|7_qobprW@Kb|kB*LnI6gj(LVsOdoz&FSNH7>Y)km0d<RBM0
zwey5A3ciw(lDj5REP8r+xFa~+QeR&$ySuxR$d@1&ISp>DWaS$e82BJLIr(}b(#_3H
z$;rtPuh%Qv+uPFE*r-M%kw3Y}Np4*cZx<94<S{rBi73R9_Vx9N+wJCdRARQawxqqi
z{gj_Io`0O=))nEwV)P^uK=9Z1_V$X$<55Dgva)1hVL`gOx)KT@C%JV+xEv0LGnT}P
zgM$M#B^(j_LOD4(5vS8BlarIu-`^kQYx0nj+`4Jo&ecs~BGJ|)@#5m5T9h0O%sU^X
z#IP@F8zv>0Ja*lYh#=dAO%aI@3WcP#wN;QyRDTdhr=p@lT3TA-`jeB~x*|dw8yf*L
zLB%8F_H1iwQwtJ#Kn*+26=`T_5S(FAz9tVjjgwYO#OB=G+|F5}(9zK$e!pK_E|;2$
z+}vDsZ)s^MVGKFRtt(=&v$J!0e}DhbB(P>cUYC}ZN@{AV8iBmLJQ*Aul(n_BQ+{SV
zxqrw>Ze0;PXjZ1CrdH!k2g#e8o7KaKp`jr)1soCUgRRp+E^->&di4ZWbOlV!@bK^_
zNJcK}+?p|EWo7DmdU{%oi1qX|4=?VDot>Rvb#?XExcwdCe!j>l%KiK?@c!7?*hi?K
zuE!G+@A$R~zyjW{tgQS2w|@b?K}=Bl6n{0G8T<ewKO#duv)k<|7m)lc(1*T^VJtbw
z6)Qli+D6b5m~Vk!Yin!2pO~0f!>~t8F{ZU%)6$2&jA1M}46c7wV|roUWtj&QH8nLA
z`+PnZwq-g>zH3G)_xJkxdU$?*KG@yeJ%d}!U=M-c&lI3jW5%ozw^5kf0&W=Jol}O(
zGnV=QE2l?XuSV$~Jh%F~NZn`z@m(Xs^3IWJbRAgUJ$Atv(k=lnD&qh8Yv9eh=#>$1
g+5cCm_KyGq05_YE=IYVNumAu607*qoM6N<$f*ji;GXMYp