Merge pull request #16743 from fabi1cazenave/customDataIcons-bug976951

Bug 976951: custom data icons for the quick settings, r=vingtetun

apps/system/js/quick_settings.js

@@ -12,15 +12,31 @@ var QuickSettings = {
 
   init: function qs_init() {
     var settings = window.navigator.mozSettings;
+    if (!settings) {
+      return;
+    }
 
     // XXX: check bug-926169
     // this is used to keep all tests passing while introducing multi-sim APIs
     var conn = window.navigator.mozMobileConnection ||
       window.navigator.mozMobileConnections &&
         window.navigator.mozMobileConnections[0];
 
-    if (!settings)
-      return;
+    (function initNetworkSprite() {
+      var networkTypeSetting =
+        SettingsHelper('operatorResources.data.icon', {});
+
+      networkTypeSetting.get(function gotNS(networkTypeValues) {
+        if (!networkTypeValues) {
+          return;
+        }
+        var sprite = networkTypeValues['data_sprite'];
+        if (sprite) {
+          document.getElementById('quick-settings-data').style.backgroundImage =
+            'url("' + sprite + '")';
+        }
+      });
+    })();
 
     this.getAllElements();
 

apps/system/style/quick_settings/quick_settings.css

@@ -73,53 +73,54 @@
   background-image: url(images/wifi-on.png);
 }
 #quick-settings-data {
-  background-image: url(images/data-off.png);
+  background-image: url(images/data.png);
+  background-position: 15px 0;
 }
 .non-mobile #quick-settings-data,
 .non-mobile #quick-settings-data + .separator {
   display: none;
 }
 #quick-settings-data[data-network="2G"]  {
-  background-image: url(images/data-2g-off.png);
+  background-position: 15px -30px;
 }
 #quick-settings-data[data-enabled][data-network="2G"] {
-  background-image: url(images/data-2g-on.png);
+  background-position: 15px -60px;
 }
 #quick-settings-data[data-network="3G"] {
-  background-image: url(images/data-3g-off.png);
+  background-position: 15px -90px;
 }
 #quick-settings-data[data-enabled][data-network="3G"] {
-  background-image: url(images/data-3g-on.png);
+  background-position: 15px -120px;
 }
 #quick-settings-data[data-network="4G"] {
-  background-image: url(images/data-4g-off.png);
+  background-position: 15px -150px;
 }
 #quick-settings-data[data-enabled][data-network="4G"] {
-  background-image: url(images/data-4g-on.png);
+  background-position: 15px -180px;
 }
 #quick-settings-data[data-network="E"] {
-  background-image: url(images/data-e-off.png);
+  background-position: 15px -210px;
 }
 #quick-settings-data[data-enabled][data-network="E"] {
-  background-image: url(images/data-e-on.png);
+  background-position: 15px -240px;
 }
 #quick-settings-data[data-network="H"] {
-  background-image: url(images/data-h-off.png);
+  background-position: 15px -270px;
 }
 #quick-settings-data[data-enabled][data-network="H"] {
-  background-image: url(images/data-h-on.png);
+  background-position: 15px -300px;
 }
 #quick-settings-data[data-network="H+"] {
-  background-image: url(images/data-h+-off.png);
+  background-position: 15px -330px;
 }
 #quick-settings-data[data-enabled][data-network="H+"] {
-  background-image: url(images/data-h+-on.png);
+  background-position: 15px -360px;
 }
 #quick-settings-data[data-network="O"] {
-  background-image: url(images/data-o-off.png);
+  background-position: 15px -390px;
 }
 #quick-settings-data[data-enabled][data-network="O"] {
-  background-image: url(images/data-o-on.png);
+  background-position: 15px -420px;
 }
 #quick-settings-bluetooth {
   background-image: url(images/bluetooth-off.png);

apps/system/test/unit/init_logo_handler_test.js

@@ -5,7 +5,7 @@
 mocha.globals(['SettingsHelper']);
 
 requireApp('system/test/unit/mock_logo_loader.js');
-requireApp('system/test/unit/mock_settings_helper.js');
+requireApp('system/shared/test/unit/mocks/mock_settings_helper.js');
 requireApp('system/js/init_logo_handler.js');
 
 suite('init_logo_handler_test.js >', function() {

apps/system/test/unit/quick_settings_test.js

@@ -1,20 +1,24 @@
 // Quick Settings Test
 'use strict';
 
-requireApp('system/test/unit/mock_l10n.js');
-requireApp('system/shared/test/unit/mocks/mock_settings_listener.js');
-requireApp('system/shared/test/unit/mocks/mock_navigator_moz_settings.js');
-requireApp('system/test/unit/mock_wifi_manager.js');
-requireApp('system/shared/test/unit/mocks/mock_navigator_moz_mobile_connection.js');
-requireApp('system/test/unit/mock_activity.js');
+require('/test/unit/mock_activity.js');
+require('/test/unit/mock_l10n.js');
+require('/test/unit/mock_wifi_manager.js');
+require('/shared/test/unit/mocks/mock_settings_helper.js');
+require('/shared/test/unit/mocks/mock_settings_listener.js');
+require('/shared/test/unit/mocks/mock_navigator_moz_settings.js');
+require('/shared/test/unit/mocks/mock_navigator_moz_mobile_connection.js');
 
-requireApp('system/js/quick_settings.js');
+require('/js/quick_settings.js');
 
-var mocksForQuickSettings = new MocksHelper(['SettingsListener']).init();
+var mocksForQuickSettings = new MocksHelper([
+  'MozActivity',
+  'SettingsHelper',
+  'SettingsListener'
+]).init();
 
 suite('quick settings > ', function() {
   var realWifiManager;
-  var realSettingsListener;
   var realL10n;
   var realSettings;
   var realMozMobileConnection;
@@ -31,24 +35,13 @@ suite('quick settings > ', function() {
     navigator.mozL10n = MockL10n;
     realMozMobileConnection = navigator.mozMobileConnection;
     navigator.mozMobileConnection = MockNavigatorMozMobileConnection;
-    try {
-      realActivity = window.MozActivity;
-    }
-    catch (e) {
-      console.log('Access MozActivity failed, passed realActivity assignment');
-    }
-    window.MozActivity = MockMozActivity;
   });
 
   suiteTeardown(function() {
     navigator.mozWifiManager = realWifiManager;
-    window.SettingsListener = realSettingsListener;
     navigator.MozMobileConnection = realMozMobileConnection;
     navigator.mozL10n = realL10n;
     navigator.mozSettings = realSettings;
-    if (typeof(realActivity) !== 'undefined') {
-      window.MozActivity = realActivity;
-    }
   });
 
   setup(function() {