diff options
| author |   Kazumasa Mitsunari <knimitz@witz-inc.co.jp> | 2018-10-18 16:08:59 +0900 |
|---|---|---|
| committer | Kazumasa Mitsunari <knimitz@witz-inc.co.jp> | 2018-10-18 16:08:59 +0900 |
| commit | c97e5b8b8b9de86a298a79c80e7ab4d29cd7ac41 (patch) | |
| tree | 9a6a3d9e6247c111c473e57b1a555582e416efc8 | |
| parent | 44729619cfd25f7b37157609d9bb1bcc288d79b4 (diff) | |
Fix translation of navigation rolesandbox/knimitz/fix_map_role
Change-Id: Ic82005ddbc2c43cab3020736115b88a050cace32
Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
| -rw-r--r-- | layers.json | 2 | ||||
| -rw-r--r-- | policy_manager/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | policy_manager/db/roles.db | 2 | ||||
| -rw-r--r-- | policy_manager/db/roles.db.zipc | 2 | ||||
| -rw-r--r-- | policy_manager/db/roles.db.zipc.split | 2 | ||||
| -rw-r--r-- | src/db/old_roles.db | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/layers.json b/layers.json index fddd258..44e2adb 100644 --- a/layers.json +++ b/layers.json @@ -20,7 +20,7 @@ "comment": "FarHomeScreen is the part of HomeScreen. The z order of this layer is lower than NearHomeScreen" }, { - "role": "music|video|browser|radio|phone|map|hvac|settings|dashboard|poi|mixer|sdl|launcher|fallback", + "role": "music|video|browser|radio|phone|navigation|map|hvac|settings|dashboard|poi|mixer|sdl|launcher|fallback", "name": "Apps", "layer_id": 1001, "comment": "Range of IDs that will always be placed on layer 1001" diff --git a/policy_manager/CMakeLists.txt b/policy_manager/CMakeLists.txt index 3ec4c39..0d2d523 100644 --- a/policy_manager/CMakeLists.txt +++ b/policy_manager/CMakeLists.txt @@ -19,13 +19,13 @@ pkg_check_modules(AFB REQUIRED afb-daemon) pkg_check_modules(SD REQUIRED libsystemd>=222) # Set name of STM -set(STM_DIR stub) -#set(STM_DIR zipc) +#set(STM_DIR stub) +set(STM_DIR zipc) # Select roles.db if(zipc MATCHES ${STM_DIR}) # if trying to show split layout, change from OFF to ON - set(TRY_SPLIT_LAYOUT OFF CACHE BOOL "Enable to show split layout") + set(TRY_SPLIT_LAYOUT ON CACHE BOOL "Enable to show split layout") if(${TRY_SPLIT_LAYOUT}) set(ROLES_DB_NAME roles.db.zipc.split) diff --git a/policy_manager/db/roles.db b/policy_manager/db/roles.db index 5d31aea..184e602 100644 --- a/policy_manager/db/roles.db +++ b/policy_manager/db/roles.db @@ -8,7 +8,7 @@ }, { "category": "debug", - "role": "launcher | map | poi | browser | sdl | mixer | radio | hvac | debug | phone | video | music | settings | dashboard | fallback", + "role": "launcher | navigation | map | poi | browser | sdl | mixer | radio | hvac | debug | phone | video | music | settings | dashboard | fallback", "area": "normal.full | split.main | split.sub | fullscreen", "layer": "apps", }, diff --git a/policy_manager/db/roles.db.zipc b/policy_manager/db/roles.db.zipc index facb1d8..13ada24 100644 --- a/policy_manager/db/roles.db.zipc +++ b/policy_manager/db/roles.db.zipc @@ -8,7 +8,7 @@ }, { "category": "map", - "role": "map", + "role": "navigation", "area": "normal.full | split.main", "layer": "apps", }, diff --git a/policy_manager/db/roles.db.zipc.split b/policy_manager/db/roles.db.zipc.split index 73c80cf..cef2631 100644 --- a/policy_manager/db/roles.db.zipc.split +++ b/policy_manager/db/roles.db.zipc.split @@ -8,7 +8,7 @@ }, { "category": "map", - "role": "map", + "role": "navigation", "area": "normal.full | split.main", "layer": "apps", }, diff --git a/src/db/old_roles.db b/src/db/old_roles.db index 02a4c2d..d8f19f9 100644 --- a/src/db/old_roles.db +++ b/src/db/old_roles.db @@ -34,7 +34,7 @@ }, { "name": "Navigation", - "new": "map" + "new": "navigation" }, { "name": "HVAC", |