From 094ca2dc2066e89743e51af5b0057834c6816c32 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Wed, 1 Aug 2012 17:25:27 +0200 Subject: [PATCH] Proximity sensor added while in call --- convert.sh | 5 +++++ res/drawable/pause_default | Bin 1536 -> 0 bytes res/drawable/pause_over | Bin 1531 -> 0 bytes res/drawable/play_default | Bin 2267 -> 0 bytes res/drawable/play_over | Bin 2252 -> 0 bytes src/org/linphone/AudioCallFragment.java | 1 - src/org/linphone/InCallActivity.java | 20 ++++++++++++-------- 7 files changed, 17 insertions(+), 9 deletions(-) create mode 100755 convert.sh delete mode 100644 res/drawable/pause_default delete mode 100644 res/drawable/pause_over delete mode 100644 res/drawable/play_default delete mode 100644 res/drawable/play_over diff --git a/convert.sh b/convert.sh new file mode 100755 index 000000000..3fb21e15c --- /dev/null +++ b/convert.sh @@ -0,0 +1,5 @@ +#/bin/sh +for file in *.png +do + convert $file -resize 67% $file +done diff --git a/res/drawable/pause_default b/res/drawable/pause_default deleted file mode 100644 index 0ca4db8c134563057f9133893eadcb0790bb9c4e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1536 zcmbVMZA=q)7{9()StqO_lk)!eU@#eN?~bbdjTR<#A!CAM2^?E&Mf%dxV0fl6a z@{)iWhtAARmyKo9=`;@bv}~Cg#KCkfu=oLuOLW5_%d(khvcx50SDnyt`md|-tOk>*hapC;uy%{W4#Qh z3{p*ui=lj-uYb#wL6D>|Q19m5&Rqn}2GvyDMjZ`?1vCVe?TCgcx`p9^muU)wOzspX;7ol80Ww+m0+QYbcT2;stQH&6AU&c zLUVyIA7Dcu&PaLLHr@makuIkY3_G2x#G%Map@foYqEuLesu4{v7|(0TI>Nh{f5TYQ zI#S;mW;8A)!nSd=(2vIa1X!ru(;dYPg=mP~TtH|F)oNquwjdMYD{UrN_@nj(d<23T z5ER9=2#z6o1BzN4Bx$sgxI<6kh|z*3IM%{ibR>rBEmnhGt4C2gYA8hns8w<yZfM zb0n~pp$JcfXeQw|AoyLuTAqp}NRFX+maAvk*2DzV_*tHf_}MTZ>vX_L(ScB0j<;ty zTN}d#+8LjNV}oF+zC>UR|G3VoH`on!3|-FKK%!a)X3*&j!Z2Bk7`%e@{hyj?gkUuB z;rP$6Bvir##*eF`F9@s4!-Ry5;e^$&$YsYNNQ_k4EcMab-b2+lnxLM=sz#?rih6&L z|1H_tPzW~m7eJB^-&2O6;;Iq}>bcO<^A{wVNaBBQ2Uj+{xMc&M@!XWX#5^v!HE6hT zdhBkULZmQ*qFa&$$rR@QXwciEl^p3Fj7iO}UVU?L&jyA0(8y!y{cRBW6WEoi%-kD0 zwpsC-igkGWN=-i)UN^^1&NuGYUVIGXU)El&d6@o5l+b5*UYRC;&Js%% zUDk0~YD}IEp1r(NTGlmtZ(UX{l6P?=ATzQ z8p_ZO7alK|9=RmVmN&o9Ry!oUW}dlU9wRO0wBY&m=>w;buN|@M>)#<-sC3g6h4|yc zIc>k4q04i&{W@Dad6;OwIl7`+crg2EJu;uOv3a}8KUp_KTi%}Bm!=e-$S!WEhXbkVqD=x@xh~LST_G;S&tEcB5C;kCy diff --git a/res/drawable/pause_over b/res/drawable/pause_over deleted file mode 100644 index a2a15e52b4fbc141e25294cff45c17669cbf2598..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1531 zcmbVMZA=q)82`5gsTB=xD%4QV!;Ked?*)2o&ldX*jTTEGSeIqv+Ft32?bW+O3STU^ z7<9;(M#AFUz)CW+SB%S?GZ8bE$u^TNI!26(i!X^;FhlvG%d+hX)a`@u!!Ehp|9S5D z{hs&#VNYZIYK2k(09fs6uzSVt7V*X9D*%w3J6Mn{3MGQWCp5Dmp^M^ZU8jDNTswjp42CoZj;lorHQyZ-sJJ@Hmt`32G#}uY zn82`6D9uRu*-pU(i;*s+5Q(|n&xoV^a-qbMA#o~(U>X#OMACUJTJwUJ{x^*0TJtU4 zF&gpGJln|y#D0XzGGMWGFLsnR6r&+`a*Ws%YOkFQbVlf?;If-w@sB3R1W6RrqZp>E zMRhnz=rPRVwAl<+o6bqtbg03CWjLOPwP%{e1tzH}^ivfq1vBCdSGeisqNe{<= zh9#pCCop|{Hu|FQY1iZkaE zPn4clPp))rl5u&`wW>o^SrRpLU~8RjA^B)Lrzv%`>QLWh=$q>k)8KlaN_jgEN~8)4 zh#`5)1+W{m!oU9b^%`V$KJnByHJG2`51mOQcMl9GjeF)HB5smsKb`1TmyNb#W^m;@ zg{Q17`<2emWc{Yz`&q50CLf<()o|kU$}aHJuD)Eij0@d4x9;PJv}T?d@?IIcuPm&S zjjizc^INYZ9dC}v3zbD@+is+qZ1t;4wZe_m+u;Z6rF-@t4^$wkrA-A6iiKcV8V)dX8@| z2+zJQU6cL!v5OTAQhM~kwjfv!7 zY3JMrf%?*|zs)YI1YxeZYGh$huH9I9{%+;fiP7o1)rwrnwR}~%^;CJ@?M>GQPnzf6 zGDauC!|`>JiI?6}Az}MHdEU;fJEa$1uACR9Erq2=&2!fh2abSylWy~^tn)IXLIyT; W49qNC`q`1bj$MvM`zO}6zJCC|%moPm diff --git a/res/drawable/play_default b/res/drawable/play_default deleted file mode 100644 index cf455e33778685f16393bb551a0a2f496b7fd367..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2267 zcmbVOX;2es8g2q|h9D?-g|TT6MIq@9M-GVO){F))G8(U`bdnAP$U)LB0i_6{i@1Ry zAj*ivgz;jO1+U#LhZ>231L%nCjQ6fPDCh{QuB%kZc#!R=xckGJANy5x_xFC^`#kSm z)m2#;%Yp;v1_A&OEL|>=6W=AoL-Y3q0I%=&4&En(Ik;GXuQqD&BGille2r0sfl@u1 zgUK;eQ(V}Or2&AqR+p{76|$8awNXz)Jvub2-bA1QAT8Z$Le=>g4yv#moq-GetFsFN zbs8?THdzMCOhPPIx4guRtuD#PR+r?f*%~N)DVS#E5CnP*M?tH;z+mB6xzJl)4zc$f z(;@J!3ZBn}-Z`a^Wr0GY83U7PaDp06fx#4nh9o92nap^Q0V6OSX3!Bv0>b1ZGB_{{ zzF!bw&8*RK_lY7>Mz^9SIzof#dc7yEx7rq5 zj{Vn-k7`@8i%l3^j#-SG&1#|^+UO}Tk-OhEuNffe{vrAj~9~$$(Q>2*Q^Lg=~S4DM=ABVKyI`;`kU=EMbaSNr`M$N)mw-BdkQ2 zfC^IhOo2eaW=N*6QiBCY4Qg!4u8y$#9?SYoEJtX@P~2$FHW~}2Iv^|8h#M`rMiVGp zoeauQwa(y?J>_{9tq3#geurr!W}_Z_n_rIZBlelef)tjRC1xP+;${hvBng9+oXjGc ziO*(0@3ETyCuelR8M>!A{-;@{j))HQY(KO9^J#xR@S~l)+=ejNM;s2vH#NlT?u(AE1jixTHsN`bWvxDq zTH9Yipibkp3uf4S=0wfiJJ8(cBkvs_?tO6?Zs75?v*&>}9y!)G$>onfD3fdtwVU{G zMd*`7!dTy!S-f+_v5nJzCoOZku2YEua~4ei*`Uu)AEsBK=9x550q;7CK{MvSP}gMV%Z4kHj}6 zR#i1RUjf;Dc4}c?-6Kc;8F%@r$@%-j(OZttfC?`jP;Lp#Dx|{S{?d{II4yI_|C|K* zMR+@a=(Tq*ZsM(o1rp+*>!$rJ_U0Mok4Q>t1nEvQ~Jox@_8^!9DKGp%rm$U+rE>N=TYE!v1Z-&w;|SF&c=D4FN) znvSM6BJoSRckXC-9KUMUzi&(nne>i4TkvGW`?MJjf<;T4lxJ)&NlstSr3d6W^ZK zKhSb8b#^|QVegKr!8C1{($jDUKO)zuXGsvs3-4TfN3yL88wBubSaMQFm@0 zuf9!*o&K$#O?C-7cz8jacVA;9J*-pJ!5iHO=Zi-cR95i( zV(*#2(cn2(@A+Okr-`ks{<*7Ew!W+2i65gR!5t8%^t-NNmK$n&uT`ph+KvtiONW2S zoL|rE_Th`o5u?qvVXJ)>*u%bR2zJfZHoYKcE7aCX0G zY+N^P)BC2jPAqfwh?UHe;e8iQ(ZW!+j7kPxe^Oq(@=h$r^SdDxXNcMb%5DDv?2l=@ diff --git a/res/drawable/play_over b/res/drawable/play_over deleted file mode 100644 index 42d81a84587fb76f0befb79e2d2c38e357c2847a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2252 zcmbVOX;f2Z8omi3fk1$O*a%dv0cl-G?hV<9GLnTrkSJxbq2id3Tu6ZAhU6*{w+Og^ zXx%_mDoZP^OC7`+Txd1QB6zgb8JFS)hzRY`0a2?{3(Sp*ogbe5n0wAW_j|wlJkPs) z?|aTylDHt2Mh&0>06qR9G^aiREi72q4y>83?E_ zYO;_dM59}g*NMyp0GCWdiV9OH6GU3n$kI45ESu4cvjJf4Jeygg%|S3Q1IaR&qL@R? zXPKZu7sdRPr-YPdDWW&T6sIyE?)a2yeCU17pB zws4a*WI{oPShW^|88e_J(5a}&K$l@rOgz#zDHzR4lCfY@^Yc z*K4#DOG5q#GG4nscjN@((TEmW4EUjFa%HG?nGrEz z3Rx5r|HIN5bRq~ALNF}gLIMuN7s9YuE|o?~qyjl#Du5!z@Px+uxG{1;jF1~46Y{w@ zGX@q$KsZ&x7Yig3NhC);!Bv>7n8u_J&K`L zJ!%G}$vjZ0(Hcxn+j%^1vXvng!*WC?x1dJwb$vyK_xKm^Bz$3vFopxa$y+FexpIz> z#}nesB#z`T-*R>TPtDkPFl=XY{7o#3k*_|B!IZ@CaO;4+Mai%<})e%6;o@BDV9QB$ee4hU8^QO&=kUhgx(5I+`K!fg` zvJTAi^OFUA6ObF~kuaxYPvUL{XIe8czB)_d2b?P0?wWbBv60h})ZiHnz><~+-jyvK zZpXK|*8@`;fR=+^4*|yNp?lx2g)W0RJ*8p|WrTQ|T-mJFl=$vft!lAPt}5$+Fu-f0d@DrXry~PFwsW7_>VU5Xh@Td?*rL1g8h+5falptYphY zF(qMezsrFz^_9^J2O0Z@#A0$QRi%{QBq80g?pe9iV_oO%;i(z$hxO;yxkgHc0kPV1 zjan@5UlI~8DNI{`#4VJZa3Mk1GDXo#(HCxv4QibG>hbLp<3$<1d;K+C+v!oi5r}S8 z$@bDdySrg(y3clE;JPMm-A7>=z{zKXfX_BgbsJn&Gu_W#F^Qfd{GmfW;1WI)K(vVk zr1t&-3AyDsziF_g+{=ES5T|$oK&2nTp6wO)H*tf){%zNFy4FnJprVDfnP)qIY(+@? zx%KQaMPdYD@E7uA=J)gClp!6^E@;E`#IFLpbRQ6Qc9YV74s2^HKJUxORXBFo2u;7+ zO~R9Il*}E$9eapf!`)}sQgX7hO|6TnzFg_G$HgbQtRcbj_!iHF&*!hLsU1JNW>iF1 zm9BMsO-Gl@kA8A>3H94F1%Fb?jJxN`vFNl9^qSzN`?SB!uWg%J>TxV4;7sWjHKA-) zZPCo=n!^J-A0%a@Zw{p#&5g6npr^fvI>YpBJJ5Q1vNC8;-$s$0npB;0wN-rCK5APM zU!S9K_zeEyL87%G!2V6?4q5+*KgqX}p$95I#{6$QWcf`e*B;yh0dhrg@x^Fm zZBybAlph_I$;ec1P{i?dBQH7Mees|1>eN}C-sK~6yY+iFTzj#%G4H$cmODi!Nc&Gd$j z>1;wmqHEd#?*$k2Js zQM5sR)}D_Kzq-o3yd2oJGH7)C9uMBw{`5w}p+k;kcdOlx zBJ=oS%Fy-Il0KUGG<|YRUjM7H6Ts4@ug}*7=LIeOtm644s^_eiDHZ)LKx5|F`|2kp xz#1}nM3#E}U%!sA9giLIja&O3F{ZLyUwTukwB9SWXqe9Xg(7Bw?5IRt_+QX|R;>U4 diff --git a/src/org/linphone/AudioCallFragment.java b/src/org/linphone/AudioCallFragment.java index 8ef8b8c0b..d952f9d77 100644 --- a/src/org/linphone/AudioCallFragment.java +++ b/src/org/linphone/AudioCallFragment.java @@ -19,7 +19,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ import org.linphone.core.LinphoneAddress; import org.linphone.core.LinphoneCall; -import org.linphone.core.Log; import org.linphone.core.LinphoneCall.State; import org.linphone.core.LinphoneCoreFactory; import org.linphone.ui.AvatarWithShadow; diff --git a/src/org/linphone/InCallActivity.java b/src/org/linphone/InCallActivity.java index 88bfec761..e9bac3bcf 100644 --- a/src/org/linphone/InCallActivity.java +++ b/src/org/linphone/InCallActivity.java @@ -86,7 +86,6 @@ public class InCallActivity extends FragmentActivity implements isVideoEnabled = call.getCurrentParamsCopy().getVideoEnabled(); } } - LinphoneManager.addListener(this); if (savedInstanceState != null) { return; @@ -612,13 +611,24 @@ public class InCallActivity extends FragmentActivity implements @Override protected void onResume() { - super.onResume(); + LinphoneManager.addListener(this); + LinphoneManager.startProximitySensorForActivity(this); if (isVideoEnabled) { displayVideoCallControlsIfHidden(); } else { setCallControlsVisibleAndRemoveCallbacks(); } + + super.onResume(); + } + + @Override + protected void onPause() { + LinphoneManager.removeListener(this); + LinphoneManager.startProximitySensorForActivity(this); + + super.onPause(); } @Override @@ -631,10 +641,4 @@ public class InCallActivity extends FragmentActivity implements public void bindAudioFragment(AudioCallFragment fragment) { audioCallFragment = fragment; } - - @Override - protected void onDestroy() { - LinphoneManager.removeListener(this); - super.onDestroy(); - } }