From b9889b160ecc43dcde07fe9d8a96373196c539ab Mon Sep 17 00:00:00 2001 From: Tadao Tanikawa Date: Tue, 27 Jun 2017 18:08:00 +0900 Subject: Additional parameter to WindowManager at application startup HomeScreen used to pass numeric id to WindowManager at application startup. This change add 1 more parameter (string id). This is necessary for WindowManager to allow some applications to run background, related to https://gerrit.automotivelinux.org/gerrit/#/c/9827/ Bug-AGL: SPEC-395 Change-Id: I90dec40fe0afd7634389b3430349259cc3616005 Signed-off-by: Tadao Tanikawa --- homescreen/qml/Home.qml | 2 +- homescreen/qml/ShortcutArea.qml | 2 +- homescreen/src/layouthandler.cpp | 4 ++-- homescreen/src/layouthandler.h | 2 +- interfaces/windowmanager.xml | 1 + 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/homescreen/qml/Home.qml b/homescreen/qml/Home.qml index a312670..de8b9bb 100644 --- a/homescreen/qml/Home.qml +++ b/homescreen/qml/Home.qml @@ -60,7 +60,7 @@ Item { applicationArea.visible = true appLauncherAreaLauncher.visible = false - layoutHandler.showAppLayer(pid) + layoutHandler.showAppLayer(applicationModel.id(loc.index), pid) } else { console.warn("app cannot be launched!") diff --git a/homescreen/qml/ShortcutArea.qml b/homescreen/qml/ShortcutArea.qml index 14c7b6b..9be3fd0 100644 --- a/homescreen/qml/ShortcutArea.qml +++ b/homescreen/qml/ShortcutArea.qml @@ -69,7 +69,7 @@ Item { applicationArea.visible = true appLauncherAreaLauncher.visible = false layoutHandler.makeMeVisible(pid) - layoutHandler.showAppLayer(pid) + layoutHandler.showAppLayer(model.application, pid) } else { console.warn("app cannot be launched!") diff --git a/homescreen/src/layouthandler.cpp b/homescreen/src/layouthandler.cpp index 1dfe4a5..6f5ba01 100644 --- a/homescreen/src/layouthandler.cpp +++ b/homescreen/src/layouthandler.cpp @@ -86,9 +86,9 @@ LayoutHandler::~LayoutHandler() delete mp_dBusWindowManagerProxy; } -void LayoutHandler::showAppLayer(int pid) +void LayoutHandler::showAppLayer(const QString &app_id, int pid) { - mp_dBusWindowManagerProxy->showAppLayer(pid); + mp_dBusWindowManagerProxy->showAppLayer(app_id, pid); } void LayoutHandler::hideAppLayer() diff --git a/homescreen/src/layouthandler.h b/homescreen/src/layouthandler.h index c82bfda..007f1ad 100644 --- a/homescreen/src/layouthandler.h +++ b/homescreen/src/layouthandler.h @@ -31,7 +31,7 @@ public: signals: public slots: - void showAppLayer(int pid); + void showAppLayer(const QString &app_id, int pid); void hideAppLayer(); void makeMeVisible(int pid); private: diff --git a/interfaces/windowmanager.xml b/interfaces/windowmanager.xml index e3c6df3..f288b32 100644 --- a/interfaces/windowmanager.xml +++ b/interfaces/windowmanager.xml @@ -191,6 +191,7 @@ Show layer for application . --> +