diff options
author | Yuta Doi <yuta-d@witz-inc.co.jp> | 2018-05-10 13:10:28 +0900 |
---|---|---|
committer | Yuta Doi <yuta-d@witz-inc.co.jp> | 2018-05-10 13:10:28 +0900 |
commit | 2ea71aa957634ce69681ae34abace0566d52b744 (patch) | |
tree | b9d9ee097a78d3d21ee07d85193a2e2e6862fce6 /src/app.cpp | |
parent | 0dcb9ae1f99cffcafac62a324f8f054cc212a880 (diff) |
Modify for restriction role
- Add policy for restriction to dummy stm.
- Add the function which inputs json file
because json_object_from_file can not allows up to only 4KB file.
- Bug fix in json files.
- Delete unexpected characters.
- Delete description because it does not follow the format of json array.
Change-Id: I2f8fba1d1001cf244e2531fe3a1a738d5a48091b
Signed-off-by: Yuta Doi <yuta-d@witz-inc.co.jp>
Diffstat (limited to 'src/app.cpp')
-rw-r--r-- | src/app.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/app.cpp b/src/app.cpp index b9338a9..777a07f 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -293,6 +293,9 @@ void App::allocateWindowResource(char const *event, char const *drawing_name, else if (0 == strcmp("normal.full", drawing_area)) { new_area = "normal"; } + else if (0 == strcmp("restriction.split.sub", drawing_area)) { + new_area = "restriction.split.sub"; + } else if (0 == strcmp("homescreen", new_role)) { // Now homescreen specifies "normalfull" new_area = "full"; @@ -909,7 +912,7 @@ int App::allocateSurface() { itr_layers != crr_layers.end(); ++itr_layers) { // Get layer std::string layer = itr_layers->first; - HMI_DEBUG("wm", "Update resource in %s layer", layer.c_str()); + HMI_DEBUG("wm", "Try to update resource in %s layer", layer.c_str()); // If layout is changed, update resouce if (this->lm_.isLayoutChanged(layer.c_str())) { @@ -953,7 +956,7 @@ int App::allocateSurface() { // Get category name std::string crr_ctg = crr_rol_ctg.begin()->second; - // Serch relevant role fron previous displayed role list + // Serch relevant role from previous displayed role list for (auto itr_role = prv_role_list.begin(); itr_role != prv_role_list.end(); ++itr_role) { std::string prv_ctg = this->pm_.roleToCategory((*itr_role).c_str()); |