From d0383867ff318ce2c3468a6c830ddcceb4ea26ae Mon Sep 17 00:00:00 2001 From: Erwan Croze Date: Mon, 17 Sep 2018 14:18:15 +0200 Subject: [PATCH] Fix conference button in call --- res/drawable-xhdpi/options_add_call_over.png | Bin 0 -> 2146 bytes .../options_start_conference_over.png | Bin 737 -> 2773 bytes .../options_transfer_call_over.png | Bin 0 -> 2416 bytes res/layout/call.xml | 4 ++-- .../org/linphone/call/CallActivity.java | 2 ++ 5 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 res/drawable-xhdpi/options_add_call_over.png create mode 100644 res/drawable-xhdpi/options_transfer_call_over.png diff --git a/res/drawable-xhdpi/options_add_call_over.png b/res/drawable-xhdpi/options_add_call_over.png new file mode 100644 index 0000000000000000000000000000000000000000..7dcaf44d03708ba7801a992c4b89daa54fb5d12a GIT binary patch literal 2146 zcmV-o2%YzdP)$+~OU^kQkN3>oduH!>owea( zUVFZ^*7wcKnVBHaU`AbC-LDKY*Qn#5jbX2=%;U>5b-`ORu-#IKim5b~>U!WaAM09+;ktsAqrHUj|p?d?MzN znbji+h0tTDbRlqYJva=WM}Rg11wtE#X(Qo(9=I^AnCcXGM-(S?SY3fo#v$%-C|?Aj z)~}w-HNV(ectn-c_obkiR>{N!eHSVtj zt2igY*r^L`Yuv5`EBHCV*r^Mh7301{xlO54FTsRtjr%TvT>l~F-7TFSCy-a7A#IKO zD&}nET4ofc#T_^1GVR0J8W;EBY8s}!XKSqJ;Jgcw-{_&n-Y=(DjNbcUOcedfWTj=+@Vc*JbPHyiVMT&9v0iR8t7PdVS z9F?Q53G&MHlg#h>5(eHEfSf_P-{L$bodmV@mW`-eN%RX3$-V`rnr0}hwQ&Vrxx?4yc331C6?$Tab03W&om_rp^Pi! zK8Io8x3m^D_Tr4q*HdE_X=JBsXye%HLXyD2^3S|q&Msw?2^Sw;4e z(+DH?G3DuF7i}UN#M3T_Tyaq26>#-5g(5=DO zuAGBs8|YXg@+Dg)LJt7{0#{AmLL`?8+I%a3(6e2+R^WMsp|j6p-}PsfACcRFO$E_i z4Iay^AX!QrxB37%!Eo88W=Vt0=89v}T)GC=VK64Mf@CFeM6LsCfXntDWOrsogUsfM z$X&oME}er*&5L7;KNB%V(1Cf`A+K!u==XzOnAQ{Q@?f4&E&$#i^&^ICfDNFwo|B>AtHFNYqrC^I zyoJwsgSRVq4am)aV*7-VE1d^RDPgv86>HW#b zVAGhH?MIPwixqns%E{0(An?S6<&z!8m&5Fg%$j1FI7Lo(C|WftF>o=EmxGrY)9t~0 z;G->rv|TA!gpt%f$3cM;sB1omBgfx}BR^n~mxT8LX8>Pq1H?D;%%%J|G<1tYl+ejx zULz|n2Hx+4gibQtia)a2jhGku-Ds&cPBg(hxh7fx^7e?{ZfY8id7*wV zqpt*cyDpMfCilZU;~$Bn{!mFlrAA?Un2^I})c>n1ai(NMeh)auCYMa@api@v_l;v( zeukBo`+>XJFgusm7&M-#J+8bEij*He4g%ZC=Vy3)uTAcmHBO4eyw4c)1ux5V#@lk6 z{4;x~tSpj4=Sb!)0A9ZNu8ik+T24wD3ZLOd)VVQEs>QtS43>d`GM$n3H+f!;Y2Vo7 zo9RPkWuX-R6Z7PAZzhoIqqMgs5*%%7TH1?>lplNFh2SHQ<|Z4Mwn_zXOnxnN7x48c zV3dtwZe_kYU7-N#o(kkUwu4cWcDSz9#dbwGwKs|IJ;5r6285wf)530gs67y@4WoL* zb=0)5rj@UU34MV)PT=dI+;X4Qv~uxXjH7Nh@F@5L_-JaH3!|!W;8+`Q6Ico4L0T8> z!D{hzz6S+xtOIBS@^{u@E+@9LUZ`)kP0GpDEiaRT!}P%bxx*w+e>DJkG2Hp!%mV5e z?g#t8_dsrZZv<<&BciY6M+j}IfGVI0r~;~hDxeCe0;+&2pbDr0s(>n>3aA3AfPn)4 Y18*^nLgKmsKmY&$07*qoM6N<$f`)n?eE?i86k`SfQC$-ANM!_08pBRsgZpc%T{5;M+q}%?}?>vt8=QY=|9L9y! zPEbOmx5ddUbJYX=*w5IXcj)_XQzrQ~^`@rw_lKg?2o)*^ytXCf-(a?63$YAIPjC?d z!V$qt63CLUG#FB57gN_`+XhNOQx}2h;4bN1Y5B4wYOdW1>rai&mQL@B;gDy}FpWli z@zH)Nhb?)~H&b7VmE5NX}&q;|hng9Oz_2fT63=>7D@#eU6_ zrw&|&Q^^{7<=XopHn<`BAzRd-UU1Ro*xIFQJxf{F2wnO9ifRQf#hM?cwwlOyCzu#b zT$J8fd9|s$yT?ZP)3B`X>exlU3M;3)nCJ5_!b~Dk_(8(pYh1xi$H$05W2mlE#LVzC ziFq2+!P#k-=eBKk9K@MJ9oXZWQ~r$fJJ#0E||Db`u*--{ITo>+EzBn&YKB&Zs;I&iZ#{GeEPnG87@caayqZy&$kR`B!4m z-Jc>GTmRsa#PszXhx6MZ`mO$%uC?Kr&2a?I`cQq<;+35v!=aOa7l1y2W$})Vza7eY z5cOMEVzj=ZQQE;~e4qB@+W20J#_6{Ml81}9mf1=a#;9`n0o$jBoN6i>VpTY$quXi{ zYyJ~de{H#Jb!K-)1%CUFSql0rfD{{^7qtL9eD<*={kn#GI|sr6zN)i*?)6yhV4f~{K+4U!vhBe56T!z zLS>VmMm3bQ8_zl4UCiA+pnw$X_JsE_=$>U6GPH1*4MBNa1i-~v8l;93kC4%#=S3vW zExU4S3`ufCvjtm1sKIZ6%F2RNJjsyvP+@SZBdKb)}Sa2-Cd7RG?fZmIL4~Jn?4w-v!eX_$wgiLMrJA0;X@j8!D8+j-&hKE zbgH|QZ*xNy^Xf{Cife!CA%{EEdr|YfxU+VcB~E$$xzz%8{SDB4#dz{r&O%kME>haS zFGBTN@Sjyyr(1RE_wkGNjaunuTXhW8N0T+$9-b|C9R0Wy=Jd=K6OTgBI)${4*?d$1 zBy$kF%DSTlVpgepHQcbLwBaKQ1Ld% zR~J;v7mX1ifgIKFT&*4;n46KG78GR}-Zf78)N2C2pFbhw zs+}QJxJ2>#=19MqP$bZPZ5LMe9)-mm`?R#yegvK#!buAv7r6PwMQEl*(a0AzT~7q` zmzM1bkdS|3<0^YMIz)fcgU~OEihgLVGvl7thW@+g^5#PS*I@|dHKxs`s|n{9zdkLn zet1ru%xvIjpadHi8McdLR~Kz&su0bl7B9NE2yKum_UXLyVc<@RShr+|<-VW@)MPj! zCSwU4F1`vAIl5jRS7IQVRW7uUo*1J?jue<4+f~DthdH<5S&wV(jgKX= z)K+Y}1FJ~e*)P_eV%u5qx&jHEgB!x4fuB2V^dwN6*xlkA z&MO3RI9H_2uE4NqLOq%zXk=OQ$87A#z@CMtwWP0*x!1FfL(nm2j26}FA%^G4x6dI? zEuta5Fyi-Xg4QEUA}7te#@KqQY{f7$Q71)TZ^wJDesya-Z%uRmZ0^>G?miv!UG^4F zVzB*Y_V6Xjn-b! zwgG9ZRiD^|+1@Ik*uXocripAv7ZpQ5KDY#Rd&LUThy3b*XspmLHg|@+`PWrt_@GTT zM-_=*unL2yf`uD2j9+I(=YvPGdZ>tLfAk{ca?dP#2F|Wh{2=MT%i~rsB-9ap?|De& z2lpqD9+~A^An?8%*i5Tz!5~Gg)Vk1n{DX|DlmrXy9p=r#d@*5X`iMIDtCOjP8wUA9b_A!K|O?4xJJz%WXxJ{+{D3#2Rm<52UvYPv)e0J5(v^ z*>8b&B}!I+4Z+cW)r?OW0;_UKE7S?PQb#!0INTN0-kKh-tFtm;Um@Sk8jQc{V)aR@ zu;RG%E$A(mCeKU3AKY`iwO%(()zFBXt55y|SDK*=DM(pEMQF0k_uoGiU}0u$T5Ie^ F{2$lCOfmof literal 737 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 iQXnai6i5ohsKCE81fm!Eijvy^0000 diff --git a/src/android/org/linphone/call/CallActivity.java b/src/android/org/linphone/call/CallActivity.java index 4d7858b17..7d79c6651 100644 --- a/src/android/org/linphone/call/CallActivity.java +++ b/src/android/org/linphone/call/CallActivity.java @@ -789,8 +789,10 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList private void enabledConferenceButton(boolean enabled){ if (enabled) { conference.setEnabled(true); + conference.setImageAlpha(255); } else { conference.setEnabled(false); + conference.setImageAlpha(102); } }