platform/core/uifw/dali-demo.git
7 years agoMerge branch 'devel/master' into tizen 91/108391/1
Seoyeon Kim [Wed, 4 Jan 2017 07:42:33 +0000 (16:42 +0900)]
Merge branch 'devel/master' into tizen

- Integration 1.2.14 -> 1.2.20 (Version up)

Change-Id: If9f846623edd5af4521e8288ce208607a5cda1d1

7 years agoDALi Version 1.2.20 dali_1.2.20
Adeel Kazmi [Fri, 30 Dec 2016 10:46:06 +0000 (10:46 +0000)]
DALi Version 1.2.20

Change-Id: I0af24652e21f05d456d978193e1bf144915c8574

7 years agoAdded a tooltip example 90/106890/5
Adeel Kazmi [Fri, 23 Dec 2016 10:41:29 +0000 (10:41 +0000)]
Added a tooltip example

Change-Id: I5909a67d2bff74f23c758862198df4da1e6c4627

7 years agoMerge "(Visual Transitions) Ensure all parameters are initialized in the constructor...
Adeel Kazmi [Fri, 16 Dec 2016 15:06:08 +0000 (07:06 -0800)]
Merge "(Visual Transitions) Ensure all parameters are initialized in the constructor" into devel/master

7 years agoMerge "Added Animated Gif example" into devel/master
Adeel Kazmi [Fri, 16 Dec 2016 13:58:03 +0000 (05:58 -0800)]
Merge "Added Animated Gif example" into devel/master

7 years ago(Visual Transitions) Ensure all parameters are initialized in the constructor 63/105463/1
Adeel Kazmi [Fri, 16 Dec 2016 13:40:16 +0000 (13:40 +0000)]
(Visual Transitions) Ensure all parameters are initialized in the constructor

Change-Id: I7ce54d7bee33741b634bb51a5653b4a08e0958bc

7 years agoDALi Version 1.2.19 47/105447/1 dali_1.2.19
Francisco Santos [Fri, 16 Dec 2016 13:20:03 +0000 (13:20 +0000)]
DALi Version 1.2.19

Change-Id: Ifc3362f5bc68a6a8031d2e250cb90f86a0748bf3

7 years agoAdded Animated Gif example 97/104597/5
Xiangyin Ma [Tue, 13 Dec 2016 18:09:30 +0000 (18:09 +0000)]
Added Animated Gif example

Change-Id: I609238663f1ecd1d7925d5388f25e43c7094a294

7 years agoMerge "Custom control transform animation" into devel/master
Adeel Kazmi [Thu, 15 Dec 2016 16:01:55 +0000 (08:01 -0800)]
Merge "Custom control transform animation" into devel/master

7 years agoCustom control transform animation 19/104919/3
David Steele [Tue, 13 Dec 2016 14:54:58 +0000 (14:54 +0000)]
Custom control transform animation

Added a new demo (transitions.example) that shows off animating
transform properties on a visual.

Change-Id: Ic333241f6618dcaf274d0e2ac399e0e5f3ed2a61

7 years agoChange sibbling order of buttons in svg example 20/104920/1
Agnelo Vaz [Wed, 14 Dec 2016 17:58:26 +0000 (17:58 +0000)]
Change sibbling order of buttons in svg example

Change-Id: I93398c5ff1f7dcdd4820cf90ebc11e81fee0fa05

7 years agoPopup buttons made larger to fit text with default point size 05/104205/2
Agnelo Vaz [Mon, 12 Dec 2016 16:18:17 +0000 (16:18 +0000)]
Popup buttons made larger to fit text with default point size

Change-Id: Ib478ca1d24461e6203810429d615af32973b4ef4

7 years agoImageview svg demo to have offset from top of screen 64/103564/3
Agnelo Vaz [Thu, 8 Dec 2016 15:35:04 +0000 (15:35 +0000)]
Imageview svg demo to have offset from top of screen

Styling demo style sheet updates

Change-Id: Id5addc0be74c387b66b9db1132b4429c6a8af4ed

7 years agoUpdating mesh example to work with button upgrade 49/103549/2
Agnelo Vaz [Thu, 8 Dec 2016 15:04:38 +0000 (15:04 +0000)]
Updating mesh example to work with button upgrade

Change-Id: Iddf64b834aec8b5c75317c7dac78404f19346236

7 years agoDALi Version 1.2.18 40/103840/1 dali_1.2.18
Ferran Sole [Fri, 9 Dec 2016 14:35:17 +0000 (14:35 +0000)]
DALi Version 1.2.18

Change-Id: If67b4c290de75d637b0aee8c95b29c197f4eb4ca

7 years agoUpdate the homescreen benchmark to use text visuals. 01/97201/5
Victor Cebollada [Thu, 10 Nov 2016 17:31:46 +0000 (17:31 +0000)]
Update the homescreen benchmark to use text visuals.

Change-Id: I155be5a4dda65b3d8886d30961857f0f9743d592
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
7 years agoDALi Version 1.2.17 80/101980/1 dali_1.2.17
adam.b [Fri, 2 Dec 2016 14:07:53 +0000 (14:07 +0000)]
DALi Version 1.2.17

Change-Id: Ic8e5e8e887553af9317bdc53014c7b9c36b31086

7 years agoRemove DALi Toy as it no longer compiles & refs to ShaderEffect 09/101609/1
Adeel Kazmi [Thu, 1 Dec 2016 15:21:11 +0000 (15:21 +0000)]
Remove DALi Toy as it no longer compiles & refs to ShaderEffect

Change-Id: I650cb43c8a5ad685f62422f5b1977f8dec5e4033

7 years agoMerge "Changes following Allow background property to be set as a URL string" into...
Adeel Kazmi [Wed, 30 Nov 2016 13:56:44 +0000 (05:56 -0800)]
Merge "Changes following Allow background property to be set as a URL string" into devel/master

7 years agoRevert public API changes. Handle methods. 85/98185/4
Victor Cebollada [Wed, 16 Nov 2016 10:37:53 +0000 (10:37 +0000)]
Revert public API changes. Handle methods.

* Use the Handle functions from the devel API.

Change-Id: Ia30bc374e573c9e84ac4162339e31bb1e0b38074
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
7 years agoChanges following Allow background property to be set as a URL string 17/100917/1
Kimmo Hoikka [Tue, 29 Nov 2016 16:52:31 +0000 (16:52 +0000)]
Changes following Allow background property to be set as a URL string

Change-Id: Ia5f1554df7b053252e4185abda89d7dedc3d0d98

7 years agoChanges following "Changed bubble effect to use new texture API" 95/99995/10
Ferran Sole [Thu, 24 Nov 2016 15:43:22 +0000 (15:43 +0000)]
Changes following "Changed bubble effect to use new texture API"

Change-Id: I1e329a43d1d6026bdfe41facd67d8228561ae713

7 years agofixed a svace error 82/100282/1
adam.b [Fri, 25 Nov 2016 14:19:51 +0000 (14:19 +0000)]
fixed a svace error

Change-Id: I9a89e885e2ea1f239319b38c784441c2ea586cfa

7 years agoMerge "Revert public API changes. BATCH property." into devel/master
Adeel Kazmi [Fri, 25 Nov 2016 13:51:38 +0000 (05:51 -0800)]
Merge "Revert public API changes. BATCH property." into devel/master

7 years agoMerge "Add Flexbox demo to the DALI demo launcher" into devel/master
Adeel Kazmi [Fri, 25 Nov 2016 11:14:32 +0000 (03:14 -0800)]
Merge "Add Flexbox demo to the DALI demo launcher" into devel/master

7 years agoRevert public API changes. BATCH property. 15/98115/5
Victor Cebollada [Wed, 16 Nov 2016 07:05:02 +0000 (07:05 +0000)]
Revert public API changes. BATCH property.

* Use the BATCH property from the devel API.

Change-Id: Ic61771c4c27f08257c5d2619a38ca3c7f8524c1c
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
7 years agoDALi Version 1.2.16 41/100141/1 dali_1.2.16
Victor Cebollada [Fri, 25 Nov 2016 07:07:05 +0000 (07:07 +0000)]
DALi Version 1.2.16

Change-Id: Iaa6a15d66618d2726646425964ef608ebcec144f

7 years agoAdd Flexbox demo to the DALI demo launcher 92/99992/3
Richard Huang [Thu, 24 Nov 2016 15:36:54 +0000 (15:36 +0000)]
Add Flexbox demo to the DALI demo launcher

Change-Id: I800e8b95f86d51276c22c802fda754e0a03749e7

7 years agoFixed svace errors and disabled indicator 99/99999/3
adam.b [Thu, 24 Nov 2016 16:23:11 +0000 (16:23 +0000)]
Fixed svace errors and disabled indicator

Change-Id: I0d4ea08dcb13932a8aa7ec21d0b204a2f6f2f791

7 years agoChanges following patch "Visuals - Avoid having 2 devel headers for visual-properties.h" 82/99582/2
Ferran Sole [Wed, 23 Nov 2016 09:31:53 +0000 (09:31 +0000)]
Changes following patch "Visuals - Avoid having 2 devel headers for visual-properties.h"

Change-Id: Ifa99fb377a65b3670da1b4b680aa441a22996bfe

7 years agoAdded a custom style to the popup example 90/99690/2
Adeel Kazmi [Wed, 23 Nov 2016 16:27:27 +0000 (16:27 +0000)]
Added a custom style to the popup example

Change-Id: I60fde090b81f314c68064081effff331c3216128

7 years agoMerge "homescreen benchmark can use buttons" into devel/master
Adeel Kazmi [Wed, 23 Nov 2016 11:15:58 +0000 (03:15 -0800)]
Merge "homescreen benchmark can use buttons" into devel/master

7 years agohomescreen benchmark can use buttons 92/99392/3
Agnelo Vaz [Tue, 22 Nov 2016 16:11:30 +0000 (16:11 +0000)]
homescreen benchmark can use buttons

Added ability for benchmark tool to use checkbox buttons by providing --use-checkbox command line argument

Change-Id: I7ac8c50a3ea594a548b447b3f3b3ec1be6da9bfd

7 years agoExample of First Person 3D game with DALI 56/95556/28
adam.b [Thu, 3 Nov 2016 20:18:03 +0000 (20:18 +0000)]
Example of First Person 3D game with DALI

- Features 3D environment with simple lightmapping
- Multi-touch first person camera control scheme
- Uses free textures on the GPL license ( blendernation )
- Models are custom made
- Tutorial screen made using DALi toolkit controls ( text labels ).
- Uses PicoJSON parser ( https://github.com/kazuho/picojson )

Change-Id: I6e3503608cd22dc63f371132376d475c890a0474

7 years agoDALi Version 1.2.15 29/98729/1 dali_1.2.15
Umar [Fri, 18 Nov 2016 10:58:44 +0000 (10:58 +0000)]
DALi Version 1.2.15

Change-Id: I5136c2c79089ba17749fd9f5672639228e4b8713

8 years agoMerge "Updates for Visual::SetSize removal" into devel/master
Adeel Kazmi [Thu, 17 Nov 2016 12:09:50 +0000 (04:09 -0800)]
Merge "Updates for Visual::SetSize removal" into devel/master

8 years agoMore SVACE fixes 19/98219/1
Adeel Kazmi [Wed, 16 Nov 2016 12:07:31 +0000 (12:07 +0000)]
More SVACE fixes

Change-Id: I340686abda4cca205187157feb2571c86b0878c2

8 years agoUpdates for Visual::SetSize removal 18/98218/1
David Steele [Wed, 16 Nov 2016 11:59:53 +0000 (11:59 +0000)]
Updates for Visual::SetSize removal

Change-Id: I51ffb1db8e8140c67b4b44cf4bb3343a8c23e622
Signed-off-by: David Steele <david.steele@samsung.com>
8 years agoFix various SVACE errors 04/98004/1
Adeel Kazmi [Tue, 15 Nov 2016 15:35:34 +0000 (15:35 +0000)]
Fix various SVACE errors

Change-Id: I2dfed0e2863dfc4eecb3cb86d28968a76ba78836

8 years agoMerge branch 'devel/master' into tizen 24/97824/1 accepted/tizen/common/20161115.201044 accepted/tizen/ivi/20161115.234657 accepted/tizen/mobile/20161115.234506 accepted/tizen/tv/20161115.234548 accepted/tizen/wearable/20161115.234623 submit/tizen/20161115.111846
dongsug.song [Tue, 15 Nov 2016 05:30:28 +0000 (14:30 +0900)]
Merge branch 'devel/master' into tizen

Change-Id: Ia5d2cb474d0295d39dfd797a7d90886facb23d35

8 years agoRevert "[3.0] Version downgrade (1.2.0 to 1.1.45)" 23/97823/1
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

8 years agoRevert "[3.0] Mesh demo improvements for lighting." 22/97822/1
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

8 years agoRevert "[3.0] TextEditor - Update the decoration box's size." 21/97821/1
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

8 years agoRevert "[3.0] Stencil Renderer demo: Toolbar removed" 20/97820/1
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

8 years agoRevert "[3.0] Updated internationalized strings" 19/97819/1
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

8 years agoRevert "[3.0] Moved po directory to resources folder & added missing language strings" 18/97818/1
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

8 years agoRevert "[3.0] Updated demos to remove indicator where appropriate" 17/97817/1
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

8 years agoRevert "[3.0] Added a simple application for testing Styling" 16/97816/1
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

8 years agoRevert "[3.0] Translate the dali-demo titile in Korean" 15/97815/1
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

8 years agoRevert "[3.0] Mesh visual buttons change." 14/97814/1
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

8 years agoRevert "[3.0] Updating .gitignore" 13/97813/1
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

8 years agoRevert "[3.0] Rename color property of primitive visual to mixColor." 12/97812/1
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

8 years agoRevert "[3.0] Use the input style changed signal to update the gui." 11/97811/1
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

8 years agoRevert "[3.0] Remove bubble-effect from dali demo main screen" 10/97810/1
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

8 years agoRevert "[3.0] Removed 3D layer dependency of Model3dView and Mesh Visual." 09/97809/1
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

8 years agoRevert "[3.0] Clipping API feature in Actor" 08/97808/1
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

8 years agoRevert "[3.0] Added bubble effect back in dali-demo (+visual changes)" 07/97807/1
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

8 years agoRevert "[3.0] Updates after removal of experimental API" 06/97806/1
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

8 years agoRevert "[3.0] Changes after PageTurnView moved to Devel API" 05/97805/1
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

8 years agoRevert "[3.0] Remove custom shader from video view example and change video file... 04/97804/1
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

8 years agoRevert "[3.0] Remove GetRendererAt() from dali-demo" 03/97803/1
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

8 years agoRevert "[3.0] Fixed dali-demo keyboard focus and updated appearance" 02/97802/1
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

8 years agoDALi Version 1.2.14 61/97261/1 dali_1.2.14
Adeel Kazmi [Fri, 11 Nov 2016 18:40:33 +0000 (18:40 +0000)]
DALi Version 1.2.14

Change-Id: I4202967328d317cb8e48341be78b499e3a42516d

8 years agoAdded an example which shows a layout containing animating contact cards 66/93766/16
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

8 years agoMerge "[3.0] Fixed dali-demo keyboard focus and updated appearance" into tizen
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

8 years agoRemoved unnecessary SetOnStage for visuals 57/96357/1
David Steele [Tue, 8 Nov 2016 20:15:12 +0000 (20:15 +0000)]
Removed unnecessary SetOnStage for visuals

Change-Id: I21c535e3cef4f68c92917e43d8b8989f27322e25

8 years agoRemoved use of VisualFactory::InitializeVisual 63/96063/1
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>
8 years agoDALi Version 1.2.13 67/95767/1 dali_1.2.13
Tom Robinson [Fri, 4 Nov 2016 13:15:30 +0000 (13:15 +0000)]
DALi Version 1.2.13

Change-Id: Ia794bccff4f2bc3580f637f3adb7272d1bacadc9

8 years agoRemove incorrect placement actor from the RegisterVisual API 74/94874/1
Kimmo Hoikka [Tue, 1 Nov 2016 18:45:00 +0000 (18:45 +0000)]
Remove incorrect placement actor from the RegisterVisual API

Change-Id: I0eed4a040cb86468fb649a062b6d3f2f2b13dbd1

8 years agoMerge "Update json style files with the new 'fontStyle' format." into devel/master
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

8 years agoMerge "Fix PageFactory to take in Texture rather than Image" 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

8 years agoDALi Version 1.2.12 68/94368/1 dali_1.2.12
Xiangyin Ma [Fri, 28 Oct 2016 12:18:31 +0000 (13:18 +0100)]
DALi Version 1.2.12

Change-Id: I5b36330fff7f6061ab2b50fe4b769b6321a16c24

8 years agoUpdate json style files with the new 'fontStyle' format. 62/94162/1
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>
8 years agoFix PageFactory to take in Texture rather than Image 12/94012/2
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

8 years agoChanged README to README.md 15/93715/2
Paul Wisbey [Tue, 25 Oct 2016 10:47:40 +0000 (11:47 +0100)]
Changed README to README.md

Change-Id: I5f2679bf6c2b318aeb027b965a448385a7bb2ef0

8 years agoMerge "Added missing Finnish localization for animated shape demo" into devel/master
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

8 years agoMerge "DALi Version 1.2.11" 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

8 years agoDALi Version 1.2.11 15/93315/1 dali_1.2.11
Nick Holland [Fri, 21 Oct 2016 14:09:13 +0000 (15:09 +0100)]
DALi Version 1.2.11

Change-Id: I10887dcbb8e26c52118c1c21b1717a4d99216812

8 years agoAdded a stylable transition to styling example. 48/92348/8
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>
8 years agoAdded missing Finnish localization for animated shape demo 08/92808/1
Kimmo Hoikka [Tue, 18 Oct 2016 15:53:20 +0000 (16:53 +0100)]
Added missing Finnish localization for animated shape demo

Change-Id: I77885a3d1555c8b7403c3f18a4ea30061d198927

8 years ago[3.0] Remove GetRendererAt() from dali-demo 66/92366/1
Xiangyin Ma [Fri, 14 Oct 2016 17:58:11 +0000 (18:58 +0100)]
[3.0] Remove GetRendererAt() from dali-demo

Change-Id: I6f8981be9fdb5de381449710c32f37f61483aea6

8 years agoDALi Version 1.2.10 31/92331/1 dali_1.2.10
Richard Huang [Fri, 14 Oct 2016 13:17:10 +0000 (14:17 +0100)]
DALi Version 1.2.10

Change-Id: I11b5fd2dc891f4e59f2f8d4231d85a9876bff2af

8 years agoBuilder examples to use Navigation View 11/92011/3
Agnelo Vaz [Wed, 12 Oct 2016 13:49:22 +0000 (14:49 +0100)]
Builder examples to use Navigation View

Change-Id: Ie0ef016796a0d37b3935278c2dc0977cb18c1769

8 years ago(Buttons) Ensured check box buttons fill to parent to show the entire text 37/91837/1
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

8 years agoDelete the unused header file 21/91821/2
Xiangyin Ma [Tue, 11 Oct 2016 13:27:56 +0000 (14:27 +0100)]
Delete the unused header file

Change-Id: Ib15910e572c4a23a49a3a7df805adea5911a32f3

8 years agoMerge "Replaced gradient image with gradient visual in renderer-stencil.example"...
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

8 years agoMerge "Size negotiation Example only exits if BACK/ESC is unhandled" 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

8 years agoReplaced gradient image with gradient visual in renderer-stencil.example 40/91440/2
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

8 years agoMerge "DALi Version 1.2.9" into devel/master
Adeel Kazmi [Fri, 7 Oct 2016 15:38:41 +0000 (08:38 -0700)]
Merge "DALi Version 1.2.9" into devel/master

8 years agoDALi Version 1.2.9 58/91458/1 dali_1.2.9
Ferran Sole [Fri, 7 Oct 2016 15:33:33 +0000 (16:33 +0100)]
DALi Version 1.2.9

Change-Id: I9044f8fcdd0a238d6fe0624cee679c3d6214d814

8 years agoMerge "Remove custom shader from video view example and change video file sample...
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

8 years agoSize negotiation Example only exits if BACK/ESC is unhandled 08/91308/3
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

8 years agoMerge "Added animated shapes demo" into devel/master
Adeel Kazmi [Wed, 5 Oct 2016 18:40:03 +0000 (11:40 -0700)]
Merge "Added animated shapes demo" into devel/master

8 years agoRemove GetRendererAt() from dali-demo 47/90647/5
Tom Robinson [Mon, 3 Oct 2016 10:59:56 +0000 (11:59 +0100)]
Remove GetRendererAt() from dali-demo

Change-Id: Iee240e86e116bf8fb93b07fa5296bbfaac8d77fa

8 years agoDALi Version 1.2.8 80/90580/1 dali_1.2.8
adam.b [Fri, 30 Sep 2016 14:12:00 +0000 (15:12 +0100)]
DALi Version 1.2.8

Change-Id: Id8da8fd00d5b4562d26f0c19b5c49d7439228c0f

8 years agoRemove custom shader from video view example and change video file sample 82/89882/2
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

8 years agoFixed dali-demo keyboard focus and updated appearance 78/88378/3
Tom Robinson [Fri, 16 Sep 2016 13:50:11 +0000 (14:50 +0100)]
Fixed dali-demo keyboard focus and updated appearance

Change-Id: I771ca7bb8b22d26efabccc35db8aca2956689516

8 years agoDALi Version 1.2.7 46/89446/1 dali_1.2.7
David Steele [Fri, 23 Sep 2016 12:57:29 +0000 (13:57 +0100)]
DALi Version 1.2.7

Change-Id: I3f78b67fd96fe0b60387f032861b261406907f4f

8 years ago[3.0] Remove custom shader from video view example and change video file sample 95/89095/1 accepted/tizen/3.0/common/20161114.110133 accepted/tizen/3.0/ivi/20161011.043854 accepted/tizen/3.0/mobile/20161015.032710 accepted/tizen/3.0/tv/20161016.003823 accepted/tizen/3.0/wearable/20161015.081757 accepted/tizen/common/20160922.142736 accepted/tizen/common/20161014.103311 accepted/tizen/ivi/20160923.090339 accepted/tizen/ivi/20161017.013549 accepted/tizen/mobile/20160923.090111 accepted/tizen/mobile/20161017.013355 accepted/tizen/tv/20160923.090206 accepted/tizen/tv/20161017.013436 accepted/tizen/wearable/20160923.090257 accepted/tizen/wearable/20161017.013513 submit/tizen/20160922.140223 submit/tizen/20161014.094936 submit/tizen_3.0_common/20161104.104000 submit/tizen_3.0_ivi/20161010.000001 submit/tizen_3.0_mobile/20161015.000001 submit/tizen_3.0_tv/20161015.000001 submit/tizen_3.0_wearable/20161015.000001
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

8 years agoPrimitive shape title and slider granularity. 69/88769/1
Andrew Poor [Mon, 19 Sep 2016 16:11:11 +0000 (17:11 +0100)]
Primitive shape title and slider granularity.

Change-Id: Id03410e559c061573522e2ff405442eca5f6c6e4