Francisco Santos [Thu, 25 Jun 2015 13:52:15 +0000 (14:52 +0100)]
Merge branch 'devel/master' into devel/new_mesh
Conflicts:
build/tizen/configure.ac
Change-Id: If7a3942fd3f79cfa01b808345875bf121bdb9898
taeyoon [Thu, 25 Jun 2015 07:53:18 +0000 (16:53 +0900)]
Move window-extension.h from public-api to devel-api
Change-Id: I3294247348eb4316285d2f350c7924c76645821e
Adeel Kazmi [Wed, 24 Jun 2015 14:59:25 +0000 (07:59 -0700)]
Merge "DALi Version 1.0.46" into devel/master
Chu Hoang [Wed, 24 Jun 2015 14:54:29 +0000 (15:54 +0100)]
DALi Version 1.0.46
Change-Id: I3c34c9581ade654934bbe62dbfd12077e61560d7
Yoonsang Lee [Tue, 23 Jun 2015 06:08:10 +0000 (15:08 +0900)]
Fix Tizen build break - change gles20 to glesv2
Change-Id: I26dfd5a0bdb0573292cb34bbe4a3c540ec2aeee9
Kimmo Hoikka [Mon, 22 Jun 2015 17:00:46 +0000 (10:00 -0700)]
Merge "Fix prevent issue - resource leak" into devel/master
Kimmo Hoikka [Mon, 22 Jun 2015 16:39:43 +0000 (09:39 -0700)]
Merge "Fixed issue with double-tap gestures" into devel/master
Paul Wisbey [Mon, 22 Jun 2015 13:39:59 +0000 (14:39 +0100)]
Fixed issue with double-tap gestures
Change-Id: I9b936ad29454d86fac32216b3210390729bff7d5
Adeel Kazmi [Mon, 22 Jun 2015 15:04:35 +0000 (08:04 -0700)]
Merge "Change Object profiler to use Environment Options, harmonize environment variable name (now: DALI_OBJECT_PROFILER_INTERVAL)" into devel/master
Kimmo Hoikka [Mon, 22 Jun 2015 14:32:37 +0000 (15:32 +0100)]
Fix FPS tracking through environment variable (and make if a bit more lightweight and usable)
Change-Id: Idc04f90cf088aab1704c0d242aabab7c4222f90d
taeyoon [Mon, 22 Jun 2015 13:39:48 +0000 (22:39 +0900)]
Fix prevent issue - resource leak
Change-Id: Ib095425b6fbd5a47777a9011cc7ddd10f6892ec0
Adeel Kazmi [Mon, 22 Jun 2015 13:25:40 +0000 (14:25 +0100)]
Ensure libunibreak does not export symbols
CXXFLAGS are being set but they're not picked up when compiling C files, therefore we have to set
CFLAGS in adaptor as well.
Change-Id: I807192f9de3bdde9ea2822673b6ddd6ba577f9ed
Kimmo Hoikka [Mon, 22 Jun 2015 12:47:56 +0000 (13:47 +0100)]
Change Object profiler to use Environment Options, harmonize environment variable name (now: DALI_OBJECT_PROFILER_INTERVAL)
Change-Id: I095e84289d50c977668507fc9894fccb6b860079
Francisco Santos [Mon, 22 Jun 2015 10:45:14 +0000 (11:45 +0100)]
Update profiling of objects with new mesh objects.
Change-Id: Ic256ff18235930c2ba0e7dd22b183baa8269c188
Agnelo Vaz [Fri, 19 Jun 2015 10:42:50 +0000 (11:42 +0100)]
Fix Clipboard to return 0 when has no items
Change-Id: If7ce529fa7dfe3ca0ef71a82a7663bf70dff80f1
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
Andrew Cox [Thu, 18 Jun 2015 15:18:11 +0000 (16:18 +0100)]
Removed traces of ImageAttributes and dead old JPEG loader
Change-Id: I67e4cc0ec822d8930e18bdae04c6d9d7fb85de25
Signed-off-by: Andrew Cox <andrew.cox@partner.samsung.com>
Adeel Kazmi [Thu, 18 Jun 2015 11:18:21 +0000 (04:18 -0700)]
Merge "DALi Version 1.0.45" into devel/master
Xiangyin Ma [Thu, 18 Jun 2015 11:14:19 +0000 (12:14 +0100)]
DALi Version 1.0.45
Change-Id: Icce7e1b7c5ae035cd76e440da89cbeeb565b4ea2
Heeyong Song [Thu, 11 Jun 2015 01:57:32 +0000 (10:57 +0900)]
Fix prevent issue - Dereference null return value
Change-Id: If062d1ac9e2d229cc6c175e02c5841305a725d56
Kimmo Hoikka [Wed, 17 Jun 2015 16:39:15 +0000 (09:39 -0700)]
Merge "Removed Setters from EnvironmentOptions & added WindowClassName as an environment variable" into devel/master
Adeel Kazmi [Wed, 17 Jun 2015 15:37:37 +0000 (08:37 -0700)]
Merge "Change Application to use NotifySceneCreated from Adaptor" into devel/master
Victor Cebollada [Mon, 15 Jun 2015 08:30:22 +0000 (09:30 +0100)]
Add the 'Carriage Return' character to the IsNewParagraph().
Change-Id: I01c559eca64c69611759b9e7b601fb2287cdb4a4
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Adeel Kazmi [Wed, 17 Jun 2015 10:54:31 +0000 (11:54 +0100)]
Removed Setters from EnvironmentOptions & added WindowClassName as an environment variable
Change-Id: I18d078328dffa6cb63f282237bf5b21204ca6e1a
Kimmo Hoikka [Wed, 17 Jun 2015 09:55:37 +0000 (02:55 -0700)]
Merge "Use environment option to set the name of the window" into devel/master
Kimmo Hoikka [Tue, 16 Jun 2015 15:59:40 +0000 (16:59 +0100)]
Change Application to use NotifySceneCreated from Adaptor
Change-Id: Iff5b4cb1c08ed15d2fa73c0a69958c496d1c1853
Kimmo Hoikka [Tue, 16 Jun 2015 15:02:44 +0000 (08:02 -0700)]
Merge "Add API to notify adaptor that scene has been created" into devel/master
Adeel Kazmi [Tue, 16 Jun 2015 14:36:04 +0000 (15:36 +0100)]
Use environment option to set the name of the window
Change-Id: I58fde9c92fc5612a3897bf943451d4619a70d57b
Adeel Kazmi [Tue, 16 Jun 2015 13:38:09 +0000 (14:38 +0100)]
Window initial size is set as per environment variables
Problem: EnvironmentOptions class was created by adaptor. The window class gets created before
environment options are parsed by the adaptor and some window managers ignore resize
requests.
Solution: Create EnvironmentOptions in Application class and pass them to Adaptor. Adaptor still
has the ability to create the class if it is not passed the options.
Change-Id: I634ebc999049fcc5e09116cbfa3a6e03f4a52563
Jonghyun Ho [Fri, 12 Jun 2015 02:28:59 +0000 (11:28 +0900)]
Add API to notify adaptor that scene has been created
Change-Id: I26c3336868f1ac02f19ecc813039799f343fd031
Kimmo Hoikka [Mon, 15 Jun 2015 16:22:55 +0000 (09:22 -0700)]
Merge "Add API to get the current state of TTS player" into devel/master
daemyung jang [Fri, 12 Jun 2015 03:03:38 +0000 (12:03 +0900)]
Add device smack rule and fix build erros when using mobile spec.
Change-Id: I801bcb1cc29d80142286ee5c89151a610300915e
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
Francisco Santos [Thu, 4 Jun 2015 16:31:19 +0000 (17:31 +0100)]
Merge branch 'tizen' into devel/new_mesh
Change-Id: I38c536fc0ba528d76aefd1809b76aac840f291ed
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
Francisco Santos [Thu, 28 May 2015 13:33:40 +0000 (14:33 +0100)]
Print a compreensive string for EGL errors.
Change-Id: Ib5b61ff30cc43de1a497ecd3b5a4f344b6fc0426
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
Francisco Santos [Mon, 18 May 2015 16:45:52 +0000 (17:45 +0100)]
Merge remote-tracking branch 'origin/tizen' into devel/new_mesh
Conflicts:
adaptors/common/indicator-impl.h
Change-Id: Iaff09e5fd5ad5634b722a4dc4ecd96c0fce5f958
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
Francisco Santos [Mon, 27 Apr 2015 14:48:47 +0000 (15:48 +0100)]
Merge remote-tracking branch 'origin/tizen' into devel/new_mesh
Change-Id: Ic5d6300c82f8984f21dd14f4355ef6f8a36ff4cc
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