From 2f20bb89f3b64701d047fa3af2aa8b6e0ecfdc34 Mon Sep 17 00:00:00 2001 From: Jake McGinty Date: Mon, 5 Jan 2015 16:44:56 -0800 Subject: [PATCH] use internal emoji pane for all android versions 1) Enter key by default (remove as option), still keeping "Enter key sends" option 2) New material assets for emoji and keyboard icons, inc a xxhdpi version finally fixes #2300, fixes #2251, fixes #2183 Closes #2302 // FREEBIE --- res/drawable-hdpi/ic_emoji_dark.png | Bin 943 -> 0 bytes res/drawable-hdpi/ic_emoji_light.png | Bin 943 -> 0 bytes res/drawable-hdpi/ic_ime_dark.png | Bin 472 -> 0 bytes res/drawable-hdpi/ic_ime_light.png | Bin 476 -> 0 bytes res/drawable-hdpi/ic_keyboard_grey600_24dp.png | Bin 0 -> 445 bytes res/drawable-hdpi/ic_keyboard_white_24dp.png | Bin 0 -> 429 bytes res/drawable-hdpi/ic_mood_grey600_24dp.png | Bin 0 -> 945 bytes res/drawable-hdpi/ic_mood_white_24dp.png | Bin 0 -> 793 bytes res/drawable-mdpi/ic_emoji_dark.png | Bin 558 -> 0 bytes res/drawable-mdpi/ic_emoji_light.png | Bin 558 -> 0 bytes res/drawable-mdpi/ic_ime_dark.png | Bin 391 -> 0 bytes res/drawable-mdpi/ic_ime_light.png | Bin 390 -> 0 bytes res/drawable-mdpi/ic_keyboard_grey600_24dp.png | Bin 0 -> 345 bytes res/drawable-mdpi/ic_keyboard_white_24dp.png | Bin 0 -> 340 bytes res/drawable-mdpi/ic_mood_grey600_24dp.png | Bin 0 -> 664 bytes res/drawable-mdpi/ic_mood_white_24dp.png | Bin 0 -> 587 bytes res/drawable-xhdpi/ic_emoji_dark.png | Bin 1316 -> 0 bytes res/drawable-xhdpi/ic_emoji_light.png | Bin 1316 -> 0 bytes res/drawable-xhdpi/ic_ime_dark.png | Bin 729 -> 0 bytes res/drawable-xhdpi/ic_ime_light.png | Bin 727 -> 0 bytes res/drawable-xhdpi/ic_keyboard_grey600_24dp.png | Bin 0 -> 527 bytes res/drawable-xhdpi/ic_keyboard_white_24dp.png | Bin 0 -> 440 bytes res/drawable-xhdpi/ic_mood_grey600_24dp.png | Bin 0 -> 1406 bytes res/drawable-xhdpi/ic_mood_white_24dp.png | Bin 0 -> 1217 bytes res/drawable-xxhdpi/ic_keyboard_grey600_24dp.png | Bin 0 -> 409 bytes res/drawable-xxhdpi/ic_keyboard_white_24dp.png | Bin 0 -> 420 bytes res/drawable-xxhdpi/ic_mood_grey600_24dp.png | Bin 0 -> 1308 bytes res/drawable-xxhdpi/ic_mood_white_24dp.png | Bin 0 -> 1301 bytes res/layout/conversation_activity.xml | 5 ++++- res/values/themes.xml | 8 ++++---- res/xml/preferences_advanced.xml | 8 +------- .../securesms/ConversationActivity.java | 13 +++++-------- 32 files changed, 14 insertions(+), 20 deletions(-) delete mode 100644 res/drawable-hdpi/ic_emoji_dark.png delete mode 100644 res/drawable-hdpi/ic_emoji_light.png delete mode 100644 res/drawable-hdpi/ic_ime_dark.png delete mode 100644 res/drawable-hdpi/ic_ime_light.png create mode 100644 res/drawable-hdpi/ic_keyboard_grey600_24dp.png create mode 100644 res/drawable-hdpi/ic_keyboard_white_24dp.png create mode 100644 res/drawable-hdpi/ic_mood_grey600_24dp.png create mode 100644 res/drawable-hdpi/ic_mood_white_24dp.png delete mode 100644 res/drawable-mdpi/ic_emoji_dark.png delete mode 100644 res/drawable-mdpi/ic_emoji_light.png delete mode 100644 res/drawable-mdpi/ic_ime_dark.png delete mode 100644 res/drawable-mdpi/ic_ime_light.png create mode 100644 res/drawable-mdpi/ic_keyboard_grey600_24dp.png create mode 100644 res/drawable-mdpi/ic_keyboard_white_24dp.png create mode 100644 res/drawable-mdpi/ic_mood_grey600_24dp.png create mode 100644 res/drawable-mdpi/ic_mood_white_24dp.png delete mode 100644 res/drawable-xhdpi/ic_emoji_dark.png delete mode 100644 res/drawable-xhdpi/ic_emoji_light.png delete mode 100644 res/drawable-xhdpi/ic_ime_dark.png delete mode 100644 res/drawable-xhdpi/ic_ime_light.png create mode 100644 res/drawable-xhdpi/ic_keyboard_grey600_24dp.png create mode 100644 res/drawable-xhdpi/ic_keyboard_white_24dp.png create mode 100644 res/drawable-xhdpi/ic_mood_grey600_24dp.png create mode 100644 res/drawable-xhdpi/ic_mood_white_24dp.png create mode 100644 res/drawable-xxhdpi/ic_keyboard_grey600_24dp.png create mode 100644 res/drawable-xxhdpi/ic_keyboard_white_24dp.png create mode 100644 res/drawable-xxhdpi/ic_mood_grey600_24dp.png create mode 100644 res/drawable-xxhdpi/ic_mood_white_24dp.png diff --git a/res/drawable-hdpi/ic_emoji_dark.png b/res/drawable-hdpi/ic_emoji_dark.png deleted file mode 100644 index 6f4d12510624c4af0280ed05b0ff566e4c77f462..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 943 zcmV;g15o^lP)sout(Tt$JnmCO{ zxQ4L%9J6s{sTopQE-l3!Wv<`=K8`Ub2`wV(8IRH8h?e_?3dB|(Ll*m9c0X+mv>MPl zuiA_Y+qlEt821YETBq~eQJF5S+bXB#kj6DU6cCec%o?un9h)KdpUGa~lXTO@Xz9^I zTCO3c2uc{?5-A}FepzvJH{@3ync)8iGB<>WtfWril6+Zs(^k;LgH&R0`!OfN#}>#u z@tb7GbGN3{+o6ZA+6n~eaC=9|bP+r_@ucPyK1(LpSycFKdgx9%GI(5qq&-*AIIerV9=&M9okz5tJGMy)_a2X}A~Q;d8%`xypV4pV{7uWGRJ_Qlp{D;DYp4=yTnVkz^sBV+)J`5fwrmKwrR~cqzo8#n zOoLZXR8f})FL|<42Curvz85`ssUh~@!^IJnjHBZc6)rrg#pC&$;nzmvakO=?CbCnp zK-PIwG=fT>KfY&iAjWqW7ieJ{9N&owS1mFwcZO7C&EvZ{L;`s@=wtNf1BAF2>k(Op zyNN(M+b2{8W$_7hh7011t0tL@r20o6fl1gza@LPP{RD04nb`xF@e*Km{08UBJx5yM RaaaHV002ovPDHLkV1l-$yW;== diff --git a/res/drawable-hdpi/ic_emoji_light.png b/res/drawable-hdpi/ic_emoji_light.png deleted file mode 100644 index a27b2474f51428908981e01d643d992511173d37..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 943 zcmV;g15o^lP)i+-a?Bv#&d+FsC$6l7` z3FhY9^Zn{=`+beQ{QVz)umoZfB*u(Lf#k?S0ydG57;B~gPv&Wq(1e2%oD(NpHOZt^ zl^#)<$FYJo`tb2U+{4F+|GDPs8XfM&&6Swl=dh0sout(Tt$JnmCO{ zxQ4L%9J6s{sTopQE-l3!Wv<`=K8`Ub2`wV(8IRH8h?e_?3dB|(Ll*m9c0X+mv>MPl zuiA_Y+qlEt821YETBq~eQJF5S+bXB#kj6DU6cCec%o?un9h)KdpUGa~lXTO@Xz9^I zTCO3c2uc{?5-A}FepzvJH{@3ync)8iGB<>WtfWril6+Zs(^k;LgH&R0`!OfN#}>#u z@tb7GbGN3{+o6ZA+6n~eaC=9|bP+r_@ucPyK1(LpSycFKdgx9%GI(5qq&-*AIIerV9=&M9okz5tJGMy)_a2X}A~Q;d8%`xypV4pV{7uWGRJ_Qlp{D;DYp4=yTnVkz^sBV+)J`5fwrmKwrR~cqzo8#n zOoLZXR8f})FL|<42Curvz85`ssUh~@!^IJnjHBZc6)rrg#pC&$;nzmvakO=?CbCnp zK-PIwG=fT>KfY&iAjWqW7ieJ{9N&owS1mFwcZO7C&EvZ{L;`s@=wtNf1BAF2>k(Op zyNN(M+b2{8W$_7hh7011t0tL@r20o6fl1gza@LPP{RD04nb`xF@e*Km{05rT!b$M& RDp>#k002ovPDHLkV1m)dz!m@i diff --git a/res/drawable-hdpi/ic_ime_dark.png b/res/drawable-hdpi/ic_ime_dark.png deleted file mode 100644 index bb6a88a354ad8e4a6de5ea3f7b3d047c1dc50e62..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 472 zcmV;}0Vn>6P)Nkl>GrR7;v4mbnX`8BBE%=hwZcQNxz4{&=WFT19jdaNt^6vSNpqzOm8AF=0!^Lh|e+{l-jM zvgR{`xPlQo{&6Gy;y2ICrJp?L)12qCZlxn9whZG6GRBm=mAo=DU6V7x$)zlD z1q3n0GbW2FPIhsw$YZm z_zmtk@xUQmdT)B-kz3oNmU*$!p1<)M^zoF6xBI@whfB}6vONmvQu5^IwI&oX8#IsA zf2F?UTGeTTH5EH@yZPFbNtIMcl__UnJ5+q<2VdhiIB=ro82$sb6#f@4)aS?_YUR{r z1Ngw48$R;RZtl;QZmNf;AXf^eoi|W21`!I0EyyebY0QQtD`m-o)hkteVnmM&OLRe~ zag;oAq;97D?(qdZ9G8@M@@ATM?_SV7-3!8fThqOuds0CvNCl}N75oPjW`Jauu&|~8 O0000)S zqaAnt8{Bi^fkV^u-r5t7+}b^A`Qo3A_WbtWV2B|X#`gOb(=m4&nDyR3#3Wwk@C}G9iEP4_H5;*J#pcWkJ}_oL z?C=d}Vj^-LIa0Uj?%h9Npy!etL)wAu-6P=t;~(Jq?WTV~e?mYA2mv7=1pEb7c0jj5 S1&$>E0000|k0wldT1B8JTOS+@4BLidG0>c;6;(>goByV>Y zhX3vTXZ8bmoCO|{#S9GGK$YCWj105pNB{-jd%8G=cpQH_#Zc&=gGk$cQ>(Nc4cZ1- zXQyTHExL7URs2!gFJ7(81+0DtT%@}qT5?W!weCMTyM9vsz2Eoq9;}z2R@9nlxFGVw zYv$sc%N&*+Z>n-ocK@}BX+=y=rT|;knMsElZykJCa%n-9!HP+2mXU#rHYj*aSy7|j z{C%ev^Uklww+n}cEP7!1MAh42vA*PunCE`}3NsrRb%hy{KhIgy)5QL{bO~<*n{nOS zl-63V_o|$`w|xD*zD@U8wY#wYpMB=u^15{{aphmU3Z=Fz{GI03AEnNJ{dk8)#-fhE zpgaHnw3~1xeLIsXe&s;?{iVipS{$}dxn>6nI@J=_h?11Vl2ohYqEsNoU}Ruus%v1V zYhW5;Xl7+>VP$BhYhYnzU@)Co*b_xVZhlH;S|vz>iLRl6u8~oQk&%_Lft4vxgE>%x TqyTRZPy>UftDnm{r-UW|9;c%o literal 0 HcmV?d00001 diff --git a/res/drawable-hdpi/ic_keyboard_white_24dp.png b/res/drawable-hdpi/ic_keyboard_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..d68a8edfb307391f6ac8d5e4e903f69894d83fde GIT binary patch literal 429 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8JTOS+@4BLidG0>c;6;(>goByV>Y zhX3vTXZ8bmoCO|{#S9GGK$YCWj105pNB{-zd%8G=cpQH_<*Zbi`*GOWS?4UL@)I zI^*FANh1cXRj(YXr}}5C3ZKZpAiU|)Ua!u(fdw0+%x5VvXe_X~zP@DY*$?$E>n2=W zWcs48D&OSg%Kh(8zqr_w{d3=9#h$&o{Bk+zw=?7|vbw9TY-|57xO(EzI}=WshMg9+ zKg0cVlZDn|{+s`RUR5n|jVMV;EJ?LWE=mPb3`Pcqrn&}(x(22phGtgA7FI?;wuO~} z!5wWaP}m|gfUDFg9q5?xJO$wTLd37+cNiLw`cXr^02fF-B__ z4t282XbN6*aUc*1nwBe@-qf6X`^kU|eBcRta z@tfSz%J6ebxht8oQXWQHeeUy$ppf-0h}zfc4Y`HPC3kuPk7mBhjjc*8Y&W41y^cid zOQ6?b%-C7z;FhAbLnEfNZG<7xW*YZ8u_B^S>u2?7js1jb-Ci;6<@i-e9FIA#$vMa3 zA|dMnX5F7JLm{Gr>T%6Q(4t+PojxlI=hb3sT-dN>%f;X77UpAJX=?vl3ZOaAuqoe$63-%N5~Mc;N|$&Ri#_Ub>@y6Z z!-wktPQ;U7f8tpd(J;t{y#9%+Yhu248bY;JFjNk@>?U^PzuI`qA-`3`{OVAg2Q5;V zT>**Ld49Tdq64T$_rig0#n1#uSZota?1)a9D5D0d31Ks|@J|?xVN;ZW5QB@FM)zXG7YB}bYv|N%^Zv*coAouY}nSiwqr>W}Y45>@%|mlN{rz3;4(~ljKN~CdU-ZG@b7;sd$=K25d4* zvd5pKOv?~2VyJjxpelorm@L)qs-hrs2Dndr`eN0PVOlX_5?AACjB3qf@2wz9rp@4i zJYIsHR*U-`Y3rMkB$1-RE_E&hFc)dCOT{aK39-ZRAkmB!+z*1y0H$HHWvigq4AY*s zTjHW5>3L#Lk~C(srviT)^M4b2TK7e|zr6!s(nbY-_7<2506#cw<01fWgG6lra&BB; zfl{y~Nm6E^OCyo@Di~8e0Dc8E`fuwJbtFlneZ`LYA|26|Bx$@aqH$lO zBdSS~E?M?BV$Y-N7IWDb>4clH4dONAfNQ>9+ax1Nq->K+2Z_>r`Pa1)XZapV^9@Ts zVv9)J1)xRNQN8b>X>i88Sv~=9r$;%4tts6x!U=9scO-RgGGLwr&j8pCy$C2-$g2ND zBF6+1ob=5kcwoqD5%sj)1Z&*{Loiue4Lpi$3{t!_P>Z>c!#~BmX#?x=_ejdE3Yx4? zBu|D6d5WyK8w4K4(m1W!u?@K$sZB@)?^$2%w>G!Kuk5%-#1&2Hyb2l?>ga=N+R&T6 z9uY^w{sL*((;kZKtVRF;03~!qSaf7zbY(hYa%Ew3WdJfTF*PkPF)c7PR53L=G&DLj zGc7PUIxsNLysOs$001R)MObuXVRU6WZEs|0W_bWIFflYOF)%GMGE_1$Ix{gkFflDK XH##sddzDsL00000NkvXXu0mjfeJ)9A literal 0 HcmV?d00001 diff --git a/res/drawable-mdpi/ic_emoji_dark.png b/res/drawable-mdpi/ic_emoji_dark.png deleted file mode 100644 index 61213b05830b8b962281248a2f7a27cda4c686ee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 558 zcmV+}0@3}6P)kdg0005?Nkl3HYvvB$xv@xaC5*BtFonfi#Y#2>w6sF!E|@v{D5J z`ebL`%-gr?ad+MOU;pSM&@*`E;7E|SQ7QyxQPjXhN4%t@VkK0RVn|xiUJABBRnhBZfL8eTt%J9C${oxnv`N}DlaqT-*WzX1K_~Fkb_(a-m znDJEAy;QwW_0PWMn$%baW^v6r^uinD)MR0H*MqQ%Osd=&7#VQKv@JXmYSol1FZ zu^A+~UeR!FamIp*XYH&{#TIS#oJMNJeg!2<`j*Zm+3^uE#Q7lBkXtp8vh*tup<>?7 zIOGQ#USM3&MwwyD3#ok*Nm(%?G%iC64iL+94_&w=jTqQHp>Ie+)*JXoD6AZXdxTCC z6N^X8c*7)sx8#hh>YCVnjR(5M{9;2LAoi0BQ)YjDjmK=6VrfchzH!4!xKUJ7wo^?y z|42sOOO~1F37^?X_+7YTC-%6Vzm`%XVw*`q4j6I8Qn+Fyrfh68h3z~yapLwsVy5%% zcJ>xy3BGV*yzhQbREZoY?JDd@J9FFl%#O4$d-PDv+0w9}U?LQX8fEhMp=vO}fY)47 waVu0@iVdv#zz>U>_@EDq;V(aJar|q8-<{b5tar4@2mk;807*qoM6N<$f(s`I9{>OV diff --git a/res/drawable-mdpi/ic_emoji_light.png b/res/drawable-mdpi/ic_emoji_light.png deleted file mode 100644 index d0d0c249108b8dca526083f9641cf879484d9af0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 558 zcmV+}0@3}6P)kdg0005?Nkl2{|xiUJABBRnhBZfL8eTt%J9C${oxnv`N}DlaqT-*WzX1K_~Fkb_(a-m znDJEAy;QwW_0PWMn$%baW^v6r^uinD)MR0H*MqQ%Osd=&7#VQKv@JXmYSol1FZ zu^A+~UeR!FamIp*XYH&{#TIS#oJMNJeg!2<`j*Zm+3^uE#Q7lBkXtp8vh*tup<>?7 zIOGQ#USM3&MwwyD3#ok*Nm(%?G%iC64iL+94_&w=jTqQHp>Ie+)*JXoD6AZXdxTCC z6N^X8c*7)sx8#hh>YCVnjR(5M{9;2LAoi0BQ)YjDjmK=6VrfchzH!4!xKUJ7wo^?y z|42sOOO~1F37^?X_+7YTC-%6Vzm`%XVw*`q4j6I8Qn+Fyrfh68h3z~yapLwsVy5%% zcJ>xy3BGV*yzhQbREZoY?JDd@J9FFl%#O4$d-PDv+0w9}U?LQX8fEhMp=vO}fY)47 waVu0@iVdv#zz>U>_@EDq;V(aJar|q8-|@Wo2JyL3D*ylh07*qoM6N<$f>osm^#A|> diff --git a/res/drawable-mdpi/ic_ime_dark.png b/res/drawable-mdpi/ic_ime_dark.png deleted file mode 100644 index 806d3a1ea5ae81b14c669a5283b2aead5cb4a12a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 391 zcmV;20eJq2P)kdg0003_NklA0B&JCk6HFTIHqmrbtC$`?AXL}1wx&>nLVFYGaRb#TH6jY7=*@rIL-nEw zdQk9?@4!2k_t(QbOb81W{Cz|rh(tf`U!&-s&c5MDQ{S<^h9i9q&pcMPSMl1|Ig)eA=ojI$z;aHGGm!n)kdg0003^Nkl8gSSe712t~UErAw_wdN-*et*tbvM3Z_mrbkGsXe!2N(lmPW&;EF*UUZ2j z+8f_V-nqQLp3E~LELiaW5rrTU{k(sVqD!59!;yxb7kcWB^wd4`Sjmp(R%{u0>iR`? zR)daHiN2X_Yd+YPcT&5P_T2^E{V?kKye zrK%v&l-HCfXh_|XD*xFJTb_7m*PgzCeFJ?5bKd{ga=8%fm>L@!o0u4z7<+9!1i8Pm kvYa^MT-q;Ku;AbM4p|rlHA`nubN~PV07*qoM6N<$f*QuOX8-^I diff --git a/res/drawable-mdpi/ic_keyboard_grey600_24dp.png b/res/drawable-mdpi/ic_keyboard_grey600_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..660ad84c0df518127bfb84217bb80e288ba75784 GIT binary patch literal 345 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1mUKs7M+U~W1%@xC#RK_FN#5=* z4FB8v&+G^CI14-?fvUKLL70(Y)*O)jZci7-5R21yC!7^@Fc4_nKO;t_$Tjqo1M?~m z<|zwxxC)GARFog9KWZz#aVG7X_dUBG`;Jr{IWhZSXCd>eIn&;>NobU?3m#$VadzSs zXlyY#QJ2M_tt(X+yH>_wq0LoK&%m>Z6SF>+c_&UvU%$ib`+j+br!RR74mu?1+x-5b zwp6fd>&I2gYj(ZQ-@@SjKuJ%age@27EY%X%h?11Vl2ohYqEsNoU}Ruus%v1VYhW5; zXl7+>VP$BhYhYnzU@)Co*b_xVZhlH;S|vz>iLRl6u8~oQk&%_Lft4vxgE>%xqyTRZ PPy>UftDnm{r-UW|=k#uf literal 0 HcmV?d00001 diff --git a/res/drawable-mdpi/ic_keyboard_white_24dp.png b/res/drawable-mdpi/ic_keyboard_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..14d1b5d82c888ec7659b70d26e0e225c823b5f05 GIT binary patch literal 340 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 LNkvXXu0mjf^!!WX diff --git a/res/drawable-xhdpi/ic_ime_light.png b/res/drawable-xhdpi/ic_ime_light.png deleted file mode 100644 index 19745e4094b20e1068ee2505eef16a9b9d87ae18..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 727 zcmV;|0x127P)Nkl zH&=yxi*OnLHhjs+^fDwJ2KF<|fHcfr(8^HYUgJRxCm9ub2Bjem0j|1%3*3<|0>_wR zR+{4|a7puY&gX3BmU1smi&XVn&rQq6s~Z4lvMy}^ZOuQVbrD)w58O1C05B@{Sl$Gv zZa^QDH@8{KAC+!0uvRdjonlYOJGg}5R{+$>NO2nACCvm5RW(F~9?c=Id;)b68g$V^ zgBBUxn!A;utVSZ<6IfNs+foDdXeY5AJwc-mRSkIHDv!A@J>m*5kZ1E82d*i*tDWJT z@9}^+JYAxP8uRK#l?&npE^qlsW!`Xj$x+k5W)XGEJj#l!0T`pqhaPcfmrw^ukEG)S zJUUJ(!H2J>z#8DJ#*UrPV@$OZ$bd!O)5hUh(OBY%GB17Bc)=SoYJ3qd@|Lz(wX}F< z-3?apEc4WMR)Fk3d=;N%h6$#m38opx)6cB z3)I;qT&BTKJdo1GC(#P8*#Hue=YzP3r-dWq9W_!CmhgPzrS=>aH2AoKFJbwMD3HB~ zd!g{p$ipB14LMf%y6MZLgF8^*gWRTxgYqz|uXv6pt$G6GkN}+^BiS)& zv2BKKeuBTV=6Z#>*$eK9FW7LmDe8VhS@ZOH>>HeQJbY4g)4rWZWj%aulj6+vzn)L} zoc_;pGGq7ANtWmK*gS7(p2E7nBHd+6RzdU=p?<65nzCvEQ_JVEU3#rBzhh3O!w~Ed(-hBOyb*0;u z<*{2%w_jsl;P{(gwks@l$(Ln%T?VJl?aKJid&gJ$&(^z3?>VkhKViS<;;pO3P5&j& zBsf`SI_K~HZrIn_m%+un_@swv?gvKMdp%R@uht8Eo^G?`=;ikpx22s?)}7b;EOBE* z(KGhX>jU*S$H?0QLs+%MHKHUXu_VKd4a7@AobTUZ&I=^9vA z85m4w7WPEZkei>9nN|tXV4`biplf6lVq|1xY+z*y)L;(OASuAx1JuCa>FVdQ&MBb@ E0F7DCga7~l literal 0 HcmV?d00001 diff --git a/res/drawable-xhdpi/ic_keyboard_white_24dp.png b/res/drawable-xhdpi/ic_keyboard_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..d2b42b3a739e5644bcb26d98856bd67214732fbe GIT binary patch literal 440 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 KT-G@yGywn>zn&=o literal 0 HcmV?d00001 diff --git a/res/drawable-xxhdpi/ic_mood_grey600_24dp.png b/res/drawable-xxhdpi/ic_mood_grey600_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..cce3d5797c0fe76ea4094562c641f31340e44f99 GIT binary patch literal 1308 zcmV+%1>^dOP)004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00fjtL_t(&-tC&(Ym`S6z&DX@lHC{~jZK4X!Di{BiWS9P zY;8?KXt5yp(EbNiaxwPT*3cJ4B^7B=Ob9J#f;II37#hRt1 zh?%XvI!&ir;~=A1KUz8JCDC9xb(4k!mSBgNG62?rTugf!!f zk!F|yI@m%LiT@I)0yxhjrY$l?9}UdUKG2(-X2Oah$|HJsHG4o+3^=2R($A{sfu7-5 zD3}@fit;Fd-s7K)aHg5&FV;l^RLGZxDQRZ!Hx3;|l0==s^XeB?Rq?u2<;&ELN zpan|YX^SM2w<~d}+#TqsvRL_%0OfN+@_Wz~XpOR!izBOc=5kf?y~+(}KsxA)A}zp{ zNI{^_1!%SO8+Jxs6Yi4yzv2({jTDs=N|@Wh2$Kx6-6uerEtA|5X6W$)dRi*K>J?X) z1>GeJlHIaND&gkaftsWgD(9>nN+j841hQKuq_kUa2RbX5?oo6j$}~epAV14}g6>Bf zP*OSrYJoASOfz8w^0Qnn=pM@JARE?5<(E3murkdJBaokE9(M$7l^Lj6Fgv78vt5~H zs}acG@`#}Q*bLMunALd{T$cp>MN66HZ`mm5514^23TD-w6K!LN32v~}r)u=GtQBUu zU}1k%4TW7tTd}YWm3E|0*Qw{o>ia%DS`igfM(s2&ALr39{ZZC0y!T0 zPIDHHSj51%-z{}?Wfe%gMto!jsus*{D=wbba=5!p@SKud{}i-q%s>h0;4f2$FMCaL*rMr+IPQ#dSi_02 zTe5h`hER|jW&bZy}<;(OH&t^l4V@w%gCOOPPk5MID z7p$gu*|i-bN1Sd$JLUyG<(dX_l@?N-_H*cwEIZu$Llyij4Q;pf_}^wD%`~%tw^(4Y zl>6Oj@245l;PuMyZqKl3HAic|zZ10S*`_!+!Q9X|CCXw=^Lg+tY@A+gcPt5ovsBv3 zkE7EQVH)Qp{H!<{XO|W#{Tjl%wWq#8n-9CYr})X^$)(A$o1f$Zk7t-cp3LO&r9@k} z$7y#T%gHm2%3}qsQVN}s(|-T3%Y~)Q5dQ9PghpyfQAPm;l#!yAMvhA5mnff^_fD_} zy!A?43L|OOM)|~9L01MaQyg%8p$>9lR!eEuU3$H8R#eaAuXD=h#a<2*-K@<1hXmzp zqMtD<$^&}YXn#A5`csPp)oh`I0e)wcF&=W4A004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00fOmL_t(&-tC&(Ym`S6z&DX@lHC{~#>QY% zt*uE2EiDK>)c-&w7h|h6^hHrgMOqXSLJOK;O}!Btuvl6eO}xY?*!os&O%sZWHA_n= zYGRUKA4HhTH}lQ+?YAX`oqarK&ir;~=A1Le3S`owZTIiMWS(@!zAe9U1686nL$ zW26~ofDX1%MdH5%s^CK|@)+9~qmKsWWFP1)&M<-NcuWr~vIkVf0AWTyE29T`juT`u zzN9=#pmqFBrsGf6L<3aF7ltM7aD+Olsic%RaZ0JAhI+cVYnZX0c&0$J=<_gqpMAV! zowtzVWwL<-T{H$R}8e0pHa}vr(LnQCJ4|x#qYF5 z63N>Yzf|rHbX?i2{78WEIVIUW>1~edD^o5ZoV2dRu(B}fQ zO8O4FBhLx|C&!Q>UyVKsS z8Pnvo%J**1uxK?yE5E-NwCLHU7&yhu&^RT^X2EB{tFUo;wbQXU6wVUqC_nK|&x9$Q zm++%vXq-KotMn@f@6}p;gEkv>bI)?kqvg`%Sj|uJfkzu=klC3uUrMx%dlGgJu#7z8 ztUQ*}DuvLeDbF|qMMhq|3`vyHqpN>00000 LNkvXXu0mjf2m@se literal 0 HcmV?d00001 diff --git a/res/layout/conversation_activity.xml b/res/layout/conversation_activity.xml index 2f561636bc..a8d5a685d0 100644 --- a/res/layout/conversation_activity.xml +++ b/res/layout/conversation_activity.xml @@ -86,9 +86,12 @@ android:autoText="true" android:capitalize="sentences" android:background="@drawable/compose_background" + android:paddingTop="12dp" + android:paddingBottom="12dp" android:paddingRight="0dp" + android:paddingLeft="0dp" android:imeOptions="actionSend|flagNoEnterAction|flagNoExtractUi" - android:inputType="textShortMessage|textAutoCorrect|textCapSentences|textMultiLine" + android:inputType="textAutoCorrect|textCapSentences" android:maxLength="2000" android:maxLines="4" android:nextFocusForward="@+id/send_button" diff --git a/res/values/themes.xml b/res/values/themes.xml index 84ba06936c..a759b74539 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -48,8 +48,8 @@ @drawable/ic_send_sms_insecure @drawable/ic_send_push @color/white - @drawable/ic_emoji_dark - @drawable/ic_ime_dark + @drawable/ic_mood_grey600_24dp + @drawable/ic_keyboard_grey600_24dp @drawable/ic_attach_file_light @drawable/ic_image_light @drawable/ic_movie_creation_light @@ -185,8 +185,8 @@ @drawable/ic_send_sms_insecure_dark @drawable/ic_send_push @color/black - @drawable/ic_emoji_light - @drawable/ic_ime_light + @drawable/ic_mood_white_24dp + @drawable/ic_keyboard_white_24dp @drawable/ic_attach_file_dark @drawable/ic_image_dark @drawable/ic_movie_creation_dark diff --git a/res/xml/preferences_advanced.xml b/res/xml/preferences_advanced.xml index 5cb1ba6c75..473d588e92 100644 --- a/res/xml/preferences_advanced.xml +++ b/res/xml/preferences_advanced.xml @@ -6,16 +6,10 @@ android:title="@string/preferences__textsecure_messages" android:summary="@string/preferences__use_the_data_channel_for_communication_with_other_textsecure_users"/> - - + android:title="@string/preferences__pref_enter_sends_title"/> = Build.VERSION_CODES.KITKAT) { - emojiToggle.setVisibility(View.GONE); - } - attachmentAdapter = new AttachmentTypeSelectorAdapter(this); attachmentManager = new AttachmentManager(this, this); @@ -1130,7 +1128,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity public boolean onEditorAction(TextView v, int actionId, KeyEvent event) { if (actionId == EditorInfo.IME_ACTION_SEND) { sendButton.performClick(); - composeText.clearFocus(); return true; } return false;