Pairing fixes and fixing images

Change-Id: Iaf094b5e823393496fb1cfede64244865fa85797
Signed-off-by: brianjjones <brian.j.jones@intel.com>

diff --git a/css/car/components/settings/icon.png b/css/car/components/settings/icon.png
index 253c312..94f2274 100644 (file)
Binary files a/css/car/components/settings/icon.png and b/css/car/components/settings/icon.png differ

diff --git a/css/car/components/settings/js/bluetooth.js b/css/car/components/settings/js/bluetooth.js
index 6d72e8a..4a07668 100644 (file)
--- a/css/car/components/settings/js/bluetooth.js
+++ b/css/car/components/settings/js/bluetooth.js
@@ -148,7 +148,7 @@ var Bluetooth = function() {
                                }, function(e) {
                                        console.log('Error: bluetooth pair failed: ', e);
                                        self._restartRefreshDevicesInterval();
-                                       alert("An error occured while pairing with " + device.name);
+                                       //alert("An error occured while pairing with " + device.name);
                                        hideLoadingSpinner("Pairing");
                                });
                        } else {
@@ -161,7 +161,7 @@ var Bluetooth = function() {
                                }, function(e) {
                                        console.log('Error: bluetooth unpairing failed: ' + e);
                                        self._restartRefreshDevicesInterval();
-                                       alert("An error occured while unpairing from " + device.name);
+                                       //alert("An error occured while unpairing from " + device.name);
                                        hideLoadingSpinner("Unpairing");
                                });
                        }
@@ -490,7 +490,11 @@ Bluetooth.prototype.getDevice = function(device) {
                        self.selectedDevice(dev);
                }
        }, function(error) {
-               // console.log ("Could not get device info:", error);
+               console.log ("Could not get device info:", error);
+               console.log ("removing device:", device.address);
+               self.removeDevice(device.address);
+               self.sortDevices();
+               self.saveBluetooth();
        });
 };
 

diff --git a/css/user/blue/icon.png b/css/user/blue/icon.png
index 3e0c411..d7886d8 100644 (file)
Binary files a/css/user/blue/icon.png and b/css/user/blue/icon.png differ

diff --git a/css/user/green/icon.png b/css/user/green/icon.png
index 399f463..2a954f5 100644 (file)
Binary files a/css/user/green/icon.png and b/css/user/green/icon.png differ

diff --git a/packaging/modello-common.changes b/packaging/modello-common.changes
index c5f158b..9dfdd8b 100644 (file)
--- a/packaging/modello-common.changes
+++ b/packaging/modello-common.changes
@@ -1,3 +1,8 @@
+* Mon Apr 14 2014 brianjjones <brian.j.jones@intel.com> submit/tizen/20140404.163702@b99f3c5
+- Pairing fixes and fixing images
+- Changing file names
+- Initial commit of the common code for the Modello UI
+
 * Thu Apr 03 2014 brianjjones <brian.j.jones@intel.com> 26c776b
 - Initial commit of the common code for the Modello UI