Denis Khalikov [Fri, 16 Dec 2016 12:59:21 +0000 (15:59 +0300)]
comment unused data
Denis Khalikov [Fri, 16 Dec 2016 12:50:30 +0000 (15:50 +0300)]
comment unused data
dongsug.song [Tue, 15 Nov 2016 05:30:28 +0000 (14:30 +0900)]
Merge branch 'devel/master' into tizen
Change-Id: Ia5d2cb474d0295d39dfd797a7d90886facb23d35
dongsug.song [Tue, 15 Nov 2016 05:29:20 +0000 (14:29 +0900)]
Revert "[3.0] Version downgrade (1.2.0 to 1.1.45)"
This reverts commit
9761eb9aa92da3580f0560bada61a168214a7642.
Change-Id: Ic02793462d4ca06239d69742f8bd21fc65483fbc
dongsug.song [Tue, 15 Nov 2016 05:29:00 +0000 (14:29 +0900)]
Revert "[3.0] Mesh demo improvements for lighting."
This reverts commit
9f17662f6e5e46251af2dd4ff406ed63fb88a4aa.
Change-Id: If10d95cdc6e91343d951a2326c6ffc8c7a8527d7
dongsug.song [Tue, 15 Nov 2016 05:28:38 +0000 (14:28 +0900)]
Revert "[3.0] TextEditor - Update the decoration box's size."
This reverts commit
fbfb38ceb9f2872c8a92e2e77a08a0d7d8f53ad2.
Change-Id: Ia790e3b03117d7ba18e9aeddb26060d13cc68136
dongsug.song [Tue, 15 Nov 2016 05:28:14 +0000 (14:28 +0900)]
Revert "[3.0] Stencil Renderer demo: Toolbar removed"
This reverts commit
d4990959450c2c6e01e857a83f2645805995e3f8.
Change-Id: I9db20e53fbf50ef8a4d35fcbd25787b68f19d804
dongsug.song [Tue, 15 Nov 2016 05:27:53 +0000 (14:27 +0900)]
Revert "[3.0] Updated internationalized strings"
This reverts commit
dbb6bacc18c4b46d18bb9fc0f600681c70953797.
Change-Id: Id0292c8129e92d34bf991aec254ce79cf7a562e0
dongsug.song [Tue, 15 Nov 2016 05:27:30 +0000 (14:27 +0900)]
Revert "[3.0] Moved po directory to resources folder & added missing language strings"
This reverts commit
5b615fdbce6a5874deb62b0806a0bbef17c5f8df.
Change-Id: I6ae08d43d65a5d8f12c6f8415e2dac29012cc83f
dongsug.song [Tue, 15 Nov 2016 05:27:06 +0000 (14:27 +0900)]
Revert "[3.0] Updated demos to remove indicator where appropriate"
This reverts commit
334d1039d9372312a8f89666d007fb6803df53d0.
Change-Id: I0c67b7e565d90e9ec5cd7087a02f1a9b2f73d0f3
dongsug.song [Tue, 15 Nov 2016 05:26:38 +0000 (14:26 +0900)]
Revert "[3.0] Added a simple application for testing Styling"
This reverts commit
08849cfa427e4aad392b8f982037ae03e6a1c758.
Change-Id: I303fceba568fac1ce11c05737699905a87eb59f8
dongsug.song [Tue, 15 Nov 2016 05:26:09 +0000 (14:26 +0900)]
Revert "[3.0] Translate the dali-demo titile in Korean"
This reverts commit
adb2ef028c3034a236e7d822522216d1d80d9c40.
Change-Id: I894597136284d8f2d44c4f2163198b76c9ee4de6
dongsug.song [Tue, 15 Nov 2016 05:25:46 +0000 (14:25 +0900)]
Revert "[3.0] Mesh visual buttons change."
This reverts commit
d5cd2eff4006d5ba236c7715e0047fc05cec8b80.
Change-Id: I8cbd96e7e0f7bd93aea34fc9cd4f2253cf049bbb
dongsug.song [Tue, 15 Nov 2016 05:24:58 +0000 (14:24 +0900)]
Revert "[3.0] Updating .gitignore"
This reverts commit
3a3a194bb0992d75b0077821b965cfa3fb9b10e9.
Change-Id: I1f2e2f779f913e034283391ed15fa71bae2e87f3
dongsug.song [Tue, 15 Nov 2016 05:24:21 +0000 (14:24 +0900)]
Revert "[3.0] Rename color property of primitive visual to mixColor."
This reverts commit
b57c3cd944761a29611789fffa3ee097804e7575.
Change-Id: Ib133f4735d62fa07c47d18ef2de77b515c54841a
dongsug.song [Tue, 15 Nov 2016 05:18:16 +0000 (14:18 +0900)]
Revert "[3.0] Use the input style changed signal to update the gui."
This reverts commit
557de64999d33e551830812eb7e94f7ef25870e9.
Change-Id: I673695a0242770197fedbc9646f1c6916c207b72
dongsug.song [Tue, 15 Nov 2016 05:17:49 +0000 (14:17 +0900)]
Revert "[3.0] Remove bubble-effect from dali demo main screen"
This reverts commit
29d0fc514b6296cf070f187fda8ff5af92158661.
Change-Id: I69bf23d58208a24884c5276664dd16b130302f3e
dongsug.song [Tue, 15 Nov 2016 05:15:57 +0000 (14:15 +0900)]
Revert "[3.0] Removed 3D layer dependency of Model3dView and Mesh Visual."
This reverts commit
30dca3a59678006c31ec36499386d181a8b02ab2.
Change-Id: I9e438de0c5be532d41654c9b8e46ac8c1bd4f31d
dongsug.song [Tue, 15 Nov 2016 05:13:51 +0000 (14:13 +0900)]
Revert "[3.0] Clipping API feature in Actor"
This reverts commit
383e13a7a7ee8fb9af1ca6010fd8730bcad38f11.
Change-Id: I6b2867f0243747a28399679ce1f3341a7b35f12c
dongsug.song [Tue, 15 Nov 2016 05:08:11 +0000 (14:08 +0900)]
Revert "[3.0] Added bubble effect back in dali-demo (+visual changes)"
This reverts commit
b4aed990f90ddd8f69a765effbb911b6c800c30f.
Change-Id: I278fb1f3db6b81eaf9424004fa248f546856eef0
dongsug.song [Tue, 15 Nov 2016 05:07:50 +0000 (14:07 +0900)]
Revert "[3.0] Updates after removal of experimental API"
This reverts commit
31d3eef02e0cf47317e39526c3bc20616eb07d34.
Change-Id: Iacc840ddf22155e2afcfb2588c469051526020c8
dongsug.song [Tue, 15 Nov 2016 05:07:24 +0000 (14:07 +0900)]
Revert "[3.0] Changes after PageTurnView moved to Devel API"
This reverts commit
d7751d12487c99bac887b5bb0eba5ef0a916a4ec.
Change-Id: Ibf1dfe8db9f1dd296c4f3c09f7f22a4c5fd8c210
dongsug.song [Tue, 15 Nov 2016 05:06:55 +0000 (14:06 +0900)]
Revert "[3.0] Remove custom shader from video view example and change video file sample"
This reverts commit
a070a2ff0030927b9672a6a625a24ba65e91b4cb.
Change-Id: Icf28ef4fe65bfc72f1436fbe298a898ceba4cf62
dongsug.song [Tue, 15 Nov 2016 04:59:03 +0000 (13:59 +0900)]
Revert "[3.0] Remove GetRendererAt() from dali-demo"
This reverts commit
ab8c452220b4f35d12838694b4ac75c3a9d9d63b.
Change-Id: I10eceaee97c7994dbdaa0ac757c4cd4be2032762
dongsug.song [Tue, 15 Nov 2016 04:58:23 +0000 (13:58 +0900)]
Revert "[3.0] Fixed dali-demo keyboard focus and updated appearance"
This reverts commit
4fca0fa4b82635cd5caf7e4365e2cfc3db85de19.
Change-Id: Ife37c23b2d751d3b8d5bd8675fad8c564171259d
Adeel Kazmi [Fri, 11 Nov 2016 18:40:33 +0000 (18:40 +0000)]
DALi Version 1.2.14
Change-Id: I4202967328d317cb8e48341be78b499e3a42516d
Adeel Kazmi [Tue, 25 Oct 2016 20:36:06 +0000 (21:36 +0100)]
Added an example which shows a layout containing animating contact cards
Change-Id: Ic59f2e05275694ed1730628b9a1ac4950a759e3f
Seoyeon Kim [Wed, 9 Nov 2016 04:54:37 +0000 (20:54 -0800)]
Merge "[3.0] Fixed dali-demo keyboard focus and updated appearance" into tizen
David Steele [Tue, 8 Nov 2016 20:15:12 +0000 (20:15 +0000)]
Removed unnecessary SetOnStage for visuals
Change-Id: I21c535e3cef4f68c92917e43d8b8989f27322e25
David Steele [Mon, 7 Nov 2016 13:33:11 +0000 (13:33 +0000)]
Removed use of VisualFactory::InitializeVisual
Styling currently uses InitalizeVisual rather than a CreateVisual and RegisterVisual pair.
We want to eventually remove InitializeVisual, so pre-emptively removing it's use.
Change-Id: I335afadc01060b477dd9420f30b97d3b953c37ea
Signed-off-by: David Steele <david.steele@samsung.com>
Tom Robinson [Fri, 4 Nov 2016 13:15:30 +0000 (13:15 +0000)]
DALi Version 1.2.13
Change-Id: Ia794bccff4f2bc3580f637f3adb7272d1bacadc9
Kimmo Hoikka [Tue, 1 Nov 2016 18:45:00 +0000 (18:45 +0000)]
Remove incorrect placement actor from the RegisterVisual API
Change-Id: I0eed4a040cb86468fb649a062b6d3f2f2b13dbd1
Paul Wisbey [Tue, 1 Nov 2016 11:50:43 +0000 (04:50 -0700)]
Merge "Update json style files with the new 'fontStyle' format." into devel/master
Adeel Kazmi [Fri, 28 Oct 2016 13:21:28 +0000 (06:21 -0700)]
Merge "Fix PageFactory to take in Texture rather than Image" into devel/master
Xiangyin Ma [Fri, 28 Oct 2016 12:18:31 +0000 (13:18 +0100)]
DALi Version 1.2.12
Change-Id: I5b36330fff7f6061ab2b50fe4b769b6321a16c24
Victor Cebollada [Thu, 27 Oct 2016 07:53:34 +0000 (08:53 +0100)]
Update json style files with the new 'fontStyle' format.
* See 'Text - FONT_STYLE and INPUT_FONT_STYLE properties refactor' patch in toolkit.
Change-Id: I2d2312a6ee7acdadc72e2af1ad4875dbc450eaef
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Kimmo Hoikka [Wed, 26 Oct 2016 16:55:59 +0000 (17:55 +0100)]
Fix PageFactory to take in Texture rather than Image
- also remove use of Atlas as that is to be removed
Change-Id: I15dcf8dcda37f01e4c669eb044e3e8eb4fcc1a80
Paul Wisbey [Tue, 25 Oct 2016 10:47:40 +0000 (11:47 +0100)]
Changed README to README.md
Change-Id: I5f2679bf6c2b318aeb027b965a448385a7bb2ef0
Paul Wisbey [Fri, 21 Oct 2016 15:34:10 +0000 (08:34 -0700)]
Merge "Added missing Finnish localization for animated shape demo" into devel/master
Adeel Kazmi [Fri, 21 Oct 2016 14:14:32 +0000 (07:14 -0700)]
Merge "DALi Version 1.2.11" into devel/master
Nick Holland [Fri, 21 Oct 2016 14:09:13 +0000 (15:09 +0100)]
DALi Version 1.2.11
Change-Id: I10887dcbb8e26c52118c1c21b1717a4d99216812
David Steele [Fri, 14 Oct 2016 14:30:50 +0000 (15:30 +0100)]
Added a stylable transition to styling example.
Added Enable / Disable transitions to ImageChannelControl which
can be set via the style sheet.
Added a Visibility attribute to ImageChannelControl which
forces the enable / disable transition to be executed when
the visibility changes.
Added 3 different transitions to the style sheet:
1) a cross fade
2) a longer cross fade
3) a scale change.
Change-Id: I82a1f0e4e4c89ae0bdcb1c59ce01a0a918f17afd
Signed-off-by: David Steele <david.steele@samsung.com>
Kimmo Hoikka [Tue, 18 Oct 2016 15:53:20 +0000 (16:53 +0100)]
Added missing Finnish localization for animated shape demo
Change-Id: I77885a3d1555c8b7403c3f18a4ea30061d198927
Xiangyin Ma [Fri, 14 Oct 2016 17:58:11 +0000 (18:58 +0100)]
[3.0] Remove GetRendererAt() from dali-demo
Change-Id: I6f8981be9fdb5de381449710c32f37f61483aea6
Richard Huang [Fri, 14 Oct 2016 13:17:10 +0000 (14:17 +0100)]
DALi Version 1.2.10
Change-Id: I11b5fd2dc891f4e59f2f8d4231d85a9876bff2af
Agnelo Vaz [Wed, 12 Oct 2016 13:49:22 +0000 (14:49 +0100)]
Builder examples to use Navigation View
Change-Id: Ie0ef016796a0d37b3935278c2dc0977cb18c1769
Adeel Kazmi [Tue, 11 Oct 2016 18:40:17 +0000 (19:40 +0100)]
(Buttons) Ensured check box buttons fill to parent to show the entire text
Change-Id: I1f4ca14ce8ecb0edda7f296572d58a9965351444
Xiangyin Ma [Tue, 11 Oct 2016 13:27:56 +0000 (14:27 +0100)]
Delete the unused header file
Change-Id: Ib15910e572c4a23a49a3a7df805adea5911a32f3
Adeel Kazmi [Mon, 10 Oct 2016 10:45:33 +0000 (03:45 -0700)]
Merge "Replaced gradient image with gradient visual in renderer-stencil.example" into devel/master
Kimmo Hoikka [Fri, 7 Oct 2016 16:40:37 +0000 (09:40 -0700)]
Merge "Size negotiation Example only exits if BACK/ESC is unhandled" into devel/master
Tom Robinson [Fri, 7 Oct 2016 11:21:35 +0000 (12:21 +0100)]
Replaced gradient image with gradient visual in renderer-stencil.example
Change-Id: I395ff7e9f0adf649294ebb913990fdda83ae9fb2
Adeel Kazmi [Fri, 7 Oct 2016 15:38:41 +0000 (08:38 -0700)]
Merge "DALi Version 1.2.9" into devel/master
Ferran Sole [Fri, 7 Oct 2016 15:33:33 +0000 (16:33 +0100)]
DALi Version 1.2.9
Change-Id: I9044f8fcdd0a238d6fe0624cee679c3d6214d814
taeyoon [Fri, 7 Oct 2016 04:39:37 +0000 (21:39 -0700)]
Merge "Remove custom shader from video view example and change video file sample" into devel/master
Adeel Kazmi [Thu, 6 Oct 2016 18:36:53 +0000 (19:36 +0100)]
Size negotiation Example only exits if BACK/ESC is unhandled
Change-Id: Ia11d6ba26ef654ca6c531a169223bc27b4d86e58
Adeel Kazmi [Wed, 5 Oct 2016 18:40:03 +0000 (11:40 -0700)]
Merge "Added animated shapes demo" into devel/master
Tom Robinson [Mon, 3 Oct 2016 10:59:56 +0000 (11:59 +0100)]
Remove GetRendererAt() from dali-demo
Change-Id: Iee240e86e116bf8fb93b07fa5296bbfaac8d77fa
adam.b [Fri, 30 Sep 2016 14:12:00 +0000 (15:12 +0100)]
DALi Version 1.2.8
Change-Id: Id8da8fd00d5b4562d26f0c19b5c49d7439228c0f
taeyoon [Thu, 22 Sep 2016 06:06:48 +0000 (15:06 +0900)]
Remove custom shader from video view example and change video file sample
Later, custom shader part will be added
video sample file should be changed because of license issue
Change-Id: Ib42cc40bfebb4f16785269e20e7106c829532671
Tom Robinson [Fri, 16 Sep 2016 13:50:11 +0000 (14:50 +0100)]
Fixed dali-demo keyboard focus and updated appearance
Change-Id: I771ca7bb8b22d26efabccc35db8aca2956689516
David Steele [Fri, 23 Sep 2016 12:57:29 +0000 (13:57 +0100)]
DALi Version 1.2.7
Change-Id: I3f78b67fd96fe0b60387f032861b261406907f4f
taeyoon [Thu, 22 Sep 2016 06:06:48 +0000 (15:06 +0900)]
[3.0] Remove custom shader from video view example and change video file sample
Change-Id: Ib42cc40bfebb4f16785269e20e7106c829532671
Andrew Poor [Mon, 19 Sep 2016 16:11:11 +0000 (17:11 +0100)]
Primitive shape title and slider granularity.
Change-Id: Id03410e559c061573522e2ff405442eca5f6c6e4
David Steele [Mon, 19 Sep 2016 14:54:09 +0000 (07:54 -0700)]
Merge "Minor demo improvements." into devel/master
Adeel Kazmi [Fri, 16 Sep 2016 17:22:12 +0000 (18:22 +0100)]
[3.0] Changes after PageTurnView moved to Devel API
Change-Id: Id111c28c6be4edc0dd582a34cf6fcd513c034483
Andrew Poor [Fri, 16 Sep 2016 10:34:03 +0000 (11:34 +0100)]
Minor demo improvements.
*The primitive shapes demo has had the buttons scaled down slightly to fit on two lines.
*The text editor demo has had a label added to the color change button, which has itself received a border to highlight the less-visible colours.
Change-Id: I16a69bd381ef0c8c980c0c3681cc47117b2d2786
Adeel Kazmi [Fri, 16 Sep 2016 17:22:12 +0000 (18:22 +0100)]
Changes after PageTurnView moved to Devel API
Change-Id: I3c576c3efe4efb2e765c96ae69ddfa5cae1b6ebd
Tom Robinson [Fri, 16 Sep 2016 13:50:11 +0000 (14:50 +0100)]
[3.0] Fixed dali-demo keyboard focus and updated appearance
Change-Id: I771ca7bb8b22d26efabccc35db8aca2956689516
Adeel Kazmi [Fri, 16 Sep 2016 17:02:57 +0000 (10:02 -0700)]
Merge "Changed the shadow/lights example defaults" into devel/master
David Steele [Thu, 15 Sep 2016 11:58:03 +0000 (12:58 +0100)]
Changed the shadow/lights example defaults
Updated the defaults on the shadow / light example to first
move the light, rather than panning the scene.
Updated the intial orientations to look better.
Change-Id: I8eceb5f536a75fef5e6881987452efb53af6e544
Signed-off-by: David Steele <david.steele@samsung.com>
Agnelo Vaz [Fri, 16 Sep 2016 09:56:11 +0000 (10:56 +0100)]
DALi Version 1.2.6
Change-Id: Ibf9587279b25297ec02853a13e2e911ffff20f14
Kimmo Hoikka [Thu, 15 Sep 2016 15:49:56 +0000 (16:49 +0100)]
Added Finnish translation for DALi demo
Change-Id: I9fc04077340b04e98f80543cb4ba601ff9b835e7
Adeel Kazmi [Thu, 15 Sep 2016 12:32:56 +0000 (13:32 +0100)]
[3.0] Updates after removal of experimental API
Change-Id: Iab968536d94de562cce7fe04940a6a327eeae803
Signed-off-by: Adeel Kazmi <adeel.kazmi@samsung.com>
Adeel Kazmi [Thu, 15 Sep 2016 12:32:56 +0000 (13:32 +0100)]
Updates after removal of experimental API
Change-Id: Iab968536d94de562cce7fe04940a6a327eeae803
Ferran Sole [Mon, 12 Sep 2016 09:44:02 +0000 (10:44 +0100)]
Added animated shapes demo
Change-Id: I7c8915f27798bb7651abb0e0890769a801c012cc
Tom Robinson [Mon, 12 Sep 2016 18:47:34 +0000 (19:47 +0100)]
[3.0] Added bubble effect back in dali-demo (+visual changes)
Change-Id: I1a32d8ce89ea465f4eefee9ce117d0c46b621f79
Tom Robinson [Mon, 12 Sep 2016 18:47:34 +0000 (19:47 +0100)]
Added bubble effect back in dali-demo (+visual changes)
Change-Id: I1a32d8ce89ea465f4eefee9ce117d0c46b621f79
Adeel Kazmi [Fri, 9 Sep 2016 16:39:22 +0000 (09:39 -0700)]
Merge "[3.0] Clipping API feature in Actor" into tizen
Tom Robinson [Fri, 18 Mar 2016 17:28:06 +0000 (17:28 +0000)]
[3.0] Clipping API feature in Actor
A multiple-branch clipping specific demo will be done in a separate patch.
Change-Id: Ie4c776dab8afecd44a278f199752ac3030210098
(cherry picked from commit
35d6ab2be9d4530a468a2c3e6158fa11e820ccbb)
Tom Robinson [Wed, 7 Sep 2016 18:31:24 +0000 (19:31 +0100)]
[3.0] Combine StencilMode and WriteToColorBuffer to RenderMode
Change-Id: I423fa10241eaf3a617f47490aa5484ed54c68594
(cherry picked from commit
d68d9abdb83792e81017f2c960a06cd8ce82a0cd)
Xiangyin Ma [Fri, 9 Sep 2016 13:02:48 +0000 (14:02 +0100)]
DALi Version 1.2.5
Change-Id: I0b89bc59de6fd12a6e082f201947344175cf05e2
Adeel Kazmi [Fri, 9 Sep 2016 12:56:30 +0000 (05:56 -0700)]
Merge "[3.0] Removed 3D layer dependency of Model3dView and Mesh Visual." into tizen
Paul Wisbey [Thu, 8 Sep 2016 18:12:53 +0000 (11:12 -0700)]
Merge "Clipping API feature in Actor" into devel/master
shiva.jm [Tue, 2 Aug 2016 05:54:52 +0000 (11:24 +0530)]
Add Progress Bar Control Demo Application
Change-Id: I9a725b76acc387f114478eb5f0a626e211b285e6
Signed-off-by: shiva.jm <shiva.jm@samsung.com>
Adeel Kazmi [Thu, 8 Sep 2016 17:09:15 +0000 (10:09 -0700)]
Merge "Port the sparkle effect demo" into devel/master
Paul Wisbey [Mon, 5 Sep 2016 09:44:53 +0000 (10:44 +0100)]
Port the sparkle effect demo
(Based on original demo by Xiangyin Ma)
Change-Id: I9ac5d9b9c4cb18a21d0a12fae0225af5527e405e
Tom Robinson [Fri, 18 Mar 2016 17:28:06 +0000 (17:28 +0000)]
Clipping API feature in Actor
A multiple-branch clipping specific demo will be done in a separate patch.
Change-Id: Ie4c776dab8afecd44a278f199752ac3030210098
Kimmo Hoikka [Thu, 8 Sep 2016 13:26:26 +0000 (06:26 -0700)]
Merge "Combine StencilMode and WriteToColorBuffer to RenderMode" into devel/master
Tom Robinson [Wed, 7 Sep 2016 18:31:24 +0000 (19:31 +0100)]
Combine StencilMode and WriteToColorBuffer to RenderMode
Change-Id: I423fa10241eaf3a617f47490aa5484ed54c68594
Andrew Poor [Mon, 5 Sep 2016 16:03:28 +0000 (17:03 +0100)]
[3.0] Removed 3D layer dependency of Model3dView and Mesh Visual.
Change-Id: I7dab8218ad7e63dde58a3ec282d661c299d6421a
Andrew Poor [Thu, 1 Sep 2016 12:01:44 +0000 (13:01 +0100)]
Removed 3D layer dependency of Model3dView and Mesh Visual.
In addition, the use of the deprecated TouchedSignal has been replaced.
Change-Id: Ia2d6999f2d1a86f39dfe4018478d7051746eb108
Tom Robinson [Tue, 30 Aug 2016 12:55:09 +0000 (13:55 +0100)]
[3.0] Remove bubble-effect from dali demo main screen
Change-Id: I73429729dab7d5df1291c95e5cff03bcfdb87218
Victor Cebollada [Wed, 27 Jul 2016 07:09:15 +0000 (08:09 +0100)]
[3.0] Use the input style changed signal to update the gui.
Change-Id: Idc1940ad0e27ec5a20641912d982b3d5865fbc20
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Victor Cebollada [Fri, 2 Sep 2016 14:02:05 +0000 (15:02 +0100)]
DALi Version 1.2.4
Change-Id: I55e08beef18bd0e9e86f436db05fbad8a156bc77
Adeel Kazmi [Tue, 30 Aug 2016 18:43:15 +0000 (11:43 -0700)]
Merge "Fixed up styling following toolkit string comparison" into devel/master
Adeel Kazmi [Tue, 30 Aug 2016 17:13:48 +0000 (10:13 -0700)]
Merge "Rename color property of primitive visual to mixColor." into devel/master
Andrew Poor [Tue, 30 Aug 2016 14:44:57 +0000 (15:44 +0100)]
[3.0] Rename color property of primitive visual to mixColor.
Change-Id: I804af801240be00969e436982760f582e27346e7
Andrew Poor [Tue, 30 Aug 2016 14:41:19 +0000 (15:41 +0100)]
Rename color property of primitive visual to mixColor.
Change-Id: Ifc6d48bd19b6d316db721cf60cf8e29a394d283b
Tom Robinson [Tue, 30 Aug 2016 12:55:09 +0000 (13:55 +0100)]
Remove bubble-effect from dali demo main screen
Change-Id: I73429729dab7d5df1291c95e5cff03bcfdb87218
Umar [Fri, 26 Aug 2016 09:27:39 +0000 (10:27 +0100)]
DALi Version 1.2.3
Change-Id: I72c54936005492b1789a4ad654ed268d34f68519