Skip to content

Commit

Permalink
Merge pull request mozilla-b2g#16896 from EragonJ/bug-979771
Browse files Browse the repository at this point in the history 
Bug 979771 - [DSDS] Data call icon on Utility Tray will not become blue
  • Loading branch information
@EragonJ
EragonJ committed Mar 6, 2014
2 parents ca0dd14 + c9e7fed commit d68074a
Show file tree
Hide file tree
Showing 3 changed files with 118 additions and 44 deletions.
96 changes: 60 additions & 36 deletions apps/system/js/quick_settings.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,8 @@ var QuickSettings = {
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];
this.getAllElements();
this.monitorDataChange();

(function initNetworkSprite() {
var networkTypeSetting =
Expand All @@ -38,52 +35,71 @@ var QuickSettings = {
});
})();

this.getAllElements();

this.overlay.addEventListener('click', this);
window.addEventListener('utilitytrayshow', this);

var self = this;
this.monitorBluetoothChange();
this.monitorWifiChange();
this.monitorGeoChange();
this.monitorAirplaneModeChange();
},

/*
* Monitor data network icon
*/
if (conn) {
conn.addEventListener('datachange', function qs_onDataChange() {
var label = {
'lte': '4G', // 4G LTE
'ehrpd': '4G', // 4G CDMA
'hspa+': 'H+', // 3.5G HSPA+
'hsdpa': 'H', 'hsupa': 'H', 'hspa': 'H', // 3.5G HSDPA
'evdo0': '3G', 'evdoa': '3G', 'evdob': '3G', '1xrtt': '3G', // 3G CDMA
'umts': '3G', // 3G
'edge': 'E', // EDGE
'is95a': '2G', 'is95b': '2G', // 2G CDMA
'gprs': '2G'
};
self.data.dataset.network = label[conn.data.type];
});
monitorDataChange: function() {
var conns = window.navigator.mozMobileConnection ||
window.navigator.mozMobileConnections;

/* monitor data setting
if (!conns) {
// hide data icon without mozMobileConnection object
this.overlay.classList.add('non-mobile');
} else {
var label = {
'lte': '4G', // 4G LTE
'ehrpd': '4G', // 4G CDMA
'hspa+': 'H+', // 3.5G HSPA+
'hsdpa': 'H', 'hsupa': 'H', 'hspa': 'H', // 3.5G HSDPA
// 3G CDMA
'evdo0': '3G', 'evdoa': '3G', 'evdob': '3G', '1xrtt': '3G',
'umts': '3G', // 3G
'edge': 'E', // EDGE
'is95a': '2G', 'is95b': '2G', // 2G CDMA
'gprs': '2G'
};

for (var i = 0; i < conns.length; i++) {
var conn = conns[i];
conn.addEventListener('datachange', function qs_onDataChange() {
var dataType;
// if there is any data connection got established,
// we would just use that
for (var j = 0; j < conns.length; j++) {
dataType = label[conns[j].data.type] || dataType;
}
this.data.dataset.network = dataType;
}.bind(this));
}

/*
* monitor data setting
* TODO prevent quickly tapping on it
*/
SettingsListener.observe('ril.data.enabled', true, function(value) {
if (value) {
self.data.dataset.enabled = 'true';
this.data.dataset.enabled = 'true';
} else {
delete self.data.dataset.enabled;
delete this.data.dataset.enabled;
}
});
} else {
// hide data icon without mozMobileConnection object
this.overlay.classList.add('non-mobile');
}.bind(this));
}
},

monitorBluetoothChange: function() {
/* monitor bluetooth setting and initialization/disable ready event
* - when settings changed, update UI and lock toogle to prevent quickly
* tapping on it.
* - when got bluetooth initialization/disable ready, active toogle, so
* return the control to user.
*/
var self = this;
var btFirstSet = true;
SettingsListener.observe('bluetooth.enabled', true, function(value) {
// check self.bluetooth.dataset.enabled and value are identical
Expand All @@ -106,14 +122,16 @@ var QuickSettings = {
});
window.addEventListener('bluetooth-adapter-added', this);
window.addEventListener('bluetooth-disabled', this);
},


monitorWifiChange: function() {
/* monitor wifi setting and initialization/disable ready event
* - when settings changed, update UI and lock toogle to prevent quickly
* tapping on it.
* - when got bluetooth initialization/disable ready, active toogle, so
* return the control to user.
*/
var self = this;
var wifiFirstSet = true;
SettingsListener.observe('wifi.enabled', true, function(value) {
// check self.wifi.dataset.enabled and value are identical
Expand All @@ -129,22 +147,28 @@ var QuickSettings = {
// Set to the initializing state to block user interaction until the
// operation completes. (unless we are being called for the first time,
// where Wifi is already initialize
if (!wifiFirstSet)
if (!wifiFirstSet) {
self.wifi.dataset.initializing = 'true';
}
wifiFirstSet = false;
});
window.addEventListener('wifi-enabled', this);
window.addEventListener('wifi-disabled', this);
window.addEventListener('wifi-statuschange', this);
},

monitorGeoChange: function() {
/* monitor geolocation setting
* TODO prevent quickly tapping on it
*/
var self = this;
SettingsListener.observe('geolocation.enabled', true, function(value) {
self.geolocationEnabled = value;
});
},

// monitor airplane mode
monitorAirplaneModeChange: function() {
var self = this;
SettingsListener.observe('ril.radio.disabled', false, function(value) {
self.data.dataset.airplaneMode = value;
if (value) {
Expand Down
63 changes: 56 additions & 7 deletions apps/system/test/unit/quick_settings_test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,44 +7,47 @@ 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');
require('/shared/test/unit/mocks/mock_navigator_moz_mobile_connections.js');

require('/js/quick_settings.js');

var mocksForQuickSettings = new MocksHelper([
'MozActivity',
'SettingsHelper',
'SettingsListener'
'SettingsListener',
'NavigatorMozMobileConnections'
]).init();

suite('quick settings > ', function() {
var realWifiManager;
var realL10n;
var realSettings;
var realMozMobileConnection;
var realActivity;
var realMozMobileConnections;
var fakeQuickSettingsNode;

mocksForQuickSettings.attachTestHelpers();

suiteSetup(function() {
realWifiManager = navigator.mozWifiManager;
navigator.mozWifiManager = MockWifiManager;
realSettings = navigator.mozSettings;
navigator.mozSettings = MockNavigatorSettings;
realL10n = navigator.mozL10n;
navigator.mozL10n = MockL10n;
realMozMobileConnection = navigator.mozMobileConnection;
navigator.mozMobileConnection = MockNavigatorMozMobileConnection;
realMozMobileConnections = navigator.mozMobileConnections;
navigator.mozMobileConnections = MockNavigatorMozMobileConnections;
});

suiteTeardown(function() {
navigator.mozWifiManager = realWifiManager;
navigator.MozMobileConnection = realMozMobileConnection;
navigator.MozMobileConnections = realMozMobileConnections;
navigator.mozL10n = realL10n;
navigator.mozSettings = realSettings;
});

setup(function() {
MockNavigatorMozMobileConnections.mAddMobileConnection();

fakeQuickSettingsNode = document.createElement('div');
fakeQuickSettingsNode.id = 'quick-settings';
document.body.appendChild(fakeQuickSettingsNode);
Expand Down Expand Up @@ -116,4 +119,50 @@ suite('quick settings > ', function() {
assert.equal(
MockNavigatorSettings.mSettings['wifi.connect_via_settings'], false);
});

suite('datachange > ', function() {
var label = {
'lte': '4G', // 4G LTE
'ehrpd': '4G', // 4G CDMA
'hspa+': 'H+', // 3.5G HSPA+
'hsdpa': 'H', 'hsupa': 'H', 'hspa': 'H', // 3.5G HSDPA
// 3G CDMA
'evdo0': '3G', 'evdoa': '3G', 'evdob': '3G', '1xrtt': '3G',
'umts': '3G', // 3G
'edge': 'E', // EDGE
'is95a': '2G', 'is95b': '2G', // 2G CDMA
'gprs': '2G'
};

function setDataTypeOnConn(index, value) {
MockNavigatorMozMobileConnections[index].data = {};
MockNavigatorMozMobileConnections[index].data.type = value;
}

suite('one sim has data but the other one doesn\'t', function() {
setup(function() {
setDataTypeOnConn(0, 'umts');
setDataTypeOnConn(1, undefined);
MockNavigatorMozMobileConnections[0]
.triggerEventListeners('datachange');
});

test('we would get 3G label', function() {
assert.equal(QuickSettings.data.dataset.network, label['umts']);
});
});

suite('no sim has data', function() {
setup(function() {
setDataTypeOnConn(0, undefined);
setDataTypeOnConn(1, undefined);
MockNavigatorMozMobileConnections[0]
.triggerEventListeners('datachange');
});

test('we would get undefined label', function() {
assert.equal(QuickSettings.data.dataset.network, label[undefined] + '');
});
});
});
});
3 changes: 2 additions & 1 deletion shared/test/unit/mocks/mock_navigator_moz_mobile_connections.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
eventListeners = {
'voicechange': [],
'iccinfochange': [],
'radiostatechange': []
'radiostatechange': [],
'datachange': []
};
radioEnabledReq = {};
}
Expand Down

0 comments on commit d68074a

Please sign in to comment.