platform/upstream/elementary.git
7 years agonaviframe: Check if item is valid in _tizen_effect_enabled_get() 12/109112/2 accepted/tizen_3.0.m2_common accepted/tizen_3.0.m2_mobile accepted/tizen_3.0.m2_tv accepted/tizen_3.0.m2_wearable tizen_3.0.m2 accepted/tizen/3.0.m2/common/20170110.181820 accepted/tizen/3.0.m2/mobile/20170110.084419 accepted/tizen/3.0.m2/tv/20170110.084440 accepted/tizen/3.0.m2/wearable/20170110.084500 submit/tizen_3.0.m2/20170109.075037
Shilpa Singh [Tue, 27 Dec 2016 16:00:45 +0000 (21:30 +0530)]
naviframe: Check if item is valid in _tizen_effect_enabled_get()

Naviframe transition begins in deferred animator callback after item is
pushed or popped.

If an item is destructed and item destructor function is called before
deferred animator callback is called, then the item is NULL in deferred
animator callback and it caused crash due to the lack of NULL check.

Change-Id: I20d2a71d0fe604f108a8c9a1072fea4b302cd76c

7 years agoAdd deprecated description to deprecated APIs 36/107836/2 accepted/tizen/3.0.m2/mobile/20170104.142724 accepted/tizen/3.0.m2/tv/20170104.143321 accepted/tizen/3.0.m2/wearable/20170104.143707 accepted/tizen/3.0/common/20170102.143319 accepted/tizen/3.0/ivi/20170102.094826 accepted/tizen/3.0/mobile/20170102.094702 accepted/tizen/3.0/tv/20170102.094738 accepted/tizen/3.0/wearable/20170102.094803 submit/tizen_3.0.m2/20170104.093752 submit/tizen_3.0/20170102.015506
Jongmin Lee [Fri, 30 Dec 2016 06:14:03 +0000 (15:14 +0900)]
Add deprecated description to deprecated APIs

Change-Id: I1b48dfef86e2a8d22101416475b6c6de2224e4bb

7 years agocopypaste: Add cbhm item type get to prevent paste option to show when entry 71/107871/2
SubodhKumar [Fri, 30 Dec 2016 09:31:38 +0000 (15:01 +0530)]
copypaste: Add cbhm item type get to prevent paste option to show when entry
mode in plain text and selection is image

Change-Id: I2499570b9a9a3f3708a676bb96788a3c82f2f523

7 years ago[Genlist] skip pan obj coord when height is 0 58/107858/1
Sungtaek Hong [Fri, 30 Dec 2016 07:48:54 +0000 (16:48 +0900)]
[Genlist] skip pan obj coord when height is 0

 - When genlist is in popup scroller, oh, derived from
   evas_object_geometry_get(), is 0. and calculates wrong y.
   This is a hack to skip when 0 height case.

@tizen_fix

Change-Id: I873caea8f53485b85c257a7f5d72b21b6f97c4e8
Signed-off-by: Sungtaek Hong <sth253.hong@samsung.com>
7 years ago[Naviframe] resize prev item before raise 74/107674/3
Sungtaek Hong [Thu, 29 Dec 2016 07:01:39 +0000 (16:01 +0900)]
[Naviframe] resize prev item before raise

Change-Id: I77ca683676a99a2079f69b6499f9549ece845973
Signed-off-by: Sungtaek Hong <sth253.hong@samsung.com>
7 years agoatspi: check if highlighted object's parent hidden 64/106864/5
Shinwoo Kim [Fri, 23 Dec 2016 08:40:06 +0000 (17:40 +0900)]
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.

Change-Id: Ic91a06a039c6a4f254db0e4216edf7a73756c5aa

7 years agoPass correct color class to elm_object_item_color_class_del 45/107645/1
Jee-Yong Um [Thu, 29 Dec 2016 02:54:57 +0000 (11:54 +0900)]
Pass correct color class to elm_object_item_color_class_del

Signed-Off-By: Jee-Yong Um <jc9.um@samsung.com>
Change-Id: I9476a6ea1d4fb32870e3e8f3426738e14c98f651

7 years agolabel: don't make ellipsis/slide label as expandable 32/107232/2 accepted/tizen/3.0/common/20161229.113435 accepted/tizen/3.0/ivi/20161229.054651 accepted/tizen/3.0/mobile/20161229.054508 accepted/tizen/3.0/tv/20161229.054540 accepted/tizen/3.0/wearable/20161229.054612 submit/tizen_3.0/20161229.023141
Youngbok Shin [Tue, 27 Dec 2016 07:57:32 +0000 (16:57 +0900)]
label: don't make ellipsis/slide label as expandable

@tizen_fix

Change-Id: Ic85c84277ba65eb3a852ebc76f5d58a9d5990afb

7 years agogenlist: fix on focus item search logic to make include content also in current viewport 96/107096/2 accepted/tizen/3.0/common/20161228.162258 accepted/tizen/3.0/ivi/20161228.091815 accepted/tizen/3.0/mobile/20161228.091626 accepted/tizen/3.0/tv/20161228.091723 accepted/tizen/3.0/wearable/20161228.091749 submit/tizen_3.0/20161227.025004 submit/tizen_3.0/20161228.012505
SangHyeon Lee [Mon, 26 Dec 2016 11:40:19 +0000 (20:40 +0900)]
genlist: fix on focus item search logic to make include content also in current viewport

Change-Id: Icdfd466b9a07e360a7aa6c0b1ea657b63fe0ae5b
Signed-off-by: SangHyeon Lee <sh10233.lee@samsung.com>
7 years agoentry: return cursor geometry for show region geometry everytime 10/106710/4
Youngbok Shin [Thu, 22 Dec 2016 12:16:42 +0000 (21:16 +0900)]
entry: return cursor geometry for show region geometry everytime

It prevents potential region show issue on mouse events.

@tizen_fix

Change-Id: I66291809c8498183cff5cfac2f54127849cfe058

7 years agoentry: fix scroll region jumping issue 03/106703/4
Youngbok Shin [Thu, 10 Nov 2016 08:45:49 +0000 (17:45 +0900)]
entry: fix scroll region jumping issue

When elm_entry takes focus by mouse clicked,
scroll region should be decided by new cursor position.

1. *_on_focus_region
   *_on_focus_region will be called before updating cursor position.
   So, elm_entry need to predict cursor position by mouse down and move.

2. _show_region_hook
   The geometry from elm_widget_show_region_get() is not proper when
   the hook function is called. We need to get cursor's geometry everytime.
   Becasue, the geometry is relative. Whenever scroll region updated,
   the geometry also has to be updated.

* dependancy warrning :
  - efl
  "edje entry: keep cursor position on mouse down and move"
  https://review.tizen.org/gerrit/#/c/106700/

@tizen_fix

Change-Id: I407b2f68634c6060920e6b1b3797cd8efc6f73f1

7 years agowidget/entry: Update show region geometry when entry is resized 42/106542/2
Youngbok Shin [Thu, 22 Dec 2016 04:41:14 +0000 (13:41 +0900)]
widget/entry: Update show region geometry when entry is resized

It fixes the following problems.

 - elm_widget_show_region_set() could be called from
   inside of elm_widget_show_region_set(). And the last function call
   could be ignored and given values were abandoned.
   The patch updates show region values everytime.

 - When elm_entry is resized during processing elm_widget_show_region_set(),
   it must update its show region geometry to show proper region according to
   lastest geometry.
   The patch will show proper region of elm_entry's cursor.

@tizen_fix

Change-Id: Ia92a5232cfd26aa98075cdb9e4b54d376d1c44b7

7 years agocopypaste: Do not show popup when entry is not in the viewport. 06/107006/1
SubodhKumar [Mon, 26 Dec 2016 06:28:51 +0000 (11:58 +0530)]
copypaste: Do not show popup when entry is not in the viewport.

Change-Id: I7fd61159dc669520bd090a16b8a8738ddc0adeab

7 years agoRevert "elm_entry: show context menu when entry is longpressed without focusing" 86/106986/1
Thiep Ha [Mon, 26 Dec 2016 03:17:07 +0000 (12:17 +0900)]
Revert "elm_entry: show context menu when entry is longpressed without focusing"

This reverts commit 5eb41281c87b4f4d8e10cec140a21bc65ffd8cdf.
The commit causes the context menu show when entry does not
have focus: http://suprem.sec.samsung.net/jira/browse/TSAM-12196

Change-Id: Ib22b0cb2b334d368fd24bb27e09b8e513342f090

7 years agopanel: decide whether a scrollable panel is open or not only when it has a size 11/106911/1
Jaeun Choi [Fri, 23 Dec 2016 13:01:44 +0000 (22:01 +0900)]
panel: decide whether a scrollable panel is open or not only when it has a size

in _state_sync() function, scrollable content's position is used to tell
whether the panel is open or not. in case of a top panel, for example,
it is considered to be open when the content's vertical position equals to zero.
however, this logic has a defect in that the position is always zero
if the content size is zero - not resized properly yet. it caused unwanted results.
this patch added some codes to check
1. if the panel's width or height is bigger than zero
2. if the box which contains panel contents is visible (resizable)

@fix

Change-Id: I997332005033cbeb3a0ebd70238de8541b257726

7 years agogenlist: checking ON_SCROLL when mouse down to prevent wrong item highlight 23/106823/2
SangHyeon Lee [Fri, 23 Dec 2016 07:15:52 +0000 (16:15 +0900)]
genlist: checking ON_SCROLL when mouse down to prevent wrong item highlight

Change-Id: I746b1691feca6b6f8cc8f318c683f5ffff82c7c5
Signed-off-by: SangHyeon Lee <sh10233.lee@samsung.com>
7 years agogenlist: move edje to unshown position when it cached 20/106820/2
SangHyeon Lee [Fri, 23 Dec 2016 07:06:54 +0000 (16:06 +0900)]
genlist: move edje to unshown position when it cached

Change-Id: I5417203091e6c65c40b3472e825e7564dd875cad

7 years ago[ATSPI][popup] Support popup's atspi name interface. 41/106641/2
JunsuChoi [Thu, 22 Dec 2016 09:02:50 +0000 (18:02 +0900)]
[ATSPI][popup] Support popup's atspi name interface.

   it can use "alert + text(name)" to set name of the popup object
   in application

Change-Id: I9c090ca22d8c026b705b3793991a847b0eeefac5

7 years agopopup: use widget style set internal function to notify 11/106811/2
JinYong Park [Fri, 23 Dec 2016 06:53:48 +0000 (15:53 +0900)]
popup: use widget style set internal function to notify

Change-Id: I48a1f800a751c6386134916d4ec911659f3ffbc0
Signed-off-by: Jinyong Park <j4939.park@samsung.com>
7 years agoRevert "notify: block_events restore previous style when style set failed" 22/106722/2
JinYong Park [Thu, 22 Dec 2016 11:53:13 +0000 (20:53 +0900)]
Revert "notify: block_events restore previous style when style set failed"

That patch to resolve problem which block events couldn't find correct theme.
But now, find better method, so revert that patch.

This reverts commit 000acee4c8f6fad04be243a1639f219e6d81da38.

Change-Id: I409a30a0d5658ea9588f3c43d2884ba198a90f11
Signed-off-by: Jinyong Park <j4939.park@samsung.com>
7 years agowidget: add _elm_widget_style_set_internal function to internal usage. 09/106809/6
JinYong Park [Fri, 23 Dec 2016 06:45:50 +0000 (15:45 +0900)]
widget: add _elm_widget_style_set_internal function to internal usage.

For some composite widgets, using "elm_widget_style_set" function
check its subobject theme apply result and it cause problem which can't set theme excatly.
To avoid this problem, internal style set function don't check sub objects theme apply result.

Change-Id: I84588263aa2936c7d1696fbfc46d3d509e5d8189
Signed-off-by: Jinyong Park <j4939.park@samsung.com>
7 years agoelm_layout: Fix not to return value from void function. 94/106694/1
Jaehyun Cho [Thu, 22 Dec 2016 11:40:59 +0000 (20:40 +0900)]
elm_layout: Fix not to return value from void function.

Change-Id: I488c83b895cc3e814130814f4141967e53563bb3

7 years agoentry: clear selection on unfocus for both editable and non-editable entries 09/106609/1 accepted/tizen/3.0/common/20161227.101418 accepted/tizen/3.0/ivi/20161226.025431 accepted/tizen/3.0/mobile/20161226.025205 accepted/tizen/3.0/tv/20161226.025319 accepted/tizen/3.0/wearable/20161226.025355 submit/tizen_3.0/20161222.090625
Minchul Lee [Thu, 22 Dec 2016 07:27:34 +0000 (16:27 +0900)]
entry: clear selection on unfocus for both editable and non-editable entries

Change-Id: Ieb050330efd16cc9ba909ba664021f6a4e03bbd9
Signed-off-by: Minchul Lee <slotus.lee@samsung.com>
7 years agospinner: disable entry touch sound for uneditable mode 80/106580/2
Minchul Lee [Thu, 22 Dec 2016 06:01:48 +0000 (15:01 +0900)]
spinner: disable entry touch sound for uneditable mode

Change-Id: Ibbb5f5ac46302b02877d47ab3bc328a8f10a2032
Signed-off-by: Minchul Lee <slotus.lee@samsung.com>
7 years agoScroller: keep contents layout rel even if rtl is set 69/106369/3
Wonki Kim [Wed, 21 Dec 2016 10:42:11 +0000 (19:42 +0900)]
Scroller: keep contents layout rel even if rtl is set

Once rtl mode is set, elm_layout reverses its x-axis.
however, scroller uses elm_layout to contain both original content and
proxy image of it when loop mode is set.

In this situation, elm_layout should not reverse its x-axis when It is
used for container of proxy to support loop mode of scroller.

This commit will not apply rtl mode to contents layout (mirrored set)

@tizen_fix

Change-Id: Ia334cc2beb61621f9b9e16c5463345efd8a415c2
Signed-off-by: Wonki Kim <wonki_.kim@samsung.com>
7 years ago[ATSPI][elm_genlist] Remove ", header" from the atspi name. 62/106262/2
JunsuChoi [Wed, 21 Dec 2016 07:20:05 +0000 (16:20 +0900)]
[ATSPI][elm_genlist] Remove ", header" from the atspi name.

   Remove the code to add ", header" to name when genlist's item is group type.
   "header" read out screen reader side.

Change-Id: I88b5fddc76e5eb7b4bcc4034b4a6dbb315b613f1

7 years ago[elm_layout][ATSPI] modify null check of obj 06/106206/4
JunsuChoi [Wed, 21 Dec 2016 04:22:43 +0000 (13:22 +0900)]
[elm_layout][ATSPI] modify null check of obj

   modify null check of obj in _elm_layout_elm_widget_atspi function.

Change-Id: I916e186388b78fbb870e4fc94d0d51f724e72a74

7 years agocolor_class: fix errors which can occur in specific scenarios 50/106350/2
Jee-Yong Um [Wed, 21 Dec 2016 10:22:32 +0000 (19:22 +0900)]
color_class: fix errors which can occur in specific scenarios

Signed-Off-By: Jee-Yong Um <jc9.um@samsung.com>
Change-Id: I3a0e504c7c800ae56eae7fef6d332a0dab484825

7 years agoRevert "elm_cnp: support return type for _wl_elm_cnp_selection_get()" 98/106298/1 accepted/tizen/3.0/common/20161221.182151 accepted/tizen/3.0/ivi/20161221.104310 accepted/tizen/3.0/mobile/20161221.104041 accepted/tizen/3.0/tv/20161221.104151 accepted/tizen/3.0/wearable/20161221.104207 submit/tizen_3.0/20161221.050821
Taehyub Kim [Wed, 21 Dec 2016 08:43:22 +0000 (17:43 +0900)]
Revert "elm_cnp: support return type for _wl_elm_cnp_selection_get()"

This reverts commit beec73b881d004d1d8915675b71cb25fada2d405.
Change-Id: Ia66221f7d3de233e82681464604872be14073193

7 years ago[Map] remove unecessary list free 63/106163/1
Sungtaek Hong [Tue, 20 Dec 2016 13:54:45 +0000 (22:54 +0900)]
[Map] remove unecessary list free

@tizen_fix

Change-Id: Ie81e4a537254c77e94eb414ef6cfdea9a2b701a1
Signed-off-by: Sungtaek Hong <sth253.hong@samsung.com>
7 years agoelm_scroller: focus_next needs to give itself when no focusable child 86/106086/3
WooHyun Jung [Tue, 20 Dec 2016 10:22:57 +0000 (19:22 +0900)]
elm_scroller: focus_next needs to give itself when no focusable child

@fix

Change-Id: I2efe6534d20477c82ef66eb64c18060d24fe2a84

7 years agoelm_cnp: modify data_ret value in _wl_general_conveter() to return NULL when input... 82/105682/2
Taehyub Kim [Mon, 19 Dec 2016 09:24:16 +0000 (18:24 +0900)]
elm_cnp: modify data_ret value in _wl_general_conveter() to return NULL when input data is empty

Change-Id: I76d302220ccebd6b897197c8465fba28d2f9d14c

7 years agoconform: Postpone indicator hiding once quickpanel is visible 65/105865/2
Wonki Kim [Tue, 20 Dec 2016 01:18:16 +0000 (10:18 +0900)]
conform: Postpone indicator hiding once quickpanel is visible

Postpone indicator hiding when quickpanel is showing to meet ux guideline.
modify indicator to work with theme.

@tizen_feature

Change-Id: I00840736632742702640a7da0f9289e192678cc4
Signed-off-by: Wonki Kim <wonki_.kim@samsung.com>
7 years agocopypaste: remove unnecessary code 69/105969/2
Taehyub Kim [Tue, 20 Dec 2016 06:32:59 +0000 (15:32 +0900)]
copypaste: remove unnecessary code

Change-Id: I8d64fb21f4d54f029a65c3ea9aa63c0a96ea2e41

7 years agoelm_cnp: support return type for _wl_elm_cnp_selection_get() 67/105967/2
Taehyub Kim [Tue, 20 Dec 2016 06:30:20 +0000 (15:30 +0900)]
elm_cnp: support return type for _wl_elm_cnp_selection_get()

Change-Id: I9cc82e340727a0866651aa201fc66e0d0043dd8e

7 years agoelm_cnp: support text plain mime type for _wl_elm_cnp_selection_get() 60/105960/2
Taehyub Kim [Tue, 20 Dec 2016 06:20:27 +0000 (15:20 +0900)]
elm_cnp: support text plain mime type for _wl_elm_cnp_selection_get()

Change-Id: I7e2273bd1a74a660739a98fc31bc6fbe2e0a2ea5

7 years agomultibuttonentry: Fix dereference of null pointer issue. 18/105918/3
Woochan Lee [Tue, 20 Dec 2016 04:52:59 +0000 (13:52 +0900)]
multibuttonentry: Fix dereference of null pointer issue.

https://phab.enlightenment.org/D4501

Change-Id: I2372ac0e65d96d0065fb9c15266827a104f54cfe

7 years agowin: bug fix - add missing NULL checking in _elm_win_translate 45/105945/2
Jaeun Choi [Tue, 20 Dec 2016 05:55:11 +0000 (14:55 +0900)]
win: bug fix - add missing NULL checking in _elm_win_translate

_elm_config might not be initialized at the point

@tizen_fix

Change-Id: Ifd31a884f484aaf1a277434fbc5d7818c20efb3f

7 years agoconfig: add missing "TIZEN_ONLY" comments for "language_auto_mirrored" 42/105942/1
Jaeun Choi [Tue, 20 Dec 2016 05:51:28 +0000 (14:51 +0900)]
config: add missing "TIZEN_ONLY" comments for "language_auto_mirrored"

Change-Id: I68fae4b2902eb2eade9a3ab15bb24d51a6acfe82

7 years agoctxpopup: fix dismissed callback call 27/104527/7
JinYong Park [Tue, 13 Dec 2016 11:55:02 +0000 (20:55 +0900)]
ctxpopup: fix dismissed callback call

Change-Id: I645481bff840cd8029034fb24fcab8725875d841
Signed-off-by: Jinyong Park <j4939.park@samsung.com>
7 years agoscrollable_interface: fixed logic for calcualting position to scroll. 42/105542/2
Hosang Kim [Mon, 19 Dec 2016 03:50:07 +0000 (12:50 +0900)]
scrollable_interface: fixed logic for calcualting position to scroll.

When width of parameter(w) is bigger than or equal to scroller's
width(pw), scrollable object must be scrolled to x position.

Change-Id: I168cd7946cd689db4fca5e170b9e2e2d86e7efc5

7 years agoelm_calendar: Fix to support NLS disabled system. 34/105634/1
Jaehyun Cho [Mon, 19 Dec 2016 06:09:51 +0000 (15:09 +0900)]
elm_calendar: Fix to support NLS disabled system.

Change-Id: Iaf39a85048cb462f136c0473dd523c03715927f2

7 years agodatetime: Fixed field list arrange code. 61/105561/1
Woochan Lee [Mon, 19 Dec 2016 04:46:18 +0000 (13:46 +0900)]
datetime: Fixed field list arrange code.

It was implemented in tizen_2.4.
I missed this commit before.

@tizen_fix

Change-Id: Id639c0a6024bce31448933a3806dfb44570b73f1

7 years agogenlist: add hidden signal when text and content is unset 94/105394/4 accepted/tizen/3.0/common/20161220.101235 accepted/tizen/3.0/ivi/20161220.013341 accepted/tizen/3.0/mobile/20161220.013131 accepted/tizen/3.0/tv/20161220.013241 accepted/tizen/3.0/wearable/20161220.013254 submit/tizen_3.0/20161217.074405
SangHyeon Lee [Fri, 16 Dec 2016 10:32:27 +0000 (19:32 +0900)]
genlist: add hidden signal when text and content is unset

Change-Id: I6298e025735b39d0ec4d51344205ac845f7a5b4c

7 years agogengrid : cancel longpress timer when event is on hold 70/105370/2
SangHyeon Lee [Fri, 16 Dec 2016 09:44:45 +0000 (18:44 +0900)]
gengrid : cancel longpress timer when event is on hold

Change-Id: Ia25c8ed9e225f067add8f1e9fcf4b930a27e5096
Signed-off-by: SangHyeon Lee <sh10233.lee@samsung.com>
7 years agogengrid : enable select in longpressed 95/105195/4
SangHyeon Lee [Fri, 16 Dec 2016 02:44:13 +0000 (11:44 +0900)]
gengrid : enable select in longpressed

This is Tizen Only patch since Tizen 2.4

@tizen_fix

Change-Id: I5b38a626f4fefac1960cb566e6584c437a187a20

7 years agogenlist: enable focus on select none and display only item 78/105278/2
SangHyeon Lee [Fri, 16 Dec 2016 07:02:34 +0000 (16:02 +0900)]
genlist: enable focus on select none and display only item

Change-Id: Idd2f7100e0b0e6dc741c0826187ef6a6217aaf34
Signed-off-by: SangHyeon Lee <sh10233.lee@samsung.com>
7 years agospinner: Delete code that make a value as min, max automatically. 02/105302/2
Woochan Lee [Fri, 16 Dec 2016 07:49:43 +0000 (16:49 +0900)]
spinner: Delete code that make a value as min, max automatically.

This is not tizen UI.
Tizen UI is just ignore last input value when value is bigger, smaller than min, max.

Change-Id: I06be226b274c7c9913509cb1c193aafaa77aedea

7 years ago[atspi] slider uses max value when atspi tries to set value. 47/104847/3
Shinwoo Kim [Wed, 14 Dec 2016 11:31:20 +0000 (20:31 +0900)]
[atspi] slider uses max value when atspi tries to set value.
Because double type value could be 1.00000000000000022204.

Change-Id: Idab1a1f4f57bae61f27511bb1b93a0fbef3aff2f

7 years ago[atspi] do not response if ecore evas is obscured 06/104506/7
Shinwoo Kim [Tue, 13 Dec 2016 11:36:01 +0000 (20:36 +0900)]
[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.

Change-Id: I385fc09e292350656a37a91cbc0b4cace82bb32b

7 years ago[ATSPI][elm_layout] apply screen_reader_changed callback 17/104317/5
JunsuChoi [Tue, 13 Dec 2016 05:48:17 +0000 (14:48 +0900)]
[ATSPI][elm_layout] apply screen_reader_changed callback

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

Change-Id: I396aaefd35a6ec9de75ef7b68251d2d1fc6d3e99

7 years agoelm_interface_scrollable: fix calculating position logic. 78/104978/2
Hosang Kim [Thu, 15 Dec 2016 04:58:40 +0000 (13:58 +0900)]
elm_interface_scrollable: fix calculating position logic.

The target position should be calculated without width and
height.

Change-Id: I88b450e9e70009efc288c2b5e94957513cd08b53

7 years agoelm_widget: add logic for updating geometry after moving 20/104520/2
Hosang Kim [Tue, 13 Dec 2016 11:19:45 +0000 (20:19 +0900)]
elm_widget: add logic for updating geometry after moving
scrollable object.

In multiple scrollable case, the target object should be updated.
Because the movement of the first object is finished. So the parent of
the first object should be target object.

Change-Id: I9f8198fb0d9f4ac5c993574e7f9d7dd2b58ad402

7 years agonaviframe: Raise previous view after item pop is finished. 46/104846/1
Jaehyun Cho [Wed, 14 Dec 2016 10:53:49 +0000 (19:53 +0900)]
naviframe: Raise previous view after item pop is finished.

Previously, previous view was raised immediately when item pop is
started so previous view covers current view when item pop is started.
Now, previous view is raised after item pop is finished so previous view
covers current view when item pop is finished.

Change-Id: I86f343e0b49f3801d00e553755896f0eb756daa0

7 years agogenlist: Evas focus should not give to Item layout when item unrealized. 29/104729/2 accepted/tizen/3.0/common/20161219.112541 accepted/tizen/3.0/ivi/20161219.064642 accepted/tizen/3.0/mobile/20161219.065232 accepted/tizen/3.0/tv/20161219.064753 accepted/tizen/3.0/wearable/20161219.063954 submit/tizen_3.0/20161214.092405 submit/tizen_3.0/20161214.123801
Woochan Lee [Wed, 14 Dec 2016 07:35:22 +0000 (16:35 +0900)]
genlist: Evas focus should not give to Item layout when item unrealized.

Change-Id: Ia9c89a556c5b90fbc95da5167a13a630508062ab

7 years agoRevert "popup: notify's parent change to elm_win" 72/104672/1
Woochan Lee [Wed, 14 Dec 2016 05:08:09 +0000 (14:08 +0900)]
Revert "popup: notify's parent change to elm_win"

This reverts commit 85052decf5b44720c3f65502e5eb3f2c56308a3f.

Change-Id: I2b0bace5d38e8cedf4d969e78c70279b0c375eda

7 years agopopup: notify's parent change to elm_win 74/104174/4
JinYong Park [Mon, 12 Dec 2016 13:00:06 +0000 (22:00 +0900)]
popup: notify's parent change to elm_win

If popup add to not window object,
notify can't block all window area.
So notify add to top window object.

Change-Id: I096fb07bc6b0a5d1d2fdea746a5dc15da593c5a1
Signed-off-by: Jinyong Park <j4939.park@samsung.com>
7 years agohoversel: fix to calculate item size correctly (screen rotation) 59/104459/2
Jee-Yong Um [Tue, 13 Dec 2016 10:04:48 +0000 (19:04 +0900)]
hoversel: fix to calculate item size correctly (screen rotation)

Signed-Off-By: Jee-Yong Um <jc9.um@samsung.com>
Change-Id: Iaa60d1f162049f44db0d335f909e601ec908f89e

7 years agofocus: is_focus_target flag is added for on_focus function 80/104480/3
WooHyun Jung [Tue, 13 Dec 2016 10:33:58 +0000 (19:33 +0900)]
focus: is_focus_target flag is added for on_focus function

Now, widgets can know whether the on_focus is called by _parent_focus
of its child OR of itself.
And, it's firstly applied to genlist's on_focus.

@tizen_feature

Change-Id: I2516ff71a5cb728e0c952cccd9e5646e8e29b072

7 years ago[atspi][naviframe] Set/Get accessible information using VIEW(item) object 38/104238/3
Shinwoo Kim [Tue, 13 Dec 2016 01:45:25 +0000 (10:45 +0900)]
[atspi][naviframe] Set/Get accessible information using VIEW(item) object

Change-Id: I1f5a342d0195581880fe5b503ece8f158794685c

7 years agogenlist : fix content focused handle on focus 36/104536/1
SangHyeon Lee [Tue, 13 Dec 2016 12:02:43 +0000 (21:02 +0900)]
genlist : fix content focused handle on focus

when content object is getting focused,
genlist object should not process on focus.

Change-Id: I18d5b0d6298b3fe5edc97ad1b0627fc4d2f8af28
Signed-off-by: SangHyeon Lee <sh10233.lee@samsung.com>
7 years agogenlist : fix focus_set issue on item when mouse up is called 74/104374/3
SangHyeon Lee [Tue, 13 Dec 2016 07:52:57 +0000 (16:52 +0900)]
genlist : fix focus_set issue on item when mouse up is called

Change-Id: I4d29d69e66b9a1847c79ca5b7fdaa32864e6791a

7 years agointerface_scrollable: modify position mirror logic to support mirrored ui 85/104185/2
Wonki Kim [Thu, 8 Dec 2016 15:29:00 +0000 (00:29 +0900)]
interface_scrollable: modify position mirror logic to support mirrored ui

logically reverse x axis.
WIP

@tizen_fix

Change-Id: Ie209577c24c6aa3bc9256c24a30e596408447c2e
Signed-off-by: Wonki Kim <wonki_.kim@samsung.com>
7 years agoelm_win: set wayland window type for dialog,dock and splash 73/104273/4
MinJeong Kim [Tue, 13 Dec 2016 03:37:02 +0000 (12:37 +0900)]
elm_win: set wayland window type for dialog,dock and splash

Change-Id: Id0ba863da4724f98e30e4713149643641b90478b
Signed-off-by: MinJeong Kim <minjjj.kim@samsung.com>
7 years agogenlist: unrealize realized item when theme is applied 83/104283/1
SangHyeon Lee [Tue, 13 Dec 2016 04:03:01 +0000 (13:03 +0900)]
genlist: unrealize realized item when theme is applied

Change-Id: I17c77d8338a51975f8b08e95802bddc3759bad58

7 years agoconformant: Add quickpanel callback to postpone hiding indicator 94/103494/7
Wonki Kim [Thu, 8 Dec 2016 12:09:00 +0000 (21:09 +0900)]
conformant: Add quickpanel callback to postpone hiding indicator

In case of transparent mode of conformant,
indicator will hide in 3 seconds later after scrolled down by flicking.
and If user flicks one more time before it get hided,
quickpanel will be scrolled down.

However, no matter what the quickpanel is visible or not,
indicator will hide in 3 seconds.

this patch makes conformant postpond hiding it's indicator,
if quickpanel is visible.

@related packages
efl-modules
efl-misc

@tizen_fix

Change-Id: I2a541c42eae3c3c68110a06684cc03de51ecc0f1
Signed-off-by: Wonki Kim <wonki_.kim@samsung.com>
7 years agoatspi: reduce IPC of object:state-changed:showing 81/103881/3
Shinwoo Kim [Fri, 9 Dec 2016 07:18:56 +0000 (16:18 +0900)]
atspi: reduce IPC of object:state-changed:showing

Send interested signal only

Change-Id: I58f56a6330148e8d7eadaa59c8f0c85459750e07

7 years agoelm: Safely delete ecore poller in elm_config_shutdown 42/103042/2
Amitesh Singh [Wed, 7 Dec 2016 05:07:05 +0000 (10:37 +0530)]
elm: Safely delete ecore poller in elm_config_shutdown

This fixes the crashes in tizen tv whenever `efl_config` exits.

commit 8c8cb0d34ff90682540bd25731d525578b67a4ea
Author: Jean-Philippe Andre <jp.andre@samsung.com>
Date:   Wed Nov 23 13:53:14 2016 +0900

elm: Safely delete ecore poller in elm_config_shutdown

This prevents some errors after elm_init / elm_shutdown /
elm_init

Change-Id: I6f5180d74543402fcfebff88679a63d46b5f9490

7 years agoaccess: do not count initted if elm_modapi_init() is fail 75/104075/2
Jonghee Choi [Thu, 8 Dec 2016 04:28:39 +0000 (13:28 +0900)]
access: do not count initted if elm_modapi_init() is fail

Summary:
When _access_init was called, initted will be increased always even though failed to initialize.
This patch will fix this problem.

Signed-off-by: Jonghee Choi <joi.choi@samsung.com>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Reviewers: cedric, Hermet

Reviewed By: Hermet

Subscribers: joi.choi, jpeg

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

Change-Id: I4e36a24cbe4a42cb5e491681d3f81807bb74490e

7 years agowidget: retry top-down when bottom-up failed. 76/104176/1
Lukasz Stanislawski [Mon, 12 Dec 2016 13:18:32 +0000 (14:18 +0100)]
widget: retry top-down when bottom-up failed.

Change-Id: I28f8321ba8db1a1fe070228804e7d58f10a64b65

7 years agogenlist: revert mouse move callback into item proxy 52/104052/2
SangHyeon Lee [Mon, 12 Dec 2016 07:39:22 +0000 (16:39 +0900)]
genlist: revert mouse move callback into item proxy

Change-Id: I54420d5746229726d1bea055b0472554edebde34

7 years agoedje_external: Fix operating useless logic. 45/100845/3
Woochan Lee [Tue, 29 Nov 2016 10:46:30 +0000 (19:46 +0900)]
edje_external: Fix operating useless logic.

https://phab.enlightenment.org/D4436
Svace: 145088

Change-Id: I2ed015cfc9a51d4dd6e7409388716d265858a940

7 years agoelm_entry: Save cursor position before entry text clear 37/103637/2
JEONGHYUN YUN [Fri, 9 Dec 2016 04:32:34 +0000 (13:32 +0900)]
elm_entry: Save cursor position before entry text clear

Summary: Cursor position should be saved because entry will be cleared when entry text set.

Reviewers: woohyun, id213sin

Reviewed By: id213sin

Subscribers: cedric, jpeg

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

Change-Id: Ia575f7bf82a0f87c4343d0a457bfd4732f2dbb1d
Signed-off-by: JEONGHYUN YUN <jh0506.yun@samsung.com>
7 years agogenlist: update height of the first item when scroll align is enabled 30/103730/2
Jee-Yong Um [Fri, 9 Dec 2016 08:24:46 +0000 (17:24 +0900)]
genlist: update height of the first item when scroll align is enabled

Signed-Off-By: Jee-Yong Um <jc9.um@samsung.com>
Change-Id: I510bb479a099a0fdcc65d105e899aade1b689eef

7 years agocolor_class: add del/clear APIs 46/102446/2
Jee-Yong Um [Tue, 6 Dec 2016 01:20:22 +0000 (10:20 +0900)]
color_class: add del/clear APIs

Signed-Off-By: Jee-Yong Um <jc9.um@samsung.com>
Change-Id: I525d176502ccde898541f7f4b811b5e715efc704

7 years agocolor_class: get color from applied color class 70/99870/2
Jee-Yong Um [Thu, 24 Nov 2016 09:55:44 +0000 (18:55 +0900)]
color_class: get color from applied color class

Signed-Off-By: Jee-Yong Um <jc9.um@samsung.com>
Change-Id: I75e273b22023f230f58a07f21bcd1050273b985a

7 years agomobile_lib/genlist: space input now selects genlist item 06/103906/2
WooHyun Jung [Sat, 10 Dec 2016 08:38:37 +0000 (17:38 +0900)]
mobile_lib/genlist: space input now selects genlist item

Change-Id: Ie1dae9d134cc864ede0d928856a37f62e10b6cba

7 years agomobile_lib/genlist: set evas_focus to genlist itself when unfocus a child 03/103903/2
WooHyun Jung [Sat, 10 Dec 2016 07:56:11 +0000 (16:56 +0900)]
mobile_lib/genlist: set evas_focus to genlist itself when unfocus a child

Change-Id: If26e3c8088fb8df0f57870710bcddb05d2ebbb50

7 years agoconfig: update config data for processes which are launched before lazy mounting 10/103510/4 accepted/tizen/3.0/common/20161212.060801 accepted/tizen/3.0/ivi/20161212.024005 accepted/tizen/3.0/mobile/20161212.024216 accepted/tizen/3.0/tv/20161212.024402 accepted/tizen/3.0/wearable/20161212.024454 accepted/tizen/ivi/20161212.023703 accepted/tizen/mobile/20161212.023250 accepted/tizen/tv/20161212.023522 accepted/tizen/wearable/20161212.023549 submit/tizen/20150127.011226 submit/tizen_3.0/20161211.083148
Youngbok Shin [Thu, 8 Dec 2016 12:42:21 +0000 (21:42 +0900)]
config: update config data for processes which are launched before lazy mounting

@tizen_only

Change-Id: Ib4f256860854a9f6f5e72b15377b3b7b01f39b51

7 years agogengrid: add unhighlight for unselected item 99/103899/2
WooHyun Jung [Sat, 10 Dec 2016 07:14:25 +0000 (16:14 +0900)]
gengrid: add unhighlight for unselected item

Change-Id: I43286fa6116de3fa8e43f83e7c90e2135bc39f60

7 years agoelm_spinner: Spinner internal focus logic fixed to following New focused UI concept. 02/103702/4
Woochan Lee [Fri, 9 Dec 2016 07:37:33 +0000 (16:37 +0900)]
elm_spinner: Spinner internal focus logic fixed to following New focused UI concept.

https://phab.enlightenment.org/D4475

Change-Id: Iff81c703daaff8176f17b79688b113c01cbb4c2b

7 years agoelm_cnp: disable html type for x protocol 98/103698/2
Taehyub Kim [Fri, 9 Dec 2016 07:29:48 +0000 (16:29 +0900)]
elm_cnp: disable html type for x protocol

Change-Id: I807c34994d9a98f2223ca17bb46e7352539af44f

7 years agoRevert "[ctxpopup] check auto hide disable mode when bg clicked" 47/103647/2
JinYong Park [Fri, 9 Dec 2016 04:49:34 +0000 (13:49 +0900)]
Revert "[ctxpopup] check auto hide disable mode when bg clicked"

This reverts commit 77bd0fd5089cb9dcafd83ad4078663354f02b04f.

Change-Id: I7596983598eccf1f706fc59775aa2b8671cb7373
Signed-off-by: Jinyong Park <j4939.park@samsung.com>
7 years agoelm_win: supported floating window. 07/103507/3
Hosang Kim [Thu, 8 Dec 2016 12:41:06 +0000 (21:41 +0900)]
elm_win: supported floating window.

Signed-off-by: Hosang Kim <hosang12.kim@samsung.com>
Change-Id: I2c4263240e8e88d416a86f6e31055d84207990dc

7 years agoRevert "ctxpopup: disable auto hide when orient is changed." 90/103090/2
JinYong Park [Wed, 7 Dec 2016 07:37:06 +0000 (16:37 +0900)]
Revert "ctxpopup: disable auto hide when orient is changed."

This reverts commit bf1f360915789c608007c5d384ee8bc791836b83.

Change-Id: I3f79e673371663ecaf5b5265def123690d08dac0

7 years agoctxpopup: focus set when show animation is finished 99/103199/2
JinYong Park [Wed, 7 Dec 2016 13:41:57 +0000 (22:41 +0900)]
ctxpopup: focus set when show animation is finished

Change-Id: Ic7aca1f07f42ab8797815fd2b7380d28a159d5e3
Signed-off-by: Jinyong Park <j4939.park@samsung.com>
7 years ago[atspi][naviframe] add API elm_object_part_access_object_get 30/103530/2
Shinwoo Kim [Thu, 8 Dec 2016 14:10:20 +0000 (23:10 +0900)]
[atspi][naviframe] add API elm_object_part_access_object_get

Change-Id: Ib81e905ad685478c0bdb73264a3c371951806eb6

7 years ago[Index] apply mirrored UI 17/103517/2
Sungtaek Hong [Thu, 8 Dec 2016 13:08:06 +0000 (22:08 +0900)]
[Index] apply mirrored UI

Change-Id: I89afdd8ee82859a9bf8ebe715cad595d73f2de18
Signed-off-by: Sungtaek Hong <sth253.hong@samsung.com>
7 years ago[atspi][proxy] assign NULL after eina_stringshare_del is called. 71/103171/3
Shinwoo Kim [Wed, 7 Dec 2016 11:38:26 +0000 (20:38 +0900)]
[atspi][proxy] assign NULL after eina_stringshare_del is called.

The _pd->path, _pd->bus could be accessed when the proxy is deleted to send signal of ATSPI_OBJECT_CHILD_REMOVED.
See the following backtrace:

0  0xb67b1c04 in raise () from /lib/libc.so.6
1  0xb67b2f98 in abort () from /lib/libc.so.6
2  0xb40bf258 in _dbus_abort () at dbus-sysdeps.c:91
3  0xb40b87be in _dbus_warn_check_failed (
   format=0xb40c5080 "arguments to %s() were incorrect, assertion \"%s\" failed in file %s line %d.\nThis is normally a bug in some application using the D-Bus library.\n") at dbus-internals.c:275
4  0xb40ae8dc in dbus_message_iter_append_basic (iter=<optimized out>,
   type=111, value=0x1, value@entry=0xbee78bc0) at dbus-message.c:2865
5  0xb61d194a in append_basic (type=type@entry=12 '\f', vl=0xbee78bec,
   vl@entry=0xbee78bd4, iter=iter@entry=0xb8728db0)
   at lib/eldbus/eldbus_message.c:449
6  0xb61d323e in eldbus_message_iter_basic_append (
   iter=iter@entry=0xb8728da0, type=111) at lib/eldbus/eldbus_message.c:566
7  0xb6d2792c in _bridge_iter_object_reference_append (
   bridge=bridge@entry=0x8000341b, iter=0xb837de90, obj=obj@entry=0x80100e0c)
   at elm_atspi_bridge.c:3233
8  0xb6d27a32 in _on_object_del (data=0x8000341b, obj=0x80100e0c,
   event=<optimized out>, event_info=<optimized out>)
   at elm_atspi_bridge.c:4480
9  0xb6d26e0c in _bridge_accessible_event_dispatch (data=0x8000341b,
   accessible=0x80100e0c,
   desc=0xb6e7c0f4 <_ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_REMOVED>,
--Type <return> to continue, or q <return> to quit---
   event_info=0x0) at elm_atspi_bridge.c:4660
10 0xb6d94778 in _elm_interface_atspi_accessible_event_emit (
   class=<optimized out>, pd=<optimized out>, accessible=0x80100e0c,
   event=0xb6e7c0f4 <_ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_REMOVED>,
   event_info=0x0) at elm_interface_atspi_accessible.c:486
11 0xb6d9407c in elm_interface_atspi_accessible_event_emit (
   accessible=accessible@entry=0x80100e0c,
   event=0xb6e7c0f4 <_ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_REMOVED>,
   event_info=event_info@entry=0x0) at elm_interface_atspi_accessible.eo.c:124
12 0xb6e0f918 in _elm_widget_eo_base_destructor (obj=0x80100e0c,
   sd=0xb87504b0) at elm_widget.c:6101
13 0xb6716108 in eo_destructor () at lib/eo/eo_base.eo.c:34
14 0xb6d254d6 in _elm_atspi_proxy_eo_base_destructor (obj=0x80100e0c,
    _pd=<optimized out>) at elm_atspi_proxy.c:88

Change-Id: Iad77033d7ba6e85799bcc17bd09efa29d5c85440

7 years agoelm_genlist: unfocused content object when item is unrealized. 23/103123/2
Hosang Kim [Wed, 7 Dec 2016 09:15:22 +0000 (18:15 +0900)]
elm_genlist: unfocused content object when item is unrealized.

Signed-off-by: Hosang Kim <hosang12.kim@samsung.com>
Change-Id: I0e2bb313088224c08b38cc5b65ee7994b13a702f

7 years agoelm_cnp: support text/uri-list type for _wl_elm_cnp_selection_get 17/103417/1
Taehyub Kim [Thu, 8 Dec 2016 08:39:22 +0000 (17:39 +0900)]
elm_cnp: support text/uri-list type for _wl_elm_cnp_selection_get

Change-Id: If0c0114d9b535e255887cb7d755ba23660b89655

7 years agoscroller: Limit coordination when there is only one page 31/100231/6
Wonki Kim [Fri, 25 Nov 2016 10:23:46 +0000 (19:23 +0900)]
scroller: Limit coordination when there is only one page

By applying scroll improvement code, coordination should be limited
with in the page when scroller has just one page

@tizen_fix

Change-Id: I8bc092a73c3a2c68bec5cf59764e1a5bd08b7a06
Signed-off-by: Wonki Kim <wonki_.kim@samsung.com>
7 years agogenlist: remove all compilation warnings of wearable profile. 27/103127/6
Hermet Park [Wed, 7 Dec 2016 09:38:59 +0000 (18:38 +0900)]
genlist: remove all compilation warnings of wearable profile.

Change-Id: Ieb753a820f224326926a6f7da5e1ce45083db277

7 years agonaviframe: Support latest naviframe effect module APIs. 24/103224/3
Jaehyun Cho [Wed, 7 Dec 2016 15:11:51 +0000 (00:11 +0900)]
naviframe: Support latest naviframe effect module APIs.

tizen_push_deferred_effect() is added.
tizen_pop_deferred_effect() is added.
tizen_effect_enabled_get() is added.
Now tizen_push_effect() is called with one view.
Now tizen_pop_effect() is called with one view.
Now transition signals are not emitted to theme if the theme supports
naviframe effect module. (i.e. if tizen_zoom is 1)

Change-Id: Iec75fcb216673827ff808d59c588ccb6ce705476

7 years ago[ATSPI][Naviframe] add reading text of back button 58/103158/1
JunsuChoi [Wed, 7 Dec 2016 11:02:15 +0000 (20:02 +0900)]
[ATSPI][Naviframe] add reading text of back button

   When prev_btn is set, Accessible name is set if there is no text.

Change-Id: I0ae8e49211aac28e47ec221f1492b5c6062f6a16

7 years agogenlist : fix cannot scroll to item after call elm_genlist_item_update 54/103054/2
jinwoo.shin [Wed, 7 Dec 2016 04:57:56 +0000 (13:57 +0900)]
genlist : fix cannot scroll to item after call elm_genlist_item_update

Summary: Fix cannot scroll to item after call elm_genlist_item_update

Test Plan: https://phab.enlightenment.org/T4974

Reviewers: Hermet

Reviewed By: Hermet

Subscribers: SanghyeonLee, minkyu, cedric, jpeg

Tags: #efl

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

Change-Id: I0774e70d412f0c08aa81bc050f139a421a93e425

7 years agoelm_cnp: change the priority for html type 35/103135/2 accepted/tizen/3.0/common/20161208.153543 accepted/tizen/3.0/ivi/20161208.063144 accepted/tizen/3.0/mobile/20161208.062805 accepted/tizen/3.0/tv/20161208.063023 accepted/tizen/3.0/wearable/20161208.063050 submit/tizen_3.0/20161207.102526
Taehyub Kim [Wed, 7 Dec 2016 10:15:32 +0000 (19:15 +0900)]
elm_cnp: change the priority for html type

Change-Id: I1fba692617dfdcae047e300361ebcc7007fe9354

7 years agoscrollable_interface: fixed last_page_get() API 43/102743/2
soohye [Tue, 6 Dec 2016 04:30:43 +0000 (13:30 +0900)]
scrollable_interface: fixed last_page_get() API

Summary: ceiling the vaule of content size divided by page size

Reviewers: cedric, jpeg, Hermet

Reviewed By: Hermet

Subscribers: minkyu, sju27, cedric, jpeg

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

Change-Id: Ic902f69dd7b265bb54c9e1625ec7960ef6ab107e

7 years agoelm_genlist: add item checking locgic, when _item_mouse_up_cb is called. 21/102721/3
Hosang Kim [Tue, 6 Dec 2016 10:31:01 +0000 (19:31 +0900)]
elm_genlist: add item checking locgic, when _item_mouse_up_cb is called.

Sometimes _item_focusable_search() API's return value and current item
will be different.

Change-Id: I14a885ce492210edca6a4aa21e5140e982b201fb

7 years agoelm_cnp: support html type for copy&paste 46/102746/1
Taehyub Kim [Tue, 6 Dec 2016 11:09:50 +0000 (20:09 +0900)]
elm_cnp: support html type for copy&paste

Change-Id: I2547671a5f8cdc41bd68f396714333759448ee99