From bfe4ad6c34481f40328f0dcbf288ee1bec11eb02 Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Wed, 18 Nov 2015 14:52:26 -0800
Subject: [PATCH] Voice notes

Closes #4610
Closes #3563
// FREEBIE
---
 .../ic_keyboard_arrow_left_grey600_24dp.png   | Bin 0 -> 307 bytes
 res/drawable-hdpi/ic_mic_grey600_24dp.png     | Bin 0 -> 460 bytes
 res/drawable-hdpi/ic_mic_white_24dp.png       | Bin 0 -> 487 bytes
 res/drawable-hdpi/ic_mic_white_48dp.png       | Bin 0 -> 767 bytes
 .../ic_keyboard_arrow_left_grey600_24dp.png   | Bin 0 -> 255 bytes
 res/drawable-mdpi/ic_mic_grey600_24dp.png     | Bin 0 -> 336 bytes
 res/drawable-mdpi/ic_mic_white_24dp.png       | Bin 0 -> 333 bytes
 res/drawable-mdpi/ic_mic_white_48dp.png       | Bin 0 -> 557 bytes
 .../ic_keyboard_arrow_left_grey600_24dp.png   | Bin 0 -> 328 bytes
 res/drawable-xhdpi/ic_mic_grey600_24dp.png    | Bin 0 -> 601 bytes
 res/drawable-xhdpi/ic_mic_white_24dp.png      | Bin 0 -> 557 bytes
 res/drawable-xhdpi/ic_mic_white_48dp.png      | Bin 0 -> 1013 bytes
 .../ic_keyboard_arrow_left_grey600_24dp.png   | Bin 0 -> 381 bytes
 res/drawable-xxhdpi/ic_mic_grey600_24dp.png   | Bin 0 -> 739 bytes
 res/drawable-xxhdpi/ic_mic_white_24dp.png     | Bin 0 -> 767 bytes
 res/drawable-xxhdpi/ic_mic_white_48dp.png     | Bin 0 -> 1518 bytes
 .../ic_keyboard_arrow_left_grey600_24dp.png   | Bin 0 -> 502 bytes
 res/drawable-xxxhdpi/ic_mic_grey600_24dp.png  | Bin 0 -> 964 bytes
 res/drawable-xxxhdpi/ic_mic_white_24dp.png    | Bin 0 -> 1013 bytes
 res/drawable-xxxhdpi/ic_mic_white_48dp.png    | Bin 0 -> 2091 bytes
 res/layout/conversation_activity.xml          |  85 +-----
 res/layout/conversation_input_panel.xml       | 171 ++++++++++++
 res/values/attrs.xml                          |   1 +
 res/values/strings.xml                        |  12 +-
 res/values/themes.xml                         |   2 +
 .../securesms/ConversationActivity.java       | 130 ++++++++-
 .../securesms/InviteActivity.java             |   4 +-
 .../securesms/audio/AudioRecorder.java        | 201 ++++++++++++++
 .../securesms/audio/AudioSlidePlayer.java     |  15 +
 .../securesms/components/AnimatingToggle.java |   2 +-
 .../components/HidingLinearLayout.java        |  83 ++++++
 .../securesms/components/InputPanel.java      | 256 ++++++++++++++++++
 .../components/MicrophoneRecorderView.java    | 184 +++++++++++++
 .../components/camera/HidingImageButton.java  |  57 ----
 .../providers/PersistentBlobProvider.java     |  29 +-
 .../thoughtcrime/securesms/util/ViewUtil.java |  12 +-
 36 files changed, 1075 insertions(+), 169 deletions(-)
 create mode 100644 res/drawable-hdpi/ic_keyboard_arrow_left_grey600_24dp.png
 create mode 100644 res/drawable-hdpi/ic_mic_grey600_24dp.png
 create mode 100644 res/drawable-hdpi/ic_mic_white_24dp.png
 create mode 100644 res/drawable-hdpi/ic_mic_white_48dp.png
 create mode 100644 res/drawable-mdpi/ic_keyboard_arrow_left_grey600_24dp.png
 create mode 100644 res/drawable-mdpi/ic_mic_grey600_24dp.png
 create mode 100644 res/drawable-mdpi/ic_mic_white_24dp.png
 create mode 100644 res/drawable-mdpi/ic_mic_white_48dp.png
 create mode 100644 res/drawable-xhdpi/ic_keyboard_arrow_left_grey600_24dp.png
 create mode 100644 res/drawable-xhdpi/ic_mic_grey600_24dp.png
 create mode 100644 res/drawable-xhdpi/ic_mic_white_24dp.png
 create mode 100644 res/drawable-xhdpi/ic_mic_white_48dp.png
 create mode 100644 res/drawable-xxhdpi/ic_keyboard_arrow_left_grey600_24dp.png
 create mode 100644 res/drawable-xxhdpi/ic_mic_grey600_24dp.png
 create mode 100644 res/drawable-xxhdpi/ic_mic_white_24dp.png
 create mode 100644 res/drawable-xxhdpi/ic_mic_white_48dp.png
 create mode 100644 res/drawable-xxxhdpi/ic_keyboard_arrow_left_grey600_24dp.png
 create mode 100644 res/drawable-xxxhdpi/ic_mic_grey600_24dp.png
 create mode 100644 res/drawable-xxxhdpi/ic_mic_white_24dp.png
 create mode 100644 res/drawable-xxxhdpi/ic_mic_white_48dp.png
 create mode 100644 res/layout/conversation_input_panel.xml
 create mode 100644 src/org/thoughtcrime/securesms/audio/AudioRecorder.java
 create mode 100644 src/org/thoughtcrime/securesms/components/HidingLinearLayout.java
 create mode 100644 src/org/thoughtcrime/securesms/components/InputPanel.java
 create mode 100644 src/org/thoughtcrime/securesms/components/MicrophoneRecorderView.java
 delete mode 100644 src/org/thoughtcrime/securesms/components/camera/HidingImageButton.java

diff --git a/res/drawable-hdpi/ic_keyboard_arrow_left_grey600_24dp.png b/res/drawable-hdpi/ic_keyboard_arrow_left_grey600_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..651cb3322e04a733b23901ea220a16aa4548bba7
GIT binary patch
literal 307
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K;Lb6AYF9SoB8UsT^3j@P1pisjL
z28L1t28LG&3=CE?7#PG0=Ijcz0ZK3>dAqwX{BQ3+vmeOgEbxddW?<k3n!+v2$S`Y;
z1W<6br;B5V$MLsU*9tNj3bZ}^E)veCdPj5756x#Pe4d7ZJgo|h%)Sag0<Bl1m`AcG
zMISJpdGr10GU5F**E#ZT@?q$!(-3GZowdoa@dS^B;qyp-&f>HuasQPP^>{Mf+IxD~
zYG+Q2{`;$Sr%{FvpH@;)Knm-Dc_*j8nRkMzLDxFowQI$nYg`(-?rC2B+a_)*IqP!s
zmj0E-rOW?1?Y;5g!~Y4k?@cbR^JxCZ^NZosFT0ulpP8xxoz39s>gTe~DWM4fPv&fD

literal 0
HcmV?d00001

diff --git a/res/drawable-hdpi/ic_mic_grey600_24dp.png b/res/drawable-hdpi/ic_mic_grey600_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..9eddc686d4cb5d136b55da872e24ec2ffd2fa4da
GIT binary patch
literal 460
zcmV;-0W<!IP)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD0000WV@Og>004R>
z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN
zS#tmY3ljhU3ljkVnw%H_00BfvL_t(Y$73jEpblghat2wK?kxRW`mJ<#sSPCtg_Zs(
z{SSqIO2f%DNU-!H+!zr22oxd9pjZ@RKroIxgK9AhswK~$1`LDhsbx^z@HMD*&>2)S
z00!9swKtTqgV}W$233K@xxi}d@EcSB)*ugNCtw&94Hj1gv-9v9<PKI81ZE4BenK(k
zeJMX!JOa#f#cvP~u<ZF?x(><<M=3^vp`u%Wye~ix5(w<MKxO|*Es+YgFF?2*E@BTh
zb~fQylLx!$VW~9M*pVxJ0+js<q=|_Bbg-QdO3kqpypO?hsl=wEHn8%)rOQj5p-F)Q
z7`Ur}UIvM`l9C|POTR+{`FH6fpgUlJ{;f2P)Re7Mx}@|MO7#CKT?!N>s}>O{jVV10
zHsmm{1Q(&Kf`sI_2Fh#NVQi2CxX^GIe$5*C8w3EPx;6&iX|*E&0000<MNUMnLSTX`
CQLGXG

literal 0
HcmV?d00001

diff --git a/res/drawable-hdpi/ic_mic_white_24dp.png b/res/drawable-hdpi/ic_mic_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..56df87e9fa76e6f1817843167b6950c0c650afd6
GIT binary patch
literal 487
zcmV<D0T}*?P)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD0000WV@Og>004R>
z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN
zS#tmY3ljhU3ljkVnw%H_00Cb~L_t(Y$K{s6N&-<7hJPz4Bm}`-pds`GEh3D9qFt?m
zTvX7e+(oO_ZmNffc14SzMF=55L_UPu${rxmCNlGD;Utbzcbp+2>%TB?&iT2_J#+7O
zCxpI7ed@J|Qp&3$OP8ARaAF$E)cH`Iw8?9lCQ6xhm5F}sHZ5&I5l0-+Vz3^Kx-yAi
z6ZQLX`}_R-r49Mpm-Z8HG|&-GYgW>}UL-YK?q(*e9Z6TZF&)}%01^nXPN!B7Vhn&S
z^I0oOlEx)T=c+hrkIJ=Gi)M@rV*zJ&ly+cb$<F40Dq$~-90Cm{?I=Z_Dpf98nHc~M
zym^$s0`3_3lsj=AfG6VJfGq>SEfcOviV^@D-4b#SfHzK<V-O*RnCFxR0K0xro8j4R
z@+<e0T1~gu^vmodN7Nj<sKznLAn+G4Rw)2bV2xPNTckO%0A#&<y-r9U7;)>m?P*Zx
d|Nb9!t#^73DuH!E3G4s>002ovPDHLkV1ndkzA^v+

literal 0
HcmV?d00001

diff --git a/res/drawable-hdpi/ic_mic_white_48dp.png b/res/drawable-hdpi/ic_mic_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..dda69060341d4f1ef5bd7dca3870003d838854be
GIT binary patch
literal 767
zcmV<b0s#GqP)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0000WV@Og>004R>
z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN
zS#tmY3ljhU3ljkVnw%H_00MVOL_t(&-tC%8YZFlv$Ik?-cA*u7Vks1CC>Sb&i-Hea
zgi@o$4<P*r){Ua#I)aau(uJ;EDLyvhQYr|gqQvT6Y_ZKoT~#nKQZp&?cOl%|b0_JY
z%)N<OoHLvIIOpUyXP);z2|(RtDH0$75+G&)P10j3QjJ1dr$=<gnFuc1C_ccnWn^4(
zy5NlC7aCaw+5Z7F+63nxQl`^DL4$*(TcOiHldxGXS>~iy*^~zlub2G^tH;TN_mPB8
z`x^CFJVM&tNg%|!Y09I+wT4n5sgP7i4w+O)DkK$>3UxnFO)Uq8jB%TVtd~}KLN}m_
zYW1=4uU4QhtXGfz=?3&o+eh6BRv_*%5_eZ@Kr5<sl#M^J0zGBDdi1Ir(6Vaf*!W9&
zzir%WT4Mdvs`buIjya+&jz`!`29>7E=n~R~Fj2R|u50^GD%Cw>Cffw5j8lf^eKq&d
zU2M3jl7$#H<}xTmaNZb|Bpkw)n!Vx<v==3nZV^FbK8J@`Llsqg#sf@5=2Lj9;(uU|
z4>{(#w*UE-1(q2t`kEhoXctzsq|+_oT-G92u+x`dHKv^fK)%6&YqX_sON-jVm`?@m
z0y}YEVaOVB5KAm(+P9=P!_sf!Ci<KD4qz5l=0DdCjd9kvz^izM^B7=0gP6i|gofu_
z{9kEJu)0X|v?DV5or+YZfcj{d_D5#_&?UOtJ|+Jc*3gQr<9NGe;a=pi84Kn&ZlJd_
zI(0v8V`E#G4cx(jB)Nmc-&}j>ES;k)rJ1-1D$*jopoJJOxn5OR{pGZz_4ZNO@q3qt
xuhMXpf@NJMKmsH{-DH9MT}OZfNPq;0+h6SJe{e5kEm;5n002ovPDHLkV1mb9Q>*|0

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/ic_keyboard_arrow_left_grey600_24dp.png b/res/drawable-mdpi/ic_keyboard_arrow_left_grey600_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..ebaae63359bfc315d67e502b83a8da89ddc69354
GIT binary patch
literal 255
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?&;zfVsScICsl#hfUlUB%i&K$1uqv5d&3gl!^w|K8m62!mP!1O^24czZO*BU*$o=@
zryew}l$p)e@hREi>HJRarOZ6vc<d#oNX`?IULzpgXS_o=o0(DfhZE;&u|FRhT)F?v
t_;)<v_=lD$TfWSH_|W6D!<CB+4C`I>1oNLWyaGCb!PC{xWt~$(69BKIQd<B3

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/ic_mic_grey600_24dp.png b/res/drawable-mdpi/ic_mic_grey600_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..7178b133e148e0cc75becd4ce37e0cce5187bd9e
GIT binary patch
literal 336
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%>kKx
z!qdeu#Nu?aMydj@QGheE`^znt{FlmmFQ2kWczI&f%X*DDK6Bdq3wY%_E`N~coV4Ph
z{8`gKs-cJFwX%N%?h^K?Z^^FUefD1aZ(r=;)=Sfuo^hz+igDJTa6IbQx-U9qyrB-N
zA01}NN*tE=x<B1dBbE76P~)PfH%vcFwPUn8&U5r^*wXpl@>4%O__W2+Ao7n!u4X91
z=P6#+UiD1921muctd>4Mxb8oPZ{Tz9t(>gd!7KA$%4~RK=^!S&QIaG3kaPs^7G0JP
ZP7D^2xpo{gc|aaz@O1TaS?83{1OR&Qc8vf4

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/ic_mic_white_24dp.png b/res/drawable-mdpi/ic_mic_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..199a33703e753c3248bb7e7713b0fdb0667518af
GIT binary patch
literal 333
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%>kKx
z)YHW=#NzbPD~4XofdUK{6c=q2I4_XnyPEO+1mlROJdD}g(vBV;Q@d|GVM{D#+bDSO
z$@*5oE9uE%t)}msnvB0T&rD2nx^nsk%MJ5M-fgq49yp=JcGV%S!PWGGZB|qN+UD=O
z9^@WQcp1jAlA+&eMujH3F@IT0BICN&SpQ{DA22<4x_sc!onG68?RAzGCHj_s13%A9
zFXyYv-le>~WTk40a(JAo`s-y^rZs-q8aVUu{$sZ;n6f3u_O4<N*;VnMd)sf8YtPiR
X^B13e_jP_E&_fKKu6{1-oD!M<nrnRy

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/ic_mic_white_48dp.png b/res/drawable-mdpi/ic_mic_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..70264345853805d534e41b3ad05c1084ecb23cb1
GIT binary patch
literal 557
zcmV+|0@D47P)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0000WV@Og>004R>
z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN
zS#tmY3ljhU3ljkVnw%H_00E^*L_t(o!|j((D@0Kk#-A(9_*4FECc;{lvhW#ftgK`w
z#ngndQ$B)?Z@|XF7qFNGp<zZe{%n<^G*aps7Je3Phv5w8GHB|)cXQ5rp7(va=bqE^
zTo3(j)F>jT7(rZf%BiTLvYJ)gxem9dhhyGGo^H2FxAyUO?O!Njl_QwL7BiJ2$XN;Y
zU1~k2i&j+3lD${s*QIU*<v`x=-UF)sCR6nU(H2Ep^sig=D1@fW{K1Oy%_t>=9c3pd
zNRkp}p0}c2vz?NpYj=WENz#CsuUJv5X7qwQbJyfW0DM}4d5j~A+|&lE9XtTA;I3%>
zL6dot>Ef`YeU^k-TL^M}VI(sRz%5-S6C=eQK0X<e)R}xQcK~dJ)8rwZ0NAGCQ_XE+
z4}d2I!;1cL@ZxFO%3?a$3{XqqT}7Oop!l3&D`JF;0I@~=cWg^LS@ThMnRw&ndYNS3
ztYv8Zt}kk4z2xi^IN_9=lH3|iKQmtATv0AA8LNb|Yb43Rhvqq^zc^tbtfLU!jGE@7
vuHM?!I=)u`?{5?>BB&AqFZ$Du2!0&TuZ5dgf?fM-00000NkvXXu0mjfi|g`3

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/ic_keyboard_arrow_left_grey600_24dp.png b/res/drawable-xhdpi/ic_keyboard_arrow_left_grey600_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..ff768e6a20d59c627ea0043f2d088a589e3f7396
GIT binary patch
literal 328
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
z4|uvbhD02Gd+i|aAp@S)ha4)$GMvh5q7Mi-@b?^4QJr~Y&WfU%vRBN9UYY*dzoJV>
zUFE($tAGPTJ<l17Y9?bTDffuaOpdM}8TM5+KG<Y`;kmfXH@07YnoquFaE@dC^3!_u
zbH?O(tY<3uUVJu>oyXYriRZ(uPrT~=r}GZ&67-j`&AY7F6m90PfqV1R2j7!aO#T}`
zUaMY`e#jx?{MK0)_Gj1@eyyC$t;NzLI{A7?V8G5jwR&1746WFJZrIOU!@#y+%BmMp
S>yH8b!r<xZ=d#Wzp$PzX7Ikz0

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/ic_mic_grey600_24dp.png b/res/drawable-xhdpi/ic_mic_grey600_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..47d32b80ee130c19973fb55330af836b7403113e
GIT binary patch
literal 601
zcmV-f0;c_mP)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0000WV@Og>004R>
z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN
zS#tmY3ljhU3ljkVnw%H_00GfSL_t(o!|m6<YZPG+#_`XJ=!t@83Pp*5R2oZz8c<NI
zLQ<%O79wIHfoM<+TKH$!q_PQGNCX=(78X$m7r5k%KZ5omB#2h(ok3WOEbAuO9J`lG
zA?#bt%sx9`cHW(LXM;O7c5PAsS_UW?R#jIw<F-=P+k%Xne89M_gg>X(=hi(zX+?St
z8@IJ}fa@#LFChk72e_0Y+7zHGN3<zGdbPK0bRUHOeJ6)SiHZ^xC0b937KOsZar`?~
z^((e+3We#abig;TH}*fIs{Tdyfv?#CAHk8>f0(Lz6kAKmPuT&l!D%}qf5iJ$ni&rw
ztIbL9Dm!2-I`0SKJ?QmrnWC!SpU57x1w6?Pm@@(H*&ju|IO>*ZH8mAOj+>9Jbhry%
zMup8dw)B`3pzMrVgST+I3Ec=CQ_0f@Wg`*jxm|0fZ}UPoxSyWBQKJo;0;kOCOI4ip
z)(J2fl_?jXu1__Z>YkZ$O?!N;!+>c|qaCW~x7gh1xWlM(3IDqVfj!HLHs-3I&7MU+
zoOi`S?C*BS!9@CbmtAO-KFeV@s?(6!Rq;1&=v<@6o0zU?*W+<yUsTRETjv2JzW_n;
n3snFTYjZAjQ0zegNLhaYGa+V=kZ|9*00000NkvXXu0mjfQw;ks

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/ic_mic_white_24dp.png b/res/drawable-xhdpi/ic_mic_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..70264345853805d534e41b3ad05c1084ecb23cb1
GIT binary patch
literal 557
zcmV+|0@D47P)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0000WV@Og>004R>
z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN
zS#tmY3ljhU3ljkVnw%H_00E^*L_t(o!|j((D@0Kk#-A(9_*4FECc;{lvhW#ftgK`w
z#ngndQ$B)?Z@|XF7qFNGp<zZe{%n<^G*aps7Je3Phv5w8GHB|)cXQ5rp7(va=bqE^
zTo3(j)F>jT7(rZf%BiTLvYJ)gxem9dhhyGGo^H2FxAyUO?O!Njl_QwL7BiJ2$XN;Y
zU1~k2i&j+3lD${s*QIU*<v`x=-UF)sCR6nU(H2Ep^sig=D1@fW{K1Oy%_t>=9c3pd
zNRkp}p0}c2vz?NpYj=WENz#CsuUJv5X7qwQbJyfW0DM}4d5j~A+|&lE9XtTA;I3%>
zL6dot>Ef`YeU^k-TL^M}VI(sRz%5-S6C=eQK0X<e)R}xQcK~dJ)8rwZ0NAGCQ_XE+
z4}d2I!;1cL@ZxFO%3?a$3{XqqT}7Oop!l3&D`JF;0I@~=cWg^LS@ThMnRw&ndYNS3
ztYv8Zt}kk4z2xi^IN_9=lH3|iKQmtATv0AA8LNb|Yb43Rhvqq^zc^tbtfLU!jGE@7
vuHM?!I=)u`?{5?>BB&AqFZ$Du2!0&TuZ5dgf?fM-00000NkvXXu0mjfi|g`3

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/ic_mic_white_48dp.png b/res/drawable-xhdpi/ic_mic_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..a11b5f6446b5ecc732d28653c6509bd49aef5772
GIT binary patch
literal 1013
zcmV<R0}A|!P)<h;3K|Lk000e1NJLTq003YB003YJ1ONa4NRhv@0000WV@Og>004R>
z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN
zS#tmY3ljhU3ljkVnw%H_00V7FL_t(|+U=X)OB7KQ$It9)1{y*58%-^ubbAPi5FY}K
z42dFwYD@osUIN2>=%t6E2Ycv0h<+Jj^bkZ!MLzb!R3iFmDVagGlG(aoyXt;>=w<HQ
zJ37~$*&XrRd6~KQ+;h%n&d!}X_ntLCtGfh<0T_S*7=Qs%C|Mrqt)i3EKq1N}qA7Y$
z{nSlgJ+TD$k4oIdBCKT*J*aTsn)~jzA_lt>LyO-5I<Q=6_cK5%oRm{;+B968%vI7`
z%5@+YqY!=b<1pIk$bF(b>U7Vjdl9IjFOF|VlD5#e-y#s!&=sJt|9(OZTGEaF0|;qJ
z*ZA)lNKm$xbdKKubQKvq8_g&HRyzPkfFr;W;0SO8I0762jsQo1Bft^h2yg^A0vv&~
z0VGU|@^2LF^ICS}in<Rb3vu@WVy5#AiuNfjfQX`Qqv<^AKERCWyg;$8_D%~xmJZS;
z)72mM0me+{xl|^#_iF(>m1?Sl)zVS-0X_*=yQKDRN@_e$_oO;e<B0nJ!@|{msePP!
z9P7HNcw(A_t09d6+2OHO*l8StAxV^D*3mBIGzz7@0Za%o6<%z!jtV9k6%t_w?l0o7
zqGz)pGvduY@nylteWgqrl1sXu#A#)}UP0=jHvrWZXLc*4jw5R8{tS*N`_x<HwtKZx
z|5z~d3<0H78M?3_Ilq7#C{fA>@k)?<=v}J8KF4_vo6&(jOdyUpCeVj-D6^G4Z_&Ef
z%Up>kf~ka_F`Jt*FX-&`HrXR&F&9B~O78E(FUu|2;dQpkB}>46pe6<Pe_FI%@IKup
z3j@;Fa$rU7AC$(c=Ln`FU#Joh>E(0<Ia)f_<Er$=m_&KH5}xYuR~jZiD&Mf`<0wX?
z{&T2HXU0~u0s(l5FtV5Iw+<~BRP>x%;m<IIl(S}=<i2TK!!Z;~@})R|>-cSx4A_*3
zl(SlTK&7^=Q}mf4G)o5MQ4wvUd|S!ybckN3u)dMPQEZu9tfcgzD3e)>2HG5c1*l3C
zXB6KRX-~T>#hqm)(dzGl+cuNCjO2~hpbH7d&L?n7cgm2C#MeT!V`$kAnn9dJfj<*p
z|CbVKqCHegb(Z=UG)x2Zh$h`NXL$BEEURL}8#BDT&HxO+01UtY48Q<u8NlHG)H47B
jFaQHE00S_<8V2|W&msNS5ECVL00000NkvXXu0mjfjy1r^

literal 0
HcmV?d00001

diff --git a/res/drawable-xxhdpi/ic_keyboard_arrow_left_grey600_24dp.png b/res/drawable-xxhdpi/ic_keyboard_arrow_left_grey600_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..eecee45e877a758b9a5ce678d4fb711aae290acb
GIT binary patch
literal 381
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$s
z6#VMx;uw-~@9mA#f`<%vSOUZyc#o)lI{A!wY2iXa4=cm+*J&!(&b-;tXkMnYcFKfb
zR-OutEJ7Y2;>CYQ$(`x}$NKip6*;J>@pg&CIq@YLevSv*n1w@%x%|#ZZ<=HLS-R-)
zj|QFRht@bxD^3l|IxRVK?ct&WZ&Ifj8_r(+^vs#Od`oWQx|YIQ4%0RpG0%E>XGiD9
z$U?a{9NGCV&Yiomu>aZD>1$&G6i#jq(vJxcIJx`w`IrC(O(jFWm<h!`-LtF?uv(_Q
zK5?@2Nt4dYqjTS8Uy?pP@0)Y)oE5yc+7_;teSBb@a}+nX$^-`{PB8Ih^Jm62i+v9Z
TMm^dC3;+gCS3j3^P6<r__<5DG

literal 0
HcmV?d00001

diff --git a/res/drawable-xxhdpi/ic_mic_grey600_24dp.png b/res/drawable-xxhdpi/ic_mic_grey600_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..374b0b627b642fdd73c6ee6da33889c49f113139
GIT binary patch
literal 739
zcmV<90v!E`P)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0000WV@Og>004R>
z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN
zS#tmY3ljhU3ljkVnw%H_00LV{L_t(&-tF4YYZE~f!11J@(u4L^EP|j#FjPGV1w9BB
zk(M6Ro8q5f6`}YQuSU??(wnE8EbXCG{0A&ZK`FHd1yNL*^dE>~OQj~Mc0Gubd9$0$
zmi>{o4(~Sa?c|f}X6I!#88X`|G7jWG4kRPXAX6+;qe_WM23ia1VG+-W1#+zdUEqh0
z<KeMJUn@X84LE;ExwJvqfRm-ieA=MFrW_BC{&Yc8R?tMcpk*tlm@cSh1y#}oc_G4q
zn#ZOCS>m??S>l%i?KIGa16iWxK$fUF&`#@z{ufZaRXr@mt5(pesP7JYZP`HI)I=x6
zc*zR-AnH%6@p3fKdo|G&F+OPp6-512HU2IdXhuzRUyKh}LFYyNh#H@c1{&6OHDqR?
zDQC{8eycLKqk&FoFLF#|a;!Dvtk7+2Ow@BHqJHf^si~eAnZ5?3Rn8fe1(o|4{XT^D
zg*|HIa?JZUuZ&MJ!*MoL_D*!r0any>FUk7y{Y+4#LWL!sa?zJ><Fz{eJNx6fQ{U6x
ze}2pN-cjx7yYVa?`}m?wI<zIuuy*8U_QtiA^=emvM?T=h1w|W=L`&Nn=i+)pT)4Bw
z$`%wym=nhg#l6~(is{#RNN2;^F2<;c`tc;%k1=0^@r-M9iJC)P=ee&J7*DDnx+$)u
z`uhEb7tFHA*T5f)w~}no&QJ`sS@kbUoK3o8Y$wlpD9leD(4I~U+sO#!rkFC1IhgLF
zg*{xNz!ICrzFCn1m&4owlX_m(AwV75;Q?OcomU5PAO~`w-3D@hwQwK@a-dxW`U5Cp
V*VIA)ZPNe%002ovPDHLkV1nJbOp5>j

literal 0
HcmV?d00001

diff --git a/res/drawable-xxhdpi/ic_mic_white_24dp.png b/res/drawable-xxhdpi/ic_mic_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..dda69060341d4f1ef5bd7dca3870003d838854be
GIT binary patch
literal 767
zcmV<b0s#GqP)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0000WV@Og>004R>
z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN
zS#tmY3ljhU3ljkVnw%H_00MVOL_t(&-tC%8YZFlv$Ik?-cA*u7Vks1CC>Sb&i-Hea
zgi@o$4<P*r){Ua#I)aau(uJ;EDLyvhQYr|gqQvT6Y_ZKoT~#nKQZp&?cOl%|b0_JY
z%)N<OoHLvIIOpUyXP);z2|(RtDH0$75+G&)P10j3QjJ1dr$=<gnFuc1C_ccnWn^4(
zy5NlC7aCaw+5Z7F+63nxQl`^DL4$*(TcOiHldxGXS>~iy*^~zlub2G^tH;TN_mPB8
z`x^CFJVM&tNg%|!Y09I+wT4n5sgP7i4w+O)DkK$>3UxnFO)Uq8jB%TVtd~}KLN}m_
zYW1=4uU4QhtXGfz=?3&o+eh6BRv_*%5_eZ@Kr5<sl#M^J0zGBDdi1Ir(6Vaf*!W9&
zzir%WT4Mdvs`buIjya+&jz`!`29>7E=n~R~Fj2R|u50^GD%Cw>Cffw5j8lf^eKq&d
zU2M3jl7$#H<}xTmaNZb|Bpkw)n!Vx<v==3nZV^FbK8J@`Llsqg#sf@5=2Lj9;(uU|
z4>{(#w*UE-1(q2t`kEhoXctzsq|+_oT-G92u+x`dHKv^fK)%6&YqX_sON-jVm`?@m
z0y}YEVaOVB5KAm(+P9=P!_sf!Ci<KD4qz5l=0DdCjd9kvz^izM^B7=0gP6i|gofu_
z{9kEJu)0X|v?DV5or+YZfcj{d_D5#_&?UOtJ|+Jc*3gQr<9NGe;a=pi84Kn&ZlJd_
zI(0v8V`E#G4cx(jB)Nmc-&}j>ES;k)rJ1-1D$*jopoJJOxn5OR{pGZz_4ZNO@q3qt
xuhMXpf@NJMKmsH{-DH9MT}OZfNPq;0+h6SJe{e5kEm;5n002ovPDHLkV1mb9Q>*|0

literal 0
HcmV?d00001

diff --git a/res/drawable-xxhdpi/ic_mic_white_48dp.png b/res/drawable-xxhdpi/ic_mic_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..977f7bf00d80955e44ca555b93b033a29e71ade0
GIT binary patch
literal 1518
zcmYL}cTm%55Qcw&1dt-qArz4knvs%#hEOF`K_CP)%%Pl8q5?<ts2ZAt-r<x0p-2me
z2q6e}5FLS|2Ttjrhcu;EkAC6C@n+ur-u-s>ubtT^-tM|NA2*a6002Hq3k;U!X{W&j
zX1zAHstA_J-nGEm06-`V0EjUFu+J(H7Xcth0|36d0)Xys03hZ|ZnoEBHQ4T4GsgfY
zajCs+tlt@53w!_o@Ccm-2zW*o2LOnNCB_&RJie0eLXdJ4?mTH38*OOZcmquzE**WR
z;|DQJput2O8hWhic1mtz1WG?8&X`k3!io`C<%FAwB2}cC1d6)VpTky_mfB_Kx1*6|
z6F5mp0h&dUvv)npz+z*rKmTcO{$yU)N$*5HYN6n0<)nWajShe*QodZY0fR9{KZInH
zlikYklS_1-Ws*X1cSVT;yv6)3%C3ya$#<(xF!&Js)-W87^|)-(61?e;JzOrGEr(Gg
zHXFe-X{{-z0+nkc(N)aIJQJzM;vt7#^7d$A6*GRxWM6pDjXgcNa8F{9E19#x1YKs!
zXH**p{pn<)CfHk*w@z<dK6v3JdW_i3jBDmPK57CzSKzM;N?!+fUh0f3P?V%dpVrS&
zO$Uv#_O9gPAah9=e8J>};aNLjCC~@7aJ!|^2s9p>Kbg4=$&!rMf>#o)gL15PoxQMQ
zZeRs424ZiFJ12sXmp!YgN+MRss*<>iqbg*fAU~1-tNy*sGS)Jr?wpRYawKa?PIdv5
zEj*wxU4}X?PA8uXE<eDzA@B1uA*K@-`!?jw0KNyij!(c)1SLI<$dL>TncD9hx9A(S
zsg8R*NHP2w%%neysG1%aV@H+}{?b=wx`XY?Jw9GFoxq0?TOAs-2`TF03`BxDGE9=q
z17%FanarE@ZIss;YEh#6U2ngtF0L7op_C*vqHa<)Mxhc+CwKu>q^5Hjq+1craQeoW
zFduiQZrh=l)L$-_%HZ@q?xi9FYdh}p+L|p644`WX=$JOIOWFoE8m6LA&{X|VgVpIq
zig`VqqYs4Or6W@sv{k7zuc3XMMQT##u9cZ2-R28z)F*_T#jBE`D?jI4JLWHkERgq)
z)tN`4sJ#j^O4jD0pAHg+?|ZF3jr>?CeX*+RZ<ldx@%1Ku*EKEQ9hI3zyS)hhy&Ozc
znm34sfYt6R3;Mr4EZwdSC}R8IGuJsT#R$L?iym6%aFDh$hUintf-XJTT`pO9Z2y$G
zCkKYAdKT&_R|58;T@_ka>(vySo9k{4hJxvwzl$RHQOF`0?Fz6)lJRzt5QKbY)+JJA
zj?J?zT@Y+$RRrH+GSEU;(u#iSbZ#>avW7@iC`^#HrJ4^EHaWu9by2m}^$PI1nGl>+
z_oI_6=*U-PpY4BO=I#+*!7{rH`OT!TSXj@jnk~k*Gim{Et9PKVa!0X0WHWEU%cErt
zr#|`c>GJyW61g{shWo-Tv1NTgd@s4Aq!y=tpkmoS=lo*e-u%0T=N~-vW!%(qlQ-#Q
zxlSXAQ>~RQSGIe)Ee6l073&;JuHIn3-ot4?rTX9zDXN1K_=Pa(d*!b)1ITk3h*lD&
zHCN1pocU@97Tv1(Yll4<U9e~AJk1?=;d7H$dba;_Pcn7(QHW_Md;7S@E&Yw*%;}iE
zNHx<Vl7sS$*kPnVsfG~3K34br%rl1AR$*t)MtIVdYk@UyTe@4|))N{sZ_523sq`mf
z;o&4x&Ch!rOC?9IrPe+ggi1058zh>&ts))|@eq=P_+h1skDZzo&K_W)8Cy;<G%Z)*
zeieLv!-$!in+cIl0M|VV>1AZJcYV8G>Ygo(<Z(VRB<jw#2G64}{c)oN3J>O@$LKlA
zyzLx~JrC0z%c6-5_P0+FIs^*^SEJ-wJ8mu8Pp{?@jB=|5@dF3_t46;xgyAxQMZ^4H
zH%~)tg9M}hDFtR-F$+}RRV-lV8}K<pP2@k0of7Papdf*Br?NSFAa*#c`E~zjM2UrA
Oz|!<O=EYUlsDA;NVyBk?

literal 0
HcmV?d00001

diff --git a/res/drawable-xxxhdpi/ic_keyboard_arrow_left_grey600_24dp.png b/res/drawable-xxxhdpi/ic_keyboard_arrow_left_grey600_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..1d718b0ebebbeb666db0af2cbb8955bfa96cad5d
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>EaktaqI1^-GR)G0xb{2N<@^nPB8M{om+Csc?pvQ3(Ji|6C4A1;>z`dzs%h9
zZ@pLl&B)w$7k}Sm5pZB&L?ixiALue(wy!~ypCL@`Am@%J%m)~Y?GJ?8F}&IMg{kJe
zx{yu7{GSX3?ZNyGbN@H#-m_*{^0TVJBA$1`^K8bp8r28e|76#cNT~Y!)N0U;XI}An
z{>G=zwHdC}*d3U2p6$lxoehjXeSlh9q*Lwq4K(JnN=!S?$a5y0q3xM5gSAXoczj{&
zcDaUwEa%!Q6dJ#pTJ;?Gttjo1&?n@~aVIhF&^_OT{>x=d{~eOmH2S85H9ZT+S6OjQ
z%d9DHqv`bD^;V8MqqYcaIUURFxHoRP@E38Jq^8GRo?ahfKIuN)`$1Q3H-pw8zT<lN
z3%d*w-+oeD$FZg6`+QrymYp^~wg7|m+|wyn*e;~Z;ZtZ}VB$a{9;~;Y|NhYiM~Ps=
Rt-$DD@O1TaS?83{1OV$DxnlqT

literal 0
HcmV?d00001

diff --git a/res/drawable-xxxhdpi/ic_mic_grey600_24dp.png b/res/drawable-xxxhdpi/ic_mic_grey600_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..784bd8f4503ae7798e5161b0e9362d98c125f485
GIT binary patch
literal 964
zcmV;#13UbQP)<h;3K|Lk000e1NJLTq003YB003YJ1ONa4NRhv@0000WV@Og>004R>
z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN
zS#tmY3ljhU3ljkVnw%H_00TTpL_t(|+U=UpOH@%5$494M|3Idq&PYLNEh1Wk3l|B+
z5Jf~kBn5*uwFnIRVzy{ev}w_zn2ivHT44mX$)Tog4wY@%7*e(vv>I^=oyr*<UyBgt
zzI)!xd-LYay#t4{yyx6|K5yRKd(QV=AAFT<J_cX_24DaN&=H^+*AT@VGRR;SQ4Anh
zIRHUCMHYt1vKU365&*i9l9FGy6uNW=fMxRQ)~7Q-cfs@x7&xmdKrqkClWR+8(i33R
zR{91EJkb%Lnb>)(EL*z$sB{1Ww$nFYpkF_LSB?N)>IX3E2q3N>K*kY3T0a28p)r73
zfHekC43K32#Q>`epcr6<0Tcsd7(g*VngJ98EHi*&fWHi&7~l^BC<ge=0Ez)p4B!|b
zSGfA<TG(13W|%6b)UXeb%$feHYiV(cm|-qwe7^JmGr|i{<x<>zCdK=)oHPEp^Z>7g
z1RACBtBwFJO7T02Q?Km<goOo;O5*_sA2`z3D#f1^Jnoeq;JmQFUBctBZGb@{dQk8<
zS9*Z$!U8kIzn~FIw$e|cMvARQT<{5aaSnVDmN-awblTG7juDX|!Drf=gY1^D$aB)C
z7i$GX-3w&gxZrie8-Ny5GW$ud(^#}j{}+yvF>NNlonDm^;$A<2YSOC#BUmNG#D}OO
z{rz|^c)swi7V5Bl@1Y4m1aYL1MjR1bL4)lNwC!FNb5WB#)$Y0+>%fXI=eW1k=x)<;
z3ADIMe-9Q+k7SqE<@8O{5B?3UF4F&Dn(eyx{lEsillGRwMWug4+OJ~pm!qKxA|V}4
zx3SsL99wWlIx)TzC89?iS({M${<lx$2}|1vOcP4cfpWH#Ap*g`TXbS$-ndQZ!Xznl
z755st=!ruX_p_3?k5j0X{OfTB5Af5XLq4RUso$5kjZEMT#xR6oj9~)vd2g=lRi#SQ
zI&35<i(s2dS)~fSHoE}I7IBH_E6T15)#FitBAV_ChAoOaCBjxKMjR+Z84Nis8Om|(
zvIc$lP_Uty#ATwT*XZta9eNN(OiDe5FnWmXRXYGHt<<A+7=Qs7fB_hQ0T_S*7@&fU
m0T_S*7=Qs7fB_i5h5ZAp1=QO{WN>!?0000<MNUMnLSTZQIGNA@

literal 0
HcmV?d00001

diff --git a/res/drawable-xxxhdpi/ic_mic_white_24dp.png b/res/drawable-xxxhdpi/ic_mic_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..a11b5f6446b5ecc732d28653c6509bd49aef5772
GIT binary patch
literal 1013
zcmV<R0}A|!P)<h;3K|Lk000e1NJLTq003YB003YJ1ONa4NRhv@0000WV@Og>004R>
z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN
zS#tmY3ljhU3ljkVnw%H_00V7FL_t(|+U=X)OB7KQ$It9)1{y*58%-^ubbAPi5FY}K
z42dFwYD@osUIN2>=%t6E2Ycv0h<+Jj^bkZ!MLzb!R3iFmDVagGlG(aoyXt;>=w<HQ
zJ37~$*&XrRd6~KQ+;h%n&d!}X_ntLCtGfh<0T_S*7=Qs%C|Mrqt)i3EKq1N}qA7Y$
z{nSlgJ+TD$k4oIdBCKT*J*aTsn)~jzA_lt>LyO-5I<Q=6_cK5%oRm{;+B968%vI7`
z%5@+YqY!=b<1pIk$bF(b>U7Vjdl9IjFOF|VlD5#e-y#s!&=sJt|9(OZTGEaF0|;qJ
z*ZA)lNKm$xbdKKubQKvq8_g&HRyzPkfFr;W;0SO8I0762jsQo1Bft^h2yg^A0vv&~
z0VGU|@^2LF^ICS}in<Rb3vu@WVy5#AiuNfjfQX`Qqv<^AKERCWyg;$8_D%~xmJZS;
z)72mM0me+{xl|^#_iF(>m1?Sl)zVS-0X_*=yQKDRN@_e$_oO;e<B0nJ!@|{msePP!
z9P7HNcw(A_t09d6+2OHO*l8StAxV^D*3mBIGzz7@0Za%o6<%z!jtV9k6%t_w?l0o7
zqGz)pGvduY@nylteWgqrl1sXu#A#)}UP0=jHvrWZXLc*4jw5R8{tS*N`_x<HwtKZx
z|5z~d3<0H78M?3_Ilq7#C{fA>@k)?<=v}J8KF4_vo6&(jOdyUpCeVj-D6^G4Z_&Ef
z%Up>kf~ka_F`Jt*FX-&`HrXR&F&9B~O78E(FUu|2;dQpkB}>46pe6<Pe_FI%@IKup
z3j@;Fa$rU7AC$(c=Ln`FU#Joh>E(0<Ia)f_<Er$=m_&KH5}xYuR~jZiD&Mf`<0wX?
z{&T2HXU0~u0s(l5FtV5Iw+<~BRP>x%;m<IIl(S}=<i2TK!!Z;~@})R|>-cSx4A_*3
zl(SlTK&7^=Q}mf4G)o5MQ4wvUd|S!ybckN3u)dMPQEZu9tfcgzD3e)>2HG5c1*l3C
zXB6KRX-~T>#hqm)(dzGl+cuNCjO2~hpbH7d&L?n7cgm2C#MeT!V`$kAnn9dJfj<*p
z|CbVKqCHegb(Z=UG)x2Zh$h`NXL$BEEURL}8#BDT&HxO+01UtY48Q<u8NlHG)H47B
jFaQHE00S_<8V2|W&msNS5ECVL00000NkvXXu0mjfjy1r^

literal 0
HcmV?d00001

diff --git a/res/drawable-xxxhdpi/ic_mic_white_48dp.png b/res/drawable-xxxhdpi/ic_mic_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..9fef3e62b0c61374e83ea718f8ecf70458c78ba5
GIT binary patch
literal 2091
zcmcIlS5OmZ7yUw_ASJW_0YVXxCcA_fECeA)sF4m4kfsEdph!_bdKOW7XaQ+zNI-!^
z5y4f^sEE|K*oYt?WdYGeDJn_{u<_}i|K*?mWgpJDbIzGNckX?;SuRetQsOG&001d_
zJA#|AKK=<Yn2=ZaHMzo~8D!_?2ta}k0Mv8<)`S-I0{}5-0R9dHz_bhirO2u_S2JNC
za)M|}09zUP&mIZYjz~N2GXO}){{#e7R3QNnW!V!fJ<bh(zI^f&!V`IM{BsGO63VM>
z%Dm%}ou+w#N+sxt?HDUkIW1x#gMj2gI4_Y_E44eehhq&K>M}J;19KrIIf~jYL<f2M
zBUF;UlBJAZi=SP@`YNj^^z8Gh^2>Xh-N)im`=7=2|2VYXUv&_N)754OJVc0i0K>}y
zhzkr45D*z){U1q>-@WbD^S63Wyd>N4WQHzP2Rm^TWvh_#Si_R2gQ(LW-$qMIpnaOU
zT~Bo>`odkD<mk>cdY{xwSFf?cD#o-z?&)hiY&k`oIB!o8Dt$C9QrrN4@FMQOJThbw
zW^38hfaKHqq$O=lvUh0i`=v9s=AgN$)W{M_7}2+qm6(PdqOb{qGjmiS!v-xMAV=LG
zM#M<!UQJ~yvm%QI0nWju_2i7`D;FAB<QD4^ik8Hrz(|XTnnqL=A?{MpMPuabM{tPy
zDPi?@b-iln+3TbI!gG&42ENr$j>&Vo)!*mKc<u!>MHo6-$#h%rR9e$e+9_Wqbie?!
z8q-0(lE%Tl3H=rY3#{E~!%~u=mTXtaGtUGZ`f+T65iN}~5O#K$qfieEH1WVz89Q4J
zgiGSZs7&a81I`c{{|>DjyWu*>ep?rlRQWRLSj+celu1VEis%bO4DmTKKh7%8C$Tnh
z5cdOu#o5hW4MU4h_za55u%UnFiqvs0L&#xjsiS&;8`Ft7FR8f}T@mj?%-AF&@U>m$
z@6eAeW22y&ZN0^XjZsM#+P{nsJUPaw>+4++WnfkhsdNWCl??*l8J<B#o<>lB=XX|D
zup-@G<(OfIfCv0VV!VKqo=4x(iVgd`|KR(adyU}NN#B8R`4&ap*6d{)z<J%4?|Ae9
zeye4jXkA$*VJZ_t6xX3xpCd-$W(7IbcbVkE6P(z`8z;)at$?QRHd4BT*Hl8I1Gand
zwOYt~7ajkxLw3dpZu+Lr>u~$J!__&-YwGTIz7sp+JHx%yowl_@VzSxz0JED4EVX76
z-TrS*7GF(%7?SA1ku&?36RBZKL!HCOSyo5MSW95(cQsB!94>dDug7gUNW0Bc+Zord
zmF1^~alg-Pmvbek1T#q?03W81m2_fPzZNCGUhoTM#OCBNg+f|oJzXE1MAWzNWK;{)
zi|1&(RO@TQp&!j>erzoVLXdiD+2p?Pu7+5T&5r2nH)0>UrBLSKil7H>Z7LhzL*i(A
z>*xKEJ+8^y-A+<<r!PH3d+MG6U3&5j#q;~7mW%Jas__)q#9Jkd<c?W6=?Bro)j<y=
z*kKMucvevBR)4_VcDlf@&>yb#i2Z5K{ER22HJ2~>$?a4gqi1r|LE}glR1a^CDS$I%
zrRq9&crc$#lD%cW>tDKCagp2Apsiz}(6_+1u2iyjzv|n{`82Cue52B@Cmcr8a&6*n
zm;Osf;3<uIA~sXgv$4|Y`!z(vQJ}0!ACYi<|FxqqYpBN1VzIjSOQrcX%LL;2&az-u
zdJ=9`yXSi8-RSa=^+5C93#A=hQsz7D3NXBff9`)LVI=qNczH;<cB20#;w|}YWBB{^
zN$Uph=rIg`qiBY*n#jv9O*Y-5><0zpis*{DH{2!em6FslLCD*ynManGM*g)Ae1gQQ
zy-O2b6c?Bo9nTwk@ZK@_!QPEopRWhT?P)Llzg^<`Y^*$Ex1AGZRC-WqQ#}2#XYHK|
zOQIdw(j`U1%K(47*8dEqm6Yulk$i1{@<)opTKrLkh>Vmt9_6$0hC%u6teY(r+GnOS
zWA85)%>_F?P*0xiRaUiN5AYh03xwvHry)75W2C3+>&}T{gyHF9-X8*K7Ve6@rzy>R
z61QGMeWOBZBlX>d%gB(gW&2R=mZ+yYeeVwKh03F4<&9N(_l+F5XdCrr?nHXh>fAZg
zK9j3*8w;b82M3t&J1g>khT6y<wzE=6U`l^67F+Fc-E5KbyN@1R3?NU5fr3moLt8-|
zg6*3CH_`;A8c;+2+9N9E!jedzAk1ufZe)-6Ek6G@#^pK{XUb;c0qUbn?~kyq<2Ujn
z&{-3Xxj&i(DL97v)RMZ*+KYKtL)((^-tLaMFnAEQbh6=kxPQA`?$RT{(j?U>__&nf
zF8=vapG9L*qU6ulHUXzkc(Zn~RK4==+>^1;&-iOz%|E$G<hdpfKh0Yai@3jK`}*c~
z0NfT~SGur+H(k_*^72-O7f0^3$xxk^yUonfqI?#-vaZFVx_&*?zOYn5HiLffFfz+k
zE=%{V?B=sX#seE?rqv*!2J*XHGY>y&8j4U2b2+cl(P(~O3Nl*cnPJuLkg*`O8;CH(
ws6bCd6J!H1s@DIM(cbNe7#jTlZ@B#`fZgqU*3`wSQMfj+w{{}jJRF$z4>dTAJ^%m!

literal 0
HcmV?d00001

diff --git a/res/layout/conversation_activity.xml b/res/layout/conversation_activity.xml
index 1205ca2a88..16e569e73c 100644
--- a/res/layout/conversation_activity.xml
+++ b/res/layout/conversation_activity.xml
@@ -12,13 +12,17 @@
         android:id="@+id/quick_attachment_drawer"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:clipToPadding="false"
+        android:clipChildren="false">
 
     <LinearLayout android:layout_width="match_parent"
                   android:layout_height="match_parent"
                   android:orientation="vertical"
                   android:paddingTop="?attr/actionBarSize"
-                  android:gravity="bottom">
+                  android:gravity="bottom"
+                  android:clipToPadding="false"
+                  android:clipChildren="false">
 
         <org.thoughtcrime.securesms.components.reminder.ReminderView
             android:id="@+id/reminder"
@@ -66,82 +70,7 @@
 
         </FrameLayout>
 
-        <LinearLayout android:id="@+id/bottom_panel"
-                      android:layout_width="fill_parent"
-                      android:layout_height="wrap_content"
-                      android:gravity="center_vertical"
-                      android:orientation="horizontal"
-                      android:clickable="true"
-                      android:background="?android:windowBackground"
-                      android:padding="5dp">
-
-            <LinearLayout android:id="@+id/compose_bubble"
-                          android:layout_width="0dp"
-                          android:layout_height="wrap_content"
-                          android:layout_weight="1"
-                          android:background="@drawable/sent_bubble">
-
-                <org.thoughtcrime.securesms.components.emoji.EmojiToggle
-                        android:id="@+id/emoji_toggle"
-                        android:layout_width="37dp"
-                        android:layout_height="37dp"
-                        android:layout_gravity="bottom"
-                        android:background="@drawable/touch_highlight_background"
-                        android:contentDescription="@string/conversation_activity__emoji_toggle_description" />
-
-                <org.thoughtcrime.securesms.components.ComposeText
-                        style="@style/ComposeEditText"
-                        android:id="@+id/embedded_text_editor"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:minHeight="37dp"
-                        android:layout_gravity="center_vertical"
-                        android:layout_weight="1"
-                        android:nextFocusForward="@+id/send_button"
-                        android:nextFocusRight="@+id/send_button"
-                        tools:hint="Send TextSecure message">
-                    <requestFocus />
-                </org.thoughtcrime.securesms.components.ComposeText>
-
-                <org.thoughtcrime.securesms.components.camera.HidingImageButton
-                        android:id="@+id/quick_attachment_toggle"
-                        android:layout_width="37dp"
-                        android:layout_height="37dp"
-                        android:layout_gravity="bottom"
-                        android:src="?quick_camera_icon"
-                        android:background="@drawable/touch_highlight_background"
-                        android:contentDescription="@string/conversation_activity__quick_attachment_drawer_toggle_description"
-                        android:padding="10dp" />
-            </LinearLayout>
-
-            <org.thoughtcrime.securesms.components.AnimatingToggle
-                    android:id="@+id/button_toggle"
-                    android:layout_width="50dp"
-                    android:layout_height="50dp"
-                    android:background="@drawable/circle_tintable"
-                    android:layout_gravity="bottom">
-
-                <ImageButton android:id="@+id/attach_button"
-                             android:layout_width="match_parent"
-                             android:layout_height="match_parent"
-                             android:layout_gravity="center"
-                             android:background="@drawable/circle_touch_highlight_background"
-                             android:src="@drawable/ic_attach_white_24dp"
-                             android:contentDescription="@string/ConversationActivity_add_attachment"
-                             android:nextFocusLeft="@+id/embedded_text_editor" />
-
-                <org.thoughtcrime.securesms.components.SendButton
-                        android:id="@+id/send_button"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:contentDescription="@string/conversation_activity__send"
-                        android:nextFocusLeft="@+id/embedded_text_editor"
-                        android:src="?conversation_transport_sms_indicator"
-                        android:background="@drawable/circle_touch_highlight_background" />
-
-            </org.thoughtcrime.securesms.components.AnimatingToggle>
-
-        </LinearLayout>
+        <include layout="@layout/conversation_input_panel"/>
 
         <Button android:id="@+id/unblock_button"
                 android:layout_width="fill_parent"
diff --git a/res/layout/conversation_input_panel.xml b/res/layout/conversation_input_panel.xml
new file mode 100644
index 0000000000..2fbfb2c30b
--- /dev/null
+++ b/res/layout/conversation_input_panel.xml
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+       xmlns:app="http://schemas.android.com/apk/res-auto"
+       xmlns:tools="http://schemas.android.com/tools">
+
+<org.thoughtcrime.securesms.components.InputPanel
+        android:id="@+id/bottom_panel"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:clickable="true"
+        android:background="?android:windowBackground"
+        android:padding="5dp"
+        android:clipChildren="false"
+        android:clipToPadding="false">
+
+    <FrameLayout android:layout_width="0dp"
+                 android:layout_height="wrap_content"
+                 android:layout_weight="1"
+                 android:clipChildren="false"
+                 android:clipToPadding="false">
+
+        <LinearLayout android:id="@+id/compose_bubble"
+                      android:layout_width="match_parent"
+                      android:layout_height="wrap_content"
+                      android:background="@drawable/sent_bubble"
+                      android:clipChildren="false"
+                      android:clipToPadding="false">
+
+            <org.thoughtcrime.securesms.components.emoji.EmojiToggle
+                    android:id="@+id/emoji_toggle"
+                    android:layout_width="37dp"
+                    android:layout_height="37dp"
+                    android:layout_gravity="bottom"
+                    android:background="@drawable/touch_highlight_background"
+                    android:contentDescription="@string/conversation_activity__emoji_toggle_description" />
+
+            <org.thoughtcrime.securesms.components.ComposeText
+                    style="@style/ComposeEditText"
+                    android:id="@+id/embedded_text_editor"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:minHeight="37dp"
+                    android:layout_gravity="center_vertical"
+                    android:layout_weight="1"
+                    android:nextFocusForward="@+id/send_button"
+                    android:nextFocusRight="@+id/send_button"
+                    tools:visibility="invisible"
+                    tools:hint="Send TextSecure message" >
+                <requestFocus />
+            </org.thoughtcrime.securesms.components.ComposeText>
+
+            <org.thoughtcrime.securesms.components.HidingLinearLayout
+                    android:id="@+id/quick_attachment_toggle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:clipChildren="false"
+                    android:clipToPadding="false">
+
+                <ImageButton
+                        android:id="@+id/quick_camera_toggle"
+                        android:layout_width="37dp"
+                        android:layout_height="37dp"
+                        android:layout_gravity="bottom"
+                        android:src="?quick_camera_icon"
+                        android:background="@drawable/touch_highlight_background"
+                        android:contentDescription="@string/conversation_activity__quick_attachment_drawer_toggle_description"
+                        android:padding="10dp"/>
+
+                <org.thoughtcrime.securesms.components.MicrophoneRecorderView
+                        android:id="@+id/recorder_view"
+                        android:layout_width="37dp"
+                        android:layout_height="37dp"
+                        android:clipChildren="false"
+                        android:clipToPadding="false">
+
+                    <ImageButton
+                            android:id="@+id/quick_audio_toggle"
+                            android:layout_width="37dp"
+                            android:layout_height="37dp"
+                            android:layout_gravity="bottom"
+                            android:src="?quick_mic_icon"
+                            android:background="@null"
+                            android:contentDescription="@string/conversation_activity__quick_attachment_drawer_toggle_description"
+                            android:padding="10dp"/>
+
+                    <ImageView android:id="@+id/quick_audio_fab"
+                               android:layout_width="74dp"
+                               android:layout_height="74dp"
+                               android:src="@drawable/ic_mic_white_48dp"
+                               android:background="@drawable/circle_tintable"
+                               android:backgroundTint="@color/red_400"
+                               android:visibility="gone"
+                               android:scaleType="center"/>
+
+                </org.thoughtcrime.securesms.components.MicrophoneRecorderView>
+
+            </org.thoughtcrime.securesms.components.HidingLinearLayout>
+        </LinearLayout>
+
+        <LinearLayout android:id="@+id/recording_container"
+                      android:layout_width="match_parent"
+                      android:layout_height="wrap_content"
+                      android:layout_gravity="center_vertical"
+                      android:orientation="horizontal">
+
+            <TextView android:id="@+id/record_time"
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"
+                      android:ellipsize="none"
+                      android:layout_marginLeft="20dp"
+                      android:text="00:00"
+                      android:textColor="#61737b"
+                      android:textSize="20dp"
+                      android:singleLine="true"
+                      android:visibility="gone"
+                      tools:visibility="visible"/>
+
+            <FrameLayout android:layout_width="match_parent"
+                         android:layout_height="match_parent"
+                         android:clipChildren="true">
+
+                <TextView android:id="@+id/slide_to_cancel"
+                          android:layout_width="wrap_content"
+                          android:layout_height="match_parent"
+                          android:gravity="center"
+                          android:drawableLeft="@drawable/ic_keyboard_arrow_left_grey600_24dp"
+                          android:text="@string/conversation_input_panel__slide_to_cancel"
+                          android:textAllCaps="true"
+                          android:textColor="#61737b"
+                          android:textSize="10sp"
+                          android:ellipsize="none"
+                          android:singleLine="true"
+                          android:paddingLeft="20dp"
+                          android:visibility="gone"
+                          tools:visibility="visible"/>
+
+            </FrameLayout>
+
+        </LinearLayout>
+
+    </FrameLayout>
+    <org.thoughtcrime.securesms.components.AnimatingToggle
+            android:id="@+id/button_toggle"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:background="@drawable/circle_tintable"
+            android:layout_gravity="bottom">
+
+        <ImageButton android:id="@+id/attach_button"
+                     android:layout_width="match_parent"
+                     android:layout_height="match_parent"
+                     android:layout_gravity="center"
+                     android:background="@drawable/circle_touch_highlight_background"
+                     android:src="@drawable/ic_attach_white_24dp"
+                     android:contentDescription="@string/ConversationActivity_add_attachment"
+                     android:nextFocusLeft="@+id/embedded_text_editor" />
+
+        <org.thoughtcrime.securesms.components.SendButton
+                android:id="@+id/send_button"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:contentDescription="@string/conversation_activity__send"
+                android:nextFocusLeft="@+id/embedded_text_editor"
+                android:src="?conversation_transport_sms_indicator"
+                android:background="@drawable/circle_touch_highlight_background" />
+
+    </org.thoughtcrime.securesms.components.AnimatingToggle>
+</org.thoughtcrime.securesms.components.InputPanel>
+</merge>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index afd2e9a504..a58d10e9d2 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -56,6 +56,7 @@
     <attr name="emoji_category_symbol" format="reference"/>
     <attr name="emoji_category_emoticons" format="reference"/>
     <attr name="quick_camera_icon" format="reference"/>
+    <attr name="quick_mic_icon" format="reference"/>
 
     <attr name="conversation_item_background" format="reference"/>
     <attr name="conversation_item_bubble_background" format="reference|color"/>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 9890a17ed8..540f8e7806 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -51,6 +51,9 @@
     <string name="AttachmentTypeSelectorAdapter_audio">Audio</string>
     <string name="AttachmentTypeSelectorAdapter_contact">Contact info</string>
 
+    <!-- AudioSlidePlayer -->
+    <string name="AudioSlidePlayer_error_playing_audio">Error playing audio!</string>
+
     <!-- BlockedContactsActivity -->
     <string name="BlockedContactsActivity_blocked_contacts">Blocked contacts</string>
 
@@ -128,6 +131,8 @@
     <string name="ConversationActivity_unblock">Unblock</string>
     <string name="ConversationActivity_attachment_exceeds_size_limits">Attachment exceeds size limits for the type of message you\'re sending.</string>
     <string name="ConversationActivity_quick_camera_unavailable">Camera unavailable</string>
+    <string name="ConversationActivity_unable_to_record_audio">Unable to record audio!</string>
+    <string name="ConversationActivity_error_sending_voice_note">Error sending voice note...</string>
 
     <!-- ConversationFragment -->
     <string name="ConversationFragment_message_details">Message details</string>
@@ -275,6 +280,9 @@
     <string name="ImportFragment_no_encrypted_backup_found">No encrypted backup found!</string>
     <string name="ImportFragment_restore_complete">Restore complete!</string>
 
+    <!-- InputPanel -->
+    <string name="InputPanel_tap_and_hold_to_record_a_voice_note_release_to_send">Tap and hold to record a voice note, release to send</string>
+
     <!-- InviteActivity -->
     <string name="InviteActivity_share">Share</string>
     <string name="InviteActivity_send_sms">Send SMS</string>
@@ -620,6 +628,9 @@
     <string name="conversation_activity__attachment_thumbnail">Attachment Thumbnail</string>
     <string name="conversation_activity__quick_attachment_drawer_toggle_description">Toggle attachment drawer</string>
 
+    <!-- conversation_input_panel -->
+    <string name="conversation_input_panel__slide_to_cancel">SLIDE TO CANCEL</string>
+
     <!-- conversation_item -->
     <string name="conversation_item__mms_downloading_description">Media message downloading</string>
     <string name="conversation_item__mms_image_description">Media message</string>
@@ -1132,7 +1143,6 @@
     <string name="device_link_fragment__link_device">Link device</string>
     <string name="device_list_fragment__link_new_device">Link new device</string>
 
-
     <!-- EOF -->
 
 </resources>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index fe39dfaa7d..c8b7f4f380 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -147,6 +147,7 @@
         <item name="conversation_item_received_text_secondary_color">#BFffffff</item>
 
         <item name="quick_camera_icon">@drawable/quick_camera_light</item>
+        <item name="quick_mic_icon">@drawable/ic_mic_grey600_24dp</item>
 
         <item name="conversation_item_sent_indicator_text_background">@drawable/conversation_item_sent_indicator_text_shape</item>
 
@@ -272,6 +273,7 @@
         <item name="emoji_category_emoticons">@drawable/emoji_category_emoticons_dark</item>
 
         <item name="quick_camera_icon">@drawable/quick_camera_dark</item>
+        <item name="quick_mic_icon">@drawable/ic_mic_white_24dp</item>
 
         <item name="menu_new_conversation_icon">@drawable/ic_add_white_24dp</item>
         <item name="menu_group_icon">@drawable/ic_group_white_24dp</item>
diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java
index f678bf8ead..7e6936fb58 100644
--- a/src/org/thoughtcrime/securesms/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationActivity.java
@@ -31,8 +31,10 @@ import android.graphics.drawable.ColorDrawable;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
+import android.os.Vibrator;
 import android.provider.ContactsContract;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.support.v4.view.WindowCompat;
 import android.support.v7.app.AlertDialog;
 import android.text.Editable;
@@ -58,15 +60,17 @@ import com.google.protobuf.ByteString;
 import org.thoughtcrime.redphone.RedPhone;
 import org.thoughtcrime.redphone.RedPhoneService;
 import org.thoughtcrime.securesms.TransportOptions.OnTransportChangedListener;
+import org.thoughtcrime.securesms.audio.AudioRecorder;
 import org.thoughtcrime.securesms.audio.AudioSlidePlayer;
 import org.thoughtcrime.securesms.color.MaterialColor;
 import org.thoughtcrime.securesms.components.AnimatingToggle;
 import org.thoughtcrime.securesms.components.AttachmentTypeSelector;
 import org.thoughtcrime.securesms.components.ComposeText;
+import org.thoughtcrime.securesms.components.HidingLinearLayout;
 import org.thoughtcrime.securesms.components.InputAwareLayout;
+import org.thoughtcrime.securesms.components.InputPanel;
 import org.thoughtcrime.securesms.components.KeyboardAwareLinearLayout.OnKeyboardShownListener;
 import org.thoughtcrime.securesms.components.SendButton;
-import org.thoughtcrime.securesms.components.camera.HidingImageButton;
 import org.thoughtcrime.securesms.components.camera.QuickAttachmentDrawer;
 import org.thoughtcrime.securesms.components.camera.QuickAttachmentDrawer.AttachmentDrawerListener;
 import org.thoughtcrime.securesms.components.camera.QuickAttachmentDrawer.DrawerState;
@@ -91,11 +95,13 @@ import org.thoughtcrime.securesms.database.ThreadDatabase;
 import org.thoughtcrime.securesms.mms.AttachmentManager;
 import org.thoughtcrime.securesms.mms.AttachmentManager.MediaType;
 import org.thoughtcrime.securesms.mms.AttachmentTypeSelectorAdapter;
+import org.thoughtcrime.securesms.mms.AudioSlide;
 import org.thoughtcrime.securesms.mms.MediaConstraints;
 import org.thoughtcrime.securesms.mms.OutgoingGroupMediaMessage;
 import org.thoughtcrime.securesms.mms.OutgoingMediaMessage;
 import org.thoughtcrime.securesms.mms.OutgoingSecureMediaMessage;
 import org.thoughtcrime.securesms.mms.Slide;
+import org.thoughtcrime.securesms.mms.SlideDeck;
 import org.thoughtcrime.securesms.notifications.MessageNotifier;
 import org.thoughtcrime.securesms.providers.PersistentBlobProvider;
 import org.thoughtcrime.securesms.recipients.Recipient;
@@ -131,6 +137,7 @@ import java.io.IOException;
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
 import java.util.List;
+import java.util.concurrent.ExecutionException;
 
 import static org.thoughtcrime.securesms.TransportOption.Type;
 import static org.thoughtcrime.securesms.database.GroupDatabase.GroupRecord;
@@ -148,7 +155,8 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
                AttachmentManager.AttachmentListener,
                RecipientsModifiedListener,
                OnKeyboardShownListener,
-               AttachmentDrawerListener
+               AttachmentDrawerListener,
+               InputPanel.Listener
 {
   private static final String TAG = ConversationActivity.class.getSimpleName();
 
@@ -175,17 +183,18 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   private   Button                unblockButton;
   private   InputAwareLayout      container;
   private   View                  composePanel;
-  private   View                  composeBubble;
   protected ReminderView          reminderView;
 
   private   AttachmentTypeSelector attachmentTypeSelector;
   private   AttachmentManager      attachmentManager;
+  private   AudioRecorder          audioRecorder;
   private   BroadcastReceiver      securityUpdateReceiver;
   private   BroadcastReceiver      groupUpdateReceiver;
   private   EmojiDrawer            emojiDrawer;
   private   EmojiToggle            emojiToggle;
-  protected HidingImageButton      quickAttachmentToggle;
+  protected HidingLinearLayout     quickAttachmentToggle;
   private   QuickAttachmentDrawer  quickAttachmentDrawer;
+  private   InputPanel             inputPanel;
 
   private Recipients recipients;
   private long       threadId;
@@ -276,6 +285,8 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     MessageNotifier.setVisibleThread(-1L);
     if (isFinishing()) overridePendingTransition(R.anim.fade_scale_in, R.anim.slide_to_right);
     quickAttachmentDrawer.onPause();
+    inputPanel.onPause();
+
     AudioSlidePlayer.stopAll();
   }
 
@@ -844,13 +855,17 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     emojiDrawer           = ViewUtil.findById(this, R.id.emoji_drawer);
     unblockButton         = ViewUtil.findById(this, R.id.unblock_button);
     composePanel          = ViewUtil.findById(this, R.id.bottom_panel);
-    composeBubble         = ViewUtil.findById(this, R.id.compose_bubble);
     container             = ViewUtil.findById(this, R.id.layout_container);
     reminderView          = ViewUtil.findById(this, R.id.reminder);
     quickAttachmentDrawer = ViewUtil.findById(this, R.id.quick_attachment_drawer);
     quickAttachmentToggle = ViewUtil.findById(this, R.id.quick_attachment_toggle);
+    inputPanel            = ViewUtil.findById(this, R.id.bottom_panel);
+
+    ImageButton quickCameraToggle = ViewUtil.findById(this, R.id.quick_camera_toggle);
+    View        composeBubble     = ViewUtil.findById(this, R.id.compose_bubble);
 
     container.addOnKeyboardShownListener(this);
+    inputPanel.setListener(this);
 
     int[]      attributes   = new int[]{R.attr.conversation_item_bubble_background};
     TypedArray colors       = obtainStyledAttributes(attributes);
@@ -860,6 +875,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
 
     attachmentTypeSelector = new AttachmentTypeSelector(this, new AttachmentTypeListener());
     attachmentManager      = new AttachmentManager(this, this);
+    audioRecorder          = new AudioRecorder(this, masterSecret);
 
     SendButtonListener        sendButtonListener        = new SendButtonListener();
     ComposeKeyPressedListener composeKeyPressedListener = new ComposeKeyPressedListener();
@@ -920,9 +936,10 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
 
     if (QuickAttachmentDrawer.isDeviceSupported(this)) {
       quickAttachmentDrawer.setListener(this);
-      quickAttachmentToggle.setOnClickListener(new QuickAttachmentToggleListener());
+      quickCameraToggle.setOnClickListener(new QuickCameraToggleListener());
     } else {
-      quickAttachmentToggle.disable();
+      quickCameraToggle.setVisibility(View.GONE);
+      quickCameraToggle.setEnabled(false);
     }
   }
 
@@ -1254,12 +1271,19 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   private void sendMediaMessage(final boolean forceSms)
       throws InvalidMessageException
   {
-    final Context context                = getApplicationContext();
-    OutgoingMediaMessage outgoingMessage = new OutgoingMediaMessage(recipients,
-                                                                    attachmentManager.buildSlideDeck(),
-                                                                    getMessage(),
-                                                                    System.currentTimeMillis(),
-                                                                    distributionType);
+    sendMediaMessage(forceSms, getMessage(), attachmentManager.buildSlideDeck());
+  }
+
+  private ListenableFuture<Void> sendMediaMessage(final boolean forceSms, String body, SlideDeck slideDeck)
+      throws InvalidMessageException
+  {
+    final SettableFuture<Void> future          = new SettableFuture<>();
+    final Context              context         = getApplicationContext();
+          OutgoingMediaMessage outgoingMessage = new OutgoingMediaMessage(recipients,
+                                                                          slideDeck,
+                                                                          body,
+                                                                          System.currentTimeMillis(),
+                                                                          distributionType);
 
     if (isSecureText && !forceSms) {
       outgoingMessage = new OutgoingSecureMediaMessage(outgoingMessage);
@@ -1277,8 +1301,11 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
       @Override
       protected void onPostExecute(Long result) {
         sendComplete(result);
+        future.set(null);
       }
     }.execute(outgoingMessage);
+
+    return future;
   }
 
   private void sendTextMessage(final boolean forceSms)
@@ -1344,6 +1371,81 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     quickAttachmentToggle.disable();
   }
 
+  @Override
+  public void onRecorderStarted() {
+    try {
+      Vibrator vibrator = (Vibrator)getSystemService(Context.VIBRATOR_SERVICE);
+      vibrator.vibrate(20);
+
+      audioRecorder.startRecording();
+    } catch (IOException e) {
+      Log.w(TAG, e);
+    }
+  }
+
+  @Override
+  public void onRecorderFinished() {
+    Vibrator vibrator = (Vibrator)getSystemService(Context.VIBRATOR_SERVICE);
+    vibrator.vibrate(20);
+
+    ListenableFuture<Pair<Uri, Long>> future = audioRecorder.stopRecording();
+    future.addListener(new ListenableFuture.Listener<Pair<Uri, Long>>() {
+      @Override
+      public void onSuccess(final @NonNull Pair<Uri, Long> result) {
+        try {
+          boolean    forceSms   = sendButton.isManualSelection() && sendButton.getSelectedTransport().isSms();
+          AudioSlide audioSlide = new AudioSlide(ConversationActivity.this, result.first, result.second);
+          SlideDeck  slideDeck  = new SlideDeck();
+          slideDeck.addSlide(audioSlide);
+
+          sendMediaMessage(forceSms, "", slideDeck).addListener(new AssertedSuccessListener<Void>() {
+            @Override
+            public void onSuccess(Void nothing) {
+              new AsyncTask<Void, Void, Void>() {
+                @Override
+                protected Void doInBackground(Void... params) {
+                  PersistentBlobProvider.getInstance(ConversationActivity.this).delete(result.first);
+                  return null;
+                }
+              }.execute();
+            }
+          });
+        } catch (IOException | InvalidMessageException e) {
+          Log.w(TAG, e);
+          Toast.makeText(ConversationActivity.this, R.string.ConversationActivity_error_sending_voice_note, Toast.LENGTH_LONG).show();
+        }
+      }
+
+      @Override
+      public void onFailure(ExecutionException e) {
+        Toast.makeText(ConversationActivity.this, R.string.ConversationActivity_unable_to_record_audio, Toast.LENGTH_LONG).show();
+      }
+    });
+  }
+
+  @Override
+  public void onRecorderCanceled() {
+    Vibrator vibrator = (Vibrator)getSystemService(Context.VIBRATOR_SERVICE);
+    vibrator.vibrate(50);
+
+    ListenableFuture<Pair<Uri, Long>> future = audioRecorder.stopRecording();
+    future.addListener(new ListenableFuture.Listener<Pair<Uri, Long>>() {
+      @Override
+      public void onSuccess(final Pair<Uri, Long> result) {
+        new AsyncTask<Void, Void, Void>() {
+          @Override
+          protected Void doInBackground(Void... params) {
+            PersistentBlobProvider.getInstance(ConversationActivity.this).delete(result.first);
+            return null;
+          }
+        }.execute();
+      }
+
+      @Override
+      public void onFailure(ExecutionException e) {}
+    });
+  }
+
   // Listeners
 
   private class AttachmentTypeListener implements AttachmentTypeSelector.AttachmentClickedListener {
@@ -1361,7 +1463,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     }
   }
 
-  private class QuickAttachmentToggleListener implements OnClickListener {
+  private class QuickCameraToggleListener implements OnClickListener {
     @Override
     public void onClick(View v) {
       if (!quickAttachmentDrawer.isShowing()) {
diff --git a/src/org/thoughtcrime/securesms/InviteActivity.java b/src/org/thoughtcrime/securesms/InviteActivity.java
index ff7efa04fc..0b83cbe1a3 100644
--- a/src/org/thoughtcrime/securesms/InviteActivity.java
+++ b/src/org/thoughtcrime/securesms/InviteActivity.java
@@ -135,7 +135,7 @@ public class InviteActivity extends PassphraseRequiredActionBarActivity implemen
   private void cancelSmsSelection() {
     contactsFragment.reset();
     updateSmsButtonText();
-    ViewUtil.animateOut(smsSendFrame, slideOutAnimation);
+    ViewUtil.animateOut(smsSendFrame, slideOutAnimation, View.GONE);
   }
 
   private class ShareClickListener implements OnClickListener {
@@ -244,7 +244,7 @@ public class InviteActivity extends PassphraseRequiredActionBarActivity implemen
       final Context context = getContext();
       if (context == null) return;
 
-      ViewUtil.animateOut(smsSendFrame, slideOutAnimation).addListener(new Listener<Boolean>() {
+      ViewUtil.animateOut(smsSendFrame, slideOutAnimation, View.GONE).addListener(new Listener<Boolean>() {
         @Override
         public void onSuccess(Boolean result) {
           contactsFragment.reset();
diff --git a/src/org/thoughtcrime/securesms/audio/AudioRecorder.java b/src/org/thoughtcrime/securesms/audio/AudioRecorder.java
new file mode 100644
index 0000000000..3a03b9d3e9
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/audio/AudioRecorder.java
@@ -0,0 +1,201 @@
+package org.thoughtcrime.securesms.audio;
+
+import android.content.Context;
+import android.media.MediaRecorder;
+import android.net.Uri;
+import android.os.ParcelFileDescriptor;
+import android.support.annotation.NonNull;
+import android.util.Log;
+import android.util.Pair;
+
+import org.thoughtcrime.securesms.ApplicationContext;
+import org.thoughtcrime.securesms.crypto.MasterSecret;
+import org.thoughtcrime.securesms.providers.PersistentBlobProvider;
+import org.thoughtcrime.securesms.util.MediaUtil;
+import org.thoughtcrime.securesms.util.Util;
+import org.thoughtcrime.securesms.util.concurrent.ListenableFuture;
+import org.thoughtcrime.securesms.util.concurrent.SettableFuture;
+import org.whispersystems.jobqueue.Job;
+import org.whispersystems.jobqueue.JobParameters;
+
+import java.io.IOException;
+
+public class AudioRecorder {
+
+  private static final String TAG = AudioRecorder.class.getSimpleName();
+
+  private final Context                context;
+  private final MasterSecret           masterSecret;
+  private final PersistentBlobProvider blobProvider;
+
+  private MediaRecorder        mediaRecorder;
+  private Uri                  captureUri;
+  private ParcelFileDescriptor fd;
+
+  public AudioRecorder(@NonNull Context context, @NonNull MasterSecret masterSecret) {
+    this.context      = context;
+    this.masterSecret = masterSecret;
+    this.blobProvider = PersistentBlobProvider.getInstance(context.getApplicationContext());
+  }
+
+  public void startRecording() throws IOException {
+    Log.w(TAG, "startRecording()");
+
+    ApplicationContext.getInstance(context)
+                      .getJobManager()
+                      .add(new StartRecordingJob());
+  }
+
+  public @NonNull ListenableFuture<Pair<Uri, Long>> stopRecording() {
+    Log.w(TAG, "stopRecording()");
+
+    StopRecordingJob stopRecordingJob = new StopRecordingJob();
+
+    ApplicationContext.getInstance(context)
+                      .getJobManager()
+                      .add(stopRecordingJob);
+
+    return stopRecordingJob.getFuture();
+  }
+
+  private class StopRecordingJob extends Job {
+
+    private final SettableFuture<Pair<Uri, Long>> future = new SettableFuture<>();
+
+    public StopRecordingJob() {
+      super(JobParameters.newBuilder()
+                         .withGroupId(AudioRecorder.class.getSimpleName())
+                         .create());
+    }
+
+    public ListenableFuture<Pair<Uri, Long>> getFuture() {
+      return future;
+    }
+
+    @Override
+    public void onAdded() {}
+
+    @Override
+    public void onRun() {
+      if (mediaRecorder == null) {
+        sendToFuture(new IOException("MediaRecorder was never initialized successfully!"));
+        return;
+      }
+
+      try {
+        mediaRecorder.stop();
+      } catch (Exception e) {
+        Log.w(TAG, e);
+      }
+
+      try {
+        fd.close();
+      } catch (IOException e) {
+        Log.w("AudioRecorder", e);
+      }
+
+      mediaRecorder.release();
+      mediaRecorder = null;
+
+      try {
+        long size = MediaUtil.getMediaSize(context, masterSecret, captureUri);
+        sendToFuture(new Pair<>(captureUri, size));
+      } catch (IOException ioe) {
+        Log.w(TAG, ioe);
+        sendToFuture(ioe);
+      }
+
+      captureUri = null;
+      fd         = null;
+    }
+
+    @Override
+    public boolean onShouldRetry(Exception e) {
+      return false;
+    }
+
+    @Override
+    public void onCanceled() {}
+
+    private void sendToFuture(final @NonNull Pair<Uri, Long> result) {
+      Util.runOnMain(new Runnable() {
+        @Override
+        public void run() {
+          future.set(result);
+        }
+      });
+    }
+
+    private void sendToFuture(final @NonNull Exception exception) {
+      Util.runOnMain(new Runnable() {
+        @Override
+        public void run() {
+          future.setException(exception);
+        }
+      });
+    }
+  }
+
+  private class StartRecordingJob extends Job {
+
+    public StartRecordingJob() {
+      super(JobParameters.newBuilder()
+                         .withGroupId(AudioRecorder.class.getSimpleName())
+                         .create());
+    }
+
+    @Override
+    public void onAdded() {}
+
+    @Override
+    public void onRun() throws Exception {
+      if (mediaRecorder != null) {
+        throw new AssertionError("We can only record once at a time.");
+      }
+
+      ParcelFileDescriptor fds[] = ParcelFileDescriptor.createPipe();
+
+      fd            = fds[1];
+      captureUri    = blobProvider.create(masterSecret, new ParcelFileDescriptor.AutoCloseInputStream(fds[0]));
+      mediaRecorder = new MediaRecorder();
+      mediaRecorder.setAudioSource(MediaRecorder.AudioSource.MIC);
+      mediaRecorder.setOutputFormat(MediaRecorder.OutputFormat.RAW_AMR);
+      mediaRecorder.setAudioEncoder(MediaRecorder.AudioEncoder.AMR_NB);
+      mediaRecorder.setOutputFile(fds[1].getFileDescriptor());
+
+      mediaRecorder.prepare();
+
+      try {
+        mediaRecorder.start();
+      } catch (Exception e) {
+        Log.w(TAG, e);
+        throw new IOException(e);
+      }
+    }
+
+    @Override
+    public boolean onShouldRetry(Exception e) {
+      return false;
+    }
+
+    @Override
+    public void onCanceled() {
+      try {
+        if (fd != null) {
+          fd.close();
+        }
+
+        if (captureUri != null) {
+          blobProvider.delete(captureUri);
+        }
+
+        fd            = null;
+        mediaRecorder = null;
+        captureUri    = null;
+      } catch (IOException e) {
+        Log.w(TAG, e);
+      }
+    }
+  }
+
+}
diff --git a/src/org/thoughtcrime/securesms/audio/AudioSlidePlayer.java b/src/org/thoughtcrime/securesms/audio/AudioSlidePlayer.java
index 104cd11eec..13f62835d9 100644
--- a/src/org/thoughtcrime/securesms/audio/AudioSlidePlayer.java
+++ b/src/org/thoughtcrime/securesms/audio/AudioSlidePlayer.java
@@ -9,7 +9,9 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.util.Log;
 import android.util.Pair;
+import android.widget.Toast;
 
+import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.crypto.MasterSecret;
 import org.thoughtcrime.securesms.mms.AudioSlide;
 import org.thoughtcrime.securesms.util.Util;
@@ -111,7 +113,20 @@ public class AudioSlidePlayer {
       @Override
       public boolean onError(MediaPlayer mp, int what, int extra) {
         Log.w(TAG, "MediaPlayer Error: " + what + " , " + extra);
+
+        Toast.makeText(context, R.string.AudioSlidePlayer_error_playing_audio, Toast.LENGTH_SHORT).show();
+
+        synchronized (AudioSlidePlayer.this) {
+          mediaPlayer = null;
+
+          if (audioAttachmentServer != null) {
+            audioAttachmentServer.stop();
+            audioAttachmentServer = null;
+          }
+        }
+
         notifyOnStop();
+        progressEventHandler.removeMessages(0);
         return true;
       }
     });
diff --git a/src/org/thoughtcrime/securesms/components/AnimatingToggle.java b/src/org/thoughtcrime/securesms/components/AnimatingToggle.java
index b8979fcc7a..2e0b7dfb45 100644
--- a/src/org/thoughtcrime/securesms/components/AnimatingToggle.java
+++ b/src/org/thoughtcrime/securesms/components/AnimatingToggle.java
@@ -52,7 +52,7 @@ public class AnimatingToggle extends FrameLayout {
 
   public void display(@Nullable View view) {
     if (view == current) return;
-    if (current != null) ViewUtil.animateOut(current, outAnimation);
+    if (current != null) ViewUtil.animateOut(current, outAnimation, View.GONE);
     if (view    != null) ViewUtil.animateIn(view, inAnimation);
 
     current = view;
diff --git a/src/org/thoughtcrime/securesms/components/HidingLinearLayout.java b/src/org/thoughtcrime/securesms/components/HidingLinearLayout.java
new file mode 100644
index 0000000000..22d103c83a
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/components/HidingLinearLayout.java
@@ -0,0 +1,83 @@
+package org.thoughtcrime.securesms.components;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.os.Build;
+import android.support.v4.view.animation.FastOutSlowInInterpolator;
+import android.util.AttributeSet;
+import android.view.ViewGroup;
+import android.view.animation.AlphaAnimation;
+import android.view.animation.Animation;
+import android.view.animation.AnimationSet;
+import android.view.animation.AnimationUtils;
+import android.view.animation.ScaleAnimation;
+import android.view.animation.TranslateAnimation;
+import android.widget.LinearLayout;
+
+import org.thoughtcrime.securesms.R;
+
+public class HidingLinearLayout extends LinearLayout {
+
+  public HidingLinearLayout(Context context) {
+    super(context);
+  }
+
+  public HidingLinearLayout(Context context, AttributeSet attrs) {
+    super(context, attrs);
+  }
+
+  @TargetApi(Build.VERSION_CODES.HONEYCOMB)
+  public HidingLinearLayout(Context context, AttributeSet attrs, int defStyleAttr) {
+    super(context, attrs, defStyleAttr);
+  }
+
+  public void hide() {
+    if (!isEnabled() || getVisibility() == GONE) return;
+
+    AnimationSet animation = new AnimationSet(true);
+    animation.addAnimation(new ScaleAnimation(1, 0, 1, 1, Animation.RELATIVE_TO_SELF, 1f, Animation.RELATIVE_TO_SELF, 0.5f));
+    animation.addAnimation(new AlphaAnimation(1, 0));
+    animation.setDuration(100);
+
+    animation.setAnimationListener(new Animation.AnimationListener() {
+      @Override
+      public void onAnimationStart(Animation animation) {
+      }
+
+      @Override
+      public void onAnimationRepeat(Animation animation) {
+      }
+
+      @Override
+      public void onAnimationEnd(Animation animation) {
+        setVisibility(GONE);
+      }
+    });
+
+    animateWith(animation);
+  }
+
+  public void show() {
+    if (!isEnabled() || getVisibility() == VISIBLE) return;
+
+    setVisibility(VISIBLE);
+
+    AnimationSet animation = new AnimationSet(true);
+    animation.addAnimation(new ScaleAnimation(0, 1, 1, 1, Animation.RELATIVE_TO_SELF, 1f, Animation.RELATIVE_TO_SELF, 0.5f));
+    animation.addAnimation(new AlphaAnimation(0, 1));
+    animation.setDuration(100);
+
+    animateWith(animation);
+  }
+
+  private void animateWith(Animation animation) {
+    animation.setDuration(150);
+    animation.setInterpolator(new FastOutSlowInInterpolator());
+    startAnimation(animation);
+  }
+
+  public void disable() {
+    setVisibility(GONE);
+    setEnabled(false);
+  }
+}
diff --git a/src/org/thoughtcrime/securesms/components/InputPanel.java b/src/org/thoughtcrime/securesms/components/InputPanel.java
new file mode 100644
index 0000000000..3802e31c11
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/components/InputPanel.java
@@ -0,0 +1,256 @@
+package org.thoughtcrime.securesms.components;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.os.Build;
+import android.os.Handler;
+import android.support.annotation.Nullable;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.View;
+import android.view.animation.AlphaAnimation;
+import android.view.animation.Animation;
+import android.view.animation.AnimationSet;
+import android.view.animation.TranslateAnimation;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.util.ViewUtil;
+import org.thoughtcrime.securesms.util.concurrent.AssertedSuccessListener;
+import org.thoughtcrime.securesms.util.concurrent.ListenableFuture;
+import org.thoughtcrime.securesms.util.concurrent.SettableFuture;
+
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicLong;
+
+public class InputPanel extends LinearLayout implements MicrophoneRecorderView.Listener {
+
+  private static final String TAG = InputPanel.class.getSimpleName();
+
+  private static final int FADE_TIME = 150;
+
+  private View emojiToggle;
+  private View composeText;
+  private View quickCameraToggle;
+  private View quickAudioToggle;
+  private View buttonToggle;
+  private View recordingContainer;
+
+  private MicrophoneRecorderView microphoneRecorderView;
+  private SlideToCancel          slideToCancel;
+  private RecordTime             recordTime;
+
+  private @Nullable Listener listener;
+
+  public InputPanel(Context context) {
+    super(context);
+  }
+
+  public InputPanel(Context context, AttributeSet attrs) {
+    super(context, attrs);
+  }
+
+  @TargetApi(Build.VERSION_CODES.HONEYCOMB)
+  public InputPanel(Context context, AttributeSet attrs, int defStyleAttr) {
+    super(context, attrs, defStyleAttr);
+  }
+
+  @Override
+  public void onFinishInflate() {
+    super.onFinishInflate();
+
+    this.emojiToggle            = ViewUtil.findById(this, R.id.emoji_toggle);
+    this.composeText            = ViewUtil.findById(this, R.id.embedded_text_editor);
+    this.quickCameraToggle      = ViewUtil.findById(this, R.id.quick_camera_toggle);
+    this.quickAudioToggle       = ViewUtil.findById(this, R.id.quick_audio_toggle);
+    this.buttonToggle           = ViewUtil.findById(this, R.id.button_toggle);
+    this.recordingContainer     = ViewUtil.findById(this, R.id.recording_container);
+    this.recordTime             = new RecordTime((TextView) ViewUtil.findById(this, R.id.record_time));
+    this.slideToCancel          = new SlideToCancel(ViewUtil.findById(this, R.id.slide_to_cancel));
+    this.microphoneRecorderView = ViewUtil.findById(this, R.id.recorder_view);
+    this.microphoneRecorderView.setListener(this);
+
+    if (Build.VERSION.SDK_INT < 14) {
+      this.microphoneRecorderView.setVisibility(View.GONE);
+      this.microphoneRecorderView.setClickable(false);
+    }
+  }
+
+  public void setListener(@Nullable Listener listener) {
+    this.listener = listener;
+  }
+
+  @Override
+  public void onRecordPressed(float startPositionX) {
+    if (listener != null) listener.onRecorderStarted();
+    recordTime.display();
+    slideToCancel.display(startPositionX);
+
+    ViewUtil.fadeOut(emojiToggle, FADE_TIME, View.INVISIBLE);
+    ViewUtil.fadeOut(composeText, FADE_TIME, View.INVISIBLE);
+    ViewUtil.fadeOut(quickCameraToggle, FADE_TIME, View.INVISIBLE);
+    ViewUtil.fadeOut(quickAudioToggle, FADE_TIME, View.INVISIBLE);
+    ViewUtil.fadeOut(buttonToggle, FADE_TIME, View.INVISIBLE);
+  }
+
+  @Override
+  public void onRecordReleased(float x) {
+    onRecordHideEvent(x);
+
+    if (listener != null) {
+      Log.w(TAG, "Elapsed time: " + recordTime.getElapsedTimeMillis());
+      if (recordTime.getElapsedTimeMillis() > 1000) {
+        listener.onRecorderFinished();
+      } else {
+        Toast.makeText(getContext(), R.string.InputPanel_tap_and_hold_to_record_a_voice_note_release_to_send, Toast.LENGTH_LONG).show();
+        listener.onRecorderCanceled();
+      }
+    }
+  }
+
+  @Override
+  public void onRecordMoved(float x, float absoluteX) {
+    slideToCancel.moveTo(x);
+
+    if (absoluteX / recordingContainer.getWidth() <= 0.5) {
+      this.microphoneRecorderView.cancelAction();
+    }
+  }
+
+  @Override
+  public void onRecordCanceled(float x) {
+    onRecordHideEvent(x);
+    if (listener != null) listener.onRecorderCanceled();
+  }
+
+  public void onPause() {
+    this.microphoneRecorderView.cancelAction();
+  }
+
+  private void onRecordHideEvent(float x) {
+    ListenableFuture<Void> future = slideToCancel.hide(x);
+    future.addListener(new AssertedSuccessListener<Void>() {
+      @Override
+      public void onSuccess(Void result) {
+        ViewUtil.fadeIn(emojiToggle, FADE_TIME);
+        ViewUtil.fadeIn(composeText, FADE_TIME);
+        ViewUtil.fadeIn(quickCameraToggle, FADE_TIME);
+        ViewUtil.fadeIn(quickAudioToggle, FADE_TIME);
+        ViewUtil.fadeIn(buttonToggle, FADE_TIME);
+
+        recordTime.hide();
+      }
+    });
+  }
+
+  public interface Listener {
+    public void onRecorderStarted();
+    public void onRecorderFinished();
+    public void onRecorderCanceled();
+  }
+
+  private static class SlideToCancel {
+
+    private final View slideToCancelView;
+
+    private float startPositionX;
+
+    public SlideToCancel(View slideToCancelView) {
+      this.slideToCancelView = slideToCancelView;
+    }
+
+    public void display(float startPositionX) {
+      this.startPositionX = startPositionX;
+      ViewUtil.fadeIn(this.slideToCancelView, FADE_TIME);
+    }
+
+    public ListenableFuture<Void> hide(float x) {
+      final SettableFuture<Void> future = new SettableFuture<>();
+      float offset = -Math.max(0, this.startPositionX - x);
+
+      AnimationSet animation = new AnimationSet(true);
+      animation.addAnimation(new TranslateAnimation(Animation.ABSOLUTE, offset,
+                                                    Animation.ABSOLUTE, 0,
+                                                    Animation.RELATIVE_TO_SELF, 0,
+                                                    Animation.RELATIVE_TO_SELF, 0));
+      animation.addAnimation(new AlphaAnimation(1, 0));
+
+      animation.setDuration(MicrophoneRecorderView.ANIMATION_DURATION);
+      animation.setFillBefore(true);
+      animation.setFillAfter(false);
+      animation.setAnimationListener(new Animation.AnimationListener() {
+        @Override
+        public void onAnimationStart(Animation animation) {}
+        @Override
+        public void onAnimationEnd(Animation animation) {
+          future.set(null);
+        }
+        @Override
+        public void onAnimationRepeat(Animation animation) {}
+      });
+
+      slideToCancelView.setVisibility(View.GONE);
+      slideToCancelView.startAnimation(animation);
+
+      return future;
+    }
+
+    public void moveTo(float x) {
+      float     offset    = -Math.max(0, this.startPositionX - x);
+      Animation animation = new TranslateAnimation(Animation.ABSOLUTE, offset,
+                                                   Animation.ABSOLUTE, offset,
+                                                   Animation.RELATIVE_TO_SELF, 0,
+                                                   Animation.RELATIVE_TO_SELF, 0);
+
+      animation.setDuration(0);
+      animation.setFillAfter(true);
+      animation.setFillBefore(true);
+
+      slideToCancelView.startAnimation(animation);
+    }
+
+  }
+
+  private static class RecordTime implements Runnable {
+
+    private final TextView recordTimeView;
+
+    private final AtomicLong startTime = new AtomicLong(0);
+    private final Handler    handler   = new Handler();
+
+    private RecordTime(TextView recordTimeView) {
+      this.recordTimeView = recordTimeView;
+    }
+
+    public void display() {
+      this.startTime.set(System.currentTimeMillis());
+      this.recordTimeView.setText("00:00");
+      ViewUtil.fadeIn(this.recordTimeView, FADE_TIME);
+      handler.postDelayed(this, TimeUnit.SECONDS.toMillis(1));
+    }
+
+    public void hide() {
+      this.startTime.set(0);
+      ViewUtil.fadeOut(this.recordTimeView, FADE_TIME, View.INVISIBLE);
+    }
+
+    public long getElapsedTimeMillis() {
+      return System.currentTimeMillis() - startTime.get();
+    }
+
+    @Override
+    public void run() {
+      long localStartTime = startTime.get();
+      if (localStartTime > 0) {
+        long elapsedTime = System.currentTimeMillis() - localStartTime;
+        recordTimeView.setText(String.format("%02d:%02d",
+                                             TimeUnit.MILLISECONDS.toMinutes(elapsedTime),
+                                             TimeUnit.MILLISECONDS.toSeconds(elapsedTime) -
+                                             TimeUnit.MINUTES.toSeconds(TimeUnit.MILLISECONDS.toMinutes(elapsedTime))));
+        handler.postDelayed(this, TimeUnit.SECONDS.toMillis(1));
+      }
+    }
+  }
+}
diff --git a/src/org/thoughtcrime/securesms/components/MicrophoneRecorderView.java b/src/org/thoughtcrime/securesms/components/MicrophoneRecorderView.java
new file mode 100644
index 0000000000..7615902605
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/components/MicrophoneRecorderView.java
@@ -0,0 +1,184 @@
+package org.thoughtcrime.securesms.components;
+
+import android.content.Context;
+import android.graphics.PorterDuff;
+import android.support.annotation.Nullable;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.animation.Animation;
+import android.view.animation.AnimationSet;
+import android.view.animation.AnticipateOvershootInterpolator;
+import android.view.animation.DecelerateInterpolator;
+import android.view.animation.OvershootInterpolator;
+import android.view.animation.ScaleAnimation;
+import android.view.animation.TranslateAnimation;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+
+import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.util.ViewUtil;
+
+public class MicrophoneRecorderView extends FrameLayout implements View.OnTouchListener {
+
+  public static final int ANIMATION_DURATION = 200;
+
+  private           FloatingRecordButton floatingRecordButton;
+  private @Nullable Listener             listener;
+  private           boolean              actionInProgress;
+
+  public MicrophoneRecorderView(Context context) {
+    super(context);
+  }
+
+  public MicrophoneRecorderView(Context context, AttributeSet attrs) {
+    super(context, attrs);
+  }
+
+  @Override
+  public void onFinishInflate() {
+    super.onFinishInflate();
+
+    ImageView recordButtonFab = ViewUtil.findById(this, R.id.quick_audio_fab);
+    this.floatingRecordButton = new FloatingRecordButton(getContext(), recordButtonFab);
+
+    View recordButton = ViewUtil.findById(this, R.id.quick_audio_toggle);
+    recordButton.setOnTouchListener(this);
+  }
+
+  public void cancelAction() {
+    if (this.actionInProgress) {
+      this.actionInProgress = false;
+      this.floatingRecordButton.hide(this.floatingRecordButton.lastPositionX);
+
+      if (listener != null) listener.onRecordCanceled(this.floatingRecordButton.lastPositionX);
+    }
+  }
+
+  @Override
+  public boolean onTouch(View v, final MotionEvent event) {
+    switch (event.getAction()) {
+      case MotionEvent.ACTION_DOWN:
+        this.actionInProgress = true;
+        this.floatingRecordButton.display(event.getX());
+        if (listener != null) listener.onRecordPressed(event.getX());
+        break;
+      case MotionEvent.ACTION_CANCEL:
+      case MotionEvent.ACTION_UP:
+        if (this.actionInProgress) {
+          this.actionInProgress = false;
+          this.floatingRecordButton.hide(event.getX());
+          if (listener != null) listener.onRecordReleased(event.getX());
+        }
+        break;
+      case MotionEvent.ACTION_MOVE:
+        if (this.actionInProgress) {
+          this.floatingRecordButton.moveTo(event.getX());
+          if (listener != null) listener.onRecordMoved(event.getX(), event.getRawX());
+        }
+        break;
+    }
+
+    return false;
+  }
+
+  public void setListener(@Nullable Listener listener) {
+    this.listener = listener;
+  }
+
+  public interface Listener {
+    public void onRecordPressed(float x);
+    public void onRecordReleased(float x);
+    public void onRecordCanceled(float x);
+    public void onRecordMoved(float x, float absoluteX);
+  }
+
+  private static class FloatingRecordButton {
+
+    private final ImageView recordButtonFab;
+
+    private float startPositionX;
+    private float lastPositionX;
+
+    public FloatingRecordButton(Context context, ImageView recordButtonFab) {
+      this.recordButtonFab = recordButtonFab;
+      this.recordButtonFab.getBackground().setColorFilter(context.getResources()
+                                                                 .getColor(R.color.red_500),
+                                                          PorterDuff.Mode.SRC_IN);
+    }
+
+    public void display(float x) {
+      this.startPositionX = x;
+      this.lastPositionX  = x;
+
+      recordButtonFab.setVisibility(View.VISIBLE);
+
+      AnimationSet animation = new AnimationSet(true);
+      animation.addAnimation(new TranslateAnimation(Animation.RELATIVE_TO_SELF, -.25f,
+                                                    Animation.RELATIVE_TO_SELF, -.25f,
+                                                    Animation.RELATIVE_TO_SELF, -.25f,
+                                                    Animation.RELATIVE_TO_SELF, -.25f));
+
+      animation.addAnimation(new ScaleAnimation(.5f, 1f, .5f, 1f,
+                                                Animation.RELATIVE_TO_SELF, .5f,
+                                                Animation.RELATIVE_TO_SELF, .5f));
+
+      animation.setFillBefore(true);
+      animation.setFillAfter(true);
+      animation.setDuration(ANIMATION_DURATION);
+      animation.setInterpolator(new OvershootInterpolator());
+
+      recordButtonFab.startAnimation(animation);
+    }
+
+    public void moveTo(float x) {
+      this.lastPositionX = x;
+
+      float offset          = -Math.max(0, this.startPositionX - x);
+      int   widthAdjustment = -(recordButtonFab.getWidth() / 4);
+
+      Animation translateAnimation = new TranslateAnimation(Animation.ABSOLUTE, widthAdjustment + offset,
+                                                            Animation.ABSOLUTE, widthAdjustment + offset,
+                                                            Animation.RELATIVE_TO_SELF, -.25f,
+                                                            Animation.RELATIVE_TO_SELF, -.25f);
+
+      translateAnimation.setDuration(0);
+      translateAnimation.setFillAfter(true);
+      translateAnimation.setFillBefore(true);
+
+      recordButtonFab.startAnimation(translateAnimation);
+    }
+
+    public void hide(float x) {
+      this.lastPositionX = x;
+
+      float offset          = -Math.max(0, this.startPositionX - x);
+      int   widthAdjustment = -(recordButtonFab.getWidth() / 4);
+
+      AnimationSet animation = new AnimationSet(false);
+      Animation scaleAnimation = new ScaleAnimation(1, 0.5f, 1, 0.5f,
+                                                    Animation.RELATIVE_TO_SELF, 0.5f,
+                                                    Animation.RELATIVE_TO_SELF, 0.5f);
+
+      Animation translateAnimation = new TranslateAnimation(Animation.ABSOLUTE, offset + widthAdjustment,
+                                                            Animation.ABSOLUTE, widthAdjustment,
+                                                            Animation.RELATIVE_TO_SELF, -.25f,
+                                                            Animation.RELATIVE_TO_SELF, -.25f);
+
+      scaleAnimation.setInterpolator(new AnticipateOvershootInterpolator(1.5f));
+      translateAnimation.setInterpolator(new DecelerateInterpolator());
+      animation.addAnimation(scaleAnimation);
+      animation.addAnimation(translateAnimation);
+      animation.setDuration(ANIMATION_DURATION);
+      animation.setFillBefore(true);
+      animation.setFillAfter(false);
+      animation.setInterpolator(new AnticipateOvershootInterpolator(1.5f));
+
+      recordButtonFab.setVisibility(View.GONE);
+      recordButtonFab.clearAnimation();
+      recordButtonFab.startAnimation(animation);
+    }
+
+  }
+
+}
diff --git a/src/org/thoughtcrime/securesms/components/camera/HidingImageButton.java b/src/org/thoughtcrime/securesms/components/camera/HidingImageButton.java
deleted file mode 100644
index 0d2281c1ef..0000000000
--- a/src/org/thoughtcrime/securesms/components/camera/HidingImageButton.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package org.thoughtcrime.securesms.components.camera;
-
-import android.content.Context;
-import android.support.v4.view.animation.FastOutSlowInInterpolator;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.view.View;
-import android.view.animation.Animation;
-import android.view.animation.Animation.AnimationListener;
-import android.view.animation.AnimationUtils;
-import android.widget.ImageButton;
-
-import org.thoughtcrime.securesms.R;
-
-public class HidingImageButton extends ImageButton {
-  public HidingImageButton(Context context) {
-    super(context);
-  }
-
-  public HidingImageButton(Context context, AttributeSet attrs) {
-    super(context, attrs);
-  }
-
-  public HidingImageButton(Context context, AttributeSet attrs, int defStyleAttr) {
-    super(context, attrs, defStyleAttr);
-  }
-
-  public void hide() {
-    if (!isEnabled() || getVisibility() == GONE) return;
-    final Animation animation = AnimationUtils.loadAnimation(getContext(), R.anim.slide_to_right);
-    animation.setAnimationListener(new AnimationListener() {
-      @Override public void onAnimationStart(Animation animation) {}
-      @Override public void onAnimationRepeat(Animation animation) {}
-      @Override public void onAnimationEnd(Animation animation) {
-        setVisibility(GONE);
-      }
-    });
-    animateWith(animation);
-  }
-
-  public void show() {
-    if (!isEnabled() || getVisibility() == VISIBLE) return;
-    setVisibility(VISIBLE);
-    animateWith(AnimationUtils.loadAnimation(getContext(), R.anim.slide_from_right));
-  }
-
-  private void animateWith(Animation animation) {
-    animation.setDuration(150);
-    animation.setInterpolator(new FastOutSlowInInterpolator());
-    startAnimation(animation);
-  }
-
-  public void disable() {
-    setVisibility(GONE);
-    setEnabled(false);
-  }
-}
diff --git a/src/org/thoughtcrime/securesms/providers/PersistentBlobProvider.java b/src/org/thoughtcrime/securesms/providers/PersistentBlobProvider.java
index 4f5d9c8bcf..1375b505f6 100644
--- a/src/org/thoughtcrime/securesms/providers/PersistentBlobProvider.java
+++ b/src/org/thoughtcrime/securesms/providers/PersistentBlobProvider.java
@@ -20,11 +20,16 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 public class PersistentBlobProvider {
-  private static final String     TAG           = PersistentBlobProvider.class.getSimpleName();
+
+  private static final String TAG = PersistentBlobProvider.class.getSimpleName();
+
   private static final String     URI_STRING    = "content://org.thoughtcrime.securesms/capture";
   public  static final Uri        CONTENT_URI   = Uri.parse(URI_STRING);
   public  static final String     AUTHORITY     = "org.thoughtcrime.securesms";
@@ -48,7 +53,8 @@ public class PersistentBlobProvider {
   }
 
   private final Context context;
-  private final Map<Long, byte[]> cache = new HashMap<>();
+  private final Map<Long, byte[]> cache    = Collections.synchronizedMap(new HashMap<Long, byte[]>());
+  private final ExecutorService   executor = Executors.newCachedThreadPool();
 
   private PersistentBlobProvider(Context context) {
     this.context = context.getApplicationContext();
@@ -75,24 +81,22 @@ public class PersistentBlobProvider {
     return ContentUris.withAppendedId(uniqueUri, id);
   }
 
-  private void persistToDisk(final MasterSecret masterSecret, final long id,
-                             final InputStream input)
-  {
-    new AsyncTask<Void, Void, Void>() {
-      @Override protected Void doInBackground(Void... params) {
+  private void persistToDisk(final MasterSecret masterSecret, final long id, final InputStream input) {
+    executor.submit(new Runnable() {
+      @Override
+      public void run() {
         try {
-          final OutputStream output = new EncryptingPartOutputStream(getFile(id), masterSecret);
+          OutputStream output = new EncryptingPartOutputStream(getFile(id), masterSecret);
+          Log.w(TAG, "Starting stream copy....");
           Util.copy(input, output);
+          Log.w(TAG, "Stream copy finished...");
         } catch (IOException e) {
           Log.w(TAG, e);
         }
-        return null;
-      }
 
-      @Override protected void onPostExecute(Void aVoid) {
         cache.remove(id);
       }
-    }.execute();
+    });
   }
 
   public Uri createForExternal(@NonNull Recipients recipients) throws IOException {
@@ -136,4 +140,5 @@ public class PersistentBlobProvider {
       return false;
     }
   }
+
 }
diff --git a/src/org/thoughtcrime/securesms/util/ViewUtil.java b/src/org/thoughtcrime/securesms/util/ViewUtil.java
index d9c1403f05..417d39c49f 100644
--- a/src/org/thoughtcrime/securesms/util/ViewUtil.java
+++ b/src/org/thoughtcrime/securesms/util/ViewUtil.java
@@ -130,12 +130,16 @@ public class ViewUtil {
   }
 
   public static ListenableFuture<Boolean> fadeOut(final @NonNull View view, final int duration) {
-    return animateOut(view, getAlphaAnimation(1f, 0f, duration));
+    return fadeOut(view, duration, View.GONE);
   }
 
-  public static ListenableFuture<Boolean> animateOut(final @NonNull View view, final @NonNull Animation animation) {
+  public static ListenableFuture<Boolean> fadeOut(@NonNull View view, int duration, int visibility) {
+    return animateOut(view, getAlphaAnimation(1f, 0f, duration), visibility);
+  }
+
+  public static ListenableFuture<Boolean> animateOut(final @NonNull View view, final @NonNull Animation animation, final int visibility) {
     final SettableFuture future = new SettableFuture();
-    if (view.getVisibility() == View.GONE) {
+    if (view.getVisibility() == visibility) {
       future.set(true);
     } else {
       view.clearAnimation();
@@ -150,7 +154,7 @@ public class ViewUtil {
 
         @Override
         public void onAnimationEnd(Animation animation) {
-          view.setVisibility(View.GONE);
+          view.setVisibility(visibility);
           future.set(true);
         }
       });