Merge branch 'tizen' into tizen_3.0 "Bezel swipe down diable & warnig"submit/tizen_3.0/20161216.044830accepted/tizen/3.0/wearable/20161219.012017

Change-Id: Iac7c14427351a166be0615f19e39be3da9f4e172

6 files changed, 22 insertions, 11 deletions

diff --git a/home/include/screen_reader_handler.h b/home/include/screen_reader_handler.h
index 2459f9f..eb474ef 100755
--- a/home/include/screen_reader_handler.h
+++ b/home/include/screen_reader_handler.h
@@ -49,7 +49,7 @@ typedef struct {
 void screen_reader_update(void);
 void screen_reader_read(char *str, Eina_Bool discardable);
 void screen_reader_update_name(Evas_Object *target_obj, const char *name);
-void screen_reader_update_widget_description(Evas_Object *target_obj, const char *name);
+void screen_reader_update_widget_description(Evas_Object *target_obj, char *name);
 void screen_reader_update_description(Evas_Object *target_obj, const char *description);
 void screen_reader_set_highlight(Evas_Object *target_obj, Eina_Bool highlight);
 access_info_t *screen_reader_create_access_info(Evas_Object *target, Evas_Object *parent, char *name, char *description, Elm_Accessible_Reading_Info_Type type);
diff --git a/home/src/add-viewer.c b/home/src/add-viewer.c
index ca83b92..7911820 100755
--- a/home/src/add-viewer.c
+++ b/home/src/add-viewer.c
@@ -1195,7 +1195,7 @@ static Evas_Object *winset_preview_add(struct widget_data *widget_data, Evas_Obj
 
 		if (name) {
 			strncpy(buf, name, sizeof(buf));
-			access_info = screen_reader_create_access_info(preview, parent, name, NULL, ELM_ACCESSIBLE_READING_INFO_TYPE_NAME);
+			access_info = screen_reader_create_access_info(preview, parent, buf, NULL, ELM_ACCESSIBLE_READING_INFO_TYPE_NAME);
 		} else {
 			access_info = screen_reader_create_access_info(preview, parent, NULL, NULL, ELM_ACCESSIBLE_READING_INFO_TYPE_NAME);
 		}
diff --git a/home/src/moments/moments_manager.c b/home/src/moments/moments_manager.c
index eded062..c3bbfab 100755
--- a/home/src/moments/moments_manager.c
+++ b/home/src/moments/moments_manager.c
@@ -15,6 +15,7 @@
  */
 
 #include <app.h>
+
 #include "log.h"
 #include "moments/moments.h"
 #include "moments/moments_view.h"
@@ -66,6 +67,7 @@ void moments_show(void)
 		_E("failed to show moment-bar");
 		return ;
 	}
+
 	scroller_freeze(s_info.bg_scroller);
 
 	s_info.visible = true;
diff --git a/home/src/moments/moments_view.c b/home/src/moments/moments_view.c
index 2e839a4..b4a61d7 100755
--- a/home/src/moments/moments_view.c
+++ b/home/src/moments/moments_view.c
@@ -30,6 +30,7 @@
 #define BASE_LAYOUT_EDJE EDJE_DIR"/circle/moments_layout.edj"
 
 static struct __view_s {
+	Evas_Object *win;
 	Evas_Object *layout;
 	Evas_Object *size_setter;
 	Evas_Object *content;
@@ -37,6 +38,7 @@ static struct __view_s {
 	bool is_drawing_up;
 	int down_y;
 } s_info = {
+	.win = NULL,
 	.layout = NULL,
 	.size_setter = NULL,
 	.content = NULL,
@@ -63,6 +65,7 @@ Evas_Object *moments_create_ui(Evas_Object *base_win)
 {
 	_D("%s", __func__);
 
+	s_info.win = base_win;
 	s_info.layout = __create_base_layout(base_win);
 	if (s_info.layout == NULL) goto __fail;
 
@@ -219,6 +222,10 @@ static void __freeze_touch_event(void)
 	}
 	*/
 
+	int id = elm_win_aux_hint_id_get(s_info.win, "wm.policy.win.gesture.disable");
+	_D("hint set wm.policy.win.gesture.disable 1 id %d", id);
+	elm_win_aux_hint_val_set(s_info.win, id, "1");
+
 	evas_object_event_callback_del(s_info.content, EVAS_CALLBACK_MOUSE_UP, __up_cb);
 	evas_object_event_callback_del(s_info.content, EVAS_CALLBACK_MOUSE_MOVE, __move_cb);
 	evas_object_event_callback_del(s_info.content, EVAS_CALLBACK_MOUSE_DOWN, __down_cb);
@@ -240,6 +247,10 @@ static void __unfreeze_touch_event(void)
 	}
 	*/
 
+	int id = elm_win_aux_hint_id_get(s_info.win, "wm.policy.win.gesture.disable");
+	_D("hint set wm.policy.win.gesture.disable 0 id %d", id);
+	elm_win_aux_hint_val_set(s_info.win, id, "0");
+
 	evas_object_event_callback_add(s_info.content, EVAS_CALLBACK_MOUSE_DOWN, __down_cb, NULL);
 	evas_object_event_callback_add(s_info.content, EVAS_CALLBACK_MOUSE_MOVE, __move_cb, NULL);
 	evas_object_event_callback_add(s_info.content, EVAS_CALLBACK_MOUSE_UP, __up_cb, NULL);
diff --git a/home/src/screen_reader_handler.c b/home/src/screen_reader_handler.c
index 1647e32..3f96f06 100755
--- a/home/src/screen_reader_handler.c
+++ b/home/src/screen_reader_handler.c
@@ -77,7 +77,7 @@ access_info_t *screen_reader_create_access_info(Evas_Object *target, Evas_Object
 	return access_info;
 }
 
-void screen_reader_update_widget_description(Evas_Object *target_obj, const char *name)
+void screen_reader_update_widget_description(Evas_Object *target_obj, char *name)
 {
 	Evas_Object *access_obj = NULL;
 
@@ -110,13 +110,6 @@ void screen_reader_make_relationship(Evas_Object *prev, Evas_Object *next)
 		_E("next access object is NULL");
 		return;
 	}
-
-#if 0
-	elm_atspi_accessible_relationship_append(prev_access, ELM_ATSPI_RELATION_FLOWS_TO, next_access);
-	elm_atspi_accessible_relationship_append(next_access, ELM_ATSPI_RELATION_FLOWS_FROM, prev_access);
-	elm_atspi_accessible_relationship_append(next_access, ELM_ATSPI_RELATION_FLOWS_TO, next_access);
-	elm_atspi_accessible_relationship_append(next_access, ELM_ATSPI_RELATION_FLOWS_FROM, next_access);
-#endif
 }
 
 void screen_reader_update(void)
diff --git a/home/src/scroller.c b/home/src/scroller.c
index 295cf37..3f41361 100755
--- a/home/src/scroller.c
+++ b/home/src/scroller.c
@@ -519,8 +519,14 @@ static void _anim_stop_cb(void *data, Evas_Object *scroller, void *event_info)
 		}
 
 		if (page == main_get_info()->clock_focus) {
+			int id = elm_win_aux_hint_id_get(main_get_info()->win, "wm.policy.win.gesture.disable");
+			_D("hint set wm.policy.win.gesture.disable 1 id %d", id);
+			elm_win_aux_hint_val_set(main_get_info()->win, id, "1");
 			vconf_set_bool(VCONFKEY_HOMESCREEN_WATCH_FACE_VISIBILITY, EINA_TRUE);
 		} else {
+			int id = elm_win_aux_hint_id_get(main_get_info()->win, "wm.policy.win.gesture.disable");
+			_D("hint set wm.policy.win.gesture.disable 0 id %d", id);
+			elm_win_aux_hint_val_set(main_get_info()->win, id, "0");
 			vconf_set_bool(VCONFKEY_HOMESCREEN_WATCH_FACE_VISIBILITY, EINA_FALSE);
 		}
 	}
@@ -971,7 +977,6 @@ HAPI void scroller_update_access_widget_description(Evas_Object *scroller)
 
 		if (page_info->direction == PAGE_DIRECTION_RIGHT) {
 			snprintf(buf, sizeof(buf), _("IDS_AT_BODY_PAGE_P1SD_OF_P2SD_T_TTS"), position, total_count);
-
 			screen_reader_update_widget_description(page_info->access_info->target, buf);
 		}
 	}