From 927aac2c4a820fb5cebdef6cb0f071ee701a79b6 Mon Sep 17 00:00:00 2001
From: Carlin <cb@viennan.net>
Date: Fri, 24 Jul 2015 03:16:45 +1200
Subject: [PATCH] Add button to toggle passphrase visibility

closes #3776
// FREEBIE
---
 .../ic_visibility_grey600_24dp.png            | Bin 0 -> 366 bytes
 .../ic_visibility_off_grey600_24dp.png        | Bin 0 -> 560 bytes
 .../ic_visibility_off_white_24dp.png          | Bin 0 -> 528 bytes
 .../ic_visibility_white_24dp.png              | Bin 0 -> 472 bytes
 .../ic_visibility_grey600_24dp.png            | Bin 0 -> 250 bytes
 .../ic_visibility_off_grey600_24dp.png        | Bin 0 -> 387 bytes
 .../ic_visibility_off_white_24dp.png          | Bin 0 -> 356 bytes
 .../ic_visibility_white_24dp.png              | Bin 0 -> 310 bytes
 .../ic_visibility_grey600_24dp.png            | Bin 0 -> 458 bytes
 .../ic_visibility_off_grey600_24dp.png        | Bin 0 -> 706 bytes
 .../ic_visibility_off_white_24dp.png          | Bin 0 -> 652 bytes
 .../ic_visibility_white_24dp.png              | Bin 0 -> 581 bytes
 .../ic_visibility_grey600_24dp.png            | Bin 0 -> 650 bytes
 .../ic_visibility_off_grey600_24dp.png        | Bin 0 -> 1019 bytes
 .../ic_visibility_off_white_24dp.png          | Bin 0 -> 919 bytes
 .../ic_visibility_white_24dp.png              | Bin 0 -> 846 bytes
 res/layout/prompt_passphrase_activity.xml     |  35 +++++++++++++-
 res/values/attrs.xml                          |   2 +
 res/values/themes.xml                         |   4 ++
 .../securesms/PassphrasePromptActivity.java   |  43 +++++++++++++++++-
 20 files changed, 81 insertions(+), 3 deletions(-)
 create mode 100644 res/drawable-hdpi/ic_visibility_grey600_24dp.png
 create mode 100644 res/drawable-hdpi/ic_visibility_off_grey600_24dp.png
 create mode 100644 res/drawable-hdpi/ic_visibility_off_white_24dp.png
 create mode 100644 res/drawable-hdpi/ic_visibility_white_24dp.png
 create mode 100644 res/drawable-mdpi/ic_visibility_grey600_24dp.png
 create mode 100644 res/drawable-mdpi/ic_visibility_off_grey600_24dp.png
 create mode 100644 res/drawable-mdpi/ic_visibility_off_white_24dp.png
 create mode 100644 res/drawable-mdpi/ic_visibility_white_24dp.png
 create mode 100644 res/drawable-xhdpi/ic_visibility_grey600_24dp.png
 create mode 100644 res/drawable-xhdpi/ic_visibility_off_grey600_24dp.png
 create mode 100644 res/drawable-xhdpi/ic_visibility_off_white_24dp.png
 create mode 100644 res/drawable-xhdpi/ic_visibility_white_24dp.png
 create mode 100644 res/drawable-xxhdpi/ic_visibility_grey600_24dp.png
 create mode 100644 res/drawable-xxhdpi/ic_visibility_off_grey600_24dp.png
 create mode 100644 res/drawable-xxhdpi/ic_visibility_off_white_24dp.png
 create mode 100644 res/drawable-xxhdpi/ic_visibility_white_24dp.png

diff --git a/res/drawable-hdpi/ic_visibility_grey600_24dp.png b/res/drawable-hdpi/ic_visibility_grey600_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..619b076ea4aa5adfc3dc262972a4c3e7af8d3afc
GIT binary patch
literal 366
zcmV-!0g?WRP)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD0003sNkl<ZcmeHI
zHDUrm6pg#Pdvb-P<{H#Ux$@sEB^O{zYU)S_Egct#RPm&W=K@ju&&Knc$e(89eV3{G
zr{71aJH9{$8Sw?x{Urfby9!Yndw8f>dz4lotNp`5Fa{4-cz9)9!Nb_QLK016;|34!
ztQ)cuO>c;ChLH2IY`}v@8$R(lXXq6%_6iOe^jyUv&E?lfvx?!Iy&u{uFXd+nrwq2^
z%=#>z#SX)qswoXZo!DZK3wNgUV!(n$M)Bm%;DX_{sFMjoibsH=1-4$5Dc`7!+glJE
z<w&Gz?Fr(ZJ>C{$gDktv7Gs55c6(33s-V1P&srgB0X^+1P(ZI~=zP^4ogrDcxAl9n
z3ks6H`=FR0QP%{5EtGz-f)r{Ip{5lYBSM2sWYmfbe}V7lx6wa60!S2;i(vnJYXATM
M07*qoM6N<$f*hZpHUIzs

literal 0
HcmV?d00001

diff --git a/res/drawable-hdpi/ic_visibility_off_grey600_24dp.png b/res/drawable-hdpi/ic_visibility_off_grey600_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..e6bddf2ef74062c9f17cdc2bc520de3371b9705a
GIT binary patch
literal 560
zcmV-00?+-4P)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD0005^Nkl<ZcmeIy
zHGJJb3<mI5W@cuFskoIH=X5Qztxrz2xBo&*8K*MCm`vqPWoBk(u0oc44sWe)dy@b5
z`+Vob|0;b2{nA=g1~ULpakdgD<lq;6MX6+MuY*6BhNgDq2Bm`1THvgvXgb#527ZOs
zb=u4+%j=YpqM7)DUyk(xnP^=$YPyS(^@_Y?_2MJ{p{S{Nid~$6OxlfC2FvxE$1q+`
z+>{Y#>~m`HJUms@Ew878;r4hWZAIzwJK=(wxyS9z$l`|i`8cR#O<q7l^Z$HDJX160
zsGfp&y+K}wDNMj8J`^;P+~%6el_7>k;b*u>@2CsTS_+5rvchWx{iIQa5Kfu99Efg)
zU_3tZFuCncJxxdR86F);CtLWX_+_a1GM{1R^Ph=E*#>9G?_MPKx-rn0f{c!u#!k6l
zn0qr|kAY6dhK<*AYRDyr9aI%O)nW6<@MmPDd8WCNN+UiLrD(D`gBudzqIx)|sAoaP
z{LWA;$5Nb)q0T1jM~}!oMP2Ya*)M~o_#t(1AKF`rddl-8D=F%NSDNB0=$3Go-yFG-
zFVAjdA{+bZoy{u#izH3*<j(G;sgeq<k%<=-r=*tG;S}18>*njTm1d!vj=hw{4N|+(
yP#R7H7dLdj!3tI7Q&0WA6@-M!2?iwoh58MBOQggVNiGKf0000<MNUMnLSTZsq7T~u

literal 0
HcmV?d00001

diff --git a/res/drawable-hdpi/ic_visibility_off_white_24dp.png b/res/drawable-hdpi/ic_visibility_off_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..e03a5d234914977992ff3441c607678fc7eeca3e
GIT binary patch
literal 528
zcmV+r0`L8aP)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD0005kNkl<Zcmd_s
zGn`ye6oBy)+qSJXw%x|6WA(qNPRiI$9Xm~&%zB$x8{7G!TikPg_r2YnnQp$*4gSv%
z(li+Xb*ElBpkBP-7WGnxP6Gs}dh}ud{pd;Ul0o&jZK$an;xT>?Ilv66$3sGW5{jD4
zH$r`215M%}p+N~L_{d7iMMFYQeky7b5820R*0P`H=q}JW3hKr~fQa2*fjK<G?=Brf
zP)CaJyN#uUrexvwh}IUWMIk_ts?0+Ax!*N2i_4~(hW4U+si<*$;e<Pr=Aql{Lu1fA
zrzr_6b=>VMyW0ohpfV)T?MG-3p!y;R2hm-@L1VG4K@e7gqv|_q0fMj&+pz!8Xl!c{
zgcV?@$`R0T+@{?OY?{yyH09=S)TRl;u{*m0f^a-QmEjq>f&Ss&fo=|hP@7``YNEOZ
zHz7V$gFO76(bRp@hh;1!p{PlYf`mOGg?2o_FN<dC&Y&oFXLv}<&_&ys`}h?xj|zyJ
z7Q8l8A?>4XBTczvcRL4J$2yMi1{VoOm5+NIm1iX%iB3}%GSigxye};!gr_>w*=P3I
zL-sSBcI1R8A%1Gnoxb#^hxa&YNVcL<cw{Ro6-a167Enajlpsf)rbkA+AN>YLWU`s@
S+q;nf0000<MNUMnLSTY<GxIqB

literal 0
HcmV?d00001

diff --git a/res/drawable-hdpi/ic_visibility_white_24dp.png b/res/drawable-hdpi/ic_visibility_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..d531d666fc23732a3d75f62411e6009bbd80e44a
GIT binary patch
literal 472
zcmV;}0Vn>6P)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD0004>Nkl<ZcmeIx
z1L$2*9KiA46rNw0ZReiCyk&D%=8Rmk6=!cZ*A(Y4{=KEycK)tT_x8^3+~+ua^6?Kx
z{yzVaW;_K7j3+IPAi-QbUSfN}S>_U#TG5w%{Ggog?4^%XLs!=Fi)wzdny!`Kaue+n
z9$Q(@Y2Kk-r&qaS#_$~5TNcwzd~{<zZ?HXOq=YfdS=LH_anPF<Y_Av`uF^wnZ-ZmV
zv6K}Q#Gnsvv2_p=8^_TWo6!^(2wWm%#ulO-wvU+>O0mfe7qDIQbM+2wa&Sy1?xT5r
zP_CRAKZ|xJIA{j0t!8{Fu4QI?1Fq@i4q9)<SClzuBd%#dX!p=goACm!tQq&vZcBhE
zXz%=FU&40YPxgDXiBiN7wE2GdFBXp>X~q_#9S|FFI<UQ=w;1GD#xk<OZ*+>^MpQJ0
z@CsWCeZrrbHf%2#C}E7`DYmyPRG)US^P0yDm(u9X^-$W+vVo0wyhpo24=InXtmFsP
zd}ldbq#Am&i*J<kjh*zAS`lLwr<|NU;S{roNh3%ymOOdJkdXiWI==xr9J3-CL_xX$
O0000<MNUMnLSTZF8rTW|

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/ic_visibility_grey600_24dp.png b/res/drawable-mdpi/ic_visibility_grey600_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..9d554fe3de950c6e216efd0135cd02929f464ae9
GIT binary patch
literal 250
zcmV<W00sYvP)<h;3K|Lk000e1NJLTq000;O000;W1ONa4N`Cco0002NNkl<ZcmZP=
zj-Y|1*tjgQtP}_ni;Wvt@G34<E}2~VzVts5d=C^+#;Q1twY0VLCqgL#0!3TXSkaUh
z2$UXxE7(-#Si)VxUFKN22`+Y^Kmgg@T%{*qQYF>M29;F9wVY_+f(w_;L6{EI&Q{u4
z`V<H|8`u~a5Vn-fftlijaBrC-P)R$S-wrg)5g}XR1PPl%NE&#7N}j=a&wxB$B<~+0
zSp&&VBGJ<%2P=sYM_$q(ocKy7l`4~#yoVtG0Q(3oFoJWRM*si-07*qoM6N<$g3+5^
Au>b%7

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/ic_visibility_off_grey600_24dp.png b/res/drawable-mdpi/ic_visibility_off_grey600_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..08dcac59fa2be04157001d75797c630e7d7185b2
GIT binary patch
literal 387
zcmV-}0et?6P)<h;3K|Lk000e1NJLTq000;O000;W1ONa4N`Cco0003>Nkl<Zcmd6l
zC0GPO7={;j>+yQpic7^wxK?E68{FNk;81Ye=i(Mz`a@4>x`w2)m6^pIzDd8lGrx@R
zPeqd;w*-CwfDAhn6>0I5MC4J4f)+|*i}$lYOCS^-!6fY5v5|3DUPa1$$U5w%^MKAW
zpGQDV1omN9krr=6ksuO8<6t$Q-HLGY{ikX`MOcK?8~#(yPZkXKor+|6VF<k~zJkDB
zp)+i#cEgzp#Xy$O?Tp5;D2Z3^KVYuvu$DmF>j)im0wFAleK&x8?u8I%$|dYNVg|^8
z`a(Ph#5phM=G&K|xoCpk#f;&!I%npKUR<!ku%^Z4pB*cyXRG88b*xMk;n-!b&^QuQ
z9Y#{vkZFs$I8J3g=)?o;{NZ|eUa*jH*i6YcIAh4OYVnptT1Y{vNRA}7cyd4az0wew
hdESG_G)ed+IRFE6J(Qz|H>dyr002ovPDHLkV1gSguPFck

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/ic_visibility_off_white_24dp.png b/res/drawable-mdpi/ic_visibility_off_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..fb21efe6d9e33ca059a00d2924f9c04ecffd7f35
GIT binary patch
literal 356
zcmV-q0h|7bP)<h;3K|Lk000e1NJLTq000;O000;W1ONa4N`Cco0003iNkl<ZcmciC
z#eo(<5P;EM-}x7Z6gCCiU86t)z}?}BySv*7cb6k!ASav$3)6+We06>^-93{0;`}c#
z$T7vQfa5q-l6pN&Fv|?%bXWIvP&gZ83q+5s)BLqPRGcYEtwTQTg(d1f2c6sirxogS
z)u2%?hvhD5_c3Vg9t24-ljLqF0@x$>v?R4QTA@L5RBlrS!$k%=6J(#|lHMZy-h<mB
z4GJ%C<{eolsfb*94{nGwN*+^^8cEZaV6aFp$x4EJx}?5&)7#|^OB$^3$g`5v#o=z2
zGH4R}FiC#;XFeg<6#^t3T$MYjw~C5U;x6WE`}yl#Z>bl))>(zGe-E0i^$4Pe?gt6*
z>D20KjOk_=ql;P<XM_CQ7gv%K0e*^{(Eoq^1l|D3Wcn-ee(`(&0000<MNUMnLSTX>
Cgq$w`

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/ic_visibility_white_24dp.png b/res/drawable-mdpi/ic_visibility_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..0e8e507f213398e3d59540a950821f0f513aef84
GIT binary patch
literal 310
zcmV-60m=S}P)<h;3K|Lk000e1NJLTq000;O000;W1ONa4N`Cco0002}Nkl<Zcmdtg
zwOy=16hQHLhC3bL9pJ8gU@>kn?(Pl|P6g=0DP=7~4;Q(=^(|okpPrFyOfVvZT<YnP
zt4{v@1zw!N5_VkKStQ-};!p;8#g`Wb2=QE=$Te!0Ji_G4XCHM*f^i~>M^vM6K?~}R
zNTb+B?Mj6)g9AHLgi0Nv)^&LmPI=NZs7a{;oXX56u5k*JcA#uh5jg$#y}^#M`rc51
zQ@->RYD}sSr&9Bc4b;9=D3jQ*GDe8hF>1vqBDq7g7#Fmou8A;CByfp3q<{#y3OPod
z66byB`gp;YXL|5`2uWoQ8?LO(kZc0sFIm*kDOZjB{WU@81L^a(3*?i%`Tzg`07*qo
IM6N<$f{NvaivR!s

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/ic_visibility_grey600_24dp.png b/res/drawable-xhdpi/ic_visibility_grey600_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..b121c9ae2967d12a6f905c37e49ec1abd2ea1e34
GIT binary patch
literal 458
zcmV;*0X6=KP)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0004zNkl<ZcmeHJ
zB|tP`5dGa1;x*jsHC%hz?eYA+x029)y(cuH1$S$>J0#ql^BWvKY~QqzH!EZBG-%N9
zEFk~2=SW4ULLa8Fc`DQBLzPry&yoM$liK)|iBba&a7+shqy{D$zut*F@0V1Bl>kag
zR-~f5U$<j_4?&uz>1a9i7T&$TA-fukIvn3Y>eS#H(6a=L5y87CfnbkfKiN-v6a<uD
zm+%^63D?o5v-QA0R<4Bkdn#e9obX&{=~vO~u}M@4F7uZ_RM;ldUsmt&SSEfSP47+-
z7=dLuo^Z8(#~|Tc;V#=R%!D><oJt!r<$ZbQ1S*KALF@OxXK@gYdkA%=*P+kH(r48<
z6NF-qcyEUvJ(6%lBq(urbbr9_?00oAN{GlKB>5)jq$-<<POFi!!ssjwk+gPt(`VAH
zV~cRw+emxch1C{8M<dgdppkZwemm`Jq<zi#_kPpSXylQA!zbeKlR1<rheqQtDjt2<
zaTwPe77mA%$zkbpI9u+1c=10Sc^tnQG-%*}6Mz?b4T?vbI{*Lx07*qoM6N<$g1vas
AbN~PV

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/ic_visibility_off_grey600_24dp.png b/res/drawable-xhdpi/ic_visibility_off_grey600_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..a666da5cd6428b31ce07650c1b9eb93f73e5d3da
GIT binary patch
literal 706
zcmV;z0zLhSP)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0007sNkl<ZcmeH}
z1F#)U5QXQDZKoL9wq1&yGM~3k@4cn47&~PnEXKBT-z&w=AKRX29;bKr*{92MX1>Mg
znpUMMRc<Q2DGsA$ULJo98V~Xefy2<yd5AzuJdhDiJ)VqZ*v(h*65sFv_YlEuUgC^(
zYvuw1Yw#T!a((BcG&8zlju1{gM4)}^882B-EeD8jUA`26(EJcH)PLDV#Mi+^=)l?^
zuB(ET&=rrMGa^E@X+6*4)>M_MI&ClmTku6d+@wy*UpyRdjX5B+p%%2=M$kJNp}a-I
zgy)hFMhqcgAE>wTdM3QG?12cu|J3a$S*z1^%W5IqnmB;d6tkd$GQtkQe<i-M1;7Tu
z_yhk7h*Qvr#5Xnjn&Ybw+m#uQAB>*@V6PNfw<ev0ro`k9#uj1cPYhOR^dFMM_L--Y
zHv-Wn8Z)7VI+r#*<DsQ;JDb*flMxYJ11E6WbWSU1u|}l=jzb32RDXrn&;nw2ay%dd
zj->!_Otx@!v;I~}6j%2L(D78jDA|(G%B-LE>kDoTE!G5;Dx4FaVWwG)_G>+!Cmx@q
z{tJ%j7W2I;Qld8k8^xIR&)CT;1>09NPZ<d!UWm9_IB)ITWKR{9aYaDvP(}+XPz+Av
zJznE&AmU1N4Q0#ih^Io55O5{gh}WSON*49T2jODR8sZ}jQ{JKx^iD|A_D~B8@xO?8
zOGA{us1t752z<d7%y8OJRkx<w8FR58Kg8eNO$94l7yF^JQdyq{|HBM^n70VEpc*g1
zvphtY4xY(JeMZM0e3TNb-<?&tHJ!1%1iKNzJ$%4dyyUCAi&tV2H8A(VgFK(iiy7ju
oQhABEW(Jx(LL4^7m#Pry7yD_Fl9c5L{r~^~07*qoM6N<$g3oq9YybcN

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/ic_visibility_off_white_24dp.png b/res/drawable-xhdpi/ic_visibility_off_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..03d0e65b1891adc28c667e903911272a5fda39df
GIT binary patch
literal 652
zcmV;70(1R|P)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+00070Nkl<ZcmeI#
zGn`ye07mf_+qP{dUF;@S9kZ`vvy7c8ZEV}N&B2aNbbqV+<<5(F25<adU986sKK*0B
zf1oTosQKf7vRnf0QS(OuI{*yvLx7sx*94^*!aTNfowp>2@`@{LVKxIP;S(^YT9Q~q
z0v#mS$4CnJ0u1rMB8qSfcQ2VjVSj)}ZAly@S<e_o77f_MeFu?nAX_Qz2WZ1Xu!zFU
zr8nisLJlg@o0WvIdq~S<Ku<yd7Ga;tu>rdPU0pyoQUEj|PNRvFxiB5k08I&?auas1
zsIPz`+yqEM6k-oYnLsW)b5cL3D-^JSwb(_(UsPd^0H-Nu?w2P8yCs={Zm8B$lY5%r
z6gkcPRjAsL29S;OsQThLi1FrLUsNZ^k_HSxSJ6y^0ZAM&w=1LTmj)a`m(6@c1O&0$
z+{%USKpJomT@LdRVf`0njycdBP6PToe?%TfK@z@yL|Hh6s<-)w3E&_GqB>31G{B<+
zs+Flf<<kygA*%M72ih|1!l}cl9H%}@6c+2nQhOv9;3{_O@ysa~<2gc*Ag_}WS14!$
z9u0Vf-DvZy-X5rhRZVv0)KM%WaY58_5Fy&T7M!jGu-ia+i+CuB0G*R9nJsyMT?(t{
zOJ#DAgQ^T>BQdauqBQlh`7O;>d?g5<yX!0r<Jos0G+<7JnZ%24Cp=uI{0wI=33L!=
zH{->6ApqB@I0Kl;W-jrP2ytF>mCekiAI0(XlH?z7pXAW{5r7_g2KfHOj_(MF&HqKp
m{3yVqHajT&yZxX1A9x37W9dUQW?0Dp0000<MNUMnLSTZYPa8J?

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/ic_visibility_white_24dp.png b/res/drawable-xhdpi/ic_visibility_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..a42cab7109d1bdab2bc49420f53915abd663bd56
GIT binary patch
literal 581
zcmV-L0=oT)P)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0006ENkl<ZcmeI!
zGniaa7{>8$8QV_E*s5Yz>)kfC`YLw%C${_8ww*HOdhpErqqDl_8^@Vn`yS(-D{*mg
ze*~J6$6Ai^gnYbs$>#}2SxX*GBsSD#1{d%Xh@bOJr;bE}hAbzaaC~AZ^(7J{FpZBy
z;saAiknqrw<3!^a%_TGj@*10qEu_<y6jEqQI@@qzdqsZ<j&YP?+eJ%ppcQ+ul`uM3
z^P_R&<YTG?zzlpixfm`wx>1P5YTns}EuSv>nSX|Dml#xMKG$&J;wp2gCWg9DPn5gC
zHf%1;+S7)+RCb$ICTWcu+eT;eBhYLqAN^gNZjoxz?P!Kb1roW9Cf(%o(abSvCYl>m
zTs(5nwKe%QG*?X89$l7{;Uc;ele^HAn6w(Y3%{^~?BGkpRWz4P+5uf=<*(<hpqo4w
z%`B5<p}9_iRA3mIZRLw_+dd`b$8;x}!BQ2QvAN2xQ!8#cnm1RFwz#pa7boiQ6x$v#
zsKy+wP(lfpnMJA?9KiO7+G3+C`PgPi5X{E*iB6(pI4+!gfxBQ1KAcJz68uFd#<rK%
z;y_z<af%or!O@SG*xYO<llD}j8Xd@DCvI#n=q;hqoTEhJFipe%ZJEq_BJqw15*g~V
zn2&_x0}H7q(V#X{IE$Y^e4Jr2wInt)CWloV<`JLp;NcUGIK(QlX(WGwxVX5_?$uY2
Tfba~h00000NkvXXu0mjf$wLkq

literal 0
HcmV?d00001

diff --git a/res/drawable-xxhdpi/ic_visibility_grey600_24dp.png b/res/drawable-xxhdpi/ic_visibility_grey600_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..503497dda83eac7ca38f4146b7d4724be30419ba
GIT binary patch
literal 650
zcmV;50(Jd~P)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0006}Nkl<ZcmeE|
zC43!05QpcXE0ao8V#~~E;}TU+W$w*?4%DimiVXXbS7p#;W^iT3YhCuyP8jbS`^_xx
zZzy31k&uv(kdP2ez)Y!=Eqp+H@%eykkvhx_CeQ$r@@EKe8qW|{h-Wx0@Mlnp`WtVa
zG|FqlT?=_Fjov)!A5300;X2|T#C6$Z@_jp*tZcz6#Jz}Dvc+VnZ;*AkgSZdkj;y2J
zvVS5v@E36(#b0#npV*tdS%_zd`#7G-!k$iN2YxEWfAd8!FXE{tZ}L2q7lHXAek)l&
zvAqX>4UQ>gzw%L@N@d`wd=y`m>|@>fqv|v0a2Mngel<DptNDa7rH=Ycmv@KTou&RD
zqLf|*5&k$A)!xNj!Xfud;Rfm=+@QSBL!=|yl&y}a8z6F5lWp2`=HiF5#L41qmUYsM
zJNW!R?nraV*O$UcXT2XXmnyS+EFL=3za6NuebnM?iE|dUwsW8g-<&lc?jBotf0~u!
zI%3=2a=a~Tz4eyc9*!u-)=cHWGUW>Xj;2}7Sq<J*G~Wd^on|ym`6~Zn8I@wvT64h{
zZ69Zy_F3EIi&}$X(xu0>L2b7@%U+|}Yb@JS?F}Uz4<2ht{$gu?S~MFi*1x@2wI7>o
z@fQ|r5l*otbVv2?blTw*y?W7ii>rEy-G<_$>VLG`U%fi64!H>p?IZiwo}Ci_0Du4p
z?BALiH$Vk{<dT{zd#f=5qXQkT{`$c!Xy6J9F8SaYBpr&tDGkU5K*wOhic)%*^rW;f
kFV2D20`Pp9nVA`Y0BbGxT)G+GVE_OC07*qoM6N<$f*(LP5C8xG

literal 0
HcmV?d00001

diff --git a/res/drawable-xxhdpi/ic_visibility_off_grey600_24dp.png b/res/drawable-xxhdpi/ic_visibility_off_grey600_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..63914559f44514579fba8eea8a2e3502a9282d60
GIT binary patch
literal 1019
zcmV<X0|fkuP)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj000BRNkl<ZcmeI#
z1C(S(6b9gG#<p$SPL5*R$(rxo|2Cqx2eA)h8^=a$bIq|mYqMH)Uo{u+ucMjSy8Ugr
zRgfS-f&>vVB!>6-y7h=dpI|8#@OA4GXX$!F!uzW^>kEmm!vY%;ZIw8NuizmV%Lz`9
z!$bHA9G~2w>Lfar#^HU;!qNh5Ha=%0j#Hs3kT`|uSn98FBfsFDQejf!7_?%kRr{Oo
z^x~By9fcMwwQLPM#EVvp<Q|D;EVXVE`I3r}_y{x=L0W=0#_w3EQ92wASXxAz&8HU$
z!bmK{(!wO?P|W79IOU$phtXDEoOY!%K=ch338V!WZm$X9#ns&nBrmM;gm$GTF({y(
zvO1%#kKir6yZwcd*q1&LNN-#p@jp86tnMU`geqw)Hj(IcpQD854P|Udif+IXW2MKG
z93CcctVl=;m&-6|?$5@2EVU=m0r(FS`Q@CWFN9Bxb>{QQ2F~bh4L7(*THW^x9HO*1
z`(UoI&a~0n76j3o!T^6|Ix3U<W9G`=ce>{)EqFqx`m)L&zCc)li{1VBI$xx&<iTof
z(z^*q<r18ehvP-@pD;;Z__$E^TTS{xX`yeV2TGnJ7WatHEhy!SG-KtzzDOH;SFC+|
z_V~mxQ|d(LD`i1?Mccb)O0_W~>$SwU%KK{E9@-@QY1(m#eK8#q)!L+Xk*m`UN)LXJ
zyLg*x|Gpbb%_RC$AAh+zey|6{wSV6$olDL>+W2oHSEp~XZXLNxY8MSO(dI&N4wb9p
zvg}PiL+X+^Qv<zXbI0)oBIoa%o1br&I<c$$>x*ozU3y5Iu-jC2yfFT@nPq(8pM)O;
z&~JGkYdA-^Iu@mO)2@kw(dCciMNwz2ixXA;@XNyg<O!w4Jr|w+NH_%bhNbX~>G?6u
z2%78cll4JgluVjITdBg~lZ6M`r`fxKFX5Ll5&h`KUszyG8gNc1^$DA{_-ZMUmf(6N
z2alOwFLXoMNE4K=gy?niLk(#aDxHK^RLK7q#W#dA>6661rIGkKnWHC!r_3Y_(v!5S
z$`d+(z7coa1Z5u{fdv9;5q$%qGiX;Y?ro0U>3k5rz#{1o7`MGDE_^y>V`(u>A{CwS
zJK_y2SwBeH(T9oa8Oe+C5HwVmB%|VdC;qN7NsfC8zrc;YKfVr6yC>02SSXN6Oek?2
z1D_jq;2eBPV{p6|HXW4}NOA`p&sXpeayY>WjK)2D6&>qsX?uECAsZ_xAib~DdPJg6
phQyRwPe>A{`lR=3#R(E5$TFX;5a+#nS_l9D002ovPDHLkV1oKH=b``r

literal 0
HcmV?d00001

diff --git a/res/drawable-xxhdpi/ic_visibility_off_white_24dp.png b/res/drawable-xxhdpi/ic_visibility_off_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..f88d24ff5ff7cb6691bd23c233a2cadb03254e0b
GIT binary patch
literal 919
zcmV;I18Dq-P)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj000ACNkl<ZcmeI&
z1B`4*7=Y0lulE_j+P3XrZQHhO+qP}nw(V$*!Fy-JP1m66HU>%h`-4Hx)amYvRxre-
z4yuFdpgL&ifm+;b?V$r|aR)jEkJKASOd3qk%@C6Y7qpI!vPdH=W<9$&$Po^;w;io%
ze#5H;#iY(Gslh@Hbgv)u)z|K{zj<l_%99TBqoRH9Obb>E%8};qv+{b==31%&1?$$B
z#J9H9R5>VEujVA)vs`h|z>p@o)KukzvIl`GNPK3&N<lm6AW8bp{dTp85gN4`Z85vK
zM~8Inwk;pj;7mR1uugQTMxmD(<w(CucU*a(Cf7oOl$)_`mhK`AML~@*r$SP&t1hW7
zC<;0oYC>8+LprJmXjiBiX&31>%Yl~ENd=^7ec}^WTeS!2W~u%$cM3GjH&792Cf|Y=
z%_iQwf0gP3ll2X{M!Ls!%9H-EeDw39r8}!H&??e(8gIRVq}ik6QioI%EYusQ*@x0S
zBnSmbFGWASPr6rn1MMW&o<bR<)k=Q0hg|E4L0Wwy*P=ohq-&#nH`hlRW6+lJjVf8<
zGcu$vOTHf?-x@LKHQAz5X{Wf(9;8xGn|x2kpqJ!pEm@+S3~2_XJ50W3V$eqNjV@W@
zbF!rJ?y_}bP_r-PTC8M=Ybk@YMEM(au!UT^l`OFuWsvrfYhytS(&%03?uiz8sSMKN
z(!HvoCn#9TM5)@N9e;Lz6eKnKL8^%s>+9rtiF8LsmtMXQDgO-RT%j+}R6djHS7W2g
z&+dh)NuQ)1egq3?m+EFgJgd6eXa3dh1D$1){xM(fA?$Y2?JEClw>W9@A`kLUk*dr3
zH6tA>6ah83JVV;0CZr3CKT&LSrF1tNTbQ(NucZ7F#b_FwEZwh;HcIGaru7UN((zTi
z*pR5hefF@VG1@d6Yiav=(gaA7hFAL5!Xmy>MF~=cpkSCQ29{Jry`m2WjuaG`CfoUL
zU`RpHX|aX3`kxe(Hw!w;_lowdvn^y(UByX3B{R4E+@9D2zjK%U%=iDHuMAR9%?vZ2
zHSAz7hd9FicC?O#4eRBSn-nDl12r2LBLzc@6b$5SlqUrPI~zu%8wMW~Y@icxtLC8q
t3f9*daRwa}tmj6}^^aQAL3PmJ%zx{}%V?bo;luy{002ovPDHLkV1nQ#wKxC(

literal 0
HcmV?d00001

diff --git a/res/drawable-xxhdpi/ic_visibility_white_24dp.png b/res/drawable-xxhdpi/ic_visibility_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..987af79f8b6e6b922788b3179b60ffdb3c2a6cfa
GIT binary patch
literal 846
zcmV-U1F`&xP)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0009ONkl<ZcmeI$
z1CTsN6vy#*j&nv?v2EM7Z99M4wrz!F$F`F*N->Y$Y`ItO4a50#d3$Dl)!vpwB9TZW
z68|7natIf42M;qSRUYOJF63Y;<*!8n2k`{Y(ndaQJj)XtNP)zSBbh}PUUe~(!zCV+
zaSI<4#7EpjsYHol?xK@0I=F*ki3X?h1yT5%Qza}aSV5GQQz5}|6fH!pnIj|^?xPo7
zH_vhpM^Zy+s?=~K_wpP)=z6$I{GyQQ=)PkJRgweM4C4oMlPK^PXBE1&)QEyQHlSNZ
zq4zi|(DZSKc)&fWnwljZTZt(~oQuUHE;AyH7aMn=yF+~7ZgjVZj>C;PvNmg@J)6}u
z(nB}ju!=J!gE5x6IYf)ID~-m?su2hK@FtmFXRq|(ZOpi@*je&n3A!QT;1qr#m!COF
z9E?CWUvlFFblp_Bt>eVWj<lD%E*ZmMfMaq`_K(p$n>KddMDwaRcmdr9Io2d@#Bz^Q
z`)n*{IJNJ`a&7jBry0wUPW{zbRyehf!O}>vxVQ>ijZ?o7%hyirT5Ok#i`TK0I`w<7
z{E>G2wY?TDP<PycuJqYu-(dMFT$dHo<ZDo`!m`}gp#Fv;NyqhA?saOPiRCn>_5)b1
z$+a+kgzh;XqwZyK@FKeRDUfU&%Yd<UR6Diz;%D;tiQS!=HS`)=$5E0S3(*Y|2Pg4!
zo;W9ngHh<_N<Qqu*JysAP8{sTtJ$5!?&6?<pU`~4PLdyo(v4<=WZ(=|@HKy=%2zDs
zw5;E^p!tJ?M8~c67V91Nqq|XTOf(Mpmx)JQK|h)?UN5AU7?JMw);dO<1r&JyXSNL8
z2I@pX16$B7vg0@?U;?@y7(un<Kn<h#3EdbwP8RO8uMK#C`#FYM%2K74V|aiU?JEjy
zm0&oWW}?=}p%NVBEG0^dDVMM~g-?mXC!8eFpom*(CyZ8Zrbwbh3D@&JLA=Yglt?@{
zgz0qPRR>c!NaDwSJjxbj1~##UN7z^XYLs&z=W{y`@^q>^$Zed@fs{)kkw_#GiGPki
Y0k;+P7Z|;w(*OVf07*qoM6N<$f&zJt!2kdN

literal 0
HcmV?d00001

diff --git a/res/layout/prompt_passphrase_activity.xml b/res/layout/prompt_passphrase_activity.xml
index 08e579718..68de241ad 100644
--- a/res/layout/prompt_passphrase_activity.xml
+++ b/res/layout/prompt_passphrase_activity.xml
@@ -32,7 +32,40 @@
                       android:layout_marginRight="50dp"
                       android:singleLine="true"
                       android:paddingLeft="10dp"
-                      android:paddingRight="10dp"/>
+                      android:paddingRight="40dp"/>
+
+            <org.thoughtcrime.securesms.components.AnimatingToggle
+                    android:id="@+id/button_toggle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignRight="@+id/passphrase_edit"
+                    android:layout_centerVertical="true"
+                    android:layout_gravity="center"
+                    android:gravity="center">
+
+                <ImageButton android:id="@+id/passphrase_visibility"
+                             android:src="?ic_visibility"
+                             android:background="@drawable/touch_highlight_background"
+                             android:layout_width="wrap_content"
+                             android:layout_height="wrap_content"
+                             android:paddingLeft="8dp"
+                             android:paddingRight="8dp"
+                             android:paddingTop="3dp"
+                             android:paddingBottom="3dp"
+                             android:layout_centerVertical="true" />
+
+                <ImageButton android:id="@+id/passphrase_visibility_off"
+                             android:src="?ic_visibility_off"
+                             android:background="@drawable/touch_highlight_background"
+                             android:layout_width="wrap_content"
+                             android:layout_height="wrap_content"
+                             android:paddingLeft="8dp"
+                             android:paddingRight="8dp"
+                             android:paddingTop="3dp"
+                             android:paddingBottom="3dp"
+                             android:layout_centerVertical="true" />
+
+            </org.thoughtcrime.securesms.components.AnimatingToggle>
 
             <ImageButton android:id="@+id/ok_button"
                          android:src="?ic_arrow_forward"
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 7657dc256..68453ca17 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -23,6 +23,8 @@
 
     <attr name="centered_app_title_color" format="reference|color" />
     <attr name="ic_arrow_forward" format="reference" />
+    <attr name="ic_visibility" format="reference" />
+    <attr name="ic_visibility_off" format="reference" />
 
     <attr name="conversation_background" format="reference|color"/>
     <attr name="conversation_editor_background" format="reference|color"/>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 26c5f8252..ffaddf70c 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -46,6 +46,8 @@
         <item name="centered_app_title_color">#55000000</item>
         <item name="ic_arrow_forward">@drawable/ic_arrow_forward_light</item>
         <item name="lockscreen_watermark">@drawable/lockscreen_watermark_light</item>
+        <item name="ic_visibility">@drawable/ic_visibility_grey600_24dp</item>
+        <item name="ic_visibility_off">@drawable/ic_visibility_off_grey600_24dp</item>
     </style>
 
     <style name="TextSecure.DarkIntroTheme" parent="@style/Theme.AppCompat">
@@ -57,6 +59,8 @@
         <item name="ic_arrow_forward">@drawable/ic_arrow_forward_dark</item>
         <item name="lockscreen_watermark">@drawable/lockscreen_watermark_dark</item>
         <item name="android:windowBackground">@color/black</item>
+        <item name="ic_visibility">@drawable/ic_visibility_white_24dp</item>
+        <item name="ic_visibility_off">@drawable/ic_visibility_off_white_24dp</item>
     </style>
 
     <style name="PopupAnimation" parent="@android:style/Animation">
diff --git a/src/org/thoughtcrime/securesms/PassphrasePromptActivity.java b/src/org/thoughtcrime/securesms/PassphrasePromptActivity.java
index 149577777..e27400f80 100644
--- a/src/org/thoughtcrime/securesms/PassphrasePromptActivity.java
+++ b/src/org/thoughtcrime/securesms/PassphrasePromptActivity.java
@@ -20,6 +20,7 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.support.v7.app.ActionBar;
 import android.text.Editable;
+import android.text.InputType;
 import android.text.SpannableString;
 import android.text.Spanned;
 import android.text.style.RelativeSizeSpan;
@@ -36,6 +37,7 @@ import android.widget.ImageButton;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import org.thoughtcrime.securesms.components.AnimatingToggle;
 import org.thoughtcrime.securesms.crypto.InvalidPassphraseException;
 import org.thoughtcrime.securesms.crypto.MasterSecretUtil;
 import org.thoughtcrime.securesms.util.DynamicIntroTheme;
@@ -52,7 +54,10 @@ public class PassphrasePromptActivity extends PassphraseActivity {
   private DynamicIntroTheme dynamicTheme    = new DynamicIntroTheme();
   private DynamicLanguage   dynamicLanguage = new DynamicLanguage();
 
-  private EditText passphraseText;
+  private EditText        passphraseText;
+  private ImageButton     showButton;
+  private ImageButton     hideButton;
+  private AnimatingToggle visibilityToggle;
 
   @Override
   public void onCreate(Bundle savedInstanceState) {
@@ -116,18 +121,36 @@ public class PassphrasePromptActivity extends PassphraseActivity {
     }
   }
 
+  private void setPassphraseVisibility(boolean visibility) {
+    int cursorPosition = passphraseText.getSelectionStart();
+    if (visibility) {
+      passphraseText.setInputType(InputType.TYPE_CLASS_TEXT |
+                                  InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD);
+    } else {
+      passphraseText.setInputType(InputType.TYPE_CLASS_TEXT |
+                                  InputType.TYPE_TEXT_VARIATION_PASSWORD);
+    }
+    passphraseText.setSelection(cursorPosition);
+  }
+
   private void initializeResources() {
     getSupportActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
     getSupportActionBar().setCustomView(R.layout.centered_app_title);
 
     ImageButton okButton = (ImageButton) findViewById(R.id.ok_button);
-    passphraseText       = (EditText)    findViewById(R.id.passphrase_edit);
+
+    showButton       = (ImageButton)     findViewById(R.id.passphrase_visibility);
+    hideButton       = (ImageButton)     findViewById(R.id.passphrase_visibility_off);
+    visibilityToggle = (AnimatingToggle) findViewById(R.id.button_toggle);
+    passphraseText   = (EditText)        findViewById(R.id.passphrase_edit);
     SpannableString hint = new SpannableString("  " + getString(R.string.PassphrasePromptActivity_enter_passphrase));
     hint.setSpan(new RelativeSizeSpan(0.9f), 0, hint.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE);
     hint.setSpan(new TypefaceSpan("sans-serif"), 0, hint.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE);
 
     passphraseText.setHint(hint);
     okButton.setOnClickListener(new OkButtonClickListener());
+    showButton.setOnClickListener(new ShowButtonOnClickListener());
+    hideButton.setOnClickListener(new HideButtonOnClickListener());
     passphraseText.setOnEditorActionListener(new PassphraseActionListener());
     passphraseText.setImeActionLabel(getString(R.string.prompt_passphrase_activity__unlock),
                                      EditorInfo.IME_ACTION_DONE);
@@ -159,6 +182,22 @@ public class PassphrasePromptActivity extends PassphraseActivity {
     }
   }
 
+  private class ShowButtonOnClickListener implements OnClickListener {
+    @Override
+    public void onClick(View v) {
+      visibilityToggle.display(hideButton);
+      setPassphraseVisibility(true);
+    }
+  }
+
+  private class HideButtonOnClickListener implements OnClickListener {
+    @Override
+    public void onClick(View v) {
+      visibilityToggle.display(showButton);
+      setPassphraseVisibility(false);
+    }
+  }
+
   @Override
   protected void cleanup() {
     this.passphraseText.setText("");