David Steele [Fri, 8 Oct 2021 13:55:14 +0000 (14:55 +0100)]
[dali_2.0.47] Merge branch 'devel/master'
Change-Id: Id55d665626c6548545600319430b0a1bcbcea9d8
David Steele [Fri, 8 Oct 2021 13:54:46 +0000 (14:54 +0100)]
DALi Version 2.0.47
Change-Id: Ifcca5f12f4784d006dbe0f823aea48101598a5c0
Adeel Kazmi [Fri, 1 Oct 2021 17:24:16 +0000 (18:24 +0100)]
[dali_2.0.46] Merge branch 'devel/master'
Change-Id: I8a436bc13a5fb0f1c01a82db5bf0112327cf6b0b
Adeel Kazmi [Fri, 1 Oct 2021 17:23:28 +0000 (18:23 +0100)]
DALi Version 2.0.46
Change-Id: Ie0eae651993d6bc3610a34b7b87efd27ff851676
Eunki, Hong [Wed, 29 Sep 2021 08:16:31 +0000 (17:16 +0900)]
WebEngine::GetNativeImageSource return NativeImageSourcePtr
NativeImageSource --> NativeImageInterface is simple valid job.
NativeImageInterface --> NativeImageSource is not simple and expensive job.
WebEngine / WebPlugin defined at dali-adaptor/devel-api and
NativeImageSource defined at dali-adaptor/public-api.
So there is no reason to convert NativeImageSource to NativeImageInterface.
Change-Id: If369761d58ae1330819abdae35a66c32de52ef34
Signed-off-by: Eunki, Hong <eunkiki.hong@samsung.com>
Adam Bialogonski [Fri, 24 Sep 2021 08:49:07 +0000 (09:49 +0100)]
[dali_2.0.45] Merge branch 'devel/master'
Change-Id: Iec4e0b8bcc1da605c077f7c294ac7b839c3c85c3
Adam Bialogonski [Fri, 24 Sep 2021 08:48:17 +0000 (09:48 +0100)]
DALi Version 2.0.45
Change-Id: I8e3640e89dda8274492ca433aa0bf2945f0683c7
Taehyub Kim [Fri, 17 Sep 2021 13:01:50 +0000 (22:01 +0900)]
RiveAnimationView: add devel package
Change-Id: Ic3528b8fcfd31d95b2afddda5f2519045c5e991c
Richard Huang [Fri, 17 Sep 2021 10:43:36 +0000 (11:43 +0100)]
[dali_2.0.44] Merge branch 'devel/master'
Change-Id: If9e5026f233b5b41b176cd559ce1f39e63cfbbf5
Richard Huang [Fri, 17 Sep 2021 10:42:47 +0000 (11:42 +0100)]
DALi Version 2.0.44
Change-Id: I64077d4df62c0262b256948832bb9b74d038371b
David Steele [Fri, 10 Sep 2021 15:21:26 +0000 (16:21 +0100)]
[dali_2.0.43] Merge branch 'devel/master'
Change-Id: I75f6a5238f216739c623f713c8b980beda978b01
David Steele [Fri, 10 Sep 2021 15:20:58 +0000 (16:20 +0100)]
DALi Version 2.0.43
Change-Id: I52f0cda52c686fa08a982c7768aef8743db0cc57
huayong.xu [Tue, 7 Sep 2021 07:29:57 +0000 (15:29 +0800)]
Fix crash when written chunk of response is null.
Change-Id: I0cca331b58a62d6069ce3ea82c5c618ff4f7860b
Taehyub Kim [Mon, 6 Sep 2021 04:47:47 +0000 (13:47 +0900)]
RiveAnimationView: apply time based rendering
Change-Id: I7f0480fe43129770a9f2cdeb36e084560ad2a5be
Adeel Kazmi [Fri, 3 Sep 2021 15:05:33 +0000 (16:05 +0100)]
[dali_2.0.42] Merge branch 'devel/master'
Change-Id: Idb4619f4383de178f7fc4e72d8812cc83361bfcd
Adeel Kazmi [Fri, 3 Sep 2021 15:04:48 +0000 (16:04 +0100)]
DALi Version 2.0.42
Change-Id: I875f51a5e6a1e053995c9bc4ce28855649324163
Adam Bialogonski [Fri, 27 Aug 2021 09:50:48 +0000 (10:50 +0100)]
[dali_2.0.41] Merge branch 'devel/master'
Change-Id: I28a3571f8686051231255b0602fc96a0cde3dd1c
Adam Bialogonski [Fri, 27 Aug 2021 09:49:55 +0000 (10:49 +0100)]
DALi Version 2.0.41
Change-Id: I21c3ff1043c65fda4c1636e94379a62997b15e6f
Eunki Hong [Wed, 25 Aug 2021 08:59:23 +0000 (01:59 -0700)]
Implement more request interceptor APIs.
Recommit to resolve git-tree
Change-Id: I176b5843706e250eabaadd3af99b3e4620f2b49f
Signed-off-by: Eunki Hong <eunkiki.hong@samsung.com>
David Steele [Fri, 20 Aug 2021 11:19:29 +0000 (12:19 +0100)]
[dali_2.0.40] Merge branch 'devel/master'
Change-Id: Ida43ef29c06ef4b54931a6759a99b52b9095c047
David Steele [Fri, 20 Aug 2021 11:19:01 +0000 (12:19 +0100)]
DALi Version 2.0.40
Change-Id: Ib69df18674f027bfe22695fbced3681db224c9a2
huayong.xu [Mon, 16 Aug 2021 07:17:39 +0000 (15:17 +0800)]
Fix a SVACE issue that evas_object_image_data_get need be checked.
Change-Id: I460c46eb6304941141685d21ab7aa86ba19abcf3
Adeel Kazmi [Fri, 13 Aug 2021 12:47:59 +0000 (13:47 +0100)]
[dali_2.0.39] Merge branch 'devel/master'
Change-Id: Iebda29ebbf368c38e7c15338503d2d395aa235de
Adeel Kazmi [Fri, 13 Aug 2021 12:47:11 +0000 (13:47 +0100)]
DALi Version 2.0.39
Change-Id: I043eabf8033c6ad0eacf5254451b4987f32d7bf4
junsu choi [Wed, 11 Aug 2021 01:00:21 +0000 (01:00 +0000)]
Merge "TizenVectorImageRenderer: Load fail log++" into devel/master
Richard Huang [Fri, 6 Aug 2021 09:49:02 +0000 (10:49 +0100)]
[dali_2.0.38] Merge branch 'devel/master'
Change-Id: Idce641835677b08c663057ea014a6f59d5e094fc
Richard Huang [Fri, 6 Aug 2021 09:48:14 +0000 (10:48 +0100)]
DALi Version 2.0.38
Change-Id: I17e886c500931950b6287e6a06a234474354a7bb
Adeel Kazmi [Wed, 4 Aug 2021 15:47:27 +0000 (15:47 +0000)]
Merge "Change ColorDepth enum name to ColorFormat" into devel/master
JunsuChoi [Tue, 3 Aug 2021 07:25:31 +0000 (16:25 +0900)]
TizenVectorImageRenderer: Load fail log++
Change-Id: I42906f3ba7881c95a2631e655b12d3379a6df60c
Seungho BAEK [Tue, 3 Aug 2021 01:24:53 +0000 (01:24 +0000)]
Merge "RiveAnimationView refactoing to cover the animation control by the time based user interaction." into devel/master
Daekwang Ryu [Fri, 30 Jul 2021 05:58:16 +0000 (14:58 +0900)]
Change ColorDepth enum name to ColorFormat
Change-Id: Ia0ba89f3e301d717e3aa481a9d133afa9eea8e1d
Taehyub Kim [Thu, 15 Jul 2021 08:41:13 +0000 (17:41 +0900)]
RiveAnimationView refactoing to cover the animation control by the time based user interaction.
Change-Id: I21cfbe14ac0d61014374219e1349b358f9d84153
Adeel Kazmi [Fri, 30 Jul 2021 11:00:56 +0000 (11:00 +0000)]
Merge "DALi Version 2.0.37" into devel/master
Adam Bialogonski [Fri, 30 Jul 2021 10:23:29 +0000 (11:23 +0100)]
[dali_2.0.37] Merge branch 'devel/master'
Change-Id: Ic6a40f591eed1d18bd0f7f7491f4c108506a1b72
Adam Bialogonski [Fri, 30 Jul 2021 10:22:26 +0000 (11:22 +0100)]
DALi Version 2.0.37
Change-Id: I28d7b80bb052ed74c1d0dc07c0407d90338ca11f
huayong.xu [Fri, 23 Jul 2021 10:21:29 +0000 (18:21 +0800)]
Enable request interceptor.
Change-Id: Ibac82f53c7c847de385ed60f23c228ec06ecf981
JunsuChoi [Wed, 28 Jul 2021 00:25:27 +0000 (09:25 +0900)]
TizenVectorImageRenderer: Fix build error
Remove unnecessary code
Change-Id: Ia20cab656eef4d3b0b7a5c6af35ceb9d722d2dea
Hermet Park [Tue, 27 Jul 2021 06:25:45 +0000 (15:25 +0900)]
TizenVectorImageRenderer: code refactoring.
removing unnecessary "FirstRender" condition to make code clean & neat.
Change-Id: I1614c05188f00ae7b5fd10597539ada5e250168e
JunsuChoi [Tue, 27 Jul 2021 01:45:30 +0000 (10:45 +0900)]
TizenVectorImageRenderer: Change viewbox to size api
viewbox() api will be deprecated.
Change-Id: I3831b65ee11327ba1530217089dab88b19dedfe1
Taehyub Kim [Mon, 26 Jul 2021 01:15:18 +0000 (01:15 +0000)]
Merge "Includes the rive animation view headers in the RiveAnimationView package." into devel/master
David Steele [Fri, 23 Jul 2021 10:33:12 +0000 (10:33 +0000)]
Merge "DALi Version 2.0.36" into devel/master
Richard Huang [Fri, 23 Jul 2021 09:29:47 +0000 (10:29 +0100)]
[dali_2.0.36] Merge branch 'devel/master'
Change-Id: Ifdb8254e2fa6c6d566c1287561e8a8ad0023272e
Richard Huang [Fri, 23 Jul 2021 09:28:58 +0000 (10:28 +0100)]
DALi Version 2.0.36
Change-Id: I99ee422191a8d62ff3a430d692a5b81b7400ee91
JIYUN YANG [Fri, 23 Jul 2021 08:45:02 +0000 (08:45 +0000)]
Merge "Implement WebEngine::GetPlainTextAsynchronously" into devel/master
Taehyub Kim [Fri, 23 Jul 2021 07:48:40 +0000 (00:48 -0700)]
Includes the rive animation view headers in the RiveAnimationView package.
Change-Id: Id4887e42c0683f27ac79838d73d95a87876667c4
Jiyun Yang [Thu, 22 Jul 2021 13:13:37 +0000 (22:13 +0900)]
Implement WebEngine::GetPlainTextAsynchronously
Change-Id: Ieb9131ff7b6f3b454e8be3b3abc1d2e01e7d2d85
Signed-off-by: Jiyun Yang <ji.yang@samsung.com>
David Steele [Thu, 22 Jul 2021 15:55:15 +0000 (16:55 +0100)]
Fix build break
Change-Id: I188d4ae4643261bc7990f2cd1accb4b320948c58
Jiyun Yang [Thu, 22 Jul 2021 03:46:35 +0000 (12:46 +0900)]
Disable video hole in WebEngine by default
Change-Id: Idb40c1cb2d4bd2bd0b1235647156b9a327a5b0e8
Signed-off-by: Jiyun Yang <ji.yang@samsung.com>
Taehyub Kim [Thu, 22 Jul 2021 01:34:13 +0000 (01:34 +0000)]
Merge "Seperate RiveAnimationView package from dali-extension package" into devel/master
Seungho BAEK [Wed, 21 Jul 2021 06:30:04 +0000 (06:30 +0000)]
Merge "Add ApplyCustomFragmentPrefix" into devel/master
Taehyub Kim [Tue, 20 Jul 2021 04:27:31 +0000 (13:27 +0900)]
Seperate RiveAnimationView package from dali-extension package
To support the RiveAnimationView for TV profile, The RiveAnimationView package should be seperated from the main package.
Change-Id: Ie84b99c254b42fd7be2721a68b6919362cf50ad3
JIYUN YANG [Mon, 19 Jul 2021 08:31:07 +0000 (08:31 +0000)]
Merge "Fix the issue that mouse wheel/right button does not respond." into devel/master
Hermet Park [Mon, 28 Jun 2021 04:21:09 +0000 (13:21 +0900)]
Use the latest api of thorvg.
Change-Id: Ic95923d4eeacb96647dcdfcff5ac3971cd2aa8b6
Adeel Kazmi [Fri, 16 Jul 2021 09:33:50 +0000 (09:33 +0000)]
Merge "DALi Version 2.0.35" into devel/master
David Steele [Fri, 16 Jul 2021 09:29:49 +0000 (10:29 +0100)]
[dali_2.0.35] Merge branch 'devel/master'
Change-Id: I0e75853fd39774a86f67ef42aa2db9ecbafacc29
David Steele [Fri, 16 Jul 2021 09:29:22 +0000 (10:29 +0100)]
DALi Version 2.0.35
Change-Id: I079fce1d9436a198e0c04c61bfc72e54c1b26130
junsu choi [Fri, 16 Jul 2021 02:42:59 +0000 (02:42 +0000)]
Merge "TizenVectorImageRenderer: Remove unnecessary canvas clear" into devel/master
huayong.xu [Mon, 12 Jul 2021 10:36:52 +0000 (18:36 +0800)]
Fix the issue that mouse wheel/right button does not respond.
Change-Id: I4cd0fdb446073b7eb4f8cb9a35a6e59846ce4f92
JunsuChoi [Thu, 15 Jul 2021 08:17:29 +0000 (17:17 +0900)]
TizenVectorImageRenderer: Remove unnecessary canvas clear
Loaded paint should not be cleared because it is reused.
Change-Id: Ic7c3f333fd97bd879afa647f08563f1162f2c645
huayong.xu [Mon, 5 Jul 2021 11:17:26 +0000 (19:17 +0800)]
Replace Signal with std::function.
Originally Signal is used to notify webview when callback of web
engine is called. If Signal is called with a std::shared_ptr<X>,
lifecyle of object X would be managed by Signal only in
csharp-binder. So if Signal are destroyed, object X would be
destroyed too. This might cause some problem.
This patch is to replace Signal with std::fuction, and replace
std:shared_ptr with unique_ptr. Lifecycle of object X would not
be associated with that of Signal.
Change-Id: I0ea0e8bc8cd3c1077db176a3fc9fba9f236a488c
JIYUN YANG [Mon, 12 Jul 2021 11:29:44 +0000 (11:29 +0000)]
Merge "Remove intercept request from chromium web engine plugin" into devel/master
Adam Bialogonski [Fri, 9 Jul 2021 08:46:02 +0000 (09:46 +0100)]
[dali_2.0.34] Merge branch 'devel/master'
Change-Id: I7a44ea4624f27135484271348ca4a9b916a5a72e
Adam Bialogonski [Fri, 9 Jul 2021 08:45:13 +0000 (09:45 +0100)]
DALi Version 2.0.34
Change-Id: I994b3b7967e9721dc4bf5650da4029d852ea85f8
JunsuChoi [Mon, 28 Jun 2021 07:14:22 +0000 (16:14 +0900)]
tizen-vector-image-renderer: fix crash at multi-canvas rendering
tizen-vector-image-rendering(svg is running on worker thread,
it needs to use individual memory pool of tvg to prevent race-condition
among the canvases.
Change-Id: I305395dcd2dbcefa59e1525b5730e20d1b1de76e
JIYUN YANG [Mon, 5 Jul 2021 09:33:56 +0000 (09:33 +0000)]
Merge "Add APIs for showing/hiding context menu." into devel/master
Taehyub Kim [Mon, 5 Jul 2021 08:30:18 +0000 (08:30 +0000)]
Merge "RiveAnimationView: add more APIs for setting animation and modifying path and node properties." into devel/master
Taehyub Kim [Mon, 21 Jun 2021 09:07:12 +0000 (18:07 +0900)]
RiveAnimationView: add more APIs for setting animation and modifying path and node properties.
Change-Id: Iae9c03faa7214c514cd27b46eb296366ef3dca87
huayong.xu [Tue, 22 Jun 2021 10:26:43 +0000 (18:26 +0800)]
Add APIs for showing/hiding context menu.
1) Remove APIs for customizing context menu and selecting some menu
item.
2) Rename some APIs in web context.
3) Fix some crashes when some ewk APIs return null string.
Change-Id: I0a39d63ef71dcc4d9dc48a326682ee4bd7554de2
Adeel Kazmi [Fri, 2 Jul 2021 16:42:05 +0000 (17:42 +0100)]
[dali_2.0.33] Merge branch 'devel/master'
Change-Id: Ifd5448d3cfa9a9b44e0768d3f4bc5e498416a6e0
Adeel Kazmi [Fri, 2 Jul 2021 16:41:37 +0000 (17:41 +0100)]
DALi Version 2.0.33
Change-Id: I61b3e3ed9d4751a5f541c4f6ce28e01b6fef39c2
Jiyun Yang [Fri, 2 Jul 2021 00:03:44 +0000 (09:03 +0900)]
Remove intercept request from chromium web engine plugin
Intercept callback is called in other thread, so it must be handled in a special way.
Until then the corrent code need to be removed since it causes problem.
Change-Id: Icc221f4a7e9976ebf3aa3774bb1ae051a9c74b46
Signed-off-by: Jiyun Yang <ji.yang@samsung.com>
seungho [Thu, 24 Jun 2021 07:14:46 +0000 (16:14 +0900)]
Add ApplyCustomFragmentPrefix
- Apply suitable prefix for the native image fragment shader
Change-Id: I72ed947327e7d5b1443b8b06c6c758f7ab8c592f
Signed-off-by: seungho <sbsh.baek@samsung.com>
Adeel Kazmi [Fri, 25 Jun 2021 10:58:06 +0000 (10:58 +0000)]
Merge "DALi Version 2.0.32" into devel/master
Richard Huang [Fri, 25 Jun 2021 10:18:34 +0000 (11:18 +0100)]
[dali_2.0.32] Merge branch 'devel/master'
Change-Id: Id09645c4f14c0fc732957048fe13ac27a6ce8402
Richard Huang [Fri, 25 Jun 2021 10:17:47 +0000 (11:17 +0100)]
DALi Version 2.0.32
Change-Id: Ia702c4ae1db81cba12f3faecf86caace0fd8c379
Heeyong Song [Fri, 18 Jun 2021 05:59:10 +0000 (14:59 +0900)]
Move rive animation implementation to internal/rive-animation-view
Change-Id: I4dd9ae49d192e51406621364bafd2a113e43e271
Heeyong Song [Tue, 15 Jun 2021 16:13:12 +0000 (01:13 +0900)]
Add RiveAnimationView
Change-Id: Iee811b4e85a1b5e66c70a29d3247302f8ae27c55
David Steele [Fri, 18 Jun 2021 10:38:49 +0000 (11:38 +0100)]
[dali_2.0.31] Merge branch 'devel/master'
Change-Id: I30984936fe4fa2e72cfbe9ae8ec15c33a60c42af
David Steele [Fri, 18 Jun 2021 10:38:19 +0000 (11:38 +0100)]
DALi Version 2.0.31
Change-Id: I7b5df53e40cdf66a227fe40533ac9625a0d67d46
Hermet Park [Wed, 16 Jun 2021 03:11:12 +0000 (03:11 +0000)]
Merge "Revert "Revert "vector-image-renderer: fix crash at multi-canvas rendering""" into devel/master
Adeel Kazmi [Fri, 11 Jun 2021 10:36:59 +0000 (11:36 +0100)]
[dali_2.0.30] Merge branch 'devel/master'
Change-Id: I558d1f51dc9173584a816ef8a3a578972b84d37d
Adeel Kazmi [Fri, 11 Jun 2021 10:36:13 +0000 (11:36 +0100)]
DALi Version 2.0.30
Change-Id: Ie61025ceed85fb93019e747fd3eb2d3f8d75f0ba
Jiyun Yang [Thu, 10 Jun 2021 02:12:12 +0000 (11:12 +0900)]
Fix svace issues on WebView
Change-Id: Ied8a96564f4ef0c51c14cbb994abe876a1dae15d
Signed-off-by: Jiyun Yang <ji.yang@samsung.com>
Hermet Park [Wed, 9 Jun 2021 04:26:04 +0000 (13:26 +0900)]
Revert "Revert "vector-image-renderer: fix crash at multi-canvas rendering""
This reverts commit
771d5cfaa9ef3cf94675c3b629c957e7d73548ef.
Change-Id: Ib38e53795d245fa6ec93e0fa90ac545ee9d034e1
Hermet Park [Wed, 9 Jun 2021 04:25:47 +0000 (13:25 +0900)]
Revert "Revert "Revert "vector-image-renderer: fix crash at multi-canvas rendering"""
This reverts commit
fb2f65ad83f1d19ffd22f06e726348a5a4388619.
Hermet Park [Wed, 9 Jun 2021 04:24:31 +0000 (13:24 +0900)]
Revert "Revert "vector-image-renderer: fix crash at multi-canvas rendering""
This reverts commit
771d5cfaa9ef3cf94675c3b629c957e7d73548ef.
Hermet Park [Wed, 9 Jun 2021 04:01:02 +0000 (13:01 +0900)]
Revert "vector-image-renderer: fix crash at multi-canvas rendering"
This reverts commit
b44094cb38f3d43c58639eb26535015399f62a6c.
Yet thorvg package is not updated to the dali build server.
This patch will come again after resolving this.
Change-Id: I30b85475ff8ea6ea308c90dd3432cc4949b640a8
Hermet Park [Wed, 12 May 2021 02:11:12 +0000 (11:11 +0900)]
vector-image-renderer: fix crash at multi-canvas rendering
dali vector animation rendering is running on worker-thread,
it needs to use individual memory pool of tvg to prevent race-condition
among the canvases.
Change-Id: Id1e8e3a864d0432e1a4ad12561726412c73ab8ff
Adam Bialogonski [Fri, 4 Jun 2021 08:58:22 +0000 (09:58 +0100)]
[dali_2.0.29] Merge branch 'devel/master'
Change-Id: I686bae0307f019a4e2b4e25d9baa88724691c2d1
Adam Bialogonski [Fri, 4 Jun 2021 08:57:27 +0000 (09:57 +0100)]
DALi Version 2.0.29
Change-Id: I4064a8bc02804939bf3eb8112599e324af005b4a
Richard Huang [Fri, 28 May 2021 09:52:30 +0000 (10:52 +0100)]
[dali_2.0.28] Merge branch 'devel/master'
Change-Id: I2e0c4a9bb6ae32fd23b896fd46f22085937f79d6
Richard Huang [Fri, 28 May 2021 09:51:42 +0000 (10:51 +0100)]
DALi Version 2.0.28
Change-Id: I51acec1da148e1b635c15a854173b3924962a028
huayong.xu [Tue, 25 May 2021 09:57:21 +0000 (17:57 +0800)]
Fix crash that some symbols are not found in webcontext.
Originally eina_list.h / eina_hash.h are included, their apis
would be c++ style, it would cause crash.
In order to use c style, Eina.h must be included instead.
Change-Id: I147276846287ce11a634d1e7c73b77b6d134e5e6
David Steele [Fri, 21 May 2021 09:18:36 +0000 (10:18 +0100)]
[dali_2.0.27] Merge branch 'devel/master'
Change-Id: I283ee6cc4ce6011ed36f5e8f1df76b266674c530
David Steele [Fri, 21 May 2021 09:18:06 +0000 (10:18 +0100)]
DALi Version 2.0.27
Change-Id: I836cf5537812e275152761d3eae2a50110def6fa
Adam Bialogonski [Fri, 14 May 2021 10:22:29 +0000 (11:22 +0100)]
[dali_2.0.26] Merge branch 'devel/master'
Change-Id: Id30f91d35e374136ca530728f6eab9c6fc2188fc
Adam Bialogonski [Fri, 14 May 2021 10:21:38 +0000 (11:21 +0100)]
DALi Version 2.0.26
Change-Id: I8cc95a6b9032f7789eda67b5e944150cc0ca3ad4
Daekwang Ryu [Mon, 25 Jan 2021 10:49:05 +0000 (19:49 +0900)]
Add handling TBM queue
NativeRenderSurface doesn't acquire a TBM surface from a TBM queue.
Scene has to acquire TBM surface by getting TBM queue from
NativeRenderSurface.
Change-Id: Ib9e32e4e18c2831a2ae6097d5410060ff2de7382
Adeel Kazmi [Fri, 7 May 2021 11:23:18 +0000 (11:23 +0000)]
Merge "DALi Version 2.0.25" into devel/master
Adeel Kazmi [Fri, 7 May 2021 10:35:43 +0000 (11:35 +0100)]
[dali_2.0.25] Merge branch 'devel/master'
Change-Id: I1b41d77cd120314b1a0f3eba2d1164356e00deef