Add HW back callback event

Change-Id: Ib45ed8d85bd45c8078f60ba73d42829456aaa0b5
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fb0f3bb376ce07fea3b3e110136c6846d2b1c62a..a328b40f44df0e0eb368058550bc6b571d60662e 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,6 +12,7 @@ SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 
 IF("$ENV{CFLAGS}" MATCHES "-DTIZEN_WEARABLE")
 SET(TABLEDIR "/usr/apps/org.tizen.bt-syspopup/shared/res/tables")
+SET(IMAGE_DIR "/usr/apps/org.tizen.bt-syspopup/res/images/")
 ENDIF()
 
 IF("${CMAKE_BUILD_TYPE}" STREQUAL "")
@@ -134,4 +135,5 @@ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/org.tizen.bt-syspopup.png DESTINA
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/custom_popup.edj DESTINATION ${TZ_SYS_RO_APP}/org.tizen.bt-syspopup/res/edje)
 IF("$ENV{CFLAGS}" MATCHES "-DTIZEN_WEARABLE")
 INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tables/ DESTINATION ${TABLEDIR} FILES_MATCHING PATTERN "*.xml")
+INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data/images/ DESTINATION ${IMAGE_DIR} FILES_MATCHING PATTERN "tw_ic_popup*.png")
 ENDIF()

diff --git a/data/images/tw_ic_popup_btn_check.png b/data/images/tw_ic_popup_btn_check.png
new file mode 100644 (file)
index 0000000..3dce121
Binary files /dev/null and b/data/images/tw_ic_popup_btn_check.png differ

diff --git a/data/images/tw_ic_popup_btn_delete.png b/data/images/tw_ic_popup_btn_delete.png
new file mode 100644 (file)
index 0000000..58de36c
Binary files /dev/null and b/data/images/tw_ic_popup_btn_delete.png differ

diff --git a/packaging/org.tizen.bt-syspopup.spec b/packaging/org.tizen.bt-syspopup.spec
index 75487c1e273faf99ff30ea758302df5989744dc8..f563c4c841ad4e5aa94ec7c0173ca6fe84620c12 100644 (file)
--- a/packaging/org.tizen.bt-syspopup.spec
+++ b/packaging/org.tizen.bt-syspopup.spec
@@ -5,7 +5,7 @@
 
 Name:       org.tizen.bt-syspopup
 Summary:    bluetooth system-popup application (bluetooth system popup)
-Version:    0.3.1
+Version:    0.3.2
 Release:    0
 Group:      main
 License:    Flora-1.1
@@ -91,6 +91,7 @@ rm -rf %{buildroot}
 %{TZ_SYS_RO_APP}/org.tizen.bt-syspopup/res/edje/*.edj
 %{TZ_SYS_SHARE}/icons/default/small/org.tizen.bt-syspopup.png
 %if "%{?profile}" == "wearable"
-/usr/apps/org.tizen.bt-syspopup/shared/res/tables/org.tizen.bt-syspopup_ChangeableColorTable.xml
-/usr/apps/org.tizen.bt-syspopup/shared/res/tables/org.tizen.bt-syspopup_FontInfoTable.xml
+%{TZ_SYS_RO_APP}/org.tizen.bt-syspopup/shared/res/tables/org.tizen.bt-syspopup_ChangeableColorTable.xml
+%{TZ_SYS_RO_APP}/org.tizen.bt-syspopup/shared/res/tables/org.tizen.bt-syspopup_FontInfoTable.xml
+%{TZ_SYS_RO_APP}/org.tizen.bt-syspopup/res/images/*
 %endif

diff --git a/src/bt-syspopup-w.c b/src/bt-syspopup-w.c
index 4bd13201c042c7b549a97256f4f73c40aee04e7e..e76d33ed9a0b13a7928cc33349e041671f596449 100644 (file)
--- a/src/bt-syspopup-w.c
+++ b/src/bt-syspopup-w.c
@@ -1917,6 +1917,19 @@ void __bluetooth_set_color_table(void *data)
        FN_END;
 }
 
+static void __bluetooth_back_key_cb(void *data, Evas_Object *obj, void *event_info)
+{
+       FN_START;
+
+       struct bt_popup_appdata *ad = data;
+
+       __bluetooth_remove_all_event(ad);
+       __bluetooth_win_del(ad);
+
+       FN_END;
+}
+
+
 static bool __bluetooth_create(void *data)
 {
        struct bt_popup_appdata *ad = data;
@@ -1981,6 +1994,8 @@ static void __bluetooth_terminate(void *data)
        }
 #endif
 
+       eext_object_event_callback_del(ad->win_main, EEXT_CALLBACK_BACK, __bluetooth_back_key_cb);
+
        if (ad->popup)
                evas_object_del(ad->popup);
 
@@ -2092,6 +2107,8 @@ DONE:
                        __lock_display();
        }
 
+       eext_object_event_callback_add(ad->win_main, EEXT_CALLBACK_BACK, __bluetooth_back_key_cb, ad);
+
        return;
 }