Agnelo Vaz [Wed, 29 Jul 2015 13:39:13 +0000 (14:39 +0100)]
Ability to build from different Style folders
* Added a "reference" folder which contains the default style
* Althernative folders can be added to the style folder
* Build system can be configured to use defined folder for style file.
- spec file currently only uses reference folder but will be configurable from build system in future
Change-Id: Ia24efc50112a03d0048d24665d0f5ce6b2b01c08
Tom Robinson [Thu, 30 Jul 2015 08:26:37 +0000 (09:26 +0100)]
DALi Version 1.0.51
Change-Id: Icf68fbadd385fcd3fe7ec5123b734888d958fbac
Richard Underhill [Wed, 29 Jul 2015 15:23:05 +0000 (16:23 +0100)]
Stop memory leak in Text Controller.
Change-Id: I85d397aded4dafc1fbf7211170d6b3ece5546c9f
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
Richard Underhill [Tue, 28 Jul 2015 12:16:15 +0000 (13:16 +0100)]
Corrects Invalid Write (reported by valgrind ) in AtlasManager.
Change-Id: I61ddeb16bca679b51c4e1a232e64f95070809374
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
Adeel Kazmi [Tue, 28 Jul 2015 14:42:34 +0000 (07:42 -0700)]
Merge "Stop setting crazy Z value with controls (at the moment depth is ignored by Size negotiation)" into devel/master
Paul Wisbey [Tue, 28 Jul 2015 14:42:02 +0000 (07:42 -0700)]
Merge "Text clean." into devel/master
Victor Cebollada [Tue, 28 Jul 2015 12:34:27 +0000 (13:34 +0100)]
Initialize the line run direction when there is an ellipsis line.
Change-Id: I3c9705c29ed7bbaaf05307ab20cfec15493028e3
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Victor Cebollada [Tue, 21 Jul 2015 14:17:03 +0000 (15:17 +0100)]
Text clean.
* Removes includes.
* Moves code in text-view.cpp to match the .h
Change-Id: Ifc510f19a427722f6072122f68b5f26800dc1081
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Kimmo Hoikka [Mon, 27 Jul 2015 16:21:47 +0000 (17:21 +0100)]
Stop setting crazy Z value with controls (at the moment depth is ignored by Size negotiation)
Change-Id: I0c192a4a00cc0d848ada0714021d5eacc22ba8e2
Agnelo Vaz [Mon, 27 Jul 2015 16:14:31 +0000 (17:14 +0100)]
Style Manager to create ThemeBuilder before Applying Style
* Fix bug in which Control::Initialize tries to ApplyStyle but StyleManager does not create a theme builder unless SetStyleName called.
Change-Id: I34a1854a1a4b2c6e08fbbdb21dffa4b04055cfcc
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
Richard Underhill [Fri, 24 Jul 2015 10:45:22 +0000 (11:45 +0100)]
Keep track of Bitmap data ownership
Change-Id: I94cd806cd506d2375ce565f6caf997467b14e164
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
Richard Underhill [Mon, 27 Jul 2015 10:04:18 +0000 (11:04 +0100)]
Fix for Text coloring issues with multiple atlas use.
Change-Id: If98fa55497f7b5eb53303fce45a1588fa141cf4f
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
Kimmo Hoikka [Fri, 24 Jul 2015 15:10:34 +0000 (08:10 -0700)]
Merge "Button SetLabel padding fix" into devel/master
Kimmo Hoikka [Fri, 24 Jul 2015 15:10:24 +0000 (08:10 -0700)]
Merge "Modify RadioButton test case" into devel/master
Tom Robinson [Fri, 24 Jul 2015 13:58:25 +0000 (14:58 +0100)]
Button SetLabel padding fix
Change-Id: If9db6c7817811bb2d54edba9909db4e48dc3fd6f
Agnelo Vaz [Fri, 24 Jul 2015 12:40:12 +0000 (13:40 +0100)]
Update cursor when Keyboard Focus gained
* Cursor had 0 height if TextField editmode started without tapping control
Change-Id: Iad6eeb1a4e6e55c498a1afc276acee03b10095d3
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
Tom Robinson [Wed, 22 Jul 2015 15:31:47 +0000 (16:31 +0100)]
UTC test fix and Adaptors initialising accessibility correctly
Change-Id: Ieb8c851356f2158ac23c3e724ab2a1b0a2b4b275
Richard Huang [Thu, 23 Jul 2015 10:56:13 +0000 (11:56 +0100)]
DALi Version 1.0.50
Change-Id: I21286ad7a09b4fcdc3c68c9f9da734c8e3283683
Heeyong Song [Thu, 23 Jul 2015 05:46:12 +0000 (14:46 +0900)]
Modify RadioButton test case
The touch point is out of button area because RadioButton size is small in target test. So I changed the touch point.
Change-Id: I93f0769b81becdca717bc0541e77e603b538a7ca
Kimmo Hoikka [Wed, 22 Jul 2015 14:15:15 +0000 (07:15 -0700)]
Merge "Changed ImageView to use a unit square mesh and instead to size the mesh in the shader to the actor size." into devel/master
Kimmo Hoikka [Wed, 22 Jul 2015 12:59:07 +0000 (05:59 -0700)]
Merge "Multi-line layout." into devel/master
Tom Robinson [Tue, 21 Jul 2015 11:46:39 +0000 (12:46 +0100)]
Added new property API to Button. Added Icon and color features. Deprecated old API
Change-Id: I9bcc9ed61c04f12465d058794260454aa9290834
Kimmo Hoikka [Tue, 21 Jul 2015 14:36:38 +0000 (07:36 -0700)]
Merge "Add UTCs for public-api" into devel/master
Chu Hoang [Tue, 21 Jul 2015 13:22:50 +0000 (14:22 +0100)]
Removed #include devel-api from image-view.h public-api header.
Change-Id: I8b20bdf6ed0bfac2101c12e8ead6376aabd38e7e
Chu Hoang [Mon, 20 Jul 2015 16:02:29 +0000 (17:02 +0100)]
Changed ImageView to use a unit square mesh and instead to size the mesh in the shader to the actor size.
Change-Id: I4adce952422a8c5d05e85778e253ead18e891fbf
Richard Huang [Mon, 20 Jul 2015 15:08:24 +0000 (16:08 +0100)]
Allow configurable refresh interval in ItemView during fast scroll
Change-Id: I1459b344c9b2315b9a86fc91a92b600509153fdf
Victor Cebollada [Tue, 14 Jul 2015 13:58:52 +0000 (14:58 +0100)]
Multi-line layout.
* The Shape tool gives a height to the glyphs shaped from
new paragraph characters.
* An extra line with no characters but height is created
if the last characters is a new paragraph.
* Bug fixed in the Shape tool when there are new
paragraph characters. Was not spliting the text in
chunks correctly.
* Bug fixed in the multi-language processor. Was not
splitting the text in chunks correctly when there are
characters common for all scripts mixed in other scripts.
* Bug fixed in the bidirectional support modul.
Mirror only the text of the right to left paragraphs.
Change-Id: Ie1321131336b2ffa883db9d3f5873528c1f26aaf
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
taeyoon [Mon, 20 Jul 2015 03:01:02 +0000 (12:01 +0900)]
Add UTCs for public-api
Change-Id: I642cbbc271c8fb8c0326f9fd8d61083277d81d8e
Kimmo Hoikka [Fri, 17 Jul 2015 15:05:23 +0000 (08:05 -0700)]
Merge "Simple implementation of ImageView." into devel/master
Paul Wisbey [Fri, 17 Jul 2015 13:48:14 +0000 (06:48 -0700)]
Merge "Fix for text highlight." into devel/master
Kimmo Hoikka [Fri, 17 Jul 2015 10:17:52 +0000 (03:17 -0700)]
Merge "Make internal actors size match TextLabel size" into devel/master
Victor Cebollada [Mon, 13 Jul 2015 15:09:44 +0000 (16:09 +0100)]
Fix for text highlight.
* Fix LATIN ligatures. Allows the selection of part of a ligature.
i.e select only one 'f' in the 'ff' ligature.
Change-Id: I2835a69d121cc996859c62b2dd86f157d1410d46
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Nick Holland [Fri, 17 Jul 2015 08:25:52 +0000 (09:25 +0100)]
DALi Version 1.0.49
Change-Id: I60c3300eb3eb534e7ffbba0ef0965313b17f7eed
Paul Wisbey [Thu, 16 Jul 2015 12:22:58 +0000 (13:22 +0100)]
Make internal actors size match TextLabel size
Change-Id: I9a874e714d482553da446bdea112f3155cc3e84e
Paul Wisbey [Thu, 16 Jul 2015 13:02:51 +0000 (06:02 -0700)]
Merge "TextDecorator. Do not destroy the highlight geometry every OnRelayout." into devel/master
Chu Hoang [Mon, 13 Jul 2015 14:28:52 +0000 (15:28 +0100)]
Simple implementation of ImageView.
Change-Id: Iab2e0995e97a4bfc2b8d1a8b36da6f9d896fc181
Agnelo Vaz [Wed, 15 Jul 2015 12:55:39 +0000 (13:55 +0100)]
Text Selection Popup to use Style sheet for Properties
Change-Id: I983afd9e02d90e3b325fc1c9876d52fd50aa557a
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
Victor Cebollada [Mon, 6 Jul 2015 15:13:02 +0000 (16:13 +0100)]
TextDecorator. Do not destroy the highlight geometry every OnRelayout.
Change-Id: I0edd86d8799c98767111b5abb5a4a71fbf928c93
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Adeel Kazmi [Wed, 15 Jul 2015 08:50:53 +0000 (01:50 -0700)]
Merge "Accessibility programming guide" into devel/master
Victor Cebollada [Wed, 15 Jul 2015 07:35:50 +0000 (08:35 +0100)]
Fix Klocwork issues.
Change-Id: I50d42a595bfc882fde7edf57e0a3d867f46769a6
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Adeel Kazmi [Tue, 14 Jul 2015 17:49:25 +0000 (10:49 -0700)]
Merge "Removal of Actor::Insert API" into devel/master
Adeel Kazmi [Tue, 14 Jul 2015 16:05:22 +0000 (09:05 -0700)]
Merge "Removed feedback controller Boost dependency" into devel/master
Kimmo Hoikka [Tue, 14 Jul 2015 15:35:22 +0000 (08:35 -0700)]
Merge "Fix ItemView scroll issue while handling ScrollPositionIntervalReachedSignal" into devel/master
Tom Robinson [Tue, 14 Jul 2015 15:10:32 +0000 (16:10 +0100)]
Removal of Actor::Insert API
Change-Id: If2d5520bc496167acd6341d6cf8a06e1cb9df540
Lee Morgan [Fri, 3 Jul 2015 13:57:46 +0000 (14:57 +0100)]
Removed feedback controller Boost dependency
Moved feedback controller to toolkit to use json parser
Change-Id: I57372ecd78c0147d58cd9c7620c812fd3a1da6e0
Richard Huang [Fri, 3 Jul 2015 12:59:02 +0000 (13:59 +0100)]
Fix ItemView scroll issue while handling ScrollPositionIntervalReachedSignal
Change-Id: I8b8d04fde2bf2471804020f1bd4e4006cc6c1112
Victor Cebollada [Mon, 13 Jul 2015 12:20:15 +0000 (13:20 +0100)]
Add text-control include dev files.
Change-Id: I5d8cd7385bd14aa966082bbaa805d5ca0a4b6bc3
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Kimmo Hoikka [Tue, 14 Jul 2015 14:00:32 +0000 (07:00 -0700)]
Merge "Simplified the glyph reference counting" into devel/master
Kimmo Hoikka [Tue, 14 Jul 2015 13:28:57 +0000 (06:28 -0700)]
Merge "Modified control depth index ranges so they have less impact on sorting algorithm" into devel/master
Adeel Kazmi [Tue, 14 Jul 2015 12:50:16 +0000 (05:50 -0700)]
Merge "Use Control's own PanGestureDetector in ScrollBar" into devel/master
Richard Huang [Tue, 14 Jul 2015 09:39:33 +0000 (10:39 +0100)]
Use Control's own PanGestureDetector in ScrollBar
Change-Id: I65c5fa40a64004358af8850cc1c4148cad91237b
Paul Wisbey [Tue, 7 Jul 2015 14:03:07 +0000 (15:03 +0100)]
Simplified the glyph reference counting
This fixes a bug found when opening/closing the text-selection popup.
The reference counts are not incremented correctly e.g. when a word contains
the same letter twice. This results in the atlas becoming corrupted.
+ More Debug macros for glyph-atlas
Change-Id: Ib91681bc76e037ec4f6765bdc6ecbc9f592c20e3
Victor Cebollada [Thu, 9 Jul 2015 10:38:00 +0000 (11:38 +0100)]
Fix for grab and selection handles.
* Was difficult/imposible to drag the handle to the beginning/end of the text.
Change-Id: I80e9a0f7c2cc2c9e2262bb2238e00debc9b37138
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Victor Cebollada [Mon, 13 Jul 2015 06:52:12 +0000 (07:52 +0100)]
Fix the cursor's height.
* In a line with different font sizes it was
getting the size of the next glyph instead
the current one.
Change-Id: I3982fe5452a0b5a02b3858231540b4092856b966
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Ferran Sole [Mon, 13 Jul 2015 14:35:14 +0000 (15:35 +0100)]
Modified control depth index ranges so they have less impact on sorting algorithm
Change-Id: I8be297d9496b48357dcdcdf2dc2a7ccd77357dc2
Kimmo Hoikka [Mon, 13 Jul 2015 17:50:28 +0000 (10:50 -0700)]
Merge "Change DrawMode::OVERLAY to DrawMode::OVERLAY_2D" into devel/master
Andrew Cox [Mon, 13 Jul 2015 15:14:37 +0000 (16:14 +0100)]
Removed Resource Saving
Change-Id: Ief30d87f9ebe3e038c2fbb8b6e0df1efe853bab4
Signed-off-by: Andrew Cox <andrew.cox@partner.samsung.com>
Tom Robinson [Tue, 7 Jul 2015 10:15:38 +0000 (11:15 +0100)]
Accessibility programming guide
Change-Id: I377386e8b4437fb48d2913546ad4cbf2384c052c
Kimmo Hoikka [Mon, 13 Jul 2015 14:01:17 +0000 (07:01 -0700)]
Merge "Updates after RenderableActor removal" into devel/master
Richard Huang [Mon, 13 Jul 2015 13:40:41 +0000 (14:40 +0100)]
Change DrawMode::OVERLAY to DrawMode::OVERLAY_2D
Change-Id: I62c18b342d4983f266d26b4dd8f7efa3e33c53f6
Adeel Kazmi [Mon, 13 Jul 2015 11:42:29 +0000 (12:42 +0100)]
Updates after RenderableActor removal
Change-Id: Ic4c5a8369913f829c301ab18b007f358abf98774
Andrew Cox [Tue, 23 Jun 2015 18:03:05 +0000 (19:03 +0100)]
Shader binary synchronous simplified IO
Change-Id: Ie09e73965389ba0229a42ecd7f9e32f49764710e
Signed-off-by: Andrew Cox <andrew.cox@partner.samsung.com>
Kimmo Hoikka [Mon, 13 Jul 2015 09:10:53 +0000 (02:10 -0700)]
Merge "Fix scroll bar to draw in the overlay mode" into devel/master
Chu Hoang [Fri, 10 Jul 2015 16:48:13 +0000 (17:48 +0100)]
Moved PushButton::SetButtonImage etc to Button base class.
Change-Id: I2eb20df5c00597c129ea0688ec3a4a11e42b77e6
Richard Huang [Mon, 6 Jul 2015 16:04:17 +0000 (17:04 +0100)]
Fix scroll bar to draw in the overlay mode
Change-Id: Ifb2ba8123c9f858c33a93a559cc612d762ff51b6
Paul Wisbey [Fri, 10 Jul 2015 09:46:38 +0000 (10:46 +0100)]
Apply default theme if no THEME_CHANGE occurs
Change-Id: I46d061d3ba3d289aac94d596da64a9a381136d45
Kimmo Hoikka [Fri, 10 Jul 2015 14:47:29 +0000 (07:47 -0700)]
Merge "Automated test fix for framebuffer creation" into devel/master
Adeel Kazmi [Fri, 10 Jul 2015 13:20:21 +0000 (06:20 -0700)]
Merge "Remove de-funct dynamics support" into devel/master
David Fumanal [Tue, 7 Jul 2015 13:10:49 +0000 (14:10 +0100)]
Automated test fix for framebuffer creation
Change-Id: I775dbaedaabc18f1cc678e820df590b4493a0cc3
Adeel Kazmi [Fri, 10 Jul 2015 09:52:36 +0000 (02:52 -0700)]
Merge "Fixed crash while wrapping a Control as an actor in JavaScript plugin" into devel/master
Kimmo Hoikka [Thu, 9 Jul 2015 18:54:34 +0000 (19:54 +0100)]
Remove de-funct dynamics support
Change-Id: I6f38ba989f55e75a7397a25d2c0e40a49fc9d9e1
Kimmo Hoikka [Thu, 9 Jul 2015 12:17:47 +0000 (13:17 +0100)]
Remove unnecessarily checked in binaries
Change-Id: Idb28aaa7455291f0f66bc225f307f5a0b608519c
Adeel Kazmi [Thu, 9 Jul 2015 16:13:09 +0000 (09:13 -0700)]
Merge "replaced toolkit pushbutton images with shorter images." into devel/master
Adeel Kazmi [Thu, 9 Jul 2015 16:11:40 +0000 (09:11 -0700)]
Merge "DALi Version 1.0.48" into devel/master
Paul Wisbey [Thu, 9 Jul 2015 14:40:34 +0000 (07:40 -0700)]
Merge "Remove UNSIGNED_INTEGER property type (removed from core)" into devel/master
Lee Morgan [Thu, 9 Jul 2015 14:02:32 +0000 (15:02 +0100)]
DALi Version 1.0.48
Change-Id: I13b15982ea4b7bd4d9751e351618727d691b4c0d
Richard Huang [Thu, 9 Jul 2015 13:38:13 +0000 (14:38 +0100)]
Fixed crash while wrapping a Control as an actor in JavaScript plugin
Change-Id: I4c01b5a77836ffd9b22bf3c1b2aa2f809871f1c5
Paul Wisbey [Thu, 9 Jul 2015 12:22:14 +0000 (05:22 -0700)]
Merge "Fix for the layout engine." into devel/master
Kimmo Hoikka [Wed, 8 Jul 2015 14:40:03 +0000 (15:40 +0100)]
Remove UNSIGNED_INTEGER property type (removed from core)
Change-Id: I9874eeaeb95b59e4486265951184558e48efc72f
Adeel Kazmi [Thu, 9 Jul 2015 10:39:55 +0000 (03:39 -0700)]
Merge "Fixed signals for toggle button" into devel/master
Victor Cebollada [Thu, 9 Jul 2015 09:35:07 +0000 (10:35 +0100)]
Fix for the layout engine.
* It was not updating the line height for the last character.
Change-Id: Ica8b0c2c3870bb24ebbdc2e3197c3ee551b80876
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Paul Wisbey [Wed, 8 Jul 2015 18:04:50 +0000 (11:04 -0700)]
Merge "TextSelection Popup Styling Image update and json" into devel/master
Agnelo Vaz [Mon, 6 Jul 2015 16:00:00 +0000 (17:00 +0100)]
TextSelection Popup Styling Image update and json
Change-Id: I75fa29003e4f77aa7b81294ea6205fb5ad7ad7ef
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
Agnelo Vaz [Tue, 7 Jul 2015 16:10:16 +0000 (17:10 +0100)]
Configure which platform style to use
Change-Id: I5c558f08ecfd63aff34da334f8a60b28309eefa2
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
Tom Robinson [Wed, 8 Jul 2015 16:33:18 +0000 (17:33 +0100)]
Fixed signals for toggle button
Change-Id: I178600d47f4564207fb6b6c3a21b38ad43d37b3b
Kimmo Hoikka [Wed, 8 Jul 2015 13:53:43 +0000 (14:53 +0100)]
Missing comma from stylesheet
Change-Id: Ia0e262aff7cca09705c1e4e6e3d5cc233a090d71
Chu Hoang [Wed, 8 Jul 2015 10:35:31 +0000 (11:35 +0100)]
replaced toolkit pushbutton images with shorter images.
This fixes issue for when the pushbutton was shorter than the original pushbutton images the top and bottom of the 9 patch would overlap. The overlap was then visible when the button was transitioning.
Change-Id: I6f1056fa8f9e32ca8de7adee3e20228ad33178dc
Paul Wisbey [Tue, 7 Jul 2015 15:49:49 +0000 (08:49 -0700)]
Merge "Fix when typing text and the grab handle is visible/pressed." into devel/master
Paul Wisbey [Tue, 7 Jul 2015 14:53:54 +0000 (07:53 -0700)]
Merge "Fix for TextField clipping." into devel/master
Victor Cebollada [Tue, 7 Jul 2015 13:36:29 +0000 (14:36 +0100)]
Fix for TextField clipping.
* The text clipper is created after the text is rendered
for the first time. If a text is long enough it exceeds
the boundaries of the text-field in the first render.
Change-Id: I1c6191fcfb7dce2935cec774fe877c89842555bd
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Adeel Kazmi [Tue, 7 Jul 2015 14:14:22 +0000 (07:14 -0700)]
Merge "Node JS Addon for DALi + Improvements" into devel/master
Victor Cebollada [Tue, 7 Jul 2015 10:48:36 +0000 (11:48 +0100)]
Fix when typing text and the grab handle is visible/pressed.
* Adds a new state EDITING_WITH_GRAB_HANDLE.
Change-Id: Ibb3294ce9de9ea701e1906c116a635b54d702f98
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Adeel Kazmi [Tue, 7 Jul 2015 09:32:52 +0000 (02:32 -0700)]
Merge "Fix Klocwork issues." into devel/master
Nick Holland [Fri, 26 Jun 2015 14:51:24 +0000 (15:51 +0100)]
Node JS Addon for DALi + Improvements
old: control = new dali.TextField();
new: control = new dali.Control('control-name');
old: log('my message \n');
new: console.log('my message'); // common.js style
new: console.error('my error message')
// added ability to require('dali')
If we are running JavaScript in Node.JS it has to explicity
call require('dali'); This is now supported in dali standalone as well
to maintain code compatibility.
Change-Id: I8f5f1828bb3e5df950f4fedf952013eb247906e5
Kimmo Hoikka [Tue, 7 Jul 2015 09:23:17 +0000 (02:23 -0700)]
Merge "(AutomatedTests) Synchronise TestSingletonService with Adaptor" into devel/master
Paul Wisbey [Tue, 7 Jul 2015 08:27:18 +0000 (01:27 -0700)]
Merge "Fixed Text Quality Regression" into devel/master
Richard Underhill [Fri, 3 Jul 2015 13:26:34 +0000 (14:26 +0100)]
Fixed Text Quality Regression
Positioning of multiple 'mesh' actors per text-label was incorrect
i.e. caused by SetSize(1,1) on parent actors.
Compensated for sampling errors by rendering half a texel more on each edge.
Change-Id: Iaee82914ca736867be081779badb8c6476a8b95d
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
Paul Wisbey [Mon, 6 Jul 2015 15:45:47 +0000 (08:45 -0700)]
Merge "Stop doing unparent and reset in text decorator." into devel/master
Adeel Kazmi [Mon, 6 Jul 2015 13:52:23 +0000 (14:52 +0100)]
(AutomatedTests) Synchronise TestSingletonService with Adaptor
Change-Id: Ie534cf1d54b58e1aaa62464e18f4a30f40b29313
Adeel Kazmi [Mon, 6 Jul 2015 14:56:10 +0000 (07:56 -0700)]
Merge "Only use StyleManager if it really is available" into devel/master
projects / platform / core / uifw / dali-toolkit.git / log