From: srimaldia <hariasti.srimaldia-1@jp.alps.com>
Date: Tue, 13 Dec 2016 06:23:20 +0000 (+0900)
Subject: Merge branch 'master' of ssh://gerrit.automotivelinux.org:29418/apps/settings-wifi
X-Git-Tag: 3.0.0~3
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=33b36ac50b4b38988570650aff563f01389a67a8;p=apps%2Fsettings-wifi.git

Merge branch 'master' of ssh://gerrit.automotivelinux.org:29418/apps/settings-wifi

Signed-off-by: srimaldia <hariasti.srimaldia-1@jp.alps.com>
---

33b36ac50b4b38988570650aff563f01389a67a8
diff --cc qml/wifi-settings/wifi-settings-app.qml
index 77990f7,c25934d..d2af106
--- a/qml/wifi-settings/wifi-settings-app.qml
+++ b/qml/wifi-settings/wifi-settings-app.qml
@@@ -89,7 -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 -110,7 +114,11 @@@
                  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 -273,7 +281,11 @@@
                  request(wifiAPIpath + 'scan', function (o) {
  
                      // log the json response
++<<<<<<< HEAD
 +                    //showRequestInfo(o.responseText)
++=======
+                     showRequestInfo(o.responseText)
++>>>>>>> 18e149d5c2f7155ef2933fe4e3ac15837c99235d
                      console.log(o.responseText)
                  })
              }
@@@ -450,7 -450,7 +462,11 @@@
                              request(wifiAPIpath + 'disconnect?network=' + index,
                                      function (o) {
  
++<<<<<<< HEAD
 +                                        //showRequestInfo(o.responseText)
++=======
+                                         showRequestInfo(o.responseText)
++>>>>>>> 18e149d5c2f7155ef2933fe4e3ac15837c99235d
                                          console.log(o.responseText)
                                      })
                          } else {
@@@ -461,7 -461,7 +477,11 @@@
                                      function (o) {
  
                                          // log the json response
++<<<<<<< HEAD
 +                                        //showRequestInfo(o.responseText)
++=======
+                                         showRequestInfo(o.responseText)
++>>>>>>> 18e149d5c2f7155ef2933fe4e3ac15837c99235d
                                          console.log(o.responseText)
                                      })
                          }
@@@ -532,7 -532,7 +552,11 @@@
                          request(wifiAPIpath + 'security?passkey=' + passkey,
                                  function (o) {
  
++<<<<<<< HEAD
 +                                    //showRequestInfo(o.responseText)
++=======
+                                     showRequestInfo(o.responseText)
++>>>>>>> 18e149d5c2f7155ef2933fe4e3ac15837c99235d
                                      console.log(o.responseText)
                                  })
                          passwordValidateButton.visible = false