Tizen 2.0 releaseHEADsubmit/master/20120920.1509412.0_alphamaster2.0alpha

15 files changed, 874 insertions, 326 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2e2cc33..0bdc93d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,3 @@
-
-
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 PROJECT(bt-syspopup C)
 
@@ -32,7 +30,8 @@ pkg_check_modules(pkgs REQUIRED
 	gobject-2.0
 	pmapi
 	syspopup
-	utilX)
+	utilX
+	aul)
 
 FOREACH(flag ${pkgs_CFLAGS})
 	SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag} -Wall -g")
@@ -60,17 +59,13 @@ SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed")
 ADD_EXECUTABLE(${PROJECT_NAME} ${SRCS})
 TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS})
 
-INSTALL(TARGETS ${PROJECT_NAME} DESTINATION bin)
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION /opt/apps/org.tizen.bt-syspopup/bin)
 
 # install desktop file & icon
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
-CONFIGURE_FILE(data/org.tizen.bt-syspopup.desktop.in data/org.tizen.bt-syspopup.desktop)
-INSTALL(FILES ${CMAKE_BINARY_DIR}/data/org.tizen.bt-syspopup.desktop DESTINATION /opt/share/applications/)
-
-INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data/images/ DESTINATION
-${PREFIX}/share/icon FILES_MATCHING PATTERN "*.png")
-
+INSTALL(FILES ${CMAKE_BINARY_DIR}/data/org.tizen.bt-syspopup.xml DESTINATION /usr/share/packages/)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/org.tizen.bt-syspopup.png DESTINATION /opt/share/icons/default/small)
 
 # install ini file
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/${PROJECT_NAME}.ini DESTINATION share/process-info)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/${PROJECT_NAME}.ini DESTINATION /opt/share/process-info)
 
diff --git a/data/images/01_header_icon_cancel.png b/data/images/01_header_icon_cancel.png
deleted file mode 100644
index 4ccaf4a..0000000
--- a/data/images/01_header_icon_cancel.png
+++ /dev/null
diff --git a/data/images/01_header_icon_done.png b/data/images/01_header_icon_done.png
deleted file mode 100644
index 7c494fd..0000000
--- a/data/images/01_header_icon_done.png
+++ /dev/null
diff --git a/data/org.tizen.bt-syspopup.desktop.in b/data/org.tizen.bt-syspopup.desktop.in
deleted file mode 100644
index 3e34c40..0000000
--- a/data/org.tizen.bt-syspopup.desktop.in
+++ /dev/null
@@ -1,9 +0,0 @@
-Name=Bluetooth System Popup
-Type=Application
-Exec=/usr/bin/bt-syspopup
-Nodisplay=True
-Icon=org.tizen.bt-syspopup.png
-Network=False
-Comment=Bluetooth System Popup (Pairing / Connection Confirmation)
-X-TIZEN-TaskManage=false
-X-TIZEN-Removable=false
diff --git a/data/org.tizen.bt-syspopup.png b/data/org.tizen.bt-syspopup.png
new file mode 100644
index 0000000..6aefb32
--- /dev/null
+++ b/data/org.tizen.bt-syspopup.png
diff --git a/data/org.tizen.bt-syspopup.xml b/data/org.tizen.bt-syspopup.xml
new file mode 100644
index 0000000..bff80c9
--- /dev/null
+++ b/data/org.tizen.bt-syspopup.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns="http://tizen.org/ns/packages" package="org.tizen.bt-syspopup" version="2.0.25" install-location="internal-only">
+	<label>Bluetooth System Popup</label>
+	<author email="dh79.pyun@samsung.com" href="www.samsung.com">DoHyun Pyun</author>
+	<description>Bluetooth System Popup</description>
+	<ui-application appid="org.tizen.bt-syspopup" exec="/opt/apps/org.tizen.bt-syspopup/bin/bt-syspopup" nodisplay="true" multiple="false" type="capp" taskmanage="false">
+		<label>Bluetooth System Popup</label>
+		<icon>org.tizen.bt-syspopup.png</icon>
+	</ui-application>
+</manifest>
diff --git a/data/tizen.org.bt-syspopup.png b/data/tizen.org.bt-syspopup.png
deleted file mode 100644
index 626b572..0000000
--- a/data/tizen.org.bt-syspopup.png
+++ /dev/null
diff --git a/debian/changelog b/debian/changelog
index cd3d446..fd2dd06 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,535 @@
-bt-syspopup (0.2.37-2) unstable; urgency=low
+bt-syspopup (0.2.51) unstable; urgency=low
 
-  * Release Tizen 1.0
+  * Change the button theme to popop style
   * Git: slp/pkgs/b/bt-syspopup
-  * Tag: bt-syspopup_0.2.37-2
+  * Tag: bt-syspopup_0.2.51
 
- -- DoHyun Pyun <dh79.pyun@samsung.com>  Thu, 22 Mar 2012 13:19:38 +0900
+ -- DoHyun Pyun <dh79.pyun@samsung.com>  Thu, 02 Aug 2012 13:49:22 +0900
 
+bt-syspopup (0.2.50) unstable; urgency=low
+
+  * Increase version number for upload.
+  * Git: slp/pkgs/b/bt-syspopup
+  * Tag: bt-syspopup_0.2.50
+
+ -- DoHyun Pyun <dh79.pyun@samsung.com>  Wed, 01 Aug 2012 15:48:03 +0900
+
+bt-syspopup (0.2.49) unstable; urgency=low
+
+  * Increase version number for upload.
+  * Git: slp/pkgs/b/bt-syspopup
+  * Tag: bt-syspopup_0.2.49
+
+ -- DoHyun Pyun <dh79.pyun@samsung.com>  Sat, 28 Jul 2012 10:20:27 +0900
+
+bt-syspopup (0.2.48) unstable; urgency=low
+
+  * Increase version number for upload.
+  * Git: slp/pkgs/b/bt-syspopup
+  * Tag: bt-syspopup_0.2.48
+
+ -- DoHyun Pyun <dh79.pyun@samsung.com>  Fri, 27 Jul 2012 15:03:06 +0900
+
+bt-syspopup (0.2.47) unstable; urgency=low
+
+  * Increase version number for upload.
+  * Git: slp/pkgs/b/bt-syspopup
+  * Tag: bt-syspopup_0.2.47
+
+ -- DoHyun Pyun <dh79.pyun@samsung.com>  Tue, 12 Jun 2012 08:44:35 +0900
+
+bt-syspopup (0.2.46) unstable; urgency=low
+
+  * Increase version number for upload.
+  * Git: slp/pkgs/b/bt-syspopup
+  * Tag: bt-syspopup_0.2.46
+
+ -- Sunil Kumar Behera <sunil.behera@samsung.com>  Mon, 04 Jun 2012 12:45:57 +0530
+
+bt-syspopup (0.2.45) unstable; urgency=low
+
+  * Change the pairing messagef as UX guideline
+  * Git: slp/pkgs/b/bt-syspopup
+  * Tag: bt-syspopup_0.2.45
+
+ -- DoHyun Pyun <dh79.pyun@samsung.com>  Mon, 04 Jun 2012 09:01:59 +0900
+
+bt-syspopup (0.2.44) unstable; urgency=low
+
+  * Change the pairing messagef as UX guideline
+  * Git: slp/pkgs/b/bt-syspopup
+  * Tag: bt-syspopup_0.2.44
+
+ -- DoHyun Pyun <dh79.pyun@samsung.com>  Thu, 31 May 2012 15:56:50 +0900
+
+bt-syspopup (0.2.43) unstable; urgency=low
+
+  * Covert the pin code input view to popup
+  * Git: slp/pkgs/b/bt-syspopup
+  * Tag: bt-syspopup_0.2.43
+
+ -- DoHyun Pyun <dh79.pyun@samsung.com>  Tue, 29 May 2012 16:12:38 +0900
+
+bt-syspopup (0.2.42) unstable; urgency=low
+
+  * Upload packagefor changes
+  * Git: slp/pkgs/b/bt-syspopup
+  * Tag: bt-syspopup_0.2.42
+
+ -- DoHyun Pyun <dh79.pyun@samsung.com>  Mon, 21 May 2012 13:26:09 +0900
+
+bt-syspopup (0.2.41) unstable; urgency=low
+
+  * Upload package for changes
+  * Git: slp/pkgs/b/bt-syspopup
+  * Tag: bt-syspopup_0.2.41
+
+ -- DoHyun Pyun <dh79.pyun@samsung.com>  Mon, 21 May 2012 10:51:08 +0900
+
+bt-syspopup (0.2.40) unstable; urgency=low
+
+  * Upload package for changes
+  * Git: slp/pkgs/b/bt-syspopup
+  * Tag: bt-syspopup_0.2.40
+
+ -- DoHyun Pyun <dh79.pyun@samsung.com>  Fri, 18 May 2012 10:22:03 +0900
+
+bt-syspopup (0.2.39) unstable; urgency=low
+
+  * Upload package for changes.
+  * Git: slp/pkgs/b/bt-syspopup
+  * Tag: bt-syspopup_0.2.39
+
+ -- Sunil Kumar Behera <sunil.behera@samsung.com>  Mon, 14 May 2012 16:24:38 +0530
+
+bt-syspopup (0.2.38) unstable; urgency=low
+
+  * Remove the codes about the MDM popup
+  * Git: slp/pkgs/b/bt-syspopup
+  * Tag: bt-syspopup_0.2.38
+
+ -- DoHyun Pyun <dh79.pyun@samsung.com>  Tue, 08 May 2012 09:01:38 +0900
+
+bt-syspopup (0.2.37) unstable; urgency=low
+
+  * SLP prefix is changed
+  * Git: slp/pkgs/b/bt-syspopup
+  * Tag: bt-syspopup_0.2.37
+
+ -- InJun Yang <injun.yang@samsung.com>  Thu, 15 Mar 2012 18:58:24 +0900
+
+bt-syspopup (0.2.36) unstable; urgency=low
+
+  * Upload the changes
+  * Git: slp/pkgs/b/bt-syspopup
+  * Tag: bt-syspopup_0.2.36
+
+ -- DoHyun Pyun <dh79.pyun@samsung.com>  Thu, 15 Mar 2012 11:30:53 +0900
+
+bt-syspopup (0.2.35) unstable; urgency=low
+
+  * Upload the changes
+  * Git: slp/pkgs/b/bt-syspopup
+  * Tag: bt-syspopup_0.2.35
+
+ -- DoHyun Pyun <dh79.pyun@samsung.com>  Wed, 14 Mar 2012 17:05:52 +0900
+
+bt-syspopup (0.2.34) unstable; urgency=low
+
+  * Modify and upload for elementary changes
+  * Git: slp/pkgs/b/bt-syspopup
+  * Tag: bt-syspopup_0.2.34
+
+ -- Sunil Kumar Behera <sunil.behera@samsung.com>  Tue, 13 Mar 2012 17:55:50 +0530
+
+bt-syspopup (0.2.33) unstable; urgency=low
+
+  * Upload the changes
+  * Git: slp/pkgs/b/bt-syspopup
+  * Tag: bt-syspopup_0.2.33
+
+ -- DoHyun Pyun <dh79.pyun@samsung.com>  Mon, 12 Mar 2012 11:15:11 +0900
+
+bt-syspopup (0.2.32) unstable; urgency=low
+
+  * Change the code about editfield
+  * Git: slp/pkgs/b/bt-syspopup
+  * Tag: bt-syspopup_0.2.32
+
+ -- DoHyun Pyun <dh79.pyun@samsung.com>  Wed, 29 Feb 2012 15:58:27 +0900
+
+bt-syspopup (0.2.31) unstable; urgency=low
+
+  * Apply the winset changes
+  * Git: slp/pkgs/b/bt-syspopup
+  * Tag: bt-syspopup_0.2.31
+
+ -- DoHyun Pyun <dh79.pyun@samsung.com>  Thu, 16 Feb 2012 10:01:12 +0900
+
+bt-syspopup (0.2.30) unstable; urgency=low
+
+  * Add the popup for MDM service
+  * Git: slp/pkgs/b/bt-syspopup
+  * Tag: bt-syspopup_0.2.30
+
+ -- DoHyun Pyun <dh79.pyun@samsung.com>  Wed, 01 Feb 2012 09:40:35 +0900
+
+bt-syspopup (0.2.29) unstable; urgency=low
+
+  * Remove the package dependency of devman / sysman
+  * Git: 165.213.180.234:slp/pkgs/b/bt-syspopup
+  * Tag: bt-syspopup_0.2.29
+
+ -- DoHyun Pyun <dh79.pyun@samsung.com>  Tue, 06 Dec 2011 16:45:07 +0900
+
+bt-syspopup (0.2.28) unstable; urgency=low
+
+  * Add new design ID to support multi-language
+  * Git: 165.213.180.234:slp/pkgs/b/bt-syspopup
+  * Tag: bt-syspopup_0.2.28
+
+ -- DoHyun Pyun <dh79.pyun@samsung.com>  Mon, 21 Nov 2011 13:37:08 +0900
+
+bt-syspopup (0.2.27) unstable; urgency=low
+
+  * Fix the display bug about input view
+  * Git: 165.213.180.234:slp/pkgs/b/bt-syspopup
+  * Tag: bt-syspopup_0.2.27
+
+ -- DoHyun Pyun <dh79.pyun@samsung.com>  Mon, 14 Nov 2011 17:02:17 +0900
+
+bt-syspopup (0.2.26) unstable; urgency=low
+
+  * Fix the bug about editfield focus
+  * Git: 165.213.180.234:slp/pkgs/b/bt-syspopup
+  * Tag: bt-syspopup_0.2.26
+
+ -- DoHyun Pyun <dh79.pyun@samsung.com>  Fri, 11 Nov 2011 11:07:09 +0900
+
+bt-syspopup (0.2.25) unstable; urgency=low
+
+  * Adjust the position of the naviframe to bottom
+  * Git: 165.213.180.234:slp/pkgs/b/bt-syspopup
+  * Tag: bt-syspopup_0.2.25
+
+ -- DoHyun Pyun <dh79.pyun@samsung.com>  Wed, 09 Nov 2011 09:00:14 +0900
+
+bt-syspopup (0.2.24) unstable; urgency=low
+
+  * Change the focus method of editfield as new policy
+  * Git: 165.213.180.234:slp/pkgs/b/bt-syspopup
+  * Tag: bt-syspopup_0.2.24
+
+ -- DoHyun Pyun <dh79.pyun@samsung.com>  Thu, 03 Nov 2011 08:51:42 +0900
+
+bt-syspopup (0.2.23) unstable; urgency=low
+
+  * Add the code to display the indicator (H0100135960)
+  * Git: 165.213.180.234:slp/pkgs/b/bt-syspopup
+  * Tag: bt-syspopup_0.2.23
+
+ -- DoHyun Pyun <dh79.pyun@samsung.com>  Thu, 27 Oct 2011 11:22:14 +0900
+
+bt-syspopup (0.2.22) unstable; urgency=low
+
+  * Remove the deprecated IME API (ecore_imf_context_input_panel_reset)
+  * Git: 165.213.180.234:slp/pkgs/b/bt-syspopup
+  * Tag: bt-syspopup_0.2.22
+
+ -- DoHyun Pyun <dh79.pyun@samsung.com>  Wed, 26 Oct 2011 17:31:24 +0900
+
+bt-syspopup (0.2.21) unstable; urgency=low
+
+  * Modify the desktop file for Manage applications
+  * Git: 165.213.180.234:slp/pkgs/b/bt-syspopup
+  * Tag: bt-syspopup_0.2.21
+
+ -- DoHyun Pyun <dh79.pyun@samsung.com>  Mon, 24 Oct 2011 11:20:33 +0900
+
+bt-syspopup (0.2.20) unstable; urgency=low
+
+  * Add the baselayout size in desktop file
+  * Git: 165.213.180.234:slp/pkgs/b/bt-syspopup
+  * Tag: bt-syspopup_0.2.20
+
+ -- DoHyun Pyun <dh79.pyun@samsung.com>  Mon, 10 Oct 2011 11:14:26 +0900
+
+bt-syspopup (0.2.19) unstable; urgency=low
+
+  * Apply the naviframe patch
+  * Git: 165.213.180.234:slp/pkgs/b/bt-syspopup
+  * Tag: bt-syspopup_0.2.19
+
+ -- DoHyun Pyun <dh79.pyun@samsung.com>  Wed, 05 Oct 2011 09:23:35 +0900
+
+bt-syspopup (0.2.18) unstable; urgency=low
+
+  * Upload the packages
+  * Git: 165.213.180.234:slp/pkgs/b/bt-syspopup
+  * Tag: bt-syspopup_0.2.18
+
+ -- Chethan T N <chethan.tn@samsung.com>  Fri, 30 Sep 2011 18:34:32 +0530
+
+bt-syspopup (0.2.17) unstable; urgency=low
+
+  * Remove the dependency of libui-bgimage-dev
+  * Git: 165.213.180.234:slp/pkgs/b/bt-syspopup
+  * Tag: bt-syspopup_0.2.17
+
+ -- DoHyun Pyun <dh79.pyun@samsung.com>  Thu, 29 Sep 2011 08:38:38 +0900
+
+bt-syspopup (0.2.16) unstable; urgency=low
+
+  * Upload package for changee
+  * Git: 165.213.180.234:slp/pkgs/b/bt-syspopup
+  * Tag: bt-syspopup_0.2.16
+
+ -- DoHyun Pyun <dh79.pyun@samsung.com>  Mon, 29 Aug 2011 19:23:14 +0900
+
+bt-syspopup (0.2.15) unstable; urgency=low
+
+  * Upload package for changes
+  * Git: 165.213.180.234:slp/pkgs/b/bt-syspopup
+  * Tag: bt-syspopup_0.2.15
+
+ -- DoHyun Pyun <dh79.pyun@samsung.com>  Thu, 11 Aug 2011 08:29:37 +0900
+
+bt-syspopup (0.2.14) unstable; urgency=low
+
+  * Upload package for changes
+  * Git: 165.213.180.234:slp/pkgs/b/bt-syspopup
+  * Tag: bt-syspopup_0.2.14
+
+ -- DoHyun Pyun <dh79.pyun@samsung.com>  Tue, 09 Aug 2011 08:29:51 +0900
+
+bt-syspopup (0.2.13) unstable; urgency=low
+
+  * Apply the changed layout style & elm_bg
+  * Git: 165.213.180.234:slp/pkgs/b/bt-syspopup
+  * Tag: bt-syspopup_0.2.13
+
+ -- DoHyun Pyun <dh79.pyun@samsung.com>  Wed, 03 Aug 2011 18:42:59 +0900
+
+bt-syspopup (0.2.12) unstable; urgency=low
+
+  * Remove the system popup when the remote device cancel the event (H0100131180)
+  * Git: 165.213.180.234:slp/pkgs/b/bt-syspopup
+  * Tag: bt-syspopup_0.2.12
+
+ -- DoHyun Pyun <dh79.pyun@samsung.com>  Mon, 01 Aug 2011 08:24:54 +0900
+
+bt-syspopup (0.2.11) unstable; urgency=low
+
+  * Upload package for changes
+  * Git: 165.213.180.234:slp/pkgs/b/bt-syspopup
+  * Tag: bt-syspopup_0.2.11
+
+ -- DoHyun Pyun <dh79.pyun@samsung.com>  Thu, 21 Jul 2011 11:11:18 +0900
+
+bt-syspopup (0.2.10) unstable; urgency=low
+
+  * Upload package for changes
+  * Git: 165.213.180.234:slp/pkgs/b/bt-syspopup
+  * Tag: bt-syspopup_0.2.10
+
+ -- Sunil Kumar Behera <sunil.behera@samsung.com>  Thu, 07 Jul 2011 17:47:11 +0530
+
+bt-syspopup (0.2.9) unstable; urgency=low
+
+  * Remove 'ReplyPinCode' event when the timeout occured about keyboard. (H0100129046)
+  * Git: 165.213.180.234:slp/pkgs/b/bt-syspopup
+  * Tag: bt-syspopup_0.2.9
+
+ -- DoHyun Pyun <dh79.pyun@samsung.com>  Thu, 30 Jun 2011 11:43:31 +0900
+
+bt-syspopup (0.2.8) unstable; urgency=low
+
+  * Change the button align to center
+  * Git: 165.213.180.234:slp/pkgs/b/bt-syspopup
+  * Tag: bt-syspopup_0.2.8
+
+ -- DoHyun Pyun <dh79.pyun@samsung.com>  Wed, 29 Jun 2011 14:56:34 +0900
+
+bt-syspopup (0.2.7) unstable; urgency=low
+
+  * Apply the landscape mode
+  * Git: 165.213.180.234:slp/pkgs/b/bt-syspopup
+  * Tag: bt-syspopup_0.2.7
+
+ -- DoHyun Pyun <dh79.pyun@samsung.com>  Fri, 10 Jun 2011 11:50:13 +0900
+
+bt-syspopup (0.2.6) unstable; urgency=low
+
+  * Upload packages for changes
+  * Git: 165.213.180.234:slp/pkgs/b/bt-syspopup
+  * Tag: bt-syspopup_0.2.6
+
+ -- Sunil Kumar Behera <sunil.behera@samsung.com>  Thu, 09 Jun 2011 15:05:15 +0530
+
+bt-syspopup (0.2.5) unstable; urgency=low
+
+  * Add the icon in navigation bar (Defect H0100127548)
+  * Git: 165.213.180.234:slp/pkgs/b/bt-syspopup
+  * Tag: bt-syspopup_0.2.5
+
+ -- DoHyun Pyun <dh79.pyun@samsung.com>  Tue, 31 May 2011 16:08:49 +0900
+
+bt-syspopup (0.2.4) unstable; urgency=low
+
+  * Add the dbus name to broadcast the dbus message
+  * Git: 165.213.180.234:slp/pkgs/b/bt-syspopup
+  * Tag: bt-syspopup_0.2.4
+
+ -- DoHyun Pyun <dh79.pyun@samsung.com>  Wed, 25 May 2011 17:24:31 +0900
+
+bt-syspopup (0.2.3) unstable; urgency=low
+
+  * Replace the dialogue group API to genlist dialogue group
+  * Git: 165.213.180.234:slp/pkgs/b/bt-syspopup
+  * Tag: bt-syspopup_0.2.3
+
+ -- DoHyun Pyun <dh79.pyun@samsung.com>  Mon, 16 May 2011 09:54:35 +0900
+
+bt-syspopup (0.2.2) unstable; urgency=low
+
+  * Show the ticker noti when the file recieved (Defect H0100126544)
+  * Git: 165.213.180.234:slp/pkgs/b/bt-syspopup
+  * Tag: bt-syspopup_0.2.2
+
+ -- DoHyun Pyun <dh79.pyun@samsung.com>  Fri, 13 May 2011 17:27:36 +0900
+
+bt-syspopup (0.2.1) unstable; urgency=low
+
+  * Upload package for changes.
+  * Git: 165.213.180.234:slp/pkgs/b/bt-syspopup
+  * Tag: bt-syspopup_0.2.1
+
+ -- Sunil Kumar Behera <sunil.behera@samsung.com>  Mon, 09 May 2011 17:03:49 +0530
+
+bt-syspopup (0.2.0) unstable; urgency=low
+
+  * Release ug-obexd init dpkg
+  * Git: 165.213.180.234:slp/pkgs/b/bt-syspopup
+  * Tag: bt-syspopup_0.2.0
+
+ -- DoHyun Pyun <dh79.pyun@samsung.com>  Wed, 27 Apr 2011 18:25:30 +0900
+
+bt-syspopup (0.1.14) unstable; urgency=low
+
+  * Change package name
+  * Git: 165.213.180.234:slp/pkgs/b/bt-syspopup
+  * Tag: bt-syspopup_0.1.14
+
+ -- InJun Yang <injun.yang@samsung.com>  Mon, 11 Apr 2011 20:53:33 +0900
+
+deb.com.samsung.bt-syspopup (0.1.13) unstable; urgency=low
+
+  * Add the dependency of the development package about dbus-glib-1 and gobject-2.0 in control file
+  * Git: 165.213.180.234:slp/pkgs/b/bt-syspopup
+  * Tag: deb.com.samsung.bt-syspopup_0.1.13
+
+ -- DoHyun Pyun <dh79.pyun@samsung.com>  Thu, 07 Apr 2011 16:49:40 +0900
+
+deb.com.samsung.bt-syspopup (0.1.12) unstable; urgency=low
+
+  * Remove dependency of the imlib package
+  * Git: 165.213.180.234:slp/pkgs/b/bt-syspopup
+  * Tag: deb.com.samsung.bt-syspopup_0.1.12
+
+ -- DoHyun Pyun <dh79.pyun@samsung.com>  Tue, 29 Mar 2011 20:20:03 +0900
+
+deb.com.samsung.bt-syspopup (0.1.11) unstable; urgency=low
+
+  * Apply N-beat UX
+  * Git: 165.213.180.234:slp/pkgs/b/bt-syspopup
+  * Tag: deb.com.samsung.bt-syspopup_0.1.11
+
+ -- DoHyun Pyun <dh79.pyun@samsung.com>  Tue, 22 Mar 2011 16:56:59 +0900
+
+deb.com.samsung.bt-syspopup (0.1.10) unstable; urgency=low
+
+  * New popup for applcation usage.
+  * Git: 165.213.180.234:slp/pkgs/b/bt-syspopup
+  * Tag: deb.com.samsung.bt-syspopup_0.1.10
+
+ -- Sunil Kumar Behera <sunil.behera@samsung.com>  Fri, 25 Feb 2011 12:29:26 +0530
+
+deb.com.samsung.bt-syspopup (0.1.9) unstable; urgency=low
+
+  * Remove the unnecessary NULL pointer check
+  * Git: 165.213.180.234:slp/pkgs/b/bt-syspopup
+  * Tag: deb.com.samsung.bt-syspopup_0.1.9
+
+ -- DoHyun Pyun <dh79.pyun@samsung.com>  Mon, 21 Feb 2011 20:44:00 +0900
+
+deb.com.samsung.bt-syspopup (0.1.8) unstable; urgency=low
+
+  * Corrected IME appearance
+  * Git: 165.213.180.234:slp/pkgs/b/bt-syspopup
+  * Tag: deb.com.samsung.bt-syspopup_0.1.8
+
+ -- DoHyun Pyun <dh79.pyun@samsung.com>  Fri, 18 Feb 2011 18:50:52 +0900
+
+deb.com.samsung.bt-syspopup (0.1.7) unstable; urgency=low
+
+  * Modify the desktop path to intall
+  * Git: 165.213.180.234:slp/pkgs/b/bt-syspopup
+  * Tag: deb.com.samsung.bt-syspopup_0.1.7
+
+ -- DoHyun Pyun <dh79.pyun@samsung.com>  Thu, 17 Feb 2011 19:17:32 +0900
+
+deb.com.samsung.bt-syspopup (0.1.6) unstable; urgency=low
+
+  * Change the desktop path to install, name of the icon
+  * Git: 165.213.180.234:slp/pkgs/b/bt-syspopup
+  * Tag: deb.com.samsung.bt-syspopup_0.1.6
+
+ -- DoHyun Pyun <dh79.pyun@samsung.com>  Mon, 14 Feb 2011 17:09:22 +0900
+
+deb.com.samsung.bt-syspopup (0.1.5) unstable; urgency=low
+
+  * hide bt-syspopup in task manager
+  * Git: 165.213.180.234:slp/pkgs/b/bt-syspopup
+  * Tag: deb.com.samsung.bt-syspopup_0.1.5
+
+ -- DoHyun Pyun <dh79.pyun@samsung.com>  Tue, 08 Feb 2011 15:16:03 +0900
+
+deb.com.samsung.bt-syspopup (0.1.4) unstable; urgency=low
+
+  * Fix the build break (libslp-pm-dev)
+  * Git: 165.213.180.234:slp/pkgs/b/bt-syspopup
+  * Tag: deb.com.samsung.bt-syspopup_0.1.4
+
+ -- Hyeongbae Park <jupio.park@samsung.com>  Mon, 07 Feb 2011 18:02:00 +0900
+
+deb.com.samsung.bt-syspopup (0.1.3) unstable; urgency=low
+
+  * Fix the BS when try to pair with the Arabic name's device
+  * Git: 165.213.180.234:slp/pkgs/b/bt-syspopup
+  * Tag: deb.com.samsung.bt-syspopup_0.1.3
+
+ -- DoHyun Pyun <dh79.pyun@samsung.com>  Mon, 07 Feb 2011 11:26:00 +0900
+
+deb.com.samsung.bt-syspopup (0.1.2) unstable; urgency=low
+
+  * Add the code to avoid the BS
+  * Git: 165.213.180.234:slp/pkgs/b/bt-syspopup
+  * Tag: deb.com.samsung.bt-syspopup_0.1.2
+
+ -- DoHyun Pyun <dh79.pyun@samsung.com>  Wed, 19 Jan 2011 20:33:48 +0900
+
+deb.com.samsung.bt-syspopup (0.1.1) unstable; urgency=low
+
+  * Show the IME after displaying the main layout
+  * Git: 165.213.180.234:slp/pkgs/b/bt-syspopup
+  * Tag: deb.com.samsung.bt-syspopup_0.1.1
+
+ -- DoHyun Pyun <dh79.pyun@samsung.com>  Fri, 07 Jan 2011 13:50:37 +0900
+
+deb.com.samsung.bt-syspopup (0.1.0) unstable; urgency=low
+
+  * Initial Release.
+  * Git: 165.213.180.234:slp/pkgs/b/bt-syspopup
+  * Tag: deb.com.samsung.bt-syspopup_0.1.0
+
+ -- DoHyun Pyun <dh79.pyun@samsung.com>  Tue, 28 Dec 2010 16:31:28 +0900
diff --git a/debian/control b/debian/control
index b5b971c..042cb74 100644
--- a/debian/control
+++ b/debian/control
@@ -3,16 +3,16 @@ Section: main
 Priority: extra
 Maintainer: Hocheol Seo <hocheol.seo@samsung.com>, DoHyun Pyun <dh79.pyun@samsung.com>, InJun Yang <injun.yang@samsung.com>, Chanyeol Park <chanyeol.park@samsung.com>
 Uploaders: Sunil Behera <sunil.behera@samsung.com>, Syam Sidhardhan <s.syam@samsung.com>
-Build-Depends: debhelper (>= 5),libevas-dev,libecore-dev,libethumb-dev,libelm-dev,libefreet-dev, libslp-sensor-dev,libappcore-efl-dev,libdevman-dev, libslp-utilx-dev, syspopup-dev, dlog-dev, libslp-pm-dev, libdbus-glib-1-dev, libglib2.0-dev
+Build-Depends: debhelper (>= 5),libevas-dev,libecore-dev,libethumb-dev,libelm-dev,libefreet-dev, libslp-sensor-dev,libappcore-efl-dev,libdevman-dev, libslp-utilx-dev, syspopup-dev, dlog-dev, libslp-pm-dev, libdbus-glib-1-dev, libglib2.0-dev, libaul-1-dev
 Standards-Version: 0.1.0 
 
-Package: org.tizen.bt-syspopup
+Package: com.samsung.bt-syspopup
 Section: main
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libslp-utilx-0, libdlog-0
 Description: bluetooth system-popup application (bluetooth system popup)
 
-Package: org.tizen.bt-syspopup-dbg
+Package: com.samsung.bt-syspopup-dbg
 Section: debug
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
diff --git a/debian/dirs b/debian/dirs
index ca882bb..e69de29 100644
--- a/debian/dirs
+++ b/debian/dirs
@@ -1,2 +0,0 @@
-usr/bin
-usr/sbin
diff --git a/debian/org.tizen.bt-syspopup.install.in b/debian/org.tizen.bt-syspopup.install.in
index 67008f2..37fa72f 100644
--- a/debian/org.tizen.bt-syspopup.install.in
+++ b/debian/org.tizen.bt-syspopup.install.in
@@ -1,4 +1,3 @@
-@PREFIX@/bin/bt-syspopup
-/opt/share/applications/org.tizen.bt-syspopup.desktop
-@PREFIX@/share/process-info/bt-syspopup.ini
-@PREFIX@/share/icon/*
+/opt/apps/org.tizen.bt-syspopup/bin/bt-syspopup
+/opt/share/icons/*
+/opt/share/process-info/bt-syspopup.ini
diff --git a/debian/rules b/debian/rules
index a66465e..00c3f0d 100755..100644
--- a/debian/rules
+++ b/debian/rules
@@ -9,10 +9,10 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+PREFIX ?= /opt/apps/org.tizen.bluetooth
 CFLAGS ?= -Wall -g
 CXXFLAGS ?=  -Wall -g
-LDFLAGS ?= 
-PREFIX ?= /usr
+LDFLAGS ?=
 DATADIR ?= /opt
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -109,12 +109,12 @@ binary-indep: build install
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-	dh_installchangelogs 
-	dh_installdocs
-	dh_installexamples
+#	dh_installchangelogs
+#	dh_installdocs
+#	dh_installexamples
 	dh_install --sourcedir=debian/tmp
 #	dh_installmenu
-#	dh_installdebconf	
+#	dh_installdebconf
 #	dh_installlogrotate
 #	dh_installemacsen
 #	dh_installpam
@@ -123,7 +123,7 @@ binary-arch: build install
 #	dh_installinit
 #	dh_installcron
 #	dh_installinfo
-	dh_installman
+#	dh_installman
 	dh_link
 	dh_strip --dbg-package=org.tizen.bt-syspopup-dbg
 	dh_compress
diff --git a/packaging/org.tizen.bt-syspopup.spec b/packaging/org.tizen.bt-syspopup.spec
index 9baf06c..cc691d7 100644
--- a/packaging/org.tizen.bt-syspopup.spec
+++ b/packaging/org.tizen.bt-syspopup.spec
@@ -1,8 +1,12 @@
+%define _optdir /opt
+%define _usrdir /usr
+%define _appdir %{_optdir}/apps
+
 Name:       org.tizen.bt-syspopup
 Summary:    bluetooth system-popup application (bluetooth system popup)
-Version:    0.2.37
-Release:    2
-Group:      TO_BE_FILLED
+Version: 0.2.52
+Release:    1
+Group:      main
 License:    Flora Software License
 Source0:    %{name}-%{version}.tar.gz
 BuildRequires:  pkgconfig(evas)
@@ -10,15 +14,19 @@ BuildRequires:  pkgconfig(ecore-input)
 BuildRequires:  pkgconfig(ethumb)
 BuildRequires:  pkgconfig(elementary)
 BuildRequires:  pkgconfig(efreet)
+BuildRequires:  pkgconfig(sysman)
 BuildRequires:  pkgconfig(sensor)
 BuildRequires:  pkgconfig(appcore-efl)
-BuildRequires:  pkgconfig(devman_haptic)
+BuildRequires:  pkgconfig(devman)
 BuildRequires:  pkgconfig(utilX)
 BuildRequires:  pkgconfig(syspopup)
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(pmapi)
 BuildRequires:  pkgconfig(dbus-glib-1)
 BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(devman_haptic)
+BuildRequires:  pkgconfig(aul)
+BuildRequires:  sysman-internal-devel
 
 BuildRequires:  cmake
 BuildRequires:  gettext-devel
@@ -32,7 +40,7 @@ bluetooth system-popup application (bluetooth system popup).
 
 %build
 
-cmake . -DCMAKE_INSTALL_PREFIX=/usr
+cmake . -DCMAKE_INSTALL_PREFIX=%{_appdir}/org.tizen.bt-syspopup
 make %{?jobs:-j%jobs}
 
 %install
@@ -42,9 +50,7 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-/opt/share/applications/org.tizen.bt-syspopup.desktop
-/usr/bin/bt-syspopup
-/usr/share/icon/01_header_icon_cancel.png
-/usr/share/icon/01_header_icon_done.png
-/usr/share/process-info/bt-syspopup.ini
-
+%{_usrdir}/share/packages/org.tizen.bt-syspopup.xml
+%{_appdir}/org.tizen.bt-syspopup/bin/bt-syspopup
+%{_optdir}/share/icons/default/small/org.tizen.bt-syspopup.png
+%{_optdir}/share/process-info/bt-syspopup.ini
diff --git a/src/bt-syspopup.c b/src/bt-syspopup.c
index 0e25a23..674c9c8 100644
--- a/src/bt-syspopup.c
+++ b/src/bt-syspopup.c
@@ -23,6 +23,7 @@
 #include <vconf-keys.h>
 #include <syspopup.h>
 #include <E_DBus.h>
+#include <aul.h>
 
 #include "bt-syspopup.h"
 
@@ -55,22 +56,49 @@ static void __bluetooth_cleanup(struct bt_popup_appdata *ad)
 	if (ad->popup)
 		evas_object_del(ad->popup);
 
-	if (ad->layout_main)
-		evas_object_del(ad->layout_main);
-
 	if (ad->win_main)
 		evas_object_del(ad->win_main);
 
 	ad->popup = NULL;
-	ad->layout_main = NULL;
 	ad->win_main = NULL;
 }
 
+static void __bluetooth_parse_event(struct bt_popup_appdata *ad, const char *event_type)
+{
+	if (!strcasecmp(event_type, "pin-request"))
+		ad->event_type = BT_EVENT_PIN_REQUEST;
+	else if (!strcasecmp(event_type, "passkey-confirm-request"))
+		ad->event_type = BT_EVENT_PASSKEY_CONFIRM_REQUEST;
+	else if (!strcasecmp(event_type, "passkey-request"))
+		ad->event_type = BT_EVENT_PASSKEY_REQUEST;
+	else if (!strcasecmp(event_type, "authorize-request"))
+		ad->event_type = BT_EVENT_AUTHORIZE_REQUEST;
+	else if (!strcasecmp(event_type, "app-confirm-request"))
+		ad->event_type = BT_EVENT_APP_CONFIRM_REQUEST;
+	else if (!strcasecmp(event_type, "push-authorize-request"))
+		ad->event_type = BT_EVENT_PUSH_AUTHORIZE_REQUEST;
+	else if (!strcasecmp(event_type, "confirm-overwrite-request"))
+		ad->event_type = BT_EVENT_CONFIRM_OVERWRITE_REQUEST;
+	else if (!strcasecmp(event_type, "keyboard-passkey-request"))
+		ad->event_type = BT_EVENT_KEYBOARD_PASSKEY_REQUEST;
+	else if (!strcasecmp(event_type, "bt-information"))
+		ad->event_type = BT_EVENT_INFORMATION;
+	else if (!strcasecmp(event_type, "exchange-request"))
+		ad->event_type = BT_EVENT_EXCHANGE_REQUEST;
+	else
+		ad->event_type = 0x0000;
+		return;
+}
+
+static void __bluetooth_request_to_cancel(void)
+{
+	/* To be implement it */
+}
+
 static void __bluetooth_remove_all_event(struct bt_popup_appdata *ad)
 {
 	switch (ad->event_type) {
 	case BT_EVENT_PIN_REQUEST:
-	case BT_EVENT_KEYBOARD_PASSKEY_REQUEST:
 
 		dbus_g_proxy_call_no_reply(ad->agent_proxy,
 					   "ReplyPinCode",
@@ -80,6 +108,13 @@ static void __bluetooth_remove_all_event(struct bt_popup_appdata *ad)
 
 		break;
 
+
+	case BT_EVENT_KEYBOARD_PASSKEY_REQUEST:
+
+		__bluetooth_request_to_cancel();
+
+		break;
+
 	case BT_EVENT_PASSKEY_CONFIRM_REQUEST:
 
 		dbus_g_proxy_call_no_reply(ad->agent_proxy,
@@ -138,6 +173,7 @@ static void __bluetooth_remove_all_event(struct bt_popup_appdata *ad)
 		break;
 
 	case BT_EVENT_PUSH_AUTHORIZE_REQUEST:
+	case BT_EVENT_EXCHANGE_REQUEST:
 
 		dbus_g_proxy_call_no_reply(ad->obex_proxy,
 					   "ReplyAuthorize",
@@ -206,38 +242,26 @@ static void __bluetooth_input_request_cb(void *data,
 	struct bt_popup_appdata *ad = (struct bt_popup_appdata *)data;
 	const char *event = elm_object_text_get(obj);
 	int response = 0;
-
 	char *input_text = NULL;
 	char *convert_input_text = NULL;
 
 	if (ad == NULL)
 		return;
 
+	/* BT_EVENT_PIN_REQUEST / BT_EVENT_PASSKEY_REQUEST */
 
-	if (ad->entry == NULL) {
-		/* BT_EVENT_KEYBOARD_PASSKEY_REQUEST */
-		convert_input_text = strdup(ad->passkey);
+	input_text = (char *)elm_entry_entry_get(ad->entry);
 
-		if (!strcmp(event, BT_STR_YES))
-			response = 1;
-		else
-			response = 0;
-	} else {
-		/* BT_EVENT_PIN_REQUEST / BT_EVENT_PASSKEY_REQUEST */
-
-			input_text = (char *)elm_entry_entry_get(ad->entry);
-
-		if (input_text) {
-			convert_input_text =
-			    elm_entry_markup_to_utf8(input_text);
-		}
-
-		if (!strcmp(event, BT_STR_DONE))
-			response = 1;
-		else
-			response = 0;
+	if (input_text) {
+		convert_input_text =
+		    elm_entry_markup_to_utf8(input_text);
 	}
 
+	if (!strcmp(event, BT_STR_OK))
+		response = 1;
+	else
+		response = 0;
+
 	if (convert_input_text == NULL)
 		return;
 
@@ -246,8 +270,7 @@ static void __bluetooth_input_request_cb(void *data,
 
 	if (response == 1) {
 		bt_log_print(BT_POPUP, "Done case");
-		if (ad->event_type == BT_EVENT_PIN_REQUEST ||
-		    ad->event_type == BT_EVENT_KEYBOARD_PASSKEY_REQUEST) {
+		if (ad->event_type == BT_EVENT_PIN_REQUEST) {
 			dbus_g_proxy_call_no_reply(ad->agent_proxy,
 						   "ReplyPinCode",
 						   G_TYPE_UINT, BT_AGENT_ACCEPT,
@@ -266,8 +289,7 @@ static void __bluetooth_input_request_cb(void *data,
 		}
 	} else {
 		bt_log_print(BT_POPUP, "Cancel case");
-		if (ad->event_type == BT_EVENT_PIN_REQUEST ||
-		    ad->event_type == BT_EVENT_KEYBOARD_PASSKEY_REQUEST) {
+		if (ad->event_type == BT_EVENT_PIN_REQUEST) {
 			dbus_g_proxy_call_no_reply(ad->agent_proxy,
 						   "ReplyPinCode",
 						   G_TYPE_UINT, BT_AGENT_CANCEL,
@@ -291,6 +313,18 @@ static void __bluetooth_input_request_cb(void *data,
 	__bluetooth_win_del(ad);
 }
 
+static void __bluetooth_input_cancel_cb(void *data,
+				       Evas_Object *obj, void *event_info)
+{
+	struct bt_popup_appdata *ad = (struct bt_popup_appdata *)data;
+
+	__bluetooth_request_to_cancel();
+
+	__bluetooth_delete_input_view(ad);
+
+	__bluetooth_win_del(ad);
+}
+
 static void __bluetooth_passkey_confirm_cb(void *data,
 					 Evas_Object *obj, void *event_info)
 {
@@ -303,7 +337,7 @@ static void __bluetooth_passkey_confirm_cb(void *data,
 	if (ad == NULL)
 		return;
 
-	if (!strcmp(event, BT_STR_YES)) {
+	if (!strcmp(event, BT_STR_OK)) {
 		dbus_g_proxy_call_no_reply(ad->agent_proxy, "ReplyConfirmation",
 					   G_TYPE_UINT, BT_AGENT_ACCEPT,
 					   G_TYPE_INVALID, G_TYPE_INVALID);
@@ -436,52 +470,6 @@ static void __bluetooth_confirm_overwrite_request_cb(void *data,
 	__bluetooth_win_del(ad);
 }
 
-static Evas_Object *__bluetooth_create_bg(Evas_Object *parent, char *style)
-{
-	Evas_Object *bg = NULL;
-
-	bg = elm_bg_add(parent);
-
-	evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-
-	if (style)
-		elm_object_style_set(bg, style);
-
-	elm_win_resize_object_add(parent, bg);
-
-	evas_object_show(bg);
-
-	return bg;
-}
-
-static Evas_Object *__bluetooth_create_layout(Evas_Object *parent)
-{
-	Evas_Object *layout = NULL;
-
-	layout = elm_layout_add(parent);
-
-	elm_layout_theme_set(layout, "layout", "application", "default");
-	evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND,
-					 EVAS_HINT_EXPAND);
-
-	elm_win_resize_object_add(parent, layout);
-
-	evas_object_show(layout);
-
-	return layout;
-}
-
-static Evas_Object *__bluetooth_add_navigationbar(Evas_Object *parent)
-{
-	Evas_Object *naviframe = NULL;
-
-	naviframe = elm_naviframe_add(parent);
-	elm_object_part_content_set(parent, "elm.swallow.content", naviframe);
-	evas_object_show(naviframe);
-
-	return naviframe;
-}
-
 static void __bluetooth_ime_hide(void)
 {
 	Ecore_IMF_Context *imf_context = NULL;
@@ -506,12 +494,19 @@ static void __bluetooth_entry_change_cb(void *data, Evas_Object *obj,
 		if (convert_input_text) {
 			text_length = strlen(convert_input_text);
 
-			if (text_length == 0)
+			if (text_length == 0) {
 				elm_object_disabled_set(ad->edit_field_save_btn,
 							EINA_TRUE);
-			else
+				elm_object_signal_emit(ad->editfield,
+							"elm,state,eraser,hide",
+							"elm");
+			} else {
 				elm_object_disabled_set(ad->edit_field_save_btn,
 							EINA_FALSE);
+				elm_object_signal_emit(ad->editfield,
+							"elm,state,eraser,show",
+							"elm");
+			}
 
 			if (ad->event_type == BT_EVENT_PASSKEY_REQUEST) {
 				if (text_length > BT_PK_MLEN) {
@@ -543,51 +538,40 @@ static void __bluetooth_entry_change_cb(void *data, Evas_Object *obj,
 	}
 }
 
-static Evas_Object *__bluetooth_gl_icon_get(void *data,
-					  Evas_Object *obj, const char *part)
+static void __bluetooth_entry_focused_cb(void *data, Evas_Object *obj,
+				      void *event_info)
 {
-	Evas_Object *entry = NULL;
-	Evas_Object *layout = NULL;
-	struct bt_popup_appdata *ad = NULL;
-
-	bt_log_print(BT_POPUP, "__bluetooth_gl_icon_get");
-
-	ad = (struct bt_popup_appdata *)data;
-
-	if (data == NULL) {
-		bt_log_print(BT_POPUP, "data is NULL");
-		return NULL;
-	}
-
-	if (!strcmp(part, "elm.icon")) {
-
-		layout = elm_layout_add(obj);
-		elm_layout_theme_set(layout, "layout", "editfield", "default");
-
-		entry = elm_entry_add(obj);
-		ad->entry = entry;
-
-		elm_entry_single_line_set(entry, EINA_TRUE);
-		elm_entry_scrollable_set(entry, EINA_TRUE);
-		elm_entry_password_set(entry, EINA_TRUE);
+	if (!elm_entry_is_empty(obj))
+		elm_object_signal_emit(data, "elm,state,eraser,show", "elm");
 
-		elm_entry_input_panel_layout_set(entry,
-			 ELM_INPUT_PANEL_LAYOUT_PHONENUMBER);
+	elm_object_signal_emit(data, "elm,state,guidetext,hide", "elm");
+}
 
-		elm_entry_input_panel_enabled_set(entry, EINA_TRUE);
+static void __bluetooth_entry_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_part_content_set(layout, "elm.swallow.content", entry);
+	elm_object_signal_emit(data, "elm,state,eraser,hide", "elm");
+}
 
-		evas_object_show(entry);
-		elm_object_focus_set(entry, EINA_TRUE);
+static void __bluetooth_eraser_clicked_cb(void* data, Evas_Object* obj,
+				const char* emission, const char* source)
+{
+	elm_entry_entry_set(data, "");
+}
 
-		evas_object_smart_callback_add(entry, "changed",
-			__bluetooth_entry_change_cb, ad);
+static void __bluetooth_check_chagned_cb(void *data, Evas_Object *obj,
+				      void *event_info)
+{
+	Eina_Bool state = EINA_FALSE;
 
-		return layout;
-	}
+        if (obj == NULL)
+                return;
 
-	return NULL;
+        state = elm_check_state_get(obj);
+        elm_entry_password_set(data, !state);
 }
 
 static void __bluetooth_draw_popup(struct bt_popup_appdata *ad,
@@ -608,22 +592,25 @@ static void __bluetooth_draw_popup(struct bt_popup_appdata *ad,
 
 	if (title != NULL) {
 		snprintf(temp_str, BT_TITLE_STR_MAX_LEN+BT_TEXT_EXTRA_LEN,
-			"<align=center>%s</font>", title);
+			"<align=center>%s</align>", title);
 		elm_object_text_set(ad->popup, temp_str);
 	}
 
 	if ((btn1_text != NULL) && (btn2_text != NULL)) {
 		btn1 = elm_button_add(ad->popup);
+		elm_object_style_set(btn1, "popup_button/default");
 		elm_object_text_set(btn1, btn1_text);
 		elm_object_part_content_set(ad->popup, "button1", btn1);
 		evas_object_smart_callback_add(btn1, "clicked", func, ad);
 
 		btn2 = elm_button_add(ad->popup);
+		elm_object_style_set(btn2, "popup_button/default");
 		elm_object_text_set(btn2, btn2_text);
 		elm_object_part_content_set(ad->popup, "button2", btn2);
 		evas_object_smart_callback_add(btn2, "clicked", func, ad);
 	} else if (btn1_text != NULL) {
 		btn1 = elm_button_add(ad->popup);
+		elm_object_style_set(btn1, "popup_button/default");
 		elm_object_text_set(btn1, btn1_text);
 		elm_object_part_content_set(ad->popup, "button1", btn1);
 		evas_object_smart_callback_add(btn1, "clicked", func, ad);
@@ -641,95 +628,140 @@ static void __bluetooth_draw_popup(struct bt_popup_appdata *ad,
 }
 
 static void __bluetooth_draw_input_view(struct bt_popup_appdata *ad,
-			const char *title,
+			const char *title, const char *text,
 			void (*func)
 			(void *data, Evas_Object *obj, void *event_info))
 {
-	Evas_Object *bg = NULL;
-	Evas_Object *genlist = NULL;
+	Ecore_X_Window xwin;
+	Evas_Object *conformant = NULL;
+	Evas_Object *content = NULL;
+	Evas_Object *passpopup = NULL;
+	Evas_Object *box = NULL;
+	Evas_Object *label = NULL;
+	Evas_Object *editfield = NULL;
+	Evas_Object *entry = NULL;
+	Evas_Object *check = NULL;
 	Evas_Object *l_button = NULL;
 	Evas_Object *r_button = NULL;
-	Elm_Object_Item *git = NULL;
-	Elm_Object_Item *navi_it;
-	Ecore_X_Window xwin;
-
-	evas_object_show(ad->win_main);
-
-	bg = __bluetooth_create_bg(ad->win_main, "group_list");
-
-	ad->layout_main = __bluetooth_create_layout(ad->win_main);
-
-	/* Show Indicator */
-	elm_win_indicator_mode_set(ad->win_main, ELM_WIN_INDICATOR_SHOW);
-
-	ad->navi_fr = __bluetooth_add_navigationbar(ad->layout_main);
-
-	/* Create genlist */
-	genlist = elm_genlist_add(ad->navi_fr);
-	evas_object_show(genlist);
-
-	/* Set item class for dialogue seperator */
-	ad->sp_itc.item_style = "dialogue/separator/11/with_line";
-	ad->sp_itc.func.text_get = NULL;
-	ad->sp_itc.func.content_get = NULL;
-	ad->sp_itc.func.state_get = NULL;
-	ad->sp_itc.func.del = NULL;
-
-	ad->itc.item_style = "dialogue/1icon";
-	ad->itc.func.text_get = NULL;
-	ad->itc.func.content_get = __bluetooth_gl_icon_get;
-	ad->itc.func.state_get = NULL;
-	ad->itc.func.del = NULL;
-
-	/* Seperator */
-	git = elm_genlist_item_append(genlist, &ad->sp_itc, NULL, NULL,
-				    ELM_GENLIST_ITEM_NONE, NULL, NULL);
 
-	elm_genlist_item_select_mode_set(git, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
-
-	/*editfield for dialogue item (dialogue item) */
-	elm_genlist_item_append(genlist, &ad->itc, ad, NULL,
-				ELM_GENLIST_ITEM_NONE, NULL, ad);
-
-	navi_it = elm_naviframe_item_push(ad->navi_fr, BT_STR_ENTER_PIN,
-		       NULL, NULL, genlist, NULL);
+	if (ad == NULL || ad->win_main == NULL) {
+		bt_log_print(BT_POPUP, "Invalid parameter");
+		return;
+	}
 
-	l_button = elm_button_add(ad->navi_fr);
-	elm_object_style_set(l_button, "naviframe/title/default");
-	elm_object_text_set(l_button, BT_STR_CANCEL);
-	evas_object_show(l_button);
+	conformant = elm_conformant_add(ad->win_main);
+	if (conformant == NULL) {
+		bt_log_print(BT_POPUP, "conformant is NULL");
+		return;
+	}
+	ad->popup = conformant;
+
+	elm_win_conformant_set(ad->win_main, EINA_TRUE);
+	elm_win_resize_object_add(ad->win_main, conformant);
+	evas_object_size_hint_weight_set(conformant, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+	evas_object_size_hint_align_set(conformant, EVAS_HINT_FILL, EVAS_HINT_FILL);
+	evas_object_show(conformant);
+
+	content = elm_layout_add(conformant);
+	elm_object_content_set(conformant, content);
+
+	passpopup = elm_popup_add(content);
+	elm_object_part_text_set(passpopup, "title,text", title);
+
+	box = elm_box_add(passpopup);
+	evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+	evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL);
+	evas_object_show(box);
+
+	label = elm_label_add(box);
+	elm_object_style_set(label, "popup/default");
+	elm_object_text_set(label, text);
+	elm_label_line_wrap_set(label, ELM_WRAP_CHAR);
+	evas_object_size_hint_weight_set(label, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+	evas_object_size_hint_align_set(label, EVAS_HINT_FILL, EVAS_HINT_FILL);
+	evas_object_show(label);
+	elm_box_pack_end(box, label);
+
+	editfield = elm_layout_add(box);
+	elm_layout_theme_set(editfield, "layout", "editfield", "default");
+	evas_object_size_hint_weight_set(editfield, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+	evas_object_size_hint_align_set(editfield, EVAS_HINT_FILL, EVAS_HINT_FILL);
+	ad->editfield = editfield;
+
+	entry = elm_entry_add(box);
+	elm_object_part_content_set(editfield, "elm.swallow.content", entry);
+	elm_object_part_text_set(editfield, "elm.text", text);
+	elm_entry_single_line_set(entry, EINA_TRUE);
+	elm_entry_scrollable_set(entry, EINA_TRUE);
+	ad->entry = entry;
+
+	evas_object_smart_callback_add(entry, "changed",
+				__bluetooth_entry_change_cb,
+				ad);
+
+	evas_object_smart_callback_add(entry, "focused",
+				__bluetooth_entry_focused_cb,
+				editfield);
+
+	evas_object_smart_callback_add(entry, "unfocused",
+				__bluetooth_entry_unfocused_cb,
+				editfield);
+
+	elm_object_signal_callback_add(editfield, "elm,eraser,clicked", "elm",
+				(Edje_Signal_Cb)__bluetooth_eraser_clicked_cb,
+				entry);
+
+	elm_entry_password_set(entry, TRUE);
+	elm_entry_input_panel_layout_set(entry,
+				ELM_INPUT_PANEL_LAYOUT_NUMBERONLY);
+
+	evas_object_show(entry);
+	evas_object_show(editfield);
+	elm_object_focus_set(entry, EINA_TRUE);
+	elm_box_pack_end(box, editfield);
+
+	check = elm_check_add(box);
+	elm_object_text_set(check, BT_STR_SHOW_PASSWORD);
+	elm_object_focus_allow_set(check, EINA_FALSE);
+	evas_object_size_hint_weight_set(check, EVAS_HINT_EXPAND,
+					EVAS_HINT_EXPAND);
+	evas_object_size_hint_align_set(check, EVAS_HINT_FILL,
+					EVAS_HINT_FILL);
+	evas_object_smart_callback_add(check, "changed",
+				__bluetooth_check_chagned_cb, entry);
+	evas_object_show(check);
+	elm_box_pack_end(box, check);
+
+	elm_object_content_set(passpopup, box);
+
+	l_button = elm_button_add(ad->win_main);
+	elm_object_style_set(l_button, "popup_button/default");
+	elm_object_text_set(l_button, BT_STR_OK);
+	elm_object_part_content_set(passpopup, "button1", l_button);
 	evas_object_smart_callback_add(l_button, "clicked", func, ad);
-	elm_object_item_part_content_set(navi_it, "title_left_btn", l_button);
+	elm_object_disabled_set(l_button, EINA_TRUE);
 
-	r_button = elm_button_add(ad->navi_fr);
-	elm_object_style_set(r_button, "naviframe/title/default");
-	elm_object_text_set(r_button, BT_STR_DONE);
-	evas_object_show(r_button);
-	evas_object_smart_callback_add(r_button, "clicked", func, ad);
-	elm_object_disabled_set(r_button, EINA_TRUE);
-
-	elm_object_item_part_content_set(navi_it, "title_right_btn", r_button);
+	ad->edit_field_save_btn = l_button;
 
-	ad->edit_field_save_btn = r_button;
+	r_button = elm_button_add(ad->win_main);
+	elm_object_style_set(r_button, "popup_button/default");
+	elm_object_text_set(r_button, BT_STR_CANCEL);
+	elm_object_part_content_set(passpopup, "button2", r_button);
+	evas_object_smart_callback_add(r_button, "clicked", func, ad);
+	evas_object_show(passpopup);
 
-	xwin = elm_win_xwindow_get(ad->layout_main);
+	xwin = elm_win_xwindow_get(conformant);
 	ecore_x_netwm_window_type_set(xwin, ECORE_X_WINDOW_TYPE_NOTIFICATION);
 	utilx_set_system_notification_level(ecore_x_display_get(), xwin,
 				UTILX_NOTIFICATION_LEVEL_NORMAL);
+
+	evas_object_show(ad->popup);
+	evas_object_show(ad->win_main);
 }
 
 static void __bluetooth_delete_input_view(struct bt_popup_appdata *ad)
 {
 	__bluetooth_ime_hide();
-
-	if (ad->navi_fr)
-		elm_naviframe_item_pop(ad->navi_fr);
-
-	if (ad->layout_main)
-		evas_object_del(ad->layout_main);
-
-	ad->navi_fr = NULL;
-	ad->layout_main = NULL;
 }
 
 /* AUL bundle handler */
@@ -751,7 +783,6 @@ static int __bluetooth_launch_handler(struct bt_popup_appdata *ad,
 		return -1;
 
 	if (!strcasecmp(event_type, "pin-request")) {
-		ad->event_type = BT_EVENT_PIN_REQUEST;
 		timeout = BT_AUTHENTICATION_TIMEOUT;
 
 		device_name = bundle_get_val(kb, "device-name");
@@ -760,16 +791,18 @@ static int __bluetooth_launch_handler(struct bt_popup_appdata *ad,
 			conv_str = elm_entry_utf8_to_markup(device_name);
 
 		snprintf(view_title, BT_TITLE_STR_MAX_LEN,
-			 "%s (%s)", BT_STR_ENTER_PIN, conv_str);
+			 "%s", BT_STR_BLUETOOTH_PAIRING_REQUEST);
+
+		snprintf(text, BT_GLOBALIZATION_STR_LENGTH,
+			 BT_STR_ENTER_PIN_TO_PAIR, conv_str);
 
 		if (conv_str)
 			free(conv_str);
 
 		/* Request user inputted PIN for basic pairing */
-		__bluetooth_draw_input_view(ad, view_title,
+		__bluetooth_draw_input_view(ad, view_title, text,
 					  __bluetooth_input_request_cb);
 	} else if (!strcasecmp(event_type, "passkey-confirm-request")) {
-		ad->event_type = BT_EVENT_PASSKEY_CONFIRM_REQUEST;
 		timeout = BT_AUTHENTICATION_TIMEOUT;
 
 		device_name = bundle_get_val(kb, "device-name");
@@ -778,11 +811,9 @@ static int __bluetooth_launch_handler(struct bt_popup_appdata *ad,
 		if (device_name && passkey) {
 			conv_str = elm_entry_utf8_to_markup(device_name);
 
-			snprintf(text, BT_GLOBALIZATION_STR_LENGTH,
-			     BT_STR_PASSKEY_MATCH_Q, conv_str);
-
 			snprintf(view_title, BT_TITLE_STR_MAX_LEN,
-			     "%s<br>%s", text, passkey);
+			     BT_STR_CONFIRM_PASSKEY_PS_TO_PAIR_WITH_PS,
+			     conv_str, passkey);
 
 			bt_log_print(BT_POPUP, "title: %s", view_title);
 
@@ -790,7 +821,7 @@ static int __bluetooth_launch_handler(struct bt_popup_appdata *ad,
 				free(conv_str);
 
 			__bluetooth_draw_popup(ad, view_title,
-					BT_STR_YES, BT_STR_NO,
+					BT_STR_OK, BT_STR_CANCEL,
 					__bluetooth_passkey_confirm_cb);
 		} else {
 			timeout = BT_ERROR_TIMEOUT;
@@ -798,7 +829,6 @@ static int __bluetooth_launch_handler(struct bt_popup_appdata *ad,
 	} else if (!strcasecmp(event_type, "passkey-request")) {
 		const char *device_name = NULL;
 
-		ad->event_type = BT_EVENT_PASSKEY_REQUEST;
 		timeout = BT_AUTHENTICATION_TIMEOUT;
 
 		device_name = bundle_get_val(kb, "device-name");
@@ -807,19 +837,21 @@ static int __bluetooth_launch_handler(struct bt_popup_appdata *ad,
 			conv_str = elm_entry_utf8_to_markup(device_name);
 
 		snprintf(view_title, BT_TITLE_STR_MAX_LEN,
-			 "%s (%s)", BT_STR_ENTER_PIN, conv_str);
+			 "%s", BT_STR_BLUETOOTH_PAIRING_REQUEST);
+
+		snprintf(text, BT_GLOBALIZATION_STR_LENGTH,
+			 BT_STR_ENTER_PIN_TO_PAIR, conv_str);
 
 		if (conv_str)
 			free(conv_str);
 
 		/* Request user inputted Passkey for basic pairing */
-		__bluetooth_draw_input_view(ad, view_title,
+		__bluetooth_draw_input_view(ad, view_title, text,
 					  __bluetooth_input_request_cb);
 
 	} else if (!strcasecmp(event_type, "passkey-display-request")) {
 		/* Nothing to do */
 	} else if (!strcasecmp(event_type, "authorize-request")) {
-		ad->event_type = BT_EVENT_AUTHORIZE_REQUEST;
 		timeout = BT_AUTHORIZATION_TIMEOUT;
 
 		device_name = bundle_get_val(kb, "device-name");
@@ -837,7 +869,6 @@ static int __bluetooth_launch_handler(struct bt_popup_appdata *ad,
 				     __bluetooth_authorization_request_cb);
 	} else if (!strcasecmp(event_type, "app-confirm-request")) {
 		bt_log_print(BT_POPUP, "app-confirm-request");
-		ad->event_type = BT_EVENT_APP_CONFIRM_REQUEST;
 		timeout = BT_AUTHORIZATION_TIMEOUT;
 
 		const char *title = NULL;
@@ -862,7 +893,6 @@ static int __bluetooth_launch_handler(struct bt_popup_appdata *ad,
 					     __bluetooth_app_confirm_cb);
 		}
 	} else if (!strcasecmp(event_type, "push-authorize-request")) {
-		ad->event_type = BT_EVENT_PUSH_AUTHORIZE_REQUEST;
 		timeout = BT_AUTHORIZATION_TIMEOUT;
 
 		device_name = bundle_get_val(kb, "device-name");
@@ -880,7 +910,6 @@ static int __bluetooth_launch_handler(struct bt_popup_appdata *ad,
 		__bluetooth_draw_popup(ad, view_title, BT_STR_YES, BT_STR_NO,
 				__bluetooth_push_authorization_request_cb);
 	} else if (!strcasecmp(event_type, "confirm-overwrite-request")) {
-		ad->event_type = BT_EVENT_CONFIRM_OVERWRITE_REQUEST;
 		timeout = BT_AUTHORIZATION_TIMEOUT;
 
 		file = bundle_get_val(kb, "file");
@@ -891,22 +920,16 @@ static int __bluetooth_launch_handler(struct bt_popup_appdata *ad,
 		__bluetooth_draw_popup(ad, view_title, BT_STR_YES, BT_STR_NO,
 				__bluetooth_confirm_overwrite_request_cb);
 	} else if (!strcasecmp(event_type, "keyboard-passkey-request")) {
-		ad->event_type = BT_EVENT_KEYBOARD_PASSKEY_REQUEST;
 		timeout = BT_AUTHENTICATION_TIMEOUT;
 
 		device_name = bundle_get_val(kb, "device-name");
 		passkey = bundle_get_val(kb, "passkey");
 
 		if (device_name && passkey) {
-			snprintf(ad->passkey, sizeof(ad->passkey), "%s", passkey);
-
 			conv_str = elm_entry_utf8_to_markup(device_name);
 
-			snprintf(text, BT_GLOBALIZATION_STR_LENGTH,
-			     BT_STR_PASSKEY_MATCH_Q, conv_str);
-
 			snprintf(view_title, BT_TITLE_STR_MAX_LEN,
-			     "%s<br>%s", text, passkey);
+			     BT_STR_ENTER_PS_ON_PS_TO_PAIR, passkey, conv_str);
 
 			bt_log_print(BT_POPUP, "title: %s", view_title);
 
@@ -914,14 +937,13 @@ static int __bluetooth_launch_handler(struct bt_popup_appdata *ad,
 				free(conv_str);
 
 			__bluetooth_draw_popup(ad, view_title,
-						BT_STR_YES, BT_STR_NO,
-						__bluetooth_input_request_cb);
+						BT_STR_CANCEL, NULL,
+						__bluetooth_input_cancel_cb);
 		} else {
 			timeout = BT_ERROR_TIMEOUT;
 		}
 	} else if (!strcasecmp(event_type, "bt-information")) {
 		bt_log_print(BT_POPUP, "bt-information");
-		ad->event_type = BT_EVENT_INFORMATION;
 		timeout = BT_NOTIFICATION_TIMEOUT;
 
 		const char *title = NULL;
@@ -943,25 +965,22 @@ static int __bluetooth_launch_handler(struct bt_popup_appdata *ad,
 			__bluetooth_draw_popup(ad, title, NULL, NULL,
 					     __bluetooth_app_confirm_cb);
 		}
-	} else if (!strcasecmp(event_type, "bt-security")) {
-		const char *type = NULL;
+	} else if (!strcasecmp(event_type, "exchange-request")) {
+		timeout = BT_AUTHORIZATION_TIMEOUT;
 
-		bt_log_print(BT_POPUP, "bt-security");
-		ad->event_type = BT_EVENT_INFORMATION;
-		timeout = BT_NOTIFICATION_TIMEOUT;
+		device_name = bundle_get_val(kb, "device-name");
 
-		type = bundle_get_val(kb, "type");
+		if (device_name)
+			conv_str = elm_entry_utf8_to_markup(device_name);
 
-		if (!strcasecmp(type, "disabled")) {
-			snprintf(view_title, BT_TITLE_STR_MAX_LEN,
-				 BT_STR_DISABLED_RESTRICTS);
-		} else if (!strcasecmp(type, "handsfree")) {
-			snprintf(view_title, BT_TITLE_STR_MAX_LEN,
-				 BT_STR_HANDS_FREE_RESTRICTS);
-		}
+		snprintf(view_title, BT_TITLE_STR_MAX_LEN,
+			 BT_STR_EXCHANGE_OBJECT_WITH_PS_Q, conv_str);
+
+		if (conv_str)
+			free(conv_str);
 
-		__bluetooth_draw_popup(ad, view_title, BT_STR_OK, NULL,
-					__bluetooth_app_confirm_cb);
+		__bluetooth_draw_popup(ad, view_title, BT_STR_YES, BT_STR_NO,
+				     __bluetooth_authorization_request_cb);
 	} else {
 
 		return -1;
@@ -1023,16 +1042,15 @@ static void __bluetooth_session_init(struct bt_popup_appdata *ad)
 						    "org.bluez.frwk_agent",
 						    "/org/bluez/agent/frwk_agent",
 						    "org.bluez.Agent");
-	if (!ad->agent_proxy) {
+	if (!ad->agent_proxy)
 		bt_log_print(BT_POPUP, "Could not create a agent dbus proxy");
-	}
+
 	ad->obex_proxy = dbus_g_proxy_new_for_name(conn,
 						   "org.bluez.frwk_agent",
 						   "/org/obex/ops_agent",
 						   "org.openobex.Agent");
-	if (!ad->agent_proxy) {
-		bt_log_print(BT_POPUP, "Could not create a agent dbus proxy");
-	}
+	if (!ad->obex_proxy)
+		bt_log_print(BT_POPUP, "Could not create obex dbus proxy");
 
 	if (!__bluetooth_init_app_signal(ad))
 		bt_log_print(BT_POPUP, "__bt_syspopup_init_app_signal failed");
@@ -1076,14 +1094,10 @@ static int __bluetooth_terminate(void *data)
 	if (ad->popup)
 		evas_object_del(ad->popup);
 
-	if (ad->layout_main)
-		evas_object_del(ad->layout_main);
-
 	if (ad->win_main)
 		evas_object_del(ad->win_main);
 
 	ad->popup = NULL;
-	ad->layout_main = NULL;
 	ad->win_main = NULL;
 
 	return 0;
@@ -1118,38 +1132,39 @@ static int __bluetooth_reset(bundle *b, void *data)
 	event_type = bundle_get_val(b, "event-type");
 
 	if (event_type != NULL) {
+		if (!strcasecmp(event_type, "terminate")) {
+			__bluetooth_win_del(ad);
+			return 0;
+		}
+
 		if (syspopup_has_popup(b)) {
-			if (!strcasecmp(event_type, "terminate")) {
-				__bluetooth_win_del(ad);
-				return 0;
-			} else {
-				/* Destroy the existing popup*/
-				__bluetooth_cleanup(ad);
-				/* create window */
-				ad->win_main = __bluetooth_create_win(PACKAGE);
-				if (ad->win_main == NULL)
-					return -1;
-			}
+			/* Destroy the existing popup*/
+			__bluetooth_cleanup(ad);
+			/* create window */
+			ad->win_main = __bluetooth_create_win(PACKAGE);
+			if (ad->win_main == NULL)
+				return -1;
 		}
-		if (strcasecmp(event_type, "pin-request") != 0 &&
-		      strcasecmp(event_type, "passkey-request") != 0)
-			elm_win_alpha_set(ad->win_main, EINA_TRUE);
+
+		__bluetooth_parse_event(ad, event_type);
+
+		elm_win_alpha_set(ad->win_main, EINA_TRUE);
 
 		ret = syspopup_create(b, &handler, ad->win_main, ad);
 		if (ret == -1) {
 			bt_log_print(BT_POPUP, "syspopup_create err");
-		}
-		else {
+			__bluetooth_remove_all_event(ad);
+		} else {
 			ret = __bluetooth_launch_handler(ad,
 						       b, event_type);
 
 			if (ret != 0)
-				return -1;
+				__bluetooth_remove_all_event(ad);
 
 			/* Change LCD brightness */
 			ret = pm_change_state(LCD_NORMAL);
 			if (ret != 0)
-				return -1;
+				bt_log_print(BT_POPUP, "Fail to change LCD");
 		}
 	} else {
 		bt_log_print(BT_POPUP, "event type is NULL \n");
diff --git a/src/bt-syspopup.h b/src/bt-syspopup.h
index 0ca0705..aec010e 100644
--- a/src/bt-syspopup.h
+++ b/src/bt-syspopup.h
@@ -22,24 +22,25 @@
 #include <glib.h>
 #include <dbus/dbus-glib.h>
 
+#ifndef PACKAGE_NAME
+#define PACKAGE_NAME "org.tizen.bt-syspopup"
+#endif
+
 #ifndef PREFIX
-#define PREFIX "/usr"
+#define PREFIX "/opt/apps"PACKAGE_NAME
 #endif
 
 #define TEMP_DIR	"/tmp"
+
 #define PACKAGE		"bt-syspopup"
 #define APPNAME		"bt-syspopup"
-#define LOCALEDIR	PREFIX"/share/locale"
-#define ICON_DIR	PREFIX"/share/icon"
+#define ICON_DIR	PREFIX"/res/default/small/icon"
 
 #define BT_COMMON_PKG		"ug-setting-bluetooth-efl"
 #define BT_COMMON_RES		"/opt/ug/res/locale"
 
 #define _EDJ(obj) elm_layout_edje_get(obj)
 
-#define BT_POPUP_ICON_CANCEL ICON_DIR"/01_header_icon_cancel.png"
-#define BT_POPUP_ICON_DONE ICON_DIR"/01_header_icon_done.png"
-
 #define BT_AUTHENTICATION_TIMEOUT		35
 #define BT_AUTHORIZATION_TIMEOUT		15
 #define BT_NOTIFICATION_TIMEOUT		2
@@ -84,12 +85,24 @@
 #define BT_STR_OVERWRITE_FILE_Q \
 	dgettext(BT_COMMON_PKG, "IDS_BT_POP_PS_ALREADY_EXISTS_OVERWRITE_Q")
 
-/* We will add these strings in BT_COMMON_PKG to translate */
-#define BT_STR_DISABLED_RESTRICTS \
-	"Security policy restricts use of Bluletooth connection"
+#define BT_STR_ENTER_PS_ON_PS_TO_PAIR \
+	dgettext(BT_COMMON_PKG, "IDS_BT_BODY_ENTER_P1SS_ON_P2SS_TO_PAIR_THEN_TAP_RETURN_OR_ENTER")
+
+#define BT_STR_EXCHANGE_OBJECT_WITH_PS_Q \
+	dgettext(BT_COMMON_PKG, "IDS_BT_POP_EXCHANGEOBJECT")
+
+/* Need to convert the design ID */
+#define BT_STR_BLUETOOTH_PAIRING_REQUEST \
+	dgettext(BT_COMMON_PKG, "IDS_BT_HEADER_BLUETOOTH_PAIRING_REQUEST")
 
-#define BT_STR_HANDS_FREE_RESTRICTS \
-	"Security policy restricts use of Bluletooth connection to hands-free features only"
+#define BT_STR_ENTER_PIN_TO_PAIR \
+	dgettext(BT_COMMON_PKG, "IDS_BT_POP_ENTER_PIN_TO_PAIR_WITH_PS_HTRY_0000_OR_1234")
+
+#define BT_STR_SHOW_PASSWORD \
+	dgettext(BT_COMMON_PKG, "IDS_BT_BODY_SHOW_PASSWORD")
+
+#define BT_STR_CONFIRM_PASSKEY_PS_TO_PAIR_WITH_PS \
+	dgettext(BT_COMMON_PKG, "IDS_BT_POP_CONFIRM_PASSKEY_IS_P2SS_TO_PAIR_WITH_P1SS")
 
 #define BT_STR_OK dgettext("sys_string", "IDS_COM_SK_OK")
 #define BT_STR_YES dgettext("sys_string", "IDS_COM_SK_YES")
@@ -97,7 +110,6 @@
 #define BT_STR_DONE dgettext("sys_string", "IDS_COM_SK_DONE")
 #define BT_STR_CANCEL dgettext("sys_string", "IDS_COM_SK_CANCEL")
 
-
 typedef enum {
 	BT_CHANGED_MODE_ENABLE,
 	BT_CHANGED_MODE_DISABLE,
@@ -116,6 +128,7 @@ typedef enum {
 	BT_EVENT_KEYBOARD_PASSKEY_REQUEST = 0x0200,
 	BT_EVENT_INFORMATION = 0x0400,
 	BT_EVENT_TERMINATE = 0x0800,
+	BT_EVENT_EXCHANGE_REQUEST = 0x1000,
 } bt_popup_event_type_t;
 
 typedef enum {
@@ -128,12 +141,11 @@ typedef enum {
 struct bt_popup_appdata {
 	Evas *evas;
 	Evas_Object *win_main;
-	Evas_Object *layout_main;
 	Evas_Object *popup;
 
 	/* Passkey layout objects */
-	Evas_Object *navi_fr;
 	Evas_Object *entry;
+	Evas_Object *editfield;
 	Evas_Object *edit_field_save_btn;
 	Evas_Object *ticker_noti;
 
@@ -144,11 +156,6 @@ struct bt_popup_appdata {
 	DBusGProxy *obex_proxy;
 	E_DBus_Connection *EDBusHandle;
 
-	Elm_Genlist_Item_Class sp_itc;
-	Elm_Genlist_Item_Class itc;
-
-	char passkey[BT_PK_MLEN + 1];
-
 	int changed_mode;
 	bt_popup_event_type_t event_type;
 };