Richard Huang [Fri, 12 Jun 2015 15:16:23 +0000 (16:16 +0100)]
Add API to get the current state of TTS player
Change-Id: Idce0225976a6b2cf791761755cd0831e3d1ba054
suhyung Eom [Thu, 11 Jun 2015 10:49:35 +0000 (19:49 +0900)]
Fixed prevent defect
< Prevent message >
Dereference null return value (NULL_RETURNS)
Signed-off-by: suhyung Eom <suhyung.eom@samsung.com>
Change-Id: I18968d836de30f0b20ba5a7cb670f451c86dbd01
Kimmo Hoikka [Thu, 11 Jun 2015 16:28:19 +0000 (09:28 -0700)]
Merge "Move tts-player.h from devel-api to public-api" into devel/master
Adeel Kazmi [Thu, 11 Jun 2015 10:19:30 +0000 (03:19 -0700)]
Merge "DALi Version 1.0.44" into devel/master
Tom Robinson [Thu, 11 Jun 2015 09:46:09 +0000 (10:46 +0100)]
DALi Version 1.0.44
Change-Id: Ia4f5fedef21892bf2fc8e88c5287c0146edff275
Victor Cebollada [Thu, 11 Jun 2015 08:19:33 +0000 (09:19 +0100)]
COMMON script added.
Change-Id: Ic809fdb911b4fcab2e8eec2beeb05732be603a18
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Richard Huang [Wed, 10 Jun 2015 16:29:08 +0000 (17:29 +0100)]
Move tts-player.h from devel-api to public-api
Change-Id: Id6896886de17078ceaebb84e33e9559bfd90027a
Adeel Kazmi [Wed, 10 Jun 2015 10:10:40 +0000 (11:10 +0100)]
Fix Tizen x86 & ARM build break
dali-adaptor.spec is for:
http://download.tizen.org/releases/daily/tizen/common/latest/repos/ia32-wayland
ONLY
Change-Id: Ifab34480d176cda3b94406b0b5d0b8b559241b00
suhyung Eom [Tue, 9 Jun 2015 09:17:27 +0000 (18:17 +0900)]
Fix build error caused by appFw modification
Signed-off-by: suhyung Eom <suhyung.eom@samsung.com>
Change-Id: I3280a309c32da03ab56fe99be1471fea73874b14
Kimmo Hoikka [Thu, 4 Jun 2015 10:44:57 +0000 (03:44 -0700)]
Merge "DALi Version 1.0.43" into tizen
Richard Huang [Thu, 4 Jun 2015 10:06:05 +0000 (11:06 +0100)]
DALi Version 1.0.43
Change-Id: Ia58646c3c336c4cf22d2a455fa0315985d067083
daemyung jang [Thu, 4 Jun 2015 04:42:26 +0000 (13:42 +0900)]
Add devel-api include path into dali-integration.pc.in
Change-Id: Ie40f9c0701729c3521b8d2b8b7f4928c90536ec3
Adeel Kazmi [Wed, 3 Jun 2015 10:59:13 +0000 (11:59 +0100)]
(AutomatedTests) Synchronise with core & remove boost & installed headers for coverage
Change-Id: I044f617e5898ed19e7468625853617efe9b54799
Lee Morgan [Tue, 2 Jun 2015 14:01:54 +0000 (15:01 +0100)]
Added boost requirement for devel package
Now its removed from toolkit
Change-Id: If22bae28fa15cb218e881c20fc4d35353020a9a7
Kimmo Hoikka [Fri, 29 May 2015 17:38:47 +0000 (10:38 -0700)]
Merge "Changes for std::vector removal from api" into tizen
Kimmo Hoikka [Fri, 29 May 2015 15:44:58 +0000 (08:44 -0700)]
Merge "Support moving of native-image-interface and image-operations to public-api" into tizen
Lee Morgan [Fri, 29 May 2015 13:52:41 +0000 (14:52 +0100)]
Changes for std::vector removal from api
Change-Id: I7f0750c3d5c33b4129ca89dd35674430c60214ca
Heeyong Song [Fri, 22 May 2015 04:37:08 +0000 (13:37 +0900)]
Change WheelEvent
- Replace MouseWheelEvent with WheelEvent
- Add custom wheel event type
Change-Id: Ie56513a13b2b6d512e151223d1c47623b4b055b8
Nick Holland [Fri, 29 May 2015 10:32:15 +0000 (11:32 +0100)]
Support moving of native-image-interface and image-operations to public-api
Change-Id: I46f03e922dcb2c90dfeef27e68c45f7a403e8513
Adeel Kazmi [Fri, 29 May 2015 08:01:15 +0000 (09:01 +0100)]
DALi Version 1.0.42
Change-Id: I7284c36eca7c9da52ee1c885797295190ed8749f
Adeel Kazmi [Thu, 28 May 2015 16:39:21 +0000 (17:39 +0100)]
(AutomatedTests) Added negative application test cases
Function coverage for Application up to 100%
Change-Id: I3fb370548a23af77d85a4b534adf9e37a428ab25
Victor Cebollada [Fri, 22 May 2015 14:17:05 +0000 (15:17 +0100)]
Scripts added.
Cyrillic, Georgian, Greek and Armenian.
Change-Id: Ie8ca2ea98fc142ba0a4ce727264f91b1374d526c
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Richard Huang [Wed, 27 May 2015 15:10:33 +0000 (16:10 +0100)]
Update UTC for Window
Change-Id: Ic1d0a819fe804f26e7cd21d28cabab0fdbfb2961
Agnelo Vaz [Fri, 22 May 2015 13:23:24 +0000 (14:23 +0100)]
VirtualKeyboard API for Settings
Change-Id: Ic16296cf6fe0e8f4b9c67d353dcc12495451c685
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
Adeel Kazmi [Fri, 22 May 2015 17:40:09 +0000 (18:40 +0100)]
(AutomatedTests) Added Application & Timer tests
Change-Id: I1a1ebfca2187178f125904a834c2b91d147117b6
Ferran Sole [Fri, 22 May 2015 18:03:40 +0000 (19:03 +0100)]
Added test case for PixmapImage
Change-Id: I4841f2a5ad783fc559f3371940ef7272450c24f5
Kimmo Hoikka [Fri, 22 May 2015 18:24:29 +0000 (11:24 -0700)]
Merge "Add test case for Window" into tizen
Kimmo Hoikka [Fri, 22 May 2015 18:16:28 +0000 (11:16 -0700)]
Merge "(Orientation) Move to devel-api" into tizen
Richard Huang [Fri, 22 May 2015 16:55:02 +0000 (17:55 +0100)]
Add test case for Window
Change-Id: I46f3cf9e26b71ee536bf7742bd112f48e993048b
Adeel Kazmi [Fri, 22 May 2015 15:36:14 +0000 (16:36 +0100)]
Convert StyleChange to an enum
Change-Id: I065c581224edb845ec0b67cf9dfb3e3fd7df86be
Xiangyin Ma [Fri, 22 May 2015 16:12:55 +0000 (17:12 +0100)]
(Orientation) Move to devel-api
Change-Id: I0e83b756bb5ad7c4c09e68a4508d74d6c4290070
Paul Wisbey [Fri, 22 May 2015 16:42:57 +0000 (09:42 -0700)]
Merge "InputMethod Public enums added for settings" into tizen
Agnelo Vaz [Thu, 21 May 2015 16:53:38 +0000 (17:53 +0100)]
InputMethod Public enums added for settings
Change-Id: Ic1a0cf976acda726a48a3a2c863ff2fdbd8fa716
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
Yoonsang Lee [Sun, 17 May 2015 02:49:52 +0000 (11:49 +0900)]
Move PixmapImage to public-api
- Move pixmap-image.h from devel-api to public-api
Change-Id: I9887502326a1b8aad050d3882d5569392fabf07a
Signed-off-by: Adeel Kazmi <adeel.kazmi@samsung.com>
Adeel Kazmi [Thu, 21 May 2015 14:30:15 +0000 (15:30 +0100)]
(AutomatedTests) Ensure local headers are included before installed
Change-Id: I375e2acf7e856a8f08385b532ea01f5f267b0360
Kimmo Hoikka [Wed, 20 May 2015 14:29:36 +0000 (15:29 +0100)]
Move illegal file access from style manager to adaptor
Change-Id: Iad712d3e9ee8a1fd8237298cefb10e5bae06020e
Adeel Kazmi [Tue, 19 May 2015 13:39:38 +0000 (06:39 -0700)]
Merge "Remove unused set/get available orientations that uses vector-wrapper (which we cannot to use in public API)" into tizen
Paul Wisbey [Tue, 19 May 2015 13:38:48 +0000 (06:38 -0700)]
Merge "Added Application::New(..., stylesheet)" into tizen
Kimmo Hoikka [Fri, 24 Apr 2015 17:30:21 +0000 (18:30 +0100)]
Remove unused set/get available orientations that uses vector-wrapper (which we cannot to use in public API)
Change-Id: Ic9954d0b1e154a5c26870d60e025967b08ad5631
Andrew Cox [Tue, 19 May 2015 09:57:38 +0000 (10:57 +0100)]
Removed ScopedPointer header includes
Not used. Deleting this file in core.
Change-Id: Ifea04b6cdd44cf31afc4bb72259cd389b629a79d
Signed-off-by: Andrew Cox <andrew.cox@partner.samsung.com>
Paul Wisbey [Mon, 18 May 2015 13:45:45 +0000 (14:45 +0100)]
Added Application::New(..., stylesheet)
+ get application name from command-line args
+ removed legacy DeviceLayout
Change-Id: If5d0f1a982ac48b54aa97bdbe1e58aba7926682c
Nick Holland [Fri, 15 May 2015 11:08:04 +0000 (12:08 +0100)]
Move more public-api headers to devel-api. PART 2
Support for dali-core header file changes:
Change-Id: I121ff9275458942f0d07725ba98c7c3bdb716b24
Nick Holland [Thu, 7 May 2015 08:55:41 +0000 (09:55 +0100)]
Create devel-api folder for header files used by Toolkit
Moved the following from public-api to devel-api:
accessibility-action-handler.h
accessibility-gesture-handler.h
accessibility-manager.h
bitmap-loader.h
bitmap-saver.h
clipboard-event-notifier.h
clipboard.h
color-controller.h
drag-and-drop-detector.h
event-feeder.h
feedback-plugin.h
haptic-player.h
imf-manager.h
lifecycle-controller.h
performance-logger.h
pixmap-image.h
render-surface.h
singleton-service.h
sound-player.h
style-monitor.h
tilt-sensor.h
tts-player.h
virtual-keyboard.h
physical-keyboard.h
Only headers remaining in public-api are:
application.h
application-configuration.h
device-layout.h
key.h
orientation.h
timer.h
window.h
style-change.h
Also moved TextAbstraction to devel folder
Change-Id: I2b831679d5b2a002b5360319e8ac8b5b8a11170a
Kimmo Hoikka [Thu, 14 May 2015 09:34:23 +0000 (02:34 -0700)]
Merge "Emit language changed signal" into tizen
Paul Wisbey [Wed, 13 May 2015 10:58:09 +0000 (03:58 -0700)]
Merge "API method added to retrieve the ellipsis glyph." into tizen
Paul Wisbey [Tue, 12 May 2015 15:01:57 +0000 (16:01 +0100)]
Removed remaining references to glyph cache
Change-Id: I460099b1ea492139fd8cdc7581ac4eba97cf2ecb
Victor Cebollada [Tue, 12 May 2015 13:22:39 +0000 (14:22 +0100)]
API method added to retrieve the ellipsis glyph.
Change-Id: If3e21dca98af940f17242cb50481e70a6108c58c
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Adeel Kazmi [Tue, 12 May 2015 15:42:05 +0000 (08:42 -0700)]
Revert "Add key grab/ungrab interfaces for Tizen"
This reverts commit
03cb56098f199af27ae1bde7940fdaf0b1359e62.
Change-Id: I14d6851a5fbed5f3f060413b8ee520ccd9dc3520
Yoonsang Lee [Mon, 27 Apr 2015 10:33:06 +0000 (19:33 +0900)]
Add key grab/ungrab interfaces for Tizen
The key grab feature is designed for following example scenarios:
- TV : A user might want to change the volume or channel of the background TV contents while focusing on the foregrund app.
- Mobile : When a user presses Home key, the homescreen appears regardless of current foreground app.
Change-Id: I152a5068d513d4b6dca748887da199a1c7516f6d
Heeyong Song [Mon, 11 May 2015 02:23:07 +0000 (11:23 +0900)]
Emit language changed signal
Change-Id: Ib0ba8829f7e4dd13ec0350772764df711b37f069
Nick Holland [Fri, 8 May 2015 12:52:26 +0000 (13:52 +0100)]
DALi Version 1.0.41
Change-Id: I676db1ef215d9cd582aeefd881e10573462f1edc
Andrew Cox [Tue, 28 Apr 2015 18:57:04 +0000 (19:57 +0100)]
Improved control of downscaling inside JPEG Loader
* Avoids blurry JPEGs.
* Requires downscaling to be requested by app for jpeg loading library's
downscaling to be engaged.
Change-Id: I105f243e0bb18fec197c7d5a76f98e71cffd4c98
Signed-off-by: Andrew Cox <andrew.cox@partner.samsung.com>
taeyoon [Wed, 6 May 2015 05:35:57 +0000 (22:35 -0700)]
Merge "Add exception for unsupported EGL or DDK" into tizen
Adeel Kazmi [Tue, 5 May 2015 14:47:06 +0000 (15:47 +0100)]
(AutomatedTests) Fix for 14.04
Change-Id: Iacad2c1f0703e603d8d55defddbfa1c21d95ee27
taeyoon [Mon, 4 May 2015 07:47:08 +0000 (16:47 +0900)]
Add exception for unsupported EGL or DDK
Change-Id: I70fbb1397125206c4379a24a6f75fb7a9c8d9870
Paul Wisbey [Thu, 30 Apr 2015 18:00:37 +0000 (19:00 +0100)]
Removed some dead code
Change-Id: I72f0c608b7c7e8ff97316bcd054fd8181890e353
Lee Morgan [Wed, 29 Apr 2015 14:34:13 +0000 (15:34 +0100)]
DALi Version 1.0.40
Change-Id: I3057b08a8e356388f1009ef800091d43a822cebe
taeyoon [Tue, 28 Apr 2015 07:55:16 +0000 (16:55 +0900)]
Fix work issue in wayland
- Add ecore_wl_init(), ecore_wl_display_get()
Change-Id: I41f79c7bf785ac1f67191f7f3db50bbd994cbc6f
Ferran Sole [Mon, 20 Apr 2015 13:46:03 +0000 (14:46 +0100)]
Alpha function changes
Change-Id: I756e0b8675513aa8fbedcf11433601fb7f3acaea
Adeel Kazmi [Thu, 23 Apr 2015 14:33:49 +0000 (07:33 -0700)]
Merge "Move environment variable parsing to environment options" into tizen
Xiangyin Ma [Thu, 23 Apr 2015 11:04:27 +0000 (12:04 +0100)]
DALi Version 1.0.39
Change-Id: Ib4501300827a81c7b3dbd6399c4083605d3517d8
Kimmo Hoikka [Thu, 23 Apr 2015 10:12:13 +0000 (11:12 +0100)]
Move environment variable parsing to environment options
Change-Id: Ifd35a66a3c7e84d78bf9c86483dbbeee5b25309b
Adeel Kazmi [Wed, 22 Apr 2015 10:23:37 +0000 (03:23 -0700)]
Merge "Remove unnecessary stream operators from radian and degree as well as unnecessary Degree constructor from AngleAxis" into tizen
daemyung jang [Wed, 8 Apr 2015 02:26:14 +0000 (11:26 +0900)]
Delete useless white spaces.
Change-Id: Ie9f14732a6280eb6612907b608da1784f4fc7890
Tom Robinson [Tue, 21 Apr 2015 11:02:48 +0000 (12:02 +0100)]
Update copyright year to 2015 for public api: adaptor
Change-Id: I1b8b1aa031c91f5d39a07e818c6c70abc12bf29b
Kimmo Hoikka [Tue, 21 Apr 2015 10:52:36 +0000 (11:52 +0100)]
Remove unnecessary stream operators from radian and degree as well as unnecessary Degree constructor from AngleAxis
Change-Id: Id66962adac73b95435587d3abcf63fef47c38dd3
daemyung jang [Tue, 14 Apr 2015 12:02:20 +0000 (21:02 +0900)]
Process Interrupted event when tap gesture detector is Touched status.
The problem is tap gesture detector can't make gesture event correctly.
The cause is beneath.
1. Tap gesture detector is Registered and takes Down event.
2. Tap gesture detector changes its status to Touched.
3. Suddenly it takes Interrupted event.
4. Ignore all touch events till it takes Up event.
Change-Id: I3b85b4a174ee898c6b1ed2c970035b62697fd6cd
Andrew Cox [Tue, 31 Mar 2015 13:02:19 +0000 (14:02 +0100)]
Cleanup for removal of ImageAttributes from public API
This is cleanup after core patch:
https://review.tizen.org/gerrit/#/c/37213
Change-Id: Idf8c2bad2150cd253e9c70c4b3d1b55b26713f9d
Signed-off-by: Andrew Cox <andrew.cox@partner.samsung.com>
Kimmo Hoikka [Wed, 15 Apr 2015 18:52:35 +0000 (19:52 +0100)]
Cleaned up Degree, Radian, AngleAxis and Quaternion classes
- Inline Degree, Radian and AngleAxis types to avoid unnecessary exports / export table lookups in using code
- Change AngleAxis to store a Radian angle for better accuracy
- Make Quaternion explicitly take a Radian as constructor
Change-Id: Ie359fb5a876ef395f85e8ef15857c6cc75389bef
Paul Wisbey [Thu, 16 Apr 2015 12:48:56 +0000 (05:48 -0700)]
Merge "Remove orientation from application class" into tizen
HyunJu Shin [Thu, 16 Apr 2015 07:16:32 +0000 (00:16 -0700)]
Merge "Change a service name of the indicator and remove a unused indicator style" into tizen
Paul Wisbey [Wed, 15 Apr 2015 15:11:04 +0000 (08:11 -0700)]
Merge "Enable Freetype Bitmap (Emoji) support from configure.ac" into tizen
Victor Cebollada [Tue, 14 Apr 2015 10:33:31 +0000 (11:33 +0100)]
Shaping fixes:
- Offset metric added to place some glyphs correctly.
- Fix wrong reordering for some right to left strings.
Change-Id: I3663e040eeaa015a523c8e1e04b6aeb0ed523b5b
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Paul Wisbey [Wed, 15 Apr 2015 12:10:18 +0000 (05:10 -0700)]
Merge "DALi Version 1.0.38" into tizen
Ferran Sole [Wed, 15 Apr 2015 11:57:59 +0000 (12:57 +0100)]
DALi Version 1.0.38
Change-Id: I55394baaf6774ef1aac193c3c9c99195325bf48f
Nick Holland [Wed, 15 Apr 2015 08:47:04 +0000 (09:47 +0100)]
Enable Freetype Bitmap (Emoji) support from configure.ac
Checks freetype library version >= 17.1.11 (freetype version 2.5.2) to
enable bitmap support.
To check installed freetype library version use:
freetype-config --version
For freetype version use:
freetype-config --ftversion
Change-Id: If51a117991649e2d038c4fd965c10a859d76b6a8
Signed-off-by: Nick Holland<n.holland@partner.samsung.com>
Nick Holland [Fri, 10 Apr 2015 14:26:09 +0000 (15:26 +0100)]
Remove orientation from application class
Orientation is available from Window, so no longer required from application.
Change-Id: I1ce5ff6a23fd0d7fa0c007a421410608aeaa0bf7
Nick Holland [Thu, 26 Mar 2015 11:27:34 +0000 (11:27 +0000)]
Added thread safe ttrace support
To enable:
DALI_PERFORMANCE_TIMESTAMP_OUTPUT=4 dali-demo
If ttrace is not part of the build environment it will fall back on using
DALi log.
Without ttrace enabled Output will look like:
INFO: DALI: AsyncBegin: UPDATE : cookie -
739011608
INFO: DALI: AsyncEnd: UPDATE : cookie -
739011608
INFO: DALI: Marker: V_SYNC
INFO: DALI: Marker: V_SYNC
INFO: DALI: Marker: V_SYNC
INFO: DALI: Marker: V_SYNC
INFO: DALI: AsyncBegin: PROCESS_EVENT : cookie -
172927739
INFO: DALI: AsyncEnd: PROCESS_EVENT : cookie -
172927739
INFO: DALI: AsyncEnd: RENDER : cookie -
869100763
INFO: DALI: AsyncBegin: RENDER : cookie -
869100763
INFO: DALI: Marker: V_SYNC
INFO: DALI: AsyncBegin: UPDATE : cookie -
739011608
INFO: DALI: AsyncEnd: UPDATE : cookie -
739011608
INFO: DALI: AsyncBegin: PROCESS_EVENT : cookie -
172927739
INFO: DALI: AsyncEnd: PROCESS_EVENT : cookie -
172927739
To log custom markers in an application...
PerformanceLogger logger = PerformanceLogger::New("MyMarker");
logger.AddMarker(PerformanceLogger::START_EVENT);
// do stuff
logger.AddMarker(PerformanceLogger::END_EVENT);
Documentation for this patch is included in shared markdown file:
https://review.tizen.org/gerrit/#/c/37690/
Change-Id: I17b4e99399d4bdb9001f8a9bdf5b690865722b02
Heeyong Song [Wed, 15 Apr 2015 06:02:26 +0000 (15:02 +0900)]
Change a service name of the indicator and remove a unused indicator style
Change-Id: I3d04857e1a10d12199b16c6002d1613acef0482d
Kimmo Hoikka [Tue, 14 Apr 2015 10:52:58 +0000 (03:52 -0700)]
Merge "Re-enable Color Emoji on platforms which have FreeType >= 2.0" into tizen
Paul Wisbey [Mon, 13 Apr 2015 17:26:36 +0000 (18:26 +0100)]
Re-enable Color Emoji on platforms which have FreeType >= 2.0
Change-Id: I33451753d3bab2360a1a6834ad70d8509586ad2c
Nick Holland [Mon, 13 Apr 2015 15:01:18 +0000 (16:01 +0100)]
Fix compile errors after removing boost function include from dali-core
Change-Id: I753842cfebbcbb76f3fb4443d6dd392c4391062a
Kingsley Stephens [Fri, 10 Apr 2015 14:35:33 +0000 (15:35 +0100)]
DALi Version 1.0.37
Change-Id: Ie9263c86a2f2dd3cf56a963a5fbf5278a08d40b9
Paul Wisbey [Thu, 9 Apr 2015 15:51:36 +0000 (16:51 +0100)]
Merge branch 'new_text' into tizen
Change-Id: I4084c10fec73a78eb03b2b1e25d8ca09479c1061
Paul Wisbey [Thu, 9 Apr 2015 10:53:29 +0000 (11:53 +0100)]
Merge remote-tracking branch 'origin/tizen' into new_text
Change-Id: Id894a3d5d460cd4fb22d9bb25559bd2173df0e54
Victor Cebollada [Wed, 8 Apr 2015 08:07:01 +0000 (09:07 +0100)]
Fix for GetCharactersDirection().
Was not giving the correct direction for neutral characters.
Change-Id: I34b7eb666d90678ebc4ad11df52dfbde1947cbb9
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Victor Cebollada [Thu, 2 Apr 2015 16:25:32 +0000 (17:25 +0100)]
New libunibreak.
Change-Id: I7850ca7c30d24338fa8f692c67cae19e94ac143e
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Adeel Kazmi [Tue, 7 Apr 2015 20:15:45 +0000 (21:15 +0100)]
Changes following ActiveConstraint removal
Change-Id: I2aadf9e5f39173aabfe7f4bf5e11e91e643aa0e5
Adeel Kazmi [Tue, 7 Apr 2015 20:13:10 +0000 (21:13 +0100)]
(AutomatedTests) Use the outputImage address rather than the address of the pointer
Change-Id: I634a5a3f9b8e9839e2d515cf8ecbcc05f7123c23
Paul Wisbey [Tue, 7 Apr 2015 14:38:12 +0000 (15:38 +0100)]
Fixed merge error
Change-Id: I90565d7292bbe2fbfea3ed09220bdb001d65c4fe
Paul Wisbey [Tue, 7 Apr 2015 10:23:52 +0000 (11:23 +0100)]
Merge remote-tracking branch 'origin/tizen' into new_text
Conflicts:
adaptors/common/adaptor-impl.cpp
build/tizen/adaptor/Makefile.am
Change-Id: I35f6abe9eeebb9f3f73f4f75c32c3bcd07682cf3
HyunJu Shin [Tue, 7 Apr 2015 10:09:51 +0000 (03:09 -0700)]
Merge "Update image downloading functionality" into tizen
Adeel Kazmi [Fri, 3 Apr 2015 05:51:21 +0000 (06:51 +0100)]
DALi Version 1.0.36
Change-Id: Ifeff8e1928a221d46e0cc80b8efcd0c43eb9a143
Richard Underhill [Wed, 1 Apr 2015 10:53:43 +0000 (11:53 +0100)]
Added underline position and thickness to FontMetrics
Change-Id: I036851956f96fe604a30da0ba3c1be4a51eaf325
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
HyunJu Shin [Wed, 1 Apr 2015 04:24:18 +0000 (21:24 -0700)]
Merge "Remove non-public APIs of Animation" into tizen
Jonghyun Ho [Mon, 30 Mar 2015 02:57:23 +0000 (11:57 +0900)]
Separating integration-devel from devel package for 2nd party to use adaptor #2 (touch issue fixed)
- hidden for 3rd party
Change-Id: I6cff9c9bd9d17aa465096175ed3eb915a00e6832
Heeyong Song [Tue, 31 Mar 2015 01:51:06 +0000 (10:51 +0900)]
Remove non-public APIs of Animation
Change-Id: Ia741f71aa40da0e8b5b6e5bf58929a5d34010892
Yoonsang Lee [Fri, 13 Mar 2015 06:33:00 +0000 (15:33 +0900)]
Update image downloading functionality
- Support for https protocol.
- Set connection timeout to 30 sec.
- Log curl error code in failure cases.
Change-Id: If05803c12ed8619d49d4ae481d82f90eb710f650
Paul Wisbey [Mon, 30 Mar 2015 14:50:22 +0000 (15:50 +0100)]
Merge remote-tracking branch 'origin/tizen' into new_text
Change-Id: I6fab774d982acc9cc82144c82134379e573658a5
Paul Wisbey [Mon, 30 Mar 2015 14:45:34 +0000 (15:45 +0100)]
Removed some junk from configure.ac
Change-Id: I19b9bde46cf4395d464534e12a4a88214fb47368