From: Tadao Tanikawa Date: Fri, 22 Dec 2017 12:57:44 +0000 (+0900) Subject: Enable to show Video and WebBrowser X-Git-Tag: 5.0.0~3 X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;ds=sidebyside;h=4bd8c0c0ad298c9da8b3803c121001d04e39f707;p=apps%2Fagl-service-windowmanager-2017.git Enable to show Video and WebBrowser Adding new applications (Video player and Web browser) to be managed by window manager properly. Releated introducing Video player, old name, 'MediaPlayer' for apps/mediaplayer has been renamed 'Music'. Old name,'MediaPlayer' keeps alive in layers.json for backward compatibility. Change-Id: I2b5e267f4015a4ed128ff5b55ba709faf1914b61 Signed-off-by: Tadao Tanikawa --- diff --git a/layers.json b/layers.json index 7ee3e21..8a04d7b 100644 --- a/layers.json +++ b/layers.json @@ -22,7 +22,7 @@ "comment": "Single layer map for the HomeScreen" }, { - "role": "MediaPlayer|Radio|Phone|Navigation|HVAC|Settings|Dashboard|POI|Mixer", + "role": "Music|Video|WebBrowser|MediaPlayer|Radio|Phone|Navigation|HVAC|Settings|Dashboard|POI|Mixer", "name": "apps", "layer_id": 1001, "area": { "type": "rect", "rect": { "x": 0, "y": 218, "width": -1, "height": -433 } }, diff --git a/src/app.cpp b/src/app.cpp index 164ea21..74a114d 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -752,6 +752,7 @@ void App::activate(int id) { // FOR CES DEMO >>> if ((0 == strcmp(label, "Radio")) || (0 == strcmp(label, "MediaPlayer")) + || (0 == strcmp(label, "Music")) || (0 == strcmp(label, "Navigation"))) { for (auto i = surface_bg.begin(); i != surface_bg.end(); ++i) { if (id == *i) { @@ -791,6 +792,7 @@ void App::deactivate(int id) { // FOR CES DEMO >>> if ((0 == strcmp(label, "Radio")) || (0 == strcmp(label, "MediaPlayer")) + || (0 == strcmp(label, "Music")) || (0 == strcmp(label, "Navigation"))) { // Store id