Nick Holland [Tue, 12 May 2015 17:24:26 +0000 (18:24 +0100)]
Remove use of ActorContainer
Also removed some unnecessary includes of <vector-wrapper.h> from
public-api files
Change-Id: I226fc94568e73231ad52e7db52b12328688e8881
Ferran Sole [Fri, 10 Apr 2015 10:11:00 +0000 (11:11 +0100)]
PathConstrainer changes in JS Plugin + LinearConstrainer
Sample code showing how to use PathConstrainer in Javascript:
var pathConstrainer = new dali.PathConstrainer();
pathConstrainer.points = [ point0, point1, point2 ];
pathConstrainer.controlPoints = [ controlPoint0, controlPoint1, controlPoint2, controlPoint3 ];
pathConstrainer.forward = [1.0,0.0,0.0];
var constraintPosition = {
"target":actor,
"targetProperty":"position",
"source":actor,
"sourceProperty":"color-alpha",
"range":[0.0,1.0]
};
pathConstrainer.applyConstraint( constraintPosition );
Change-Id: If5c5aee0d402b5c689b983a9848648d6700dec6b
Adeel Kazmi [Tue, 12 May 2015 15:21:03 +0000 (08:21 -0700)]
Merge "Remove navigation frame control" into tizen
Kimmo Hoikka [Tue, 12 May 2015 15:14:25 +0000 (08:14 -0700)]
Merge "Reduce ImageActor & RenderableActor APIs" into tizen
Nick Holland [Tue, 12 May 2015 13:14:53 +0000 (14:14 +0100)]
Remove navigation frame control
Change-Id: Ice4b22f3153f2e4a4c7ae98debfa223cee9d8b1b
Kimmo Hoikka [Tue, 12 May 2015 12:49:58 +0000 (13:49 +0100)]
Remove dependency to std::vector and property::value from property notification API
Change-Id: I606e7860fcc8c8ea1cc1cc38db2961b56a12870d
Yoonsang Lee [Tue, 12 May 2015 01:07:14 +0000 (10:07 +0900)]
Reduce ImageActor & RenderableActor APIs
- Remove ImageActor::IsPixelAreaSet(), ClearPixelArea()
- Remove RenderableActor::SetBlendFunc(), SetBlendEquation(), GetBlendEquation(), SetBlendColor(), GetBlendColor()
Change-Id: I3d13dd7450338380197361ecae2859f0fec78988
Adeel Kazmi [Mon, 11 May 2015 14:44:19 +0000 (15:44 +0100)]
Fix version issues with 1.0.41
Change-Id: If96da7e6d6e0d36db3f9f34a0cdb016217758fea
Nick Holland [Wed, 6 May 2015 10:59:48 +0000 (11:59 +0100)]
Added more shared C++/JavaScript documentation
TextLabel, script-hello, dali-fundamentals converted to markdown and
shared with JavaScript.
Removed all references to TextActor
Added JavaScript examples to JSON specification and moved to shared C++/
Javascript folder
Replaced main DALi screenshot image with screen grabs from current dali-demo
Change-Id: Iaf4b56c6a0e34356e8891e1b4cb3fbc1fdef0587
Kimmo Hoikka [Fri, 8 May 2015 15:08:18 +0000 (08:08 -0700)]
Merge "IMF event fixes" into tizen
Paul Wisbey [Fri, 8 May 2015 14:30:50 +0000 (07:30 -0700)]
Merge "Revert "DALi Version 1.0.41"" into tizen
Nick Holland [Fri, 8 May 2015 14:27:56 +0000 (07:27 -0700)]
Revert "DALi Version 1.0.41"
This reverts commit
541c8417421eec40c1bf6c7e2fca0e668b6369f3.
Change-Id: I4a6ae1a24bbbf722657fcdf3c6abb4d80a77a6f3
Paul Wisbey [Fri, 8 May 2015 14:17:18 +0000 (07:17 -0700)]
Merge "DALi Version 1.0.41" into tizen
Nick Holland [Fri, 8 May 2015 12:52:29 +0000 (13:52 +0100)]
DALi Version 1.0.41
Change-Id: Ia38edc3f527bad772130fa750f06eab405b039b1
Paul Wisbey [Thu, 7 May 2015 12:22:12 +0000 (13:22 +0100)]
IMF event fixes
Change-Id: Ide705ec18a46ded7fd770b20ce3752446e8c7f7d
Victor Cebollada [Fri, 8 May 2015 08:15:30 +0000 (09:15 +0100)]
TextLayout - Wrap a word by character if it doesn't fit.
Change-Id: I73c2005e0fab4ce538248ca0c428803096fce460
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Lee Morgan [Wed, 29 Apr 2015 14:05:16 +0000 (15:05 +0100)]
Fixed JSON shaders. Added JSON spec to documentation
Change-Id: Ia05409e49a9db7c944364bf50fb82cc5e700c37a
Paul Wisbey [Wed, 6 May 2015 15:50:17 +0000 (16:50 +0100)]
Simplified the placeholder-text show/hide logic
Change-Id: I4cd9e7befafcc78fd9f9cb6acdfdc6e79544e8e5
Victor Cebollada [Wed, 6 May 2015 11:18:20 +0000 (12:18 +0100)]
Cursor fix.
Update the cursor position after all text is removed and
the place holder text appears.
Change-Id: I4455e5b382db195b5129cfd13c47c022811122c9
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
HyunJu Shin [Wed, 6 May 2015 02:03:51 +0000 (19:03 -0700)]
Merge "Set label padding in case of ResizePolicy::USE_NATURAL_SIZE - we don't need a padding in other resize policies." into tizen
Kimmo Hoikka [Tue, 5 May 2015 16:04:53 +0000 (09:04 -0700)]
Merge "(ItemView) Store initial value in constraints to apply weight correctly" into tizen
Adeel Kazmi [Tue, 5 May 2015 15:45:45 +0000 (08:45 -0700)]
Merge "Add more shared C++/JavaScript docs and add JavaScript wrapping guide" into tizen
Adeel Kazmi [Tue, 5 May 2015 14:24:48 +0000 (07:24 -0700)]
Merge "More Text related logging & clean-up" into tizen
Nick Holland [Thu, 2 Apr 2015 11:54:08 +0000 (12:54 +0100)]
Add more shared C++/JavaScript docs and add JavaScript wrapping guide
Change-Id: Ief3c78e0b752b0c21e3dbebeb216317a154a440c
Paul Wisbey [Tue, 5 May 2015 12:32:14 +0000 (05:32 -0700)]
Merge "Fix for multi-language support." into tizen
Victor Cebollada [Tue, 5 May 2015 08:56:57 +0000 (09:56 +0100)]
Fix for multi-language support.
The validated font per script was not inserted in the chache producing a memory leak and also it was not reused.
Change-Id: Iee3bbbe96a36c65aafa12b92876e633a8af4174a
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Heeyong Song [Mon, 4 May 2015 08:12:17 +0000 (17:12 +0900)]
Set label padding in case of ResizePolicy::USE_NATURAL_SIZE
- we don't need a padding in other resize policies.
Change-Id: Icec860efd36a1115a9461ecb10a09a46c0a850fc
Paul Wisbey [Sat, 2 May 2015 12:40:22 +0000 (13:40 +0100)]
More Text related logging & clean-up
Change-Id: If565d84d0543cdbc8e80c8c8a0f9e4ae16f2fe89
Paul Wisbey [Sat, 2 May 2015 10:12:07 +0000 (11:12 +0100)]
Fix for PLACEHOLDER_TEXT_FOCUSED feature
Change-Id: Ifd2601e7f5d9a012d18af9b5279ade4782d9a164
Adeel Kazmi [Fri, 1 May 2015 16:52:03 +0000 (17:52 +0100)]
(ItemView) Store initial value in constraints to apply weight correctly
[Problem] Constraint apply animations happen too quickly.
[Cause] Interpolating between current and final value, but current is being updated.
[Solution] Store the initial value and interpolate between that and the desired value.
Change-Id: I71c6f403058f9ef0774fa1e42f4c0fbf6b7f29c2
Paul Wisbey [Wed, 29 Apr 2015 16:04:53 +0000 (17:04 +0100)]
Added more DALI_LOG_INFO for Text components
Enable Logging with environment variable
for general logging LOG_TEXT_CONTROLS=3,true
for verbose logging LOG_TEXT_CONTROLS=4,true
Change-Id: I58b02488875b6c72de28a9638d86dd68a0cb01dc
Adeel Kazmi [Thu, 30 Apr 2015 10:10:32 +0000 (03:10 -0700)]
Merge "Added rectangle support for property values" into tizen
Adeel Kazmi [Wed, 29 Apr 2015 16:22:28 +0000 (09:22 -0700)]
Merge "Fix unsigned/signed int comparison warning" into tizen
Adeel Kazmi [Wed, 29 Apr 2015 16:20:34 +0000 (09:20 -0700)]
Merge "DALi Version 1.0.40" into tizen
Kingsley Stephens [Wed, 29 Apr 2015 15:53:56 +0000 (16:53 +0100)]
Fix unsigned/signed int comparison warning
Change-Id: I1ba59f93c7f842fad0a8a2a9b480e813be2c339a
Lee Morgan [Wed, 29 Apr 2015 14:34:20 +0000 (15:34 +0100)]
DALi Version 1.0.40
Change-Id: I9bf818488d818c8beaff43afb6255a232a352599
Adeel Kazmi [Thu, 23 Apr 2015 16:45:10 +0000 (17:45 +0100)]
(Doxygen) Added constraints documentation & some clean up
Change-Id: I226252305a1a2129c5fbe6691440a6422d54fb91
Nick Holland [Wed, 25 Mar 2015 09:40:00 +0000 (09:40 +0000)]
Added rectangle support for property values
layer.clippingBox = [ 2,54,56,4];
was failing
Change-Id: I5f438bbd24d169b5081a66635d14e459a5124e79
Paul Wisbey [Sat, 25 Apr 2015 11:40:16 +0000 (12:40 +0100)]
PlaceholderText + IMF improvements
Change-Id: I14e33827fca8df01ac22699e59908f47c4341c2d
Adeel Kazmi [Mon, 27 Apr 2015 09:21:18 +0000 (02:21 -0700)]
Merge "Alpha function changes" into tizen
Agnelo Vaz [Wed, 22 Apr 2015 15:58:46 +0000 (16:58 +0100)]
TextField to limit Input to maximum characters and emit signal
Change-Id: I592740c84c1121b2e5c9d3f779b4639236fa4ea6
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
Victor Cebollada [Fri, 24 Apr 2015 06:33:49 +0000 (07:33 +0100)]
Selection Handled Scrolling - Step1
*Decorator uses the same data structure to store the three handles.
*Decorator uses the same code to send events to the controller for the three handles.
Change-Id: I14595b6531c55ecfffedc7a8266a2f70b927c5ce
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Ferran Sole [Mon, 20 Apr 2015 13:46:55 +0000 (14:46 +0100)]
Alpha function changes
Change-Id: I26579ded59bbbce7c1dcb4c9b068f22046879ab1
Kimmo Hoikka [Fri, 24 Apr 2015 14:35:05 +0000 (07:35 -0700)]
Merge "(Page) Using registered properties" into tizen
Kimmo Hoikka [Fri, 24 Apr 2015 14:34:13 +0000 (07:34 -0700)]
Merge "Delete view from toolkit and move cluster into demo" into tizen
Adeel Kazmi [Fri, 24 Apr 2015 10:33:06 +0000 (11:33 +0100)]
(Page) Using registered properties
Change-Id: I7e61c64244b9e0b9179287898295eb6778d9cef0
Kingsley Stephens [Fri, 17 Apr 2015 12:14:56 +0000 (13:14 +0100)]
Delete view from toolkit and move cluster into demo
Change-Id: I079a8b85eaedc2a9915db163f6ab1e5f17557c49
Paul Wisbey [Wed, 22 Apr 2015 14:25:30 +0000 (15:25 +0100)]
TextField property updates
Change-Id: I5ee0b8ef3e7e0b9760a4731f05fb479dfe123be8
Adeel Kazmi [Thu, 23 Apr 2015 13:52:13 +0000 (14:52 +0100)]
(AutomatedTests) Removed control style-change test case
Change-Id: Ie10be9b842a236c31eb17d5b391da419e71af170
Paul Wisbey [Thu, 23 Apr 2015 13:36:59 +0000 (06:36 -0700)]
Merge "Cursor Scrolling." into tizen
Paul Wisbey [Thu, 23 Apr 2015 13:33:39 +0000 (06:33 -0700)]
Merge "Make cursor invisible when exceeds the boundaries of the Text Control." into tizen
Paul Wisbey [Thu, 23 Apr 2015 13:33:25 +0000 (06:33 -0700)]
Merge "Text Decorator - Set positions in Control coords." into tizen
Richard Huang [Thu, 23 Apr 2015 13:04:41 +0000 (14:04 +0100)]
Fix the failed test case for ScrollView overshoot
Change-Id: I26e538df346d5ed98d6a5998b7eb07c1441948b8
Adeel Kazmi [Thu, 23 Apr 2015 11:08:20 +0000 (04:08 -0700)]
Merge "DALi Version 1.0.39" into tizen
Xiangyin Ma [Thu, 23 Apr 2015 11:04:30 +0000 (12:04 +0100)]
DALi Version 1.0.39
Change-Id: Ie8c22ac0e9f6a8d08826bed7604c6768dc3fd5c4
Victor Cebollada [Wed, 15 Apr 2015 12:56:53 +0000 (13:56 +0100)]
Cursor Scrolling.
Change-Id: Ief97436d85ea16e4af852468785e40bdecb1a160
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Adeel Kazmi [Thu, 23 Apr 2015 09:44:43 +0000 (10:44 +0100)]
(AutomatedTests) Remove View test cases
Change-Id: Icb8ed042dbb1b3f232face9103e045f353c164b9
Victor Cebollada [Wed, 22 Apr 2015 08:02:23 +0000 (09:02 +0100)]
Make cursor invisible when exceeds the boundaries of the Text Control.
Change-Id: I1a038bb45d6e7d5fca388aac6e1d1202a7874b9a
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Victor Cebollada [Tue, 21 Apr 2015 15:36:49 +0000 (16:36 +0100)]
Text Decorator - Set positions in Control coords.
Change-Id: I2417c24e4b5035e821ed7b311723a856973823a0
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Kimmo Hoikka [Wed, 22 Apr 2015 15:22:02 +0000 (08:22 -0700)]
Merge "Type registry macros made namespace-generic: toolkit" into tizen
Victor Cebollada [Thu, 16 Apr 2015 08:53:05 +0000 (09:53 +0100)]
Split text-controller files in text-controller and text-controller-impl.
Change-Id: I72f41a8fba43da1570e7231904bead38d90310dc
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Tom Robinson [Wed, 22 Apr 2015 10:24:12 +0000 (11:24 +0100)]
Type registry macros made namespace-generic: toolkit
Change-Id: I303755ba21cec9ef4c0e3a6d2cc1c74f9f0c8fae
Paul Wisbey [Wed, 22 Apr 2015 12:08:23 +0000 (05:08 -0700)]
Merge "Test cases for new KeyInputFocus signals" into tizen
Paul Wisbey [Wed, 22 Apr 2015 12:07:41 +0000 (05:07 -0700)]
Merge "Fixes crash when fontclient is unable to supply a correct bitmap" into tizen
Paul Wisbey [Wed, 22 Apr 2015 12:07:05 +0000 (05:07 -0700)]
Merge "Fix to default Shadow Color setting" into tizen
Agnelo Vaz [Tue, 21 Apr 2015 16:17:18 +0000 (17:17 +0100)]
Test cases for new KeyInputFocus signals
Change-Id: If8898640d0e70fe20bb9a34b2d784d6cbc849c68
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
Adeel Kazmi [Wed, 22 Apr 2015 10:23:35 +0000 (03:23 -0700)]
Merge "Remove unnecessary stream operators from radian and degree as well as unnecessary Degree constructor from AngleAxis" into tizen
Agnelo Vaz [Tue, 21 Apr 2015 13:36:35 +0000 (14:36 +0100)]
Controls to Emit Signals when Key Input Focus lost or gained
Change-Id: Iecc83cf41be7783436fa5a936d1e17e8afa1f692
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
Tom Robinson [Tue, 21 Apr 2015 11:03:19 +0000 (12:03 +0100)]
Update copyright year to 2015 for public api: toolkit
Change-Id: I63856bf33b9efe4984e6d5a1874acf2ec3f2955c
Paul Wisbey [Tue, 21 Apr 2015 13:30:40 +0000 (06:30 -0700)]
Merge "Increased test coverage on TextLabel and TextField" into tizen
Kimmo Hoikka [Tue, 21 Apr 2015 10:53:35 +0000 (11:53 +0100)]
Remove unnecessary stream operators from radian and degree as well as unnecessary Degree constructor from AngleAxis
Change-Id: Icc4edab7df8ba10e902964c8967bce04b1c7a7ea
Kimmo Hoikka [Mon, 20 Apr 2015 17:13:44 +0000 (10:13 -0700)]
Merge "Size negotiation patch 4: Remove SetRelayoutEnabled" into tizen
Kimmo Hoikka [Mon, 20 Apr 2015 17:11:43 +0000 (10:11 -0700)]
Merge "Cleanup for removal of ImageAttributes from public API" into tizen
Richard Underhill [Thu, 16 Apr 2015 14:26:05 +0000 (15:26 +0100)]
Increased test coverage on TextLabel and TextField
Change-Id: I5bddb6dcbb6c8090815b94a2151b44b5d3ebd239
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
Kingsley Stephens [Tue, 14 Apr 2015 13:00:34 +0000 (14:00 +0100)]
Size negotiation patch 4: Remove SetRelayoutEnabled
PushButton size negotiation fixes
Change-Id: I497d3d2c357ee97e0970171f1888e5c45871abca
Kingsley Stephens [Wed, 8 Apr 2015 15:37:28 +0000 (16:37 +0100)]
Slider fix: Fix progress bar dissapearing with negative slider values.
Change-Id: Ic3b7d29ae6de4a2652147eb2f26118fc44ffbbd5
Andrew Cox [Tue, 31 Mar 2015 14:55:29 +0000 (15:55 +0100)]
Cleanup for removal of ImageAttributes from public API
Change-Id: Ia2efe9ef0dffe1361f0e6995b0e8134324916a4d
Signed-off-by: Andrew Cox <andrew.cox@partner.samsung.com>
Kimmo Hoikka [Tue, 14 Apr 2015 15:56:51 +0000 (16:56 +0100)]
Cleaned up Degree, Radian, AngleAxis and Quaternion classes
- Inline Degree, Radian and AngleAxis types to avoid unnecessary exports / export table lookups in using code
- Change AngleAxis to store a Radian angle for better accuracy
- Make Quaternion explicitly take a Radian as constructor
Change-Id: I81f5478572322c65f87045d1b58c621da8989d27
Paul Wisbey [Thu, 16 Apr 2015 12:49:04 +0000 (05:49 -0700)]
Merge "Use orientation from Window not application" into tizen
Richard Underhill [Thu, 16 Apr 2015 10:28:25 +0000 (11:28 +0100)]
Fixes crash when fontclient is unable to supply a correct bitmap
Change-Id: Idcc5f0921e39ce8927a429987a8edc8567103d9d
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
Richard Underhill [Thu, 16 Apr 2015 08:51:02 +0000 (09:51 +0100)]
Fix to default Shadow Color setting
Change-Id: I45788e8dcf2a9ac63e4d3b759de071621f7d6f30
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
Paul Wisbey [Wed, 15 Apr 2015 17:33:29 +0000 (10:33 -0700)]
Merge "Text Selection Popup to use bounding box and table views" into tizen
Paul Wisbey [Tue, 14 Apr 2015 15:12:08 +0000 (16:12 +0100)]
Text-related Programming guide updates
Change-Id: I474917bd30af46ad58b389c5c8c3e4469578c606
Agnelo Vaz [Tue, 14 Apr 2015 15:49:01 +0000 (16:49 +0100)]
Text Selection Popup to use bounding box and table views
Change-Id: I0ff7776a5cd8c5f9ad49f2d11d7c930b96f1ed24
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
Richard Underhill [Wed, 15 Apr 2015 08:35:19 +0000 (09:35 +0100)]
Fix for Text Rendering Artefacts
Change-Id: I64f318791b61629a750ec2e558625ada7da1de97
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
Ferran Sole [Wed, 15 Apr 2015 11:58:08 +0000 (12:58 +0100)]
DALi Version 1.0.38
Change-Id: I2d12e0d929edbb5c44d39adacf33a0cce61e958a
Nick Holland [Fri, 10 Apr 2015 14:36:21 +0000 (15:36 +0100)]
Use orientation from Window not application
Change-Id: I71b88e71a64dfe4e2ebe139126c2e2acd9c26373
Richard Underhill [Tue, 14 Apr 2015 09:21:45 +0000 (10:21 +0100)]
Added UNDERLINE_HEIGHT Property to override font metrics
Change-Id: I04398e2ef68a758ed6524a6fa7640e9a35c6532c
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
Paul Wisbey [Tue, 14 Apr 2015 12:05:20 +0000 (05:05 -0700)]
Merge "Added TextLabel and TextField tests" into tizen
Kimmo Hoikka [Tue, 14 Apr 2015 10:52:41 +0000 (03:52 -0700)]
Merge "Size negotiation patch 3: Scope size negotiation enums" into tizen
Richard Underhill [Mon, 13 Apr 2015 15:08:45 +0000 (16:08 +0100)]
Added TextLabel and TextField tests
Change-Id: I8ac0c4479f87cf6ac4ee20a7e50f7d091b60c2d0
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
Paul Wisbey [Tue, 14 Apr 2015 10:26:58 +0000 (03:26 -0700)]
Merge "Layout fixes" into tizen
Paul Wisbey [Tue, 14 Apr 2015 10:26:46 +0000 (03:26 -0700)]
Merge "TextLayout - Use one method to do the single line or multi-line layout." into tizen
Victor Cebollada [Thu, 9 Apr 2015 10:21:19 +0000 (11:21 +0100)]
Layout fixes
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Change-Id: I67c7630438655ea72940a70e764ae214267122be
Victor Cebollada [Thu, 9 Apr 2015 16:24:02 +0000 (17:24 +0100)]
TextLayout - Use one method to do the single line or multi-line layout.
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Change-Id: Iec3bd2c60a2d3c36f2a13f16b2e7ce77dedaa336
Kingsley Stephens [Fri, 10 Apr 2015 09:24:06 +0000 (10:24 +0100)]
Size negotiation patch 3: Scope size negotiation enums
Change-Id: I3fecc8c0ae631da45f474c64e9138b29cf5e71d1
Nick Holland [Mon, 13 Apr 2015 14:33:30 +0000 (15:33 +0100)]
Fix compile errors after removing boost function include from dali-core
Change-Id: Ie62e653b1b37d71326365fd9992955a3ce622fe5
Paul Wisbey [Mon, 13 Apr 2015 10:06:21 +0000 (11:06 +0100)]
Removed some accidentally exported symbols
Change-Id: I254cbe601f67609db21dd9432e402f00e93ef23e
Kimmo Hoikka [Mon, 13 Apr 2015 10:25:49 +0000 (11:25 +0100)]
Remove mention of boost and textview from custom actor programming guide chapter
Change-Id: Ideaa3e756edb959d393c907fd1940351493f0883
Kimmo Hoikka [Fri, 10 Apr 2015 14:52:11 +0000 (07:52 -0700)]
Merge "DALi Version 1.0.37" into tizen