From 774ad223041bd4abab63dd523b1f3847196645ff Mon Sep 17 00:00:00 2001
From: "Geunsun, Lee" <gs86.lee@samsung.com>
Date: Fri, 9 Dec 2016 20:31:53 +0900
Subject: [PATCH 01/16] [Screen Reader] Fix APPS description on edit mode

Change-Id: I760cc4a39ff3d853de67229426a8a5037d17888e
---
 src/apps_view.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/apps_view.c b/src/apps_view.c
index 190c489..b2754a0 100755
--- a/src/apps_view.c
+++ b/src/apps_view.c
@@ -2098,11 +2098,19 @@ static void __apps_view_get_access_page_app_icon(Eina_List **list)
 						info->description = strdup(_("IDS_HS_TBBODY_DOUBLE_TAP_TO_SELECT"));
 						info->clicked_cb = __apps_view_icon_check_changed_cb;
 					}
-				} else {
+				} else if (apps_view_s.view_state == VIEW_STATE_EDIT) {
 					if (item->is_folder) {
 						snprintf(buf, sizeof(buf), "%s, %s", _("IDS_HS_HEADER_FOLDER"), _("IDS_LCKSCN_TBBODY_DOUBLE_TAP_TO_OPEN"));
 					} else {
-						snprintf(buf, sizeof(buf), "%s, %s", _("IDS_LCKSCN_TBBODY_DOUBLE_TAP_TO_OPEN"), _("IDS_BR_BODY_DOUBLE_TAP_AND_HOLD_THEN_DRAG_TO_REORDER_TTS"));
+						snprintf(buf, sizeof(buf), "%s", _("IDS_BR_BODY_DOUBLE_TAP_AND_HOLD_THEN_DRAG_TO_REORDER_TTS"));
+					}
+					info->description = strdup(buf);
+					info->clicked_cb = __apps_view_icon_clicked_cb;
+				} else {
+					if (item->is_folder) {
+						snprintf(buf, sizeof(buf), "%s, %s, %s", _("IDS_HS_HEADER_FOLDER"), _("IDS_LCKSCN_TBBODY_DOUBLE_TAP_TO_OPEN"), _("IDS_BR_BODY_DOUBLE_TAP_AND_HOLD_THEN_DRAG_TO_REORDER_TTS"));
+					} else {
+						snprintf(buf, sizeof(buf), "%s", _("IDS_LCKSCN_TBBODY_DOUBLE_TAP_TO_OPEN"));
 					}
 					info->description = strdup(buf);
 					info->clicked_cb = __apps_view_icon_clicked_cb;
-- 
2.7.4


From 490a06a8db37eabb91f3f908cc81cd8c3dd18281 Mon Sep 17 00:00:00 2001
From: junkyu han <junkyu.han@samsung.com>
Date: Mon, 12 Dec 2016 15:11:18 +0900
Subject: [PATCH 02/16] Search the storage type on install

Change-Id: I94eed83b66744c4bcdffa5e3de9c31f99c65defc
---
 .cproject                  | 32 ++++++++++++++++----------------
 Build/basedef.mk           |  2 +-
 Build/build_edc.mk         |  4 ++--
 Build/build_po.mk          |  4 ++--
 Build/makefile             |  3 ++-
 Build/makefile.mk          | 28 +++++++++++++++-------------
 inc/apps_data.h            |  1 +
 project_def.prop           |  2 +-
 src/apps_data.c            | 19 +++++++++++++++++++
 src/apps_package_manager.c | 14 +++-----------
 10 files changed, 62 insertions(+), 47 deletions(-)

diff --git a/.cproject b/.cproject
index a6da12c..ab7aa9b 100755
--- a/.cproject
+++ b/.cproject
@@ -27,11 +27,17 @@
 								<option defaultValue="gnu.cpp.compiler.debugging.level.max" id="sbi.gnu.cpp.compiler.option.debugging.level.core.481743771" name="Debug level" superClass="sbi.gnu.cpp.compiler.option.debugging.level.core" valueType="enumerated"/>
 								<option defaultValue="false" id="sbi.gnu.cpp.compiler.option.misc.pic.core.2102599528" name="-fPIC option" superClass="sbi.gnu.cpp.compiler.option.misc.pic.core" valueType="boolean"/>
 								<option id="sbi.gnu.cpp.compiler.option.1070320025" name="Tizen-Target" superClass="sbi.gnu.cpp.compiler.option" valueType="userObjs">
-									<listOptionValue builtIn="false" value="mobile-3.0-device.core.public.20161129_1_gcc49.armel.core.app"/>
+									<listOptionValue builtIn="false" value="mobile-3.0-device.core_gcc49.armel.core.app"/>
 								</option>
 								<option id="sbi.gnu.cpp.compiler.option.frameworks_inc.core.312288874" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.cpp.compiler.option.frameworks_inc.core" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/libxml2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/EGL&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES2&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES3&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/KHR&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore-agent&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appfw&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/attach-panel&quot;"/>
@@ -68,7 +74,6 @@
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/efl-1&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/efl-extension&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/efreet-1&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/EGL&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eina-1&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eina-1/eina&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eio-1&quot;"/>
@@ -86,14 +91,10 @@
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/freetype2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/geofence&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/gio-unix-2.0&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES2&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES3&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/glib-2.0&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/harfbuzz&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/iotcon&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/json-glib-1.0&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/KHR&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/location&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/maps&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/media&quot;"/>
@@ -106,7 +107,6 @@
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/notification&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/nsd/&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/phonenumber-utils&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/sensor&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/service-adaptor&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/shortcut&quot;"/>
@@ -146,11 +146,17 @@
 								<option defaultValue="gnu.c.debugging.level.max" id="sbi.gnu.c.compiler.option.debugging.level.core.247638963" name="Debug level" superClass="sbi.gnu.c.compiler.option.debugging.level.core" valueType="enumerated"/>
 								<option defaultValue="false" id="sbi.gnu.c.compiler.option.misc.pic.core.982331969" name="-fPIC option" superClass="sbi.gnu.c.compiler.option.misc.pic.core" valueType="boolean"/>
 								<option id="sbi.gnu.c.compiler.option.1644890019" name="Tizen-Target" superClass="sbi.gnu.c.compiler.option" valueType="userObjs">
-									<listOptionValue builtIn="false" value="mobile-3.0-device.core.public.20161129_1_gcc49.armel.core.app"/>
+									<listOptionValue builtIn="false" value="mobile-3.0-device.core_gcc49.armel.core.app"/>
 								</option>
 								<option id="sbi.gnu.c.compiler.option.frameworks_inc.core.1483034184" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.c.compiler.option.frameworks_inc.core" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/libxml2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/EGL&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES2&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES3&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/KHR&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore-agent&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appfw&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/attach-panel&quot;"/>
@@ -187,7 +193,6 @@
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/efl-1&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/efl-extension&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/efreet-1&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/EGL&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eina-1&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eina-1/eina&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eio-1&quot;"/>
@@ -205,14 +210,10 @@
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/freetype2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/geofence&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/gio-unix-2.0&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES2&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES3&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/glib-2.0&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/harfbuzz&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/iotcon&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/json-glib-1.0&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/KHR&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/location&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/maps&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/media&quot;"/>
@@ -225,7 +226,6 @@
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/notification&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/nsd/&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/phonenumber-utils&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/sensor&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/service-adaptor&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/shortcut&quot;"/>
@@ -643,10 +643,10 @@
 	</storageModule>
 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
 	<storageModule moduleId="refreshScope" versionNumber="2">
-		<configuration configurationName="Release">
+		<configuration configurationName="Debug">
 			<resource resourceType="PROJECT" workspacePath="/homescreen-efl"/>
 		</configuration>
-		<configuration configurationName="Debug">
+		<configuration configurationName="Release">
 			<resource resourceType="PROJECT" workspacePath="/homescreen-efl"/>
 		</configuration>
 	</storageModule>
diff --git a/Build/basedef.mk b/Build/basedef.mk
index 64fbf82..a762983 100755
--- a/Build/basedef.mk
+++ b/Build/basedef.mk
@@ -22,7 +22,7 @@ PROJ_PATH ?= $(PROJPATH)
 #endif
 
 #ifeq ($(strip $(OUTPUT_DIR)),)
-OUTPUT_DIR ?= $(PROJ_PATH)/$(BUILD_CONFIG)
+#OUTPUT_DIR ?= $(PROJ_PATH)/$(BUILD_CONFIG)
 #endif
 
 #ifeq ($(strip $(BUILD_ARCH)),)
diff --git a/Build/build_edc.mk b/Build/build_edc.mk
index 6f85fdd..2270b84 100644
--- a/Build/build_edc.mk
+++ b/Build/build_edc.mk
@@ -1,12 +1,12 @@
 # EDC build script
 
 
-FUNC_EDC2EDJ = $(patsubst %.edc,$(2)/%.edj,$(1))
+FUNC_EDC2EDJ = $(patsubst %.edc,%.edj,$(1))
 
 # parameter :
 #  $(1) - C/C++ soruce file
 #  $(2) - output path
-CONVERT_ESC_EDC_TO_EDJ = $(call CONVERT_4MAKE_TO_OUT,$(call FUNC_EDC2EDJ,$(1),$(2)))
+CONVERT_ESC_EDC_TO_EDJ = $(2)/$(call CONVERT_4MAKE_TO_OUT,$(call FUNC_EDC2EDJ,$(1)))
 
 
 # parameter :
diff --git a/Build/build_po.mk b/Build/build_po.mk
index d88d71a..514116b 100644
--- a/Build/build_po.mk
+++ b/Build/build_po.mk
@@ -1,14 +1,14 @@
 # PO build script
 
 
-_FUNC_PO2MO = $(patsubst %.po,$(2)/res/locale/%/LC_MESSAGES/$(3).mo,$(notdir $(1)))
+_FUNC_PO2MO = $(patsubst %.po,res/locale/%/LC_MESSAGES/$(2).mo,$(notdir $(1)))
 
 
 # parameter :
 #  $(1) - C/C++ soruce file
 #  $(2) - output path
 #  $(3) - app name
-CONVERT_ESC_PO_TO_MO = $(call CONVERT_4MAKE_TO_OUT,$(call _FUNC_PO2MO,$(1),$(2),$(3)))
+CONVERT_ESC_PO_TO_MO = $(2)/$(call CONVERT_4MAKE_TO_OUT,$(call _FUNC_PO2MO,$(1),$(3)))
 
 
 # parameter :
diff --git a/Build/makefile b/Build/makefile
index 9348c50..3c3f61e 100755
--- a/Build/makefile
+++ b/Build/makefile
@@ -14,7 +14,8 @@ clean : app_clean
 version : build_version
 
 #PROJ_ROOT = .
-BUILD_ROOT := $(PROJ_PATH)/Build#
+PROJ_PATH ?= .#
+BUILD_ROOT ?= $(PROJ_PATH)/Build#
 
 ifeq ($(MAKE_NAME),mingw32-make)
 ifneq ($(SHELL),)
diff --git a/Build/makefile.mk b/Build/makefile.mk
index c95b4b4..fd5349d 100644
--- a/Build/makefile.mk
+++ b/Build/makefile.mk
@@ -15,8 +15,8 @@ version : build_version
 
 
 #PROJ_ROOT := $(call BSLASH2SLASH,$(PROJ_PATH))
-PROJ_ROOT := .
-BUILD_ROOT := $(PROJ_ROOT)/Build
+PROJ_ROOT ?= .#
+BUILD_ROOT ?= $(PROJ_ROOT)/Build
 
 include $(BUILD_ROOT)/basedef.mk
 
@@ -32,8 +32,11 @@ include $(BUILD_ROOT)/funcs.mk
 
 APPTYPE := $(type)
 
-OUTPUT_DIR := $(PROJ_ROOT)/$(BUILD_CONFIG)
-OBJ_OUTPUT := $(OUTPUT_DIR)/objs
+OUTPUT_BASE ?= $(PROJ_ROOT)
+#OUTPUT_DIR ?= $(OUTPUT_BASE)/$(BUILD_CONFIG)/$(BUILD_ARCH)
+OUTPUT_DIR ?= $(OUTPUT_BASE)/$(BUILD_CONFIG)
+OUTPUT_DIR := $(call BSLASH2SLASH,$(OUTPUT_DIR))
+OBJ_OUTPUT ?= $(OUTPUT_DIR)/objs
 
 LOWER_APPNAME := $(call LOWER_CASE,$(APPNAME))
 APPID2 := $(subst $(basename $(APPID)).,,$(APPID))
@@ -65,8 +68,8 @@ ifeq ($(strip $(APPTYPE)),sharedLib)
 EXT_OP := -fPIC
 endif
 
-C_OPT := $(COMPILE_FLAGS) $(TC_COMPILER_MISC) $(RS_COMPILER_MISC) $(EXT_OP) --sysroot="$(SYSROOT)" -Werror-implicit-function-declaration $(M_OPT)
-CPP_OPT := $(CPP_COMPILE_FLAGS) $(TC_COMPILER_MISC) $(RS_COMPILER_MISC) $(EXT_OP) --sysroot="$(SYSROOT)" -Werror-implicit-function-declaration $(M_OPT)
+C_OPT := $(COMPILE_FLAGS) $(TC_COMPILER_MISC) $(RS_COMPILER_MISC) $(EXT_OP) --sysroot="$(SYSROOT)" -Werror-implicit-function-declaration $(M_OPT) $(USER_C_OPTS)
+CPP_OPT := $(CPP_COMPILE_FLAGS) $(TC_COMPILER_MISC) $(RS_COMPILER_MISC) $(EXT_OP) --sysroot="$(SYSROOT)" -Werror-implicit-function-declaration $(M_OPT) $(USER_CPP_OPTS)
 C_OPT_FILE := $(PLATFORM_INCS_FILE)
 
 OBJS := #
@@ -81,7 +84,7 @@ $(foreach ext,cpp cxx cc c++ C,$(eval $(call C_PROC_RAW,$(OBJ_OUTPUT),$(USER_SRC
 # Individual C/C++
 ifneq ($(strip $(USER_EXT_C_KEYS)),)
 $(foreach var,$(USER_EXT_C_KEYS),$(eval $(call C_PROC_RAW,$(OBJ_OUTPUT),$(USER_EXT_$(var)_SRCS),$(USER_EXT_$(var)_INC_DIRS),$(USER_EXT_$(var)_INC_FILES),$(USER_EXT_$(var)_DEFS),$(USER_EXT_$(var)_UNDEFS),$(C_OPT),$(C_OPT_FILE),C,c,$(CC),OBJS)))
-$(foreach ext,cpp cxx cc c++ C,$(foreach var,$(USER_EXT_C_KEYS),$(eval $(call C_PROC_RAW,$(OBJ_OUTPUT),$(USER_EXT_$(var)_SRCS),$(USER_EXT_$(var)_INC_DIRS),$(USER_EXT_$(var)_CPP_INC_FILES),$(USER_EXT_$(var)_CPP_DEFS),$(USER_EXT_$(var)_CPP_UNDEFS),$(C_OPT),$(C_OPT_FILE),C++,$(ext),$(CXX),OBJS))))
+$(foreach ext,cpp cxx cc c++ C,$(foreach var,$(USER_EXT_C_KEYS),$(eval $(call C_PROC_RAW,$(OBJ_OUTPUT),$(USER_EXT_$(var)_SRCS),$(USER_EXT_$(var)_INC_DIRS),$(USER_EXT_$(var)_CPP_INC_FILES),$(USER_EXT_$(var)_CPP_DEFS),$(USER_EXT_$(var)_CPP_UNDEFS),$(CPP_OPT),$(C_OPT_FILE),C++,$(ext),$(CXX),OBJS))))
 endif
 
 
@@ -109,7 +112,7 @@ $(APPFILE) : $(OBJS) $(UOBJS)
 	@echo '  Building target: $@'
 	@echo '  Invoking: C/C++ Linker'
 	$(call MAKEDIRS,$(@D))
-	$(CXX) -o $(APPFILE) $(OBJS) $(UOBJS) $(LIBPATHS) -Xlinker --as-needed $(LIBS) $(LINK_FLAGS) $(TC_LINKER_MISC) $(RS_LINKER_MISC) -pie -lpthread --sysroot="$(SYSROOT)" -Xlinker --version-script="$(PROJ_ROOT)/.exportMap" $(RS_LIB_PATHS) $(RS_LIBRARIES) -Xlinker -rpath="/opt/usr/apps/$(APPID)/lib" -Werror-implicit-function-declaration
+	$(CXX) -o $(APPFILE) $(OBJS) $(UOBJS) $(LIBPATHS) -Xlinker --as-needed $(LIBS) $(LINK_FLAGS) $(TC_LINKER_MISC) $(RS_LINKER_MISC) -pie -lpthread --sysroot="$(SYSROOT)" -Xlinker --version-script="$(PROJ_ROOT)/.exportMap" $(RS_LIB_PATHS) $(RS_LIBRARIES) -Xlinker -rpath="/opt/usr/apps/$(APPID)/lib" -Werror-implicit-function-declaration $(USER_LINK_OPTS)
 	@echo '  Finished building target: $@'
 endif
 ifeq ($(strip $(APPTYPE)),staticLib)
@@ -117,7 +120,7 @@ $(APPFILE) : $(OBJS) $(UOBJS)
 	@echo '  Building target: $@'
 	@echo '  Invoking: Archive utility'
 	$(call MAKEDIRS,$(@D))
-	$(AR) -r $(APPFILE) $(OBJS) $(UOBJS) $(AR_FLAGS)
+	$(AR) -r $(APPFILE) $(OBJS) $(UOBJS) $(AR_FLAGS) $(USER_LINK_OPTS)
 	@echo '  Finished building target: $@'
 endif
 ifeq ($(strip $(APPTYPE)),sharedLib)
@@ -125,7 +128,7 @@ $(APPFILE) : $(OBJS) $(UOBJS)
 	@echo '  Building target: $@'
 	@echo '  Invoking: C/C++ Linker'
 	$(call MAKEDIRS,$(@D))
-	$(CXX) -o $(APPFILE) $(OBJS) $(UOBJS) $(LIBPATHS) -Xlinker --as-needed $(LIBS) $(LINK_FLAGS) $(TC_LINKER_MISC) $(RS_LINKER_MISC) -shared -lpthread --sysroot="$(SYSROOT)" $(RS_LIB_PATHS) $(RS_LIBRARIES)
+	$(CXX) -o $(APPFILE) $(OBJS) $(UOBJS) $(LIBPATHS) -Xlinker --as-needed $(LIBS) $(LINK_FLAGS) $(TC_LINKER_MISC) $(RS_LINKER_MISC) -shared -lpthread --sysroot="$(SYSROOT)" $(RS_LIB_PATHS) $(RS_LIBRARIES) $(USER_LINK_OPTS)
 	@echo '  Finished building target: $@'
 endif
 
@@ -144,14 +147,13 @@ ifneq ($(findstring Windows,$(OS)),)
 ifneq ($(findstring 3.82,$(MAKE_VERSION)),)
 	$(file > $@,$(PLATFORM_INCS))
 else
-	@echo $(PLATFORM_INCS) > $@
+	@echo $(PLATFORM_INCS) > "$@"
 endif
 else
-	@echo $(PLATFORM_INCS) > $@
+	@echo $(PLATFORM_INCS) > "$@"
 endif
 endif
 
-
 include $(BUILD_ROOT)/build_edc.mk
 
 #ifeq ($(strip $(ENVENTOR_SHARED_RES_PATH)),)
diff --git a/inc/apps_data.h b/inc/apps_data.h
index 695f792..d8984f4 100755
--- a/inc/apps_data.h
+++ b/inc/apps_data.h
@@ -72,5 +72,6 @@ void apps_data_delete_list(Eina_List *list);
 app_data_t *apps_data_find_item_by_index(int index);
 int apps_data_get_folder_item_count(app_data_t *folder);
 void apps_data_update_item_label(void);
+storage_t apps_data_get_storage_type(const char *package);
 
 #endif /* __APPS_DATA_H__ */
diff --git a/project_def.prop b/project_def.prop
index e3e696d..b64d38e 100755
--- a/project_def.prop
+++ b/project_def.prop
@@ -18,7 +18,7 @@ USER_EDCS =
 USER_POS = res/po/ca.po res/po/fr.po res/po/nl.po res/po/pt_BR.po res/po/sk.po res/po/sv.po res/po/uz.po res/po/ko_KR.po res/po/is.po res/po/ka.po res/po/ro.po res/po/it_IT.po res/po/en_PH.po res/po/lt.po res/po/mk.po res/po/nb.po res/po/ru_RU.po res/po/el_GR.po res/po/zh_TW.po res/po/az.po res/po/hr.po res/po/uk.po res/po/zh_CN.po res/po/de.po res/po/es_US.po res/po/eu.po res/po/kk.po res/po/sl.po res/po/et.po res/po/fr_CA.po res/po/ga.po res/po/gl.po res/po/hy.po res/po/lv.po res/po/ja_JP.po res/po/es_ES.po res/po/bg.po res/po/cs.po res/po/pl.po res/po/pt_PT.po res/po/sr.po res/po/hu.po res/po/ar.po res/po/en_US.po res/po/fi.po res/po/da.po res/po/en.po res/po/zh_HK.po res/po/tr_TR.po 
 
 # User Defines
-USER_DEFS = 
+USER_DEFS = TIZEN_DEPRECATION 
 USER_CPP_DEFS = 
 
 # User Undefines
diff --git a/src/apps_data.c b/src/apps_data.c
index 83b65ee..f721a7e 100755
--- a/src/apps_data.c
+++ b/src/apps_data.c
@@ -495,3 +495,22 @@ void apps_data_update_item_label(void)
 		}
 	}
 }
+
+storage_t apps_data_get_storage_type(const char *package)
+{
+	Eina_List *list = NULL;
+	Eina_List *find_list = NULL;
+	app_data_t *item = NULL;
+	storage_t storage_type = INTERNAL;
+
+	apps_package_manager_get_external_list(&list);
+
+	EINA_LIST_FOREACH(list, find_list, item) {
+		if ((strcmp(package, item->pkg_id) == 0) && item->owner && (strcmp(item->owner, TEMP_OWNER) == 0)) {
+			storage_type = EXTERNAL;
+			break;
+		}
+	}
+
+	return storage_type;
+}
diff --git a/src/apps_package_manager.c b/src/apps_package_manager.c
index 82b8ada..00f2405 100755
--- a/src/apps_package_manager.c
+++ b/src/apps_package_manager.c
@@ -268,6 +268,7 @@ static bool __apps_data_get_app_info_from_pkg(package_info_app_component_type_e
 	}
 
 	if (__apps_data_pkg_get_apps_info(app_info, &item)) {
+		item->storage_type = apps_data_get_storage_type(item->pkg_id);
 		apps_data_install(item);
 	}
 	app_info_destroy(app_info);
@@ -301,19 +302,10 @@ static void __apps_package_manager_uninstall(const char *package)
 
 static void __apps_package_manager_move(const char *package)
 {
-	Eina_List *list = NULL;
-	Eina_List *find_list = NULL;
-	app_data_t *item = NULL;
 	storage_t storage_type = INTERNAL;
 
-	apps_package_manager_get_external_list(&list);
-
-	EINA_LIST_FOREACH(list, find_list, item) {
-		if ((strcmp(package, item->pkg_id) == 0) && item->owner && (strcmp(item->owner, TEMP_OWNER) == 0)) {
-			storage_type = EXTERNAL;
-			break;
-		}
-	}
+	storage_type = apps_data_get_storage_type(package);
+	LOGD("This package is installed: %d", storage_type);
 
 	apps_data_move(package, storage_type);
 }
-- 
2.7.4


From 22ad4e8131c55fdd1e0da27f3586889a4cc54fb0 Mon Sep 17 00:00:00 2001
From: junkyu han <junkyu.han@samsung.com>
Date: Mon, 12 Dec 2016 15:53:26 +0900
Subject: [PATCH 03/16] Delete icon that has removed already

Change-Id: Ia3c5eaba57332da5ae6666096717dedc3697f9d5
---
 src/apps_view.c | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/apps_view.c b/src/apps_view.c
index b2754a0..250e4e5 100755
--- a/src/apps_view.c
+++ b/src/apps_view.c
@@ -919,14 +919,17 @@ static void __apps_view_uninstall_app_cb(void *data, Evas_Object *obj, void *eve
 		LOGE("Could not set request mode. App: %s", item->pkg_id);
 		return;
 	}
-	if (package_manager_request_uninstall(request, item->pkg_id, &id) != PACKAGE_MANAGER_ERROR_NONE) {
-		LOGE("Could not uninstall application. App: %s", item->pkg_id);
-		return;
-	}
-	if (package_manager_request_destroy(request) != PACKAGE_MANAGER_ERROR_NONE) {
-		LOGE("Could not destroy unistall request. App: %s", item->pkg_id);
-		return;
+	ret = package_manager_request_uninstall(request, item->pkg_id, &id);
+	if (ret != PACKAGE_MANAGER_ERROR_NONE) {
+		if (ret != PACKAGE_MANAGER_ERROR_NO_SUCH_PACKAGE) {
+			LOGE("Could not uninstall application. App: %s", item->pkg_id);
+			return;
+		}
+		LOGD("This application is removed on other homescreen");
+		apps_data_uninstall(item->pkg_id);
 	}
+
+	package_manager_request_destroy(request);
 }
 
 static void __apps_view_icon_check_changed_cb(void *data, Evas_Object *obj, const char *emission, const char *source)
-- 
2.7.4


From 249f5338b1c944b1a914b7de9f0ddae33175225d Mon Sep 17 00:00:00 2001
From: YoungHun Cho <hoon.cho@samsung.com>
Date: Fri, 16 Dec 2016 16:01:19 +0900
Subject: [PATCH 04/16] widget box

Change-Id: I232b5a3f1d6a21bb3a00e5f76dff1463aad5f66c
---
 .cproject                 | 38 +++++++++++------------
 Build/basedef.mk          |  2 +-
 Build/build_edc.mk        |  4 +--
 Build/build_po.mk         |  4 +--
 Build/makefile            |  3 +-
 Build/makefile.mk         | 28 ++++++++---------
 inc/cluster_data.h        |  1 +
 inc/edc_conf.h            |  2 ++
 project_def.prop          |  4 +--
 res/edje/cluster_page.edc | 12 ++++---
 res/edje/widget.edc       |  6 ++++
 res/edje/widget_box.edc   | 26 ++++++++++++++++
 src/widget_viewer.c       | 79 +++++++++++++++++++++--------------------------
 13 files changed, 117 insertions(+), 92 deletions(-)
 create mode 100644 res/edje/widget_box.edc

diff --git a/.cproject b/.cproject
index ab7aa9b..2e3c45f 100755
--- a/.cproject
+++ b/.cproject
@@ -22,22 +22,16 @@
 							<targetPlatform binaryParser="org.eclipse.cdt.core.ELF" id="org.tizen.nativeide.target.sbi.gnu.platform.base.1500203774" osList="linux,win32" superClass="org.tizen.nativeide.target.sbi.gnu.platform.base"/>
 							<builder autoBuildTarget="all" buildPath="${workspace_loc:/homescreen-efl}/Debug" enableAutoBuild="true" id="org.tizen.nativecore.target.sbi.gnu.builder.676790294" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Tizen Application Builder" superClass="org.tizen.nativecore.target.sbi.gnu.builder"/>
 							<tool id="org.tizen.nativecore.tool.sbi.gnu.archiver.766671326" name="Archiver" superClass="org.tizen.nativecore.tool.sbi.gnu.archiver"/>
-							<tool command="arm-linux-gnueabi-g++" id="org.tizen.nativecore.tool.sbi.gnu.cpp.compiler.1800477664" name="C++ Compiler" superClass="org.tizen.nativecore.tool.sbi.gnu.cpp.compiler">
+							<tool command="clang++" id="org.tizen.nativecore.tool.sbi.gnu.cpp.compiler.1800477664" name="C++ Compiler" superClass="org.tizen.nativecore.tool.sbi.gnu.cpp.compiler">
 								<option id="gnu.cpp.compiler.option.optimization.level.1791913917" name="Optimization Level" superClass="gnu.cpp.compiler.option.optimization.level" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
 								<option defaultValue="gnu.cpp.compiler.debugging.level.max" id="sbi.gnu.cpp.compiler.option.debugging.level.core.481743771" name="Debug level" superClass="sbi.gnu.cpp.compiler.option.debugging.level.core" valueType="enumerated"/>
 								<option defaultValue="false" id="sbi.gnu.cpp.compiler.option.misc.pic.core.2102599528" name="-fPIC option" superClass="sbi.gnu.cpp.compiler.option.misc.pic.core" valueType="boolean"/>
 								<option id="sbi.gnu.cpp.compiler.option.1070320025" name="Tizen-Target" superClass="sbi.gnu.cpp.compiler.option" valueType="userObjs">
-									<listOptionValue builtIn="false" value="mobile-3.0-device.core_gcc49.armel.core.app"/>
+									<listOptionValue builtIn="false" value="mobile-3.0-emulator.core.public.20161215_1_llvm37.i386.core.app"/>
 								</option>
 								<option id="sbi.gnu.cpp.compiler.option.frameworks_inc.core.312288874" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.cpp.compiler.option.frameworks_inc.core" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/libxml2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/EGL&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES2&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES3&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/KHR&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore-agent&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appfw&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/attach-panel&quot;"/>
@@ -74,6 +68,7 @@
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/efl-1&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/efl-extension&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/efreet-1&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/EGL&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eina-1&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eina-1/eina&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eio-1&quot;"/>
@@ -91,10 +86,14 @@
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/freetype2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/geofence&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/gio-unix-2.0&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES2&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES3&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/glib-2.0&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/harfbuzz&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/iotcon&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/json-glib-1.0&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/KHR&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/location&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/maps&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/media&quot;"/>
@@ -107,6 +106,7 @@
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/notification&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/nsd/&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/phonenumber-utils&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/sensor&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/service-adaptor&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/shortcut&quot;"/>
@@ -131,7 +131,6 @@
 									<listOptionValue builtIn="false" value="${RS_COMPILER_MISC}"/>
 									<listOptionValue builtIn="false" value=" -fPIE"/>
 									<listOptionValue builtIn="false" value="--sysroot=&quot;${SBI_SYSROOT}&quot;"/>
-									<listOptionValue builtIn="false" value="-mthumb"/>
 								</option>
 								<option id="gnu.cpp.compiler.option.include.paths.1857385470" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/inc}&quot;"/>
@@ -141,22 +140,16 @@
 								</option>
 								<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1527920498" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
 							</tool>
-							<tool command="arm-linux-gnueabi-gcc" id="org.tizen.nativecore.tool.sbi.gnu.c.compiler.281727115" name="C Compiler" superClass="org.tizen.nativecore.tool.sbi.gnu.c.compiler">
+							<tool command="clang" id="org.tizen.nativecore.tool.sbi.gnu.c.compiler.281727115" name="C Compiler" superClass="org.tizen.nativecore.tool.sbi.gnu.c.compiler">
 								<option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.option.optimization.level.1600914293" name="Optimization Level" superClass="gnu.c.compiler.option.optimization.level" valueType="enumerated"/>
 								<option defaultValue="gnu.c.debugging.level.max" id="sbi.gnu.c.compiler.option.debugging.level.core.247638963" name="Debug level" superClass="sbi.gnu.c.compiler.option.debugging.level.core" valueType="enumerated"/>
 								<option defaultValue="false" id="sbi.gnu.c.compiler.option.misc.pic.core.982331969" name="-fPIC option" superClass="sbi.gnu.c.compiler.option.misc.pic.core" valueType="boolean"/>
 								<option id="sbi.gnu.c.compiler.option.1644890019" name="Tizen-Target" superClass="sbi.gnu.c.compiler.option" valueType="userObjs">
-									<listOptionValue builtIn="false" value="mobile-3.0-device.core_gcc49.armel.core.app"/>
+									<listOptionValue builtIn="false" value="mobile-3.0-emulator.core.public.20161215_1_llvm37.i386.core.app"/>
 								</option>
 								<option id="sbi.gnu.c.compiler.option.frameworks_inc.core.1483034184" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.c.compiler.option.frameworks_inc.core" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/libxml2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/EGL&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES2&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES3&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/KHR&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore-agent&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appfw&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/attach-panel&quot;"/>
@@ -193,6 +186,7 @@
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/efl-1&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/efl-extension&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/efreet-1&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/EGL&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eina-1&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eina-1/eina&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eio-1&quot;"/>
@@ -210,10 +204,14 @@
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/freetype2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/geofence&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/gio-unix-2.0&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES2&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES3&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/glib-2.0&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/harfbuzz&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/iotcon&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/json-glib-1.0&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/KHR&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/location&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/maps&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/media&quot;"/>
@@ -226,6 +224,7 @@
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/notification&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/nsd/&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/phonenumber-utils&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/sensor&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/service-adaptor&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/shortcut&quot;"/>
@@ -250,7 +249,6 @@
 									<listOptionValue builtIn="false" value="${RS_COMPILER_MISC}"/>
 									<listOptionValue builtIn="false" value=" -fPIE"/>
 									<listOptionValue builtIn="false" value="--sysroot=&quot;${SBI_SYSROOT}&quot;"/>
-									<listOptionValue builtIn="false" value="-mthumb"/>
 								</option>
 								<option id="gnu.c.compiler.option.include.paths.1774757534" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/inc}&quot;"/>
@@ -261,7 +259,7 @@
 								<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.840478259" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
 							</tool>
 							<tool id="org.tizen.nativeide.tool.sbi.gnu.c.linker.base.614766676" name="C Linker" superClass="org.tizen.nativeide.tool.sbi.gnu.c.linker.base"/>
-							<tool command="arm-linux-gnueabi-g++" id="org.tizen.nativecore.tool.sbi.gnu.cpp.linker.1632738856" name="C++ Linker" superClass="org.tizen.nativecore.tool.sbi.gnu.cpp.linker">
+							<tool command="clang++" id="org.tizen.nativecore.tool.sbi.gnu.cpp.linker.1632738856" name="C++ Linker" superClass="org.tizen.nativecore.tool.sbi.gnu.cpp.linker">
 								<option defaultValue="false" id="sbi.gnu.cpp.linker.option.shared_flag.core.1016151526" name="Linker.Shared" superClass="sbi.gnu.cpp.linker.option.shared_flag.core" valueType="boolean"/>
 								<option defaultValue="false" id="sbi.gnu.cpp.linker.option.noundefined.core.1946527908" name="Report unresolved symbol references (-Wl,--no-undefined)" superClass="sbi.gnu.cpp.linker.option.noundefined.core" valueType="boolean"/>
 								<option id="sbi.gnu.cpp.linker.option.frameworks_lflags.core.472552373" name="Tizen-Frameworks-Other-Lflags" superClass="sbi.gnu.cpp.linker.option.frameworks_lflags.core" valueType="stringList">
@@ -281,7 +279,7 @@
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
 								</inputType>
 							</tool>
-							<tool command="arm-linux-gnueabi-as" id="org.tizen.nativeapp.tool.sbi.gnu.assembler.base.1815664769" name="Assembler" superClass="org.tizen.nativeapp.tool.sbi.gnu.assembler.base">
+							<tool command="i386-linux-gnueabi-as" id="org.tizen.nativeapp.tool.sbi.gnu.assembler.base.1815664769" name="Assembler" superClass="org.tizen.nativeapp.tool.sbi.gnu.assembler.base">
 								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.88475890" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
 							</tool>
 							<tool id="org.tizen.nativecore.tool.fnmapgen.304005350" name="C FN-Map Generator" superClass="org.tizen.nativecore.tool.fnmapgen"/>
diff --git a/Build/basedef.mk b/Build/basedef.mk
index a762983..64fbf82 100755
--- a/Build/basedef.mk
+++ b/Build/basedef.mk
@@ -22,7 +22,7 @@ PROJ_PATH ?= $(PROJPATH)
 #endif
 
 #ifeq ($(strip $(OUTPUT_DIR)),)
-#OUTPUT_DIR ?= $(PROJ_PATH)/$(BUILD_CONFIG)
+OUTPUT_DIR ?= $(PROJ_PATH)/$(BUILD_CONFIG)
 #endif
 
 #ifeq ($(strip $(BUILD_ARCH)),)
diff --git a/Build/build_edc.mk b/Build/build_edc.mk
index 2270b84..6f85fdd 100644
--- a/Build/build_edc.mk
+++ b/Build/build_edc.mk
@@ -1,12 +1,12 @@
 # EDC build script
 
 
-FUNC_EDC2EDJ = $(patsubst %.edc,%.edj,$(1))
+FUNC_EDC2EDJ = $(patsubst %.edc,$(2)/%.edj,$(1))
 
 # parameter :
 #  $(1) - C/C++ soruce file
 #  $(2) - output path
-CONVERT_ESC_EDC_TO_EDJ = $(2)/$(call CONVERT_4MAKE_TO_OUT,$(call FUNC_EDC2EDJ,$(1)))
+CONVERT_ESC_EDC_TO_EDJ = $(call CONVERT_4MAKE_TO_OUT,$(call FUNC_EDC2EDJ,$(1),$(2)))
 
 
 # parameter :
diff --git a/Build/build_po.mk b/Build/build_po.mk
index 514116b..d88d71a 100644
--- a/Build/build_po.mk
+++ b/Build/build_po.mk
@@ -1,14 +1,14 @@
 # PO build script
 
 
-_FUNC_PO2MO = $(patsubst %.po,res/locale/%/LC_MESSAGES/$(2).mo,$(notdir $(1)))
+_FUNC_PO2MO = $(patsubst %.po,$(2)/res/locale/%/LC_MESSAGES/$(3).mo,$(notdir $(1)))
 
 
 # parameter :
 #  $(1) - C/C++ soruce file
 #  $(2) - output path
 #  $(3) - app name
-CONVERT_ESC_PO_TO_MO = $(2)/$(call CONVERT_4MAKE_TO_OUT,$(call _FUNC_PO2MO,$(1),$(3)))
+CONVERT_ESC_PO_TO_MO = $(call CONVERT_4MAKE_TO_OUT,$(call _FUNC_PO2MO,$(1),$(2),$(3)))
 
 
 # parameter :
diff --git a/Build/makefile b/Build/makefile
index 3c3f61e..9348c50 100755
--- a/Build/makefile
+++ b/Build/makefile
@@ -14,8 +14,7 @@ clean : app_clean
 version : build_version
 
 #PROJ_ROOT = .
-PROJ_PATH ?= .#
-BUILD_ROOT ?= $(PROJ_PATH)/Build#
+BUILD_ROOT := $(PROJ_PATH)/Build#
 
 ifeq ($(MAKE_NAME),mingw32-make)
 ifneq ($(SHELL),)
diff --git a/Build/makefile.mk b/Build/makefile.mk
index fd5349d..c95b4b4 100644
--- a/Build/makefile.mk
+++ b/Build/makefile.mk
@@ -15,8 +15,8 @@ version : build_version
 
 
 #PROJ_ROOT := $(call BSLASH2SLASH,$(PROJ_PATH))
-PROJ_ROOT ?= .#
-BUILD_ROOT ?= $(PROJ_ROOT)/Build
+PROJ_ROOT := .
+BUILD_ROOT := $(PROJ_ROOT)/Build
 
 include $(BUILD_ROOT)/basedef.mk
 
@@ -32,11 +32,8 @@ include $(BUILD_ROOT)/funcs.mk
 
 APPTYPE := $(type)
 
-OUTPUT_BASE ?= $(PROJ_ROOT)
-#OUTPUT_DIR ?= $(OUTPUT_BASE)/$(BUILD_CONFIG)/$(BUILD_ARCH)
-OUTPUT_DIR ?= $(OUTPUT_BASE)/$(BUILD_CONFIG)
-OUTPUT_DIR := $(call BSLASH2SLASH,$(OUTPUT_DIR))
-OBJ_OUTPUT ?= $(OUTPUT_DIR)/objs
+OUTPUT_DIR := $(PROJ_ROOT)/$(BUILD_CONFIG)
+OBJ_OUTPUT := $(OUTPUT_DIR)/objs
 
 LOWER_APPNAME := $(call LOWER_CASE,$(APPNAME))
 APPID2 := $(subst $(basename $(APPID)).,,$(APPID))
@@ -68,8 +65,8 @@ ifeq ($(strip $(APPTYPE)),sharedLib)
 EXT_OP := -fPIC
 endif
 
-C_OPT := $(COMPILE_FLAGS) $(TC_COMPILER_MISC) $(RS_COMPILER_MISC) $(EXT_OP) --sysroot="$(SYSROOT)" -Werror-implicit-function-declaration $(M_OPT) $(USER_C_OPTS)
-CPP_OPT := $(CPP_COMPILE_FLAGS) $(TC_COMPILER_MISC) $(RS_COMPILER_MISC) $(EXT_OP) --sysroot="$(SYSROOT)" -Werror-implicit-function-declaration $(M_OPT) $(USER_CPP_OPTS)
+C_OPT := $(COMPILE_FLAGS) $(TC_COMPILER_MISC) $(RS_COMPILER_MISC) $(EXT_OP) --sysroot="$(SYSROOT)" -Werror-implicit-function-declaration $(M_OPT)
+CPP_OPT := $(CPP_COMPILE_FLAGS) $(TC_COMPILER_MISC) $(RS_COMPILER_MISC) $(EXT_OP) --sysroot="$(SYSROOT)" -Werror-implicit-function-declaration $(M_OPT)
 C_OPT_FILE := $(PLATFORM_INCS_FILE)
 
 OBJS := #
@@ -84,7 +81,7 @@ $(foreach ext,cpp cxx cc c++ C,$(eval $(call C_PROC_RAW,$(OBJ_OUTPUT),$(USER_SRC
 # Individual C/C++
 ifneq ($(strip $(USER_EXT_C_KEYS)),)
 $(foreach var,$(USER_EXT_C_KEYS),$(eval $(call C_PROC_RAW,$(OBJ_OUTPUT),$(USER_EXT_$(var)_SRCS),$(USER_EXT_$(var)_INC_DIRS),$(USER_EXT_$(var)_INC_FILES),$(USER_EXT_$(var)_DEFS),$(USER_EXT_$(var)_UNDEFS),$(C_OPT),$(C_OPT_FILE),C,c,$(CC),OBJS)))
-$(foreach ext,cpp cxx cc c++ C,$(foreach var,$(USER_EXT_C_KEYS),$(eval $(call C_PROC_RAW,$(OBJ_OUTPUT),$(USER_EXT_$(var)_SRCS),$(USER_EXT_$(var)_INC_DIRS),$(USER_EXT_$(var)_CPP_INC_FILES),$(USER_EXT_$(var)_CPP_DEFS),$(USER_EXT_$(var)_CPP_UNDEFS),$(CPP_OPT),$(C_OPT_FILE),C++,$(ext),$(CXX),OBJS))))
+$(foreach ext,cpp cxx cc c++ C,$(foreach var,$(USER_EXT_C_KEYS),$(eval $(call C_PROC_RAW,$(OBJ_OUTPUT),$(USER_EXT_$(var)_SRCS),$(USER_EXT_$(var)_INC_DIRS),$(USER_EXT_$(var)_CPP_INC_FILES),$(USER_EXT_$(var)_CPP_DEFS),$(USER_EXT_$(var)_CPP_UNDEFS),$(C_OPT),$(C_OPT_FILE),C++,$(ext),$(CXX),OBJS))))
 endif
 
 
@@ -112,7 +109,7 @@ $(APPFILE) : $(OBJS) $(UOBJS)
 	@echo '  Building target: $@'
 	@echo '  Invoking: C/C++ Linker'
 	$(call MAKEDIRS,$(@D))
-	$(CXX) -o $(APPFILE) $(OBJS) $(UOBJS) $(LIBPATHS) -Xlinker --as-needed $(LIBS) $(LINK_FLAGS) $(TC_LINKER_MISC) $(RS_LINKER_MISC) -pie -lpthread --sysroot="$(SYSROOT)" -Xlinker --version-script="$(PROJ_ROOT)/.exportMap" $(RS_LIB_PATHS) $(RS_LIBRARIES) -Xlinker -rpath="/opt/usr/apps/$(APPID)/lib" -Werror-implicit-function-declaration $(USER_LINK_OPTS)
+	$(CXX) -o $(APPFILE) $(OBJS) $(UOBJS) $(LIBPATHS) -Xlinker --as-needed $(LIBS) $(LINK_FLAGS) $(TC_LINKER_MISC) $(RS_LINKER_MISC) -pie -lpthread --sysroot="$(SYSROOT)" -Xlinker --version-script="$(PROJ_ROOT)/.exportMap" $(RS_LIB_PATHS) $(RS_LIBRARIES) -Xlinker -rpath="/opt/usr/apps/$(APPID)/lib" -Werror-implicit-function-declaration
 	@echo '  Finished building target: $@'
 endif
 ifeq ($(strip $(APPTYPE)),staticLib)
@@ -120,7 +117,7 @@ $(APPFILE) : $(OBJS) $(UOBJS)
 	@echo '  Building target: $@'
 	@echo '  Invoking: Archive utility'
 	$(call MAKEDIRS,$(@D))
-	$(AR) -r $(APPFILE) $(OBJS) $(UOBJS) $(AR_FLAGS) $(USER_LINK_OPTS)
+	$(AR) -r $(APPFILE) $(OBJS) $(UOBJS) $(AR_FLAGS)
 	@echo '  Finished building target: $@'
 endif
 ifeq ($(strip $(APPTYPE)),sharedLib)
@@ -128,7 +125,7 @@ $(APPFILE) : $(OBJS) $(UOBJS)
 	@echo '  Building target: $@'
 	@echo '  Invoking: C/C++ Linker'
 	$(call MAKEDIRS,$(@D))
-	$(CXX) -o $(APPFILE) $(OBJS) $(UOBJS) $(LIBPATHS) -Xlinker --as-needed $(LIBS) $(LINK_FLAGS) $(TC_LINKER_MISC) $(RS_LINKER_MISC) -shared -lpthread --sysroot="$(SYSROOT)" $(RS_LIB_PATHS) $(RS_LIBRARIES) $(USER_LINK_OPTS)
+	$(CXX) -o $(APPFILE) $(OBJS) $(UOBJS) $(LIBPATHS) -Xlinker --as-needed $(LIBS) $(LINK_FLAGS) $(TC_LINKER_MISC) $(RS_LINKER_MISC) -shared -lpthread --sysroot="$(SYSROOT)" $(RS_LIB_PATHS) $(RS_LIBRARIES)
 	@echo '  Finished building target: $@'
 endif
 
@@ -147,13 +144,14 @@ ifneq ($(findstring Windows,$(OS)),)
 ifneq ($(findstring 3.82,$(MAKE_VERSION)),)
 	$(file > $@,$(PLATFORM_INCS))
 else
-	@echo $(PLATFORM_INCS) > "$@"
+	@echo $(PLATFORM_INCS) > $@
 endif
 else
-	@echo $(PLATFORM_INCS) > "$@"
+	@echo $(PLATFORM_INCS) > $@
 endif
 endif
 
+
 include $(BUILD_ROOT)/build_edc.mk
 
 #ifeq ($(strip $(ENVENTOR_SHARED_RES_PATH)),)
diff --git a/inc/cluster_data.h b/inc/cluster_data.h
index 29eb506..356e974 100755
--- a/inc/cluster_data.h
+++ b/inc/cluster_data.h
@@ -33,6 +33,7 @@ typedef struct {
 	double period;
 	int allow_duplicate;
 	Evas_Object *widget_layout;
+	Evas_Object *widget_box;
 	Evas_Object *widget_content;
 } widget_data_t;
 
diff --git a/inc/edc_conf.h b/inc/edc_conf.h
index f5ad1d8..b6a6e17 100755
--- a/inc/edc_conf.h
+++ b/inc/edc_conf.h
@@ -164,8 +164,10 @@
 #define SIGNAL_APPS_FOLDER_CLICKED_PLUS_ICON "apps_folder_clicked_plus_icon"
 
 #define GROUP_WIDGET_LY "widget_ly"
+#define GROUP_WIDGET_BOX_LY "widget_box_ly"
 #define WIDGET_CONTENT "widget_content"
 #define WIDGET_THUMBNAIL "widget_thumbnail"
+#define WIDGET_BOX_CONTENT "widget_box_content"
 #define WIDGET_DELETE_BUTTON "widget_delete_button"
 #define SIGNAL_DELETE_BUTTON_SHOW_ANI "delete_button_show_ani"
 #define SIGNAL_DELETE_BUTTON_HIDE_ANI "delete_button_hide_ani"
diff --git a/project_def.prop b/project_def.prop
index b64d38e..a027382 100755
--- a/project_def.prop
+++ b/project_def.prop
@@ -18,7 +18,7 @@ USER_EDCS =
 USER_POS = res/po/ca.po res/po/fr.po res/po/nl.po res/po/pt_BR.po res/po/sk.po res/po/sv.po res/po/uz.po res/po/ko_KR.po res/po/is.po res/po/ka.po res/po/ro.po res/po/it_IT.po res/po/en_PH.po res/po/lt.po res/po/mk.po res/po/nb.po res/po/ru_RU.po res/po/el_GR.po res/po/zh_TW.po res/po/az.po res/po/hr.po res/po/uk.po res/po/zh_CN.po res/po/de.po res/po/es_US.po res/po/eu.po res/po/kk.po res/po/sl.po res/po/et.po res/po/fr_CA.po res/po/ga.po res/po/gl.po res/po/hy.po res/po/lv.po res/po/ja_JP.po res/po/es_ES.po res/po/bg.po res/po/cs.po res/po/pl.po res/po/pt_PT.po res/po/sr.po res/po/hu.po res/po/ar.po res/po/en_US.po res/po/fi.po res/po/da.po res/po/en.po res/po/zh_HK.po res/po/tr_TR.po 
 
 # User Defines
-USER_DEFS = TIZEN_DEPRECATION 
+USER_DEFS = 
 USER_CPP_DEFS = 
 
 # User Undefines
@@ -52,7 +52,7 @@ USER_EDCS_FONT_DIRS = ${OUTPUT_DIR} edje/fonts
 # EDC Flags
 USER_EXT_EDC_KEYS = EDC0 
 
-USER_EXT_EDC0_EDCS = res/edje/cluster_allpage_thumbnail.edc res/edje/home_btn.edc res/edje/home.edc res/edje/widget.edc res/edje/add_widget_viewer.edc res/edje/apps_folder_icon.edc res/edje/apps_chooser_btn.edc res/edje/apps_folder_popup.edc res/edje/app_icon.edc res/edje/cluster_page.edc res/edje/apps_view.edc res/edje/page_indicator_unit.edc res/edje/apps_view_bg.edc res/edje/cluster_allpage.edc 
+USER_EXT_EDC0_EDCS = res/edje/cluster_allpage_thumbnail.edc res/edje/home_btn.edc res/edje/home.edc res/edje/widget.edc res/edje/add_widget_viewer.edc res/edje/apps_folder_icon.edc res/edje/apps_chooser_btn.edc res/edje/apps_folder_popup.edc res/edje/app_icon.edc res/edje/cluster_page.edc res/edje/apps_view.edc res/edje/page_indicator_unit.edc res/edje/apps_view_bg.edc res/edje/cluster_allpage.edc res/edje/widget_box.edc 
 USER_EXT_EDC0_EDCS_IMAGE_DIRS = ${OUTPUT_DIR} edje/images res/images 
 USER_EXT_EDC0_EDCS_SOUND_DIRS = ${OUTPUT_DIR} edje/sounds 
 USER_EXT_EDC0_EDCS_FONT_DIRS = ${OUTPUT_DIR} edje/fonts 
diff --git a/res/edje/cluster_page.edc b/res/edje/cluster_page.edc
index 1e531b0..5f1de33 100755
--- a/res/edje/cluster_page.edc
+++ b/res/edje/cluster_page.edc
@@ -39,8 +39,10 @@ collections {
 					align: 0 0;
 					visible: 0;
 					color : 0 0 0 0;
-					rel1{relative: 0.01 0.06; to: SIZE_SETTER;}
-					rel2{relative: 0.99 0.675; to: SIZE_SETTER;}
+					rel1{relative: 0.0 0.06; to: SIZE_SETTER;}
+					rel2{relative: 1.0 1.0; to: SIZE_SETTER;}
+					aspect: 1.0 1.0;
+					aspect_preference: BOTH;
 				}
 				description {
 					state: "edit" 0.0;
@@ -48,14 +50,16 @@ collections {
 					color : 0 0 0 50;
 					visible: 1;
 					rel1{relative: 0.057 0.066; to: SIZE_SETTER;}
-					rel2{relative: 0.943 0.621; to: SIZE_SETTER;}
+					rel2{relative: 0.943 1.0; to: SIZE_SETTER;}
+					aspect: 1.0 1.0;
+					aspect_preference: BOTH;
 				}
 			}
 			part { name: CLUSTER_BOX;
 				type: SWALLOW;
 				description {
 					state: "default" 0.0;
-					align: 0 0;
+					align: 0.5 0.5;
 					rel1{relative: 0.0 0.0; to: CLUSTER_BG;}
 					rel2{relative: 1.0 1.0; to: CLUSTER_BG;}
 				}
diff --git a/res/edje/widget.edc b/res/edje/widget.edc
index 647bcbd..693d7ae 100755
--- a/res/edje/widget.edc
+++ b/res/edje/widget.edc
@@ -14,7 +14,9 @@ collections {
 				repeat_events: 1;
 				description {
 					state: "default" 0.0;
+					align: 0.5 0.5;
 					rel1.relative: 0.0 0.0;
+					rel2.relative: 1.0 1.0;
 				}
 			}
 			part { name: WIDGET_THUMBNAIL;
@@ -23,7 +25,9 @@ collections {
 				repeat_events: 1;
 				description {
 					state: "default" 0.0;
+					align: 0.5 0.5;
 					rel1.relative: 0.0 0.0;
+					rel2.relative: 1.0 1.0;
 				}
 			}
 			part { name: SIZE_SETTER;
@@ -37,6 +41,8 @@ collections {
 					visible: 0;
 					rel1.relative: 0.0 0.0;
 					rel2.relative: 0.01 0.01;
+					aspect: 1.0 1.0;
+					aspect_preference: BOTH;
 				}
 			}
 			part { name: "touch,block";
diff --git a/res/edje/widget_box.edc b/res/edje/widget_box.edc
new file mode 100644
index 0000000..2b0bc8e
--- /dev/null
+++ b/res/edje/widget_box.edc
@@ -0,0 +1,26 @@
+#include "../../inc/edc_conf.h"
+
+collections {
+   group { name: GROUP_WIDGET_BOX_LY;
+      parts {
+         part { name: SIZE_SETTER;
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               align: 0.5 0.5;
+               rel1.relative: 0.0 0.0;
+               rel2.relative: 1.0 1.0;
+            }
+         }
+         part { name: WIDGET_BOX_CONTENT;
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               align: 0.5 0.5;
+               rel1{relative: 0.0 0.0; to: SIZE_SETTER;}
+               rel2{relative: 1.0 1.0; to: SIZE_SETTER;}
+            }
+         }
+      }
+   }
+}
\ No newline at end of file
diff --git a/src/widget_viewer.c b/src/widget_viewer.c
index de65195..40ced5e 100755
--- a/src/widget_viewer.c
+++ b/src/widget_viewer.c
@@ -21,16 +21,6 @@
 #include "conf.h"
 #include "edc_conf.h"
 
-//#define _TEST_
-#ifdef _TEST_
-static Eina_Bool __widget_viewer_test_timer_cb(void *data)
-{
-	Evas_Object *widget = (Evas_Object*) data;
-	evas_object_color_set(widget, rand()%255, rand()%255, rand()%255, 100);
-	return ECORE_CALLBACK_RENEW;
-}
-static int count = 0;
-#endif
 static void __widget_viewer_delete_btn_clicked_cb(void *data, Evas_Object *obj, const char *emission, const char *source);
 
 static void __widget_viewer_created_cb(void *data, Evas_Object *obj, void *event_info);
@@ -57,8 +47,6 @@ void widget_viewer_add_widget(Evas_Object *parent, widget_data_t *widget_data, i
 	elm_layout_file_set(widget_layout, util_get_res_file_path(EDJE_DIR"/widget.edj"), GROUP_WIDGET_LY);
 	evas_object_size_hint_weight_set(widget_layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
 
-	widget_service_get_size(widget_data->type, widget_width, widget_height);
-
 	Evas_Object *rect = evas_object_rectangle_add(evas_object_evas_get(widget_layout));
 	evas_object_size_hint_min_set(rect, CLUSTER_W / 4, CLUSTER_H / 4);
 	evas_object_size_hint_align_set(rect, 0, 0);
@@ -66,47 +54,52 @@ void widget_viewer_add_widget(Evas_Object *parent, widget_data_t *widget_data, i
 	evas_object_show(rect);
 	elm_object_part_content_set(widget_layout, SIZE_SETTER, rect);
 
-#ifndef _TEST_
-	int w, h;
-	Evas_Object *widget = widget_viewer_evas_add_widget(widget_layout, widget_data->pkg_name, widget_data->content_info, widget_data->period);
-	evas_object_size_hint_align_set(widget, EVAS_HINT_FILL, EVAS_HINT_FILL);
+	Evas_Object *widget_box = elm_box_add(widget_layout);
+	evas_object_size_hint_weight_set(widget_box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+	elm_box_align_set(widget_box, 0.5, 0.5);
+	evas_object_show(widget_box);
+
+	Evas_Object *widget_box_layout = elm_layout_add(widget_box);
+	elm_layout_file_set(widget_box_layout, util_get_res_file_path(EDJE_DIR"/widget_box.edj"), GROUP_WIDGET_BOX_LY);
+	evas_object_size_hint_weight_set(widget_box_layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+	evas_object_size_hint_align_set(widget_box_layout, 0.5, 0.5);
+	evas_object_show(widget_box_layout);
+
+	Evas_Object *widget = widget_viewer_evas_add_widget(widget_box_layout, widget_data->pkg_name, widget_data->content_info, widget_data->period);
 	evas_object_size_hint_weight_set(widget, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+	evas_object_size_hint_align_set(widget, 0.5, 0.5);
 
 	//Notify widget_size_type_e to widget application.
-	widget_service_get_size(widget_data->type, &w, &h);
-	evas_object_resize(widget, w, h);
+	widget_service_get_size(widget_data->type, widget_width, widget_height);
+	evas_object_resize(widget, *widget_width, *widget_height);
+
+	evas_object_size_hint_min_set(widget, *widget_width, *widget_height);
+	evas_object_show(widget);
 
 	evas_object_smart_callback_add(widget, WIDGET_SMART_SIGNAL_WIDGET_CREATED, __widget_viewer_created_cb, widget_data);
 	evas_object_smart_callback_add(widget, WIDGET_SMART_SIGNAL_WIDGET_FAULTED, __widget_viewer_faulted_cb, widget_data);
 	evas_object_smart_callback_add(widget, WIDGET_SMART_SIGNAL_UPDATED, __widget_viewer_update_cb, widget_data);
 	evas_object_smart_callback_add(widget, WIDGET_SMART_SIGNAL_EXTRA_INFO_UPDATED, __widget_viewer_extra_info_updated_cb, widget_data);
 
-#else // for TEST
-/*	Evas_Object *widget = evas_object_rectangle_add(evas_object_evas_get(widget_layout));
-	evas_object_size_hint_align_set(widget, EVAS_HINT_FILL, EVAS_HINT_FILL);
-	evas_object_size_hint_weight_set(widget, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-	evas_object_color_set(widget, 0, 0, 255, 100);
-	evas_object_show(widget);
-*/
-	char number[1000];
-	snprintf(number, sizeof(number), "<font_size=50>%s_%d</font_size>", widget_data->pkg_name, count++);
-	Evas_Object *widget = elm_label_add(evas_object_evas_get(widget_layout));
-	elm_object_style_set(widget, "popup/default");
-	evas_object_size_hint_weight_set(widget, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-	evas_object_size_hint_align_set(widget, EVAS_HINT_FILL, EVAS_HINT_FILL);
-	elm_object_text_set(widget, number);
-	evas_object_color_set(widget, 0, 0, 255, 100);
-	evas_object_show(widget);
+	Evas_Object *widget_size_setter = evas_object_rectangle_add(evas_object_evas_get(widget_box_layout));
+	evas_object_size_hint_weight_set(widget_size_setter, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+	evas_object_size_hint_align_set(widget_size_setter, 0.5, 0.5);
+	evas_object_color_set(widget_size_setter, 0, 0, 0, 0);
+	evas_object_resize(widget_size_setter, *widget_width, *widget_height);
+	evas_object_size_hint_min_set(widget_size_setter, *widget_width, *widget_height);
+
+	elm_object_part_content_set(widget_box_layout, SIZE_SETTER, widget_size_setter);
+	elm_object_part_content_set(widget_box_layout, WIDGET_BOX_CONTENT, widget);
 
-	Ecore_Timer *timer = ecore_timer_add(1, __widget_viewer_test_timer_cb, widget);
-#endif
-	elm_object_part_content_set(widget_layout, WIDGET_CONTENT, widget);
+	elm_box_pack_end(widget_box, widget_box_layout);
+
+	elm_object_part_content_set(widget_layout, WIDGET_CONTENT, widget_box);
 	elm_object_signal_callback_add(widget_layout, SIGNAL_DELETE_BUTTON_CLICKED, SIGNAL_SOURCE, __widget_viewer_delete_btn_clicked_cb, (void *)widget_data);
 
-	evas_object_show(widget);
 	evas_object_show(widget_layout);
 
 	widget_data->widget_content = widget;
+	widget_data->widget_box = widget_box;
 	widget_data->widget_layout = widget_layout;
 }
 
@@ -119,9 +112,7 @@ static void __widget_viewer_delete_btn_clicked_cb(void *data, Evas_Object *obj,
 void widget_viewer_send_cancel_click_event(widget_data_t *widget_data)
 {
 	LOGD("Send to : %s", widget_data->pkg_name);
-	Evas_Object *widget_obj = NULL;
-	widget_obj = elm_object_part_content_get(widget_data->widget_layout, WIDGET_CONTENT);
-	widget_viewer_evas_cancel_click_event(widget_obj);
+	widget_viewer_evas_cancel_click_event(widget_data->widget_content);
 }
 
 void widget_viewer_thumbnail_add(widget_data_t *widget_data)
@@ -134,7 +125,7 @@ void widget_viewer_thumbnail_add(widget_data_t *widget_data)
 		return;
 	}
 
-	if (!evas_object_image_source_set(image, widget_data->widget_content)) {
+	if (!evas_object_image_source_set(image, widget_data->widget_box)) {
 		evas_object_del(image);
 		LOGE("Could not set proxy image source");
 		return;
@@ -153,13 +144,13 @@ void widget_viewer_thumbnail_add(widget_data_t *widget_data)
 
 void widget_viewer_thumbnail_delete(widget_data_t *widget_data)
 {
-	if (widget_data && widget_data->widget_layout && widget_data->widget_content) {
+	if (widget_data && widget_data->widget_layout && widget_data->widget_box) {
 		Evas_Object *image = NULL;
 		image = elm_object_part_content_get(widget_data->widget_layout, WIDGET_THUMBNAIL);
 		evas_object_image_source_visible_set(image, EINA_TRUE);
 		elm_object_part_content_unset(widget_data->widget_layout, WIDGET_THUMBNAIL);
 		evas_object_del(image);
-		elm_object_part_content_set(widget_data->widget_layout, WIDGET_CONTENT, widget_data->widget_content);
+		elm_object_part_content_set(widget_data->widget_layout, WIDGET_CONTENT, widget_data->widget_box);
 	}
 }
 
-- 
2.7.4


From 75be19e0c49822ac740e2b61eee35abcb6daa2de Mon Sep 17 00:00:00 2001
From: YoungHun Cho <hoon.cho@samsung.com>
Date: Fri, 16 Dec 2016 16:01:19 +0900
Subject: [PATCH 05/16] widget box

Change-Id: I232b5a3f1d6a21bb3a00e5f76dff1463aad5f66c
---
 .cproject                 | 38 +++++++++++------------
 Build/basedef.mk          |  2 +-
 Build/build_edc.mk        |  4 +--
 Build/build_po.mk         |  4 +--
 Build/makefile            |  3 +-
 Build/makefile.mk         | 28 ++++++++---------
 inc/cluster_data.h        |  1 +
 inc/edc_conf.h            |  2 ++
 project_def.prop          |  4 +--
 res/edje/cluster_page.edc | 12 ++++---
 res/edje/widget.edc       |  6 ++++
 res/edje/widget_box.edc   | 26 ++++++++++++++++
 src/widget_viewer.c       | 79 +++++++++++++++++++++--------------------------
 13 files changed, 117 insertions(+), 92 deletions(-)
 create mode 100644 res/edje/widget_box.edc

diff --git a/.cproject b/.cproject
index ab7aa9b..2e3c45f 100755
--- a/.cproject
+++ b/.cproject
@@ -22,22 +22,16 @@
 							<targetPlatform binaryParser="org.eclipse.cdt.core.ELF" id="org.tizen.nativeide.target.sbi.gnu.platform.base.1500203774" osList="linux,win32" superClass="org.tizen.nativeide.target.sbi.gnu.platform.base"/>
 							<builder autoBuildTarget="all" buildPath="${workspace_loc:/homescreen-efl}/Debug" enableAutoBuild="true" id="org.tizen.nativecore.target.sbi.gnu.builder.676790294" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Tizen Application Builder" superClass="org.tizen.nativecore.target.sbi.gnu.builder"/>
 							<tool id="org.tizen.nativecore.tool.sbi.gnu.archiver.766671326" name="Archiver" superClass="org.tizen.nativecore.tool.sbi.gnu.archiver"/>
-							<tool command="arm-linux-gnueabi-g++" id="org.tizen.nativecore.tool.sbi.gnu.cpp.compiler.1800477664" name="C++ Compiler" superClass="org.tizen.nativecore.tool.sbi.gnu.cpp.compiler">
+							<tool command="clang++" id="org.tizen.nativecore.tool.sbi.gnu.cpp.compiler.1800477664" name="C++ Compiler" superClass="org.tizen.nativecore.tool.sbi.gnu.cpp.compiler">
 								<option id="gnu.cpp.compiler.option.optimization.level.1791913917" name="Optimization Level" superClass="gnu.cpp.compiler.option.optimization.level" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
 								<option defaultValue="gnu.cpp.compiler.debugging.level.max" id="sbi.gnu.cpp.compiler.option.debugging.level.core.481743771" name="Debug level" superClass="sbi.gnu.cpp.compiler.option.debugging.level.core" valueType="enumerated"/>
 								<option defaultValue="false" id="sbi.gnu.cpp.compiler.option.misc.pic.core.2102599528" name="-fPIC option" superClass="sbi.gnu.cpp.compiler.option.misc.pic.core" valueType="boolean"/>
 								<option id="sbi.gnu.cpp.compiler.option.1070320025" name="Tizen-Target" superClass="sbi.gnu.cpp.compiler.option" valueType="userObjs">
-									<listOptionValue builtIn="false" value="mobile-3.0-device.core_gcc49.armel.core.app"/>
+									<listOptionValue builtIn="false" value="mobile-3.0-emulator.core.public.20161215_1_llvm37.i386.core.app"/>
 								</option>
 								<option id="sbi.gnu.cpp.compiler.option.frameworks_inc.core.312288874" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.cpp.compiler.option.frameworks_inc.core" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/libxml2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/EGL&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES2&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES3&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/KHR&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore-agent&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appfw&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/attach-panel&quot;"/>
@@ -74,6 +68,7 @@
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/efl-1&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/efl-extension&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/efreet-1&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/EGL&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eina-1&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eina-1/eina&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eio-1&quot;"/>
@@ -91,10 +86,14 @@
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/freetype2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/geofence&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/gio-unix-2.0&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES2&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES3&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/glib-2.0&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/harfbuzz&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/iotcon&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/json-glib-1.0&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/KHR&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/location&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/maps&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/media&quot;"/>
@@ -107,6 +106,7 @@
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/notification&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/nsd/&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/phonenumber-utils&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/sensor&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/service-adaptor&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/shortcut&quot;"/>
@@ -131,7 +131,6 @@
 									<listOptionValue builtIn="false" value="${RS_COMPILER_MISC}"/>
 									<listOptionValue builtIn="false" value=" -fPIE"/>
 									<listOptionValue builtIn="false" value="--sysroot=&quot;${SBI_SYSROOT}&quot;"/>
-									<listOptionValue builtIn="false" value="-mthumb"/>
 								</option>
 								<option id="gnu.cpp.compiler.option.include.paths.1857385470" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/inc}&quot;"/>
@@ -141,22 +140,16 @@
 								</option>
 								<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1527920498" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
 							</tool>
-							<tool command="arm-linux-gnueabi-gcc" id="org.tizen.nativecore.tool.sbi.gnu.c.compiler.281727115" name="C Compiler" superClass="org.tizen.nativecore.tool.sbi.gnu.c.compiler">
+							<tool command="clang" id="org.tizen.nativecore.tool.sbi.gnu.c.compiler.281727115" name="C Compiler" superClass="org.tizen.nativecore.tool.sbi.gnu.c.compiler">
 								<option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.option.optimization.level.1600914293" name="Optimization Level" superClass="gnu.c.compiler.option.optimization.level" valueType="enumerated"/>
 								<option defaultValue="gnu.c.debugging.level.max" id="sbi.gnu.c.compiler.option.debugging.level.core.247638963" name="Debug level" superClass="sbi.gnu.c.compiler.option.debugging.level.core" valueType="enumerated"/>
 								<option defaultValue="false" id="sbi.gnu.c.compiler.option.misc.pic.core.982331969" name="-fPIC option" superClass="sbi.gnu.c.compiler.option.misc.pic.core" valueType="boolean"/>
 								<option id="sbi.gnu.c.compiler.option.1644890019" name="Tizen-Target" superClass="sbi.gnu.c.compiler.option" valueType="userObjs">
-									<listOptionValue builtIn="false" value="mobile-3.0-device.core_gcc49.armel.core.app"/>
+									<listOptionValue builtIn="false" value="mobile-3.0-emulator.core.public.20161215_1_llvm37.i386.core.app"/>
 								</option>
 								<option id="sbi.gnu.c.compiler.option.frameworks_inc.core.1483034184" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.c.compiler.option.frameworks_inc.core" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/libxml2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/EGL&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES2&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES3&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/KHR&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore-agent&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appfw&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/attach-panel&quot;"/>
@@ -193,6 +186,7 @@
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/efl-1&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/efl-extension&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/efreet-1&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/EGL&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eina-1&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eina-1/eina&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eio-1&quot;"/>
@@ -210,10 +204,14 @@
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/freetype2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/geofence&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/gio-unix-2.0&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES2&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES3&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/glib-2.0&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/harfbuzz&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/iotcon&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/json-glib-1.0&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/KHR&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/location&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/maps&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/media&quot;"/>
@@ -226,6 +224,7 @@
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/notification&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/nsd/&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/phonenumber-utils&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/sensor&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/service-adaptor&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/shortcut&quot;"/>
@@ -250,7 +249,6 @@
 									<listOptionValue builtIn="false" value="${RS_COMPILER_MISC}"/>
 									<listOptionValue builtIn="false" value=" -fPIE"/>
 									<listOptionValue builtIn="false" value="--sysroot=&quot;${SBI_SYSROOT}&quot;"/>
-									<listOptionValue builtIn="false" value="-mthumb"/>
 								</option>
 								<option id="gnu.c.compiler.option.include.paths.1774757534" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/inc}&quot;"/>
@@ -261,7 +259,7 @@
 								<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.840478259" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
 							</tool>
 							<tool id="org.tizen.nativeide.tool.sbi.gnu.c.linker.base.614766676" name="C Linker" superClass="org.tizen.nativeide.tool.sbi.gnu.c.linker.base"/>
-							<tool command="arm-linux-gnueabi-g++" id="org.tizen.nativecore.tool.sbi.gnu.cpp.linker.1632738856" name="C++ Linker" superClass="org.tizen.nativecore.tool.sbi.gnu.cpp.linker">
+							<tool command="clang++" id="org.tizen.nativecore.tool.sbi.gnu.cpp.linker.1632738856" name="C++ Linker" superClass="org.tizen.nativecore.tool.sbi.gnu.cpp.linker">
 								<option defaultValue="false" id="sbi.gnu.cpp.linker.option.shared_flag.core.1016151526" name="Linker.Shared" superClass="sbi.gnu.cpp.linker.option.shared_flag.core" valueType="boolean"/>
 								<option defaultValue="false" id="sbi.gnu.cpp.linker.option.noundefined.core.1946527908" name="Report unresolved symbol references (-Wl,--no-undefined)" superClass="sbi.gnu.cpp.linker.option.noundefined.core" valueType="boolean"/>
 								<option id="sbi.gnu.cpp.linker.option.frameworks_lflags.core.472552373" name="Tizen-Frameworks-Other-Lflags" superClass="sbi.gnu.cpp.linker.option.frameworks_lflags.core" valueType="stringList">
@@ -281,7 +279,7 @@
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
 								</inputType>
 							</tool>
-							<tool command="arm-linux-gnueabi-as" id="org.tizen.nativeapp.tool.sbi.gnu.assembler.base.1815664769" name="Assembler" superClass="org.tizen.nativeapp.tool.sbi.gnu.assembler.base">
+							<tool command="i386-linux-gnueabi-as" id="org.tizen.nativeapp.tool.sbi.gnu.assembler.base.1815664769" name="Assembler" superClass="org.tizen.nativeapp.tool.sbi.gnu.assembler.base">
 								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.88475890" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
 							</tool>
 							<tool id="org.tizen.nativecore.tool.fnmapgen.304005350" name="C FN-Map Generator" superClass="org.tizen.nativecore.tool.fnmapgen"/>
diff --git a/Build/basedef.mk b/Build/basedef.mk
index a762983..64fbf82 100755
--- a/Build/basedef.mk
+++ b/Build/basedef.mk
@@ -22,7 +22,7 @@ PROJ_PATH ?= $(PROJPATH)
 #endif
 
 #ifeq ($(strip $(OUTPUT_DIR)),)
-#OUTPUT_DIR ?= $(PROJ_PATH)/$(BUILD_CONFIG)
+OUTPUT_DIR ?= $(PROJ_PATH)/$(BUILD_CONFIG)
 #endif
 
 #ifeq ($(strip $(BUILD_ARCH)),)
diff --git a/Build/build_edc.mk b/Build/build_edc.mk
index 2270b84..6f85fdd 100644
--- a/Build/build_edc.mk
+++ b/Build/build_edc.mk
@@ -1,12 +1,12 @@
 # EDC build script
 
 
-FUNC_EDC2EDJ = $(patsubst %.edc,%.edj,$(1))
+FUNC_EDC2EDJ = $(patsubst %.edc,$(2)/%.edj,$(1))
 
 # parameter :
 #  $(1) - C/C++ soruce file
 #  $(2) - output path
-CONVERT_ESC_EDC_TO_EDJ = $(2)/$(call CONVERT_4MAKE_TO_OUT,$(call FUNC_EDC2EDJ,$(1)))
+CONVERT_ESC_EDC_TO_EDJ = $(call CONVERT_4MAKE_TO_OUT,$(call FUNC_EDC2EDJ,$(1),$(2)))
 
 
 # parameter :
diff --git a/Build/build_po.mk b/Build/build_po.mk
index 514116b..d88d71a 100644
--- a/Build/build_po.mk
+++ b/Build/build_po.mk
@@ -1,14 +1,14 @@
 # PO build script
 
 
-_FUNC_PO2MO = $(patsubst %.po,res/locale/%/LC_MESSAGES/$(2).mo,$(notdir $(1)))
+_FUNC_PO2MO = $(patsubst %.po,$(2)/res/locale/%/LC_MESSAGES/$(3).mo,$(notdir $(1)))
 
 
 # parameter :
 #  $(1) - C/C++ soruce file
 #  $(2) - output path
 #  $(3) - app name
-CONVERT_ESC_PO_TO_MO = $(2)/$(call CONVERT_4MAKE_TO_OUT,$(call _FUNC_PO2MO,$(1),$(3)))
+CONVERT_ESC_PO_TO_MO = $(call CONVERT_4MAKE_TO_OUT,$(call _FUNC_PO2MO,$(1),$(2),$(3)))
 
 
 # parameter :
diff --git a/Build/makefile b/Build/makefile
index 3c3f61e..9348c50 100755
--- a/Build/makefile
+++ b/Build/makefile
@@ -14,8 +14,7 @@ clean : app_clean
 version : build_version
 
 #PROJ_ROOT = .
-PROJ_PATH ?= .#
-BUILD_ROOT ?= $(PROJ_PATH)/Build#
+BUILD_ROOT := $(PROJ_PATH)/Build#
 
 ifeq ($(MAKE_NAME),mingw32-make)
 ifneq ($(SHELL),)
diff --git a/Build/makefile.mk b/Build/makefile.mk
index fd5349d..c95b4b4 100644
--- a/Build/makefile.mk
+++ b/Build/makefile.mk
@@ -15,8 +15,8 @@ version : build_version
 
 
 #PROJ_ROOT := $(call BSLASH2SLASH,$(PROJ_PATH))
-PROJ_ROOT ?= .#
-BUILD_ROOT ?= $(PROJ_ROOT)/Build
+PROJ_ROOT := .
+BUILD_ROOT := $(PROJ_ROOT)/Build
 
 include $(BUILD_ROOT)/basedef.mk
 
@@ -32,11 +32,8 @@ include $(BUILD_ROOT)/funcs.mk
 
 APPTYPE := $(type)
 
-OUTPUT_BASE ?= $(PROJ_ROOT)
-#OUTPUT_DIR ?= $(OUTPUT_BASE)/$(BUILD_CONFIG)/$(BUILD_ARCH)
-OUTPUT_DIR ?= $(OUTPUT_BASE)/$(BUILD_CONFIG)
-OUTPUT_DIR := $(call BSLASH2SLASH,$(OUTPUT_DIR))
-OBJ_OUTPUT ?= $(OUTPUT_DIR)/objs
+OUTPUT_DIR := $(PROJ_ROOT)/$(BUILD_CONFIG)
+OBJ_OUTPUT := $(OUTPUT_DIR)/objs
 
 LOWER_APPNAME := $(call LOWER_CASE,$(APPNAME))
 APPID2 := $(subst $(basename $(APPID)).,,$(APPID))
@@ -68,8 +65,8 @@ ifeq ($(strip $(APPTYPE)),sharedLib)
 EXT_OP := -fPIC
 endif
 
-C_OPT := $(COMPILE_FLAGS) $(TC_COMPILER_MISC) $(RS_COMPILER_MISC) $(EXT_OP) --sysroot="$(SYSROOT)" -Werror-implicit-function-declaration $(M_OPT) $(USER_C_OPTS)
-CPP_OPT := $(CPP_COMPILE_FLAGS) $(TC_COMPILER_MISC) $(RS_COMPILER_MISC) $(EXT_OP) --sysroot="$(SYSROOT)" -Werror-implicit-function-declaration $(M_OPT) $(USER_CPP_OPTS)
+C_OPT := $(COMPILE_FLAGS) $(TC_COMPILER_MISC) $(RS_COMPILER_MISC) $(EXT_OP) --sysroot="$(SYSROOT)" -Werror-implicit-function-declaration $(M_OPT)
+CPP_OPT := $(CPP_COMPILE_FLAGS) $(TC_COMPILER_MISC) $(RS_COMPILER_MISC) $(EXT_OP) --sysroot="$(SYSROOT)" -Werror-implicit-function-declaration $(M_OPT)
 C_OPT_FILE := $(PLATFORM_INCS_FILE)
 
 OBJS := #
@@ -84,7 +81,7 @@ $(foreach ext,cpp cxx cc c++ C,$(eval $(call C_PROC_RAW,$(OBJ_OUTPUT),$(USER_SRC
 # Individual C/C++
 ifneq ($(strip $(USER_EXT_C_KEYS)),)
 $(foreach var,$(USER_EXT_C_KEYS),$(eval $(call C_PROC_RAW,$(OBJ_OUTPUT),$(USER_EXT_$(var)_SRCS),$(USER_EXT_$(var)_INC_DIRS),$(USER_EXT_$(var)_INC_FILES),$(USER_EXT_$(var)_DEFS),$(USER_EXT_$(var)_UNDEFS),$(C_OPT),$(C_OPT_FILE),C,c,$(CC),OBJS)))
-$(foreach ext,cpp cxx cc c++ C,$(foreach var,$(USER_EXT_C_KEYS),$(eval $(call C_PROC_RAW,$(OBJ_OUTPUT),$(USER_EXT_$(var)_SRCS),$(USER_EXT_$(var)_INC_DIRS),$(USER_EXT_$(var)_CPP_INC_FILES),$(USER_EXT_$(var)_CPP_DEFS),$(USER_EXT_$(var)_CPP_UNDEFS),$(CPP_OPT),$(C_OPT_FILE),C++,$(ext),$(CXX),OBJS))))
+$(foreach ext,cpp cxx cc c++ C,$(foreach var,$(USER_EXT_C_KEYS),$(eval $(call C_PROC_RAW,$(OBJ_OUTPUT),$(USER_EXT_$(var)_SRCS),$(USER_EXT_$(var)_INC_DIRS),$(USER_EXT_$(var)_CPP_INC_FILES),$(USER_EXT_$(var)_CPP_DEFS),$(USER_EXT_$(var)_CPP_UNDEFS),$(C_OPT),$(C_OPT_FILE),C++,$(ext),$(CXX),OBJS))))
 endif
 
 
@@ -112,7 +109,7 @@ $(APPFILE) : $(OBJS) $(UOBJS)
 	@echo '  Building target: $@'
 	@echo '  Invoking: C/C++ Linker'
 	$(call MAKEDIRS,$(@D))
-	$(CXX) -o $(APPFILE) $(OBJS) $(UOBJS) $(LIBPATHS) -Xlinker --as-needed $(LIBS) $(LINK_FLAGS) $(TC_LINKER_MISC) $(RS_LINKER_MISC) -pie -lpthread --sysroot="$(SYSROOT)" -Xlinker --version-script="$(PROJ_ROOT)/.exportMap" $(RS_LIB_PATHS) $(RS_LIBRARIES) -Xlinker -rpath="/opt/usr/apps/$(APPID)/lib" -Werror-implicit-function-declaration $(USER_LINK_OPTS)
+	$(CXX) -o $(APPFILE) $(OBJS) $(UOBJS) $(LIBPATHS) -Xlinker --as-needed $(LIBS) $(LINK_FLAGS) $(TC_LINKER_MISC) $(RS_LINKER_MISC) -pie -lpthread --sysroot="$(SYSROOT)" -Xlinker --version-script="$(PROJ_ROOT)/.exportMap" $(RS_LIB_PATHS) $(RS_LIBRARIES) -Xlinker -rpath="/opt/usr/apps/$(APPID)/lib" -Werror-implicit-function-declaration
 	@echo '  Finished building target: $@'
 endif
 ifeq ($(strip $(APPTYPE)),staticLib)
@@ -120,7 +117,7 @@ $(APPFILE) : $(OBJS) $(UOBJS)
 	@echo '  Building target: $@'
 	@echo '  Invoking: Archive utility'
 	$(call MAKEDIRS,$(@D))
-	$(AR) -r $(APPFILE) $(OBJS) $(UOBJS) $(AR_FLAGS) $(USER_LINK_OPTS)
+	$(AR) -r $(APPFILE) $(OBJS) $(UOBJS) $(AR_FLAGS)
 	@echo '  Finished building target: $@'
 endif
 ifeq ($(strip $(APPTYPE)),sharedLib)
@@ -128,7 +125,7 @@ $(APPFILE) : $(OBJS) $(UOBJS)
 	@echo '  Building target: $@'
 	@echo '  Invoking: C/C++ Linker'
 	$(call MAKEDIRS,$(@D))
-	$(CXX) -o $(APPFILE) $(OBJS) $(UOBJS) $(LIBPATHS) -Xlinker --as-needed $(LIBS) $(LINK_FLAGS) $(TC_LINKER_MISC) $(RS_LINKER_MISC) -shared -lpthread --sysroot="$(SYSROOT)" $(RS_LIB_PATHS) $(RS_LIBRARIES) $(USER_LINK_OPTS)
+	$(CXX) -o $(APPFILE) $(OBJS) $(UOBJS) $(LIBPATHS) -Xlinker --as-needed $(LIBS) $(LINK_FLAGS) $(TC_LINKER_MISC) $(RS_LINKER_MISC) -shared -lpthread --sysroot="$(SYSROOT)" $(RS_LIB_PATHS) $(RS_LIBRARIES)
 	@echo '  Finished building target: $@'
 endif
 
@@ -147,13 +144,14 @@ ifneq ($(findstring Windows,$(OS)),)
 ifneq ($(findstring 3.82,$(MAKE_VERSION)),)
 	$(file > $@,$(PLATFORM_INCS))
 else
-	@echo $(PLATFORM_INCS) > "$@"
+	@echo $(PLATFORM_INCS) > $@
 endif
 else
-	@echo $(PLATFORM_INCS) > "$@"
+	@echo $(PLATFORM_INCS) > $@
 endif
 endif
 
+
 include $(BUILD_ROOT)/build_edc.mk
 
 #ifeq ($(strip $(ENVENTOR_SHARED_RES_PATH)),)
diff --git a/inc/cluster_data.h b/inc/cluster_data.h
index 29eb506..356e974 100755
--- a/inc/cluster_data.h
+++ b/inc/cluster_data.h
@@ -33,6 +33,7 @@ typedef struct {
 	double period;
 	int allow_duplicate;
 	Evas_Object *widget_layout;
+	Evas_Object *widget_box;
 	Evas_Object *widget_content;
 } widget_data_t;
 
diff --git a/inc/edc_conf.h b/inc/edc_conf.h
index f5ad1d8..b6a6e17 100755
--- a/inc/edc_conf.h
+++ b/inc/edc_conf.h
@@ -164,8 +164,10 @@
 #define SIGNAL_APPS_FOLDER_CLICKED_PLUS_ICON "apps_folder_clicked_plus_icon"
 
 #define GROUP_WIDGET_LY "widget_ly"
+#define GROUP_WIDGET_BOX_LY "widget_box_ly"
 #define WIDGET_CONTENT "widget_content"
 #define WIDGET_THUMBNAIL "widget_thumbnail"
+#define WIDGET_BOX_CONTENT "widget_box_content"
 #define WIDGET_DELETE_BUTTON "widget_delete_button"
 #define SIGNAL_DELETE_BUTTON_SHOW_ANI "delete_button_show_ani"
 #define SIGNAL_DELETE_BUTTON_HIDE_ANI "delete_button_hide_ani"
diff --git a/project_def.prop b/project_def.prop
index b64d38e..a027382 100755
--- a/project_def.prop
+++ b/project_def.prop
@@ -18,7 +18,7 @@ USER_EDCS =
 USER_POS = res/po/ca.po res/po/fr.po res/po/nl.po res/po/pt_BR.po res/po/sk.po res/po/sv.po res/po/uz.po res/po/ko_KR.po res/po/is.po res/po/ka.po res/po/ro.po res/po/it_IT.po res/po/en_PH.po res/po/lt.po res/po/mk.po res/po/nb.po res/po/ru_RU.po res/po/el_GR.po res/po/zh_TW.po res/po/az.po res/po/hr.po res/po/uk.po res/po/zh_CN.po res/po/de.po res/po/es_US.po res/po/eu.po res/po/kk.po res/po/sl.po res/po/et.po res/po/fr_CA.po res/po/ga.po res/po/gl.po res/po/hy.po res/po/lv.po res/po/ja_JP.po res/po/es_ES.po res/po/bg.po res/po/cs.po res/po/pl.po res/po/pt_PT.po res/po/sr.po res/po/hu.po res/po/ar.po res/po/en_US.po res/po/fi.po res/po/da.po res/po/en.po res/po/zh_HK.po res/po/tr_TR.po 
 
 # User Defines
-USER_DEFS = TIZEN_DEPRECATION 
+USER_DEFS = 
 USER_CPP_DEFS = 
 
 # User Undefines
@@ -52,7 +52,7 @@ USER_EDCS_FONT_DIRS = ${OUTPUT_DIR} edje/fonts
 # EDC Flags
 USER_EXT_EDC_KEYS = EDC0 
 
-USER_EXT_EDC0_EDCS = res/edje/cluster_allpage_thumbnail.edc res/edje/home_btn.edc res/edje/home.edc res/edje/widget.edc res/edje/add_widget_viewer.edc res/edje/apps_folder_icon.edc res/edje/apps_chooser_btn.edc res/edje/apps_folder_popup.edc res/edje/app_icon.edc res/edje/cluster_page.edc res/edje/apps_view.edc res/edje/page_indicator_unit.edc res/edje/apps_view_bg.edc res/edje/cluster_allpage.edc 
+USER_EXT_EDC0_EDCS = res/edje/cluster_allpage_thumbnail.edc res/edje/home_btn.edc res/edje/home.edc res/edje/widget.edc res/edje/add_widget_viewer.edc res/edje/apps_folder_icon.edc res/edje/apps_chooser_btn.edc res/edje/apps_folder_popup.edc res/edje/app_icon.edc res/edje/cluster_page.edc res/edje/apps_view.edc res/edje/page_indicator_unit.edc res/edje/apps_view_bg.edc res/edje/cluster_allpage.edc res/edje/widget_box.edc 
 USER_EXT_EDC0_EDCS_IMAGE_DIRS = ${OUTPUT_DIR} edje/images res/images 
 USER_EXT_EDC0_EDCS_SOUND_DIRS = ${OUTPUT_DIR} edje/sounds 
 USER_EXT_EDC0_EDCS_FONT_DIRS = ${OUTPUT_DIR} edje/fonts 
diff --git a/res/edje/cluster_page.edc b/res/edje/cluster_page.edc
index 1e531b0..5f1de33 100755
--- a/res/edje/cluster_page.edc
+++ b/res/edje/cluster_page.edc
@@ -39,8 +39,10 @@ collections {
 					align: 0 0;
 					visible: 0;
 					color : 0 0 0 0;
-					rel1{relative: 0.01 0.06; to: SIZE_SETTER;}
-					rel2{relative: 0.99 0.675; to: SIZE_SETTER;}
+					rel1{relative: 0.0 0.06; to: SIZE_SETTER;}
+					rel2{relative: 1.0 1.0; to: SIZE_SETTER;}
+					aspect: 1.0 1.0;
+					aspect_preference: BOTH;
 				}
 				description {
 					state: "edit" 0.0;
@@ -48,14 +50,16 @@ collections {
 					color : 0 0 0 50;
 					visible: 1;
 					rel1{relative: 0.057 0.066; to: SIZE_SETTER;}
-					rel2{relative: 0.943 0.621; to: SIZE_SETTER;}
+					rel2{relative: 0.943 1.0; to: SIZE_SETTER;}
+					aspect: 1.0 1.0;
+					aspect_preference: BOTH;
 				}
 			}
 			part { name: CLUSTER_BOX;
 				type: SWALLOW;
 				description {
 					state: "default" 0.0;
-					align: 0 0;
+					align: 0.5 0.5;
 					rel1{relative: 0.0 0.0; to: CLUSTER_BG;}
 					rel2{relative: 1.0 1.0; to: CLUSTER_BG;}
 				}
diff --git a/res/edje/widget.edc b/res/edje/widget.edc
index 647bcbd..693d7ae 100755
--- a/res/edje/widget.edc
+++ b/res/edje/widget.edc
@@ -14,7 +14,9 @@ collections {
 				repeat_events: 1;
 				description {
 					state: "default" 0.0;
+					align: 0.5 0.5;
 					rel1.relative: 0.0 0.0;
+					rel2.relative: 1.0 1.0;
 				}
 			}
 			part { name: WIDGET_THUMBNAIL;
@@ -23,7 +25,9 @@ collections {
 				repeat_events: 1;
 				description {
 					state: "default" 0.0;
+					align: 0.5 0.5;
 					rel1.relative: 0.0 0.0;
+					rel2.relative: 1.0 1.0;
 				}
 			}
 			part { name: SIZE_SETTER;
@@ -37,6 +41,8 @@ collections {
 					visible: 0;
 					rel1.relative: 0.0 0.0;
 					rel2.relative: 0.01 0.01;
+					aspect: 1.0 1.0;
+					aspect_preference: BOTH;
 				}
 			}
 			part { name: "touch,block";
diff --git a/res/edje/widget_box.edc b/res/edje/widget_box.edc
new file mode 100644
index 0000000..2b0bc8e
--- /dev/null
+++ b/res/edje/widget_box.edc
@@ -0,0 +1,26 @@
+#include "../../inc/edc_conf.h"
+
+collections {
+   group { name: GROUP_WIDGET_BOX_LY;
+      parts {
+         part { name: SIZE_SETTER;
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               align: 0.5 0.5;
+               rel1.relative: 0.0 0.0;
+               rel2.relative: 1.0 1.0;
+            }
+         }
+         part { name: WIDGET_BOX_CONTENT;
+            type: SWALLOW;
+            description {
+               state: "default" 0.0;
+               align: 0.5 0.5;
+               rel1{relative: 0.0 0.0; to: SIZE_SETTER;}
+               rel2{relative: 1.0 1.0; to: SIZE_SETTER;}
+            }
+         }
+      }
+   }
+}
\ No newline at end of file
diff --git a/src/widget_viewer.c b/src/widget_viewer.c
index de65195..40ced5e 100755
--- a/src/widget_viewer.c
+++ b/src/widget_viewer.c
@@ -21,16 +21,6 @@
 #include "conf.h"
 #include "edc_conf.h"
 
-//#define _TEST_
-#ifdef _TEST_
-static Eina_Bool __widget_viewer_test_timer_cb(void *data)
-{
-	Evas_Object *widget = (Evas_Object*) data;
-	evas_object_color_set(widget, rand()%255, rand()%255, rand()%255, 100);
-	return ECORE_CALLBACK_RENEW;
-}
-static int count = 0;
-#endif
 static void __widget_viewer_delete_btn_clicked_cb(void *data, Evas_Object *obj, const char *emission, const char *source);
 
 static void __widget_viewer_created_cb(void *data, Evas_Object *obj, void *event_info);
@@ -57,8 +47,6 @@ void widget_viewer_add_widget(Evas_Object *parent, widget_data_t *widget_data, i
 	elm_layout_file_set(widget_layout, util_get_res_file_path(EDJE_DIR"/widget.edj"), GROUP_WIDGET_LY);
 	evas_object_size_hint_weight_set(widget_layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
 
-	widget_service_get_size(widget_data->type, widget_width, widget_height);
-
 	Evas_Object *rect = evas_object_rectangle_add(evas_object_evas_get(widget_layout));
 	evas_object_size_hint_min_set(rect, CLUSTER_W / 4, CLUSTER_H / 4);
 	evas_object_size_hint_align_set(rect, 0, 0);
@@ -66,47 +54,52 @@ void widget_viewer_add_widget(Evas_Object *parent, widget_data_t *widget_data, i
 	evas_object_show(rect);
 	elm_object_part_content_set(widget_layout, SIZE_SETTER, rect);
 
-#ifndef _TEST_
-	int w, h;
-	Evas_Object *widget = widget_viewer_evas_add_widget(widget_layout, widget_data->pkg_name, widget_data->content_info, widget_data->period);
-	evas_object_size_hint_align_set(widget, EVAS_HINT_FILL, EVAS_HINT_FILL);
+	Evas_Object *widget_box = elm_box_add(widget_layout);
+	evas_object_size_hint_weight_set(widget_box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+	elm_box_align_set(widget_box, 0.5, 0.5);
+	evas_object_show(widget_box);
+
+	Evas_Object *widget_box_layout = elm_layout_add(widget_box);
+	elm_layout_file_set(widget_box_layout, util_get_res_file_path(EDJE_DIR"/widget_box.edj"), GROUP_WIDGET_BOX_LY);
+	evas_object_size_hint_weight_set(widget_box_layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+	evas_object_size_hint_align_set(widget_box_layout, 0.5, 0.5);
+	evas_object_show(widget_box_layout);
+
+	Evas_Object *widget = widget_viewer_evas_add_widget(widget_box_layout, widget_data->pkg_name, widget_data->content_info, widget_data->period);
 	evas_object_size_hint_weight_set(widget, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+	evas_object_size_hint_align_set(widget, 0.5, 0.5);
 
 	//Notify widget_size_type_e to widget application.
-	widget_service_get_size(widget_data->type, &w, &h);
-	evas_object_resize(widget, w, h);
+	widget_service_get_size(widget_data->type, widget_width, widget_height);
+	evas_object_resize(widget, *widget_width, *widget_height);
+
+	evas_object_size_hint_min_set(widget, *widget_width, *widget_height);
+	evas_object_show(widget);
 
 	evas_object_smart_callback_add(widget, WIDGET_SMART_SIGNAL_WIDGET_CREATED, __widget_viewer_created_cb, widget_data);
 	evas_object_smart_callback_add(widget, WIDGET_SMART_SIGNAL_WIDGET_FAULTED, __widget_viewer_faulted_cb, widget_data);
 	evas_object_smart_callback_add(widget, WIDGET_SMART_SIGNAL_UPDATED, __widget_viewer_update_cb, widget_data);
 	evas_object_smart_callback_add(widget, WIDGET_SMART_SIGNAL_EXTRA_INFO_UPDATED, __widget_viewer_extra_info_updated_cb, widget_data);
 
-#else // for TEST
-/*	Evas_Object *widget = evas_object_rectangle_add(evas_object_evas_get(widget_layout));
-	evas_object_size_hint_align_set(widget, EVAS_HINT_FILL, EVAS_HINT_FILL);
-	evas_object_size_hint_weight_set(widget, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-	evas_object_color_set(widget, 0, 0, 255, 100);
-	evas_object_show(widget);
-*/
-	char number[1000];
-	snprintf(number, sizeof(number), "<font_size=50>%s_%d</font_size>", widget_data->pkg_name, count++);
-	Evas_Object *widget = elm_label_add(evas_object_evas_get(widget_layout));
-	elm_object_style_set(widget, "popup/default");
-	evas_object_size_hint_weight_set(widget, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-	evas_object_size_hint_align_set(widget, EVAS_HINT_FILL, EVAS_HINT_FILL);
-	elm_object_text_set(widget, number);
-	evas_object_color_set(widget, 0, 0, 255, 100);
-	evas_object_show(widget);
+	Evas_Object *widget_size_setter = evas_object_rectangle_add(evas_object_evas_get(widget_box_layout));
+	evas_object_size_hint_weight_set(widget_size_setter, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+	evas_object_size_hint_align_set(widget_size_setter, 0.5, 0.5);
+	evas_object_color_set(widget_size_setter, 0, 0, 0, 0);
+	evas_object_resize(widget_size_setter, *widget_width, *widget_height);
+	evas_object_size_hint_min_set(widget_size_setter, *widget_width, *widget_height);
+
+	elm_object_part_content_set(widget_box_layout, SIZE_SETTER, widget_size_setter);
+	elm_object_part_content_set(widget_box_layout, WIDGET_BOX_CONTENT, widget);
 
-	Ecore_Timer *timer = ecore_timer_add(1, __widget_viewer_test_timer_cb, widget);
-#endif
-	elm_object_part_content_set(widget_layout, WIDGET_CONTENT, widget);
+	elm_box_pack_end(widget_box, widget_box_layout);
+
+	elm_object_part_content_set(widget_layout, WIDGET_CONTENT, widget_box);
 	elm_object_signal_callback_add(widget_layout, SIGNAL_DELETE_BUTTON_CLICKED, SIGNAL_SOURCE, __widget_viewer_delete_btn_clicked_cb, (void *)widget_data);
 
-	evas_object_show(widget);
 	evas_object_show(widget_layout);
 
 	widget_data->widget_content = widget;
+	widget_data->widget_box = widget_box;
 	widget_data->widget_layout = widget_layout;
 }
 
@@ -119,9 +112,7 @@ static void __widget_viewer_delete_btn_clicked_cb(void *data, Evas_Object *obj,
 void widget_viewer_send_cancel_click_event(widget_data_t *widget_data)
 {
 	LOGD("Send to : %s", widget_data->pkg_name);
-	Evas_Object *widget_obj = NULL;
-	widget_obj = elm_object_part_content_get(widget_data->widget_layout, WIDGET_CONTENT);
-	widget_viewer_evas_cancel_click_event(widget_obj);
+	widget_viewer_evas_cancel_click_event(widget_data->widget_content);
 }
 
 void widget_viewer_thumbnail_add(widget_data_t *widget_data)
@@ -134,7 +125,7 @@ void widget_viewer_thumbnail_add(widget_data_t *widget_data)
 		return;
 	}
 
-	if (!evas_object_image_source_set(image, widget_data->widget_content)) {
+	if (!evas_object_image_source_set(image, widget_data->widget_box)) {
 		evas_object_del(image);
 		LOGE("Could not set proxy image source");
 		return;
@@ -153,13 +144,13 @@ void widget_viewer_thumbnail_add(widget_data_t *widget_data)
 
 void widget_viewer_thumbnail_delete(widget_data_t *widget_data)
 {
-	if (widget_data && widget_data->widget_layout && widget_data->widget_content) {
+	if (widget_data && widget_data->widget_layout && widget_data->widget_box) {
 		Evas_Object *image = NULL;
 		image = elm_object_part_content_get(widget_data->widget_layout, WIDGET_THUMBNAIL);
 		evas_object_image_source_visible_set(image, EINA_TRUE);
 		elm_object_part_content_unset(widget_data->widget_layout, WIDGET_THUMBNAIL);
 		evas_object_del(image);
-		elm_object_part_content_set(widget_data->widget_layout, WIDGET_CONTENT, widget_data->widget_content);
+		elm_object_part_content_set(widget_data->widget_layout, WIDGET_CONTENT, widget_data->widget_box);
 	}
 }
 
-- 
2.7.4


From 838d389aa72af4667acf9cc658735b7f84812597 Mon Sep 17 00:00:00 2001
From: junkyu han <junkyu.han@samsung.com>
Date: Fri, 16 Dec 2016 19:25:28 +0900
Subject: [PATCH 06/16] Make home can eable/diable App

Change-Id: I39d8fedf19ea59e4e7c0c5dbed2b15cdd6d8fa15
---
 .cproject                  | 32 +++++++++---------
 Build/basedef.mk           |  2 +-
 Build/build_edc.mk         |  4 +--
 Build/build_po.mk          |  4 +--
 Build/makefile             |  3 +-
 Build/makefile.mk          | 28 ++++++++--------
 inc/apps_package_manager.h |  1 +
 inc/util.h                 |  2 --
 project_def.prop           |  2 +-
 src/apps_data.c            |  2 ++
 src/apps_package_manager.c | 83 +++++++++++++++++++++++++++++++++++++++++++++-
 src/cluster_page.c         | 11 ------
 src/util.c                 |  3 --
 13 files changed, 125 insertions(+), 52 deletions(-)

diff --git a/.cproject b/.cproject
index 2e3c45f..e307377 100755
--- a/.cproject
+++ b/.cproject
@@ -27,11 +27,17 @@
 								<option defaultValue="gnu.cpp.compiler.debugging.level.max" id="sbi.gnu.cpp.compiler.option.debugging.level.core.481743771" name="Debug level" superClass="sbi.gnu.cpp.compiler.option.debugging.level.core" valueType="enumerated"/>
 								<option defaultValue="false" id="sbi.gnu.cpp.compiler.option.misc.pic.core.2102599528" name="-fPIC option" superClass="sbi.gnu.cpp.compiler.option.misc.pic.core" valueType="boolean"/>
 								<option id="sbi.gnu.cpp.compiler.option.1070320025" name="Tizen-Target" superClass="sbi.gnu.cpp.compiler.option" valueType="userObjs">
-									<listOptionValue builtIn="false" value="mobile-3.0-emulator.core.public.20161215_1_llvm37.i386.core.app"/>
+									<listOptionValue builtIn="false" value="mobile-3.0-device.core_llvm37.armel.core.app"/>
 								</option>
 								<option id="sbi.gnu.cpp.compiler.option.frameworks_inc.core.312288874" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.cpp.compiler.option.frameworks_inc.core" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/libxml2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/EGL&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES2&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES3&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/KHR&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore-agent&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appfw&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/attach-panel&quot;"/>
@@ -68,7 +74,6 @@
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/efl-1&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/efl-extension&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/efreet-1&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/EGL&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eina-1&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eina-1/eina&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eio-1&quot;"/>
@@ -86,14 +91,10 @@
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/freetype2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/geofence&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/gio-unix-2.0&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES2&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES3&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/glib-2.0&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/harfbuzz&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/iotcon&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/json-glib-1.0&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/KHR&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/location&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/maps&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/media&quot;"/>
@@ -106,7 +107,6 @@
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/notification&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/nsd/&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/phonenumber-utils&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/sensor&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/service-adaptor&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/shortcut&quot;"/>
@@ -131,6 +131,7 @@
 									<listOptionValue builtIn="false" value="${RS_COMPILER_MISC}"/>
 									<listOptionValue builtIn="false" value=" -fPIE"/>
 									<listOptionValue builtIn="false" value="--sysroot=&quot;${SBI_SYSROOT}&quot;"/>
+									<listOptionValue builtIn="false" value="-mthumb"/>
 								</option>
 								<option id="gnu.cpp.compiler.option.include.paths.1857385470" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/inc}&quot;"/>
@@ -145,11 +146,17 @@
 								<option defaultValue="gnu.c.debugging.level.max" id="sbi.gnu.c.compiler.option.debugging.level.core.247638963" name="Debug level" superClass="sbi.gnu.c.compiler.option.debugging.level.core" valueType="enumerated"/>
 								<option defaultValue="false" id="sbi.gnu.c.compiler.option.misc.pic.core.982331969" name="-fPIC option" superClass="sbi.gnu.c.compiler.option.misc.pic.core" valueType="boolean"/>
 								<option id="sbi.gnu.c.compiler.option.1644890019" name="Tizen-Target" superClass="sbi.gnu.c.compiler.option" valueType="userObjs">
-									<listOptionValue builtIn="false" value="mobile-3.0-emulator.core.public.20161215_1_llvm37.i386.core.app"/>
+									<listOptionValue builtIn="false" value="mobile-3.0-device.core_llvm37.armel.core.app"/>
 								</option>
 								<option id="sbi.gnu.c.compiler.option.frameworks_inc.core.1483034184" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.c.compiler.option.frameworks_inc.core" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/libxml2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/EGL&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES2&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES3&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/KHR&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore-agent&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appfw&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/attach-panel&quot;"/>
@@ -186,7 +193,6 @@
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/efl-1&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/efl-extension&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/efreet-1&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/EGL&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eina-1&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eina-1/eina&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eio-1&quot;"/>
@@ -204,14 +210,10 @@
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/freetype2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/geofence&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/gio-unix-2.0&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES2&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES3&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/glib-2.0&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/harfbuzz&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/iotcon&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/json-glib-1.0&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/KHR&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/location&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/maps&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/media&quot;"/>
@@ -224,7 +226,6 @@
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/notification&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/nsd/&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/phonenumber-utils&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/sensor&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/service-adaptor&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/shortcut&quot;"/>
@@ -249,6 +250,7 @@
 									<listOptionValue builtIn="false" value="${RS_COMPILER_MISC}"/>
 									<listOptionValue builtIn="false" value=" -fPIE"/>
 									<listOptionValue builtIn="false" value="--sysroot=&quot;${SBI_SYSROOT}&quot;"/>
+									<listOptionValue builtIn="false" value="-mthumb"/>
 								</option>
 								<option id="gnu.c.compiler.option.include.paths.1774757534" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/inc}&quot;"/>
@@ -279,7 +281,7 @@
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
 								</inputType>
 							</tool>
-							<tool command="i386-linux-gnueabi-as" id="org.tizen.nativeapp.tool.sbi.gnu.assembler.base.1815664769" name="Assembler" superClass="org.tizen.nativeapp.tool.sbi.gnu.assembler.base">
+							<tool command="arm-linux-gnueabi-as" id="org.tizen.nativeapp.tool.sbi.gnu.assembler.base.1815664769" name="Assembler" superClass="org.tizen.nativeapp.tool.sbi.gnu.assembler.base">
 								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.88475890" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
 							</tool>
 							<tool id="org.tizen.nativecore.tool.fnmapgen.304005350" name="C FN-Map Generator" superClass="org.tizen.nativecore.tool.fnmapgen"/>
diff --git a/Build/basedef.mk b/Build/basedef.mk
index 64fbf82..a762983 100755
--- a/Build/basedef.mk
+++ b/Build/basedef.mk
@@ -22,7 +22,7 @@ PROJ_PATH ?= $(PROJPATH)
 #endif
 
 #ifeq ($(strip $(OUTPUT_DIR)),)
-OUTPUT_DIR ?= $(PROJ_PATH)/$(BUILD_CONFIG)
+#OUTPUT_DIR ?= $(PROJ_PATH)/$(BUILD_CONFIG)
 #endif
 
 #ifeq ($(strip $(BUILD_ARCH)),)
diff --git a/Build/build_edc.mk b/Build/build_edc.mk
index 6f85fdd..2270b84 100644
--- a/Build/build_edc.mk
+++ b/Build/build_edc.mk
@@ -1,12 +1,12 @@
 # EDC build script
 
 
-FUNC_EDC2EDJ = $(patsubst %.edc,$(2)/%.edj,$(1))
+FUNC_EDC2EDJ = $(patsubst %.edc,%.edj,$(1))
 
 # parameter :
 #  $(1) - C/C++ soruce file
 #  $(2) - output path
-CONVERT_ESC_EDC_TO_EDJ = $(call CONVERT_4MAKE_TO_OUT,$(call FUNC_EDC2EDJ,$(1),$(2)))
+CONVERT_ESC_EDC_TO_EDJ = $(2)/$(call CONVERT_4MAKE_TO_OUT,$(call FUNC_EDC2EDJ,$(1)))
 
 
 # parameter :
diff --git a/Build/build_po.mk b/Build/build_po.mk
index d88d71a..514116b 100644
--- a/Build/build_po.mk
+++ b/Build/build_po.mk
@@ -1,14 +1,14 @@
 # PO build script
 
 
-_FUNC_PO2MO = $(patsubst %.po,$(2)/res/locale/%/LC_MESSAGES/$(3).mo,$(notdir $(1)))
+_FUNC_PO2MO = $(patsubst %.po,res/locale/%/LC_MESSAGES/$(2).mo,$(notdir $(1)))
 
 
 # parameter :
 #  $(1) - C/C++ soruce file
 #  $(2) - output path
 #  $(3) - app name
-CONVERT_ESC_PO_TO_MO = $(call CONVERT_4MAKE_TO_OUT,$(call _FUNC_PO2MO,$(1),$(2),$(3)))
+CONVERT_ESC_PO_TO_MO = $(2)/$(call CONVERT_4MAKE_TO_OUT,$(call _FUNC_PO2MO,$(1),$(3)))
 
 
 # parameter :
diff --git a/Build/makefile b/Build/makefile
index 9348c50..3c3f61e 100755
--- a/Build/makefile
+++ b/Build/makefile
@@ -14,7 +14,8 @@ clean : app_clean
 version : build_version
 
 #PROJ_ROOT = .
-BUILD_ROOT := $(PROJ_PATH)/Build#
+PROJ_PATH ?= .#
+BUILD_ROOT ?= $(PROJ_PATH)/Build#
 
 ifeq ($(MAKE_NAME),mingw32-make)
 ifneq ($(SHELL),)
diff --git a/Build/makefile.mk b/Build/makefile.mk
index c95b4b4..fd5349d 100644
--- a/Build/makefile.mk
+++ b/Build/makefile.mk
@@ -15,8 +15,8 @@ version : build_version
 
 
 #PROJ_ROOT := $(call BSLASH2SLASH,$(PROJ_PATH))
-PROJ_ROOT := .
-BUILD_ROOT := $(PROJ_ROOT)/Build
+PROJ_ROOT ?= .#
+BUILD_ROOT ?= $(PROJ_ROOT)/Build
 
 include $(BUILD_ROOT)/basedef.mk
 
@@ -32,8 +32,11 @@ include $(BUILD_ROOT)/funcs.mk
 
 APPTYPE := $(type)
 
-OUTPUT_DIR := $(PROJ_ROOT)/$(BUILD_CONFIG)
-OBJ_OUTPUT := $(OUTPUT_DIR)/objs
+OUTPUT_BASE ?= $(PROJ_ROOT)
+#OUTPUT_DIR ?= $(OUTPUT_BASE)/$(BUILD_CONFIG)/$(BUILD_ARCH)
+OUTPUT_DIR ?= $(OUTPUT_BASE)/$(BUILD_CONFIG)
+OUTPUT_DIR := $(call BSLASH2SLASH,$(OUTPUT_DIR))
+OBJ_OUTPUT ?= $(OUTPUT_DIR)/objs
 
 LOWER_APPNAME := $(call LOWER_CASE,$(APPNAME))
 APPID2 := $(subst $(basename $(APPID)).,,$(APPID))
@@ -65,8 +68,8 @@ ifeq ($(strip $(APPTYPE)),sharedLib)
 EXT_OP := -fPIC
 endif
 
-C_OPT := $(COMPILE_FLAGS) $(TC_COMPILER_MISC) $(RS_COMPILER_MISC) $(EXT_OP) --sysroot="$(SYSROOT)" -Werror-implicit-function-declaration $(M_OPT)
-CPP_OPT := $(CPP_COMPILE_FLAGS) $(TC_COMPILER_MISC) $(RS_COMPILER_MISC) $(EXT_OP) --sysroot="$(SYSROOT)" -Werror-implicit-function-declaration $(M_OPT)
+C_OPT := $(COMPILE_FLAGS) $(TC_COMPILER_MISC) $(RS_COMPILER_MISC) $(EXT_OP) --sysroot="$(SYSROOT)" -Werror-implicit-function-declaration $(M_OPT) $(USER_C_OPTS)
+CPP_OPT := $(CPP_COMPILE_FLAGS) $(TC_COMPILER_MISC) $(RS_COMPILER_MISC) $(EXT_OP) --sysroot="$(SYSROOT)" -Werror-implicit-function-declaration $(M_OPT) $(USER_CPP_OPTS)
 C_OPT_FILE := $(PLATFORM_INCS_FILE)
 
 OBJS := #
@@ -81,7 +84,7 @@ $(foreach ext,cpp cxx cc c++ C,$(eval $(call C_PROC_RAW,$(OBJ_OUTPUT),$(USER_SRC
 # Individual C/C++
 ifneq ($(strip $(USER_EXT_C_KEYS)),)
 $(foreach var,$(USER_EXT_C_KEYS),$(eval $(call C_PROC_RAW,$(OBJ_OUTPUT),$(USER_EXT_$(var)_SRCS),$(USER_EXT_$(var)_INC_DIRS),$(USER_EXT_$(var)_INC_FILES),$(USER_EXT_$(var)_DEFS),$(USER_EXT_$(var)_UNDEFS),$(C_OPT),$(C_OPT_FILE),C,c,$(CC),OBJS)))
-$(foreach ext,cpp cxx cc c++ C,$(foreach var,$(USER_EXT_C_KEYS),$(eval $(call C_PROC_RAW,$(OBJ_OUTPUT),$(USER_EXT_$(var)_SRCS),$(USER_EXT_$(var)_INC_DIRS),$(USER_EXT_$(var)_CPP_INC_FILES),$(USER_EXT_$(var)_CPP_DEFS),$(USER_EXT_$(var)_CPP_UNDEFS),$(C_OPT),$(C_OPT_FILE),C++,$(ext),$(CXX),OBJS))))
+$(foreach ext,cpp cxx cc c++ C,$(foreach var,$(USER_EXT_C_KEYS),$(eval $(call C_PROC_RAW,$(OBJ_OUTPUT),$(USER_EXT_$(var)_SRCS),$(USER_EXT_$(var)_INC_DIRS),$(USER_EXT_$(var)_CPP_INC_FILES),$(USER_EXT_$(var)_CPP_DEFS),$(USER_EXT_$(var)_CPP_UNDEFS),$(CPP_OPT),$(C_OPT_FILE),C++,$(ext),$(CXX),OBJS))))
 endif
 
 
@@ -109,7 +112,7 @@ $(APPFILE) : $(OBJS) $(UOBJS)
 	@echo '  Building target: $@'
 	@echo '  Invoking: C/C++ Linker'
 	$(call MAKEDIRS,$(@D))
-	$(CXX) -o $(APPFILE) $(OBJS) $(UOBJS) $(LIBPATHS) -Xlinker --as-needed $(LIBS) $(LINK_FLAGS) $(TC_LINKER_MISC) $(RS_LINKER_MISC) -pie -lpthread --sysroot="$(SYSROOT)" -Xlinker --version-script="$(PROJ_ROOT)/.exportMap" $(RS_LIB_PATHS) $(RS_LIBRARIES) -Xlinker -rpath="/opt/usr/apps/$(APPID)/lib" -Werror-implicit-function-declaration
+	$(CXX) -o $(APPFILE) $(OBJS) $(UOBJS) $(LIBPATHS) -Xlinker --as-needed $(LIBS) $(LINK_FLAGS) $(TC_LINKER_MISC) $(RS_LINKER_MISC) -pie -lpthread --sysroot="$(SYSROOT)" -Xlinker --version-script="$(PROJ_ROOT)/.exportMap" $(RS_LIB_PATHS) $(RS_LIBRARIES) -Xlinker -rpath="/opt/usr/apps/$(APPID)/lib" -Werror-implicit-function-declaration $(USER_LINK_OPTS)
 	@echo '  Finished building target: $@'
 endif
 ifeq ($(strip $(APPTYPE)),staticLib)
@@ -117,7 +120,7 @@ $(APPFILE) : $(OBJS) $(UOBJS)
 	@echo '  Building target: $@'
 	@echo '  Invoking: Archive utility'
 	$(call MAKEDIRS,$(@D))
-	$(AR) -r $(APPFILE) $(OBJS) $(UOBJS) $(AR_FLAGS)
+	$(AR) -r $(APPFILE) $(OBJS) $(UOBJS) $(AR_FLAGS) $(USER_LINK_OPTS)
 	@echo '  Finished building target: $@'
 endif
 ifeq ($(strip $(APPTYPE)),sharedLib)
@@ -125,7 +128,7 @@ $(APPFILE) : $(OBJS) $(UOBJS)
 	@echo '  Building target: $@'
 	@echo '  Invoking: C/C++ Linker'
 	$(call MAKEDIRS,$(@D))
-	$(CXX) -o $(APPFILE) $(OBJS) $(UOBJS) $(LIBPATHS) -Xlinker --as-needed $(LIBS) $(LINK_FLAGS) $(TC_LINKER_MISC) $(RS_LINKER_MISC) -shared -lpthread --sysroot="$(SYSROOT)" $(RS_LIB_PATHS) $(RS_LIBRARIES)
+	$(CXX) -o $(APPFILE) $(OBJS) $(UOBJS) $(LIBPATHS) -Xlinker --as-needed $(LIBS) $(LINK_FLAGS) $(TC_LINKER_MISC) $(RS_LINKER_MISC) -shared -lpthread --sysroot="$(SYSROOT)" $(RS_LIB_PATHS) $(RS_LIBRARIES) $(USER_LINK_OPTS)
 	@echo '  Finished building target: $@'
 endif
 
@@ -144,14 +147,13 @@ ifneq ($(findstring Windows,$(OS)),)
 ifneq ($(findstring 3.82,$(MAKE_VERSION)),)
 	$(file > $@,$(PLATFORM_INCS))
 else
-	@echo $(PLATFORM_INCS) > $@
+	@echo $(PLATFORM_INCS) > "$@"
 endif
 else
-	@echo $(PLATFORM_INCS) > $@
+	@echo $(PLATFORM_INCS) > "$@"
 endif
 endif
 
-
 include $(BUILD_ROOT)/build_edc.mk
 
 #ifeq ($(strip $(ENVENTOR_SHARED_RES_PATH)),)
diff --git a/inc/apps_package_manager.h b/inc/apps_package_manager.h
index 0c123c3..b2196f0 100755
--- a/inc/apps_package_manager.h
+++ b/inc/apps_package_manager.h
@@ -27,6 +27,7 @@
 #include "apps_data.h"
 
 void apps_package_manager_init();
+void apps_package_manager_init_app_manager_event();
 Eina_Bool apps_package_manager_get_internal_list(Eina_List **list);
 Eina_Bool apps_package_manager_get_external_list(Eina_List **list);
 void apps_package_manager_update_label(const char *app_id, app_data_t *item);
diff --git a/inc/util.h b/inc/util.h
index b54d36d..baa1ef3 100755
--- a/inc/util.h
+++ b/inc/util.h
@@ -48,7 +48,6 @@ enum app_subdir {
 	APP_DIR_SHARED_TRUSTED,
 	APP_DIR_EXTERNAL_DATA,
 	APP_DIR_EXTERNAL_CACHE,
-	APP_DIR_EXTERNAL_SHARED_DATA,
 };
 
 const char *util_get_file_path(enum app_subdir dir, const char *relative);
@@ -62,6 +61,5 @@ const char *util_to_string(int num);
 #define util_get_trusted_file_path(x) util_get_file_path(APP_DIR_SHARED_TRUSTED, (x))
 #define util_get_external_data_file_path(x) util_get_file_path(APP_DIR_EXTERNAL_DATA, (x))
 #define util_get_external_cache_file_path(x) util_get_file_path(APP_DIR_EXTERNAL_CACHE, (x))
-#define util_get_external_shared_data_file_path(x) util_get_file_path(APP_DIR_EXTERNAL_SHARED_DATA, (x))
 
 #endif /* __UTIL_H__ */
diff --git a/project_def.prop b/project_def.prop
index a027382..963fc12 100755
--- a/project_def.prop
+++ b/project_def.prop
@@ -18,7 +18,7 @@ USER_EDCS =
 USER_POS = res/po/ca.po res/po/fr.po res/po/nl.po res/po/pt_BR.po res/po/sk.po res/po/sv.po res/po/uz.po res/po/ko_KR.po res/po/is.po res/po/ka.po res/po/ro.po res/po/it_IT.po res/po/en_PH.po res/po/lt.po res/po/mk.po res/po/nb.po res/po/ru_RU.po res/po/el_GR.po res/po/zh_TW.po res/po/az.po res/po/hr.po res/po/uk.po res/po/zh_CN.po res/po/de.po res/po/es_US.po res/po/eu.po res/po/kk.po res/po/sl.po res/po/et.po res/po/fr_CA.po res/po/ga.po res/po/gl.po res/po/hy.po res/po/lv.po res/po/ja_JP.po res/po/es_ES.po res/po/bg.po res/po/cs.po res/po/pl.po res/po/pt_PT.po res/po/sr.po res/po/hu.po res/po/ar.po res/po/en_US.po res/po/fi.po res/po/da.po res/po/en.po res/po/zh_HK.po res/po/tr_TR.po 
 
 # User Defines
-USER_DEFS = 
+USER_DEFS = TIZEN_DEPRECATION 
 USER_CPP_DEFS = 
 
 # User Undefines
diff --git a/src/apps_data.c b/src/apps_data.c
index f721a7e..8f4cba5 100755
--- a/src/apps_data.c
+++ b/src/apps_data.c
@@ -48,6 +48,7 @@ void apps_data_init(void *data, Ecore_Thread *th)
 	apps_package_manager_init();
 	apps_package_manager_get_internal_list(&pkg_list);
 	apps_package_manager_get_external_list(&pkg_list);
+	apps_package_manager_init_app_manager_event();
 
 	if (!apps_db_create()) {
 		apps_db_get_app_list(&db_list);
@@ -290,6 +291,7 @@ static int __apps_data_shortcut_request_cb(const char *package_name,
 	new_item->position = INIT_VALUE;
 	new_item->label_str = strdup(name);
 	new_item->app_id = strdup(package_name);
+	new_item->enable = true;
 
 	char* pkg_id = NULL;
 	int ret = package_manager_get_package_id_by_app_id(package_name, &pkg_id);
diff --git a/src/apps_package_manager.c b/src/apps_package_manager.c
index 00f2405..7893509 100755
--- a/src/apps_package_manager.c
+++ b/src/apps_package_manager.c
@@ -20,10 +20,14 @@
 #include "conf.h"
 
 static package_manager_h pkg_mgr = NULL;
+static app_manager_event_h app_mgr = NULL;
 
 static void __apps_package_manager_event_cb(const char *type, const char *package,
 		package_manager_event_type_e event_type, package_manager_event_state_e event_state, int progress,
 		package_manager_error_e error, void *user_data);
+static void __apps_app_manager_event_cb(const char *type, const char *app_id,
+		app_manager_event_type_e event_type, app_manager_event_state_e event_state,
+		app_manager_event_h handle, void *user_data);
 static bool __apps_data_pkg_get_apps_info(app_info_h app_handle, app_data_t **item);
 static bool __apps_data_get_app_info_from_pkg(package_info_app_component_type_e comp_type, const char *app_id, void *data);
 static bool __apps_package_manager_get_internal_item(app_info_h app_handle, void *data);
@@ -31,8 +35,33 @@ static bool __apps_package_manager_get_external_item(app_info_h app_handle, void
 static void __apps_package_manager_install(const char *package);
 static void __apps_package_manager_uninstall(const char *package);
 static void __apps_package_manager_move(const char *package);
+static void __apps_app_manager_enable_app(const char *app_id);
+static void __apps_app_manager_disable_app(const char *app_id);
 
 
+
+void apps_package_manager_init_app_manager_event()
+{
+	int ret;
+	if (app_mgr != NULL)
+		return;
+
+	ret = app_manager_event_create(&app_mgr);
+	if (ret != APP_MANAGER_ERROR_NONE) {
+		LOGE("app_manager_event_create : failed[%d]", ret);
+	}
+
+	ret = app_manager_event_set_status(app_mgr, APP_MANAGER_EVENT_STATUS_TYPE_ALL);
+	if (ret != APP_MANAGER_ERROR_NONE) {
+		LOGE("app_manager_set_event_status : failed[%d]", ret);
+	}
+
+	ret = app_manager_set_event_cb(app_mgr, __apps_app_manager_event_cb, NULL);
+	if (ret != APP_MANAGER_ERROR_NONE) {
+		LOGE("app_manager_set_event_cb : failed[%d]", ret);
+	}
+}
+
 void apps_package_manager_init()
 {
 	int ret;
@@ -55,6 +84,25 @@ void apps_package_manager_init()
 	}
 }
 
+static void __apps_app_manager_event_cb(const char *type, const char *app_id,
+		app_manager_event_type_e event_type, app_manager_event_state_e event_state,
+		app_manager_event_h handle, void *user_data)
+{
+	LOGD("event_type: %d, event_state: %d", event_type, event_state);
+	if (event_state == APP_MANAGER_EVENT_STATE_STARTED) {
+		LOGI("app_id:%s type:%d state:APP_MANAGER_EVENT_STATE_STARTED", app_id, event_type);
+	} else if (event_state == APP_MANAGER_EVENT_STATE_COMPLETED) {
+		LOGI("app_id:%s type:%d APP_MANAGER_EVENT_STATE_COMPLETED", app_id, event_type);
+		if (event_type == APP_MANAGER_EVENT_ENABLE_APP) {
+			__apps_app_manager_enable_app(app_id);
+		} else if (event_type == APP_MANAGER_EVENT_DISABLE_APP) {
+			__apps_app_manager_disable_app(app_id);
+		}
+	} else {
+		LOGE("app_id:%s type:%d state:APP_MANAGER_EVENT_STATE_COMPLETED: FAILED", app_id, event_type);
+	}
+}
+
 static void __apps_package_manager_event_cb(const char *type, const char *package,
 		package_manager_event_type_e event_type, package_manager_event_state_e event_state, int progress,
 		package_manager_error_e error, void *user_data)
@@ -257,7 +305,7 @@ void apps_package_manager_update_label(const	 char *app_id, app_data_t *item)
 
 static bool __apps_data_get_app_info_from_pkg(package_info_app_component_type_e comp_type, const char *app_id, void *data)
 {
-	int ret = PACKAGE_MANAGER_ERROR_NONE;
+	int ret = APP_MANAGER_ERROR_NONE;
 	app_info_h app_info = NULL;
 	app_data_t *item = NULL;
 
@@ -276,6 +324,39 @@ static bool __apps_data_get_app_info_from_pkg(package_info_app_component_type_e
 	return true;
 }
 
+static void __apps_app_manager_enable_app(const char *app_id)
+{
+	int ret = APP_MANAGER_ERROR_NONE;
+	app_info_h app_info = NULL;
+	app_data_t *item = NULL;
+
+	ret = app_manager_get_app_info(app_id, &app_info);
+	if (APP_MANAGER_ERROR_NONE != ret) {
+		LOGE("Failed to get app_info, return: [%d]", ret);
+		return;
+	}
+
+	if (__apps_data_pkg_get_apps_info(app_info, &item)) {
+		item->storage_type = apps_data_get_storage_type(item->pkg_id);
+		apps_data_install(item);
+	}
+	app_info_destroy(app_info);
+}
+
+static void __apps_app_manager_disable_app(const char *app_id)
+{
+	Eina_List *list = apps_data_get_list();
+	app_data_t *item = NULL;
+	Eina_List *find_list;
+
+	EINA_LIST_FOREACH(list, find_list, item) {
+		if (item != NULL && !strcmp(item->app_id,app_id)) {
+			apps_data_delete_item(item);
+			break;
+		}
+	}
+}
+
 static void __apps_package_manager_install(const char *package)
 {
 	package_info_h package_info = NULL;
diff --git a/src/cluster_page.c b/src/cluster_page.c
index 17f1072..3ac9a5a 100755
--- a/src/cluster_page.c
+++ b/src/cluster_page.c
@@ -33,7 +33,6 @@ static struct {
 };
 
 static void __cluster_page_set(cluster_page_t *page, widget_data_t *item);
-static void __cluster_page_print_space(cluster_page_t *page);
 static void __cluster_page_get_widget_size(widget_size_type_e type, int *w, int *h);
 
 static void __cluster_page_edit_on_done(void *data, Evas_Object *obj, const char *emission, const char *source);
@@ -365,16 +364,6 @@ static void __cluster_page_set(cluster_page_t *page, widget_data_t *item)
 	page->widget_list = eina_list_append(page->widget_list, item);
 }
 
-static void __cluster_page_print_space(cluster_page_t *page)
-{
-	LOGD("=========================================");
-	int i;
-	for (i = 0; i < 4; i++) {
-		LOGD("%d %d %d %d", page->space[i][0], page->space[i][1], page->space[i][2], page->space[i][3]);
-	}
-	LOGD("=========================================");
-}
-
 static void __cluster_page_get_widget_size(widget_size_type_e type, int *w, int *h)
 {
 	switch (type) {
diff --git a/src/util.c b/src/util.c
index 5e911e7..9f6cdbe 100755
--- a/src/util.c
+++ b/src/util.c
@@ -51,9 +51,6 @@ const char *util_get_file_path(enum app_subdir dir, const char *relative)
 	case APP_DIR_EXTERNAL_CACHE:
 		prefix = app_get_external_cache_path();
 		break;
-	case APP_DIR_EXTERNAL_SHARED_DATA:
-		prefix = app_get_external_shared_data_path();
-		break;
 	default:
 		LOGE("Not handled directory type.");
 		return NULL;
-- 
2.7.4


From b3f9b73c7ed649c770be36c55c6142a31fbaa225 Mon Sep 17 00:00:00 2001
From: YoungHun Cho <hoon.cho@samsung.com>
Date: Tue, 20 Dec 2016 13:59:02 +0900
Subject: [PATCH 07/16] loop set FALSE && indicator unit angle

Change-Id: Ib590851021caefdba3d6275d3ecc3a27aecefcca
---
 .cproject            |  8 +++++---
 inc/conf.h           |  2 ++
 src/apps_view.c      |  6 +-----
 src/cluster_view.c   |  6 +-----
 src/conf.c           |  8 ++++++++
 src/page_indicator.c | 46 ++++++++++++++++++++++++----------------------
 6 files changed, 41 insertions(+), 35 deletions(-)

diff --git a/.cproject b/.cproject
index 3e8bb33..9036413 100755
--- a/.cproject
+++ b/.cproject
@@ -27,7 +27,7 @@
 								<option defaultValue="gnu.cpp.compiler.debugging.level.max" id="sbi.gnu.cpp.compiler.option.debugging.level.core.481743771" name="Debug level" superClass="sbi.gnu.cpp.compiler.option.debugging.level.core" valueType="enumerated"/>
 								<option defaultValue="false" id="sbi.gnu.cpp.compiler.option.misc.pic.core.2102599528" name="-fPIC option" superClass="sbi.gnu.cpp.compiler.option.misc.pic.core" valueType="boolean"/>
 								<option id="sbi.gnu.cpp.compiler.option.1070320025" name="Tizen-Target" superClass="sbi.gnu.cpp.compiler.option" valueType="userObjs">
-									<listOptionValue builtIn="false" value="mobile-3.0-device.core_llvm37.armel.core.app"/>
+									<listOptionValue builtIn="false" value="mobile-3.0-device.core.public.20161129_1_llvm37.armel.core.app"/>
 								</option>
 								<option id="sbi.gnu.cpp.compiler.option.frameworks_inc.core.312288874" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.cpp.compiler.option.frameworks_inc.core" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/libxml2&quot;"/>
@@ -131,6 +131,7 @@
 									<listOptionValue builtIn="false" value="${RS_COMPILER_MISC}"/>
 									<listOptionValue builtIn="false" value=" -fPIE"/>
 									<listOptionValue builtIn="false" value="--sysroot=&quot;${SBI_SYSROOT}&quot;"/>
+									<listOptionValue builtIn="false" value="-mthumb"/>
 								</option>
 								<option id="gnu.cpp.compiler.option.include.paths.1857385470" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/inc}&quot;"/>
@@ -145,7 +146,7 @@
 								<option defaultValue="gnu.c.debugging.level.max" id="sbi.gnu.c.compiler.option.debugging.level.core.247638963" name="Debug level" superClass="sbi.gnu.c.compiler.option.debugging.level.core" valueType="enumerated"/>
 								<option defaultValue="false" id="sbi.gnu.c.compiler.option.misc.pic.core.982331969" name="-fPIC option" superClass="sbi.gnu.c.compiler.option.misc.pic.core" valueType="boolean"/>
 								<option id="sbi.gnu.c.compiler.option.1644890019" name="Tizen-Target" superClass="sbi.gnu.c.compiler.option" valueType="userObjs">
-									<listOptionValue builtIn="false" value="mobile-3.0-device.core_llvm37.armel.core.app"/>
+									<listOptionValue builtIn="false" value="mobile-3.0-device.core.public.20161129_1_llvm37.armel.core.app"/>
 								</option>
 								<option id="sbi.gnu.c.compiler.option.frameworks_inc.core.1483034184" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.c.compiler.option.frameworks_inc.core" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/libxml2&quot;"/>
@@ -249,6 +250,7 @@
 									<listOptionValue builtIn="false" value="${RS_COMPILER_MISC}"/>
 									<listOptionValue builtIn="false" value=" -fPIE"/>
 									<listOptionValue builtIn="false" value="--sysroot=&quot;${SBI_SYSROOT}&quot;"/>
+									<listOptionValue builtIn="false" value="-mthumb"/>
 								</option>
 								<option id="gnu.c.compiler.option.include.paths.1774757534" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/inc}&quot;"/>
@@ -279,7 +281,7 @@
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
 								</inputType>
 							</tool>
-							<tool command="i386-linux-gnueabi-as" id="org.tizen.nativeapp.tool.sbi.gnu.assembler.base.1815664769" name="Assembler" superClass="org.tizen.nativeapp.tool.sbi.gnu.assembler.base">
+							<tool command="arm-linux-gnueabi-as" id="org.tizen.nativeapp.tool.sbi.gnu.assembler.base.1815664769" name="Assembler" superClass="org.tizen.nativeapp.tool.sbi.gnu.assembler.base">
 								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.88475890" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
 							</tool>
 							<tool id="org.tizen.nativecore.tool.fnmapgen.304005350" name="C FN-Map Generator" superClass="org.tizen.nativecore.tool.fnmapgen"/>
diff --git a/inc/conf.h b/inc/conf.h
index 84ab1b9..eca7955 100755
--- a/inc/conf.h
+++ b/inc/conf.h
@@ -43,8 +43,10 @@ extern double __conf_get_resolution_scale_area();
 extern int __conf_get_window_h();
 extern int __conf_get_window_w();
 extern int __conf_get_mirroring_x(int x, int width);
+extern double __conf_get_mirroring_angle(double angle);
 
 #define MIRRORING_X(x, w) (__conf_get_mirroring_x((x), (w)))
+#define MIRRORING_ANGLE(angle) (__conf_get_mirroring_angle((angle)))
 
 #define INDICATOR_H ((45) * (__conf_get_resolution_scale_h()))
 
diff --git a/src/apps_view.c b/src/apps_view.c
index 250e4e5..1bfb041 100755
--- a/src/apps_view.c
+++ b/src/apps_view.c
@@ -641,7 +641,7 @@ static void __apps_view_create_base_gui(Evas_Object *win)
 	elm_scroller_page_scroll_limit_set(apps_view_s.scroller, 1, 1);
 	evas_object_size_hint_weight_set(apps_view_s.scroller, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
 
-	elm_scroller_loop_set(apps_view_s.scroller, EINA_TRUE, EINA_FALSE);
+	elm_scroller_loop_set(apps_view_s.scroller, EINA_FALSE, EINA_FALSE);
 	elm_scroller_page_size_set(apps_view_s.scroller, APPS_VIEW_W, APPS_VIEW_H);
 	evas_object_resize(apps_view_s.scroller, APPS_VIEW_W , APPS_VIEW_H);
 
@@ -713,8 +713,6 @@ static Evas_Object *__apps_view_add_page(void)
 	apps_view_s.page_count += 1;
 	page_indicator_set_page_count(apps_view_s.indicator, apps_view_s.page_count);
 
-	elm_scroller_loop_set(apps_view_s.scroller, apps_view_s.page_count > 1, EINA_FALSE);
-
 	return page_ly;
 }
 
@@ -745,8 +743,6 @@ static void __apps_view_remove_page(void)
 	page_indicator_set_page_count(apps_view_s.indicator, apps_view_s.page_count);
 #endif
 	evas_object_del(item);
-
-	elm_scroller_loop_set(apps_view_s.scroller, apps_view_s.page_count > 1, EINA_FALSE);
 }
 
 static void __apps_view_fill_apps(void *data, Ecore_Thread *th)
diff --git a/src/cluster_view.c b/src/cluster_view.c
index 1ee29b4..2269d18 100755
--- a/src/cluster_view.c
+++ b/src/cluster_view.c
@@ -231,7 +231,7 @@ Evas_Object *__cluster_view_create_base_gui(Evas_Object *win)
 	evas_object_size_hint_weight_set(cluster_view_s.scroller, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
 	evas_object_resize(cluster_view_s.scroller, CLUSTER_VIEW_W, CLUSTER_VIEW_H);
 
-	elm_scroller_loop_set(cluster_view_s.scroller, EINA_TRUE, EINA_FALSE);
+	elm_scroller_loop_set(cluster_view_s.scroller, EINA_FALSE, EINA_FALSE);
 	elm_scroller_page_size_set(cluster_view_s.scroller, CLUSTER_VIEW_W , CLUSTER_VIEW_H);
 
 	evas_object_event_callback_add(cluster_view_s.scroller, EVAS_CALLBACK_MOUSE_DOWN, __clsuter_view_scroller_down_cb, NULL);
@@ -931,8 +931,6 @@ static cluster_page_t *__cluster_view_page_new(void)
 
 	page_indicator_set_page_count(cluster_view_s.indicator, cluster_view_s.page_count);
 
-	elm_scroller_loop_set(cluster_view_s.scroller, cluster_view_s.page_count > 1, EINA_FALSE);
-
 	return page_t;
 }
 
@@ -954,8 +952,6 @@ static void __cluster_view_page_delete(cluster_page_t *page)
 
 	cluster_data_set_page_count(cluster_view_s.page_count);
 	page_indicator_set_page_count(cluster_view_s.indicator, cluster_view_s.page_count);
-
-	elm_scroller_loop_set(cluster_view_s.scroller, cluster_view_s.page_count > 1, EINA_FALSE);
 }
 
 static void __cluster_view_allpage_delete_clicked(void *data, Evas_Object *obj, const char *emission, const char *source)
diff --git a/src/conf.c b/src/conf.c
index 128b4b8..bca57f7 100755
--- a/src/conf.c
+++ b/src/conf.c
@@ -58,6 +58,14 @@ int __conf_get_mirroring_x(int x, int width)
 	return x;
 }
 
+double __conf_get_mirroring_angle(double angle)
+{
+	if (elm_config_mirrored_get())
+		return - angle;
+
+	return angle;
+}
+
 void conf_set_resolution_scale(int win_width, int win_height)
 {
 	window_h = win_height;
diff --git a/src/page_indicator.c b/src/page_indicator.c
index 6c5685d..e2e7118 100755
--- a/src/page_indicator.c
+++ b/src/page_indicator.c
@@ -180,6 +180,11 @@ static int __page_indicator_get_indicator_unit(int page_count, int page)
 	return indicator;
 }
 
+/**
+ * @brief Set the angle of page indicator units.
+ *
+ * @note This function is run without considering the scrolling on a loop.
+ */
 static void __page_indicator_scroll_cb(void *data, Evas_Object *obj, void *event_info)
 {
 	page_indicator_t *page_indicator = (page_indicator_t*) data;
@@ -193,38 +198,32 @@ static void __page_indicator_scroll_cb(void *data, Evas_Object *obj, void *event
 	elm_scroller_region_get(obj, &cur_x, NULL, &page_size, NULL);
 
 	int scroller_width = page_size * page_indicator->page_count;
-	int cur_page_x = page_indicator->current_page * page_size;
-
 	cur_x = MIRRORING_X(cur_x + page_size / 2, scroller_width) - page_size / 2;
 
-	int delta_x = cur_x - cur_page_x;
-	if (delta_x < -page_size)
-		delta_x = delta_x + scroller_width;
-	else if (delta_x > page_size)
-		delta_x = delta_x - scroller_width;
-
-	int cur_page = page_indicator->current_page;
-	int next_page = (cur_page + 1) % page_indicator->page_count;
-	if (delta_x < 0) {
-		delta_x = (delta_x - scroller_width) % scroller_width;
-		next_page = ((cur_page - 1) + page_indicator->page_count) % page_indicator->page_count;
-	}
+	int prev_page = cur_x / page_size;
+	int next_page = prev_page + 1;
 
-	int cur_indicator_unit = __page_indicator_get_indicator_unit(page_indicator->page_count, cur_page);
-	int next_indicator_unit = __page_indicator_get_indicator_unit(page_indicator->page_count, next_page);
+	int prev_delta_x = cur_x - (prev_page * page_size);
+	int next_delta_x = cur_x - (next_page * page_size);
 
-	double angle_delta = (double)delta_x / page_size * 90.0;
+	int prev_unit = __page_indicator_get_indicator_unit(page_indicator->page_count, prev_page);
+	int next_unit = __page_indicator_get_indicator_unit(page_indicator->page_count, next_page);
+
+	double prev_unit_angle = ((double)prev_delta_x / page_size) * 90.0 - 90.0;
+	double next_unit_angle = 90.0 + ((double)next_delta_x / page_size) * 90.0;
+
+	prev_unit_angle = MIRRORING_ANGLE(prev_unit_angle);
+	next_unit_angle = MIRRORING_ANGLE(next_unit_angle);
 
 	int i = 0;
 	int max_unit_count = page_indicator->page_count < PAGE_INDICATOR_MAX_PAGE_COUNT ? page_indicator->page_count : PAGE_INDICATOR_MAX_PAGE_COUNT;
 	for (i = 0; i < max_unit_count; i++)
 	{
 		double angle = 0.0;
-		if (i == cur_indicator_unit || i == next_indicator_unit) {
-			angle = page_indicator->unit_angle[i] + angle_delta;
-			if (angle > 90.0)
-				angle -= 180.0;
-		}
+		if (i == prev_unit)
+			angle = prev_unit_angle;
+		else if (i == next_unit)
+			angle = next_unit_angle;
 
 		double color = fabs(angle) * 2 + 75.0;
 		__page_indicator_unit_rotate(page_indicator->unit[i], angle, color);
@@ -293,6 +292,9 @@ static void __page_indicator_unit_clicked_cb(void *data, Evas_Object *obj, const
 			break;
 		}
 	}
+
+	int unit_count = page_indicator->page_count <= PAGE_INDICATOR_MAX_PAGE_COUNT ? page_indicator->page_count : PAGE_INDICATOR_MAX_PAGE_COUNT;
+	clicked_indicator_unit = MIRRORING_X(clicked_indicator_unit, unit_count - 1);
 	LOGD("UNIT CLICKED : %dth", clicked_indicator_unit);
 
 	if (page_indicator->page_count > PAGE_INDICATOR_MAX_PAGE_COUNT) {
-- 
2.7.4


From 67da30fefc89c8cd9c9bec97383495f531bcb6ef Mon Sep 17 00:00:00 2001
From: YoungHun Cho <hoon.cho@samsung.com>
Date: Tue, 20 Dec 2016 13:59:02 +0900
Subject: [PATCH 08/16] loop set FALSE && indicator unit angle

Change-Id: Ib590851021caefdba3d6275d3ecc3a27aecefcca
---
 .cproject            |  8 +++++---
 inc/conf.h           |  2 ++
 src/apps_view.c      |  6 +-----
 src/cluster_view.c   |  6 +-----
 src/conf.c           |  8 ++++++++
 src/page_indicator.c | 46 ++++++++++++++++++++++++----------------------
 6 files changed, 41 insertions(+), 35 deletions(-)

diff --git a/.cproject b/.cproject
index 3e8bb33..9036413 100755
--- a/.cproject
+++ b/.cproject
@@ -27,7 +27,7 @@
 								<option defaultValue="gnu.cpp.compiler.debugging.level.max" id="sbi.gnu.cpp.compiler.option.debugging.level.core.481743771" name="Debug level" superClass="sbi.gnu.cpp.compiler.option.debugging.level.core" valueType="enumerated"/>
 								<option defaultValue="false" id="sbi.gnu.cpp.compiler.option.misc.pic.core.2102599528" name="-fPIC option" superClass="sbi.gnu.cpp.compiler.option.misc.pic.core" valueType="boolean"/>
 								<option id="sbi.gnu.cpp.compiler.option.1070320025" name="Tizen-Target" superClass="sbi.gnu.cpp.compiler.option" valueType="userObjs">
-									<listOptionValue builtIn="false" value="mobile-3.0-device.core_llvm37.armel.core.app"/>
+									<listOptionValue builtIn="false" value="mobile-3.0-device.core.public.20161129_1_llvm37.armel.core.app"/>
 								</option>
 								<option id="sbi.gnu.cpp.compiler.option.frameworks_inc.core.312288874" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.cpp.compiler.option.frameworks_inc.core" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/libxml2&quot;"/>
@@ -131,6 +131,7 @@
 									<listOptionValue builtIn="false" value="${RS_COMPILER_MISC}"/>
 									<listOptionValue builtIn="false" value=" -fPIE"/>
 									<listOptionValue builtIn="false" value="--sysroot=&quot;${SBI_SYSROOT}&quot;"/>
+									<listOptionValue builtIn="false" value="-mthumb"/>
 								</option>
 								<option id="gnu.cpp.compiler.option.include.paths.1857385470" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/inc}&quot;"/>
@@ -145,7 +146,7 @@
 								<option defaultValue="gnu.c.debugging.level.max" id="sbi.gnu.c.compiler.option.debugging.level.core.247638963" name="Debug level" superClass="sbi.gnu.c.compiler.option.debugging.level.core" valueType="enumerated"/>
 								<option defaultValue="false" id="sbi.gnu.c.compiler.option.misc.pic.core.982331969" name="-fPIC option" superClass="sbi.gnu.c.compiler.option.misc.pic.core" valueType="boolean"/>
 								<option id="sbi.gnu.c.compiler.option.1644890019" name="Tizen-Target" superClass="sbi.gnu.c.compiler.option" valueType="userObjs">
-									<listOptionValue builtIn="false" value="mobile-3.0-device.core_llvm37.armel.core.app"/>
+									<listOptionValue builtIn="false" value="mobile-3.0-device.core.public.20161129_1_llvm37.armel.core.app"/>
 								</option>
 								<option id="sbi.gnu.c.compiler.option.frameworks_inc.core.1483034184" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.c.compiler.option.frameworks_inc.core" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/libxml2&quot;"/>
@@ -249,6 +250,7 @@
 									<listOptionValue builtIn="false" value="${RS_COMPILER_MISC}"/>
 									<listOptionValue builtIn="false" value=" -fPIE"/>
 									<listOptionValue builtIn="false" value="--sysroot=&quot;${SBI_SYSROOT}&quot;"/>
+									<listOptionValue builtIn="false" value="-mthumb"/>
 								</option>
 								<option id="gnu.c.compiler.option.include.paths.1774757534" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/inc}&quot;"/>
@@ -279,7 +281,7 @@
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
 								</inputType>
 							</tool>
-							<tool command="i386-linux-gnueabi-as" id="org.tizen.nativeapp.tool.sbi.gnu.assembler.base.1815664769" name="Assembler" superClass="org.tizen.nativeapp.tool.sbi.gnu.assembler.base">
+							<tool command="arm-linux-gnueabi-as" id="org.tizen.nativeapp.tool.sbi.gnu.assembler.base.1815664769" name="Assembler" superClass="org.tizen.nativeapp.tool.sbi.gnu.assembler.base">
 								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.88475890" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
 							</tool>
 							<tool id="org.tizen.nativecore.tool.fnmapgen.304005350" name="C FN-Map Generator" superClass="org.tizen.nativecore.tool.fnmapgen"/>
diff --git a/inc/conf.h b/inc/conf.h
index 84ab1b9..eca7955 100755
--- a/inc/conf.h
+++ b/inc/conf.h
@@ -43,8 +43,10 @@ extern double __conf_get_resolution_scale_area();
 extern int __conf_get_window_h();
 extern int __conf_get_window_w();
 extern int __conf_get_mirroring_x(int x, int width);
+extern double __conf_get_mirroring_angle(double angle);
 
 #define MIRRORING_X(x, w) (__conf_get_mirroring_x((x), (w)))
+#define MIRRORING_ANGLE(angle) (__conf_get_mirroring_angle((angle)))
 
 #define INDICATOR_H ((45) * (__conf_get_resolution_scale_h()))
 
diff --git a/src/apps_view.c b/src/apps_view.c
index 250e4e5..1bfb041 100755
--- a/src/apps_view.c
+++ b/src/apps_view.c
@@ -641,7 +641,7 @@ static void __apps_view_create_base_gui(Evas_Object *win)
 	elm_scroller_page_scroll_limit_set(apps_view_s.scroller, 1, 1);
 	evas_object_size_hint_weight_set(apps_view_s.scroller, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
 
-	elm_scroller_loop_set(apps_view_s.scroller, EINA_TRUE, EINA_FALSE);
+	elm_scroller_loop_set(apps_view_s.scroller, EINA_FALSE, EINA_FALSE);
 	elm_scroller_page_size_set(apps_view_s.scroller, APPS_VIEW_W, APPS_VIEW_H);
 	evas_object_resize(apps_view_s.scroller, APPS_VIEW_W , APPS_VIEW_H);
 
@@ -713,8 +713,6 @@ static Evas_Object *__apps_view_add_page(void)
 	apps_view_s.page_count += 1;
 	page_indicator_set_page_count(apps_view_s.indicator, apps_view_s.page_count);
 
-	elm_scroller_loop_set(apps_view_s.scroller, apps_view_s.page_count > 1, EINA_FALSE);
-
 	return page_ly;
 }
 
@@ -745,8 +743,6 @@ static void __apps_view_remove_page(void)
 	page_indicator_set_page_count(apps_view_s.indicator, apps_view_s.page_count);
 #endif
 	evas_object_del(item);
-
-	elm_scroller_loop_set(apps_view_s.scroller, apps_view_s.page_count > 1, EINA_FALSE);
 }
 
 static void __apps_view_fill_apps(void *data, Ecore_Thread *th)
diff --git a/src/cluster_view.c b/src/cluster_view.c
index 1ee29b4..2269d18 100755
--- a/src/cluster_view.c
+++ b/src/cluster_view.c
@@ -231,7 +231,7 @@ Evas_Object *__cluster_view_create_base_gui(Evas_Object *win)
 	evas_object_size_hint_weight_set(cluster_view_s.scroller, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
 	evas_object_resize(cluster_view_s.scroller, CLUSTER_VIEW_W, CLUSTER_VIEW_H);
 
-	elm_scroller_loop_set(cluster_view_s.scroller, EINA_TRUE, EINA_FALSE);
+	elm_scroller_loop_set(cluster_view_s.scroller, EINA_FALSE, EINA_FALSE);
 	elm_scroller_page_size_set(cluster_view_s.scroller, CLUSTER_VIEW_W , CLUSTER_VIEW_H);
 
 	evas_object_event_callback_add(cluster_view_s.scroller, EVAS_CALLBACK_MOUSE_DOWN, __clsuter_view_scroller_down_cb, NULL);
@@ -931,8 +931,6 @@ static cluster_page_t *__cluster_view_page_new(void)
 
 	page_indicator_set_page_count(cluster_view_s.indicator, cluster_view_s.page_count);
 
-	elm_scroller_loop_set(cluster_view_s.scroller, cluster_view_s.page_count > 1, EINA_FALSE);
-
 	return page_t;
 }
 
@@ -954,8 +952,6 @@ static void __cluster_view_page_delete(cluster_page_t *page)
 
 	cluster_data_set_page_count(cluster_view_s.page_count);
 	page_indicator_set_page_count(cluster_view_s.indicator, cluster_view_s.page_count);
-
-	elm_scroller_loop_set(cluster_view_s.scroller, cluster_view_s.page_count > 1, EINA_FALSE);
 }
 
 static void __cluster_view_allpage_delete_clicked(void *data, Evas_Object *obj, const char *emission, const char *source)
diff --git a/src/conf.c b/src/conf.c
index 128b4b8..bca57f7 100755
--- a/src/conf.c
+++ b/src/conf.c
@@ -58,6 +58,14 @@ int __conf_get_mirroring_x(int x, int width)
 	return x;
 }
 
+double __conf_get_mirroring_angle(double angle)
+{
+	if (elm_config_mirrored_get())
+		return - angle;
+
+	return angle;
+}
+
 void conf_set_resolution_scale(int win_width, int win_height)
 {
 	window_h = win_height;
diff --git a/src/page_indicator.c b/src/page_indicator.c
index 6c5685d..e2e7118 100755
--- a/src/page_indicator.c
+++ b/src/page_indicator.c
@@ -180,6 +180,11 @@ static int __page_indicator_get_indicator_unit(int page_count, int page)
 	return indicator;
 }
 
+/**
+ * @brief Set the angle of page indicator units.
+ *
+ * @note This function is run without considering the scrolling on a loop.
+ */
 static void __page_indicator_scroll_cb(void *data, Evas_Object *obj, void *event_info)
 {
 	page_indicator_t *page_indicator = (page_indicator_t*) data;
@@ -193,38 +198,32 @@ static void __page_indicator_scroll_cb(void *data, Evas_Object *obj, void *event
 	elm_scroller_region_get(obj, &cur_x, NULL, &page_size, NULL);
 
 	int scroller_width = page_size * page_indicator->page_count;
-	int cur_page_x = page_indicator->current_page * page_size;
-
 	cur_x = MIRRORING_X(cur_x + page_size / 2, scroller_width) - page_size / 2;
 
-	int delta_x = cur_x - cur_page_x;
-	if (delta_x < -page_size)
-		delta_x = delta_x + scroller_width;
-	else if (delta_x > page_size)
-		delta_x = delta_x - scroller_width;
-
-	int cur_page = page_indicator->current_page;
-	int next_page = (cur_page + 1) % page_indicator->page_count;
-	if (delta_x < 0) {
-		delta_x = (delta_x - scroller_width) % scroller_width;
-		next_page = ((cur_page - 1) + page_indicator->page_count) % page_indicator->page_count;
-	}
+	int prev_page = cur_x / page_size;
+	int next_page = prev_page + 1;
 
-	int cur_indicator_unit = __page_indicator_get_indicator_unit(page_indicator->page_count, cur_page);
-	int next_indicator_unit = __page_indicator_get_indicator_unit(page_indicator->page_count, next_page);
+	int prev_delta_x = cur_x - (prev_page * page_size);
+	int next_delta_x = cur_x - (next_page * page_size);
 
-	double angle_delta = (double)delta_x / page_size * 90.0;
+	int prev_unit = __page_indicator_get_indicator_unit(page_indicator->page_count, prev_page);
+	int next_unit = __page_indicator_get_indicator_unit(page_indicator->page_count, next_page);
+
+	double prev_unit_angle = ((double)prev_delta_x / page_size) * 90.0 - 90.0;
+	double next_unit_angle = 90.0 + ((double)next_delta_x / page_size) * 90.0;
+
+	prev_unit_angle = MIRRORING_ANGLE(prev_unit_angle);
+	next_unit_angle = MIRRORING_ANGLE(next_unit_angle);
 
 	int i = 0;
 	int max_unit_count = page_indicator->page_count < PAGE_INDICATOR_MAX_PAGE_COUNT ? page_indicator->page_count : PAGE_INDICATOR_MAX_PAGE_COUNT;
 	for (i = 0; i < max_unit_count; i++)
 	{
 		double angle = 0.0;
-		if (i == cur_indicator_unit || i == next_indicator_unit) {
-			angle = page_indicator->unit_angle[i] + angle_delta;
-			if (angle > 90.0)
-				angle -= 180.0;
-		}
+		if (i == prev_unit)
+			angle = prev_unit_angle;
+		else if (i == next_unit)
+			angle = next_unit_angle;
 
 		double color = fabs(angle) * 2 + 75.0;
 		__page_indicator_unit_rotate(page_indicator->unit[i], angle, color);
@@ -293,6 +292,9 @@ static void __page_indicator_unit_clicked_cb(void *data, Evas_Object *obj, const
 			break;
 		}
 	}
+
+	int unit_count = page_indicator->page_count <= PAGE_INDICATOR_MAX_PAGE_COUNT ? page_indicator->page_count : PAGE_INDICATOR_MAX_PAGE_COUNT;
+	clicked_indicator_unit = MIRRORING_X(clicked_indicator_unit, unit_count - 1);
 	LOGD("UNIT CLICKED : %dth", clicked_indicator_unit);
 
 	if (page_indicator->page_count > PAGE_INDICATOR_MAX_PAGE_COUNT) {
-- 
2.7.4


From 100669f33b922d1d01173be455a7d80680b5040e Mon Sep 17 00:00:00 2001
From: YoungHun Cho <hoon.cho@samsung.com>
Date: Mon, 26 Dec 2016 10:54:09 +0900
Subject: [PATCH 09/16] delete resume_app for [TSAM - 12070] [TSAM - 12065]

Change-Id: I99b75d05933e4712014baa55bc210192aaaa932f
Signed-off-by: YoungHun Cho <hoon.cho@samsung.com>
---
 .cproject         | 28 ++++++++++++++--------------
 Build/basedef.mk  |  2 +-
 Build/funcs.mk    |  2 +-
 Build/makefile    |  2 +-
 Build/makefile.mk | 12 ++++++------
 project_def.prop  |  4 ++--
 src/apps_view.c   | 17 -----------------
 7 files changed, 25 insertions(+), 42 deletions(-)

diff --git a/.cproject b/.cproject
index 9036413..e307377 100755
--- a/.cproject
+++ b/.cproject
@@ -27,11 +27,17 @@
 								<option defaultValue="gnu.cpp.compiler.debugging.level.max" id="sbi.gnu.cpp.compiler.option.debugging.level.core.481743771" name="Debug level" superClass="sbi.gnu.cpp.compiler.option.debugging.level.core" valueType="enumerated"/>
 								<option defaultValue="false" id="sbi.gnu.cpp.compiler.option.misc.pic.core.2102599528" name="-fPIC option" superClass="sbi.gnu.cpp.compiler.option.misc.pic.core" valueType="boolean"/>
 								<option id="sbi.gnu.cpp.compiler.option.1070320025" name="Tizen-Target" superClass="sbi.gnu.cpp.compiler.option" valueType="userObjs">
-									<listOptionValue builtIn="false" value="mobile-3.0-device.core.public.20161129_1_llvm37.armel.core.app"/>
+									<listOptionValue builtIn="false" value="mobile-3.0-device.core_llvm37.armel.core.app"/>
 								</option>
 								<option id="sbi.gnu.cpp.compiler.option.frameworks_inc.core.312288874" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.cpp.compiler.option.frameworks_inc.core" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/libxml2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/EGL&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES2&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES3&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/KHR&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore-agent&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appfw&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/attach-panel&quot;"/>
@@ -68,7 +74,6 @@
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/efl-1&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/efl-extension&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/efreet-1&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/EGL&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eina-1&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eina-1/eina&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eio-1&quot;"/>
@@ -86,14 +91,10 @@
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/freetype2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/geofence&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/gio-unix-2.0&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES2&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES3&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/glib-2.0&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/harfbuzz&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/iotcon&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/json-glib-1.0&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/KHR&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/location&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/maps&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/media&quot;"/>
@@ -106,7 +107,6 @@
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/notification&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/nsd/&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/phonenumber-utils&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/sensor&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/service-adaptor&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/shortcut&quot;"/>
@@ -146,11 +146,17 @@
 								<option defaultValue="gnu.c.debugging.level.max" id="sbi.gnu.c.compiler.option.debugging.level.core.247638963" name="Debug level" superClass="sbi.gnu.c.compiler.option.debugging.level.core" valueType="enumerated"/>
 								<option defaultValue="false" id="sbi.gnu.c.compiler.option.misc.pic.core.982331969" name="-fPIC option" superClass="sbi.gnu.c.compiler.option.misc.pic.core" valueType="boolean"/>
 								<option id="sbi.gnu.c.compiler.option.1644890019" name="Tizen-Target" superClass="sbi.gnu.c.compiler.option" valueType="userObjs">
-									<listOptionValue builtIn="false" value="mobile-3.0-device.core.public.20161129_1_llvm37.armel.core.app"/>
+									<listOptionValue builtIn="false" value="mobile-3.0-device.core_llvm37.armel.core.app"/>
 								</option>
 								<option id="sbi.gnu.c.compiler.option.frameworks_inc.core.1483034184" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.c.compiler.option.frameworks_inc.core" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/libxml2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/EGL&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES2&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES3&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/KHR&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore-agent&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appfw&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/attach-panel&quot;"/>
@@ -187,7 +193,6 @@
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/efl-1&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/efl-extension&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/efreet-1&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/EGL&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eina-1&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eina-1/eina&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eio-1&quot;"/>
@@ -205,14 +210,10 @@
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/freetype2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/geofence&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/gio-unix-2.0&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES2&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES3&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/glib-2.0&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/harfbuzz&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/iotcon&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/json-glib-1.0&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/KHR&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/location&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/maps&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/media&quot;"/>
@@ -225,7 +226,6 @@
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/notification&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/nsd/&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/phonenumber-utils&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/sensor&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/service-adaptor&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/shortcut&quot;"/>
diff --git a/Build/basedef.mk b/Build/basedef.mk
index 64fbf82..a762983 100755
--- a/Build/basedef.mk
+++ b/Build/basedef.mk
@@ -22,7 +22,7 @@ PROJ_PATH ?= $(PROJPATH)
 #endif
 
 #ifeq ($(strip $(OUTPUT_DIR)),)
-OUTPUT_DIR ?= $(PROJ_PATH)/$(BUILD_CONFIG)
+#OUTPUT_DIR ?= $(PROJ_PATH)/$(BUILD_CONFIG)
 #endif
 
 #ifeq ($(strip $(BUILD_ARCH)),)
diff --git a/Build/funcs.mk b/Build/funcs.mk
index 8297d18..3ba778b 100644
--- a/Build/funcs.mk
+++ b/Build/funcs.mk
@@ -45,6 +45,6 @@ CONVERT_4MAKE_TO_OUT = $(subst $(DOTDOT),$(DOTDOT_OUT),$(subst $(COLON),$(COLON_
 PROC_NO_EXIST = $(if $(wildcard $(1)),,$(call $(2),$(1)))
 define MAKEDIRS0
 	@echo '  Building directory: $(1)'
-	@$(MKDIR) $(MKDIR_OP) $(subst $(BSLASH),/,$(1))	
+	@$(MKDIR) $(MKDIR_OP) $(subst $(BSLASH),/,$(1))
 endef
 MAKEDIRS = $(call PROC_NO_EXIST,$(1),MAKEDIRS0)
diff --git a/Build/makefile b/Build/makefile
index 9348c50..f491b50 100755
--- a/Build/makefile
+++ b/Build/makefile
@@ -24,7 +24,7 @@ endif
 
 app_build :
 	@echo $(MAKE) -f "$(BUILD_ROOT)/makefile.mk"
-	@$(MAKE) -f "$(BUILD_ROOT)/makefile.mk" -C "$(PROJ_PATH)" $(OPTIONS)
+	@$(MAKE_BIN) -f "$(BUILD_ROOT)/makefile.mk" -C "$(PROJ_PATH)" $(OPTIONS)
 
 app_clean :
 	@$(MAKE) -f "$(BUILD_ROOT)/makefile.mk" -C "$(PROJ_PATH)" $(OPTIONS) clean
diff --git a/Build/makefile.mk b/Build/makefile.mk
index c95b4b4..205a3ad 100644
--- a/Build/makefile.mk
+++ b/Build/makefile.mk
@@ -65,8 +65,8 @@ ifeq ($(strip $(APPTYPE)),sharedLib)
 EXT_OP := -fPIC
 endif
 
-C_OPT := $(COMPILE_FLAGS) $(TC_COMPILER_MISC) $(RS_COMPILER_MISC) $(EXT_OP) --sysroot="$(SYSROOT)" -Werror-implicit-function-declaration $(M_OPT)
-CPP_OPT := $(CPP_COMPILE_FLAGS) $(TC_COMPILER_MISC) $(RS_COMPILER_MISC) $(EXT_OP) --sysroot="$(SYSROOT)" -Werror-implicit-function-declaration $(M_OPT)
+C_OPT := $(COMPILE_FLAGS) $(TC_COMPILER_MISC) $(RS_COMPILER_MISC) $(EXT_OP) --sysroot="$(SYSROOT)" -Werror-implicit-function-declaration $(M_OPT) $(USER_C_OPTS)
+CPP_OPT := $(CPP_COMPILE_FLAGS) $(TC_COMPILER_MISC) $(RS_COMPILER_MISC) $(EXT_OP) --sysroot="$(SYSROOT)" -Werror-implicit-function-declaration $(M_OPT) $(USER_CPP_OPTS)
 C_OPT_FILE := $(PLATFORM_INCS_FILE)
 
 OBJS := #
@@ -81,7 +81,7 @@ $(foreach ext,cpp cxx cc c++ C,$(eval $(call C_PROC_RAW,$(OBJ_OUTPUT),$(USER_SRC
 # Individual C/C++
 ifneq ($(strip $(USER_EXT_C_KEYS)),)
 $(foreach var,$(USER_EXT_C_KEYS),$(eval $(call C_PROC_RAW,$(OBJ_OUTPUT),$(USER_EXT_$(var)_SRCS),$(USER_EXT_$(var)_INC_DIRS),$(USER_EXT_$(var)_INC_FILES),$(USER_EXT_$(var)_DEFS),$(USER_EXT_$(var)_UNDEFS),$(C_OPT),$(C_OPT_FILE),C,c,$(CC),OBJS)))
-$(foreach ext,cpp cxx cc c++ C,$(foreach var,$(USER_EXT_C_KEYS),$(eval $(call C_PROC_RAW,$(OBJ_OUTPUT),$(USER_EXT_$(var)_SRCS),$(USER_EXT_$(var)_INC_DIRS),$(USER_EXT_$(var)_CPP_INC_FILES),$(USER_EXT_$(var)_CPP_DEFS),$(USER_EXT_$(var)_CPP_UNDEFS),$(C_OPT),$(C_OPT_FILE),C++,$(ext),$(CXX),OBJS))))
+$(foreach ext,cpp cxx cc c++ C,$(foreach var,$(USER_EXT_C_KEYS),$(eval $(call C_PROC_RAW,$(OBJ_OUTPUT),$(USER_EXT_$(var)_SRCS),$(USER_EXT_$(var)_INC_DIRS),$(USER_EXT_$(var)_CPP_INC_FILES),$(USER_EXT_$(var)_CPP_DEFS),$(USER_EXT_$(var)_CPP_UNDEFS),$(CPP_OPT),$(C_OPT_FILE),C++,$(ext),$(CXX),OBJS))))
 endif
 
 
@@ -109,7 +109,7 @@ $(APPFILE) : $(OBJS) $(UOBJS)
 	@echo '  Building target: $@'
 	@echo '  Invoking: C/C++ Linker'
 	$(call MAKEDIRS,$(@D))
-	$(CXX) -o $(APPFILE) $(OBJS) $(UOBJS) $(LIBPATHS) -Xlinker --as-needed $(LIBS) $(LINK_FLAGS) $(TC_LINKER_MISC) $(RS_LINKER_MISC) -pie -lpthread --sysroot="$(SYSROOT)" -Xlinker --version-script="$(PROJ_ROOT)/.exportMap" $(RS_LIB_PATHS) $(RS_LIBRARIES) -Xlinker -rpath="/opt/usr/apps/$(APPID)/lib" -Werror-implicit-function-declaration
+	$(CXX) -o $(APPFILE) $(OBJS) $(UOBJS) $(LIBPATHS) -Xlinker --as-needed $(LIBS) $(LINK_FLAGS) $(TC_LINKER_MISC) $(RS_LINKER_MISC) -pie -lpthread --sysroot="$(SYSROOT)" -Xlinker --version-script="$(PROJ_ROOT)/.exportMap" $(RS_LIB_PATHS) $(RS_LIBRARIES) -Xlinker -rpath="/opt/usr/apps/$(APPID)/lib" -Werror-implicit-function-declaration $(USER_LINK_OPTS)
 	@echo '  Finished building target: $@'
 endif
 ifeq ($(strip $(APPTYPE)),staticLib)
@@ -117,7 +117,7 @@ $(APPFILE) : $(OBJS) $(UOBJS)
 	@echo '  Building target: $@'
 	@echo '  Invoking: Archive utility'
 	$(call MAKEDIRS,$(@D))
-	$(AR) -r $(APPFILE) $(OBJS) $(UOBJS) $(AR_FLAGS)
+	$(AR) -r $(APPFILE) $(OBJS) $(UOBJS) $(AR_FLAGS) $(USER_LINK_OPTS)
 	@echo '  Finished building target: $@'
 endif
 ifeq ($(strip $(APPTYPE)),sharedLib)
@@ -125,7 +125,7 @@ $(APPFILE) : $(OBJS) $(UOBJS)
 	@echo '  Building target: $@'
 	@echo '  Invoking: C/C++ Linker'
 	$(call MAKEDIRS,$(@D))
-	$(CXX) -o $(APPFILE) $(OBJS) $(UOBJS) $(LIBPATHS) -Xlinker --as-needed $(LIBS) $(LINK_FLAGS) $(TC_LINKER_MISC) $(RS_LINKER_MISC) -shared -lpthread --sysroot="$(SYSROOT)" $(RS_LIB_PATHS) $(RS_LIBRARIES)
+	$(CXX) -o $(APPFILE) $(OBJS) $(UOBJS) $(LIBPATHS) -Xlinker --as-needed $(LIBS) $(LINK_FLAGS) $(TC_LINKER_MISC) $(RS_LINKER_MISC) -shared -lpthread --sysroot="$(SYSROOT)" $(RS_LIB_PATHS) $(RS_LIBRARIES) $(USER_LINK_OPTS)
 	@echo '  Finished building target: $@'
 endif
 
diff --git a/project_def.prop b/project_def.prop
index a027382..3a80800 100755
--- a/project_def.prop
+++ b/project_def.prop
@@ -18,7 +18,7 @@ USER_EDCS =
 USER_POS = res/po/ca.po res/po/fr.po res/po/nl.po res/po/pt_BR.po res/po/sk.po res/po/sv.po res/po/uz.po res/po/ko_KR.po res/po/is.po res/po/ka.po res/po/ro.po res/po/it_IT.po res/po/en_PH.po res/po/lt.po res/po/mk.po res/po/nb.po res/po/ru_RU.po res/po/el_GR.po res/po/zh_TW.po res/po/az.po res/po/hr.po res/po/uk.po res/po/zh_CN.po res/po/de.po res/po/es_US.po res/po/eu.po res/po/kk.po res/po/sl.po res/po/et.po res/po/fr_CA.po res/po/ga.po res/po/gl.po res/po/hy.po res/po/lv.po res/po/ja_JP.po res/po/es_ES.po res/po/bg.po res/po/cs.po res/po/pl.po res/po/pt_PT.po res/po/sr.po res/po/hu.po res/po/ar.po res/po/en_US.po res/po/fi.po res/po/da.po res/po/en.po res/po/zh_HK.po res/po/tr_TR.po 
 
 # User Defines
-USER_DEFS = 
+USER_DEFS = TIZEN_DEPRECATION DEPRECATION_WARNING 
 USER_CPP_DEFS = 
 
 # User Undefines
@@ -59,5 +59,5 @@ USER_EXT_EDC0_EDCS_FONT_DIRS = ${OUTPUT_DIR} edje/fonts
 
 # Resource Filter
 USER_RES_INCLUDE = 
-USER_RES_EXCLUDE = 
+USER_RES_EXCLUDE = Debug/homescreen-efl 
 
diff --git a/src/apps_view.c b/src/apps_view.c
index 1bfb041..456ab80 100755
--- a/src/apps_view.c
+++ b/src/apps_view.c
@@ -815,23 +815,6 @@ static void __apps_view_icon_clicked_cb(void *data, Evas_Object *obj, const char
 		goto __ret;
 	}
 
-	bool is_running = false;
-	if (app_manager_is_running(item->app_id, &is_running) == APP_MANAGER_ERROR_NONE) {
-		if (is_running) {
-			LOGD("%s app is running", item->app_id);
-
-			app_context_h context = NULL;
-			if (app_manager_get_app_context(item->app_id, &context) == APP_MANAGER_ERROR_NONE &&
-					app_manager_resume_app(context) == APP_MANAGER_ERROR_NONE) {
-				app_context_destroy(context);
-				goto __ret;
-			}
-
-			LOGE("[FAILED][app_manager_resume_app]");
-			if (context) app_context_destroy(context);
-		}
-	}
-
 	if (app_control_send_launch_request(app_control_handle, NULL, NULL) != APP_CONTROL_ERROR_NONE) {
 		LOGE("[FAILED][app_control_send_launch_request]");
 		goto __ret;
-- 
2.7.4


From 9827a55379061c7e47585208dc49bf250285af96 Mon Sep 17 00:00:00 2001
From: YoungHun Cho <hoon.cho@samsung.com>
Date: Mon, 26 Dec 2016 10:54:09 +0900
Subject: [PATCH 10/16] delete resume_app for [TSAM - 12070] [TSAM - 12065]

Change-Id: I99b75d05933e4712014baa55bc210192aaaa932f
Signed-off-by: YoungHun Cho <hoon.cho@samsung.com>
---
 .cproject         | 28 ++++++++++++++--------------
 Build/basedef.mk  |  2 +-
 Build/funcs.mk    |  2 +-
 Build/makefile    |  2 +-
 Build/makefile.mk | 12 ++++++------
 project_def.prop  |  4 ++--
 src/apps_view.c   | 17 -----------------
 7 files changed, 25 insertions(+), 42 deletions(-)

diff --git a/.cproject b/.cproject
index 9036413..e307377 100755
--- a/.cproject
+++ b/.cproject
@@ -27,11 +27,17 @@
 								<option defaultValue="gnu.cpp.compiler.debugging.level.max" id="sbi.gnu.cpp.compiler.option.debugging.level.core.481743771" name="Debug level" superClass="sbi.gnu.cpp.compiler.option.debugging.level.core" valueType="enumerated"/>
 								<option defaultValue="false" id="sbi.gnu.cpp.compiler.option.misc.pic.core.2102599528" name="-fPIC option" superClass="sbi.gnu.cpp.compiler.option.misc.pic.core" valueType="boolean"/>
 								<option id="sbi.gnu.cpp.compiler.option.1070320025" name="Tizen-Target" superClass="sbi.gnu.cpp.compiler.option" valueType="userObjs">
-									<listOptionValue builtIn="false" value="mobile-3.0-device.core.public.20161129_1_llvm37.armel.core.app"/>
+									<listOptionValue builtIn="false" value="mobile-3.0-device.core_llvm37.armel.core.app"/>
 								</option>
 								<option id="sbi.gnu.cpp.compiler.option.frameworks_inc.core.312288874" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.cpp.compiler.option.frameworks_inc.core" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/libxml2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/EGL&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES2&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES3&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/KHR&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore-agent&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appfw&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/attach-panel&quot;"/>
@@ -68,7 +74,6 @@
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/efl-1&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/efl-extension&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/efreet-1&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/EGL&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eina-1&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eina-1/eina&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eio-1&quot;"/>
@@ -86,14 +91,10 @@
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/freetype2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/geofence&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/gio-unix-2.0&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES2&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES3&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/glib-2.0&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/harfbuzz&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/iotcon&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/json-glib-1.0&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/KHR&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/location&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/maps&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/media&quot;"/>
@@ -106,7 +107,6 @@
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/notification&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/nsd/&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/phonenumber-utils&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/sensor&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/service-adaptor&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/shortcut&quot;"/>
@@ -146,11 +146,17 @@
 								<option defaultValue="gnu.c.debugging.level.max" id="sbi.gnu.c.compiler.option.debugging.level.core.247638963" name="Debug level" superClass="sbi.gnu.c.compiler.option.debugging.level.core" valueType="enumerated"/>
 								<option defaultValue="false" id="sbi.gnu.c.compiler.option.misc.pic.core.982331969" name="-fPIC option" superClass="sbi.gnu.c.compiler.option.misc.pic.core" valueType="boolean"/>
 								<option id="sbi.gnu.c.compiler.option.1644890019" name="Tizen-Target" superClass="sbi.gnu.c.compiler.option" valueType="userObjs">
-									<listOptionValue builtIn="false" value="mobile-3.0-device.core.public.20161129_1_llvm37.armel.core.app"/>
+									<listOptionValue builtIn="false" value="mobile-3.0-device.core_llvm37.armel.core.app"/>
 								</option>
 								<option id="sbi.gnu.c.compiler.option.frameworks_inc.core.1483034184" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.c.compiler.option.frameworks_inc.core" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/libxml2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/EGL&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES2&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES3&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/KHR&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore-agent&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appfw&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/attach-panel&quot;"/>
@@ -187,7 +193,6 @@
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/efl-1&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/efl-extension&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/efreet-1&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/EGL&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eina-1&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eina-1/eina&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eio-1&quot;"/>
@@ -205,14 +210,10 @@
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/freetype2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/geofence&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/gio-unix-2.0&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES2&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES3&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/glib-2.0&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/harfbuzz&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/iotcon&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/json-glib-1.0&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/KHR&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/location&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/maps&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/media&quot;"/>
@@ -225,7 +226,6 @@
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/notification&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/nsd/&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/phonenumber-utils&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/sensor&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/service-adaptor&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/shortcut&quot;"/>
diff --git a/Build/basedef.mk b/Build/basedef.mk
index 64fbf82..a762983 100755
--- a/Build/basedef.mk
+++ b/Build/basedef.mk
@@ -22,7 +22,7 @@ PROJ_PATH ?= $(PROJPATH)
 #endif
 
 #ifeq ($(strip $(OUTPUT_DIR)),)
-OUTPUT_DIR ?= $(PROJ_PATH)/$(BUILD_CONFIG)
+#OUTPUT_DIR ?= $(PROJ_PATH)/$(BUILD_CONFIG)
 #endif
 
 #ifeq ($(strip $(BUILD_ARCH)),)
diff --git a/Build/funcs.mk b/Build/funcs.mk
index 8297d18..3ba778b 100644
--- a/Build/funcs.mk
+++ b/Build/funcs.mk
@@ -45,6 +45,6 @@ CONVERT_4MAKE_TO_OUT = $(subst $(DOTDOT),$(DOTDOT_OUT),$(subst $(COLON),$(COLON_
 PROC_NO_EXIST = $(if $(wildcard $(1)),,$(call $(2),$(1)))
 define MAKEDIRS0
 	@echo '  Building directory: $(1)'
-	@$(MKDIR) $(MKDIR_OP) $(subst $(BSLASH),/,$(1))	
+	@$(MKDIR) $(MKDIR_OP) $(subst $(BSLASH),/,$(1))
 endef
 MAKEDIRS = $(call PROC_NO_EXIST,$(1),MAKEDIRS0)
diff --git a/Build/makefile b/Build/makefile
index 9348c50..f491b50 100755
--- a/Build/makefile
+++ b/Build/makefile
@@ -24,7 +24,7 @@ endif
 
 app_build :
 	@echo $(MAKE) -f "$(BUILD_ROOT)/makefile.mk"
-	@$(MAKE) -f "$(BUILD_ROOT)/makefile.mk" -C "$(PROJ_PATH)" $(OPTIONS)
+	@$(MAKE_BIN) -f "$(BUILD_ROOT)/makefile.mk" -C "$(PROJ_PATH)" $(OPTIONS)
 
 app_clean :
 	@$(MAKE) -f "$(BUILD_ROOT)/makefile.mk" -C "$(PROJ_PATH)" $(OPTIONS) clean
diff --git a/Build/makefile.mk b/Build/makefile.mk
index c95b4b4..205a3ad 100644
--- a/Build/makefile.mk
+++ b/Build/makefile.mk
@@ -65,8 +65,8 @@ ifeq ($(strip $(APPTYPE)),sharedLib)
 EXT_OP := -fPIC
 endif
 
-C_OPT := $(COMPILE_FLAGS) $(TC_COMPILER_MISC) $(RS_COMPILER_MISC) $(EXT_OP) --sysroot="$(SYSROOT)" -Werror-implicit-function-declaration $(M_OPT)
-CPP_OPT := $(CPP_COMPILE_FLAGS) $(TC_COMPILER_MISC) $(RS_COMPILER_MISC) $(EXT_OP) --sysroot="$(SYSROOT)" -Werror-implicit-function-declaration $(M_OPT)
+C_OPT := $(COMPILE_FLAGS) $(TC_COMPILER_MISC) $(RS_COMPILER_MISC) $(EXT_OP) --sysroot="$(SYSROOT)" -Werror-implicit-function-declaration $(M_OPT) $(USER_C_OPTS)
+CPP_OPT := $(CPP_COMPILE_FLAGS) $(TC_COMPILER_MISC) $(RS_COMPILER_MISC) $(EXT_OP) --sysroot="$(SYSROOT)" -Werror-implicit-function-declaration $(M_OPT) $(USER_CPP_OPTS)
 C_OPT_FILE := $(PLATFORM_INCS_FILE)
 
 OBJS := #
@@ -81,7 +81,7 @@ $(foreach ext,cpp cxx cc c++ C,$(eval $(call C_PROC_RAW,$(OBJ_OUTPUT),$(USER_SRC
 # Individual C/C++
 ifneq ($(strip $(USER_EXT_C_KEYS)),)
 $(foreach var,$(USER_EXT_C_KEYS),$(eval $(call C_PROC_RAW,$(OBJ_OUTPUT),$(USER_EXT_$(var)_SRCS),$(USER_EXT_$(var)_INC_DIRS),$(USER_EXT_$(var)_INC_FILES),$(USER_EXT_$(var)_DEFS),$(USER_EXT_$(var)_UNDEFS),$(C_OPT),$(C_OPT_FILE),C,c,$(CC),OBJS)))
-$(foreach ext,cpp cxx cc c++ C,$(foreach var,$(USER_EXT_C_KEYS),$(eval $(call C_PROC_RAW,$(OBJ_OUTPUT),$(USER_EXT_$(var)_SRCS),$(USER_EXT_$(var)_INC_DIRS),$(USER_EXT_$(var)_CPP_INC_FILES),$(USER_EXT_$(var)_CPP_DEFS),$(USER_EXT_$(var)_CPP_UNDEFS),$(C_OPT),$(C_OPT_FILE),C++,$(ext),$(CXX),OBJS))))
+$(foreach ext,cpp cxx cc c++ C,$(foreach var,$(USER_EXT_C_KEYS),$(eval $(call C_PROC_RAW,$(OBJ_OUTPUT),$(USER_EXT_$(var)_SRCS),$(USER_EXT_$(var)_INC_DIRS),$(USER_EXT_$(var)_CPP_INC_FILES),$(USER_EXT_$(var)_CPP_DEFS),$(USER_EXT_$(var)_CPP_UNDEFS),$(CPP_OPT),$(C_OPT_FILE),C++,$(ext),$(CXX),OBJS))))
 endif
 
 
@@ -109,7 +109,7 @@ $(APPFILE) : $(OBJS) $(UOBJS)
 	@echo '  Building target: $@'
 	@echo '  Invoking: C/C++ Linker'
 	$(call MAKEDIRS,$(@D))
-	$(CXX) -o $(APPFILE) $(OBJS) $(UOBJS) $(LIBPATHS) -Xlinker --as-needed $(LIBS) $(LINK_FLAGS) $(TC_LINKER_MISC) $(RS_LINKER_MISC) -pie -lpthread --sysroot="$(SYSROOT)" -Xlinker --version-script="$(PROJ_ROOT)/.exportMap" $(RS_LIB_PATHS) $(RS_LIBRARIES) -Xlinker -rpath="/opt/usr/apps/$(APPID)/lib" -Werror-implicit-function-declaration
+	$(CXX) -o $(APPFILE) $(OBJS) $(UOBJS) $(LIBPATHS) -Xlinker --as-needed $(LIBS) $(LINK_FLAGS) $(TC_LINKER_MISC) $(RS_LINKER_MISC) -pie -lpthread --sysroot="$(SYSROOT)" -Xlinker --version-script="$(PROJ_ROOT)/.exportMap" $(RS_LIB_PATHS) $(RS_LIBRARIES) -Xlinker -rpath="/opt/usr/apps/$(APPID)/lib" -Werror-implicit-function-declaration $(USER_LINK_OPTS)
 	@echo '  Finished building target: $@'
 endif
 ifeq ($(strip $(APPTYPE)),staticLib)
@@ -117,7 +117,7 @@ $(APPFILE) : $(OBJS) $(UOBJS)
 	@echo '  Building target: $@'
 	@echo '  Invoking: Archive utility'
 	$(call MAKEDIRS,$(@D))
-	$(AR) -r $(APPFILE) $(OBJS) $(UOBJS) $(AR_FLAGS)
+	$(AR) -r $(APPFILE) $(OBJS) $(UOBJS) $(AR_FLAGS) $(USER_LINK_OPTS)
 	@echo '  Finished building target: $@'
 endif
 ifeq ($(strip $(APPTYPE)),sharedLib)
@@ -125,7 +125,7 @@ $(APPFILE) : $(OBJS) $(UOBJS)
 	@echo '  Building target: $@'
 	@echo '  Invoking: C/C++ Linker'
 	$(call MAKEDIRS,$(@D))
-	$(CXX) -o $(APPFILE) $(OBJS) $(UOBJS) $(LIBPATHS) -Xlinker --as-needed $(LIBS) $(LINK_FLAGS) $(TC_LINKER_MISC) $(RS_LINKER_MISC) -shared -lpthread --sysroot="$(SYSROOT)" $(RS_LIB_PATHS) $(RS_LIBRARIES)
+	$(CXX) -o $(APPFILE) $(OBJS) $(UOBJS) $(LIBPATHS) -Xlinker --as-needed $(LIBS) $(LINK_FLAGS) $(TC_LINKER_MISC) $(RS_LINKER_MISC) -shared -lpthread --sysroot="$(SYSROOT)" $(RS_LIB_PATHS) $(RS_LIBRARIES) $(USER_LINK_OPTS)
 	@echo '  Finished building target: $@'
 endif
 
diff --git a/project_def.prop b/project_def.prop
index a027382..3a80800 100755
--- a/project_def.prop
+++ b/project_def.prop
@@ -18,7 +18,7 @@ USER_EDCS =
 USER_POS = res/po/ca.po res/po/fr.po res/po/nl.po res/po/pt_BR.po res/po/sk.po res/po/sv.po res/po/uz.po res/po/ko_KR.po res/po/is.po res/po/ka.po res/po/ro.po res/po/it_IT.po res/po/en_PH.po res/po/lt.po res/po/mk.po res/po/nb.po res/po/ru_RU.po res/po/el_GR.po res/po/zh_TW.po res/po/az.po res/po/hr.po res/po/uk.po res/po/zh_CN.po res/po/de.po res/po/es_US.po res/po/eu.po res/po/kk.po res/po/sl.po res/po/et.po res/po/fr_CA.po res/po/ga.po res/po/gl.po res/po/hy.po res/po/lv.po res/po/ja_JP.po res/po/es_ES.po res/po/bg.po res/po/cs.po res/po/pl.po res/po/pt_PT.po res/po/sr.po res/po/hu.po res/po/ar.po res/po/en_US.po res/po/fi.po res/po/da.po res/po/en.po res/po/zh_HK.po res/po/tr_TR.po 
 
 # User Defines
-USER_DEFS = 
+USER_DEFS = TIZEN_DEPRECATION DEPRECATION_WARNING 
 USER_CPP_DEFS = 
 
 # User Undefines
@@ -59,5 +59,5 @@ USER_EXT_EDC0_EDCS_FONT_DIRS = ${OUTPUT_DIR} edje/fonts
 
 # Resource Filter
 USER_RES_INCLUDE = 
-USER_RES_EXCLUDE = 
+USER_RES_EXCLUDE = Debug/homescreen-efl 
 
diff --git a/src/apps_view.c b/src/apps_view.c
index 1bfb041..456ab80 100755
--- a/src/apps_view.c
+++ b/src/apps_view.c
@@ -815,23 +815,6 @@ static void __apps_view_icon_clicked_cb(void *data, Evas_Object *obj, const char
 		goto __ret;
 	}
 
-	bool is_running = false;
-	if (app_manager_is_running(item->app_id, &is_running) == APP_MANAGER_ERROR_NONE) {
-		if (is_running) {
-			LOGD("%s app is running", item->app_id);
-
-			app_context_h context = NULL;
-			if (app_manager_get_app_context(item->app_id, &context) == APP_MANAGER_ERROR_NONE &&
-					app_manager_resume_app(context) == APP_MANAGER_ERROR_NONE) {
-				app_context_destroy(context);
-				goto __ret;
-			}
-
-			LOGE("[FAILED][app_manager_resume_app]");
-			if (context) app_context_destroy(context);
-		}
-	}
-
 	if (app_control_send_launch_request(app_control_handle, NULL, NULL) != APP_CONTROL_ERROR_NONE) {
 		LOGE("[FAILED][app_control_send_launch_request]");
 		goto __ret;
-- 
2.7.4


From c2826827312099d62ed7ff8b9c1cd9a03163b162 Mon Sep 17 00:00:00 2001
From: YoungHun Cho <hoon.cho@samsung.com>
Date: Mon, 26 Dec 2016 18:45:19 +0900
Subject: [PATCH 11/16] build issue

Change-Id: I212437b53276dbfa72d1ac4f7fd97a37b130e065
Signed-off-by: YoungHun Cho <hoon.cho@samsung.com>
---
 .cproject        | 28 ++++++++++++++--------------
 project_def.prop |  2 +-
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.cproject b/.cproject
index e307377..9036413 100755
--- a/.cproject
+++ b/.cproject
@@ -27,17 +27,11 @@
 								<option defaultValue="gnu.cpp.compiler.debugging.level.max" id="sbi.gnu.cpp.compiler.option.debugging.level.core.481743771" name="Debug level" superClass="sbi.gnu.cpp.compiler.option.debugging.level.core" valueType="enumerated"/>
 								<option defaultValue="false" id="sbi.gnu.cpp.compiler.option.misc.pic.core.2102599528" name="-fPIC option" superClass="sbi.gnu.cpp.compiler.option.misc.pic.core" valueType="boolean"/>
 								<option id="sbi.gnu.cpp.compiler.option.1070320025" name="Tizen-Target" superClass="sbi.gnu.cpp.compiler.option" valueType="userObjs">
-									<listOptionValue builtIn="false" value="mobile-3.0-device.core_llvm37.armel.core.app"/>
+									<listOptionValue builtIn="false" value="mobile-3.0-device.core.public.20161129_1_llvm37.armel.core.app"/>
 								</option>
 								<option id="sbi.gnu.cpp.compiler.option.frameworks_inc.core.312288874" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.cpp.compiler.option.frameworks_inc.core" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/libxml2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/EGL&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES2&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES3&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/KHR&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore-agent&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appfw&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/attach-panel&quot;"/>
@@ -74,6 +68,7 @@
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/efl-1&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/efl-extension&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/efreet-1&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/EGL&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eina-1&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eina-1/eina&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eio-1&quot;"/>
@@ -91,10 +86,14 @@
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/freetype2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/geofence&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/gio-unix-2.0&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES2&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES3&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/glib-2.0&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/harfbuzz&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/iotcon&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/json-glib-1.0&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/KHR&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/location&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/maps&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/media&quot;"/>
@@ -107,6 +106,7 @@
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/notification&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/nsd/&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/phonenumber-utils&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/sensor&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/service-adaptor&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/shortcut&quot;"/>
@@ -146,17 +146,11 @@
 								<option defaultValue="gnu.c.debugging.level.max" id="sbi.gnu.c.compiler.option.debugging.level.core.247638963" name="Debug level" superClass="sbi.gnu.c.compiler.option.debugging.level.core" valueType="enumerated"/>
 								<option defaultValue="false" id="sbi.gnu.c.compiler.option.misc.pic.core.982331969" name="-fPIC option" superClass="sbi.gnu.c.compiler.option.misc.pic.core" valueType="boolean"/>
 								<option id="sbi.gnu.c.compiler.option.1644890019" name="Tizen-Target" superClass="sbi.gnu.c.compiler.option" valueType="userObjs">
-									<listOptionValue builtIn="false" value="mobile-3.0-device.core_llvm37.armel.core.app"/>
+									<listOptionValue builtIn="false" value="mobile-3.0-device.core.public.20161129_1_llvm37.armel.core.app"/>
 								</option>
 								<option id="sbi.gnu.c.compiler.option.frameworks_inc.core.1483034184" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.c.compiler.option.frameworks_inc.core" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/libxml2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/EGL&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES2&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES3&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/KHR&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore-agent&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appfw&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/attach-panel&quot;"/>
@@ -193,6 +187,7 @@
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/efl-1&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/efl-extension&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/efreet-1&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/EGL&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eina-1&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eina-1/eina&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eio-1&quot;"/>
@@ -210,10 +205,14 @@
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/freetype2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/geofence&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/gio-unix-2.0&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES2&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES3&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/glib-2.0&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/harfbuzz&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/iotcon&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/json-glib-1.0&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/KHR&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/location&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/maps&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/media&quot;"/>
@@ -226,6 +225,7 @@
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/notification&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/nsd/&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/phonenumber-utils&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/sensor&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/service-adaptor&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/shortcut&quot;"/>
diff --git a/project_def.prop b/project_def.prop
index 3a80800..b95136d 100755
--- a/project_def.prop
+++ b/project_def.prop
@@ -59,5 +59,5 @@ USER_EXT_EDC0_EDCS_FONT_DIRS = ${OUTPUT_DIR} edje/fonts
 
 # Resource Filter
 USER_RES_INCLUDE = 
-USER_RES_EXCLUDE = Debug/homescreen-efl 
+USER_RES_EXCLUDE = 
 
-- 
2.7.4


From b9cdc3ed16a5cbca2fa4ddf9b34781e9f8811e38 Mon Sep 17 00:00:00 2001
From: junkyu han <junkyu.han@samsung.com>
Date: Fri, 30 Dec 2016 13:09:02 +0900
Subject: [PATCH 12/16] Fixed problem regarding can't change the state to edit

Change-Id: I6606c8fbfaf868f983b7ce4f57de6d48682f8efc
(cherry picked from commit 97703db359f0b223de6ac4152bbc4fcb4e82857f)
---
 .cproject          | 4 ++--
 src/cluster_view.c | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.cproject b/.cproject
index bae1f30..e307377 100755
--- a/.cproject
+++ b/.cproject
@@ -27,7 +27,7 @@
 								<option defaultValue="gnu.cpp.compiler.debugging.level.max" id="sbi.gnu.cpp.compiler.option.debugging.level.core.481743771" name="Debug level" superClass="sbi.gnu.cpp.compiler.option.debugging.level.core" valueType="enumerated"/>
 								<option defaultValue="false" id="sbi.gnu.cpp.compiler.option.misc.pic.core.2102599528" name="-fPIC option" superClass="sbi.gnu.cpp.compiler.option.misc.pic.core" valueType="boolean"/>
 								<option id="sbi.gnu.cpp.compiler.option.1070320025" name="Tizen-Target" superClass="sbi.gnu.cpp.compiler.option" valueType="userObjs">
-									<listOptionValue builtIn="false" value="mobile-3.0-device.core.public.20161129_1_llvm37.armel.core.app"/>
+									<listOptionValue builtIn="false" value="mobile-3.0-device.core_llvm37.armel.core.app"/>
 								</option>
 								<option id="sbi.gnu.cpp.compiler.option.frameworks_inc.core.312288874" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.cpp.compiler.option.frameworks_inc.core" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/libxml2&quot;"/>
@@ -146,7 +146,7 @@
 								<option defaultValue="gnu.c.debugging.level.max" id="sbi.gnu.c.compiler.option.debugging.level.core.247638963" name="Debug level" superClass="sbi.gnu.c.compiler.option.debugging.level.core" valueType="enumerated"/>
 								<option defaultValue="false" id="sbi.gnu.c.compiler.option.misc.pic.core.982331969" name="-fPIC option" superClass="sbi.gnu.c.compiler.option.misc.pic.core" valueType="boolean"/>
 								<option id="sbi.gnu.c.compiler.option.1644890019" name="Tizen-Target" superClass="sbi.gnu.c.compiler.option" valueType="userObjs">
-									<listOptionValue builtIn="false" value="mobile-3.0-device.core.public.20161129_1_llvm37.armel.core.app"/>
+									<listOptionValue builtIn="false" value="mobile-3.0-device.core_llvm37.armel.core.app"/>
 								</option>
 								<option id="sbi.gnu.c.compiler.option.frameworks_inc.core.1483034184" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.c.compiler.option.frameworks_inc.core" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/libxml2&quot;"/>
diff --git a/src/cluster_view.c b/src/cluster_view.c
index 2269d18..cb20a29 100755
--- a/src/cluster_view.c
+++ b/src/cluster_view.c
@@ -146,6 +146,7 @@ static void __cluster_view_edit_move_anim_done(void *data);
 static Eina_Bool __cluster_view_scroll_timer_cb(void *data);
 
 static void __cluster_view_scroll_drag_start_cb(void *data, Evas_Object *obj, void *event_info);
+static void __cluster_view_scroll_drag_stop_cb(void *data, Evas_Object *obj, void *event_info);
 static void __cluster_view_scroll_anim_stop_cb(void *data, Evas_Object *obj, void *event_info);
 static void __cluster_view_allpage_get_page_pos(int page_idx, int *w, int *h);
 static int __cluster_view_allpage_get_page_index(int x, int y);
@@ -240,6 +241,7 @@ Evas_Object *__cluster_view_create_base_gui(Evas_Object *win)
 
 	evas_object_smart_callback_add(cluster_view_s.scroller, "scroll,anim,stop", __cluster_view_scroll_anim_stop_cb, NULL);
 	evas_object_smart_callback_add(cluster_view_s.scroller, "scroll,drag,start", __cluster_view_scroll_drag_start_cb, NULL);
+	evas_object_smart_callback_add(cluster_view_s.scroller, "scroll,drag,stop", __cluster_view_scroll_drag_stop_cb, NULL);
 
 	cluster_view_s.box = elm_box_add(cluster_view_s.scroller);
 	elm_box_horizontal_set(cluster_view_s.box, EINA_TRUE);
@@ -1647,6 +1649,11 @@ static void __cluster_view_scroll_drag_start_cb(void *data, Evas_Object *obj, vo
 	}
 }
 
+static void __cluster_view_scroll_drag_stop_cb(void *data, Evas_Object *obj, void *event_info)
+{
+	cluster_view_s.is_srolling = false;
+}
+
 static void __cluster_view_scroll_anim_stop_cb(void *data, Evas_Object *obj, void *event_info)
 {
 	char buf[STR_MAX] = { 0 , };
-- 
2.7.4


From 73b5cb038a3424314bc434b735baa0be692268aa Mon Sep 17 00:00:00 2001
From: YoungHun Cho <hoon.cho@samsung.com>
Date: Mon, 2 Jan 2017 18:56:10 +0900
Subject: [PATCH 13/16] modify scroll start / stop

Change-Id: I8f9039c548286709cc4ee0cf6c7e9a3d28e62977
Signed-off-by: YoungHun Cho <hoon.cho@samsung.com>
---
 .cproject          | 28 +++++++++++------------
 src/cluster_view.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++--------
 2 files changed, 70 insertions(+), 23 deletions(-)

diff --git a/.cproject b/.cproject
index e307377..9036413 100755
--- a/.cproject
+++ b/.cproject
@@ -27,17 +27,11 @@
 								<option defaultValue="gnu.cpp.compiler.debugging.level.max" id="sbi.gnu.cpp.compiler.option.debugging.level.core.481743771" name="Debug level" superClass="sbi.gnu.cpp.compiler.option.debugging.level.core" valueType="enumerated"/>
 								<option defaultValue="false" id="sbi.gnu.cpp.compiler.option.misc.pic.core.2102599528" name="-fPIC option" superClass="sbi.gnu.cpp.compiler.option.misc.pic.core" valueType="boolean"/>
 								<option id="sbi.gnu.cpp.compiler.option.1070320025" name="Tizen-Target" superClass="sbi.gnu.cpp.compiler.option" valueType="userObjs">
-									<listOptionValue builtIn="false" value="mobile-3.0-device.core_llvm37.armel.core.app"/>
+									<listOptionValue builtIn="false" value="mobile-3.0-device.core.public.20161129_1_llvm37.armel.core.app"/>
 								</option>
 								<option id="sbi.gnu.cpp.compiler.option.frameworks_inc.core.312288874" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.cpp.compiler.option.frameworks_inc.core" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/libxml2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/EGL&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES2&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES3&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/KHR&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore-agent&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appfw&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/attach-panel&quot;"/>
@@ -74,6 +68,7 @@
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/efl-1&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/efl-extension&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/efreet-1&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/EGL&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eina-1&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eina-1/eina&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eio-1&quot;"/>
@@ -91,10 +86,14 @@
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/freetype2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/geofence&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/gio-unix-2.0&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES2&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES3&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/glib-2.0&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/harfbuzz&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/iotcon&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/json-glib-1.0&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/KHR&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/location&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/maps&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/media&quot;"/>
@@ -107,6 +106,7 @@
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/notification&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/nsd/&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/phonenumber-utils&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/sensor&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/service-adaptor&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/shortcut&quot;"/>
@@ -146,17 +146,11 @@
 								<option defaultValue="gnu.c.debugging.level.max" id="sbi.gnu.c.compiler.option.debugging.level.core.247638963" name="Debug level" superClass="sbi.gnu.c.compiler.option.debugging.level.core" valueType="enumerated"/>
 								<option defaultValue="false" id="sbi.gnu.c.compiler.option.misc.pic.core.982331969" name="-fPIC option" superClass="sbi.gnu.c.compiler.option.misc.pic.core" valueType="boolean"/>
 								<option id="sbi.gnu.c.compiler.option.1644890019" name="Tizen-Target" superClass="sbi.gnu.c.compiler.option" valueType="userObjs">
-									<listOptionValue builtIn="false" value="mobile-3.0-device.core_llvm37.armel.core.app"/>
+									<listOptionValue builtIn="false" value="mobile-3.0-device.core.public.20161129_1_llvm37.armel.core.app"/>
 								</option>
 								<option id="sbi.gnu.c.compiler.option.frameworks_inc.core.1483034184" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.c.compiler.option.frameworks_inc.core" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/libxml2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/EGL&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES2&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES3&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/KHR&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore-agent&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appfw&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/attach-panel&quot;"/>
@@ -193,6 +187,7 @@
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/efl-1&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/efl-extension&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/efreet-1&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/EGL&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eina-1&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eina-1/eina&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eio-1&quot;"/>
@@ -210,10 +205,14 @@
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/freetype2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/geofence&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/gio-unix-2.0&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES2&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES3&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/glib-2.0&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/harfbuzz&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/iotcon&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/json-glib-1.0&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/KHR&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/location&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/maps&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/media&quot;"/>
@@ -226,6 +225,7 @@
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/notification&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/nsd/&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/phonenumber-utils&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/sensor&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/service-adaptor&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/shortcut&quot;"/>
diff --git a/src/cluster_view.c b/src/cluster_view.c
index cb20a29..0d8da7f 100755
--- a/src/cluster_view.c
+++ b/src/cluster_view.c
@@ -31,6 +31,8 @@
 #include "mouse.h"
 #include "screen_reader_handler.h"
 
+#define SCROLL_STOP_TIME 0.05
+
 static struct {
 	Evas_Object *win;
 	Evas_Object *scroller;
@@ -46,6 +48,7 @@ static struct {
 	cluster_page_t *picked_page;
 	widget_data_t *picked_widget;
 	Ecore_Timer *edit_mode_scroll_timer;
+	Ecore_Timer *scroll_stop_timer;
 	bool is_srolling;
 	Ecore_Animator *edit_animator;
 	int animation_from_x;
@@ -66,6 +69,7 @@ static struct {
 	.picked_page = NULL,
 	.picked_widget = NULL,
 	.edit_mode_scroll_timer = NULL,
+	.scroll_stop_timer = NULL,
 	.is_srolling = false,
 	.edit_animator = NULL,
 	.animation_from_x = INIT_VALUE,
@@ -147,7 +151,10 @@ static Eina_Bool __cluster_view_scroll_timer_cb(void *data);
 
 static void __cluster_view_scroll_drag_start_cb(void *data, Evas_Object *obj, void *event_info);
 static void __cluster_view_scroll_drag_stop_cb(void *data, Evas_Object *obj, void *event_info);
+static void __cluster_view_scroll_anim_start_cb(void *data, Evas_Object *obj, void *event_info);
 static void __cluster_view_scroll_anim_stop_cb(void *data, Evas_Object *obj, void *event_info);
+static void __cluster_view_scroll_start(void);
+static Eina_Bool __cluster_view_scorll_stop(void *data);
 static void __cluster_view_allpage_get_page_pos(int page_idx, int *w, int *h);
 static int __cluster_view_allpage_get_page_index(int x, int y);
 static void __cluster_view_allpage_reposition(void);
@@ -185,6 +192,11 @@ void cluster_view_init(void)
 
 void cluster_view_app_terminate(void)
 {
+	evas_object_smart_callback_del(cluster_view_s.scroller, "scroll,drag,start", __cluster_view_scroll_drag_start_cb);
+	evas_object_smart_callback_del(cluster_view_s.scroller, "scroll,drag,stop", __cluster_view_scroll_drag_stop_cb);
+	evas_object_smart_callback_del(cluster_view_s.scroller, "scroll,anim,start", __cluster_view_scroll_anim_start_cb);
+	evas_object_smart_callback_del(cluster_view_s.scroller, "scroll,anim,stop", __cluster_view_scroll_anim_stop_cb);
+
 	evas_object_event_callback_del(cluster_view_s.scroller, EVAS_CALLBACK_MOUSE_DOWN, __clsuter_view_scroller_down_cb);
 	evas_object_event_callback_del(cluster_view_s.scroller, EVAS_CALLBACK_MOUSE_MOVE, __clsuter_view_scroller_move_cb);
 	evas_object_event_callback_del(cluster_view_s.scroller, EVAS_CALLBACK_MOUSE_UP, __clsuter_view_scroller_up_cb);
@@ -239,9 +251,10 @@ Evas_Object *__cluster_view_create_base_gui(Evas_Object *win)
 	evas_object_event_callback_add(cluster_view_s.scroller, EVAS_CALLBACK_MOUSE_MOVE, __clsuter_view_scroller_move_cb, NULL);
 	evas_object_event_callback_add(cluster_view_s.scroller, EVAS_CALLBACK_MOUSE_UP, __clsuter_view_scroller_up_cb, NULL);
 
-	evas_object_smart_callback_add(cluster_view_s.scroller, "scroll,anim,stop", __cluster_view_scroll_anim_stop_cb, NULL);
 	evas_object_smart_callback_add(cluster_view_s.scroller, "scroll,drag,start", __cluster_view_scroll_drag_start_cb, NULL);
 	evas_object_smart_callback_add(cluster_view_s.scroller, "scroll,drag,stop", __cluster_view_scroll_drag_stop_cb, NULL);
+	evas_object_smart_callback_add(cluster_view_s.scroller, "scroll,anim,start", __cluster_view_scroll_anim_start_cb, NULL);
+	evas_object_smart_callback_add(cluster_view_s.scroller, "scroll,anim,stop", __cluster_view_scroll_anim_stop_cb, NULL);
 
 	cluster_view_s.box = elm_box_add(cluster_view_s.scroller);
 	elm_box_horizontal_set(cluster_view_s.box, EINA_TRUE);
@@ -720,9 +733,11 @@ static void __cluster_view_scroll_to_home(void)
 static void __cluster_view_scroll_to_page(int page_idx, bool animation)
 {
 	if (animation) {
+		LOGD("bring in %d page", page_idx);
 		elm_scroller_page_bring_in(cluster_view_s.scroller, page_idx, 0);
 	} else {
 		page_indicator_set_current_page(cluster_view_s.indicator, page_idx);
+		LOGD("show %d page", page_idx);
 		elm_scroller_page_show(cluster_view_s.scroller, page_idx, 0);
 	}
 }
@@ -1635,11 +1650,41 @@ static Eina_Bool __cluster_view_scroller_long_press_time_cb(void *data)
 
 	return ECORE_CALLBACK_CANCEL;
 }
+
 static void __cluster_view_scroll_drag_start_cb(void *data, Evas_Object *obj, void *event_info)
 {
+	__cluster_view_scroll_start();
+}
+
+static void __cluster_view_scroll_drag_stop_cb(void *data, Evas_Object *obj, void *event_info)
+{
+	if (cluster_view_s.scroll_stop_timer) {
+		ecore_timer_del(cluster_view_s.scroll_stop_timer);
+		cluster_view_s.scroll_stop_timer = NULL;
+	}
+
+	cluster_view_s.scroll_stop_timer = ecore_timer_add(SCROLL_STOP_TIME, __cluster_view_scorll_stop, NULL);
+}
+
+static void __cluster_view_scroll_anim_start_cb(void *data, Evas_Object *obj, void *event_info)
+{
+	if (cluster_view_s.scroll_stop_timer) {
+		ecore_timer_del(cluster_view_s.scroll_stop_timer);
+		cluster_view_s.scroll_stop_timer = NULL;
+	}
+}
+
+static void __cluster_view_scroll_anim_stop_cb(void *data, Evas_Object *obj, void *event_info)
+{
+	__cluster_view_scorll_stop(NULL);
+}
+
+static void __cluster_view_scroll_start(void)
+{
 	screen_reader_update(CLEAR);
 
 	cluster_view_s.is_srolling = true;
+
 	cluster_page_t *current_page = (cluster_page_t *)eina_list_nth(cluster_view_s.page_list, cluster_view_s.current_page);
 	Eina_List *find_list = NULL;
 	widget_data_t *item;
@@ -1649,23 +1694,25 @@ static void __cluster_view_scroll_drag_start_cb(void *data, Evas_Object *obj, vo
 	}
 }
 
-static void __cluster_view_scroll_drag_stop_cb(void *data, Evas_Object *obj, void *event_info)
-{
-	cluster_view_s.is_srolling = false;
-}
-
-static void __cluster_view_scroll_anim_stop_cb(void *data, Evas_Object *obj, void *event_info)
+static Eina_Bool __cluster_view_scorll_stop(void *data)
 {
-	char buf[STR_MAX] = { 0 , };
+	if (!cluster_view_s.is_srolling) {
+		LOGE("scroll is already stopped");
+		return ECORE_CALLBACK_CANCEL;
+	}
 
 	cluster_view_s.is_srolling = false;
-	elm_scroller_current_page_get(obj, &cluster_view_s.current_page, NULL);
+
+	elm_scroller_current_page_get(cluster_view_s.scroller, &cluster_view_s.current_page, NULL);
 	cluster_view_s.current_page = cluster_view_s.current_page % cluster_view_s.page_count;
 	LOGD("current page %d", cluster_view_s.current_page);
 
+	char buf[STR_MAX] = { 0 , };
 	snprintf(buf, sizeof(buf), _("IDS_HS_TBOPT_PAGE_P1SD_OF_P2SD"), cluster_view_s.current_page + 1, cluster_view_s.page_count);
 	screen_reader_read(buf);
 	screen_reader_update(HOME);
+
+	return ECORE_CALLBACK_CANCEL;
 }
 
 static Eina_Bool __cluster_view_scroll_timer_cb(void *data)
-- 
2.7.4


From 94bc78d203113bd062664a23f9228fa14a03f42c Mon Sep 17 00:00:00 2001
From: YoungHun Cho <hoon.cho@samsung.com>
Date: Tue, 3 Jan 2017 15:04:51 +0900
Subject: [PATCH 14/16] widget scroll issue

Change-Id: I742a799db05efcdf2b76092af256c5dd9621de0e
Signed-off-by: YoungHun Cho <hoon.cho@samsung.com>
---
 src/cluster_view.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 46 insertions(+), 6 deletions(-)

diff --git a/src/cluster_view.c b/src/cluster_view.c
index 0d8da7f..fc40c19 100755
--- a/src/cluster_view.c
+++ b/src/cluster_view.c
@@ -100,6 +100,13 @@ static mouse_info_t cluster_mouse_info = {
 	.pressed_obj = NULL,
 };
 
+//#define SCROLL_TIMING_ISSUE
+#ifdef SCROLL_TIMING_ISSUE
+#define SCROLL_TIMING_INTERVAL 0.001
+
+Ecore_Timer *__scroll_timing_timer = NULL;
+#endif
+
 static Eina_Hash *cluster_menu_table = NULL;
 
 Evas_Object *__cluster_view_create_base_gui(Evas_Object *win);
@@ -154,7 +161,7 @@ static void __cluster_view_scroll_drag_stop_cb(void *data, Evas_Object *obj, voi
 static void __cluster_view_scroll_anim_start_cb(void *data, Evas_Object *obj, void *event_info);
 static void __cluster_view_scroll_anim_stop_cb(void *data, Evas_Object *obj, void *event_info);
 static void __cluster_view_scroll_start(void);
-static Eina_Bool __cluster_view_scorll_stop(void *data);
+static Eina_Bool __cluster_view_scroll_stop(void *data);
 static void __cluster_view_allpage_get_page_pos(int page_idx, int *w, int *h);
 static int __cluster_view_allpage_get_page_index(int x, int y);
 static void __cluster_view_allpage_reposition(void);
@@ -730,15 +737,42 @@ static void __cluster_view_scroll_to_home(void)
 	__cluster_view_scroll_to_page(CLUSTER_HOME_PAGE, true);
 }
 
+#ifdef SCROLL_TIMING_ISSUE
+static Eina_Bool __cluster_view_scroll_show_page(void *data)
+{
+	int page_idx = *((int*)data);
+	page_indicator_set_current_page(cluster_view_s.indicator, page_idx);
+	LOGD("show %d page", page_idx);
+	elm_scroller_page_show(cluster_view_s.scroller, page_idx, 0);
+	__cluster_view_scroll_stop(NULL);
+
+	return ECORE_CALLBACK_CANCEL;
+}
+#endif
+
 static void __cluster_view_scroll_to_page(int page_idx, bool animation)
 {
+	__cluster_view_scroll_start();
+
 	if (animation) {
 		LOGD("bring in %d page", page_idx);
 		elm_scroller_page_bring_in(cluster_view_s.scroller, page_idx, 0);
 	} else {
+#ifdef SCROLL_TIMING_ISSUE
+		static int __page_idx = 0;
+		__page_idx = page_idx;
+
+		if (__scroll_timing_timer) {
+			ecore_timer_del(__scroll_timing_timer);
+			__scroll_timing_timer = NULL;
+		}
+		__scroll_timing_timer = ecore_timer_add(SCROLL_TIMING_INTERVAL, __cluster_view_scroll_show_page, &__page_idx);
+#else
 		page_indicator_set_current_page(cluster_view_s.indicator, page_idx);
 		LOGD("show %d page", page_idx);
 		elm_scroller_page_show(cluster_view_s.scroller, page_idx, 0);
+		__cluster_view_scroll_stop(NULL);
+#endif
 	}
 }
 
@@ -1663,7 +1697,7 @@ static void __cluster_view_scroll_drag_stop_cb(void *data, Evas_Object *obj, voi
 		cluster_view_s.scroll_stop_timer = NULL;
 	}
 
-	cluster_view_s.scroll_stop_timer = ecore_timer_add(SCROLL_STOP_TIME, __cluster_view_scorll_stop, NULL);
+	cluster_view_s.scroll_stop_timer = ecore_timer_add(SCROLL_STOP_TIME, __cluster_view_scroll_stop, NULL);
 }
 
 static void __cluster_view_scroll_anim_start_cb(void *data, Evas_Object *obj, void *event_info)
@@ -1676,7 +1710,7 @@ static void __cluster_view_scroll_anim_start_cb(void *data, Evas_Object *obj, vo
 
 static void __cluster_view_scroll_anim_stop_cb(void *data, Evas_Object *obj, void *event_info)
 {
-	__cluster_view_scorll_stop(NULL);
+	__cluster_view_scroll_stop(NULL);
 }
 
 static void __cluster_view_scroll_start(void)
@@ -1694,7 +1728,7 @@ static void __cluster_view_scroll_start(void)
 	}
 }
 
-static Eina_Bool __cluster_view_scorll_stop(void *data)
+static Eina_Bool __cluster_view_scroll_stop(void *data)
 {
 	if (!cluster_view_s.is_srolling) {
 		LOGE("scroll is already stopped");
@@ -1720,13 +1754,19 @@ static Eina_Bool __cluster_view_scroll_timer_cb(void *data)
 	cluster_page_t *current_page = (cluster_page_t *)eina_list_nth(cluster_view_s.page_list, cluster_view_s.current_page);
 
 	int next_page_idx = 0;
-	if (cluster_mouse_info.move_x > CLUSTER_EDIT_RIGHT_SCROLL_REGION) {
+	if (MIRRORING_X(cluster_mouse_info.move_x, CLUSTER_VIEW_W) > CLUSTER_EDIT_RIGHT_SCROLL_REGION) {
 		next_page_idx = current_page->page_index + 1;
-	} else if (cluster_mouse_info.move_x < CLUSTER_EDIT_LEFT_SCROLL_REGION) {
+	} else if (MIRRORING_X(cluster_mouse_info.move_x, CLUSTER_VIEW_W) < CLUSTER_EDIT_LEFT_SCROLL_REGION) {
 		next_page_idx = current_page->page_index - 1;
 	} else {
+		cluster_view_s.edit_mode_scroll_timer = NULL;
 		return ECORE_CALLBACK_CANCEL;
 	}
+
+	if (next_page_idx < 0 || next_page_idx >= cluster_view_s.page_count) {
+		return ECORE_CALLBACK_RENEW;
+	}
+
 	cluster_page_drag_cancel(current_page);
 	__cluster_view_scroll_to_page(next_page_idx, true);
 	return ECORE_CALLBACK_RENEW;
-- 
2.7.4


From 9c064c9d509ff41d2f282ba5afbbe0c3134e2447 Mon Sep 17 00:00:00 2001
From: YOUNG HUN JO <hoon.cho@samsung.com>
Date: Mon, 2 Jan 2017 22:24:14 -0800
Subject: [PATCH 15/16] Revert "widget scroll issue"

This reverts commit 94bc78d203113bd062664a23f9228fa14a03f42c.

Change-Id: Ib4d4d0f7742437d49edba2a12fed5924c701aca1
---
 src/cluster_view.c | 52 ++++++----------------------------------------------
 1 file changed, 6 insertions(+), 46 deletions(-)

diff --git a/src/cluster_view.c b/src/cluster_view.c
index fc40c19..0d8da7f 100755
--- a/src/cluster_view.c
+++ b/src/cluster_view.c
@@ -100,13 +100,6 @@ static mouse_info_t cluster_mouse_info = {
 	.pressed_obj = NULL,
 };
 
-//#define SCROLL_TIMING_ISSUE
-#ifdef SCROLL_TIMING_ISSUE
-#define SCROLL_TIMING_INTERVAL 0.001
-
-Ecore_Timer *__scroll_timing_timer = NULL;
-#endif
-
 static Eina_Hash *cluster_menu_table = NULL;
 
 Evas_Object *__cluster_view_create_base_gui(Evas_Object *win);
@@ -161,7 +154,7 @@ static void __cluster_view_scroll_drag_stop_cb(void *data, Evas_Object *obj, voi
 static void __cluster_view_scroll_anim_start_cb(void *data, Evas_Object *obj, void *event_info);
 static void __cluster_view_scroll_anim_stop_cb(void *data, Evas_Object *obj, void *event_info);
 static void __cluster_view_scroll_start(void);
-static Eina_Bool __cluster_view_scroll_stop(void *data);
+static Eina_Bool __cluster_view_scorll_stop(void *data);
 static void __cluster_view_allpage_get_page_pos(int page_idx, int *w, int *h);
 static int __cluster_view_allpage_get_page_index(int x, int y);
 static void __cluster_view_allpage_reposition(void);
@@ -737,42 +730,15 @@ static void __cluster_view_scroll_to_home(void)
 	__cluster_view_scroll_to_page(CLUSTER_HOME_PAGE, true);
 }
 
-#ifdef SCROLL_TIMING_ISSUE
-static Eina_Bool __cluster_view_scroll_show_page(void *data)
-{
-	int page_idx = *((int*)data);
-	page_indicator_set_current_page(cluster_view_s.indicator, page_idx);
-	LOGD("show %d page", page_idx);
-	elm_scroller_page_show(cluster_view_s.scroller, page_idx, 0);
-	__cluster_view_scroll_stop(NULL);
-
-	return ECORE_CALLBACK_CANCEL;
-}
-#endif
-
 static void __cluster_view_scroll_to_page(int page_idx, bool animation)
 {
-	__cluster_view_scroll_start();
-
 	if (animation) {
 		LOGD("bring in %d page", page_idx);
 		elm_scroller_page_bring_in(cluster_view_s.scroller, page_idx, 0);
 	} else {
-#ifdef SCROLL_TIMING_ISSUE
-		static int __page_idx = 0;
-		__page_idx = page_idx;
-
-		if (__scroll_timing_timer) {
-			ecore_timer_del(__scroll_timing_timer);
-			__scroll_timing_timer = NULL;
-		}
-		__scroll_timing_timer = ecore_timer_add(SCROLL_TIMING_INTERVAL, __cluster_view_scroll_show_page, &__page_idx);
-#else
 		page_indicator_set_current_page(cluster_view_s.indicator, page_idx);
 		LOGD("show %d page", page_idx);
 		elm_scroller_page_show(cluster_view_s.scroller, page_idx, 0);
-		__cluster_view_scroll_stop(NULL);
-#endif
 	}
 }
 
@@ -1697,7 +1663,7 @@ static void __cluster_view_scroll_drag_stop_cb(void *data, Evas_Object *obj, voi
 		cluster_view_s.scroll_stop_timer = NULL;
 	}
 
-	cluster_view_s.scroll_stop_timer = ecore_timer_add(SCROLL_STOP_TIME, __cluster_view_scroll_stop, NULL);
+	cluster_view_s.scroll_stop_timer = ecore_timer_add(SCROLL_STOP_TIME, __cluster_view_scorll_stop, NULL);
 }
 
 static void __cluster_view_scroll_anim_start_cb(void *data, Evas_Object *obj, void *event_info)
@@ -1710,7 +1676,7 @@ static void __cluster_view_scroll_anim_start_cb(void *data, Evas_Object *obj, vo
 
 static void __cluster_view_scroll_anim_stop_cb(void *data, Evas_Object *obj, void *event_info)
 {
-	__cluster_view_scroll_stop(NULL);
+	__cluster_view_scorll_stop(NULL);
 }
 
 static void __cluster_view_scroll_start(void)
@@ -1728,7 +1694,7 @@ static void __cluster_view_scroll_start(void)
 	}
 }
 
-static Eina_Bool __cluster_view_scroll_stop(void *data)
+static Eina_Bool __cluster_view_scorll_stop(void *data)
 {
 	if (!cluster_view_s.is_srolling) {
 		LOGE("scroll is already stopped");
@@ -1754,19 +1720,13 @@ static Eina_Bool __cluster_view_scroll_timer_cb(void *data)
 	cluster_page_t *current_page = (cluster_page_t *)eina_list_nth(cluster_view_s.page_list, cluster_view_s.current_page);
 
 	int next_page_idx = 0;
-	if (MIRRORING_X(cluster_mouse_info.move_x, CLUSTER_VIEW_W) > CLUSTER_EDIT_RIGHT_SCROLL_REGION) {
+	if (cluster_mouse_info.move_x > CLUSTER_EDIT_RIGHT_SCROLL_REGION) {
 		next_page_idx = current_page->page_index + 1;
-	} else if (MIRRORING_X(cluster_mouse_info.move_x, CLUSTER_VIEW_W) < CLUSTER_EDIT_LEFT_SCROLL_REGION) {
+	} else if (cluster_mouse_info.move_x < CLUSTER_EDIT_LEFT_SCROLL_REGION) {
 		next_page_idx = current_page->page_index - 1;
 	} else {
-		cluster_view_s.edit_mode_scroll_timer = NULL;
 		return ECORE_CALLBACK_CANCEL;
 	}
-
-	if (next_page_idx < 0 || next_page_idx >= cluster_view_s.page_count) {
-		return ECORE_CALLBACK_RENEW;
-	}
-
 	cluster_page_drag_cancel(current_page);
 	__cluster_view_scroll_to_page(next_page_idx, true);
 	return ECORE_CALLBACK_RENEW;
-- 
2.7.4


From 27ceaac64066458fcd530d3b04dd3c67651038e6 Mon Sep 17 00:00:00 2001
From: YoungHun Cho <hoon.cho@samsung.com>
Date: Tue, 3 Jan 2017 15:25:54 +0900
Subject: [PATCH 16/16] widget scroll issue

Change-Id: Ie1c95a03053cf637bf15ef45b7ce381d6a7a43d0
Signed-off-by: YoungHun Cho <hoon.cho@samsung.com>
---
 src/cluster_view.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 46 insertions(+), 6 deletions(-)

diff --git a/src/cluster_view.c b/src/cluster_view.c
index 0d8da7f..0f58972 100755
--- a/src/cluster_view.c
+++ b/src/cluster_view.c
@@ -100,6 +100,13 @@ static mouse_info_t cluster_mouse_info = {
 	.pressed_obj = NULL,
 };
 
+//#define SCROLL_TIMING_ISSUE
+#ifdef SCROLL_TIMING_ISSUE
+#define SCROLL_TIMING_INTERVAL 0.001
+
+static Ecore_Timer *__scroll_timing_timer = NULL;
+#endif
+
 static Eina_Hash *cluster_menu_table = NULL;
 
 Evas_Object *__cluster_view_create_base_gui(Evas_Object *win);
@@ -154,7 +161,7 @@ static void __cluster_view_scroll_drag_stop_cb(void *data, Evas_Object *obj, voi
 static void __cluster_view_scroll_anim_start_cb(void *data, Evas_Object *obj, void *event_info);
 static void __cluster_view_scroll_anim_stop_cb(void *data, Evas_Object *obj, void *event_info);
 static void __cluster_view_scroll_start(void);
-static Eina_Bool __cluster_view_scorll_stop(void *data);
+static Eina_Bool __cluster_view_scroll_stop(void *data);
 static void __cluster_view_allpage_get_page_pos(int page_idx, int *w, int *h);
 static int __cluster_view_allpage_get_page_index(int x, int y);
 static void __cluster_view_allpage_reposition(void);
@@ -730,15 +737,42 @@ static void __cluster_view_scroll_to_home(void)
 	__cluster_view_scroll_to_page(CLUSTER_HOME_PAGE, true);
 }
 
+#ifdef SCROLL_TIMING_ISSUE
+static Eina_Bool __cluster_view_scroll_show_page(void *data)
+{
+	int page_idx = *((int*)data);
+	page_indicator_set_current_page(cluster_view_s.indicator, page_idx);
+	LOGD("show %d page", page_idx);
+	elm_scroller_page_show(cluster_view_s.scroller, page_idx, 0);
+	__cluster_view_scroll_stop(NULL);
+
+	return ECORE_CALLBACK_CANCEL;
+}
+#endif
+
 static void __cluster_view_scroll_to_page(int page_idx, bool animation)
 {
+	__cluster_view_scroll_start();
+
 	if (animation) {
 		LOGD("bring in %d page", page_idx);
 		elm_scroller_page_bring_in(cluster_view_s.scroller, page_idx, 0);
 	} else {
+#ifdef SCROLL_TIMING_ISSUE
+		static int __page_idx = 0;
+		__page_idx = page_idx;
+
+		if (__scroll_timing_timer) {
+			ecore_timer_del(__scroll_timing_timer);
+			__scroll_timing_timer = NULL;
+		}
+		__scroll_timing_timer = ecore_timer_add(SCROLL_TIMING_INTERVAL, __cluster_view_scroll_show_page, &__page_idx);
+#else
 		page_indicator_set_current_page(cluster_view_s.indicator, page_idx);
 		LOGD("show %d page", page_idx);
 		elm_scroller_page_show(cluster_view_s.scroller, page_idx, 0);
+		__cluster_view_scroll_stop(NULL);
+#endif
 	}
 }
 
@@ -1663,7 +1697,7 @@ static void __cluster_view_scroll_drag_stop_cb(void *data, Evas_Object *obj, voi
 		cluster_view_s.scroll_stop_timer = NULL;
 	}
 
-	cluster_view_s.scroll_stop_timer = ecore_timer_add(SCROLL_STOP_TIME, __cluster_view_scorll_stop, NULL);
+	cluster_view_s.scroll_stop_timer = ecore_timer_add(SCROLL_STOP_TIME, __cluster_view_scroll_stop, NULL);
 }
 
 static void __cluster_view_scroll_anim_start_cb(void *data, Evas_Object *obj, void *event_info)
@@ -1676,7 +1710,7 @@ static void __cluster_view_scroll_anim_start_cb(void *data, Evas_Object *obj, vo
 
 static void __cluster_view_scroll_anim_stop_cb(void *data, Evas_Object *obj, void *event_info)
 {
-	__cluster_view_scorll_stop(NULL);
+	__cluster_view_scroll_stop(NULL);
 }
 
 static void __cluster_view_scroll_start(void)
@@ -1694,7 +1728,7 @@ static void __cluster_view_scroll_start(void)
 	}
 }
 
-static Eina_Bool __cluster_view_scorll_stop(void *data)
+static Eina_Bool __cluster_view_scroll_stop(void *data)
 {
 	if (!cluster_view_s.is_srolling) {
 		LOGE("scroll is already stopped");
@@ -1720,13 +1754,19 @@ static Eina_Bool __cluster_view_scroll_timer_cb(void *data)
 	cluster_page_t *current_page = (cluster_page_t *)eina_list_nth(cluster_view_s.page_list, cluster_view_s.current_page);
 
 	int next_page_idx = 0;
-	if (cluster_mouse_info.move_x > CLUSTER_EDIT_RIGHT_SCROLL_REGION) {
+	if (MIRRORING_X(cluster_mouse_info.move_x, CLUSTER_VIEW_W) > CLUSTER_EDIT_RIGHT_SCROLL_REGION) {
 		next_page_idx = current_page->page_index + 1;
-	} else if (cluster_mouse_info.move_x < CLUSTER_EDIT_LEFT_SCROLL_REGION) {
+	} else if (MIRRORING_X(cluster_mouse_info.move_x, CLUSTER_VIEW_W) < CLUSTER_EDIT_LEFT_SCROLL_REGION) {
 		next_page_idx = current_page->page_index - 1;
 	} else {
+		cluster_view_s.edit_mode_scroll_timer = NULL;
 		return ECORE_CALLBACK_CANCEL;
 	}
+
+	if (next_page_idx < 0 || next_page_idx >= cluster_view_s.page_count) {
+		return ECORE_CALLBACK_RENEW;
+	}
+
 	cluster_page_drag_cancel(current_page);
 	__cluster_view_scroll_to_page(next_page_idx, true);
 	return ECORE_CALLBACK_RENEW;
-- 
2.7.4