aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsrimaldia <hariasti.srimaldia-1@jp.alps.com>2016-12-13 15:23:20 +0900
committersrimaldia <hariasti.srimaldia-1@jp.alps.com>2016-12-13 15:23:20 +0900
commit33b36ac50b4b38988570650aff563f01389a67a8 (patch)
tree0ce963a6a38ea552332ad4a58b9b6d8e35c26faf
parent311d8f14ceec5b57066228f7ada4483cc4598c80 (diff)
parent18e149d5c2f7155ef2933fe4e3ac15837c99235d (diff)
Merge branch 'master' of ssh://gerrit.automotivelinux.org:29418/apps/settings-wifi
Signed-off-by: srimaldia <hariasti.srimaldia-1@jp.alps.com>
-rwxr-xr-xqml/wifi-settings/wifi-settings-app.qml24
1 files changed, 24 insertions, 0 deletions
diff --git a/qml/wifi-settings/wifi-settings-app.qml b/qml/wifi-settings/wifi-settings-app.qml
index 77990f7..d2af106 100755
--- a/qml/wifi-settings/wifi-settings-app.qml
+++ b/qml/wifi-settings/wifi-settings-app.qml
@@ -89,7 +89,11 @@ ApplicationWindow {
request(wifiAPIpath + 'deactivate', function (o) {
// log the json response
+<<<<<<< HEAD
//showRequestInfo(o.responseText)
+=======
+ showRequestInfo(o.responseText)
+>>>>>>> 18e149d5c2f7155ef2933fe4e3ac15837c99235d
console.log(o.responseText)
})
}
@@ -110,7 +114,11 @@ ApplicationWindow {
request(wifiAPIpath + 'activate', function (o) {
// log the json response
+<<<<<<< HEAD
//showRequestInfo(o.responseText)
+=======
+ showRequestInfo(o.responseText)
+>>>>>>> 18e149d5c2f7155ef2933fe4e3ac15837c99235d
console.log(o.responseText)
})
periodicRefresh.start()
@@ -273,7 +281,11 @@ ApplicationWindow {
request(wifiAPIpath + 'scan', function (o) {
// log the json response
+<<<<<<< HEAD
//showRequestInfo(o.responseText)
+=======
+ showRequestInfo(o.responseText)
+>>>>>>> 18e149d5c2f7155ef2933fe4e3ac15837c99235d
console.log(o.responseText)
})
}
@@ -450,7 +462,11 @@ ApplicationWindow {
request(wifiAPIpath + 'disconnect?network=' + index,
function (o) {
+<<<<<<< HEAD
//showRequestInfo(o.responseText)
+=======
+ showRequestInfo(o.responseText)
+>>>>>>> 18e149d5c2f7155ef2933fe4e3ac15837c99235d
console.log(o.responseText)
})
} else {
@@ -461,7 +477,11 @@ ApplicationWindow {
function (o) {
// log the json response
+<<<<<<< HEAD
//showRequestInfo(o.responseText)
+=======
+ showRequestInfo(o.responseText)
+>>>>>>> 18e149d5c2f7155ef2933fe4e3ac15837c99235d
console.log(o.responseText)
})
}
@@ -532,7 +552,11 @@ ApplicationWindow {
request(wifiAPIpath + 'security?passkey=' + passkey,
function (o) {
+<<<<<<< HEAD
//showRequestInfo(o.responseText)
+=======
+ showRequestInfo(o.responseText)
+>>>>>>> 18e149d5c2f7155ef2933fe4e3ac15837c99235d
console.log(o.responseText)
})
passwordValidateButton.visible = false