[UI]Remove needless codes

68 files changed, 47 insertions, 4593 deletions

diff --git a/NOTICE b/NOTICE
index ded3804..e5fc676 100755
--- a/NOTICE
+++ b/NOTICE
@@ -1 +1 @@
-Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
\ No newline at end of file
+Copyright (c) 2012 Samsung Electronics Co., Ltd. All rights reserved.
\ No newline at end of file
diff --git a/debian/starter.postinst b/debian/starter.postinst
index a3c94ed..f1f673f 100755
--- a/debian/starter.postinst
+++ b/debian/starter.postinst
@@ -2,7 +2,7 @@
 
 vconftool set -t int "memory/starter/sequence" 0 -i -u 5000 -g 5000
 
-vconftool set -t string file/private/lockscreen/pkgname "org.tizen.draglock" -u 5000 -g 5000
+vconftool set -t string file/private/lockscreen/pkgname "org.tizen.lockscreen" -u 5000 -g 5000
 
 vconftool -i set -t int memory/idle_lock/state "0" -u 5000 -g 5000
 
diff --git a/include/hw_key.h b/include/hw_key.h
index 594e810..863cbf3 100644..100755
--- a/include/hw_key.h
+++ b/include/hw_key.h
@@ -18,7 +18,3 @@
 
 extern void destroy_key_window(void);
 extern void create_key_window(void);
-
-
-
-// End of a file
diff --git a/include/lock-daemon.h b/include/lock-daemon.h
index 47caf66..6c968f7 100755
--- a/include/lock-daemon.h
+++ b/include/lock-daemon.h
@@ -21,4 +21,4 @@
 
 int start_lock_daemon(int launch_lock);
 
-#endif				/* __LOCK_DAEMON_H__ */
+#endif
diff --git a/include/lockd-debug.h b/include/lockd-debug.h
index 2da144e..5999247 100644..100755
--- a/include/lockd-debug.h
+++ b/include/lockd-debug.h
@@ -61,4 +61,4 @@ void lockd_log_t(char *fmt, ...);
 #define FALSE 0
 #endif
 
-#endif				/* __LOCKD_DEBUG_H__ */
+#endif
diff --git a/include/lockd-process-mgr.h b/include/lockd-process-mgr.h
index 0d10863..4de8c6b 100755
--- a/include/lockd-process-mgr.h
+++ b/include/lockd-process-mgr.h
@@ -35,4 +35,4 @@ void lockd_process_mgr_terminate_phone_lock(int phone_lock_pid);
 
 int lockd_process_mgr_check_lock(int pid);
 
-#endif				/* __LOCKD_PROCESS_MGR_H__ */
+#endif
diff --git a/include/lockd-window-mgr.h b/include/lockd-window-mgr.h
index 05b27bc..27e837e 100755
--- a/include/lockd-window-mgr.h
+++ b/include/lockd-window-mgr.h
@@ -39,4 +39,4 @@ lockd_window_mgr_ready_lock(void *data, lockw_data * lockw,
 void lockd_window_mgr_finish_lock(lockw_data * lockw);
 
 lockw_data *lockd_window_init(void);
-#endif				/* __LOCKD_WINDOW_MGR_H__ */
+#endif
diff --git a/include/menu_daemon.h b/include/menu_daemon.h
index cde3b5c..3e6a836 100755
--- a/include/menu_daemon.h
+++ b/include/menu_daemon.h
@@ -25,5 +25,3 @@ extern void menu_daemon_fini(void);
 extern bool menu_daemon_is_homescreen(pid_t pid);
 
 extern int menu_daemon_check_dead_signal(int pid);
-
-// End of a file
diff --git a/include/pkg_event.h b/include/pkg_event.h
index 0445093..4459999 100644..100755
--- a/include/pkg_event.h
+++ b/include/pkg_event.h
@@ -21,15 +21,15 @@
 #include <stdbool.h>
 
 #if !defined(PUBLIC)
-#define PUBLIC          __attribute__((visibility("default")))  /**<All other from outside modules can access this typed API */
+#define PUBLIC          __attribute__((visibility("default")))
 #endif
 
 #if !defined(PROTECTED)
-#define PROTECTED       __attribute__((visibility("hidden")))   /**<All other from outside modules can not access this directly */
+#define PROTECTED       __attribute__((visibility("hidden")))
 #endif
 
 #if !defined(PRIVATE)
-#define PRIVATE         __attribute__((visibility("internal"))) /**<Does not export APIs to the other. only can be accessed in this module */
+#define PRIVATE         __attribute__((visibility("internal")))
 #endif
 
 
diff --git a/include/starter-util.h b/include/starter-util.h
index 31e3e9d..c3ff2df 100644..100755
--- a/include/starter-util.h
+++ b/include/starter-util.h
@@ -32,4 +32,4 @@
 	fclose(fp);\
 } while (0)
 
-#endif				/* __STARTER_UTIL_H__ */
+#endif
diff --git a/include/starter-vconf.h b/include/starter-vconf.h
index 9f18b8a..f2cf3af 100755
--- a/include/starter-vconf.h
+++ b/include/starter-vconf.h
@@ -21,4 +21,4 @@
 
 #define VCONF_PRIVATE_LOCKSCREEN_PKGNAME "file/private/lockscreen/pkgname"
 
-#endif				/* __STARTER_VCONF_H__ */
+#endif
diff --git a/include/starter.h b/include/starter.h
index 9032010..5c52ae9 100644..100755
--- a/include/starter.h
+++ b/include/starter.h
@@ -22,7 +22,7 @@
 #include <sys/time.h>
 
 struct appdata {
-	struct timeval tv_start;	/* start time */
+	struct timeval tv_start;
 };
 
-#endif				/* __STARTER_H__ */
+#endif
diff --git a/include/util.h b/include/util.h
index 4956d0d..81312f3 100644..100755
--- a/include/util.h
+++ b/include/util.h
@@ -28,7 +28,6 @@
 #define LOG_TAG "starter"
 #endif
 
-/* Log */
 #if !defined(_W)
 #define _W(fmt, arg...) LOGW("[%s:%d] "fmt"\n", __func__, __LINE__, ##arg)
 #endif
@@ -76,4 +75,4 @@
 	} \
 }
 
-#endif /* __MENU_DAEMON_UTIL_H__ */
+#endif
diff --git a/include/x11.h b/include/x11.h
index 78735af..40470b9 100644..100755
--- a/include/x11.h
+++ b/include/x11.h
@@ -23,4 +23,4 @@ void prop_string_set(const char *name, const char *value);
 void prop_int_set(const char *name, unsigned int val);
 void set_window_scale(void);
 
-#endif				/* __STARTER_X11_H__ */
+#endif
diff --git a/include/xmonitor.h b/include/xmonitor.h
index e904c0b..47388d5 100644..100755
--- a/include/xmonitor.h
+++ b/include/xmonitor.h
@@ -22,4 +22,4 @@
 extern int xmonitor_init(void);
 extern void xmonitor_fini(void);
 
-#endif /* __MENU_DAEMON_XMONITOR_H__ */
+#endif
diff --git a/lock-setting/CMakeLists.txt b/lock-setting/CMakeLists.txt
index f754bda..7745b83 100755
--- a/lock-setting/CMakeLists.txt
+++ b/lock-setting/CMakeLists.txt
@@ -1,7 +1,6 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 PROJECT(lock-setting C)
 
-ADD_SUBDIRECTORY(lockapp-setting)
 ADD_SUBDIRECTORY(lockscreen-options)
 
 # i18n
diff --git a/lock-setting/lockapp-setting/CMakeLists.txt b/lock-setting/lockapp-setting/CMakeLists.txt
deleted file mode 100755
index 002b0bd..0000000
--- a/lock-setting/lockapp-setting/CMakeLists.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-PROJECT(ug-openlock-setting C)
-
-SET(PREFIX ${CMAKE_INSTALL_PREFIX})
-SET(EXEC_PREFIX "\${prefix}")
-SET(LIBDIR "\${prefix}/lib")
-SET(INCLUDEDIR "\${prefix}/include")
-SET(VERSION 0.1.0)
-
-SET(SRCS
-	./src/openlock-setting.c
-	./src/openlock-setting-util.c
-	./src/openlock-setting-main.c
-	./src/openlock-setting-pw.c
-)
-
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
-
-INCLUDE(FindPkgConfig)
-pkg_check_modules(pkgs_lock_settings REQUIRED appcore-efl aul elementary ui-gadget-1 evas ail capi-appfw-application)
-
-FOREACH(flag ${pkgs_lock_settings_CFLAGS})
-	SET(EXTRA_CXXFLAGS "${EXTRA_CXXFLAGS} ${flag}")
-ENDFOREACH(flag)
-
-SET(EXTRA_CXXFLAGS "${EXTRA_CXXFLAGS} -fvisibility=hidden -Wall")
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CXXFLAGS}")
-SET(CMAKE_C_FLAGS ${CMAKE_CXX_FLAGS})
-
-ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
-
-ADD_LIBRARY(${PROJECT_NAME} SHARED ${SRCS})
-SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES SOVERSION 0.1.0)
-TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_lock_settings_LDFLAGS})
-
-INSTALL(TARGETS ${PROJECT_NAME} DESTINATION /usr/ug/lib)
-#INSTALL(TARGETS "${CMAKE_CURRENT_SOURCE_DIR}/00_winset_control_top_arrow.png" DESTINATION /opt/ug/res/images/ug-openlock-setting)
-
diff --git a/lock-setting/lockapp-setting/include/openlock-setting-debug.h b/lock-setting/lockapp-setting/include/openlock-setting-debug.h
deleted file mode 100755
index 8855a1b..0000000
--- a/lock-setting/lockapp-setting/include/openlock-setting-debug.h
+++ /dev/null
@@ -1,48 +0,0 @@
- /*
-  * Copyright 2012  Samsung Electronics Co., Ltd
-  *
-  * Licensed under the Flora License, Version 1.0 (the "License");
-  * you may not use this file except in compliance with the License.
-  * You may obtain a copy of the License at
-  *
-  *     http://www.tizenopensource.org/license
-  *
-  * Unless required by applicable law or agreed to in writing, software
-  * distributed under the License is distributed on an "AS IS" BASIS,
-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  * See the License for the specific language governing permissions and
-  * limitations under the License.
-  */
-
-
-
-#ifndef __OPENLOCK_SETTING_DEBUG_H__
-#define __OPENLOCK_SETTING_DEBUG_H__
-
-#include <stdio.h>
-
-#define OPENLOCK_USING_PLATFORM_DEBUG
-
-#ifdef OPENLOCK_USING_PLATFORM_DEBUG
-#ifndef LOG_TAG
-#define LOG_TAG "openlock-setting"
-#endif
-#include <dlog.h>
-
-#define OPENLOCKS_DBG(fmt, args...) LOGD("["LOG_TAG"%s:%d:E] "fmt, __FILE__, __LINE__, ##args)
-#define OPENLOCKS_WARN(fmt, args...) LOGW("["LOG_TAG"%s:%d:E] "fmt, __FILE__, __LINE__, ##args)
-#define OPENLOCKS_ERR(fmt, args...) LOGE("["LOG_TAG"%s:%d:E] "fmt, __FILE__, __LINE__, ##args)
-#else
-#define OPENLOCKS_DBG(fmt, args...) do{printf("[OPENLOCKS_DBG][%s(%d)] "fmt " \n", __FILE__, __LINE__, ##args);}while(0);
-#define OPENLOCKS_WARN(fmt, args...) do{printf("[OPENLOCKS_WARN][%s(%d)] "fmt " \n", __FILE__, __LINE__, ##args);}while(0);
-#define OPENLOCKS_ERR(fmt, args...) do{printf("[OPENLOCKS_ERR][%s(%d)] "fmt " \n", __FILE__, __LINE__, ##args);}while(0);
-#endif				/* LOCKD_USING_PLATFORM_DEBUG */
-
-#ifndef TRUE
-#define TRUE 1
-#endif
-#ifndef FALSE
-#define FALSE 0
-#endif
-
-#endif				/* __OPENLOCK_SETTING_DEBUG_H__ */
diff --git a/lock-setting/lockapp-setting/include/openlock-setting-main.h b/lock-setting/lockapp-setting/include/openlock-setting-main.h
deleted file mode 100755
index 5155f0a..0000000
--- a/lock-setting/lockapp-setting/include/openlock-setting-main.h
+++ /dev/null
@@ -1,48 +0,0 @@
- /*
-  * Copyright 2012  Samsung Electronics Co., Ltd
-  *
-  * Licensed under the Flora License, Version 1.0 (the "License");
-  * you may not use this file except in compliance with the License.
-  * You may obtain a copy of the License at
-  *
-  *     http://www.tizenopensource.org/license
-  *
-  * Unless required by applicable law or agreed to in writing, software
-  * distributed under the License is distributed on an "AS IS" BASIS,
-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  * See the License for the specific language governing permissions and
-  * limitations under the License.
-  */
-
-
-
-#ifndef __OPENLOCK_SETTING_MAIN_H__
-#define __OPENLOCK_SETTING_MAIN_H__
-
-#include <Elementary.h>
-#include "openlock-setting.h"
-
-typedef struct _openlock_setting_appdata openlock_setting_appdata;
-
-struct _openlock_setting_appdata {
-	openlock_setting_appdata *prev;
-	openlock_setting_appdata *next;
-
-	char *pkg_name;
-	char *app_name;
-	int index;
-
-	Evas_Object *radio;
-	Evas_Object *entry;
-	Evas_Object *editfield_layout;
-	Evas_Object *popup;
-	/* for pw */
-	Evas_Object *ly;
-	Evas_Object *genlist;
-	int count;
-	openlock_ug_data *openlock_data;
-};
-
-void openlock_setting_main_create_view(openlock_ug_data * openlock_data);
-
-#endif				/* __OPENLOCK_SETTING_MAIN_H__ */
diff --git a/lock-setting/lockapp-setting/include/openlock-setting-pw.h b/lock-setting/lockapp-setting/include/openlock-setting-pw.h
deleted file mode 100755
index c1dfd1d..0000000
--- a/lock-setting/lockapp-setting/include/openlock-setting-pw.h
+++ /dev/null
@@ -1,30 +0,0 @@
- /*
-  * Copyright 2012  Samsung Electronics Co., Ltd
-  *
-  * Licensed under the Flora License, Version 1.0 (the "License");
-  * you may not use this file except in compliance with the License.
-  * You may obtain a copy of the License at
-  *
-  *     http://www.tizenopensource.org/license
-  *
-  * Unless required by applicable law or agreed to in writing, software
-  * distributed under the License is distributed on an "AS IS" BASIS,
-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  * See the License for the specific language governing permissions and
-  * limitations under the License.
-  */
-
-
-
-#ifndef __OPENLOCK_SETTING_PW_H__
-#define __OPENLOCK_SETTING_PW_H__
-
-#include <Elementary.h>
-
-#include "openlock-setting-main.h"
-
-void
-openlock_setting_pw_create_view(openlock_setting_appdata *
-				openlock_setting_data);
-
-#endif				/* __OPENLOCK_SETTING_PW_H__ */
diff --git a/lock-setting/lockapp-setting/include/openlock-setting-util.h b/lock-setting/lockapp-setting/include/openlock-setting-util.h
deleted file mode 100755
index e95a66d..0000000
--- a/lock-setting/lockapp-setting/include/openlock-setting-util.h
+++ /dev/null
@@ -1,28 +0,0 @@
- /*
-  * Copyright 2012  Samsung Electronics Co., Ltd
-  *
-  * Licensed under the Flora License, Version 1.0 (the "License");
-  * you may not use this file except in compliance with the License.
-  * You may obtain a copy of the License at
-  *
-  *     http://www.tizenopensource.org/license
-  *
-  * Unless required by applicable law or agreed to in writing, software
-  * distributed under the License is distributed on an "AS IS" BASIS,
-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  * See the License for the specific language governing permissions and
-  * limitations under the License.
-  */
-
-
-
-#ifndef __OPENLOCK_SETTING_UTIL_H__
-#define __OPENLOCK_SETTING_UTIL_H__
-
-#include <Elementary.h>
-
-Evas_Object *openlock_setting_util_create_navigation(Evas_Object * parent);
-
-Evas_Object *openlock_setting_util_create_layout(Evas_Object * parent);
-
-#endif				/* __OPENLOCK_SETTING_UTIL_H__ */
diff --git a/lock-setting/lockapp-setting/include/openlock-setting.h b/lock-setting/lockapp-setting/include/openlock-setting.h
deleted file mode 100755
index 4adb642..0000000
--- a/lock-setting/lockapp-setting/include/openlock-setting.h
+++ /dev/null
@@ -1,40 +0,0 @@
- /*
-  * Copyright 2012  Samsung Electronics Co., Ltd
-  *
-  * Licensed under the Flora License, Version 1.0 (the "License");
-  * you may not use this file except in compliance with the License.
-  * You may obtain a copy of the License at
-  *
-  *     http://www.tizenopensource.org/license
-  *
-  * Unless required by applicable law or agreed to in writing, software
-  * distributed under the License is distributed on an "AS IS" BASIS,
-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  * See the License for the specific language governing permissions and
-  * limitations under the License.
-  */
-
-
-
-#ifndef __openlock_setting_H__
-#define __openlock_setting_H__
-
-#include <Elementary.h>
-#include <libintl.h>
-#include <ui-gadget.h>
-
-#define PKGNAME "ug-openlock-setting"
-
-#define _EDJ(o)			elm_layout_edje_get(o)
-#define dgettext_noop(s)	(s)
-
-typedef struct _openlock_ug_data {
-	Evas_Object *win_main;
-	Evas_Object *base;
-	ui_gadget_h ug;
-
-	Evas_Object *navi_bar;
-	;
-} openlock_ug_data;
-
-#endif				/* __openlock_setting_H__ */
diff --git a/lock-setting/lockapp-setting/src/openlock-setting-main.c b/lock-setting/lockapp-setting/src/openlock-setting-main.c
deleted file mode 100755
index 03cbce3..0000000
--- a/lock-setting/lockapp-setting/src/openlock-setting-main.c
+++ /dev/null
@@ -1,342 +0,0 @@
- /*
-  * Copyright 2012  Samsung Electronics Co., Ltd
-  *
-  * Licensed under the Flora License, Version 1.0 (the "License");
-  * you may not use this file except in compliance with the License.
-  * You may obtain a copy of the License at
-  *
-  *     http://www.tizenopensource.org/license
-  *
-  * Unless required by applicable law or agreed to in writing, software
-  * distributed under the License is distributed on an "AS IS" BASIS,
-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  * See the License for the specific language governing permissions and
-  * limitations under the License.
-  */
-
-
-
-#include <vconf.h>
-#include <vconf-keys.h>
-#include <ui-gadget.h>
-#include <ui-gadget-module.h>
-#include <aul.h>
-#include <ail.h>
-
-#include "openlock-setting.h"
-#include "openlock-setting-pw.h"
-#include "openlock-setting-debug.h"
-#include "openlock-setting-main.h"
-#include "starter-vconf.h"
-
-#define OPENLOCK_DESKTOP_VALUE_LOCKSCREEN "lock-screen"
-
-static Elm_Gen_Item_Class itc;
-static Evas_Object *radio_group = NULL;
-
-static void _openlock_setting_main_back_cb(void *data, Evas_Object * obj,
-					   void *event_info)
-{
-	openlock_ug_data *openlock_data = (openlock_ug_data *) data;
-
-	if (openlock_data == NULL)
-		return;
-
-	ug_destroy_me(openlock_data->ug);
-}
-
-static void
-_openlock_setting_main_button_clicked_cb(void *data, Evas_Object * obj,
-					 void *event_info)
-{
-	if (data == NULL)
-		return;
-
-	openlock_setting_appdata *lockapp_data =
-	    (openlock_setting_appdata *) data;
-
-	OPENLOCKS_DBG("edit button pressed : %s", lockapp_data->pkg_name);
-
-	bundle *b = NULL;
-
-	b = bundle_create();
-
-	bundle_add(b, "mode", "edit");
-	aul_launch_app(lockapp_data->pkg_name, b);
-
-	if (b)
-		bundle_free(b);
-}
-
-static Evas_Object *_openlock_setting_main_gl_icon_get(void *data,
-						       Evas_Object * obj,
-						       const char *part)
-{
-	if (data == NULL || part == NULL)
-		return NULL;
-
-	openlock_setting_appdata *lockapp_data =
-	    (openlock_setting_appdata *) data;
-	Evas_Object *radio = NULL;
-	Evas_Object *button = NULL;
-	char *cur_pkg_name = NULL;
-	char editable_key[512] = { 0, };
-	int val = 0;
-
-	OPENLOCKS_DBG("part : %s", part);
-
-	if (!strcmp(part, "elm.icon.1")) {
-		radio = elm_radio_add(obj);
-		elm_radio_state_value_set(radio, lockapp_data->index);
-
-		if (lockapp_data->index != 0) {
-			elm_radio_group_add(radio, radio_group);
-		} else {
-			radio_group = radio;
-		}
-
-		lockapp_data->radio = radio;
-
-		cur_pkg_name = vconf_get_str(VCONF_PRIVATE_LOCKSCREEN_PKGNAME);
-		OPENLOCKS_DBG("cur pkg : %s, this pkg : %s", cur_pkg_name,
-			      lockapp_data->pkg_name);
-		if (cur_pkg_name == NULL) {
-			return NULL;
-		}
-		if (!strcmp(cur_pkg_name, lockapp_data->pkg_name)) {
-			elm_radio_value_set(radio_group, lockapp_data->index);
-		}
-
-		return radio;
-	} else if (!strcmp(part, "elm.icon.2")) {
-		snprintf(editable_key, sizeof(editable_key),
-			 "db/openlockscreen/%s/editable",
-			 lockapp_data->app_name);
-		int ret = vconf_get_bool(editable_key, &val);
-		if (ret == 0 && val == 1) {
-			OPENLOCKS_DBG("app %s have a editable mode!",
-				      lockapp_data->app_name);
-			button = elm_button_add(obj);
-			elm_object_style_set(button, "text_only/sweep");
-			elm_object_text_set(button, "edit");
-			evas_object_smart_callback_add(button, "clicked",
-						       _openlock_setting_main_button_clicked_cb,
-						       lockapp_data);
-
-			return button;
-		}
-	}
-
-	return NULL;
-}
-
-static char *_openlock_setting_main_gl_label_get(void *data, Evas_Object * obj,
-						 const char *part)
-{
-	if (data == NULL || part == NULL)
-		return NULL;
-
-	openlock_setting_appdata *lockapp_data =
-	    (openlock_setting_appdata *) data;
-
-	if (lockapp_data->app_name && !strcmp(part, "elm.text")) {
-		return strdup(lockapp_data->app_name);
-	}
-
-	return NULL;
-}
-
-static void _openlock_setting_main_gl_del(void *data, Evas_Object * obj)
-{
-	if (data == NULL)
-		return;
-
-	openlock_setting_appdata *lockapp_data =
-	    (openlock_setting_appdata *) data;
-
-	if (lockapp_data->pkg_name)
-		free(lockapp_data->pkg_name);
-
-	if (lockapp_data->app_name)
-		free(lockapp_data->app_name);
-
-	free(lockapp_data);
-}
-
-static void
-_openlock_setting_main_gl_sel(void *data, Evas_Object * obj, void *event_info)
-{
-	char *cur_pkg_name = NULL;
-	elm_genlist_item_selected_set((Elm_Object_Item *) event_info,
-				      EINA_FALSE);
-
-	if (data == NULL)
-		return;
-
-	openlock_setting_appdata *lockapp_data =
-	    (openlock_setting_appdata *) data;
-
-	(lockapp_data->count)++;
-	OPENLOCKS_DBG("lockapp_data->count = %d\n", lockapp_data->count);
-
-	if ((lockapp_data->count) > 1) {
-		lockapp_data->count = 0;
-		return;
-	}
-
-	OPENLOCKS_DBG("lockapp_data->pkg_name = %s\n", lockapp_data->pkg_name);
-
-	if (lockapp_data != NULL && lockapp_data->pkg_name != NULL) {
-		int ret = 0;
-		elm_radio_value_set(radio_group, lockapp_data->index);
-		ret = vconf_set_str(VCONF_PRIVATE_LOCKSCREEN_PKGNAME,
-			      lockapp_data->pkg_name);
-		if(ret != 0)
-		{
-			OPENLOCKS_ERR("Failed to get vconf : VCONF_PRIVATE_LOCKSCREEN_PKGNAME\n");
-		}
-		lockapp_data->count = 0;	/* reset the count */
-	}
-}
-
-
-ail_cb_ret_e _openlock_setting_main_appinfo_cb(const ail_appinfo_h appinfo,
-					       void *user_data)
-{
-	openlock_setting_appdata *lockapp_data =
-	    (openlock_setting_appdata *) user_data;
-	openlock_setting_appdata *new_lockapp_data = NULL;
-	char *pkgname = NULL;
-	char *appname = NULL;
-
-	ail_appinfo_get_str(appinfo, AIL_PROP_PACKAGE_STR, &pkgname);
-	ail_appinfo_get_str(appinfo, AIL_PROP_NAME_STR, &appname);
-
-	/* Get tail of the list */
-	while (lockapp_data->next != NULL) {
-		lockapp_data = lockapp_data->next;
-	}
-
-	if (lockapp_data->index == 0 && lockapp_data->pkg_name == NULL) {
-		/* first data */
-		lockapp_data->pkg_name = strdup(pkgname);
-		lockapp_data->app_name = strdup(appname);
-		OPENLOCKS_DBG("appinfo %d) %s, %s", lockapp_data->index,
-			      lockapp_data->pkg_name, lockapp_data->app_name);
-	} else {
-		/* create new data */
-		new_lockapp_data = (openlock_setting_appdata *)
-		    malloc(sizeof(openlock_setting_appdata));
-		memset(new_lockapp_data, 0, sizeof(openlock_setting_appdata));
-		new_lockapp_data->pkg_name = strdup(pkgname);
-		new_lockapp_data->app_name = strdup(appname);
-		new_lockapp_data->index = lockapp_data->index + 1;
-		new_lockapp_data->openlock_data = lockapp_data->openlock_data;
-
-		new_lockapp_data->next = NULL;
-		new_lockapp_data->prev = lockapp_data;
-
-		lockapp_data->next = new_lockapp_data;
-
-		OPENLOCKS_DBG("appinfo %d) %s, %s", new_lockapp_data->index,
-			      new_lockapp_data->pkg_name,
-			      new_lockapp_data->app_name);
-	}
-
-	return AIL_CB_RET_CONTINUE;
-}
-
-void openlock_setting_main_create_view(openlock_ug_data * openlock_data)
-{
-	OPENLOCKS_DBG("openlock_setting_main_create_view begin\n");
-	Evas_Object *navi_bar = openlock_data->navi_bar;
-	Evas_Object *back_button = NULL;
-	Evas_Object *genlist = NULL;
-	Elm_Object_Item *item = NULL;
-	int i = 0, count = 0;
-	openlock_setting_appdata *lockapp_data = NULL;
-	openlock_setting_appdata *head_lockapp_data = NULL;
-
-	if (navi_bar == NULL) {
-		OPENLOCKS_WARN("navi_bar is null.");
-		return;
-	}
-
-	/* Get app info */
-	ail_filter_h filter;
-	ail_error_e ret;
-
-	ret = ail_filter_new(&filter);
-	if (ret != AIL_ERROR_OK) {
-		OPENLOCKS_WARN("Fail ail_filter_new : %d", ret);
-		return;
-	}
-
-	ret =
-	    ail_filter_add_str(filter, AIL_PROP_CATEGORIES_STR,
-			       OPENLOCK_DESKTOP_VALUE_LOCKSCREEN);
-	ret = ail_filter_count_appinfo(filter, &count);
-
-	lockapp_data = (openlock_setting_appdata *)
-	    malloc(sizeof(openlock_setting_appdata));
-	memset(lockapp_data, 0, sizeof(openlock_setting_appdata));
-	lockapp_data->prev = NULL;
-	lockapp_data->next = NULL;
-	lockapp_data->pkg_name = NULL;
-	lockapp_data->app_name = NULL;
-	lockapp_data->index = 0;
-	lockapp_data->openlock_data = openlock_data;
-	ail_filter_list_appinfo_foreach(filter,
-					_openlock_setting_main_appinfo_cb,
-					lockapp_data);
-
-	ail_filter_destroy(filter);
-
-	OPENLOCKS_DBG("lock app count : %d", count);
-
-	if (count > 0) {
-		/* Create genlist */
-		genlist = elm_genlist_add(navi_bar);
-
-		itc.item_style = "dialogue/1text.2icon";
-		itc.func.text_get = _openlock_setting_main_gl_label_get;
-		itc.func.content_get = _openlock_setting_main_gl_icon_get;
-		itc.func.state_get = NULL;
-		itc.func.del = _openlock_setting_main_gl_del;
-
-		head_lockapp_data = lockapp_data;
-
-		for (i = 0; i < count; i++) {
-			/* Find index */
-			lockapp_data = head_lockapp_data;
-
-			while (lockapp_data != NULL) {
-				if (lockapp_data->index == i) {
-					/* find */
-					OPENLOCKS_DBG("%d) [%s][%s]",
-						      lockapp_data->index,
-						      lockapp_data->pkg_name,
-						      lockapp_data->app_name);
-					    elm_genlist_item_append(genlist,
-								    &itc,
-								    lockapp_data,
-								    NULL,
-								    ELM_GENLIST_ITEM_NONE,
-								    _openlock_setting_main_gl_sel,
-								    lockapp_data);
-					break;
-				}
-				lockapp_data = lockapp_data->next;
-			}
-		}
-	}
-
-	/* Set navigation objects and push */
-	back_button = elm_button_add(navi_bar);
-	elm_object_style_set(back_button, "naviframe/back_btn/default");
-	evas_object_smart_callback_add(back_button, "clicked",
-				       _openlock_setting_main_back_cb,
-				       openlock_data);
-
-	elm_naviframe_item_push(navi_bar, "Downloaded lock screens", back_button, NULL, genlist, NULL);	/* the same tile */
-}
diff --git a/lock-setting/lockapp-setting/src/openlock-setting-pw.c b/lock-setting/lockapp-setting/src/openlock-setting-pw.c
deleted file mode 100755
index cec2763..0000000
--- a/lock-setting/lockapp-setting/src/openlock-setting-pw.c
+++ /dev/null
@@ -1,522 +0,0 @@
- /*
-  * Copyright 2012  Samsung Electronics Co., Ltd
-  *
-  * Licensed under the Flora License, Version 1.0 (the "License");
-  * you may not use this file except in compliance with the License.
-  * You may obtain a copy of the License at
-  *
-  *     http://www.tizenopensource.org/license
-  *
-  * Unless required by applicable law or agreed to in writing, software
-  * distributed under the License is distributed on an "AS IS" BASIS,
-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  * See the License for the specific language governing permissions and
-  * limitations under the License.
-  */
-
-
-
-#include <appcore-efl.h>
-#include <Ecore_X.h>
-#include <vconf.h>
-#include <vconf-keys.h>
-
-#include "openlock-setting-pw.h"
-#include "openlock-setting-debug.h"
-#include "starter-vconf.h"
-
-static Evas_Object *done_button = NULL;
-static Elm_Gen_Item_Class itc_label, itc_entry;
-static Evas_Object *_openlock_setting_pw_editfield_create(Evas_Object * parent,
-							  void *data);
-static Evas_Object *_openlock_setting_pw_editfield_entry_get(Evas_Object *
-							     parent);
-
-static Evas_Object *_openlock_setting_pw_create_conformant(Evas_Object * parent)
-{
-	Evas_Object *conform = NULL;
-	elm_win_conformant_set(parent, 1);
-	conform = elm_conformant_add(parent);
-	elm_object_style_set(conform, "internal_layout");
-	evas_object_show(conform);
-
-	return conform;
-}
-
-static void _openlock_setting_pw_done_button_changed(void *data,
-						     Evas_Object * obj, void *e)
-{
-	openlock_setting_appdata *openlock_setting_data =
-	    (openlock_setting_appdata *) data;
-
-	if (!openlock_setting_data) {
-		return;
-	}
-	int length = strlen(elm_entry_entry_get(obj));
-
-	if (length == 0) {
-		elm_object_disabled_set(done_button, EINA_TRUE);
-	} else {
-		elm_object_disabled_set(done_button, EINA_FALSE);
-	}
-
-	if (elm_object_focus_get(obj)) {
-		if (elm_entry_is_empty(obj)) {
-			elm_object_signal_emit
-			    (openlock_setting_data->editfield_layout,
-			     "elm,state,eraser,hide", "elm");
-		} else {
-			elm_object_signal_emit
-			    (openlock_setting_data->editfield_layout,
-			     "elm,state,eraser,show", "elm");
-		}
-	}
-}
-
-static void _openlock_setting_pw_focused_cb(void *data, Evas_Object * obj,
-					    void *event_info)
-{
-	if (!elm_entry_is_empty(obj)) {
-		elm_object_signal_emit(data, "elm,state,eraser,show", "elm");
-	}
-	elm_object_signal_emit(data, "elm,state,guidetext,hide", "elm");
-}
-
-static void _openlock_setting_pw_unfocused_cb(void *data, Evas_Object * obj,
-					      void *event_info)
-{
-	if (elm_entry_is_empty(obj)) {
-		elm_object_signal_emit(data, "elm,state,guidetext,show", "elm");
-	}
-	elm_object_signal_emit(data, "elm,state,eraser,hide", "elm");
-}
-
-static void _openlock_setting_pw_eraser_clicked_cb(void *data,
-						   Evas_Object * obj,
-						   const char *emission,
-						   const char *source)
-{
-	elm_entry_entry_set(data, "");
-}
-
-static Evas_Object *_openlock_setting_pw_editfield_create(Evas_Object * parent,
-							  void *data)
-{
-	Evas_Object *layout = NULL;
-	Evas_Object *entry = NULL;
-	openlock_setting_appdata *openlock_setting_data =
-	    (openlock_setting_appdata *) data;
-	static Elm_Entry_Filter_Limit_Size limit_filter_data;
-
-	limit_filter_data.max_char_count = 15;	/* hard code for demo */
-	limit_filter_data.max_byte_count = 0;
-
-	layout = elm_layout_add(parent);
-	elm_layout_theme_set(layout, "layout", "editfield", "title");
-
-	entry = elm_entry_add(parent);
-	elm_entry_scrollable_set(entry, EINA_TRUE);
-	elm_entry_single_line_set(entry, EINA_TRUE);
-	elm_entry_password_set(entry, EINA_TRUE);
-	elm_entry_input_panel_layout_set(entry,
-					 ELM_INPUT_PANEL_LAYOUT_NUMBERONLY);
-	elm_entry_markup_filter_append(entry, elm_entry_filter_limit_size,
-				       &limit_filter_data);
-	elm_object_focus_set(entry, EINA_TRUE);
-	evas_object_show(entry);
-	evas_object_smart_callback_add(entry, "changed",
-				       _openlock_setting_pw_done_button_changed,
-				       openlock_setting_data);
-	evas_object_smart_callback_add(entry, "focused",
-				       _openlock_setting_pw_focused_cb, layout);
-	evas_object_smart_callback_add(entry, "unfocused",
-				       _openlock_setting_pw_unfocused_cb,
-				       layout);
-
-	elm_object_part_content_set(layout, "elm.swallow.content", entry);
-	elm_object_part_text_set(layout, "elm.guidetext", "");
-	elm_object_signal_callback_add(layout, "elm,eraser,clicked", "elm",
-				       _openlock_setting_pw_eraser_clicked_cb,
-				       entry);
-
-	Ecore_IMF_Context *imf_context =
-			(Ecore_IMF_Context *) elm_entry_imf_context_get(entry);
-	if (imf_context) {
-		ecore_imf_context_input_panel_show(imf_context);
-	}
-	elm_object_focus_set(entry, EINA_TRUE);
-
-	return layout;
-}
-
-static Evas_Object *_openlock_setting_pw_editfield_entry_get(Evas_Object *
-							     parent)
-{
-	Evas_Object *entry = NULL;
-
-	entry = elm_object_part_content_get(parent, "elm.swallow.content");
-
-	return entry;
-}
-
-static char *_openlock_setting_pw_gl_label_get_title(void *data,
-						     Evas_Object * obj,
-						     const char *part)
-{
-	openlock_setting_appdata *openlock_setting_data =
-	    (openlock_setting_appdata *) data;
-	char buf[50] = { 0, };
-
-	if (!openlock_setting_data || !part) {
-		return NULL;
-	}
-
-	if (!strcmp(part, "elm.text")) {
-		snprintf(buf, sizeof(buf), "%s", "Enter Password");	/* hard code for demo */
-		return strdup(buf);
-	}
-	return NULL;
-}
-
-static Evas_Object *_openlock_setting_pw_gl_icon_get(void *data,
-						     Evas_Object * obj,
-						     const char *part)
-{
-	Evas_Object *layout = NULL;
-	openlock_setting_appdata *openlock_setting_data =
-	    (openlock_setting_appdata *) data;
-
-	if (!openlock_setting_data || !part) {
-		return NULL;
-	}
-
-	if (!strcmp(part, "elm.icon")) {
-		layout =
-		    _openlock_setting_pw_editfield_create(obj,
-							  openlock_setting_data);
-		openlock_setting_data->editfield_layout = layout;
-
-		return layout;
-
-	}
-	return NULL;
-}
-
-static void _openlock_setting_pw_list_set_styles()
-{
-	itc_label.item_style = "dialogue/title";
-	itc_label.func.text_get = _openlock_setting_pw_gl_label_get_title;
-	itc_label.func.content_get = NULL;
-	itc_label.func.state_get = NULL;
-	itc_label.func.del = NULL;
-
-	itc_entry.item_style = "dialogue/1icon";
-	itc_entry.func.text_get = NULL;
-	itc_entry.func.content_get = _openlock_setting_pw_gl_icon_get;
-	itc_entry.func.state_get = NULL;
-	itc_entry.func.del = NULL;
-}
-
-static void _openlock_setting_pw_back_cb(void *data, Evas_Object * obj,
-					 void *event_info)
-{
-	openlock_setting_appdata *openlock_setting_data =
-	    (openlock_setting_appdata *) data;
-	openlock_ug_data *openlock_data = NULL;
-
-	if (!openlock_setting_data) {
-		return;
-	}
-
-	openlock_data = openlock_setting_data->openlock_data;
-	if (!openlock_data) {
-		return;
-	}
-	OPENLOCKS_DBG("_openlock_setting_pw_back_cb\n");
-	openlock_setting_data->count = 0;
-
-	elm_naviframe_item_pop(openlock_data->navi_bar);
-	if (openlock_setting_data->editfield_layout) {
-		evas_object_del(openlock_setting_data->editfield_layout);
-		openlock_setting_data->editfield_layout = NULL;
-	}
-	if (openlock_setting_data->genlist) {
-		evas_object_del(openlock_setting_data->genlist);
-		openlock_setting_data->genlist = NULL;
-	}
-	if (openlock_setting_data->ly) {
-		evas_object_del(openlock_setting_data->ly);
-		openlock_setting_data->ly = NULL;
-	}
-}
-
-static Eina_Bool _openlock_setting_pw_input_panel_show_idler(void *data)
-{
-	Evas_Object *entry = (Evas_Object *) data;
-
-	OPENLOCKS_DBG("_openlock_setting_pw_input_panel_show_idler");
-
-	elm_object_focus_set(entry, EINA_TRUE);
-
-	return ECORE_CALLBACK_CANCEL;
-}
-
-static void _openlock_setting_pw_imf_context_input_panel_show(void *data)
-{
-	openlock_setting_appdata *openlock_setting_data =
-			(openlock_setting_appdata *) data;
-	Evas_Object *entry = NULL;
-
-	if (!openlock_setting_data) {
-		return;
-	}
-
-	OPENLOCKS_DBG("_openlock_setting_pw_imf_context_input_panel_show\n");
-
-	entry = _openlock_setting_pw_editfield_entry_get(
-			openlock_setting_data->editfield_layout);
-	evas_object_show(entry);
-
-	ecore_idler_add(_openlock_setting_pw_input_panel_show_idler, entry);
-}
-
-static void _openlock_setting_pw_imf_context_input_panel_hide(void *data)
-{
-	openlock_setting_appdata *openlock_setting_data =
-			(openlock_setting_appdata *) data;
-	Evas_Object *entry = NULL;
-
-	if (!openlock_setting_data) {
-		return;
-	}
-
-	OPENLOCKS_DBG("_openlock_setting_pw_imf_context_input_panel_hide\n");
-
-	entry = _openlock_setting_pw_editfield_entry_get(
-			openlock_setting_data->editfield_layout);
-	evas_object_hide(entry);
-
-	elm_object_focus_set(entry, EINA_FALSE);
-}
-
-static void _openlock_setting_pw_destroy_popup_cb(void *data, Evas_Object * obj,
-						  void *e)
-{
-	openlock_setting_appdata *openlock_setting_data =
-	    (openlock_setting_appdata *) data;
-	Evas_Object *popup = NULL;
-
-	OPENLOCKS_DBG("_openlock_setting_pw_destroy_popup_cb\n");
-	_openlock_setting_pw_imf_context_input_panel_show
-	    (openlock_setting_data);
-
-	if (!openlock_setting_data) {
-		return;
-	}
-
-	popup = openlock_setting_data->popup;
-	if (popup) {
-		evas_object_del(popup);
-		popup = NULL;
-	}
-}
-
-static void _openlock_setting_pw_show_popup(void *data, const char *mesg)
-{
-	openlock_setting_appdata *openlock_setting_data =
-	    (openlock_setting_appdata *) data;
-	openlock_ug_data *openlock_data = NULL;
-	Evas_Object *popup = NULL;
-
-	if (!openlock_setting_data) {
-		return;
-	}
-	openlock_data = openlock_setting_data->openlock_data;
-	if (!openlock_data) {
-		return;
-	}
-
-	OPENLOCKS_DBG("_openlock_setting_pw_show_popup\n");
-
-	_openlock_setting_pw_imf_context_input_panel_hide
-	    (openlock_setting_data);
-	popup = elm_popup_add(openlock_data->win_main);
-	openlock_setting_data->popup = popup;
-	evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND,
-					 EVAS_HINT_EXPAND);
-	elm_object_text_set(popup, mesg);
-	elm_popup_timeout_set(popup, 3);
-	evas_object_smart_callback_add(popup, "timeout",
-				       _openlock_setting_pw_destroy_popup_cb,
-				       openlock_setting_data);
-	evas_object_show(popup);
-}
-
-static void _openlock_setting_pw_set_str(char **s, const char *str)
-{
-	if (s == NULL)
-		return;
-
-	if (*s)
-		free(*s);
-
-	if (str && str[0] != '\0')
-		*s = strdup(str);
-	else
-		*s = NULL;
-}
-
-static void _openlock_setting_pw_done_cb(void *data, Evas_Object * obj, void *e)
-{
-	openlock_setting_appdata *openlock_setting_data =
-	    (openlock_setting_appdata *) data;
-	openlock_ug_data *openlock_data = NULL;
-	Evas_Object *entry = NULL;
-	Evas_Object *editfield_layout = NULL;
-	char *str = NULL;
-
-	if (!openlock_setting_data) {
-		return;
-	}
-
-	OPENLOCKS_DBG("_openlock_setting_pw_done_cb\n");
-	editfield_layout = openlock_setting_data->editfield_layout;
-	entry =
-	    _openlock_setting_pw_editfield_entry_get
-	    (openlock_setting_data->editfield_layout);
-
-	_openlock_setting_pw_set_str(&str, elm_entry_entry_get(entry));
-	OPENLOCKS_DBG("str = %s\n", str);
-	if (!str) {
-		_openlock_setting_pw_show_popup(openlock_setting_data, "Wrong Password!");	/* hard code for demo */
-		if (entry) {
-			elm_object_part_text_set(editfield_layout,
-						 "elm.guidetext", "");
-			elm_entry_entry_set(entry, "");
-		}
-	} else {
-		if (strcmp(str, "16777216") == 0) {	/* hard code for demo */
-			OPENLOCKS_DBG("right pw\n");
-			OPENLOCKS_DBG("openlock_setting_data->index: %d",
-				      openlock_setting_data->index);
-			if (openlock_setting_data != NULL
-			    && openlock_setting_data->pkg_name != NULL) {
-				vconf_set_str(VCONF_PRIVATE_LOCKSCREEN_PKGNAME,
-					      openlock_setting_data->pkg_name);
-				OPENLOCKS_DBG("vconf pkgname set : %s",
-					      openlock_setting_data->pkg_name);
-			}
-			openlock_data = openlock_setting_data->openlock_data;
-			if (!openlock_data) {
-				return;
-			}
-			OPENLOCKS_DBG("_openlock_setting_pw_done_cb\n");
-			openlock_setting_data->count = 0;	/* reset the count */
-
-			elm_naviframe_item_pop(openlock_data->navi_bar);
-			if (openlock_setting_data->editfield_layout) {
-				evas_object_del
-				    (openlock_setting_data->editfield_layout);
-				openlock_setting_data->editfield_layout = NULL;
-			}
-			if (openlock_setting_data->genlist) {
-				evas_object_del(openlock_setting_data->genlist);
-				openlock_setting_data->genlist = NULL;
-			}
-			if (openlock_setting_data->ly) {
-				evas_object_del(openlock_setting_data->ly);
-				openlock_setting_data->ly = NULL;
-			}
-		} else {
-			_openlock_setting_pw_show_popup(openlock_setting_data, "Wrong Password!");	/* hard code for demo */
-			if (entry) {
-				elm_object_part_text_set(editfield_layout,
-							 "elm.guidetext", "");
-				elm_entry_entry_set(entry, "");
-			}
-		}
-	}
-}
-
-void
-openlock_setting_pw_create_view(openlock_setting_appdata *
-				openlock_setting_data)
-{
-	Evas_Object *navi_bar = NULL;
-	Evas_Object *win_main = NULL;
-	Evas_Object *genlist = NULL;
-	Evas_Object *ly = NULL;
-	Evas_Object *cancel_button = NULL;
-	Evas_Object *back_button = NULL;
-	Elm_Object_Item *genlist_item = NULL;
-	Elm_Object_Item *navi_it = NULL;
-	openlock_ug_data *openlock_data = NULL;
-
-	if (!openlock_setting_data) {
-		return;
-	}
-
-	openlock_data = openlock_setting_data->openlock_data;
-	if (!openlock_data) {
-		return;
-	}
-
-	OPENLOCKS_DBG("openlock_setting_pw_create_view begin\n");
-
-	win_main = openlock_data->win_main;
-	navi_bar = openlock_data->navi_bar;
-
-	ly = _openlock_setting_pw_create_conformant(win_main);
-	openlock_setting_data->ly = ly;
-
-	/* genlist */
-	genlist = elm_genlist_add(navi_bar);
-	_openlock_setting_pw_list_set_styles();
-	genlist_item =
-	    elm_genlist_item_append(genlist, &itc_label,
-				    (void *)openlock_setting_data, NULL,
-				    ELM_GENLIST_ITEM_NONE, NULL, NULL);
-	elm_genlist_item_select_mode_set(genlist_item, EINA_TRUE);
-
-	genlist_item =
-	    elm_genlist_item_append(genlist, &itc_entry,
-				    (void *)openlock_setting_data, NULL,
-				    ELM_GENLIST_ITEM_NONE, NULL, NULL);
-	elm_genlist_item_select_mode_set(genlist_item, EINA_TRUE);
-
-	evas_object_show(genlist);
-	elm_object_content_set(ly, genlist);
-	openlock_setting_data->genlist = genlist;
-
-	/* Done button */
-	done_button = elm_button_add(navi_bar);
-	elm_object_style_set(done_button, "naviframe/title/default");
-	elm_object_text_set(done_button, "Done");	/* hard code for demo */
-	elm_object_disabled_set(done_button, EINA_TRUE);
-	evas_object_smart_callback_add(done_button, "clicked",
-				       _openlock_setting_pw_done_cb,
-				       openlock_setting_data);
-
-	/* Cancel button */
-	cancel_button = elm_button_add(navi_bar);
-	elm_object_style_set(cancel_button, "naviframe/title/default");
-	elm_object_text_set(cancel_button, "Cancel"); /* hard code for demo */
-	elm_object_disabled_set(cancel_button, EINA_FALSE);
-	evas_object_smart_callback_add(cancel_button, "clicked",
-			_openlock_setting_pw_back_cb, openlock_setting_data);
-
-	/* Set navigation objects and push */
-	navi_it = elm_naviframe_item_push(navi_bar, "Enter Password", NULL, NULL,
-			ly, NULL); /* hard code for demo */
-	elm_object_item_part_content_set(navi_it, "title_right_btn", done_button);
-	elm_object_item_part_content_set(navi_it, "title_left_btn", cancel_button);
-
-	/* Remove <- button */
-	back_button = elm_object_item_part_content_get(navi_it, "prev_btn");
-	if (back_button != NULL) {
-		elm_object_item_part_content_set(navi_it, "prev_btn", NULL);
-		if (back_button != NULL) {
-			evas_object_del(back_button);
-		}
-	}
-}
diff --git a/lock-setting/lockapp-setting/src/openlock-setting-util.c b/lock-setting/lockapp-setting/src/openlock-setting-util.c
deleted file mode 100755
index 3722b2b..0000000
--- a/lock-setting/lockapp-setting/src/openlock-setting-util.c
+++ /dev/null
@@ -1,65 +0,0 @@
- /*
-  * Copyright 2012  Samsung Electronics Co., Ltd
-  *
-  * Licensed under the Flora License, Version 1.0 (the "License");
-  * you may not use this file except in compliance with the License.
-  * You may obtain a copy of the License at
-  *
-  *     http://www.tizenopensource.org/license
-  *
-  * Unless required by applicable law or agreed to in writing, software
-  * distributed under the License is distributed on an "AS IS" BASIS,
-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  * See the License for the specific language governing permissions and
-  * limitations under the License.
-  */
-
-
-
-#include "openlock-setting-debug.h"
-#include "openlock-setting-util.h"
-
-Evas_Object *openlock_setting_util_create_navigation(Evas_Object * parent)
-{
-	Evas_Object *navi_bar = NULL;
-
-	if (parent == NULL) {
-		OPENLOCKS_WARN("Parent is null.");
-		return NULL;
-	}
-
-	navi_bar = elm_naviframe_add(parent);
-	if (navi_bar == NULL) {
-		OPENLOCKS_ERR("Cannot add naviagtionbar.");
-		return NULL;
-	}
-
-	elm_object_part_content_set(parent, "elm.swallow.content", navi_bar);
-
-	evas_object_show(navi_bar);
-
-	return navi_bar;
-}
-
-Evas_Object *openlock_setting_util_create_layout(Evas_Object * parent)
-{
-	Evas_Object *layout = NULL;
-
-	if (parent == NULL) {
-		OPENLOCKS_WARN("Parent is null.");
-		return NULL;
-	}
-
-	layout = elm_layout_add(parent);
-	if (layout == NULL) {
-		OPENLOCKS_ERR("Cannot add layout.");
-		return NULL;
-	}
-
-	evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND,
-					 EVAS_HINT_EXPAND);
-
-	evas_object_show(layout);
-
-	return layout;
-}
diff --git a/lock-setting/lockapp-setting/src/openlock-setting.c b/lock-setting/lockapp-setting/src/openlock-setting.c
deleted file mode 100755
index 4b6184a..0000000
--- a/lock-setting/lockapp-setting/src/openlock-setting.c
+++ /dev/null
@@ -1,217 +0,0 @@
- /*
-  * Copyright 2012  Samsung Electronics Co., Ltd
-  *
-  * Licensed under the Flora License, Version 1.0 (the "License");
-  * you may not use this file except in compliance with the License.
-  * You may obtain a copy of the License at
-  *
-  *     http://www.tizenopensource.org/license
-  *
-  * Unless required by applicable law or agreed to in writing, software
-  * distributed under the License is distributed on an "AS IS" BASIS,
-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  * See the License for the specific language governing permissions and
-  * limitations under the License.
-  */
-
-
-
-#ifndef UG_MODULE_API
-#define UG_MODULE_API __attribute__ ((visibility("default")))
-#endif
-
-#include <Elementary.h>
-#include <ui-gadget-module.h>
-
-#include "openlock-setting.h"
-#include "openlock-setting-util.h"
-#include "openlock-setting-main.h"
-
-static Evas_Object *create_bg(Evas_Object * parent)
-{
-	Evas_Object *bg = elm_bg_add(parent);
-
-	evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND,
-					 EVAS_HINT_EXPAND);
-	elm_object_style_set(bg, "group_list");
-
-	elm_object_part_content_set(parent, "elm.swallow.bg", bg);
-	evas_object_show(bg);
-
-	return bg;
-}
-
-static Evas_Object *create_fullview(Evas_Object * parent,
-				    openlock_ug_data * openlock_data)
-{
-	Evas_Object *base = NULL;
-	Evas_Object *navi_bar = NULL;
-	Evas_Object *bg = NULL;
-
-	base = openlock_setting_util_create_layout(parent);
-
-	elm_layout_theme_set(base, "layout", "application", "default");
-	elm_win_resize_object_add(parent, base);
-	elm_win_indicator_mode_set(parent, ELM_WIN_INDICATOR_SHOW);
-
-	bg = create_bg(base);
-
-	navi_bar = openlock_setting_util_create_navigation(base);
-	openlock_data->navi_bar = navi_bar;
-
-	openlock_setting_main_create_view(openlock_data);
-
-	return base;
-}
-
-static Evas_Object *create_frameview(Evas_Object * parent,
-				     openlock_ug_data * openlock_data)
-{
-	Evas_Object *base = NULL;
-
-	/* Create Frame view */
-
-	return base;
-}
-
-static void *on_create(ui_gadget_h ug, enum ug_mode mode, service_h service,
-		       void *priv)
-{
-	Evas_Object *parent = NULL;
-	Evas_Object *win_main = NULL;
-	openlock_ug_data *openlock_data = NULL;
-
-	if (!ug || !priv)
-		return NULL;
-
-	bindtextdomain("openlock-setting", "/opt/ug/res/locale");
-
-	openlock_data = priv;
-	openlock_data->ug = ug;
-
-	parent = ug_get_parent_layout(ug);
-	if (!parent)
-		return NULL;
-
-	win_main = ug_get_window();
-	if (!win_main) {
-		return NULL;
-	}
-
-	openlock_data->win_main = win_main;
-
-	if (mode == UG_MODE_FULLVIEW)
-		openlock_data->base = create_fullview(parent, openlock_data);
-	else
-		openlock_data->base = create_frameview(parent, openlock_data);
-
-	/* Add del callback for base layout */
-
-	return openlock_data->base;
-}
-
-static void on_start(ui_gadget_h ug, service_h service, void *priv)
-{
-}
-
-static void on_pause(ui_gadget_h ug, service_h service, void *priv)
-{
-
-}
-
-static void on_resume(ui_gadget_h ug, service_h service, void *priv)
-{
-
-}
-
-static void on_destroy(ui_gadget_h ug, service_h service, void *priv)
-{
-	openlock_ug_data *openlock_data;
-
-	if (!ug || !priv)
-		return;
-
-	openlock_data = priv;
-	evas_object_del(openlock_data->base);
-	openlock_data->base = NULL;
-}
-
-static void on_message(ui_gadget_h ug, service_h msg, service_h service,
-		       void *priv)
-{
-}
-
-static void on_event(ui_gadget_h ug, enum ug_event event, service_h service,
-		     void *priv)
-{
-	switch (event) {
-	case UG_EVENT_LOW_MEMORY:
-		break;
-	case UG_EVENT_LOW_BATTERY:
-		break;
-	case UG_EVENT_LANG_CHANGE:
-		break;
-	case UG_EVENT_ROTATE_PORTRAIT:
-		break;
-	case UG_EVENT_ROTATE_PORTRAIT_UPSIDEDOWN:
-		break;
-	case UG_EVENT_ROTATE_LANDSCAPE:
-		break;
-	case UG_EVENT_ROTATE_LANDSCAPE_UPSIDEDOWN:
-		break;
-	default:
-		break;
-	}
-}
-
-static void on_key_event(ui_gadget_h ug, enum ug_key_event event,
-			 service_h service, void *priv)
-{
-	if (!ug)
-		return;
-
-	switch (event) {
-	case UG_KEY_EVENT_END:
-		ug_destroy_me(ug);
-		break;
-	default:
-		break;
-	}
-}
-
-UG_MODULE_API int UG_MODULE_INIT(struct ug_module_ops *ops)
-{
-	openlock_ug_data *openlock_data;
-
-	if (!ops)
-		return -1;
-
-	openlock_data = calloc(1, sizeof(openlock_ug_data));
-	if (!openlock_data)
-		return -1;
-
-	ops->create = on_create;
-	ops->start = on_start;
-	ops->pause = on_pause;
-	ops->resume = on_resume;
-	ops->destroy = on_destroy;
-	ops->message = on_message;
-	ops->event = on_event;
-	ops->key_event = on_key_event;
-	ops->priv = openlock_data;
-	ops->opt = UG_OPT_INDICATOR_ENABLE;
-
-	return 0;
-}
-
-UG_MODULE_API void UG_MODULE_EXIT(struct ug_module_ops *ops)
-{
-	openlock_ug_data *openlock_data;
-
-	if (!ops)
-		return;
-
-	openlock_data = ops->priv;
-	if (openlock_data)
-		free(openlock_data);
-}
diff --git a/lock-setting/lockscreen-options/CMakeLists.txt b/lock-setting/lockscreen-options/CMakeLists.txt
index e4789c1..09dde8d 100755
--- a/lock-setting/lockscreen-options/CMakeLists.txt
+++ b/lock-setting/lockscreen-options/CMakeLists.txt
@@ -15,10 +15,6 @@ SET(SRCS
 	./src/lockscreen-options.c
 	./src/lockscreen-options-util.c
 	./src/lockscreen-options-main.c
-	./src/lockscreen-options-shortcuts.c
-	./src/lockscreen-options-shortcuts-edit.c
-	./src/lockscreen-options-dualclock.c
-	./src/lockscreen-options-locktitle.c
 )
 
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
@@ -37,18 +33,8 @@ SET(CMAKE_C_FLAGS ${CMAKE_CXX_FLAGS})
 
 ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
 
-ADD_CUSTOM_TARGET(lockscreen-options.edj COMMAND edje_cc -id ${CMAKE_CURRENT_SOURCE_DIR}/res/images
-                        ${CMAKE_CURRENT_SOURCE_DIR}/res/edje/lockscreen-options.edc
-                        ${CMAKE_CURRENT_BINARY_DIR}/lockscreen-options.edj
-                DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/res/edje/lockscreen-options.edc
-)
-
 ADD_LIBRARY(${PROJECT_NAME} SHARED ${SRCS})
 SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES SOVERSION 0.1.0)
 TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_lock-screen-options_LDFLAGS})
 
-ADD_DEPENDENCIES(${PROJECT_NAME} lockscreen-options.edj)
-
 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIBDIR})
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/lockscreen-options.edj DESTINATION ${EDJEDIR}/ug-lockscreen-options-efl)
-INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/res/images/ DESTINATION ${IMAGEDIR}/ug-lockscreen-options-efl)
diff --git a/lock-setting/lockscreen-options/include/lockscreen-options-debug.h b/lock-setting/lockscreen-options/include/lockscreen-options-debug.h
index a25f85e..750a759 100755
--- a/lock-setting/lockscreen-options/include/lockscreen-options-debug.h
+++ b/lock-setting/lockscreen-options/include/lockscreen-options-debug.h
@@ -36,7 +36,7 @@
 #define LOCKOPTIONS_DBG(fmt, args...) do{printf("[LOCKOPTIONS_DBG][%s(%d)] "fmt " \n", __FILE__, __LINE__, ##args);}while(0);
 #define LOCKOPTIONS_WARN(fmt, args...) do{printf("[LOCKOPTIONS_WARN][%s(%d)] "fmt " \n", __FILE__, __LINE__, ##args);}while(0);
 #define LOCKOPTIONS_ERR(fmt, args...) do{printf("[LOCKOPTIONS_ERR][%s(%d)] "fmt " \n", __FILE__, __LINE__, ##args);}while(0);
-#endif				/* LOCKD_USING_PLATFORM_DEBUG */
+#endif
 
 #ifndef TRUE
 #define TRUE 1
@@ -45,4 +45,4 @@
 #define FALSE 0
 #endif
 
-#endif				/* __OPENLOCK_SETTING_DEBUG_H__ */
+#endif
diff --git a/lock-setting/lockscreen-options/include/lockscreen-options-dualclock.h b/lock-setting/lockscreen-options/include/lockscreen-options-dualclock.h
deleted file mode 100755
index 84447f7..0000000
--- a/lock-setting/lockscreen-options/include/lockscreen-options-dualclock.h
+++ /dev/null
@@ -1,28 +0,0 @@
- /*
-  * Copyright 2012  Samsung Electronics Co., Ltd
-  *
-  * Licensed under the Flora License, Version 1.0 (the "License");
-  * you may not use this file except in compliance with the License.
-  * You may obtain a copy of the License at
-  *
-  *     http://www.tizenopensource.org/license
-  *
-  * Unless required by applicable law or agreed to in writing, software
-  * distributed under the License is distributed on an "AS IS" BASIS,
-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  * See the License for the specific language governing permissions and
-  * limitations under the License.
-  */
-
-

-

-#ifndef __LOCKSCREEN_OPTIONS_DUALCLOCK_H__

-#define __LOCKSCREEN_OPTIONS_DUALCLOCK_H__

-

-#include <Elementary.h>

-#include "lockscreen-options.h"

-

-void lockscreen_options_dualclock_create_view(lockscreen_options_ug_data * ug_data);

-

-#endif				/* __OPENLOCK_SETTING_MAIN_H__ */

-

diff --git a/lock-setting/lockscreen-options/include/lockscreen-options-locktitle.h b/lock-setting/lockscreen-options/include/lockscreen-options-locktitle.h
deleted file mode 100755
index 28f1910..0000000
--- a/lock-setting/lockscreen-options/include/lockscreen-options-locktitle.h
+++ /dev/null
@@ -1,26 +0,0 @@
- /*
-  * Copyright 2012  Samsung Electronics Co., Ltd
-  *
-  * Licensed under the Flora License, Version 1.0 (the "License");
-  * you may not use this file except in compliance with the License.
-  * You may obtain a copy of the License at
-  *
-  *     http://www.tizenopensource.org/license
-  *
-  * Unless required by applicable law or agreed to in writing, software
-  * distributed under the License is distributed on an "AS IS" BASIS,
-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  * See the License for the specific language governing permissions and
-  * limitations under the License.
-  */
-
-

-

-#ifndef __LOCKSCREEN_OPTIONS_LOCKTITLE_H__

-#define __LOCKSCREEN_OPTIONS_LOCKTITLE_H__

-

-#include "lockscreen-options.h"

-

-void lockscreen_options_locktitle_create_view(lockscreen_options_ug_data * ug_data);

-

-#endif				/* __LOCKSCREEN_OPTIONS_LOCKTITLE_H__ */

diff --git a/lock-setting/lockscreen-options/include/lockscreen-options-main.h b/lock-setting/lockscreen-options/include/lockscreen-options-main.h
index a1c0c49..a57e586 100755
--- a/lock-setting/lockscreen-options/include/lockscreen-options-main.h
+++ b/lock-setting/lockscreen-options/include/lockscreen-options-main.h
@@ -25,4 +25,4 @@
 void lockscreen_options_main_create_view(lockscreen_options_ug_data * ug_data);
 void lockscreen_options_main_update_view();
 
-#endif				/* __OPENLOCK_SETTING_MAIN_H__ */
+#endif
diff --git a/lock-setting/lockscreen-options/include/lockscreen-options-shortcuts-edit.h b/lock-setting/lockscreen-options/include/lockscreen-options-shortcuts-edit.h
deleted file mode 100755
index 497b8cc..0000000
--- a/lock-setting/lockscreen-options/include/lockscreen-options-shortcuts-edit.h
+++ /dev/null
@@ -1,25 +0,0 @@
- /*
-  * Copyright 2012  Samsung Electronics Co., Ltd
-  *
-  * Licensed under the Flora License, Version 1.0 (the "License");
-  * you may not use this file except in compliance with the License.
-  * You may obtain a copy of the License at
-  *
-  *     http://www.tizenopensource.org/license
-  *
-  * Unless required by applicable law or agreed to in writing, software
-  * distributed under the License is distributed on an "AS IS" BASIS,
-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  * See the License for the specific language governing permissions and
-  * limitations under the License.
-  */
-

-

-

-#ifndef __LOCKSCREEN_OPTIONS_SHORTCUTS_EDIT_H__

-#define __LOCKSCREEN_OPTIONS_SHORTCUTS_EDIT_H__

-

-void lockscreen_options_shortcuts_create_edit_view(void *data);

-

-#endif				/* __LOCKSCREEN_OPTIONS_SHORTCUTS_EDIT_H__ */

-

diff --git a/lock-setting/lockscreen-options/include/lockscreen-options-shortcuts.h b/lock-setting/lockscreen-options/include/lockscreen-options-shortcuts.h
deleted file mode 100755
index f7e6d22..0000000
--- a/lock-setting/lockscreen-options/include/lockscreen-options-shortcuts.h
+++ /dev/null
@@ -1,26 +0,0 @@
- /*
-  * Copyright 2012  Samsung Electronics Co., Ltd
-  *
-  * Licensed under the Flora License, Version 1.0 (the "License");
-  * you may not use this file except in compliance with the License.
-  * You may obtain a copy of the License at
-  *
-  *     http://www.tizenopensource.org/license
-  *
-  * Unless required by applicable law or agreed to in writing, software
-  * distributed under the License is distributed on an "AS IS" BASIS,
-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  * See the License for the specific language governing permissions and
-  * limitations under the License.
-  */
-
-
-
-#ifndef __LOCKSCREEN_OPTIONS_SHORTCUTS_H__
-#define __LOCKSCREEN_OPTIONS_SHORTCUTS_H__
-
-void lockscreen_options_shortcuts_create_view(void *data);
-void lockscreen_options_shortcuts_update_view();
-Eina_Bool lockscreen_options_shortcuts_check_items();
-
-#endif				/* __LOCKSCREEN_OPTIONS_SHORTCUTS_H__ */
diff --git a/lock-setting/lockscreen-options/include/lockscreen-options-util.h b/lock-setting/lockscreen-options/include/lockscreen-options-util.h
index 0fb97bb..0a7a962 100755
--- a/lock-setting/lockscreen-options/include/lockscreen-options-util.h
+++ b/lock-setting/lockscreen-options/include/lockscreen-options-util.h
@@ -21,8 +21,6 @@
 
 #include <Elementary.h>
 
-#define USE_TITLE_AND_CAMERA 0
-
 enum {
 	IDS_COM_SK_OK = 0,
 	IDS_COM_SK_CANCEL,
@@ -30,35 +28,13 @@ enum {
 };
 
 enum {
-	IDS_LOCKSCREEN_OPTIONS_SHORTCUTS =
-	    IDS_LOCKSCREEN_OPTIONS_SYSTEM_STRING_MAX,
-	IDS_LOCKSCREEN_OPTIONS_SHORTCUTS_HELP,
-#if USE_TITLE_AND_CAMERA
-	IDS_LOCKSCREEN_OPTIONS_LOCK_SCREEN_TITLE,
-	IDS_LOCKSCREEN_OPTIONS_LOCK_SCREEN_TITLE_HELP,
-#endif
-	IDS_LOCKSCREEN_OPTIONS_EVENT_NOTIFICATIONS,
+	IDS_LOCKSCREEN_OPTIONS_EVENT_NOTIFICATIONS =
+		IDS_LOCKSCREEN_OPTIONS_SYSTEM_STRING_MAX,
 	IDS_LOCKSCREEN_OPTIONS_EVENT_NOTIFICATIONS_HELP,
-	IDS_LOCKSCREEN_OPTIONS_CONTEXTAWARE_NOTI,
-	IDS_LOCKSCREEN_OPTIONS_CONTEXTAWARE_NOTI_HELP,
-#if USE_TITLE_AND_CAMERA
-	IDS_LOCKSCREEN_OPTIONS_CAMERA_QUICK_ACCESS,
-	IDS_LOCKSCREEN_OPTIONS_CAMERA_QUICK_ACCESS_HELP,
-#endif
 	IDS_LOCKSCREEN_OPTIONS_CLOCK,
-//	IDS_LOCKSCREEN_OPTIONS_DUAL_CLOCK,
-//	IDS_LOCKSCREEN_OPTIONS_DUAL_CLOCK_HELP,
-	IDS_LOCKSCREEN_OPTIONS_WEATHER,
 	IDS_LOCKSCREEN_OPTIONS_HELPTEXT,
 	IDS_LOCKSCREEN_OPTIONS_HELPTEXT_HELP,
-	IDS_LOCKSCREEN_OPTIONS_SET_SHORTCUTS,
-	IDS_LOCKSCREEN_OPTIONS_EDIT_SHORTCUTS,
-	IDS_LOCKSCREEN_OPTIONS_SET_SHORTCUTS_ON_LOCKSCREEN,
-	IDS_LOCKSCREEN_OPTIONS_TAP_SHORTCUTS,
-	IDS_LOCKSCREEN_OPTIONS_DRAG_DROP_SHORTCUTS,
-	IDS_LOCKSCREEN_OPTIONS_SELECT_APPLICATIONS,
-	IDS_LOCKSCREEN_OPTIONS_LOCK_SCREEN_TITLE_GUIDE_TEXT,
-	IDS_LOCKSCREEN_OPTIONS_APP_STRING_MAX,	/* 45 */
+	IDS_LOCKSCREEN_OPTIONS_APP_STRING_MAX,
 };
 
 Evas_Object *lockscreen_options_util_create_navigation(Evas_Object * parent);
@@ -69,4 +45,4 @@ void lockscreen_options_util_create_seperator(Evas_Object * genlist);
 void lockscreen_options_util_create_underline(Evas_Object * genlist);
 char *lockscreen_optoins_get_string(int id);
 
-#endif				/* __OPENLOCK_SETTING_UTIL_H__ */
+#endif
diff --git a/lock-setting/lockscreen-options/include/lockscreen-options.h b/lock-setting/lockscreen-options/include/lockscreen-options.h
index 2820560..7b24faa 100755
--- a/lock-setting/lockscreen-options/include/lockscreen-options.h
+++ b/lock-setting/lockscreen-options/include/lockscreen-options.h
@@ -61,4 +61,4 @@ typedef struct _lockscreen_options_ug_data {
 
 } lockscreen_options_ug_data;
 
-#endif				/* __lockscreen_options_H__ */
+#endif
diff --git a/lock-setting/lockscreen-options/res/edje/lockscreen-options-locktitle.edc b/lock-setting/lockscreen-options/res/edje/lockscreen-options-locktitle.edc
deleted file mode 100755
index eced5a4..0000000
--- a/lock-setting/lockscreen-options/res/edje/lockscreen-options-locktitle.edc
+++ /dev/null
@@ -1,432 +0,0 @@
- /*
-  * Copyright 2012  Samsung Electronics Co., Ltd
-  *
-  * Licensed under the Flora License, Version 1.0 (the "License");
-  * you may not use this file except in compliance with the License.
-  * You may obtain a copy of the License at
-  *
-  *     http://www.tizenopensource.org/license
-  *
-  * Unless required by applicable law or agreed to in writing, software
-  * distributed under the License is distributed on an "AS IS" BASIS,
-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  * See the License for the specific language governing permissions and
-  * limitations under the License.
-  */
-
-
-
-#define WIDTH 720
-#define HEIGHT 1280
-#define TOOLBAR_WIDTH 720
-#define TOOLBAR_HEIGHT 84
-
-#define BUTTON_BG_NORMAL_OR_PRESS(part_name, rel1_x, rel1_y, rel2_x, rel2_y, normal_icon_name, press_icon_name)\
-		part{\
-			name: part_name;\
-			type: IMAGE;\
-			mouse_events: 1;\
-			scale: 1;\
-			description{\
-				state: "default" 0.0;\
-				visible: 1;\
-				rel1 {relative: rel1_x rel1_y; to: "bg";}\
-				rel2 {relative: rel2_x rel2_y; to: "bg";}\
-				image.normal: normal_icon_name;\
-				image.border: 8 8 0 0;\
-			}\
-			description{\
-				state: "press" 0.0;\
-				inherit: "default" 0.0;\
-				image.normal: press_icon_name;\
-				image.border: 8 8 0 0;\
-			}\
-		}
-
-#define BUTTON_NORMAL_OR_PRESS(part_name, normal_icon_name, press_icon_name, part_bg_name)\
-		part{\
-			name: part_name;\
-			type: IMAGE;\
-			scale: 1;\
-			mouse_events: 1;\
-			repeat_events: 1;\
-			description{\
-				state: "default" 0.0;\
-				visible: 1;\
-				rel1 {relative: 0.0 0.0; to: part_bg_name;}\
-				rel2 {relative: 1.0 1.0; to: part_bg_name;}\
-				image.normal: normal_icon_name;\
-			}\
-			description{\
-					state: "press" 0.0;\
-					inherit: "default" 0.0;\
-					image.normal: press_icon_name;\
-				}\
-			}
-#define TOOLBAR_BUTTON_PROGRAM_SIGNAL_EMIT_1(part_name, singal_name)\
-		 program{\
-			 name: "mouse_down_"part_name;\
-			 signal: "mouse,down,1";\
-			 source: part_name;\
-			 action: STATE_SET "press" 0.0;\
-			 target: part_name;\
-		 }\
-		 program{\
-			 name: "send_event_"part_name;\
-			 signal: "mouse,clicked,1";\
-			 source: part_name;\
-			 action: SIGNAL_EMIT singal_name "";\
-		 }\
-		 program{\
-			 name: "mouse_up_"part_name;\
-			 signal: "mouse,up,1";\
-			 source: part_name;\
-			 action: STATE_SET "default" 0.0;\
-			 target: part_name;\
-		 }
-#define TOOLBAR_BUTTON_PROGRAM_SIGNAL_EMIT_2(part_name, singal_name)\
-		 program{\
-			 name: "send_event_"part_name;\
-			 signal: "mouse,clicked,1";\
-			 source: part_name;\
-			 action: SIGNAL_EMIT singal_name "";\
-		 }
-#define COLOR_RECT(part_name, relative_part_name, color_class_name)\
-	part{\
-		name: part_name;\
-		type: RECT;\
-		scale: 1;\
-		description{\
-			state: "default" 0.0;\
-			rel1 { relative: 9/56 40/60; to: relative_part_name;}\
-			rel2 { relative: 49/56 50/60; to: relative_part_name;}\
-			color_class: color_class_name;\
-		}\
-	}
-
-group{
-	images{
-		image: "B09_Add Text_sip_option_bg.png" COMP;
-	}
-	name: "lockscreen.options.locktitle.main";
-	parts{
-		part{
-			name: "background";
-			type: RECT;
-			scale: 1;
-			description{
-				state: "default" 0.0;
-				visible: 0;
-				rel1 { relative: 0.0 0.0; }
-				rel2 { relative: 1.0 1.0; }
-			}
-		}
-		part{
-			name: "elm.swallow.content"; /* editfield */
-			type: SWALLOW;
-			scale: 1;
-			description{
-				state: "default" 0.0;
-				min: 0 108;
-				align: 0.0 0.0;
-				rel1 { relative: 0.0 0.15; to: "background";}
-				rel2 { relative: 1.0 0.15; to: "background";}
-			}
-		}
-		part{
-			name: "toolbar.bg";
-			type: IMAGE;
-			scale: 1;
-			description{
-				state: "default" 0.0;
-				min: 0 100;
-				align: 0.0 1.0;
-				visible: 0;
-				rel1 { relative: 0.0 1.0; to: "background";}
-				rel2 { relative: 1.0 1.0; to: "background";}
-				image.normal: "B09_Add Text_sip_option_bg.png";
-				image.border: 8 8 8 8;
-			}
-		}
-		part{
-			name: "elm.swallow.toolbar";/* toolbar layout */
-			type: SWALLOW;
-			scale: 1;
-			description{
-				state: "default" 0.0;
-				visible: 0;
-				rel1 { relative: 0.0 0.0; to: "toolbar.bg";}
-				rel2 { relative: 1.0 1.0; to: "toolbar.bg";}
-			}
-		}
-		part{
-			name: "elm.swallow.selector";/* font and color selector layout */
-			type: SWALLOW;
-			scale: 1;
-			description{
-				state: "default" 0.0;
-				visible: 1;
-				rel1 { relative: 0.0 1.0; to: "toolbar.bg";}
-				rel2 { relative: 1.0 1.0; to: "background";}
-			}
-		}
-	}
-	script {
-		public message(Msg_Type:type, id, ...) {
-			custom_state(PART:"toolbar.bg", "default", 0.0);
-			custom_state(PART:"elm.swallow.toolbar", "default", 0.0);
-			if ((type == MSG_FLOAT) && (id == 1)) {
-				new Float:rel2_y = Float:getarg(2);
-				set_state_val(PART:"toolbar.bg", STATE_REL1, 0.0, rel2_y);
-				set_state_val(PART:"toolbar.bg", STATE_REL2, 1.0, rel2_y);
-			}
-			if ((type == MSG_FLOAT) && (id == 2)) {
-				set_state_val(PART:"toolbar.bg", STATE_VISIBLE, 1);
-				set_state_val(PART:"elm.swallow.toolbar", STATE_VISIBLE, 1);
-			}
-			if ((type == MSG_FLOAT) && (id == 3)) {
-				set_state_val(PART:"toolbar.bg", STATE_VISIBLE, 0);
-				set_state_val(PART:"elm.swallow.toolbar", STATE_VISIBLE, 0);
-			}
-			set_state(PART:"toolbar.bg", "custom", 0.0);
-			set_state(PART:"elm.swallow.toolbar", "custom", 0.0);
-		}
-	}
-}
-
-group{
-	images{
-		image: "B09_key_btn_01.png" COMP;
-		image: "B09_key_btn_press.png" COMP;
-		image: "B09_Add Text_sip_option_bold.png" COMP;
-		image: "B09_Add Text_sip_option_Italic.png" COMP;
-		image: "B09_Add Text_sip_option_underline.png" COMP;
-		image: "B09_Add Text_sip_option_color.png" COMP;
-		image: "B09_Add Text_sip_option_style.png" COMP;
-		image: "B09_Add Text_sip_option_size.png" COMP;
-	}
-	name: "lockscreen.options.locktitle.toolbar";
-	parts{
-		part{
-			name: "bg";
-			type: RECT;
-			scale: 1;
-			description{
-				state: "default" 0.0;
-				visible: 0;
-				rel1 { relative: 0.0 0.0; }
-				rel2 { relative: 1.0 1.0; }
-			}
-		}
-		part{
-			name: "font.bg";
-			type: IMAGE;
-			mouse_events: 1;
-			scale: 1;
-			description{
-				state: "default" 0.0;
-				visible: 1;
-				rel1 {relative: 8/TOOLBAR_WIDTH 12/TOOLBAR_HEIGHT; to: "bg";}
-				rel2 {relative: 144/TOOLBAR_WIDTH 76/TOOLBAR_HEIGHT; to: "bg";}
-				image.normal: "B09_key_btn_01.png";
-				image.border: 5 5 0 0;
-			}
-			description{
-				state: "press" 0.0;
-				inherit: "default" 0.0;
-				image.normal: "B09_key_btn_press.png";
-				image.border: 5 5 0 0;
-			}
-		}
-		part{
-			name: "font";
-			type: IMAGE;
-			scale: 1;
-			mouse_events: 1;
-			repeat_events: 1;
-			description{
-				state: "default" 0.0;
-				visible: 1;
-				rel1 {relative: 0.0 0.0; to: font.bg;}
-				rel2 {relative: 1.0 1.0; to: font.bg;}
-				image.normal: "B09_Add Text_sip_option_style.png";
-			}
-			description{
-				state: "press" 0.0;
-				inherit: "default" 0.0;
-				image.normal: "B09_Add Text_sip_option_style.png";
-			}
-		}
-		part{
-			name: "size.bg";
-			type: IMAGE;
-			mouse_events: 1;
-			scale: 1;
-			description{
-				state: "default" 0.0;
-				visible: 1;
-				rel1 {relative: 160/TOOLBAR_WIDTH 12/TOOLBAR_HEIGHT; to: "bg";}
-				rel2 {relative: 240/TOOLBAR_WIDTH 76/TOOLBAR_HEIGHT; to: "bg";}
-				image.normal: B09_key_btn_01.png;
-				image.border: 5 5 0 0;
-			}
-			description{
-				state: "press" 0.0;
-				inherit: "default" 0.0;
-				image.normal: "B09_key_btn_press.png";
-				image.border: 5 5 0 0;
-			}
-		}
-		part{
-			name: "size";
-			type: IMAGE;
-			scale: 1;
-			mouse_events: 1;
-			repeat_events: 1;
-			description{
-				state: "default" 0.0;
-				visible: 1;
-				rel1 {relative: 0.0 0.0; to: size.bg;}
-				rel2 {relative: 1.0 1.0; to: size.bg;}
-				image.normal: "B09_Add Text_sip_option_size.png";
-			}
-			description{
-				state: "press" 0.0;
-				inherit: "default" 0.0;
-				image.normal: "B09_Add Text_sip_option_size.png";
-			}
-		}
-		part{
-			name: "draw.bg";
-			type: IMAGE;
-			mouse_events: 1;
-			scale: 1;
-			description{
-				state: "default" 0.0;
-				visible: 1;
-				rel1 {relative: 256/TOOLBAR_WIDTH 12/TOOLBAR_HEIGHT; to: "bg";}
-				rel2 {relative: 336/TOOLBAR_WIDTH 76/TOOLBAR_HEIGHT; to: "bg";}
-				image.normal: B09_key_btn_01.png;
-				image.border: 5 5 0 0;
-			}
-			description{
-				state: "press" 0.0;
-				inherit: "default" 0.0;
-				image.normal: "B09_key_btn_press.png";
-				image.border: 5 5 0 0;
-			}
-		}
-		part{
-			name: "draw";
-			type: IMAGE;
-			scale: 1;
-			mouse_events: 1;
-			repeat_events: 1;
-			description{
-				state: "default" 0.0;
-				visible: 1;
-				rel1 {relative: 0.0 0.0; to: draw.bg;}
-				rel2 {relative: 1.0 1.0; to: draw.bg;}
-				image.normal: "B09_Add Text_sip_option_color.png";
-			}
-			description{
-				state: "press" 0.0;
-				inherit: "default" 0.0;
-				image.normal: "B09_Add Text_sip_option_color.png";
-			}
-		}
-		COLOR_RECT("draw_indictor", "draw", "draw_indictor");
-
-		BUTTON_BG_NORMAL_OR_PRESS("text.bold.bg", 440/TOOLBAR_WIDTH, 12/TOOLBAR_HEIGHT,
-			                     520/TOOLBAR_WIDTH, 76/TOOLBAR_HEIGHT, "B09_key_btn_01.png",
-			                     "B09_key_btn_press.png");
-		BUTTON_NORMAL_OR_PRESS("text.bold","B09_Add Text_sip_option_bold.png", "B09_Add Text_sip_option_bold.png", "text.bold.bg");
-		BUTTON_BG_NORMAL_OR_PRESS("text.italic.bg", 536/TOOLBAR_WIDTH, 12/TOOLBAR_HEIGHT,
-			                     616/TOOLBAR_WIDTH, 76/TOOLBAR_HEIGHT, "B09_key_btn_01.png",
-			                     "B09_key_btn_press.png");
-		BUTTON_NORMAL_OR_PRESS("text.italic","B09_Add Text_sip_option_Italic.png", "B09_Add Text_sip_option_Italic.png", "text.italic.bg");
-		BUTTON_BG_NORMAL_OR_PRESS("text.underline.bg", 632/TOOLBAR_WIDTH, 12/TOOLBAR_HEIGHT,
-			                     712/TOOLBAR_WIDTH, 76/TOOLBAR_HEIGHT, "B09_key_btn_01.png",
-			                     "B09_key_btn_press.png");
-		BUTTON_NORMAL_OR_PRESS("text.underline","B09_Add Text_sip_option_underline.png", "B09_Add Text_sip_option_underline.png", "text.underline.bg");
-	}
-	script {
-        public message(Msg_Type:type, id, ...) {
-			if ((type == MSG_INT) && (id == 1)) {
-				new text_mode = getarg(2);
-				new btnState[128];
-				new Float:x;
-
-				if (text_mode == 1) {
-					//Bold
-					get_state(PART:"text.bold.bg", btnState, 128, x);
-					if (strcmp(btnState, "press") == 0) {
-						set_state(PART:"text.bold.bg", "default", 0.0);
-					} else {
-						set_state(PART:"text.bold.bg", "press", 0.0);
-					}
-				} else if (text_mode == 2) {
-					//italic
-					get_state(PART:"text.italic.bg", btnState, 128, x);
-					if (strcmp(btnState, "press") == 0) {
-						set_state(PART:"text.italic.bg", "default", 0.0);
-					} else {
-						set_state(PART:"text.italic.bg", "press", 0.0);
-					}
-				} else if (text_mode == 3) {
-					//font_underline
-					get_state(PART:"text.underline.bg", btnState, 128, x);
-					if (strcmp(btnState, "press") == 0) {
-						set_state(PART:"text.underline.bg", "default", 0.0);
-					} else {
-						set_state(PART:"text.underline.bg", "press", 0.0);
-					}
-				}
-			}
-		}
-	}
-	programs{
-		TOOLBAR_BUTTON_PROGRAM_SIGNAL_EMIT_1("font.bg", "dropdown.fonttype.clicked");
-		TOOLBAR_BUTTON_PROGRAM_SIGNAL_EMIT_1("size.bg", "size.button.clicked");
-		TOOLBAR_BUTTON_PROGRAM_SIGNAL_EMIT_1("draw.bg", "draw.button.clicked");
-		TOOLBAR_BUTTON_PROGRAM_SIGNAL_EMIT_2("text.bold.bg", "text.bold.clicked");
-		TOOLBAR_BUTTON_PROGRAM_SIGNAL_EMIT_2("text.italic.bg", "text.italic.clicked");
-		TOOLBAR_BUTTON_PROGRAM_SIGNAL_EMIT_2("text.underline.bg", "text.underline.clicked");
-	}
-}
-
-group {
-	name: "lockscreen.options.locktitle.colorselector";
-	parts{
-		part {
-			name: "bg";
-			type: RECT;
-			scale: 1;
-			description {
-				state: "default" 0.0;
-				visible: 0;
-			}
-		}
-		part {
-			name: "rect";
-			type: SWALLOW;
-			scale: 1;
-			description {
-				state: "default" 0.0;
-				min: 0 109;
-				rel1 { relative: 0.0 0.0; to: "bg"; offset: 83 83;}
-				rel2 { relative: 1.0 0.0; to: "bg"; offset: -83 83;}
-			}
-		}
-		part {
-			name: "color";
-			type: SWALLOW;
-			scale: 1;
-			description {
-				state: "default" 0.0;
-				rel1 { relative: 0.0 1.0; to_x: "bg"; to_y:"rect"; offset: 0 20;}
-				rel2 { relative: 1.0 1.0; to: "bg"; offset: 0 -20;}
-			}
-		}
-	}
-}
diff --git a/lock-setting/lockscreen-options/res/edje/lockscreen-options-shortcuts.edc b/lock-setting/lockscreen-options/res/edje/lockscreen-options-shortcuts.edc
deleted file mode 100755
index 1f3d3ae..0000000
--- a/lock-setting/lockscreen-options/res/edje/lockscreen-options-shortcuts.edc
+++ /dev/null
@@ -1,116 +0,0 @@
- /*
-  * Copyright 2012  Samsung Electronics Co., Ltd
-  *
-  * Licensed under the Flora License, Version 1.0 (the "License");
-  * you may not use this file except in compliance with the License.
-  * You may obtain a copy of the License at
-  *
-  *     http://www.tizenopensource.org/license
-  *
-  * Unless required by applicable law or agreed to in writing, software
-  * distributed under the License is distributed on an "AS IS" BASIS,
-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  * See the License for the specific language governing permissions and
-  * limitations under the License.
-  */
-
-
-
- group{
-	 name: "lockscreen.options.shortcuts.main";
-	 parts{
-		 part{
-			 name: "background";
-			 type: RECT;
-			 scale: 1;
-			 description{
-				 state: "default" 0.0;
-				 visible: 0;
-				 rel1 { relative: 0.0 0.0; }
-				 rel2 { relative: 1.0 1.0; }
-			 }
-		 }
-		 part{
-			 name: "shortcuts.help.title";
-			 type: SWALLOW;
-			 scale: 1;
-			 description{
-				 state: "default" 0.0;
-				 align: 0.5 0.0;
-				 min: 0 40;
-				 rel1 { relative: 0.0 0.08; to: "background"; }
-				 rel2 { relative: 1.0 0.08; to: "background"; }
-			 }
-		 }
-		part{
-			 name: "blank.rect1";
-			 type: RECT;
-			 scale: 1;
-			 description{
-				 state: "default" 0.0;
-				 visible: 0;
-				 min: 0 40;
-				 rel1 { relative: 0.0 1.0; to: "shortcuts.help.title"; }
-				 rel2 { relative: 1.0 1.0; to: "shortcuts.help.title"; }
-			 }
-		 }
-		 part{
-			 name: "shortcuts.help.contents";
-			 type: SWALLOW;
-			 scale: 1;
-			 description{
-				 state: "default" 0.0;
-				 align: 0.5 0.0;
-				 min: 0 80;
-				 rel1 { relative: 0.0 1.0; to: "blank.rect1"; }
-				 rel2 { relative: 1.0 1.0; to: "blank.rect1"; }
-			 }
-		 }
-		part{
-			 name: "blank.rect2";
-			 type: RECT;
-			 scale: 1;
-			 description{
-				 state: "default" 0.0;
-				 visible: 0;
-				 min: 0 100;
-				 rel1 { relative: 0.0 1.0; to: "shortcuts.help.contents"; }
-				 rel2 { relative: 1.0 1.0; to: "shortcuts.help.contents"; }
-			 }
-		 }
-		part{
-			 name: "shortcuts.edit.help.title";
-			 type: SWALLOW;
-			 scale: 1;
-			 description{
-				 state: "default" 0.0;
-				 align: 0.5 0.0;
-				 min: 0 40;
-				 rel1 { relative: 0.0 0.14; to: "background"; }
-				 rel2 { relative: 1.0 0.14; to: "background"; }
-			 }
-		 }
-		part{
-			 name: "blank.rect3";
-			 type: RECT;
-			 scale: 1;
-			 description{
-				 state: "default" 0.0;
-				 visible: 0;
-				 min: 0 40;
-				 rel1 { relative: 0.0 1.0; to: "shortcuts.edit.help.title"; }
-				 rel2 { relative: 1.0 1.0; to: "shortcuts.edit.help.title"; }
-			 }
-		 }
-		 part{
-			 name: "shortcuts.gengrid";
-			 type: SWALLOW;
-			 scale: 1;
-			 description{
-				 state: "default" 0.0;
-				 rel1 { relative: 0.0 1.0; to: "blank.rect2"; }
-				 rel2 { relative: 1.0 1.0; to: "background"; }
-			 }
-		 }
-	 }
- }
diff --git a/lock-setting/lockscreen-options/res/edje/lockscreen-options-thumbnail.edc b/lock-setting/lockscreen-options/res/edje/lockscreen-options-thumbnail.edc
deleted file mode 100755
index a3da17f..0000000
--- a/lock-setting/lockscreen-options/res/edje/lockscreen-options-thumbnail.edc
+++ /dev/null
@@ -1,66 +0,0 @@
- /*
-  * Copyright 2012  Samsung Electronics Co., Ltd
-  *
-  * Licensed under the Flora License, Version 1.0 (the "License");
-  * you may not use this file except in compliance with the License.
-  * You may obtain a copy of the License at
-  *
-  *     http://www.tizenopensource.org/license
-  *
-  * Unless required by applicable law or agreed to in writing, software
-  * distributed under the License is distributed on an "AS IS" BASIS,
-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  * See the License for the specific language governing permissions and
-  * limitations under the License.
-  */
-
-
-
-group{
-	images{
-		image: "icon_delete.png" COMP;
-		image: "icon_delete_press.png" COMP;
-	}
-
-	name: "lockscreen.options.shortcuts.thumbnail.main";
-	parts{
-		part{
-			name: "background";
-			type: RECT;
-			mouse_events: 1;
-			scale: 1;
-			description{
-				state: "default" 0.0;
-				visible: 1;
-				rel1 { relative: 0.0 0.0; }
-				rel2 { relative: 1.0 1.0; }
-				color: 0 0 0 0;
-			}
-		}
-		part{
-			name: "elm.swallow.contents";
-			type: SWALLOW;
-			repeat_events: 1;
-			scale: 1;
-			description{
-				state: "default" 0.0;
-				rel1 {relative: 0.0 0.0; to: "background";}
-				rel2 {relative: 1.0 1.0; to: "background";}
-			}
-		}
-		part{
-			name: "elm.swallow.button";
-			type: SWALLOW;
-			repeat_events: 0;
-			scale: 1;
-			description{
-				state: "default" 0.0;
-				fixed: 1 1;
-				rel1 {relative: 0.0 0.0; to: "background";}
-				rel2 {relative: 0.45 0.45; to: "background";}
-			}
-		}
-	}
-	programs{
-	}
-}
diff --git a/lock-setting/lockscreen-options/res/edje/lockscreen-options.edc b/lock-setting/lockscreen-options/res/edje/lockscreen-options.edc
deleted file mode 100755
index d0ba457..0000000
--- a/lock-setting/lockscreen-options/res/edje/lockscreen-options.edc
+++ /dev/null
@@ -1,23 +0,0 @@
- /*
-  * Copyright 2012  Samsung Electronics Co., Ltd
-  *
-  * Licensed under the Flora License, Version 1.0 (the "License");
-  * you may not use this file except in compliance with the License.
-  * You may obtain a copy of the License at
-  *
-  *     http://www.tizenopensource.org/license
-  *
-  * Unless required by applicable law or agreed to in writing, software
-  * distributed under the License is distributed on an "AS IS" BASIS,
-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  * See the License for the specific language governing permissions and
-  * limitations under the License.
-  */
-
-
-
-collections {
-	#include "lockscreen-options-shortcuts.edc"
-	#include "lockscreen-options-thumbnail.edc"
-	#include "lockscreen-options-locktitle.edc"
-}
diff --git a/lock-setting/lockscreen-options/res/images/B09_Add Text_sip_option_Italic.png b/lock-setting/lockscreen-options/res/images/B09_Add Text_sip_option_Italic.png
deleted file mode 100755
index ef2092c..0000000
--- a/lock-setting/lockscreen-options/res/images/B09_Add Text_sip_option_Italic.png
+++ /dev/null
diff --git a/lock-setting/lockscreen-options/res/images/B09_Add Text_sip_option_bg.png b/lock-setting/lockscreen-options/res/images/B09_Add Text_sip_option_bg.png
deleted file mode 100755
index dcaef91..0000000
--- a/lock-setting/lockscreen-options/res/images/B09_Add Text_sip_option_bg.png
+++ /dev/null
diff --git a/lock-setting/lockscreen-options/res/images/B09_Add Text_sip_option_bold.png b/lock-setting/lockscreen-options/res/images/B09_Add Text_sip_option_bold.png
deleted file mode 100755
index d222f74..0000000
--- a/lock-setting/lockscreen-options/res/images/B09_Add Text_sip_option_bold.png
+++ /dev/null
diff --git a/lock-setting/lockscreen-options/res/images/B09_Add Text_sip_option_color.png b/lock-setting/lockscreen-options/res/images/B09_Add Text_sip_option_color.png
deleted file mode 100755
index 3b807c1..0000000
--- a/lock-setting/lockscreen-options/res/images/B09_Add Text_sip_option_color.png
+++ /dev/null
diff --git a/lock-setting/lockscreen-options/res/images/B09_Add Text_sip_option_size.png b/lock-setting/lockscreen-options/res/images/B09_Add Text_sip_option_size.png
deleted file mode 100755
index b7a6260..0000000
--- a/lock-setting/lockscreen-options/res/images/B09_Add Text_sip_option_size.png
+++ /dev/null
diff --git a/lock-setting/lockscreen-options/res/images/B09_Add Text_sip_option_style.png b/lock-setting/lockscreen-options/res/images/B09_Add Text_sip_option_style.png
deleted file mode 100755
index 7263e6e..0000000
--- a/lock-setting/lockscreen-options/res/images/B09_Add Text_sip_option_style.png
+++ /dev/null
diff --git a/lock-setting/lockscreen-options/res/images/B09_Add Text_sip_option_underline.png b/lock-setting/lockscreen-options/res/images/B09_Add Text_sip_option_underline.png
deleted file mode 100755
index 959467b..0000000
--- a/lock-setting/lockscreen-options/res/images/B09_Add Text_sip_option_underline.png
+++ /dev/null
diff --git a/lock-setting/lockscreen-options/res/images/B09_key_btn_01.png b/lock-setting/lockscreen-options/res/images/B09_key_btn_01.png
deleted file mode 100755
index 826be34..0000000
--- a/lock-setting/lockscreen-options/res/images/B09_key_btn_01.png
+++ /dev/null
diff --git a/lock-setting/lockscreen-options/res/images/B09_key_btn_press.png b/lock-setting/lockscreen-options/res/images/B09_key_btn_press.png
deleted file mode 100755
index ee2484d..0000000
--- a/lock-setting/lockscreen-options/res/images/B09_key_btn_press.png
+++ /dev/null
diff --git a/lock-setting/lockscreen-options/res/images/icon_add.png b/lock-setting/lockscreen-options/res/images/icon_add.png
deleted file mode 100755
index efa4733..0000000
--- a/lock-setting/lockscreen-options/res/images/icon_add.png
+++ /dev/null
diff --git a/lock-setting/lockscreen-options/res/images/icon_delete.png b/lock-setting/lockscreen-options/res/images/icon_delete.png
deleted file mode 100755
index 7145638..0000000
--- a/lock-setting/lockscreen-options/res/images/icon_delete.png
+++ /dev/null
diff --git a/lock-setting/lockscreen-options/res/images/icon_delete_press.png b/lock-setting/lockscreen-options/res/images/icon_delete_press.png
deleted file mode 100755
index 2ac8311..0000000
--- a/lock-setting/lockscreen-options/res/images/icon_delete_press.png
+++ /dev/null
diff --git a/lock-setting/lockscreen-options/res/images/mainmenu_icon.png b/lock-setting/lockscreen-options/res/images/mainmenu_icon.png
deleted file mode 100755
index ab3194b..0000000
--- a/lock-setting/lockscreen-options/res/images/mainmenu_icon.png
+++ /dev/null
diff --git a/lock-setting/lockscreen-options/src/lockscreen-options-dualclock.c b/lock-setting/lockscreen-options/src/lockscreen-options-dualclock.c
deleted file mode 100755
index bdd0d2a..0000000
--- a/lock-setting/lockscreen-options/src/lockscreen-options-dualclock.c
+++ /dev/null
@@ -1,249 +0,0 @@
- /*
-  * Copyright 2012  Samsung Electronics Co., Ltd
-  *
-  * Licensed under the Flora License, Version 1.0 (the "License");
-  * you may not use this file except in compliance with the License.
-  * You may obtain a copy of the License at
-  *
-  *     http://www.tizenopensource.org/license
-  *
-  * Unless required by applicable law or agreed to in writing, software
-  * distributed under the License is distributed on an "AS IS" BASIS,
-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  * See the License for the specific language governing permissions and
-  * limitations under the License.
-  */
-
-

-

-#include <vconf.h>

-#include <vconf-keys.h>

-#include <ui-gadget.h>

-#include <ui-gadget-module.h>

-#include <ail.h>

-

-#include "lockscreen-options.h"

-#include "lockscreen-options-debug.h"

-#include "lockscreen-options-main.h"

-#include "lockscreen-options-util.h"

-#include "lockscreen-options-dualclock.h"

-

-#define CITY_BUF_SIZE 		128

-#define GMT_BUF_SIZE        10

-

-static char time_zone_str[CITY_BUF_SIZE + GMT_BUF_SIZE + 3];

-static Elm_Object_Item *genlist_item;

-

-

-static Elm_Gen_Item_Class itc_menu_2text;

-

-static char *_lockscreen_options_dualclock_gl_label_get(void *data,

-						   Evas_Object * obj,

-						   const char *part)

-{

-	if (part == NULL)

-		return NULL;

-

-	if ((strcmp(part, "elm.text.1") == 0)){

-		return strdup("Set home city");

-	}

-	if((strcmp(part, "elm.text.2") == 0)) {

-		return strdup(time_zone_str);

-	}

-

-	return NULL;

-}

-

-

-static void _lockscreen_options_dualclock_create_gl_item(Elm_Gen_Item_Class * item)

-{

-	item->item_style = "dialogue/2text.3";

-	item->func.text_get = _lockscreen_options_dualclock_gl_label_get;

-	item->func.content_get = NULL;

-	item->func.state_get = NULL;

-	item->func.del = NULL;

-}

-

-static void _lockscreen_options_update_timezone()

-{

-	elm_genlist_item_update(genlist_item);

-}

-

-static void _launch_worldclock_layout_ug_cb(ui_gadget_h ug,

-						      enum ug_mode mode,

-						      void *priv)

-{

-	LOCKOPTIONS_DBG("_launch_worldclock_layout_ug_cb begin.\n");

-	lockscreen_options_ug_data *ug_data = (lockscreen_options_ug_data *) priv;

-	Evas_Object *base;

-

-	if (!priv)

-		return;

-

-	base = (Evas_Object *) ug_get_layout(ug);

-	if (!base)

-		return;

-

-	switch (mode) {

-	case UG_MODE_FULLVIEW:

-		evas_object_size_hint_weight_set(base, EVAS_HINT_EXPAND,

-						 EVAS_HINT_EXPAND);

-		elm_win_resize_object_add(ug_data->win_main, base);

-		evas_object_show(base);

-		break;

-	default:

-		break;

-	}

-	LOCKOPTIONS_DBG("_launch_worldclock_layout_ug_cb end.\n");

-}

-

-static void _launch_worldclock_result_ug_cb(ui_gadget_h ug,

-						 service_h result, void *priv)

-{

-	LOCKOPTIONS_DBG("_launch_worldclock_result_ug_cb begin.\n");

-	if (!priv)

-		return;

-

-	char *city = NULL;

-	char *timezone = NULL;

-	service_get_extra_data(result, "city", &city);

-	if(city == NULL) return;

-	service_get_extra_data(result, "timezone", &timezone);

-	if(timezone == NULL) return;

-

-	snprintf(time_zone_str, CITY_BUF_SIZE + GMT_BUF_SIZE + 2, "%s, GMT %s", _S(city), _(timezone));

-	LOCKOPTIONS_DBG("time_zone_str is [%s]", time_zone_str);

-	_lockscreen_options_update_timezone();

-

-	free(city);

-	free(timezone);

-	city = timezone = NULL;

-	LOCKOPTIONS_DBG("_launch_worldclock_result_ug_cb end.\n");

-}

-

-static void _launch_worldclock_destroy_ug_cb(ui_gadget_h ug,

-						       void *priv)

-{

-	LOCKOPTIONS_DBG("_launch_worldclock_destroy_ug_cb begin.\n");

-

-	if (!priv)

-		return;

-

-	if (ug) {

-		ug_destroy(ug);

-	}

-

-	LOCKOPTIONS_DBG("_launch_worldclock_destroy_ug_cb end.\n");

-}

-

-static void _launch_worldclock(void *data)

-{

-	LOCKOPTIONS_DBG("Launch world clock begin.\n");

-

-	if(data == NULL){

-		LOCKOPTIONS_ERR("The data (ug_data) transferred to _lauch_worldclock is NULL.");

-		return;

-	}

-

-	lockscreen_options_ug_data *ug_data = (lockscreen_options_ug_data *) data;

-

-	struct ug_cbs *cbs = (struct ug_cbs *)calloc(1, sizeof(struct ug_cbs));

-	if(cbs == NULL)

-		return;

-	cbs->layout_cb = _launch_worldclock_layout_ug_cb;

-	cbs->result_cb = _launch_worldclock_result_ug_cb;

-	cbs->destroy_cb = _launch_worldclock_destroy_ug_cb;

-	cbs->priv = (void *)ug_data;

-

-	LOCKOPTIONS_DBG("Launch worldclock-efl begin.\n");

-	ui_gadget_h loading=ug_create(ug_data->ug, "worldclock-efl", UG_MODE_FULLVIEW, NULL, cbs);

-	if (NULL == loading) {

-		LOCKOPTIONS_ERR("Launch wordclock-efl failed.");

-    }

-

-	free(cbs);

-	LOCKOPTIONS_DBG("Launch world clock end.\n");

-}

-

-static void _lockscreen_options_dualclock_select_cb(void *data, Evas_Object *obj,

-					   void *event_info)

-{

-	elm_genlist_item_selected_set(genlist_item, EINA_FALSE);

-	if(data == NULL){

-		LOCKOPTIONS_ERR("ug_data is null.");

-		return;

-	}

-

-	_launch_worldclock(data);

-}

-

-static void _lockscreen_options_dualclock_back_cb(void *data, Evas_Object * obj,

-					     void *event_info)

-{

-	lockscreen_options_ug_data *ug_data =

-		(lockscreen_options_ug_data *) data;

-

-	if (ug_data == NULL){

-		LOCKOPTIONS_ERR("ug_data is null.");

-		return;

-	}

-

-	Evas_Object *navi_bar = ug_data->navi_bar;

-

-	if (navi_bar == NULL) {

-		LOCKOPTIONS_ERR("navi_bar is null.");

-		return;

-	}

-

-	elm_naviframe_item_pop(navi_bar);

-}

-

-static void _init_time_zone()

-{

-	snprintf(time_zone_str, CITY_BUF_SIZE + GMT_BUF_SIZE + 2, "%s, GMT %s", _("Nanjing"), _("+8"));

-}

-

-

-void lockscreen_options_dualclock_create_view(lockscreen_options_ug_data * ug_data)

-{

-	LOCKOPTIONS_DBG("lockscreen_options_dualclock_create_view begin\n");

-

-	Evas_Object *navi_bar = ug_data->navi_bar;

-	Evas_Object *back_button = NULL;

-	Evas_Object *genlist = NULL;

-

-	if (navi_bar == NULL) {

-		LOCKOPTIONS_ERR("navi_bar is null.");

-		return;

-	}

-

-	_init_time_zone();

-

-	genlist = elm_genlist_add(navi_bar);

-	elm_genlist_mode_set(genlist, ELM_LIST_COMPRESS);

-	elm_object_style_set(genlist, "dialogue");

-

-	_lockscreen_options_dualclock_create_gl_item(&itc_menu_2text);

-

-	lockscreen_options_util_create_seperator(genlist);

-

-

-	genlist_item = elm_genlist_item_append(genlist,

-						       &itc_menu_2text,

-						       NULL, NULL,

-						       ELM_GENLIST_ITEM_NONE,
-						       _lockscreen_options_dualclock_select_cb,

-						       ug_data);

-

-

-	back_button = elm_button_add(navi_bar);

-	elm_object_style_set(back_button, "naviframe/back_btn/default");

-	evas_object_smart_callback_add(back_button, "clicked",

-				       _lockscreen_options_dualclock_back_cb,

-				       ug_data);
-
-	elm_naviframe_item_push(navi_bar, "Dual clock", back_button, NULL, genlist, NULL);

-}

-

-

-

diff --git a/lock-setting/lockscreen-options/src/lockscreen-options-locktitle.c b/lock-setting/lockscreen-options/src/lockscreen-options-locktitle.c
deleted file mode 100755
index 738818a..0000000
--- a/lock-setting/lockscreen-options/src/lockscreen-options-locktitle.c
+++ /dev/null
@@ -1,535 +0,0 @@
- /*
-  * Copyright 2012  Samsung Electronics Co., Ltd
-  *
-  * Licensed under the Flora License, Version 1.0 (the "License");
-  * you may not use this file except in compliance with the License.
-  * You may obtain a copy of the License at
-  *
-  *     http://www.tizenopensource.org/license
-  *
-  * Unless required by applicable law or agreed to in writing, software
-  * distributed under the License is distributed on an "AS IS" BASIS,
-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  * See the License for the specific language governing permissions and
-  * limitations under the License.
-  */
-
-
-
-#include <Ecore_X.h>
-
-#include "lockscreen-options.h"
-#include "lockscreen-options-debug.h"
-#include "lockscreen-options-util.h"
-#include "lockscreen-options-locktitle.h"
-
-#define EDJE_DIR "/usr/ug/res/edje/ug-lockscreen-options-efl"
-
-typedef struct {
-	unsigned char red;
-	unsigned char green;
-	unsigned char blue;
-	unsigned char reserved;
-} options_locktitle_rgb_s;
-
-typedef struct {
-	lockscreen_options_ug_data *ug_data;
-	Evas_Object *layout;
-	Evas_Object *toolbar;
-	Evas_Object *entry;
-	Ecore_IMF_Context *entry_ctx;
-	Evas_Object *colorselector;
-	Evas_Object *fontselector;
-	Evas_Object *font_radio;
-
-	options_locktitle_rgb_s rgb;
-} options_locktile_view_s;
-
-static options_locktile_view_s *options_locktile_view_data = NULL;
-
-static const fonttype_size = 5;
-static const char *fonttype_value[] = {
-	"Arial", "Courier New", "Roboto", "Tahoma", "Verdana"
-};
-
-static char *_fonttype_dropdown_text_get(void *data, Evas_Object * obj, const char *part);
-static Evas_Object *_fonttype_dropdown_content_get(void *data, Evas_Object * obj, const char *part);
-static Evas_Object *_editfield_content_get(void *data, Evas_Object * obj, const char *part);
-static void _lockscreen_options_locktitle_font_selector_create();
-static void _lockscreen_options_locktitle_color_selector_create();
-
-static Elm_Genlist_Item_Class itc_fontlist_style = {
-	.item_style = "1text.1icon.2",
-	.func.text_get = _fonttype_dropdown_text_get,
-	.func.content_get = _fonttype_dropdown_content_get,
-};
-
-static Elm_Genlist_Item_Class itc_editfield_style = {
-	.item_style = "dialogue/1icon",
-	.func.text_get = NULL,
-	.func.content_get = _editfield_content_get,
-};
-
-static char *_fonttype_dropdown_text_get(void *data, Evas_Object * obj,
-					     const char *part)
-{
-	int index = (int)data;
-	if (strcmp(part, "elm.text") == 0) {
-		return strdup(fonttype_value[index]);
-	}
-	return NULL;
-}
-
-static Evas_Object *_fonttype_dropdown_content_get(void *data,
-						       Evas_Object * obj,
-						       const char *part)
-{
-	int index = (int)data;
-	if (!strcmp(part, "elm.icon")) {
-		Evas_Object *radio = elm_radio_add(obj);
-		elm_radio_state_value_set(radio, index);
-		elm_radio_group_add(radio, options_locktile_view_data->font_radio);
-		return radio;
-	}
-	return NULL;
-}
-
-static void *_fonttype_sel(void *data, Evas_Object * obj, void *event_info)
-{
-	//select font type
-}
-
-static void _lockscreen_options_locktitle_delete_cb(void *data, Evas * e,
-						    Evas_Object * obj,
-						    void *event_info)
-{
-	if (options_locktile_view_data) {
-		free(options_locktile_view_data);
-		options_locktile_view_data = NULL;
-	}
-}
-
-static void _lockscreen_options_locktitle_back_cb(void *data, Evas_Object * obj,
-						  void *event_info)
-{
-	lockscreen_options_ug_data *ug_data =
-	    (lockscreen_options_ug_data *) data;
-
-	if (ug_data == NULL) {
-		LOCKOPTIONS_ERR("ug_data is null.");
-		return;
-	}
-
-	Evas_Object *navi_bar = ug_data->navi_bar;
-
-	if (navi_bar == NULL) {
-		LOCKOPTIONS_ERR("navi_bar is null.");
-		return;
-	}
-	elm_naviframe_item_pop(navi_bar);
-}
-
-static void _send_int_message_to_edc(Evas_Object * obj, int msgID, int param)
-{
-	Edje_Message_Int msg;
-	msg.val = param;
-	edje_object_message_send(elm_layout_edje_get(obj),
-				 EDJE_MESSAGE_INT, msgID, &msg);
-}
-
-static void _send_float_message_to_edc(Evas_Object * obj, int msgID, float param)
-{
-	Edje_Message_Float msg;
-	msg.val = param;
-	edje_object_message_send(elm_layout_edje_get(obj),
-				 EDJE_MESSAGE_FLOAT, msgID, &msg);
-}
-
-static void _lockscreen_options_locktitle_entry_imf_state_cb(void *data,
-							     Ecore_IMF_Context *
-							     ctx, int value)
-{
-	static float val = 1.0;
-	if (value == ECORE_IMF_INPUT_PANEL_STATE_SHOW) {
-		Evas_Coord keypad_x = 0;
-		Evas_Coord keypad_y = 0;
-		Evas_Coord keypad_w = 0;
-		Evas_Coord keypad_h = 0;
-		Evas_Coord window_width = 0;
-		Evas_Coord window_height = 0;
-
-		ecore_x_window_size_get(ecore_x_window_root_first_get(),
-					&window_width, &window_height);
-		ecore_imf_context_input_panel_geometry_get(ctx, &keypad_x,
-							   &keypad_y, &keypad_w,
-							   &keypad_h);
-		val = (float)(keypad_y) / (float)window_height;
-		/*set the toolbar's location*/
-		_send_float_message_to_edc(options_locktile_view_data->layout, 1, val);
-		/*set toolbar visible*/
-		_send_float_message_to_edc(options_locktile_view_data->layout, 2, 0.0);
-	} else if (value == ECORE_IMF_INPUT_PANEL_STATE_HIDE
-					&&options_locktile_view_data->colorselector == NULL
-					&&options_locktile_view_data->fontselector == NULL) {
-		_send_float_message_to_edc(options_locktile_view_data->layout, 3, 0.0);
-	}else {
-		/*set the toolbar's location*/
-		_send_float_message_to_edc(options_locktile_view_data->layout, 1, val);
-	}
-}
-
-static void _lockscreen_options_locktitle_entry_imf_resize_cb(void *data,
-							      Ecore_IMF_Context
-							      * ctx, int value)
-{
-	Evas_Coord keypad_x = 0;
-	Evas_Coord keypad_y = 0;
-	Evas_Coord keypad_w = 0;
-	Evas_Coord keypad_h = 0;
-	Evas_Coord window_width = 0;
-	Evas_Coord window_height = 0;
-
-	ecore_x_window_size_get(ecore_x_window_root_first_get(), &window_width,
-				&window_height);
-	ecore_imf_context_input_panel_geometry_get(ctx, &keypad_x, &keypad_y,
-					   &keypad_w, &keypad_h);
-}
-
-/* This callback is for showing(hiding) X marked button.*/
-static void _changed_cb(void *data, Evas_Object *obj, void *event_info)
-{
-	if (elm_object_focus_get(data)) {
-		if (elm_entry_is_empty(obj)) {
-			elm_object_signal_emit(data, "elm,state,eraser,hide", "elm");
-		}else {
-			elm_object_signal_emit(data, "elm,state,eraser,show", "elm");
-		}
-	}
-}
-
-/* Focused callback will show X marked button and hide guidetext.*/
-static void _focused_cb(void *data, Evas_Object *obj, void *event_info)
-{
-	if (!elm_entry_is_empty(obj)) {
-		elm_object_signal_emit(data, "elm,state,eraser,show", "elm");
-	}
-	elm_object_signal_emit(data, "elm,state,guidetext,hide", "elm");
-}
-
-/*Unfocused callback will show guidetext and hide X marked button.*/
-static void _unfocused_cb(void *data, Evas_Object *obj, void *event_info)
-{
-	if (elm_entry_is_empty(obj)) {
-		elm_object_signal_emit(data, "elm,state,guidetext,show", "elm");
-	}
-	elm_object_signal_emit(data, "elm,state,eraser,hide", "elm");
-}
-
-static void _eraser_clicked_cb(void *data, Evas_Object *obj, const char *emission, const char *source) // When X marked button clicked, make string as empty.
-{
-	elm_entry_entry_set(data, "");
-}
-
-static Evas_Object *_lockscreen_options_editfield_create(Evas_Object *parent)
-{
-	LOCKOPTIONS_DBG("[ == %s == ]", __func__);
-	Evas_Object *layout = NULL;
-	Evas_Object *entry = NULL;
-
-	layout = elm_layout_add(parent);
-	if(layout == NULL)
-		return NULL;
-	elm_layout_theme_set(layout, "layout", "editfield", "default");
-	evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-
-	entry = elm_entry_add(parent);
-	if(entry == NULL)
-		return NULL;
-	evas_object_smart_callback_add(entry, "changed", _changed_cb, layout);
-	evas_object_smart_callback_add(entry, "focused", _focused_cb, layout);
-	evas_object_smart_callback_add(entry, "unfocused", _unfocused_cb, layout);
-
-	elm_object_part_content_set(layout, "elm.swallow.content", entry);
-	elm_object_part_text_set(layout, "elm.guidetext", lockscreen_optoins_get_string(IDS_LOCKSCREEN_OPTIONS_LOCK_SCREEN_TITLE_GUIDE_TEXT));
-	elm_object_signal_callback_add(layout, "elm,eraser,clicked", "elm", _eraser_clicked_cb, entry);
-
-	options_locktile_view_data->entry = entry;
-
-	Ecore_IMF_Context *entry_ctx = elm_entry_imf_context_get(entry);
-	if(entry_ctx != NULL) {
-		ecore_imf_context_input_panel_event_callback_add((Ecore_IMF_Context *)
-							entry_ctx,
-							ECORE_IMF_INPUT_PANEL_STATE_EVENT,
-							_lockscreen_options_locktitle_entry_imf_state_cb,
-							options_locktile_view_data);
-		ecore_imf_context_input_panel_event_callback_add((Ecore_IMF_Context *)
-							entry_ctx,
-							ECORE_IMF_INPUT_PANEL_GEOMETRY_EVENT,
-							_lockscreen_options_locktitle_entry_imf_resize_cb,
-							options_locktile_view_data);
-		options_locktile_view_data->entry_ctx = entry_ctx;
-	}
-
-	return layout;
-}
-
-static Evas_Object *_editfield_content_get(void *data,
-						       Evas_Object * obj,
-						       const char *part)
-{
-	if (!strcmp(part, "elm.icon")) {
-		LOCKOPTIONS_DBG("[ == %s == ]", __func__);
-		Evas_Object *editfield = NULL;
-		editfield = _lockscreen_options_editfield_create(obj);
-		return editfield;
-	}
-	return NULL;
-}
-
-static void *_editfield_sel(void *data, Evas_Object * obj, void *event_info)
-{
-	elm_genlist_item_selected_set((Elm_Object_Item *)event_info, EINA_FALSE);
-}
-
-static void _on_text_fonttype_btn_clicked_cb(void *data, Evas_Object * obj,
-					       const char *emission,
-					       const char *source)
-{
-	if (options_locktile_view_data != NULL) {
-		if(options_locktile_view_data->fontselector == NULL) {
-			if(options_locktile_view_data->colorselector != NULL) {
-				evas_object_del(options_locktile_view_data->colorselector);
-				options_locktile_view_data->colorselector = NULL;
-			}
-			_lockscreen_options_locktitle_font_selector_create();
-			/*if create fontselector successfully, hide IME*/
-			if(options_locktile_view_data->fontselector != NULL) {
-				elm_object_focus_set(options_locktile_view_data->entry, EINA_FALSE);
-			}
-		}else {
-			evas_object_del(options_locktile_view_data->fontselector);
-			options_locktile_view_data->fontselector = NULL;
-			elm_object_focus_set(options_locktile_view_data->entry, EINA_TRUE);
-		}
-	}
-}
-
-static void _on_text_draw_btn_clicked_cb(void *data, Evas_Object * obj,
-					       const char *emission,
-					       const char *source)
-{
-	if (options_locktile_view_data != NULL) {
-		if(options_locktile_view_data->colorselector == NULL) {
-			if(options_locktile_view_data->fontselector != NULL) {
-				evas_object_del(options_locktile_view_data->fontselector);
-				options_locktile_view_data->fontselector = NULL;
-			}
-			_lockscreen_options_locktitle_color_selector_create();
-			/*if create colorselector successfully, hide IME*/
-			if(options_locktile_view_data->colorselector != NULL) {
-				elm_object_focus_set(options_locktile_view_data->entry, EINA_FALSE);
-			}
-		}else {
-			evas_object_del(options_locktile_view_data->colorselector);
-			options_locktile_view_data->colorselector = NULL;
-			elm_object_focus_set(options_locktile_view_data->entry, EINA_TRUE);
-		}
-	}
-}
-
-static void _on_text_bold_btn_clicked_cb(void *data, Evas_Object * obj,
-					  const char *emission,
-					  const char *source)
-{
-	if (options_locktile_view_data != NULL) {
-		_send_int_message_to_edc(options_locktile_view_data->toolbar, 1, 1);
-	}
-}
-
-static void _on_text_italic_btn_clicked_cb(void *data, Evas_Object * obj,
-					    const char *emission,
-					    const char *source)
-{
-	if (options_locktile_view_data != NULL) {
-		_send_int_message_to_edc(options_locktile_view_data->toolbar, 1, 2);
-	}
-
-}
-
-static void _on_text_underline_btn_clicked_cb(void *data, Evas_Object * obj,
-					       const char *emission,
-					       const char *source)
-{
-	if (options_locktile_view_data != NULL) {
-		_send_int_message_to_edc(options_locktile_view_data->toolbar, 1, 3);
-	}
-}
-
-static void _lockscreen_options_locktitle_colorselector_changed_cb(void *data, Evas_Object *obj, void *event_info)
-{
-	Evas_Object *rect = (Evas_Object *)data;
-	int r = 0, g = 0, b = 0, a = 0;
-	elm_colorselector_color_get(obj, &r, &g, &b, &a);
-	evas_object_color_set(rect, r, g, b, a);
-}
-
-static void _lockscreen_options_locktitle_color_selector_create()
-{
-	if(options_locktile_view_data == NULL)
-		return;
-	Evas_Object *colorselector = NULL;
-	Evas_Object *rect = NULL;
-	Evas_Object *color = NULL;
-
-	colorselector =
-			lockscreen_options_util_create_layout(options_locktile_view_data->layout,
-							  EDJE_DIR
-							  "/lockscreen-options.edj",
-							  "lockscreen.options.locktitle.colorselector");
-	if(colorselector == NULL)
-		return;
-
-	rect = evas_object_rectangle_add(evas_object_evas_get(options_locktile_view_data->layout));
-	elm_object_part_content_set(colorselector, "rect", rect);
-	evas_object_color_set(rect, options_locktile_view_data->rgb.red, options_locktile_view_data->rgb.green, options_locktile_view_data->rgb.blue, options_locktile_view_data->rgb.reserved);
-
-	color = elm_colorselector_add(options_locktile_view_data->layout);
-	elm_colorselector_mode_set(color, ELM_COLORSELECTOR_COMPONENTS);
-	elm_object_part_content_set(colorselector, "color", color);
-	evas_object_smart_callback_add(color, "changed", _lockscreen_options_locktitle_colorselector_changed_cb, rect);
-	evas_object_color_set(color, options_locktile_view_data->rgb.red, options_locktile_view_data->rgb.green, options_locktile_view_data->rgb.blue, options_locktile_view_data->rgb.reserved);
-
-	options_locktile_view_data->colorselector = colorselector;
-	elm_object_part_content_set(options_locktile_view_data->layout, "elm.swallow.selector", colorselector);
-	evas_object_show(colorselector);
-}
-
-static void _lockscreen_options_locktitle_font_selector_create()
-{
-	if(options_locktile_view_data == NULL)
-		return;
-	Evas_Object *fontselector = NULL;
-	Evas_Object *font_radio = NULL;
-
-	fontselector = elm_genlist_add(options_locktile_view_data->layout);
-	if(fontselector == NULL)
-		return;
-
-	font_radio= elm_radio_add(fontselector);
-	if(font_radio == NULL)
-		return;
-
-	int index = 0;
-	for (index = 0; index < fonttype_size; index++) {
-		elm_genlist_item_append(fontselector, &itc_fontlist_style,
-				(void *)index, NULL,
-				ELM_GENLIST_ITEM_NONE, _fonttype_sel, NULL);
-	}
-
-	options_locktile_view_data->fontselector = fontselector;
-	options_locktile_view_data->font_radio = font_radio;
-	elm_object_part_content_set(options_locktile_view_data->layout, "elm.swallow.selector", fontselector);
-	evas_object_show(fontselector);
-}
-
-static void _lockscreen_options_locktitle_create_toolbar()
-{
-	if(options_locktile_view_data == NULL)
-		return;
-
-	Evas_Object *toolbar = NULL;
-
-	toolbar =
-			lockscreen_options_util_create_layout(options_locktile_view_data->layout,
-							  EDJE_DIR
-							  "/lockscreen-options.edj",
-							  "lockscreen.options.locktitle.toolbar");
-	if(toolbar == NULL)
-		return;
-
-	elm_object_part_content_set(options_locktile_view_data->layout, "elm.swallow.toolbar", toolbar);
-	evas_object_show(toolbar);
-	options_locktile_view_data->toolbar = toolbar;
-
-	edje_object_signal_callback_add(elm_layout_edje_get(toolbar),
-				"dropdown.fonttype.clicked", "*",
-				_on_text_fonttype_btn_clicked_cb,
-				NULL);
-	edje_object_signal_callback_add(elm_layout_edje_get(toolbar),
-				"draw.button.clicked", "*",
-				_on_text_draw_btn_clicked_cb, NULL);
-	edje_object_signal_callback_add(elm_layout_edje_get(toolbar),
-				"text.bold.clicked", "*",
-				_on_text_bold_btn_clicked_cb, NULL);
-	edje_object_signal_callback_add(elm_layout_edje_get(toolbar),
-				"text.italic.clicked", "*",
-				_on_text_italic_btn_clicked_cb, NULL);
-	edje_object_signal_callback_add(elm_layout_edje_get(toolbar),
-				"text.underline.clicked", "*",
-				_on_text_underline_btn_clicked_cb, NULL);
-}
-
-void lockscreen_options_locktitle_create_view(lockscreen_options_ug_data *
-					      ug_data)
-{
-	if (ug_data == NULL) {
-		LOCKOPTIONS_ERR("ug is NULL");
-		return;
-	}
-	LOCKOPTIONS_DBG("lockscreen_options_locktitle_create_view begin\n");
-	Evas_Object *navi_bar = ug_data->navi_bar;
-	if (navi_bar == NULL) {
-		LOCKOPTIONS_ERR("navi_bar is null.");
-		return;
-	}
-
-	/*initialization*/
-	options_locktile_view_data =
-	    (options_locktile_view_s *) calloc(1,
-					       sizeof(options_locktile_view_s));
-	options_locktile_view_data->ug_data = ug_data;
-	options_locktile_view_data->rgb.red = 255;
-	options_locktile_view_data->rgb.green = 255;
-	options_locktile_view_data->rgb.blue = 255;
-	options_locktile_view_data->rgb.reserved = 255;
-
-	Evas_Object *layout = NULL;
-	Evas_Object *back_button = NULL;
-	Evas_Object *genlist = NULL;
-
-	layout =
-	    lockscreen_options_util_create_layout(navi_bar,
-						  EDJE_DIR
-						  "/lockscreen-options.edj",
-						  "lockscreen.options.locktitle.main");
-
-	if (layout == NULL) {
-		LOCKOPTIONS_ERR("can't create locktitle layout.");
-		return;
-	}
-
-	evas_object_event_callback_add(layout, EVAS_CALLBACK_DEL,
-				       _lockscreen_options_locktitle_delete_cb,
-				       NULL);
-	options_locktile_view_data->layout = layout;
-
-	genlist = elm_genlist_add(layout);
-	if(genlist == NULL) {
-		return;
-	}
-	elm_genlist_mode_set(genlist, ELM_LIST_COMPRESS);
-	elm_genlist_item_append(genlist, &itc_editfield_style, NULL, NULL, ELM_GENLIST_ITEM_NONE, _editfield_sel, NULL);
-	elm_object_part_content_set(layout, "elm.swallow.content", genlist);
-	evas_object_show(genlist);
-
-	_lockscreen_options_locktitle_create_toolbar();
-
-	back_button = elm_button_add(navi_bar);
-	elm_object_style_set(back_button, "naviframe/back_btn/default");
-	evas_object_smart_callback_add(back_button, "clicked",
-				       _lockscreen_options_locktitle_back_cb,
-				       ug_data);
-
-	elm_naviframe_item_push(navi_bar, "Lock screen title", back_button,
-				NULL, layout, NULL);
-}
diff --git a/lock-setting/lockscreen-options/src/lockscreen-options-main.c b/lock-setting/lockscreen-options/src/lockscreen-options-main.c
index feb0caf..10e68a2 100755
--- a/lock-setting/lockscreen-options/src/lockscreen-options-main.c
+++ b/lock-setting/lockscreen-options/src/lockscreen-options-main.c
@@ -26,17 +26,10 @@
 #include "lockscreen-options-debug.h"
 #include "lockscreen-options-main.h"
 #include "lockscreen-options-util.h"
-#include "lockscreen-options-shortcuts.h"
-#include "lockscreen-options-locktitle.h"
-#include "lockscreen-options-dualclock.h"
 
 #include "starter-vconf.h"
 
-#if USE_TITLE_AND_CAMERA
-#define LOCKSCREEN_OPTOINS_GENLIST_ITEM_CNT 12
-#else
-#define LOCKSCREEN_OPTOINS_GENLIST_ITEM_CNT 8
-#endif
+#define LOCKSCREEN_OPTOINS_GENLIST_ITEM_CNT 5
 
 typedef struct {
 	int glStyle;
@@ -45,58 +38,17 @@ typedef struct {
 	void (*func) (void *data, Evas_Object * obj, void *event_info);
 } lockscreen_menu_item_info;
 
-static void _lockscreen_options_shortcuts_cb(void *data, Evas_Object * obj,
-					     void *event_info);
-static void _lockscreen_options_locktitle_cb(void *data, Evas_Object * obj,
-					     void *event_info);
-static void _lockscreen_options_dualclock_cb(void *data, Evas_Object * obj,
-					     void *event_info);
-
 static lockscreen_menu_item_info lockscreen_options_menu_item[] = {
-	{ENUM_LOCKSCREEN_GENLIST_STYLE_1TEXT1ICON, IDS_LOCKSCREEN_OPTIONS_SHORTCUTS, NULL, _lockscreen_options_shortcuts_cb},	//launch short cut setting
-	{ENUM_LOCKSCREEN_GENLIST_STYLE_HELP, IDS_LOCKSCREEN_OPTIONS_SHORTCUTS_HELP, NULL, NULL},	//help text
-#if USE_TITLE_AND_CAMERA
-	{ENUM_LOCKSCREEN_GENLIST_STYLE_2TEXT1ICON, IDS_LOCKSCREEN_OPTIONS_LOCK_SCREEN_TITLE, NULL, _lockscreen_options_locktitle_cb},	//launch life magazine input view
-	{ENUM_LOCKSCREEN_GENLIST_STYLE_HELP, IDS_LOCKSCREEN_OPTIONS_LOCK_SCREEN_TITLE_HELP, NULL, NULL},	//help text
-#endif
-	{ENUM_LOCKSCREEN_GENLIST_STYLE_1TEXT1ICON, IDS_LOCKSCREEN_OPTIONS_EVENT_NOTIFICATIONS, NULL, NULL},	//Event notifications
-	{ENUM_LOCKSCREEN_GENLIST_STYLE_HELP, IDS_LOCKSCREEN_OPTIONS_EVENT_NOTIFICATIONS_HELP, NULL, NULL},	//help text
-//	{ENUM_LOCKSCREEN_GENLIST_STYLE_1TEXT1ICON, IDS_LOCKSCREEN_OPTIONS_CONTEXTAWARE_NOTI, NULL, NULL},	//Context-aware notifications
-//	{ENUM_LOCKSCREEN_GENLIST_STYLE_HELP, IDS_LOCKSCREEN_OPTIONS_CONTEXTAWARE_NOTI_HELP, NULL, NULL},	//help text
-#if USE_TITLE_AND_CAMERA
-	{ENUM_LOCKSCREEN_GENLIST_STYLE_1TEXT1ICON, IDS_LOCKSCREEN_OPTIONS_CAMERA_QUICK_ACCESS, NULL, NULL},	//camera qucik access option
-	{ENUM_LOCKSCREEN_GENLIST_STYLE_HELP, IDS_LOCKSCREEN_OPTIONS_CAMERA_QUICK_ACCESS_HELP, NULL, NULL},	//help text
-#endif
-	{ENUM_LOCKSCREEN_GENLIST_STYLE_1TEXT1ICON, IDS_LOCKSCREEN_OPTIONS_CLOCK, NULL, NULL},	//Clock
-//	{ENUM_LOCKSCREEN_GENLIST_STYLE_1TEXT1ICON, IDS_LOCKSCREEN_OPTIONS_DUAL_CLOCK, NULL, _lockscreen_options_dualclock_cb},   //Dual Clock
-//	{ENUM_LOCKSCREEN_GENLIST_STYLE_HELP, IDS_LOCKSCREEN_OPTIONS_DUAL_CLOCK_HELP, NULL, NULL},   //Dual Clock help
-	{ENUM_LOCKSCREEN_GENLIST_STYLE_1TEXT1ICON, IDS_LOCKSCREEN_OPTIONS_WEATHER, NULL, NULL},	//Weather
-	{ENUM_LOCKSCREEN_GENLIST_STYLE_1TEXT1ICON, IDS_LOCKSCREEN_OPTIONS_HELPTEXT, NULL, NULL},	//Help text
-	{ENUM_LOCKSCREEN_GENLIST_STYLE_HELP, IDS_LOCKSCREEN_OPTIONS_HELPTEXT_HELP, NULL, NULL}	//help text
+	{ENUM_LOCKSCREEN_GENLIST_STYLE_1TEXT1ICON, IDS_LOCKSCREEN_OPTIONS_EVENT_NOTIFICATIONS, NULL, NULL},
+	{ENUM_LOCKSCREEN_GENLIST_STYLE_HELP, IDS_LOCKSCREEN_OPTIONS_EVENT_NOTIFICATIONS_HELP, NULL, NULL},
+	{ENUM_LOCKSCREEN_GENLIST_STYLE_1TEXT1ICON, IDS_LOCKSCREEN_OPTIONS_CLOCK, NULL, NULL},
+	{ENUM_LOCKSCREEN_GENLIST_STYLE_1TEXT1ICON, IDS_LOCKSCREEN_OPTIONS_HELPTEXT, NULL, NULL},
+	{ENUM_LOCKSCREEN_GENLIST_STYLE_HELP, IDS_LOCKSCREEN_OPTIONS_HELPTEXT_HELP, NULL, NULL}
 };
 
 static Elm_Gen_Item_Class itc_menu_1text1icon;
 static Elm_Gen_Item_Class itc_menu_2text1icon;
 static Elm_Gen_Item_Class itc_help_1text;
-static Elm_Object_Item *genlist_shortcuts_item = NULL;
-
-static void _lockscreen_options_shortcuts_cb(void *data, Evas_Object * obj,
-					     void *event_info)
-{
-	lockscreen_options_shortcuts_create_view(data);
-}
-
-static void _lockscreen_options_locktitle_cb(void *data, Evas_Object * obj,
-					     void *event_info)
-{
-	lockscreen_options_locktitle_create_view(data);
-}
-
-static void _lockscreen_options_dualclock_cb(void *data, Evas_Object * obj,
-					     void *event_info)
-{
-	lockscreen_options_dualclock_create_view(data);
-}
 
 static void _lockscreen_options_main_back_cb(void *data, Evas_Object * obj,
 					     void *event_info)
@@ -127,10 +79,6 @@ static char *_lockscreen_options_main_gl_label_get(void *data,
 			   (lockoption_data->stringId));
 	}
 
-	if((strcmp(part, "elm.text.2") == 0)) {
-		return strdup("Life Magazine");
-	}
-
 	return NULL;
 
 }
@@ -139,37 +87,18 @@ static void _lockscreen_options_set_menu_status(int stringId, int value)
 {
 	int ret = 0;
 	switch (stringId) {
-	case IDS_LOCKSCREEN_OPTIONS_SHORTCUTS:
-		ret = vconf_set_bool(VCONFKEY_LOCKSCREEN_SHORTCUT_DISPLAY, value);
-		break;
-#if USE_TITLE_AND_CAMERA
-	case IDS_LOCKSCREEN_OPTIONS_LOCK_SCREEN_TITLE:
-		break;
-#endif
 	case IDS_LOCKSCREEN_OPTIONS_EVENT_NOTIFICATIONS:
 		ret = vconf_set_bool(VCONFKEY_LOCKSCREEN_EVENT_NOTIFICATION_DISPLAY, value);
 		break;
-	case IDS_LOCKSCREEN_OPTIONS_CONTEXTAWARE_NOTI:
-		ret = vconf_set_bool(VCONFKEY_LOCKSCREEN_CONTEXT_AWARE_NOTIFICATION_DISPLAY, value);
-		break;
-#if USE_TITLE_AND_CAMERA
-	case IDS_LOCKSCREEN_OPTIONS_CAMERA_QUICK_ACCESS:
-		ret = vconf_set_bool(VCONFKEY_LOCKSCREEN_CAMERA_QUICK_ACCESS, value);
-		break;
-#endif
 	case IDS_LOCKSCREEN_OPTIONS_CLOCK:
 		ret = vconf_set_bool(VCONFKEY_LOCKSCREEN_CLOCK_DISPLAY, value);
 		break;
-	case IDS_LOCKSCREEN_OPTIONS_WEATHER:
-		ret = vconf_set_bool(VCONFKEY_LOCKSCREEN_WEATHER_DISPLAY, value);
-		break;
 	case IDS_LOCKSCREEN_OPTIONS_HELPTEXT:
 		ret = vconf_set_bool(VCONFKEY_LOCKSCREEN_HELP_TEXT_DISPLAY, value);
 		break;
 	default:
 		LOCKOPTIONS_DBG("NO VALID STRINGID %d", stringId);
 		break;
-
 	}
 }
 
@@ -179,30 +108,12 @@ static bool _lockscreen_options_get_menu_status(int stringId)
 	int ret = 0;
 
 	switch (stringId) {
-	case IDS_LOCKSCREEN_OPTIONS_SHORTCUTS:
-		ret = vconf_get_bool(VCONFKEY_LOCKSCREEN_SHORTCUT_DISPLAY, &status);
-		break;
-#if USE_TITLE_AND_CAMERA
-	case IDS_LOCKSCREEN_OPTIONS_LOCK_SCREEN_TITLE:
-		break;
-#endif
 	case IDS_LOCKSCREEN_OPTIONS_EVENT_NOTIFICATIONS:
 		ret = vconf_get_bool(VCONFKEY_LOCKSCREEN_EVENT_NOTIFICATION_DISPLAY, &status);
 		break;
-	case IDS_LOCKSCREEN_OPTIONS_CONTEXTAWARE_NOTI:
-		ret = vconf_get_bool(VCONFKEY_LOCKSCREEN_CONTEXT_AWARE_NOTIFICATION_DISPLAY, &status);
-		break;
-#if USE_TITLE_AND_CAMERA
-	case IDS_LOCKSCREEN_OPTIONS_CAMERA_QUICK_ACCESS:
-		ret = vconf_get_bool(VCONFKEY_LOCKSCREEN_CAMERA_QUICK_ACCESS, &status);
-		break;
-#endif
 	case IDS_LOCKSCREEN_OPTIONS_CLOCK:
 		ret = vconf_get_bool(VCONFKEY_LOCKSCREEN_CLOCK_DISPLAY, &status);
 		break;
-	case IDS_LOCKSCREEN_OPTIONS_WEATHER:
-		ret = vconf_get_bool(VCONFKEY_LOCKSCREEN_WEATHER_DISPLAY, &status);
-		break;
 	case IDS_LOCKSCREEN_OPTIONS_HELPTEXT:
 		ret = vconf_get_bool(VCONFKEY_LOCKSCREEN_HELP_TEXT_DISPLAY, &status);
 		break;
@@ -221,7 +132,6 @@ static bool _lockscreen_options_get_menu_status(int stringId)
 	     status);
 
 	return status;
-
 }
 
 static void _lockscreen_options_check_changed_cb(void *data, Evas_Object * obj,
@@ -242,10 +152,8 @@ static void _lockscreen_options_check_changed_cb(void *data, Evas_Object * obj,
 			ret == EINA_TRUE ? "ON" : "OFF");
 
 	if (ret == EINA_TRUE) {
-		/* set on */
 		value = 1;
 	} else {
-		/* set off */
 		value = 0;
 	}
 
@@ -277,22 +185,6 @@ static Evas_Object *_lockscreen_options_main_gl_icon_get(void *data,
 	evas_object_pass_events_set(check, 1);
 	evas_object_propagate_events_set(check, 0);
 
-
-	if (lockoption_data->stringId == IDS_LOCKSCREEN_OPTIONS_SHORTCUTS) {
-		Eina_Bool is_have = EINA_FALSE;
-		is_have = lockscreen_options_shortcuts_check_items();
-		if(is_have == EINA_TRUE){
-			elm_object_disabled_set(check, EINA_FALSE);
-		}else{
-			elm_object_disabled_set(check, EINA_TRUE);
-			elm_check_state_set(check, EINA_FALSE);
-			_lockscreen_options_set_menu_status(lockoption_data->stringId, EINA_FALSE);
-		}
-	}else if (lockoption_data->stringId ==
-	    IDS_LOCKSCREEN_OPTIONS_CONTEXTAWARE_NOTI) {
-		elm_object_disabled_set(check, EINA_TRUE);
-	}
-
 	evas_object_smart_callback_add(check, "changed",
 				       _lockscreen_options_check_changed_cb,
 				       lockoption_data);
@@ -328,7 +220,6 @@ static void _lockscreen_options_main_gl_sel(void *data, Evas_Object * obj,
 	if (lockoption_data->stringId ==
 	    IDS_LOCKSCREEN_OPTIONS_EVENT_NOTIFICATIONS
 	    || lockoption_data->stringId == IDS_LOCKSCREEN_OPTIONS_CLOCK
-	    || lockoption_data->stringId == IDS_LOCKSCREEN_OPTIONS_WEATHER
 	    || lockoption_data->stringId == IDS_LOCKSCREEN_OPTIONS_HELPTEXT) {
 		Eina_Bool check_state =
 		    elm_check_state_get(lockoption_data->check);
@@ -389,7 +280,7 @@ void lockscreen_options_main_create_view(lockscreen_options_ug_data * ug_data)
 					   ENUM_LOCKSCREEN_GENLIST_STYLE_2TEXT1ICON);
 	_lockscreen_options_create_gl_item(&(itc_help_1text),
 					   ENUM_LOCKSCREEN_GENLIST_STYLE_HELP);
-	/* Create genlist */
+
 	genlist = elm_genlist_add(navi_bar);
 
 	elm_genlist_mode_set(genlist, ELM_LIST_COMPRESS);
@@ -440,23 +331,13 @@ void lockscreen_options_main_create_view(lockscreen_options_ug_data * ug_data)
 			LOCKOPTIONS_WARN("lockscreen option has no such type.");
 			return;
 		}
-		if((lockscreen_options_menu_item[i].stringId) == IDS_LOCKSCREEN_OPTIONS_SHORTCUTS){
-			genlist_shortcuts_item = item;
-		}
 	}
 
-	/* Set navigation objects and push */
 	back_button = elm_button_add(navi_bar);
 	elm_object_style_set(back_button, "naviframe/back_btn/default");
 	evas_object_smart_callback_add(back_button, "clicked",
 				       _lockscreen_options_main_back_cb,
 				       ug_data);
 
-	elm_naviframe_item_push(navi_bar, _("IDS_ST_BODY_LOCK_SCREEN") , back_button, NULL, genlist, NULL);	/* the same tile */
-}
-
-void lockscreen_options_main_update_view()
-{	if(genlist_shortcuts_item){
-		elm_gengrid_item_update(genlist_shortcuts_item);
-	}
+	elm_naviframe_item_push(navi_bar, _("IDS_ST_BODY_LOCK_SCREEN") , back_button, NULL, genlist, NULL);
 }
diff --git a/lock-setting/lockscreen-options/src/lockscreen-options-shortcuts-edit.c b/lock-setting/lockscreen-options/src/lockscreen-options-shortcuts-edit.c
deleted file mode 100755
index 80f2d02..0000000
--- a/lock-setting/lockscreen-options/src/lockscreen-options-shortcuts-edit.c
+++ /dev/null
@@ -1,576 +0,0 @@
- /*
-  * Copyright 2012  Samsung Electronics Co., Ltd
-  *
-  * Licensed under the Flora License, Version 1.0 (the "License");
-  * you may not use this file except in compliance with the License.
-  * You may obtain a copy of the License at
-  *
-  *     http://www.tizenopensource.org/license
-  *
-  * Unless required by applicable law or agreed to in writing, software
-  * distributed under the License is distributed on an "AS IS" BASIS,
-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  * See the License for the specific language governing permissions and
-  * limitations under the License.
-  */
-
-
-
-#include <Elementary.h>
-#include <Ecore_X.h>
-#include <ail.h>
-#include <vconf.h>
-#include <vconf-keys.h>
-
-#include "lockscreen-options.h"
-#include "lockscreen-options-debug.h"
-#include "lockscreen-options-util.h"
-#include "lockscreen-options-shortcuts.h"
-#include "lockscreen-options-shortcuts-edit.h"
-
-#define EDJE_DIR                    "/usr/ug/res/edje/ug-lockscreen-options-efl"
-#define IMAGES_DIR                  "/usr/ug/res/images/ug-lockscreen-options-efl"
-#define GENGRID_ITEM_HEIGHT         188
-#define WINDOW_HEIGHT               1280
-
-typedef enum {
-	SET_SHORTCUTS_APP1 = 0,
-	SET_SHORTCUTS_APP2,
-	SET_SHORTCUTS_APP3,
-	SET_SHORTCUTS_APP4
-} shortcuts_type_t;
-
-typedef struct {
-	int index;
-	char *pkg_name;
-	Elm_Object_Item *item;
-} shortcuts_item_s;
-
-typedef struct {
-	lockscreen_options_ug_data *ug_data;
-	Evas_Object *gengrid;
-	Eina_List *app_list;
-	shortcuts_type_t shortcuts_type;
-	Elm_Object_Item *selected_gengrid_item;
-	Eina_Bool is_moved;
-} options_shortcuts_edit_view_s;
-
-static Elm_Gengrid_Item_Class gic;
-static options_shortcuts_edit_view_s *options_shortcuts_edit_view_data = NULL;
-static bool delete_icons[4];
-
-static Evas_Object *_lockscreen_options_grid_content_get_e(void *data, Evas_Object * obj, const char *part);
-
-static char *_lockscreen_options_icon_path_get_e(shortcuts_item_s *
-					       shortcuts_item)
-{
-	ail_appinfo_h handle;
-	ail_error_e ret;
-	char *pkg_name = NULL;
-	char *temp = NULL;
-	char *icon_path = NULL;
-	shortcuts_type_t shortcuts_type = SET_SHORTCUTS_APP1;
-
-	if (shortcuts_item == NULL) {
-		return NULL;
-	}
-
-	shortcuts_type = shortcuts_item->index;
-
-	switch (shortcuts_type) {
-	case SET_SHORTCUTS_APP1:
-		pkg_name = vconf_get_str(VCONFKEY_LOCKSCREEN_SHORTCUT1);
-		LOCKOPTIONS_ERR("pkg_name is %s", pkg_name);
-		break;
-	case SET_SHORTCUTS_APP2:
-		pkg_name = vconf_get_str(VCONFKEY_LOCKSCREEN_SHORTCUT2);
-		LOCKOPTIONS_ERR("pkg_name is %s", pkg_name);
-		break;
-	case SET_SHORTCUTS_APP3:
-		pkg_name = vconf_get_str(VCONFKEY_LOCKSCREEN_SHORTCUT3);
-		LOCKOPTIONS_ERR("pkg_name is %s", pkg_name);
-		break;
-	case SET_SHORTCUTS_APP4:
-		pkg_name = vconf_get_str(VCONFKEY_LOCKSCREEN_SHORTCUT4);
-		LOCKOPTIONS_ERR("pkg_name is %s", pkg_name);
-		break;
-	default:
-		break;
-	}
-
-	if (pkg_name == NULL || strlen(pkg_name) == 0) {
-		LOCKOPTIONS_ERR("pkg_name is NULL");
-		return NULL;
-	}
-	shortcuts_item->pkg_name = strdup(pkg_name);
-
-	ret = ail_get_appinfo(pkg_name, &handle);
-	if (ret != AIL_ERROR_OK) {
-		LOCKOPTIONS_ERR("Fail to ail_get_appinfo");
-		return NULL;
-	}
-
-	ret = ail_appinfo_get_str(handle, AIL_PROP_ICON_STR, &temp);
-	if (ret != AIL_ERROR_OK) {
-		LOCKOPTIONS_ERR("Fail to ail_appinfo_get_str");
-		ail_destroy_appinfo(handle);
-		return NULL;
-	}
-
-	if (temp) {
-		icon_path = strdup(temp);
-	}
-
-	ret = ail_destroy_appinfo(handle);
-	if (ret != AIL_ERROR_OK) {
-		LOCKOPTIONS_ERR("Fail to ail_destroy_appinfo");
-	}
-
-	if (pkg_name) {
-		free(pkg_name);
-		pkg_name = NULL;
-	}
-	return icon_path;
-}
-
-static void _lockscreen_options_shortcuts_set_e(shortcuts_type_t shortcuts_type,
-					      const char *pkg_name)
-{
-	int ret = 0;
-
-	switch (shortcuts_type) {
-	case SET_SHORTCUTS_APP1:
-		ret = vconf_set_str(VCONFKEY_LOCKSCREEN_SHORTCUT1, pkg_name);
-		if (ret != 0) {
-			LOCKOPTIONS_ERR("set failed");
-		}
-		break;
-	case SET_SHORTCUTS_APP2:
-		ret = vconf_set_str(VCONFKEY_LOCKSCREEN_SHORTCUT2, pkg_name);
-		if (ret != 0) {
-			LOCKOPTIONS_ERR("set failed");
-		}
-		break;
-	case SET_SHORTCUTS_APP3:
-		ret = vconf_set_str(VCONFKEY_LOCKSCREEN_SHORTCUT3, pkg_name);
-		if (ret != 0) {
-			LOCKOPTIONS_ERR("set failed");
-		}
-		break;
-	case SET_SHORTCUTS_APP4:
-		ret = vconf_set_str(VCONFKEY_LOCKSCREEN_SHORTCUT4, pkg_name);
-		if (ret != 0) {
-			LOCKOPTIONS_ERR("set failed");
-		}
-		break;
-	default:
-		break;
-	}
-}
-
-static void _lockscreen_options_shortcuts_delete_cb_e(void *data, Evas * e,
-						    Evas_Object * obj,
-						    void *event_info)
-{
-	void *list_item_data = NULL;
-
-	if (options_shortcuts_edit_view_data == NULL) {
-		return;
-	}
-
-	EINA_LIST_FREE(options_shortcuts_edit_view_data->app_list, list_item_data) {
-		if (list_item_data) {
-			free(list_item_data);
-			list_item_data = NULL;
-		}
-	}
-	if (options_shortcuts_edit_view_data->gengrid) {
-		evas_object_del(options_shortcuts_edit_view_data->gengrid);
-		options_shortcuts_edit_view_data->gengrid = NULL;
-	}
-	if (options_shortcuts_edit_view_data) {
-		free(options_shortcuts_edit_view_data);
-		options_shortcuts_edit_view_data = NULL;
-	}
-}
-
-static void _lockscreen_options_shortcuts_back_cb_e(void *data, Evas_Object * obj,
-						  void *event_info)
-{
-	lockscreen_options_ug_data *ug_data =
-	    (lockscreen_options_ug_data *) data;
-	if (ug_data == NULL) {
-		return;
-	}
-	Evas_Object *navi_bar = ug_data->navi_bar;
-
-	if (navi_bar == NULL) {
-		LOCKOPTIONS_ERR("navi_bar is null.");
-		return;
-	}
-
-	elm_naviframe_item_pop(navi_bar);
-}
-
-static void _lockscreen_options_grid_moved_cb_e(void *data, Evas_Object * obj,
-					      void *event_info)
-{
-	options_shortcuts_edit_view_data->is_moved = EINA_TRUE;
-}
-
-static void _lockscreen_options_shortcuts_done_cb_e(void *data, Evas_Object * obj,
-						  void *event_info)
-{
-	lockscreen_options_ug_data *ug_data =
-	    (lockscreen_options_ug_data *) data;
-	if (ug_data == NULL) {
-		return;
-	}
-
-    int index = 0;
-	Elm_Object_Item *object_item = NULL;
-	shortcuts_item_s *shortcuts_item = NULL;
-
-	object_item = elm_gengrid_first_item_get(options_shortcuts_edit_view_data->gengrid);
-	while (object_item) {
-		shortcuts_item = elm_object_item_data_get(object_item);
-		if (shortcuts_item) {
-			shortcuts_item->index = index;
-			if ((shortcuts_item->pkg_name == NULL)
-			    || (strlen(shortcuts_item->pkg_name) == 0)
-			    || (strcmp(shortcuts_item->pkg_name, "(null)") ==
-				0)) {
-				_lockscreen_options_shortcuts_set_e(index, "");
-			} else {
-				_lockscreen_options_shortcuts_set_e(index,
-								  shortcuts_item->pkg_name);
-			}
-		}
-		object_item = elm_gengrid_item_next_get(object_item);
-		index++;
-	}
-	while(index<4)
-	{
-		_lockscreen_options_shortcuts_set_e(index, "");
-		index++;
-	}
-	Evas_Object *navi_bar = ug_data->navi_bar;
-
-	if (navi_bar == NULL) {
-		LOCKOPTIONS_ERR("navi_bar is null.");
-		return;
-	}
-	elm_naviframe_item_pop(navi_bar);
-	lockscreen_options_shortcuts_update_view();
-}
-
-static void _lockscreen_options_grid_del_e(void *data, Evas_Object * obj)
-{
-	shortcuts_item_s *shortcuts_item = (shortcuts_item_s *) data;
-
-	if (shortcuts_item == NULL) {
-		return;
-	}
-	if (shortcuts_item->pkg_name) {
-		free(shortcuts_item->pkg_name);
-		shortcuts_item->pkg_name = NULL;
-	}
-	free(shortcuts_item);
-	shortcuts_item = NULL;
-}
-
-static void _lockscreen_options_shortcuts_thumbnail_delete_cb_e(void *data,
-							      Evas_Object * obj,
-							      void *event_info)
-{
-	LOCKOPTIONS_DBG("_lockscreen_options_shortcuts_thumbnail_delete_cb");
-	shortcuts_item_s *shortcuts_item = (shortcuts_item_s *) data;
-
-	if (shortcuts_item == NULL || options_shortcuts_edit_view_data->is_moved == EINA_TRUE) {
-		options_shortcuts_edit_view_data->is_moved = EINA_FALSE;
-		return;
-	}
-
-	delete_icons[shortcuts_item->index] = true;
-
-	elm_gengrid_clear(options_shortcuts_edit_view_data->gengrid);
-
-	Evas_Object *gengrid = options_shortcuts_edit_view_data->gengrid;
-
-	evas_object_smart_callback_add(gengrid, "moved",
-				       _lockscreen_options_grid_moved_cb_e, NULL);
-
-	gic.item_style = "default_grid";
-	gic.func.text_get = NULL;
-	gic.func.content_get = _lockscreen_options_grid_content_get_e;
-	gic.func.state_get = NULL;
-	gic.func.del = _lockscreen_options_grid_del_e;
-
-	char *pkg_name1 = NULL;
-	char *pkg_name2 = NULL;
-	char *pkg_name3 = NULL;
-	char *pkg_name4 = NULL;
-	pkg_name1 = vconf_get_str(VCONFKEY_LOCKSCREEN_SHORTCUT1);
-	pkg_name2 = vconf_get_str(VCONFKEY_LOCKSCREEN_SHORTCUT2);
-	pkg_name3 = vconf_get_str(VCONFKEY_LOCKSCREEN_SHORTCUT3);
-	pkg_name4 = vconf_get_str(VCONFKEY_LOCKSCREEN_SHORTCUT4);
-
-	if((delete_icons[0] == false) && (pkg_name1 != NULL && strlen(pkg_name1) != 0))
-	{
-		shortcuts_item_s *shortcuts_item = (shortcuts_item_s *) calloc(1, sizeof(shortcuts_item_s));
-		shortcuts_item->index = 0;
-		shortcuts_item->item = elm_gengrid_item_append(gengrid, &gic,
-			(void *)shortcuts_item, NULL, (void *)shortcuts_item);
-    }
-	if((delete_icons[1] == false) && (pkg_name2 != NULL && strlen(pkg_name2) != 0))
-	{
-		shortcuts_item_s *shortcuts_item = (shortcuts_item_s *) calloc(1, sizeof(shortcuts_item_s));
-		shortcuts_item->index = 1;
-		shortcuts_item->item = elm_gengrid_item_append(gengrid, &gic,
-			(void *)shortcuts_item, NULL, (void *)shortcuts_item);
-	}
-	if((delete_icons[2] == false) && (pkg_name3 != NULL && strlen(pkg_name3) != 0))
-	{
-		shortcuts_item_s *shortcuts_item = (shortcuts_item_s *) calloc(1, sizeof(shortcuts_item_s));
-		shortcuts_item->index = 2;
-		shortcuts_item->item = elm_gengrid_item_append(gengrid, &gic,
-			(void *)shortcuts_item, NULL, (void *)shortcuts_item);
-	}
-	if((delete_icons[3] == false) && (pkg_name4 != NULL && strlen(pkg_name4) != 0))
-	{
-		shortcuts_item_s *shortcuts_item = (shortcuts_item_s *) calloc(1, sizeof(shortcuts_item_s));
-		shortcuts_item->index = 3;
-		shortcuts_item->item = elm_gengrid_item_append(gengrid, &gic,
-			(void *)shortcuts_item, NULL, (void *)shortcuts_item);
-	}
-
-	if(pkg_name1 != NULL)
-	{
-		free(pkg_name1);
-		pkg_name1 = NULL;
-	}
-	if(pkg_name2 != NULL)
-	{
-		free(pkg_name2);
-		pkg_name2 = NULL;
-	}
-	if(pkg_name3 != NULL)
-	{
-		free(pkg_name3);
-		pkg_name3 = NULL;
-	}
-	if(pkg_name4 != NULL)
-	{
-		free(pkg_name4);
-		pkg_name4 = NULL;
-	}
-}
-
-static Evas_Object *_lockscreen_options_grid_content_get_e(void *data,
-							 Evas_Object * obj,
-							 const char *part)
-{
-	char *icon_path = NULL;
-	Evas_Object *icon = NULL;
-	Evas_Object *button = NULL;
-	Evas_Object *layout = NULL;
-	shortcuts_item_s *shortcuts_item = (shortcuts_item_s *) data;
-	LOCKOPTIONS_DBG("_lockscreen_options_grid_content_get.");
-
-	if (shortcuts_item == NULL) {
-		return NULL;
-	}
-
-	if (!strcmp(part, "elm.swallow.icon")) {
-		layout =
-		    lockscreen_options_util_create_layout(obj,
-							  EDJE_DIR
-							  "/lockscreen-options.edj",
-							  "lockscreen.options.shortcuts.thumbnail.main");
-		icon_path = _lockscreen_options_icon_path_get_e(shortcuts_item);
-		icon = elm_icon_add(layout);
-		if (icon_path) {
-			elm_icon_file_set(icon, icon_path, NULL);
-			elm_object_part_content_set(layout,
-						    "elm.swallow.contents",
-						    icon);
-			elm_icon_aspect_fixed_set(icon, EINA_FALSE);
-			button = elm_button_add(layout);
-			elm_object_style_set(button, "icon_minus");
-			evas_object_pass_events_set(button, 1);
-			evas_object_repeat_events_set(button, 0);
-			evas_object_propagate_events_set(button, 0);
-			elm_object_part_content_set(layout,
-						    "elm.swallow.button",
-						    button);
-			evas_object_smart_callback_add(button, "clicked",
-						       _lockscreen_options_shortcuts_thumbnail_delete_cb_e,
-						       shortcuts_item);
-			free(icon_path);
-			icon_path = NULL;
-		} else {
-			return NULL;
-		}
-		return layout;
-	}
-	return NULL;
-}
-
-static void _lockscreen_options_shortcuts_help_text_create_e(Evas_Object * parent)
-{
-	Evas_Object *title_label = NULL;
-	char buffer[1024] = { 0 };
-
-	title_label = elm_label_add(parent);
-	snprintf(buffer, sizeof(buffer),
-		 "<font_size=40><align=center>%s</align></font_size>",
-		 lockscreen_optoins_get_string
-		 (IDS_LOCKSCREEN_OPTIONS_DRAG_DROP_SHORTCUTS));
-	elm_object_text_set(title_label, buffer);
-	evas_object_show(title_label);
-	elm_object_part_content_set(parent, "shortcuts.edit.help.title",
-				    title_label);
-}
-
-static void _lockscreen_options_shortcuts_gengrid_create_e(Evas_Object * parent)
-{
-	char *pkg_name1 = NULL;
-	char *pkg_name2 = NULL;
-	char *pkg_name3 = NULL;
-	char *pkg_name4 = NULL;
-	pkg_name1 = vconf_get_str(VCONFKEY_LOCKSCREEN_SHORTCUT1);
-	pkg_name2 = vconf_get_str(VCONFKEY_LOCKSCREEN_SHORTCUT2);
-	pkg_name3 = vconf_get_str(VCONFKEY_LOCKSCREEN_SHORTCUT3);
-	pkg_name4 = vconf_get_str(VCONFKEY_LOCKSCREEN_SHORTCUT4);
-
-	Evas_Coord window_width = 0;
-	Evas_Coord window_height = 0;
-	Evas_Object *gengrid = NULL;
-
-	gengrid = elm_gengrid_add(parent);
-	ecore_x_window_size_get(ecore_x_window_root_first_get(), &window_width, &window_height);
-	elm_gengrid_item_size_set(gengrid, window_width / 4,
-					GENGRID_ITEM_HEIGHT * window_height /
-					WINDOW_HEIGHT);
-	elm_gengrid_align_set(gengrid, 0.5, 0.0);
-	elm_gengrid_reorder_mode_set(gengrid, EINA_TRUE),
-	evas_object_show(gengrid);
-	elm_object_part_content_set(parent, "shortcuts.gengrid", gengrid);
-
-	evas_object_smart_callback_add(gengrid, "moved",
-				       _lockscreen_options_grid_moved_cb_e, NULL);
-	options_shortcuts_edit_view_data->gengrid = gengrid;
-
-	gic.item_style = "default_grid";
-	gic.func.text_get = NULL;
-	gic.func.content_get = _lockscreen_options_grid_content_get_e;
-	gic.func.state_get = NULL;
-	gic.func.del = _lockscreen_options_grid_del_e;
-
-	if(pkg_name1 != NULL && strlen(pkg_name1) != 0)
-	{
-		shortcuts_item_s *shortcuts_item = (shortcuts_item_s *) calloc(1, sizeof(shortcuts_item_s));
-		shortcuts_item->index = 0;
-		shortcuts_item->item = elm_gengrid_item_append(gengrid, &gic,
-			(void *)shortcuts_item, NULL, (void *)shortcuts_item);
-	}
-
-	if(pkg_name2 != NULL && strlen(pkg_name2) != 0)
-	{
-		shortcuts_item_s *shortcuts_item = (shortcuts_item_s *) calloc(1, sizeof(shortcuts_item_s));
-		shortcuts_item->index = 1;
-		shortcuts_item->item = elm_gengrid_item_append(gengrid, &gic,
-			(void *)shortcuts_item, NULL, (void *)shortcuts_item);
-	}
-
-	if(pkg_name3 != NULL && strlen(pkg_name3) != 0)
-	{
-		shortcuts_item_s *shortcuts_item = (shortcuts_item_s *) calloc(1, sizeof(shortcuts_item_s));
-		shortcuts_item->index = 2;
-		shortcuts_item->item = elm_gengrid_item_append(gengrid, &gic,
-			(void *)shortcuts_item, NULL, (void *)shortcuts_item);
-	}
-
-	if(pkg_name4 != NULL && strlen(pkg_name4) != 0)
-	{
-		shortcuts_item_s *shortcuts_item = (shortcuts_item_s *) calloc(1, sizeof(shortcuts_item_s));
-		shortcuts_item->index = 3;
-		shortcuts_item->item = elm_gengrid_item_append(gengrid, &gic,
-			(void *)shortcuts_item, NULL, (void *)shortcuts_item);
-	}
-
-	if(pkg_name1 != NULL)
-	{
-		free(pkg_name1);
-		pkg_name1 = NULL;
-	}
-	if(pkg_name2 != NULL)
-	{
-		free(pkg_name2);
-		pkg_name2 = NULL;
-	}
-	if(pkg_name3 != NULL)
-	{
-		free(pkg_name3);
-		pkg_name3 = NULL;
-	}
-	if(pkg_name4 != NULL)
-	{
-		free(pkg_name4);
-		pkg_name4 = NULL;
-	}
-}
-
-void lockscreen_options_shortcuts_create_edit_view(void *data)
-{
-	lockscreen_options_ug_data *ug_data =
-	    (lockscreen_options_ug_data *) data;
-	if (ug_data == NULL) {
-        LOCKOPTIONS_ERR("ug is NULL");
-		return;
-	}
-	Evas_Object *navi_bar = ug_data->navi_bar;
-	Evas_Object *layout = NULL;
-
-	if (navi_bar == NULL) {
-		LOCKOPTIONS_ERR("navi_bar is null.");
-		return;
-	}
-
-	options_shortcuts_edit_view_data =
-	    (options_shortcuts_edit_view_s *) calloc(1,
-						sizeof
-						(options_shortcuts_edit_view_s));
-	options_shortcuts_edit_view_data->ug_data = ug_data;
-
-	layout =
-	    lockscreen_options_util_create_layout(navi_bar,
-						  EDJE_DIR
-						  "/lockscreen-options.edj",
-						  "lockscreen.options.shortcuts.main");
-	_lockscreen_options_shortcuts_help_text_create_e(layout);
-	_lockscreen_options_shortcuts_gengrid_create_e(layout);
-
-	Evas_Object *done_button = elm_button_add(navi_bar);
-	Evas_Object *cancel_button = elm_button_add(navi_bar);
-	elm_object_style_set(done_button, "naviframe/toolbar/default");
-	elm_object_text_set(done_button, _S("IDS_COM_SK_DONE"));
-	evas_object_smart_callback_add(done_button, "clicked", _lockscreen_options_shortcuts_done_cb_e, ug_data);
-	elm_object_style_set(cancel_button, "naviframe/toolbar/default");
-	elm_object_text_set(cancel_button, _S("IDS_COM_POP_CANCEL"));
-	evas_object_smart_callback_add(cancel_button, "clicked", _lockscreen_options_shortcuts_back_cb_e, ug_data);
-
-	evas_object_event_callback_add(layout, EVAS_CALLBACK_DEL,
-				_lockscreen_options_shortcuts_delete_cb_e, NULL);
-
-	Elm_Object_Item *navi_item = elm_naviframe_item_push(navi_bar, lockscreen_optoins_get_string(IDS_LOCKSCREEN_OPTIONS_EDIT_SHORTCUTS), NULL, NULL, layout, NULL);
-	elm_object_item_part_content_set(navi_item, "prev_btn", NULL);
-	elm_object_item_part_content_set(navi_item , "toolbar_button1", done_button);
-	elm_object_item_part_content_set(navi_item , "toolbar_button2", cancel_button);
-
-	int i;
-	for(i = 0;i < 4;i++)
-	{
-		delete_icons[i] = false;
-	}
-}
diff --git a/lock-setting/lockscreen-options/src/lockscreen-options-shortcuts.c b/lock-setting/lockscreen-options/src/lockscreen-options-shortcuts.c
deleted file mode 100755
index 5844852..0000000
--- a/lock-setting/lockscreen-options/src/lockscreen-options-shortcuts.c
+++ /dev/null
@@ -1,803 +0,0 @@
- /*
-  * Copyright 2012  Samsung Electronics Co., Ltd
-  *
-  * Licensed under the Flora License, Version 1.0 (the "License");
-  * you may not use this file except in compliance with the License.
-  * You may obtain a copy of the License at
-  *
-  *     http://www.tizenopensource.org/license
-  *
-  * Unless required by applicable law or agreed to in writing, software
-  * distributed under the License is distributed on an "AS IS" BASIS,
-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  * See the License for the specific language governing permissions and
-  * limitations under the License.
-  */
-
-
-
-#include <Elementary.h>
-#include <Ecore_X.h>
-#include <ail.h>
-#include <vconf.h>
-#include <vconf-keys.h>
-
-#include "lockscreen-options.h"
-#include "lockscreen-options-debug.h"
-#include "lockscreen-options-util.h"
-#include "lockscreen-options-shortcuts.h"
-#include "lockscreen-options-shortcuts-edit.h"
-
-
-#define EDJE_DIR                    "/usr/ug/res/edje/ug-lockscreen-options-efl"
-#define IMAGES_DIR                  "/usr/ug/res/images/ug-lockscreen-options-efl"
-#define GENGRID_ITEM_HEIGHT         188
-#define WINDOW_HEIGHT               1280
-
-typedef enum {
-	SET_SHORTCUTS_APP1 = 0,
-	SET_SHORTCUTS_APP2,
-	SET_SHORTCUTS_APP3,
-	SET_SHORTCUTS_APP4
-} shortcuts_type_t;
-
-typedef struct {
-	int index;
-	char *app_icon;
-	char *app_name;
-	char *pkg_name;
-} app_list_item_s;
-
-typedef struct {
-	int index;
-	char *pkg_name;
-	Elm_Object_Item *item;
-} shortcuts_item_s;
-
-typedef struct {
-	lockscreen_options_ug_data *ug_data;
-	Evas_Object *gengrid;
-	Eina_List *app_list;
-	shortcuts_type_t shortcuts_type;
-	Elm_Object_Item *selected_gengrid_item;
-	Eina_Bool is_moved;
-} options_shortcuts_view_s;
-
-static Elm_Gengrid_Item_Class gic;
-static Elm_Genlist_Item_Class ltc;
-static options_shortcuts_view_s *options_shortcuts_view_data = NULL;
-static Evas_Object *edit_item = NULL;
-
-static Eina_Bool _lockscreen_options_package_name_compare(const char *pkg_name)
-{
-	char *temp_name = NULL;
-
-	temp_name = vconf_get_str(VCONFKEY_LOCKSCREEN_SHORTCUT1);
-	if ((temp_name != NULL) && (strcmp(pkg_name, temp_name) == 0)) {
-		LOCKOPTIONS_DBG("pkg_name is %s", pkg_name);
-		free(temp_name);
-		temp_name = NULL;
-		return EINA_TRUE;
-	}
-
-	temp_name = vconf_get_str(VCONFKEY_LOCKSCREEN_SHORTCUT2);
-	if ((temp_name != NULL) && (strcmp(pkg_name, temp_name) == 0)) {
-		LOCKOPTIONS_DBG("pkg_name is %s", pkg_name);
-		free(temp_name);
-		temp_name = NULL;
-		return EINA_TRUE;
-	}
-
-	temp_name = vconf_get_str(VCONFKEY_LOCKSCREEN_SHORTCUT3);
-	if ((temp_name != NULL) && (strcmp(pkg_name, temp_name) == 0)) {
-		LOCKOPTIONS_DBG("pkg_name is %s", pkg_name);
-		free(temp_name);
-		temp_name = NULL;
-		return EINA_TRUE;
-	}
-
-	temp_name = vconf_get_str(VCONFKEY_LOCKSCREEN_SHORTCUT4);
-	if ((temp_name != NULL) && (strcmp(pkg_name, temp_name) == 0)) {
-		LOCKOPTIONS_DBG("pkg_name is %s", pkg_name);
-		free(temp_name);
-		temp_name = NULL;
-		return EINA_TRUE;
-	}
-
-	return EINA_FALSE;
-}
-
-static char *_lockscreen_options_icon_path_get(shortcuts_item_s *
-					       shortcuts_item)
-{
-	ail_appinfo_h handle;
-	ail_error_e ret;
-	char *pkg_name = NULL;
-	char *temp = NULL;
-	char *icon_path = NULL;
-	shortcuts_type_t shortcuts_type = SET_SHORTCUTS_APP1;
-
-	if (shortcuts_item == NULL) {
-		return NULL;
-	}
-
-	shortcuts_type = shortcuts_item->index;
-
-	switch (shortcuts_type) {
-	case SET_SHORTCUTS_APP1:
-		pkg_name = vconf_get_str(VCONFKEY_LOCKSCREEN_SHORTCUT1);
-		LOCKOPTIONS_ERR("pkg_name is %s", pkg_name);
-		break;
-	case SET_SHORTCUTS_APP2:
-		pkg_name = vconf_get_str(VCONFKEY_LOCKSCREEN_SHORTCUT2);
-		LOCKOPTIONS_ERR("pkg_name is %s", pkg_name);
-		break;
-	case SET_SHORTCUTS_APP3:
-		pkg_name = vconf_get_str(VCONFKEY_LOCKSCREEN_SHORTCUT3);
-		LOCKOPTIONS_ERR("pkg_name is %s", pkg_name);
-		break;
-	case SET_SHORTCUTS_APP4:
-		pkg_name = vconf_get_str(VCONFKEY_LOCKSCREEN_SHORTCUT4);
-		LOCKOPTIONS_ERR("pkg_name is %s", pkg_name);
-		break;
-	default:
-		break;
-	}
-
-	if (pkg_name == NULL || strlen(pkg_name) == 0) {
-		LOCKOPTIONS_ERR("pkg_name is NULL");
-		return NULL;
-	}
-	shortcuts_item->pkg_name = strdup(pkg_name);
-
-	ret = ail_get_appinfo(pkg_name, &handle);
-	if (ret != AIL_ERROR_OK) {
-		LOCKOPTIONS_ERR("Fail to ail_get_appinfo");
-		return NULL;
-	}
-
-	ret = ail_appinfo_get_str(handle, AIL_PROP_ICON_STR, &temp);
-	if (ret != AIL_ERROR_OK) {
-		LOCKOPTIONS_ERR("Fail to ail_appinfo_get_str");
-		ail_destroy_appinfo(handle);
-		return NULL;
-	}
-
-	if (temp) {
-		icon_path = strdup(temp);
-	}
-
-	ret = ail_destroy_appinfo(handle);
-	if (ret != AIL_ERROR_OK) {
-		LOCKOPTIONS_ERR("Fail to ail_destroy_appinfo");
-	}
-
-	if (pkg_name) {
-		free(pkg_name);
-		pkg_name = NULL;
-	}
-	return icon_path;
-}
-
-static void _lockscreen_options_shortcuts_set(shortcuts_type_t shortcuts_type,
-					      const char *pkg_name)
-{
-	int ret = 0;
-
-	switch (shortcuts_type) {
-	case SET_SHORTCUTS_APP1:
-		ret = vconf_set_str(VCONFKEY_LOCKSCREEN_SHORTCUT1, pkg_name);
-		if (ret != 0) {
-			LOCKOPTIONS_ERR("set failed");
-		}
-		break;
-	case SET_SHORTCUTS_APP2:
-		ret = vconf_set_str(VCONFKEY_LOCKSCREEN_SHORTCUT2, pkg_name);
-		if (ret != 0) {
-			LOCKOPTIONS_ERR("set failed");
-		}
-		break;
-	case SET_SHORTCUTS_APP3:
-		ret = vconf_set_str(VCONFKEY_LOCKSCREEN_SHORTCUT3, pkg_name);
-		if (ret != 0) {
-			LOCKOPTIONS_ERR("set failed");
-		}
-		break;
-	case SET_SHORTCUTS_APP4:
-		ret = vconf_set_str(VCONFKEY_LOCKSCREEN_SHORTCUT4, pkg_name);
-		if (ret != 0) {
-			LOCKOPTIONS_ERR("set failed");
-		}
-		break;
-	default:
-		break;
-	}
-}
-
-ail_cb_ret_e _lockscreen_options_appinfo_func(const ail_appinfo_h appinfo,
-					      void *user_data)
-{
-	char *pkg_name = NULL;
-	char *app_name = NULL;
-	char *app_icon = NULL;
-	int index = 0;
-	Eina_Bool is_same = EINA_FALSE;
-
-	if (AIL_ERROR_OK !=
-	    ail_appinfo_get_str(appinfo, AIL_PROP_PACKAGE_STR, &pkg_name)) {
-		LOCKOPTIONS_ERR("cannot get package name");
-	}
-
-	is_same = _lockscreen_options_package_name_compare(pkg_name);
-
-	LOCKOPTIONS_DBG("is_same = %d", is_same);
-	if (is_same == EINA_FALSE) {
-		app_list_item_s *list_item =
-		    (app_list_item_s *) calloc(1, sizeof(app_list_item_s));
-
-		if (pkg_name) {
-			list_item->pkg_name = strdup(pkg_name);
-		}
-
-		if (AIL_ERROR_OK !=
-		    ail_appinfo_get_str(appinfo, AIL_PROP_NAME_STR,
-					&app_name)) {
-			LOCKOPTIONS_ERR("cannot get App name");
-		}
-		if (AIL_ERROR_OK !=
-		    ail_appinfo_get_str(appinfo, AIL_PROP_ICON_STR,
-					&app_icon)) {
-			LOCKOPTIONS_ERR("cannot get App icon");
-		}
-		list_item->index = index;
-		if (app_name) {
-			list_item->app_name = strdup(app_name);
-		}
-		if (app_icon && (strcmp(app_icon, "(null)") != 0)) {
-			list_item->app_icon = strdup(app_icon);
-		} else {
-			list_item->app_icon =
-			    strdup(IMAGES_DIR "/mainmenu_icon.png");
-		}
-		options_shortcuts_view_data->app_list =
-		    eina_list_append(options_shortcuts_view_data->app_list,
-				     list_item);
-		index++;
-	}
-
-	return AIL_CB_RET_CONTINUE;
-}
-
-void _lockscreen_options_list_all_packages()
-{
-	ail_filter_h filter;
-	ail_error_e ret;
-
-	ret = ail_filter_new(&filter);
-	if (ret != AIL_ERROR_OK) {
-		return;
-	}
-
-	ret = ail_filter_add_bool(filter, AIL_PROP_X_SLP_TASKMANAGE_BOOL, true);
-	if (ret != AIL_ERROR_OK) {
-		return;
-	}
-
-	ret = ail_filter_add_bool(filter, AIL_PROP_NODISPLAY_BOOL, false);
-	if (ret != AIL_ERROR_OK) {
-		return;
-	}
-
-	ret = ail_filter_add_str(filter, AIL_PROP_TYPE_STR, "Application");
-	if (ret != AIL_ERROR_OK) {
-		return;
-	}
-
-	ail_filter_list_appinfo_foreach(filter,
-					_lockscreen_options_appinfo_func, NULL);
-	ail_filter_destroy(filter);
-}
-
-static void _lockscreen_options_select_apps_delete_cb(void *data, Evas * e,
-						      Evas_Object * obj,
-						      void *event_info)
-{
-	void *list_item_data = NULL;
-
-	EINA_LIST_FREE(options_shortcuts_view_data->app_list, list_item_data) {
-		if (list_item_data) {
-			free(list_item_data);
-			list_item_data = NULL;
-		}
-	}
-}
-
-static void _lockscreen_options_shortcuts_delete_cb(void *data, Evas * e,
-						    Evas_Object * obj,
-						    void *event_info)
-{
-	void *list_item_data = NULL;
-
-	if (options_shortcuts_view_data == NULL) {
-		return;
-	}
-
-	EINA_LIST_FREE(options_shortcuts_view_data->app_list, list_item_data) {
-		if (list_item_data) {
-			free(list_item_data);
-			list_item_data = NULL;
-		}
-	}
-	if (options_shortcuts_view_data->gengrid) {
-		evas_object_del(options_shortcuts_view_data->gengrid);
-		options_shortcuts_view_data->gengrid = NULL;
-	}
-	if (options_shortcuts_view_data) {
-		free(options_shortcuts_view_data);
-		options_shortcuts_view_data = NULL;
-	}
-}
-
-static void _lockscreen_options_shortcuts_back_cb(void *data, Evas_Object * obj,
-						  void *event_info)
-{
-	lockscreen_options_ug_data *ug_data =
-	    (lockscreen_options_ug_data *) data;
-	if (ug_data == NULL) {
-		return;
-	}
-	Evas_Object *navi_bar = ug_data->navi_bar;
-
-	if (navi_bar == NULL) {
-		LOCKOPTIONS_ERR("navi_bar is null.");
-		return;
-	}
-
-	elm_naviframe_item_pop(navi_bar);
-}
-
-//not used now
-static void _lockscreen_options_shortcuts_thumbnail_delete_cb(void *data,
-							      Evas_Object * obj,
-							      void *event_info)
-{
-	LOCKOPTIONS_DBG("_lockscreen_options_shortcuts_thumbnail_delete_cb");
-	Elm_Object_Item *object_item = NULL;
-	shortcuts_item_s *shortcuts_item = (shortcuts_item_s *) data;
-
-	if (shortcuts_item == NULL) {
-		return;
-	}
-
-	_lockscreen_options_shortcuts_set(shortcuts_item->index, "");
-
-	object_item =
-	    elm_gengrid_first_item_get(options_shortcuts_view_data->gengrid);
-	while (object_item) {
-		shortcuts_item_s *shortcuts_item_info = NULL;
-		shortcuts_item_info = elm_object_item_data_get(object_item);
-		if (shortcuts_item->index == shortcuts_item_info->index) {
-			elm_gengrid_item_update(object_item);
-		}
-		object_item = elm_gengrid_item_next_get(object_item);
-	}
-}
-
-//not used now
-static void _lockscreen_options_grid_moved_cb(void *data, Evas_Object * obj,
-					      void *event_info)
-{
-	int index = 0;
-	Elm_Object_Item *object_item = NULL;
-	shortcuts_item_s *shortcuts_item = NULL;
-
-	options_shortcuts_view_data->is_moved = EINA_TRUE;
-
-	object_item =
-	    elm_gengrid_first_item_get(options_shortcuts_view_data->gengrid);
-	while (object_item) {
-		shortcuts_item = elm_object_item_data_get(object_item);
-		if (shortcuts_item) {
-			LOCKOPTIONS_DBG
-			    ("index = %d, shortcuts_item->pkg_name = %s.",
-			     index, shortcuts_item->pkg_name);
-			shortcuts_item->index = index;
-			if ((shortcuts_item->pkg_name == NULL)
-			    || (strlen(shortcuts_item->pkg_name) == 0)
-			    || (strcmp(shortcuts_item->pkg_name, "(null)") ==
-				0)) {
-				_lockscreen_options_shortcuts_set(index, "");
-			} else {
-				_lockscreen_options_shortcuts_set(index,
-								  shortcuts_item->pkg_name);
-			}
-		}
-		object_item = elm_gengrid_item_next_get(object_item);
-		index++;
-	}
-}
-
-static void _lockscreen_options_gengrid_select_cb(void *data, Evas_Object * obj,
-						  const char *emission,
-						  const char *source)
-{
-	shortcuts_item_s *shortcuts_item = (shortcuts_item_s *) data;
-
-	if (shortcuts_item == NULL
-	    || options_shortcuts_view_data->is_moved == EINA_TRUE) {
-		options_shortcuts_view_data->is_moved = EINA_FALSE;
-		return;
-	}
-	LOCKOPTIONS_DBG("_lockscreen_options_gengrid_select_cb.");
-	if (shortcuts_item->item != NULL) {
-		options_shortcuts_view_data->selected_gengrid_item =
-		    shortcuts_item->item;
-		elm_gengrid_item_selected_set(shortcuts_item->item, EINA_FALSE);
-		_lockscreen_options_select_applications_create
-		    (shortcuts_item->index);
-	}
-}
-
-static Evas_Object *_lockscreen_options_grid_content_get(void *data,
-							 Evas_Object * obj,
-							 const char *part)
-{
-	char *icon_path = NULL;
-	Evas_Object *icon = NULL;
-	Evas_Object *layout = NULL;
-	shortcuts_item_s *shortcuts_item = (shortcuts_item_s *) data;
-	LOCKOPTIONS_DBG("_lockscreen_options_grid_content_get.");
-
-	if (shortcuts_item == NULL) {
-		return NULL;
-	}
-
-	if (!strcmp(part, "elm.swallow.icon")) {
-		layout =
-		    lockscreen_options_util_create_layout(obj,
-							  EDJE_DIR
-							  "/lockscreen-options.edj",
-							  "lockscreen.options.shortcuts.thumbnail.main");
-		icon_path = _lockscreen_options_icon_path_get(shortcuts_item);
-		icon = elm_icon_add(layout);
-		if (icon_path) {
-			elm_icon_file_set(icon, icon_path, NULL);
-			elm_object_part_content_set(layout,
-						    "elm.swallow.contents",
-						    icon);
-			elm_icon_aspect_fixed_set(icon, EINA_FALSE);
-			/*button = elm_button_add(layout);
-			elm_object_style_set(button, "minus/extended");
-			evas_object_pass_events_set(button, 1);
-			evas_object_repeat_events_set(button, 0);
-			evas_object_propagate_events_set(button, 0);
-			elm_object_part_content_set(layout,
-						    "elm.swallow.button",
-						    button);
-			evas_object_smart_callback_add(button, "clicked",
-						       _lockscreen_options_shortcuts_thumbnail_delete_cb,
-						       shortcuts_item);*/
-			free(icon_path);
-			icon_path = NULL;
-		} else {
-			elm_icon_file_set(icon, IMAGES_DIR "/icon_add.png",
-					  NULL);
-			elm_object_part_content_set(layout,
-						    "elm.swallow.contents",
-						    icon);
-		}
-		edje_object_signal_callback_add(elm_layout_edje_get(layout),
-						"mouse,clicked,*", "background",
-						_lockscreen_options_gengrid_select_cb,
-						shortcuts_item);
-		return layout;
-	}
-	return NULL;
-}
-
-static void _lockscreen_options_grid_del(void *data, Evas_Object * obj)
-{
-	shortcuts_item_s *shortcuts_item = (shortcuts_item_s *) data;
-
-	if (shortcuts_item == NULL) {
-		return;
-	}
-	if (shortcuts_item->pkg_name) {
-		free(shortcuts_item->pkg_name);
-		shortcuts_item->pkg_name = NULL;
-	}
-	free(shortcuts_item);
-	shortcuts_item = NULL;
-}
-
-static void _lockscreen_options_shortcuts_help_text_create(Evas_Object * parent)
-{
-	Evas_Object *title_label = NULL;
-	Evas_Object *contents_label = NULL;
-	char buffer[1024] = { 0 };
-
-	title_label = elm_label_add(parent);
-	snprintf(buffer, sizeof(buffer),
-		 "<font_size=40><align=center>%s</align></font_size>",
-		 lockscreen_optoins_get_string
-		 (IDS_LOCKSCREEN_OPTIONS_SET_SHORTCUTS_ON_LOCKSCREEN));
-	elm_object_text_set(title_label, buffer);
-	evas_object_show(title_label);
-	elm_object_part_content_set(parent, "shortcuts.help.title",
-				    title_label);
-
-	contents_label = elm_label_add(parent);
-	snprintf(buffer, sizeof(buffer),
-		 "<font_size=32><align=center><color=#7C7C7C>%s</color></align></font_size>",
-		 lockscreen_optoins_get_string
-		 (IDS_LOCKSCREEN_OPTIONS_TAP_SHORTCUTS));
-	elm_object_text_set(contents_label, buffer);
-	evas_object_show(contents_label);
-	elm_object_part_content_set(parent, "shortcuts.help.contents",
-				    contents_label);
-}
-
-static void _lockscreen_options_shortcuts_gengrid_create(Evas_Object * parent)
-{
-	Evas_Coord window_width = 0;
-	Evas_Coord window_height = 0;
-	Evas_Object *gengrid = NULL;
-	int index = 0;
-
-	gengrid = elm_gengrid_add(parent);
-	ecore_x_window_size_get(ecore_x_window_root_first_get(), &window_width,
-				&window_height);
-	elm_gengrid_item_size_set(gengrid, window_width / 4,
-				  GENGRID_ITEM_HEIGHT * window_height /
-				  WINDOW_HEIGHT);
-	elm_gengrid_align_set(gengrid, 0.5, 0.0);
-	//elm_gengrid_reorder_mode_set(gengrid, EINA_TRUE),
-	    evas_object_show(gengrid);
-	elm_object_part_content_set(parent, "shortcuts.gengrid", gengrid);
-
-	/*evas_object_smart_callback_add(gengrid, "moved",
-				       _lockscreen_options_grid_moved_cb, NULL);*/
-	options_shortcuts_view_data->gengrid = gengrid;
-
-	gic.item_style = "default_grid";
-	gic.func.text_get = NULL;
-	gic.func.content_get = _lockscreen_options_grid_content_get;
-	gic.func.state_get = NULL;
-	gic.func.del = _lockscreen_options_grid_del;
-
-	for (index = 0; index <= SET_SHORTCUTS_APP4; index++) {
-		shortcuts_item_s *shortcuts_item =
-		    (shortcuts_item_s *) calloc(1, sizeof(shortcuts_item_s));
-		shortcuts_item->index = index;
-		shortcuts_item->item =
-		    elm_gengrid_item_append(gengrid, &gic,
-					    (void *)shortcuts_item, NULL,
-					    (void *)shortcuts_item);
-	}
-}
-
-static char *_lockscreen_options_gl_text_get(void *data, Evas_Object * obj,
-					     const char *part)
-{
-	int index = (int)data;
-	app_list_item_s *list_item = (app_list_item_s *)
-	    eina_list_nth(options_shortcuts_view_data->app_list, index);
-
-	if (list_item == NULL || list_item->app_name == NULL) {
-		return NULL;
-	}
-
-	if (!strcmp(part, "elm.text")) {
-		return strdup(list_item->app_name);
-	}
-	return NULL;
-}
-
-static Evas_Object *_lockscreen_options_gl_content_get(void *data,
-						       Evas_Object * obj,
-						       const char *part)
-{
-	int index = (int)data;
-	Evas_Object *icon = NULL;
-	app_list_item_s *list_item = (app_list_item_s *)
-	    eina_list_nth(options_shortcuts_view_data->app_list, index);
-
-	if (list_item == NULL || list_item->app_icon == NULL) {
-		return NULL;
-	}
-
-	if (!strcmp(part, "elm.icon") || !strcmp(part, "elm.swallow.icon")) {
-		icon = elm_icon_add(obj);
-		elm_icon_file_set(icon, list_item->app_icon, NULL);
-		return icon;
-	}
-
-	return NULL;
-}
-
-static void _lockscreen_options_gl_options_sel(void *data, Evas_Object * obj,
-					       void *event_info)
-{
-	Elm_Object_Item *item = (Elm_Object_Item *) event_info;
-	int index = (int)data;
-	app_list_item_s *list_item = (app_list_item_s *)
-	    eina_list_nth(options_shortcuts_view_data->app_list, index);
-
-	if (list_item == NULL || list_item->pkg_name == NULL) {
-		return;
-	}
-	LOCKOPTIONS_DBG("list_item->pkg_name = %s", list_item->pkg_name);
-	if (item != NULL) {
-		elm_genlist_item_selected_set(item, EINA_FALSE);
-		_lockscreen_options_shortcuts_set
-		    (options_shortcuts_view_data->shortcuts_type,
-		     list_item->pkg_name);
-		elm_gengrid_item_update
-		    (options_shortcuts_view_data->selected_gengrid_item);
-	}
-	elm_naviframe_item_pop(options_shortcuts_view_data->ug_data->navi_bar);
-	Eina_Bool is_have = EINA_FALSE;
-	is_have = lockscreen_options_shortcuts_check_items();
-	if(is_have == EINA_TRUE){
-		elm_object_disabled_set(edit_item, EINA_FALSE);
-	}else{
-		elm_object_disabled_set(edit_item, EINA_TRUE);
-	}
-}
-
-void _lockscreen_options_select_applications_create(shortcuts_type_t
-						    shortcuts_type)
-{
-	Evas_Object *genlist = NULL;
-	int index = 0;
-
-	_lockscreen_options_list_all_packages();
-
-	options_shortcuts_view_data->shortcuts_type = shortcuts_type;
-	genlist =
-	    elm_genlist_add(options_shortcuts_view_data->ug_data->navi_bar);
-
-	ltc.item_style = "1text.1icon.2";
-	ltc.func.text_get = _lockscreen_options_gl_text_get;
-	ltc.func.content_get = _lockscreen_options_gl_content_get;
-	ltc.func.state_get = NULL;
-	ltc.func.del = NULL;
-
-	for (index = 0;
-	     index < eina_list_count(options_shortcuts_view_data->app_list);
-	     index++) {
-		elm_genlist_item_append(genlist, &ltc, (void *)index, NULL,
-					ELM_GENLIST_ITEM_NONE,
-					_lockscreen_options_gl_options_sel,
-					(void *)index);
-	}
-
-	evas_object_event_callback_add(genlist, EVAS_CALLBACK_DEL,
-				       _lockscreen_options_select_apps_delete_cb,
-				       NULL);
-	elm_naviframe_item_push(options_shortcuts_view_data->ug_data->navi_bar, lockscreen_optoins_get_string(IDS_LOCKSCREEN_OPTIONS_SELECT_APPLICATIONS), NULL, NULL, genlist, NULL);	/* the same tile */
-}
-
-static void _lockscreen_options_shortcuts_edit_cb(void *data, Evas_Object * obj, void *event_info)
-{
-	lockscreen_options_shortcuts_create_edit_view(data);
-}
-
-void lockscreen_options_shortcuts_create_view(void *data)
-{
-	lockscreen_options_ug_data *ug_data =
-	    (lockscreen_options_ug_data *) data;
-	if (ug_data == NULL) {
-		return;
-	}
-	Evas_Object *navi_bar = ug_data->navi_bar;
-	Evas_Object *layout = NULL;
-
-	if (navi_bar == NULL) {
-		LOCKOPTIONS_ERR("navi_bar is null.");
-		return;
-	}
-
-	options_shortcuts_view_data =
-	    (options_shortcuts_view_s *) calloc(1,
-						sizeof
-						(options_shortcuts_view_s));
-	options_shortcuts_view_data->ug_data = ug_data;
-
-	layout =
-	    lockscreen_options_util_create_layout(navi_bar,
-						  EDJE_DIR
-						  "/lockscreen-options.edj",
-						  "lockscreen.options.shortcuts.main");
-	_lockscreen_options_shortcuts_help_text_create(layout);
-	_lockscreen_options_shortcuts_gengrid_create(layout);
-
-	edit_item= elm_button_add(navi_bar);
-	elm_object_style_set(edit_item, "naviframe/toolbar/default");
-	elm_object_text_set(edit_item, _S("IDS_COM_BODY_EDIT"));
-	evas_object_smart_callback_add(edit_item, "clicked", _lockscreen_options_shortcuts_edit_cb, ug_data);
-
-	Evas_Object *back_button = elm_button_add(navi_bar);
-	elm_object_style_set(back_button, "naviframe/back_btn/default");
-	evas_object_smart_callback_add(back_button, "clicked", _lockscreen_options_shortcuts_back_cb, ug_data);
-	evas_object_event_callback_add(layout, EVAS_CALLBACK_DEL,
-					_lockscreen_options_shortcuts_delete_cb, NULL);
-
-
-	Elm_Object_Item *navi_item = elm_naviframe_item_push(navi_bar, lockscreen_optoins_get_string(IDS_LOCKSCREEN_OPTIONS_SET_SHORTCUTS), back_button, NULL, layout, NULL);	/* the same tile */
-	elm_object_item_part_content_set(navi_item , "toolbar_button1", edit_item);
-
-	Eina_Bool is_have = EINA_FALSE;
-	is_have = lockscreen_options_shortcuts_check_items();
-	if(is_have == EINA_TRUE){
-		elm_object_disabled_set(edit_item, EINA_FALSE);
-	}else{
-		elm_object_disabled_set(edit_item, EINA_TRUE);
-	}
-}
-
-void lockscreen_options_shortcuts_update_view()
-{
-	Elm_Object_Item *object_item = NULL;
-
-	object_item = elm_gengrid_first_item_get(options_shortcuts_view_data->gengrid);
-	while (object_item) {
-		elm_gengrid_item_update(object_item);
-		object_item = elm_gengrid_item_next_get(object_item);
-	}
-
-	Eina_Bool is_have = EINA_FALSE;
-	is_have = lockscreen_options_shortcuts_check_items();
-	if(is_have == EINA_TRUE){
-		elm_object_disabled_set(edit_item, EINA_FALSE);
-	}else{
-		elm_object_disabled_set(edit_item, EINA_TRUE);
-	}
-}
-
-Eina_Bool lockscreen_options_shortcuts_check_items()
-{
-	char *pkg_name1 = NULL;
-	char *pkg_name2 = NULL;
-	char *pkg_name3 = NULL;
-	char *pkg_name4 = NULL;
-	Eina_Bool is_have = EINA_FALSE;
-
-	pkg_name1 = vconf_get_str(VCONFKEY_LOCKSCREEN_SHORTCUT1);
-	pkg_name2 = vconf_get_str(VCONFKEY_LOCKSCREEN_SHORTCUT2);
-	pkg_name3 = vconf_get_str(VCONFKEY_LOCKSCREEN_SHORTCUT3);
-	pkg_name4 = vconf_get_str(VCONFKEY_LOCKSCREEN_SHORTCUT4);
-
-	if((pkg_name1 == NULL || strlen(pkg_name1) == 0) && (pkg_name2 == NULL || strlen(pkg_name2) == 0)
-		&& (pkg_name3 == NULL || strlen(pkg_name3) == 0) && (pkg_name4 == NULL || strlen(pkg_name4) == 0))
-	{
-		is_have = EINA_FALSE;
-		//elm_object_disabled_set(edit_item, EINA_TRUE);
-	}
-	else
-	{
-		is_have = EINA_TRUE;
-		//elm_object_disabled_set(edit_item, EINA_FALSE);
-	}
-	if(pkg_name1 != NULL)
-	{
-		free(pkg_name1);
-		pkg_name1 = NULL;
-	}
-	if(pkg_name2 != NULL)
-	{
-		free(pkg_name2);
-		pkg_name2 = NULL;
-	}
-	if(pkg_name3 != NULL)
-	{
-		free(pkg_name3);
-		pkg_name3 = NULL;
-	}
-	if(pkg_name4 != NULL)
-	{
-		free(pkg_name4);
-		pkg_name4 = NULL;
-	}
-	return is_have;
-}
diff --git a/lock-setting/lockscreen-options/src/lockscreen-options-util.c b/lock-setting/lockscreen-options/src/lockscreen-options-util.c
index 4d3afb2..cc5a7c5 100755
--- a/lock-setting/lockscreen-options/src/lockscreen-options-util.c
+++ b/lock-setting/lockscreen-options/src/lockscreen-options-util.c
@@ -26,35 +26,11 @@ const char *sys_str_table[] = {
 };
 
 const char *app_str_table[] = {
-	"IDS_ST_BODY_SHORTCUTS",
-	"IDS_ST_BODY_SET_SHORTCUTS_ON_LOCK_SCREEN",
-#if USE_TITLE_AND_CAMERA
-	"Lock screen title",
-	"Show title text on the lock screen",
-#endif
-	//"Event notifications",
 	"IDS_IDLE_MBODY_EVENT_NOTIFICATIONS",
-	//"View event notification on lock screen",
 	"IDS_IDLE_BODY_VIEW_EVENT_NOTIFICATIONS_ON_THE_LOCK_SCREEN",
-	"Context-aware notifications",
-	"View context-aware notifications on lock screen",
-#if USE_TITLE_AND_CAMERA
-	"IDS_ST_MBODY_CAMERA_QUICK_ACCESS",
-	"IDS_ST_BODY_TAP_AND_HOLD_THE_SCREEN_WHILE_ROTATING_THE_DEVICE_TO_OPEN_CAMERA",
-#endif
 	"IDS_ST_BODY_CLOCK",
-//	"Dual clock",
-//	"Show dual clock on lock screen when roaming",
-	"IDS_ST_BODY_WEATHER",
 	"IDS_IM_BODY_HELP_TEXT",
-	"IDS_ST_BODY_SHOW_HELP_TEXT_ON_LOCK_SCREEN",
-	"IDS_ST_BODY_SET_SHORTCUTS",
-	"IDS_ST_OPT_EDIT_SHORTCUTS",
-	"IDS_ST_BODY_SET_SHORTCUTS_ON_LOCK_SCREEN",
-	"IDS_ST_BODY_TAP_SHORTCUT_TO_ASSIGN_APPLICATION",
-	"IDS_ST_BODY_DRAG_AND_DROP_TO_CHANGE_ORDER",
-	"IDS_ST_BODY_SELECT_APPLICATION",
-	"Life Magazine"
+	"IDS_ST_BODY_SHOW_HELP_TEXT_ON_LOCK_SCREEN"
 };
 
 static Elm_Gen_Item_Class itc_underline;
@@ -158,10 +134,8 @@ char *lockscreen_optoins_get_string(int id)
 	char *str = NULL;
 
 	if (id < IDS_LOCKSCREEN_OPTIONS_SYSTEM_STRING_MAX) {
-		/* get system string */
 		str = dgettext("sys_string", sys_str_table[id]);
 	} else {
-		/* get application string */
 		str =
 		    dgettext(PKGNAME,
 			     app_str_table[id -
diff --git a/lock-setting/lockscreen-options/src/lockscreen-options.c b/lock-setting/lockscreen-options/src/lockscreen-options.c
index 363230e..ab3ab8a 100755
--- a/lock-setting/lockscreen-options/src/lockscreen-options.c
+++ b/lock-setting/lockscreen-options/src/lockscreen-options.c
@@ -69,8 +69,6 @@ static Evas_Object *create_frameview(Evas_Object * parent,
 {
 	Evas_Object *base = NULL;
 
-	/* Create Frame view */
-
 	return base;
 }
 
@@ -105,8 +103,6 @@ static void *on_create(ui_gadget_h ug, enum ug_mode mode, service_h service,
 	else
 		ug_data->base = create_frameview(parent, ug_data);
 
-	/* Add del callback for base layout */
-
 	return ug_data->base;
 }
 
diff --git a/packaging/starter.spec b/packaging/starter.spec
index a075865..d66e67d 100755
--- a/packaging/starter.spec
+++ b/packaging/starter.spec
@@ -74,21 +74,13 @@ GOPTION="-u 5000 -f"
 
 vconftool set -t int "memory/starter/sequence" 0 -i $GOPTION
 vconftool set -t int "memory/starter/use_volume_key" 0 -i $GOPTION
-vconftool set -t string file/private/lockscreen/pkgname "org.tizen.draglock" -u 5000 -g 5000
+vconftool set -t string file/private/lockscreen/pkgname "org.tizen.lockscreen" -u 5000 -g 5000
 vconftool set -t int memory/idle_lock/state "0" -i $GOPTION
 vconftool set -t bool memory/lockscreen/phone_lock_verification 0 -i $GOPTION
 
-vconftool set -t bool db/lockscreen/shortcut_display 0 $GOPTION
 vconftool set -t bool db/lockscreen/event_notification_display 1 $GOPTION
-vconftool set -t bool db/lockscreen/context_aware_notification_display 0 $GOPTION
 vconftool set -t bool db/lockscreen/clock_display 1 $GOPTION
-vconftool set -t bool db/lockscreen/weather_display 1 $GOPTION
 vconftool set -t bool db/lockscreen/help_text_display 0 $GOPTION
-vconftool set -t bool db/lockscreen/camera_quick_access 0 $GOPTION
-vconftool set -t string file/lockscreen/shortcut1 "" $GOPTION
-vconftool set -t string file/lockscreen/shortcut2 "" $GOPTION
-vconftool set -t string file/lockscreen/shortcut3 "" $GOPTION
-vconftool set -t string file/lockscreen/shortcut4 "" $GOPTION
 
 vconftool set -t string memory/menuscreen/desktop "0" -i -f
 vconftool set -t int memory/idle-screen/is_idle_screen_launched "0" -i -u 5000 -f
@@ -110,15 +102,9 @@ sync
 %{_sysconfdir}/init.d/rd4starter
 %{_sysconfdir}/init.d/rd3starter
 %{_bindir}/starter
-/usr/ug/lib/libug-openlock-setting.so
-/usr/ug/lib/libug-openlock-setting.so.0.1.0
 /usr/ug/lib/libug-lockscreen-options.so
 /usr/ug/lib/libug-lockscreen-options.so.0.1.0
 /usr/ug/res/locale/*/LC_MESSAGES/*
-/usr/ug/res/edje/*
-/usr/ug/res/edje/ug-lockscreen-options-efl/*
-/usr/ug/res/images/*
-/usr/ug/res/images/ug-lockscreen-options-efl/*
 %{_libdir}/systemd/user/starter.service
 %{_libdir}/systemd/user/core-efl.target.wants/starter.service
 /usr/share/license/%{name}
diff --git a/src/hw_key.c b/src/hw_key.c
index 42bd288..12d2e22 100755
--- a/src/hw_key.c
+++ b/src/hw_key.c
@@ -87,7 +87,7 @@ static Eina_Bool _launch_home_screen(void *data)
 		if (ret < 0) {
 			_E("cannot launch package %s(err:%d)", package, ret);
 
-			if (-1 == ret) { // -1 : AUL returns '-1' when there is no package name in DB.
+			if (-1 == ret) {
 				ret = aul_open_app(HOME_SCREEN_PKG_NAME);
 				if (ret < 0) {
 					_E("Failed to open a default home, %s(err:%d)", HOME_SCREEN_PKG_NAME, ret);
@@ -328,7 +328,3 @@ void destroy_key_window(void)
 
 	media_key_release();
 }
-
-
-
-// End of a file
diff --git a/src/lock-daemon.c b/src/lock-daemon.c
index 9e722c5..0086c46 100755
--- a/src/lock-daemon.c
+++ b/src/lock-daemon.c
@@ -47,7 +47,7 @@ static int phone_lock_pid;
 struct lockd_data {
 	int lock_app_pid;
 	int phone_lock_app_pid;
-	int lock_type;	/* 0:Normal, 1:Security,  2:Other */
+	int lock_type;
 	Eina_Bool request_recovery;
 	lockw_data *lockw;
 	GPollFD *gpollfd;
@@ -291,7 +291,7 @@ static void lockd_unlock_lockscreen(struct lockd_data *lockd)
 inline static void lockd_set_sock_option(int fd, int cli)
 {
 	int size;
-	struct timeval tv = { 1, 200 * 1000 };	/* 1.2 sec */
+	struct timeval tv = { 1, 200 * 1000 };
 
 	size = PHLOCK_SOCK_MAXBUFF;
 	setsockopt(fd, SOL_SOCKET, SO_SNDBUF, &size, sizeof(size));
@@ -305,7 +305,7 @@ static int lockd_create_sock(void)
 	struct sockaddr_un saddr;
 	int fd;
 
-	fd = socket(AF_UNIX, SOCK_STREAM, 0);	/* support above version 2.6.27 */
+	fd = socket(AF_UNIX, SOCK_STREAM, 0);
 	if (fd < 0) {
 		if (errno == EINVAL) {
 			fd = socket(AF_UNIX, SOCK_STREAM, 0);
@@ -334,7 +334,6 @@ static int lockd_create_sock(void)
 	}
 
 	if (chmod(saddr.sun_path, (S_IRWXU | S_IRWXG | S_IRWXO)) < 0) {
-		/* Flawfinder: ignore */
 		LOCKD_DBG("failed to change the socket permission");
 		return -1;
 	}
@@ -461,7 +460,6 @@ static int lockd_sock_handler(void *data)
 
 	lockd_set_sock_option(clifd, 1);
 
-	/* receive single packet from socket */
 	len = recv(clifd, cmd, PHLOCK_SOCK_MAXBUFF, 0);
 
 	if (cmd == NULL) {
@@ -478,10 +476,8 @@ static int lockd_sock_handler(void *data)
 
 	LOCKD_DBG("cmd %s", cmd);
 
-	/* Read command line of the PID from proc fs */
 	cmdline = lockd_read_cmdline_from_proc(cr.pid);
 	if (cmdline == NULL) {
-		/* It's weired. no file in proc file system, */
 		LOCKD_DBG("Error on opening /proc/%d/cmdline", cr.pid);
 		close(clifd);
 		return -1;
diff --git a/src/lockd-debug.c b/src/lockd-debug.c
index 69545de..323f706 100644..100755
--- a/src/lockd-debug.c
+++ b/src/lockd-debug.c
@@ -28,7 +28,7 @@
 #include "lockd-debug.h"
 
 #define LINEMAX 256
-#define MAXFILELEN	1048576	/* 32000 */
+#define MAXFILELEN	1048576
 #define LOGFILE "/tmp/starter.log"
 
 void lockd_log_t(char *fmt, ...)
@@ -46,8 +46,7 @@ void lockd_log_t(char *fmt, ...)
 	time_t current_time = 0;
 	bzero((char *)&debugString, LINEMAX);
 	time(&current_time);
-	/* local_t = gmtime(&current_time); */
-	gmtime_r(&current_time, &local_t);	/* for prevent 53555 */
+	gmtime_r(&current_time, &local_t);
 	int len = snprintf(debugString, sizeof(debugString),
 			   "[%d-%02d-%02d, %02d:%02d:%02d]: ",
 			   local_t.tm_year + 1900, local_t.tm_mon + 1,
@@ -60,13 +59,10 @@ void lockd_log_t(char *fmt, ...)
 	}
 	len = g_strlcat(debugString, buf, LINEMAX);
 	if (len >= LINEMAX) {
-		/* TODO:ERROR handling */
 		return;
 	} else {
 		debugString[len] = '\n';
 	}
-	/* FIXME this is for permission.. later we should fix and remove this... */
-	/* system("chmod 666 "LOGFILE); */
 	if ((fd = fopen(LOGFILE, "at+")) == NULL) {
 		LOCKD_DBG("File fopen fail for writing Pwlock information");
 	} else {
@@ -80,7 +76,6 @@ void lockd_log_t(char *fmt, ...)
 				execl("/bin/rm", "rm", "-f", LOGFILE,
 				      (char *)0);
 			}
-			/* system("rm -rf "LOGFILE);  */
 		} else {
 			fseek(fd, 0l, SEEK_END);
 			fileLen = ftell(fd);
@@ -92,7 +87,6 @@ void lockd_log_t(char *fmt, ...)
 					execl("/bin/rm", "rm", "-f", LOGFILE,
 					      (char *)0);
 				}
-				/* system("rm -rf "LOGFILE); */
 			} else
 				fclose(fd);
 		}
diff --git a/src/lockd-window-mgr.c b/src/lockd-window-mgr.c
index a3ec625..45cb16e 100755
--- a/src/lockd-window-mgr.c
+++ b/src/lockd-window-mgr.c
@@ -42,10 +42,10 @@ struct _lockw_data {
 	Ecore_Event_Handler *h_wincreate;
 	Ecore_Event_Handler *h_winshow;
 
-	Ecore_Timer *pTimerId; /* volume key timer */
+	Ecore_Timer *pTimerId;
 	int volume_key_cnt;
 
-	int phone_lock_state;	/* 0 : disable, 1 : enable */
+	int phone_lock_state;
 	int phone_lock_app_pid;
 };
 
diff --git a/src/menu_daemon.c b/src/menu_daemon.c
index b432bf3..c199e78 100755
--- a/src/menu_daemon.c
+++ b/src/menu_daemon.c
@@ -43,13 +43,6 @@ int errno;
 #define RELAUNCH_INTERVAL 100*1000
 #define RETRY_MAXCOUNT 30
 
-
-
-// Define prototype of the "hidden API of AUL"
-//extern int aul_listen_app_dead_signal(int (*func)(int signal, void *data), void *data);
-
-
-
 static struct info {
 	pid_t home_pid;
 	pid_t volume_pid;
@@ -101,7 +94,7 @@ static inline void _open_homescreen(const char *pkgname)
 	if (ret < 0 && strcmp(homescreen, HOME_SCREEN_PKG_NAME)) {
 		_E("cannot launch package %s", homescreen);
 
-		if (-1 == ret) { // -1 : AUL returns '-1' when there is no package name in DB.
+		if (-1 == ret) {
 			ret = aul_open_app(HOME_SCREEN_PKG_NAME);
 			if (ret < 0) {
 				_E("Failed to open a default home, %s(err:%d)", HOME_SCREEN_PKG_NAME, ret);
@@ -149,7 +142,7 @@ static void _show_cb(keynode_t* node, void *data)
 				_D("pid[%d] is terminated.", s_info.home_pid);
 
 				pid = s_info.home_pid;
-				s_info.home_pid = -1; /* to freeze the dead_cb */
+				s_info.home_pid = -1;
 
 				if (aul_terminate_pid(pid) != AUL_R_OK)
 					_E("Failed to terminate %d", s_info.home_pid);
@@ -207,13 +200,9 @@ static void _pkg_changed(keynode_t* node, void *data)
 		if (aul_terminate_pid(s_info.home_pid) != AUL_R_OK)
 			_D("Failed to terminate pid %d", s_info.home_pid);
 	} else {
-		/* If there is no running home */
 		_open_homescreen(pkgname);
 	}
 
-	/* NOTE: Dead callback will catch the termination of a current menuscreen 
-	 * _open_homescreen(pkgname);
-	 */
 	free(pkgname);
 	return;
 }
@@ -259,11 +248,9 @@ int menu_daemon_check_dead_signal(int pid)
 		return 0;
 
 	if (pid == s_info.home_pid) {
-		/* Relaunch */
 		_D("pkg_name : %s", pkgname);
 		_open_homescreen(pkgname);
 	} else if (pid == s_info.volume_pid) {
-		/* Relaunch */
 		_launch_volume();
 	} else {
 		_D("Unknown process, ignore it (pid %d, home pid %d)",
@@ -299,7 +286,6 @@ void menu_daemon_init(void *data)
 		_E("Failed to add callback for show event");
 
 	_pkg_changed(NULL, NULL);
-	// THIS ROUTINE IS FOR SAT.
 	vconf_set_int(VCONFKEY_IDLE_SCREEN_LAUNCHED, VCONFKEY_IDLE_SCREEN_LAUNCHED_TRUE);
 }
 
@@ -314,7 +300,3 @@ void menu_daemon_fini(void)
 	pkg_event_fini();
 	destroy_key_window();
 }
-
-
-
-// End of a file
diff --git a/src/pkg_event.c b/src/pkg_event.c
index c1508f1..367e62f 100644..100755
--- a/src/pkg_event.c
+++ b/src/pkg_event.c
@@ -84,7 +84,6 @@ directory_notify(void* data, Ecore_Fd_Handler* fd_handler)
 	len = read(fd, buf, read_size);
 	if (len < 0) {
 		free(buf);
-		// Stop monitoring about this invalid file descriptor
 		return ECORE_CALLBACK_CANCEL;
 	}
 
@@ -95,7 +94,6 @@ directory_notify(void* data, Ecore_Fd_Handler* fd_handler)
 		ssize_t idx;
 		int nev_name;
 
-		// 1. check the extension of a file
 		nev_name = strlen(event->name) - 1;
 		for (idx = 0; nev_name >= 0 && str_potksed[idx]; idx++) {
 			if (event->name[nev_name] != str_potksed[idx]) {
@@ -116,8 +114,7 @@ directory_notify(void* data, Ecore_Fd_Handler* fd_handler)
 		package[nev_name + 1] = '\0';
 		_D("Package : %s", package);
 
-		// add & update
-		if (event->mask & IN_CLOSE_WRITE || event->mask & IN_MOVED_TO) { // for moving
+		if (event->mask & IN_CLOSE_WRITE || event->mask & IN_MOVED_TO) {
 			ail_appinfo_h ai = NULL;
 			ail_error_e ret;
 
@@ -135,8 +132,7 @@ directory_notify(void* data, Ecore_Fd_Handler* fd_handler)
 				}
 			} else
 				;
-		// delete
-		} else if (event->mask & IN_DELETE) { // for deleting
+		} else if (event->mask & IN_DELETE) {
 			if (ail_desktop_remove(package) < 0) 
 				_D("Failed to remove a package (%s)", event->name);
 		} else {
@@ -266,7 +262,6 @@ void pkg_event_init()
 
 	s_desktop_notifier.handler = ecore_main_fd_handler_add(s_desktop_notifier.ifd, ECORE_FD_READ, directory_notify, NULL, NULL, NULL);
 	if (!s_desktop_notifier.handler) {
-		// TODO: Handles me.. EXCEPTION!!
 		_E("cannot add handler for inotify");
 	}
 }
@@ -301,6 +296,3 @@ void pkg_event_fini(void)
 		s_desktop_notifier.ifd = 0;
 	}
 }
-
-
-// End of a file
diff --git a/src/xmonitor.c b/src/xmonitor.c
index f337925..92d2a07 100644..100755
--- a/src/xmonitor.c
+++ b/src/xmonitor.c
@@ -27,11 +27,6 @@
 #include <stdio.h>
 #include <sys/shm.h>
 #include <vconf.h>
-//#include <X11/Xatom.h>
-//#include <X11/Xlib.h>
-//#include <X11/Xutil.h>
-//#include <X11/extensions/Xcomposite.h>
-//#include <X11/extensions/XShm.h>
 
 #include "menu_daemon.h"
 #include "util.h"
@@ -198,11 +193,6 @@ static inline void _sniff_all_windows(void)
 		while (item->i < item->nr_of_wins) {
 			ret = item->wins[item->i];
 
-			/*
-			 * Now we don't need to care about visibility of window,
-			 * just check whether it is registered or not.
-			 * (ecore_x_window_visible_get(ret))
-			 */
 			ecore_x_window_client_sniff(ret);
 
 			new_item = malloc(sizeof(*new_item));
@@ -300,5 +290,3 @@ void xmonitor_fini(void)
 	ecore_event_handler_del(xmonitor_info.focus_out_handler);
 	xmonitor_info.focus_out_handler = NULL;
 }
-
-/* End of a file */
diff --git a/starter.init.sh b/starter.init.sh
index b4e0f40..8b13789 100755
--- a/starter.init.sh
+++ b/starter.init.sh
@@ -1,2 +1 @@
-cp -f /usr/ug/lib/libug-openlock-setting.so /opt/ug/lib
-cp -f /usr/ug/lib/libug-openlock-setting.so.0.1.0 /opt/ug/lib
+