platform/core/uifw/dali-demo.git
7 years ago[3.0] Updated demos to remove indicator where appropriate 83/85283/3
David Steele [Thu, 4 Aug 2016 15:15:19 +0000 (16:15 +0100)]
[3.0] Updated demos to remove indicator where appropriate

Removed indicator from demo toolbar, and from other examples that
don't use toolbar and have a UI at the top of the display.

Change-Id: Ifd3b3c5f916f249f492ff154a0ca28054763ee6e
Signed-off-by: David Steele <david.steele@samsung.com>
7 years ago[3.0] Moved po directory to resources folder & added missing language strings 82/85282/3
Adeel Kazmi [Thu, 4 Aug 2016 12:24:26 +0000 (13:24 +0100)]
[3.0] Moved po directory to resources folder & added missing language strings

Change-Id: Id1199bdf7c72614c9fdb27c16e235b59e0206d04

7 years ago[3.0] Updated internationalized strings 81/85281/3
David Steele [Tue, 2 Aug 2016 10:21:53 +0000 (11:21 +0100)]
[3.0] Updated internationalized strings

Change-Id: I659445f2e0d7d1193abdf1e5b15035cdb401e2e3
Signed-off-by: David Steele <david.steele@samsung.com>
Signed-off-by: Adeel Kazmi <adeel.kazmi@samsung.com>
7 years ago[3.0] Stencil Renderer demo: Toolbar removed 80/85280/3
Tom Robinson [Fri, 29 Jul 2016 15:30:36 +0000 (16:30 +0100)]
[3.0] Stencil Renderer demo: Toolbar removed

Change-Id: I0e61ab6668a28c000571b957e482f1845c3705be

7 years ago[3.0] TextEditor - Update the decoration box's size. 79/85279/3
Victor Cebollada [Thu, 21 Jul 2016 10:46:03 +0000 (11:46 +0100)]
[3.0] TextEditor - Update the decoration box's size.

* Sets the decoration bounding box the size of the text-editor control.
  This prevents the popup to be positioned on top of the virtual keyboard
  or the top bar.

Change-Id: I317d2289e740725b8e39746feeccad5ff664827e
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
7 years ago[3.0] Mesh demo improvements for lighting. 78/85278/2
Andrew Poor [Wed, 27 Jul 2016 08:58:47 +0000 (09:58 +0100)]
[3.0] Mesh demo improvements for lighting.

Change-Id: I6fb94272f1fc562b210c765d79f217d40a611263

7 years ago[3.0] Version downgrade (1.2.0 to 1.1.45) 33/84733/1
taeyoon [Mon, 22 Aug 2016 07:05:55 +0000 (16:05 +0900)]
[3.0] Version downgrade (1.2.0 to 1.1.45)

  Final integration work for tizen 3.0 merged 1.2.0 in tizen branch.
  1.2.0 already includes new features (Public-APIs) for next tizen release.
  For tizen 3.0, we downgrade tizen branch to 1.1.45.

This reverts commit 3daf6de364bc2f66277f6a0fb7eab33973368a13.

Revert "Updated demos to remove indicator where appropriate"

This reverts commit 68084ad1ce68796f9ae1db1cd6692ffaa5d5e3c9.

Revert "Moved po directory to resources folder & added missing language strings"

This reverts commit c83f64b6a2d71d988d4a3299507d2d1277166d8c.

Revert "Batching clean-up"

This reverts commit 799c9609fbd3526e10f180537d35c9391163ff04.

Revert "Updated internationalized strings"

This reverts commit a209b08efcae2a931cf49df65b44577bcff04872.

Revert "Geometry Batching"

This reverts commit 28854be72245e7687daa98e0e2e117d2f669154e.

Revert "Stencil Renderer demo: Toolbar removed"

This reverts commit 58d399c7397a4574dfbfd74793c27ae0ffc1fb65.

Revert "TextEditor - Update the decoration box's size."

This reverts commit a9263c8380f4df40f72d4a084da6b54d676ad5bd.

Revert "Mesh demo improvements for lighting."

This reverts commit 19369b28e77acb7d31e72bae8a35a6a1d8456729.

Change-Id: Idbfcf27432b2e9d9f1e6a1472c649575740508fe

7 years agoMerge branch 'devel/master (1.2.0)' into tizen 13/83213/1
taeyoon [Tue, 9 Aug 2016 12:02:47 +0000 (21:02 +0900)]
Merge branch 'devel/master (1.2.0)' into tizen

Change-Id: Ia802c3b17b32c21222ea6c8d9cd13d6ad6bc99ea

7 years agoRevert "[3.0] Tizen Directory Migration" 11/83211/1
taeyoon [Tue, 9 Aug 2016 12:01:44 +0000 (21:01 +0900)]
Revert "[3.0] Tizen Directory Migration"

This reverts commit 248f642a58732dfd8aa56667affe98528ed10f09.

Change-Id: I8d1c8035be8de3260bf45d99491433137cf5b221

7 years agoDALi Version 1.2.0 71/82771/1 dali_1.2.0
Tom Robinson [Fri, 5 Aug 2016 13:52:18 +0000 (14:52 +0100)]
DALi Version 1.2.0

Change-Id: If90a93fd7eef1e64292e29b696c80777fd431e95

7 years agoMerge "Updated demos to remove indicator where appropriate" into devel/master
Adeel Kazmi [Thu, 4 Aug 2016 15:59:47 +0000 (08:59 -0700)]
Merge "Updated demos to remove indicator where appropriate" into devel/master

7 years agoMerge "Moved po directory to resources folder & added missing language strings" into...
Adeel Kazmi [Thu, 4 Aug 2016 15:51:54 +0000 (08:51 -0700)]
Merge "Moved po directory to resources folder & added missing language strings" into devel/master

7 years agoUpdated demos to remove indicator where appropriate 34/82634/2
David Steele [Thu, 4 Aug 2016 15:15:19 +0000 (16:15 +0100)]
Updated demos to remove indicator where appropriate

Removed indicator from demo toolbar, and from other examples that
don't use toolbar and have a UI at the top of the display.

Change-Id: Ifd3b3c5f916f249f492ff154a0ca28054763ee6e
Signed-off-by: David Steele <david.steele@samsung.com>
7 years agoBatching clean-up 29/82629/1
adam.b [Thu, 4 Aug 2016 13:47:15 +0000 (14:47 +0100)]
Batching clean-up
BATCHING_ENABLED property has been moved to ImageVisual

Change-Id: Ib720deb1722f8959ba2f182babc888321fe70ca5

7 years agoMoved po directory to resources folder & added missing language strings 25/82625/1
Adeel Kazmi [Thu, 4 Aug 2016 12:24:26 +0000 (13:24 +0100)]
Moved po directory to resources folder & added missing language strings

Change-Id: Id1199bdf7c72614c9fdb27c16e235b59e0206d04

7 years agoUpdated internationalized strings 82/82282/5
David Steele [Tue, 2 Aug 2016 10:21:53 +0000 (11:21 +0100)]
Updated internationalized strings

Change-Id: I659445f2e0d7d1193abdf1e5b15035cdb401e2e3
Signed-off-by: David Steele <david.steele@samsung.com>
Signed-off-by: Adeel Kazmi <adeel.kazmi@samsung.com>
7 years agoMerge "Geometry Batching" into devel/master
Paul Wisbey [Wed, 3 Aug 2016 16:01:28 +0000 (09:01 -0700)]
Merge "Geometry Batching" into devel/master

7 years agoGeometry Batching 23/64023/10
Tom Robinson [Mon, 1 Aug 2016 18:04:59 +0000 (19:04 +0100)]
Geometry Batching

A reduction in GL calls can be observed when running the example with the following options for comparison:

DALI_GLES_CALL_TIME=1 DALI_GLES_CALL_TIME_ACCUMULATE=1 homescreen-benchmark.example –disable-icon-labels
&
DALI_GLES_CALL_TIME=1 DALI_GLES_CALL_TIME_ACCUMULATE=1 homescreen-benchmark.example –disable-icon-labels –disable-batching

                 W/O Batching      W/ Batching     % Improvement
Bind buffers       0.00             11.88             N/A
Bind textures      4.03              5.6             -26%
Draw calls        27.31             10.06            +63%
Uniform sets      53.88             10.06            +81%

Note: Larger improvements can be seen when the bottleneck is within the Render thread (instead of Update).

Change-Id: I294665299f2d7d8149563f1ea7fed730aed53da6

7 years agoMerge "Stencil Renderer demo: Toolbar removed" into devel/master
Paul Wisbey [Tue, 2 Aug 2016 16:51:36 +0000 (09:51 -0700)]
Merge "Stencil Renderer demo: Toolbar removed" into devel/master

7 years agoStencil Renderer demo: Toolbar removed 04/82104/3
Tom Robinson [Fri, 29 Jul 2016 15:30:36 +0000 (16:30 +0100)]
Stencil Renderer demo: Toolbar removed

Change-Id: I0e61ab6668a28c000571b957e482f1845c3705be

7 years agoTextEditor - Update the decoration box's size. 38/81038/4
Victor Cebollada [Thu, 21 Jul 2016 10:46:03 +0000 (11:46 +0100)]
TextEditor - Update the decoration box's size.

* Sets the decoration bounding box the size of the text-editor control.
  This prevents the popup to be positioned on top of the virtual keyboard
  or the top bar.

Change-Id: I317d2289e740725b8e39746feeccad5ff664827e
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
7 years agoMesh demo improvements for lighting. 20/81620/6
Andrew Poor [Wed, 27 Jul 2016 08:58:47 +0000 (09:58 +0100)]
Mesh demo improvements for lighting.

Change-Id: I6fb94272f1fc562b210c765d79f217d40a611263

7 years agoDALi Version 1.1.45 09/82109/1 dali_1.1.45
Adeel Kazmi [Fri, 29 Jul 2016 16:12:16 +0000 (17:12 +0100)]
DALi Version 1.1.45

Change-Id: I2c8685ce577c9174057cd4917388a3c620e0777e

7 years agoUpdates following Visual Property Changes 67/81667/3
Adeel Kazmi [Wed, 27 Jul 2016 09:48:12 +0000 (10:48 +0100)]
Updates following Visual Property Changes

Change-Id: Ie5d0a5aa32a0fcee1448f4fb69277d4476048fdd

7 years agoFrameBuffer::Format changed to bit-mask Attachment: Demo 28/81828/2
Tom Robinson [Thu, 28 Jul 2016 13:18:36 +0000 (14:18 +0100)]
FrameBuffer::Format changed to bit-mask Attachment: Demo

Change-Id: Ia6f1c7db32069f80bcaecd562dd487f65702ae22

7 years agoChanges following dali-core patch "Renamed enum Geometry::GeometryType to Geometry... 74/81674/2
Ferran Sole [Wed, 27 Jul 2016 16:16:44 +0000 (17:16 +0100)]
Changes following dali-core patch "Renamed enum Geometry::GeometryType to Geometry::Type"

Change-Id: I6deb28113e55870148a50eea68bb86b3cdc7c014

7 years agoRendering API Stencil Implementation: Demo 08/80808/15
Tom Robinson [Wed, 20 Jul 2016 10:01:25 +0000 (11:01 +0100)]
Rendering API Stencil Implementation: Demo

Change-Id: I36c8f31b4154d743919019d0059db748b1d05e2d

7 years agoModel3DView does not need to set IMAGES_URL when changing model 42/81342/1
Agnelo Vaz [Mon, 25 Jul 2016 13:17:10 +0000 (14:17 +0100)]
Model3DView does not need to set IMAGES_URL when changing model

Change-Id: I8db72bdd61641363dae9548554cdf12c76563a0c

7 years agoMerge "Tizen Directory Migration" into devel/master
Adeel Kazmi [Fri, 22 Jul 2016 16:14:30 +0000 (09:14 -0700)]
Merge "Tizen Directory Migration" into devel/master

7 years agoMerge "Added support for setting light position in mesh renderer." into devel/master
Adeel Kazmi [Fri, 22 Jul 2016 16:08:56 +0000 (09:08 -0700)]
Merge "Added support for setting light position in mesh renderer." into devel/master

7 years agoMerge "DALi Version 1.1.44" into devel/master
Adeel Kazmi [Fri, 22 Jul 2016 16:06:23 +0000 (09:06 -0700)]
Merge "DALi Version 1.1.44" into devel/master

7 years agoDALi Version 1.1.44 05/81205/1 dali_1.1.44
Richard Huang [Fri, 22 Jul 2016 16:00:40 +0000 (17:00 +0100)]
DALi Version 1.1.44

Change-Id: Id4714421a864f5d820ab9095a93c704750fe1394

7 years agoAdded support for setting light position in mesh renderer. 69/79969/11
Andrew Poor [Thu, 7 Jul 2016 14:00:01 +0000 (15:00 +0100)]
Added support for setting light position in mesh renderer.

Change-Id: I1d0298c1e0cd30ac370bc27f45ffe0ade5d2d616

7 years agoNormal-less objects now have their normals calculated so that they can be displayed... 89/81189/1
Andrew Poor [Fri, 22 Jul 2016 13:32:03 +0000 (14:32 +0100)]
Normal-less objects now have their normals calculated so that they can be displayed correctly.

Change-Id: If1d7bd35eaba1cff82f12ea8118b35cf486cfb23

7 years agoRemoving unused control renderer and factory header files 62/81062/1
Agnelo Vaz [Thu, 21 Jul 2016 16:03:47 +0000 (17:03 +0100)]
Removing unused control renderer and factory header files

Change-Id: Ibf0a299acb09a87536d1847ca680ec97aac6e0a7

7 years agoImplemented a primitive shape renderer to display simple shapes like cubes. 34/72834/17
Andrew Poor [Thu, 2 Jun 2016 14:00:29 +0000 (15:00 +0100)]
Implemented a primitive shape renderer to display simple shapes like cubes.

Change-Id: I2431290a111de586f6440f58d17ffb5473f400bf

7 years agoUpdates after Renderer Type values changed 70/80670/1
Adeel Kazmi [Tue, 19 Jul 2016 10:38:26 +0000 (11:38 +0100)]
Updates after Renderer Type values changed

Change-Id: I32c2aa4576413ba56bcdac4376b491125805b0f3

7 years agoUpdates following enum changes to mesh and gradient renderer 36/80536/1
Adeel Kazmi [Mon, 18 Jul 2016 12:43:59 +0000 (13:43 +0100)]
Updates following enum changes to mesh and gradient renderer

Change-Id: I1a885d54a18113547b6af9bb1437d43c21a00de4

7 years agoTizen Directory Migration 11/78111/2
minho.sun [Mon, 4 Jul 2016 09:26:41 +0000 (18:26 +0900)]
Tizen Directory Migration

Change absolute Directories to Tizen paths

Change-Id: I1916835c8a53153663b227aa51f4c075d6d9eb5a
Signed-off-by: minho.sun <minho.sun@samsung.com>
7 years agoDALi Version 1.1.43 60/80260/1 dali_1.1.43
David Steele [Fri, 15 Jul 2016 11:27:22 +0000 (12:27 +0100)]
DALi Version 1.1.43

Change-Id: I24b308353a1507ffd2acf12bd5fb5f1446a03c67

7 years agoMoved Core Rendering API from devel-api to public-api 55/79955/1
Tom Robinson [Wed, 13 Jul 2016 14:04:55 +0000 (15:04 +0100)]
Moved Core Rendering API from devel-api to public-api

Change-Id: I2f8676282ff622eba6f3fd67dd6db11c52d3c260

7 years agoMoved TextureSet::SetImage() to separate devel-api module 25/79525/1
Tom Robinson [Mon, 11 Jul 2016 14:51:41 +0000 (15:51 +0100)]
Moved TextureSet::SetImage() to separate devel-api module

Change-Id: I801d127df7805fb8df6bbaa28fbfeeee46c898a6

7 years agoMerge "Modified native image and compressed texture examples to use new texture....
Paul Wisbey [Mon, 11 Jul 2016 10:29:06 +0000 (03:29 -0700)]
Merge "Modified native image and compressed texture examples to use new texture." into devel/master

7 years agoClean up more ResourceImage Usage 97/79197/4
Xiangyin Ma [Fri, 8 Jul 2016 15:25:40 +0000 (16:25 +0100)]
Clean up more ResourceImage Usage

Change-Id: Iaefcd75232bb19ed72555960bea8732b34e07937

7 years agoMerge "DALi Version 1.1.42" into devel/master
Adeel Kazmi [Fri, 8 Jul 2016 16:52:46 +0000 (09:52 -0700)]
Merge "DALi Version 1.1.42" into devel/master

7 years agoDALi Version 1.1.42 02/79202/1 dali_1.1.42
Agnelo Vaz [Fri, 8 Jul 2016 16:43:49 +0000 (17:43 +0100)]
DALi Version 1.1.42

Change-Id: I2145b5caed787a23e96fa6c8bb1e955da3940555

7 years agoModified native image and compressed texture examples to use new texture. 37/74237/12
Ferran Sole [Mon, 13 Jun 2016 09:42:34 +0000 (10:42 +0100)]
Modified native image and compressed texture examples to use new texture.

* Clean-up some demos to use utility function to create quad with texture coordinates

Change-Id: I35d71cabc4140bdda298c2975f1f682d72a94176

7 years agoReplaced Image with Texture when using cube transition effect. All references to... 50/78750/2
adam.b [Wed, 6 Jul 2016 16:11:57 +0000 (17:11 +0100)]
Replaced Image with Texture when using cube transition effect. All references to the Image type have been removed.

Change-Id: Ibc08cbaf72fa8f0f65bd434998adc17b9a9c7c64

7 years ago(Touch) Remove Usage of TouchEvent 13/78913/2
Adeel Kazmi [Thu, 7 Jul 2016 09:01:53 +0000 (10:01 +0100)]
(Touch) Remove Usage of TouchEvent

Change-Id: Ie09429854a2dd9cd8aa9e4bc506f41cd41374f7f

7 years ago[3.0] Tizen Directory Migration 04/78504/1 accepted/tizen/common/20160711.170643 accepted/tizen/ivi/20160711.084839 accepted/tizen/mobile/20160711.084917 accepted/tizen/tv/20160711.084711 accepted/tizen/wearable/20160711.084759 submit/tizen/20160711.050618
minho.sun [Wed, 6 Jul 2016 00:58:38 +0000 (09:58 +0900)]
[3.0] Tizen Directory Migration

Change absolute Directories to Tizen paths

Signed-off-by: minho.sun <minho.sun@samsung.com>
Change-Id: I377dbf0829ef0c7ee6ab5c01addbc74bc0238452

7 years agoRemove ResourceImage usage from demos 96/76096/10
Xiangyin Ma [Wed, 22 Jun 2016 17:36:42 +0000 (18:36 +0100)]
Remove ResourceImage usage from demos

Change-Id: I48be2cb5c069cfa59e768291b1c128567d5835e0

7 years agoDALi Version 1.1.41 19/77919/1 dali_1.1.41
adam.b [Fri, 1 Jul 2016 13:28:56 +0000 (14:28 +0100)]
DALi Version 1.1.41

Change-Id: Ia63e74177bc97db37f9335e0395f06867e77e40e

7 years agoMerge "Mesh demo improvements." into devel/master
Adeel Kazmi [Thu, 30 Jun 2016 11:46:09 +0000 (04:46 -0700)]
Merge "Mesh demo improvements." into devel/master

7 years agoMesh demo improvements. 88/77388/1
Andrew Poor [Wed, 29 Jun 2016 12:50:16 +0000 (13:50 +0100)]
Mesh demo improvements.

Change-Id: I605525a41398bedf5db8675719d4d32475517f03

7 years agoChanges following "Added support for compressed texture upload to Render::NewTexture" 27/77127/1
Ferran Sole [Tue, 28 Jun 2016 15:56:40 +0000 (16:56 +0100)]
Changes following "Added support for compressed texture upload to Render::NewTexture"

Change-Id: I3d25317e94d22389e94b4afd91bebedaca23b5b9

7 years agoDALi Version 1.1.40 51/76551/1 dali_1.1.40
Victor Cebollada [Fri, 24 Jun 2016 07:42:17 +0000 (08:42 +0100)]
DALi Version 1.1.40

Change-Id: If3b73c0ba23ecc9c0a6dbdd0d8bc08ae0f319439
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
7 years agoImplemented a mesh renderer to display 3D objects from files. 33/72833/16
Andrew Poor [Thu, 2 Jun 2016 13:54:12 +0000 (14:54 +0100)]
Implemented a mesh renderer to display 3D objects from files.

Change-Id: I0a9992e6750db54c55f0e40c9e9005875aab6366

7 years agoMerge branch 'devel/master(1.1.39)' into tizen 19/75419/1 accepted/tizen/common/20160620.163535 accepted/tizen/common/20160624.134211 accepted/tizen/ivi/20160620.082235 accepted/tizen/ivi/20160624.103115 accepted/tizen/mobile/20160620.082058 accepted/tizen/mobile/20160624.102956 accepted/tizen/tv/20160620.082133 accepted/tizen/tv/20160624.103022 accepted/tizen/wearable/20160620.082203 accepted/tizen/wearable/20160624.103049 submit/tizen/20160618.115218 submit/tizen/20160624.043400
taeyoon [Sat, 18 Jun 2016 05:08:48 +0000 (14:08 +0900)]
Merge branch 'devel/master(1.1.39)' into tizen

Change-Id: I7076a16a94447bccc18042662f1f92812a22a515

7 years agoDALi Version 1.1.39 26/75326/1 dali_1.1.39
Adeel Kazmi [Fri, 17 Jun 2016 10:43:44 +0000 (11:43 +0100)]
DALi Version 1.1.39

Change-Id: Ib8835de4bd9a0ed029b3bfbc5c7151fe10f1fddc

7 years agoUpdated demo following Slider move to the public API 48/70948/6
Seoyeon Kim [Mon, 23 May 2016 10:28:02 +0000 (19:28 +0900)]
Updated demo following Slider move to the public API

Change-Id: I33bbf86c1ae35d8b55f4b5c3d8d83d27503c2ecc
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
7 years agoSample for video view control 50/68050/18
taeyoon [Mon, 2 May 2016 04:44:19 +0000 (13:44 +0900)]
Sample for video view control

  Add a sample for video view control
  - Playback, custom shader

Change-Id: Ie1527d63f2cff681cac7405b0e45624028e1f095

7 years agoUse new touch signal & image-view URL specified as a string 40/74240/1
Adeel Kazmi [Mon, 13 Jun 2016 09:52:54 +0000 (10:52 +0100)]
Use new touch signal & image-view URL specified as a string

Change-Id: Ied59238560a6e49f4ed60b437a0225cf07e425ea

7 years agoDALi Version 1.1.38 16/74016/1 dali_1.1.38
Xiangyin Ma [Fri, 10 Jun 2016 10:48:29 +0000 (11:48 +0100)]
DALi Version 1.1.38

Change-Id: I95d6919dd7424729bc644f62824bbac515aebe20

7 years agoMerge "Updata Atlas example following the PixelData change" into devel/master
Kimmo Hoikka [Fri, 3 Jun 2016 16:13:24 +0000 (09:13 -0700)]
Merge "Updata Atlas example following the PixelData change" into devel/master

7 years agoDALi Version 1.1.37 15/73015/1 dali_1.1.37
Tom Robinson [Fri, 3 Jun 2016 13:33:47 +0000 (14:33 +0100)]
DALi Version 1.1.37

Change-Id: Iff23fa6ef913948b6e8deef296375c6cddde567e

7 years agoUpdata Atlas example following the PixelData change 08/71708/3
Xiangyin Ma [Thu, 26 May 2016 15:54:12 +0000 (16:54 +0100)]
Updata Atlas example following the PixelData change

Change-Id: I3e37cc6dcfddc9cfc092b6b9aa68f9d4b932b71f

7 years agoMerge "Simple TextEditor demo." into devel/master
Paul Wisbey [Thu, 2 Jun 2016 17:03:08 +0000 (10:03 -0700)]
Merge "Simple TextEditor demo." into devel/master

7 years agoSimple TextEditor demo. 37/72837/1
Victor Cebollada [Thu, 2 Jun 2016 14:31:16 +0000 (15:31 +0100)]
Simple TextEditor demo.

Change-Id: I6d36b8cc0c9ca9ce91def537024b1fdb8ac94bf9
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
7 years agoUse new TouchData API 34/71934/2
Adeel Kazmi [Fri, 27 May 2016 16:07:19 +0000 (17:07 +0100)]
Use new TouchData API

Change-Id: Ia8cc676eeb95ec2673995026cddca8850693d04e

7 years agoMerge branch 'devel/master' into tizen 87/72287/1 accepted/tizen/common/20160613.144902 accepted/tizen/ivi/20160614.041531 accepted/tizen/mobile/20160614.041453 accepted/tizen/tv/20160614.041427 accepted/tizen/wearable/20160614.041606 submit/tizen/20160613.053509 submit/tizen/20160613.224145
suhyung Eom [Tue, 31 May 2016 09:33:50 +0000 (18:33 +0900)]
Merge branch 'devel/master' into tizen

Change-Id: I5b76cfa3207618e58c716a0543f47a69cb0d4de5

7 years agoDALi Version 1.1.36 93/71893/1 dali_1.1.36
Richard Huang [Fri, 27 May 2016 11:21:18 +0000 (12:21 +0100)]
DALi Version 1.1.36

Change-Id: I58c976327fa95fc9e1273936e0545244f05261db

7 years agoUse sync image loading in text scrolling example 29/71029/4
Xiangyin Ma [Mon, 23 May 2016 16:22:09 +0000 (17:22 +0100)]
Use sync image loading in text scrolling example

Change-Id: I1a9bd9116c491f158fd2a1bf64657a5123376407

7 years agoAllows debug builds to be enabled for GBS & Ubuntu builds 41/71241/3
Tom Robinson [Tue, 24 May 2016 15:03:12 +0000 (16:03 +0100)]
Allows debug builds to be enabled for GBS & Ubuntu builds

You can now enable a debug build of DALi via GBS by adding the following to your GBS build line:

--define "%enable_debug 1"

Details in README file.

Change-Id: Ie587690ac1871d17905e83b70ce251d64f88dff2

7 years agoDALi Version 1.1.35 53/70753/1 dali_1.1.35
Nick Holland [Fri, 20 May 2016 10:17:50 +0000 (11:17 +0100)]
DALi Version 1.1.35

Change-Id: If8b46cadc3ef249ad52da2c0b92618717e9f0cc4

7 years agoMake FlexContainer as public API 62/68962/2
Richard Huang [Tue, 10 May 2016 15:17:19 +0000 (16:17 +0100)]
Make FlexContainer as public API

Change-Id: Id10551f78b22606e3e9002bda5f508feeaae1e47

7 years agoSupport for child properties registration in FlexContainer 81/70181/1
Richard Huang [Wed, 18 May 2016 12:23:56 +0000 (13:23 +0100)]
Support for child properties registration in FlexContainer

Change-Id: I12e45bcce115a5e78ca60bf88b1183f2bdebe873

7 years agoMerge branch 'devel/master' into tizen 24/71024/1 accepted/tizen/common/20160524.150524 accepted/tizen/common/20160525.160509 accepted/tizen/ivi/20160525.062209 accepted/tizen/ivi/20160526.003816 accepted/tizen/mobile/20160525.062309 accepted/tizen/mobile/20160526.003648 accepted/tizen/tv/20160525.062140 accepted/tizen/tv/20160526.003723 accepted/tizen/wearable/20160525.062236 accepted/tizen/wearable/20160526.003748 submit/tizen/20160524.015112 submit/tizen/20160525.015808 submit/tizen/20160525.140602
minho.sun [Wed, 18 May 2016 02:15:06 +0000 (11:15 +0900)]
Merge branch 'devel/master' into tizen

Change-Id: I8b916a6a9e3be55c66f09930df4c9155f0695589

7 years agoMerge "Text Message Field example changed to a Text Scrolling demo" into devel/master
Adeel Kazmi [Fri, 13 May 2016 14:35:01 +0000 (07:35 -0700)]
Merge "Text Message Field example changed to a Text Scrolling demo" into devel/master

7 years agoText Message Field example changed to a Text Scrolling demo 07/68907/5
Agnelo Vaz [Tue, 10 May 2016 09:12:24 +0000 (10:12 +0100)]
Text Message Field example changed to a Text Scrolling demo

Shows text labels scrolling with large/small text and rtl and ltr text.

TextField can scroll to top of screen, demonstrates the Popup positioning when space restricted

Change-Id: I48b2f4b1510ff1b7cc0d13dcccb8ead516c2772c

7 years agoDALi Version 1.1.34 96/69496/1 dali_1.1.34
Ferran Sole [Fri, 13 May 2016 10:54:59 +0000 (11:54 +0100)]
DALi Version 1.1.34

Change-Id: I7cd9fef39a259a267b577e2e877f3a324f400390

7 years agoItemView - Shows how to use the "stopScrolling" action. 36/69236/3
Victor Cebollada [Thu, 12 May 2016 08:28:49 +0000 (09:28 +0100)]
ItemView - Shows how to use the "stopScrolling" action.

* Do a long press on the item-view.
* The item-view will scroll towards the last item for 5 seconds
  if the touch point is in the bottom half of the screen or to
  the first item otherwise.
* If the long press is cancelled, the animation finishes.

Change-Id: I523bc992953d3d3a0ba3bd292598b77042955cdf
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
7 years agoDALi Version 1.1.33 78/68578/1 dali_1.1.33
David Steele [Fri, 6 May 2016 14:47:35 +0000 (15:47 +0100)]
DALi Version 1.1.33

Change-Id: Idd1a1e272dadcb1719f4b7f31536e00e91276264

7 years agoMerge branch 'devel/master' into tizen 86/68386/1 accepted/tizen/common/20160509.135208 accepted/tizen/ivi/20160510.002649 accepted/tizen/mobile/20160510.002552 accepted/tizen/tv/20160510.002617 accepted/tizen/wearable/20160510.002523 submit/tizen/20160509.092357
dongsug.song [Wed, 4 May 2016 00:09:16 +0000 (09:09 +0900)]
Merge branch 'devel/master' into tizen

Change-Id: Ie7b8cfa4cd8adee13b52fd3bb3ad09fa39bdd1fe
Signed-off-by: dongsug.song <dongsug.song@samsung.com>
8 years agoBlending enum clean-up 11/67011/5
Paul Wisbey [Fri, 22 Apr 2016 13:04:01 +0000 (14:04 +0100)]
Blending enum clean-up

We were previously using a mixture of BLEND and BLENDING in enums.
The order of the BLEND_FACTOR enums & string names was also inconsistent.

As a rule of thumb always use Blend & BLEND for namespaces & enums/constants
(not Blending or BLENDING)

Change-Id: Ia4dd6483edc56e9736436e7aa8545b40f999ba47

8 years agoDALi Version 1.1.32 27/67927/1 dali_1.1.32
Agnelo Vaz [Fri, 29 Apr 2016 08:10:56 +0000 (09:10 +0100)]
DALi Version 1.1.32

Change-Id: Icda20718f0353032008902e333192863d5e7d3f5

8 years agoMerge "Updated demos following StyleManager move to the public API" into devel/master
Adeel Kazmi [Thu, 28 Apr 2016 12:42:01 +0000 (05:42 -0700)]
Merge "Updated demos following StyleManager move to the public API" into devel/master

8 years agoStop using ImageActor in Json files 08/66408/4
Xiangyin Ma [Mon, 18 Apr 2016 17:48:57 +0000 (18:48 +0100)]
Stop using ImageActor in Json files

Change-Id: Ia032845f8db6dc457b940500c453930e8b588207

8 years agoline-mesh-demo using setIndexRange(). When changing mode it doesn't recreate the... 93/66593/5
Adam Bialogonski [Tue, 19 Apr 2016 15:10:28 +0000 (16:10 +0100)]
line-mesh-demo using setIndexRange(). When changing mode it doesn't recreate the index buffer, but changes the range of indices to draw and the type of primitives.

added interface to modify number of used elements from the elements array.

Change-Id: If0b223e6ace3d64aae8f16af0a284a42a7c9d967

8 years agoUpdated demos following StyleManager move to the public API 59/67459/3
David Steele [Tue, 26 Apr 2016 14:23:07 +0000 (15:23 +0100)]
Updated demos following StyleManager move to the public API

Change-Id: I988e00a3a2d36ec6f9f9341443c500f03aa70c72
Signed-off-by: David Steele <david.steele@samsung.com>
8 years agoChanges following "Remove geometry scvene object" 47/66747/6
Ferran Sole [Wed, 20 Apr 2016 15:11:56 +0000 (16:11 +0100)]
Changes following "Remove geometry scvene object"

Change-Id: I8138d652252f76ef24becc0fcfce3cef15321cad

8 years agoupdate following the changes of the ControlRenderer property names 80/66880/2
Xiangyin Ma [Thu, 21 Apr 2016 16:15:23 +0000 (17:15 +0100)]
update following the changes of the ControlRenderer property names

Change-Id: I2aea5bcde8b3a1a4b2bebdcb9ad525ed87a9847a

8 years agoDALi Version 1.1.31 70/66970/1 dali_1.1.31
Adeel Kazmi [Fri, 22 Apr 2016 09:08:06 +0000 (10:08 +0100)]
DALi Version 1.1.31

Change-Id: I8321e948b6f85990f62c98855bfde433045f432e

8 years agoWorking... Add missed tag and fix launch issue 47/66647/2
taeyoon [Wed, 20 Apr 2016 04:20:21 +0000 (13:20 +0900)]
Working... Add missed tag and fix launch issue

  - Fix mismatch between <ui...> and </ui..>
  - Add DALI_EXPORT_API
  TODO> Example launch issue in dali-demo

Change-Id: I3c685d79c725e08d3798eb9e906734effd1a2fd0

8 years agoMerge branch 'devel/master' into tizen 42/66642/1 accepted/tizen/common/20160427.144413 accepted/tizen/ivi/20160428.002736 accepted/tizen/mobile/20160428.004958 accepted/tizen/tv/20160428.002537 accepted/tizen/wearable/20160428.002827 submit/tizen/20160427.082119
Seoyeon Kim [Wed, 20 Apr 2016 05:20:36 +0000 (14:20 +0900)]
Merge branch 'devel/master' into tizen

Change-Id: I8ea2d92322c8f9713328930cd3343c00573d21a8

8 years agoRevert "[3.0] add perf-scroll sample" 41/66641/1
Seoyeon Kim [Wed, 20 Apr 2016 05:19:01 +0000 (14:19 +0900)]
Revert "[3.0] add perf-scroll sample"

This reverts commit 683256773411415423a61e85c9abdd3efac0cc5b.

Change-Id: I7d934143d9765882c1817893a840f170f791f92b

8 years agoMerge "add perf-scroll sample" into devel/master
minho.sun [Wed, 20 Apr 2016 01:32:00 +0000 (18:32 -0700)]
Merge "add perf-scroll sample" into devel/master

8 years agoMerge "Flexbox Demo to demonstrates a proof of concept for FlexContainer UI control...
Kimmo Hoikka [Tue, 19 Apr 2016 16:01:29 +0000 (09:01 -0700)]
Merge "Flexbox Demo to demonstrates a proof of concept for FlexContainer UI control" into devel/master

8 years agoFix a typo of EffectsView example 39/66539/1
Xiangyin Ma [Tue, 19 Apr 2016 10:30:04 +0000 (11:30 +0100)]
Fix a typo of EffectsView example

Change-Id: I5639464418baffc593106dbb95a78b39e438aaf4

8 years agoadd perf-scroll sample 85/64085/5
minho.sun [Wed, 30 Mar 2016 03:53:31 +0000 (12:53 +0900)]
add perf-scroll sample

add perf-scroll sample for measuring performance on tizen target.

you can use two options.

--use-mesh  :  use "mesh" to make images.( use imageView by default )
-t30        :  set duration.( In this case, duration will be 30 second )

Change-Id: Ib2caca45bed12a62e3e9d6b57fb240aa21579e0c

8 years ago[3.0] add perf-scroll sample 29/66429/1
minho.sun [Wed, 30 Mar 2016 03:53:31 +0000 (12:53 +0900)]
[3.0] add perf-scroll sample

add perf-scroll sample for measuring performance on tizen target.

you can use two options.

--use-mesh  :  use "mesh" to make images.( use imageView by default )
-t30        :  set duration.( In this case, duration will be 30 second )

Change-Id: Iaf6dd8dcc4d2a3481ea15c47115d7b9387319bd0