From 7d688846f92a4e06f6d496e62bc1f54253b4c006 Mon Sep 17 00:00:00 2001
From: Jake McGinty <me@jake.su>
Date: Tue, 22 Jul 2014 17:27:05 -1000
Subject: [PATCH] Move default SMS and system import to "reminders"

// FREEBIE
Closes #1730
---
 res/drawable-hdpi/sms_selection_icon.png      | Bin 0 -> 2261 bytes
 res/drawable-hdpi/sms_system_import_icon.png  | Bin 0 -> 1757 bytes
 res/drawable-mdpi/sms_selection_icon.png      | Bin 0 -> 1728 bytes
 res/drawable-mdpi/sms_system_import_icon.png  | Bin 0 -> 1511 bytes
 res/drawable-xhdpi/sms_selection_icon.png     | Bin 0 -> 2720 bytes
 res/drawable-xhdpi/sms_system_import_icon.png | Bin 0 -> 2079 bytes
 res/drawable-xxhdpi/sms_selection_icon.png    | Bin 0 -> 3525 bytes
 .../sms_system_import_icon.png                | Bin 0 -> 2488 bytes
 .../light_touch_highlight_background.xml      |   5 +
 res/layout/reminder_header.xml                |  82 +++++++++++
 res/values/attrs.xml                          |   2 +
 res/values/colors.xml                         |   3 +-
 res/values/strings.xml                        |   5 +
 res/values/themes.xml                         |   4 +
 .../securesms/ConversationListActivity.java   |  11 --
 .../securesms/ConversationListFragment.java   | 128 +++++++++++++++++-
 .../securesms/RoutingActivity.java            |  20 +--
 17 files changed, 227 insertions(+), 33 deletions(-)
 create mode 100644 res/drawable-hdpi/sms_selection_icon.png
 create mode 100644 res/drawable-hdpi/sms_system_import_icon.png
 create mode 100644 res/drawable-mdpi/sms_selection_icon.png
 create mode 100644 res/drawable-mdpi/sms_system_import_icon.png
 create mode 100644 res/drawable-xhdpi/sms_selection_icon.png
 create mode 100644 res/drawable-xhdpi/sms_system_import_icon.png
 create mode 100644 res/drawable-xxhdpi/sms_selection_icon.png
 create mode 100644 res/drawable-xxhdpi/sms_system_import_icon.png
 create mode 100644 res/drawable/light_touch_highlight_background.xml
 create mode 100644 res/layout/reminder_header.xml

diff --git a/res/drawable-hdpi/sms_selection_icon.png b/res/drawable-hdpi/sms_selection_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..55cce26495133477b461c3e0f3bc3786d09ca999
GIT binary patch
literal 2261
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
U&UVbrH~(nRY0=a(Ve1S20I{F44gdfE

literal 0
HcmV?d00001

diff --git a/res/drawable-hdpi/sms_system_import_icon.png b/res/drawable-hdpi/sms_system_import_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..050b0618b15cb747413cb7163775ff552885200b
GIT binary patch
literal 1757
zcmeAS@N?(olHy`uVBq!ia0vp^-XP4u1|%)~s$Kyp$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%qp275hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;Tteb3LXsBRjre|nk
zYG!7rqhMrUXryldL}t2%CRV0qRz~IuP@n{~ttchUD#*nRY8Q}atCUevQedU8UtV6W
zS8lAAUzDzIXlZE)GQ-G77pOwFxH7LKu|hYmSQ%!5OKNd)QD#9&W`3Rm$i&2?{L&Iz
zC7??oUdSzg8=F@Q4JKfK=~pBc=o{)8fV>1#=<ADLX>KlDb#X~hD#E>34K5C;EJ)Q4
zN-fSWElLJPT$(b-ssbzLqSVBa{GyQj{2W*)24v)y<QHe;7brLfn<;4cCMIX*fdn+c
zI(&VtJoAc667!N%JzZ>-fM)1rW~Nw~m>O6Z8@o9fSh_hG8oHWTxR^RRIvYEgn;JQ~
znK@d*^t$9Hm*%GCmB93-AoM!p)C)=sxdlL*T~doO%TiO^it=+6z@E0s#O)SKoaRCG
zrr>sqBTl{gK*#8Vq82HtVM4(417gAxE|3FH`l)%q^j-u^*jqB=wgdBvzo(01NX4x;
zvrlGUNswsYzvJ9d)<VYeEv&9C0{%*R3pz3i83m6tD=hl1`GY;eF{5AZi_#0ngIXS;
z0*+f=EUXgzs-(xhkfW<f+G^UikKZS4FInTM_VZJ1<b8RYEk0>ZpL{+&yM3%MHr#Vj
z>Ld+;NG0!-PMwLWn_L=C2!T0kPNjD({j103uC!-8Biljl4_5Ct$#^g3i$2&a@m`*Z
z`GL)jsI9jPES~*d-gx!_*ADhDkF#CVWEaS<5sti=9VZ_V!5XP1C*yr^r<TZ%rw>#z
zwtlvZSsm88CtbQCA}z8oh`IEF=!U;i7Al+mosBFw_57><0@)hz$j38z?=|eSyM3)W
z{ga8z`S1@$3Abx9t^UlvuUUSYOZPNq#a+=z)^4aPfld|#IX5&cOx<F}gU^#4%_Am1
zb4<VJxb}1Br7z-VrSDx5D3z39V?W^cVOvkQSm&#U|1*DeyE$4Xm28;p8klkFjb4WK
z<TWc#NwdD4`Jt+}^=;<IpZ0&YM_!2t+q7Y8>cp)qbNFt!9jZE5_QBZY8>@Wa*+Z|k
z`751Ge9E`4D~s`VeMA1K*~U42r%hMdrriHN)qLg0r8=8L?&s}QJXGSe=-cKuL83oy
z-$}_3@eK)ks}p=ENOWrIVw05{uDGV&y?aq~TBpWbCjZ{UlBep$jy)9aul`inwXaVj
z`M6B@HJ=X=to~J(R!!IQ_V>K2ed>nc@wd{K%r|;eu8#j>r2SA=Qbp(F+VnRwO0%v7
zoY*GFZF<I~*Qn@BrS$n(8akVk;#eY+4`oDF#Lshid1cL(qUMvKCF^vK2c6wCbt232
z$sX4>aK%5qH_bWn^OWrYdK$dZo9Y_-6>ooUs<jj{jjd$vOMJWi`?f5xtqJor@^2<x
zI2g+=eo!{GvPM(I<j)={8D{CIIp>3;@5*xN9(@=7l%w{e^uZNtnf`k`O^MyrSmG|a
zv^q8LMY$>SsW%<zw|1U<Yw^1G((?x{jjk8pOZP9o*|a=!<>EgrIzbsMN#Z}|l$Adh
zy0PfdUjgIQ0oz~pe5zaY-7%eAExo*~cz&KRf2W0|fJ^va?RWW?=6=vSc`nDN_2P;r
zMjIM#$3~`1S-<3<MejMCl&NN$>|lv`nhP*hTmRHPz;IdXSjr@h^Om3r$J5o%Wt~$(
F69Cy(uweiI

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/sms_selection_icon.png b/res/drawable-mdpi/sms_selection_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..f64a3e0eb2674dfc9d0f86576e2e5dbaf97ac6fe
GIT binary patch
literal 1728
zcmaJ?eKb^Q9G*DH*w#{5DsDrmjkz;}$xJ5Amo+icP$BGm-N|6)j+r|Qk&Tkt?Nck&
zSZX^WOjAy^wF=8dK00Cx?UpvlvSZCUN3CVsy<^e-vG$&O@B6;L^E}V*^PYPsJnZ8o
zSQjh?gIU4}X7SLKWO^1`qHov0{Hy5VjIg7S2v~xo36v0qE{25=z>x`dLp(?zPEWZH
z1z<4d9@5AtB#IkK6~QvRz=XkTWD1mx!2|?q6arBagaATlw^UBUjeS#x1EgXaZl@oY
zz*R7z1Zi-F5{k$Oixg!fi6~-R;3gnILq!E-5F!9HvShi6s-fX#bgAgxWCn4-3<OD{
z;r<CKiW?3vVI>6k;eEVC1R@b2lkr4fKQfu<1&|0t5=cOAvNzF}>PM!MHUP614)vxK
zOQ<|n(5x@?M8hQ@h=K}&X=!QrG#@;y+zk>b6pBfMMDj)v-l}vtBG7otRqk^NEJ!6%
zN)?C{mIEe5fe=<BG#nb~KPku*^RjZ)Y?;u4ff|7VB;pCCl;(h3?*Bt&vU#)$;X&`>
z{ZC<4WV!+Zd5{WLD@ADIB<?0x3Mx|x2@qHr3B$>ARSZvn5m=P~D*$E$8Cc5|h@^6p
zVciUa%cXMUDnuX`K^zthhic%ZQZbc4B9lpM0-Zo%2N8*EUw@V#ozC=OZ15w|gUEEs
z9G3-))G|np%yGr<xQqq4reTmNP|qw#DNTjMK}uK#%p^^fE*y*hf_k%D@xrlC7UY6x
zFrcZm|7!J|37sF)c7AZt!~Ez&a&+F6=wR=N0HV?Fg~VaeBQ;M9XGcE^-L|56tT=A8
z>vEj!eci$2{o#4v-Ee(oH0vwWZ;9FZaLtt))8>^gkF34V<ZOv)&wFVxB{^}4vF^et
zM|LV>S7n~_#=CWYByR0#FTSPvwb6iNPgI<_HT2`2yKkl+jA{ERqOxx3SIfMFr}7Ul
z4tKQLR5@Ar(9digoi=}#I}{z#!cW`0<Y!CfFyG)<R8%1=%Pog;ekone2XEUvt~s5z
zd}wov&{!3m*Mv3dJBg$p#{V?ew0}9?^^yx(Otiu(_5LXLSg?06!d7c$Ww=mXV4U)4
zJU8AJG?<a9bB(rg+=tcIE2|eFw+)OJx|<C<Z@xO=qHwOdUa_&{Ygx(gHJZHL;Hk_v
zb|uoC%DWv%7RfgLwMWf&A#s(3BF5;5kL$r`XE&}RSl;6xJhIrWLEx5gKCZdg-DOdO
ztnz#7F~KH#tn~qnr#Q!cF|PH_<u6E&qDLIqm)93OiYDZqC^N4$ds=GiWp2AUu(u_t
zns4uKd(VemsF?C?aqVmJ+9rI<Swq2<+r=*0NMG)>w}WpU_3cD=fd1?mNkpe^b;T=p
z#nMoV=DwP1?b!^=`YdDN`rP4VlLsd3pT~CUwp+ZvZ<#+<$anM9V}&2Jttim>o*lgR
zX*YjWudDbN>sC{I<Gt54SGU)eWV%+?dQ8%+caVA#F6uR%G+cV?2JE2}Ok37#eM()u
z+?Y3Lo8$C+B|C)RZ;2n&gz+Y|<B2QP2g_6GlbH{3(<O24lf7P&a!dD%)t-~r0k5W*
z&kcJLe&ZGOt*+`{KFqLeh(G$!ZXhOWOZ|s0v>pRS^>I$bD#wA$!6yMH$18raE<UZT
z(5nm1AGK-B<c?&U?NpsAh|aopvP;+HQs?}@rEFh6UJD_;+8QMB@n6T1oo>fci=<$9
z6Xuih8y`>{M%0|pb4<IGPJ_{-<8|pJtxr-e)c8PNP<=8b-W&7`+10Q@(Zn0F>WN(^
z(kz{_eAD&bQ{sg-$??{Kj%=&8rx`jY#{QLi4;y*;`hL(Z-o`GbA>=qFx73PtM^iZ5
uSd!RURO3n6mLZh<K2{nYyte7_TPy)XyV9)H8xKdC{wW-G7)!_C=ll(bqp1r3

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/sms_system_import_icon.png b/res/drawable-mdpi/sms_system_import_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..3b50dfef2da2cb5480e7bfdb92070464310a1599
GIT binary patch
literal 1511
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2nC-$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%qp275hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;Tteb3LXsBRjre|nk
zYG!7rqhMrUXryldL}t2%CRV0qRz~IuP@n{~ttchUD#*nRY8Q}atCUevQedU8UtV6W
zS8lAAUzDzIXlZE)GQ-G77pOwFxH7LKu|hYmSQ%!5OKNd)QD#9&W`3Rm$i&2?{L&Iz
zC7??oUdSzg8=F@Q4JKfK=~pBc=o{)8fV>1#=<ADLX>KlDb#X~hD#E>34K5C;EJ)Q4
zN-fSWElLJPT$(b-ssbzLqSVBa{GyQj{2W*)24v)y<QHe;7brLfn<;4cCMIX*fdn+c
zI(&VtJoAc667!N%JzZ>-fM)1rW~Nw~m>O6Z8@ss~Sh_hG8oHWTxR^RRIvYEgn;JQ~
znK@d*^t$9Hm*%GCmB93-!1S6J7~s?kN({LLK$~4si!#enQ{0O3a}~gzw#vlq78ji6
zLG`BKa*MH>D^9)oK*#8Vq82HtVM4(417gAxE|3FH`l)%q^j-u^*nX=lr!z1xMS8k8
zhE&{oGvll_OQOv2@@vbcmPf|4#!Oi}XUY`mr@HKXmrgWxb1z)-hcl1wiK=JN>E6|I
z1fI6ck;%DKRUiBK_mjZKnQ7%|^U~j*`S$14WwY~k#`~XJpMPID@BSYV-^(>G6YAn;
z%@9#)^-v7z*sgP+Fkc{radGnt);*Q3Cln;i1wS$L9W=U8vU`G!fYHzOEFleM0&IUD
z99x@xBrESS(>BMx=vJF%Yk|}q<}aezmrd4mdFUav`DOGqo;W|%8H~KUzNrWBuDheA
zGVy7Xv(~HYRR_ARpA+0voNJI98fPo;e#UE`^;{pV@4QS|rwVq1NYZJwhOCYG>redA
zRtPvEadv&j-lnA%wblo1PAs?{eCM9$I@Jcwx9g8OXiKEsa(6WTk#H-$;gB&~ps~=x
z<=Yl<-wZ7{^d*~pGTX$0v$e0dX9+s#&*j{`tm}h*P=~PLDvkS#T5kw0?)ox2qgP|g
zi3iu$HtPSf%oe-6fA>|VId5wj&TxL6?T~3_!75nbTYuic@c5aCnViP^6_+mzWyqV^
zXww+fo|tAj=ggmJGw&upP5Ga)&ORq+s>+#P86G@p9O`=e{mu!VeKv1D$F~EnLbVpB
zwt7SfZmvAvdiLM^U0+-~1cF+sO*B52s9Vl_%j7C{EXi`qy@QMz>9^7y7r$Q~AbWYK
zT8t;#+*YXzi671=M?EQyS&+?St@q=Jg6R|8d8V7ZgWrYRin0+bn{-Se;(AbW;sj-@
z>rzb5|EoL@>S5SFb)%(b(qyd~+ZC*>O=7$14!XZAKV!F6e)%3L{nZ*l9l)6G*q+bG
Z#_)LQLcT8&VJAREucxb@%Q~loCIE^zGiLw*

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/sms_selection_icon.png b/res/drawable-xhdpi/sms_selection_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..39c9888bd98b36542cd05f2ccc8b74c1cd4a2234
GIT binary patch
literal 2720
zcmaJ@4Lp-;8{aA9vu16C=xOtwBF20SV;Gx|Ii^)AsoBOB`>;LQ#6egTYUiAakoSa~
z<g<>DkF24TuRczM<j9Frl8>aF!^u0H^1koy_x3)&=Xvh?zJCAz|GKXGx_<ZboCxsW
zuA^zF34uU#e7uQ)%8{}BsH-X8{O4z>%E1661%W$xVW5a6U_uBCUMLgr;n2dFflL}B
zCh9KJ1p--Z%BBW^L1aH1oyS4bmN95Chp%KqATDlVK8+s11c6XyIGc+{PBk<m0X74V
z++$C+Ci6X+EVlPi0dwb3e=7ZG1l@^&baMq<#5kn@hY8XEF(;BM#EJ39kGeSJeA#S;
z1U^E*2t4xdpn}K&fG1DD1nkkamUL?j2Eby`7(06`7GnX}SYvFgtd%#`5@Uz6$Kq@p
zfKL}v=}o{0!vzw(KKW9v@JJR2@^MyHB9RC!vPJU*;Z_(YC#Pi%8yia{!crK+1!-bS
zt`PNEfyfln1#CXZ=5c{#MOr8?8pI=&k^Y?mhrc4r6@J<#<%U^_X?!aT+Il&q&p<Ny
z|3f*P6|@ixWd1we|0yh_#_*X|flMJUT0mD8E)2EoijVUYFliu9K;`iwKks4yiwE+A
zEFK^5+=&IYl4*1{ciCX}kwGToe7Hi8#-%fTh<Kz@1I=bLa72=)hm#Z5%i4)V!eB^t
zjzoI`!PC~m!QO`8g(WzB<`Q}IXbzJLe&#Y(xDM7|<SsV@hp+TZWD3|vm<%rgj{|&6
z8pr-}EW|JBed02{7z>v4MXr@H7^~&d{zs`lo0R>tJY8vA<zl7vnOtSR3zUuRoICFa
zfvkb~5D8TA!0Q8Ak#N$6eCK_>C9F~e!pHrDCJRo{rNR#?;<stIdZ$%x@I(06-OdIG
zl(_WJZ(BFm8B(kdXZT)%78b11J2+zyx8qy*S`MO!|6$X@funh%*CDYD&an##ceA+j
zM?^=)CpwpUI^AqffH)3(9=Mov8PG%!RVkMN^E3}t3IWcvXul|5pVE@ze1;wW0ks%d
z7o?~tPjXM}mp`J<_pGIGp%v9W(oxA<iSwOmwO3Go7`mDuy(nkO2eNY|nesx(rWDI|
zBl*nX;@VINKcmXlg5aewyvMlamYKY72<`jl8AVCX(o%~-2zqvhbR=gfhI3_`d7N)!
zWyjRdL6ztBA0Mv2FkIRKZ|$<S{JKK}6|6GDDEnb^Q`~hkw>ir;&+olxh(%ayx%kN8
z-i2__0BXej;=8cI(;fH*bx~LS9c-lD2eYSe1VK8oUNWxrUVom>?l_}e`|Rm$Yu8>B
z3|>U83szKTsU65p+Ssja{2&=Dy#Lp!z{bjH<Vd=_G^KeU%=45k_FX{6*5?~Xa^*uD
zn2Oa~i_)JQpF>7|h>tC9b6NBnF~NwE{9*Z=WFT6u_1J9a<TeiUH-Of3_$mUGc{-UJ
z(o}W~-OT%OI0T)T`nXiagBCVhBZ`5u=w^DS_+*<-Qz&Hfvx^=3FYhi<Z%8S^pOI1x
z&Puz`F(ZR@qKDVUp9Fe%B+t+9Q~R$1nWt$M1Q4iD(o@wEn*$W{kjl!t!ke`-dKM4*
zh%A4)H0h93i#~f$D*+mB-Z&WPJS~ZMX5%mV03D&rD>H1rn`P#=I1k?y0v@2(n9n-T
za&<q&ZpDSDvC`lOk2fx$C&~RK(2^r@*67pNpJ{6VckvgOMb%GX^rI}MobEZ^0)HRa
zzVS)E{44pU^ZnT~`?`eC*+Z`SbyS7p>CLX8GOzE{ch@~tJdv14U;=!bOxEMN*8`$%
zR-b*Re-zqfp&P3)HGac$EBuWyBQLuoA#=U1?Xf=h#@v`i$fLp2Q&QatSzVUY&*hQf
zC{bnAj*Rtxq<Nov5%cE!=HRZ;y^EE{@pTv8uj;8X#C3vgColf;%Z$QEGc2f!mTge@
z&xlcU`>IiuenKMY_Ic=^CO!HdQ)P7O{z-TdYP>!}X3%n>;J|rzBl~@IXD+?fwSTqN
z1Rk<wF+^N2jUE}4_oQUO>$XsSt=n^K;^E$eN~kN*IeGfh_Vc|kO?WIp>hs<(d_Z62
zh9pF94B5Rtf7kQ5UaiXFN%xXG)FRo@Uy;M-=cy8MSMO{J`<a`%4R;~>Lu%t#BdpjV
z;~#un6PlW?BS-C>eEhI9y<F!d0}=QQ)|&o`+~@Lr4Xk+0pl#-z^0JDW4O`Bc?;I-6
z6lxIgu9C;S4D8tMs#~e%6QWT+Ui<ZRcQ-nJcfKXd2-Ul#l(a6+v@!M0IxRQ-n){dc
zJUU|EHq?>x%~bf6sB>(??!cMvr?Dp)PgudXN1Ly`8E(~!Gd4Qj&!UwmOedb&&8zzr
z56MOGx8{EJSTYt7w1<XB)n-jEZ*tpjgq@vEb9rBI(z#qF{7KJo*t_>yb-Bafy2SJg
zz}Gzq@lbEoIh{!g!t|B*!-&WZ_G%se4XcYuiq(wQrp>-r)&{7i>LFUu76F9Ux8Ck;
zf|+}_%hF!hW3T@*s%^LXYW*`qglX_1u}^Fft6pvV9Cd%Jt|hXe)2lf1SiCdXU-p`t
zOjR{A`Q7Pu;$TnwbsVCtrS=7h3hf9mC){KAqzA;NGz~y&PhqqzcBxI@ytHqw?BR?3
zFnoKuyGqnTCBbxrHM-=xRw#M@ZrVV-D*Jaq7mzh@XvdSJ#pkmNr;3K%f74XEZrBjB
z<Tpab$F0!@umADxSO}-x{AQYt%<+#RX)DCFh9Gszxby5@;&jS%6126wXwv9pe?@3j
z)Sq*l{vTB_4da>zbpo_sZ?o@K)D;}Qx{#V@7PlEVeNPLDPvQVMtD&oDRcZAHCnxj?
zQe@0Ee)NDzQ3`#wal8{&e3j~0WE8W@uA!l2?e5@)PRGqZW+zZalRI+J1*Y=bnGOe9
zirUU(Sb`JloyG&fuzZ{D&PsQ~j7v{uSq}A$@#;zZon;nHwcGnPmL3ny95OI@<gS7$
zm~|LybhFtsQaq7Vkz82yXgnb7sr$M<WXP3+x}h>NR_#lA;k9?>V^HL)s|hFa!!K>1
zz*J;8Z?gv}dn!VSWM~Ukwyk*KZFeq<j*I+Dw)Kr(=3kJj`w6>loY37x&@Rmz&v@Vc
zfCN4m<SbQPKD7b;TS7xt)MQL!4PJAT-aDN)x>3($u;d!wFf~2H=<Fl-EbJDWw0gjR
zN|7GL&Q|4lMZn#Pf>q3nR=zwd2itwcH;G?C+>JHoa#Lzi%m0i%B!6Os$DyQu0iz&_
A;Q#;t

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/sms_system_import_icon.png b/res/drawable-xhdpi/sms_system_import_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..02c0239ae461bd1b8e95141e663fd47979d31901
GIT binary patch
literal 2079
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
Xcf{34Zz#7qe%WGSoS=!f<uCsQMZYTz

literal 0
HcmV?d00001

diff --git a/res/drawable-xxhdpi/sms_selection_icon.png b/res/drawable-xxhdpi/sms_selection_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..18e3dba254a4833cb284109c5d278fbb14a75c5c
GIT binary patch
literal 3525
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

literal 0
HcmV?d00001

diff --git a/res/drawable-xxhdpi/sms_system_import_icon.png b/res/drawable-xxhdpi/sms_system_import_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..dce3937eeb1aa0c4a54b809eda4244fe22f2d371
GIT binary patch
literal 2488
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
TYe%`W>0gRQWl(C!`_ujd^5zB=

literal 0
HcmV?d00001

diff --git a/res/drawable/light_touch_highlight_background.xml b/res/drawable/light_touch_highlight_background.xml
new file mode 100644
index 0000000000..805a3ef218
--- /dev/null
+++ b/res/drawable/light_touch_highlight_background.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:drawable="@color/light_button_highlight" />
+    <item android:drawable="@color/light_button" />
+</selector>
diff --git a/res/layout/reminder_header.xml b/res/layout/reminder_header.xml
new file mode 100644
index 0000000000..c6d345c376
--- /dev/null
+++ b/res/layout/reminder_header.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="fill_parent"
+              android:layout_height="wrap_content">
+    <LinearLayout android:id="@+id/container"
+                  android:orientation="horizontal"
+                  android:layout_width="match_parent"
+                  android:layout_height="wrap_content"
+                  android:gravity="center_vertical"
+                  android:background="?reminder_header_background">
+
+        <ImageView android:id="@+id/icon"
+                   android:layout_width="50dp"
+                   android:layout_height="50dp"
+                   android:src="@drawable/sms_selection_icon"
+                   android:padding="5dp"/>
+
+        <LinearLayout android:id="@+id/reminder"
+                      android:layout_width="0dp"
+                      android:layout_height="wrap_content"
+                      android:layout_weight="1"
+                      android:layout_margin="10dp"
+                      android:orientation="vertical">
+
+            <TextView android:id="@+id/reminder_title"
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"
+                      android:layout_marginBottom="5dp"
+                      android:textColor="@color/white"
+                      android:textSize="18sp"/>
+
+            <TextView android:id="@+id/reminder_text"
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"
+                      android:fontFamily="sans-serif-light"
+                      android:textColor="@color/white"
+                      android:textSize="16sp"/>
+
+        </LinearLayout>
+
+        <LinearLayout android:layout_width="wrap_content"
+                      android:layout_height="match_parent"
+                      android:gravity="right"
+                      android:layout_marginLeft="15dp"
+                      android:orientation="vertical">
+
+            <LinearLayout android:layout_width="wrap_content"
+                          android:layout_height="0dp"
+                          android:layout_weight="1"
+                          android:gravity="top">
+
+                <ImageButton android:id="@+id/cancel"
+                             android:layout_width="40dp"
+                             android:layout_height="40dp"
+                             android:padding="10dp"
+                             android:background="@drawable/touch_highlight_background"
+                             android:src="@drawable/ic_menu_remove_holo_light"/>
+            </LinearLayout>
+
+            <LinearLayout android:layout_width="wrap_content"
+                          android:layout_height="0dp"
+                          android:layout_weight="1"
+                          android:gravity="bottom">
+
+                <Button android:id="@+id/ok"
+                        android:layout_width="60sp"
+                        android:layout_height="40sp"
+                        android:gravity="center_vertical|center_horizontal"
+                        android:background="@drawable/light_touch_highlight_background"
+                        android:fontFamily="sans-serif-light"
+                        android:textColor="@color/white"
+                        android:text="@string/yes"
+                        android:padding="2dp"/>
+
+            </LinearLayout>
+
+          </LinearLayout>
+
+    </LinearLayout>
+</LinearLayout>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 7eb175e1a4..bd9bc663a4 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -57,6 +57,8 @@
     <attr name="navigation_drawer_icons" format="reference"/>
     <attr name="navigation_drawer_shadow" format="reference"/>
 
+    <attr name="reminder_header_background" format="color"/>
+
     <attr name="menu_new_conversation_icon" format="reference" />
     <attr name="menu_new_group_icon" format="reference" />
     <attr name="menu_search_icon" format="reference" />
diff --git a/res/values/colors.xml b/res/values/colors.xml
index b32daa4770..965eb54f1a 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -15,7 +15,8 @@
     <color name="textsecure_holo_blue_light">#ff33b5e5</color>
 
     <color name="touch_highlight">#400099cc</color>
-
+    <color name="light_button">#33ffffff</color>
+    <color name="light_button_highlight">#66ffffff</color>
     <color name="conversation_item_sent_background_dark">#ff284e0a</color>
     <color name="conversation_item_sent_background_light">#ff64a926</color>
     <color name="conversation_item_sent_shadow_light">#ffd5d5d5</color>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index c7f5774ac8..cced6800e6 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -856,6 +856,11 @@
     <!-- verify_keys -->
     <string name="verify_keys__menu_verified">Verified</string>
 
+    <!-- reminder_header -->
+    <string name="reminder_header_sms_default_title">Use as default SMS app?</string>
+    <string name="reminder_header_sms_default_text">TextSecure is not currently your default SMS app.</string>
+    <string name="reminder_header_sms_import_title">Import system SMS?</string>
+    <string name="reminder_header_sms_import_text">TextSecure can copy your phone\'s SMS messages into its encrypted database.</string>
     <!-- EOF -->
 
 </resources>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 7adfe3a62b..0c64d4f0c6 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -79,6 +79,8 @@
         <item name="menu_info_icon">@drawable/ic_dialog_info_holo_light</item>
         <item name="menu_forward_icon">@drawable/ic_action_forward_holo_light</item>
         <item name="menu_save_icon">@drawable/ic_action_save_holo_light</item>
+
+        <item name="reminder_header_background">#ff5a8800</item>
     </style>
 
     <style name="TextSecure.LightTheme.NavigationDrawer"
@@ -160,6 +162,8 @@
         <item name="menu_info_icon">@drawable/ic_dialog_info_holo_dark</item>
         <item name="menu_forward_icon">@drawable/ic_action_forward_holo_dark</item>
         <item name="menu_save_icon">@drawable/ic_action_save_holo_dark</item>
+
+        <item name="reminder_header_background">#ff385400</item>
     </style>
 
     <style name="TextSecure.DarkTheme.NavigationDrawer"
diff --git a/src/org/thoughtcrime/securesms/ConversationListActivity.java b/src/org/thoughtcrime/securesms/ConversationListActivity.java
index 29a0ae2e11..17d528ccfa 100644
--- a/src/org/thoughtcrime/securesms/ConversationListActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationListActivity.java
@@ -85,8 +85,6 @@ public class ConversationListActivity extends PassphraseRequiredSherlockFragment
     super.onResume();
     dynamicTheme.onResume(this);
     dynamicLanguage.onResume(this);
-
-    initializeDefaultMessengerCheck();
   }
 
   @Override
@@ -296,15 +294,6 @@ public class ConversationListActivity extends PassphraseRequiredSherlockFragment
     this.fragment.setMasterSecret(masterSecret);
   }
 
-  private void initializeDefaultMessengerCheck() {
-    if (!TextSecurePreferences.hasPromptedDefaultSmsProvider(this) && !Util.isDefaultSmsProvider(this)) {
-      TextSecurePreferences.setPromptedDefaultSmsProvider(this, true);
-      Intent intent = new Intent(Telephony.Sms.Intents.ACTION_CHANGE_DEFAULT);
-      intent.putExtra(Telephony.Sms.Intents.EXTRA_PACKAGE_NAME, getPackageName());
-      startActivity(intent);
-    }
-  }
-
   class DrawerToggle extends ActionBarDrawerToggle {
 
     public DrawerToggle(Activity activity, DrawerLayout drawerLayout,
diff --git a/src/org/thoughtcrime/securesms/ConversationListFragment.java b/src/org/thoughtcrime/securesms/ConversationListFragment.java
index f875bdd90e..887f174333 100644
--- a/src/org/thoughtcrime/securesms/ConversationListFragment.java
+++ b/src/org/thoughtcrime/securesms/ConversationListFragment.java
@@ -16,21 +16,33 @@
  */
 package org.thoughtcrime.securesms;
 
+import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.ProgressDialog;
 import android.content.DialogInterface;
+import android.content.Intent;
 import android.database.Cursor;
 import android.os.AsyncTask;
+import android.os.Build;
+import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
+import android.provider.Telephony;
 import android.support.v4.app.LoaderManager;
 import android.support.v4.content.Loader;
+import android.text.TextUtils;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
+import android.widget.Button;
 import android.widget.CursorAdapter;
+import android.widget.ImageButton;
+import android.widget.ImageView;
 import android.widget.ListView;
+import android.widget.TextView;
 
 import com.actionbarsherlock.app.SherlockListFragment;
 import com.actionbarsherlock.view.ActionMode;
@@ -43,9 +55,11 @@ import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.loaders.ConversationListLoader;
 import org.thoughtcrime.securesms.notifications.MessageNotifier;
 import org.thoughtcrime.securesms.recipients.Recipients;
+import org.thoughtcrime.securesms.service.ApplicationMigrationService;
 import org.thoughtcrime.securesms.util.Dialogs;
+import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.whispersystems.textsecure.crypto.MasterSecret;
-import org.whispersystems.textsecure.util.Util;
+import org.thoughtcrime.securesms.util.Util;
 
 import java.util.Set;
 
@@ -57,12 +71,20 @@ public class ConversationListFragment extends SherlockListFragment
   private ConversationSelectedListener listener;
   private MasterSecret                 masterSecret;
   private ActionMode                   actionMode;
-
+  private View reminderView;
   private String queryFilter = "";
 
   @Override
   public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle bundle) {
-    return inflater.inflate(R.layout.conversation_list_fragment, container, false);
+    final View view = inflater.inflate(R.layout.conversation_list_fragment, container, false);
+    reminderView = LayoutInflater.from(getActivity()).inflate(R.layout.reminder_header, null);
+    return view;
+  }
+
+  @Override
+  public void onDestroyView() {
+    super.onDestroyView();
+    getListView().setAdapter(null);
   }
 
   @Override
@@ -70,12 +92,21 @@ public class ConversationListFragment extends SherlockListFragment
     super.onActivityCreated(bundle);
 
     setHasOptionsMenu(true);
+    getListView().setAdapter(null);
+    getListView().addHeaderView(reminderView);
     initializeListAdapter();
     initializeBatchListener();
 
     getLoaderManager().initLoader(0, null, this);
   }
 
+  @Override
+  public void onResume() {
+    super.onResume();
+
+    initializeReminders();
+  }
+
   @Override
   public void onAttach(Activity activity) {
     super.onAttach(activity);
@@ -132,7 +163,7 @@ public class ConversationListFragment extends SherlockListFragment
   }
 
   public void resetQueryFilter() {
-    if (!Util.isEmpty(this.queryFilter)) {
+    if (!TextUtils.isEmpty(this.queryFilter)) {
       setQueryFilter("");
     }
   }
@@ -147,6 +178,7 @@ public class ConversationListFragment extends SherlockListFragment
         }
         return false;
       }
+
       @Override
       public boolean onQueryTextChange(String newText) {
         return onQueryTextSubmit(newText);
@@ -170,6 +202,21 @@ public class ConversationListFragment extends SherlockListFragment
     });
   }
 
+  private void initializeReminders() {
+    final boolean isDefault = Util.isDefaultSmsProvider(getActivity());
+    if (isDefault) {
+      TextSecurePreferences.setPromptedDefaultSmsProvider(getActivity(), false);
+    }
+
+    if (!isDefault && !TextSecurePreferences.hasPromptedDefaultSmsProvider(getActivity())) {
+      showDefaultSmsReminder();
+    } else if (isDefault && !ApplicationMigrationService.isDatabaseImported(getActivity())) {
+      showSystemSmsImportReminder();
+    } else {
+      reminderView.findViewById(R.id.container).setVisibility(View.GONE);
+    }
+  }
+
   private void initializeListAdapter() {
     this.setListAdapter(new ConversationListAdapter(getActivity(), null, masterSecret));
     getListView().setRecyclerListener((ConversationListAdapter)getListAdapter());
@@ -292,6 +339,79 @@ public class ConversationListFragment extends SherlockListFragment
     actionMode = null;
   }
 
+  @TargetApi(VERSION_CODES.KITKAT)
+  private void showDefaultSmsReminder() {
+    final ViewGroup container = (ViewGroup) reminderView.findViewById(R.id.container);
+
+    setReminderData(R.drawable.sms_selection_icon,
+                    R.string.reminder_header_sms_default_title,
+                    R.string.reminder_header_sms_default_text,
+                    new OnClickListener() {
+                      @Override
+                      public void onClick(View v) {
+                        TextSecurePreferences.setPromptedDefaultSmsProvider(getActivity(), true);
+                        Intent intent = new Intent(Telephony.Sms.Intents.ACTION_CHANGE_DEFAULT);
+                        intent.putExtra(Telephony.Sms.Intents.EXTRA_PACKAGE_NAME, getActivity().getPackageName());
+                        startActivity(intent);
+                      }
+                    },
+                    new OnClickListener() {
+                      @Override
+                      public void onClick(View v) {
+                        TextSecurePreferences.setPromptedDefaultSmsProvider(getActivity(), true);
+                        container.setVisibility(View.GONE);
+                      }
+                    });
+    container.setVisibility(View.VISIBLE);
+  }
+
+  private void showSystemSmsImportReminder() {
+    final ViewGroup container = (ViewGroup) reminderView.findViewById(R.id.container);
+
+    setReminderData(R.drawable.sms_system_import_icon,
+                    R.string.reminder_header_sms_import_title,
+                    R.string.reminder_header_sms_import_text,
+                    new OnClickListener() {
+                      @Override
+                      public void onClick(View v) {
+                        Intent intent = new Intent(getActivity(), ApplicationMigrationService.class);
+                        intent.setAction(ApplicationMigrationService.MIGRATE_DATABASE);
+                        intent.putExtra("master_secret", masterSecret);
+                        getActivity().startService(intent);
+
+                        Intent nextIntent = new Intent(getActivity(), ConversationListActivity.class);
+                        intent.putExtra("master_secret", masterSecret);
+
+                        Intent activityIntent = new Intent(getActivity(), DatabaseMigrationActivity.class);
+                        activityIntent.putExtra("master_secret", masterSecret);
+                        activityIntent.putExtra("next_intent", nextIntent);
+                        getActivity().startActivity(activityIntent);
+                      }
+                    },
+                    new OnClickListener() {
+                      @Override
+                      public void onClick(View v) {
+                        ApplicationMigrationService.setDatabaseImported(getActivity());
+                        container.setVisibility(View.GONE);
+                      }
+                    });
+    container.setVisibility(View.VISIBLE);
+  }
+
+  private void setReminderData(int iconResId, int titleResId, int textResId, OnClickListener okListener, OnClickListener cancelListener) {
+    final ImageButton cancel = (ImageButton) reminderView.findViewById(R.id.cancel);
+    final Button      ok     = (Button     ) reminderView.findViewById(R.id.ok);
+    final TextView    title  = (TextView   ) reminderView.findViewById(R.id.reminder_title);
+    final TextView    text   = (TextView   ) reminderView.findViewById(R.id.reminder_text);
+    final ImageView   icon   = (ImageView  ) reminderView.findViewById(R.id.icon);
+
+    icon.setImageResource(iconResId);
+    title.setText(titleResId);
+    text.setText(textResId);
+    ok.setOnClickListener(okListener);
+    cancel.setOnClickListener(cancelListener);
+  }
+
 }
 
 
diff --git a/src/org/thoughtcrime/securesms/RoutingActivity.java b/src/org/thoughtcrime/securesms/RoutingActivity.java
index e942933d68..652353706e 100644
--- a/src/org/thoughtcrime/securesms/RoutingActivity.java
+++ b/src/org/thoughtcrime/securesms/RoutingActivity.java
@@ -18,10 +18,9 @@ public class RoutingActivity extends PassphraseRequiredSherlockActivity {
 
   private static final int STATE_CREATE_PASSPHRASE        = 1;
   private static final int STATE_PROMPT_PASSPHRASE        = 2;
-  private static final int STATE_IMPORT_DATABASE          = 3;
-  private static final int STATE_CONVERSATION_OR_LIST     = 4;
-  private static final int STATE_UPGRADE_DATABASE         = 5;
-  private static final int STATE_PROMPT_PUSH_REGISTRATION = 6;
+  private static final int STATE_CONVERSATION_OR_LIST     = 3;
+  private static final int STATE_UPGRADE_DATABASE         = 4;
+  private static final int STATE_PROMPT_PUSH_REGISTRATION = 5;
 
   private MasterSecret masterSecret   = null;
   private boolean      isVisible      = false;
@@ -84,7 +83,6 @@ public class RoutingActivity extends PassphraseRequiredSherlockActivity {
     switch (state) {
     case STATE_CREATE_PASSPHRASE:        handleCreatePassphrase();          break;
     case STATE_PROMPT_PASSPHRASE:        handlePromptPassphrase();          break;
-    case STATE_IMPORT_DATABASE:          handleImportDatabase();            break;
     case STATE_CONVERSATION_OR_LIST:     handleDisplayConversationOrList(); break;
     case STATE_UPGRADE_DATABASE:         handleUpgradeDatabase();           break;
     case STATE_PROMPT_PUSH_REGISTRATION: handlePushRegistration();          break;
@@ -101,15 +99,6 @@ public class RoutingActivity extends PassphraseRequiredSherlockActivity {
     startActivityForResult(intent, 2);
   }
 
-  private void handleImportDatabase() {
-    Intent intent = new Intent(this, DatabaseMigrationActivity.class);
-    intent.putExtra("master_secret", masterSecret);
-    intent.putExtra("next_intent", getPushRegistrationIntent());
-
-    startActivity(intent);
-    finish();
-  }
-
   private void handleUpgradeDatabase() {
     Intent intent = new Intent(this, DatabaseUpgradeActivity.class);
     intent.putExtra("master_secret", masterSecret);
@@ -202,9 +191,6 @@ public class RoutingActivity extends PassphraseRequiredSherlockActivity {
     if (masterSecret == null)
       return STATE_PROMPT_PASSPHRASE;
 
-    if (!ApplicationMigrationService.isDatabaseImported(this))
-      return STATE_IMPORT_DATABASE;
-
     if (DatabaseUpgradeActivity.isUpdate(this))
       return STATE_UPGRADE_DATABASE;