diff options
| author | mked-luxoft <mked@luxoft.com> | 2019-08-08 20:02:13 +0300 |
|---|---|---|
| committer | Andriy Byzhynar (GitHub) <AByzhynar@luxoft.com> | 2019-08-20 21:17:13 +0300 |
| commit | 304aa9aad5834b6fdcca03f7d372ad6e26e98cc0 (patch) | |
| tree | fe9a388bfe1dba6e4212d31dde6c0a14c184089c | |
| parent | d3eec8ea4098e43d3fc929c8901881d1f5589ab0 (diff) | |
| download | sdl_core-304aa9aad5834b6fdcca03f7d372ad6e26e98cc0.tar.gz | |
fixup! Update Show RPC
2 files changed, 15 insertions, 3 deletions
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/show_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/show_request.cc index eb65bf11d3..dea2255304 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/show_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/show_request.cc @@ -202,6 +202,18 @@ void ShowRequest::ApplyTemplateConfigurationForApp( template_config_[strings::template_layout].asString(); LOG4CXX_DEBUG(logger_, "New layout : " << new_layout << " is applied"); app.set_window_layout(current_window_id_, new_layout); + + if (template_config_.keyExists(strings::day_color_scheme)) { + app.set_day_color_scheme(current_window_id_, + template_config_[strings::day_color_scheme]); + } + + if (template_config_.keyExists(strings::night_color_scheme)) { + app.set_night_color_scheme( + current_window_id_, template_config_[strings::night_color_scheme]); + } + + return; } if (dcs_change_required_) { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/show_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/show_test.cc index 8b452e1036..f4648c8f5a 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/show_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/show_test.cc @@ -1209,8 +1209,8 @@ TEST_F(ShowRequestTest, OnEvent_SuccessResultCode_ExpectSetWindowLayoutOnly) { // Expectation EXPECT_CALL(*mock_app_, set_window_layout(kCurrentWindowID, kNewTemplateLayout)); - EXPECT_CALL(*mock_app_, set_day_color_scheme(_, _)).Times(0); - EXPECT_CALL(*mock_app_, set_night_color_scheme(_, _)).Times(0); + EXPECT_CALL(*mock_app_, set_day_color_scheme(_, _)); + EXPECT_CALL(*mock_app_, set_night_color_scheme(_, _)); EXPECT_CALL(mock_rpc_service_, ManageMobileCommand( CheckMessageToMobile(mobile_apis::Result::SUCCESS, true), @@ -1242,7 +1242,7 @@ TEST_F(ShowRequestTest, EXPECT_CALL(*mock_app_, set_day_color_scheme(kCurrentWindowID, CreateColorScheme(kCurrentDayColorRGB))); - EXPECT_CALL(*mock_app_, set_night_color_scheme(_, _)).Times(0); + EXPECT_CALL(*mock_app_, set_night_color_scheme(_, _)); EXPECT_CALL(mock_rpc_service_, ManageMobileCommand( CheckMessageToMobile(mobile_apis::Result::SUCCESS, true), |