From e641a28cf5740485600c5c7fbf8ed40056c89427 Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Mon, 30 Jul 2012 17:51:31 -0700
Subject: [PATCH] New lock icons.

---
 res/drawable-hdpi/ic_menu_lock_holo_light.png | Bin 0 -> 767 bytes
 res/drawable-mdpi/ic_menu_lock_holo_light.png | Bin 0 -> 611 bytes
 .../ic_menu_lock_holo_light.png               | Bin 0 -> 1349 bytes
 res/layout/conversation_activity.xml          |  41 +-----------------
 res/layout/conversation_item_received.xml     |   2 +-
 res/layout/conversation_item_sent.xml         |   2 +-
 .../securesms/ConversationActivity.java       |   4 +-
 7 files changed, 5 insertions(+), 44 deletions(-)
 create mode 100644 res/drawable-hdpi/ic_menu_lock_holo_light.png
 create mode 100644 res/drawable-mdpi/ic_menu_lock_holo_light.png
 create mode 100644 res/drawable-xhdpi/ic_menu_lock_holo_light.png

diff --git a/res/drawable-hdpi/ic_menu_lock_holo_light.png b/res/drawable-hdpi/ic_menu_lock_holo_light.png
new file mode 100644
index 0000000000000000000000000000000000000000..9577af4f223e62ac57ab799339c77a219f815059
GIT binary patch
literal 767
zcmV<b0s#GqP)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+00001b5ch_0Itp)
z=>Px#32;bRa{vGf5&!@T5&_cPe*6Fc00(qQO+^RX2Oj_;9!}4eZU6uRkx4{BR9M69
zmOp3|VGzZCZ|^R-7(tV$jS&k8HX?~w1SE*pDTtP$t%!w{%^h}PbE^nqA*8Uf5!6Dg
z#7bhLh$xDv5QB{t;=dR*8gtKL&v4@2y0?2Eh|?^~&d!^e_h!Bi{@dR+rFE?L(Wlj{
z0Ke56f2qxP5g=T{9(FU%Y9kCUb&IRMTKm)$fUv@8Mx)TOQS{Gu-_haf!`uM%30<cT
z@GrhbhF7XopX34v*YcG9pTYfF9}z1U{0YLeM{9FQ5sH5(;1d0|03LHr_xy@L!;Eu;
zbw*}`COMF~f^e@dD*)sNs#M>$G;TdptdkL6Jzl%tK1Pt3|2_hQ_{O%@@KAf9UBUuN
z>`w}j01ys&M6!*K|1QYtBVUXnXiL4At%6k=GLqm*?Dq>zK@Dmk6UpwS2f$zTE|$LM
z&1ac%CIAHlVAN>iu-MdU!G)|OC(CTXQKf+j+2<h17Sv3@<ftIQ>=aIk04BdB0C=`Z
zulW$`FdOmX2D2S;SRde;dTcH8MwP$~Jzyc`-yV+&!#vM4??BTWtj?t%StYj8+uY9v
z1&p=rp=8Qz20_1zX;rkiR9fOPlv+K!7)M&rJ!+MfWF<*zkp{SfEYc2|5e;rI<&r9z
zu;g?XhGKlI*s_lKRILHwNlxhK?@rD)$-eFLwFW@-GiRB}F=&eK(2U+My}n~Q2g&gY
z@yh6Q0HDNBTJ@!tsdjkN(#v*_bz7#US2x3*0O297DBUXUfMj8pIRn5X*ivQyw;$AK
zmCZq1_?$9rX`MP*An8{{#$D9enOv$bS21<_J6aXdml5t7mB|OtK0lS&*qt+3-6J7h
xriDz0P9Y8=u0^jsjNEzp-`m_i{@cH9KL9>B&vF~{U%UVS002ovPDHLkV1haaU5Eex

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/ic_menu_lock_holo_light.png b/res/drawable-mdpi/ic_menu_lock_holo_light.png
new file mode 100644
index 0000000000000000000000000000000000000000..9bd67488ea9d6d3603dc80664eb049c874cbfb4a
GIT binary patch
literal 611
zcmV-p0-XJcP)<h;3K|Lk000e1NJLTq001BW001Be1ONa4*>kdg00001b5ch_0Itp)
z=>Px#32;bRa{vGf5&!@T5&_cPe*6Fc00(qQO+^RX2Oj_=3w21<0{{R4^+`lQR7l6o
zmAz{eQ5400XLoi<G>A%K5EEBYSlEblNF&6?4+z*;S_w8*vXg%x%yxocZKr|>Vw$uG
z7!Zq8HX>mcEJQ3sg>1+=$6_|@?C#9&lzGhz@7;Uex#!&vIH9Z6{WdC5CHZUSSSs7S
zMs!w>x$X175540>{jf!?7(j~}(LKHLDF7^ie{m=L(Bw)n2GI?Da#<MuNS+dgzg&N~
zKRaYw$_#AVW#JtyG4IP-_8w?TTeHPNXgu*V*<XEawbNyEhR<A*d_P<t%iud+1dB(<
z?hyWF4FSuH58-9NG(dT~Z~H9((+!OUkQ4y?bKh<o4ApoDASjp|hh6j{uiy-nQVarl
z6hM-!^&{E<^*C+zG!gV*HBKk`&^^%-Z|HDARZHJ+id4ySzyUvrwNl^9(LfViG+@h~
z8;I9}N#@;gHCF>0gpiQHi5><UDPb$)TmYrd3|Ozd0nSn{D+H${kzq01h3Kx{_fA}>
zm=eQ};VwY9$rt6eo?HOIOt-iuJd@wMf?NjHLSx+z6tKxT`#1?T5JWD3guSAxOmY+V
za=5St7;!|0j*;v_8uZZ<2;#)G$3TUj5pckB%A*HBFj&TE5S6%<q+vk-SF(D+Koh7?
x$>|;YEU>2bn3;8&y0hlPK$VYP%@Z|-{{z;wrrkwPUB&<a002ovPDHLkV1iHQ1keBg

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/ic_menu_lock_holo_light.png b/res/drawable-xhdpi/ic_menu_lock_holo_light.png
new file mode 100644
index 0000000000000000000000000000000000000000..c4db3cb399f16fb6dde73c75a84417cdef42eb20
GIT binary patch
literal 1349
zcmV-L1-kl)P)<h;3K|Lk000e1NJLTq002M$002M;1ONa40ARUQ00001b5ch_0Itp)
z=>Px#32;bRa{vGf5&!@T5&_cPe*6Fc00(qQO+^RX2Oj_=G{Y|VJ^%m&*GWV{RA}Dq
zm|tjIRS?F1bN23^WZPuZ&|;fH*4V1CP({%sBB-E6MG-^=DX1WrCq+@i=3UHE1)uam
zF!jwUg1%`H1d9)?2&OHqRa%o^Ei~3Nrb%{_-M!<(-rejb*}LbaH~xXnQ*!UzbH17L
z&CGWeuG#<3Cf4z$v6+8690}q)Nq5bEBaXBZ2XZWA+}b>(HwHju`)oTq=wd6Kv=IaH
zIxCl$;&(1&=2rs^1;7N52C^}>)6YHJNiS`cw~Aci6vsHC$7Ci`gh{Xj5ePuGg??V<
zE;=zdb>F%aDKe$s$pLeEsALbou}}V+4iE7LdzK@wBXf)xX*O%heTQ$mt+`-T1?5<r
zeGD={8=!S@YxN|MPI;6UvVHaiCU)^>g)Tne;p*lti%c^^4k1a36mbmdt@sfyJw4ZB
zl>^6;tgXC7AD}3PBIo#=6P#xjLyB&0=LvQoxPWjUL!XY23yp-?I0GCcT_!y6HSh8>
z)8tA8h{R}R8+&<`epOKn%5nB*PKQ83kImb8K(`6F7~mUyfB4H9r#yM4IWv-ygxrRp
z2t5ppTpa$hQoidZVRxB;JGfgSo_CS=hQFwQtDOOnQ9dj)5pcMdE=V_JfgM%1avc#+
z$T7-KYdZ}U8RG~`07Tg(sgQ<IHqI7O7!X+Gu%3qrCTbc@nn@-BozTM`03k(tSko|0
zl7v_6OPm|NvO2ZpqmpSElY$2zLGo=A4giBgL<B$!UW9AgA~V&t<Pa@I!T}&irCddu
z_^Jm$FhtytGEmzsd;vt1Qq|31jD!Wi(q42a)*u%CX#nk1GGLLe4bp^awQFD!))Ug#
zSH;@5F@P2F`U(p*3SicEy;*UqxtJebsGTa4_QNR6IB+N_F%;E=B&x9po3jZL4boqr
zt?FsCHQNp<qAWd=>kc-K$2k<^HF=Ocio;HBB!U1rzGtpsYLzznh=D4L{2~`{H6rtT
z#b~A!XdDY-xP|*!00f7KN9qK9xPC{fj(`fpxS8Fk7-l)E5>O8a2rWSCikgxJ>91j-
z=V^#lc@rln00k;d#nVAj2ZO3Qs{Kprm|uBX&|>4_Y*2=Upyk}8jy0$xi`3^#)?824
zc%n7Wt@LI?06tYy*=&(Nn8C1xPNHbtp;((A2mEuI=Le2*Rvqc3pS>OgLIO}|7R(X{
z8Ra+*APg|b<HQ<4@LMZr2Fhn#;1r)RmMKyI$R4AeJLp-#0jukW2{@z5Wj4ndJ(($%
z#VKUw_>pmPjRw#<svzor0E=8Mi_i4(kz68Ai(lfx)B{o7M07<U?bXf~hyy_zQMu7}
z$gR3<dB`3x+`vsF8wnB#;dWf#2MoLA`RvD>=q^IG)$QjwcKU@H_z0SCKuPjCgY*J0
zz$-jU)OSjTmVpYX72zqSI0@|Mu~mcUYBgaK4wRD`C+=O{nu^lEjmY)qfPg^G`wb*t
z|0a|w5F3?TNx3xtENl{ns0Y@Qfn_Jx`T`V`10|bpW9%7u1mXG(0brpm61q?NfsPFT
zV8sC=o7se3-Tl&8CkHBXf3;Q)kpl_qA2|KDPWr9XSdytslh?VcE=R)^{<4jv?soV|
z7ai(`&<|WLKY4LikT1sB2%E5PM225E8uIqPam}vTf7Jd4&?bNGUV4U?00000NkvXX
Hu0mjfHknh-

literal 0
HcmV?d00001

diff --git a/res/layout/conversation_activity.xml b/res/layout/conversation_activity.xml
index 4d225e0aed..077375d7bd 100644
--- a/res/layout/conversation_activity.xml
+++ b/res/layout/conversation_activity.xml
@@ -149,53 +149,14 @@
                             android:maxLength="1000"
                         />
 
-<!--                     <RelativeLayout -->
-<!--                         android:id="@+id/editor_with_counter" -->
-<!--                         android:layout_width="0dip" -->
-<!--                         android:layout_height="wrap_content" -->
-<!--                         android:layout_weight="1.0" -->
-<!--                         android:addStatesFromChildren="true" -->
-<!--                         android:background="@android:drawable/edit_text"> -->
-
-<!--                         <EditText -->
-<!--                             android:id="@+id/embedded_text_editor" -->
-<!--                             android:layout_width="fill_parent" -->
-<!--                             android:layout_height="wrap_content" -->
-<!--                             android:autoText="true" -->
-<!--                             android:capitalize="sentences" -->
-<!--                             android:nextFocusRight="@+id/send_button" -->
-<!--                             android:hint="Type to compose" -->
-<!--                             android:maxLines="4" -->
-<!--                             android:inputType="textShortMessage|textAutoCorrect|textCapSentences|textMultiLine" -->
-<!--                             android:imeOptions="actionSend|flagNoEnterAction" -->
-<!--                             android:background="@null" -->
-<!--                             android:maxLength="1000" -->
-<!--                         /> -->
-
-<!--                         <TextView -->
-<!--                             android:id="@+id/text_counter" -->
-<!--                             android:layout_width="wrap_content" -->
-<!--                             android:layout_height="wrap_content" -->
-<!--                             android:background="#88000000" -->
-<!--                             android:textColor="#ffffffff" -->
-<!--                             android:textSize="11sp" -->
-<!--                             android:textStyle="bold" -->
-<!--                             android:paddingLeft="3dip" -->
-<!--                             android:paddingRight="3dip" -->
-<!--                             android:layout_alignParentRight="true" -->
-<!--                             android:layout_alignParentTop="true" -->
-<!--                             android:visibility="gone" -->
-<!--                         /> -->
-<!--                     </RelativeLayout> -->
-
                     <Button android:id="@+id/send_button"
                         android:layout_marginLeft="5dip"
                         android:layout_width="wrap_content"
                         android:layout_height="fill_parent"
-                        style="?android:attr/buttonStyle"
                         android:layout_gravity="center_vertical"
                         android:nextFocusLeft="@+id/embedded_text_editor"
                         android:text="Send"
+                        android:padding="8dip"
                     />
                 </LinearLayout>
                        <TextView android:id="@+id/space_left"
diff --git a/res/layout/conversation_item_received.xml b/res/layout/conversation_item_received.xml
index bd679fdbb6..a3bd43ab7d 100644
--- a/res/layout/conversation_item_received.xml
+++ b/res/layout/conversation_item_received.xml
@@ -123,7 +123,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
-                android:src="@drawable/ic_lock_message_sms"
+                android:src="@drawable/ic_menu_lock_holo_light"
                 android:visibility="gone" />
 
             <ImageView
diff --git a/res/layout/conversation_item_sent.xml b/res/layout/conversation_item_sent.xml
index fd293e5064..28bb7dee03 100644
--- a/res/layout/conversation_item_sent.xml
+++ b/res/layout/conversation_item_sent.xml
@@ -32,7 +32,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
-                android:src="@drawable/ic_lock_message_sms"
+                android:src="@drawable/ic_menu_lock_holo_light"
                 android:visibility="gone" />
 
             <ImageView
diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java
index 189fac64c5..e43331c97f 100644
--- a/src/org/thoughtcrime/securesms/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationActivity.java
@@ -365,8 +365,8 @@ public class ConversationActivity extends SherlockFragmentActivity {
     if (isSingleExistingConversation() &&
         KeyUtil.isSessionFor(this, recipients.getPrimaryRecipient()))
     {
-      sendButton.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_lock_small, 0);
-      sendButton.setCompoundDrawablePadding(10);
+      sendButton.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_menu_lock_holo_light, 0);
+      sendButton.setCompoundDrawablePadding(15);
       this.sendEncrypted       = true;
       this.characterCalculator = new EncryptedCharacterCalculator();
     } else {