From 9ea53d7b1e6777c3ca440cc52f278daf2f2cc209 Mon Sep 17 00:00:00 2001
From: Jake McGinty <me@jake.su>
Date: Thu, 17 Sep 2015 17:53:09 -0700
Subject: [PATCH] fix gingerbread view issues

Closes #4085
// FREEBIE
---
 .../transfer_controls_background.9.png        | Bin 1122 -> 1228 bytes
 .../transfer_controls_background.9.png        | Bin 675 -> 694 bytes
 .../transfer_controls_background.9.png        | Bin 1331 -> 1451 bytes
 .../transfer_controls_background.9.png        | Bin 2678 -> 3104 bytes
 .../transfer_controls_background.9.png        | Bin 2887 -> 3110 bytes
 .../securesms/components/AnimatingToggle.java |   3 ++
 .../components/TransferControlView.java       |  31 +++++------
 .../thoughtcrime/securesms/util/ResUtil.java  |   6 ++-
 .../thoughtcrime/securesms/util/ViewUtil.java |  48 +++++++++++-------
 9 files changed, 55 insertions(+), 33 deletions(-)

diff --git a/res/drawable-hdpi/transfer_controls_background.9.png b/res/drawable-hdpi/transfer_controls_background.9.png
index 0e503fb5126da06dce91c323dbad158315ebee09..c7b7f575f4513155056f64d2d92309899f9a73e4 100644
GIT binary patch
delta 1208
zcmV;p1V{Vg2+RqPB!81hL_t(|0qxv1a9c?n2JokG-g(AcC2b<w@2{uBJ+v}oT@~gS
z`U$5FCx-Hvsf+FAnC~ic8D{2GVdf|8F|I-IVBcE*uP=ULEqsROBMfh+G^Hs`h*v}=
zvMC7*^{kOrp$)Io2l#|O!0TwERjd*935!jMOym_tC}8jX^nZjHQ8U`niC!F`Ysf+j
zAG(Gk=tU>msX0m93<5C}iP9GA!bRMM4Uuzf+{Q)hqAe6NLW&Z3MI2a)UfhQ$Di1J-
zrE%~IrHJ8LwwStb5*Y|blEF#pVvXTiMTnS#9k>JGc<x{ao9i=?RntuLLb#e<n#rpD
zA(o+mKF3uE*MD=BK1bRp^O(p@+UzP%Vxohao)N9b@DlnVJkJ2?qvakDxk+nr7Q&CP
zbF`M5E)%UP_7iLf-(ustCn{Yef@2WE@6aH7)+Hj+*oUnDL}am#z3c*!O@|GkOl-_{
zn23cq3!zfjIV^IJNVC{E2-QO8XqH1nq+vrSnGDhn5P!k37ed+W122;JL?s50RhXEi
z!6zz<Aaawwg-|}<akD^Tw4Bz$4gk@nb<y&Ih*k>cAp()}R;mCZH!%Pam<(_;Ut$?;
zh6qw<i&2&r5e>K+EF!L=ArB&}rq3Y)moK6<ITL9nt_F~Jm1gElL@z`j)0-m^vmt^S
zHa7=iw0{QMgG<EDaP62xEW(`t6YsLdF^If^bwLC<)XghKB_;_cgH6OKD={h&%a92;
zF@t5J5knY+2z>gC(1=8e;eiIk2NWBbxEVr+(54ZH+@#%l5V0dYVOU~}a8VQDr8tHq
zvPRt2gm^pAI2<vAR@j;lZL}F7iO4Ic3qqGr_kR<W5-~Xm{rV6wkennD<6#`th<G#}
zmWT-p*EJ$ur=&zgJ+ct`gry`RYlP5>*d!5Ym0m<zEfLYC7ZL3;@eR$0Z%9P?KrbSF
z@DK4%B|g!Mh)?7f>O1;Ai+>Kis{MOW|4&r?zZb{FuN%~BMof*ze;WG#U)29!|F~GY
zF@Hj6(|iR^vvt%a?N`HNG(Pt<ejD1N_0H69gShtli<;~b_ZuPI_xhKQ_Y)iXpS#iF
z^i-4fXW%B+Nkn<rTy0M>YH%L4PybWJvvMXzYw(4JXTvo(;h)a)o(5V2Mr<|8O1EtS
zerIZGp*P>wX?XKZda-`5J~8n<H;cN3N`Hf@-$J#jioZ*|PhsLd_H5}!c&_*QmHccy
zkJ(PPGb~cAynvl&iyiLRh|fSqsh8+%cbZc6E7Fv*-=U@ydDye0Lf_4h!+kf>72Kcw
zZ7oWCZ&kV9J+;oa&)4&`&YkWl>9?zu^5tL1fHgH*?qLrcT0QQ8YvraNZGNBOihl>Z
zEA*M%=BHC9W1labjMBR6PP*g9$~Jbgx$5+zHc~fEIoOYSin>|j<T}M#ZexUH=qq{?
z_8}X>@)+?7WxI+gMq6k%F6G@-d<U1X2d#*!*;OokrC14SK?mzXAC8WCw(dHPqK|c<
zgIcUaFdC<&-tc&sk}SoVXf@jK1~GkzPw*~YM;onXO)N#pc-a5m@Y0k<sS(=c&-n#C
Wjc_|=j>|&;0000<MNUMnLSTX#{zDD`

delta 1101
zcmV-T1hV_g3E~KlB!4MML_t(|0qxv{lIunj1z>r#7%EtX%TwypGAwv+cyFm7XgTob
z4>L2_4qawuvgT#OoLOGcbg9o1d}a?EC-wQsDW;fW(w$PdpYHZXXiDut9RWgm9xu~t
zc$uC@hyZo9ho-y{y1U%(lx%zNyF5vY2=NwwO~?5v^h)8Ybbp+`##?C8B2PN56~y^b
zZqPwo#C7gMuQ%MqbzG!_+^CH?rJNGW{pE@B!)Wm>=&girqvJ1?C(8Y~BF+r)0=<n>
zh@fLhgj4?8sLu@LgjlIzKW;$Bo*UR-p3RuJbC4_iHFTnBp}KQ08)6SUd_Y&AlMY?M
z2k@Mpw23Y^l7HnH%%<a}Mhtqr-DpFno{riR^rk^{@hHwfXOc5`%yAPYssVh?UFfXB
zUH(K3BuL~P=s;(l4(~{a2oHx5<$xIBFi`?TzihrhGi6p|Ci?R@1D&VPSzd^dh$@}U
z9%Uj?jfn^k5p*sS!Ha>&J8&2}w>iu^wn$V1Xd}uoF@Hiw4Qz$z@+Z)F4}apgn<NIk
zc#OLi5W9FR=-m{tvWLz>+YmbItIZHyw4tp@+i^Ea?BNEqP2q;qvmqipx?&fRuE5&>
zapxdDfVM6l?i^e<kt@b?XvgzdT|e<_Xe-lNC$Un4wl(G1br5$BV!ypaI`F{InnYf}
z4SR{Wfq(iM#Bx8q4Q+G$cgp>%6DM%WZX!<c<f=q}36bT*$X{BGSV9}x`m|Od*2eg@
z{Y1W18(Wdc4QL7RpIC|L(m@$S?04K{i9CsmLWq}ma#<qkxGscv9rfjiC4}6SLF6t%
zr(_VV{#|2)-YNGRM0F3^a)@ZFdkmsC!pG$h`G2??HHb9DR|OHT(v(3|d!Qx7R|XMv
zSwvbiiGeI40+SdDBQ^~pJuiz$&l^O%EQ^R&{wDsRq}OB-={4h7<QL^Wi+>EBlmA|n
z|A{L9dr|(c8~MLc<^R)=|9?^bzkc~^H}Y5D<gcU3Uk#VPry+D_iW}nh7c1kd?GkrH
z?0*uMgzxq9zEzJi@TB+?8|8jq!nqsyr>BZDaE?=+6?c-+9JDMYwu)2563&JTKjBX#
z{GJ9vr>D4WV~($+-kB0`^R2kQXxu{WSa1uqxJzvHjc_92_xh<8V><&c(Am5JQ5W8^
zLA9bO#pb>n`i6JNZY}y$4J6(@MUT_j%zr*&9&_AO8pM2+$qTmQtDrZ<9yo+4_rQgY
zn?;-7`?#C}@N%kce#RP46)lOKjK;bv9Z05GlMa+;bJLHCy8lkh{iyF`-;Zi+`0%8^
z6i>@7@8ikbwA`9g8$(D3aS1mz^qfYxflG7{VP)JYS<*P|?M0K`Mr-ZHX|(8VdPd6I
zYfIy_(HpKty=h<3A_6r1=kW@?#xK$T(L_LtzVfEksJh33-thFMm|}hsmp|rb-7z1g
T0b(}900000NkvXXu0mjf2Ad{)

diff --git a/res/drawable-mdpi/transfer_controls_background.9.png b/res/drawable-mdpi/transfer_controls_background.9.png
index 3e632049683d808e77b4aec6cf67fe9374b6e5d1..5e8b65b45d27738b892aca82397f83fa7b43c2f3 100644
GIT binary patch
delta 670
zcmV;P0%8551-1o{B!7KLL_t(|0qxpFb{s(r24Ek+ybLD;^=sfgpJhC74KsUXxP!5K
zXIzJwIXOs}u@#0IhN><F^k3j>n(mR*X0*8NPp$uzim0rb!4h_Gk}lFkoWu^6XhvmI
z5hpiAG@{0ETs;O?j(UvaYFq=_gsBc1!yN?RIuodSG^RSN!hdiG9$tf+$QyV#WCfP)
zfroeC7V-{$y2mh#2JsARAkQ#j3>M#ut6+n<7T;?CmdN8N*l?bzY>P0O$9u4ayvITd
zFsvg0TZ`W$Ol^YghPIl3!2^d7uR$2iBM1c+(0l_h^y57^q`X(zI$_a$cnS_NPow+l
zg5erC<Xo!*Mt_4~2N|jXOZVWJ6WFt4Z&esPu%q}@U~~}goWb7VP-WN}*kSw%Fx7$A
zPGPTAM_Cw+fgNX}EKJ>V4!c_hmWU#74hvF|5*Uqx-A9d<z;FyKAjeB#4@JNp6~QP5
zmJy0+utZJ@ERoY-YDNl-W;Ga=z(TU5!*;~Lc6Hb(F@LaAKVV;NbWsY7F6n3Nyj0jp
zd6!c7&A%iDwyeQO>JO}-S5jX7OI-A4kKhkQ8K2fPD*w-jq`z-;SN<Pf(Jcb4uP>&l
zqQedeZ9~aw+-a5Ub=2y7Uar-t6^5L^hGn+XuL~VOME2J?vQgPEM>dI^$RQUNWR3;>
zCI+drWq+GR+s%)jS<dKLD=gS~4AciKwz%Fv1sm%PiJXCjkjQ>qH~VuM*>7xx21CYH
zXod|h9rbm?Z++>guiMs|mf!T6mXAZW7u&{hw~@s*+^2D?i*5RDA|`O6<|^O`OeCUC
z7FQEdm7`fKVHc<95-#8rcCk#eDyM-$g#9lTlozk{37DL>4&V*WF8}}l07*qoM6N<$
Ef_Zf^-~a#s

delta 651
zcmV;60(AYh1)~L!B!6m2L_t(|0qxpFVkA8b1>o$4vBR7B2ldoUHwbg~VP1uqju5E7
z(U%=Y2OA6;@VmfQ=qgDKM%Rai-*x?4Z<;vG{o!#e(Hgd}MQd0Jk8?k#-!wV9DRdBe
zXqC>Ot`D8jDtdIFMc99L(L;wQLsghE9iivHyH;TcVG4Pu8h?_<G(uKj@dudVB2?|+
zBBtXH48yn+0hECR=r#sRKIL5~bK%|OQv)!{@;Q{@1e~rD#-m(<G9NDSXdN(~gtD0F
z8ev#~vYf>lV3>w-km)L6;Sne|;n6B!oaT}<Sc%gW!eY<#7lic$v1b**co)iTc((!=
zcS5-jcisYvKYu{r1BM{};6@mxpgd*z1{gwI^abN0LRY}FEl9#S`=Ea`=e@%6|J}V3
zh8`%tq24QDbmSYxM_0h!G@<MphVq*x4W?a4zv;dNqZJ7-TD=6rsRS5KFTh?mL&-?I
zS%V=X1%`|U<9;bH9?)RnaVfCyxCX<L6d0B?7_CWx(SO=^*cThN#K5-oOSvf&Ch=0r
zzWK$zF2ufI#coM*Ht}eS{LdcgABs{xt!4a-yl$5N`zGs$S7eER3R;OkND)des>m-x
zY1MsCnU-1V{Qs&_r?$Au2aLNaD5qo3Ic%@O1_T0;4G3v18=W>PvdJa5Ehw*%>T-*k
zmfftceSf^c!pkE-#=t;G?3v+L?q2Mfxe=N!QzJCoWq9bQ{XVAaA3AEkZ);3z8u{A3
zPBD#;^}#kis%Ef_kF~)z+oOQgORIE#<5@bVRqB1+>}7B@)r1TWgvYVOYqb4icya)l
lRMWqST0iT9pnO>$0n9YbQDbUVF#rGn07*qoL<FuvV1jX}H(LMz

diff --git a/res/drawable-xhdpi/transfer_controls_background.9.png b/res/drawable-xhdpi/transfer_controls_background.9.png
index 8f4d75a97bec182fa32d18d2cf27683882e4415e..3721dc5202c3cd4a196d4a099f337e7f6cdaa1e0 100644
GIT binary patch
delta 1444
zcmV;V1zY;F3abl{8Gi%-006R<0rCI<1#(G5K~#7F?VUAz97hz!&kSK^PIkVhJB87V
zd!{SZN>*iNMnNanVHSj$lgdneDL$n#yOX8+>7~k;=5#xU3-9~)&0mr|JM$ps({M~8
zk%TJ}$@90s!8D|>9P4NY?L#B&qa9d><w#)~oab+e{C`042Y=yWD_ZFk&VqAtmQJA+
zTj9nZjFc`1w3@y~KR9pt>1$f;Ak?~EncytO`zj4C7AlSRY00yb!lr91Eu@ce9$XSG
z;d5FT8ygB;iO0}HX>h5bG@25R1zH#0!gt7k%SHy@;jKXGf~$^zD}g!!H&D807LI`{
z$}!9igf6A<8-Lgr{HBzzbv=IzwcrZaH(a3u@mqbW3od%VzN4R(`cBu=ci?ldZ)tt{
z4j<`qW}p}BYkHj-zR*=O4h_hFeNP4rv9T4_6~7z*fP(`4UVT>ubx{J{;2=R=l&Fv{
zBykxWI4&bu0bQuW5IB$wV|kf%VI4-mfn@}n%cu)G!GA$V?J1KkwHF))Xm1&G(I#+M
zpiL##g*uFYL&FH_N~nt#Vh9{6hG=1lbXCQ185}w;SH(-9tNJeL0*4Xms=lk(y2jG)
z;IKl!$Ho>_7aG8!rlE+sFdLbW>&jquk#xOyC#At*hte<JSrlDp1xJF<i=YcGI5M~e
z>U#bb^nXN1SI_ge6r_t<z)^x)3ecq#u7D%Okb}H+;a70v_%%;mGz%O>XjWdja10zt
zj^&|?7J?&-Ypn~1qN__CvDD?f297k-taQ;g5!dydg|5V77>>BE;lyK}bx|`o>QJ*s
zT{Yt<ExPb;%{ULb^c{rY=GLX}w*>mcgRW;M;eQfX0OLY@VoqJOR7Cv`Ey=CxJ<+6f
zy^~WH21JvlCx@=*2n>y&)Tp}DN-#8nS~;pNbbzlx=onSk4evfe&nUX+ArW*V@dvZ(
zS|WNzJ$rGkie_PFR$bICdTxZ;v+Fu7dTxYHXVqnxMI)TcqU-rvM2?B)Z!zkEBWjE|
zW`AANM2(SYW?d;!V<ctNrRqhE2~}^_wO-ViQ0tAlXosjVK|9R4_K6x3wC`G7+87!|
zjgdz4|BSmtjS1Rk*0ovGSp3_CwW7v^T5omkl5>~Msa{Cgd@~BuY;Gh3NA9}{xbM=z
zIq(e#=Pd5(1v+i<5+qQ&%{!y8)8Z9dpnoM6H4*|nBo#Q`>9MKr5;`oZ2L-jtqBd1f
zN-Cd=Q2DHb_rZd$tCy|~@6eK>_5?{!kaV1B=o9H@w852bS?>(gjFVn$&row|I{l^7
zU*<^Q`_fG*ktroI1IJdED@O>K-{pnlG9Au>Jg39S>_JOi4lookSyq!RWp3($LVu_7
z_C`ooZ@yD`b&!mZuB1#9_fD(KtM`oEyn5M&Fh_Q6c&DM*n_T_~uPpkbsGD45PmtCn
zTc{{ex*cb-<4iW_$$my}Y%at0PudrvKE=}O3P+=;vR{=dn~Tf27dxm=w>EpRW$U_H
zBs=}R(p`z2{yMk^{{-pVP=D@}U4NG@Z$cw7fw-b+&>zwj(WQeql=l1OpT5tks4jiu
z>gy}&R((@iaa}q{`tsGNS3g+zMwfnOQ!Tz)QFw(~^i!Cxbm>$*OF#KT7X4K9Y)r?0
zx^ytR;?+CH^x|e;>(YTsM=GO=j_CTVK<LuJTlfx{vYxHJ(`AwY)1|AZRev+3%W<+&
z&AM7Sn7VYv!lh4ep;RBuXhl+=*aNOhCq9vu;QgZZOAg?DTKepym`-?f=_H8O&^Icb
zzb2KYZ)i<|Vmjf~r4xS;No-YZblTJGopW?rwP7og*RFGjh%Q6for7seVYymQJJ5he
y?7|kT!*ZlB4UYM29#LHdL>+WVBoY>~pz|NIRFpW4K1YNA0000<MNUMnLSTaPVZYJ<

literal 1331
zcmeAS@N?(olHy`uVBq!ia0vp^(?OVn8A$3oT6!}uFbW3vgt!8^K%k<cq5}r%>gpOA
z8bA^VG&MDWY@n33wl<Ir6ajJ}04M@uYJ`S{LS%so92^{grU6X?ia-ERnXaxbP)bcr
z4af!x0u6*PfNTf@nG0mg$jE4EX#p8PqkyEIo*u+%V`F2WArM_aafl$q76=<C2m}xj
z2m?q0jZ#ulf;bqc9bz(2Tv=Hes1m3VE&>z;Didb@`4?z$bV-n3FvEX#ab-O#Cl7C5
zJ}uY8ir$$L4yo<TI?)|0jGA$M6A}ddl+vavm#CJhWd~24)~d^?(#GV&ou9)c-7?YA
zafXYRRIx&OXMd!meG<P%l&5xXkXUAEj9X=&)0vkRz6=b^Wu7jMAr*{oE{7&9Hsoo&
z=qGVyi}@KK*zsTXZ1E5F+pi8p9#lX5OW?)z<Msdh{_BLzzWcCbr)}Q!%Zb|~b>FBz
zS?YiPx_Mr0{ZG4-r>{KaXK}7j72)|ITHdOBQDRGnt8!szY-frV?^~ltFO3(co+e+=
zo_5~zotB8V!J-fy?>CFMdR9+ZvM!7F*_Bs9yZ-Rbxc-6r-6oT0frWRsbi7%_=fYXq
zTKaX9z{%^vm#@k@tZ|HYxLy#_l(97MP|o!VCdp;S#j&6Ho<y8ETXIoolg`PC>#KMx
zZ}BaTea*Y%melJa$8B>bu9JOI{QCVZr`EOi)`?z;c=>vf*_DjR^Va<pTBY;-*6uX!
z6`N;dzV-51c*$hp#%z|YZnt*5Qe6?cD*NTE)&)@+%NA;Lf8F$cH;2rN*y&4|`D9Pe
zUZ+-J5?}uF_JfPx_P@z$@O~T`E?Tone^=In;Ocv>4_y3r^F0WuyjIGhe|z#eg^Iay
z<xjmHgr2f}bE-M|U*L5Ew!G&LoAsFNt1e7s-G8Mv+=jVs`iIzXaeK!n>$JP(KPb0M
zZ@lBiz~X3lx#g&9Vw&H?8Iqs=*S93TKlIHpd};gzr_;Nwjei_mt;JM+H_qA6;_)Y`
z&VwhOnu;}VJpFo|#GTSAUzfy3A9iVQiOa?X2hOnCb8L}8S;bV>g>OEr>To(*b@Yg0
z+MY*`1kB?&3q2&(FR@VR4fm1>I;O45m-%?AV0+KUQ(eyACSOnAJjde6na`$AZR6)_
zINguWKceXS_urzr`^o?9KGpjN)Yk{ruTQGKAN*f_(ZBx{fg<ldJ{Nva$yfHzb*^~O
z^VL@>O;YOYo8MW#bNudX`ogYvSAEL6?A850e&_zPW%ydhRGlxh^VFX62k#jNzTdy$
zd(oBOPH$}0zSfxvRj)9pka&FG{qy^ivNr3rGFF}cS;<<ruX%oZ<MZ|nmD)LWytAJ#
zek#u!84`EJApKdkWo3#(o%DqAc!l4L@Af%-)6|(ie^<Ry`>Xi|cUGK=US+=LrFmuC
zr0G-URbOM@T%obPV#kLq_UWb3aRt?)pLgVE?7jH%=9=0U>AMcTN;eYOW@Q<D{`VT5
z@LlR}{=bU*x&PNCp07@u*Y95*8+E1m_2b*2U(G|xzcamjY|L|h-tWE9U+>&Z%&6`E
zed(cw`Eln=`LO$ocgugyeO8zk_hp^@WX==a{PQ(B{oUR(%F3IX_6c!b0A_RsPgg&e
IbxsLQ0Nc1IRR910

diff --git a/res/drawable-xxhdpi/transfer_controls_background.9.png b/res/drawable-xxhdpi/transfer_controls_background.9.png
index cdbc966d88dd808313cdaf3ad6db093500d2a433..0fa81940ce8f43ab4b46461c74ecef28ffe484e1 100644
GIT binary patch
literal 3104
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

literal 2678
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

diff --git a/res/drawable-xxxhdpi/transfer_controls_background.9.png b/res/drawable-xxxhdpi/transfer_controls_background.9.png
index 4aad138cfd53822481adfb1e480f88d196e729d4..e349e740583ed427e05606ca6cb158f0936b7e70 100644
GIT binary patch
literal 3110
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
SUWW32C2tSEgSV+++5ZJlamXqF

literal 2887
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

diff --git a/src/org/thoughtcrime/securesms/components/AnimatingToggle.java b/src/org/thoughtcrime/securesms/components/AnimatingToggle.java
index 30b100b89..293e07fd3 100644
--- a/src/org/thoughtcrime/securesms/components/AnimatingToggle.java
+++ b/src/org/thoughtcrime/securesms/components/AnimatingToggle.java
@@ -3,6 +3,7 @@ package org.thoughtcrime.securesms.components;
 import android.content.Context;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.v4.view.animation.FastOutSlowInInterpolator;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewGroup;
@@ -32,6 +33,8 @@ public class AnimatingToggle extends FrameLayout {
     super(context, attrs, defStyleAttr);
     this.outAnimation = AnimationUtils.loadAnimation(getContext(), R.anim.animation_toggle_out);
     this.inAnimation  = AnimationUtils.loadAnimation(getContext(), R.anim.animation_toggle_in);
+    this.outAnimation.setInterpolator(new FastOutSlowInInterpolator());
+    this.inAnimation.setInterpolator(new FastOutSlowInInterpolator());
   }
 
   @Override
diff --git a/src/org/thoughtcrime/securesms/components/TransferControlView.java b/src/org/thoughtcrime/securesms/components/TransferControlView.java
index 282a7ae6a..19721b1e9 100644
--- a/src/org/thoughtcrime/securesms/components/TransferControlView.java
+++ b/src/org/thoughtcrime/securesms/components/TransferControlView.java
@@ -1,14 +1,17 @@
 package org.thoughtcrime.securesms.components;
 
 import android.content.Context;
+import android.graphics.PorterDuff.Mode;
+import android.graphics.drawable.Drawable;
+import android.os.Build.VERSION;
+import android.os.Build.VERSION_CODES;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.v4.content.ContextCompat;
 import android.support.v4.view.animation.FastOutSlowInInterpolator;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.animation.AlphaAnimation;
-import android.view.animation.Animation;
 import android.widget.FrameLayout;
 import android.widget.TextView;
 
@@ -34,8 +37,6 @@ public class TransferControlView extends FrameLayout {
 
   private final ProgressWheel progressWheel;
   private final TextView      downloadDetails;
-  private final Animation     inAnimation;
-  private final Animation     outAnimation;
   private final int           contractedWidth;
   private final int           expandedWidth;
 
@@ -50,18 +51,18 @@ public class TransferControlView extends FrameLayout {
   public TransferControlView(Context context, AttributeSet attrs, int defStyleAttr) {
     super(context, attrs, defStyleAttr);
     inflate(context, R.layout.transfer_controls_view, this);
-    setBackgroundResource(R.drawable.transfer_controls_background);
+
+    final Drawable background = ContextCompat.getDrawable(context, R.drawable.transfer_controls_background);
+    if (VERSION.SDK_INT >= VERSION_CODES.ICE_CREAM_SANDWICH) {
+      background.setColorFilter(0x66ffffff, Mode.MULTIPLY);
+    }
+    ViewUtil.setBackground(this, background);
     setVisibility(GONE);
+
     this.progressWheel   = ViewUtil.findById(this, R.id.progress_wheel);
     this.downloadDetails = ViewUtil.findById(this, R.id.download_details);
     this.contractedWidth = getResources().getDimensionPixelSize(R.dimen.transfer_controls_contracted_width);
     this.expandedWidth   = getResources().getDimensionPixelSize(R.dimen.transfer_controls_expanded_width);
-    this.outAnimation    = new AlphaAnimation(1f, 0f);
-    this.inAnimation     = new AlphaAnimation(0f, 1f);
-    this.outAnimation.setInterpolator(new FastOutSlowInInterpolator());
-    this.inAnimation.setInterpolator(new FastOutSlowInInterpolator());
-    this.outAnimation.setDuration(TRANSITION_MS);
-    this.inAnimation.setDuration(TRANSITION_MS);
   }
 
   @Override protected void onAttachedToWindow() {
@@ -115,16 +116,16 @@ public class TransferControlView extends FrameLayout {
       layoutParams.width = targetWidth;
       setLayoutParams(layoutParams);
     } else {
-      ViewUtil.animateOut(current, outAnimation);
+      ViewUtil.fadeOut(current, TRANSITION_MS);
       Animator anim = getWidthAnimator(sourceWidth, targetWidth);
       anim.start();
     }
 
     if (view == null) {
-      ViewUtil.animateOut(this, outAnimation);
+      ViewUtil.fadeOut(this, TRANSITION_MS);
     } else {
-      ViewUtil.animateIn(this, inAnimation);
-      ViewUtil.animateIn(view, inAnimation);
+      ViewUtil.fadeIn(this, TRANSITION_MS);
+      ViewUtil.fadeIn(view, TRANSITION_MS);
     }
 
     current = view;
diff --git a/src/org/thoughtcrime/securesms/util/ResUtil.java b/src/org/thoughtcrime/securesms/util/ResUtil.java
index 0984f1081..7cd6ea8ca 100644
--- a/src/org/thoughtcrime/securesms/util/ResUtil.java
+++ b/src/org/thoughtcrime/securesms/util/ResUtil.java
@@ -21,8 +21,12 @@ import android.content.Context;
 import android.content.res.Resources.Theme;
 import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
+import android.os.Build.VERSION;
+import android.os.Build.VERSION_CODES;
 import android.support.annotation.ArrayRes;
 import android.support.annotation.AttrRes;
+import android.support.annotation.DrawableRes;
+import android.support.v4.content.ContextCompat;
 import android.util.TypedValue;
 
 public class ResUtil {
@@ -45,7 +49,7 @@ public class ResUtil {
   }
 
   public static Drawable getDrawable(Context c, @AttrRes int attr) {
-    return c.getResources().getDrawable(getDrawableRes(c, attr), c.getTheme());
+    return ContextCompat.getDrawable(c, getDrawableRes(c, attr));
   }
 
   public static int[] getResourceIds(Context c, @ArrayRes int array) {
diff --git a/src/org/thoughtcrime/securesms/util/ViewUtil.java b/src/org/thoughtcrime/securesms/util/ViewUtil.java
index 130ec2b7f..849c76d8d 100644
--- a/src/org/thoughtcrime/securesms/util/ViewUtil.java
+++ b/src/org/thoughtcrime/securesms/util/ViewUtil.java
@@ -17,35 +17,29 @@
 package org.thoughtcrime.securesms.util;
 
 import android.graphics.drawable.Drawable;
-import android.support.annotation.DrawableRes;
+import android.os.Build.VERSION;
+import android.os.Build.VERSION_CODES;
 import android.support.annotation.IdRes;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.v4.view.animation.FastOutSlowInInterpolator;
 import android.text.TextUtils;
 import android.text.TextUtils.TruncateAt;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewStub;
+import android.view.animation.AlphaAnimation;
 import android.view.animation.Animation;
 import android.widget.TextView;
 
 public class ViewUtil {
-  public static void setBackgroundSavingPadding(View v, Drawable drawable) {
-    final int paddingBottom = v.getPaddingBottom();
-    final int paddingLeft = v.getPaddingLeft();
-    final int paddingRight = v.getPaddingRight();
-    final int paddingTop = v.getPaddingTop();
-    v.setBackgroundDrawable(drawable);
-    v.setPadding(paddingLeft, paddingTop, paddingRight, paddingBottom);
-  }
-
-  public static void setBackgroundSavingPadding(View v, @DrawableRes int resId) {
-    final int paddingBottom = v.getPaddingBottom();
-    final int paddingLeft = v.getPaddingLeft();
-    final int paddingRight = v.getPaddingRight();
-    final int paddingTop = v.getPaddingTop();
-    v.setBackgroundResource(resId);
-    v.setPadding(paddingLeft, paddingTop, paddingRight, paddingBottom);
+  @SuppressWarnings("deprecation")
+  public static void setBackground(final @NonNull View v, final @Nullable Drawable drawable) {
+    if (VERSION.SDK_INT >= VERSION_CODES.JELLY_BEAN) {
+      v.setBackground(drawable);
+    } else {
+      v.setBackgroundDrawable(drawable);
+    }
   }
 
   public static void swapChildInPlace(ViewGroup parent, View toRemove, View toAdd, int defaultIndex) {
@@ -75,10 +69,27 @@ public class ViewUtil {
     return (T) parent.findViewById(resId);
   }
 
+  private static Animation getAlphaAnimation(float from, float to, int duration) {
+    final Animation anim = new AlphaAnimation(from, to);
+    anim.setInterpolator(new FastOutSlowInInterpolator());
+    anim.setDuration(duration);
+    return anim;
+  }
+
+  public static void fadeIn(final @NonNull View view, final int duration) {
+    animateIn(view, getAlphaAnimation(0f, 1f, duration));
+  }
+
+  public static void fadeOut(final @NonNull View view, final int duration) {
+    animateOut(view, getAlphaAnimation(1f, 0f, duration));
+  }
+
   public static void animateOut(final @NonNull View view, final @NonNull Animation animation) {
     if (view.getVisibility() == View.GONE) return;
 
     view.clearAnimation();
+    animation.reset();
+    animation.setStartTime(0);
     animation.setAnimationListener(new Animation.AnimationListener() {
       @Override public void onAnimationStart(Animation animation) {}
       @Override public void onAnimationRepeat(Animation animation) {}
@@ -92,7 +103,10 @@ public class ViewUtil {
 
   public static void animateIn(final @NonNull View view, final @NonNull Animation animation) {
     if (view.getVisibility() == View.VISIBLE) return;
+
     view.clearAnimation();
+    animation.reset();
+    animation.setStartTime(0);
     view.setVisibility(View.VISIBLE);
     view.startAnimation(animation);
   }