Updated to work with Crosswalk. TIVI-3074

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

diff --git a/Makefile b/Makefile
index 3bfa46f..578e6e8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-PROJECT = html5UIHomescreen
+PROJECT = Modello_Homescreen
 
 VERSION := 0.0.2
 PACKAGE = $(PROJECT)-$(VERSION)
@@ -12,7 +12,7 @@ wgtPkg:
 install:
        @echo "Installing Homescreen, stand by..."
        mkdir -p $(INSTALL_DIR)/
-       install -m 0644 $(PROJECT).wgt $(INSTALL_DIR)/
+       cp $(PROJECT).wgt $(INSTALL_DIR)/
 
 dist:
        tar czf ../$(PACKAGE).tar.bz2 .

diff --git a/config.xml b/config.xml
index 0b574c1..9d51dd3 100644 (file)
--- a/config.xml
+++ b/config.xml
@@ -2,8 +2,8 @@
 <widget xmlns="http://www.w3.org/ns/widgets" xmlns:tizen="http://tizen.org/ns/widgets"
        id="http://com.intel.tizen/homescreen" version="1.0.0" viewmodes="fullscreen">
        <access origin="*" subdomains="true"></access>
-       <tizen:application id="html5POC05.Homescreen"
-               package="html5POC05" required_version="2.1" />
+       <tizen:application id="Modello005.Homescreen"
+               package="Modello005" required_version="2.1" />
        <content src="index.html" />
        <icon src="icon.png" />
        <name>Home Screen</name>

diff --git a/js/installedApps.js b/js/installedApps.js
index f5a656d..8fe3717 100644 (file)
--- 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("html5POC") >= 0) {
+               if (appFrame.id.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 b6a4d8b..4aed778 100644 (file)
--- a/js/predefAppModel.js
+++ b/js/predefAppModel.js
@@ -81,7 +81,7 @@ var areasDefinitions = [ {
        shape: 'cenerCircle'
 }, {
        name: 'navigation',
-       id: 'html5POC08.Nav',
+       id: 'Modello008.Nav',
        iconPath: '../navigation/icon.png',
        sectorId: 1,
        sc: 104,
@@ -91,7 +91,7 @@ var areasDefinitions = [ {
        shape: 'pieWithoutCenter'
 }, {
        name: "airconditioning",
-       id: 'html5POC06.Hvac',
+       id: 'Modello006.Hvac',
        iconPath: '../dashboard/icon.png',
        sectorId: 2,
        sc: 94,         //small circle border
@@ -101,7 +101,7 @@ var areasDefinitions = [ {
        shape: 'pieWithoutCenter'
 }, {
        name: 'MultimediaPlayer',
-       id: 'html5POC07.Multimediaplayer',
+       id: 'Modello007.Multimediaplayer',
        iconPath: '../musicplayer/icon.png',
        sectorId: 3,
        sc: 80,
@@ -111,7 +111,7 @@ var areasDefinitions = [ {
        shape: 'pieWithoutCenter'
 }, {
        name: 'SmartDeviceLink',
-       id: 'html5POC10.SDL',
+       id: 'Modello010.SDL',
        iconPath: '../smartdevicelink/icon.png',
        sectorId: 4,
        sc: 80,
@@ -121,7 +121,7 @@ var areasDefinitions = [ {
        shape: 'pieWithoutCenter'
 }, {
        name: 'phone',
-       id: 'html5POC09.Phone',
+       id: 'Modello009.Phone',
        iconPath: '../phone/icon.png',
        sectorId: 5,
        sc: 82,
@@ -131,7 +131,7 @@ var areasDefinitions = [ {
        shape: 'pieWithoutCenter'
 }, {
        name: 'store',
-       id: 'html5POC03.AppManager',
+       id: 'Modello003.AppManager',
        iconPath: '../store/icon.png',
        sectorId: 6,
        sc: 82,
@@ -141,7 +141,7 @@ var areasDefinitions = [ {
        shape: 'pieWithoutCenter'
 }, {
        name: 'dashboard',
-       id: 'html5POC04.Dashboard',
+       id: 'Modello004.Dashboard',
        iconPath: '../dashboard/icon.png',
        sectorId: 7,
        sc: 105,

diff --git a/packaging/modello-homescreen.changes b/packaging/modello-homescreen.changes
index 8a1560d..fe2e785 100644 (file)
--- a/packaging/modello-homescreen.changes
+++ b/packaging/modello-homescreen.changes
@@ -1,3 +1,6 @@
+* Tue May 06 2014 brianjjones <brian.j.jones@intel.com> submit/tizen/20140424.181930@b99f7ff
+- Updated to work with Crosswalk.  TIVI-3074
+
 * Thu Apr 24 2014 brianjjones <brian.j.jones@intel.com> submit/tizen/20140422.195849@b2c4efc
 - Adding a delay to the startup script to allow WRT to be ready
 

diff --git a/packaging/modello-homescreen.spec b/packaging/modello-homescreen.spec
index 065350d..803e8ef 100644 (file)
--- a/packaging/modello-homescreen.spec
+++ b/packaging/modello-homescreen.spec
@@ -8,9 +8,6 @@ URL:        http://www.tizen.org
 Source0:    %{name}-%{version}.tar.bz2
 BuildRequires:  zip
 Requires:   Modello_Common
-Requires:   wrt-installer
-Requires:   wrt-plugins-ivi
-Requires:   wrt-plugins-tizen-bt
 
 %description
 A proof of concept pure html5 UI
@@ -23,26 +20,8 @@ A proof of concept pure html5 UI
 make wgtPkg
 
 %install
-    %make_install
-    mkdir -p %{buildroot}%{_bindir}
-    mkdir -p %{buildroot}%{_libdir}/systemd/user/weston.target.wants/
-    install -m 755 systemd/modello_launcher.sh %{buildroot}%{_bindir}
-    install -m 0644 systemd/Modello_Homescreen-launchpad-ready.path %{buildroot}%{_libdir}/systemd/user
-    install -m 0644 systemd/Modello_Homescreen.service %{buildroot}%{_libdir}/systemd/user
-    ln -sf systemd/Modello_Homescreen-launchpad-ready.path %{buildroot}%{_libdir}/systemd/user/weston.target.wants/
-
-%post
-    wrt-installer -i /opt/usr/apps/.preinstallWidgets/html5UIHomescreen.wgt
-    cp -r /opt/usr/apps/_common/js/services /opt/usr/apps/html5POC05/res/wgt/js/
-    cp -r /opt/usr/apps/_common/css/* /opt/usr/apps/html5POC05/res/wgt/css/
-
-%postun
-    wrt-installer -un html5POC05.Homescreen
+%make_install
 
 %files
 %defattr(-,root,root,-)
-/opt/usr/apps/.preinstallWidgets/html5UIHomescreen.wgt
-%{_libdir}/systemd/user/Modello_Homescreen.service
-%{_libdir}/systemd/user/Modello_Homescreen-launchpad-ready.path
-%{_bindir}/modello_launcher.sh
-%{_libdir}/systemd/user/weston.target.wants
+/opt/usr/apps/.preinstallWidgets/Modello_Homescreen.wgt

diff --git a/systemd/Modello_Homescreen-launchpad-ready.path b/systemd/Modello_Homescreen-launchpad-ready.path
deleted file mode 100644 (file)
index 70d3a96..0000000
--- a/systemd/Modello_Homescreen-launchpad-ready.path
+++ /dev/null
@@ -1,8 +0,0 @@
-# Description=Path activation for Modello_Homescreen
-
-[Path]
-PathExists=/run/user/%U/wayland-0
-Unit=Modello_Homescreen.service
-
-[Install]
-WantedBy=weston.target

diff --git a/systemd/Modello_Homescreen.service b/systemd/Modello_Homescreen.service
deleted file mode 100644 (file)
index 4a94f3a..0000000
--- a/systemd/Modello_Homescreen.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Modello Homescreen
-Requires=weston.service
-After=weston.service
-
-[Service]
-Environment=TIZEN_PLATFORMLOGGING_MODE=1
-Environment=TIZEN_DLOG_LEVEL=1
-Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%U/dbus/user_bus_socket
-ExecStart=/usr/bin/modello_launcher.sh --user app

diff --git a/systemd/modello_launcher.sh b/systemd/modello_launcher.sh
deleted file mode 100644 (file)
index 2a65444..0000000
--- a/systemd/modello_launcher.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-sleep 5
-wrt-launcher -s html5POC05.Homescreen