Bug 1207813 - locked-sim

apps/sharedtest/test/unit/lockscreen_conn_info_manager_test.js

@@ -322,6 +322,20 @@ suite('system/LockScreenConnInfoManager >', function() {
           'emergencyCallsOnly-unknownSIMState');
       });
 
+      test('pinRequired', function() {
+        mockMobileConnection.voice = {
+          connected: false,
+          emergencyCallsOnly: true,
+          isLocked: true
+        };
+        iccObj.cardState = 'pinRequired';
+
+        subject.updateConnStates();
+        assert.equal(domConnstateL1.dataset.l10nId, 'emergencyCallsOnly');
+        assert.equal(domConnstateL2.dataset.l10nId,
+          'emergencyCallsOnly-pinRequired');
+      });
+
       test('other card state', function() {
         mockMobileConnection.voice = {
           connected: false,

apps/system/js/signal_icon.js

@@ -55,6 +55,7 @@
       _(this.element, 'statusbarSignalNoSimCard');
     } else if (data && data.connected &&
                data.type && data.type.startsWith('evdo')) {
+      this.element.classList.remove('sim-locked');
       // "Carrier" / "Carrier (Roaming)" (EVDO)
       // Show signal strength of data call as EVDO only supports data call.
       this.debug('data connection, level=', data.relSignalStrength);
@@ -70,24 +71,26 @@
       this.updateSignal(voice);
     } else if (simslot.isLocked()) {
       this.debug('locked simcard');
+      this.element.classList.add('sim-locked');
+      this.show();
       // SIM locked
       // We check if the sim card is locked after checking hasActiveCall
       // because we still need to show the signal bars in the case of
       // making emergency calls when the sim card is locked.
-      this.hide();
     } else {
       this.debug('emergency call only');
       // emergencyCallsOnly is always true if voice.connected is false. Show
       // searching icon if the device is searching. Or show the signal bars
       // with a red "x", which stands for emergency calls only.
       this.updateSignal(voice, true);
     }
+
   };
   SignalIcon.prototype.updateSignal = function(connInfo, emergency) {
     if (!this.element) {
       return;
     }
-
+    this.element.classList.remove('sim-locked');
     this.show();
     var _ = navigator.mozL10n.setAttributes, level;
     var previousSearching = (this.element.dataset.searching === 'true');

apps/system/style/statusbar/statusbar.css

@@ -439,6 +439,9 @@ html[dir="rtl"] #statusbar-call-forwardings > * { float: right; }
   background-position: -14rem -8rem;
   position: relative;
 }
+.sb-icon-signal.sim-locked{
+  background-position: -30rem -4rem;
+}
 
 .sb-icon-network-activity {
   width: 1.6rem;

apps/system/test/unit/signal_icon_test.js

@@ -185,7 +185,7 @@ suite('system/SignalIcon', function() {
 
     test('SIM card is locked', function() {
       MockService.mockQueryWith('Radio.settingEnabled', true);
-      this.sinon.stub(subject, 'hide');
+      this.sinon.stub(subject, 'sim-locked');
       this.sinon.stub(subject.manager, 'isLocked').returns(true);
       subject.update();
       assert.isTrue(subject.hide.called);

shared/js/lockscreen_connection_info_manager.js

@@ -265,7 +265,12 @@
       } else if (SIMSlotManager.noSIMCardConnectedToNetwork()) {
         if (index === 0) {
           lineText(nextLine(), 'emergencyCallsOnly');
+
+          if(SIMSlotManager.getSlots()[index].isLocked()){
+            lineText(nextLine(), 'emergencyCallsOnly-pinRequired');
+          }
         }
+
         simIDLine.hidden = true;
         return;
       }
@@ -333,4 +338,5 @@
 
   LockScreenConnInfoManager.prototype = LockScreenConnInfoManagerPrototype;
   exports.LockScreenConnInfoManager = LockScreenConnInfoManager;
+
 })(window);