Revert "Merge pull request #21804 from gtorodelvalle/v2.0-bug-1018283…

…-uplifting" This reverts commit a89900c, reversing changes made to abdb110.
mozilla-b2g · Jul 28, 2014 · 90a5a08 · 90a5a08
1 parent 6d97765
commit 90a5a08
Show file tree

Hide file tree

Showing 108 changed files with 1,183 additions and 1,253 deletions.
diff --git a/apps/callscreen/index.html b/apps/callscreen/index.html
@@ -53,20 +53,13 @@
     -->
 
     <!-- incoming call / swiper on locked screen-->
-    <link rel="stylesheet" type="text/css" href="/style/lockscreen.css">
-    <script defer src="/shared/js/settings_listener.js"></script>
-    <script defer src="/shared/js/mobile_operator.js"></script>
+    <link rel="stylesheet" type="text/css" href="/style/swiper.css">
     <script defer src="/shared/js/lockscreen_slide.js"></script>
     <script defer src="/shared/js/screen_layout.js"></script>
-    <script defer src="/shared/js/simslot.js"></script>
-    <script defer src="/shared/js/simslot_manager.js"></script>
-    <script defer src="/shared/js/lockscreen_connection_info_manager.js"></script>
   </head>
   <body>
     <article id="call-screen" data-layout>
       <div id="lockscreen-header">
-        <div id="lockscreen-conn-states">
-        </div>
         <div id="lockscreen-clock-time"></div>
         <div id="lockscreen-date"></div>
       </div>
@@ -132,20 +125,20 @@
       </form>
       <article id="main-container">
         <div id="contact-background"></div>
-        <div id="lockscreen-masked-background" class="blank"></div>
-        <div id="lockscreen-area"></div>
         <div id="actions-container">
           <div id="swiper-wrapper">
+            <!--Slider module related widgets -->
+            <div id="lockscreen-area"></div>
             <div id="lockscreen-icon-container">
               <div id="lockscreen-area-hangup"
-                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-left dark" role="button"
+                   data-l10n-id="hangup-a11y-button">
                 <div class="lockscreen-icon">
                 </div>
               </div>
               <div id="lockscreen-area-pickup"
-                class="lockscreen-icon-area lockscreen-icon-right dark" role="button"
-                data-l10n-id="pickup-a11y-button" aria-label="Pick up">
+                   class="lockscreen-icon-area lockscreen-icon-right dark" role="button"
+                   data-l10n-id="pickup-a11y-button">
                 <div class="lockscreen-icon">
                 </div>
               </div>
@@ -156,6 +149,7 @@
                 </div>
               </div>
             </div>
+
           </div>
           <section id="statusMsg" role="status">
             <p></p>

diff --git a/apps/callscreen/js/call_screen.js b/apps/callscreen/js/call_screen.js
@@ -12,7 +12,6 @@ var CallScreen = {
 
   body: document.body,
   screen: document.getElementById('call-screen'),
-  lockscreenConnStates: document.getElementById('lockscreen-conn-states'),
   views: document.getElementById('views'),
 
   calls: document.getElementById('calls'),
@@ -154,21 +153,6 @@ var CallScreen = {
     this.syncSpeakerEnabled();
   },
 
-  _connInfoManagerInitialized: false,
-  initLockScreenConnInfoManager: function cs_initLockScreenConnInfoManager() {
-    if (this._connInfoManagerInitialized) {
-      return;
-    }
-
-    /* mobile connection state on lock screen */
-    if (window.navigator.mozMobileConnections) {
-      LazyL10n.get(function localized(_) {
-          new window.LockScreenConnInfoManager(CallScreen.lockscreenConnStates);
-        CallScreen._connInfoManagerInitialized = true;
-      });
-    }
-  },
-
   _slideInitialized: false,
   initLockScreenSlide: function cs_initLockScreenSlide() {
     if (this._slideInitialized) {
@@ -180,49 +164,46 @@ var CallScreen = {
     this.hangUpIcon = document.getElementById('lockscreen-area-hangup');
     this.pickUpIcon = document.getElementById('lockscreen-area-pickup');
     this.initUnlockerEvents();
-    new LockScreenSlide({
-      useNewStyle: true,
-
-      IDs: {
-        overlay: 'main-container',
-        areas: {
-          left: 'lockscreen-area-hangup',
-          right: 'lockscreen-area-pickup'
+    new LockScreenSlide(
+      // Options
+      {
+        IDs: {
+          overlay: 'main-container',
+          areas: {
+            left: 'lockscreen-area-hangup',
+            right: 'lockscreen-area-pickup'
+          }
         },
-      },
-
-      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'
+
+        track: {
+          backgroundColor: 'rgba(0, 0, 0, 0.4)'
         },
-        right: {
-          touchedColor: '0, 173, 173',
-          touchedColorStop: '255, 255, 255'
-        }
-      },
 
-      iconBG: {
-        left: {
-          color: 'rgba(224, 0, 0, 0.80)'
+        colors: {
+          left: {
+            touchedColor: '255, 0, 0',
+            touchedColorStop: '255, 178, 178'
+          },
+
+          right: {
+            touchedColor: '132, 200, 44',
+            touchedColorStop: '218, 238, 191'
+          }
         },
-        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'
+        resources: {
+          larrow: '/style/images/lock_screen/LArrow_Lockscreen.png',
+          rarrow: '/style/images/lock_screen/RArrow_Lockscreen.png'
+        },
+        handle: {
+          autoExpand: {
+            sentinelOffset: 80
+          },
+          backgroundColor: '255, 255, 255',
+          backgroundAlpha: 0.85
+        }
       }
-    });
+    );
   },
 
   _wallpaperReady: false,
@@ -343,7 +324,6 @@ var CallScreen = {
 
   hashchangeHandler: function cs_hashchangeHandler() {
     if (window.location.hash.startsWith('#locked')) {
-      this.initLockScreenConnInfoManager();
       this.showClock(new Date());
       this.initLockScreenSlide();
 

diff --git a/apps/callscreen/js/handled_call.js b/apps/callscreen/js/handled_call.js
@@ -66,7 +66,6 @@ function HandledCall(aCall) {
     this.updateDirection();
 
     if (navigator.mozIccManager.iccIds.length > 1) {
-      this.node.classList.add('sim-info');
       var n = this.call.serviceId + 1;
       this.viaSimNode.textContent = _('via-sim', { n: n });
       this.simNumberNode.textContent = _('sim-number', { n: n });

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
diff --git a/apps/callscreen/style/images/lock_screen/Ico_lsc_hangupwhite_40x40@1.5x.png b/apps/callscreen/style/images/lock_screen/Ico_lsc_hangupwhite_40x40@1.5x.png
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
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
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
diff --git a/apps/callscreen/style/images/lock_screen/Ico_lsc_pickupwhite_40x40@1.5x.png b/apps/callscreen/style/images/lock_screen/Ico_lsc_pickupwhite_40x40@1.5x.png
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
diff --git a/apps/callscreen/style/images/lock_screen/Ico_lsc_pickupwhite_40x40@2x.png b/apps/callscreen/style/images/lock_screen/Ico_lsc_pickupwhite_40x40@2x.png
diff --git a/apps/callscreen/style/images/lock_screen/LArrow_Lockscreen.png b/apps/callscreen/style/images/lock_screen/LArrow_Lockscreen.png
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
diff --git a/apps/callscreen/style/images/lock_screen/LArrow_Lockscreen@2.25x.png b/apps/callscreen/style/images/lock_screen/LArrow_Lockscreen@2.25x.png
diff --git a/apps/callscreen/style/images/lock_screen/LArrow_Lockscreen@2x.png b/apps/callscreen/style/images/lock_screen/LArrow_Lockscreen@2x.png
diff --git a/apps/callscreen/style/images/lock_screen/RArrow_Lockscreen.png b/apps/callscreen/style/images/lock_screen/RArrow_Lockscreen.png
diff --git a/apps/callscreen/style/images/lock_screen/RArrow_Lockscreen@1.5x.png b/apps/callscreen/style/images/lock_screen/RArrow_Lockscreen@1.5x.png
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
diff --git a/apps/callscreen/style/images/lock_screen/RArrow_Lockscreen@2x.png b/apps/callscreen/style/images/lock_screen/RArrow_Lockscreen@2x.png
diff --git a/apps/callscreen/style/images/lock_screen/actionicon_lockscreen_answer.png b/apps/callscreen/style/images/lock_screen/actionicon_lockscreen_answer.png
diff --git a/apps/callscreen/style/images/lock_screen/actionicon_lockscreen_answer@1.5x.png b/apps/callscreen/style/images/lock_screen/actionicon_lockscreen_answer@1.5x.png
diff --git a/apps/callscreen/style/images/lock_screen/actionicon_lockscreen_answer@2.25x.png b/apps/callscreen/style/images/lock_screen/actionicon_lockscreen_answer@2.25x.png
diff --git a/apps/callscreen/style/images/lock_screen/actionicon_lockscreen_answer@2x.png b/apps/callscreen/style/images/lock_screen/actionicon_lockscreen_answer@2x.png
diff --git a/apps/callscreen/style/images/lock_screen/actionicon_lockscreen_reject.png b/apps/callscreen/style/images/lock_screen/actionicon_lockscreen_reject.png
diff --git a/apps/callscreen/style/images/lock_screen/actionicon_lockscreen_reject@1.5x.png b/apps/callscreen/style/images/lock_screen/actionicon_lockscreen_reject@1.5x.png
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
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
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
diff --git a/apps/callscreen/style/images/lock_screen/lockscreen_toggle_arrow_left@1.5x.png b/apps/callscreen/style/images/lock_screen/lockscreen_toggle_arrow_left@1.5x.png
diff --git a/apps/callscreen/style/images/lock_screen/lockscreen_toggle_arrow_left@2.25x.png b/apps/callscreen/style/images/lock_screen/lockscreen_toggle_arrow_left@2.25x.png
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
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
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
diff --git a/apps/callscreen/style/images/lock_screen/lockscreen_toggle_arrow_right@2.25x.png b/apps/callscreen/style/images/lock_screen/lockscreen_toggle_arrow_right@2.25x.png
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
diff --git a/apps/callscreen/style/lockscreen.css b/apps/callscreen/style/lockscreen.css