From: Bocklage, Jens Date: Wed, 7 Dec 2016 16:46:47 +0000 (+0100) Subject: First integration of new HMI design X-Git-Tag: 3.0.0~68 X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=ba8a07ab5aa28064af68922348e36a06ba1912ea;p=AGL%2Fmeta-agl-demo.git First integration of new HMI design New HMI in QML is integrated. Apps are only launched once now and not several times. Layer- and surface handling fixed by removing duplicate ilm API calls. Signed-off-by: Bocklage, Jens --- diff --git a/recipes-demo-hmi/HomeScreen/HomeScreen.bb b/recipes-demo-hmi/HomeScreen/HomeScreen.bb deleted file mode 100644 index 7e5b7eacd..000000000 --- a/recipes-demo-hmi/HomeScreen/HomeScreen.bb +++ /dev/null @@ -1,87 +0,0 @@ -SUMMARY = "AGL Home Screen Application" -DESCRIPTION = "AGL Home Screen Application + SampleAppTimeDate + HomeScreenAppFrameworkBinderAGL + WindowManager + InputEventManager + two sample apps (QML and Qtwidget)" -HOMEPAGE = "https://wiki.automotivelinux.org/homescreen" -LICENSE = "Apache-2.0" -SECTION = "apps" -PV = "0.6.5+git" -S = "${WORKDIR}/git/" - -inherit qmake5 systemd -DEPENDS = " qtbase " - -# for HomeScreenAppFrameworkBinderTizen: -#DEPENDS += " pkgmgr-info aul " -# for WindowManager: -DEPENDS += " wayland-ivi-extension " -# for libhomescreen -DEPENDS += " glib-2.0 " -# for sample apps -DEPENDS += " qtdeclarative qtquickcontrols2 " - -LIC_FILES_CHKSUM = "file://HomeScreen/LICENSE;md5=ae6497158920d9524cf208c09cc4c984" -SRCREV = "${AUTOREV}" -SRC_URI = "git://gerrit.automotivelinux.org/gerrit/p/staging/HomeScreen.git;protocol=http" - -PATH_prepend = "${STAGING_DIR_NATIVE}${OE_QMAKE_PATH_QT_BINS}:" - -do_install() { - install -d ${D}/usr/AGL/${PN} - install -m 0755 ${B}/HomeScreen/HomeScreen ${D}/usr/AGL/${PN}/ - install -d ${D}/usr/AGL/${PN}/colorschemes - cp -r ${B}/HomeScreen/colorschemes/* ${D}/usr/AGL/${PN}/colorschemes/ - install -m 0755 ${B}/SampleAppTimeDate/SampleAppTimeDate ${D}/usr/AGL/${PN}/ - install -m 0755 ${B}/SampleHomeScreenInterfaceApp/SampleHomeScreenInterfaceApp ${D}/usr/AGL/${PN}/ - install -m 0755 ${B}/HomeScreenAppFrameworkBinderAGL/HomeScreenAppFrameworkBinderAGL ${D}/usr/AGL/${PN}/ - install -m 0755 ${B}/WindowManager/WindowManager ${D}/usr/AGL/${PN}/ - install -m 0755 ${B}/InputEventManager/InputEventManager ${D}/usr/AGL/${PN}/ - install -m 0755 ${B}/SampleNavigationApp/SampleNavigationApp ${D}/usr/AGL/${PN}/ - install -m 0755 ${B}/SampleMediaApp/SampleMediaApp ${D}/usr/AGL/${PN}/ - - install -d ${D}${libdir} - install -m 0644 ${B}/libhomescreen/libhomescreen.so.1.0.0 ${D}${libdir}/ - ln -sf ${libdir}/libhomescreen.so.1.0.0 ${D}${libdir}/libhomescreen.so - ln -sf ${libdir}/libhomescreen.so.1.0.0 ${D}${libdir}/libhomescreen.so.1 - ln -sf ${libdir}/libhomescreen.so.1.0.0 ${D}${libdir}/libhomescreen.so.1.0 - - - install -d ${D}${systemd_user_unitdir} - install -m 0644 ${S}/HomeScreen/conf/HomeScreen.service ${D}${systemd_user_unitdir} - install -m 0644 ${S}/HomeScreenAppFrameworkBinderAGL/conf/HomeScreenAppFrameworkBinderAGL.service ${D}${systemd_user_unitdir} - install -m 0644 ${S}/InputEventManager/conf/InputEventManager.service ${D}${systemd_user_unitdir} - install -m 0644 ${S}/WindowManager/conf/WindowManager.service ${D}${systemd_user_unitdir} - - install -d ${D}${sysconfdir}/systemd/user/default.target.wants - ln -sf ${systemd_user_unitdir}/WindowManager.service ${D}${sysconfdir}/systemd/user/default.target.wants - ln -sf ${systemd_user_unitdir}/HomeScreen.service ${D}${sysconfdir}/systemd/user/default.target.wants -} - -FILES_${PN} += "/usr/AGL/${PN}/ /usr/AGL/${PN}/colorschemes ${libdir} ${systemd_user_unitdir}" -FILES_${PN}-dbg += "/usr/AGL/${PN}/.debug" - -#SYSTEMD_PACKAGES - no separate packages -#SYSTEMD_SERVICE += "WindowManager.service" -#SYSTEMD_SERVICE += "HomeScreen.service" -#SYSTEMD_SERVICE += "InputEventManager.service" -#SYSTEMD_SERVICE += "HomeScreenAppFrameworkBinderAGL.service" - - -############################################# -# this has to be set up later... -############################################# -#PACKAGES =+ "libhomescreen libhomescreen-dev libhomescreen-dbg" -# -#FILES_libhomescreen = "\ -# ${libdir}/libhomescreen.so.* \ -#" -#FILES_libhomescreen-dev = "\ -# ${includedir}/libhomescreen.hpp \ -# ${libdir}/libhomescreen.so \ -# ${libdir}/pkgconfig/libhomescreen.pc \ -#" -#FILES_libhomescreen-dbg = "\ -# ${libdir}/.debug/libhomescreen.so.* \ -#" -#RDEPENDS_libhomescreen-dbg += "${PN}-dbg libhomescreen-dev" -# -#RDEPENDS_${PN}-dev += "libhomescreen-dev" -