From 2ef00548402ab521c118229f99302e6a53bb2f76 Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Tue, 14 Jul 2015 14:31:03 -0700
Subject: [PATCH] Update look of contact selection activities.

// FREEBIE
---
 AndroidManifest.xml                           |   3 +-
 res/drawable-hdpi/ic_dialpad_white_24dp.png   | Bin 0 -> 359 bytes
 res/drawable-hdpi/ic_keyboard_white_24dp.png  | Bin 429 -> 281 bytes
 res/drawable-mdpi/ic_dialpad_white_24dp.png   | Bin 0 -> 252 bytes
 res/drawable-mdpi/ic_keyboard_white_24dp.png  | Bin 340 -> 210 bytes
 res/drawable-xhdpi/ic_dialpad_white_24dp.png  | Bin 0 -> 375 bytes
 res/drawable-xhdpi/ic_keyboard_white_24dp.png | Bin 440 -> 333 bytes
 res/drawable-xxhdpi/ic_dialpad_white_24dp.png | Bin 0 -> 463 bytes
 .../ic_dialpad_white_24dp.png                 | Bin 0 -> 493 bytes
 .../ic_keyboard_white_24dp.png                | Bin 0 -> 502 bytes
 res/layout/contact_selection_activity.xml     |  92 ++++++++
 .../contact_selection_list_fragment.xml       |  26 +++
 ....xml => contact_selection_list_header.xml} |   7 +-
 ...em.xml => contact_selection_list_item.xml} |   0
 res/layout/new_conversation_activity.xml      |  16 --
 .../push_contact_selection_activity.xml       |  16 --
 .../push_contact_selection_list_activity.xml  |  27 ---
 .../new_conversation_activity_number_pad.xml  |   9 +
 res/menu/new_conversation_activity_search.xml |  11 +
 .../new_conversation_activity_text_pad.xml    |  10 +
 res/menu/push_directory.xml                   |   2 +-
 res/values/attrs.xml                          |   2 +-
 res/values/styles.xml                         |   1 +
 res/values/themes.xml                         |  20 +-
 .../securesms/ContactSelectionActivity.java   | 198 ++++++++++++++++++
 ...java => ContactSelectionListFragment.java} |  68 +++---
 .../securesms/NewConversationActivity.java    |  88 +-------
 .../PushContactSelectionActivity.java         |  83 ++------
 .../contacts/ContactSelectionListAdapter.java |   4 +-
 .../securesms/contacts/ContactsDatabase.java  |   2 +-
 30 files changed, 417 insertions(+), 268 deletions(-)
 create mode 100644 res/drawable-hdpi/ic_dialpad_white_24dp.png
 create mode 100644 res/drawable-mdpi/ic_dialpad_white_24dp.png
 create mode 100644 res/drawable-xhdpi/ic_dialpad_white_24dp.png
 create mode 100644 res/drawable-xxhdpi/ic_dialpad_white_24dp.png
 create mode 100644 res/drawable-xxxhdpi/ic_dialpad_white_24dp.png
 create mode 100644 res/drawable-xxxhdpi/ic_keyboard_white_24dp.png
 create mode 100644 res/layout/contact_selection_activity.xml
 create mode 100644 res/layout/contact_selection_list_fragment.xml
 rename res/layout/{push_contact_selection_list_header.xml => contact_selection_list_header.xml} (68%)
 rename res/layout/{push_contact_selection_list_item.xml => contact_selection_list_item.xml} (100%)
 delete mode 100644 res/layout/new_conversation_activity.xml
 delete mode 100644 res/layout/push_contact_selection_activity.xml
 delete mode 100644 res/layout/push_contact_selection_list_activity.xml
 create mode 100644 res/menu/new_conversation_activity_number_pad.xml
 create mode 100644 res/menu/new_conversation_activity_search.xml
 create mode 100644 res/menu/new_conversation_activity_text_pad.xml
 create mode 100644 src/org/thoughtcrime/securesms/ContactSelectionActivity.java
 rename src/org/thoughtcrime/securesms/{PushContactSelectionListFragment.java => ContactSelectionListFragment.java} (78%)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b259eee64f..d3808f09e7 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -201,8 +201,7 @@
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".NewConversationActivity"
-              android:label="@string/AndroidManifest__select_contacts"
-              android:windowSoftInputMode="stateVisible"
+              android:theme="@style/TextSecure.LightNoActionBar"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".PushContactSelectionActivity"
diff --git a/res/drawable-hdpi/ic_dialpad_white_24dp.png b/res/drawable-hdpi/ic_dialpad_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..761be162aeec4809a88b5e14e4c615a5662dacf6
GIT binary patch
literal 359
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K;Lb6AYF9SoB8UsT^3j@P1pisjL
z28L1t28LG&3=CE?7#PG0=Ijcz0ZK3>dAqwX{BQ3+vmeOgEbxddW?<k3n!+v2$S`Y;
z1W@q4r;B5V$MLt90=b$TL|PNCPrPO4wOI7(1FPUd-Aw+K1ywVBp50k!ofI%(-(Mc~
z!hIYUt=3BiNl2*pX-+tIN~|?F<3$4>!v&>cul76Bl=J)q+p=utPx4Cjc6OC`wcNQ}
zYp<@dXyS@le6cI0+*>c!X0(N&LAxyE+qNg)*6;1A$TmD@k@#4oxgtzRVmXKNYRg~E
zHS9$S6Al|q*xEFoOC|ZT$j56EvzPs0@i?|j)8xnv6IY2Wkv|~{?yURmPrPS7x&DNH
m&56V4IRE6@&Odf9UNBDitvt_Mh3x{+s|=p5elF{r5}E)CJA^9$

literal 0
HcmV?d00001

diff --git a/res/drawable-hdpi/ic_keyboard_white_24dp.png b/res/drawable-hdpi/ic_keyboard_white_24dp.png
index d68a8edfb307391f6ac8d5e4e903f69894d83fde..9a66461887f7314b7b118807a441026526725fb3 100644
GIT binary patch
delta 219
zcmV<103`pd1DOJlBq<<cNK#Dz0D2|>0Dy!50Qvv`0D$NK0Cg|`0P0`>06Lfe02gqa
zx=}olF(!YJNkl<ZNXKLN&p;i>Flx|{Hc0k={{IFNVIfc#nnAYzzx*c$eEDyKYS6j=
z<bt!P2K^=5pueaFQ39|U)Bxr+z@!O?3@L-C7Dfla3GD#b-UhI(_(X<O7*Wk@R10hx
z7=)|nAlV>XMHsyd`bW0c{!*)8JA-PF4Vgvlr~fBb=!L%w8HIoTf9cVhcGMss1OV8T
V`Nx_B17!dJ002ovPDHLkV1o3kTX+Bf

delta 368
zcmbQqw3c~-3NK5#qpu?aW7`757t`V=`l{96_jGX#@i_i=%2~lC1Cf^RKZ~!it#O&_
z$r~k**&(Olpy{L?U{iUbilN1YW75f^6W>p{sVH4Gx$?jfdF8K7(lQ(5cK+@Q(VKQi
zm%Hu5gL7t9tT!j5<hec;K7F95=ge)lWtrI}XPFp`-LEPsU1;d&=!nlWmbUw7y-3pa
zb;iRL^^!&mT&rF=R8RHKSQS2zfkAlFrM+IAcLNJHNSV)4V$fJ%bA5fu)UzMzU)D{y
zxXAQHVO74#%a!}zpMG(%C;R8V#fm+9b@}CT(r;(TTV!=tUD?+DUvTxrqjx5pG7UQ|
zY=4IP=OzoS#r!w_F)%QwmbgZgq$HN4S|t~y0x1R~g9t-YT?0d11Je*gGb>{YD<dG=
z!pgwlj<%KxijLg;l+3hBpbkS5T|)z1Bcl)_BP(MAD^oLF19PATNdev-paup{S3j3^
HP6<r_Y$%fM

diff --git a/res/drawable-mdpi/ic_dialpad_white_24dp.png b/res/drawable-mdpi/ic_dialpad_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..fb534ab5b73d7b9e984849764eb1a8045e313f79
GIT binary patch
literal 252
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1g=CK)Uj~LMH3o);76yi2K%s^g
z3=E|P3=FRl7#OT(FffQ0%-I!a1C(G&@^*J&_}|`tW<QX}S>O=~G=W<fgc%uT%>kKR
z;_2cTVsZNJ1#7+r1p(KKkqg>h{Htb*II`7n;zMOcF)8D-*?ETU6L#)?=H^hyamY`}
zY#S#NgPfxWLrd0dhs_F13$B_q9)28oPB!3L*6f5|FZs2;rsPezWuy<JcX`>)jMsh|
oexj$@DNRPi=<$LHm0!Lvc759QBV*OcG@$(qp00i_>zopr0LB_q&j0`b

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/ic_keyboard_white_24dp.png b/res/drawable-mdpi/ic_keyboard_white_24dp.png
index 14d1b5d82c888ec7659b70d26e0e225c823b5f05..5fd959bc29332fdafab6d27ce88dac399c80dc32 100644
GIT binary patch
delta 147
zcmV;E0Brx%0@4AHBq<<cNK#Dz0D2|>0Dy!50Qvv`0D$NK0Cg|`0P0`>06Lfe02gqa
zx=}olF(zM1Nkl<ZILl-B&p;Yv7&aOL|G)fC2)z35kI+C^IS9N&Xdo7#X@IbBk<`#I
z9Gpa^2K2;09SyIDa?lHe27e+_(~JMU!z;&;00CI#8J>xM!wmoc002ovPDHLkV1lNT
BHm?8x

delta 278
zcmcb_c!g<#3NK5#qpu?aW7`757t`V=`l{8pdAc};Se$-3$(FC#fX6LffSG;8sYx-M
z@9fJp?9~%~SzTyhXid?1#Os&yb92t=g4#2GY*q+$3O|0d;$pOB)z%-cBwtRt!YC5p
zIQMGZU(uGr9^>QJggJHI9dV1^v}elBpwI7hp9a2JedNg9^HXj&#8&pnH*vDfvnw$2
zm#@pZTDMeRQ|A8P9}LkU&CY83V&^h2FsPQeMwFx^mZVxG7o`Fz1|tJQQ(Xf?T?5k)
zLo+L53o9ca+rrAg;EuMI3W|o@{FKbJN{|K<T|)z1Bcl)_BP(MAD^oLF19PATNdev-
Ppaup{S3j3^P6<r_`Lbv<

diff --git a/res/drawable-xhdpi/ic_dialpad_white_24dp.png b/res/drawable-xhdpi/ic_dialpad_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..1079772e7c0c9b1dd7fa4806ff7107e5f7509bdc
GIT binary patch
literal 375
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}a}tg=CK)Uj~LMH3o);76yi2K%s^g
z3=E|}g|8AA7_4S6Fo+k-*%fF5lweBoc6VX;-`;;_Kaj^+;1OBOz`!jG!i)^F=12eq
z-+Q_^hD02GJLN22vw{Fy?aWm#H%kXTF8<kE@vkbwYr)G+>oRhrKbTFN%WNRIsd)bz
zF2_zbDJibj<L_T=JhZ@hXQyzJkZ@eK%e$VLy7T7*im0>l-U*GqSG_0IQuD$+w%nhu
zKDIuUX5IX>O(JCp)6?7)I`3`PMfh=X^?duzxV^vK-lE<A;{nsNfzHWpPkZY7vNk3(
zR!KX5d@UCxv_!17wtLB0!R;QmWD0?dn-`Tbi-WrB0u*xlHn?7T))B3e+qVPASR%Gm
zO!eTxri9{0tUgHiSq|gnITb*xye@Nt<^SK4<c*wO&nUIr=m7LOgQu&X%Q~loCIF;9
Bkk0@B

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/ic_keyboard_white_24dp.png b/res/drawable-xhdpi/ic_keyboard_white_24dp.png
index d2b42b3a739e5644bcb26d98856bd67214732fbe..f0050c5f7c359bbb9d26ca0b28d97b09d361221f 100644
GIT binary patch
delta 271
zcmV+q0r38~1I+@EBq<<cNK#Dz0D2|>0Dy!50Qvv`0D$NK0Cg|`0P0`>06Lfe02gqa
zx=}olF(!Y-Nkl<ZSi|j>%?iRW5QJydn|SagY93zDdKMq47F%!Pc#tN=SfS0PAnfK6
z2+Y^)PdY;6jRg!~00Ybl*x`s9n7CS;;Cib5q~MiWQPXw00kEfLl%1~l$F9OwG4(Ar
z?@a(auvD$Cd=^>qbkXV;9h|VYNgiEmpSGuRnPpq18(0^O07&jG(zbYFlbkdM-)3Sc
zXue3T26wEd<aqF>AKl=h`r+r;csbT;uBc)W8!ynYWRoo3@DSwt#>?8&00#J9zzcn!
Vltwp1%vb;b002ovPDHLkV1jA(dMW?_

delta 379
zcmX@hw1atq3NK5#qpu?aW7`757t`V=`l{8x@^o<wi8%ar+F7n92a(qEzL_`qx4e^8
zioL4*Wz)+13yVS*ycdkTsP|}#r;4cPvsn_K*XkJ`w!AaHkvl?X+PR4~GKuY?%i5aw
z=LkFu-M7HGpHbiB>9G#Gxj{-X#%5yYJzj|NOnVULJ5S~Co(~KStQ!K~zTK8!!1inv
z+vX<5ef7^gCkI|#*wJw!@RP*a$6;)9(-(9`mwGhsnA*6^+1^&-g-Gd_i+8k2tzG}8
zJ}|SLaO-7KZF~Jh$N#EH(o@r#)eDZhTzoi-b-vKt#^$Wlt}LcsK3BFa+OegAvE+qu
zN|w$%qXpqnvbtiY7gRDIRA0Kd*12W{0|SF<iEBhjN@7WJs#S7PYGO$$gOP!usjh*c
zu7PQYp_!Gjg_RMIZDD0#a7SB91xZJ$Rc?MtW?CgkgNd%8fv%BJh>?+%v4NGTnXZ93
VP=llZZx2udgQu&X%Q~loCID~_mq-8r

diff --git a/res/drawable-xxhdpi/ic_dialpad_white_24dp.png b/res/drawable-xxhdpi/ic_dialpad_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..e33194bd0791ed63019e4ca8fc78298505fec022
GIT binary patch
literal 463
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhaw6p}rHd>I(3)EF2VS{N990fib~
zFff!FFfhDIU|_JC!N4G1FlSew4N!t9$=lt9;eUJonf*W>XMsm#F#`j)FbFd;%$g&?
zz`*G4>EalYaqsOk$Gk%Z0<N3As@MYjJ(L&4Ok(oX?3mmjlKOr3+UALAQ{JD@y?@iL
zcb@piJxs1~@rny0om8{l6dv#3<6WikxlPRW*v%ftjNbe|cH(Q~XOzci_BgJX^Mc`k
z<kKh5!nu-#RtZ|)ZpifP@yw8yE#a9l@5qdncNZO<5A>)!%jc?fW0z%GrfjITu>ZvZ
zs{|>b<Ueos%N?7ewm-X-yVcOHXLaW#&ebO#S1vPnc6H-HK64(61$9NMxuRtZ&!la6
ztE#e4rzOJFL(46UcT(5H(B>^kImOz??6xP#6mxHR)3WPM*T$1;B_d5dbbu;^x`8UR
z+&Dcwj;=@wF<d1P+N0$ry0|OQNvKLu(VbUM@yV)#U!2ZK`RG4c17q~87Z)kImQbab
w&bv&!=-LAz{>7`=rbo*5NnP3Yf4Y->;+Y9=nw?hX0>hcX)78&qol`;+04WTwp8x;=

literal 0
HcmV?d00001

diff --git a/res/drawable-xxxhdpi/ic_dialpad_white_24dp.png b/res/drawable-xxxhdpi/ic_dialpad_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..36a9ba77fbfd1bf56dbc43ceb401f9f1eef82c32
GIT binary patch
literal 493
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%xcg6p}rHd>I(3)EF2VS{N990fib~
zFff!FFfhDIU|_JC!N4G1FlSew4N!t9$=lt9;eUJonf*W>XMsm#F#`j)FbFd;%$g&?
zz`&U5>EaktaqI02$Gk%Z0<N30EqJ;tv=^itjMO@!=uj{zW%B*f)km&YNcC&qJM-=I
z;^h&2f2B<S@0Mm@&|odNuwc5HZ`G=B@p<NqZ%QtHpJlp&_p~%)*{;l$>$H`(otw?5
z7q!|>C7;D2WAC%py}L^9@fc`?K7Ukcd_ddsL7+`O+l)!f#~%Is&Rn6!ey98SS%%u8
z0~;&u@m$FClPUiF=x2}o&0mh?TqkEUM#YLx|9{2Z!|t)s^{gKs7pBh@I-NiF{4T$8
ztJezy7r(Rmx6j=C{AVR*pihB7zeW5I_rul?P8EuK1mZZL+=_{eVA%$2k{_J*oB+!*
z{Fr?1i%ltmg^fQigWmaI=7!Usk1$)<`r9;IhB1OCGd##!{=AdDplV(P!}8}VAG$yL
xWMj&(!^U5Bx@G(GmCvo_zO1ac0F0fr`x!E7*6F-Ic<mp^cu!Y9mvv4FO#l{R!A}4H

literal 0
HcmV?d00001

diff --git a/res/drawable-xxxhdpi/ic_keyboard_white_24dp.png b/res/drawable-xxxhdpi/ic_keyboard_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..84365a57634273a7ee657fb5264b4c0df6e8ff8d
GIT binary patch
literal 502
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%xcg6p}rHd>I(3)EF2VS{N990fib~
zFff!FFfhDIU|_JC!N4G1FlSew4N!t9$=lt9;eUJonf*W>XMsm#F#`j)FbFd;%$g&?
zz`&U2>EaktaqI0ZL%+iYBF8?S=eX!|r*WoYL6g(+qKPu>Y8p?JHi#VI47j?|`>5y*
zsWv;cX}6{ZH%<!wv3vGXkN4BR&wCrfx9qPRI}^|fWKbtru&h%oE5-J|l&(qOPSbNw
zf?Ka{GxJZ*{T{X?iMO*}mCN?kp~S6wvetyo7TQ%NxzFT^uZ?8-gOFm@<+9mU*L9{h
zp340Z6fjkPq4)LG&ottl<gLnhGD4mh85GQIbllg{^ewAE>{YeQyA3V5>rUQ1^MAk4
zqE1GJ1)a6;n6F*7v1M5BT8?8*tA--On<FU=`AO%TObmT_7#Qv!(LL^e(2bK3=-h_Y
zwGV>bW7j>l?o*rJSbkl<W+uDMZZ@CA%?=@qOYh0VZ`U+EpPI1j*4y9vZ}Y@QubX3=
z`NH6jc<k29q|Buo<x<XdJvS4rvtqu#Hz0G#<a_Jyn?z-;veKI;(=ZnpzR2KD?g8-!
WzWV>ZUy_jriF>;GxvX<aXaWHH|GVM<

literal 0
HcmV?d00001

diff --git a/res/layout/contact_selection_activity.xml b/res/layout/contact_selection_activity.xml
new file mode 100644
index 0000000000..08f995fc20
--- /dev/null
+++ b/res/layout/contact_selection_activity.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout android:layout_gravity="center"
+              android:layout_height="fill_parent"
+              android:layout_width="fill_parent"
+              android:orientation="vertical"
+              xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <android.support.v7.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_height="?attr/actionBarSize"
+            android:layout_width="match_parent"
+            android:minHeight="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            android:theme="@style/TextSecure.LightActionBar">
+
+        <LinearLayout android:layout_width="match_parent"
+                      android:layout_height="match_parent"
+                      android:orientation="horizontal">
+
+            <ImageView android:id="@+id/action_icon"
+                       android:layout_width="wrap_content"
+                       android:layout_height="wrap_content"
+                       android:layout_gravity="center_vertical"
+                       android:gravity="center_vertical"
+                       android:clickable="true"
+                       android:background="@drawable/circle_touch_highlight_background"
+                       android:src="@drawable/ic_search_white_24dp" />
+
+            <EditText android:id="@+id/search_view"
+                      android:layout_height="wrap_content"
+                      android:layout_width="0px"
+                      android:layout_weight="1"
+                      android:layout_marginLeft="5dp"
+                      android:hint="Enter name or number"
+                      android:inputType="textPersonName"
+                      android:theme="@style/TextSecure.TitleTextStyle"
+                      android:background="@android:color/transparent"
+                      android:layout_gravity="center_vertical"
+                      android:gravity="center_vertical"/>
+
+            <org.thoughtcrime.securesms.components.AnimatingToggle
+                    android:id="@+id/button_toggle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:gravity="center">
+
+                <ImageView android:id="@+id/search_dialpad"
+                           android:layout_width="wrap_content"
+                           android:layout_height="wrap_content"
+                           android:layout_gravity="center_vertical"
+                           android:gravity="center_vertical"
+                           android:clickable="true"
+                           android:background="@drawable/circle_touch_highlight_background"
+                           android:src="@drawable/ic_dialpad_white_24dp" />
+
+                <ImageView android:id="@+id/search_keyboard"
+                           android:layout_width="wrap_content"
+                           android:layout_height="wrap_content"
+                           android:layout_gravity="center_vertical"
+                           android:gravity="center_vertical"
+                           android:clickable="true"
+                           android:visibility="gone"
+                           android:background="@drawable/circle_touch_highlight_background"
+                           android:src="@drawable/ic_keyboard_white_24dp" />
+
+
+                <ImageView android:id="@+id/search_clear"
+                           android:layout_width="wrap_content"
+                           android:layout_height="wrap_content"
+                           android:layout_gravity="center_vertical"
+                           android:gravity="center_vertical"
+                           android:clickable="true"
+                           android:visibility="gone"
+                           android:background="@drawable/circle_touch_highlight_background"
+                           android:src="@drawable/ic_clear_white_24dp" />
+
+            </org.thoughtcrime.securesms.components.AnimatingToggle>
+
+        </LinearLayout>
+
+    </android.support.v7.widget.Toolbar>
+
+    <fragment
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/contact_selection_list_fragment"
+        android:name="org.thoughtcrime.securesms.ContactSelectionListFragment">
+        </fragment>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/contact_selection_list_fragment.xml b/res/layout/contact_selection_list_fragment.xml
new file mode 100644
index 0000000000..f54bcb98c8
--- /dev/null
+++ b/res/layout/contact_selection_list_fragment.xml
@@ -0,0 +1,26 @@
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+    
+    <android.support.v4.widget.SwipeRefreshLayout
+            android:id="@+id/swipe_refresh"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+        <se.emilsjolander.stickylistheaders.StickyListHeadersListView
+            android:id="@android:id/list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+        <TextView android:id="@android:id/empty"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center|center_vertical"
+            android:layout_marginTop="15dp"
+            android:text="@string/contact_selection_group_activity__finding_contacts"
+            android:textSize="20sp" />
+
+    </android.support.v4.widget.SwipeRefreshLayout>
+</LinearLayout>
diff --git a/res/layout/push_contact_selection_list_header.xml b/res/layout/contact_selection_list_header.xml
similarity index 68%
rename from res/layout/push_contact_selection_list_header.xml
rename to res/layout/contact_selection_list_header.xml
index a386bd04ab..040602aeb8 100644
--- a/res/layout/push_contact_selection_list_header.xml
+++ b/res/layout/contact_selection_list_header.xml
@@ -14,12 +14,7 @@
               android:layout_centerVertical="true"
               android:layout_alignParentLeft="true"
               android:textSize="15sp"
-              android:textColor="?conversation_selection_header_text"
+              android:textColor="?contact_selection_header_text"
               android:textStyle="bold" />
 
-    <View android:layout_width="match_parent"
-          android:layout_height="3dp"
-          android:layout_alignParentBottom="true"
-          android:layout_marginTop="2dp"
-          android:background="?conversation_selection_header_text" />
 </RelativeLayout>
diff --git a/res/layout/push_contact_selection_list_item.xml b/res/layout/contact_selection_list_item.xml
similarity index 100%
rename from res/layout/push_contact_selection_list_item.xml
rename to res/layout/contact_selection_list_item.xml
diff --git a/res/layout/new_conversation_activity.xml b/res/layout/new_conversation_activity.xml
deleted file mode 100644
index e3bf93e1f4..0000000000
--- a/res/layout/new_conversation_activity.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:layout_gravity="center"
-              android:layout_height="fill_parent"
-              android:layout_width="fill_parent"
-              android:orientation="vertical"
-              xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <fragment
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:id="@+id/contact_selection_list_fragment"
-        android:name="org.thoughtcrime.securesms.PushContactSelectionListFragment">
-        </fragment>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/push_contact_selection_activity.xml b/res/layout/push_contact_selection_activity.xml
deleted file mode 100644
index e3bf93e1f4..0000000000
--- a/res/layout/push_contact_selection_activity.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:layout_gravity="center"
-              android:layout_height="fill_parent"
-              android:layout_width="fill_parent"
-              android:orientation="vertical"
-              xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <fragment
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:id="@+id/contact_selection_list_fragment"
-        android:name="org.thoughtcrime.securesms.PushContactSelectionListFragment">
-        </fragment>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/push_contact_selection_list_activity.xml b/res/layout/push_contact_selection_list_activity.xml
deleted file mode 100644
index e45ff7657b..0000000000
--- a/res/layout/push_contact_selection_list_activity.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-    <EditText android:id="@+id/filter"
-              android:inputType="textPersonName"
-              android:layout_width="match_parent"
-              android:layout_height="45sp"
-              android:hint="@string/recipients_panel__to"
-              android:textColor="?conversation_editor_text_color" />
-
-    <se.emilsjolander.stickylistheaders.StickyListHeadersListView
-        android:id="@android:id/list"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-    <TextView android:id="@android:id/empty"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center|center_vertical"
-        android:layout_marginTop="15dp"
-        android:text="@string/contact_selection_group_activity__finding_contacts"
-        android:textSize="20sp" />
-
-</LinearLayout>
diff --git a/res/menu/new_conversation_activity_number_pad.xml b/res/menu/new_conversation_activity_number_pad.xml
new file mode 100644
index 0000000000..8c6dd923a2
--- /dev/null
+++ b/res/menu/new_conversation_activity_number_pad.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item android:title="Number pad"
+          android:id="@+id/menu_number_pad"
+          android:icon="@drawable/ic_dialpad_white_24dp"
+          app:showAsAction="always"/>
+</menu>
\ No newline at end of file
diff --git a/res/menu/new_conversation_activity_search.xml b/res/menu/new_conversation_activity_search.xml
new file mode 100644
index 0000000000..13a5a920a6
--- /dev/null
+++ b/res/menu/new_conversation_activity_search.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item android:title="Search contacts"
+          android:id="@+id/menu_search"
+          android:icon="?attr/menu_search_icon"
+          app:actionViewClass="android.support.v7.widget.SearchView"
+          app:showAsAction="always|collapseActionView" />
+
+</menu>
diff --git a/res/menu/new_conversation_activity_text_pad.xml b/res/menu/new_conversation_activity_text_pad.xml
new file mode 100644
index 0000000000..86978ce33a
--- /dev/null
+++ b/res/menu/new_conversation_activity_text_pad.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item android:title="Text input"
+          android:id="@+id/menu_text_pad"
+          android:icon="@drawable/ic_keyboard_white_24dp"
+          app:showAsAction="always"/>
+
+</menu>
\ No newline at end of file
diff --git a/res/menu/push_directory.xml b/res/menu/push_directory.xml
index 0644a91b91..4c89c705b7 100644
--- a/res/menu/push_directory.xml
+++ b/res/menu/push_directory.xml
@@ -4,6 +4,6 @@
     <item android:title="@string/push_directory__menu_refresh"
           android:id="@+id/menu_refresh_directory"
           android:icon="?menu_refresh_directory"
-          app:showAsAction="ifRoom"
+          app:showAsAction="always"
         />
 </menu>
\ No newline at end of file
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 9b8142d0c1..67e9de4a12 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -72,7 +72,7 @@
     <attr name="contact_selection_push_user" format="reference|color" />
     <attr name="contact_selection_lay_user" format="reference|color" />
     <attr name="contact_selection_label_text" format="reference|color" />
-    <attr name="conversation_selection_header_text" format="reference|color" />
+    <attr name="contact_selection_header_text" format="reference|color" />
 
     <attr name="import_export_item_background_color" format="reference|color" />
     <attr name="import_export_item_background_shadow_color" format="reference|color" />
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 2f59733247..4b81c43887 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -58,6 +58,7 @@
 
     <style name="TextSecure.TitleTextStyle" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">
         <item name="android:textColor">@color/white</item>
+        <item name="android:textColorHint">#BFffffff</item>
     </style>
 
     <style name="TextSecure.SubtitleTextStyle" parent="TextAppearance.AppCompat.Widget.ActionBar.Subtitle">
diff --git a/res/values/themes.xml b/res/values/themes.xml
index b91ef0a2a7..2520a6ae4f 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -9,7 +9,12 @@
         <item name="colorPrimary">@color/textsecure_primary</item>
         <item name="colorPrimaryDark">@color/textsecure_primary_dark</item>
         <item name="colorAccent">@color/textsecure_primary_dark</item>
+
         <item name="recipient_preference_blocked">#8e0000</item>
+        <item name="contact_selection_label_text">#66000000</item>
+        <item name="contact_selection_push_user">#ff000000</item>
+        <item name="contact_selection_lay_user">#a0000000</item>
+        <item name="contact_selection_header_text">@color/textsecure_primary_dark</item>
     </style>
 
     <style name="TextSecure.DarkNoActionBar" parent="@style/Theme.AppCompat.NoActionBar">
@@ -17,7 +22,12 @@
         <item name="actionBarStyle">@style/TextSecure.DarkActionBar</item>
         <item name="actionBarTabBarStyle">@style/TextSecure.DarkActionBar.TabBar</item>
         <item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
+
         <item name="recipient_preference_blocked">#d00000</item>
+        <item name="contact_selection_label_text">#66eeeeee</item>
+        <item name="contact_selection_push_user">#ffeeeeee</item>
+        <item name="contact_selection_lay_user">#afeeeeee</item>
+        <item name="contact_selection_header_text">#66eeeeee</item>
     </style>
 
     <style name="TextSecure.LightIntroTheme" parent="@style/Theme.AppCompat.Light">
@@ -82,11 +92,6 @@
 
         <item name="conversation_group_member_name">#99000000</item>
 
-        <item name="contact_selection_push_user">#ff000000</item>
-        <item name="contact_selection_lay_user">#a0000000</item>
-        <item name="contact_selection_label_text">#66000000</item>
-        <item name="conversation_selection_header_text">#44000000</item>
-
         <item name="conversation_background">#eeeeee</item>
         <item name="conversation_editor_background">#22000000</item>
         <item name="conversation_editor_text_color">#ff111111</item>
@@ -196,11 +201,6 @@
 
         <item name="conversation_group_member_name">#99ffffff</item>
 
-        <item name="contact_selection_push_user">#ffeeeeee</item>
-        <item name="contact_selection_lay_user">#afeeeeee</item>
-        <item name="contact_selection_label_text">#66eeeeee</item>
-        <item name="conversation_selection_header_text">#66eeeeee</item>
-
         <item name="conversation_item_background">@drawable/conversation_item_background_dark</item>
         <item name="conversation_item_bubble_background">#ff333333</item>
         <item name="conversation_item_sent_text_primary_color">#ffffffff</item>
diff --git a/src/org/thoughtcrime/securesms/ContactSelectionActivity.java b/src/org/thoughtcrime/securesms/ContactSelectionActivity.java
new file mode 100644
index 0000000000..3684b384fd
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/ContactSelectionActivity.java
@@ -0,0 +1,198 @@
+/**
+ * Copyright (C) 2015 Open Whisper Systems
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.thoughtcrime.securesms;
+
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.v4.widget.SwipeRefreshLayout;
+import android.support.v7.widget.Toolbar;
+import android.text.Editable;
+import android.text.InputType;
+import android.text.TextWatcher;
+import android.util.Log;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.ImageView;
+
+import org.thoughtcrime.securesms.components.AnimatingToggle;
+import org.thoughtcrime.securesms.crypto.MasterSecret;
+import org.thoughtcrime.securesms.util.DirectoryHelper;
+import org.thoughtcrime.securesms.util.DynamicLanguage;
+import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
+import org.thoughtcrime.securesms.util.DynamicTheme;
+
+import java.io.IOException;
+
+/**
+ * Base activity container for selecting a list of contacts.
+ *
+ * @author Moxie Marlinspike
+ *
+ */
+public abstract class ContactSelectionActivity extends PassphraseRequiredActionBarActivity
+                                               implements SwipeRefreshLayout.OnRefreshListener,
+                                                          ContactSelectionListFragment.OnContactSelectedListener
+{
+  private static final String TAG             = ContactSelectionActivity.class.getSimpleName();
+  public  final static String PUSH_ONLY_EXTRA = "push_only";
+
+  private final DynamicTheme    dynamicTheme    = new DynamicNoActionBarTheme();
+  private final DynamicLanguage dynamicLanguage = new DynamicLanguage();
+
+  protected ContactSelectionListFragment contactsFragment;
+
+  private   Toolbar         toolbar;
+  private   EditText        searchText;
+  private   AnimatingToggle toggle;
+  protected ImageView       action;
+  private   ImageView       keyboardToggle;
+  private   ImageView       dialpadToggle;
+  private   ImageView       clearToggle;
+
+  @Override
+  protected void onPreCreate() {
+    dynamicTheme.onCreate(this);
+    dynamicLanguage.onCreate(this);
+  }
+
+  @Override
+  protected void onCreate(Bundle icicle, @NonNull MasterSecret masterSecret) {
+    setContentView(R.layout.contact_selection_activity);
+
+    initializeToolbar();
+    initializeResources();
+    initializeSearch();
+  }
+
+  @Override
+  public void onResume() {
+    super.onResume();
+    dynamicTheme.onResume(this);
+    dynamicLanguage.onResume(this);
+  }
+
+  private void initializeToolbar() {
+    this.toolbar = (Toolbar) findViewById(R.id.toolbar);
+    setSupportActionBar(toolbar);
+
+    getSupportActionBar().setDisplayHomeAsUpEnabled(false);
+    getSupportActionBar().setDisplayShowTitleEnabled(false);
+  }
+
+  private void initializeResources() {
+    this.action         = (ImageView) findViewById(R.id.action_icon);
+    this.searchText     = (EditText) findViewById(R.id.search_view);
+    this.toggle         = (AnimatingToggle) findViewById(R.id.button_toggle);
+    this.keyboardToggle = (ImageView) findViewById(R.id.search_keyboard);
+    this.dialpadToggle  = (ImageView) findViewById(R.id.search_dialpad);
+    this.clearToggle    = (ImageView) findViewById(R.id.search_clear);
+
+    contactsFragment = (ContactSelectionListFragment) getSupportFragmentManager().findFragmentById(R.id.contact_selection_list_fragment);
+    contactsFragment.setOnContactSelectedListener(this);
+    contactsFragment.setOnRefreshListener(this);
+
+    this.keyboardToggle.setOnClickListener(new View.OnClickListener() {
+      @Override
+      public void onClick(View v) {
+        searchText.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PERSON_NAME);
+        toggle.display(dialpadToggle);
+      }
+    });
+
+    this.dialpadToggle.setOnClickListener(new View.OnClickListener() {
+      @Override
+      public void onClick(View v) {
+        searchText.setInputType(InputType.TYPE_CLASS_PHONE);
+        toggle.display(keyboardToggle);
+      }
+    });
+
+    this.clearToggle.setOnClickListener(new View.OnClickListener() {
+      @Override
+      public void onClick(View v) {
+        searchText.setText("");
+
+        if (SearchUtil.isTextInput(searchText)) toggle.display(dialpadToggle);
+        else                                    toggle.display(keyboardToggle);
+      }
+    });
+  }
+
+  private void initializeSearch() {
+    this.searchText.addTextChangedListener(new TextWatcher() {
+      @Override
+      public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+      }
+
+      @Override
+      public void onTextChanged(CharSequence s, int start, int before, int count) {
+
+      }
+
+      @Override
+      public void afterTextChanged(Editable s) {
+        if      (!SearchUtil.isEmpty(searchText))     toggle.display(clearToggle);
+        else if (SearchUtil.isTextInput(searchText))  toggle.display(dialpadToggle);
+        else if (SearchUtil.isPhoneInput(searchText)) toggle.display(keyboardToggle);
+
+        contactsFragment.setQueryFilter(searchText.getText().toString());
+      }
+    });
+  }
+
+  @Override
+  public void onRefresh() {
+    new AsyncTask<Void, Void, Void>() {
+      @Override
+      protected Void doInBackground(Void... params) {
+        try {
+          DirectoryHelper.refreshDirectory(ContactSelectionActivity.this);
+        } catch (IOException e) {
+          Log.w(TAG, e);
+        }
+
+        return null;
+      }
+
+      @Override
+      protected void onPostExecute(Void result) {
+        searchText.setText("");
+        contactsFragment.resetQueryFilter();
+      }
+    }.execute();
+  }
+
+  @Override
+  public void onContactSelected(String number) {}
+
+  private static class SearchUtil {
+
+    public static boolean isTextInput(EditText editText) {
+      return (editText.getInputType() & 0x0000000F) == InputType.TYPE_CLASS_TEXT;
+    }
+
+    public static boolean isPhoneInput(EditText editText) {
+      return (editText.getInputType() & 0x0000000F) == InputType.TYPE_CLASS_PHONE;
+    }
+
+    public static boolean isEmpty(EditText editText) {
+      return editText.getText().length() <= 0;
+    }
+  }
+}
diff --git a/src/org/thoughtcrime/securesms/PushContactSelectionListFragment.java b/src/org/thoughtcrime/securesms/ContactSelectionListFragment.java
similarity index 78%
rename from src/org/thoughtcrime/securesms/PushContactSelectionListFragment.java
rename to src/org/thoughtcrime/securesms/ContactSelectionListFragment.java
index db440ecae9..067780c209 100644
--- a/src/org/thoughtcrime/securesms/PushContactSelectionListFragment.java
+++ b/src/org/thoughtcrime/securesms/ContactSelectionListFragment.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2011 Whisper Systems
+ * Copyright (C) 2015 Open Whisper Systems
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,13 +23,11 @@ import android.support.v4.app.Fragment;
 import android.support.v4.app.LoaderManager;
 import android.support.v4.content.Loader;
 import android.support.v4.widget.CursorAdapter;
-import android.text.Editable;
-import android.text.TextWatcher;
+import android.support.v4.widget.SwipeRefreshLayout;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
-import android.widget.EditText;
 import android.widget.TextView;
 
 import org.thoughtcrime.securesms.contacts.ContactSelectionListAdapter;
@@ -49,17 +47,17 @@ import se.emilsjolander.stickylistheaders.StickyListHeadersListView;
  * @author Moxie Marlinspike
  *
  */
-
-public class PushContactSelectionListFragment extends    Fragment
-                                              implements LoaderManager.LoaderCallbacks<Cursor>
+public class ContactSelectionListFragment extends    Fragment
+                                          implements LoaderManager.LoaderCallbacks<Cursor>
 {
-  private static final String TAG = "ContactSelectFragment";
+  private static final String TAG = ContactSelectionListFragment.class.getSimpleName();
 
   private TextView emptyText;
 
   private Map<Long, String>         selectedContacts;
   private OnContactSelectedListener onContactSelectedListener;
   private StickyListHeadersListView listView;
+  private SwipeRefreshLayout        swipeRefresh;
   private String                    cursorFilter;
 
   private boolean multi = false;
@@ -67,7 +65,6 @@ public class PushContactSelectionListFragment extends    Fragment
   @Override
   public void onActivityCreated(Bundle icicle) {
     super.onCreate(icicle);
-    initializeResources();
     initializeCursor();
   }
 
@@ -83,7 +80,17 @@ public class PushContactSelectionListFragment extends    Fragment
 
   @Override
   public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-    return inflater.inflate(R.layout.push_contact_selection_list_activity, container, false);
+    View view = inflater.inflate(R.layout.contact_selection_list_fragment, container, false);
+
+    this.emptyText = (TextView)                  view.findViewById(android.R.id.empty);
+    swipeRefresh   = (SwipeRefreshLayout)        view.findViewById(R.id.swipe_refresh);
+    listView       = (StickyListHeadersListView) view.findViewById(android.R.id.list);
+    listView.setFocusable(true);
+    listView.setFastScrollEnabled(true);
+    listView.setDrawingListUnderStickyHeader(false);
+    listView.setOnItemClickListener(new ListClickListener());
+
+    return view;
   }
 
   public List<String> getSelectedContacts() {
@@ -106,42 +113,19 @@ public class PushContactSelectionListFragment extends    Fragment
     this.getLoaderManager().initLoader(0, null, this);
   }
 
-  private void initializeResources() {
-    emptyText = (TextView) getView().findViewById(android.R.id.empty);
-    listView  = (StickyListHeadersListView) getView().findViewById(android.R.id.list);
-    listView.setFocusable(true);
-    listView.setFastScrollEnabled(true);
-    listView.setDrawingListUnderStickyHeader(false);
-    listView.setOnItemClickListener(new ListClickListener());
-
-    EditText filterEditText = (EditText) getView().findViewById(R.id.filter);
-    filterEditText.addTextChangedListener(new TextWatcher() {
-      @Override
-      public void beforeTextChanged(CharSequence charSequence, int i, int i2, int i3) {
-
-      }
-
-      @Override
-      public void onTextChanged(CharSequence charSequence, int i, int i2, int i3) {
-        cursorFilter = charSequence.toString();
-        update();
-      }
-
-      @Override
-      public void afterTextChanged(Editable editable) {
-
-      }
-    });
-    cursorFilter = null;
+  public void setQueryFilter(String filter) {
+    this.cursorFilter = filter;
+    this.getLoaderManager().restartLoader(0, null, this);
   }
 
-  public void update() {
-    this.getLoaderManager().restartLoader(0, null, this);
+  public void resetQueryFilter() {
+    setQueryFilter(null);
+    swipeRefresh.setRefreshing(false);
   }
 
   @Override
   public Loader<Cursor> onCreateLoader(int id, Bundle args) {
-    boolean pushOnly    = getActivity().getIntent().getBooleanExtra(PushContactSelectionActivity.PUSH_ONLY_EXTRA, false);
+    boolean pushOnly    = getActivity().getIntent().getBooleanExtra(ContactSelectionActivity.PUSH_ONLY_EXTRA, false);
     boolean supportsSms = TextSecurePreferences.isSmsEnabled(getActivity());
 
     return new ContactsCursorLoader(getActivity(), !pushOnly && supportsSms, cursorFilter);
@@ -178,6 +162,10 @@ public class PushContactSelectionListFragment extends    Fragment
     this.onContactSelectedListener = onContactSelectedListener;
   }
 
+  public void setOnRefreshListener(SwipeRefreshLayout.OnRefreshListener onRefreshListener) {
+    this.swipeRefresh.setOnRefreshListener(onRefreshListener);
+  }
+
   public interface OnContactSelectedListener {
     public void onContactSelected(String number);
   }
diff --git a/src/org/thoughtcrime/securesms/NewConversationActivity.java b/src/org/thoughtcrime/securesms/NewConversationActivity.java
index fa65e1a2ca..f3a711288d 100644
--- a/src/org/thoughtcrime/securesms/NewConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/NewConversationActivity.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2011 Whisper Systems
+ * Copyright (C) 2015 Open Whisper Systems
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,99 +17,26 @@
 package org.thoughtcrime.securesms;
 
 import android.content.Intent;
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.util.Log;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
 
-import org.thoughtcrime.securesms.crypto.MasterSecret;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.ThreadDatabase;
 import org.thoughtcrime.securesms.recipients.RecipientFactory;
 import org.thoughtcrime.securesms.recipients.Recipients;
-import org.thoughtcrime.securesms.util.DirectoryHelper;
-import org.thoughtcrime.securesms.util.DynamicLanguage;
-import org.thoughtcrime.securesms.util.DynamicTheme;
-import org.thoughtcrime.securesms.util.TextSecurePreferences;
 
 /**
- * Activity container for selecting a list of contacts.
+ * Activity container for starting a new conversation.
  *
  * @author Moxie Marlinspike
  *
  */
-public class NewConversationActivity extends PassphraseRequiredActionBarActivity {
-  private static final String TAG = NewConversationActivity.class.getSimpleName();
-
-  private final DynamicTheme    dynamicTheme    = new DynamicTheme   ();
-  private final DynamicLanguage dynamicLanguage = new DynamicLanguage();
+public class NewConversationActivity extends ContactSelectionActivity {
 
-  private PushContactSelectionListFragment contactsFragment;
-
-  @Override
-  protected void onPreCreate() {
-    dynamicTheme.onCreate(this);
-    dynamicLanguage.onCreate(this);
-  }
-
-  @Override
-  protected void onCreate(Bundle icicle, @NonNull MasterSecret masterSecret) {
-    getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-    setContentView(R.layout.new_conversation_activity);
-    initializeResources();
-  }
-
-  @Override
-  public void onResume() {
-    super.onResume();
-    dynamicTheme.onResume(this);
-    dynamicLanguage.onResume(this);
-    getSupportActionBar().setTitle(R.string.AndroidManifest__select_contacts);
-  }
-
-  @Override
-  public boolean onPrepareOptionsMenu(Menu menu) {
-    MenuInflater inflater = this.getMenuInflater();
-    menu.clear();
-
-    if (TextSecurePreferences.isPushRegistered(this)) inflater.inflate(R.menu.push_directory, menu);
-    return true;
-  }
+  private static final String TAG = NewConversationActivity.class.getSimpleName();
 
   @Override
-  public boolean onOptionsItemSelected(MenuItem item) {
-    super.onOptionsItemSelected(item);
-    switch (item.getItemId()) {
-    case R.id.menu_refresh_directory:  handleDirectoryRefresh();  return true;
-    case android.R.id.home:            finish();                  return true;
-    }
-    return false;
-  }
-
-  private void initializeResources() {
-    contactsFragment = (PushContactSelectionListFragment) getSupportFragmentManager().findFragmentById(R.id.contact_selection_list_fragment);
-    contactsFragment.setOnContactSelectedListener(new PushContactSelectionListFragment.OnContactSelectedListener() {
-      @Override
-      public void onContactSelected(String number) {
-        Log.i(TAG, "Choosing contact from list.");
-        Recipients recipients = RecipientFactory.getRecipientsFromString(NewConversationActivity.this, number, true);
-        openNewConversation(recipients);
-      }
-    });
-  }
-
-  private void handleDirectoryRefresh() {
-    DirectoryHelper.refreshDirectoryWithProgressDialog(this, new DirectoryHelper.DirectoryUpdateFinishedListener() {
-      @Override
-      public void onUpdateFinished() {
-        contactsFragment.update();
-      }
-    });
-  }
+  public void onContactSelected(String number) {
+    Recipients recipients = RecipientFactory.getRecipientsFromString(this, number, true);
 
-  private void openNewConversation(Recipients recipients) {
     if (recipients != null) {
       Intent intent = new Intent(this, ConversationActivity.class);
       intent.putExtra(ConversationActivity.RECIPIENTS_EXTRA, recipients.getIds());
@@ -117,11 +44,14 @@ public class NewConversationActivity extends PassphraseRequiredActionBarActivity
       intent.putExtra(ConversationActivity.DRAFT_AUDIO_EXTRA, getIntent().getParcelableExtra(ConversationActivity.DRAFT_AUDIO_EXTRA));
       intent.putExtra(ConversationActivity.DRAFT_VIDEO_EXTRA, getIntent().getParcelableExtra(ConversationActivity.DRAFT_VIDEO_EXTRA));
       intent.putExtra(ConversationActivity.DRAFT_IMAGE_EXTRA, getIntent().getParcelableExtra(ConversationActivity.DRAFT_IMAGE_EXTRA));
+
       long existingThread = DatabaseFactory.getThreadDatabase(this).getThreadIdIfExistsFor(recipients);
+
       intent.putExtra(ConversationActivity.THREAD_ID_EXTRA, existingThread);
       intent.putExtra(ConversationActivity.DISTRIBUTION_TYPE_EXTRA, ThreadDatabase.DistributionTypes.DEFAULT);
       startActivity(intent);
       finish();
     }
   }
+
 }
diff --git a/src/org/thoughtcrime/securesms/PushContactSelectionActivity.java b/src/org/thoughtcrime/securesms/PushContactSelectionActivity.java
index a06b46a2b5..9a4472e036 100644
--- a/src/org/thoughtcrime/securesms/PushContactSelectionActivity.java
+++ b/src/org/thoughtcrime/securesms/PushContactSelectionActivity.java
@@ -22,10 +22,12 @@ import android.support.annotation.NonNull;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
+import android.view.View;
 
 import org.thoughtcrime.securesms.crypto.MasterSecret;
 import org.thoughtcrime.securesms.util.DirectoryHelper;
 import org.thoughtcrime.securesms.util.DynamicLanguage;
+import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
 import org.thoughtcrime.securesms.util.DynamicTheme;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 
@@ -38,81 +40,28 @@ import java.util.List;
  * @author Moxie Marlinspike
  *
  */
-public class PushContactSelectionActivity extends PassphraseRequiredActionBarActivity {
-  private final static String TAG             = "ContactSelectActivity";
-  public  final static String PUSH_ONLY_EXTRA = "push_only";
+public class PushContactSelectionActivity extends ContactSelectionActivity {
 
-  private final DynamicTheme    dynamicTheme    = new DynamicTheme   ();
-  private final DynamicLanguage dynamicLanguage = new DynamicLanguage();
-
-  private PushContactSelectionListFragment contactsFragment;
-
-  @Override
-  protected void onPreCreate() {
-    dynamicTheme.onCreate(this);
-    dynamicLanguage.onCreate(this);
-  }
+  private final static String TAG = PushContactSelectionActivity.class.getSimpleName();
 
   @Override
   protected void onCreate(Bundle icicle, @NonNull MasterSecret masterSecret) {
-    getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-
-    setContentView(R.layout.push_contact_selection_activity);
-    initializeResources();
-  }
-
-  @Override
-  public void onResume() {
-    super.onResume();
-    dynamicTheme.onResume(this);
-    dynamicLanguage.onResume(this);
-    getSupportActionBar().setTitle(R.string.AndroidManifest__select_contacts);
-  }
-
-  @Override
-  public boolean onPrepareOptionsMenu(Menu menu) {
-    MenuInflater inflater = this.getMenuInflater();
-    menu.clear();
-
-    if (TextSecurePreferences.isPushRegistered(this)) inflater.inflate(R.menu.push_directory, menu);
-
-    inflater.inflate(R.menu.contact_selection, menu);
-    return true;
-  }
-
-  @Override
-  public boolean onOptionsItemSelected(MenuItem item) {
-    super.onOptionsItemSelected(item);
-    switch (item.getItemId()) {
-    case R.id.menu_refresh_directory:  handleDirectoryRefresh();  return true;
-    case R.id.menu_selection_finished: handleSelectionFinished(); return true;
-    case android.R.id.home:            finish();                  return true;
-    }
-    return false;
-  }
-
-  private void initializeResources() {
-    contactsFragment = (PushContactSelectionListFragment) getSupportFragmentManager().findFragmentById(R.id.contact_selection_list_fragment);
+    super.onCreate(icicle, masterSecret);
     contactsFragment.setMultiSelect(true);
-  }
 
-  private void handleSelectionFinished() {
-    Intent resultIntent = getIntent();
-    List<String> selectedContacts = contactsFragment.getSelectedContacts();
+    action.setImageDrawable(getResources().getDrawable(R.drawable.ic_check_white_24dp));
+    action.setOnClickListener(new View.OnClickListener() {
+      @Override
+      public void onClick(View v) {
+        Intent       resultIntent     = getIntent();
+        List<String> selectedContacts = contactsFragment.getSelectedContacts();
 
-    if (selectedContacts != null) {
-      resultIntent.putStringArrayListExtra("contacts", new ArrayList<>(selectedContacts));
-    }
+        if (selectedContacts != null) {
+          resultIntent.putStringArrayListExtra("contacts", new ArrayList<>(selectedContacts));
+        }
 
-    setResult(RESULT_OK, resultIntent);
-    finish();
-  }
-
-  private void handleDirectoryRefresh() {
-    DirectoryHelper.refreshDirectoryWithProgressDialog(this, new DirectoryHelper.DirectoryUpdateFinishedListener() {
-      @Override
-      public void onUpdateFinished() {
-        contactsFragment.update();
+        setResult(RESULT_OK, resultIntent);
+        finish();
       }
     });
   }
diff --git a/src/org/thoughtcrime/securesms/contacts/ContactSelectionListAdapter.java b/src/org/thoughtcrime/securesms/contacts/ContactSelectionListAdapter.java
index 7f1ae268b1..565f870d80 100644
--- a/src/org/thoughtcrime/securesms/contacts/ContactSelectionListAdapter.java
+++ b/src/org/thoughtcrime/securesms/contacts/ContactSelectionListAdapter.java
@@ -65,7 +65,7 @@ public class ContactSelectionListAdapter extends    CursorAdapter
 
   @Override
   public View newView(Context context, Cursor cursor, ViewGroup parent) {
-    return li.inflate(R.layout.push_contact_selection_list_item, parent, false);
+    return li.inflate(R.layout.contact_selection_list_item, parent, false);
   }
 
   @Override
@@ -96,7 +96,7 @@ public class ContactSelectionListAdapter extends    CursorAdapter
 
     if (convertView == null) {
       holder      = new HeaderViewHolder();
-      convertView = li.inflate(R.layout.push_contact_selection_list_header, viewGroup, false);
+      convertView = li.inflate(R.layout.contact_selection_list_header, viewGroup, false);
       holder.text = (TextView) convertView.findViewById(R.id.text);
       convertView.setTag(holder);
     } else {
diff --git a/src/org/thoughtcrime/securesms/contacts/ContactsDatabase.java b/src/org/thoughtcrime/securesms/contacts/ContactsDatabase.java
index b30801a151..a942dc73a9 100644
--- a/src/org/thoughtcrime/securesms/contacts/ContactsDatabase.java
+++ b/src/org/thoughtcrime/securesms/contacts/ContactsDatabase.java
@@ -149,7 +149,7 @@ public class ContactsDatabase {
                                            .withSelection(BaseColumns._ID + " = ?", new String[] {String.valueOf(rowId)})
                                            .build());
   }
-  
+
   public @NonNull Cursor querySystemContacts(String filter) {
     Uri uri;