From 810f70f5a6f00cd3235edc9b273d7b06102cdf70 Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Tue, 22 May 2012 14:58:33 -0700
Subject: [PATCH] New icons and menu items as placeholders for premium features

---
 .../astrid/actfm/TagSettingsActivity.java     |   2 +-
 .../res/drawable-hdpi/close_clear_cancel.png  | Bin 1391 -> 0 bytes
 astrid/res/drawable-hdpi/ic_menu_attach.png   | Bin 0 -> 2786 bytes
 astrid/res/drawable-hdpi/ic_menu_camera.png   | Bin 0 -> 2141 bytes
 astrid/res/drawable-hdpi/ic_menu_close.png    | Bin 0 -> 1951 bytes
 astrid/res/drawable-hdpi/ic_menu_mic.png      | Bin 0 -> 2175 bytes
 astrid/res/drawable-hdpi/ic_menu_save.png     | Bin 0 -> 2309 bytes
 astrid/res/drawable/close_clear_cancel.png    | Bin 1391 -> 0 bytes
 astrid/res/drawable/ic_menu_attach.png        | Bin 0 -> 1476 bytes
 astrid/res/drawable/ic_menu_camera.png        | Bin 0 -> 1071 bytes
 astrid/res/drawable/ic_menu_close.png         | Bin 0 -> 968 bytes
 astrid/res/drawable/ic_menu_mic.png           | Bin 0 -> 980 bytes
 astrid/res/drawable/ic_menu_save.png          | Bin 0 -> 1054 bytes
 .../res/layout-land/astrid_reminder_view.xml  |   2 +-
 astrid/res/layout/astrid_missed_call_view.xml |   2 +-
 astrid/res/layout/astrid_reminder_view.xml    |   2 +-
 .../layout/astrid_reminder_view_portrait.xml  |   2 +-
 astrid/res/layout/file_row.xml                |   2 +-
 astrid/res/layout/tag_settings_activity.xml   |   4 ++--
 astrid/res/layout/task_edit_activity.xml      |   4 ++--
 astrid/res/values/strings-premium.xml         |   3 +++
 .../astrid/activity/TaskEditFragment.java     |  22 +++++++++++++++---
 22 files changed, 32 insertions(+), 13 deletions(-)
 delete mode 100644 astrid/res/drawable-hdpi/close_clear_cancel.png
 create mode 100644 astrid/res/drawable-hdpi/ic_menu_attach.png
 create mode 100644 astrid/res/drawable-hdpi/ic_menu_camera.png
 create mode 100644 astrid/res/drawable-hdpi/ic_menu_close.png
 create mode 100644 astrid/res/drawable-hdpi/ic_menu_mic.png
 create mode 100644 astrid/res/drawable-hdpi/ic_menu_save.png
 delete mode 100644 astrid/res/drawable/close_clear_cancel.png
 create mode 100644 astrid/res/drawable/ic_menu_attach.png
 create mode 100644 astrid/res/drawable/ic_menu_camera.png
 create mode 100644 astrid/res/drawable/ic_menu_close.png
 create mode 100644 astrid/res/drawable/ic_menu_mic.png
 create mode 100644 astrid/res/drawable/ic_menu_save.png

diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java
index 8d4e070eb..1b73c8113 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java
@@ -475,7 +475,7 @@ public class TagSettingsActivity extends FragmentActivity {
         item.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
 
         item = menu.add(Menu.NONE, MENU_SAVE_ID, 0, R.string.TEA_menu_save);
-        item.setIcon(android.R.drawable.ic_menu_save);
+        item.setIcon(R.drawable.ic_menu_save);
         item.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
         return super.onCreateOptionsMenu(menu);
     }
diff --git a/astrid/res/drawable-hdpi/close_clear_cancel.png b/astrid/res/drawable-hdpi/close_clear_cancel.png
deleted file mode 100644
index 778c7f0812d8d59d7ec939c631119a902e589ee9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1391
zcmV-#1(5oQP)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+00002VoOIv0RM-N
z%)bBt010qNS#tmY07w7;07w8v$!k6U000Sga6xAP001xm001xm&hCs?000DcNkl<Z
zSi|j?Piz}S6vp4%*|md{-C0L1MYYpJz##~!L`_mbypB^M4xyB&q6ZFe;)*EwgTx7m
z1E^9H6M@7DwO7OeP$98JIn<#EssyD7Bv2eg(~TWL6$nXo)9!e7IINR6_S#MnkwD5P
z`8M<Y_KoJfZw#=nef@8R#ou16_7=YcyWVtft91Y*5Nd^!a@R))DA(MkAizbGyWnJ~
zl>ngbTigy2<U)GH9q5ew{HHZ7rV$ljqMAJe5YXG$+aCTlC#Bq<2=cPEQaO-|P@6k&
zrtKO%cL-v^L_2YWe-$$Ji&i<%55~De*XWrxcOcZpMfoR_%8e}6_1Gs(4Ta-MbK~T}
zRdT`X<5_eo>`#dwm3%KVlF_q@R2XQu99UR~Y{iNA92xyBdQg3wFt<n6v=p_7Wu7QQ
z$T%pjE4c)VjYWo$2|_-&d-1mT0rI=3;LZFMCDp8|1~OrQO4HOP>t;Wn+d{~AT70AA
z6Rc+}Is%Re;5fdzgwx{dO1BC?0R94b(Z;l{QUe?j2bHF%P1ej_K94Q{$oP!7uH+L=
z&scOsc=n@<f!WB_huvl1^#B}hV>fpeEs~}xje{fNpwX0WNw(R~=TO4a#lsmdu~%jz
znValoWc4cmaA5%x+%hea)~RNIBMhKgO1GqS^AGOAhLTILSTZs!91*~z_w|`$>;)|N
zTxTBufD7~3%Wcz=Qe}uEW>{M6W3gmpNH`*Z@8C#InT=*T*(G25DgX}=uSA45aIMub
zw(W;=%1k74lzm>szA6B~g<r6bTRRXsom6>CvSp`z2b-*FUjqQ(LKgdqRp?p_91(*?
z`V{pp=0wr{82hY-eN8|Kf=q>VEe0G6hye!$CvYgQ%(i5nU?11CuLJN9%lyMzt2n7O
zQUeO$f(++j)C|r%bY-sad>#ABVdo<R1P~y$M}-R@KuEg^fI1b(I4JHYzxFxCc*|?R
zK?Vsp#6i=i!Yky6nJ9MmKLp75w79X=R!qov9%jJ+w$&GQ#TdK?fQ*CU`=Y&fF(;(a
zTbEa<9s@@hplK;;ll3}Pkm~lQ#C0W~U_Il};mv!W56;NuRCu#5RO$`$S_o3z{yQb-
z4djxxIy|i{SY)&H;-JzrwTR^#Ni_g6KI>~A&D>-wZfi+*ZzGoZTfPV%fPzfCzQaC=
zBRORzlIdo1C}BTeGc75lYb6MqT&RNZ37n(wwz5=WUyPGX2fKs?;ldpDa@(|})K*@o
zG(~OqjRhA%!0G`wEWw&lh>t}_1lzJdoax>g$S%xdKVLI#;vtwYu(@GUCz4pGA2<jA
z-O`iqJ#dyVp-9PMT6MBdONN3Ab9jQUn-)n^RWp!@9{K)I>VU9!75dQ8`Dn5!SRmwG
zXK2YwtMWK;A?u}{ln&FTm;}5%_yy*F-_^4v#1^92#^)N|zw=5yaP`5jvIV~|bYUKk
z^Sg^1IHexAuQT|f{iPY2W-H|t?D^BNLi)e_`1RLbKHp1@ZV&%}>}y~DDg6z^7lFuI
ztd^z#001R)MObuXVRU6WV{&C-bY%cCFflPLFflDNF;p=#IyE;sFflDKI65#eL6wV#
z0000bbVXQnWMOn=I&E)cX=Zr<GB7bQEif@HGci;#GdeXeIx#gZFgQ9eFzWFP&j0`b
x8FWQhbW?9;ba!ELWdK2BZ(?O2No`?gWm08fWO;GPWjp`?002ovPDHLkV1oFUYD544

diff --git a/astrid/res/drawable-hdpi/ic_menu_attach.png b/astrid/res/drawable-hdpi/ic_menu_attach.png
new file mode 100644
index 0000000000000000000000000000000000000000..9a974fac649e606fd2c5cb34eb3f95eeffc92968
GIT binary patch
literal 2786
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

literal 0
HcmV?d00001

diff --git a/astrid/res/drawable-hdpi/ic_menu_camera.png b/astrid/res/drawable-hdpi/ic_menu_camera.png
new file mode 100644
index 0000000000000000000000000000000000000000..439e1118eafcfd44ec5da5a3f1a3be447bacfa90
GIT binary patch
literal 2141
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
XDXXyt^~QwQxgS1{%jaAS*qQSO;<;if

literal 0
HcmV?d00001

diff --git a/astrid/res/drawable-hdpi/ic_menu_close.png b/astrid/res/drawable-hdpi/ic_menu_close.png
new file mode 100644
index 0000000000000000000000000000000000000000..daadfe766c83240b523172f00c2b2f3cf7c82f40
GIT binary patch
literal 1951
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

literal 0
HcmV?d00001

diff --git a/astrid/res/drawable-hdpi/ic_menu_mic.png b/astrid/res/drawable-hdpi/ic_menu_mic.png
new file mode 100644
index 0000000000000000000000000000000000000000..f5f35f90645e5636af0f4e1c08b03238a8a25674
GIT binary patch
literal 2175
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
N5bz?nr#TyQ{sZ_|bMF8E

literal 0
HcmV?d00001

diff --git a/astrid/res/drawable-hdpi/ic_menu_save.png b/astrid/res/drawable-hdpi/ic_menu_save.png
new file mode 100644
index 0000000000000000000000000000000000000000..f1b115b1d95de83e113e7817ebbc10cca1dfa40e
GIT binary patch
literal 2309
zcmbVOdo)!09^YMs<Al;<P|li$Beyay^Jpf6VMZo165~=it>&?rsd+WC)y$krDy7nE
zJVS~oQG{^vsHjj>oN$yAikR}~B_yf4RXX>N*12olz1H5p-|zeTe7^7RTKj;n&uUW>
zYZCwfOj%wGKX@g;uY<86{4JC`{1INPAZ8HcFAsrs@RT4x7s~k{k|pJZf_@-RsM&TK
zbOrzek(e6<1##F^fn18_O<~Y#sRCvLfU~Pw!4qr+AtWCR70YO-mlfAgNU@NH3M6u{
z9EArc5_@Ttpug6KE6{EgP=qK~7o@YA3M-I;5D%%AN@OaknuhwUmkRHv#26IvGX&a7
zLw#{7h~ta&kSjqX5sh^eU`aS6iGaotuoMDi1rm?NVKF#721|CtVW~ti6^lcDeNeD9
zr7(o*$MF1W3qH|MA_!7YF_;}YcA$4Sq2<a@430vfV6b=$9`6Vv990?_#8W%URJPL^
z7@$g^6e}RHT!x&|$m7eyAQ}qx^h*d*1&8xZu}t+fQE<vIYMugvLt`;g=~P^w(JIIf
z{L78+qE%dt0>t=%DtVYv0M{eLcA5<5?(Ypv0by^bYn5WSC_D*6E(nu?GKj^Xq2L>|
zP%NZk$t$rq9GQS6<FTZbI2;{MB+#AcbUMj{?#Xn*PwV&|*ONqdC#|G=QpgM@4#&h%
zh(vdHBA!GilbK9+B4wJ(lBpn`OaM;X6~lJFa+!b2rFtkq9wb+C<#Ne%2l$HQkX$8_
zE07-kL^KY`;R(dDDallUzQoG_mE!H7&{HXwB0p!CD*lcKSjzv3{0mq3|6~mVJA;{O
zkN;|yX%XCmQ`>LN4<Ejb4=96YMhOo`rdx*!0A@L{7<8_>eK2{gNWffNH{9tRXD_bE
zE8o3+^3wH#k83K7n3&F4=2yJt_GgGTl+)C4BdGaN`NhOd@tyGp&l%SjIT&|W$9S0+
z6(9nI1Bpc|#Lf1a9{t3Lf66a$!ZoaU4y&-0w<|T*#>4evJG-p}`0SkVWdA>WY|<t7
z_ck;%#L?$e4o*b;L^QpQt!xz$uIe?>5sli$;TPKSK5p=E(=z(7=Dk0gm~yx8;@hr1
zz25)NT}e0h0rQ>?kN*}O9qnpqZC!6%Rb5^EvSh<h>*VC**7r8q2ATZJKqkU6)T$!M
zWi~nJ*FCSdlTyPMr<{7KEK8bMu<4@Qeb`a-X(gE)>ce)I3?fYS9?<D@v#U^U6%`ex
zCztru-~9RMWZP`E%Zy81Z-zX8n1u!C$mcee5k|hJlq>J@3xl#lgEBp|iDgG~Tl-f;
zt4o5>sq+e#NDcS2J7=0*Ha_0BF`zzAf2DE8{JOfj=%x1d2TS#JwYBdm=Kx$IFbHul
zB!^r73hhLtz9)2r-}$gS^5A}qqoanFaIAG~|2mw7|M}9bC1yYD<;UOH-^og;G}kfq
z_cI3;|B|O`UsHZ3O}{=PX?(DuriR(9%5Ku}YTa)4wRBYWz0L0+d(~bt8nJ9NU!Jfg
z@|W-$9%13ag?HQl8-4G`my4D<{%Nmk2ek<wJJNfOiLFveFWYw)m5vzaPM~5<4bLh`
zo$ubB4tstwhW>W$zVWQs*x@Id^sc3*UTi}gtHOV5ru$Deh{+$#9v>>Co2-896xdrP
zouN&<r%UJGb71F|KSWEiJg?=%37XZpn~N#zPxPiV{@|*ydnf8n@Y@ncM62FzSruY)
z&PRe<fE<uDo;JC7<56kRuEcoH{I*+8PcqD|q}bJP?bg>IukHj2^hU7_CFOy~H5Qpy
zW_oba{=KLv;zRtb4a1kWWtbNp1*lBXaod(M*GPV{2ap*WybL-q;BxO(&o&lx|MJAi
z2Xok5-ZSeP)`zlUi_6^}J3I=WS5A56lKGUxd7aF89-B}bTvyc<l{|nAa7LHf(QG3J
zmlUqnz1NGX_FiS(N;D5E>fSjzI?6?y@x;++;cYJuA2v-`6qducE@?QcJ7VGO_D)?8
ziFX(L{=<E2L3w%qmYmwbK}no}$*tL^gAxhHM;W~U$i1+BLUZ`;DUVO7Hn}IAHR%`r
zvBA~g#UkhI`W1~K3no=2rHSVagp0`^_T~BnZh+deiXQYJfN?s3g9u#L0o*@J$$EoG
z?=)%&0Eiol_Sua(oJwQ5yYkll*4Eb6I6^b4d0{(0;EZ*k!XhyE_di&vDJff8=@%Cr
zeV7n+Vvq0Qb@ITP?d;-HIcvSO7DGqdoo~In5OGtcwkSzRSioxU*(^(J=uMNg<PB(z
z`vS5Lp_0c6G7uM{*wGfRC6@2BQt6OihOcOL{XVl{+^-Guy5~QgbKPvlIO(jFowS?u
zAgQXoyBC_+7X1-@=<r6Y{oa0)n!M!XWa~|6%Xoj^12kbP7}MNwy_uPv(vn|NN*vkc
zbFbsssAEApTeEh-`C%wO>e>9Jx$8f472Q?av?AOd+_gLM7-e-`YDb9w*PVnlKS%UF
zLXNDf9#dq$USXOpskEMTtIRJ4T6d<{t|cZUEyidlI0jPEW<{Ai?;ka+Rs{l3+Idsm
zvFv3PMkP%duL6#E_eu;;Z#+%yag8&4#E3+mn|RjfHAF5<sC+{VExz*6yZK>OUPzdC
vabss{_Y$#7B84;bap#4x86#zr%c}sJ*oXKh!cVWKeoR<QA4b0W=H34R;mO%{

literal 0
HcmV?d00001

diff --git a/astrid/res/drawable/close_clear_cancel.png b/astrid/res/drawable/close_clear_cancel.png
deleted file mode 100644
index 778c7f0812d8d59d7ec939c631119a902e589ee9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1391
zcmV-#1(5oQP)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+00002VoOIv0RM-N
z%)bBt010qNS#tmY07w7;07w8v$!k6U000Sga6xAP001xm001xm&hCs?000DcNkl<Z
zSi|j?Piz}S6vp4%*|md{-C0L1MYYpJz##~!L`_mbypB^M4xyB&q6ZFe;)*EwgTx7m
z1E^9H6M@7DwO7OeP$98JIn<#EssyD7Bv2eg(~TWL6$nXo)9!e7IINR6_S#MnkwD5P
z`8M<Y_KoJfZw#=nef@8R#ou16_7=YcyWVtft91Y*5Nd^!a@R))DA(MkAizbGyWnJ~
zl>ngbTigy2<U)GH9q5ew{HHZ7rV$ljqMAJe5YXG$+aCTlC#Bq<2=cPEQaO-|P@6k&
zrtKO%cL-v^L_2YWe-$$Ji&i<%55~De*XWrxcOcZpMfoR_%8e}6_1Gs(4Ta-MbK~T}
zRdT`X<5_eo>`#dwm3%KVlF_q@R2XQu99UR~Y{iNA92xyBdQg3wFt<n6v=p_7Wu7QQ
z$T%pjE4c)VjYWo$2|_-&d-1mT0rI=3;LZFMCDp8|1~OrQO4HOP>t;Wn+d{~AT70AA
z6Rc+}Is%Re;5fdzgwx{dO1BC?0R94b(Z;l{QUe?j2bHF%P1ej_K94Q{$oP!7uH+L=
z&scOsc=n@<f!WB_huvl1^#B}hV>fpeEs~}xje{fNpwX0WNw(R~=TO4a#lsmdu~%jz
znValoWc4cmaA5%x+%hea)~RNIBMhKgO1GqS^AGOAhLTILSTZs!91*~z_w|`$>;)|N
zTxTBufD7~3%Wcz=Qe}uEW>{M6W3gmpNH`*Z@8C#InT=*T*(G25DgX}=uSA45aIMub
zw(W;=%1k74lzm>szA6B~g<r6bTRRXsom6>CvSp`z2b-*FUjqQ(LKgdqRp?p_91(*?
z`V{pp=0wr{82hY-eN8|Kf=q>VEe0G6hye!$CvYgQ%(i5nU?11CuLJN9%lyMzt2n7O
zQUeO$f(++j)C|r%bY-sad>#ABVdo<R1P~y$M}-R@KuEg^fI1b(I4JHYzxFxCc*|?R
zK?Vsp#6i=i!Yky6nJ9MmKLp75w79X=R!qov9%jJ+w$&GQ#TdK?fQ*CU`=Y&fF(;(a
zTbEa<9s@@hplK;;ll3}Pkm~lQ#C0W~U_Il};mv!W56;NuRCu#5RO$`$S_o3z{yQb-
z4djxxIy|i{SY)&H;-JzrwTR^#Ni_g6KI>~A&D>-wZfi+*ZzGoZTfPV%fPzfCzQaC=
zBRORzlIdo1C}BTeGc75lYb6MqT&RNZ37n(wwz5=WUyPGX2fKs?;ldpDa@(|})K*@o
zG(~OqjRhA%!0G`wEWw&lh>t}_1lzJdoax>g$S%xdKVLI#;vtwYu(@GUCz4pGA2<jA
z-O`iqJ#dyVp-9PMT6MBdONN3Ab9jQUn-)n^RWp!@9{K)I>VU9!75dQ8`Dn5!SRmwG
zXK2YwtMWK;A?u}{ln&FTm;}5%_yy*F-_^4v#1^92#^)N|zw=5yaP`5jvIV~|bYUKk
z^Sg^1IHexAuQT|f{iPY2W-H|t?D^BNLi)e_`1RLbKHp1@ZV&%}>}y~DDg6z^7lFuI
ztd^z#001R)MObuXVRU6WV{&C-bY%cCFflPLFflDNF;p=#IyE;sFflDKI65#eL6wV#
z0000bbVXQnWMOn=I&E)cX=Zr<GB7bQEif@HGci;#GdeXeIx#gZFgQ9eFzWFP&j0`b
x8FWQhbW?9;ba!ELWdK2BZ(?O2No`?gWm08fWO;GPWjp`?002ovPDHLkV1oFUYD544

diff --git a/astrid/res/drawable/ic_menu_attach.png b/astrid/res/drawable/ic_menu_attach.png
new file mode 100644
index 0000000000000000000000000000000000000000..e1bef9e08b1d7f4c8c8ecf49da9c3fbda2ff467d
GIT binary patch
literal 1476
zcmV;#1v~nQP)<h;3K|Lk000e1NJLTq001KZ000{Z1^@s6_V6~D00009a7bBm000XU
z000XU0RWnu7ytkTc1c7*R7i=<*V}JYMH~n4IcLx5?z!Kl+tQ@arSf3ngNYBAC_;s3
zEn8Z;MlOwDVrXlGKR~6~q6B-fux-~iwv??6_Q9&bM->{BpioL`FeFN|A!T==4QWa3
z+1;MY%=iL{58d7%%Dm3WcRu<3@|($_2qEBUS@i!6`1fL-bYOjbJzG>%B#5HOn5Jnr
zH8stX6_%fRQf+E!X;CCe+V1oDsu+gZ000mOA#;x7{BBv+w}%fOzOo$ZiD079Xh4?b
zc0mv-S(ar8A@^vSP6Gf`ilSgToqjMsKi`^4r6S>Qcp+ELW4EcNr)Q(8s!_u*-arW5
z^msfSG)<2(3^Sj}WDJ_7-;`zfkk{+|gr;d50B|x_)?-yB8jS{YT_1oDzJd_?31i%F
z>(;G%nx^d_gsihH>*n<I^wrIqH}3`j#7xsPXJ%%C_4V~*i{-6(nj(=%iJ~Z-4<T2w
z*=)na#6%WCc$Vk+uN6i4Lf7^0N=ix&mY0_gBZR(@B&k3Uggv=3*HoEkG#bz}?M!}t
z{x*#9h57mUL#AoEKA-PP2w|DyI9Dl(x<CkdH=Ry9v$M0W7Zw(lc)i~5)9LhRC=_~W
zvD{Tx<{_jLLbwfMd<7v?cmMwVEXQ#%UDwMHLKkV8K3Gvvag-2pDK9Utz~}R=BZN$2
zj1kMSY_9B8VIq;pMqSrq`T6-lgwT16@!nJ_<?6crm0=j$F~%d7WgRFlFaK+BaBv?0
zV5`UDxkCuKW7~EyMNtePB<D1(7}M3&RSF^e+%Sx-2%+E7>2zH(nY3kDKBKDYtB&K0
zAcPvKs;UxweSJZm=i3>E(J;o{larHi0KjgK$KwG2{Q6j!&d$zF5W<+>?=MFPoks}m
zotc>-vMir93}ZVXWW;sdw}ZjpL|<QDt)^-HJkR?PLT#31bp!%|8lLChLI@>H)BGye
zIm_NN-QC^K=(--&b$ts$=(26w4YRYeuBK^cRaGr>UH4)plW7QrLU;T7`ztj~YZn9o
z5<*&%$z<5;_3o5qxx?%A(%Eb_T3cKD$C@hB)zww1s%p&d_rHcQ{?W3mgYkHLj^nr?
z2w@q<c*M5t1EEl8A{LA7lV!PI6h%KFq-9`Wppj+S3Q3X%d_G@MHk&;@H8pi=sq=DT
zIyyQEbX|`?2w!$x_p)i4?^jn>$2pE;Xqx^zlga$Du(0r6RaI4@x3_nvD2k^fNis0T
z%>@Mo;b1VhOHq^_Q4}SNar@-tWNTerowF1s=RGqxIM@gw{FtJs5zDgbs;jHxkM@R!
zhBN>G*uQ`OgIFxKN0OvYK@cE9sO9?g>qj?i*sx1clo-cx3PLEHN~M~YgDi;|9v;3V
zisJLG>jo<;D}P?>o71OHS15|oFN&fc0MMLBB%1Q_@^;Fy+#`x2bQ~u#Ha7NAI2^W@
zg8;BZn^>03M+n`eY5GPE$exFg0)$Y@=;&yp&*!U<WjV(4e4%aI$5sPb5<}DU0>)UL
zo124+Kq?ePIVnk!pAgcP&1Rd5i;IJzD0YjYC?ka0Z{NP%wi*ZkON_Sbx>qGhsxwXV
z!`9Z;#&|qFU0Pb|(=;ulY1#=<6bmuNpIy6l?SnudP@$^o89@*X*L9o5#>PHfEo4cI
zZQFgeZSPQ3^&N_$p7s0v;|#+T@jSnS<2WzIxNT}`>iGKg>nnMlk4loHIgWEG9*;M#
z1p>e_ulBif=U(7A?ij{+i{m&vP1CN&<N4EZobK`Q@tCgbykQtWKnP!SUAHNjOrBWD
z)T{{u006zcy-IO$@pFWbLPCgXS=No3nwoo$_J@au%UPD)lt?6cj~qE-trfB&%zwF_
es{f{^3iA(LR;v)BTs4mX0000<MNUMnLSTX-LCXyQ

literal 0
HcmV?d00001

diff --git a/astrid/res/drawable/ic_menu_camera.png b/astrid/res/drawable/ic_menu_camera.png
new file mode 100644
index 0000000000000000000000000000000000000000..99442f943d8b4c8a19a23e2684c6d7c8e10495a3
GIT binary patch
literal 1071
zcmV+~1kn45P)<h;3K|Lk000e1NJLTq001KZ000{Z1^@s6_V6~D00009a7bBm000XU
z000XU0RWnu7ytkR;Ymb6R7i>KmOW@3M-+hHdo#169qr!TCXtIfk{B%11maG(NfS#D
zE<cr1g%EW|5D5_m<AC6BW88>qq}U+KxJYFuO$-Voq%dg$ZcM-s41ps#)I>N4tu%W(
zJ2NS)6LNGXXGKU{_;tJUe!lnS&6`2*Jv=Ky|2M!vc@8s5_;HL75to;jU$NE(ob&yr
zD~bXcWBJ{?cYC*P-Lj?qmTllprxR8xl~1IUpCMw5h;Fdvy(jPew$^$rP1DN@3k$l8
z@6wg2)oOD|l3a=77>N$=vU4s<({zz@z5xJN%lJOBGD}NKFDa$oW{kx|WQ7nE$MMHW
zlDsCR1VlV!<GqJG&*9OdM-S38y_V;>b<Qzs?e_Ne_V*VqT-YcLv$C=>702-xaU7o&
zLV))kgb*O5gdhlDSXBn%oP#{iq2KRAQ51lPkmot<?CkuswYBxp{QUgGVRj?8sZyz&
zpO~09J2o~3jIqb$h(JX96&ZXVgz(-25rLEvgb-ki*+oR7l&UDD&Uo+713;@3j8f{P
zQVN6+L)VE2j4_3C?xAz;Pa;Z)Xi^9fIOhNnfiVWgn6I644}=gGg%CBR)X7mXN5XK<
zi&0yFh_Ji6`>VBfDa*3k8yg#2^?JQ3rF_R2vlxcqDepa4Yr%W}p0)NZ&UuB1fOB4q
zidlN-5fNyuf74o@o0*xp+U<6OJkO`Q-EJ^DJ9|@WeNJor3lRYkK@bGhFbpRcV^57$
z8pc}dvMl?u*=*ilTU(p1R;%ktl6+gOR@YZoS7(~d=6$X8HEXRSB4CUGW9-O=KNbuk
zg4Q}s)AWZ{t0lrP{Jha<oUYgFaih^V9YxV%tJM-&mi?%;PRk}*dgv8JVe>ri*Xwnm
zlzK4?LqJ6E-h)!AQm@yU*4m7ZkK3}-y;NoPj;-RHpK7<;yNLLWF~;tlEDHeNwcG6s
z5nm=ERf+_TQ5h+vWQ={#>2z)<NwORSL6&9N>(<(z^E|)V>2$(Iqw%4XQvPc&IBeEG
z{tr<U&73%K;>zac=H<D$x#hvyrAwDyn4Fw!M^W_t2=kGCkAwjL8fM2B1EmxdMe!*j
zp1E=3##h$bKNw>ZQ&Us##&P_{`1tt#)c$)Sa71g2gt6A%F~+>9loEr9x=%?2wOS3L
zD4Nc)Y}yzDLI@Ze8w1WcaL%95A6yYyYiF&!QyQk%>s^;pRv2Ro-uoxsEeD~blsIS)
zBJ$pQFvdKg=e;LH+}2vJ^?JSQqhdbwakaj_{_5U+GgR?lpZ5Fxp+1NRjWPMXd-r~C
px7&x3`o}Q;r94v)^5-z4<S#jkq~FxbCY%5O002ovPDHLkV1l=x0$Tt8

literal 0
HcmV?d00001

diff --git a/astrid/res/drawable/ic_menu_close.png b/astrid/res/drawable/ic_menu_close.png
new file mode 100644
index 0000000000000000000000000000000000000000..33c5bbfb1eb9740607899a214ac20341f5440674
GIT binary patch
literal 968
zcmV;(12_DMP)<h;3K|Lk000e1NJLTq001KZ000{Z1^@s6_V6~D00009a7bBm000XU
z000XU0RWnu7ytkRdPzh<R7i>Kmd{HZXBfx7^S-n5%h{b-cSbbWJ(h-G63Ar_l{QdA
zPqMlw)|MuL1VN-;wjlJ}kRqkjHM{I?AxV)UEQ)w4Sm<AnU{acv;6Y01WfjMrS!Z>A
z^^y&eCgI(XwjT05&EY%G^O@&;o@ZVziXxm8k^dXuxZc3LNGA%0XElzGkJG`y!F(8o
z_h)BkH(ur~7K<07C>q?}-u`-ie!j_?gJYSdsi~=0CX<<!B<U;9^By~n^U?J5^yc%t
z)oS&;D2hJ_f^fRkYTek`*}0L==b3<*jwzGL%<H=TWlv8J>Fw=(r@Om*sZ=Umc-B`c
zl`h2N@uj}LzSE{@LesQ4(=@+h$-xXGNz(a5A|XhU1VvF`7{(c0*Ke0frL)IC&g!~;
z+c1nXvMfWEWoVj4L{WU36^5y2c%J{%_x*1vrP(NoAc`Uk!x)I7=x(`O{ulr>O}lFt
z#(*e_pp=5+IC!472H-PR7^a>9faT@oQ>JO&QB`#)2m*v*2-kJ7x3~8I0Fue%Ia!uL
z2mz%Oj^k|9>-8%W6BB>Eb{GIyU0v-@BoftlJpN%AhVXqKK@b1{D5c<e9)u9sw*6zH
z(YQW3I{GJb@J?X>pjNA;Q>j!{mgNrskoNl=#{od-y6#WAySvxN#>W2WDDbPm0KoeC
z`o%;du`WrHdK{+JYB`NYV|aLY_~(v;;uSV<rBX?Io;SyFoO1j_q9_8#af;`8bCpUZ
z{jb9m3Wa_}QOc^SULu4L03d|m$s-6ML{-&GilUSYg+hO)FwDoaxVU&q*Y!K5X%5M<
z{IppQ4-X#zfGCRR+D+}cF6#CAhGkh-W@cuXr-`XD3kwTrP1A0fra7c23V5Cer4-F(
zbJMb{Nz1Y(o6Y8Cd!n8!#vxtTZxxHhw^(7AmR>TM{63XRy(i1^(-F39`xncyF6VN&
zM*y(0vT_-~Qam0X0D!KpE(Af44T2yI;2*z^=ZUE@f*@=Pf^Zaz#o875)wb=cxm@mH
z+mp-X9@@5j)p49hlv2cEF^HlVN|N-LB?mLi{{H^wp67kx`+jKK_V2Fiev-{*?>+0w
zX0!JW4h|-5+y2e-JOn{-^XTa48Y>KQ1J`ObDhNV848!{)BO@=p&#bMjy$|5st*xzZ
qSg#Kq!Tc9GQP<8lFfY=Hg83T)qFcWuu3nq~0000<MNUMnLSTY=pVS%v

literal 0
HcmV?d00001

diff --git a/astrid/res/drawable/ic_menu_mic.png b/astrid/res/drawable/ic_menu_mic.png
new file mode 100644
index 0000000000000000000000000000000000000000..c33cd20538bfe202645ed4da88a7c60900a9626d
GIT binary patch
literal 980
zcmV;_11tQAP)<h;3K|Lk000e1NJLTq001KZ000{Z1^@s6_V6~D00009a7bBm000XU
z000XU0RWnu7ytkRhDk(0R7i=<mrZCSRS?Jj^*;J*CX)#!Y%npJi?`j2Ajo0_WrfAd
zV3>G_hegdHCWpm~SF;B%dKru!f*^}XATdPa!GnlF$U#9Cb#Duc2XVke7&4vo^y_~0
zJea}V4GYtaS+}4M4b@dYs{U2)H96<-u$cJ20q!(a_QO`IbuNmcD^kkmh{zdZzRmOe
z`qI+UUu9!bnKrdrt#kEy{nL?=kxN=@06?$T!{OoK7jYcFQ5L9hWmZ;J#Psy^)$#H1
zOTO<zseeL5QG_4}8UStpxK;+Hux5PUAC98vnJ9|jc^-ri5JEs}jY_40Fbtoao160<
z2+Y{n82P?0`xWUM5kX1`-}h;9a#B7Jn3Kf!6&ew_;o;#@`=YRBq?F9efl><hivQ$2
z0KjEn2AZbT)zxXO^=0Rrwbp(&F)?wuTCF}Qgvjpnv(~C^xBE-G-QJZ_zQD{LGylB2
zyu3RI%s`cqQc@U(uLMCblcwoQ$H&LUT1!N9SDT%4B2Cj?wOTzNMbSsbn7vM?b7PPk
z1H&vXF5ceW-u_A{HA6%!glN?3^%t4>RI8ZzQP1-}(OR?b`=8Cv&wu})!T^A^R%)%G
zl!DgUhG7WiyQSfrgE1yE#y9}TvaHZl4GhD~{l^I*Af*Hmo$?_f5D}Nz?1e`AWS4{h
z<o%L4=M;cY2tfb}Rc2rqB4VvInE4R^x9_b=AC`!I6GBWXrHGmBnZN+}m6<ak#PiO%
zkB^Ry{_s2xQp*13MUo`9(lq^C2r=uNJF?c^ECMsIX1d+(UJwM|1VPY@<9H9iYeaNa
z2yvc>oVE6+EX&r2Xf6!Hi%F7fwcG6<iog`QLTqhqU5KLSOKa^DX_|h>%wH>|EC4Wb
zMN0W<tyXJfS#~py<CkY=XK$Su3;^ux?950h-<48cG{*FtbH6h)DWx7)N-1XE&9dz6
zMx*g#p}=Ke0AO=-GptstuX~>Nfl>-Y1Y=B`W!YPC9A9rXo2GD3lsvUNoz7#%m?<fx
z^E?k)Ye*?Yk|b06`}<R6Vgdy#LqxQ;w)Re~R(o@FbaXTb0`yOBYb}x_!NI}7pWSZv
zy@iE^_lv?5x<WLYO%X-W(?df;ArW<~wa(gqSBVgU>h=0ip65>y5xIgIC<L>yv0>NO
z*RMF|DtVr}JkL-0^m;wvoa+_^0ZIz^tn8usiTfLAI+Cfa;<|7E0000<MNUMnLSTYx
Cch!af

literal 0
HcmV?d00001

diff --git a/astrid/res/drawable/ic_menu_save.png b/astrid/res/drawable/ic_menu_save.png
new file mode 100644
index 0000000000000000000000000000000000000000..d748aaaad82bb356cf275bd89b6b9273f4a432f3
GIT binary patch
literal 1054
zcmV+(1mXLMP)<h;3K|Lk000e1NJLTq001KZ000{Z1^@s6_V6~D00009a7bBm000XU
z000XU0RWnu7ytkR&`Cr=R7i=<m(Ob?RS?Ik-mC7{ZD%s=41^FNbCDeO;A+I+K_PhX
z;7x=?^yDQ$Ou~XW<gk#7NN$NHlaNSYksS~M9tBV46htxp1tNk6oh+J}IKR4IS9#c(
zHHqm-XR~O&(1-5#qd)K4uj*B!h`>#e`o95Ai_#jVrl$1d<m4NU<4jm<Th`jo=jZ2t
z%`)lQ+S>ERn75euw^pllZ*g(4aV?nf@$tcdfq}VVvG{uZp}qltGce_H`AyIBrnJ^^
zk|a(PMc-Ge)wR*l(HDXsxT};(>h=1qm6esdOG`_CJ~oUo26MR_hG7VZXsxw;zE2p2
zFAfb2z1_P%Iyx#;tJP0~Ac*t%yfwy<>$>j~k-xsaerJAuzTOX}@17wd(OQGn`oebK
z_hZlVAP55ReIJ4#Xz%au_r`)T2Es7JVzKyM7=~LL8yh2!4U<JmDL};D^(ZuZQA$LR
z%jKY0EWR^1IQa3x!h%VgEA=y-SCS-n!DE+*9>Iu6Fg7-JrXL~#5kWqmhfb$+yHqOW
z0HAZ>!ZNam>$>gp51IM9TCH}!*=*iBIXSs+t^I0ydpj19GcQ9#&{_i##Y(Av?Y*8d
zIir-)B653kb8~>12>?KAEso>-QLEKHGscLu7MNLfc6MGV6biQx&l=ftub(o(IF6Ig
z<#HRY>&7CYx|0hcf>QsO%gm^hV$bt@*LA4}z?^Ev)nSN;gCICE#<ZDPpWdh!2#H9n
zwZhD-l=75PB}BY9B(DOal!7ElPNFFKKx_R&tJQLoB)RlJ(^{kFc@`0$^L_sdB6|AT
zFd_nR9CN*1e=t2gU7eksbuJqN05CE#BFoFmc5iR*86rx2-@kNBCYU5i005$`t*w_Q
zCMK4&)=K&u_t;I@<#KtgP$(QTGiIp{u9RnzBxx99es>(_QkYJslQ8pNN~ugBnPEf(
zMZ}w%oBI|3X0zcxRHagRDQn-%&LASMuCDry<2)-OiilE|Ypq2QNuntFxl}4;i|ec~
z-JH@k#=PqL{wG>%jfkl)5fK%~aiq0gilXS3Ckg`qpp-I1bZCsZLqwpIN_B>rQEM&D
zX7fix9PKXXiNOc}L^Crp4*=lnjAH-*pi-#}0{~wun%eC)iiqkSavlJ@ySuyl8Z%#-
zNl%IM`TUU9`l+rn{p+W+2H*D+W{%@H2BnlA1i^=CMOHs~o(EcMh~pSUB<gfJsTQTe
z92^{+3=a=~bbNgLB@x9Ug2trQMX3@Ih@waujRrLujh_w=4^vCe%n9kg(2e?Ux=}EH
Y11I5_CSq~#2><{907*qoM6N<$f_R7RX#fBK

literal 0
HcmV?d00001

diff --git a/astrid/res/layout-land/astrid_reminder_view.xml b/astrid/res/layout-land/astrid_reminder_view.xml
index 8e13547f5..f27c529b3 100644
--- a/astrid/res/layout-land/astrid_reminder_view.xml
+++ b/astrid/res/layout-land/astrid_reminder_view.xml
@@ -53,7 +53,7 @@
             android:scaleType="fitCenter"
             android:layout_gravity="right"
             android:layout_marginBottom="10dip"
-            android:src="@drawable/close_clear_cancel"/>
+            android:src="@drawable/ic_menu_close"/>
 	    <Button
 	        android:id="@+id/reminder_edit"
 	        android:layout_width="fill_parent"
diff --git a/astrid/res/layout/astrid_missed_call_view.xml b/astrid/res/layout/astrid_missed_call_view.xml
index e7b772884..199806126 100644
--- a/astrid/res/layout/astrid_missed_call_view.xml
+++ b/astrid/res/layout/astrid_missed_call_view.xml
@@ -40,7 +40,7 @@
             android:layout_width="25dip"
             android:layout_height="25dip"
             android:scaleType="fitCenter"
-            android:src="@drawable/close_clear_cancel"/>
+            android:src="@drawable/ic_menu_close"/>
     
     </LinearLayout>
     
diff --git a/astrid/res/layout/astrid_reminder_view.xml b/astrid/res/layout/astrid_reminder_view.xml
index 50c0a907a..e8991fe74 100644
--- a/astrid/res/layout/astrid_reminder_view.xml
+++ b/astrid/res/layout/astrid_reminder_view.xml
@@ -28,7 +28,7 @@
             android:layout_width="25dip"
             android:layout_height="25dip"
             android:scaleType="fitCenter"
-            android:src="@drawable/close_clear_cancel"/>
+            android:src="@drawable/ic_menu_close"/>
     
     </LinearLayout>
     
diff --git a/astrid/res/layout/astrid_reminder_view_portrait.xml b/astrid/res/layout/astrid_reminder_view_portrait.xml
index 50c0a907a..e8991fe74 100644
--- a/astrid/res/layout/astrid_reminder_view_portrait.xml
+++ b/astrid/res/layout/astrid_reminder_view_portrait.xml
@@ -28,7 +28,7 @@
             android:layout_width="25dip"
             android:layout_height="25dip"
             android:scaleType="fitCenter"
-            android:src="@drawable/close_clear_cancel"/>
+            android:src="@drawable/ic_menu_close"/>
     
     </LinearLayout>
     
diff --git a/astrid/res/layout/file_row.xml b/astrid/res/layout/file_row.xml
index e020c19df..ad8018ebd 100644
--- a/astrid/res/layout/file_row.xml
+++ b/astrid/res/layout/file_row.xml
@@ -23,7 +23,7 @@
         android:id="@+id/remove_file"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="@drawable/close_clear_cancel"
+        android:src="@drawable/ic_menu_close"
         android:layout_marginLeft="5dip"
         android:layout_marginRight="5dip"
         android:visibility="gone"/>
diff --git a/astrid/res/layout/tag_settings_activity.xml b/astrid/res/layout/tag_settings_activity.xml
index 1d15e4333..9944e63c7 100644
--- a/astrid/res/layout/tag_settings_activity.xml
+++ b/astrid/res/layout/tag_settings_activity.xml
@@ -33,7 +33,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginRight="10dip"
                     android:background="@android:color/transparent"
-                    android:src="@drawable/close_clear_cancel" />
+                    android:src="@drawable/ic_menu_close" />
 
                 <ImageButton
                     android:id="@+id/save"
@@ -41,7 +41,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginRight="10dip"
                     android:background="@android:color/transparent"
-                    android:src="@android:drawable/ic_menu_save" />
+                    android:src="@drawable/ic_menu_save" />
             </LinearLayout>
 
             <RelativeLayout
diff --git a/astrid/res/layout/task_edit_activity.xml b/astrid/res/layout/task_edit_activity.xml
index d5a2102ad..cbd265300 100644
--- a/astrid/res/layout/task_edit_activity.xml
+++ b/astrid/res/layout/task_edit_activity.xml
@@ -43,14 +43,14 @@
                         android:layout_height="wrap_content"
                         android:layout_marginRight="10dip"
                         android:background="@android:color/transparent"
-                        android:src="@drawable/close_clear_cancel" />
+                        android:src="@drawable/ic_menu_close" />
 
                     <ImageButton
                         android:id="@+id/save"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:background="@android:color/transparent"
-                        android:src="@android:drawable/ic_menu_save" />
+                        android:src="@drawable/ic_menu_save" />
                 </LinearLayout>
             </LinearLayout>
 
diff --git a/astrid/res/values/strings-premium.xml b/astrid/res/values/strings-premium.xml
index 0a469d5da..46afcd62b 100644
--- a/astrid/res/values/strings-premium.xml
+++ b/astrid/res/values/strings-premium.xml
@@ -6,4 +6,7 @@
     <string name="speech_err_no_match">Sorry, I couldn\'t understand that! Please try again.</string>
     <string name="speech_err_default">Sorry, speech recognition encountered an error. Please try again.</string>
     
+    <string name="premium_attach_file">Attach a file</string>
+    <string name="premium_record_audio">Record a note</string>
+    
 </resources>
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java
index 6205ba76c..d4d97abd1 100755
--- a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java
@@ -158,6 +158,8 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
     private static final int MENU_DISCARD_ID = R.string.TEA_menu_discard;
     private static final int MENU_DELETE_ID = R.string.TEA_menu_delete;
     private static final int MENU_COMMENTS_REFRESH_ID = R.string.TEA_menu_comments;
+    private static final int MENU_ATTACH_ID = R.string.premium_attach_file;
+    private static final int MENU_RECORD_ID = R.string.premium_record_audio;
 
     // --- result codes
 
@@ -1000,7 +1002,12 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
         case MENU_DELETE_ID:
             deleteButtonClick();
             return true;
-
+        case MENU_ATTACH_ID:
+            System.err.println("Attach file!"); //$NON-NLS-1$
+            return true;
+        case MENU_RECORD_ID:
+            System.err.println("Record audio!"); //$NON-NLS-1$
+            return true;
         case MENU_COMMENTS_REFRESH_ID: {
                 editNotes.refreshData(true, null);
             return true;
@@ -1022,13 +1029,22 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
         MenuItem item;
 
         AstridActivity activity = (AstridActivity) getActivity();
+
+        item = menu.add(Menu.NONE, MENU_ATTACH_ID, 0, R.string.premium_attach_file);
+        item.setIcon(R.drawable.ic_menu_attach);
+        item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
+
+        item = menu.add(Menu.NONE, MENU_RECORD_ID, 0, R.string.premium_record_audio);
+        item.setIcon(R.drawable.ic_menu_mic);
+        item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
+
         if (activity instanceof TaskListActivity && activity.fragmentLayout != AstridActivity.LAYOUT_DOUBLE || activity instanceof TaskEditActivity) {
             item = menu.add(Menu.NONE, MENU_DISCARD_ID, 0, R.string.TEA_menu_discard);
-            item.setIcon(R.drawable.close_clear_cancel);
+            item.setIcon(R.drawable.ic_menu_close);
             item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
 
             item = menu.add(Menu.NONE, MENU_SAVE_ID, 0, R.string.TEA_menu_save);
-            item.setIcon(android.R.drawable.ic_menu_save);
+            item.setIcon(R.drawable.ic_menu_save);
             item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
         }