From 6bc943ce025e9ca6b07734d71f66a4a145657685 Mon Sep 17 00:00:00 2001 From: German Toro del Valle Date: Thu, 5 Jun 2014 14:50:12 +0800 Subject: [PATCH] Bug 1018283 - [Follow-up 951665] Pending visual revision and adjustments of the VR call screen when in lockscreen --- apps/callscreen/index.html | 24 +- apps/callscreen/js/call_screen.js | 145 +++++++++--- .../lock_screen/Ico_lsc_hangupwhite_40x40.png | Bin 0 -> 352 bytes .../Ico_lsc_hangupwhite_40x40@1.5x.png | Bin 0 -> 459 bytes .../Ico_lsc_hangupwhite_40x40@2.25x.png | Bin 0 -> 692 bytes .../Ico_lsc_hangupwhite_40x40@2x.png | Bin 0 -> 606 bytes .../lock_screen/Ico_lsc_pickupwhite_40x40.png | Bin 0 -> 336 bytes .../Ico_lsc_pickupwhite_40x40@1.5x.png | Bin 0 -> 462 bytes .../Ico_lsc_pickupwhite_40x40@2.25x.png | Bin 0 -> 679 bytes .../Ico_lsc_pickupwhite_40x40@2x.png | Bin 0 -> 604 bytes .../images/lock_screen/LArrow_Lockscreen.png | Bin 218 -> 0 bytes .../lock_screen/LArrow_Lockscreen@1.5x.png | Bin 315 -> 0 bytes .../lock_screen/LArrow_Lockscreen@2.25x.png | Bin 440 -> 0 bytes .../lock_screen/LArrow_Lockscreen@2x.png | Bin 395 -> 0 bytes .../images/lock_screen/RArrow_Lockscreen.png | Bin 220 -> 0 bytes .../lock_screen/RArrow_Lockscreen@1.5x.png | Bin 310 -> 0 bytes .../lock_screen/RArrow_Lockscreen@2.25x.png | Bin 433 -> 0 bytes .../lock_screen/RArrow_Lockscreen@2x.png | Bin 401 -> 0 bytes .../actionicon_lockscreen_answer.png | Bin 304 -> 0 bytes .../actionicon_lockscreen_answer@1.5x.png | Bin 394 -> 0 bytes .../actionicon_lockscreen_answer@2.25x.png | Bin 541 -> 0 bytes .../actionicon_lockscreen_answer@2x.png | Bin 503 -> 0 bytes .../actionicon_lockscreen_reject.png | Bin 291 -> 0 bytes .../actionicon_lockscreen_reject@1.5x.png | Bin 355 -> 0 bytes .../actionicon_lockscreen_reject@2.25x.png | Bin 475 -> 0 bytes .../actionicon_lockscreen_reject@2x.png | Bin 434 -> 0 bytes .../lockscreen_toggle_arrow_left.png | Bin 0 -> 1210 bytes .../lockscreen_toggle_arrow_left@1.5x.png | Bin 0 -> 1380 bytes .../lockscreen_toggle_arrow_left@2x.png | Bin 0 -> 1545 bytes .../lockscreen_toggle_arrow_right.png | Bin 0 -> 1192 bytes .../lockscreen_toggle_arrow_right@1.5x.png | Bin 0 -> 1370 bytes .../lockscreen_toggle_arrow_right@2x.png | Bin 0 -> 1564 bytes apps/callscreen/style/lockscreen.css | 209 ++++++++++++++++++ apps/callscreen/style/oncall.css | 69 ++---- apps/callscreen/style/swiper.css | 126 ----------- apps/callscreen/test/unit/call_screen_test.js | 1 + .../dialer/locales/dialer.en-US.properties | 1 + shared/js/lockscreen_slide.js | 24 +- 38 files changed, 375 insertions(+), 224 deletions(-) create mode 100644 apps/callscreen/style/images/lock_screen/Ico_lsc_hangupwhite_40x40.png create mode 100644 apps/callscreen/style/images/lock_screen/Ico_lsc_hangupwhite_40x40@1.5x.png create mode 100644 apps/callscreen/style/images/lock_screen/Ico_lsc_hangupwhite_40x40@2.25x.png create mode 100644 apps/callscreen/style/images/lock_screen/Ico_lsc_hangupwhite_40x40@2x.png create mode 100644 apps/callscreen/style/images/lock_screen/Ico_lsc_pickupwhite_40x40.png create mode 100644 apps/callscreen/style/images/lock_screen/Ico_lsc_pickupwhite_40x40@1.5x.png create mode 100644 apps/callscreen/style/images/lock_screen/Ico_lsc_pickupwhite_40x40@2.25x.png create mode 100644 apps/callscreen/style/images/lock_screen/Ico_lsc_pickupwhite_40x40@2x.png delete mode 100644 apps/callscreen/style/images/lock_screen/LArrow_Lockscreen.png delete mode 100644 apps/callscreen/style/images/lock_screen/LArrow_Lockscreen@1.5x.png delete mode 100644 apps/callscreen/style/images/lock_screen/LArrow_Lockscreen@2.25x.png delete mode 100644 apps/callscreen/style/images/lock_screen/LArrow_Lockscreen@2x.png delete mode 100644 apps/callscreen/style/images/lock_screen/RArrow_Lockscreen.png delete mode 100644 apps/callscreen/style/images/lock_screen/RArrow_Lockscreen@1.5x.png delete mode 100644 apps/callscreen/style/images/lock_screen/RArrow_Lockscreen@2.25x.png delete mode 100644 apps/callscreen/style/images/lock_screen/RArrow_Lockscreen@2x.png delete mode 100644 apps/callscreen/style/images/lock_screen/actionicon_lockscreen_answer.png delete mode 100644 apps/callscreen/style/images/lock_screen/actionicon_lockscreen_answer@1.5x.png delete mode 100644 apps/callscreen/style/images/lock_screen/actionicon_lockscreen_answer@2.25x.png delete mode 100644 apps/callscreen/style/images/lock_screen/actionicon_lockscreen_answer@2x.png delete mode 100644 apps/callscreen/style/images/lock_screen/actionicon_lockscreen_reject.png delete mode 100644 apps/callscreen/style/images/lock_screen/actionicon_lockscreen_reject@1.5x.png delete mode 100644 apps/callscreen/style/images/lock_screen/actionicon_lockscreen_reject@2.25x.png delete mode 100644 apps/callscreen/style/images/lock_screen/actionicon_lockscreen_reject@2x.png create mode 100644 apps/callscreen/style/images/lock_screen/lockscreen_toggle_arrow_left.png create mode 100644 apps/callscreen/style/images/lock_screen/lockscreen_toggle_arrow_left@1.5x.png create mode 100644 apps/callscreen/style/images/lock_screen/lockscreen_toggle_arrow_left@2x.png create mode 100644 apps/callscreen/style/images/lock_screen/lockscreen_toggle_arrow_right.png create mode 100644 apps/callscreen/style/images/lock_screen/lockscreen_toggle_arrow_right@1.5x.png create mode 100644 apps/callscreen/style/images/lock_screen/lockscreen_toggle_arrow_right@2x.png create mode 100644 apps/callscreen/style/lockscreen.css delete mode 100644 apps/callscreen/style/swiper.css diff --git a/apps/callscreen/index.html b/apps/callscreen/index.html index 92bed5b93783..22373c56a992 100644 --- a/apps/callscreen/index.html +++ b/apps/callscreen/index.html @@ -51,13 +51,22 @@ --> - + +
+
+
+ +
+
+ +
+
@@ -123,20 +132,20 @@
+
+
- -
+ class="lockscreen-icon-area lockscreen-icon-left dark" role="button" + data-l10n-id="hangup-a11y-button" aria-label="Hang Up">
+ class="lockscreen-icon-area lockscreen-icon-right dark" role="button" + data-l10n-id="pickup-a11y-button" aria-label="Pick up">
@@ -147,7 +156,6 @@
-

diff --git a/apps/callscreen/js/call_screen.js b/apps/callscreen/js/call_screen.js index 98566e97fa93..a95f4d1d3bfe 100644 --- a/apps/callscreen/js/call_screen.js +++ b/apps/callscreen/js/call_screen.js @@ -1,5 +1,5 @@ /* globals CallsHandler, KeypadManager, LazyL10n, LockScreenSlide, - MozActivity */ + MozActivity, MobileOperator */ /* jshint nonew: false */ 'use strict'; @@ -12,6 +12,7 @@ var CallScreen = { body: document.body, screen: document.getElementById('call-screen'), + lockscreenConnStates: document.getElementById('lockscreen-conn-states'), views: document.getElementById('views'), calls: document.getElementById('calls'), @@ -163,46 +164,49 @@ var CallScreen = { this.hangUpIcon = document.getElementById('lockscreen-area-hangup'); this.pickUpIcon = document.getElementById('lockscreen-area-pickup'); this.initUnlockerEvents(); - new LockScreenSlide( - // Options - { - IDs: { - overlay: 'main-container', - areas: { - left: 'lockscreen-area-hangup', - right: 'lockscreen-area-pickup' - } + new LockScreenSlide({ + useNewStyle: true, + + IDs: { + overlay: 'main-container', + areas: { + left: 'lockscreen-area-hangup', + right: 'lockscreen-area-pickup' }, - - track: { - backgroundColor: 'rgba(0, 0, 0, 0.4)' - }, - - colors: { - left: { - touchedColor: '255, 0, 0', - touchedColorStop: '255, 178, 178' - }, - - right: { - touchedColor: '132, 200, 44', - touchedColorStop: '218, 238, 191' - } + }, + + trackNew: { + strokeColorTop: 'rgba(0, 0, 0, 0)', + strokeColorBottom: 'rgba(0, 0, 0, 0)', + fillColorTop: 'rgba(0, 0, 0, 0.1)', + fillColorBottom: 'rgba(0, 0, 0, 0.1)' + }, + + colors: { + left: { + touchedColor: '224, 0, 0', + touchedColorStop: '255, 255, 255' }, + right: { + touchedColor: '0, 173, 173', + touchedColorStop: '255, 255, 255' + } + }, - resources: { - larrow: '/style/images/lock_screen/LArrow_Lockscreen.png', - rarrow: '/style/images/lock_screen/RArrow_Lockscreen.png' + iconBG: { + left: { + color: 'rgba(224, 0, 0, 0.80)' }, - handle: { - autoExpand: { - sentinelOffset: 80 - }, - backgroundColor: '255, 255, 255', - backgroundAlpha: 0.85 + right: { + color: 'rgba(0, 173, 173, 0.80)' } + }, + + resourcesNew: { + larrow: '/style/images/lock_screen/lockscreen_toggle_arrow_left.png', + rarrow: '/style/images/lock_screen/lockscreen_toggle_arrow_right.png' } - ); + }); }, _wallpaperReady: false, @@ -445,8 +449,79 @@ var CallScreen = { } }, + /** + * Code 'inspired in' + * /apps/system/js/lockscreen_connection_info_manager.js#updateConnState + * and adapted to the call screen when the lock screen is active case. + */ + showConnectionInfo: function cs_showConnectionInfo() { + var conns = navigator.mozMobileConnections; + + var nextLine = function(connStateLines) { + for (var i = 0; i < connStateLines.length; i++) { + var line = connStateLines[i]; + if (line.textContent === '') { + return line; + } + } + return connStateLines[connStateLines.length - 1]; + }; + + var localized = function(connStateLines, operator, _) { + nextLine(connStateLines).textContent = + _('roaming', { operator: operator }); + }; + + for (var i = 0; i < conns.length; i++) { + var conn = conns[i]; + var connState = this.lockscreenConnStates.children[i]; + var simIDLine = connState.children[0]; + var connStateLines = + Array.prototype.slice.call( + connState.querySelectorAll('.connstate-line')); + var line; + + // Set sim ID line + if (conns.length > 1) { + simIDLine.hidden = false; + simIDLine.textContent = 'SIM ' + (i + 1); + } else { + simIDLine.hidden = true; + } + + // If there are multiple sim slots and only one sim card inserted, we + // only show the state of the inserted sim card. + var simCard = navigator.mozIccManager.getIccById(conn.iccId); + if (conns.length > 1 && + navigator.mozIccManager.iccIds.length == 1 && + (simCard || simCard && simCard.iccInfo && + simCard.iccInfo.iccid === null)) { + connState.hidden = true; + return; + } + + var operatorInfos = MobileOperator.userFacingInfo(conn); + var operator = operatorInfos.operator; + + if (conn.voice.roaming) { + LazyL10n.get(localized.bind(connStateLines, operator)); + } else { + line = nextLine(connStateLines); + line.l10nId = ''; + line.textContent = operator; + } + + if (operatorInfos.carrier) { + line = nextLine(connStateLines); + line.l10nId = ''; + line.textContent = operatorInfos.carrier + ' ' + operatorInfos.region; + } + } + }, + showClock: function cs_showClock(now) { LazyL10n.get(function localized(_) { + this.showConnectionInfo(); var f = new navigator.mozL10n.DateTimeFormat(); var timeFormat = _('shortTimeFormat').replace('%p', '%p'); var dateFormat = _('longDateFormat'); diff --git a/apps/callscreen/style/images/lock_screen/Ico_lsc_hangupwhite_40x40.png b/apps/callscreen/style/images/lock_screen/Ico_lsc_hangupwhite_40x40.png new file mode 100644 index 0000000000000000000000000000000000000000..5cc7a0b926969214856b0c94fd96ccd36591b510 GIT binary patch literal 352 zcmV-m0iXVfP)VU12289{B4gD;{bT6_f!wYLOr4b2hljSUSUwDxDLp{XFsQ4^Jj ztn^zP3cUB+yads7J`Z>O!tZc#9LM<=9-%bK9P=ztAWg~?r$gKHz?G>%7zN8}L#KLI zv^(vnC{GOLA6wSB`ud%kwv-g#dE!fnZI-Y-a!G?GuS}33M*&-%3cI`wo}5unL3M3v zHh7XIwW15z*8C^0D(FxN@ndD{X^#AZ`||5+N(}8-eou-C5yP-v=9W6co#8h|7GMN} zJOD4WK5NtBgeX-ONs}^P5)a6651ufl%`e-2mlau*|ld|z+wSwHX{4r7cl#u)Se3dl)|tVb0Km6ji#0(dR$zMesjpv^5g+{fZP{lpa+@B7k6+KiDUvyJb!e1bAS>-%s z4in(h;{$cJ=rWrAQ8sMDHf+N-Y{NEe!#4c)`vnjUSA;bWzDocA002ovPDHLkV1iMM B(8d4& literal 0 HcmV?d00001 diff --git a/apps/callscreen/style/images/lock_screen/Ico_lsc_hangupwhite_40x40@2.25x.png b/apps/callscreen/style/images/lock_screen/Ico_lsc_hangupwhite_40x40@2.25x.png new file mode 100644 index 0000000000000000000000000000000000000000..f387313974197b4f89945266f931864ccc59d495 GIT binary patch literal 692 zcmeAS@N?(olHy`uVBq!ia0vp^Q6S900wgCb?CfMl_2RlE(z3v13un^;U&nq|*WFDX0=HNMS@vcGx`aqs z@^)nShS+Iwmo70%&)GG1sf6)7>+fey9QgnFF;98v52M+MdNchv6k7zGpo9xw+l{!e zpf!E{F`ok3Wfr;2aFjjN^U+tgi!sv7GuoFoYfZAQs>p)mN$2;3N{2`%D8*j%UXgCh zo29x#^wH8NbH}t`(b&^|WgA8Lm;HSp`2EVh89nPBGW=elvNeb4PJnc=bnJmTzD=!P zejcv1+Ucyb^Mz7h!IV^;Hi73am0s!GI?l=WIN7kbVA|>3)gi z;TPPOkCryQIK8aXEb655^>D9^!tU~qq^g!#9%o(Vd5p{NqMKROtBS)iVxPAzNN@N$ z$InP|-{pg5$1YxG>Rhz>W?x_6tRD^5=QGukly))NTlEOozh(1u&8-rmGd@j-`XgfGxp0>JSDW`bN4-S;b`~A_qaw%epQ#|a?t-ID z4n2_#8d}!{&i~kw&ZC4lv{ku^F POpOelu6{1-oD!M<=piq+ literal 0 HcmV?d00001 diff --git a/apps/callscreen/style/images/lock_screen/Ico_lsc_hangupwhite_40x40@2x.png b/apps/callscreen/style/images/lock_screen/Ico_lsc_hangupwhite_40x40@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..62dfde21e208c55fc3090e4bc0b7835c51aef6c3 GIT binary patch literal 606 zcmeAS@N?(olHy`uVBq!ia0vp^0U*r50wh%=tkf77m{dJo978G?-(Gk02riU4@Nxa? zPD|ypU0q!ZdPQff5T7g|yQ+CAYbl3SONs7=V|`Z_db@LK*@UDkb1dSS^=RjYB?`>K zR$Ck&E?K&G;~dl9#vcyy<^TVF@BdPP{pb7d-)?5F-?!(obhaCZVvB$in27kXWzXc= zBR39iJC(C=BHOjqTQxp*yKZIObY|7bNza6h&pdX%Yb3X3ajzWTCD$IcJ*SM$M#rr_ z$s#ZDlttb02wT&K-om&EkK6?sf4_XLW7zb)J=`W~#+>^H-1G`2%KcmGI`89zDc2A5 z#;6?(3p-t%_pxQuZinvGG0SIOH9ITn_O-FF&7z??^WMkC$f6qc<;xtn*G|28M$hVH zlJGlQwS(8A8hM{^Ja(Ho-6nMQ!fjSo7UwLj3ZGjp&t{cN=GiM$zSEaYf7eb&`6|{Z z%|!0Nwc>jd2;b(7a1R>^p4eE(_55v7G8cWvtzbd$t0Zz_f?$L8t=aN zlO|)VS#pchn$_*%%takD&0oAN3_s>OqhNl9XCZ!03JM9R4 zW+Tk^ZuQJ1 p90D~Dq_{rbXY*RXf))K^{i8WiC9*!o6_{=qJYD@<);T3K0RSYT4RQbg literal 0 HcmV?d00001 diff --git a/apps/callscreen/style/images/lock_screen/Ico_lsc_pickupwhite_40x40.png b/apps/callscreen/style/images/lock_screen/Ico_lsc_pickupwhite_40x40.png new file mode 100644 index 0000000000000000000000000000000000000000..367e156792e115859b7be292ff3d61382351c9fb GIT binary patch literal 336 zcmV-W0k8gvP)E^tX=1=evj>9ql`z_()qUK3ig z05=GAnf^OCLFk@Ai(hVmZwcjHkJ7E{y9ebh6THxwTy^D-tW|jd;E{pI8>Y65YugGe zaSFf(4I5BYxC5ZgxD6<(Jo`)5Y(O!^D*zp4Y(UYVgKLk9f17769u$*2;d-aZCM}@L zYCI@Lxh35erC3muIVRl!{ZXLbB5i(m&QLrkM%d>Q2)!{I4f>67_=Db1L-Al(nFWqm ip%2-BVFg%#Hv0l5Ng?N4&TqE>0000r}hZmdu!OVkZzfwh%|lDZ3)h804o zS;#Hjdu2m2(=_w8a(dXxw(!H~MK=4v;vjvaKhpGr#qr?CI<)*?aUP2<+x+0k`~J=mKX`_R zggs&%3bvO+rNg!xge@~m6Cvu{X2gIKsbF!A5n)3*JZA|27&Ds+7RTrj>lQO-6)XzQvcTVaLL&)mTg`DT# zQP!%QV%|Rd8M}}JY}>#|?r{_$PuP~>3}?8+WjMpX0h%V!sdG1HL;wH)07*qoM6N<$ Ef{8!dJOBUy literal 0 HcmV?d00001 diff --git a/apps/callscreen/style/images/lock_screen/Ico_lsc_pickupwhite_40x40@2.25x.png b/apps/callscreen/style/images/lock_screen/Ico_lsc_pickupwhite_40x40@2.25x.png new file mode 100644 index 0000000000000000000000000000000000000000..72d681fe888878396f1285391cb24e3af059d4c2 GIT binary patch literal 679 zcmV;Y0$BZtP)k9QbkMd7kHap67X<_kSTtC%aMH z6H#^%7@|C%qL1(cfB}m0C3*wz`Qsi1`4QdCzuNO5`Y^5w)}s>)kgM5tbR$7#ska?d&Jye#vKw8(I6-z=dR$ynx}hK=T7HCI8KdN?uzYDLqgLfQ zWc$)0#ampR)_-ipaa^-(vK}q&;<{!(dOc%g`^t9f(V`hwkNs%Tfvd@WbQyzWn_!3a zXt9rPWP3@m^=Q$8tBZv7XmJZyoBik%4{^0xj~43~#C6qrw5a3*uA3CtjuzE?!qvxG z+tK0xlemVdu^lbyna1^Zqk_z+U&BhMR(ti=Gab`MEe1=uZM-6iAu8keJlvIXpD0GzAAht+ za-ArqXox>rh(bAfTaoHlFJ`l8>9J z^;kv4z%THjKB?NgWG8S{S5>WB@xXVlaZTI$QH#TraqYJiC`NIOTMO)Do=Pk1wiPH& z;Cf*#P>kccU@fqN87eK(V=GYXV~I-dN!tn(1Gt{jVk=M#ySdQ|$|9oKv0RB8wF0 zPa;rsGfl0JTqcW%I7kiv_`}&G0!0^ZsISCNDwVmCM4(v5eSF;}ia$`K7{b>C?QsRV zJ4pdQIXaUF6g!y2Po7K?fufaRR`D^%-uMFD9U_m90{zJZiZ+H=qPZfOI0M~fxJ#M; z`A#2-JJ8($9yN@7P8Uih&|Q{Me&PDTASsk&pu05ZdC4*WB}UkYd?(^t2S>R^4?@NQ q-G#sq7y?6}p@qN@7y?6J2>c7kA&{s*hJxDw0000ecDav;1{B^|#^4u7P{i zd|P(w5ptY+5k{Iz3-If!rE_al_35CcQ>#czla`K^NX1c0V_l?`6PmY3y)#J{@m(_V z4JKxi_OqBurb^__p=4$qd1)-U_+PXyxzb1eu(y@+jRp82yNlab0}rZe8=md_0jl^L Ucb#OXXaE2J07*qoM6N<$g8GhN>Hq)$ diff --git a/apps/callscreen/style/images/lock_screen/LArrow_Lockscreen@1.5x.png b/apps/callscreen/style/images/lock_screen/LArrow_Lockscreen@1.5x.png deleted file mode 100644 index 85d847843db5358865d6740e95660a236288eb72..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 315 zcmV-B0mS}^P)?+X{w_py)j)a&y7xj3hD zVi8tEKT24@4gnG{FNY1>S=AaoVg+~M!xCn&fV(os&80Ad^B6-eiHQiONUAV_u?Xi# zt1ylq5iaonxseEek%in)gj?hx_bI|13XtoGFhB`%&ms&_hMstr2UPIyLQnh!)7GAN zfw(0ez%Tm+x|9?V@z64R+eRj76&)0W@;=L;6 z%2-0`mC(hhQf?6)1hkP=O3mUOL0^`YLepp?d~>KjHi0I>59)9?hF1jrZdi^+@Pd$_ ztjGpYHw-@@uZRkGGz>qYposE#Fbvl*sEBg7GYr4Peu-J!8irpnrie1QG7L8{u84YZ zVHj>>S`qc!AhSw(hW817&}k?k0UyPl`smT|bO$SMd1Yl^IZreSzPj&=>hTXI%S z7(R!)R>F7*?rMgQ#NDys2Qx2cQ|KC=Av1EehmfF!Njb{k#&F;bMLFt2)o`GJQ8~)t z-f-XkG=L|=fg191G=yivfqUfSXcP^@fhw|cRK%O%z%?>*G>Mksz$JR+ zXa;S=fm8Iz(HuI41BY_9WIRxkvlYXWv

r34cug-1;x$XG*EfAI2+6vF&fK#eSvS iJ_4@vPaUC*&prUXx|tYsg}p@p0000420ve8sbB8rH1qL3h?1ThVw#TKb7HMeYW{{K(tJ}B@&=b2aMf$Q{!VTNzM znSfS89D%F=7g z+DO8*TM>Q7f+ZM5O+@Q(EKvt_5v?I=iN?_s(I?DVqDizx^Z^k|G>xu^RuHyCGx!kE zD}*f3WqgY01x#Co`i&N0+B(#aJ`dA2^;N`vnCywmQUm54cm&Te(T>Ihw=wZ@Bd){_ prdoa|_=rGOgo{H2w(|eu{sJCMc=#==S$+Tj002ovPDHLkV1j=BsQ&-} diff --git a/apps/callscreen/style/images/lock_screen/RArrow_Lockscreen.png b/apps/callscreen/style/images/lock_screen/RArrow_Lockscreen.png deleted file mode 100644 index bdf9b4bd6389996eddebc51d9e4c95ddf724dc12..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 220 zcmV<203-j2P)VSR~IKi+S}{*j6RZ!tFsUYgxlYE2!VuMPqtcU z9)|d;Y3?eG?SrL7#czM$*_G0vPfgRis64d_-Z-m#tPAd(R6ex{UYm>xpL;RF54ATj zJ1#Ug1-~*gUG7XevJUFZk|tI`y?N3>UgR=q&qvUgYnk_;=63s^_iAo5j|S~n4(T8A W@*HV)#%Htu00003~#H9tZ!Tu2rX5m5vYh?w9;#D$QESbiYGpw9XKKcRc!BIG>tp7Dlj`Mj$$ zb8)PTYh*5u2wT*VsXMr%HEIa12lvk}DhO&0cVdA{m`&h3W++>!V=E4P!K{Hu9O%HTiC7%Cg;@)G@dkn#dB!o! za#(oAE0_)8Jo?sfAckuc&F|d9{Nr@QFhT>e4>635wh_aZbKmVdf_gm}ej>OU5;$~`xheWMs~cqQ54^EN4sQ=~bpQYW07*qo IM6N<$f*Zts=l}o! diff --git a/apps/callscreen/style/images/lock_screen/RArrow_Lockscreen@2.25x.png b/apps/callscreen/style/images/lock_screen/RArrow_Lockscreen@2.25x.png deleted file mode 100644 index 04401d927357f00b25d094d4f972f1262f37b20e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 433 zcmV;i0Z#sjP)n~4^Px+@gt!Bn(t#|5 zhJieY&)5(zOTz)o4e^5XV)Z~7q$N*6hX_AO9ElYz_Wduzlm@U ze9^mX@GSjbd^Ch#Ai?MO%QA!j#3!@j6JZM?pXpNg9g^VW+-u<}q`}!a1O=av0q183 bS(m|I2cel6A*mNJ00000NkvXXu0mjf5goR< diff --git a/apps/callscreen/style/images/lock_screen/RArrow_Lockscreen@2x.png b/apps/callscreen/style/images/lock_screen/RArrow_Lockscreen@2x.png deleted file mode 100644 index 2808596688cee9b3e196f856b6fa7d1950c674df..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 401 zcmV;C0dD?@P)EBu%kHOPJoOkKPgxq0}jw0QqK>72sEb!Pb0vf zAGD!Giv;~fYg)8I&@Z&20jJOZppe}kPXamh_P!IV8eMXK3O`_JOiSxC?@PqGc&o5*(weQtV7{(67rsc77GvG>WyzWog$acOC)mBlWh&V25VH vxg)N`1ru|RLkv&c!VW^LWGu}^6&uhWm1=nQt~Qj=00000NkvXXu0mjf59zAx diff --git a/apps/callscreen/style/images/lock_screen/actionicon_lockscreen_answer.png b/apps/callscreen/style/images/lock_screen/actionicon_lockscreen_answer.png deleted file mode 100644 index d34fe5040f2aef2cabf962fd4901ae06e1f4af9a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 304 zcmV-00nh%4P)dtU<4*0jKByTfe{$N+9f}6-@>U@XCoyumsHyt zF=Vix9~0BF_f;&lhY*%TUupawet0000Wz!@MKz)6s`S$5A~%PzcT*&_n4G~mBvKhoq&`Clw-!qbWD5i^r;tPtJ} z;8}$ChVTr+YlASs84Wxev)s8fFvt>4(xE~4$=rAlHzIY%(0gdTI_8nnp4_FyeoCQE`VgNDFdE>IzoE}kNYY#5C1B^>Te_DKFO=@2gG+TCq)FStB?9S7$936`Jb0u>Run~16h*lUZ$HW~mavjCqE*Z=?jGpt=pDyn+dy$xuB zU`dc)Fav|Y`|}142?hND_t($guh8(u+M2Ai#ikD}c*{yiFLx1;#mv?)t3o}(r z&8E9;G@E`bC0DQa>a7^5i#J-myEm39UD~_%t z);lv!7)2at<7&#-nasi^8*_covj zf+azI!3+%V69ncv7~DS}u)klSV12^^RTo_b2F7?#7srr_xVKks_8vCialNSMnj3fc z-|V@poN_q_mzV@lq%$Uef zVe~xk9{XfveU=L%^MdSdupjVa^i>o(@K!U7OXF_5ugr!7EjLEi^G^>l8j728X)yau zWKOyqXR*LEXBLy!QTBt3tkMI*iMRh3QHh2 zYtc2?S<2uE=-ucz2*GF!@G9x{>}Cyz%s9YVnrx09vD1b{an^L HB{Ts5B+JT@ diff --git a/apps/callscreen/style/images/lock_screen/actionicon_lockscreen_reject.png b/apps/callscreen/style/images/lock_screen/actionicon_lockscreen_reject.png deleted file mode 100644 index 4ede38f43e8b4c1f4d28bc598989abda9cc73a3d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 291 zcmV+;0o?wHP)v7pcn0`S0|;N|*WP&)#b1;fq30Sq^LdMKGk2Ggq-2{A&HpD*`bA{i@vwnlbN z=|5Vqt0dUn5%lZ}QTgM))e?+g1#@M=S?We+i@(^+NmHkW3@1N|jANhHH7iR=tj*WZ=g1Tk|4ie zhW!l=3H=5N0_*Pwygxs`phWG}38370PZ!6KinzCz0<(`O2(Ubu8EN{gXy@(!|FgLl z2JBMv;%cq_P%Uz-H07iIvdmdso+^K(Jx_AAO`Gyke8%NVGiS)#eK_&7B+Vo4x#;uT zugur9$+y-CbMvjZ`CsAs;y01k)wkZfn7h%pW?pGL!wKp2ya&H!eP-G)-(Dl@^jn9o z3J(uGb8KyWBR&0|VvcWWiOJH#WdgE1yM_2$_>Ma6ecu(d=Ej=XE0M_)Rxe3O6MZxx z;H-{k)XDqizXK$vcfG4WX(4^{-SiBJjc0<5YG!24TBd()s%}z@?*7X_uQ7PK`njxg HN@xNAX3voy diff --git a/apps/callscreen/style/images/lock_screen/actionicon_lockscreen_reject@2.25x.png b/apps/callscreen/style/images/lock_screen/actionicon_lockscreen_reject@2.25x.png deleted file mode 100644 index c4a0985a6c0c30e41ddc5f0e2f0782cb3d0be836..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 475 zcmeAS@N?(olHy`uVBq!ia0vp^Q6S903?%u>HW~ma;{cx!S0Md>M0BI(kvCAAKuM5a zFhj%s_XZC46BPOd3f9jLIKLzH-BAVxMt4sa$B>G+x7SYh9X8-#y}*5}|AyzO|MhRT z%sr|RSv$nRb(xkO)Z&l|4U zTbD;~*{3;kmRz=PtzUm`&gO)sCv)o8-#)yXRa)?EdsOKC z0DkMYE?XY9&i31V(0!7h7q8!LzgrK(mKQDW;taa7mSb5-5u5)N!`0WnZmNpRKK{KG e7$k}<4e})pS?t%-?>Pd4o59o7&t;ucLK6V(jmG2v diff --git a/apps/callscreen/style/images/lock_screen/actionicon_lockscreen_reject@2x.png b/apps/callscreen/style/images/lock_screen/actionicon_lockscreen_reject@2x.png deleted file mode 100644 index 9a22a5725d649ac29c7d49872dfce32a0c868b09..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 434 zcmeAS@N?(olHy`uVBq!ia0vp^0U*r53?z4+XPOVBj01c^T!Hih648yCN8Uhf0wqCy z!3+-j8{P}_pHDC-xIaH&y#jAOdlUl$qnxLUV@O5Z+pFGrhYfgKFS-ZS-{kzh|CZX< zC7v1WdDfbzjK%IfXlnRi-Xh?{(ddzq_-xgDHDi4x7mM}V4|$fW>aG2K{KyTX@b=`A z*h%vyOcP~45mB5Yc`gw8LzHAxHM_k5>dbKF!p_i`t?r! l-21!K>cU6juh#$o diff --git a/apps/callscreen/style/images/lock_screen/lockscreen_toggle_arrow_left.png b/apps/callscreen/style/images/lock_screen/lockscreen_toggle_arrow_left.png new file mode 100644 index 0000000000000000000000000000000000000000..7323fccfeb68e3fc9c49663cea01b16ce8e658ad GIT binary patch literal 1210 zcmeAS@N?(olHy`uVBq!ia0vp^av;pX1|+Qw)-3{3k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+m{l@EB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxSU1_g&``n5OwZ87 z)XdCKN5ROz&`93^h|F{iO{`4Ktc=VRpg;*|TTx1yRgjAt)Gi>;Rw<*Tq`*pFzr4I$ zuiRKKzbIYb(9+TpWQLKEE>MMTab;dfVufyAu`f(~1RD^r68eAMwS&*t9 zlvO-#2=9ZF3nBND}m`vLFhHZsTY(OatnYqyQCInmZhe+73JqDfIV%MiQ6s4IL(9V zO~LIJ6P$YWfsWA!MJ-ZP!-Rn82gHOYTp$OY^i%VI>AeV;uy1ttOk-eR)bVt245_&F zaF507OwttEOgBxzIf3&NA0X$v}?5r@E);!qr0u3$2?SazCv@@ zjSB|qevbs_TO1C#y0gn;;YN>)3lB^_RUF*BDO_GLZ~0&O%P%>NL#`ZTzN46aHhE*D z)P_0NJ~kMhoBH%iqx72_4HM?x*lfRB*7fw9n=VD(4w12b>#w=oxwU!qy5#E~`vNz& z`it3Y$=}<~eDu8O{x^3YvoD{qB5GOmhjqCRZ*vqSCvo0gpFBBxMa|Xve5=1)1`KC< V-8gi(c7%aS6Hiw^mvv4FO#rOc-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxSU1_g&``n5OwZ87 z)XdCKN5ROz&`93^h|F{iO{`4Ktc=VRpg;*|TTx1yRgjAt)Gi>;Rw<*Tq`*pFzr4I$ zuiRKKzbIYb(9+TpWQLKEE>MMTab;dfVufyAu`f(~1RD^r68eAMwS&*t9 zlvO-#2=9ZF3nBND}m`vLFjeFsTY(OatnYqyQCInmZhe+73JqDfIV%MiQ6saIL(9V zO~LIJ3!HlOfsWA!MJ-ZP!-Rn82gHOYTp$OY^i%VI>AeV;u&1f#^)WCoUh{Nu45_$v zWyWc3*FceD=S%as6g3kcL{2dZRPvlMiD$}*WCumhldAu?^4VH=&g@BA#G}y}WE8}9 zs#rmo({RG;UtwW4Q>)J9)~~L+n_qPPXX&lCd%t~ZJ)GFSc9G1Xt|eRgeXS(7Z1Vix zY_|QLIOj{I0QMk9&gLy^9t-~c%P^hilIeng&qftRPrWO4_#bcZoxmjLp!{RYU+?l2 z8?LlOAByu@-dJ{a`Gbas1(FOG6*b5l?Ey!5p{T+bw``l}`^uVmbF zLr<3fmq~ncX`9}9X%)%nm=k3$buO&=DKN+2%VkG_3(P594}}8QPMNN6s=mGS>Hp?g zOC_U{cI1gR=bZigV6LOpoxia^8zQSc@A;~4F z+%nhaFjPq{S$gikyk~3^PAlk|F5bKK{*D(>`nt&*L>CLMDf#>`?%b!OgKf@crzc;0 zx8_;N^YRt%Zs_T5iduHda-IErw_;6=bODH`>XN+hWHIpp|2AIUxCU!Pgg&ebxsLQ00m|G+yDRo literal 0 HcmV?d00001 diff --git a/apps/callscreen/style/images/lock_screen/lockscreen_toggle_arrow_left@2x.png b/apps/callscreen/style/images/lock_screen/lockscreen_toggle_arrow_left@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..e61fd3203a8450683dbe27750b2f5f50c1b2a84b GIT binary patch literal 1545 zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw1|+Ti+$;i8k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ-L~|RWd^&N+NuHtdjF{^%6m9^eS=-fVzQ(*;f=KCTFLXC?ut( zXXe=|z2CiGNg*@ERw>-n*TA>HIW;5GqpB!1xXLdixhgx^GDXSWPQj+a3TQxXYDuC( zMQ%=Bu~mhw64+cTAR8pCucQE0Qj%?}1aVY^Z-9bxeo?A|sh+WJvVozYf|;3~p^2%P znW2t?k%6I+z5x)K=^C0?nVMM{nJYkn6417ylr*a#7dNO~K%T8qMoCG5mA-y?dAVM> zv0i>ry1t>Mr6tG=BO_g)3fZ zE`@j@w*YQzUNJP7fB~jokyxN_sAmB35=^15FMg%Dxp39RB|)hO_hL1;IHa;5RX-@T zIKQ+g85nVC${?!>telHd6HD@oLh|!-V4)b0kzbNuoRMFk;2dnGpy8XCoS6p_&;;x7 z^|kWMD=taQOHTE4u~h<^p_iGNVr5`x;OgY+V&LLv;%sQ>YHZ=?YUt=}YG~nPVPWcO zVFAryA&s6|>+A0%^TO5r|U5s1} zoPg#zVRs8eZweN-K=nG~)TkpMZko8n?KZv zfq|*o)5S5Q;?|ql8@;0wMULigncCFEDjvIuEA6r9%?LK_M=<>{qJ`> z@1MSsW%_!_t4(~Xs~@yzU-mq3e&I(y#&?a^7Tnxn|H9F$L41LZ35#u8oyPxm_66Y& ze<_-*t@B>*u=n9F{x6}DKQv7q|4DxlBRa$TLiBg@KTUR8_Dj_l8b05?aQ>o4#>WxdulNqNAB6ez~}d!%~u_`W3{jBACFZK9|PAy&jdr4+YSF#F>QWZ{j!Gj*R(6&*2x}N zdf~z5yoGC3c2C{WsJ=k_++Om zKp~?z)0Wn!>B>6plMdwY)Z`RPm`N?;`or?7xbA#VNFhVG^1fw!HIkWJT(1tqRPoJu z{=U*ha>mx||4G+>rSI8n=EF9bCGF0xw>FP&c%~+ZC12-$9=>*Bswb0iS#0^d%%_Wt z47xwQ?)>b1ZH~M5x5KmZa-ZqOhOnpcM3>Do%=MF;an$0QRgC-cwn+!>RMr;EE6k0P z{81k(oP0Yj^+86w&4eR%yYKE_obl=453|)gXFlB&dwhG6Re{OglpgDaJUQ29`5T{m z8^+e>ry%kCoHq09t>(ocLxu^=JBU@T-sPjrm`H z@XD@co^9&)xn`rpd9TfviX8UT#c6+gnWUEbUN=?enWyWmds&@-Z||?q_uTuAMS{V( Ws_@5ylIL}x!r9Z+&t;ucLK6V2%vqWM literal 0 HcmV?d00001 diff --git a/apps/callscreen/style/images/lock_screen/lockscreen_toggle_arrow_right.png b/apps/callscreen/style/images/lock_screen/lockscreen_toggle_arrow_right.png new file mode 100644 index 0000000000000000000000000000000000000000..684930ee56d68c794a6c527f6558b7cb8db39ab1 GIT binary patch literal 1192 zcmeAS@N?(olHy`uVBq!ia0vp^av;pX1|+Qw)-3{3k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+m{l@EB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxSU1_g&``n5OwZ87 z)XdCKN5ROz&`93^h|F{iO{`4Ktc=VRpg;*|TTx1yRgjAt)Gi>;Rw<*Tq`*pFzr4I$ zuiRKKzbIYb(9+TpWQLKEE>MMTab;dfVufyAu`f(~1RD^r68eAMwS&*t9 zlvO-#2=9ZF3nBND}m`vLFjeFsTY(OatnYqyQCInmZhe+73JqDfIV%MiN!4jh6b)q zt}eLEgX&Ge?G_81ZqWxiMjsTlNKp+F0;V4j6P|E^9C*@C%>$zij)#D6pO}Nm!w5(UBxKqfdq!^R6?0G*{qbd=&rX)baU^6>I|D zjDhEALat$7jHjG zci1D;@wFkM_ukga^;O3WnN7T189u6JMEaR`b2rQo?fCujWpc#EoxC0Tmp3y+G95Ac zqUXT0aAgIf<+Pw6&o#`C-hWxAa%sWY`J7Lpy!wuEU0{=6vtvoL^8$`l%csxN6_8fg z)^zNBZdKG8wp^AoOWd?4x3X-Vy-;lb^0uQr%In^<2qZB4H*);M(KY2PsO<1`^>bP0 Hl+XkKrXZ7{ literal 0 HcmV?d00001 diff --git a/apps/callscreen/style/images/lock_screen/lockscreen_toggle_arrow_right@1.5x.png b/apps/callscreen/style/images/lock_screen/lockscreen_toggle_arrow_right@1.5x.png new file mode 100644 index 0000000000000000000000000000000000000000..da640c4b6c19219b9a7d87ea8572b0b250b8fcfb GIT binary patch literal 1370 zcmeAS@N?(olHy`uVBq!ia0vp^x**KK1|+Sd9?b$$k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+m{l@EB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxSU1_g&``n5OwZ87 z)XdCKN5ROz&`93^h|F{iO{`4Ktc=VRpg;*|TTx1yRgjAt)Gi>;Rw<*Tq`*pFzr4I$ zuiRKKzbIYb(9+TpWQLKEE>MMTab;dfVufyAu`f(~1RD^r68eAMwS&*t9 zlvO-#2=9ZF3nBND}m`vLFl!_sTY(OatnYqyQCInmZhe+73JqDfIV%MiQ6q^IL(9V zO~LIJbDVnhfsWA!MJ-ZP!-Rn82gHOYTp$OY^i%VI>AeV;ur;N(3oT={v$=8dz8{qEmB6Tbi1%`;!Jtv=V?|JF`^TarB&z3VUIMZg{Wz==QTw8EL=E0w^!g+kn`V)BAws^!hhd#3kSh#fO znMUzvip$*=+`gn_b3TUS)Yg(CvC-$QE5&A?HkVqm^usrU_@-puOMAC1vpaTq!Np5K zCDAj=4@_*EXwDER^>bP0l+XkKev$Z8 literal 0 HcmV?d00001 diff --git a/apps/callscreen/style/images/lock_screen/lockscreen_toggle_arrow_right@2x.png b/apps/callscreen/style/images/lock_screen/lockscreen_toggle_arrow_right@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..e90c18f59c66d09cc7baff42eb27df8fefb465db GIT binary patch literal 1564 zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw1|+Ti+$;i8k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ-L~|RWd^&N+NuHtdjF{^%6m9^eS=-fVzQ(*;f=KCTFLXC?ut( zXXe=|z2CiGNg*@ERw>-n*TA>HIW;5GqpB!1xXLdixhgx^GDXSWPQj+a3TQxXYDuC( zMQ%=Bu~mhw64+cTAR8pCucQE0Qj%?}1aVY^Z-9bxeo?A|sh+WJvVozYf|;3~p^2%P znW2t?k%6I+z5x)K=^C0?nVMM{nJYkn6417ylr*a#7dNO~K%T8qMoCG5mA-y?dAVM> zv0i>ry1t>Mr6tG=BO_g)3fZ zE`@j@w*YQzUNJP7fB~jokyxN_sAmB35=^15FMg%Dxp39RB|)hO_hL1;IHa;5RX-@T zIKQ+g85nVC${?!>telHd6HD@oLh|!-V4)b0kzbNuoRMFk;2dnGpy8XCoS6p_&;;x7 z^|kWMD=taQOHTE4u~h<^p_iGNVr5`x;OgY+V&dXx;%sQ>YHZ=?YUt=}YG~nPVPWcO zVFA4ZC^6&~0Bv?jEy^rQO>ryA&s6|>+A0&bTa0j;2i2Q` z+bza8_38s1qYsK&q^O1o0n-nN2~W5{4m|0n<^j`t5int=mHP)XFfjFbx;TbZ+gFl7#_T3L!f<#g(|YoK`AWsJUgxKXNM9i`pR)drskz``bk#e;Nd1 zca&UQH1}Q81hI+SqD=xiTAz~t$Xkn_J7ZM!-S%89d)oz0`Pf84S`Z)9UNr-`NPfU}hx-3n|HvIl6%HwL2@4co2 zon;4~tX%D~PkR3rkX z^jPs&Z?Dv{a7k;ge~-;w#}5c7Y{R=NoMuSg>h^Y z2@VvLej>B&czgMQ4V?ijrtO*2?f-x2d&Q-GBjL0*|2@YZ9e21W*+ W`|oQEd-V^1%4<(oKbLh*2~7Z1n^+J4 literal 0 HcmV?d00001 diff --git a/apps/callscreen/style/lockscreen.css b/apps/callscreen/style/lockscreen.css new file mode 100644 index 000000000000..2baf829bfea2 --- /dev/null +++ b/apps/callscreen/style/lockscreen.css @@ -0,0 +1,209 @@ +#lockscreen-header { + z-index: 9999; + position: absolute; + top: 0; + left: 0; + width: 100%; + -moz-box-sizing: border-box; + padding: 2rem 2.4rem 4.4rem; + color: #fff; + opacity: 1; +} + +#lockscreen-conn-states { + width: 100%; + display: inline-block; + font-weight: 300; + font-size: 1.4rem; + padding-bottom: 1.4rem; + + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; +} + +#lockscreen-conn-states span:empty { + display: none; +} + +#lockscreen-conn-states span:first-child { + display: inline-block; + width: 4rem; + overflow: visible; +} + +#lockscreen-conn-states span:last-child { + display: block; +} + +/* For some reason display: inline-block disregards hidden attribute */ +#lockscreen-conn-states span[hidden], +#lockscreen-conn-states[hidden] { + display: none; +} + +#lockscreen-clock-time { + line-height: 1; + margin: -1.4rem 0 0 -0.4rem; + font-weight: 200; + font-size: 8.5rem; +} + +#lockscreen-clock-time span { /* optional meridiem */ + font-size: 3rem; + display: none; +} + +#lockscreen-date { + font-weight: 300; + font-size: 1.4rem; +} + +#lockscreen-clock-time, #lockscreen-date { + color: #fff; +} + +#lockscreen-masked-background { + position: absolute; + top: 0; + overflow: hidden; + + /* Must match the CSS background rule of #screen in system.css */ + width: 100%; + height: 100%; + background-repeat: no-repeat; + + -moz-user-select: none; + opacity: 1; + z-index: 1; +} + +#lockscreen-masked-background { + background-size: 100% 100%; + transition: background-image 0.3s ease, background-color 0.3s ease; +} + +#lockscreen-masked-background.blank { + background-image: linear-gradient(to bottom, rgba(0,0,0,0.3), rgba(0,0,0,0)); + background-size: 100% 22.6rem; +} + +#lockscreen-area { + position: absolute; + height: 10rem; + left: 0; + right: 0; + bottom: 0; + z-index: 4; +} + +.lockscreen-icon-area { + height: 10rem; + position: absolute; + border-style: none; + transition: opacity 0.5s ease; +} + +.lockscreen-icon { + margin-top: 2rem; + width: 6rem; + height: 6rem; + + pointer-events: none; +} + +#lockscreen-area-slide { + text-align: center; + width: calc(100%); +} + +.touched .lockscreen-icon { + transition: none; +} + +.lockscreen-icon-right { + right: calc(50% - 14rem); +} + +.lockscreen-icon-left { + left: calc(50% - 14rem); +} + +@media (min-width:768px) { + .lockscreen-icon-right { + right: calc(50% - 20.5rem); + } + + .lockscreen-icon-left { + left: calc(50% - 20.5rem); + } + + #lockscreen-header { + padding-left: 6rem; + font-weight: lighter; + } + + #lockscreen-date { + padding-top: 0.5rem; + font-size: 2.4rem; + } +} + +button::-moz-focus-inner { + border: 0; +} + +:-moz-any(.touched, #screen:not(.locked), #screen.attention, #lockscreen:not([data-panel="main"])) +:-moz-any(#lockscreen-left-arrow, #lockscreen-right-arrow) { + display: none; + animation: none; +} + +#lockscreen-area-pickup > div { + background-image: url('./images/lock_screen/Ico_lsc_pickupwhite_40x40.png'); + background-position: 0.5rem center; + background-repeat: no-repeat; + background-size: 4rem; +} + +.lockscreen-icon-left, .lockscreen-icon-right { + z-index: 16; + pointer-events: auto; +} + +/* Compensation for the effects after enabling the pointer-event attribute. */ +.lockscreen-icon-left:active, .lockscreen-icon-right:active { + background: none; +} + +#lockscreen-area-hangup > div { + background-image: url('./images/lock_screen/Ico_lsc_hangupwhite_40x40.png'); + background-position: 1.4rem center; + background-repeat: no-repeat; + background-size: 4rem; +} + +#lockscreen-icon-container { + position: absolute; + bottom: 0; + width: 100%; + height: 10rem; + pointer-events: none; + z-index: 5; + background-color: rgba(255, 255, 255, .85); +} + +.touched #lockscreen-icon-container { + transition: none; +} + +.touched .lockscreen-icon-area { + transition: none; +} + +#lockscreen-canvas-wrapper { + position: absolute; + bottom: 0.75rem; + z-index: 8; + width: 100%; +} diff --git a/apps/callscreen/style/oncall.css b/apps/callscreen/style/oncall.css index 322faa8d2a23..6064cad696e2 100644 --- a/apps/callscreen/style/oncall.css +++ b/apps/callscreen/style/oncall.css @@ -181,15 +181,15 @@ transition: transform 0.5s ease 0s; } - #call-screen:before { - background: url("images/call_screen/mask.png") no-repeat scroll 50% 50% / cover transparent; - } - #main-container { position: absolute; + top: 0; height: 100%; width: 100%; - background: #000 no-repeat center top/cover; + background-color: #000; + background-size: cover; /* Possible memory over-consumption with huge images, it should be removed for improving stability*/ + background-position: 50% calc(50% - 1.2rem); + background-repeat: no-repeat; } #actions-container { @@ -871,16 +871,27 @@ #contact-background { position: absolute; top: 0; - width: 100%; height: 100%; - background-repeat: no-repeat; - background-position: center center; + width: 100%; background-color: transparent; background-size: cover; + background-position: center center; + background-repeat: no-repeat; opacity: 0; transition: opacity 0.3s linear; } + #main-container { + position: absolute; + top: 0; + height: 100%; + width: 100%; + background-color: #000; + background-size: cover; /* Possible memory over-consumption with huge images, it should be removed for improving stability*/ + background-position: 50% calc(50% - 1.2rem); + background-repeat: no-repeat; + } + #contact-background.ready { opacity: 1; } @@ -890,17 +901,17 @@ } #call-screen[data-layout="dialing"] #callbar-answer, - #call-screen[data-layout="dialing"] #swiper-wrapper, #call-screen[data-layout="incoming"] #swiper-wrapper, #call-screen[data-layout="incoming-locked"] #callbar-answer, #call-screen[data-layout="incoming-locked"] #callbar-hang-up, #call-screen[data-layout="incoming-locked"] #call-options, #call-screen[data-layout="incoming-locked"] .duration, - #call-screen[data-layout="connected"] #swiper-wrapper, #call-screen[data-layout="connected"] #callbar-answer, - #call-screen[data-layout="connected-hold"] #swiper-wrapper, #call-screen[data-layout="connected-hold"] #callbar-answer, - #call-screen:not([data-layout="incoming-locked"]) #lockscreen-header { + #call-screen:not([data-layout="incoming-locked"]) #lockscreen-header, + #call-screen:not([data-layout="incoming-locked"]) #lockscreen-masked-background, + #call-screen:not([data-layout="incoming-locked"]) #lockscreen-area, + #call-screen:not([data-layout="incoming-locked"]) #swiper-wrapper { display: none; } @@ -985,40 +996,6 @@ padding-bottom: 2rem; } - #lockscreen-header { - z-index: 9999; - position: absolute; - top: 3.4rem; - left: 0; - width: 100%; - -moz-box-sizing: border-box; - padding: 1.8rem 2.5rem 1.2rem 2.5rem; - color: #fff; - text-shadow: 0 0 0.3rem #333; - transition: transform 0.2s ease, opacity 0.2s ease; - opacity: 1; - } - - #lockscreen-clock-time { - margin: -0.6rem 0 -1rem -0.4rem; - font-weight: 300; - font-size: calc(26 * 0.226rem); - } - - #lockscreen-clock-time span { /* optional meridiem */ - font-size: calc(17 * 0.226rem); - } - - #lockscreen-date { - font-weight: 400; - font-size: calc(7 * 0.226rem); - } - - #lockscreen-clock-time, #lockscreen-date { - text-shadow: 0.1rem 0.1rem 0.3rem #000000; - color: #fff; - } - /* We may need to sync system lockscreen media query part for showing call screen on larger screen size*/ diff --git a/apps/callscreen/style/swiper.css b/apps/callscreen/style/swiper.css deleted file mode 100644 index e4ac72ef4299..000000000000 --- a/apps/callscreen/style/swiper.css +++ /dev/null @@ -1,126 +0,0 @@ -/* Lockscreen slider - Need to move duplicate styling in other proper place */ -#lockscreen-area { - position: absolute; - height: 11.2rem; - left: 0; - right: 0; - bottom: 0; - z-index: 4; -} - -.lockscreen-icon-area { - height: 10rem; - position: absolute; - border-style: none; - transition: opacity 0.5s ease; -} - -.lockscreen-icon { - margin-top: 2rem; - width: 6rem; - height: 6rem; - - pointer-events: none; -} - -.lockscreen-icon-area.dark .lockscreen-icon { - opacity: 0.65; -} - -#lockscreen-area-slide { - text-align: center; - width: calc(100%); -} - -.touched .lockscreen-icon { - transition: none; -} - -.lockscreen-icon-right { - right: calc(50% - 14rem); -} - -.lockscreen-icon-left { - left: calc(50% - 14rem); -} - -@media (min-width:768px) { - .lockscreen-icon-right { - right: calc(50% - 20.5rem); - } - - .lockscreen-icon-left { - left: calc(50% - 20.5rem); - } - - #lockscreen-header { - text-shadow: 0 0 0.5rem #111111; - padding-left: 6rem; - font-weight: lighter; - } - - #lockscreen-date { - padding-top: 0.5rem; - font-size: 2.4rem; - } -} - -button::-moz-focus-inner { - border: 0; -} - -:-moz-any(.touched, #screen:not(.locked), #screen.attention, #lockscreen:not([data-panel="main"])) -:-moz-any(#lockscreen-left-arrow, #lockscreen-right-arrow) { - display: none; - animation: none; -} - -#lockscreen-area-pickup > div { - background-image: url('images/lock_screen/actionicon_lockscreen_answer.png'); - background-position: center; - background-repeat: no-repeat; - background-size: 4rem; -} - -.lockscreen-icon-left, .lockscreen-icon-right { - z-index: 16; - pointer-events: auto; -} - -/* Compensation for the effects after enabling the pointer-event attribute. */ -.lockscreen-icon-left:active, .lockscreen-icon-right:active { - background: none; -} - -#lockscreen-area-hangup > div { - background-image: url('images/lock_screen/actionicon_lockscreen_reject.png'); - background-position: center; - background-repeat: no-repeat; - background-size: 4rem; -} - -#lockscreen-icon-container { - position: absolute; - bottom: 0; - width: 100%; - height: 10rem; - pointer-events: none; - border-top: 0.1rem solid #989898; - background-color: rgba(231, 231, 231, 0.85); - z-index: 5; -} - -.touched #lockscreen-icon-container { - transition: none; -} - -.touched .lockscreen-icon-area { - transition: none; -} - -#lockscreen-canvas-wrapper { - position: absolute; - bottom: 0.75rem; - z-index: 8; - width: 100%; -} diff --git a/apps/callscreen/test/unit/call_screen_test.js b/apps/callscreen/test/unit/call_screen_test.js index a9717fb6804d..cd22765ec923 100755 --- a/apps/callscreen/test/unit/call_screen_test.js +++ b/apps/callscreen/test/unit/call_screen_test.js @@ -889,6 +889,7 @@ suite('call screen', function() { test('clock and date should display current clock/date info', function() { currentDate = new Date(); + this.sinon.stub(CallScreen, 'showConnectionInfo'); CallScreen.showClock(currentDate); var clockTime = CallScreen.lockedClockTime.innerHTML; var dateStr = CallScreen.lockedDate.textContent; diff --git a/apps/communications/dialer/locales/dialer.en-US.properties b/apps/communications/dialer/locales/dialer.en-US.properties index 74c60649ce64..2e4a2e6870d0 100644 --- a/apps/communications/dialer/locales/dialer.en-US.properties +++ b/apps/communications/dialer/locales/dialer.en-US.properties @@ -91,6 +91,7 @@ sim-number=SIM{{ n }} hangup-a11y-button.ariaLabel=Hang Up pickup-a11y-button.ariaLabel=Pick up unlock-a11y-button.ariaLabel=Slider +roaming={{operator}} (Roaming) settings=Settings diff --git a/shared/js/lockscreen_slide.js b/shared/js/lockscreen_slide.js index a1b8f5209ad9..ca391777b0b6 100644 --- a/shared/js/lockscreen_slide.js +++ b/shared/js/lockscreen_slide.js @@ -67,8 +67,13 @@ }, iconBG: { - color: 'rgba(255, 255, 255, 0.25)', - radius: 20 + radius: 20, + left: { + color: 'rgba(255, 255, 255, 0.25)' + }, + right: { + color: 'rgba(255, 255, 255, 0.25)' + } }, slides: { @@ -147,13 +152,12 @@ colors: { left: { - touchedColor: '0, 170, 204', - touchedColorStop: '178, 229, 239' + touchedColor: '255, 255, 255', + touchedColorStop: '255, 255, 255' }, - right: { - touchedColor: '0, 170, 204', - touchedColorStop: '178, 229, 239' + touchedColor: '255, 255, 255', + touchedColorStop: '255, 255, 255' } }, @@ -962,7 +966,8 @@ strokeStyle = 'transparent'; - ctx.fillStyle = 'rgba(255, 255, 255, ' + fillAlpha + ')'; + ctx.fillStyle = 'rgba(' + this.handle.touchedColor + ', ' + + fillAlpha + ')'; ctx.strokeStyle = strokeStyle; // Start to draw it. @@ -1066,7 +1071,7 @@ var canvas = this.canvas; var ctx = canvas.getContext('2d'); - ctx.fillStyle = this.iconBG.color; + ctx.fillStyle = this.iconBG.left.color; ctx.strokeStyle = 'transparent'; ctx.beginPath(); @@ -1076,6 +1081,7 @@ ctx.closePath(); ctx.fill(); + ctx.fillStyle = this.iconBG.right.color; ctx.beginPath(); ctx.arc(this.track.to, this.track.y, this.iconBG.radius, 0, 2 * Math.PI, false);