aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarunobu Kurokawa <harunobu.kurokawa.dn@renesas.com>2017-12-07 21:12:15 +0900
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2017-12-08 14:06:45 +0000
commit68b55dc5d4a71a762ee849aedf243626bee4c9e9 (patch)
tree0d4480f3b0fdf072f2c6ff88de5e2b684eef6c83
parent940e8ed5b42abb7b8b0c62c903757b59faef5a6c (diff)
mapviewer: Change layer id to 11001 to avoid conflict.
While the hmi-framework doesn't support multi-display, mapviewer is located in screen 1 in order to transfer to Cluster ECU. Then a layer which mapviewr uses is out of control by windowmanager. As layer id 1000 is conflict, so we decide new layer id as 11001 for Screen 1. Change-Id: I52b6071e91adb69cfa8ab65c6ea6604b3fef8be1 Signed-off-by: Harunobu Kurokawa <harunobu.kurokawa.dn@renesas.com>
-rwxr-xr-xrecipes-demo-hmi/navigation/mapviewer/mapviewer-settings.sh2
-rw-r--r--recipes-demo-hmi/navigation/mapviewer/mapviewer.service6
2 files changed, 4 insertions, 4 deletions
diff --git a/recipes-demo-hmi/navigation/mapviewer/mapviewer-settings.sh b/recipes-demo-hmi/navigation/mapviewer/mapviewer-settings.sh
index d1ebb20b8..0d7bf205b 100755
--- a/recipes-demo-hmi/navigation/mapviewer/mapviewer-settings.sh
+++ b/recipes-demo-hmi/navigation/mapviewer/mapviewer-settings.sh
@@ -15,7 +15,7 @@ do
$LMC set surface $SURFACEID source region 0 0 384 368
$LMC set surface $SURFACEID destination region 0 0 384 368
$LMC set surface $SURFACEID visibility 1
- $LMC set layer 1000 render order $SURFACEID
+ $LMC set layer 11001 render order $SURFACEID
exit
fi
fi
diff --git a/recipes-demo-hmi/navigation/mapviewer/mapviewer.service b/recipes-demo-hmi/navigation/mapviewer/mapviewer.service
index c3f5515af..b701204db 100644
--- a/recipes-demo-hmi/navigation/mapviewer/mapviewer.service
+++ b/recipes-demo-hmi/navigation/mapviewer/mapviewer.service
@@ -10,9 +10,9 @@ After=weston.service HomeScreen.service
Environment=NAVI_DATA_DIR=/var/mapdata/navi_data_UK/japan_TR9 XDG_RUNTIME_DIR=/run/user/0
ExecStartPre=/bin/sleep 5
ExecStart=/usr/bin/mapview
-ExecStartPost=/usr/bin/LayerManagerControl create layer 1000 1920 1080
-ExecStartPost=/usr/bin/LayerManagerControl set layer 1000 visibility 1
-ExecStartPost=/usr/bin/LayerManagerControl set screen 1 render order 1000
+ExecStartPost=/usr/bin/LayerManagerControl create layer 11001 1920 1080
+ExecStartPost=/usr/bin/LayerManagerControl set layer 11001 visibility 1
+ExecStartPost=/usr/bin/LayerManagerControl set screen 1 render order 11001
ExecStartPost=/usr/AGL/mapviewer/mapviewer-settings.sh
ExecStop=/usr/bin/killall -s KILL mapview