From 75f2cbce6e857afca98d666343aedf4f2980da02 Mon Sep 17 00:00:00 2001 From: Alice Liu Date: Fri, 22 Aug 2014 14:37:55 +0800 Subject: [PATCH] Updated Modello web samples from upstream; version up Change-Id: I00e36ddd91d2828a0dc6ae9db09db7b3f83e6171 Signed-off-by: Alice Liu --- package/changelog | 4 ++++ package/pkginfo.manifest | 2 +- .../project/packaging/modello-ambsimulator.changes | 3 +++ .../Web App/Modello_Appmanager/project/Makefile | 2 +- .../project/packaging/modello-appmanager.changes | 3 +++ .../project/packaging/modello-dashboard.changes | 3 +++ .../Modello_Homescreen/project/js/installedApps.js | 2 +- .../project/js/predefAppModel.js | 28 +++++++++++----------- .../project/packaging/modello-homescreen.changes | 3 +++ .../project/packaging/modello-hvac.changes | 3 +++ .../packaging/modello-multimediaplayer.changes | 3 +++ .../project/packaging/modello-nav.changes | 3 +++ .../project/packaging/modello-sdl.changes | 3 +++ 13 files changed, 45 insertions(+), 17 deletions(-) diff --git a/package/changelog b/package/changelog index 385a6c7..b85089b 100644 --- a/package/changelog +++ b/package/changelog @@ -1,3 +1,7 @@ +* 3.0.21 +* Updated Modello web samples from upstream +== Alice Liu 2014-08-22 + * 3.0.20 * Updated Modello web samples from upstream == Alice Liu 2014-08-11 diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest index 763aba5..17494d4 100644 --- a/package/pkginfo.manifest +++ b/package/pkginfo.manifest @@ -1,4 +1,4 @@ -Version:3.0.20 +Version:3.0.21 Maintainer: Alice Liu Package:ivi-3.0-web-sample 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 809102a..86563ad 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 @@ +* Tue Aug 19 2014 Brian Jones accepted/tizen/ivi/20140807.053921-1-g14c6918 +- Matching config.xml icon name to the one in the .wgt file + * Wed Aug 06 2014 Brian Jones accepted/tizen/ivi/20140526.131112-1-g7fa65f7 - Updating manifest to use xwalk_version instead of version - TC-1465 diff --git a/samples/web/Sample/Tizen/Web App/Modello_Appmanager/project/Makefile b/samples/web/Sample/Tizen/Web App/Modello_Appmanager/project/Makefile index 9717ebb..616da5a 100644 --- a/samples/web/Sample/Tizen/Web App/Modello_Appmanager/project/Makefile +++ b/samples/web/Sample/Tizen/Web App/Modello_Appmanager/project/Makefile @@ -7,7 +7,7 @@ INSTALL_FILES = $(PROJECT).wgt INSTALL_DIR = ${DESTDIR}/opt/usr/apps/.preinstallWidgets wgtPkg: - zip -r $(PROJECT).wgt config.xml css AppManagericon.png index.html js templates + zip -r $(PROJECT).wgt config.xml css AppManager_icon.png index.html js templates install: @echo "Installing Appmanager, stand by..." 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 fbc9ca6..3fd3592 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 @@ +* Tue Aug 19 2014 Brian Jones accepted/tizen/ivi/20140807.053836-1-g373017f +- Matching config.xml icon name to the one in the .wgt file + * Wed Aug 06 2014 Brian Jones accepted/tizen/ivi/20140526.131050-1-g0558dae - Updating manifest to use xwalk_version instead of version - TC-1465 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 0bbcb2f..71bcd26 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 @@ +* Tue Aug 19 2014 Brian Jones accepted/tizen/ivi/20140807.053859-1-g315b0c2 +- Matching config.xml icon name to the one in the .wgt file + * Wed Aug 06 2014 Brian Jones accepted/tizen/ivi/20140526.130948-1-g3c2b00a - Updating manifest to use xwalk_version instead of version - TC-1465 diff --git a/samples/web/Sample/Tizen/Web App/Modello_Homescreen/project/js/installedApps.js b/samples/web/Sample/Tizen/Web App/Modello_Homescreen/project/js/installedApps.js index 3509eef..fc743e7 100644 --- a/samples/web/Sample/Tizen/Web App/Modello_Homescreen/project/js/installedApps.js +++ b/samples/web/Sample/Tizen/Web App/Modello_Homescreen/project/js/installedApps.js @@ -247,7 +247,7 @@ function onAppInfoSuccess(list) { **/ evalInstalledApps = function() { "use strict"; - if (typeof tizen !== 'undefined') { + if (typeof (tizen.application.getAppsInfo) !== 'undefined') { try { // get the installed applications list tizen.application.getAppsInfo(onAppInfoSuccess, function(err) { 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 d69bb40..62ed157 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 @@ -81,8 +81,8 @@ var areasDefinitions = [ { shape: 'cenerCircle' }, { name: 'navigation', - id: 'xwalk.epacfkhfnnlaamkbaiedmohaeogbedkf', - iconPath: '../navigation/icon.png', + id: 'Modello008.Nav', + iconPath: '../icons/Navigation_icon.png', sectorId: 1, sc: 104, lc: 497, @@ -91,8 +91,8 @@ var areasDefinitions = [ { shape: 'pieWithoutCenter' }, { name: "airconditioning", - id: 'xwalk.fmpbbfhmnlghfghbblcobiiedfbjgegp', - iconPath: '../dashboard/icon.png', + id: 'Modello006.Hvac', + iconPath: '../icons/Dashboard_icon.png', sectorId: 2, sc: 94, //small circle border lc: 437, //large circle border @@ -101,8 +101,8 @@ var areasDefinitions = [ { shape: 'pieWithoutCenter' }, { name: 'MultimediaPlayer', - id: 'xwalk.ilflnmejfmcdcdnjjgejnfbhhbfaaefb', - iconPath: '../musicplayer/icon.png', + id: 'Modello007.Multimediaplayer', + iconPath: '../icons/Multimedia_Player_icon.png', sectorId: 3, sc: 80, lc: 392, @@ -111,8 +111,8 @@ var areasDefinitions = [ { shape: 'pieWithoutCenter' }, { name: 'SmartDeviceLink', - id: 'xwalk.kiefmdieeelkgmnjldgklhlemjdkgpbm', - iconPath: '../smartdevicelink/icon.png', + id: 'Modello010.SDL', + iconPath: '../icons/SmartDeviceLink_icon.png', sectorId: 4, sc: 80, lc: 384, @@ -121,8 +121,8 @@ var areasDefinitions = [ { shape: 'pieWithoutCenter' }, { name: 'phone', - id: 'xwalk.nejoidhifdhhbogkaoimdcalkmllicab', - iconPath: '../phone/icon.png', + id: 'Modello009.Phone', + iconPath: '../apps/Phone_icon.png', sectorId: 5, sc: 82, lc: 364, @@ -131,8 +131,8 @@ var areasDefinitions = [ { shape: 'pieWithoutCenter' }, { name: 'store', - id: 'xwalk.ofalfnmcoplngiipflmdhdegilbfepoh', - iconPath: '../store/icon.png', + id: 'Modello003.AppManager', + iconPath: '../icons/AppManager_icon.png', sectorId: 6, sc: 82, lc: 364, @@ -141,8 +141,8 @@ var areasDefinitions = [ { shape: 'pieWithoutCenter' }, { name: 'dashboard', - id: 'xwalk.knojblgeighiodojgihegbmkbbadfpnk', - iconPath: '../dashboard/icon.png', + id: 'Modello004.Dashboard', + iconPath: '../icons/Dashboard_icon.png', sectorId: 7, sc: 105, lc: 433, 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 5be7fee..9fa6109 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 @@ +* Tue Aug 19 2014 Brian Jones submit/tizen_3.0.m14.2_ivi/20140723.000001-3-g1933e57 +- Matching config.xml icon name to the one in the .wgt file + * Wed Aug 06 2014 Brian Jones accepted/tizen/ivi/20140702.153400-1-g90fae66 - Updating manifest to use xwalk_version instead of version - TC-1465 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 999e596..5b5e4cd 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 @@ +* Tue Aug 19 2014 Brian Jones accepted/tizen/ivi/20140807.054025-1-g2bb817c +- Matching config.xml icon name to the one in the .wgt file + * Wed Aug 06 2014 Brian Jones accepted/tizen/ivi/20140526.130905-1-g894b121 - Updating manifest to use xwalk_version instead of version - TC-1465 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 79cf83c..249f064 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,6 @@ +* Tue Aug 19 2014 Brian Jones accepted/tizen/ivi/20140807.054001-1-g5c41e5d +- Matching config.xml icon name to the one in the .wgt file + * Wed Aug 06 2014 Brian Jones submit/tizen_ivi/20140708.220310-1-ge05ded7 - Updating manifest to use xwalk_version instead of version - TC-1465 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 036dbfc..0b4fb13 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 @@ +* Tue Aug 19 2014 Brian Jones accepted/tizen/ivi/20140807.054115-1-gcfb250b +- Matching config.xml icon name to the one in the .wgt file + * Wed Aug 06 2014 Brian Jones accepted/tizen/ivi/20140526.130843-1-g993574a - Updating manifest to use xwalk_version instead of version - TC-1465 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 ad09fdd..546dc7a 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 @@ +* Tue Aug 19 2014 Brian Jones accepted/tizen/ivi/20140807.053941-1-gc1691b9 +- Matching config.xml icon name to the one in the .wgt file + * Wed Aug 06 2014 Brian Jones accepted/tizen/ivi/20140614.104104-1-g22ec0f1 - Updating manifest to use xwalk_version instead of version - TC-1465 -- 2.7.4