summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlice Liu <alice.liu@intel.com>2014-09-12 10:17:44 +0800
committerAlice Liu <alice.liu@intel.com>2014-09-12 10:34:45 +0800
commit7a517f946875c188dad3a1869383f234060052a3 (patch)
tree29a07982bf01a024480325d96ada9564d7f73952
parent860c5728c172f33dd5f2457727e6a6e6ea8399af (diff)
downloadweb-sample-build-7a517f946875c188dad3a1869383f234060052a3.tar.gz
web-sample-build-7a517f946875c188dad3a1869383f234060052a3.tar.bz2
web-sample-build-7a517f946875c188dad3a1869383f234060052a3.zip
Updated Modello web samples from upstream
Package version up (3.0.23). Change-Id: Ic75963ad9030fc129067f21b0f0133e9f3b307a9 Signed-off-by: Alice Liu <alice.liu@intel.com>
-rw-r--r--package/changelog4
-rw-r--r--package/pkginfo.manifest2
-rw-r--r--samples/web/Sample/Tizen/Web App/Modello_AMBSimulator/project/AMBSimulator_icon.png (renamed from samples/web/Sample/Tizen/Web App/Modello_AMBSimulator/project/AMB_Simulator_icon.png)bin12895 -> 12895 bytes
-rw-r--r--samples/web/Sample/Tizen/Web App/Modello_AMBSimulator/project/config.xml4
-rw-r--r--samples/web/Sample/Tizen/Web App/Modello_AMBSimulator/project/packaging/modello-ambsimulator.changes3
-rw-r--r--samples/web/Sample/Tizen/Web App/Modello_Appmanager/project/config.xml2
-rw-r--r--samples/web/Sample/Tizen/Web App/Modello_Appmanager/project/packaging/modello-appmanager.changes3
-rw-r--r--samples/web/Sample/Tizen/Web App/Modello_Dashboard/project/config.xml2
-rw-r--r--samples/web/Sample/Tizen/Web App/Modello_Dashboard/project/packaging/modello-dashboard.changes3
-rw-r--r--samples/web/Sample/Tizen/Web App/Modello_Homescreen/project/config.xml2
-rw-r--r--samples/web/Sample/Tizen/Web App/Modello_Homescreen/project/js/predefAppModel.js14
-rw-r--r--samples/web/Sample/Tizen/Web App/Modello_Homescreen/project/packaging/modello-homescreen.changes3
-rw-r--r--samples/web/Sample/Tizen/Web App/Modello_Homescreen/project/packaging/modello-homescreen.spec2
-rw-r--r--samples/web/Sample/Tizen/Web App/Modello_Hvac/project/config.xml2
-rw-r--r--samples/web/Sample/Tizen/Web App/Modello_Hvac/project/packaging/modello-hvac.changes3
-rw-r--r--samples/web/Sample/Tizen/Web App/Modello_Multimediaplayer/project/Makefile4
-rw-r--r--samples/web/Sample/Tizen/Web App/Modello_Multimediaplayer/project/MultimediaPlayer_icon.pngbin0 -> 2217 bytes
-rw-r--r--samples/web/Sample/Tizen/Web App/Modello_Multimediaplayer/project/config.xml4
-rw-r--r--samples/web/Sample/Tizen/Web App/Modello_Multimediaplayer/project/manifest.json2
-rw-r--r--samples/web/Sample/Tizen/Web App/Modello_Multimediaplayer/project/packaging/modello-multimediaplayer.changes5
-rw-r--r--samples/web/Sample/Tizen/Web App/Modello_Multimediaplayer/project/packaging/modello-multimediaplayer.spec2
-rw-r--r--samples/web/Sample/Tizen/Web App/Modello_Nav/project/config.xml2
-rw-r--r--samples/web/Sample/Tizen/Web App/Modello_Nav/project/packaging/modello-nav.changes3
-rw-r--r--samples/web/Sample/Tizen/Web App/Modello_Phone/project/config.xml2
-rw-r--r--samples/web/Sample/Tizen/Web App/Modello_Phone/project/js/main.js2
-rw-r--r--samples/web/Sample/Tizen/Web App/Modello_Phone/project/packaging/modello-phone.changes6
-rw-r--r--samples/web/Sample/Tizen/Web App/Modello_SDL/project/config.xml2
-rw-r--r--samples/web/Sample/Tizen/Web App/Modello_SDL/project/packaging/modello-sdl.changes3
28 files changed, 61 insertions, 25 deletions
diff --git a/package/changelog b/package/changelog
index 02ac2a8..4f1a85f 100644
--- a/package/changelog
+++ b/package/changelog
@@ -1,3 +1,7 @@
+* 3.0.23
+* Updated Modello web samples from upstream
+== Alice Liu <alice.liu@intel.com> 2014-09-12
+
* 3.0.22
* Updated Modello web samples from upstream
== Alice Liu <alice.liu@intel.com> 2014-09-02
diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index 6879129..295eb70 100644
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,4 +1,4 @@
-Version:3.0.22
+Version:3.0.23
Maintainer: Alice Liu<alice.liu@intel.com>
Package:ivi-3.0-web-sample
diff --git a/samples/web/Sample/Tizen/Web App/Modello_AMBSimulator/project/AMB_Simulator_icon.png b/samples/web/Sample/Tizen/Web App/Modello_AMBSimulator/project/AMBSimulator_icon.png
index 2fdeb53..2fdeb53 100644
--- a/samples/web/Sample/Tizen/Web App/Modello_AMBSimulator/project/AMB_Simulator_icon.png
+++ b/samples/web/Sample/Tizen/Web App/Modello_AMBSimulator/project/AMBSimulator_icon.png
Binary files differ
diff --git a/samples/web/Sample/Tizen/Web App/Modello_AMBSimulator/project/config.xml b/samples/web/Sample/Tizen/Web App/Modello_AMBSimulator/project/config.xml
index 3ebaf16..fe95f99 100644
--- a/samples/web/Sample/Tizen/Web App/Modello_AMBSimulator/project/config.xml
+++ b/samples/web/Sample/Tizen/Web App/Modello_AMBSimulator/project/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/ambsimulator" version="1.0.0" viewmodes="fullscreen">
<tizen:application id="Modello002.AMBSimulator" package="Modello002" required_version="2.1"/>
<content src="index.html"/>
- <icon src="AMB_Simulator_icon.png"/>
- <name>Modello AMB Simulator</name>
+ <icon src="AMBSimulator_icon.png"/>
+ <name>ModelloAMBSimulator</name>
<tizen:privilege name="http://tizen.org/privilege/application.launch"/>
<tizen:privilege name="http://tizen.org/privilege/filesystem.read"/>
<tizen:privilege name="http://tizen.org/privilege/filesystem.write"/>
diff --git a/samples/web/Sample/Tizen/Web App/Modello_AMBSimulator/project/packaging/modello-ambsimulator.changes b/samples/web/Sample/Tizen/Web App/Modello_AMBSimulator/project/packaging/modello-ambsimulator.changes
index 86563ad..9af8e4e 100644
--- a/samples/web/Sample/Tizen/Web App/Modello_AMBSimulator/project/packaging/modello-ambsimulator.changes
+++ b/samples/web/Sample/Tizen/Web App/Modello_AMBSimulator/project/packaging/modello-ambsimulator.changes
@@ -1,3 +1,6 @@
+* Wed Sep 10 2014 Brian Jones <brian.j.jones@intel.com> submit/tizen_ivi/20140819.215742-1-ge14cadf
+- Removing space in app name - Fix for TC-1404
+
* Tue Aug 19 2014 Brian Jones <brian.j.jones@intel.com> accepted/tizen/ivi/20140807.053921-1-g14c6918
- Matching config.xml icon name to the one in the .wgt file
diff --git a/samples/web/Sample/Tizen/Web App/Modello_Appmanager/project/config.xml b/samples/web/Sample/Tizen/Web App/Modello_Appmanager/project/config.xml
index e918f42..add20ef 100644
--- a/samples/web/Sample/Tizen/Web App/Modello_Appmanager/project/config.xml
+++ b/samples/web/Sample/Tizen/Web App/Modello_Appmanager/project/config.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<widget xmlns="http://www.w3.org/ns/widgets" xmlns:tizen="http://tizen.org/ns/widgets" id="http://com.intel.tizen/store" version="0.5.0" viewmodes="fullscreen">
- <name>Modello AppManager</name>
+ <name>ModelloAppManager</name>
<tizen:application id="Modello003.AppManager" package="Modello003" required_version="2.1"/>
<feature name="http://tizen.org/feature/network.wifi"/>
<feature name="http://tizen.org/feature/network.telephony"/>
diff --git a/samples/web/Sample/Tizen/Web App/Modello_Appmanager/project/packaging/modello-appmanager.changes b/samples/web/Sample/Tizen/Web App/Modello_Appmanager/project/packaging/modello-appmanager.changes
index 3fd3592..86ac586 100644
--- a/samples/web/Sample/Tizen/Web App/Modello_Appmanager/project/packaging/modello-appmanager.changes
+++ b/samples/web/Sample/Tizen/Web App/Modello_Appmanager/project/packaging/modello-appmanager.changes
@@ -1,3 +1,6 @@
+* Wed Sep 10 2014 Brian Jones <brian.j.jones@intel.com> submit/tizen_ivi/20140819.215754-1-g59c6738
+- Removing space in app name - Fix for TC-1404
+
* Tue Aug 19 2014 Brian Jones <brian.j.jones@intel.com> accepted/tizen/ivi/20140807.053836-1-g373017f
- Matching config.xml icon name to the one in the .wgt file
diff --git a/samples/web/Sample/Tizen/Web App/Modello_Dashboard/project/config.xml b/samples/web/Sample/Tizen/Web App/Modello_Dashboard/project/config.xml
index 6645bf2..387e605 100644
--- a/samples/web/Sample/Tizen/Web App/Modello_Dashboard/project/config.xml
+++ b/samples/web/Sample/Tizen/Web App/Modello_Dashboard/project/config.xml
@@ -14,7 +14,7 @@
<tizen:privilege name="http://tizen.org/privilege/bluetooth.spp" />
<tizen:privilege name="http://tizen.org/privilege/bluetooth.gap" />
<icon src="Dashboard_icon.png"/>
- <name>Modello Dashboard</name>
+ <name>ModelloDashboard</name>
<tizen:setting screen-orientation="portrait"/>
</widget>
diff --git a/samples/web/Sample/Tizen/Web App/Modello_Dashboard/project/packaging/modello-dashboard.changes b/samples/web/Sample/Tizen/Web App/Modello_Dashboard/project/packaging/modello-dashboard.changes
index 71bcd26..ff2a18a 100644
--- a/samples/web/Sample/Tizen/Web App/Modello_Dashboard/project/packaging/modello-dashboard.changes
+++ b/samples/web/Sample/Tizen/Web App/Modello_Dashboard/project/packaging/modello-dashboard.changes
@@ -1,3 +1,6 @@
+* Wed Sep 10 2014 Brian Jones <brian.j.jones@intel.com> submit/tizen_ivi/20140819.215800-1-g73c1cf7
+- Removing space in app name - Fix for TC-1404
+
* Tue Aug 19 2014 Brian Jones <brian.j.jones@intel.com> accepted/tizen/ivi/20140807.053859-1-g315b0c2
- Matching config.xml icon name to the one in the .wgt file
diff --git a/samples/web/Sample/Tizen/Web App/Modello_Homescreen/project/config.xml b/samples/web/Sample/Tizen/Web App/Modello_Homescreen/project/config.xml
index 76a7af6..45dff2f 100644
--- a/samples/web/Sample/Tizen/Web App/Modello_Homescreen/project/config.xml
+++ b/samples/web/Sample/Tizen/Web App/Modello_Homescreen/project/config.xml
@@ -6,7 +6,7 @@
package="Modello005" required_version="2.1" />
<content src="index.html" />
<icon src="Homescreen_icon.png" />
- <name>Modello Homescreen</name>
+ <name>ModelloHomescreen</name>
<tizen:privilege name="http://tizen.org/privilege/application.launch" />
<tizen:privilege name="http://tizen.org/privilege/filesystem.read" />
<tizen:privilege name="http://tizen.org/privilege/filesystem.write" />
diff --git a/samples/web/Sample/Tizen/Web App/Modello_Homescreen/project/js/predefAppModel.js b/samples/web/Sample/Tizen/Web App/Modello_Homescreen/project/js/predefAppModel.js
index 4f6983b..e112075 100644
--- a/samples/web/Sample/Tizen/Web App/Modello_Homescreen/project/js/predefAppModel.js
+++ b/samples/web/Sample/Tizen/Web App/Modello_Homescreen/project/js/predefAppModel.js
@@ -154,31 +154,31 @@ function fillAppIDs (appList)
{
switch (app.name)
{
- case "Modello Navigation":
+ case "ModelloNavigation":
areasDefinitions[1].id = app.id;
break;
- case "Modello HVAC":
+ case "ModelloHVAC":
areasDefinitions[2].id = app.id;
break;
- case "Modello Multimedia Player":
+ case "ModelloMultimediaPlayer":
areasDefinitions[3].id = app.id;
break;
- case "Modello SmartDeviceLink":
+ case "ModelloSmartDeviceLink":
areasDefinitions[4].id = app.id;
break;
- case "Modello Phone":
+ case "ModelloPhone":
areasDefinitions[5].id = app.id;
break;
- case "Modello AppManager":
+ case "ModelloAppManager":
areasDefinitions[6].id = app.id;
break;
- case "Modello Dashboard":
+ case "ModelloDashboard":
areasDefinitions[7].id = app.id;
break;
}
diff --git a/samples/web/Sample/Tizen/Web App/Modello_Homescreen/project/packaging/modello-homescreen.changes b/samples/web/Sample/Tizen/Web App/Modello_Homescreen/project/packaging/modello-homescreen.changes
index 630b12c..65d54dc 100644
--- a/samples/web/Sample/Tizen/Web App/Modello_Homescreen/project/packaging/modello-homescreen.changes
+++ b/samples/web/Sample/Tizen/Web App/Modello_Homescreen/project/packaging/modello-homescreen.changes
@@ -1,3 +1,6 @@
+* Wed Sep 10 2014 Brian Jones <brian.j.jones@intel.com> accepted/tizen/ivi/20140828.212836-1-g6742024
+- Removing space in app name - Fix for TC-1404
+
* Mon Aug 25 2014 Brian Jones <brian.j.jones@intel.com> accepted/tizen/ivi/20140821.133919-1-geec5ebe
- Adding code to get the app ID from tizen.application for the center tiles rather than hardcode
diff --git a/samples/web/Sample/Tizen/Web App/Modello_Homescreen/project/packaging/modello-homescreen.spec b/samples/web/Sample/Tizen/Web App/Modello_Homescreen/project/packaging/modello-homescreen.spec
index 8e4f9a0..48bb82d 100644
--- a/samples/web/Sample/Tizen/Web App/Modello_Homescreen/project/packaging/modello-homescreen.spec
+++ b/samples/web/Sample/Tizen/Web App/Modello_Homescreen/project/packaging/modello-homescreen.spec
@@ -26,7 +26,7 @@ make wgtPkg
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/
+ ln -sf ../Modello_Homescreen-launchpad-ready.path %{buildroot}%{_libdir}/systemd/user/weston.target.wants/
%files
%defattr(-,root,root,-)
diff --git a/samples/web/Sample/Tizen/Web App/Modello_Hvac/project/config.xml b/samples/web/Sample/Tizen/Web App/Modello_Hvac/project/config.xml
index c97eda7..7191f9d 100644
--- a/samples/web/Sample/Tizen/Web App/Modello_Hvac/project/config.xml
+++ b/samples/web/Sample/Tizen/Web App/Modello_Hvac/project/config.xml
@@ -3,7 +3,7 @@
<tizen:application id="Modello006.Hvac" package="Modello006" required_version="2.1"/>
<content src="index.html"/>
<icon src="HVAC_icon.png"/>
- <name>Modello HVAC</name>
+ <name>ModelloHVAC</name>
<tizen:privilege name="http://tizen.org/privilege/application.launch"/>
<tizen:privilege name="http://tizen.org/privilege/filesystem.read"/>
<tizen:privilege name="http://tizen.org/privilege/filesystem.write"/>
diff --git a/samples/web/Sample/Tizen/Web App/Modello_Hvac/project/packaging/modello-hvac.changes b/samples/web/Sample/Tizen/Web App/Modello_Hvac/project/packaging/modello-hvac.changes
index 5b5e4cd..318d302 100644
--- a/samples/web/Sample/Tizen/Web App/Modello_Hvac/project/packaging/modello-hvac.changes
+++ b/samples/web/Sample/Tizen/Web App/Modello_Hvac/project/packaging/modello-hvac.changes
@@ -1,3 +1,6 @@
+* Wed Sep 10 2014 Brian Jones <brian.j.jones@intel.com> submit/tizen_ivi/20140819.215818-1-geac9226
+- Removing space in app name - Fix for TC-1404
+
* Tue Aug 19 2014 Brian Jones <brian.j.jones@intel.com> accepted/tizen/ivi/20140807.054025-1-g2bb817c
- Matching config.xml icon name to the one in the .wgt file
diff --git a/samples/web/Sample/Tizen/Web App/Modello_Multimediaplayer/project/Makefile b/samples/web/Sample/Tizen/Web App/Modello_Multimediaplayer/project/Makefile
index e6ae5e6..d6b559b 100644
--- a/samples/web/Sample/Tizen/Web App/Modello_Multimediaplayer/project/Makefile
+++ b/samples/web/Sample/Tizen/Web App/Modello_Multimediaplayer/project/Makefile
@@ -7,14 +7,14 @@ INSTALL_FILES = $(PROJECT).wgt
INSTALL_DIR = ${DESTDIR}/opt/usr/apps/.preinstallWidgets
wgtPkg:
- zip -r $(PROJECT).wgt components config.xml css Multimedia_Player_icon.png images index.html js
+ zip -r $(PROJECT).wgt components config.xml css MultimediaPlayer_icon.png images index.html js
install:
@echo "Installing Multimediaplayer, stand by..."
mkdir -p $(INSTALL_DIR)/
mkdir -p ${DESTDIR}/opt/usr/apps/_common/icons
cp $(PROJECT).wgt $(INSTALL_DIR)/
- cp Multimedia_Player_icon.png ${DESTDIR}/opt/usr/apps/_common/icons
+ cp MultimediaPlayer_icon.png ${DESTDIR}/opt/usr/apps/_common/icons
dist:
tar czf ../$(PACKAGE).tar.bz2 .
diff --git a/samples/web/Sample/Tizen/Web App/Modello_Multimediaplayer/project/MultimediaPlayer_icon.png b/samples/web/Sample/Tizen/Web App/Modello_Multimediaplayer/project/MultimediaPlayer_icon.png
new file mode 100644
index 0000000..4716719
--- /dev/null
+++ b/samples/web/Sample/Tizen/Web App/Modello_Multimediaplayer/project/MultimediaPlayer_icon.png
Binary files differ
diff --git a/samples/web/Sample/Tizen/Web App/Modello_Multimediaplayer/project/config.xml b/samples/web/Sample/Tizen/Web App/Modello_Multimediaplayer/project/config.xml
index be9a339..569629d 100644
--- a/samples/web/Sample/Tizen/Web App/Modello_Multimediaplayer/project/config.xml
+++ b/samples/web/Sample/Tizen/Web App/Modello_Multimediaplayer/project/config.xml
@@ -5,8 +5,8 @@
<tizen:application id="Modello007.Multimediaplayer"
package="Modello007" required_version="2.1" />
<content src="index.html" />
- <icon src="Multimedia_Player_icon.png" />
- <name>Modello Multimedia Player</name>
+ <icon src="MultimediaPlayer_icon.png" />
+ <name>ModelloMultimediaPlayer</name>
<tizen:privilege name="http://tizen.org/privilege/application.launch" />
<tizen:privilege name="http://tizen.org/privilege/filesystem.read" />
<tizen:privilege name="http://tizen.org/privilege/filesystem.write" />
diff --git a/samples/web/Sample/Tizen/Web App/Modello_Multimediaplayer/project/manifest.json b/samples/web/Sample/Tizen/Web App/Modello_Multimediaplayer/project/manifest.json
index 8cf7b7c..e851e69 100644
--- a/samples/web/Sample/Tizen/Web App/Modello_Multimediaplayer/project/manifest.json
+++ b/samples/web/Sample/Tizen/Web App/Modello_Multimediaplayer/project/manifest.json
@@ -7,6 +7,6 @@
}
},
"icons": {
- "128": "Multimedia_Player_icon.png"
+ "128": "MultimediaPlayer_icon.png"
}
}
diff --git a/samples/web/Sample/Tizen/Web App/Modello_Multimediaplayer/project/packaging/modello-multimediaplayer.changes b/samples/web/Sample/Tizen/Web App/Modello_Multimediaplayer/project/packaging/modello-multimediaplayer.changes
index 249f064..3194251 100644
--- a/samples/web/Sample/Tizen/Web App/Modello_Multimediaplayer/project/packaging/modello-multimediaplayer.changes
+++ b/samples/web/Sample/Tizen/Web App/Modello_Multimediaplayer/project/packaging/modello-multimediaplayer.changes
@@ -1,3 +1,8 @@
+* Wed Sep 10 2014 Brian Jones <brian.j.jones@intel.com> submit/tizen_ivi/20140819.215824-1-g0d52355
+
+* Wed Sep 10 2014 Brian Jones <brian.j.jones@intel.com> submit/tizen_ivi/20140819.215824-1-g0d52355
+- Removing space in app name - Fix for TC-1404
+
* Tue Aug 19 2014 Brian Jones <brian.j.jones@intel.com> accepted/tizen/ivi/20140807.054001-1-g5c41e5d
- Matching config.xml icon name to the one in the .wgt file
diff --git a/samples/web/Sample/Tizen/Web App/Modello_Multimediaplayer/project/packaging/modello-multimediaplayer.spec b/samples/web/Sample/Tizen/Web App/Modello_Multimediaplayer/project/packaging/modello-multimediaplayer.spec
index 5069b88..54713c0 100644
--- a/samples/web/Sample/Tizen/Web App/Modello_Multimediaplayer/project/packaging/modello-multimediaplayer.spec
+++ b/samples/web/Sample/Tizen/Web App/Modello_Multimediaplayer/project/packaging/modello-multimediaplayer.spec
@@ -26,4 +26,4 @@ rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
/opt/usr/apps/.preinstallWidgets/Modello_Multimediaplayer.wgt
-/opt/usr/apps/_common/icons/Multimedia_Player_icon.png
+/opt/usr/apps/_common/icons/MultimediaPlayer_icon.png
diff --git a/samples/web/Sample/Tizen/Web App/Modello_Nav/project/config.xml b/samples/web/Sample/Tizen/Web App/Modello_Nav/project/config.xml
index 50182bc..c712f94 100644
--- a/samples/web/Sample/Tizen/Web App/Modello_Nav/project/config.xml
+++ b/samples/web/Sample/Tizen/Web App/Modello_Nav/project/config.xml
@@ -4,7 +4,7 @@
<tizen:application id="Modello008.Nav" package="Modello008" required_version="2.1"/>
<content src="index.html"/>
<icon src="Navigation_icon.png"/>
- <name>Modello Navigation</name>
+ <name>ModelloNavigation</name>
<tizen:privilege name="http://tizen.org/privilege/application.launch"/>
<tizen:privilege name="http://tizen.org/privilege/filesystem.read"/>
<tizen:privilege name="http://tizen.org/privilege/filesystem.write"/>
diff --git a/samples/web/Sample/Tizen/Web App/Modello_Nav/project/packaging/modello-nav.changes b/samples/web/Sample/Tizen/Web App/Modello_Nav/project/packaging/modello-nav.changes
index 0b4fb13..530dfea 100644
--- a/samples/web/Sample/Tizen/Web App/Modello_Nav/project/packaging/modello-nav.changes
+++ b/samples/web/Sample/Tizen/Web App/Modello_Nav/project/packaging/modello-nav.changes
@@ -1,3 +1,6 @@
+* Wed Sep 10 2014 Brian Jones <brian.j.jones@intel.com> submit/tizen_ivi/20140819.215831-1-g9ada4ef
+- Removing space in app name - Fix for TC-1404
+
* Tue Aug 19 2014 Brian Jones <brian.j.jones@intel.com> accepted/tizen/ivi/20140807.054115-1-gcfb250b
- Matching config.xml icon name to the one in the .wgt file
diff --git a/samples/web/Sample/Tizen/Web App/Modello_Phone/project/config.xml b/samples/web/Sample/Tizen/Web App/Modello_Phone/project/config.xml
index 5ade7a4..61bc670 100644
--- a/samples/web/Sample/Tizen/Web App/Modello_Phone/project/config.xml
+++ b/samples/web/Sample/Tizen/Web App/Modello_Phone/project/config.xml
@@ -3,7 +3,7 @@
<tizen:application id="Modello009.Phone" package="Modello009" required_version="2.1"/>
<icon src="Phone_icon.png"/>
<content src="index.html"/>
- <name>Modello Phone</name>
+ <name>ModelloPhone</name>
<tizen:privilege name="http://tizen.org/privilege/tizen"/>
<tizen:privilege name="http://tizen.org/privilege/application.launch"/>
<tizen:privilege name="http://tizen.org/privilege/filesystem.read"/>
diff --git a/samples/web/Sample/Tizen/Web App/Modello_Phone/project/js/main.js b/samples/web/Sample/Tizen/Web App/Modello_Phone/project/js/main.js
index 38d4e8e..9ee0db7 100644
--- a/samples/web/Sample/Tizen/Web App/Modello_Phone/project/js/main.js
+++ b/samples/web/Sample/Tizen/Web App/Modello_Phone/project/js/main.js
@@ -730,7 +730,7 @@ $(document).ready(
if (acceptPhoneCallFromOtherWidget === true) {
window.setTimeout(function() {
- if (typeof tizen !== "undefined") {
+ if (typeof (tizen.application.getCurrentApplication) !== "undefined") {
tizen.application.getCurrentApplication().exit();
}
}, 1000);
diff --git a/samples/web/Sample/Tizen/Web App/Modello_Phone/project/packaging/modello-phone.changes b/samples/web/Sample/Tizen/Web App/Modello_Phone/project/packaging/modello-phone.changes
index fbe1ecd..9d7464a 100644
--- a/samples/web/Sample/Tizen/Web App/Modello_Phone/project/packaging/modello-phone.changes
+++ b/samples/web/Sample/Tizen/Web App/Modello_Phone/project/packaging/modello-phone.changes
@@ -1,3 +1,9 @@
+* Wed Sep 10 2014 Brian Jones <brian.j.jones@intel.com> submit/tizen_ivi/20140819.215838-1-g740adb1
+- Removing space in app name - Fix for TC-1404
+
+* Tue Aug 19 2014 Brian Jones <brian.j.jones@intel.com> accepted/tizen/ivi/20140807.054137-1-g2aae498
+- Matching config.xml icon name to the one in the .wgt file
+
* Wed Aug 06 2014 Brian Jones <brian.j.jones@intel.com> accepted/tizen/ivi/20140702.152118-1-g0c6f8c5
- Updating manifest to use xwalk_version instead of version - TC-1465
diff --git a/samples/web/Sample/Tizen/Web App/Modello_SDL/project/config.xml b/samples/web/Sample/Tizen/Web App/Modello_SDL/project/config.xml
index bd13ef6..04a89bb 100644
--- a/samples/web/Sample/Tizen/Web App/Modello_SDL/project/config.xml
+++ b/samples/web/Sample/Tizen/Web App/Modello_SDL/project/config.xml
@@ -2,7 +2,7 @@
<widget xmlns="http://www.w3.org/ns/widgets" xmlns:tizen="http://tizen.org/ns/widgets" version="0.5.0" viewmodes="fullscreen" id="http://com.ford.tizen/smartdevicelink">
<icon src="SmartDeviceLink_icon.png"/>
- <name>Modello SmartDeviceLink</name>
+ <name>ModelloSmartDeviceLink</name>
<tizen:application id="Modello010.SDL" package="Modello010" required_version="2.1"/>
<feature name="http://tizen.org/api/bluetooth" required="true"/>
<feature name="http://tizen.org/api/bluetooth.admin" required="true"/>
diff --git a/samples/web/Sample/Tizen/Web App/Modello_SDL/project/packaging/modello-sdl.changes b/samples/web/Sample/Tizen/Web App/Modello_SDL/project/packaging/modello-sdl.changes
index 546dc7a..28e9afc 100644
--- a/samples/web/Sample/Tizen/Web App/Modello_SDL/project/packaging/modello-sdl.changes
+++ b/samples/web/Sample/Tizen/Web App/Modello_SDL/project/packaging/modello-sdl.changes
@@ -1,3 +1,6 @@
+* Wed Sep 10 2014 Brian Jones <brian.j.jones@intel.com> submit/tizen_ivi/20140819.215851-1-g5f6b3fa
+- Removing space in app name - Fix for TC-1404
+
* Tue Aug 19 2014 Brian Jones <brian.j.jones@intel.com> accepted/tizen/ivi/20140807.053941-1-gc1691b9
- Matching config.xml icon name to the one in the .wgt file