platform/core/uifw/dali-demo.git
6 years agoRevert "[Tizen] Use old ABI temporarily" 97/128197/1
Heeyong Song [Mon, 8 May 2017 04:13:59 +0000 (13:13 +0900)]
Revert "[Tizen] Use old ABI temporarily"

This reverts commit 749bad0ac62db024ecc4c50aca7893724737f9c5.

Change-Id: I4ec349cda5b45d71f87e9639d44b5338dbbab858

6 years ago[Tizen] Use old ABI temporarily 33/127833/1 accepted/tizen/unified/20170502.165634 submit/tizen/20170502.061218
Seoyeon Kim [Tue, 2 May 2017 02:11:45 +0000 (11:11 +0900)]
[Tizen] Use old ABI temporarily

This reverts commit 0656b3f520715c76d3f064cd294343a7841cedd9.

Change-Id: I558e644b0051dcb808276be62b5960512c1490fd

6 years agoMerge branch 'devel/master' into tizen 32/127832/1
Seoyeon Kim [Tue, 2 May 2017 02:10:56 +0000 (11:10 +0900)]
Merge branch 'devel/master' into tizen

Change-Id: Ic64edf62a115136a5bb387f0eb7c8be8c6040ad3

6 years agoRevert "[Tizen] Use old ABI temporarily" 31/127831/1
Seoyeon Kim [Tue, 2 May 2017 02:09:47 +0000 (11:09 +0900)]
Revert "[Tizen] Use old ABI temporarily"

This reverts commit af0f96ee6b16c2aa7742680cacd0cb56c7171a25.

Change-Id: I78e3695d525d2a7b52f9317ff202ac0f43a4489d

7 years agoDALi Version 1.2.37 15/127715/1 dali_1.2.37
Adeel Kazmi [Fri, 28 Apr 2017 10:33:03 +0000 (11:33 +0100)]
DALi Version 1.2.37

Change-Id: I959d02c918463b8758c0c551940ad6b7cda34e49

7 years ago[Tizen] Use old ABI temporarily 44/126844/1 accepted/tizen/unified/20170426.061758 submit/tizen/20170425.094140 submit/tizen/20170425.110915
taeyoon0.lee [Tue, 25 Apr 2017 06:46:22 +0000 (15:46 +0900)]
[Tizen] Use old ABI temporarily

This reverts commit 0a30a93832e076af078caa186ce4a42cbc324316.

Change-Id: I178c6d0b60dd4c25988b2dde9b6bef59f161df8c

7 years agoMerge branch 'devel/master (1.2.36+)' into tizen 43/126843/1
taeyoon0.lee [Tue, 25 Apr 2017 06:45:35 +0000 (15:45 +0900)]
Merge branch 'devel/master (1.2.36+)' into tizen

Change-Id: I8d542cf5fd6b5638273e917e123d25c87140b981

7 years agoRevert "[Tizen] Changed RENDERING_TYPE to renderingType for video view" 42/126842/1
taeyoon0.lee [Tue, 25 Apr 2017 06:44:57 +0000 (15:44 +0900)]
Revert "[Tizen] Changed RENDERING_TYPE to renderingType for video view"

This reverts commit fcb1eb473bf3d5bcc5dfa63d69dae31ee2c8e334.

Change-Id: Iad3f8665923f9b015f02fa68973eac40be820c9c

7 years agoRevert "[Tizen] Use old ABI temporarily" 41/126841/1
taeyoon0.lee [Tue, 25 Apr 2017 06:44:26 +0000 (15:44 +0900)]
Revert "[Tizen] Use old ABI temporarily"

This reverts commit 2bac295c04b88131ec190139470f47afed7d41c4.

Change-Id: Ie0bc9accc669040a90526750ec953bf421a966bb

7 years ago[Tizen] Use old ABI temporarily 08/126508/1 submit/tizen/20170424.093438
Heeyong Song [Mon, 24 Apr 2017 02:20:29 +0000 (11:20 +0900)]
[Tizen] Use old ABI temporarily

Change-Id: Ie4e14005f3587cfaa6828d49a9d7867b11f26b64

7 years agoMerge "Changes after Set/Get synchronous behaviour of registered animatable & custom...
David Steele [Fri, 21 Apr 2017 12:34:20 +0000 (05:34 -0700)]
Merge "Changes after Set/Get synchronous behaviour of registered animatable & custom properties" into devel/master

7 years agoMerge "DALi Version 1.2.36" into devel/master
Adeel Kazmi [Fri, 21 Apr 2017 11:38:46 +0000 (04:38 -0700)]
Merge "DALi Version 1.2.36" into devel/master

7 years agoDALi Version 1.2.36 47/126447/1 dali_1.2.36
adam.b [Fri, 21 Apr 2017 11:29:40 +0000 (12:29 +0100)]
DALi Version 1.2.36

Change-Id: I70ba243b0e818d39eb58477f15a9c169ed369997

7 years agoChanges after Set/Get synchronous behaviour of registered animatable & custom properties 70/124470/2
Adeel Kazmi [Tue, 11 Apr 2017 10:14:29 +0000 (11:14 +0100)]
Changes after Set/Get synchronous behaviour of registered animatable & custom properties

Change-Id: Icee24bd6eedfb1764513c763393bd2a9a2853341

7 years ago[Tizen] Changed RENDERING_TYPE to renderingType for video view 57/125857/1
taeyoon0.lee [Wed, 19 Apr 2017 04:36:14 +0000 (13:36 +0900)]
[Tizen] Changed RENDERING_TYPE to renderingType for video view

Change-Id: I8b12cd759774e790c8e1abfc3c65c8d3708e7d70

7 years agoChanged RENDERING_TYPE to renderingType for video view 17/125817/1
taeyoon0.lee [Wed, 19 Apr 2017 04:36:14 +0000 (13:36 +0900)]
Changed RENDERING_TYPE to renderingType for video view

Change-Id: I8b12cd759774e790c8e1abfc3c65c8d3708e7d70

7 years agoMerge branch 'devel/master' into tizen 11/125411/1 accepted/tizen/unified/20170418.072447 submit/tizen/20170417.100748
Jinho, Lee [Mon, 17 Apr 2017 07:56:42 +0000 (16:56 +0900)]
Merge branch 'devel/master' into tizen

Change-Id: I0a9f37f406f8ffdeba1fcd594fa46211f8583844

7 years agoDALi Version 1.2.35 97/124997/1 dali_1.2.35
Umar [Thu, 13 Apr 2017 09:10:31 +0000 (10:10 +0100)]
DALi Version 1.2.35

Change-Id: Ic0964483674ddc18950f2c753507a88b32a9c710

7 years agoMerge branch 'devel/master' into tizen 35/124035/1 accepted/tizen/unified/20170410.160011 submit/tizen/20170410.071852
minho.sun [Mon, 10 Apr 2017 03:32:29 +0000 (12:32 +0900)]
Merge branch 'devel/master' into tizen

Change-Id: I435d9578cbf191b7e79dcdb43487931a8d44a190

7 years agoMerge "DALi Version 1.2.34" into devel/master
Adeel Kazmi [Fri, 7 Apr 2017 10:58:13 +0000 (03:58 -0700)]
Merge "DALi Version 1.2.34" into devel/master

7 years agoDALi Version 1.2.34 95/123895/1 dali_1.2.34
Nick Holland [Fri, 7 Apr 2017 10:11:21 +0000 (11:11 +0100)]
DALi Version 1.2.34

Change-Id: I258733584f2da7cf20b32351ec99888cd04428b4

7 years agoRemove UnhandledKeyEventSignal from examples. 14/123714/2
minho.sun [Thu, 6 Apr 2017 16:34:58 +0000 (01:34 +0900)]
Remove UnhandledKeyEventSignal from examples.

UnhandledKeyEventSignal is removed from KeyInputFocusManager.
Stage::KeyEventSignal can work as UnhandledKeyEventSignal.

Change-Id: I264c4fdd7aafcc668ba64bf8fe5abafed5103430
Signed-off-by: minho.sun <minho.sun@samsung.com>
7 years agoRendering of radial progress indicator 49/123149/4
adam.b [Fri, 10 Mar 2017 11:40:09 +0000 (11:40 +0000)]
Rendering of radial progress indicator

Tutorial shows rendering of radial progress bar with
use of stencil buffer and two renderers attached
to single actor.

Change-Id: Ia1005524ec3cd27147bb2a40ddf87c7284ad7731

7 years agoTutorials added to the xml file 48/121748/3
adam.b [Tue, 28 Mar 2017 17:25:39 +0000 (18:25 +0100)]
Tutorials added to the xml file

Change-Id: I6fe21917c21063709d1516c0bcf5d83530908161

7 years agoMerge "DALi Version 1.2.33" into devel/master
Paul Wisbey [Fri, 31 Mar 2017 12:33:26 +0000 (05:33 -0700)]
Merge "DALi Version 1.2.33" into devel/master

7 years agoDALi Version 1.2.33 38/122438/1 dali_1.2.33
Richard Huang [Fri, 31 Mar 2017 09:59:03 +0000 (10:59 +0100)]
DALi Version 1.2.33

Change-Id: I45bfcc74c0169df10333b28db1f584807160467f

7 years agoMerge branch 'devel/master' into tizen 64/122364/1 accepted/tizen_common accepted/tizen_ivi accepted/tizen_mobile accepted/tizen_tv accepted/tizen_wearable accepted/tizen/common/20170403.185636 accepted/tizen/ivi/20170403.022404 accepted/tizen/mobile/20170403.021959 accepted/tizen/tv/20170403.022208 accepted/tizen/unified/20170403.022426 accepted/tizen/wearable/20170403.022318 submit/tizen/20170331.124519
dongsug.song [Fri, 31 Mar 2017 05:57:03 +0000 (14:57 +0900)]
Merge branch 'devel/master' into tizen

Change-Id: If12fb6560b14a3d83693d4135c4e2d3530ccc55e

7 years agoTextScrolling example allows text color changes 21/122221/1
Agnelo Vaz [Thu, 30 Mar 2017 14:19:09 +0000 (15:19 +0100)]
TextScrolling example allows text color changes

Change-Id: I01f2785583486b5c26cee4ae8cfaa9ac1b40bb92

7 years agoMerge branch 'devel/master' into tizen 41/121041/1 accepted/tizen/common/20170327.143227 accepted/tizen/ivi/20170328.060434 accepted/tizen/mobile/20170328.060028 accepted/tizen/tv/20170328.060211 accepted/tizen/unified/20170328.060502 accepted/tizen/wearable/20170328.060344 submit/tizen/20170327.130356
Seoyeon Kim [Mon, 27 Mar 2017 05:59:36 +0000 (14:59 +0900)]
Merge branch 'devel/master' into tizen

Change-Id: Iab9636d4e7113374521306d69d85e1e914f6002c

7 years agoAdd Back key support to examples which do not have it 19/120919/1
Adeel Kazmi [Fri, 24 Mar 2017 18:51:32 +0000 (18:51 +0000)]
Add Back key support to examples which do not have it

Change-Id: Ib36b14b0763130b811ae1f45ce4c631c25d6776c

7 years agoMerge "packaging/com.samsung.dali-demo.spec use license macro" into devel/master
Adeel Kazmi [Fri, 24 Mar 2017 18:33:12 +0000 (11:33 -0700)]
Merge "packaging/com.samsung.dali-demo.spec use license macro" into devel/master

7 years agoDALi Version 1.2.32 73/120873/1 dali_1.2.32
Victor Cebollada [Fri, 24 Mar 2017 11:51:16 +0000 (11:51 +0000)]
DALi Version 1.2.32

Change-Id: I41d8a4a5355359d7df630b24cc04d33db8ad06c9

7 years agopackaging/com.samsung.dali-demo.spec use license macro 64/120764/1
Jinho, Lee [Fri, 24 Mar 2017 04:39:58 +0000 (13:39 +0900)]
packaging/com.samsung.dali-demo.spec use license macro

Change-Id: I2379792074afbfc960e06c1fac71fc37b6f71d56

7 years agoMerge branch 'devel/master (1.2.31)' into tizen 27/119727/1 accepted/tizen/common/20170320.173855 accepted/tizen/common/20170324.123047 accepted/tizen/ivi/20170320.223056 accepted/tizen/ivi/20170324.112153 accepted/tizen/mobile/20170320.222645 accepted/tizen/mobile/20170324.111710 accepted/tizen/tv/20170320.222911 accepted/tizen/tv/20170324.111935 accepted/tizen/unified/20170320.223119 accepted/tizen/unified/20170324.112226 accepted/tizen/wearable/20170320.223013 accepted/tizen/wearable/20170324.112057 submit/tizen/20170320.091401 submit/tizen/20170324.082849
Heeyong Song [Mon, 20 Mar 2017 02:23:16 +0000 (11:23 +0900)]
Merge branch 'devel/master (1.2.31)' into tizen

Change-Id: I642f6a50947051b11977f238a8a8210219a78497

7 years agoMerge "DALi Version 1.2.31" into devel/master
Adeel Kazmi [Fri, 17 Mar 2017 16:22:51 +0000 (09:22 -0700)]
Merge "DALi Version 1.2.31" into devel/master

7 years agoDALi Version 1.2.31 27/119627/1 dali_1.2.31
Francisco Santos [Fri, 17 Mar 2017 16:15:43 +0000 (16:15 +0000)]
DALi Version 1.2.31

Change-Id: If5f42c790c843641cf2ccc5a1d7c3f14bc7145fd

7 years agoUpdates following size and offset policy property changes 97/119397/2
Adeel Kazmi [Thu, 16 Mar 2017 18:35:16 +0000 (18:35 +0000)]
Updates following size and offset policy property changes

Change-Id: I59fbcbdea60da95ec599528fe76b2a227355711c

7 years agoMerge "Fixed launcher for textured-mesh example" into devel/master
Adeel Kazmi [Wed, 15 Mar 2017 16:05:13 +0000 (09:05 -0700)]
Merge "Fixed launcher for textured-mesh example" into devel/master

7 years agoMerge branch 'devel/master (1.2.30)' into tizen 87/118587/1 accepted/tizen/common/20170313.162855 accepted/tizen/ivi/20170314.074908 accepted/tizen/mobile/20170314.074553 accepted/tizen/tv/20170314.074732 accepted/tizen/unified/20170314.074956 accepted/tizen/wearable/20170314.074821 submit/tizen/20170313.134641
taeyoon0.lee [Mon, 13 Mar 2017 08:04:04 +0000 (17:04 +0900)]
Merge branch 'devel/master (1.2.30)' into tizen

Change-Id: I84a52627a7dfb49c3618b994425fef6e865cf8dd

7 years agoMerge "DALi Version 1.2.30" into devel/master
Adeel Kazmi [Fri, 10 Mar 2017 15:05:39 +0000 (07:05 -0800)]
Merge "DALi Version 1.2.30" into devel/master

7 years agoDALi Version 1.2.30 64/118464/1 dali_1.2.30
David Steele [Fri, 10 Mar 2017 15:01:26 +0000 (15:01 +0000)]
DALi Version 1.2.30

Change-Id: I9c3ab63b00d8fb2959032e8626ba732a8a53d3e5

7 years agoFixed launcher for textured-mesh example 98/117098/2
David Steele [Thu, 2 Mar 2017 19:20:00 +0000 (19:20 +0000)]
Fixed launcher for textured-mesh example

Change-Id: I8c5d63694570cb30da7be41aea31dbc5a3be991c
Signed-off-by: David Steele <david.steele@samsung.com>
7 years agoFocus Integration Sample 59/117459/13
minho.sun [Mon, 6 Mar 2017 06:54:47 +0000 (15:54 +0900)]
Focus Integration Sample

You can check the InputFocus is given to focused Control.
After that, when key is pressed, focused control's KeyEvent callback will be called.

Change-Id: I93c605e7bcde5505099948445c762873f57e8381
Signed-off-by: minho.sun <minho.sun@samsung.com>
7 years agoMerge "Example of animating around a pivot" into devel/master
Kimmo Hoikka [Thu, 9 Mar 2017 17:12:52 +0000 (09:12 -0800)]
Merge "Example of animating around a pivot" into devel/master

7 years agoExample of animating around a pivot 72/115872/10
Adeel Kazmi [Tue, 21 Feb 2017 16:57:03 +0000 (16:57 +0000)]
Example of animating around a pivot

Change-Id: I4452b494bb6a3a094787480dd60c38f140d36e20

7 years agoUpdated shadow-button transition demo resources 93/117093/3
David Steele [Thu, 16 Feb 2017 16:46:11 +0000 (16:46 +0000)]
Updated shadow-button transition demo resources

Fixed the sizes and substates for disabling/enabling the shadow
button

Change-Id: I0fff3e76acbde962c0d958881f5e92aa2a8478ff
Signed-off-by: David Steele <david.steele@samsung.com>
7 years agoUpdate demos to not use deprecated Button API 30/117030/3
Agnelo Vaz [Thu, 2 Mar 2017 10:24:03 +0000 (10:24 +0000)]
Update demos to not use deprecated Button API

Change-Id: Iaf8e17feb02567a92f2ff83a050e8bc6652212a0

7 years agoDALi Version 1.2.29 93/117293/1 dali_1.2.29
Agnelo Vaz [Fri, 3 Mar 2017 14:06:22 +0000 (14:06 +0000)]
DALi Version 1.2.29

Change-Id: I2e5b9410bb5b98b4a354d7154624cdc9642de890

7 years agoMerge "A simple control using visuals" into devel/master
Adeel Kazmi [Tue, 28 Feb 2017 13:39:43 +0000 (05:39 -0800)]
Merge "A simple control using visuals" into devel/master

7 years agoA simple control using visuals 73/115873/9
Agnelo Vaz [Tue, 21 Feb 2017 14:10:57 +0000 (14:10 +0000)]
A simple control using visuals

Example code for creating a control using visuals with states defined in the stylesheet

Change-Id: Ief41cfad7c3eeb8d78bd6540db36e4b761b28e5f

7 years agoAdded Rendering tutorials 29/114929/13
adam.b [Wed, 15 Feb 2017 18:00:24 +0000 (18:00 +0000)]
Added Rendering tutorials

- Drawing line
- Drawing triangle
- Drawing colored cube
- Drawing textured cube

Change-Id: Ief3c47871b0f06ba764fa86a260ad8561c78acd3

7 years agoSVACE error, un-intialised variable in example 97/116697/2
Agnelo Vaz [Mon, 27 Feb 2017 16:47:57 +0000 (16:47 +0000)]
SVACE error, un-intialised variable in example

Change-Id: I78dec36ee7609f7beb3202dd77a785644702ce6e

7 years agoRemove redundant call to ResourceImage::GetImageSize() 22/115822/3
Nick Holland [Tue, 21 Feb 2017 10:54:26 +0000 (10:54 +0000)]
Remove redundant call to ResourceImage::GetImageSize()

Change-Id: I6fd663fad743bd52f1667108492cd92c3c150ad3

7 years agoMerge branch 'devel/master' into tizen 46/116546/1 accepted/tizen/common/20170306.164909 accepted/tizen/ivi/20170306.103423 accepted/tizen/mobile/20170306.103133 accepted/tizen/tv/20170306.103237 accepted/tizen/unified/20170309.034501 accepted/tizen/wearable/20170306.103327 submit/tizen/20170227.051047 submit/tizen/20170306.033709 submit/tizen_unified/20170308.100410
suhyung Eom [Mon, 27 Feb 2017 02:21:05 +0000 (11:21 +0900)]
Merge branch 'devel/master' into tizen

Change-Id: Ief09616fa9eb5342c31be091ee0d2f6b055d6dd0

7 years agoRevert "[Tizen] Prepare for Tizen 4.0 Build" 45/116545/1
suhyung Eom [Mon, 27 Feb 2017 02:19:54 +0000 (11:19 +0900)]
Revert "[Tizen] Prepare for Tizen 4.0 Build"

This reverts commit 99797a8cc93a3dd359025b2edb01ce20006395eb.
Change-Id: Ie7ab25cc13667826b7422c163504627c957c9540

7 years agoDALi Version 1.2.28 50/116450/1 dali_1.2.28
Adeel Kazmi [Fri, 24 Feb 2017 09:34:18 +0000 (09:34 +0000)]
DALi Version 1.2.28

Change-Id: I551e0e08ccc3737bf5e48bc19fc4168c29f21b5f

7 years agoMerge "Updated shadow-button transition demo to use states and sub-states" into devel...
Adeel Kazmi [Thu, 23 Feb 2017 19:15:13 +0000 (11:15 -0800)]
Merge "Updated shadow-button transition demo to use states and sub-states" into devel/master

7 years ago(Mesh Visual) Changed the stage colour 12/115612/2
Adeel Kazmi [Mon, 20 Feb 2017 15:49:13 +0000 (15:49 +0000)]
(Mesh Visual) Changed the stage colour

Change-Id: Ia0c00bd55018abeae0d478f33aa33d01bf7dfbdf

7 years agoUpdated shadow-button transition demo to use states and sub-states 89/115189/7
David Steele [Thu, 16 Feb 2017 16:46:11 +0000 (16:46 +0000)]
Updated shadow-button transition demo to use states and sub-states

Also updated the style sheet to set up the transitions for a future
patch in Toolkit.

Change-Id: I9e33a2ab3bc2fb9e9dac3fc01435d233d530c1a8
Signed-off-by: David Steele <david.steele@samsung.com>
7 years agoExample of transitions of each visual type. 44/115344/9
David Steele [Thu, 16 Feb 2017 15:47:44 +0000 (15:47 +0000)]
Example of transitions of each visual type.

Change-Id: I8d15f1aec5cdca527f93283ff179dcf572e831ea

7 years agoMerge "Remove last usage of SetImage( ResourceImage ) from examples" into devel/master
Paul Wisbey [Fri, 17 Feb 2017 16:28:35 +0000 (08:28 -0800)]
Merge "Remove last usage of SetImage( ResourceImage ) from examples" into devel/master

7 years agoMerge "Stopped image-scaling examples using Deprecated SetImage( ResourceImage )...
Paul Wisbey [Fri, 17 Feb 2017 16:27:55 +0000 (08:27 -0800)]
Merge "Stopped image-scaling examples using Deprecated SetImage( ResourceImage ) API" into devel/master

7 years agoRemove last usage of SetImage( ResourceImage ) from examples 88/115388/1
Nick Holland [Fri, 17 Feb 2017 15:10:34 +0000 (15:10 +0000)]
Remove last usage of SetImage( ResourceImage ) from examples

Change-Id: If2cb8f802e055f1afcea3bbfefd774872a8f90e6

7 years agoStopped image-scaling examples using Deprecated SetImage( ResourceImage ) API 85/115385/3
Nick Holland [Fri, 17 Feb 2017 14:21:48 +0000 (14:21 +0000)]
Stopped image-scaling examples using Deprecated SetImage( ResourceImage ) API

Note: the examples no longer work correctly:
- Flickering
- Image scaling modes in ImageVisual aren't fully
functional.

Currently logs the following errors when image needs scaling up.

Change-Id: I972a4368719937edfdef9657e3c2f0155772fe67
ImageAtlas::UploadToAtlas(uint32_t, Dali::PixelData) Can not upscale the image from actual loaded size [ 326, 210 ] to specified size [ 358, 231 ]

7 years agoDALi Version 1.2.27 70/115370/1 dali_1.2.27
adam.b [Fri, 17 Feb 2017 12:56:26 +0000 (12:56 +0000)]
DALi Version 1.2.27

Change-Id: I0fd57d2a93e89c31e8bbc3b2dd430dd42fa66fd0

7 years agoMerge "Updated mobile stylesheet for demo" into devel/master
Adeel Kazmi [Thu, 16 Feb 2017 19:45:57 +0000 (11:45 -0800)]
Merge "Updated mobile stylesheet for demo" into devel/master

7 years agoUpdated mobile stylesheet for demo 95/115195/1
David Steele [Thu, 16 Feb 2017 19:19:10 +0000 (19:19 +0000)]
Updated mobile stylesheet for demo

Change-Id: I91d6b400adb0e1b5262a1ca255ac32ca07945154
Signed-off-by: David Steele <david.steele@samsung.com>
7 years agoMerge "Remove examples using Deprecated SetImage( FrameBuffer ) API" into devel/master
Adeel Kazmi [Thu, 16 Feb 2017 17:14:09 +0000 (09:14 -0800)]
Merge "Remove examples using Deprecated SetImage( FrameBuffer ) API" into devel/master

7 years agoRemove examples using Deprecated SetImage( FrameBuffer ) API 28/115128/5
Nick Holland [Thu, 16 Feb 2017 15:15:05 +0000 (15:15 +0000)]
Remove examples using Deprecated SetImage( FrameBuffer ) API

Examples removed dali-examples:

super-blur-bloom-example
new-window-example
page-turn-view-example

Example removed from dali-demo

meta-ball-explosion & refrac

The meta ball demos will be reimplemented with the new rendering API

Change-Id: Ib3026a2dce5728c4adf28951fa8cd7b9139ec28b

7 years agoMerge "[Tizen] Prepare for Tizen 4.0 Build" into tizen accepted/tizen/common/20170223.182657 accepted/tizen/ivi/20170220.224151 accepted/tizen/mobile/20170220.223617 accepted/tizen/tv/20170220.223932 accepted/tizen/wearable/20170220.224108 submit/tizen/20170220.003759 submit/tizen_common/20170223.092744
Seoyeon Kim [Thu, 16 Feb 2017 01:53:52 +0000 (17:53 -0800)]
Merge "[Tizen] Prepare for Tizen 4.0 Build" into tizen

7 years agoAdded focus styling to demo 43/114943/1
David Steele [Wed, 15 Feb 2017 20:02:04 +0000 (20:02 +0000)]
Added focus styling to demo

Change-Id: I818b3770e5183d3597a1c6b991f3df989569fd34

7 years agoPrepare for Tizen 4.0 Build 44/114844/1
MyungJoo Ham [Fri, 13 Jan 2017 05:38:13 +0000 (14:38 +0900)]
Prepare for Tizen 4.0 Build

I've assumed that Tizen 4.0 code is going to be more similar with 3.0
than 2.0.

Please do not rely on string == compare for version check.

Change-Id: I826b0e599b6b510e49543ef9e66a6976b5e27511
Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>
7 years ago[Tizen] Prepare for Tizen 4.0 Build 46/110146/3
MyungJoo Ham [Fri, 13 Jan 2017 05:38:13 +0000 (14:38 +0900)]
[Tizen] Prepare for Tizen 4.0 Build

I've assumed that Tizen 4.0 code is going to be more similar with 3.0
than 2.0.

Please do not rely on string == compare for version check.

Change-Id: I826b0e599b6b510e49543ef9e66a6976b5e27511
Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>
7 years agoMerge "Remove batching from homescreen benchmark." into devel/master
Adeel Kazmi [Tue, 14 Feb 2017 15:51:31 +0000 (07:51 -0800)]
Merge "Remove batching from homescreen benchmark." into devel/master

7 years agoSpliting dali-demo into examples-reel and demo 44/114044/3
Agnelo Vaz [Wed, 8 Feb 2017 17:10:38 +0000 (17:10 +0000)]
Spliting dali-demo into examples-reel and demo

Change-Id: I5c1c52ee969ac04a46412f8f6326a655fc7e63d5

7 years agoMerge "Ensure buttons appears on top of super-blur-view control" into devel/master
David Steele [Fri, 10 Feb 2017 12:29:02 +0000 (04:29 -0800)]
Merge "Ensure buttons appears on top of super-blur-view control" into devel/master

7 years agoDALi Version 1.2.26 68/114168/1 dali_1.2.26
Victor Cebollada [Fri, 10 Feb 2017 07:57:51 +0000 (07:57 +0000)]
DALi Version 1.2.26

Change-Id: I4a290d9d10f6974436fd9b3a1d173fc7a08cd203

7 years agoEnsure buttons appears on top of super-blur-view control 43/114043/1
Adeel Kazmi [Thu, 9 Feb 2017 17:55:19 +0000 (17:55 +0000)]
Ensure buttons appears on top of super-blur-view control

Change-Id: I1fb7619b2165870c5dd18097c04edb3f112f2824

7 years agoRemove batching from homescreen benchmark. 36/113936/1
Francisco Santos [Thu, 9 Feb 2017 09:50:40 +0000 (09:50 +0000)]
Remove batching from homescreen benchmark.

Change-Id: Ic4f20d0c4169cdedd20a2966edc67da5ec539849

7 years agoMerge branch 'devel/master' into tizen 12/113812/1
minho.sun [Thu, 9 Feb 2017 02:23:04 +0000 (11:23 +0900)]
Merge branch 'devel/master' into tizen

Change-Id: I6947f0c77b5e9925ad966bc8d7004d8a72ba61dd

7 years agoCreate ImageView with shader and Image at the same time 61/113461/2
Nick Holland [Tue, 7 Feb 2017 16:08:45 +0000 (16:08 +0000)]
Create ImageView with shader and Image at the same time

Change-Id: If22c12af7072927646e60ee320bd4e58f0702cb7

7 years agoSplit shaders in JSONs over multiple lines 72/112172/3
Adeel Kazmi [Thu, 26 Jan 2017 18:36:47 +0000 (18:36 +0000)]
Split shaders in JSONs over multiple lines

Change-Id: I231d03ba20e15626ed7d6020d65fbbac3411ccff

7 years agoMerge "Update progress bar example" into devel/master
Adeel Kazmi [Mon, 6 Feb 2017 14:05:49 +0000 (06:05 -0800)]
Merge "Update progress bar example" into devel/master

7 years agoMerge "Javanese, Sundanese, Xhosa and Zulu strigns added." into devel/master
Paul Wisbey [Fri, 3 Feb 2017 16:12:48 +0000 (08:12 -0800)]
Merge "Javanese, Sundanese, Xhosa and Zulu strigns added." into devel/master

7 years agoMerge "DALi Version 1.2.25" into devel/master
David Steele [Fri, 3 Feb 2017 15:41:44 +0000 (07:41 -0800)]
Merge "DALi Version 1.2.25" into devel/master

7 years agoDALi Version 1.2.25 15/113015/1 dali_1.2.25
Umar [Fri, 3 Feb 2017 15:37:56 +0000 (15:37 +0000)]
DALi Version 1.2.25

Change-Id: I81a6105c8f4fb499e05103b74ad5f0861100ea27

7 years agoJavanese, Sundanese, Xhosa and Zulu strigns added. 07/113007/1
Victor Cebollada [Fri, 3 Feb 2017 14:21:11 +0000 (14:21 +0000)]
Javanese, Sundanese, Xhosa and Zulu strigns added.

Change-Id: If4baf934350fe467695f69e20a0d222651ac7824
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
7 years agoFix SVACE error caused by uninitialised member 38/112938/1
Adeel Kazmi [Fri, 3 Feb 2017 09:41:56 +0000 (09:41 +0000)]
Fix SVACE error caused by uninitialised member

Change-Id: Idd4cae871e9003c1f7535dcceb4bc6f26e7fbb51

7 years agoUpdate progress bar example 77/111077/8
minho.sun [Thu, 19 Jan 2017 10:05:40 +0000 (19:05 +0900)]
Update progress bar example

Update progress bar example.

There are three new buttons to check new properies of Progress bar.

Change-Id: I9bf0607e3fb3763b37ca88c80040d9713b731169
Signed-off-by: minho.sun <minho.sun@samsung.com>
7 years agoCube transition example to use ToggleButton for effect changes 92/112192/3
Agnelo Vaz [Fri, 27 Jan 2017 11:27:31 +0000 (11:27 +0000)]
Cube transition example to use ToggleButton for effect changes

Change-Id: Ib4484df7478e578817a6663838271bf7a6d87461

7 years agoDALi Version 1.2.24 05/112205/1 dali_1.2.24
Nick Holland [Fri, 27 Jan 2017 15:14:50 +0000 (15:14 +0000)]
DALi Version 1.2.24

Change-Id: I0e7100883cb682fc58b3761eae52c8415391a3f0

7 years agoRemoved Atlas example 07/111907/2
Ferran Sole [Tue, 24 Jan 2017 17:57:39 +0000 (17:57 +0000)]
Removed Atlas example

Change-Id: I48cb4bef5d1e5bcb9f32bbd3e04cf186387dcce3

7 years agoRemoved NOOP page position setters 91/111891/1
Paul Wisbey [Tue, 24 Jan 2017 13:41:14 +0000 (13:41 +0000)]
Removed NOOP page position setters

ScrollViewPagePathEffect is supplying the real positions

Change-Id: I4697ad3b5f341eb075ec7cda4bf3e1a636a6da6e

7 years agoDALi Version 1.2.23 88/111488/1 dali_1.2.23
Richard Huang [Fri, 20 Jan 2017 13:36:22 +0000 (13:36 +0000)]
DALi Version 1.2.23

Change-Id: Ie8c74ec167bfdb8403d9f72ed2f5667df94161f3

7 years agoMerge branch 'devel/master' into tizen 76/111276/1 accepted/tizen/common/20170123.182559 accepted/tizen/ivi/20170120.082242 accepted/tizen/mobile/20170120.082003 accepted/tizen/tv/20170120.082105 accepted/tizen/wearable/20170120.082150 submit/tizen/20170120.063242 submit/tizen_common/20170123.022625
Seoyeon Kim [Fri, 20 Jan 2017 05:19:10 +0000 (14:19 +0900)]
Merge branch 'devel/master' into tizen

Change-Id: Idf27811f3dc3921c9627f1a4eab395e2681be6d7

7 years agoMerge "(Clipping Example) Add a rotation effect around the X-axis as we scroll throug...
Kimmo Hoikka [Wed, 18 Jan 2017 12:54:33 +0000 (04:54 -0800)]
Merge "(Clipping Example) Add a rotation effect around the X-axis as we scroll through the item-view" into devel/master

7 years ago(Clipping Example) Add a rotation effect around the X-axis as we scroll through the... 80/110880/1
Adeel Kazmi [Wed, 18 Jan 2017 10:23:04 +0000 (10:23 +0000)]
(Clipping Example) Add a rotation effect around the X-axis as we scroll through the item-view

Change-Id: I4a485a758d54ca01c0bf5c2dc3d2162f27810241

7 years agoUpdate the AnimatedImageVisual demo 92/110492/4
Xiangyin Ma [Mon, 16 Jan 2017 19:03:50 +0000 (19:03 +0000)]
Update the AnimatedImageVisual demo

Change-Id: Ic7f90ed9cc5d59e3cdcd2741691c8d927b4e9037

7 years agoMerge "DALi Version 1.2.22" into devel/master
David Steele [Fri, 13 Jan 2017 14:37:29 +0000 (06:37 -0800)]
Merge "DALi Version 1.2.22" into devel/master

7 years agoDALi Version 1.2.22 94/110294/1 dali_1.2.22
David Steele [Fri, 13 Jan 2017 14:35:56 +0000 (14:35 +0000)]
DALi Version 1.2.22

Change-Id: I3ff7abffe275e0efba00daa1695f3c8485718536