platform/upstream/efl.git
6 years agoevas_gl: remove GL_VERSION wrapping
Daekwang Ryu [Wed, 13 Dec 2017 14:14:22 +0000 (23:14 +0900)]
evas_gl: remove GL_VERSION wrapping

Remove GL_SHADING_LANGUAGE_VERSION because tizen support GLES 3.x.

Change-Id: I60f5d58b39b22dde6a6e3fb4b6502cbdf81415ba

6 years agoevas_gl: remove hack code in evgl_api_gles3_get()
Daekwang Ryu [Wed, 13 Dec 2017 13:55:28 +0000 (22:55 +0900)]
evas_gl: remove hack code in evgl_api_gles3_get()

Change-Id: I96bb71fceea5126694a67417caef8b4f50ca0a34

6 years agoelm_win: undeprecate elm_win_type_set for tizen.
Jiyoun Park [Thu, 14 Dec 2017 06:36:00 +0000 (15:36 +0900)]
elm_win: undeprecate elm_win_type_set for tizen.

tizen need to change win type after window creation.

Change-Id: I7053f6313be785f12bf7c698bf64880f5e0ed58a

6 years agoelm_win_input_rect_set/add/subtract added
Jiyoun Park [Thu, 14 Dec 2017 05:35:22 +0000 (14:35 +0900)]
elm_win_input_rect_set/add/subtract added

Before_Change-Id: I0ff5ae24eb30b3d824da7fd020db96fe41eac6cc
Signed-off-by: Junghwan Choi <jhhh.choi@samsung.com>
Change-Id: Iaf9b0ca33f1bdde5d4a42f78fdcaa3ebb307a3d7

6 years agoremove ecore_imf module since isf provide it
Jongmin Lee [Thu, 14 Dec 2017 03:17:01 +0000 (12:17 +0900)]
remove ecore_imf module since isf provide it

Change-Id: I159e25e3086c0782bcd018ad4a04a19aee65d0be

6 years agoedje_cc: add nine-patch feature
Jeonghyun Yun [Thu, 14 Dec 2017 02:35:56 +0000 (11:35 +0900)]
edje_cc: add nine-patch feature

@tizen_feature

Change-Id: Ie56ee6f82b1e6a33e23bf3c641cfa76c1a90d272
Signed-off-by: Jeonghyun Yun <jh0506.yun@samsung.com>
6 years agoEvasGL: Fix the bug as EvasGL can not find the config
Wonsik, Jung [Thu, 14 Dec 2017 02:28:24 +0000 (11:28 +0900)]
EvasGL: Fix the bug as EvasGL can not find the config

Fix the bug of reset config value by native window config
@TIZEN_ONLY

Change-Id: Ie3518fcbc9480f03288b57bd427b05b550bcf380

6 years agoAdd ecore cplusplus extern define
Jeonghyun Yun [Thu, 14 Dec 2017 01:45:00 +0000 (10:45 +0900)]
Add ecore cplusplus extern define

Change-Id: I98738db07f015896f753afb5f9fa083c4d7cec37
Signed-off-by: Jeonghyun Yun <jh0506.yun@samsung.com>
6 years agoeina_list: fix old-style-cast warning
Jiyoun Park [Wed, 13 Dec 2017 23:21:57 +0000 (08:21 +0900)]
eina_list: fix old-style-cast warning

opensource changed EINA_LIST_FOREACH to use the c type casting.
it cause old-style-cast warning in c++.

Change-Id: I4411929d56a7fcbcf85b2109266079d211875426

6 years agoelm:[elm_hoversel] Added hover object in children list
Prasoon Singh [Wed, 13 Dec 2017 11:13:13 +0000 (16:43 +0530)]
elm:[elm_hoversel] Added hover object in children list

@tizen_fix

orignal patch:4ac1a2892f0024759b231a4aa286a4428ae24bb0

Change-Id: I83ddc41e26d05c6c6fe7bb32a8dc025794328721

6 years agoatspi: fix infinite loop issue
Shinwoo Kim [Wed, 13 Dec 2017 09:13:16 +0000 (14:43 +0530)]
atspi: fix infinite loop issue

It is possilbe to get a target object as a return value of
get_object_at_point. In this case _elm_widget_elm_interface_atspi_component_accessible_at_point_get
works again with the target which is same with root object.

[Enhanced]
- We do not have to go parent if the bottom up logic meets root object.
- Visiblity of panel is always true. So we are checking its SHOWING state.
  If the panel is not SHOWING, remove it from valid children list.

orignal patch: 680532bd4dff4ca12f9ec0958fcb65ac67a89256

@tizen_fix

Change-Id: I9b18a6fda915f4958c3b965454c6bb2ba9663fa6

6 years agoAdd backwards compatability implementation for elm_scale_get and elm_scale_set
Jeonghyun Yun [Wed, 13 Dec 2017 10:07:24 +0000 (19:07 +0900)]
Add backwards compatability implementation for elm_scale_get and elm_scale_set
to allow running unmodified Tizen applications on a new drop of elementary

@tizen_feature

Change-Id: I473d9928b8d6810d7ebca7be5ccb0df09894de5e
Signed-off-by: Jeonghyun Yun <jh0506.yun@samsung.com>
6 years agoRevert "evas_gl: fix evas_gl_current_context_get()"
Daekwang Ryu [Wed, 13 Dec 2017 07:59:26 +0000 (16:59 +0900)]
Revert "evas_gl: fix evas_gl_current_context_get()"

This reverts commit 7769755062b2b814f8390b60a9f39caaea150878.

Change-Id: I5ff8159c0a84d4c5b5444856becb4705eded3b5e

6 years agoelm: [atspi] remove unacceptable leaf node
JunsuChoi [Wed, 13 Dec 2017 09:26:24 +0000 (14:56 +0530)]
elm: [atspi] remove unacceptable leaf node

An object could have children which have same position. In this case, if
first child of this object is not acceptable leaf node, then there is no chance
to find second child object.

orignal patch: d834889ee1f1dfed962c9b92201412b32ce280d8

@tizen_fix

Change-Id: I663a5c980ddb4598ab2beeb0ee5f847c1b46ee49

6 years agoatspi : During the highlight grab, out signal is not sent.
JunsuChoi [Wed, 13 Dec 2017 09:14:40 +0000 (14:44 +0530)]
atspi : During the highlight grab, out signal is not sent.
There is an action that takes time to complete the highlight grab,
such as scroll bring in.
So the highlight box can be outside the screen.
After the highlight grab process is completed,
will check the highlight box status.

Change-Id: Ib114183209239f099ec7c1d081291f8953285562
Signed-off-by: Shilpa Singh <shilpa.singh@samsung.com>
6 years agoelm: [atspi]enhance _accessible_at_point_top_down_get
Shinwoo Kim [Wed, 13 Dec 2017 09:06:44 +0000 (14:36 +0530)]
elm: [atspi]enhance _accessible_at_point_top_down_get

If there is only one valid child at point, then return it.
The evas_tree_objects_at_xy_get could not find proper object,
if application does not have well aligned objects.

This could be a role of application, but this patch set could solve somehow.

@tizen_fix

orignal patch: b81db08d75d968f005810a892039e944dd517b0c

Change-Id: I53f4077c8b5b89ce906147633034ada9652e45e0

6 years agoelm: [ATSPI] Add to find genlist item using proxy image
JunsuChoi [Wed, 13 Dec 2017 08:59:36 +0000 (14:29 +0530)]
elm: [ATSPI] Add to find genlist item using proxy image

In a wearable profile, genlist displays the item using a proxy image.
When a screen-reader finds an object in the top_down, it can not find
the item. because, found item is proxy image. So, using evas_object_image_source_get
and gets item view object from proxy image.

@tizen_fix

orignal patch: da9b3affe94ecdbfbe4d67c1d554571e071ba414

Change-Id: I2218f6237e2c5c935f27bfd549c013b0b322abb2

6 years agoelm: access: genlist: Do not center align when genlist item is highlighted in wearabl...
JunsuChoi [Wed, 13 Dec 2017 08:58:01 +0000 (14:28 +0530)]
elm: access: genlist: Do not center align when genlist item is highlighted in wearable profile

orig: 65e5539a7aaee40ac132de03da18eebd820bb71e
Change-Id: I9c95392d1160510bfafbd0e9bdcdab8b7babea84
Signed-off-by: Shilpa Singh <shilpa.singh@samsung.com>
6 years agoelm:[widget][atspi] check if the access info is NULL
Shinwoo Kim [Wed, 13 Dec 2017 08:53:47 +0000 (14:23 +0530)]
elm:[widget][atspi] check if the access info is NULL

The elm_access object is deleted in job callback. the
access information is removed before adding the job.
So the access information could be NULL.

@tizen_fix

orignal patch: c46157c9484129e6bf749850e0525fb87d3410d6

Change-Id: Ic04b5bc02c8eb1ae1b3d4cb32c771f48f03563bf

6 years agoelm: [atspi][widget] Proper handling: In case of widget is registerd by elm_access_ob...
Shinwoo Kim [Wed, 13 Dec 2017 08:46:56 +0000 (14:16 +0530)]
elm: [atspi][widget] Proper handling: In case of widget is registerd by elm_access_object_register

@tizen_fix

orignal patch:5211783e90c0ce1ed169b92dcb71de7014d42c02

Change-Id: I03b7effba0360bad0503a99048874e3922e01a3e

6 years agoelm: access: Improves how to find the can_highlight of the widget.
JunsuChoi [Wed, 13 Dec 2017 08:21:56 +0000 (13:51 +0530)]
elm: access: Improves how to find the can_highlight of the widget.
Returns EINA_FALSE if any of parents is EINA_FALSE when determining can_highlight.
To determine can_highlight for the parent of an object,
we try to find the parent of the parent again.
As it repeats, it traverses as much as depth size factorial (d!) However,
if any of the parent of the object has can_highlight of the widget
data is EINA_FALSE, it is eventually EINA_FALSE

orig:
366d904cb45a7c7dd6202c16ec19d73b8784e8e6
2212fffb35af18498d53f0da894218ba59f8c8ca

Change-Id: I5ad0cc5c36f017dbbc6f07a05919a3b95aaa513c
Signed-off-by: Shilpa Singh <shilpa.singh@samsung.com>
6 years agoEcore_Device: fix app's build error becase difference between tizen & opensource
Jiyoun Park [Wed, 13 Dec 2017 08:16:10 +0000 (17:16 +0900)]
Ecore_Device: fix app's build error becase difference between tizen & opensource

Ecore_Event structure is changed in opensource. it add Eo type to all Ecore event type structure.
but currently, tize only code also add Ecore_Device to the end of Ecore event sturcture.
so we should change c code to deal with Ecore_Device type.
this is hotfix patch for build.

Change-Id: Ic4b66cf5f99e116f308831bd58d744aac82a5b56

6 years agoelm: [atspi] try bottom-up search first for getting accessible object at x,y point
Shinwoo Kim [Wed, 13 Dec 2017 07:27:21 +0000 (12:57 +0530)]
elm: [atspi] try bottom-up search first for getting accessible object at x,y point

@tizen_fix

orignal patch: 6f910731325c6503df460216c4e6500d8a1bc656:

Change-Id: Idbdace712b97639b2e3b58962b278756a38b04c7

6 years agoelm: add elm_atspi_ewk_wrapper class
Lukasz Stanislawski [Thu, 7 Dec 2017 13:56:57 +0000 (19:26 +0530)]
elm: add elm_atspi_ewk_wrapper class

Create wrapper widget around Ewk_View Evas_Object in order to
integrate a11y frameworks from elementary and Chromium. Such wrapper
should be created on Chromium EFL port side, however currently will be
added on elementary side with hope to move it into chromium library.

@tizen_feature

orignal patch: 85d052b2e63dc7e0b5286cea61c0870a2f854dcc

Change-Id: I8e99a836e5c47d8e37100b5309c200fbfa20960d

6 years agoevas_gl: sync with Evas_GL.h of Tizen
Daekwang Ryu [Tue, 12 Dec 2017 06:21:14 +0000 (15:21 +0900)]
evas_gl: sync with Evas_GL.h of Tizen

Change-Id: I68cd5c2b36416d692e8c4fba70e826b93ebfe50c

6 years agoevas_gl: fix evas_gl_current_context_get()
Daekwang Ryu [Tue, 12 Dec 2017 04:54:46 +0000 (13:54 +0900)]
evas_gl: fix evas_gl_current_context_get()

evas_gl_current_context_get() function should return
the context of evas_gl_common_current_context_get()
becuase CONTEXT_RESTORE feature was added.
CONTEXT_RESTORE makes app call evas_gl_make_current() only once
without evas_gl context switching.

Change-Id: Ic1807436691ce714ee7f8dc231d7215db37c2959

6 years agoevas_gl: add creating a debug context
Daekwang Ryu [Wed, 19 Apr 2017 06:07:27 +0000 (15:07 +0900)]
evas_gl: add creating a debug context

When users create a debug context,
have to check EGL_KHR_create_context extension with
evas_gl_string_query().

Change-Id: I0ee03d18232301e1b97ae6ad98967065a9ec99a7

6 years agoEvas_GL:(WL)Add feature to set EvasGL error state
Daekwang Ryu [Tue, 12 Dec 2017 02:33:09 +0000 (11:33 +0900)]
Evas_GL:(WL)Add feature to set EvasGL error state

Change-Id: Icbebe48816db5f5b0c97852a982e1d23fb3cd685

6 years agoEvasGL: modify context_create() for GLES3 on wayland_egl
Daekwang Ryu [Wed, 22 Nov 2017 02:51:32 +0000 (11:51 +0900)]
EvasGL: modify context_create() for GLES3 on wayland_egl

Change-Id: Iad5abfd22077dace59899a6fc87adc72cc4a37d4

6 years agoadd dependenecy pkg for ECORE_WAYLAND pc
Jeonghyun Yun [Wed, 13 Dec 2017 05:37:01 +0000 (14:37 +0900)]
add dependenecy pkg for ECORE_WAYLAND pc

Change-Id: I0c76e92dda779aca563b518a12078e1fda1159a8
Signed-off-by: Jeonghyun Yun <jh0506.yun@samsung.com>
6 years agogenlist: add @tizen_only @internal APIs
SangHyeon Lee [Wed, 13 Dec 2017 04:50:42 +0000 (13:50 +0900)]
genlist: add @tizen_only @internal APIs

@tizen_fix

Change-Id: I5417c44b461fd5bb8e513d786d3c792c08de5454

6 years agoremove unnecessary build dependency
Jongmin Lee [Tue, 12 Dec 2017 08:33:31 +0000 (17:33 +0900)]
remove unnecessary build dependency

Change-Id: I254b305db8188e83d40c69191f292eb296cb6bae

6 years agoEvasGL: Add GL[u]int64 type in Evas_GL
Wonsik, Jung [Tue, 12 Dec 2017 10:47:30 +0000 (19:47 +0900)]
EvasGL: Add GL[u]int64 type in Evas_GL

To support khronos 64 bit type, this patch is made.

@TIZEN_ONLY

Change-Id: Ie71f1e8c7aa0bf1bd663cc75222f5e023bea09d2

6 years agoEvasGL: Add PreRotation
Wonsik, Jung [Tue, 12 Dec 2017 09:47:52 +0000 (18:47 +0900)]
EvasGL: Add PreRotation

Add PreRotation feature for Evas GL's direct rendering

@TIZEN_ONLY
Change-Id: I7548a8f7ec516aebc30df64cc2216dcb1dcd41a0

6 years agoelm:[atspi]moved highlight when object is out of screen
JunsuChoi [Tue, 12 Dec 2017 13:41:56 +0000 (19:11 +0530)]
elm:[atspi]moved highlight when object is out of screen

 when highlighted object is out of screen or scroll view , elementary
 send 'object:move-outed' signal to screen-reader
 need this commit:
 screen-reader - https://review.tizen.org/gerrit/#/c/135993/
 at-spi2-core - https://review.tizen.org/gerrit/#/c/135994/

@tizen_feature

orignal patch: 9cd6a35c8731fc59b736bd0721f9f3dba1cf26fb

Change-Id: I0a657c9e4444d2eab78213a7e6c5b6e5668c5c1d

6 years agoelm: [ATSPI] Show object highlighted by highlight_grab when object is out of scroll
JunsuChoi [Mon, 11 Dec 2017 13:37:46 +0000 (19:07 +0530)]
elm: [ATSPI] Show object highlighted by highlight_grab when object is out of scroll

 Show item object of elm_genlist, elm_gengrid, elm_toolbar, elm_list and
 other object( in scroller) when out of scroll view.

@tizen_fix

orignal patch: d8bdb91a65cb678258ac3704d11610520aa8948d,0b4c76fdcbbd91710a81c9072b5571e6d3fffcec

Change-Id: Ia1f06c35601b7803c489cf2c64b83b582f33b58f

6 years agoelm: access: connect to at-spi dbus based on org.a11y.Status.IsEnabled property
Paweł Stawicki [Tue, 12 Dec 2017 13:46:25 +0000 (19:16 +0530)]
elm: access: connect to at-spi dbus based on org.a11y.Status.IsEnabled property

Change-Id: I288e0e4e96900f16edc6f25433d1005f478db9df
Signed-off-by: Shilpa Singh <shilpa.singh@samsung.com>
6 years ago evas: Avoid glTexSubImage2D() COW problem
sunghyun kim [Tue, 12 Dec 2017 10:22:47 +0000 (19:22 +0900)]
 evas: Avoid glTexSubImage2D() COW problem

Change-Id: I77696a283920b0e3ec22e23b99ddc3b6bf686fc9

6 years agoelm:[atspi] block event which is not interested in
Shinwoo Kim [Tue, 12 Dec 2017 10:32:51 +0000 (16:02 +0530)]
elm:[atspi] block event which is not interested in

The following ATSPI dbus signal is not interested in. Moreover the
following ATSPI dbus signal occurs a lot at init time. This could
cause a performance issue.

 - 'ChildrenChanged' with added child
 - 'ChildrenChanged' with deleted child
 - 'AddAccessible'
 - 'RemoveAccessible'

@tizen_fix

orignal patch: 9f22a562423b272c4b39306c57771fadca5ee8f7

Change-Id: I208bf22092bd2678d270f3b895ae097a3e2e1c2d

6 years agoelm: Add null check for svace issues
JunsuChoi [Tue, 12 Dec 2017 10:08:54 +0000 (15:38 +0530)]
elm: Add null check for svace issues
 Add null check because alloc function could return null

@tizen_fix

orignal patch: afd2f1e6d978c0981b264f63b9cc2497cff18378

Change-Id: I7282122af463842220ef26277313683eb5352057

6 years agoelm: [efl_ui_layout] Added NULL check of obj
JunsuChoi [Tue, 12 Dec 2017 09:06:49 +0000 (14:36 +0530)]
elm: [efl_ui_layout] Added NULL check of obj

@tizen_fix

orignal patch: f6329f2e51bb2f164f97073eb518944801263089

Change-Id: I15f0ebc6e637b5f4119a5f897c7a1dd6d21f78d1

6 years ago[ATSPI][elm_layout] apply screen_reader_changed callback Called screen_reader_changed...
JunsuChoi [Mon, 11 Dec 2017 15:19:59 +0000 (20:49 +0530)]
[ATSPI][elm_layout] apply screen_reader_changed callback Called screen_reader_changed callback when screen reader is on/off

Called screen_reader_changed callback when screen reader is on/off.
@TIZEN_ONLY

@tizen_fix

orignal patch: 8835059cbcce3daf2f2a822f655164edc1391b28

Change-Id: I63d602d1c9df6eb6b8ac66414e51cdc41ce9724b

6 years agoelm: access: index: Send selected signal to atspi client
Shilpa Singh [Tue, 12 Dec 2017 08:31:06 +0000 (14:01 +0530)]
elm: access: index: Send selected signal to atspi client

orig: 83e5dbbc7975fb5a29896915d8b10da9272d2899

Change-Id: Ia3884c391c630956131996b3f870ef9cb51fb7ed

6 years agoelm: access: Access frame going behind popup issue fix
Shilpa Singh [Tue, 12 Dec 2017 08:15:17 +0000 (13:45 +0530)]
elm: access: Access frame going behind popup issue fix
when popup is created in transition,finished callback.
orig: 4130d890df95add7632c0ab863be4db3477d28af

Change-Id: I391bc0013830c88d74e41eb1fe0f8109b442b21c
Signed-off-by: Shilpa Singh <shilpa.singh@samsung.com>
6 years agoatspi : Change default label append of popup from show_finish_cb to on_show.
JunsuChoi [Tue, 12 Dec 2017 07:55:34 +0000 (13:25 +0530)]
atspi : Change default label append of popup from show_finish_cb to on_show.
show_finish_cb is called after animation of popup has finished.
default label time limit for screen-readers is 0.3 seconds.
Default label does not work if animation does not finish in 0.3 seconds
So change it so that it can be processed by smart show.

orig: 0f834dc1b813fac712082b21d91eb15b555aa592

Change-Id: I44a0257217307fb47eefc31e6d04213700bf1b67
Signed-off-by: Shilpa Singh <shilpa.singh@samsung.com>
6 years agoatspi: Handle default label object on toolkit side
Shinwoo Kim [Tue, 12 Dec 2017 07:45:07 +0000 (13:15 +0530)]
atspi: Handle default label object on toolkit side

There are unexpected difficult cases to make default label work correctly.

The following would be the case.
(top of accessible tree) - (bottom side)
PageTab1 - Panel1 - PageTab2 - Panel2 - PageTab3 - Panel3(currently showing)
Application could make as below: PageTab1 - Panel1 - PageTab3 - Panel3 - PageTab2 - Panel2(currently showing) or
following tree would normally be possilbe: PageTab1 - Panel1 - PageTab2 - Panel2(currently showing)
There are much of complicated case over there.
So we are handling the default label object stack on toolkit(Elementary) side.
Please refer to following patch set: https://review.tizen.org/gerrit/#/c/151025/ (at-spi2-core)
https://review.tizen.org/gerrit/#/c/151030/ (screen-reader)

Change-Id: Ibc0918ad925066a7cbe0e8888edc4d3431d8c154
orig: a981fc78abdb4bb61fc76deb8d15016d63bc3da9
Signed-off-by: Shilpa Singh <shilpa.singh@samsung.com>
6 years agoecore_input: need to include Ecore.h in Ecore_Input.h
Duna Oh [Wed, 6 Apr 2016 09:54:25 +0000 (18:54 +0900)]
ecore_input: need to include Ecore.h in Ecore_Input.h

Signed-off-by: Duna Oh <duna.oh@samsung.com>
Change-Id: I8b09b61c85cdf6d260d22dda764aeee1d6c468cd

6 years agoelm: access: Use Efl_Access instead of Elm_Atspi
Shilpa Singh [Tue, 12 Dec 2017 06:15:06 +0000 (11:45 +0530)]
elm: access: Use Efl_Access instead of Elm_Atspi

Change-Id: Icb57e66de1e01049c074d547731f6c05bfb745da

6 years agoelm: [atspi][panel] Adds accessibility support for the panel widget.
JunsuChoi [Fri, 8 Dec 2017 13:59:58 +0000 (19:29 +0530)]
elm: [atspi][panel] Adds accessibility support for the panel widget.
Panel handles similar popups.
When open or close it sends signal to screen-reader.

orig patch: ebc340ef13fdab63a07f6a58af54f00d84c92eb8

Change-Id: I5124d0398c410d33335705d9bbe4577eb9b3bd9b
Signed-off-by: Shilpa Singh <shilpa.singh@samsung.com>
6 years ago[EvasGL] Fix to 3D memory leak.
Wonsik, Jung [Mon, 11 Dec 2017 07:14:21 +0000 (16:14 +0900)]
[EvasGL] Fix to 3D memory leak.

If evas_gl_make_current is called with NULL,
and evgl_surface_destroy and evgl_context_destroy is called,
3D memory leak occurs.
Because rsc->current_ctx is NULL in evas_gl_make_current
and texture and framebuffer can not be free in destroy funnctions.
To fix that, one value is added to EVGL_resource.
This value is kept with current_ctx, when evas_gl_make_current is called with NULL.

Change-Id: Ib363990589872858fd3a27ea730f38a3c6571a65

6 years ago[Evas Engine] : add native TBM surface to gl drm engine
Wonsik, Jung [Mon, 11 Dec 2017 05:27:20 +0000 (14:27 +0900)]
[Evas Engine] : add native TBM surface to gl drm engine

Add evas object image's native surface of TBM to EvasGLDRM engine

Change-Id: I56b035150de7798ca9e990b162b350b36f1c46fc

6 years agoelm: Tizen Profile Runtime Configurability
Shinwoo Kim [Mon, 11 Dec 2017 10:18:04 +0000 (19:18 +0900)]
elm: Tizen Profile Runtime Configurability

[From]
commit fb75487443770f053f720aef8fa071597de83d57
Author: Jongmin Lee <jm105.lee@samsung.com>
Date:   Tue Apr 11 12:23:06 2017 +0900

    tizen_util: support for runtime tizen profile configurability

Change-Id: I79bd9bb203738f4c78ec209b3669179bf8db4cc1

6 years agoelm: Add navigation helper functions for screen-reader and friends (part 2)
Radoslaw Cybulski [Mon, 11 Dec 2017 14:25:58 +0000 (19:55 +0530)]
elm: Add navigation helper functions for screen-reader and friends (part 2)

@tizen_feature

orignal patch: 6dc61d57e94d35149f8af0678be2c5237f7791ac

Change-Id: If3be1cee8b4c422c4da2bb7b805da8234ed84c89

6 years agoelm: access: grab highlight using unrealized item
Shinwoo Kim [Mon, 11 Dec 2017 13:36:30 +0000 (19:06 +0530)]
elm: access: grab highlight using unrealized item

The looping naviation could make the first(or last) item grab highlight.
But the _elm_widget_item_elm_interface_atspi_component_highlight_grab returns
without setting highlight if sd->view is NULL
that means the item is NOT realized in case of genlist.
So the _elm_genlist_item_elm_interface_atspi_component_highlight_grab
BRINGs the first(or last) item IN first before grabbing highlight.

orig: bf0dc4a05f36fbec6822e3275827f16b33036957

Change-Id: Ic6021cd5358a79748610da0c54384a24fcb45f5c
Signed-off-by: Shilpa Singh <shilpa.singh@samsung.com>
6 years agoelm: access: In access_name_get function call _elm_widget_item_accessible_plain_name_...
Shilpa Singh [Mon, 11 Dec 2017 10:18:19 +0000 (15:48 +0530)]
elm: access: In access_name_get function call _elm_widget_item_accessible_plain_name_get/_elm_widget_accessible_plain_name_get
to store the name text as well to convert the text.

Change-Id: I0b8ee228efad334725fe909015f19ebcb9fa9727

6 years agoelm: Add navigation helper functions for screen-reader and friends
Radoslaw Cybulski [Mon, 11 Dec 2017 10:44:25 +0000 (16:14 +0530)]
elm: Add navigation helper functions for screen-reader and friends

This patch adds GetNavigableAtPoint accessibility interface - the function finds accessibility object at given coordinates. This massively (10-15 times)
reduce amount of IPC calls (and time spent) in typical screen-reader scenario.

@tizen_fix

orignal patch: 7519c5070dae2b1a0716ead7bfe8d4de1a4a5114

Change-Id: I657c900bc6618bc4a17fbbb21469b06e41d0c7ff

6 years agoelm: [ATSPI] Modify clear only specified objects when called highlight_clear
JunsuChoi [Mon, 11 Dec 2017 09:03:23 +0000 (14:33 +0530)]
elm: [ATSPI] Modify clear only specified objects when called highlight_clear

In the past, highlight clear cleared all highlight in the window. When a user calls
highlight_grab manually, highlight_clear on highlighted object causes all highlight
to disappear. So we modify it to clear the object specified in highlight_clear.

@tizen_fix

orignal patch: 52e6f940c73b6d12b0a8866821ef32badb724f66

Change-Id: Ibbe8570ece706f68bef3a6e647c6cfb204b145d4

6 years ago[evas] use EVAS_GL_WAYLAND_Y_INVERTED_WL attribute of
Joogab Yun [Wed, 8 Jun 2016 08:19:12 +0000 (17:19 +0900)]
[evas] use EVAS_GL_WAYLAND_Y_INVERTED_WL attribute of
eglQueryWaylandBufferWL

 - 'yinvert=0' in YaGL of emulator, so we need check
EGL_WAYLAND_Y_INVERTED_WL attribute to query orientation of
   wl_buffer

@tizen_fix : bug fix

Change-Id: I98abbe72c882d83a4bf90081f5feb2462027fb7c

6 years agoatspi: Add and expose API
Shinwoo Kim [Mon, 11 Dec 2017 08:12:37 +0000 (13:42 +0530)]
atspi: Add and expose API
[add]
- elm_object_part_access_register
[expose]
- elm_object_part_access_object_get
- elm_access_object_register
- elm_access_object_unregister
- elm_access_object_get
- elm_atspi_bridge_utils_say
- elm_atspi_accessible_name_cb_set
- elm_atspi_accessible_description_cb_set
- elm_atspi_accessible_attribute_append
- elm_atspi_accessible_reading_info_type_set
- elm_atspi_accessible_reading_info_type_get
- elm_atspi_accessible_gesture_cb_set
- elm_atspi_accessible_can_highlight_set
- elm_atspi_accessible_can_highlight_get
- elm_atspi_component_highlight_grab
- elm_atspi_component_highlight_clear

original patch: c8fb84319dc59b6a5d6ffaac9c396c9f03932005

Change-Id: Iae890f9a899cae165135be0e6458e90a9793bddc
Signed-off-by: Shilpa Singh <shilpa.singh@samsung.com>
6 years agoEdje_cc: Disable beta feature checking logic
Wonki Kim [Mon, 11 Dec 2017 08:40:47 +0000 (17:40 +0900)]
Edje_cc: Disable beta feature checking logic

Tizen has already used that feature without the option(-beta)
This patch removes the checking logic, to keep compatability

Change-Id: I766012b94a30e3b845c12e0a389e4d6cdb634ca6
Signed-off-by: Wonki Kim <wonki_.kim@samsung.com>
6 years agoelm: keep Tizen legacy API
Shinwoo Kim [Mon, 11 Dec 2017 08:29:54 +0000 (17:29 +0900)]
elm: keep Tizen legacy API

Upstream is using prefix efl_access for legacy API.
Tizen has used prefix elm_atspi for legacy API. Application is uisng elm_atspi
API set. So we have to keep Tizen legacy API.

@tizen_feature

Change-Id: If0ea8ed9d477b5764c36c56eab756514aa2bfcd6

6 years ago[evas-gl] check extention "EGL_TIZEN_image_native_surface" in wayland_egl
sunghyun kim [Wed, 6 Dec 2017 11:07:25 +0000 (20:07 +0900)]
[evas-gl] check extention  "EGL_TIZEN_image_native_surface" in wayland_egl

Change-Id: I459902b3c5383be64ebb665455095862674a2b1d

6 years ago[evas_gl] add partial_render_debug mode for debug
sunghyun kim [Wed, 6 Dec 2017 09:30:32 +0000 (18:30 +0900)]
[evas_gl] add partial_render_debug mode for debug

if EVAS_GL_PARTIAL_DEBUG is set, add sky blue color rectangle before draw object.
it is for debug.

Change-Id: Ib4716c98b4735ea4edebf102a4692ec610392b28

6 years ago[evas-gl] destroy surface when evas-gl is direct renderable
sunghyun kim [Wed, 6 Dec 2017 07:34:35 +0000 (16:34 +0900)]
[evas-gl] destroy surface when evas-gl is direct renderable

evasgl create more buffer when evas gl is direct renderable status.
but according to log,this code want destory buffer.

Change-Id: If06a0c42d551ad1d7559a5f225f9b0beced579b9

6 years agochange type position Kept for ABI compatibility
sunghyun kim [Wed, 6 Dec 2017 06:55:59 +0000 (15:55 +0900)]
change type position  Kept for ABI compatibility

Change-Id: I40891b039c45376314345956a699cf945c55b5a1

6 years agoedje: fix calculation for vertically expandable textblock without max height
Youngbok Shin [Mon, 11 Dec 2017 07:49:59 +0000 (16:49 +0900)]
edje: fix calculation for vertically expandable textblock without max height

It also include a performance patch for this code section from tizen branch.

@tizen_fix

Change-Id: Ib1c98cf360ebf301a0c7980e42c9fec1fabea443

6 years agoecore_device: add dummy functions for ecore_device API
JengHyun Kang [Wed, 6 Dec 2017 08:33:35 +0000 (17:33 +0900)]
ecore_device: add dummy functions for ecore_device API

Change-Id: I42a1290124ddda47b2e6741363adf8d15a033e19

6 years agoecore_wl2: add functions to set client's custom cursors
JengHyun Kang [Fri, 8 Dec 2017 08:54:51 +0000 (17:54 +0900)]
ecore_wl2: add functions to set client's custom cursors

Change-Id: I0017e31e31bf1ccd2c0b4afb5bf5badd48a00584

6 years agoecore_wl2_input: do not send pointer enter about all of touch down
JengHyun Kang [Thu, 7 Dec 2017 04:49:00 +0000 (13:49 +0900)]
ecore_wl2_input: do not send pointer enter about all of touch down

Change-Id: I2e14b59daa5934bc654284146a43c63fd61ace2e

6 years agoevas: Add scale feature for embedded bitmap fonts.
Youngbok Shin [Mon, 25 Sep 2017 09:34:22 +0000 (18:34 +0900)]
evas: Add scale feature for embedded bitmap fonts.

Summary:
When evas selects a strike of embedded bitmap font,
calculate ratio and use it for scaling embedded bitmap.
@feature

Reviewers: jpeg, tasn, woohyun, raster, herdsman

Reviewed By: raster

Subscribers: charlesmilette, Francesco149, cedric

Differential Revision: https://phab.enlightenment.org/D2713

Change-Id: Ifcafac15f88cbc1914e005342af236b93b791dbf

6 years agovpath: A temp patch for migration task
Wonki Kim [Mon, 11 Dec 2017 02:33:26 +0000 (11:33 +0900)]
vpath: A temp patch for migration task

calling setuid makes crash on qemu environment, especially for arm env
so this patch skip setuid temporally

Change-Id: Ia7dc5ab03b641b9c5da4d136986a6487b2c6378c
Signed-off-by: Wonki Kim <wonki_.kim@samsung.com>
6 years agoelm_win: add ELM_WIN_INDICATOR_BG_TRANSPARENT enum to fix build break
Jiyoun Park [Sat, 9 Dec 2017 08:56:25 +0000 (17:56 +0900)]
elm_win: add ELM_WIN_INDICATOR_BG_TRANSPARENT enum to fix build break

Change-Id: Iea6a9562720eec9b9f3ee333272c61ab6c1893ce

6 years agoconfigure.ac: fix app's build break related with Ecore_Wayland.h
Jiyoun Park [Sat, 9 Dec 2017 07:46:03 +0000 (16:46 +0900)]
configure.ac: fix app's build break related with Ecore_Wayland.h

this code should be removed after finding the right way(ex: app change)

Change-Id: Ie8b7893a48f5107efab6df104ddc9bf5498faf48

6 years agoelm: access: handle "gesture_required" attribute
Shinwoo Kim [Fri, 8 Dec 2017 13:40:05 +0000 (19:10 +0530)]
elm: access: handle "gesture_required" attribute
The elementary sends the "detail2" information highlight based on the attribute
"gesture_required" when an object grabs.
If an object has attribute key "gesture_required", and "scroll" for its value,
then the "detail2" is 1. Otherwise, the "detail2" is 0.
The screen-reader AT client calls "ObjectNeedsScrollGesture" method of
e-mod-tizen-screen-reader window manager module with object geometry value,
if the "detail2" is 1. Otherwise, the object geometry value is not used.

The e-mod-tizen-screen-reader window manager module will send mouse event
based on the object geometry.

Application side could use this feature setting attribute as below:
- elm_atspi_accessible_attribute_append(btn, "gesture_required", "scroll");

This patch set depends on: https://review.tizen.org/gerrit/#/c/142108/ (screen-reader)
https://review.tizen.org/gerrit/#/c/142107/ (e-mod-tizen-screen-reader)

Change-Id: Ibdc8d4d93d5d9946c566812b6cd77e48cbbab4c2
Signed-off-by: Shilpa Singh <shilpa.singh@samsung.com>
6 years agoelm: [atspi]Demote relation object if the object exist
Shinwoo Kim [Fri, 8 Dec 2017 11:47:14 +0000 (17:17 +0530)]
elm: [atspi]Demote relation object if the object exist

@tizen_fix

orignal patch: e57e429c5cf05062d10b11226ab220576322f2fb

Change-Id: I1477280838fd7b0a67588ba89dbc31b9863a1dcd

6 years agoelm: [atspi][elm_popup] Ignore text from elm_object_text_set in accessible_name_get
JunsuChoi [Fri, 8 Dec 2017 10:50:06 +0000 (16:20 +0530)]
elm: [atspi][elm_popup] Ignore text from elm_object_text_set in accessible_name_get

Because of screen-reader need to read title when object have dialog role(popup),
but object_text_get gets the body text. So, if user do not set accessible name
in the popup, elc_popup should return title.

@tizen_fix

orignal patch: b4978c5ba599c4b35bdf60ff40f294bbe556da18

Change-Id: Ifc583d6c4a2c916e0551f2c839904d3fa43a2751

6 years agoelm: [atspi]check if highlighted object's parent hidden
Shinwoo Kim [Fri, 8 Dec 2017 10:37:33 +0000 (16:07 +0530)]
elm: [atspi]check if highlighted object's parent hidden

If an object is content of a layout (parent), and user calls
evas_object_hide for the layout, then the _elm_widget_evas_object_smart_hide
for the object (child) is not called. So it is not possible to know
object's changed state on the AT-client side.

 This patch set will check parents of highlighted object in
_elm_widget_evas_object_smart_hide, and emit state changed
signal if one of parents is equal to the hiding object.

@tizen_fix

orignal patch: afcec90361769e19f6d6dc005aa35daeaa74b8ec

Change-Id: I45d7d71c96e1a2645c93f2d1012067f880d6a99d

6 years agoelm_win: fix app's build break related with precreate object get/set
Jiyoun Park [Fri, 8 Dec 2017 10:20:24 +0000 (19:20 +0900)]
elm_win: fix app's build break related with precreate object get/set

precreate object get/set is API for improving launching performance of 3rd party applications.
// TIZEN_ONLY(20160218): Improve launching performance.
add empty function for app build

Change-Id: I1ca11acfd9a6f829584681b8c5ad145809a43d23

6 years agoelm: access: add "GetReadingMaterial" interface method
Shinwoo Kim [Fri, 8 Dec 2017 10:08:35 +0000 (15:38 +0530)]
elm: access: add "GetReadingMaterial" interface method
The atspi_accessible_get_reading_material of at-spi2-core calls this method to get
reading material to be used screen-reader side.
This is for reducing IPC. It seems that the number of IPC is changed from 30 to 1.

original patch: 55d106bd627819d11800b74b090aca626abd9108

Change-Id: I2ce742626f48343d01447c5e200b2f5b7a3370fc
Signed-off-by: Shilpa Singh <shilpa.singh@samsung.com>
6 years agoelm: [atspi] do not response if ecore evas is obscured
Shinwoo Kim [Fri, 8 Dec 2017 10:17:39 +0000 (15:47 +0530)]
elm: [atspi] do not response if ecore evas is obscured

The homescreen could launch an application using 1 finger two tap.
If 1 finger tap is fired as soon as application launches,
the accessible_at_point_get works for obscured homescreen.

@tizen_fix

orignal patch: 4ae8e71b4911e81e7943413a71f9a0463a4fac70

Change-Id: Ia9276ef17736d63a6c424e517deb65e8370aaee2

6 years agoelm: [atspi]reduce IPC of object:state-changed:showing
Shinwoo Kim [Fri, 8 Dec 2017 10:09:03 +0000 (15:39 +0530)]
elm: [atspi]reduce IPC of object:state-changed:showing
     Send interested signal only

@tizen_fix

orignal patch: afef94299613fafe9dd46276597873561a929080

Change-Id: I1d6cc39cdaa6b7ef20446bb8118ba19c46dbcdb6

6 years agoefl_ui_win: fix build break by opensource temporarily until migration finish
Jiyoun Park [Fri, 8 Dec 2017 09:21:59 +0000 (18:21 +0900)]
efl_ui_win: fix build break by opensource temporarily until migration finish

return type of elm_win_wl_window_get has been changed.
Ecore_Wl_Window -> Ecore_Wl2_Window
It cause build break. so until fixing all app in tizen, we return Ecore_Wl_Window like before

Change-Id: I005fa8f4878eef36bcd613f41c3e4c2ad6f8074b

6 years agoelm: access: Reduce action related IPC.
Shinwoo Kim [Fri, 8 Dec 2017 08:33:06 +0000 (14:03 +0530)]
elm: access: Reduce action related IPC.
If there are more than 10 actions on an object, then more than 10 IPC occurs for calling
reading information related action such as ReadingStopped
which is called whenever an object has highlight.

Change-Id: I10c540801cfc89ffc08c7a44cc031fff6dc6e646
Signed-off-by: Shilpa Singh <shilpa.singh@samsung.com>
6 years agoevas text: Replace the replacement character to 0x00A0 which is empty character
Youngbok Shin [Fri, 8 Dec 2017 06:40:04 +0000 (15:40 +0900)]
evas text: Replace the replacement character to 0x00A0 which is empty character

@tizen_feature

Change-Id: I13ddfb89759bceddb81f6fd70bf69a94fd9de0e0

6 years agoevas/edje: Add evas_textblock_cursor_cluster_* internal APIs.
Youngbok Shin [Fri, 8 Dec 2017 06:32:14 +0000 (15:32 +0900)]
evas/edje: Add evas_textblock_cursor_cluster_* internal APIs.

@tizen_feature

Change-Id: Iabe46715e06f7db74ac5a9bcbb9fc07d528af2f1

6 years agoelm: access: atspi: add gesture method to accessible interface Screen reader asks...
Shinwoo Kim [Wed, 6 Dec 2017 13:21:58 +0000 (18:51 +0530)]
elm: access: atspi: add gesture method to accessible interface Screen reader asks application first if application want to consume gesture event.
If application returns FALSE, it means that application does NOT want to consume gesture event.

Change-Id: I8b17cbc15240c570acfd055798c058ddc44aa3f9
Signed-off-by: Shilpa Singh <shilpa.singh@samsung.com>
6 years ago[evas-gl] change dynamic texture's format RGBA/BGRA to ARGB
sunghyun kim [Thu, 7 Dec 2017 01:57:31 +0000 (10:57 +0900)]
[evas-gl] change dynamic texture's format RGBA/BGRA to ARGB

now, dynamic hint set has color format problem.
so changed internal format RGBA/BGRA to ARGB.

Change-Id: I3b333ede46460e693af1672a29ae3c7f3aa268e8

6 years agoevas-gl : fix initialize bug in eng_gl_surface_query()
sunghyun kim [Fri, 23 Sep 2016 05:42:39 +0000 (14:42 +0900)]
evas-gl : fix initialize bug in eng_gl_surface_query()

Change-Id: Ia280d87b16b462db2896cdbe48e1b399415bdf6a

6 years ago[evasgl] change swap mode when rect size not match tile size
sunghyun kim [Fri, 11 Aug 2017 05:16:32 +0000 (14:16 +0900)]
[evasgl] change swap mode when rect size not match tile size

Change-Id: I609a0bab36f0781de0048844516405a53a7990c8

6 years agoelm: atspi: do operation if its object is available Operation
Shinwoo Kim [Thu, 7 Dec 2017 14:12:21 +0000 (19:42 +0530)]
elm: atspi: do operation if its object is available Operation
1. activate An object under the naviframe item is accessible even though new
naviframe item is pushed on it.
In this case, it is possilbe to do action of the object.
So this patch set is checking SHOWING state before doing action.
Operation 2. selection It was possible to (de)select even though its one
of parent freezes events.
It is impossilbe to (de)select using touch event if freeze_events set to
1. So it should work same using atspi interface. TODO: handle non UI action

Change-Id: I7d01183f00ab27b01d7cb71a537ef7a4fc4b01b6
Signed-off-by: Shilpa Singh <shilpa.singh@samsung.com>
6 years agoelm: access: entry: Support accessibility for entry anchors Rectangles makes entry...
Shinwoo Kim [Thu, 7 Dec 2017 13:44:22 +0000 (19:14 +0530)]
elm: access: entry: Support accessibility for entry anchors Rectangles makes entry anchors
work which are kept in anchor_atspi_rects One entry anchor could wrap over multiple
lines.
In this case the rectangle for the entry anchor exists only on the first line.
Other lines just draw highlight rectangle when the first rectangle has highlight.
The highlight rectangles are kept in anchor_highlight_rects. In the follwing interface,
entry checks the point if it exists inside of anchor wrapping over multiple lines.
Because from the second line of the entry anchor does not have any objects such as
rectangle to work for the following interface.
Efl.Access.Component.accessible_at_point_get;

Change-Id: I27ff9512bde51f0ced4305967a6d3a31d27af945
Signed-off-by: Shilpa Singh <shilpa.singh@samsung.com>
6 years agoevas: add EVAS_BIDI_DIRECTION_ANY_RTL for evas_object_paragraph_direction_set API
Youngbok Shin [Thu, 7 Dec 2017 13:26:48 +0000 (22:26 +0900)]
evas: add EVAS_BIDI_DIRECTION_ANY_RTL for evas_object_paragraph_direction_set API

The original patch is uploaded to EFL upstream.
Please, check the following link.
https://phab.enlightenment.org/D4663

@tizen_feature

Change-Id: Ia5f6967b7cb769eb743ff57f83a86959e834672c

6 years agoelm: access: Make atspi,(un)highlighted callback work on widget item. The atspi,...
Shinwoo Kim [Thu, 7 Dec 2017 11:06:29 +0000 (16:36 +0530)]
elm: access: Make atspi,(un)highlighted callback work on widget item. The atspi,(un)highlighted callback works only on the widget so far.

Change-Id: Ib89f6dc33a8e1060b279f6757ecbb05bc3699f2e
Signed-off-by: Shilpa Singh <shilpa.singh@samsung.com>
6 years ago[atspi] Use atspi status as smart callback event info
Shinwoo Kim [Thu, 7 Dec 2017 11:22:18 +0000 (16:52 +0530)]
[atspi] Use atspi status as smart callback event info
The elm_win did not use atspi status for SIG_ATSPI_SCREEN_READER_CHANGED smart signal.

Change-Id: Id7ec063d154a08bce727435436f54cbcb3202deb
Signed-off-by: Shilpa Singh <shilpa.singh@samsung.com>
6 years agoevas text: add "width" which includes advance
Youngbok Shin [Thu, 7 Dec 2017 12:35:05 +0000 (21:35 +0900)]
evas text: add "width" which includes advance

The advance value didn't consider bigger width cases.
It also include the following patch.
Evas text: Remove a whitespcae from the right end of ellipsized RTL text

@tizen_fix

Change-Id: Ie14a286593b7c7c35ba3263c257dfaf89c653c11

6 years agoevas: Apply the last character's advance for width calculation
Youngbok Shin [Thu, 7 Dec 2017 12:26:29 +0000 (21:26 +0900)]
evas: Apply the last character's advance for width calculation

@tizen_fix

Change-Id: Ic158de603bea079885a8454296465b0cba4e285f

6 years agoEvas textblock: Calculate exact width for current item
Youngbok Shin [Thu, 7 Dec 2017 12:10:13 +0000 (21:10 +0900)]
Evas textblock: Calculate exact width for current item

@tizen_fix

Change-Id: I46f3f118cd7eab80ed3d986a221f0cb4d47b3807

6 years agoEvas textblock: Replace the replacement character of Tizen to 0x00A0 from 0xFFFC
Youngbok Shin [Thu, 7 Dec 2017 11:35:52 +0000 (20:35 +0900)]
Evas textblock: Replace the replacement character of Tizen to 0x00A0 from 0xFFFC

To do not show "OBJECT REPLACEMENT CHARACTER",
we are going to use 0x00A0 instead of 0xFFFC.

@tizen_fix

Change-Id: Ifb9381d32a76c0eb2175cda2a1a2c96a8ca882df

6 years agosend h/w device infomation to input events
JengHyun Kang [Thu, 30 Nov 2017 16:12:04 +0000 (01:12 +0900)]
send h/w device infomation to input events

Change-Id: Id512610175246e4caedcf0224dc2f2fede4d2643

6 years agoatspi: add state_notify api
Lukasz Stanislawski [Thu, 7 Dec 2017 10:17:23 +0000 (15:47 +0530)]
atspi: add state_notify api

The purpose of this api is to provide additional way of synchronization
between elementary application and assistive technology client
(screen reader).

The subject of synchronization is accssibility object state which
is required by screen reader implementation to work properly.

Because of nature of efl, visibility changes of efl object state cannot be
effectively evaluated in a moment they occur due to following obstacles:

1. requires tracking of visibility of parent, parent's parent etc.
2. requires tracking of clipper of parent, parent's parent etc.
3. requires tracking of all clippers movement
4. requires tracking of all clippers alpha
5. requires tracking of stacking order 5. requires tracking of object movement.

 Such implementation will have heavy impact on framework.
To cover more cases an additioanl method of synchronization is provided
which can notify assistive technology clients about state of accessible
objects at the moment it is invoked.

This is meant to be elementary internal api.

@tizen_feature

orignal patch : 10aa19137bb1c6168e26f0973aa06caab6942fbf

Change-Id: Icc41b643b72fb2fb0ccd438394f71749de533fa5