Updated Modello web samples from upstream; version up

Change-Id: Ib035c903b331bf0f4e0e34517a6df50eeb1dbbdf
Signed-off-by: Alice Liu <alice.liu@intel.com>

diff --git a/package/changelog b/package/changelog
index 8142a03..385a6c7 100644 (file)
--- a/package/changelog
+++ b/package/changelog
@@ -1,3 +1,7 @@
+* 3.0.20
+* Updated Modello web samples from upstream
+== Alice Liu <alice.liu@intel.com> 2014-08-11
+
 * 3.0.19
 * Updated Modello web samples from upstream
 == Alice Liu <alice.liu@intel.com> 2014-07-23

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index f4633a8..763aba5 100644 (file)
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,4 +1,4 @@
-Version:3.0.19
+Version:3.0.20
 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/manifest.json b/samples/web/Sample/Tizen/Web App/Modello_AMBSimulator/project/manifest.json
index 880b1d1..d9c3e5c 100644 (file)
--- a/samples/web/Sample/Tizen/Web App/Modello_AMBSimulator/project/manifest.json
+++ b/samples/web/Sample/Tizen/Web App/Modello_AMBSimulator/project/manifest.json
@@ -1,6 +1,6 @@
 {
   "name": "Modello AMB Simulator",
-  "version": "0.0.2",
+  "xwalk_version": "0.0.2",
   "app": {
     "launch":{
       "local_path": "index.html"

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 017bcf7..809102a 100644 (file)
--- 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 Aug 06 2014 Brian Jones <brian.j.jones@intel.com> accepted/tizen/ivi/20140526.131112-1-g7fa65f7
+- Updating manifest to use xwalk_version instead of version - TC-1465
+
 * Thu May 22 2014 brianjjones <brian.j.jones@intel.com> submit/tizen_ivi/20140508.232447@3a76a49
 - Fixes for IVI-3190 - To get things to render normally
 

diff --git a/samples/web/Sample/Tizen/Web App/Modello_Appmanager/project/manifest.json b/samples/web/Sample/Tizen/Web App/Modello_Appmanager/project/manifest.json
index bca2ec5..945ea40 100644 (file)
--- a/samples/web/Sample/Tizen/Web App/Modello_Appmanager/project/manifest.json
+++ b/samples/web/Sample/Tizen/Web App/Modello_Appmanager/project/manifest.json
@@ -1,6 +1,6 @@
 {
   "name": "Modello AppManager",
-  "version": "0.0.2",
+  "xwalk_version": "0.0.2",
   "app": {
     "launch":{
       "local_path": "index.html"

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 e8a7e54..fbc9ca6 100644 (file)
--- 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 Aug 06 2014 Brian Jones <brian.j.jones@intel.com> accepted/tizen/ivi/20140526.131050-1-g0558dae
+- Updating manifest to use xwalk_version instead of version - TC-1465
+
 * Thu May 22 2014 brianjjones <brian.j.jones@intel.com> submit/tizen_ivi/20140508.232454@931c063
 - Fixes for IVI-3190 - To get things to render normally
 

diff --git a/samples/web/Sample/Tizen/Web App/Modello_Dashboard/project/manifest.json b/samples/web/Sample/Tizen/Web App/Modello_Dashboard/project/manifest.json
index a5bab5f..acb6398 100644 (file)
--- a/samples/web/Sample/Tizen/Web App/Modello_Dashboard/project/manifest.json
+++ b/samples/web/Sample/Tizen/Web App/Modello_Dashboard/project/manifest.json
@@ -1,6 +1,6 @@
 {
   "name": "Modello Dashboard",
-  "version": "0.0.2",
+  "xwalk_version": "0.0.2",
   "app": {
     "launch":{
       "local_path": "index.html"

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 a70e50b..0bbcb2f 100644 (file)
--- 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 Aug 06 2014 Brian Jones <brian.j.jones@intel.com> accepted/tizen/ivi/20140526.130948-1-g3c2b00a
+- Updating manifest to use xwalk_version instead of version - TC-1465
+
 * Thu May 22 2014 brianjjones <brian.j.jones@intel.com> submit/tizen_ivi/20140508.232502@b29a4bd
 - Fixes for IVI-3190 - To get things to render normally
 

diff --git a/samples/web/Sample/Tizen/Web App/Modello_Homescreen/project/manifest.json b/samples/web/Sample/Tizen/Web App/Modello_Homescreen/project/manifest.json
index cb899cd..65e54b5 100644 (file)
--- a/samples/web/Sample/Tizen/Web App/Modello_Homescreen/project/manifest.json
+++ b/samples/web/Sample/Tizen/Web App/Modello_Homescreen/project/manifest.json
@@ -1,6 +1,6 @@
 {
   "name": "Modello Homescreen",
-  "version": "0.0.2",
+  "xwalk_version": "0.0.2",
   "app": {
     "launch":{
       "local_path": "index.html"

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 6f3e813..5be7fee 100644 (file)
--- 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 Aug 06 2014 Brian Jones <brian.j.jones@intel.com> accepted/tizen/ivi/20140702.153400-1-g90fae66
+- Updating manifest to use xwalk_version instead of version - TC-1465
+
 * Thu Jun 05 2014 brianjjones <brian.j.jones@intel.com> accepted/tizen/ivi/20140526.131006@dabff47
 - Fix for TIVI-3114.  Refactor Modello to start at launch with Xwalk
 

diff --git a/samples/web/Sample/Tizen/Web App/Modello_Hvac/project/manifest.json b/samples/web/Sample/Tizen/Web App/Modello_Hvac/project/manifest.json
index 3eb7677..a4f4f3a 100644 (file)
--- a/samples/web/Sample/Tizen/Web App/Modello_Hvac/project/manifest.json
+++ b/samples/web/Sample/Tizen/Web App/Modello_Hvac/project/manifest.json
@@ -1,6 +1,6 @@
 {
   "name": "Modello HVAC",
-  "version": "0.0.2",
+  "xwalk_version": "0.0.2",
   "app": {
     "launch":{
       "local_path": "index.html"

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 d6c1da2..999e596 100644 (file)
--- 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 Aug 06 2014 Brian Jones <brian.j.jones@intel.com> accepted/tizen/ivi/20140526.130905-1-g894b121
+- Updating manifest to use xwalk_version instead of version - TC-1465
+
 * Thu May 22 2014 brianjjones <brian.j.jones@intel.com> submit/tizen_ivi/20140508.232618@f5ca6c4
 - Fixes for IVI-3190 - To get things to render normally
 

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 e61c388..8cf7b7c 100644 (file)
--- a/samples/web/Sample/Tizen/Web App/Modello_Multimediaplayer/project/manifest.json
+++ b/samples/web/Sample/Tizen/Web App/Modello_Multimediaplayer/project/manifest.json
@@ -1,12 +1,12 @@
 {
   "name": "Modello Multimedia Player",
-  "version": "0.0.2",
+  "xwalk_version": "0.0.2",
   "app": {
     "launch":{
       "local_path": "index.html"
     }
   },
   "icons": {
-    "128": "Multimedia_Player__icon.png"
+    "128": "Multimedia_Player_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 c8d7ccc..79cf83c 100644 (file)
--- 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,6 @@
+* Wed Aug 06 2014 Brian Jones <brian.j.jones@intel.com> submit/tizen_ivi/20140708.220310-1-ge05ded7
+- Updating manifest to use xwalk_version instead of version - TC-1465
+
 * Mon Jul 07 2014 brianjjones <brian.j.jones@intel.com> accepted/tizen/ivi/20140702.153244-1-g3435640
 - Removing faulty debug code and commented coded
 

diff --git a/samples/web/Sample/Tizen/Web App/Modello_Nav/project/manifest.json b/samples/web/Sample/Tizen/Web App/Modello_Nav/project/manifest.json
index 2feedde..5c785ff 100644 (file)
--- a/samples/web/Sample/Tizen/Web App/Modello_Nav/project/manifest.json
+++ b/samples/web/Sample/Tizen/Web App/Modello_Nav/project/manifest.json
@@ -1,6 +1,6 @@
 {
   "name": "Modello Navigation",
-  "version": "0.0.2",
+  "xwalk_version": "0.0.2",
   "app": {
     "launch":{
       "local_path": "index.html"

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 df0b845..036dbfc 100644 (file)
--- 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 Aug 06 2014 Brian Jones <brian.j.jones@intel.com> accepted/tizen/ivi/20140526.130843-1-g993574a
+- Updating manifest to use xwalk_version instead of version - TC-1465
+
 * Thu May 22 2014 brianjjones <brian.j.jones@intel.com> submit/tizen_ivi/20140508.232701@8db0d1c
 - Fixes for IVI-3190 - To get things to render normally
 

diff --git a/samples/web/Sample/Tizen/Web App/Modello_Phone/project/manifest.json b/samples/web/Sample/Tizen/Web App/Modello_Phone/project/manifest.json
index 1a8da7f..c074083 100644 (file)
--- a/samples/web/Sample/Tizen/Web App/Modello_Phone/project/manifest.json
+++ b/samples/web/Sample/Tizen/Web App/Modello_Phone/project/manifest.json
@@ -1,6 +1,6 @@
 {
   "name": "Modello Phone",
-  "version": "0.0.2",
+  "xwalk_version": "0.0.2",
   "app": {
     "launch":{
       "local_path": "index.html"

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 7dc936f..fbe1ecd 100644 (file)
--- 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,6 @@
+* 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
+
 * Thu May 22 2014 brianjjones <brian.j.jones@intel.com> submit/tizen_ivi/20140508.232710@14d529a
 - Fixes for IVI-3190 - To get things to render normally
 

diff --git a/samples/web/Sample/Tizen/Web App/Modello_SDL/project/manifest.json b/samples/web/Sample/Tizen/Web App/Modello_SDL/project/manifest.json
index 43fcbce..11ae73d 100644 (file)
--- a/samples/web/Sample/Tizen/Web App/Modello_SDL/project/manifest.json
+++ b/samples/web/Sample/Tizen/Web App/Modello_SDL/project/manifest.json
@@ -1,6 +1,6 @@
 {
   "name": "Modello SmartDeviceLink",
-  "version": "0.0.2",
+  "xwalk_version": "0.0.2",
   "app": {
     "launch":{
       "local_path": "index.html"

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 c244ff4..ad09fdd 100644 (file)
--- 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 Aug 06 2014 Brian Jones <brian.j.jones@intel.com> accepted/tizen/ivi/20140614.104104-1-g22ec0f1
+- Updating manifest to use xwalk_version instead of version - TC-1465
+
 * Thu May 22 2014 brianjjones <brian.j.jones@intel.com> submit/tizen_ivi/20140508.232717@a182318
 - Fixes for IVI-3190 - To get things to render normally