From 3bba0994311f6914904c417eca15c4549892d5f0 Mon Sep 17 00:00:00 2001
From: brianjjones <brian.j.jones@intel.com>
Date: Thu, 22 May 2014 15:46:45 -0700
Subject: [PATCH] Fixes for IVI-3190 - To get things to render normally

Change-Id: If56fffca9e35741fb1b79c6608dd2c872b187bd3
---
 icon.png => Homescreen_icon.png      | Bin
 Makefile                             |   4 +++-
 js/installedApps.js                  |   2 +-
 js/predefAppModel.js                 |  14 +++++++-------
 manifest.json                        |  12 ++++++++++++
 packaging/modello-homescreen.changes |   3 +++
 packaging/modello-homescreen.spec    |   1 +
 7 files changed, 27 insertions(+), 9 deletions(-)
 rename icon.png => Homescreen_icon.png (100%)
 create mode 100644 manifest.json

diff --git a/icon.png b/Homescreen_icon.png
similarity index 100%
rename from icon.png
rename to Homescreen_icon.png
diff --git a/Makefile b/Makefile
index 578e6e8..50a3c7e 100644
--- a/Makefile
+++ b/Makefile
@@ -7,12 +7,14 @@ INSTALL_FILES = $(PROJECT).wgt
 INSTALL_DIR = ${DESTDIR}/opt/usr/apps/.preinstallWidgets
 
 wgtPkg:
-	zip -r $(PROJECT).wgt config.xml css icon.png index.html js
+	zip -r $(PROJECT).wgt config.xml manifest.json css Homescreen_icon.png index.html js
 
 install:
 	@echo "Installing Homescreen, stand by..."
 	mkdir -p $(INSTALL_DIR)/
+	mkdir -p ${DESTDIR}/opt/usr/apps/_common/icons
 	cp $(PROJECT).wgt $(INSTALL_DIR)/
+	cp Homescreen_icon.png ${DESTDIR}/opt/usr/apps/_common/icons
 
 dist:
 	tar czf ../$(PACKAGE).tar.bz2 .
diff --git a/js/installedApps.js b/js/installedApps.js
index 8fe3717..3509eef 100644
--- a/js/installedApps.js
+++ b/js/installedApps.js
@@ -127,7 +127,7 @@ function insertAppFrame(appFrame) {
 		var h = ctx.canvas.height = img.height;
 
 		// Change icon only in case of Intel POC apps
-		if (appFrame.id.indexOf("Modello") >= 0) {
+		if (appFrame.appName.indexOf("Modello") >= 0) {
 			ctx.fillStyle = ThemeKeyColor;
 			ctx.fillRect(0, 0, w, h);
 			ctx.globalCompositeOperation = 'destination-in';
diff --git a/js/predefAppModel.js b/js/predefAppModel.js
index 4aed778..d69bb40 100644
--- a/js/predefAppModel.js
+++ b/js/predefAppModel.js
@@ -81,7 +81,7 @@ var areasDefinitions = [ {
 	shape: 'cenerCircle'
 }, {
 	name: 'navigation',
-	id: 'Modello008.Nav',
+	id: 'xwalk.epacfkhfnnlaamkbaiedmohaeogbedkf',
 	iconPath: '../navigation/icon.png',
 	sectorId: 1,
 	sc: 104,
@@ -91,7 +91,7 @@ var areasDefinitions = [ {
 	shape: 'pieWithoutCenter'
 }, {
 	name: "airconditioning",
-	id: 'Modello006.Hvac',
+	id: 'xwalk.fmpbbfhmnlghfghbblcobiiedfbjgegp',
 	iconPath: '../dashboard/icon.png',
 	sectorId: 2,
 	sc: 94,		//small circle border
@@ -101,7 +101,7 @@ var areasDefinitions = [ {
 	shape: 'pieWithoutCenter'
 }, {
 	name: 'MultimediaPlayer',
-	id: 'Modello007.Multimediaplayer',
+	id: 'xwalk.ilflnmejfmcdcdnjjgejnfbhhbfaaefb',
 	iconPath: '../musicplayer/icon.png',
 	sectorId: 3,
 	sc: 80,
@@ -111,7 +111,7 @@ var areasDefinitions = [ {
 	shape: 'pieWithoutCenter'
 }, {
 	name: 'SmartDeviceLink',
-	id: 'Modello010.SDL',
+	id: 'xwalk.kiefmdieeelkgmnjldgklhlemjdkgpbm',
 	iconPath: '../smartdevicelink/icon.png',
 	sectorId: 4,
 	sc: 80,
@@ -121,7 +121,7 @@ var areasDefinitions = [ {
 	shape: 'pieWithoutCenter'
 }, {
 	name: 'phone',
-	id: 'Modello009.Phone',
+	id: 'xwalk.nejoidhifdhhbogkaoimdcalkmllicab',
 	iconPath: '../phone/icon.png',
 	sectorId: 5,
 	sc: 82,
@@ -131,7 +131,7 @@ var areasDefinitions = [ {
 	shape: 'pieWithoutCenter'
 }, {
 	name: 'store',
-	id: 'Modello003.AppManager',
+	id: 'xwalk.ofalfnmcoplngiipflmdhdegilbfepoh',
 	iconPath: '../store/icon.png',
 	sectorId: 6,
 	sc: 82,
@@ -141,7 +141,7 @@ var areasDefinitions = [ {
 	shape: 'pieWithoutCenter'
 }, {
 	name: 'dashboard',
-	id: 'Modello004.Dashboard',
+	id: 'xwalk.knojblgeighiodojgihegbmkbbadfpnk',
 	iconPath: '../dashboard/icon.png',
 	sectorId: 7,
 	sc: 105,
diff --git a/manifest.json b/manifest.json
new file mode 100644
index 0000000..cb899cd
--- /dev/null
+++ b/manifest.json
@@ -0,0 +1,12 @@
+{
+  "name": "Modello Homescreen",
+  "version": "0.0.2",
+  "app": {
+    "launch":{
+      "local_path": "index.html"
+    }
+  },
+  "icons": {
+    "128": "Homescreen_icon.png"
+  }
+}
diff --git a/packaging/modello-homescreen.changes b/packaging/modello-homescreen.changes
index 6ec41f8..e2e0bfd 100644
--- a/packaging/modello-homescreen.changes
+++ b/packaging/modello-homescreen.changes
@@ -1,3 +1,6 @@
+* Thu May 22 2014 brianjjones <brian.j.jones@intel.com> submit/tizen_ivi/20140508.232610@8b497ad
+- Fixes for IVI-3190 - To get things to render normally
+
 * Thu May 08 2014 brianjjones <brian.j.jones@intel.com> submit/tizen_ivi/20140508.172522@617d429
 - Adding Modello to the app name to easily identify it
 
diff --git a/packaging/modello-homescreen.spec b/packaging/modello-homescreen.spec
index 803e8ef..6ca95b8 100644
--- a/packaging/modello-homescreen.spec
+++ b/packaging/modello-homescreen.spec
@@ -25,3 +25,4 @@ make wgtPkg
 %files
 %defattr(-,root,root,-)
 /opt/usr/apps/.preinstallWidgets/Modello_Homescreen.wgt
+/opt/usr/apps/_common/icons/Homescreen_icon.png
-- 
2.7.4