X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=recipes-demo-hmi%2FCES2017-demo%2FCES2017-demo.bb;h=681e246f5526eb0cf264885bc5967d4074896334;hb=7bb3630d56eaf54bbb59bfac22ddca695f8d9dcd;hp=ef4b48d7a1d3285482a658bb48e25b759d08f677;hpb=276f30ef24715c9c86a9b63e7406dd9a8cc93a0c;p=AGL%2Fmeta-agl-demo.git

diff --git a/recipes-demo-hmi/CES2017-demo/CES2017-demo.bb b/recipes-demo-hmi/CES2017-demo/CES2017-demo.bb
index ef4b48d7a..681e246f5 100644
--- a/recipes-demo-hmi/CES2017-demo/CES2017-demo.bb
+++ b/recipes-demo-hmi/CES2017-demo/CES2017-demo.bb
@@ -10,11 +10,19 @@ PN          = "ces2017-demo"
 inherit qmake5
 DEPENDS = "homescreen zip-native qtmultimedia qtquickcontrols2"
 
+inherit aglwgt
+
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=815ca599c9df247a0c7f619bab123dad"
 
-SRC_URI     = "git://gerrit.automotivelinux.org/gerrit/AGL/DemoApps/CES2017;protocol=http"
-SRCREV      = "${AUTOREV}"
+# ALS, CES, FOSDEM available
+AGL_RADIO_PRESETS_LOCALE ?= "CES"
 
+SRC_URI     = "git://gerrit.automotivelinux.org/gerrit/AGL/DemoApps/CES2017;protocol=http \
+               file://presets-ALS.conf \
+               file://presets-CES.conf \
+               file://presets-FOSDEM.conf \
+"
+SRCREV      = "${AUTOREV}"
 
 RDEPENDS_${PN} += " \
     qtmultimedia-qmlplugins \
@@ -25,6 +33,8 @@ RDEPENDS_${PN} += " \
     "
 
 do_install_prepend() {
+    mkdir -p ${B}/package
+
     echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?> \
 <widget xmlns=\"http://www.w3.org/ns/widgets\" id=\"controls\" version=\"0.1\"> \
   <name>Controls</name> \
@@ -37,9 +47,7 @@ do_install_prepend() {
 " > ${B}/apps/Controls/config.xml
 
     cd ${B}/apps/Controls/
-    zip controls.wgt config.xml controls
-
-
+    zip ${B}/package/controls.wgt config.xml controls
 
     echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?> \
 <widget xmlns=\"http://www.w3.org/ns/widgets\" id=\"dashboard\" version=\"0.1\"> \
@@ -53,8 +61,7 @@ do_install_prepend() {
 " > ${B}/apps/Dashboard/config.xml
 
     cd ${B}/apps/Dashboard/
-    zip dashboard.wgt config.xml dashboard
-
+    zip ${B}/package/dashboard.wgt config.xml dashboard
 
 
     echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?> \
@@ -69,7 +76,7 @@ do_install_prepend() {
 " > ${B}/apps/Phone/config.xml
 
     cd ${B}/apps/Phone/
-    zip phone.wgt config.xml phone
+    zip ${B}/package/phone.wgt config.xml phone
 
 
 
@@ -85,34 +92,16 @@ do_install_prepend() {
 " > ${B}/apps/Radio/config.xml
 
     cd ${B}/apps/Radio/
-    zip radio.wgt config.xml radio
-
-
-
-    cat > ${B}/apps/installAllApps.sh <<-EOF
-	#!/bin/sh
-	/usr/bin/afm-util install controls.wgt
-	/usr/bin/afm-util install dashboard.wgt
-	/usr/bin/afm-util install phone.wgt
-	/usr/bin/afm-util install radio.wgt
-	/usr/bin/afm-util install settings.wgt
-	/usr/bin/afm-util install navigation.wgt
-	/usr/bin/afm-util install poi.wgt
-	
-	#it's Workaround
-	cyad -s -k MANIFESTS -t allow -c User::App::navigation -u '*' -p 'http://tizen.org/privilege/internal/dbus'
-	cyad -s -k MANIFESTS -t allow -c User::App::poi -u '*' -p 'http://tizen.org/privilege/internal/dbus'
-	EOF
+    zip ${B}/package/radio.wgt config.xml radio
+
 }
 
 do_install() {
-    install -d ${D}/usr/AGL/${PN}
-    install -m 0644 ${B}/apps/Controls/controls.wgt ${D}/usr/AGL/${PN}/
-    install -m 0644 ${B}/apps/Dashboard/dashboard.wgt ${D}/usr/AGL/${PN}/
-    install -m 0644 ${B}/apps/Phone/phone.wgt ${D}/usr/AGL/${PN}/
-    install -m 0644 ${B}/apps/Radio/radio.wgt ${D}/usr/AGL/${PN}/
-
-    install -m 0755 ${B}/apps/installAllApps.sh ${D}/usr/AGL/${PN}/
+    install -d ${D}/home/root/app-data/radio
+    install -m 0644 ${WORKDIR}/presets-CES.conf ${D}/home/root/app-data/radio/
+    install -m 0644 ${WORKDIR}/presets-ALS.conf ${D}/home/root/app-data/radio/
+    install -m 0644 ${WORKDIR}/presets-FOSDEM.conf ${D}/home/root/app-data/radio/
+    install -m 0644 ${WORKDIR}/presets-${AGL_RADIO_PRESETS_LOCALE}.conf ${D}/home/root/app-data/radio/presets.conf
 
     install -d ${D}${libdir}/qt5/qml/AGL/Demo/Controls/
     install -m 0644 ${S}/imports/AGL/Demo/Controls/qmldir ${D}${libdir}/qt5/qml/AGL/Demo/Controls/
@@ -143,6 +132,8 @@ do_install() {
 #}
 
 FILES_${PN} += "/usr/AGL/ \
+        /home/root/app-data/radio/presets-*.conf \
+        /home/root/app-data/radio/presets.conf \
 	/usr/lib/qt5/qml/AGL/Demo/Controls/qmldir \
 	/usr/lib/qt5/qml/AGL/Demo/Controls/ImageButton.qml \
 	/usr/lib/qt5/qml/AGL/Demo/Controls/ToggleButton.qml \