platform/core/uifw/dali-demo.git
9 years agoAdded key event handling to image-view-example 34/50734/1
Ferran Sole [Fri, 30 Oct 2015 11:07:37 +0000 (11:07 +0000)]
Added key event handling to image-view-example

To allow quitting example with escape or back key

Change-Id: Icaa30d4991ee2f65e8c10e4fc136f52de05168cd

9 years agoDALi Version 1.1.8 10/50510/1 dali_1.1.8
Nick Holland [Thu, 29 Oct 2015 10:32:02 +0000 (10:32 +0000)]
DALi Version 1.1.8

Change-Id: Ia37d31f8d4e4b0f1d54a9da109c8e0bd159191a6

9 years agoMerge "Adding Image View example demostrating changing, adding and removing ImageView...
Kimmo Hoikka [Tue, 27 Oct 2015 14:29:15 +0000 (07:29 -0700)]
Merge "Adding Image View example demostrating changing, adding and removing ImageViews." into devel/master

9 years agoMerge "Changed Cube Transition example to use new CubeTransitionEffect." into devel...
Kimmo Hoikka [Tue, 27 Oct 2015 14:25:06 +0000 (07:25 -0700)]
Merge "Changed Cube Transition example to use new CubeTransitionEffect." into devel/master

9 years agoChanged Cube Transition example to use new CubeTransitionEffect. 45/50045/2
Chu Hoang [Wed, 21 Oct 2015 09:01:22 +0000 (10:01 +0100)]
Changed Cube Transition example to use new CubeTransitionEffect.

Change-Id: I93d0cede01c9afd0239ba0230cd082ee4acacd25

9 years agoAdding Image View example demostrating changing, adding and removing ImageViews. 31/46731/20
Chu Hoang [Tue, 25 Aug 2015 10:27:09 +0000 (11:27 +0100)]
Adding Image View example demostrating changing, adding and removing ImageViews.

Change-Id: I4a0238a90a26201086e412369da0170435e1a86b

9 years agoFixed benchmark example comment about flag names. 13/50113/2
Chu Hoang [Fri, 23 Oct 2015 14:25:39 +0000 (15:25 +0100)]
Fixed benchmark example comment about flag names.

Change-Id: Id633e6b967f901734d12643f6693ba20759988fc

9 years agoMerge "DALi Version 1.1.7" into devel/master
Adeel Kazmi [Fri, 23 Oct 2015 14:19:27 +0000 (07:19 -0700)]
Merge "DALi Version 1.1.7" into devel/master

9 years agoMerge "Changed Shadow example to use ImageView." into devel/master
Kimmo Hoikka [Fri, 23 Oct 2015 13:05:07 +0000 (06:05 -0700)]
Merge "Changed Shadow example to use ImageView." into devel/master

9 years agoDALi Version 1.1.7 36/50036/1 dali_1.1.7
Lee Morgan [Fri, 23 Oct 2015 10:00:44 +0000 (11:00 +0100)]
DALi Version 1.1.7

Change-Id: I6a31b30255d5a0d53d17ac8d2d75dba1539617b0

9 years agoChanged Shadow example to use ImageView. 60/49660/2
Chu Hoang [Fri, 16 Oct 2015 15:08:21 +0000 (16:08 +0100)]
Changed Shadow example to use ImageView.

Change-Id: Id5e73e4214bc1c88d66bf89d5f50da5a7f9be01b

9 years agoRemoval of more ImageActor usage from examples. 16/49616/9
Chu Hoang [Thu, 15 Oct 2015 14:19:20 +0000 (15:19 +0100)]
Removal of more ImageActor usage from examples.

Change-Id: I85a641655c2a1f1691fd53a217ee1600d5a45165

9 years agoRemoved more ImageActor usage from dali-demo. 30/49330/3
Chu Hoang [Mon, 12 Oct 2015 15:26:24 +0000 (16:26 +0100)]
Removed more ImageActor usage from dali-demo.

Change-Id: If925dd14b7f6091136ec4fdd0c879c53ee43a1ff

9 years agoMerge "Changed benchmark example to use image urls directly when creating ImageViews...
Kimmo Hoikka [Wed, 14 Oct 2015 09:36:21 +0000 (02:36 -0700)]
Merge "Changed benchmark example to use image urls directly when creating ImageViews." into devel/master

9 years agoChanged benchmark example to use image urls directly when creating ImageViews. 68/49468/1
Chu Hoang [Tue, 13 Oct 2015 13:33:24 +0000 (14:33 +0100)]
Changed benchmark example to use image urls directly when creating ImageViews.

Change-Id: Ie6e970a2df6812d1a0daea4758159c98eebe487d

9 years agoChanges following "Remove Sampler scene object" 54/49154/3
Ferran Sole [Wed, 7 Oct 2015 09:23:22 +0000 (10:23 +0100)]
Changes following "Remove Sampler scene object"

Change-Id: I5c99b4c1b27d0f3b8fc8102620f5f8e6e90f399b

9 years agoRemove some dead code from dali-demo 15/49315/3
Kimmo Hoikka [Mon, 12 Oct 2015 12:26:19 +0000 (13:26 +0100)]
Remove some dead code from dali-demo

Change-Id: Ia265405b98d66d6c45fcff7d157a62c45b93b198

9 years agoDALi Version 1.1.6 32/49232/1 dali_1.1.6
Tom Robinson [Fri, 9 Oct 2015 09:48:51 +0000 (10:48 +0100)]
DALi Version 1.1.6

Change-Id: Ia0cd02c19c09302aaf71e311c9630b70f0b0d998

9 years agoMerge "Another change to Image Scaling Irregular Grid example to not use deprecated...
Kimmo Hoikka [Mon, 5 Oct 2015 13:17:50 +0000 (06:17 -0700)]
Merge "Another change to Image Scaling Irregular Grid example to not use deprecated ImageView::GetImage method." into devel/master

9 years agoAnother change to Image Scaling Irregular Grid example to not use deprecated ImageVie... 06/48606/2
Chu Hoang [Wed, 23 Sep 2015 13:40:26 +0000 (14:40 +0100)]
Another change to Image Scaling Irregular Grid example to not use deprecated ImageView::GetImage method.

Change-Id: I9d1ff6792eb7b664c9453f2f25ee5cc180754268

9 years agoChange the colors in demo laucher 92/48992/2
Xiangyin Ma [Fri, 2 Oct 2015 17:46:07 +0000 (18:46 +0100)]
Change the colors in demo laucher

Change-Id: I5dbe51d7bd65a18fc150acadd4d8ffe15b9c5546

9 years agoMerge "Added nine patch images to Benchmark example." into devel/master
Kimmo Hoikka [Mon, 5 Oct 2015 09:47:00 +0000 (02:47 -0700)]
Merge "Added nine patch images to Benchmark example." into devel/master

9 years agoAdded nine patch images to Benchmark example. 89/48989/2
Chu Hoang [Fri, 2 Oct 2015 14:05:40 +0000 (15:05 +0100)]
Added nine patch images to Benchmark example.

use the --use-ninepatch command flag to use nine patch images.

Change-Id: Ie14eacdf938066343a1d75f6738a3c1dd65a7e81

9 years agoAdded demo of color gradients 70/48970/3
Xiangyin Ma [Fri, 2 Oct 2015 09:32:20 +0000 (10:32 +0100)]
Added demo of color gradients

Change-Id: I9d1467c53e20d278084499c201b138047d590448

9 years agoAdded demo to compare performance between ImageActor and ImageView 38/48738/3
Ferran Sole [Fri, 25 Sep 2015 14:28:30 +0000 (15:28 +0100)]
Added demo to compare performance between ImageActor and ImageView

By default, the application consist of 10 pages of 25x25 ImageActors.

The default values can be modified using the following command line arguments:
 -r NumberOfRows  (Modifies the number of rows per page)
 -c NumberOfColumns (Modifies the number of columns per page)
 -p NumberOfPages (Modifies the nimber of pages )
 --use-imageview ( Use ImageView instead of ImageActor )
 --use-mesh ( Use new renderer API (as ImageView) but shares renderers between actors when possible )

Change-Id: I8a54bd713672433a6f80726972f15d698509dbbe

9 years agoDALi Version 1.1.5 76/48976/1 dali_1.1.5
Chu Hoang [Fri, 2 Oct 2015 09:38:55 +0000 (10:38 +0100)]
DALi Version 1.1.5

Change-Id: I9cbeacbec2990011a1c770608e7cff45e2bd6bb2

9 years agoChanged Dissolve effect to use new custom shaders. 90/48790/5
Chu Hoang [Tue, 29 Sep 2015 14:53:40 +0000 (15:53 +0100)]
Changed Dissolve effect to use new custom shaders.

Change-Id: I6fe378deddef85558569c8b4d323ddbb79f6421b

9 years agoSet launcher background from stylesheet 84/48684/5
Xiangyin Ma [Thu, 24 Sep 2015 16:16:33 +0000 (17:16 +0100)]
Set launcher background from stylesheet

Change-Id: I3bb7ab3711311431cd0cbff0abc2cfdd11ee616d

9 years agoBug fix: Image Scaling Grid example doesn't show "crossbars" 41/48841/1
Ferran Sole [Wed, 30 Sep 2015 11:06:46 +0000 (12:06 +0100)]
Bug fix: Image Scaling Grid example doesn't show "crossbars"

Change-Id: I9dbf15948401036c144535596960b4b2271fc489

9 years agoBug fix: ItemView example's multiple selection checkbox renders below the image 75/48775/3
Ferran Sole [Tue, 29 Sep 2015 09:42:16 +0000 (10:42 +0100)]
Bug fix: ItemView example's multiple selection checkbox renders below the image

Also fixes a bug where the checkbox of the first items was not being rendered

Change-Id: I7d6b9edec90f1997dc1e9baab0c911e4bb5d74ff

9 years agoText-Font example added 41/48741/4
Agnelo Vaz [Fri, 25 Sep 2015 15:59:21 +0000 (16:59 +0100)]
Text-Font example added

* Added to test Font setting via Property system and system font changes.
* 3 Initial TextLabels;
    first has no font set,
    second is set via the demo json style sheet,
    third is set via the SetProperty in code.
  Only the first should change when the system font changes to a different font
* Pressing button creates a new TextLabel with the system font

Change-Id: I9291797ba357979d9b3d85ab0d3a30a3fbd6c497
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
9 years agoMerge "Fixed texture mesh example after changed uniform precedence." into devel/master
Kimmo Hoikka [Fri, 25 Sep 2015 14:35:33 +0000 (07:35 -0700)]
Merge "Fixed texture mesh example after changed uniform precedence." into devel/master

9 years agoDALi Version 1.1.4 14/48714/1 dali_1.1.4
Adeel Kazmi [Fri, 25 Sep 2015 07:46:14 +0000 (08:46 +0100)]
DALi Version 1.1.4

Change-Id: I92e974a578824d940629dd2ff1f6b32f260f29df

9 years agoFixed texture mesh example after changed uniform precedence. 93/48593/1
Ferran Sole [Wed, 23 Sep 2015 09:35:57 +0000 (10:35 +0100)]
Fixed texture mesh example after changed uniform precedence.

Now actor's properties have precedence over Renderers properties as uniforms

Change-Id: Ie893579e3d59bfa4bc4b1b99939b0bf236c2efdd

9 years agoChanged Image Scaling Irregular Grid example to not use deprecated ImageView::GetImag... 71/48371/1
Chu Hoang [Fri, 18 Sep 2015 12:19:31 +0000 (13:19 +0100)]
Changed Image Scaling Irregular Grid example to not use deprecated ImageView::GetImage method.

Change-Id: I0f513af3b3a8c2c128dbfe06533874e740ae701d

9 years agoDALi Version 1.1.3 52/48352/1 dali_1.1.3
Xiangyin Ma [Fri, 18 Sep 2015 10:03:25 +0000 (11:03 +0100)]
DALi Version 1.1.3

Change-Id: I056891670adc11824ac3cb34778fcedb70934972

9 years agoUpdate the scripts with the changed control property and remove cluster demo 95/48295/2
Xiangyin Ma [Thu, 17 Sep 2015 09:04:53 +0000 (10:04 +0100)]
Update the scripts with the changed control property and remove cluster demo

Change-Id: I2d5c022ceee49e7d5732fee4c952f801b72bdcb8

9 years agoDALi Version 1.1.2 63/47963/1 dali_1.1.2
Richard Huang [Thu, 10 Sep 2015 10:05:36 +0000 (11:05 +0100)]
DALi Version 1.1.2

Change-Id: I271639b4d44332759304e608198b17358241e0d1

9 years agoDALi Version 1.1.1 20/46820/1 dali_1.1.1
Lee Morgan [Wed, 26 Aug 2015 10:14:55 +0000 (11:14 +0100)]
DALi Version 1.1.1

Change-Id: If97fc764d066b74277011e5a77f6b5d5f5cbb473

9 years agoPageTurnView demo update 42/46242/2
Xiangyin Ma [Tue, 18 Aug 2015 10:35:35 +0000 (11:35 +0100)]
PageTurnView demo update

Change-Id: Ib3053eb08dc834edc656868289d7124763080b0e

9 years agoDALi Version 1.1.0 55/46455/1 dali_1.1.0
Chu Hoang [Thu, 20 Aug 2015 12:33:18 +0000 (13:33 +0100)]
DALi Version 1.1.0

Change-Id: I1d9b7a8c1cb7753fe22e08195a6b191a754b336c

9 years agoExample of usage of ModelView class 89/44389/13
David Fumanal [Tue, 21 Jul 2015 09:56:56 +0000 (10:56 +0100)]
Example of usage of ModelView class

Change-Id: I2b1abd915988795432a002369617caa3f0fdc1cb

9 years agoMerge "Changed buttons example to use ImageView." into devel/master
Adeel Kazmi [Wed, 12 Aug 2015 13:06:51 +0000 (06:06 -0700)]
Merge "Changed buttons example to use ImageView." into devel/master

9 years agoMerge "Re-apply LAYER_3D drawing order in ItemView demo" into devel/master
Kimmo Hoikka [Wed, 12 Aug 2015 12:18:41 +0000 (05:18 -0700)]
Merge "Re-apply LAYER_3D drawing order in ItemView demo" into devel/master

9 years agoDALi Version 1.0.53 20/45920/1 dali_1.0.53
Adeel Kazmi [Wed, 12 Aug 2015 09:51:03 +0000 (10:51 +0100)]
DALi Version 1.0.53

Change-Id: I96f8837131306cbba8d2138c9689a8b4978b0998

9 years agoChanged buttons example to use ImageView. 81/44381/4
Chu Hoang [Tue, 21 Jul 2015 08:52:18 +0000 (09:52 +0100)]
Changed buttons example to use ImageView.

Change-Id: I8debcef8e1aaf8355167c2fc9d36cc3170d4b619

9 years agoRe-apply LAYER_3D drawing order in ItemView demo 21/45821/1
Paul Wisbey [Tue, 11 Aug 2015 14:08:57 +0000 (15:08 +0100)]
Re-apply LAYER_3D drawing order in ItemView demo

Change-Id: Ie518d47df2a859cc7fb28a5fe40dcc00ee1bb06d

9 years agoMerge "DALi Version 1.0.52" into devel/master
Adeel Kazmi [Thu, 6 Aug 2015 10:24:05 +0000 (03:24 -0700)]
Merge "DALi Version 1.0.52" into devel/master

9 years agoDALi Version 1.0.52 69/45469/1 dali_1.0.52
Xiangyin Ma [Thu, 6 Aug 2015 10:05:48 +0000 (11:05 +0100)]
DALi Version 1.0.52

Change-Id: I19abff8f9031a46410be2690e140c11facbd661b

9 years agoFix text-field example edit popup not showing 07/45407/1
Tom Robinson [Wed, 5 Aug 2015 17:11:02 +0000 (18:11 +0100)]
Fix text-field example edit popup not showing

Change-Id: I97689bed78b824d44a88555a1222f62ce3df8e32

9 years agoMerge "New Popup implementation" into devel/master
Adeel Kazmi [Wed, 5 Aug 2015 15:35:52 +0000 (08:35 -0700)]
Merge "New Popup implementation" into devel/master

9 years agoNew Popup implementation 69/44869/8
Tom Robinson [Tue, 28 Jul 2015 14:18:58 +0000 (15:18 +0100)]
New Popup implementation

Change-Id: I19544f18bd90836c039d045be4ab2d9d5386b37f

9 years agoTextField Demo not to use Demo style sheet 75/45375/3
Agnelo Vaz [Wed, 5 Aug 2015 09:47:00 +0000 (10:47 +0100)]
TextField Demo not to use Demo style sheet

* TextField entries removed from demo style sheets

Once demo styles can be merged with toolkit styles then some of the removed entries can be put back and demo style sheets used

Change-Id: I0047eea7a6bc51177225e20535e413dea3a76fe7
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
9 years agoDALi Version 1.0.51 84/44984/1 dali_1.0.51
Tom Robinson [Thu, 30 Jul 2015 08:26:41 +0000 (09:26 +0100)]
DALi Version 1.0.51

Change-Id: I8af8d73e0ec58d3573c57ce3d52eb6bce8e786a7

9 years agoMerge "Fixed 4 demo json scripts" into devel/master
Adeel Kazmi [Mon, 27 Jul 2015 10:45:40 +0000 (03:45 -0700)]
Merge "Fixed 4 demo json scripts" into devel/master

9 years agoMerge "Cleaned up image scaling and filtering example by removing (commented out...
Adeel Kazmi [Mon, 27 Jul 2015 10:35:55 +0000 (03:35 -0700)]
Merge "Cleaned up image scaling and filtering example by removing (commented out unneeded) SetSortModifier." into devel/master

9 years agoFixed 4 demo json scripts 92/44692/2
Tom Robinson [Fri, 24 Jul 2015 16:03:25 +0000 (17:03 +0100)]
Fixed 4 demo json scripts

Change-Id: I7402521736ed2b2c0a8ccf8aa8139018444dac7d

9 years agoDALi Version 1.0.50 84/44584/1 dali_1.0.50
Richard Huang [Thu, 23 Jul 2015 10:56:23 +0000 (11:56 +0100)]
DALi Version 1.0.50

Change-Id: Ic2910e0733f2097f5d7a0fa3a041143900aec4dc

9 years agoMerge "Changed blocks example to use ImageView." into devel/master
Kimmo Hoikka [Wed, 22 Jul 2015 14:14:45 +0000 (07:14 -0700)]
Merge "Changed blocks example to use ImageView." into devel/master

9 years agoCleaned up image scaling and filtering example by removing (commented out unneeded... 94/44394/2
Chu Hoang [Tue, 21 Jul 2015 10:24:55 +0000 (11:24 +0100)]
Cleaned up image scaling and filtering example by removing (commented out unneeded) SetSortModifier.

Change-Id: I8bed95f8669a9ee5891ab88262f5c559bc3432f1

9 years agoChanged blocks example to use ImageView. 92/44292/1
Chu Hoang [Mon, 20 Jul 2015 16:14:45 +0000 (17:14 +0100)]
Changed blocks example to use ImageView.

Change-Id: I17d52b7bc360fda645494b1e2a0f5fe449d4c9de

9 years agoRemoved Actor API from button. Added Icon properties 94/44094/7
Tom Robinson [Thu, 16 Jul 2015 17:43:02 +0000 (18:43 +0100)]
Removed Actor API from button. Added Icon properties

Change-Id: Ib21ed8b157a7ce22762bc4ee9c04a2bbf5e770b9

9 years agoMerge "Changed some demo examples to use ImageView." into devel/master
Kimmo Hoikka [Fri, 17 Jul 2015 15:05:29 +0000 (08:05 -0700)]
Merge "Changed some demo examples to use ImageView." into devel/master

9 years agoChanged some demo examples to use ImageView. 54/43754/6
Chu Hoang [Mon, 13 Jul 2015 14:30:52 +0000 (15:30 +0100)]
Changed some demo examples to use ImageView.

Change-Id: If2ced48efc39bfc03cc07fb716770d45eb2f42e6

9 years agoDALi Version 1.0.49 54/44154/1 dali_1.0.49
Nick Holland [Fri, 17 Jul 2015 08:25:56 +0000 (09:25 +0100)]
DALi Version 1.0.49

Change-Id: I17d85a279cc0cf8f2954541a3cf4fbf809b7249f

9 years agoMerge "Fixed memory leak in text-field demo" into devel/master
Adeel Kazmi [Thu, 16 Jul 2015 17:02:53 +0000 (10:02 -0700)]
Merge "Fixed memory leak in text-field demo" into devel/master

9 years agoTextField updates to json style files 01/42901/4
Agnelo Vaz [Fri, 3 Jul 2015 16:06:26 +0000 (17:06 +0100)]
TextField updates to json style files

Change-Id: I571058b0f303fb72ec5e46d55234d5950e91f0ba
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
9 years agoFixed memory leak in text-field demo 68/43868/4
Paul Wisbey [Mon, 13 Jul 2015 10:09:01 +0000 (11:09 +0100)]
Fixed memory leak in text-field demo

+ Chose a better cursor color

Change-Id: Ifb6abb311df33c5c30090ecde0a2699035c69fdb

9 years agoRemoval of Actor::Insert API 66/43866/1
Tom Robinson [Tue, 14 Jul 2015 17:13:00 +0000 (18:13 +0100)]
Removal of Actor::Insert API

Change-Id: I8940fb262a864c17942615c37229cb154f955486

9 years agoChanges following the patch: 19/43819/1
Ferran Sole [Tue, 14 Jul 2015 09:53:37 +0000 (10:53 +0100)]
Changes following the patch:
"Changed draw ordering to take into account the depth of the node in the hierarchy"

Change-Id: I19a20705ae42be53023a76dbfea0894533087b39

9 years agoChange DrawMode::OVERLAY to DrawMode::OVERLAY_2D 52/43752/1
Richard Huang [Mon, 13 Jul 2015 13:41:05 +0000 (14:41 +0100)]
Change DrawMode::OVERLAY to DrawMode::OVERLAY_2D

Change-Id: If79d262a37658ab3de84e98abc399c20e135a391

9 years agoMerge "DALi Version 1.0.48" into devel/master
Adeel Kazmi [Thu, 9 Jul 2015 16:11:28 +0000 (09:11 -0700)]
Merge "DALi Version 1.0.48" into devel/master

9 years agoDALi Version 1.0.48 92/43492/1 dali_1.0.48
Lee Morgan [Thu, 9 Jul 2015 14:03:03 +0000 (15:03 +0100)]
DALi Version 1.0.48

Change-Id: I110536b17bb7f6fdc60e80c1a352ac2ad11d1adc

9 years agoRemove UNSIGNED_INTEGER property type (removed from core) 86/43386/2
Kimmo Hoikka [Wed, 8 Jul 2015 14:40:55 +0000 (15:40 +0100)]
Remove UNSIGNED_INTEGER property type (removed from core)

Change-Id: I5bd7eee4565227f2d47a6d269ca4a3f775925bdd

9 years agoMerge "DALi Version 1.0.47" into devel/master
Adeel Kazmi [Wed, 1 Jul 2015 13:23:57 +0000 (06:23 -0700)]
Merge "DALi Version 1.0.47" into devel/master

9 years agoDALi Version 1.0.47 93/42693/1 dali_1.0.47
Ferran Sole [Wed, 1 Jul 2015 13:18:39 +0000 (14:18 +0100)]
DALi Version 1.0.47

Change-Id: I86cd3b11b3c439403d8c0a0bd381ff9e19440220

9 years agoChanged demos to use unselected button images. 33/42533/5
Chu Hoang [Mon, 29 Jun 2015 15:54:51 +0000 (16:54 +0100)]
Changed demos to use unselected button images.

[SRUK] ()

[Issue#]   N/A
[Problem]  N/A
[Cause]    N/A
[Solution] N/A

Change-Id: If2cafffc9545e439994ee5442057004bc2653eab

9 years agoOnActivated() change for Accessibility and KeyboardFocus 99/42399/1
Tom Robinson [Fri, 26 Jun 2015 18:35:59 +0000 (19:35 +0100)]
OnActivated() change for Accessibility and KeyboardFocus

Change-Id: Id26db275107e93fa974ce8cd233861338e54b9ab

9 years agoMerge branch 'devel/new_mesh' into devel/master 97/42397/1
Francisco Santos [Fri, 26 Jun 2015 17:47:18 +0000 (18:47 +0100)]
Merge branch 'devel/new_mesh' into devel/master

Change-Id: I84faa5b88e6cca8f606c5f32d8fb5e18ce0ce27c

9 years agoMerge branch 'devel/master' into devel/new_mesh 89/42389/2
Francisco Santos [Fri, 26 Jun 2015 14:31:51 +0000 (15:31 +0100)]
Merge branch 'devel/master' into devel/new_mesh

Change-Id: I9877668ddf0ca176f873d8157b525f5eae24b0df

9 years agoChanged cluster example layer to have 3D behavior 77/42377/1
Ferran Sole [Fri, 26 Jun 2015 13:45:09 +0000 (14:45 +0100)]
Changed cluster example layer to have 3D behavior

Change-Id: I78ee2b606aeaa4f905f4a68b45d0fa2ae977be9a

9 years agoMerge "Rename AccessibilityFocusManager to AccessibilityManager" into devel/master
Adeel Kazmi [Thu, 25 Jun 2015 15:30:22 +0000 (08:30 -0700)]
Merge "Rename AccessibilityFocusManager to AccessibilityManager" into devel/master

9 years agoMerge branch 'devel/master' into devel/new_mesh 18/42318/1
Francisco Santos [Thu, 25 Jun 2015 14:53:25 +0000 (15:53 +0100)]
Merge branch 'devel/master' into devel/new_mesh

Change-Id: Ie51fa61a8ef7c904635b99c9bf39185c10efd2bf

9 years agoMerge "Update script: table-view.json" into devel/master
Kimmo Hoikka [Thu, 25 Jun 2015 09:20:49 +0000 (02:20 -0700)]
Merge "Update script: table-view.json" into devel/master

9 years agoFixes for demos following change of default behaviour in Layer. 41/42241/1
Francisco Santos [Wed, 24 Jun 2015 15:53:02 +0000 (16:53 +0100)]
Fixes for demos following change of default behaviour in Layer.

Change-Id: I5757490feb24c9cd1e6eee38139fbae848f0255a

9 years agoDALi Version 1.0.46 36/42236/1 dali_1.0.46
Chu Hoang [Wed, 24 Jun 2015 14:54:36 +0000 (15:54 +0100)]
DALi Version 1.0.46

Change-Id: I9b426848869179c2b40e099e09aa9e1c79701e03

9 years agoRemoved DepthIndex methods from public-api 03/42203/3
Richard Underhill [Wed, 24 Jun 2015 11:00:48 +0000 (12:00 +0100)]
Removed DepthIndex methods from public-api

Needs: https://review.tizen.org/gerrit/#/c/42196/
       https://review.tizen.org/gerrit/#/c/42201/

Change-Id: I21487d2896dabf45009393bdf615d128db6842f3
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
9 years agoMove new mesh API to devel-api. 36/42136/4
Francisco Santos [Tue, 23 Jun 2015 13:49:08 +0000 (14:49 +0100)]
Move new mesh API to devel-api.

Change-Id: Ic4e00c7e787229ef38e35217eae5e376f054049e

9 years agoUpdate script: table-view.json 33/42133/2
Xiangyin Ma [Tue, 23 Jun 2015 13:42:51 +0000 (14:42 +0100)]
Update script: table-view.json

Change-Id: I4e7c3b06fd29a7aa0ad76529b09f6303b9118516

9 years agoUpdates following magnifier changes 94/41994/1
Adeel Kazmi [Fri, 19 Jun 2015 13:58:21 +0000 (14:58 +0100)]
Updates following magnifier changes

Change-Id: I9f310da3fc56b87c6e8d24bfc08585bfa9d02bf8

9 years agoRename AccessibilityFocusManager to AccessibilityManager 00/41600/2
Richard Huang [Tue, 16 Jun 2015 13:56:32 +0000 (14:56 +0100)]
Rename AccessibilityFocusManager to AccessibilityManager

Change-Id: Ia10868e413bfb742c53dccda767ccbebf5ae21a3

9 years agoDALi Version 1.0.45 60/41860/1 dali_1.0.45
Xiangyin Ma [Thu, 18 Jun 2015 11:14:30 +0000 (12:14 +0100)]
DALi Version 1.0.45

Change-Id: I3d9b0b7fd1af9ef46697dd694b6d15c21c4b2956

9 years agoRemove dali-any from Property::Value 59/41359/2
Kimmo Hoikka [Fri, 12 Jun 2015 19:12:46 +0000 (20:12 +0100)]
Remove dali-any from Property::Value
- reimplement multivalue using more efficient union inside value
- remove unnecessary asserts when types dont match
- cleanup and sanitize scripting
- remove unnecessary templates from GetEnum, added error handling

Change-Id: If87d7eb6b5a0e3ff32f298cccc670b3f34dd091a

9 years agoRemoved Draw::OVERLAY from Demos. 47/41347/3
Richard Underhill [Fri, 12 Jun 2015 13:41:41 +0000 (14:41 +0100)]
Removed Draw::OVERLAY from Demos.

NEEDS:
https://review.tizen.org/gerrit/#/c/41345/

and

https://review.tizen.org/gerrit/#/c/41346/

Change-Id: I2b66ac6882960400d5b32e26ba9909974a2b30cc
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
9 years agoDALi Version 1.0.44 46/41146/1 dali_1.0.44
Tom Robinson [Thu, 11 Jun 2015 09:46:16 +0000 (10:46 +0100)]
DALi Version 1.0.44

Change-Id: I54a85ce8f45341ce893c058007614e4440d5b3d1

9 years agoUpdate dali-demo menu. 76/40976/3
Francisco Santos [Wed, 10 Jun 2015 12:06:11 +0000 (13:06 +0100)]
Update dali-demo menu.

Change-Id: I3e62364b420a9df327292dc877abb2b69ec6b21e

9 years agoRemove uniform mapping. 53/40853/3
Francisco Santos [Tue, 9 Jun 2015 17:55:29 +0000 (18:55 +0100)]
Remove uniform mapping.

Change-Id: Ib151a33642e16d305cbc278f6ebab58820ce2a2e

9 years agoRemove egl package from dependencies. 56/40756/1
Victor Cebollada [Mon, 8 Jun 2015 17:00:35 +0000 (18:00 +0100)]
Remove egl package from dependencies.

Change-Id: I712e244b55b6a0e8813a56a89c6377d2318990c7
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
9 years agoMerge remote-tracking branch 'origin/tizen' into devel/new_mesh 37/40737/1
Francisco Santos [Mon, 8 Jun 2015 09:56:20 +0000 (10:56 +0100)]
Merge remote-tracking branch 'origin/tizen' into devel/new_mesh

Conflicts:
examples/animated-shapes/animated-shapes-example.cpp
examples/bubble-effect/bubble-effect-example.cpp
examples/new-window/new-window-example.cpp
examples/path-animation/path-animation.cpp

Change-Id: I0e3fe040dfe9faaf9074617294d1fde7f0b7ef67

9 years agoDALi Version 1.0.43 91/40491/1 accepted/tizen_3.0.2015.q2_common tizen_3.0.2015.q2_common accepted/tizen/3.0.2015.q2/common/20150615.091823 accepted/tizen/common/20150611.081707 accepted/tizen/mobile/20150611.091339 accepted/tizen/tv/20150611.091531 accepted/tizen/wearable/20150611.085816 dali_1.0.43 submit/tizen/20150611.012320 submit/tizen_3.0.2015.q2_common/20150615.075539 submit/tizen_mobile/20150611.014034
Richard Huang [Thu, 4 Jun 2015 10:06:14 +0000 (11:06 +0100)]
DALi Version 1.0.43

Change-Id: I54c61b8b44c334b7ef79dbd90c81b402a6649d87