From c4a37e38aba926c2bef27e4fc00e3a4848ce46bd Mon Sep 17 00:00:00 2001
From: Calvin Hu <fivepercentjuice@gmail.com>
Date: Thu, 16 Apr 2015 01:38:33 -0400
Subject: [PATCH] Add camera preview to message composition

---
 AndroidManifest.xml                           |   1 +
 build.gradle                                  |   4 +
 res/drawable-hdpi/quick_camera_dark.png       | Bin 0 -> 457 bytes
 .../quick_camera_exit_fullscreen.png          | Bin 0 -> 236 bytes
 res/drawable-hdpi/quick_camera_front.png      | Bin 0 -> 640 bytes
 res/drawable-hdpi/quick_camera_fullscreen.png | Bin 0 -> 231 bytes
 res/drawable-hdpi/quick_camera_hide.png       | Bin 0 -> 324 bytes
 res/drawable-hdpi/quick_camera_light.png      | Bin 0 -> 469 bytes
 res/drawable-hdpi/quick_camera_rear.png       | Bin 0 -> 310 bytes
 res/drawable-hdpi/quick_shutter_button.png    | Bin 0 -> 1274 bytes
 res/drawable-mdpi/quick_camera_dark.png       | Bin 0 -> 326 bytes
 .../quick_camera_exit_fullscreen.png          | Bin 0 -> 193 bytes
 res/drawable-mdpi/quick_camera_front.png      | Bin 0 -> 362 bytes
 res/drawable-mdpi/quick_camera_fullscreen.png | Bin 0 -> 193 bytes
 res/drawable-mdpi/quick_camera_hide.png       | Bin 0 -> 290 bytes
 res/drawable-mdpi/quick_camera_light.png      | Bin 0 -> 330 bytes
 res/drawable-mdpi/quick_camera_rear.png       | Bin 0 -> 310 bytes
 res/drawable-mdpi/quick_shutter_button.png    | Bin 0 -> 915 bytes
 res/drawable-xhdpi/quick_camera_dark.png      | Bin 0 -> 534 bytes
 .../quick_camera_exit_fullscreen.png          | Bin 0 -> 231 bytes
 res/drawable-xhdpi/quick_camera_front.png     | Bin 0 -> 644 bytes
 .../quick_camera_fullscreen.png               | Bin 0 -> 234 bytes
 res/drawable-xhdpi/quick_camera_hide.png      | Bin 0 -> 406 bytes
 res/drawable-xhdpi/quick_camera_light.png     | Bin 0 -> 548 bytes
 res/drawable-xhdpi/quick_camera_rear.png      | Bin 0 -> 560 bytes
 res/drawable-xhdpi/quick_shutter_button.png   | Bin 0 -> 1728 bytes
 res/drawable-xxhdpi/quick_camera_dark.png     | Bin 0 -> 781 bytes
 .../quick_camera_exit_fullscreen.png          | Bin 0 -> 303 bytes
 res/drawable-xxhdpi/quick_camera_front.png    | Bin 0 -> 983 bytes
 .../quick_camera_fullscreen.png               | Bin 0 -> 305 bytes
 res/drawable-xxhdpi/quick_camera_hide.png     | Bin 0 -> 539 bytes
 res/drawable-xxhdpi/quick_camera_light.png    | Bin 0 -> 795 bytes
 res/drawable-xxhdpi/quick_camera_rear.png     | Bin 0 -> 784 bytes
 res/drawable-xxhdpi/quick_shutter_button.png  | Bin 0 -> 2533 bytes
 res/drawable/quick_camera_shutter_ring.xml    |  27 +
 res/layout-land/quick_camera_controls.xml     |  37 ++
 res/layout/conversation_activity.xml          |  16 +
 res/layout/quick_camera_controls.xml          |  37 ++
 res/values/attrs.xml                          |   1 +
 res/values/dimens.xml                         |   1 +
 res/values/strings.xml                        |   4 +
 res/values/themes.xml                         |   6 +
 .../securesms/ConversationActivity.java       | 122 ++++-
 .../securesms/components/CameraView.java      | 515 ++++++++++++++++++
 .../components/QuickAttachmentDrawer.java     | 503 +++++++++++++++++
 .../securesms/components/QuickCamera.java     | 185 +++++++
 .../components/SurfacePreviewStrategy.java    |  72 +++
 .../components/TexturePreviewStrategy.java    |  88 +++
 .../securesms/components/ThumbnailView.java   |  14 +-
 .../securesms/database/DraftDatabase.java     |  18 +-
 .../securesms/mms/AttachmentManager.java      |  17 +-
 .../securesms/mms/ImageSlide.java             |  35 +-
 .../securesms/mms/PartAuthority.java          |   8 +-
 src/org/thoughtcrime/securesms/mms/Slide.java |   4 +
 .../securesms/util/BitmapUtil.java            |   2 +-
 55 files changed, 1698 insertions(+), 19 deletions(-)
 create mode 100755 res/drawable-hdpi/quick_camera_dark.png
 create mode 100755 res/drawable-hdpi/quick_camera_exit_fullscreen.png
 create mode 100755 res/drawable-hdpi/quick_camera_front.png
 create mode 100755 res/drawable-hdpi/quick_camera_fullscreen.png
 create mode 100755 res/drawable-hdpi/quick_camera_hide.png
 create mode 100755 res/drawable-hdpi/quick_camera_light.png
 create mode 100755 res/drawable-hdpi/quick_camera_rear.png
 create mode 100755 res/drawable-hdpi/quick_shutter_button.png
 create mode 100755 res/drawable-mdpi/quick_camera_dark.png
 create mode 100755 res/drawable-mdpi/quick_camera_exit_fullscreen.png
 create mode 100755 res/drawable-mdpi/quick_camera_front.png
 create mode 100755 res/drawable-mdpi/quick_camera_fullscreen.png
 create mode 100755 res/drawable-mdpi/quick_camera_hide.png
 create mode 100755 res/drawable-mdpi/quick_camera_light.png
 create mode 100755 res/drawable-mdpi/quick_camera_rear.png
 create mode 100755 res/drawable-mdpi/quick_shutter_button.png
 create mode 100755 res/drawable-xhdpi/quick_camera_dark.png
 create mode 100755 res/drawable-xhdpi/quick_camera_exit_fullscreen.png
 create mode 100755 res/drawable-xhdpi/quick_camera_front.png
 create mode 100755 res/drawable-xhdpi/quick_camera_fullscreen.png
 create mode 100755 res/drawable-xhdpi/quick_camera_hide.png
 create mode 100755 res/drawable-xhdpi/quick_camera_light.png
 create mode 100755 res/drawable-xhdpi/quick_camera_rear.png
 create mode 100755 res/drawable-xhdpi/quick_shutter_button.png
 create mode 100755 res/drawable-xxhdpi/quick_camera_dark.png
 create mode 100755 res/drawable-xxhdpi/quick_camera_exit_fullscreen.png
 create mode 100755 res/drawable-xxhdpi/quick_camera_front.png
 create mode 100755 res/drawable-xxhdpi/quick_camera_fullscreen.png
 create mode 100755 res/drawable-xxhdpi/quick_camera_hide.png
 create mode 100755 res/drawable-xxhdpi/quick_camera_light.png
 create mode 100755 res/drawable-xxhdpi/quick_camera_rear.png
 create mode 100755 res/drawable-xxhdpi/quick_shutter_button.png
 create mode 100644 res/drawable/quick_camera_shutter_ring.xml
 create mode 100644 res/layout-land/quick_camera_controls.xml
 create mode 100644 res/layout/quick_camera_controls.xml
 create mode 100644 src/org/thoughtcrime/securesms/components/CameraView.java
 create mode 100644 src/org/thoughtcrime/securesms/components/QuickAttachmentDrawer.java
 create mode 100644 src/org/thoughtcrime/securesms/components/QuickCamera.java
 create mode 100644 src/org/thoughtcrime/securesms/components/SurfacePreviewStrategy.java
 create mode 100644 src/org/thoughtcrime/securesms/components/TexturePreviewStrategy.java

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 71e173e18f..9f7889295f 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -33,6 +33,7 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_CALL_LOG" />
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
+    <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
 
     <permission android:name="org.thoughtcrime.securesms.permission.C2D_MESSAGE"
diff --git a/build.gradle b/build.gradle
index 351d21faf2..50309b7083 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,6 +29,9 @@ repositories {
     maven { // textdrawable
         url 'https://dl.bintray.com/amulyakhare/maven'
     }
+    maven {
+        url 'https://repo.commonsware.com.s3.amazonaws.com'
+    }
     jcenter()
     mavenLocal()
 }
@@ -69,6 +72,7 @@ dependencies {
         exclude group: 'com.android.support', module: 'support-v4'
     }
     compile 'com.madgag.spongycastle:prov:1.51.0.0'
+    compile 'com.commonsware.cwac:camera:0.6.+'
     provided 'com.squareup.dagger:dagger-compiler:1.2.2'
 
     compile 'org.whispersystems:jobmanager:0.11.0'
diff --git a/res/drawable-hdpi/quick_camera_dark.png b/res/drawable-hdpi/quick_camera_dark.png
new file mode 100755
index 0000000000000000000000000000000000000000..aa3a3e571757b939c19df2a90507401cb2d44888
GIT binary patch
literal 457
zcmV;)0XF`LP)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD0000WV@Og>004R>
z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN
zS#tmY3ljhU3ljkVnw%H_00BWsL_t(Y$K}>LZo)tmh2hf}QYB>~9zjBECIv;7fRMMs
zLm-5Af$$<CxpA3DBqa;LM6yr>DgQJP!WbLRga+kIH^o=XoqK15F0*t+&;v`3v*g|s
zy5o&gdF9pwx*;GdFO>73G9EFe+2B!1LLRp9l2B|7#YyNdDFns%jOj6BZ4X7bIQzOd
zbXeIy?>wf8Tw!4fMZZi7kC2clO@yctnL#c>JoCNZ+0jObt_c+5AX*0uz?KHWNgaC*
z<Y!#c5kkz1Lt}&pQ&4~q{o+tB7aA0YW(YA&K|_S_i$iN1M3Y@&_lr8h;nSr29fWAJ
zJz$;?!Zo``D=G-lU_?N`kUB!tPW0TF7FkeDwMdN*yQb|Xn%2#j0ENcLnmK(2_^Bf{
zgp3E<=2D~9e)vz4P|4~!ikTcgNB`<Ka`n&;Rw;~)%M}-~00000NkvXXu0mjf0L-oi

literal 0
HcmV?d00001

diff --git a/res/drawable-hdpi/quick_camera_exit_fullscreen.png b/res/drawable-hdpi/quick_camera_exit_fullscreen.png
new file mode 100755
index 0000000000000000000000000000000000000000..061e737dabde906a81f4d3dc795bbc01c61aa6e1
GIT binary patch
literal 236
zcmeAS@N?(olHy`uVBq!ia0vp^W+2SL0wmRZ7KH&Rg=CK)Uj~LMH3o);76yi2K%s^g
z3=E|P3=FRl7#OT(FffQ0%-I!a1C(G&@^*J&_}|`tW<QX}S>O>_%)r1c48n{Iv*t(u
z1yej-977@wzrAKC)S$q_a^Qo}-<iLRYiHgHh)^&ydZhDp;@ptwTika~PcXQ_zQJ<Y
z99@-99Z%03N{~&yuAj`qzft$vY)jTPTXJ|;KTBMnsKv(Cd@$sU{Dx)h{mP<j!G;DA
b`8OC>sZ}rrXH9<uw2#5l)z4*}Q$iB}?9xge

literal 0
HcmV?d00001

diff --git a/res/drawable-hdpi/quick_camera_front.png b/res/drawable-hdpi/quick_camera_front.png
new file mode 100755
index 0000000000000000000000000000000000000000..6fa7c4fa3d420bfc446f45b9f58518b60b6a3a67
GIT binary patch
literal 640
zcmV-`0)PF9P)<h;3K|Lk000e1NJLTq001@s001@!1ONa4CQPDM0000WV@Og>004R>
z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN
zS#tmY3ljhU3ljkVnw%H_00H<(L_t(o!|j+sOB+EH$A2bP@X%;;6UC;Np3FBWDve@6
zq$iQ;C8gM}VZK9qsr2BfBJHJk(L`_$^(Y>4Dju?-5pS&(4YWa?2NyMFXPcSnte5={
z%QCb3=EuHyZ}#mXC|gnX<&Ws7B?t0aJ);`+PE7S)7gi7(6~bpt5w1mSv=lzvtGGQE
zoa?M<K#DwWv+fd>4$eL$4cKG=Q}`=Ij7nfP8fS+lO)5Nd4SU5d1^Ve{3XcVsuq+>L
zS)^IzkvrH+9=7!}%(;V&bc~F;gZ=0jsk?)H<+QE;n@xAHU%chwx_7}cCoV&Og9*x<
zbIvy7eAYAW)lTX?W|F<}USYaxHbR~!WPzX5sM2r&OEbef(+uAkZ&2n7<y#36B}H}R
z1$B}qNJ^H)kF2I@@<w{@SZP#OHyWVAYEWCCERQ}?CSxBU>pbtuMN@pTU9+bQb-n(x
z9N9hDkXEb?Cp$<2OJEwXrq!%xdayk!*f+ghKP$(^U(`o3sQb4dFNa2`?=q&Evq#j<
zc)$zt^tHW8{7CoxrOFm9)#WHyr%J&QQ|Pb63A4hPB(*v29|ey}rQp6&=vCu_=RZE3
z`QBJ$FfLe~Nxg5gsOoABFZAEk#5L+Fy}eLtUoSwy+f_LDk`qi?%E*C!Jb7k;(uMgp
aD7XYAdch@`>O$TC0000<MNUMnLSTZ{oE1v|

literal 0
HcmV?d00001

diff --git a/res/drawable-hdpi/quick_camera_fullscreen.png b/res/drawable-hdpi/quick_camera_fullscreen.png
new file mode 100755
index 0000000000000000000000000000000000000000..bd69358cb53882b84efb55aa8c2420fad0d84ba0
GIT binary patch
literal 231
zcmeAS@N?(olHy`uVBq!ia0vp^W+2SL0wmRZ7KH&Rg=CK)Uj~LMH3o);76yi2K%s^g
z3=E|P3=FRl7#OT(FffQ0%-I!a1C(G&@^*J&_}|`tW<QX}S>O>_%)r1c48n{Iv*t(u
z1>-$k977@wzrF6r#~{Gta`9Wr9Uk+?DQk4KlpJUM(Nn*)UFNFZd$)rJ4(v;qw%%>u
zU%59{*OvHInoT=bIi;XUwD@n<CKUsN`4XbcY;0_9M;jXd{;4ZA`gw4Lgn_~F8w^}Y
W6^uQ<FRB2oV(@hJb6Mw<&;$U1HA&b2

literal 0
HcmV?d00001

diff --git a/res/drawable-hdpi/quick_camera_hide.png b/res/drawable-hdpi/quick_camera_hide.png
new file mode 100755
index 0000000000000000000000000000000000000000..724eb1f7ab2ca9c76c5876cb2c69889b830f59f0
GIT binary patch
literal 324
zcmeAS@N?(olHy`uVBq!ia0vp^W+2SL0wmRZ7KH&Rg=CK)Uj~LMH3o);76yi2K%s^g
z3=E|P3=FRl7#OT(FffQ0%-I!a1C(G&@^*J&_}|`tW<QX}S>O>_%)r1c48n{Iv*t(u
z1^0NmIEF+VetZ2O?;!&L76<k~2M^bmY^Mws*>LFU_BRNr7woeQIFfvQQv7P^yQhnq
zx5So7M;&V66jt+@vEhF5@+-U4N?%62Jzyu!5WZ!_SF1aWDZ5kqEs}kDr8TcuWV`fh
znm5nZV0f{3b}D;#(8IIW?mU!U)pt|IwQ|FG8PA^^CP~ke@vYowD!$;)jY-@AJYhwQ
zU5D=#vK&qF?psumb8cb?OLd`1>lXe!jg@7=nO~NR0WCI2JoHbZn!)||f$m34=a&Kf
O!QkoY=d#Wzp$P!l8FRY;

literal 0
HcmV?d00001

diff --git a/res/drawable-hdpi/quick_camera_light.png b/res/drawable-hdpi/quick_camera_light.png
new file mode 100755
index 0000000000000000000000000000000000000000..c26a846e37ec072e31e0096415ec5857ba5e4ca0
GIT binary patch
literal 469
zcmV;`0V@89P)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD0000WV@Og>004R>
z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN
zS#tmY3ljhU3ljkVnw%H_00B)&L_t(Y$K}>NY63wR#_^|FO_h`henb#2lfoiL5ZNRA
zuiyuYxVI4Z5P@wh6EG<~fErjNXv#^Gi0itWosErzw;PyWG4H(3jL>;X7X;n0z#P?r
zTU+Rcml$I(JacUWT@jpQ42CC)X;2Z5FmZEIZSW{WA<r85DK83zxuGx$nLkt}D8y$-
zhY9Qa&<Yo4-xr4#%RJC4_pv6InA<|DZ>E9Aj2UC<2vKHb2e}CG$mf1#M-w61Hc*Iz
zXdEyG!<HJti5+_i<R@Ix0YXf(Lqmj^#h?Hoy4j&lD%8skO%P%ngZc>JXNT4}h&sE-
z>IYSX!@EuUTL{r)d%!#(gll(?mXr{p#(;o;K2?OMoS3;^Mr2MoHX;??@(pb}GPG_&
z0%VGjHB-9u@MA}830Vi*=3G&mKm12gsF3S93K<<gNB`<Ka`Dg?Jzdej;<&jP00000
LNkvXXu0mjfHJY*Q

literal 0
HcmV?d00001

diff --git a/res/drawable-hdpi/quick_camera_rear.png b/res/drawable-hdpi/quick_camera_rear.png
new file mode 100755
index 0000000000000000000000000000000000000000..764e35ab0f5ba7d1ab0de085dfc386c0cf22ce4d
GIT binary patch
literal 310
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K;Lb6AYF9SoB8UsT^3j@P1pisjL
z28L1t28LG&3=CE?7#PG0=Ijcz0ZK3>dAqwX{BQ3+vmeOgEbxddW?<k3n!+v2$S`Y;
z1W<6Dr;B5V$MLsU9r+F^2si}hU68uFQryt=ql45M^#={N4$shA<N5bpL<0BX9_zNJ
zJo*L`dJeK=`ycnvi7PRAxNpMEOUj+|d}TIy96qKfKE>W5D6sIEWXhfL3n$a{Dg)jc
zYwKprWRG0Cnm0o1$`+o=3pFAu99Xq3s9eeN6?_@9dvl+2TU&I}rM{S(OV!?{pYO?8
z$~7S<)5GKBy!(|VzvX317RdW8xwd%!-dR87_cA7?#FnsK+WH^pat2RVKbLh*2~7aO
C>2A>g

literal 0
HcmV?d00001

diff --git a/res/drawable-hdpi/quick_shutter_button.png b/res/drawable-hdpi/quick_shutter_button.png
new file mode 100755
index 0000000000000000000000000000000000000000..9817b7e7e29c3dcf1c3410696d2ebb90ce6b2195
GIT binary patch
literal 1274
zcmV<W1O@wvP)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0000WV@Og>004R>
z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN
zS#tmY3ljhU3ljkVnw%H_00eSLL_t(&-tC%wXjWAiz^BtpbL3Z=<%+<fuR;02!huFK
zqYurD%m@+$34+v8aiaKv)E`30pe!P?5?xNTtSH7@pxN5ktcVP<4{};9Kjz1r<=nfU
ze|UV}cX#)k^W3}lPXBnH`_FyPd7g8B?>Xn5^E}VFdE{MLS6&V%2Xuu1^`Y<O1{%h6
z*07!LXyzOM?KIQKN37u1-UYguGV1BXCa1Z+_kbRz%7JoG%0zoRl}t(wsFZ#9<u?Wx
z{fA7+R}^O-=q7felNrXMA3tZ5e#mv%1e(KXCC)CfnIEV*DyTgMdK;~DaJR7;PD@Dr
zdirGpXq_79O|jWv(Wqi@&w&bPR^c3Hn6W6L!>ZN5khnnC$lY8O(2Js9<J4=QAP!J}
zb}`G`_odN`^OMYvC%n4V_PJySdIR{Af#z3<_aUW5a{#|9db2z#&@5xPQc5bE5BOB{
z%9Jm_lTm<1%S+qF7*kfrS!?6x7%P^oN}%J6(gSVHFx(=gtF4W%6P@?bONAC_O2Dwh
zln<gQwBcrXYbJU(-td+^K;H(;8tG$do(XMsu2|L*P4;Sl9&|o(Z^){03HMo|%l&?!
z&zyrYzT2Rb$TE632GGYopfRL8)Al{f#9T`p>0q=QXo>g59+lyWv{5K-?SI6R1#X~P
z#nQJ_%2p*E1`ToS(lFI%UB#~e9F&bEF`!4Box5MQ#K!@6I{83xrDwe7i)J-@oMB^K
zgjuxQ4z$%{+QM+7c^CIO|7nypdy5^Y!E3xh-T5D=f$Hr*hZXBakrGJ1?>E_j&MM4n
z)P1x}33SE|lu|V?QwgN=9ih_>q?11+SoU2rmD`6ENW1)(sfVqmXG8Xn5~ww}C0ef{
z=i2X`)ce%0>PB@Rz2$AI&JMIq4b;g5Cq^-Mn!6F9QNGo;?%K@i2n+r<&aI=KD*3g*
z)6$CMv#@gjcq}wiWcMNx0~*ZV034uyAeR;<=etJwNdUbn4_hQ<pId=;yFJFmF&)u#
zgnJABOX*2Qn$p{7w^+Uu&&l^mItQ?$OZhue{#raI-_^NxNoPqO2-Kvw$JAWQzaf^N
z_~WwD7(kcuNcsHem?QH-ET?Ef>AHwG=|{d0TK|-!y}l3B?1`6ba7%hnhH}g@pjR7>
z$$^?l+H_211fcY^Emy3?nJsUQlCV0V#5pM$`a3x9a4>G{7U3S1B_UEu&nGX7MU_);
zQ@0$zj5tY8pZp@5!!)mVaG#{T4gs&nOAGttQ3<XOD1x1I9_dT+<0Q@tJlW|lyg8Gu
z@|@@oihHy$)Db$ibGy+R$te}kUm0fuvCldRtdn)U=)9|5B3{YH@l<~3ws=I2P{u{r
zj?1%kfH$2Zfu^6Ay04WmEzHj55$6atX5=$|kW>2EN}NjVNp%!Ya01nVWbQyqDm@qu
zOiu2YyqJoNJ!q9TNZ#2!6P?_r7KOAqT=(59<c8k;_G2td*+eY|X(dI9Gc-}hW|lM6
kce0xMTqg&V1G;?I1xZ*Al&V1Oz5oCK07*qoM6N<$f+DkI5dZ)H

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/quick_camera_dark.png b/res/drawable-mdpi/quick_camera_dark.png
new file mode 100755
index 0000000000000000000000000000000000000000..4dbf6c77bce2898fe96ca0c423836a5c297478a1
GIT binary patch
literal 326
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%>kLc
z&(p;*#NzbP%h6uUh7xQS?Cp3rb8&j??uZLhI4aBW&OxFuaH&YSq6pWzMQ@dC_K6&4
zoV!Hh$5YJ@a|Mbx3vYJZZ&r`LJoP|x;=Q}|?C)fz7HxXvxRdX=+?8kS8_X_eoXO2P
zuy}%xugXI0#;pa9dEcZaTJxo?J6C$cQ|$2qL)jdqZ1033$r;|?=5G!^StOIwl2g7e
zo?Cxu^4k`b(~~~L6c<Kwuf0~Z;TOk>3aRC*el28Q-Sxey;J17Hm-`3VuX#lsR6lWG
Q9ndEXp00i_>zopr0HvXL*#H0l

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/quick_camera_exit_fullscreen.png b/res/drawable-mdpi/quick_camera_exit_fullscreen.png
new file mode 100755
index 0000000000000000000000000000000000000000..2e88a87737bb0aa8823b8bd48395b98755fe893b
GIT binary patch
literal 193
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K;Lb6AYF9SoB8UsT^3j@P1pisjL
z28L1t28LG&3=CE?7#PG0=Ijcz0ZK3>dAqwX{BQ3+vmeOgEbxddW?<k3n!+v2$S`Y;
z1W?e@)5S5w<9PC)^A55HEV3?aFyc@;*b$y`MWKtw$$a`mkDZDM7c%0cyV!a=SS+LD
jE?!)4agP}j4--TGI~T_F7L#j%hA?=#`njxgN@xNAST-~z

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/quick_camera_front.png b/res/drawable-mdpi/quick_camera_front.png
new file mode 100755
index 0000000000000000000000000000000000000000..ee64e0f670f9582921679ab85d46e16e1da6b864
GIT binary patch
literal 362
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K;Lb6AYF9SoB8UsT^3j@P1pisjL
z28L1t28LG&3=CE?7#PG0=Ijcz0ZK3>dAqwX{BQ3+vmeOgEbxddW?<k3n!+v2$S`Y;
z1W@pir;B5V$MLsU4Y>{(h%`L(`zjD7Zrd92!R@H)^?3`HPOjiA6x3gM&yl4tD{xoG
zmi^IfVY9=79gj{o{pk@W_dYVB)ilN3E%eEog6`*CKJ6l&ODwKVXgArDb%OnXzHP+r
z=f4+-338?@<rr%Oo$Nicz{T-oyTigJCgT%oDr$-bzTf)AQu;Zyzs2k<OgKBGuJ%Nt
z<G%&Mx-YLarpe6T)-POaDUv;Fmc*nZ@<wgPe0>F9#_YbZu1zOq+bqx78xt4I-tu%#
z<ff&!8>U=xcJli6cb`-5>x?TrUk>$3oxXUx&Ns%r+-v())=S4CE&zSY;OXk;vd$@?
F2>_kGic$ao

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/quick_camera_fullscreen.png b/res/drawable-mdpi/quick_camera_fullscreen.png
new file mode 100755
index 0000000000000000000000000000000000000000..382fe09edca9006bbab6628fb289a3df26c35aa6
GIT binary patch
literal 193
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K;Lb6AYF9SoB8UsT^3j@P1pisjL
z28L1t28LG&3=CE?7#PG0=Ijcz0ZK3>dAqwX{BQ3+vmeOgEbxddW?<k3n!+v2$S`Y;
z1W?e@)5S5w<9PC)^A55HEV3>b7;xN;aZ`HQ*5la2!t~_-3dbu387Av_@7}SWwdrNX
jg$+7c?w@aU7;!N4zjI+c#lv9%G=#y^)z4*}Q$iB}#y>XW

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/quick_camera_hide.png b/res/drawable-mdpi/quick_camera_hide.png
new file mode 100755
index 0000000000000000000000000000000000000000..6c24766600ea8302621bf9498cbaa430c114d2d7
GIT binary patch
literal 290
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K;Lb6AYF9SoB8UsT^3j@P1pisjL
z28L1t28LG&3=CE?7#PG0=Ijcz0ZK3>dAqwX{BQ3+vmeOgEbxddW?<k3n!+v2$S`Y;
z1W<66r;B5V$MLsU9l4qf1XwS~i=H{lH80ESeQ?x;S8w-m3tmo}v{2!0Nt(j!nKpG{
zoJTCL&Us?-<idQ%+>dVGc}orp@3rcbP<+)=8Sgns_;-%b&Iu~2`>(DrW8m3Qzoe_;
zK~Rm+R<XRVUO{g&uh{4~Sf(1JzL;w?Q>r9j^Vus4n~fy7y);+mM_usi+<N_>mghMy
i*8kUKie9K+;JUOr?oOO-#(SVE89ZJ6T-G@yGywqWEoM6a

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/quick_camera_light.png b/res/drawable-mdpi/quick_camera_light.png
new file mode 100755
index 0000000000000000000000000000000000000000..2a906080fd6df6db6c1aca7c27dbdf8f6b3ecf8b
GIT binary patch
literal 330
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$kW9!#NzbP%Xc{s8Hlt!6khMOd_uz(=PPAQnt2L48b5S7PgTlO6k%DOVcl|kcG6mV
zUl+%Hs}Fo{nJ|arQ{<EC4X*E-xYw|kK0WkGG~$wt$o$Kbz8{DUpR$bo)lBmR3W^E|
zelMBLIND}#G&gXIa2TJ{IK|n$L7ts+^15{zqHQHIEJvE1Bb>xL?3jyrmfwEWp(xF+
z+O+i5tKgRA*HMlJ5jt#%&p#Jb2RS)yI`~fcK(a~H`l`Flcar0>#q57As%H;>Y@%Xx
U<@@EEK;JNUy85}Sb4q9e0P<yaUH||9

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/quick_camera_rear.png b/res/drawable-mdpi/quick_camera_rear.png
new file mode 100755
index 0000000000000000000000000000000000000000..764e35ab0f5ba7d1ab0de085dfc386c0cf22ce4d
GIT binary patch
literal 310
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K;Lb6AYF9SoB8UsT^3j@P1pisjL
z28L1t28LG&3=CE?7#PG0=Ijcz0ZK3>dAqwX{BQ3+vmeOgEbxddW?<k3n!+v2$S`Y;
z1W<6Dr;B5V$MLsU9r+F^2si}hU68uFQryt=ql45M^#={N4$shA<N5bpL<0BX9_zNJ
zJo*L`dJeK=`ycnvi7PRAxNpMEOUj+|d}TIy96qKfKE>W5D6sIEWXhfL3n$a{Dg)jc
zYwKprWRG0Cnm0o1$`+o=3pFAu99Xq3s9eeN6?_@9dvl+2TU&I}rM{S(OV!?{pYO?8
z$~7S<)5GKBy!(|VzvX317RdW8xwd%!-dR87_cA7?#FnsK+WH^pat2RVKbLh*2~7aO
C>2A>g

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/quick_shutter_button.png b/res/drawable-mdpi/quick_shutter_button.png
new file mode 100755
index 0000000000000000000000000000000000000000..90022770feb3edbf34dccb77c5eefdd0f5e982f0
GIT binary patch
literal 915
zcmV;E18n?>P)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0000WV@Og>004R>
z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN
zS#tmY3ljhU3ljkVnw%H_00Rq2L_t(o!|j+|Xw6|5z@P1$9fzdGW@|fH$OS?|>_W-~
zrAW+*l9C$~Qa(nM#Zt7ijghYlZfLd(+lAyK%>@@O?4!j(88LPaGqaClKNsike7zs%
zY-dXG{BO?x|32^Yd*A2%c%J77@@F6U=KyJ>k3PV~GLF$eJG}t(&_*43qXU>mIi09-
z4?&nrX(EuVF^5Y8(Mgaw2*O36p9&_91hAO^COL;7%;%@`-bvAL0oyT)pGgS9qnNK%
zxQ7GCr^g7`g&-6w-|O)v18^}DK{#SC--;VyEN?Vz4eBgZKow265WHFwu)>Nzn+UK0
zfSpmlW92r2;N!c|fyFjJ7M}s=ayH(>xX%5|KoG85w!kN{%z(3DwMqnGUU(yh<TQd%
z$PhNEG68%Hgp~%FjUZfz>iCff2x&aUF8%oQfRiz5cM*hazJ$MQLlCx*Sju#ObUNbH
z)*uLbowsMCBaG*L5`d1#of`oZDrztBAY{-6z|vIXL5XH0`w@gyz>U-cPOS#eO%8%k
z!xW|KRQfDVs#5{YTE!~}LWXv9Wfnk-3h-+chgfKwzHPw+Dqz5%`q<)O^Og;&0Q2eG
zWJv*@BoF8|0^Tyth*)A6m|q3Fuq;`r*0={jxTfvVtODvSfL;m|^V6w85c0IK?^f!W
zT^+CzK{%`d9849kJSu#8d945zsQ?!rlDNh~3-02%^S&EFC{nc2bTc@W1R%6!cSIei
zQ2crjqjg*#4+<DeV7?JS$aDg0NUELK7s&zpqSMJ(&z`rM|9x###2u-*aedF2V{$fK
z7Qj^mVU{w_`%c0TZ~|+lEp6FoG~Z1wf^bLEwhlqq1HjruiC47&Z~#GAt!;b77z8)1
zvF_0W+%#xRwBteW7%!AVj{986B)?wGwGo>5KBEJ_nF<m8IdxO1NnvvMYS{u?hg*QG
z50_3sCkeZ3G(Lg?By^z4`4LV97sREJkvwjMB~<9i<)~B7G-`~$;{^GmQz!elNfUm8
p1PRbWEhQ|DTxtLRO8A=rzW|!0cdDCS#?=4-002ovPDHLkV1j1~hw1<T

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/quick_camera_dark.png b/res/drawable-xhdpi/quick_camera_dark.png
new file mode 100755
index 0000000000000000000000000000000000000000..753805275baa08d95ede5eddb9f5bbf40a23395b
GIT binary patch
literal 534
zcmV+x0_pvUP)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0000WV@Og>004R>
z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN
zS#tmY3ljhU3ljkVnw%H_00E9kL_t(o!|j*NN&-<BhCdVW9#RI~gnQj6L01rgKZT%>
zyFjRwSJ1{y7a@w05dK_G2zmh_Dy5V?Ejo<C%w)_tf(zf-op;W8;Qi)&=ZqlxedGu*
z0jS}nnh8J!Z+&yC3%KHozx2ta4&Z_hcIln-{{j;9nW3u%LlSO)1XE0Dx<PCJeN1ZL
z1k8*A=1zcV9U5RsgDe&yLRe&JvNQ?kaO(KNBXrFG*4%k+qbh5Cz-IX%87fpr6Wl^*
z0y@eKP-bF}jw#ynx;lWR%09r8!>g-#QC9u|4ds<x-D~Bx`~$Ko`-!VN;sim+`v+JE
zLdLU@DFh+r9}wDcrj-zc@BssUBT9P$k_bXvzsO@(_f-|S;2+RbUeVRfDYvb&(IU#N
zJG@8bSUMXGo^Ahz(N;J)d;CSW*;VZ~PDoLrL{eoh2=^x1b=9+7KbUCO09~Sv#VyZp
zd>xr9TI7ilCQO_HZI99(?xAl0u-Ny-YiJbE+wbM~jWhS_`+&KDaC)2NkH4`;z!88T
YKN)pv1mZE@z5oCK07*qoM6N<$f-VW$-~a#s

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/quick_camera_exit_fullscreen.png b/res/drawable-xhdpi/quick_camera_exit_fullscreen.png
new file mode 100755
index 0000000000000000000000000000000000000000..fbb53e5c6e2d1f85b3b2cb4da8bd932c61f658b9
GIT binary patch
literal 231
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
z6pZ(DaSX}0_x8FWAA<r1i^0$Ti%Uz3C$RLSKAV&$W9Yt~QvnPXWL=Q!=#~Ys7w}y0
zls;*xu;9Ogl(GO2TzIW;U5;bLBEw%XjSUSAyP8ehAbPetaEq{XFgjlTDF?KQ!PC{x
JWt~$(69BvoLM;FQ

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/quick_camera_front.png b/res/drawable-xhdpi/quick_camera_front.png
new file mode 100755
index 0000000000000000000000000000000000000000..379bc460f8374bef28f512400322ff9257e75f81
GIT binary patch
literal 644
zcmV-~0(<?5P)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0000WV@Og>004R>
z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN
zS#tmY3ljhU3ljkVnw%H_00I0-L_t(&-tF1DF9cB($MNra?0R+@kBZK-kfrhmh*qMo
zi9+I)cyu~hwZf|q8U=|)i(Y3}A&8ESXjCNLMk7Jo-JO|x=I-F0a%M95By;cl&YX!j
z<g6&eBxs}p|Mkczo2>Ad>%vG*P%S&OAyX%GbEyZ4k`m(p924hB2Q<zSvNgq`4(Nam
zVbCFQ9nh`TQdZSHWjdg*rz08+*Y~j?3$maeRl*qkG(pz1G6t$+k7gHXWe5}_O^d6v
zG6b4r!DU(*0;QC>q)ID8pgYQ4rqzE1shg9u;;12zx_z5qIbR@EgL_10{<b~Tu=|a4
zL=RW_jgBazBtD{JgVhWzyiI!xvY<Z!s-lYyTBxUnN*wOE;+zxG>~mulR84|j;u&x4
zkYbxnu1$a%NYY2Ki^ufL7PDLg35qaHl9;DK)eLhu!GH=_XTZmTUT2WEAV8z6_}pVd
ztOWr&qtPem^xLPB80eKkpP(0tf&fXC1zC^<S&#)uf*w3I8*WPT*TNy~!k~2a-#NKJ
zQ_Ks4RI?EeAk|n?r_{3%4<M*zmsT;3dN$$-1TjWP&_t=$QqDFT@d(OXNs{941TB!m
ztTag%gfvMXButV3iIQYMf+V?c{YrAek@laYkbpi(7W69~nW04;x^4d}UyLD(j*x|G
e$l8wp8nkz53l<Qw6ArTg0000<MNUMnLSTZm%?pqK

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/quick_camera_fullscreen.png b/res/drawable-xhdpi/quick_camera_fullscreen.png
new file mode 100755
index 0000000000000000000000000000000000000000..5709dd8bed5c0b507dcc8affb8a727887b034ce6
GIT binary patch
literal 234
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
z6io7TaSX}0_xAcpP6h=Y7Kh9A7jHE@IIJNz`TwCBC$qrQk-`oTVC|@!tMa^|;UC-4
zCwAcqK(K&Sp;wRt2wp6`e{U;06BCn_>=j>ikQ(O99*C~*%~B#P9gM24zW^P_z~JfX
K=d#Wzp$PzHa7E?-

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/quick_camera_hide.png b/res/drawable-xhdpi/quick_camera_hide.png
new file mode 100755
index 0000000000000000000000000000000000000000..f00aa8bd4e394bdba5a8002d97bdcbd5220c8640
GIT binary patch
literal 406
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhaw6p}rHd>I(3)EF2VS{N990fib~
zFff!FFfhDIU|_JC!N4G1FlSew4N!t9$=lt9;eUJonf*W>XMsm#F#`j)FbFd;%$g&?
zz`)4o>EalYaqsO-Pp(4_0<0Ihc3c-;(yZQFWnkM_!Pq{#CcJUR#<poJfA%Y`UUzEo
zq&5ex6T3D=N;wEPvIuT5X;5h5P|C<;0CHR=WPU$a+W&XGL;6n7%x57*({F8%zg5b_
zU=y%Po27{>pTS}6+6!iOi#l7c6!56TK9+i$;koi?;AETSZxqCj?w;~Q>*U2)%RlcW
z&-!aVyt?wluM=xj%#Sl&nk+Ogu8((#a;rty1sly18=IGTrcQax*gM&%pk_g0kXWC%
ziOZ=&ADe$I(V4@M(e>on5r^a@4C-7`O05=!0n<gEJYm@Cndm1M;C$*pV~*_nfWKGP
sW*e~npDySE@&t%js|}<t+;6nYogd7qa{gT{Ft`{zUHx3vIVCg!04VX7ng9R*

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/quick_camera_light.png b/res/drawable-xhdpi/quick_camera_light.png
new file mode 100755
index 0000000000000000000000000000000000000000..3be61d73f4e5742d73b926aa601c3547772c1303
GIT binary patch
literal 548
zcmV+<0^9wGP)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0000WV@Og>004R>
z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN
zS#tmY3ljhU3ljkVnw%H_00EpyL_t(o!|j*NN&-<BhCdVW9x4XignQc*L01rgKSiLB
zyFjSba|LbObP-Y%2~m1IA=m|ksFcyqY0+sWm^m7Aj^JYWcJt18A9%kx-#H`5VoMT$
z3jioX;R4Vw+AF>|wgv3-F$17@XU_((%j-;gh2n*s{{jj;Fq&&PuO{>;L;(s6t<8UH
z7$5?`gEM=Dq8kQ`oC3ySfO1^R2AI;Oghz%99wjcBx&+*?8v4T5=(quVa$?*@O+M`b
zfqj~78Z_7<{Rd$QxY25gI#2%70Z0D2jtyX{vrlmm(pq}mI&bj-ZLQTK)dQ_w#Rrsh
z_D_*&pA`h55+C3p2;0U+ZXyV|_<+ouGp&XoWS1E56Va9tP(%>&_Dvo{s*k$K)%bu*
ztsO<GWvyP@Y_v74wnEyuRy>=HrnvR>L;8QhDf`dwY=>Rbe`AGBYSbv|>;>V}#kg)7
z$Mu<uajj5vSPz+d#&BXCnQvTCAxD-hd8%9+TD!c5z5~Ey(HF0tQ^5UVFTc-hL|@;#
mj2(n?AJ`|qu?ZjnAjmhSS&+GA&zr>n0000<MNUMnLSTYJUf>%5

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/quick_camera_rear.png b/res/drawable-xhdpi/quick_camera_rear.png
new file mode 100755
index 0000000000000000000000000000000000000000..d27bf85e7992c643234d4007c04bfc6ec543ce7b
GIT binary patch
literal 560
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhaw6p}rHd>I(3)EF2VS{N990fib~
zFff!FFfhDIU|_JC!N4G1FlSew4N!t9$=lt9;eUJonf*W>XMsm#F#`j)FbFd;%$g&?
zz`(e|)5S3)<KEkwXZ4r^MGkzdZxx%^G4}(T#zlUij|_Hk3$KZCW*%a`!mO|_QrLe%
zoP$e7^My_7I<85MxmhbyN@m>){_b_|=Gl`z&!*2TKELxM@01U{3Z6n=F1Wo7R5@>V
zTjXyZ&yS{ECk+~W?iid~EU9r~rv&?hSr+nY3nH&g=oMM5w!pZp#nJMS+Jf-KLEpN}
zqkJ8fYQ=3h$hh4^AgxQq@xD6KSC+fR$6{}mw(!jT=8*5QzmOqm&ZP|QEk~N%%i5Rd
z2DEthztK3p&Ef34#S5C#w>!MubA!os=Z6!01xegn&g^k7n=Bc<pgc*W?g^Xa;*)X7
zH3?0B%+D#tnpvBQ+<er)bm94-7b{dnmME}ldN^_gO=v=5-eKG;Ec8r5PWMR%SM#Q+
z{l$MAG{agPi`UF<a7y9iE?OsHW__SJukVHUW1mk?f<K1pEEc$|@?z=H6;nRH*%<xv
zbqMz_+e=H1RyPT*II_s(q)3a&Nf{NNNerEnQXHC8c0P>q)7okHcE3ko!#)qLU*h}U
w^mpCbnfhN}dU5jN!y6yIy76r>pY#@gb*DRw_x7K<0gOlnPgg&ebxsLQ0BX1DF#rGn

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/quick_shutter_button.png b/res/drawable-xhdpi/quick_shutter_button.png
new file mode 100755
index 0000000000000000000000000000000000000000..9324ec8cb3f2f3ec94c5f57e26ff9ed53a50c72c
GIT binary patch
literal 1728
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
W#@^|kqP&;@0000<MNUMnLSTZ+5ejku

literal 0
HcmV?d00001

diff --git a/res/drawable-xxhdpi/quick_camera_dark.png b/res/drawable-xxhdpi/quick_camera_dark.png
new file mode 100755
index 0000000000000000000000000000000000000000..c1a3549bfc0d4b26e9beaf97a65220052ffab653
GIT binary patch
literal 781
zcmV+o1M>WdP)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0000WV@Og>004R>
z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN
zS#tmY3ljhU3ljkVnw%H_00M<cL_t(&-tE~-OB+!X!0}nMGw8ONh|Q*0rK>`hft2b>
zSEV3Gx9zH6OyWYbk*SEEAe(#yA&V{){SZE&J`nl|suHxJLh2*!zpKVO(V4k1xp&g`
zo>}HBewq6?=iaffdh4+a$bbyU!eSnonAZh*k6irXoet0&8py^quT_Iy@q>1v&P$b`
z7u0AszVTcY=qbnCC%*Ee6Oc`gP0mpr7wj;L69r1Ki_X|56$Y|3a{%_RgF!jsh(a)E
zGZxTxFz7rMP(2tFR~V2s&?T#6N#kN;<C12EHLl_To#FB5&h0<JVw*Lu3!oL;(3&(r
zMIWfa2dP4tmF}E60yUVFuH93Tq>ezXZ^vN*k1}OE#{G2(i)q!M6<>ZoA362?US)wk
zUrt3O=*%~jpYi3+tV2e8)4Qe)<oP(&z`PTNh0G;Ypi5!j=?{22f8s#s1rw25<vl^G
zLZ%n_uZu$Vx*AYcSXrl$pkp31^Ydyz>1N)9)M6fM=4aG^+%^WxKWIrcpqovvECnhF
zL;Qb$dTz*WCiS=!XjJv2o)Hd|)kw~fu<Q$JKx;zgLL_KT$lg#@IugyyJ`O{3cZDV3
za;>VkE(*CLoP=D!3<;Ub>Z*N>0U>*sgMhaqat8UXvO%k~bc@B7OROX2TDrzhs$1A>
zOOyJLF^ZHZQDjtDS#o8yD^32Cbd&#<pL&i#(^8zgB&RC}#foow-+l(A=1y0S(lwTZ
zeMx*=mL*n}lFNoG*2$A0iGxFu3<WkKw?T71^e=-hdhOD4Cl=6FFlaUwP%aqcu&<r-
zIqcJdMT$MmoX1h0ryL4wQ`az+x5(YP;4<Is4ak5D$bby!uLu1G>qRjC;|;dM00000
LNkvXXu0mjf*Bf09

literal 0
HcmV?d00001

diff --git a/res/drawable-xxhdpi/quick_camera_exit_fullscreen.png b/res/drawable-xxhdpi/quick_camera_exit_fullscreen.png
new file mode 100755
index 0000000000000000000000000000000000000000..d041734c139bf5c591799e4a5ad32f1bf015b474
GIT binary patch
literal 303
zcmeAS@N?(olHy`uVBq!ia0vp^IUvlz0wh)Q=eq$Zg=CK)Uj~LMH3o);76yi2K%s^g
z3=E|P3=FRl7#OT(FffQ0%-I!a1C(G&@^*J&_}|`tW<QX}S>O>_%)r1c48n{Iv*t(u
z1($oeIEGZ*dV9-}>wp3ei^KLW|Ks!I0|XYf1<l<nEy=;6y7Sg7ODPFdaHGm{d1%!?
zuBC6Lgt0Kgz~>yvnxv2=_1;^QK+13MZHN$p$w6pokEi10cB@v39y|a9+oUecw91O_
rPgu*r1_RsJ&!q98S|)L$zlho8F4t|D*E(l`PG<0Q^>bP0l+XkKeKJqt

literal 0
HcmV?d00001

diff --git a/res/drawable-xxhdpi/quick_camera_front.png b/res/drawable-xxhdpi/quick_camera_front.png
new file mode 100755
index 0000000000000000000000000000000000000000..9e35ad5c4afe1b48126dfaa2e480d27df928f46a
GIT binary patch
literal 983
zcmV;|11S87P)<h;3K|Lk000e1NJLTq003+N003+V1ONa4C2yZb0000WV@Og>004R>
z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN
zS#tmY3ljhU3ljkVnw%H_00U1+L_t(|+U?xWOO!zv!13?9sFkcr1hU0KA|k2Or5~c3
zSVE>rouwkk`U4_@2nu(*N9UHrg9%+i3{6r3J*=q&bucQ+EL@_Hkg_s6G#!cv+;yGZ
zcV_n8=9$~R^S(QueRtk>=Gl4I5u_CX&eBRXB{--F!6%+_k1jr>xxaMriOXVH=!$RR
zlJLp5Ql3>H`i1W36Zz_4-NHoNlx?RY*~i)#z)ZAoU#7Y&Y>K^xU=!4-gH`Ynb5YLR
z`YZdS4qcDQ2+35Ig9VMkg6d!et6quVC@PUv@3m1K%tK*e7G_}<W?>fQQaBvp7O(li
z3bXXkq63zv{2glO{%1x|PB|x;<TTH`ea4!YNHEc<Wr~AdhE>szKj9WXcd7C&tUC$o
zH?7O7ux4u4++N3FZ^DkdP$Mg0sps1vZ^D8u)W}Mhz+k9^#Z%Up_a-dnLXE71^}0|a
zD`5{(oRJtKULARK@Hy$WB|5x2q?+LvOG#Kqnep=IevExQOz<V#!<g6SW6!ClnG=Kv
z0`tV^RoS=n!2pICwmA<AvoH&@FblJ=Y`H;~v74P#QpPs6unAb^Bky>_3#NI*Td%<a
zv~h?=0;{(8@w5H!Qk3_MGQwb*>)W)#ifHE)p>;0y3(!tGKZ()9?IiPnEa+ofxlWuY
z`z6;f`e-0ZoNEcruyNQ1uJVd=6sLWJV$L&5IKf&HgRp9zaD~E*k5fn|kJ*teum&dF
zY0RGwY0`}haptf}1}Jj%0#wW(73N{l4Ej~FDB*_b%l$4ImD~xNSTuXa)csykZx&Xn
z3>Glm$5e%rt1vrlu`mm>FblIV3$ri_voH%&30pDR*6-?Iaig$#b+B=xuyJ*;Stbp#
z=G4JR@PMJN2&=s+4yj#Ko;0G;t9hg!$<G&k+8@ZjBl6V$*8svNE{d<(P+!Ca;mEhr
zNpnSVDQ9S<hRq89&ts8khUj7;&Ha^?u)thVd2nHprWR(9rW$69rXFU9rUPb#rUzz#
zrVFN>rVpl>CVR`xEW#=Aa(k~)^yWM|WhWorN#<yy>CaMWqM1m)b#fp#VG%}i5f;hK
zuVN%OFCGznmwP+%uw%vlYIGmAGiaOhuvsdbSM*3G_!kP{H#_cw?lb@Z002ovPDHLk
FV1h7+$58+P

literal 0
HcmV?d00001

diff --git a/res/drawable-xxhdpi/quick_camera_fullscreen.png b/res/drawable-xxhdpi/quick_camera_fullscreen.png
new file mode 100755
index 0000000000000000000000000000000000000000..ce96d83e362f8f2bbc99a941f577ccf04873f829
GIT binary patch
literal 305
zcmeAS@N?(olHy`uVBq!ia0vp^IUvlz0wh)Q=eq$Zg=CK)Uj~LMH3o);76yi2K%s^g
z3=E|P3=FRl7#OT(FffQ0%-I!a1C(G&@^*J&_}|`tW<QX}S>O>_%)r1c48n{Iv*t(u
z1y_2yIEGZ*dV4F7>wp3W!v&e$|EJz%{Wfv3Vc7ZiE95wnBrLD>BsVmog0<r5iMe0z
ztJ~cQ)@lMt<%TYhe){Pl-^-&15a7@R2^4U{<%?SJqo=n`{ibv!z=8EPUE^HWtw%ld
l*}$MI*v0o5x`lt$_2$gwx_wl)h#lx?22WQ%mvv4FO#u0wYl8p)

literal 0
HcmV?d00001

diff --git a/res/drawable-xxhdpi/quick_camera_hide.png b/res/drawable-xxhdpi/quick_camera_hide.png
new file mode 100755
index 0000000000000000000000000000000000000000..16094f9bc4ff3b460119791c86d6e3ac07a23c84
GIT binary patch
literal 539
zcmeAS@N?(olHy`uVBq!ia0vp^IUvlz0wh)Q=eq$Zg=CK)Uj~LMH3o);76yi2K%s^g
z3=E|P3=FRl7#OT(FffQ0%-I!a1C(G&@^*J&_}|`tW<QX}S>O>_%)r1c48n{Iv*t)J
zFfdN`ba4!+xb^m?wcp_Yf!2qQxxO(*H!evw++rhhX~UeBX=@KyX)II_+}I&}+&Epw
z^}oloobZ2ng|*LpKCk_}hE2jC;Xnf;GaC<1#<TX=m&QL=uls6fo3pa|?n~Q=rq{jJ
zXDx5l{i^U%d!pHOFY!rYhEY7<79BquE0%jYXo^^)?w2i}r#RkDWzBq?7#qfxyR5Wb
zbWv~X)~b7-&75XuE<L@M`-UICwEyemsfUX)U#_|FY@)02hDEn)+1`e|t_l0YF1vJQ
zgrxf_j<d&3S+evmm5hwcJuNY7>eTD~bG?i=8%duH&L|7ZW4E1Bw%FWU+geJ(Njvdr
zy4>*$R~`2m#U0DErl~J|wcIpRC;ZPf_h8Y})3y1QM@F1GP$F^m$S1Xf$1}~QSwFJ#
zG2Zm&X083%Q>!Gr-YlOPX?l6ue-rD~Sv^;lif(xIEV+J*P}tK4@27_ySv5Cf+w9kG
k5|*;!4k$<%o_ft5<@bv5*0+UMfN{p)>FVdQ&MBb@0B&;DnE(I)

literal 0
HcmV?d00001

diff --git a/res/drawable-xxhdpi/quick_camera_light.png b/res/drawable-xxhdpi/quick_camera_light.png
new file mode 100755
index 0000000000000000000000000000000000000000..62d83b253db2a6a8b087097a760a81fbf7d93394
GIT binary patch
literal 795
zcmV+$1LXXPP)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0000WV@Og>004R>
z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN
zS#tmY3ljhU3ljkVnw%H_00NUqL_t(&-tF1TN*hre$MIRT8FbrB#AZ`krK>`hft2b>
zSEW#pZrfGCn8bzOY-B3p6J(P|5VGh((TDH?^@7kRs7la=3aOX0r>n*@qmwx?IWuW{
zI7@$!k8>{n|D3U~`fFGQWIzUFVF5y65EbaX5=ZchcTs>|(^Lcru6U&z^pYRS9D$(0
z3!R|n)H~t`1mAe33-pAejyVFsR~~f(N|0xRvpfBCC*z!LX0gLSX?C<z<grJ(9Viho
zM<CcG5e&*l&JhTT!Jv&;KwH6}vsgflV33Gu7*J%O3s%UH!688chYT~Uav2Zk6qg6L
z9{))eI;?p;04?LRtw}>vqXRYhpj0Sx%AHeJpeApWYxk5QsVk8G>DWx-QlWy&gtsnX
zF|8Z4?8y)EkrU6~Ys@p?$y9ZMPCZNcDPL|)9Wd%y-gSK-*Tbm==8hSWl8d@P7t*;i
z81QudjD4vWOokqncLc3SNjLPrE=lP%J)oSlvra-mN8D@W3wl7AR&G*hGmp3OSv?@9
zg9-CaT1pS-`p~N=fy&Yp{~w^fo3iUgJ)r~|)4ix?q!-FsDCbbx_C-CQRVg_i3YwGB
z>$*xuvXva*plx<X+5!$&x{B+9lpW=`%>~S3DY>Mt+SeJ9(j)8#JRO-c%y*p)TGiJr
zmVB33hs^o9#!tFi*qpCPz0Wu$%9JTFChaV>vf7g-e@eN@f6LEkUW2BUI0Z#cPhJ$O
zp5=XW3@fdjp1w-gS(MHtc{nU7>?|#p4VSD@AWI4xn-p1!tcM<h=6>j32A%iYrRR1m
zpv_>=Y%HLBFvw;va?a;=pB60A>_*Ia81{L}rpOkJ2$u3D`5PBp=DWQC8IS=PkOBSm
Zpx@9fMcR%eOgjJo002ovPDHLkV1ic0Tq6Jg

literal 0
HcmV?d00001

diff --git a/res/drawable-xxhdpi/quick_camera_rear.png b/res/drawable-xxhdpi/quick_camera_rear.png
new file mode 100755
index 0000000000000000000000000000000000000000..d9fd33dd377bd50d0e933fbcbddf2354dbcca513
GIT binary patch
literal 784
zcmeAS@N?(olHy`uVBq!ia0vp^IUvlz0wh)Q=eq$Zg=CK)Uj~LMH3o);76yi2K%s^g
z3=E|P3=FRl7#OT(FffQ0%-I!a1C(G&@^*J&_}|`tW<QX}S>O>_%)r1c48n{Iv*t(u
zRdjf|IEGZ*dV9w)Ti8+Lz{me>W?Wpix+_+6ERB1#a}itMtEG<majO?Bs$+I!S$K2(
z!nTI?drP<uD(nr}aB$kAqg9tKH1F(S=e)6M`Nt&{9-GhIGGD)WpZRiweDlxTvv1C1
z-`%MkF7r&xR7*y|QB9`y-p4s?^NZx(-}QR8@AosOqtkXj_xiW^OZwEi#^P3DcUIV}
zd1>-!;(H6>^Z#$SM!h(~qhE8WHgUC&=E1n)C_b~3)nAgDdiVS5RnGmzGb`|`=eOqG
z)rXEfO?WzI`zf)_GK<g1sqH+L<aZ-({u9BE_kZeMul)Qwc)DKy%1cjnytzKDC9-?Y
zuja4X(`G&jJ+q-yZ?ox!<>yuHj&K#<NhrR3&u)8i>()r=Tl<fkwn+SJJz=AE;@mSm
zPc0Jn%AU9}bpy-M2`#DmjeSQrPsbUBKW;gjmKM_~Y<BqM!oQd2^p<|g*i?V}o}t{a
z-C=7!OsQqA=DU=n^z7<i)-d*%3C|-Y-|Id7{<zkf3u*KCY=!!Qo@!nG^xd#h!l5^6
zV%~*Si3ZJ*XA;<qXB^~7BaWH0L4H;8Up@BMD-YS7I%u_OL!Zo=(_Kp0&U|burPk<K
zYj4Y3u|clF{^rZS9{*NEbNqAoCv2|te;s4Y$-AYq4+g~Fm7V^h-{|B|yME_8OOA0K
zW4ZtQV{7RxlOJ<FS8NO`e_?uZvbFCl9iNG6yupi49-fk+n4q=Az<@PMBcdS6A|hed
zd)@E%7tQPZZe8WU9sPO6=espWg3oZeamO#^a=EOr|7_vD85^c7RXTJjDXuHiP`%&e
zPD#Etf3)_$@YTO}y<M>OSz@TxYHhb5&VQU!HuCxU{<#WFpbQM2u6{1-oD!M<K?iBN

literal 0
HcmV?d00001

diff --git a/res/drawable-xxhdpi/quick_shutter_button.png b/res/drawable-xxhdpi/quick_shutter_button.png
new file mode 100755
index 0000000000000000000000000000000000000000..4394349386faaf072fe9cde21db581a4e8aed151
GIT binary patch
literal 2533
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

literal 0
HcmV?d00001

diff --git a/res/drawable/quick_camera_shutter_ring.xml b/res/drawable/quick_camera_shutter_ring.xml
new file mode 100644
index 0000000000..33690326ca
--- /dev/null
+++ b/res/drawable/quick_camera_shutter_ring.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true">
+        <shape
+            android:innerRadiusRatio="3"
+            android:shape="ring"
+            android:thickness="2dp"
+            android:useLevel="false" >
+            <solid android:color="@android:color/white" />
+            <size
+                android:height="52dp"
+                android:width="52dp" />
+        </shape>
+    </item>
+    <item>
+        <shape
+            android:innerRadiusRatio="3"
+            android:shape="ring"
+            android:thickness="2dp"
+            android:useLevel="false" >
+            <solid android:color="#40ffffff" />
+            <size
+                android:height="52dp"
+                android:width="52dp" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/res/layout-land/quick_camera_controls.xml b/res/layout-land/quick_camera_controls.xml
new file mode 100644
index 0000000000..558d6b77f9
--- /dev/null
+++ b/res/layout-land/quick_camera_controls.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="bottom"
+    tools:background="@android:color/darker_gray">
+    <ImageButton
+        android:id="@+id/shutter_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_centerVertical="true"
+        android:background="@drawable/quick_camera_shutter_ring"
+        android:src="@drawable/quick_shutter_button"
+        android:padding="20dp"/>
+    <ImageButton
+        android:id="@+id/fullscreen_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentRight="true"
+        android:background="#00000000"
+        android:src="@drawable/quick_camera_fullscreen"
+        android:padding="20dp"/>
+    <ImageButton
+        android:id="@+id/swap_camera_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentRight="true"
+        android:background="#00000000"
+        android:src="@drawable/quick_camera_front"
+        android:padding="20dp"
+        android:visibility="invisible"
+        tools:visibility="visible"/>
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/conversation_activity.xml b/res/layout/conversation_activity.xml
index a83d849113..c9421f4c62 100644
--- a/res/layout/conversation_activity.xml
+++ b/res/layout/conversation_activity.xml
@@ -10,6 +10,12 @@
         android:background="?conversation_background"
         android:orientation="vertical">
 
+<org.thoughtcrime.securesms.components.QuickAttachmentDrawer
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/quick_attachment_drawer"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
     <RelativeLayout android:layout_width="fill_parent"
                     android:layout_height="fill_parent"
                     android:layout_weight="1"
@@ -95,6 +101,14 @@
                         tools:hint="Send TextSecure message" />
                 </LinearLayout>
 
+                <ImageButton android:id="@+id/quick_attachment_toggle"
+                             android:layout_width="wrap_content"
+                             android:layout_height="44dp"
+                             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.AnimatingToggle
                     android:id="@+id/button_toggle"
                     android:layout_width="50dp"
@@ -141,4 +155,6 @@
 
         </LinearLayout>
     </RelativeLayout>
+
+</org.thoughtcrime.securesms.components.QuickAttachmentDrawer>
 </org.thoughtcrime.securesms.components.KeyboardAwareLinearLayout>
diff --git a/res/layout/quick_camera_controls.xml b/res/layout/quick_camera_controls.xml
new file mode 100644
index 0000000000..1e6a697589
--- /dev/null
+++ b/res/layout/quick_camera_controls.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="bottom"
+    tools:background="@android:color/darker_gray">
+    <ImageButton
+        android:id="@+id/shutter_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        android:background="@drawable/quick_camera_shutter_ring"
+        android:src="@drawable/quick_shutter_button"
+        android:padding="20dp"/>
+    <ImageButton
+        android:id="@+id/fullscreen_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentRight="true"
+        android:background="#00000000"
+        android:src="@drawable/quick_camera_fullscreen"
+        android:padding="20dp"/>
+    <ImageButton
+        android:id="@+id/swap_camera_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentLeft="true"
+        android:background="#00000000"
+        android:src="@drawable/quick_camera_front"
+        android:padding="20dp"
+        android:visibility="invisible"
+        tools:visibility="visible"/>
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 6d25609aa4..9b8142d0c1 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -52,6 +52,7 @@
     <attr name="emoji_category_places" format="reference"/>
     <attr name="emoji_category_symbol" format="reference"/>
     <attr name="emoji_category_emoticons" format="reference"/>
+    <attr name="quick_camera_icon" format="reference"/>
 
     <attr name="conversation_item_background" format="reference"/>
     <attr name="conversation_item_bubble_background" format="reference|color"/>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 56b0af4c42..2fdaa5cf2e 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -28,4 +28,5 @@
 
     <dimen name="color_grid_extra_padding">32dp</dimen>
     <dimen name="color_grid_item_size">48dp</dimen>
+    <dimen name="quick_media_drawer_default_height">250dp</dimen>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index a28a9126dc..0df6e3941e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -521,6 +521,7 @@
     <string name="conversation_activity__compose_description">Message composition</string>
     <string name="conversation_activity__emoji_toggle_description">Toggle emoji keyboard</string>
     <string name="conversation_activity__attachment_thumbnail">Attachment Thumbnail</string>
+    <string name="conversation_activity__quick_attachment_drawer_toggle_description">Toggle attachment drawer</string>
 
     <!-- conversation_item -->
     <string name="conversation_item__mms_downloading_description">Media message downloading</string>
@@ -981,6 +982,9 @@
     <!-- transport_selection_list_item -->
     <string name="transport_selection_list_item__transport_icon">Transport icon</string>
 
+    <!-- quick_attachment_drawer -->
+    <string name="quick_camera_unavailable">Camera unavailable</string>
+
     <!-- EOF -->
 
 </resources>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 22cd2496b2..a460231e13 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -40,6 +40,7 @@
         <item name="ic_arrow_forward">@drawable/ic_arrow_forward_dark</item>
         <item name="lockscreen_watermark">@drawable/lockscreen_watermark_dark</item>
         <item name="android:windowBackground">@color/black</item>
+        <item name="conversation_background">@color/black</item>
     </style>
 
     <style name="PopupAnimation" parent="@android:style/Animation">
@@ -124,6 +125,9 @@
         <item name="conversation_item_sent_text_indicator_tab_color">#99000000</item>
         <item name="conversation_item_received_text_primary_color">@color/white</item>
         <item name="conversation_item_received_text_secondary_color">#BFffffff</item>
+
+        <item name="quick_camera_icon">@drawable/quick_camera_light</item>
+
         <item name="conversation_item_background">@drawable/conversation_item_background</item>
         <item name="conversation_item_sent_indicator_text_background">@drawable/conversation_item_sent_indicator_text_shape</item>
 
@@ -250,6 +254,8 @@
         <item name="emoji_category_symbol">@drawable/emoji_category_symbol_dark</item>
         <item name="emoji_category_emoticons">@drawable/emoji_category_emoticons_dark</item>
 
+        <item name="quick_camera_icon">@drawable/quick_camera_dark</item>
+
         <item name="menu_new_conversation_icon">@drawable/ic_add_white_24dp</item>
         <item name="menu_group_icon">@drawable/ic_group_white_24dp</item>
         <item name="menu_search_icon">@drawable/ic_search_white_24dp</item>
diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java
index 121af277b4..663c9b2d2d 100644
--- a/src/org/thoughtcrime/securesms/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationActivity.java
@@ -34,6 +34,7 @@ import android.os.Build;
 import android.os.Bundle;
 import android.provider.ContactsContract;
 import android.support.annotation.NonNull;
+import android.support.v4.view.WindowCompat;
 import android.text.Editable;
 import android.text.InputType;
 import android.text.TextWatcher;
@@ -70,6 +71,9 @@ import org.thoughtcrime.securesms.components.emoji.EmojiPopup;
 import org.thoughtcrime.securesms.components.emoji.EmojiToggle;
 import org.thoughtcrime.securesms.contacts.ContactAccessor;
 import org.thoughtcrime.securesms.contacts.ContactAccessor.ContactData;
+import org.thoughtcrime.securesms.components.QuickAttachmentDrawer;
+import org.thoughtcrime.securesms.components.QuickCamera;
+import org.thoughtcrime.securesms.crypto.EncryptingPartOutputStream;
 import org.thoughtcrime.securesms.crypto.MasterCipher;
 import org.thoughtcrime.securesms.crypto.MasterSecret;
 import org.thoughtcrime.securesms.crypto.SecurityEvent;
@@ -114,6 +118,8 @@ import org.thoughtcrime.securesms.util.concurrent.SettableFuture;
 import org.whispersystems.libaxolotl.InvalidMessageException;
 import org.whispersystems.libaxolotl.util.guava.Optional;
 
+import java.io.File;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
@@ -172,6 +178,8 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   private BroadcastReceiver             groupUpdateReceiver;
   private Optional<EmojiPopup>          emojiPopup = Optional.absent();
   private EmojiToggle                   emojiToggle;
+  private ImageButton                   quickAttachmentToggle;
+  private QuickAttachmentDrawer         quickAttachmentDrawer;
 
   private Recipients recipients;
   private long       threadId;
@@ -193,6 +201,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   protected void onCreate(Bundle state, @NonNull MasterSecret masterSecret) {
     this.masterSecret = masterSecret;
 
+    supportRequestWindowFeature(WindowCompat.FEATURE_ACTION_BAR_OVERLAY);
     setContentView(R.layout.conversation_activity);
 
     fragment = initFragment(R.id.fragment_content, new ConversationFragment(),
@@ -229,6 +238,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     super.onResume();
     dynamicTheme.onResume(this);
     dynamicLanguage.onResume(this);
+    quickAttachmentDrawer.onResume();
 
     initializeSecurity();
     initializeEnabledCheck();
@@ -249,6 +259,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     super.onPause();
     MessageNotifier.setVisibleThread(-1L);
     if (isFinishing()) overridePendingTransition(R.anim.fade_scale_in, R.anim.slide_to_right);
+    quickAttachmentDrawer.onPause();
   }
 
   @Override
@@ -366,6 +377,8 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   public void onBackPressed() {
     if (isEmojiDrawerOpen()) {
       hideEmojiPopup(false);
+    } else if (quickAttachmentDrawer.getDrawerState() != QuickAttachmentDrawer.COLLAPSED) {
+      quickAttachmentDrawer.setDrawerStateAndAnimate(QuickAttachmentDrawer.COLLAPSED);
     } else {
       super.onBackPressed();
     }
@@ -694,6 +707,8 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
             addAttachmentAudio(Uri.parse(draft.getValue()));
           } else if (draft.getType().equals(Draft.VIDEO)) {
             addAttachmentVideo(Uri.parse(draft.getValue()));
+          } else if (draft.getType().equals(Draft.ENCRYPTED_IMAGE)) {
+            addAttachmentEncryptedImage(Uri.parse(draft.getValue()));
           }
         }
 
@@ -766,6 +781,18 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
 
     container.addOnKeyboardShownListener(this);
 
+    buttonToggle          = (AnimatingToggle)       findViewById(R.id.button_toggle);
+    sendButton            = (SendButton)            findViewById(R.id.send_button);
+    attachButton          = (ImageButton)           findViewById(R.id.attach_button);
+    composeText           = (ComposeText)           findViewById(R.id.embedded_text_editor);
+    charactersLeft        = (TextView)              findViewById(R.id.space_left);
+    emojiToggle           = (EmojiToggle)           findViewById(R.id.emoji_toggle);
+    titleView             = (ConversationTitleView) getSupportActionBar().getCustomView();
+    unblockButton         = (Button)                findViewById(R.id.unblock_button);
+    composePanel          = findViewById(R.id.bottom_panel);
+    quickAttachmentDrawer = (QuickAttachmentDrawer) findViewById(R.id.quick_attachment_drawer);
+    quickAttachmentToggle = (ImageButton)           findViewById(R.id.quick_attachment_toggle);
+
     int[]      attributes   = new int[]{R.attr.conversation_item_bubble_background};
     TypedArray colors       = obtainStyledAttributes(attributes);
     int        defaultColor = colors.getColor(0, Color.WHITE);
@@ -814,6 +841,15 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     composeText.setOnClickListener(composeKeyPressedListener);
     composeText.setOnFocusChangeListener(composeKeyPressedListener);
     emojiToggle.setOnClickListener(new EmojiToggleListener());
+
+    if (quickAttachmentDrawer.hasCamera()) {
+      QuickAttachmentDrawerToggleListener listener = new QuickAttachmentDrawerToggleListener();
+      quickAttachmentDrawer.setQuickAttachmentDrawerListener(listener);
+      quickAttachmentDrawer.setQuickCameraListener(listener);
+      quickAttachmentToggle.setOnClickListener(listener);
+    } else {
+      quickAttachmentToggle.setVisibility(View.GONE);
+    }
   }
 
   protected void initializeActionBar() {
@@ -934,6 +970,17 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     }
   }
 
+  private void addAttachmentEncryptedImage(Uri uri) {
+    try {
+      attachmentManager.setEncryptedImage(uri, masterSecret);
+    } catch (IOException | BitmapDecodingException e) {
+      Log.w(TAG, e);
+      attachmentManager.clear();
+      Toast.makeText(this, R.string.ConversationActivity_sorry_there_was_an_error_setting_your_attachment,
+          Toast.LENGTH_LONG).show();
+    }
+  }
+
   private void addAttachmentImage(Uri imageUri) {
     try {
       attachmentManager.setImage(imageUri);
@@ -1018,9 +1065,13 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     }
 
     for (Slide slide : attachmentManager.getSlideDeck().getSlides()) {
-      if      (slide.hasAudio()) drafts.add(new Draft(Draft.AUDIO, slide.getUri().toString()));
-      else if (slide.hasVideo()) drafts.add(new Draft(Draft.VIDEO, slide.getUri().toString()));
-      else if (slide.hasImage()) drafts.add(new Draft(Draft.IMAGE, slide.getUri().toString()));
+      String draftType = null;
+      if      (slide.hasAudio()) draftType = Draft.AUDIO;
+      else if (slide.hasVideo()) draftType = Draft.VIDEO;
+      else if (slide.hasImage()) draftType = slide.isEncrypted() ? Draft.ENCRYPTED_IMAGE : Draft.IMAGE;
+
+      if (draftType != null)
+        drafts.add(new Draft(draftType, slide.getUri().toString()));
     }
 
     return drafts;
@@ -1296,10 +1347,71 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
           }
         });
         input.hideSoftInputFromWindow(composeText.getWindowToken(), 0);
+        quickAttachmentDrawer.setDrawerStateAndAnimate(QuickAttachmentDrawer.COLLAPSED);
       }
     }
   }
 
+  private class QuickAttachmentDrawerToggleListener implements OnClickListener,
+          QuickAttachmentDrawer.QuickAttachmentDrawerListener,
+          QuickCamera.QuickCameraListener {
+    @QuickAttachmentDrawer.DrawerState int nextDrawerState = QuickAttachmentDrawer.HALF_EXPANDED;
+
+    @Override
+    public void onClick(View v) {
+      InputMethodManager input = (InputMethodManager)getSystemService(Context.INPUT_METHOD_SERVICE);
+      input.hideSoftInputFromWindow(composeText.getWindowToken(), 0);
+      composeText.clearFocus();
+      hideEmojiPopup(false);
+      quickAttachmentDrawer.setDrawerStateAndAnimate(nextDrawerState);
+    }
+
+    @Override
+    public void onCollapsed() {
+      getSupportActionBar().show();
+      nextDrawerState = QuickAttachmentDrawer.HALF_EXPANDED;
+    }
+
+    @Override
+    public void onExpanded() {
+      getSupportActionBar().hide();
+      nextDrawerState = QuickAttachmentDrawer.COLLAPSED;
+    }
+
+    @Override
+    public void onHalfExpanded() {
+      getSupportActionBar().hide();
+      nextDrawerState = QuickAttachmentDrawer.COLLAPSED;
+    }
+
+    @Override
+    public void onImageCapture(final byte[] data) {
+      quickAttachmentDrawer.setDrawerStateAndAnimate(QuickAttachmentDrawer.COLLAPSED);
+        new AsyncTask<Void, Void, Uri>() {
+          @Override
+          protected Uri doInBackground(Void... voids) {
+            try {
+              File tempDirectory = getDir("media", Context.MODE_PRIVATE);
+              File tempFile = File.createTempFile("image", ".jpg", tempDirectory);
+              FileOutputStream fileOutputStream = new EncryptingPartOutputStream(tempFile, masterSecret);
+              fileOutputStream.write(data);
+              fileOutputStream.close();
+              return Uri.fromFile(tempFile);
+            } catch (IOException e) {
+              e.printStackTrace();
+            }
+            return null;
+          }
+
+          @Override
+          protected void onPostExecute(Uri uri) {
+            if (uri != null)
+              addAttachmentEncryptedImage(uri);
+          }
+        }.execute();
+    }
+  }
+
   private class SendButtonListener implements OnClickListener, TextView.OnEditorActionListener {
     @Override
     public void onClick(View v) {
@@ -1370,8 +1482,10 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
 
     @Override
     public void onFocusChange(View v, boolean hasFocus) {
-      if (hasFocus) {
+      if (hasFocus && isEmojiDrawerOpen()) {
         hideEmojiPopup(true);
+      } else if (hasFocus && quickAttachmentDrawer.getDrawerState() != QuickAttachmentDrawer.COLLAPSED) {
+        quickAttachmentDrawer.setDrawerStateAndAnimate(QuickAttachmentDrawer.COLLAPSED);
       }
     }
   }
diff --git a/src/org/thoughtcrime/securesms/components/CameraView.java b/src/org/thoughtcrime/securesms/components/CameraView.java
new file mode 100644
index 0000000000..766e97f462
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/components/CameraView.java
@@ -0,0 +1,515 @@
+/***
+ Copyright (c) 2013-2014 CommonsWare, LLC
+ Portions Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License"); you may
+ not use this file except in compliance with the License. You may obtain
+ a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+package org.thoughtcrime.securesms.components;
+
+import android.annotation.TargetApi;
+import android.app.Activity;
+import android.content.Context;
+import android.content.pm.ActivityInfo;
+import android.hardware.Camera;
+import android.hardware.Camera.AutoFocusCallback;
+import android.hardware.Camera.PreviewCallback;
+import android.os.Build;
+import android.util.AttributeSet;
+import android.util.DisplayMetrics;
+import android.util.Log;
+import android.view.OrientationEventListener;
+import android.view.Surface;
+import android.view.View;
+import android.view.ViewGroup;
+import java.io.IOException;
+
+import com.commonsware.cwac.camera.CameraHost;
+import com.commonsware.cwac.camera.CameraHost.FailureReason;
+import com.commonsware.cwac.camera.CameraHostProvider;
+import com.commonsware.cwac.camera.PreviewStrategy;
+
+public class CameraView extends ViewGroup implements AutoFocusCallback {
+  static final String TAG = "CWAC-Camera";
+  private PreviewStrategy previewStrategy;
+  private Camera.Size     previewSize;
+  private Camera              camera                 = null;
+  private boolean             inPreview              = false;
+  private CameraHost          host                   = null;
+  private OnOrientationChange onOrientationChange    = null;
+  private int                 displayOrientation     = -1;
+  private int                 outputOrientation      = -1;
+  private int                 cameraId               = -1;
+  private boolean             isAutoFocusing         = false;
+  private int                 lastPictureOrientation = -1;
+
+  public CameraView(Context context) {
+    super(context);
+
+    onOrientationChange = new OnOrientationChange(context.getApplicationContext());
+  }
+
+  public CameraView(Context context, AttributeSet attrs) {
+    this(context, attrs, 0);
+  }
+
+  public CameraView(Context context, AttributeSet attrs, int defStyle) {
+    super(context, attrs, defStyle);
+
+    onOrientationChange = new OnOrientationChange(context.getApplicationContext());
+
+    if (context instanceof CameraHostProvider) {
+      setHost(((CameraHostProvider)context).getCameraHost());
+    } else {
+      throw new IllegalArgumentException("To use the two- or "
+          + "three-parameter constructors on CameraView, "
+          + "your activity needs to implement the "
+          + "CameraHostProvider interface");
+    }
+  }
+
+  public CameraHost getHost() {
+    return (host);
+  }
+
+  // must call this after constructor, before onResume()
+
+  public void setHost(CameraHost host) {
+    this.host = host;
+
+    if (host.getDeviceProfile().useTextureView()) {
+      previewStrategy = new TexturePreviewStrategy(this);
+    } else {
+      previewStrategy = new SurfacePreviewStrategy(this);
+    }
+  }
+
+  @TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH)
+  public void onResume() {
+    addView(previewStrategy.getWidget());
+
+    if (camera == null) {
+      try {
+        cameraId = getHost().getCameraId();
+
+        if (cameraId >= 0) {
+          camera = Camera.open(cameraId);
+
+          if (getActivity().getRequestedOrientation() != ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED) {
+            onOrientationChange.enable();
+          }
+
+          setCameraDisplayOrientation();
+        }
+        else {
+          getHost().onCameraFail(FailureReason.NO_CAMERAS_REPORTED);
+        }
+      }
+      catch (Exception e) {
+        getHost().onCameraFail(FailureReason.UNKNOWN);
+      }
+    }
+  }
+
+  public void onPause() {
+    if (camera != null) {
+      previewDestroyed();
+    }
+
+    removeView(previewStrategy.getWidget());
+    onOrientationChange.disable();
+    lastPictureOrientation=-1;
+  }
+
+  // based on CameraPreview.java from ApiDemos
+
+  @Override
+  protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+    final int width=
+        resolveSize(getSuggestedMinimumWidth(), widthMeasureSpec);
+    final int height=
+        resolveSize(getSuggestedMinimumHeight(), heightMeasureSpec);
+    setMeasuredDimension(width, height);
+
+    if (width > 0 && height > 0) {
+      if (camera != null) {
+        Camera.Size newSize=null;
+
+        try {
+          if (getHost().getRecordingHint() != CameraHost.RecordingHint.STILL_ONLY) {
+
+            newSize=
+                getHost().getPreferredPreviewSizeForVideo(getDisplayOrientation(),
+                    width,
+                    height,
+                    camera.getParameters(),
+                    null);
+
+          }
+
+          if (newSize == null || newSize.width * newSize.height < 65536) {
+            newSize=
+                getHost().getPreviewSize(getDisplayOrientation(),
+                    width, height,
+                    camera.getParameters());
+          }
+        }
+        catch (Exception e) {
+          android.util.Log.e(getClass().getSimpleName(),
+              "Could not work with camera parameters?",
+              e);
+          // TODO get this out to library clients
+        }
+
+        if (newSize != null) {
+          if (previewSize == null) {
+            previewSize=newSize;
+          }
+          else if (previewSize.width != newSize.width
+              || previewSize.height != newSize.height) {
+            if (inPreview) {
+              stopPreview();
+            }
+
+            previewSize=newSize;
+            initPreview(width, height, false);
+          }
+        }
+      }
+    }
+  }
+
+  // based on CameraPreview.java from ApiDemos
+
+  @Override
+  protected void onLayout(boolean changed, int l, int t, int r, int b) {
+    if (changed && getChildCount() > 0) {
+      final View child=getChildAt(0);
+      final int width=r - l;
+      final int height=b - t;
+      int previewWidth=width;
+      int previewHeight=height;
+
+      // handle orientation
+
+      if (previewSize != null) {
+        if (getDisplayOrientation() == 90
+            || getDisplayOrientation() == 270) {
+          previewWidth=previewSize.height;
+          previewHeight=previewSize.width;
+        }
+        else {
+          previewWidth=previewSize.width;
+          previewHeight=previewSize.height;
+        }
+      }
+
+      boolean useFirstStrategy=
+          (width * previewHeight > height * previewWidth);
+      boolean useFullBleed=getHost().useFullBleedPreview();
+
+      if ((useFirstStrategy && !useFullBleed)
+          || (!useFirstStrategy && useFullBleed)) {
+        final int scaledChildWidth=
+            previewWidth * height / previewHeight;
+        child.layout((width - scaledChildWidth) / 2, 0,
+            (width + scaledChildWidth) / 2, height);
+      }
+      else {
+        final int scaledChildHeight=
+            previewHeight * width / previewWidth;
+        child.layout(0, (height - scaledChildHeight) / 2, width,
+            (height + scaledChildHeight) / 2);
+      }
+    }
+  }
+
+  public int getDisplayOrientation() {
+    return(displayOrientation);
+  }
+
+  public void lockToLandscape(boolean enable) {
+    if (enable) {
+      getActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE);
+      onOrientationChange.enable();
+    }
+    else {
+      getActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
+      onOrientationChange.disable();
+    }
+  }
+
+  public void restartPreview() {
+    if (!inPreview) {
+      startPreview();
+    }
+  }
+
+  public void autoFocus() {
+    if (inPreview) {
+      camera.autoFocus(this);
+      isAutoFocusing=true;
+    }
+  }
+
+  public void cancelAutoFocus() {
+    camera.cancelAutoFocus();
+  }
+
+  public boolean isAutoFocusAvailable() {
+    return(inPreview);
+  }
+
+  @Override
+  public void onAutoFocus(boolean success, Camera camera) {
+    isAutoFocusing=false;
+
+    if (getHost() instanceof AutoFocusCallback) {
+      getHost().onAutoFocus(success, camera);
+    }
+  }
+
+  public String getFlashMode() {
+    return(camera.getParameters().getFlashMode());
+  }
+
+  public void setFlashMode(String mode) {
+    if (camera != null) {
+      Camera.Parameters params=camera.getParameters();
+
+      params.setFlashMode(mode);
+      camera.setParameters(params);
+    }
+  }
+
+  public void setOneShotPreviewCallback(PreviewCallback callback) {
+    if (camera != null)
+      camera.setOneShotPreviewCallback(callback);
+  }
+
+  public Camera.Parameters getCameraParameters() {
+    return camera.getParameters();
+  }
+
+  void previewCreated() {
+    if (camera != null) {
+      try {
+        previewStrategy.attach(camera);
+      }
+      catch (IOException e) {
+        getHost().handleException(e);
+      }
+    }
+  }
+
+  void previewDestroyed() {
+    if (camera != null) {
+      previewStopped();
+      camera.release();
+      camera=null;
+    }
+  }
+
+  void previewReset(int width, int height) {
+    previewStopped();
+    initPreview(width, height);
+  }
+
+  private void previewStopped() {
+    if (inPreview) {
+      stopPreview();
+    }
+  }
+
+  public void initPreview(int w, int h) {
+    initPreview(w, h, true);
+  }
+
+  @TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH)
+  public void initPreview(int w, int h, boolean firstRun) {
+    if (camera != null) {
+      Camera.Parameters parameters=camera.getParameters();
+
+      parameters.setPreviewSize(previewSize.width, previewSize.height);
+
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
+        parameters.setRecordingHint(getHost().getRecordingHint() != CameraHost.RecordingHint.STILL_ONLY);
+      }
+
+      requestLayout();
+
+      camera.setParameters(getHost().adjustPreviewParameters(parameters));
+      startPreview();
+    }
+  }
+
+  private void startPreview() {
+    camera.startPreview();
+    inPreview=true;
+    getHost().autoFocusAvailable();
+  }
+
+  private void stopPreview() {
+    inPreview=false;
+    getHost().autoFocusUnavailable();
+    camera.stopPreview();
+  }
+
+  // based on
+  // http://developer.android.com/reference/android/hardware/Camera.html#setDisplayOrientation(int)
+  // and http://stackoverflow.com/a/10383164/115145
+
+  private void setCameraDisplayOrientation() {
+    Camera.CameraInfo info=new Camera.CameraInfo();
+    int rotation=
+        getActivity().getWindowManager().getDefaultDisplay()
+            .getRotation();
+    int degrees=0;
+    DisplayMetrics dm=new DisplayMetrics();
+
+    Camera.getCameraInfo(cameraId, info);
+    getActivity().getWindowManager().getDefaultDisplay().getMetrics(dm);
+
+    switch (rotation) {
+      case Surface.ROTATION_0:
+        degrees=0;
+        break;
+      case Surface.ROTATION_90:
+        degrees=90;
+        break;
+      case Surface.ROTATION_180:
+        degrees=180;
+        break;
+      case Surface.ROTATION_270:
+        degrees=270;
+        break;
+    }
+
+    if (info.facing == Camera.CameraInfo.CAMERA_FACING_FRONT) {
+      displayOrientation=(info.orientation + degrees) % 360;
+      displayOrientation=(360 - displayOrientation) % 360;
+    }
+    else {
+      displayOrientation=(info.orientation - degrees + 360) % 360;
+    }
+
+    boolean wasInPreview=inPreview;
+
+    if (inPreview) {
+      stopPreview();
+    }
+
+    camera.setDisplayOrientation(displayOrientation);
+
+    if (wasInPreview) {
+      startPreview();
+    }
+  }
+
+  public int getCameraPictureOrientation() {
+    Camera.CameraInfo info=new Camera.CameraInfo();
+
+    Camera.getCameraInfo(cameraId, info);
+
+    if (getActivity().getRequestedOrientation() != ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED) {
+      outputOrientation=
+          getCameraPictureRotation(getActivity().getWindowManager()
+              .getDefaultDisplay()
+              .getOrientation());
+    }
+    else if (info.facing == Camera.CameraInfo.CAMERA_FACING_FRONT) {
+      outputOrientation=(360 - displayOrientation) % 360;
+    }
+    else {
+      outputOrientation=displayOrientation;
+    }
+
+    if (lastPictureOrientation != outputOrientation) {
+      lastPictureOrientation=outputOrientation;
+    }
+    return outputOrientation;
+  }
+
+  // based on:
+  // http://developer.android.com/reference/android/hardware/Camera.Parameters.html#setRotation(int)
+
+  public int getCameraPictureRotation(int orientation) {
+    Camera.CameraInfo info=new Camera.CameraInfo();
+    Camera.getCameraInfo(cameraId, info);
+    int rotation=0;
+
+    orientation=(orientation + 45) / 90 * 90;
+
+    if (info.facing == Camera.CameraInfo.CAMERA_FACING_FRONT) {
+      rotation=(info.orientation - orientation + 360) % 360;
+    }
+    else { // back-facing camera
+      rotation=(info.orientation + orientation) % 360;
+    }
+
+    return(rotation);
+  }
+
+  Activity getActivity() {
+    return((Activity)getContext());
+  }
+
+  private class OnOrientationChange extends OrientationEventListener {
+    private boolean isEnabled=false;
+
+    public OnOrientationChange(Context context) {
+      super(context);
+      disable();
+    }
+
+    @Override
+    public void onOrientationChanged(int orientation) {
+      if (camera != null && orientation != ORIENTATION_UNKNOWN) {
+        int newOutputOrientation=getCameraPictureRotation(orientation);
+
+        if (newOutputOrientation != outputOrientation) {
+          outputOrientation=newOutputOrientation;
+
+          Camera.Parameters params=camera.getParameters();
+
+          params.setRotation(outputOrientation);
+
+          try {
+            camera.setParameters(params);
+            lastPictureOrientation=outputOrientation;
+          }
+          catch (Exception e) {
+            Log.e(getClass().getSimpleName(),
+                "Exception updating camera parameters in orientation change",
+                e);
+            // TODO: get this info out to hosting app
+          }
+        }
+      }
+    }
+
+    @Override
+    public void enable() {
+      isEnabled=true;
+      super.enable();
+    }
+
+    @Override
+    public void disable() {
+      isEnabled=false;
+      super.disable();
+    }
+
+    boolean isEnabled() {
+      return(isEnabled);
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/components/QuickAttachmentDrawer.java b/src/org/thoughtcrime/securesms/components/QuickAttachmentDrawer.java
new file mode 100644
index 0000000000..2ab5d641f3
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/components/QuickAttachmentDrawer.java
@@ -0,0 +1,503 @@
+package org.thoughtcrime.securesms.components;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.graphics.Canvas;
+import android.graphics.Rect;
+import android.hardware.Camera;
+import android.os.Build;
+import android.support.annotation.IntDef;
+import android.support.annotation.NonNull;
+import android.support.v4.view.MotionEventCompat;
+import android.support.v4.view.ViewCompat;
+import android.support.v4.widget.ViewDragHelper;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.view.Surface;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+import android.widget.ImageButton;
+
+import com.commonsware.cwac.camera.SimpleCameraHost;
+
+import org.thoughtcrime.securesms.R;
+
+public class QuickAttachmentDrawer extends ViewGroup {
+  @IntDef({COLLAPSED, HALF_EXPANDED, FULL_EXPANDED})
+  public @interface DrawerState {}
+
+  public static final int COLLAPSED = 0;
+  public static final int HALF_EXPANDED = 1;
+  public static final int FULL_EXPANDED = 2;
+
+  private static final float FULL_EXPANDED_ANCHOR_POINT = 1.f;
+  private static final float COLLAPSED_ANCHOR_POINT = 0.f;
+
+  private final ViewDragHelper dragHelper;
+  private final QuickCamera quickCamera;
+  private final View controls;
+  private View coverView;
+  private ImageButton fullScreenButton;
+  private @DrawerState int drawerState;
+  private float slideOffset, initialMotionX, initialMotionY, halfExpandedAnchorPoint;
+  private boolean initialSetup, hasCamera, startCamera, stopCamera, landscape, belowICS;
+  private int slideRange, baseHalfHeight;
+  private Rect drawChildrenRect = new Rect();
+  private QuickAttachmentDrawerListener listener;
+
+  public QuickAttachmentDrawer(Context context) {
+    this(context, null);
+  }
+
+  public QuickAttachmentDrawer(Context context, AttributeSet attrs) {
+    this(context, attrs, 0);
+  }
+
+  public QuickAttachmentDrawer(Context context, AttributeSet attrs, int defStyle) {
+    super(context, attrs, defStyle);
+    initialSetup = true;
+    startCamera = false;
+    stopCamera = false;
+    drawerState = COLLAPSED;
+    baseHalfHeight = getResources().getDimensionPixelSize(R.dimen.quick_media_drawer_default_height);
+    halfExpandedAnchorPoint = COLLAPSED_ANCHOR_POINT;
+    int rotation = ((WindowManager) getContext().getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay().getRotation();
+    landscape = rotation == Surface.ROTATION_90 || rotation == Surface.ROTATION_270;
+    belowICS = android.os.Build.VERSION.SDK_INT < Build.VERSION_CODES.ICE_CREAM_SANDWICH;
+    hasCamera = context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_CAMERA) && Camera.getNumberOfCameras() > 0;
+    if (hasCamera) {
+      setBackgroundResource(android.R.color.black);
+      dragHelper = ViewDragHelper.create(this, 1.f, new ViewDragHelperCallback());
+      quickCamera = new QuickCamera(context);
+      controls = inflate(getContext(), R.layout.quick_camera_controls, null);
+      initializeControlsView();
+      addView(quickCamera);
+      addView(controls);
+    } else {
+      dragHelper = null;
+      quickCamera = null;
+      controls = null;
+    }
+  }
+
+  public boolean hasCamera() {
+    return hasCamera;
+  }
+
+  private void initializeHalfExpandedAnchorPoint() {
+    if (initialSetup) {
+      if (getChildCount() == 3)
+        coverView = getChildAt(2);
+      else
+        coverView = getChildAt(0);
+      slideRange = getMeasuredHeight();
+      int anchorHeight = slideRange - baseHalfHeight;
+      halfExpandedAnchorPoint = computeSlideOffsetFromCoverBottom(anchorHeight);
+      initialSetup = false;
+    }
+  }
+
+  private void initializeControlsView() {
+    controls.findViewById(R.id.shutter_button).setOnClickListener(new OnClickListener() {
+      @Override
+      public void onClick(View v) {
+        boolean crop = drawerState != FULL_EXPANDED;
+        int imageHeight = crop ? baseHalfHeight : quickCamera.getMeasuredHeight();
+        Rect previewRect = new Rect(0, 0, quickCamera.getMeasuredWidth(), imageHeight);
+        quickCamera.takePicture(crop, previewRect);
+      }
+    });
+
+    final ImageButton swapCameraButton = (ImageButton) controls.findViewById(R.id.swap_camera_button);
+    if (quickCamera.isMultipleCameras()) {
+      swapCameraButton.setVisibility(View.VISIBLE);
+      swapCameraButton.setOnClickListener(new OnClickListener() {
+        @Override
+        public void onClick(View v) {
+          quickCamera.swapCamera();
+          swapCameraButton.setImageResource(quickCamera.isRearCamera() ? R.drawable.quick_camera_front : R.drawable.quick_camera_rear);
+        }
+      });
+    }
+
+    fullScreenButton = (ImageButton) controls.findViewById(R.id.fullscreen_button);
+    fullScreenButton.setOnClickListener(new OnClickListener() {
+      @Override
+      public void onClick(View v) {
+        if (drawerState == HALF_EXPANDED || drawerState == COLLAPSED)
+          setDrawerStateAndAnimate(FULL_EXPANDED);
+        else if (landscape || belowICS)
+          setDrawerStateAndAnimate(COLLAPSED);
+        else
+          setDrawerStateAndAnimate(HALF_EXPANDED);
+      }
+    });
+  }
+
+  @Override
+  protected void onLayout(boolean changed, int l, int t, int r, int b) {
+    final int paddingLeft = getPaddingLeft();
+    final int paddingTop = getPaddingTop();
+
+    final int childCount = getChildCount();
+
+    for (int i = 0; i < childCount; i++) {
+      final View child = getChildAt(i);
+
+      final int childHeight = child.getMeasuredHeight();
+      int childTop = paddingTop;
+      int childBottom;
+      int childLeft = paddingLeft;
+
+      if (child == quickCamera) {
+        childTop = computeCameraTopPosition(slideOffset);
+        childBottom = childTop + childHeight;
+        if (quickCamera.getMeasuredWidth() < getMeasuredWidth())
+          childLeft = (getMeasuredWidth() - quickCamera.getMeasuredWidth()) / 2 + paddingLeft;
+      } else if (child == controls) {
+        childBottom = getMeasuredHeight();
+      } else {
+        childBottom = computeCoverBottomPosition(slideOffset);
+        childTop = childBottom - childHeight;
+      }
+      final int childRight = childLeft + child.getMeasuredWidth();
+
+      if (childHeight > 0)
+        child.layout(childLeft, childTop, childRight, childBottom);
+    }
+  }
+
+  @Override
+  protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+    final int widthMode = MeasureSpec.getMode(widthMeasureSpec);
+    final int widthSize = MeasureSpec.getSize(widthMeasureSpec);
+    final int heightMode = MeasureSpec.getMode(heightMeasureSpec);
+    final int heightSize = MeasureSpec.getSize(heightMeasureSpec);
+
+    if (widthMode != MeasureSpec.EXACTLY) {
+      throw new IllegalStateException("Width must have an exact value or MATCH_PARENT");
+    } else if (heightMode != MeasureSpec.EXACTLY) {
+      throw new IllegalStateException("Height must have an exact value or MATCH_PARENT");
+    }
+
+    final int childCount = getChildCount();
+    if ((hasCamera && childCount != 3) || (!hasCamera && childCount != 1))
+      throw new IllegalStateException("QuickAttachmentDrawer layouts may only have 1 child.");
+
+    int layoutHeight = heightSize - getPaddingTop() - getPaddingBottom();
+
+    for (int i = 0; i < childCount; i++) {
+      final View child = getChildAt(i);
+      final LayoutParams lp = child.getLayoutParams();
+
+      if (child.getVisibility() == GONE && i == 0) {
+        continue;
+      }
+
+      int childWidthSpec;
+      switch (lp.width) {
+        case LayoutParams.WRAP_CONTENT:
+          childWidthSpec = MeasureSpec.makeMeasureSpec(widthSize, MeasureSpec.AT_MOST);
+          break;
+        case LayoutParams.MATCH_PARENT:
+          childWidthSpec = MeasureSpec.makeMeasureSpec(widthSize, MeasureSpec.EXACTLY);
+          break;
+        default:
+          childWidthSpec = MeasureSpec.makeMeasureSpec(lp.width, MeasureSpec.EXACTLY);
+          break;
+      }
+
+      int childHeightSpec;
+      switch (lp.height) {
+        case LayoutParams.WRAP_CONTENT:
+          childHeightSpec = MeasureSpec.makeMeasureSpec(layoutHeight, MeasureSpec.AT_MOST);
+          break;
+        case LayoutParams.MATCH_PARENT:
+          childHeightSpec = MeasureSpec.makeMeasureSpec(layoutHeight, MeasureSpec.EXACTLY);
+          break;
+        default:
+          childHeightSpec = MeasureSpec.makeMeasureSpec(lp.height, MeasureSpec.EXACTLY);
+          break;
+      }
+
+      child.measure(childWidthSpec, childHeightSpec);
+    }
+
+    setMeasuredDimension(widthSize, heightSize);
+    initializeHalfExpandedAnchorPoint();
+  }
+
+  @Override
+  protected void onSizeChanged(int w, int h, int oldw, int oldh) {
+    super.onSizeChanged(w, h, oldw, oldh);
+    if (h != oldh)
+      initialSetup = true;
+  }
+
+  @Override
+  protected boolean drawChild(@NonNull Canvas canvas, @NonNull View child, long drawingTime) {
+    boolean result;
+    final int save = canvas.save(Canvas.CLIP_SAVE_FLAG);
+
+    canvas.getClipBounds(drawChildrenRect);
+    if (child == coverView)
+      drawChildrenRect.bottom = Math.min(drawChildrenRect.bottom, child.getBottom());
+    else if (coverView != null)
+      drawChildrenRect.top = Math.max(drawChildrenRect.top, coverView.getBottom());
+    canvas.clipRect(drawChildrenRect);
+    result = super.drawChild(canvas, child, drawingTime);
+    canvas.restoreToCount(save);
+    return result;
+  }
+
+  @Override
+  public void computeScroll() {
+    if (dragHelper != null && dragHelper.continueSettling(true)) {
+      ViewCompat.postInvalidateOnAnimation(this);
+    } else if (stopCamera) {
+      stopCamera = false;
+      quickCamera.onPause();
+    } else if (startCamera) {
+      startCamera = false;
+      quickCamera.onResume();
+    }
+  }
+
+  private void setDrawerState(@DrawerState int drawerState) {
+    if (hasCamera) {
+      switch (drawerState) {
+        case COLLAPSED:
+          quickCamera.previewCreated();
+          if (quickCamera.isStarted())
+            stopCamera = true;
+          slideOffset = COLLAPSED_ANCHOR_POINT;
+          startCamera = false;
+          fullScreenButton.setImageResource(R.drawable.quick_camera_fullscreen);
+          if (listener != null) listener.onCollapsed();
+          break;
+        case HALF_EXPANDED:
+          if (landscape || belowICS) {
+            setDrawerState(FULL_EXPANDED);
+            return;
+          }
+          if (!quickCamera.isStarted())
+            startCamera = true;
+          slideOffset = halfExpandedAnchorPoint;
+          stopCamera = false;
+          fullScreenButton.setImageResource(R.drawable.quick_camera_fullscreen);
+          if (listener != null) listener.onHalfExpanded();
+          break;
+        case FULL_EXPANDED:
+          if (!quickCamera.isStarted())
+            startCamera = true;
+          slideOffset = FULL_EXPANDED_ANCHOR_POINT;
+          stopCamera = false;
+          fullScreenButton.setImageResource(landscape || belowICS ? R.drawable.quick_camera_hide : R.drawable.quick_camera_exit_fullscreen);
+          if (listener != null) listener.onExpanded();
+          break;
+      }
+      this.drawerState = drawerState;
+    }
+  }
+
+  public
+  @DrawerState
+  int getDrawerState() {
+    return drawerState;
+  }
+
+  public void setDrawerStateAndAnimate(@DrawerState int drawerState) {
+    setDrawerState(drawerState);
+    slideTo(slideOffset);
+  }
+
+  public void setQuickAttachmentDrawerListener(QuickAttachmentDrawerListener listener) {
+    this.listener = listener;
+  }
+
+  public void setQuickCameraListener(QuickCamera.QuickCameraListener listener) {
+    if (quickCamera != null) quickCamera.setQuickCameraListener(listener);
+  }
+
+  public interface QuickAttachmentDrawerListener {
+    void onCollapsed();
+    void onExpanded();
+    void onHalfExpanded();
+  }
+
+  private class ViewDragHelperCallback extends ViewDragHelper.Callback {
+
+    @Override
+    public boolean tryCaptureView(View child, int pointerId) {
+      return child == controls && !belowICS;
+    }
+
+    @Override
+    public void onViewDragStateChanged(int state) {
+      if (dragHelper.getViewDragState() == ViewDragHelper.STATE_IDLE) {
+        setDrawerState(drawerState);
+        requestLayout();
+      }
+    }
+
+    @Override
+    public void onViewCaptured(View capturedChild, int activePointerId) {
+    }
+
+    @Override
+    public void onViewPositionChanged(View changedView, int left, int top, int dx, int dy) {
+      int newTop = coverView.getTop() + dy;
+      final int expandedTop = computeCoverBottomPosition(FULL_EXPANDED_ANCHOR_POINT) - coverView.getHeight();
+      final int collapsedTop = computeCoverBottomPosition(COLLAPSED_ANCHOR_POINT) - coverView.getHeight();
+      newTop = Math.min(Math.max(newTop, expandedTop), collapsedTop);
+      slideOffset = computeSlideOffsetFromCoverBottom(newTop + coverView.getHeight());
+      requestLayout();
+    }
+
+    @Override
+    public void onViewReleased(View releasedChild, float xvel, float yvel) {
+      if (releasedChild == controls) {
+        float direction = -yvel;
+        int drawerState = COLLAPSED;
+
+        if (direction > 1) {
+          drawerState = FULL_EXPANDED;
+        } else if (direction < -1) {
+          boolean halfExpand = (slideOffset > halfExpandedAnchorPoint && !landscape);
+          drawerState = halfExpand ? HALF_EXPANDED : COLLAPSED;
+        } else if (!landscape) {
+          if (halfExpandedAnchorPoint != 1 && slideOffset >= (1.f + halfExpandedAnchorPoint) / 2) {
+            drawerState = FULL_EXPANDED;
+          } else if (halfExpandedAnchorPoint == 1 && slideOffset >= 0.5f) {
+            drawerState = FULL_EXPANDED;
+          } else if (halfExpandedAnchorPoint != 1 && slideOffset >= halfExpandedAnchorPoint) {
+            drawerState = HALF_EXPANDED;
+          } else if (halfExpandedAnchorPoint != 1 && slideOffset >= halfExpandedAnchorPoint / 2) {
+            drawerState = HALF_EXPANDED;
+          }
+        }
+
+        setDrawerState(drawerState);
+        dragHelper.captureChildView(coverView, 0);
+        dragHelper.settleCapturedViewAt(coverView.getLeft(), computeCoverBottomPosition(slideOffset) - coverView.getHeight());
+        dragHelper.captureChildView(quickCamera, 0);
+        dragHelper.settleCapturedViewAt(quickCamera.getLeft(), computeCameraTopPosition(slideOffset));
+        ViewCompat.postInvalidateOnAnimation(QuickAttachmentDrawer.this);
+      }
+    }
+
+    @Override
+    public int getViewVerticalDragRange(View child) {
+      return slideRange;
+    }
+
+    @Override
+    public int clampViewPositionVertical(View child, int top, int dy) {
+      return top;
+    }
+  }
+
+  @Override
+  public boolean onInterceptTouchEvent(MotionEvent event) {
+    if (dragHelper != null) {
+      final int action = MotionEventCompat.getActionMasked(event);
+
+      if (action == MotionEvent.ACTION_CANCEL || action == MotionEvent.ACTION_UP) {
+        dragHelper.cancel();
+        return false;
+      }
+
+      final float x = event.getX();
+      final float y = event.getY();
+
+      switch (action) {
+        case MotionEvent.ACTION_DOWN: {
+          initialMotionX = x;
+          initialMotionY = y;
+          break;
+        }
+
+        case MotionEvent.ACTION_MOVE: {
+          final float adx = Math.abs(x - initialMotionX);
+          final float ady = Math.abs(y - initialMotionY);
+          final int dragSlop = dragHelper.getTouchSlop();
+
+          if (adx > dragSlop && ady < dragSlop) {
+            return super.onInterceptTouchEvent(event);
+          }
+
+          if ((ady > dragSlop && adx > ady) || !isDragViewUnder((int) initialMotionX, (int) initialMotionY)) {
+            dragHelper.cancel();
+            return false;
+          }
+          break;
+        }
+      }
+      return dragHelper.shouldInterceptTouchEvent(event);
+    }
+    return super.onInterceptTouchEvent(event);
+  }
+
+
+  @Override
+  public boolean onTouchEvent(@NonNull MotionEvent event) {
+    if (dragHelper != null) {
+      dragHelper.processTouchEvent(event);
+      return true;
+    }
+    return super.onTouchEvent(event);
+  }
+
+  private boolean isDragViewUnder(int x, int y) {
+    int[] viewLocation = new int[2];
+    quickCamera.getLocationOnScreen(viewLocation);
+    int[] parentLocation = new int[2];
+    this.getLocationOnScreen(parentLocation);
+    int screenX = parentLocation[0] + x;
+    int screenY = parentLocation[1] + y;
+    return screenX >= viewLocation[0] && screenX < viewLocation[0] + quickCamera.getWidth() &&
+        screenY >= viewLocation[1] && screenY < viewLocation[1] + quickCamera.getHeight();
+  }
+
+  private int computeCameraTopPosition(float slideOffset) {
+    float clampedOffset = slideOffset - halfExpandedAnchorPoint;
+    if (clampedOffset < COLLAPSED_ANCHOR_POINT)
+      clampedOffset = COLLAPSED_ANCHOR_POINT;
+    else
+      clampedOffset = clampedOffset / (FULL_EXPANDED_ANCHOR_POINT - halfExpandedAnchorPoint);
+    float slidePixelOffset = slideOffset * slideRange +
+        (quickCamera.getMeasuredHeight() - baseHalfHeight) / 2 * (FULL_EXPANDED_ANCHOR_POINT - clampedOffset);
+    float marginPixelOffset = (getMeasuredHeight() - quickCamera.getMeasuredHeight()) / 2 * clampedOffset;
+    return (int) (getMeasuredHeight() - slidePixelOffset + marginPixelOffset);
+  }
+
+  private int computeCoverBottomPosition(float slideOffset) {
+    int slidePixelOffset = (int) (slideOffset * slideRange);
+    return getMeasuredHeight() - getPaddingBottom() - slidePixelOffset;
+  }
+
+  private void slideTo(float slideOffset) {
+    if (dragHelper != null && !belowICS) {
+      dragHelper.smoothSlideViewTo(coverView, coverView.getLeft(), computeCoverBottomPosition(slideOffset) - coverView.getHeight());
+      dragHelper.smoothSlideViewTo(quickCamera, quickCamera.getLeft(), computeCameraTopPosition(slideOffset));
+      ViewCompat.postInvalidateOnAnimation(this);
+    } else {
+      invalidate();
+    }
+  }
+
+  private float computeSlideOffsetFromCoverBottom(int topPosition) {
+    final int topBoundCollapsed = computeCoverBottomPosition(0);
+    return (float) (topBoundCollapsed - topPosition) / slideRange;
+  }
+
+  public void onPause() {
+    quickCamera.onPause();
+  }
+
+  public void onResume() {
+    if (hasCamera && (drawerState == HALF_EXPANDED || drawerState == FULL_EXPANDED))
+      quickCamera.onResume();
+  }
+}
diff --git a/src/org/thoughtcrime/securesms/components/QuickCamera.java b/src/org/thoughtcrime/securesms/components/QuickCamera.java
new file mode 100644
index 0000000000..88f50c0d4f
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/components/QuickCamera.java
@@ -0,0 +1,185 @@
+package org.thoughtcrime.securesms.components;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.ImageFormat;
+import android.graphics.Matrix;
+import android.graphics.Rect;
+import android.graphics.YuvImage;
+import android.hardware.Camera;
+import android.os.AsyncTask;
+import android.view.ViewGroup;
+import android.widget.Toast;
+
+import com.commonsware.cwac.camera.SimpleCameraHost;
+
+import org.thoughtcrime.securesms.R;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.List;
+
+public class QuickCamera extends CameraView {
+  private QuickCameraListener listener;
+  private boolean started, savingImage;
+  private int rotation;
+  private QuickCameraHost cameraHost;
+
+  public QuickCamera(Context context) {
+    super(context);
+    started = false;
+    savingImage = false;
+    setLayoutParams(new ViewGroup.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT));
+    cameraHost = new QuickCameraHost(context);
+    setHost(cameraHost);
+  }
+
+  @Override
+  public void onResume() {
+    super.onResume();
+    rotation = getCameraPictureOrientation();
+    started = true;
+  }
+
+  @Override
+  public void onPause() {
+    started = false;
+    super.onPause();
+  }
+
+  public boolean isStarted() {
+    return started;
+  }
+
+  public void takePicture(final boolean crop, final Rect previewRect) {
+    setOneShotPreviewCallback(new Camera.PreviewCallback() {
+      @Override
+      public void onPreviewFrame(byte[] data, Camera camera) {
+        new AsyncTask<byte[], Void, byte[]>() {
+          @Override
+          protected byte[] doInBackground(byte[]... params) {
+            byte[] data = params[0];
+            if (savingImage)
+              return null;
+            savingImage = true;
+            try {
+              ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+              int previewWidth = getCameraParameters().getPreviewSize().width;
+              int previewHeight = getCameraParameters().getPreviewSize().height;
+              YuvImage previewImage = new YuvImage(data, ImageFormat.NV21, previewWidth, previewHeight, null);
+
+              if (crop) {
+                float newWidth, newHeight;
+                if (rotation == 90 || rotation == 270) {
+                  newWidth = previewRect.height();
+                  newHeight = previewRect.width();
+                } else {
+                  newWidth = previewRect.width();
+                  newHeight = previewRect.height();
+                }
+                float centerX = previewWidth / 2;
+                float centerY = previewHeight / 2;
+                previewRect.set((int) (centerX - newWidth / 2),
+                    (int) (centerY - newHeight / 2),
+                    (int) (centerX + newWidth / 2),
+                    (int) (centerY + newHeight / 2));
+              } else if (rotation == 90 || rotation == 270) {
+                previewRect.set(0, 0, previewRect.height(), previewRect.width());
+              }
+              previewImage.compressToJpeg(previewRect, 100, byteArrayOutputStream);
+              byte[] bytes = byteArrayOutputStream.toByteArray();
+              byteArrayOutputStream.close();
+              byteArrayOutputStream = new ByteArrayOutputStream();
+              Bitmap bitmap = BitmapFactory.decodeByteArray(bytes, 0, bytes.length);
+              if (rotation != 0)
+                bitmap = rotateBitmap(bitmap, rotation);
+              bitmap.compress(Bitmap.CompressFormat.JPEG, 100, byteArrayOutputStream);
+              byte[] finalImageByteArray = byteArrayOutputStream.toByteArray();
+              byteArrayOutputStream.close();
+              savingImage = false;
+              return finalImageByteArray;
+            } catch (IOException e) {
+              savingImage = false;
+              return null;
+            }
+          }
+
+          @Override
+          protected void onPostExecute(byte[] data) {
+            if (data != null && listener != null)
+              listener.onImageCapture(data);
+          }
+        }.execute(data);
+      }
+    });
+  }
+
+  private static Bitmap rotateBitmap(Bitmap bitmap, int angle) {
+    Matrix matrix = new Matrix();
+    matrix.postRotate(angle);
+    Bitmap rotated = Bitmap.createBitmap(bitmap, 0, 0, bitmap.getWidth(), bitmap.getHeight(), matrix, true);
+    if (rotated != bitmap) bitmap.recycle();
+    return rotated;
+  }
+
+  public void setQuickCameraListener(QuickCameraListener listener) {
+    this.listener = listener;
+  }
+
+  public boolean isMultipleCameras() {
+    return Camera.getNumberOfCameras() > 1;
+  }
+
+  public boolean isRearCamera() {
+    return cameraHost.getCameraId() == Camera.CameraInfo.CAMERA_FACING_BACK;
+  }
+
+  public void swapCamera() {
+    cameraHost.swapCameraId();
+    onPause();
+    onResume();
+  }
+
+  public interface QuickCameraListener {
+    void onImageCapture(final byte[] data);
+  }
+
+  private class QuickCameraHost extends SimpleCameraHost {
+    int cameraId = Camera.CameraInfo.CAMERA_FACING_BACK;
+
+    public QuickCameraHost(Context context) {
+      super(context);
+    }
+
+    @Override
+    public Camera.Parameters adjustPreviewParameters(Camera.Parameters parameters) {
+      List<String> focusModes = parameters.getSupportedFocusModes();
+      if (focusModes.contains(Camera.Parameters.FOCUS_MODE_CONTINUOUS_PICTURE))
+        parameters.setFocusMode(Camera.Parameters.FOCUS_MODE_CONTINUOUS_PICTURE);
+      else if (focusModes.contains(Camera.Parameters.FOCUS_MODE_CONTINUOUS_VIDEO))
+        parameters.setFocusMode(Camera.Parameters.FOCUS_MODE_CONTINUOUS_VIDEO);
+      return parameters;
+    }
+
+    @Override
+    public int getCameraId() {
+      return cameraId;
+    }
+
+    public void swapCameraId() {
+      if (isMultipleCameras()) {
+        if (cameraId == Camera.CameraInfo.CAMERA_FACING_BACK)
+          cameraId = Camera.CameraInfo.CAMERA_FACING_FRONT;
+        else
+          cameraId = Camera.CameraInfo.CAMERA_FACING_BACK;
+      }
+    }
+
+    @Override
+    public void onCameraFail(FailureReason reason) {
+      super.onCameraFail(reason);
+      Toast.makeText(getContext(), R.string.quick_camera_unavailable, Toast.LENGTH_SHORT).show();
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/components/SurfacePreviewStrategy.java b/src/org/thoughtcrime/securesms/components/SurfacePreviewStrategy.java
new file mode 100644
index 0000000000..0b95b8cf7a
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/components/SurfacePreviewStrategy.java
@@ -0,0 +1,72 @@
+/***
+ Copyright (c) 2013 CommonsWare, LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License"); you may
+ not use this file except in compliance with the License. You may obtain
+ a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+package org.thoughtcrime.securesms.components;
+
+import android.hardware.Camera;
+import android.media.MediaRecorder;
+import android.view.SurfaceHolder;
+import android.view.SurfaceView;
+import android.view.View;
+
+import com.commonsware.cwac.camera.PreviewStrategy;
+
+import java.io.IOException;
+
+class SurfacePreviewStrategy implements PreviewStrategy,
+    SurfaceHolder.Callback {
+  private final CameraView cameraView;
+  private SurfaceView preview=null;
+  private SurfaceHolder previewHolder=null;
+
+  @SuppressWarnings("deprecation")
+  SurfacePreviewStrategy(CameraView cameraView) {
+    this.cameraView=cameraView;
+    preview=new SurfaceView(cameraView.getContext());
+    previewHolder=preview.getHolder();
+    previewHolder.setType(SurfaceHolder.SURFACE_TYPE_PUSH_BUFFERS);
+    previewHolder.addCallback(this);
+  }
+
+  @Override
+  public void surfaceCreated(SurfaceHolder holder) {
+    cameraView.previewCreated();
+  }
+
+  @Override
+  public void surfaceChanged(SurfaceHolder holder, int format,
+                             int width, int height) {
+    cameraView.initPreview(width, height);
+  }
+
+  @Override
+  public void surfaceDestroyed(SurfaceHolder holder) {
+    cameraView.previewDestroyed();
+  }
+
+  @Override
+  public void attach(Camera camera) throws IOException {
+    camera.setPreviewDisplay(previewHolder);
+  }
+
+  @Override
+  public void attach(MediaRecorder recorder) {
+    recorder.setPreviewDisplay(previewHolder.getSurface());
+  }
+
+  @Override
+  public View getWidget() {
+    return(preview);
+  }
+}
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/components/TexturePreviewStrategy.java b/src/org/thoughtcrime/securesms/components/TexturePreviewStrategy.java
new file mode 100644
index 0000000000..d63faeeeda
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/components/TexturePreviewStrategy.java
@@ -0,0 +1,88 @@
+package org.thoughtcrime.securesms.components;
+/***
+ Copyright (c) 2013 CommonsWare, LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License"); you may
+ not use this file except in compliance with the License. You may obtain
+ a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+import android.annotation.TargetApi;
+import android.graphics.SurfaceTexture;
+import android.hardware.Camera;
+import android.media.MediaRecorder;
+import android.os.Build;
+import android.view.TextureView;
+import android.view.View;
+
+import com.commonsware.cwac.camera.PreviewStrategy;
+
+import java.io.IOException;
+
+@TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH)
+class TexturePreviewStrategy implements PreviewStrategy,
+    TextureView.SurfaceTextureListener {
+  private final CameraView cameraView;
+  private TextureView widget=null;
+  private SurfaceTexture surface=null;
+
+  TexturePreviewStrategy(CameraView cameraView) {
+    this.cameraView=cameraView;
+    widget=new TextureView(cameraView.getContext());
+    widget.setSurfaceTextureListener(this);
+  }
+
+  @Override
+  public void onSurfaceTextureAvailable(SurfaceTexture surface,
+                                        int width, int height) {
+    this.surface=surface;
+
+    cameraView.previewCreated();
+    cameraView.initPreview(width, height);
+  }
+
+  @Override
+  public void onSurfaceTextureSizeChanged(SurfaceTexture surface,
+                                          int width, int height) {
+    cameraView.previewReset(width, height);
+  }
+
+  @Override
+  public boolean onSurfaceTextureDestroyed(SurfaceTexture surface) {
+    cameraView.previewDestroyed();
+
+    return(true);
+  }
+
+  @Override
+  public void onSurfaceTextureUpdated(SurfaceTexture surface) {
+    // no-op
+  }
+
+  @Override
+  public void attach(Camera camera) throws IOException {
+    camera.setPreviewTexture(surface);
+  }
+
+  @Override
+  public void attach(MediaRecorder recorder) {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
+      // no-op
+    }
+    else {
+      throw new IllegalStateException(
+          "Cannot use TextureView with MediaRecorder");
+    }
+  }
+
+  @Override
+  public View getWidget() {
+    return(widget);
+  }
+}
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/components/ThumbnailView.java b/src/org/thoughtcrime/securesms/components/ThumbnailView.java
index 4d580995bd..af68acfcbf 100644
--- a/src/org/thoughtcrime/securesms/components/ThumbnailView.java
+++ b/src/org/thoughtcrime/securesms/components/ThumbnailView.java
@@ -175,8 +175,9 @@ public class ThumbnailView extends FrameLayout {
   private GenericRequestBuilder buildThumbnailGlideRequest(Slide slide, MasterSecret masterSecret) {
 
     final GenericRequestBuilder builder;
-    if (slide.isDraft()) builder = buildDraftGlideRequest(slide);
-    else                 builder = buildEncryptedPartGlideRequest(slide, masterSecret);
+    if      (slide.isDraft() && slide.isEncrypted()) builder = buildEncryptedDraftGlideRequest(slide, masterSecret);
+    else if (slide.isDraft())                        builder = buildDraftGlideRequest(slide);
+    else                                             builder = buildEncryptedPartGlideRequest(slide, masterSecret);
     return builder;
   }
 
@@ -186,6 +187,15 @@ public class ThumbnailView extends FrameLayout {
                                    .listener(new PduThumbnailSetListener(slide.getPart()));
   }
 
+  private GenericRequestBuilder buildEncryptedDraftGlideRequest(Slide slide, MasterSecret masterSecret) {
+    if (masterSecret == null) {
+      throw new IllegalStateException("null MasterSecret when loading encrypted draft thumbnail");
+    }
+
+    return Glide.with(getContext()).load(new DecryptableUri(masterSecret, slide.getThumbnailUri()))
+        .fitCenter();
+  }
+
   private GenericRequestBuilder buildEncryptedPartGlideRequest(Slide slide, MasterSecret masterSecret) {
     if (masterSecret == null) {
       throw new IllegalStateException("null MasterSecret when loading non-draft thumbnail");
diff --git a/src/org/thoughtcrime/securesms/database/DraftDatabase.java b/src/org/thoughtcrime/securesms/database/DraftDatabase.java
index 631878f938..0a923b2016 100644
--- a/src/org/thoughtcrime/securesms/database/DraftDatabase.java
+++ b/src/org/thoughtcrime/securesms/database/DraftDatabase.java
@@ -101,10 +101,11 @@ public class DraftDatabase extends Database {
   }
 
   public static class Draft {
-    public static final String TEXT  = "text";
-    public static final String IMAGE = "image";
-    public static final String VIDEO = "video";
-    public static final String AUDIO = "audio";
+    public static final String TEXT            = "text";
+    public static final String IMAGE           = "image";
+    public static final String VIDEO           = "video";
+    public static final String AUDIO           = "audio";
+    public static final String ENCRYPTED_IMAGE = "encrypted_image";
 
     private final String type;
     private final String value;
@@ -124,10 +125,11 @@ public class DraftDatabase extends Database {
 
     public String getSnippet(Context context) {
       switch (type) {
-      case TEXT:  return value;
-      case IMAGE: return context.getString(R.string.DraftDatabase_Draft_image_snippet);
-      case VIDEO: return context.getString(R.string.DraftDatabase_Draft_video_snippet);
-      case AUDIO: return context.getString(R.string.DraftDatabase_Draft_audio_snippet);
+      case TEXT:            return value;
+      case ENCRYPTED_IMAGE:
+      case IMAGE:           return context.getString(R.string.DraftDatabase_Draft_image_snippet);
+      case VIDEO:           return context.getString(R.string.DraftDatabase_Draft_video_snippet);
+      case AUDIO:           return context.getString(R.string.DraftDatabase_Draft_audio_snippet);
       default:    return null;
       }
     }
diff --git a/src/org/thoughtcrime/securesms/mms/AttachmentManager.java b/src/org/thoughtcrime/securesms/mms/AttachmentManager.java
index f1dc5871a2..027a4fb534 100644
--- a/src/org/thoughtcrime/securesms/mms/AttachmentManager.java
+++ b/src/org/thoughtcrime/securesms/mms/AttachmentManager.java
@@ -24,6 +24,7 @@ import android.net.Uri;
 import android.os.Build;
 import android.provider.ContactsContract;
 import android.provider.MediaStore;
+import android.support.annotation.Nullable;
 import android.util.Log;
 import android.view.View;
 import android.view.animation.AlphaAnimation;
@@ -36,6 +37,7 @@ import android.widget.Toast;
 
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.components.ThumbnailView;
+import org.thoughtcrime.securesms.crypto.MasterSecret;
 import org.thoughtcrime.securesms.util.BitmapDecodingException;
 
 import java.io.File;
@@ -106,11 +108,24 @@ public class AttachmentManager {
     setMedia(new AudioSlide(context, audio));
   }
 
+  public void setEncryptedImage(Uri uri, MasterSecret masterSecret) throws IOException, BitmapDecodingException {
+    setMedia(new ImageSlide(context, masterSecret, uri), masterSecret);
+  }
+
   public void setMedia(final Slide slide) {
+    setMedia(slide, null);
+  }
+
+  public void setMedia(final Slide slide, @Nullable MasterSecret masterSecret) {
+    Slide thumbnailSlide = slideDeck.getThumbnailSlide(context);
+    if (thumbnailSlide != null && thumbnailSlide.isEncrypted()) {
+      Uri dataUri = slideDeck.getThumbnailSlide(context).getPart().getDataUri();
+      new File(dataUri.getPath()).delete();
+    }
     slideDeck.clear();
     slideDeck.addSlide(slide);
     attachmentView.setVisibility(View.VISIBLE);
-    thumbnail.setImageResource(slide);
+    thumbnail.setImageResource(slide, masterSecret);
     attachmentListener.onAttachmentChanged();
   }
 
diff --git a/src/org/thoughtcrime/securesms/mms/ImageSlide.java b/src/org/thoughtcrime/securesms/mms/ImageSlide.java
index 606e00c27b..3c962a324b 100644
--- a/src/org/thoughtcrime/securesms/mms/ImageSlide.java
+++ b/src/org/thoughtcrime/securesms/mms/ImageSlide.java
@@ -20,25 +20,36 @@ import android.content.Context;
 import android.content.res.Resources.Theme;
 import android.net.Uri;
 import android.support.annotation.DrawableRes;
+import android.support.annotation.Nullable;
 
 import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.crypto.DecryptingPartInputStream;
 import org.thoughtcrime.securesms.crypto.MasterSecret;
 import org.thoughtcrime.securesms.util.BitmapDecodingException;
+import org.thoughtcrime.securesms.util.Util;
 
+import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
 
 import ws.com.google.android.mms.ContentType;
 import ws.com.google.android.mms.pdu.PduPart;
 
 public class ImageSlide extends Slide {
   private static final String TAG = ImageSlide.class.getSimpleName();
+  private boolean encrypted = false;
 
   public ImageSlide(Context context, MasterSecret masterSecret, PduPart part) {
     super(context, masterSecret, part);
   }
 
   public ImageSlide(Context context, Uri uri) throws IOException, BitmapDecodingException {
-    super(context, constructPartFromUri(uri));
+    this(context, null, uri);
+  }
+
+  public ImageSlide(Context context, MasterSecret masterSecret, Uri uri) throws IOException, BitmapDecodingException {
+    super(context, masterSecret, constructPartFromByteArrayAndUri(uri, decryptContent(uri, masterSecret), masterSecret != null));
+    encrypted = masterSecret != null;
   }
 
   @Override
@@ -62,12 +73,32 @@ public class ImageSlide extends Slide {
     return true;
   }
 
-  private static PduPart constructPartFromUri(Uri uri)
+  @Override
+  public boolean isEncrypted() {
+    return encrypted;
+  }
+
+  private static byte[] decryptContent(Uri uri, MasterSecret masterSecret) {
+    try {
+      if (masterSecret != null) {
+        InputStream inputStream = new DecryptingPartInputStream(new File(uri.getPath()), masterSecret);
+        return Util.readFully(inputStream);
+      }
+    } catch (IOException e) {
+      e.printStackTrace();
+    }
+    return null;
+  }
+
+  private static PduPart constructPartFromByteArrayAndUri(Uri uri, @Nullable byte[] data, boolean encrypted)
       throws IOException, BitmapDecodingException
   {
     PduPart part = new PduPart();
 
     part.setDataUri(uri);
+    if (data != null)
+      part.setData(data);
+    part.setEncrypted(encrypted);
     part.setContentType(ContentType.IMAGE_JPEG.getBytes());
     part.setContentId((System.currentTimeMillis()+"").getBytes());
     part.setName(("Image" + System.currentTimeMillis()).getBytes());
diff --git a/src/org/thoughtcrime/securesms/mms/PartAuthority.java b/src/org/thoughtcrime/securesms/mms/PartAuthority.java
index 6ffcdc3c86..1ff0b3c326 100644
--- a/src/org/thoughtcrime/securesms/mms/PartAuthority.java
+++ b/src/org/thoughtcrime/securesms/mms/PartAuthority.java
@@ -5,11 +5,13 @@ import android.content.Context;
 import android.content.UriMatcher;
 import android.net.Uri;
 
+import org.thoughtcrime.securesms.crypto.DecryptingPartInputStream;
 import org.thoughtcrime.securesms.crypto.MasterSecret;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.PartDatabase;
 import org.thoughtcrime.securesms.providers.PartProvider;
 
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 
@@ -46,7 +48,11 @@ public class PartAuthority {
         partUri = new PartUriParser(uri);
         return partDatabase.getThumbnailStream(masterSecret, partUri.getPartId());
       default:
-        return context.getContentResolver().openInputStream(uri);
+        String tempMediaDir = context.getDir("media", Context.MODE_PRIVATE).getPath();
+        if (uri.getPath().startsWith(tempMediaDir))
+          return  new DecryptingPartInputStream(new File(uri.getPath()), masterSecret);
+        else
+          return context.getContentResolver().openInputStream(uri);
       }
     } catch (SecurityException se) {
       throw new IOException(se);
diff --git a/src/org/thoughtcrime/securesms/mms/Slide.java b/src/org/thoughtcrime/securesms/mms/Slide.java
index b4ce8bc981..080bdf1f9c 100644
--- a/src/org/thoughtcrime/securesms/mms/Slide.java
+++ b/src/org/thoughtcrime/securesms/mms/Slide.java
@@ -66,6 +66,10 @@ public abstract class Slide {
     return false;
   }
 
+  public boolean isEncrypted() {
+    return false;
+  }
+
   public PduPart getPart() {
     return part;
   }
diff --git a/src/org/thoughtcrime/securesms/util/BitmapUtil.java b/src/org/thoughtcrime/securesms/util/BitmapUtil.java
index 74c9f5f797..484d585fab 100644
--- a/src/org/thoughtcrime/securesms/util/BitmapUtil.java
+++ b/src/org/thoughtcrime/securesms/util/BitmapUtil.java
@@ -209,7 +209,7 @@ public class BitmapUtil {
     }
   }
 
-  private static Bitmap rotateBitmap(Bitmap bitmap, int angle) {
+  public static Bitmap rotateBitmap(Bitmap bitmap, int angle) {
     Matrix matrix = new Matrix();
     matrix.postRotate(angle);
     Bitmap rotated = Bitmap.createBitmap(bitmap, 0, 0, bitmap.getWidth(), bitmap.getHeight(), matrix, true);