X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=recipes-demo-hmi%2FCES2017-demo%2FCES2017-demo.bb;h=ef4b48d7a1d3285482a658bb48e25b759d08f677;hb=refs%2Fchanges%2F73%2F7873%2F2;hp=631cbc1f8ad7acdf35e531e66162fd3b0b865128;hpb=f4743ec44fb3fdac04a82790b763cb84f51cc6b7;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 631cbc1f8..ef4b48d7a 100644
--- a/recipes-demo-hmi/CES2017-demo/CES2017-demo.bb
+++ b/recipes-demo-hmi/CES2017-demo/CES2017-demo.bb
@@ -8,7 +8,7 @@ S           = "${WORKDIR}/git/"
 PN          = "ces2017-demo"
 
 inherit qmake5
-DEPENDS = " qtbase qtdeclarative qtquickcontrols2 qtvirtualkeyboard qtmultimedia homescreen zip-native"
+DEPENDS = "homescreen zip-native qtmultimedia qtquickcontrols2"
 
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=815ca599c9df247a0c7f619bab123dad"
 
@@ -57,38 +57,6 @@ do_install_prepend() {
 
 
 
-    echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?> \
-<widget xmlns=\"http://www.w3.org/ns/widgets\" id=\"hvac\" version=\"0.1\"> \
-  <name>HVAC</name> \
-  <content src=\"hvac\" type=\"application/x-executable\"/> \
-  <description>HVAC app.</description> \
-  <author>Qt</author> \
-  <icon src=\"hvac.png\"/> \
-  <license>Apache 2.0</license> \
-</widget> \
-" > ${B}/apps/HVAC/config.xml
-
-    cd ${B}/apps/HVAC/
-    zip hvac.wgt config.xml hvac
-
-
-
-    echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?> \
-<widget xmlns=\"http://www.w3.org/ns/widgets\" id=\"mediaplayer\" version=\"0.1\"> \
-  <name>MediaPlayer</name> \
-  <content src=\"mediaplayer\" type=\"application/x-executable\"/> \
-  <description>MediaPlayer app.</description> \
-  <author>Qt</author> \
-  <icon src=\"mediaplayer.png\"/> \
-  <license>Apache 2.0</license> \
-</widget> \
-" > ${B}/apps/MediaPlayer/config.xml
-
-    cd ${B}/apps/MediaPlayer/
-    zip mediaplayer.wgt config.xml mediaplayer
-
-
-
     echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?> \
 <widget xmlns=\"http://www.w3.org/ns/widgets\" id=\"phone\" version=\"0.1\"> \
   <name>Phone</name> \
@@ -121,30 +89,19 @@ do_install_prepend() {
 
 
 
-    echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?> \
-<widget xmlns=\"http://www.w3.org/ns/widgets\" id=\"settings\" version=\"0.1\"> \
-  <name>Settings</name> \
-  <content src=\"settings\" type=\"application/x-executable\"/> \
-  <description>Settings app.</description> \
-  <author>Qt</author> \
-  <icon src=\"settings.png\"/> \
-  <license>Apache 2.0</license> \
-</widget> \
-" > ${B}/apps/Settings/config.xml
-
-    cd ${B}/apps/Settings/
-    zip settings.wgt config.xml settings
-
-
     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 hvac.wgt
-	/usr/bin/afm-util install mediaplayer.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
 }
 
@@ -152,11 +109,8 @@ 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/HVAC/hvac.wgt ${D}/usr/AGL/${PN}/
-    install -m 0644 ${B}/apps/MediaPlayer/mediaplayer.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 0644 ${B}/apps/Settings/settings.wgt ${D}/usr/AGL/${PN}/
 
     install -m 0755 ${B}/apps/installAllApps.sh ${D}/usr/AGL/${PN}/
 
@@ -164,6 +118,16 @@ do_install() {
     install -m 0644 ${S}/imports/AGL/Demo/Controls/qmldir ${D}${libdir}/qt5/qml/AGL/Demo/Controls/
     install -m 0644 ${S}/imports/AGL/Demo/Controls/ImageButton.qml ${D}${libdir}/qt5/qml/AGL/Demo/Controls/
     install -m 0644 ${S}/imports/AGL/Demo/Controls/ToggleButton.qml ${D}${libdir}/qt5/qml/AGL/Demo/Controls/
+    install -m 0644 ${S}/imports/AGL/Demo/Controls/Key.qml ${D}${libdir}/qt5/qml/AGL/Demo/Controls/
+    install -m 0644 ${S}/imports/AGL/Demo/Controls/AbstractKeyboard.qml ${D}${libdir}/qt5/qml/AGL/Demo/Controls/
+    install -m 0644 ${S}/imports/AGL/Demo/Controls/Symbols.qml ${D}${libdir}/qt5/qml/AGL/Demo/Controls/
+    install -m 0644 ${S}/imports/AGL/Demo/Controls/Alphabet.qml ${D}${libdir}/qt5/qml/AGL/Demo/Controls/
+    install -m 0644 ${S}/imports/AGL/Demo/Controls/Keyboard.qml ${D}${libdir}/qt5/qml/AGL/Demo/Controls/
+    install -d ${D}${libdir}/qt5/qml/AGL/Demo/Controls/images/
+    install -m 0644 ${S}/imports/AGL/Demo/Controls/images/Keyboard_Back.svg ${D}${libdir}/qt5/qml/AGL/Demo/Controls/images/
+    install -m 0644 ${S}/imports/AGL/Demo/Controls/images/Keyboard_Shift.svg ${D}${libdir}/qt5/qml/AGL/Demo/Controls/images/
+    install -m 0644 ${S}/imports/AGL/Demo/Controls/images/Keyboard_Space.svg ${D}${libdir}/qt5/qml/AGL/Demo/Controls/images/
+    install -m 0644 ${S}/imports/AGL/Demo/Controls/images/Keyboard_Arrow.svg ${D}${libdir}/qt5/qml/AGL/Demo/Controls/images/
 
     install -d ${D}${libdir}/qt5/qml/QtQuick/Controls.2/AGL
     install -m 0644 ${S}/imports/qtquickcontrols2aglstyle/*.qml ${D}${libdir}/qt5/qml/QtQuick/Controls.2/AGL
@@ -182,6 +146,15 @@ FILES_${PN} += "/usr/AGL/ \
 	/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 \
+	/usr/lib/qt5/qml/AGL/Demo/Controls/Key.qml \
+	/usr/lib/qt5/qml/AGL/Demo/Controls/AbstractKeyboard.qml \
+	/usr/lib/qt5/qml/AGL/Demo/Controls/Symbols.qml \
+	/usr/lib/qt5/qml/AGL/Demo/Controls/Alphabet.qml \
+	/usr/lib/qt5/qml/AGL/Demo/Controls/Keyboard.qml \
+	/usr/lib/qt5/qml/AGL/Demo/Controls/images/Keyboard_Back.svg \
+	/usr/lib/qt5/qml/AGL/Demo/Controls/images/Keyboard_Shift.svg \
+	/usr/lib/qt5/qml/AGL/Demo/Controls/images/Keyboard_Space.svg \
+	/usr/lib/qt5/qml/AGL/Demo/Controls/images/Keyboard_Arrow.svg \
 	/usr/lib/qt5/qml/QtQuick/Controls.2/AGL \
 	/usr/lib/qt5/qml/QtQuick/Controls.2/AGL/images \
 	"