revise build scripts and code cleanup 53/237653/1 accepted/tizen/unified/20200715.002122 submit/tizen/20200703.012802 submit/tizen/20200714.061839
authorYoungjae Shin <yj99.shin@samsung.com>
Thu, 2 Jul 2020 06:56:00 +0000 (15:56 +0900)
committerYoungjae Shin <yj99.shin@samsung.com>
Thu, 2 Jul 2020 06:56:00 +0000 (15:56 +0900)
Change-Id: I9d5616c1225f433c920c2320e922d715a260649d

39 files changed:
AUTHORS [deleted file]
CMakeLists.txt
emulator/CMakeLists.txt
emulator/bt-callback.h [moved from emulator/include/bt-callback.h with 100% similarity]
emulator/bt-emulator-api.h [moved from emulator/include/bt-emulator-api.h with 100% similarity]
emulator/bt-event-manager.h [moved from emulator/include/bt-event-manager.h with 100% similarity]
emulator/bt-main-ug.h [moved from emulator/include/bt-main-ug.h with 92% similarity]
emulator/bt-main-view.h [moved from emulator/include/bt-main-view.h with 100% similarity]
emulator/bt-type-define.h [moved from emulator/include/bt-type-define.h with 100% similarity]
emulator/bt-util.h [moved from emulator/include/bt-util.h with 100% similarity]
emulator/bt-widget.h [moved from emulator/include/bt-widget.h with 100% similarity]
emulator/include/bt-debug.h [deleted file]
emulator/include/bt-string-define.h [deleted file]
include/bt-contacts.h [moved from packaging/contacts.h with 71% similarity]
include/bt-debug.h [moved from standard/include/bt-debug.h with 100% similarity]
include/bt-define.h [new file with mode: 0644]
include/bt-resource.h [moved from emulator/include/bt-resource.h with 98% similarity]
include/bt-string-define.h [moved from standard/include/bt-string-define.h with 100% similarity]
packaging/ug-bluetooth-efl.manifest [moved from ug-bluetooth-efl.manifest with 100% similarity]
packaging/ug-bluetooth-efl.spec
res/CMakeLists.txt
res/edje/CMakeLists.txt [new file with mode: 0644]
res/tables/HD/ug-bluetooth-efl_ChangeableColorTable.xml [deleted file]
res/tables/HD/ug-bluetooth-efl_FontInfoTable.xml [deleted file]
res/tables/ug-bluetooth-efl_ChangeableColorTable.xml [moved from res/tables/WVGA/ug-bluetooth-efl_ChangeableColorTable.xml with 100% similarity]
res/tables/ug-bluetooth-efl_FontInfoTable.xml [moved from res/tables/WVGA/ug-bluetooth-efl_FontInfoTable.xml with 100% similarity]
standard/CMakeLists.txt
standard/bt-callback.h [moved from standard/include/bt-callback.h with 100% similarity]
standard/bt-ipc-handler.h [moved from standard/include/bt-ipc-handler.h with 100% similarity]
standard/bt-main-ug.h [moved from standard/include/bt-main-ug.h with 90% similarity]
standard/bt-main-view.h [moved from standard/include/bt-main-view.h with 100% similarity]
standard/bt-net-connection.h [moved from standard/include/bt-net-connection.h with 100% similarity]
standard/bt-profile-view.h [moved from standard/include/bt-profile-view.h with 100% similarity]
standard/bt-type-define.h [moved from standard/include/bt-type-define.h with 100% similarity]
standard/bt-util.c
standard/bt-util.h [moved from standard/include/bt-util.h with 97% similarity]
standard/bt-wearable.h [moved from standard/include/bt-wearable.h with 100% similarity]
standard/bt-widget.h [moved from standard/include/bt-widget.h with 100% similarity]
standard/include/bt-resource.h [deleted file]

diff --git a/AUTHORS b/AUTHORS
deleted file mode 100644 (file)
index 46d1687..0000000
--- a/AUTHORS
+++ /dev/null
@@ -1,2 +0,0 @@
-Jinmin Jung <jinmin@samsung.com>
-DoHyun Pyun <dh79.pyun@samsung.com>
index 979723a..d197c37 100644 (file)
@@ -1,10 +1,16 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.9)
 PROJECT(ug-setting-bluetooth-efl C)
 
+INCLUDE(FindPkgConfig)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
+
+SET(EXTRA_FLAGS "-Wall -Werror -fvisibility=hidden")
+SET(GC_SECTIONS_FLAGS "-fdata-sections -ffunction-sections -Wl,--gc-sections")
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_FLAGS} ${GC_SECTIONS_FLAGS}")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_FLAGS} ${GC_SECTIONS_FLAGS}")
+SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,nodelete")
+
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
-SET(EXEC_PREFIX "\${prefix}")
-SET(LIBDIR "\${prefix}/lib")
-SET(INCLUDEDIR "\${prefix}/include")
 SET(VERSION 0.1.0)
 SET(RESDIR "${PREFIX}/res")
 SET(LOCALEDIR "${RESDIR}/locale")
@@ -13,11 +19,20 @@ SET(IMAGEDIR "${RESDIR}/images/${PROJECT_NAME}")
 SET(HELPDIR "${RESDIR}/help/${PROJECT_NAME}")
 SET(TABLEDIR "${RESDIR}/tables/${PROJECT_NAME}")
 
-IF("$ENV{CFLAGS}" MATCHES "-DTIZEN_TEST_EMUL")
-ADD_SUBDIRECTORY(emulator)
-ELSE()
-ADD_SUBDIRECTORY(standard)
-ENDIF()
+ADD_DEFINITIONS("-DPKGNAME=\"${PROJECT_NAME}\"")
+ADD_DEFINITIONS("-DPREFIX=\"${PREFIX}\"")
+ADD_DEFINITIONS("-DLOCALEDIR=\"${LOCALEDIR}\"")
+ADD_DEFINITIONS("-DEDJDIR=\"${EDJDIR}\"")
+#ADD_DEFINITIONS("-D__TIZEN_OPEN__")
 
-ADD_SUBDIRECTORY(res/po)
+IF(TV_PROFILE)
+       ADD_DEFINITIONS("-DBT_TV_PROFILE")
+ENDIF(TV_PROFILE)
+
+ADD_SUBDIRECTORY(standard)
 ADD_SUBDIRECTORY(res)
+
+IF(BUILD_EMUL)
+       SET(EMUL_LIB_NAME "emul${PROJECT_NAME}")
+       ADD_SUBDIRECTORY(emulator)
+ENDIF(BUILD_EMUL)
index 1a0ffca..700ff66 100644 (file)
@@ -1,69 +1,15 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+FILE(GLOB SRCS *.c)
 
-SET(SRCS
-bt-main-ug.c
-bt-widget.c
-bt-main-view.c
-bt-util.c
-bt-callback.c
-bt-event-manager.c
-bt-emulator-api.c
-)
+SET(PKG_MODULES elementary appcore-efl ui-gadget-1 dlog vconf evas edje ecore eina aul
+       syspopup-caller capi-network-bluetooth capi-appfw-application capi-system-info
+       notification efl-extension glib-2.0 gio-2.0)
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
-
-SET(PKG_MODULES
-       elementary
-       appcore-efl
-       ui-gadget-1
-       dlog
-       vconf
-       evas
-       edje
-       ecore
-       eina
-       aul
-       syspopup-caller
-       gobject-2.0
-       capi-network-bluetooth
-       capi-appfw-application
-       capi-system-info
-       notification
-       efl-extension
-       glib-2.0
-       gio-2.0
-)
-
-INCLUDE(FindPkgConfig)
 pkg_check_modules(pkgs REQUIRED ${PKG_MODULES})
+INCLUDE_DIRECTORIES(${pkgs_INCLUDE_DIRS})
+LINK_DIRECTORIES(${pkgs_LIBRARY_DIRS})
 
-FOREACH(flag ${pkgs_CFLAGS})
-       SET(EXTRA_CXXFLAGS "${EXTRA_CXXFLAGS} ${flag}")
-ENDFOREACH(flag)
-
-SET(GC_SECTIONS_FLAGS "-fdata-sections -ffunction-sections -Wl,--gc-sections")
-SET(EXTRA_CXXFLAGS "${EXTRA_CXXFLAGS} -fvisibility=hidden -Wall")
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CXXFLAGS} ${GC_SECTIONS_FLAGS}")
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_CXX_FLAGS} ${GC_SECTIONS_FLAGS} -fPIC -Werror")
-
-ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
-ADD_DEFINITIONS("-DEDJDIR=\"${EDJDIR}\"")
-ADD_DEFINITIONS("-DRESDIR=\"${RESDIR}\"")
-ADD_DEFINITIONS("-DIMAGEDIR=\"${IMAGEDIR}\"")
-ADD_DEFINITIONS("-DBT_USE_PLATFORM_DBG")
-#ADD_DEFINITIONS("-D__TIZEN_OPEN__")
-
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/res/ug-bluetooth-efl.xml DESTINATION /usr/share/packages/)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/res/images/ug-bluetooth-efl.png DESTINATION /usr/share/icons/default/small)
-
-ADD_LIBRARY(${PROJECT_NAME} SHARED ${SRCS})
-SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES SOVERSION 0.1.0)
-TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS})
-
-INSTALL(TARGETS ${PROJECT_NAME} DESTINATION /usr/ug/lib)
+ADD_LIBRARY(${EMUL_LIB_NAME} SHARED ${SRCS})
+SET_TARGET_PROPERTIES(${EMUL_LIB_NAME} PROPERTIES SOVERSION ${VERSION})
+TARGET_LINK_LIBRARIES(${EMUL_LIB_NAME} ${pkgs_LIBRARIES})
 
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/res/images/ug-bluetooth-efl.png DESTINATION ${IMAGEDIR})
-INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/res/images/ DESTINATION ${IMAGEDIR} FILES_MATCHING PATTERN "*.png")
-INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/res/images/ DESTINATION ${IMAGEDIR} FILES_MATCHING PATTERN "*.jpg")
-INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/res/help/ DESTINATION ${HELPDIR} FILES_MATCHING PATTERN "*help_*")
-INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/res/tables/WVGA/ DESTINATION ${TABLEDIR} FILES_MATCHING PATTERN "*.xml")
+INSTALL(TARGETS ${EMUL_LIB_NAME} DESTINATION ${LIB_INSTALL_DIR})
similarity index 92%
rename from emulator/include/bt-main-ug.h
rename to emulator/bt-main-ug.h
index 67d360c..9a3ca40 100644 (file)
@@ -38,26 +38,10 @@ extern "C" {
 #include <bundle.h>
 #include <gio/gio.h>
 
+#include "bt-define.h"
 #include "bt-type-define.h"
 
-#ifndef UG_MODULE_API
-#define UG_MODULE_API __attribute__ ((visibility("default")))
-#endif
-
-#define PKGNAME "ug-setting-bluetooth-efl"
-
-#ifdef PREFIX
-#undef PREFIX
-#endif
-#define PREFIX "/usr/ug/"
-
-#define LOCALEDIR PREFIX"/res/locale"
-
-#define BT_EDJ_PATH PREFIX"/res/edje/ug-setting-bluetooth-efl"
-
 #define _EDJ(o)                        elm_layout_edje_get(o)
-#define BT_ICON_EDJ BT_EDJ_PATH"/bluetooth_images.edj"
-#define BT_GENLIST_EDJ BT_EDJ_PATH"/bluetooth_genlist.edj"
 
 #ifdef _
 #undef _
diff --git a/emulator/include/bt-debug.h b/emulator/include/bt-debug.h
deleted file mode 100644 (file)
index baa514b..0000000
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
-* ug-bluetooth-efl
-*
-* Copyright 2012 Samsung Electronics Co., Ltd
-*
-* Contact: Hocheol Seo <hocheol.seo@samsung.com>
-*           GirishAshok Joshi <girish.joshi@samsung.com>
-*           DoHyun Pyun <dh79.pyun@samsung.com>
-*
-* Licensed under the Flora License, Version 1.1 (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 __BT_DEBUG_H
-#define __BT_DEBUG_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <dlog.h>
-#include <stdio.h>
-#include <string.h>
-
-#undef LOG_TAG
-#define LOG_TAG "BLUETOOTH_SETTING_UG"
-
-#define BT_INFO(fmt, arg...) SLOGI(fmt, ##arg)
-
-#define BT_ERR(fmt, arg...) SLOGE(fmt, ##arg)
-
-#define BT_DBG(fmt, arg...) SLOGD(fmt, ##arg)
-
-
-#define DBG_SECURE(fmt, args...) SECURE_SLOGD(fmt, ##args)
-#define ERR_SECURE(fmt, args...) SECURE_SLOGE(fmt, ##args)
-#define INFO_SECURE(fmt, args...) SECURE_SLOGI(fmt, ##args)
-
-#define FUNCTION_TRACE
-#ifdef FUNCTION_TRACE
-#define        FN_START BT_DBG("[ENTER FUNC]");
-#define        FN_END BT_DBG("[EXIT FUNC]");
-#else
-#define        FN_START
-#define        FN_END
-#endif
-
-#define warn_if(expr, fmt, arg...) \
-       do { \
-               if (expr) { \
-                       BT_ERR("(%s) -> "fmt, #expr, ##arg); \
-               } \
-       } while (0);
-
-#define ret_if(expr) \
-       do { \
-               if (expr) { \
-                       BT_ERR("(%s) return", #expr); \
-                       return; \
-               } \
-       } while (0);
-
-#define retv_if(expr, val) \
-       do { \
-               if (expr) { \
-                       BT_ERR("(%s) return", #expr); \
-                       return (val); \
-               } \
-       } while (0);
-
-#define retm_if(expr, fmt, arg...) \
-       do { \
-               if (expr) { \
-                       BT_ERR(fmt, ##arg); \
-                       BT_ERR("(%s) return", #expr); \
-                       return; \
-               } \
-       } while (0);
-
-#define retvm_if(expr, val, fmt, arg...) \
-       do { \
-               if (expr) { \
-                       BT_ERR(fmt, ##arg); \
-                       BT_ERR("(%s) return", #expr); \
-                       return (val); \
-               } \
-       } while (0);
-
-#ifdef __cplusplus
-}
-#endif
-#endif                         /* __BT_DEBUG_H */
diff --git a/emulator/include/bt-string-define.h b/emulator/include/bt-string-define.h
deleted file mode 100644 (file)
index f1ddfea..0000000
+++ /dev/null
@@ -1,331 +0,0 @@
-/*
-* ug-bluetooth-efl
-*
-* Copyright 2012 Samsung Electronics Co., Ltd
-*
-* Contact: Hocheol Seo <hocheol.seo@samsung.com>
-*           GirishAshok Joshi <girish.joshi@samsung.com>
-*           DoHyun Pyun <dh79.pyun@samsung.com>
-*
-* Licensed under the Flora License, Version 1.1 (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 __BT_STRING_DEFINE_H__
-#define __BT_STRING_DEFINE_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Not included in excel file, but it exist in STMS */
-#define BT_STR_ALLOW_TO_DELETE_YOUR_FILE_Q \
-       _("IDS_BT_BODY_ALLOW_PS_TO_DELETE_YOUR_FILE_Q")
-#define BT_STR_ALLOW_TO_GET_YOUR_FILE_Q \
-       _("IDS_BT_BODY_ALLOW_PS_TO_GET_YOUR_FILE_Q")
-#define BT_STR_ALLOW_TO_PUT_A_FILE_IN_Q \
-       _("IDS_BT_BODY_ALLOW_PS_TO_PUT_A_FILE_IN_Q")
-#define BT_STR_ALWAYS_ON _("IDS_BT_BODY_ALWAYS_ON")
-#define BT_STR_CANCELLED _("IDS_BT_BODY_CANCELLED")
-#define BT_STR_CONTACT_ALREADY_EXISTS \
-       _("IDS_BT_BODY_CONTACT_ALREADY_EXISTS")
-#define BT_STR_FILE_SENT _("IDS_BT_BODY_FILE_SENT")
-#define BT_STR_HEADSET _("IDS_BT_BODY_HEADSET")
-#define BT_STR_INVALID_TIME_ENTER_NUMBER_BETWEEN_1_AND_60 \
-       _("IDS_BT_BODY_INVALID_TIME_ENTER_NUMBER_BETWEEN_1_AND_60")
-#define BT_STR_MINUTE _("IDS_BT_BODY_MINUTE_LC")
-#define BT_STR_MY_PHONES_NAME _("IDS_BT_BODY_MY_PHONES_NAME")
-#define BT_STR_MY_PHONES_VISIBILITY _("IDS_BT_BODY_MY_PHONES_VISIBILITY")
-#define BT_STR_NO_MORE_CONNECTIONS_POSSIBLE \
-       _("IDS_BT_BODY_NO_MORE_CONNECTIONS_POSSIBLE_VODA")
-#define BT_STR_PAIRED_DEVICES _("IDS_BT_BODY_PAIRED_DEVICES")
-#define BT_STR_PRINTER _("IDS_BT_BODY_PRINTER")
-#define BT_STR_RECEIVCED _("IDS_BT_BODY_RECEIVED")
-#define BT_STR_SERVICES _("IDS_BT_BODY_SERVICES")
-#define BT_STR_UPDATING _("IDS_BT_BODY_UPDATING_ING")
-#define BT_STR_BLUETOOTH_DEVICES _("IDS_BT_HEADER_BLUETOOTH_DEVICES")
-#define BT_STR_ENTER_PIN _("IDS_BT_HEADER_ENTERPIN")
-#define BT_STR_NEW_DEVICE _("IDS_BT_HEADER_NEW_DEVICE")
-#define BT_STR_PRINTING         _("IDS_BT_HEADER_PRINTING")
-#define BT_STR_CONNECT_STEREO _("IDS_BT_OPT_CONNECT_STEREO")
-#define BT_STR_DOWNLOAD _("IDS_BT_OPT_DOWNLOAD")
-#define BT_STR_PC _("IDS_BT_OPT_PC")
-#define BT_STR_PRINT _("IDS_BT_OPT_PRINT")
-#define BT_STR_SEARCH_OPTIONS _("IDS_BT_OPT_SEARCH_OPTIONS")
-#define BT_STR_ALLOW_PS_TO_CONNECT_Q _("IDS_BT_POP_ALLOW_PS_TO_CONNECT_Q")
-#define BT_STR_BLUETOOTH_ERROR_TRY_AGAIN_Q \
-       _("IDS_BT_POP_BLUETOOTH_ERROR_TRY_AGAIN_Q")
-#define BT_STR_BLUETOOTH_TIMEOUT_TRY_AGAIN_Q \
-       _("IDS_BT_POP_BLUETOOTH_TIMEOUT_TRY_AGAIN_Q")
-#define BT_STR_CONFIRM_PASSKEY_IS_PS_TO_PAIR_WITH_PS \
-       _("IDS_BT_POP_CONFIRM_PASSKEY_IS_PS_TO_PAIR_WITH_PS")
-#define BT_STR_UNABLE_TO_CONNECT_TRY_Q _("IDS_BT_POP_CONNECTAGAIN")
-#define BT_STR_DELETE_QUESTION _("IDS_BT_POP_DELETE_Q")
-#define BT_STR_DELETING _("IDS_BT_POP_DELETING_ING")
-#define BT_STR_DEVICE_DELETED _("IDS_BT_POP_DEVICEDELETED")
-#define BT_STR_DOWNLOADED _("IDS_BT_POP_DOWNLOADED")
-#define BT_STR_DOWNLOADING_FAILED _("IDS_BT_POP_DOWNLOADING_FAILED")
-#define BT_STR_DOWNLOADING _("IDS_BT_POP_DOWNLOADING_ING")
-#define BT_STR_ENTER_DEVICE_NAME _("IDS_ST_POP_ENTER_DEVICE_NAME")
-#define BT_STR_ENTER_NUMBER_BETWEEN_PD_AND_PD \
-       _("IDS_BT_POP_ENTER_NUMBER_BETWEEN_PD_AND_PD")
-#define BT_STR_INCORRECT_PIN_TRY_AGAIN_Q \
-       _("IDS_BT_POP_INCORRECT_PIN_TRY_AGAIN_Q")
-#define BT_STR_PD_FILES_RECEIVED _("IDS_BT_POP_PD_FILES_RECEIVED")
-#define BT_STR_SENDING_CANCELLED _("IDS_BT_POP_SENDINGCANCEL")
-#define BT_STR_UNABLE_TO_SEND _("IDS_BT_POP_SENDINGFAIL")
-#define BT_STR_SERIAL_CONNECT_WITH_PS_Q _("IDS_BT_POP_SERIAL_CONNECT_WITH_PS_Q")
-#define BT_STR_FILE_RECEIVED _("IDS_BT_POP_SUBFILERECEIVED")
-#define BT_STR_UNABLE_TO_GET_SERVICE_LIST \
-       _("IDS_BT_POP_UNABLE_TO_GET_SERVICE_LIST")
-#define BT_STR_CONNECT _("IDS_BT_SK_CONNECT")
-#define BT_STR_DISCONNECT _("IDS_BT_SK_DISCONNECT")
-#define BT_STR_DISCONNECT_DEVICE _("IDS_BT_HEADER_DISCONNECT_DEVICE_ABB")
-#define BT_STR_DOWNLOAD_CANCELLED _("IDS_BR_POP_DOWNLOAD_CANCELLED")
-#define BT_STR_SEARCHING _("IDS_BT_BODY_SEARCHINGDEVICE")
-#define BT_STR_CONNECTED _("IDS_BT_SBODY_CONNECTED_M_STATUS")
-#define BT_STR_DEVICE_NAME _("IDS_BT_BODY_DEVICENAME")
-#define BT_STR_NO_DEVICE _("IDS_BT_BODY_NO_DEVICES")
-#define BT_STR_GETTING_SERVICE_LIST _("IDS_BT_POP_GETTINGSERVICELIST")
-#define BT_STR_HEADSET_INFO _("IDS_BT_BODY_INFOHEADSET")
-#define BT_STR_SELECT_DEVICES _("IDS_BT_HEADER_SELECT_DEVICE")
-
-#define BT_STR_CONNECT_TO_DEVICE \
-       _("IDS_BT_BODY_CONNECT_TO_BLUETOOTH_DEVICE")
-
-#define BT_STR_UNABLE_TO_GET_THE_SERVICE_LIST \
-       _("IDS_BT_POP_UNABLE_TO_GET_SERVICE_LIST")
-
-#define BT_STR_FLIGHT_MODE \
-       _("IDS_BT_POP_UNABLE_TO_ACTIVATE_BLUETOOTH_WHEN_FLIGHT_MODE_IS_ON")
-
-#define BT_STR_CONNECTED_PHONE_AND_MEDIO_AUDIO \
-       _("IDS_BT_BODY_CONNECTED_TO_PHONE_AND_MEDIA_AUDIO")
-
-#define BT_STR_CONNECTED_PHONE_AUDIO \
-       _("IDS_BT_BODY_CONNECTED_TO_PHONE_AUDIO")
-
-#define BT_STR_CONNECTED_MEDIA_AUDIO \
-       _("IDS_BT_BODY_CONNECTED_TO_MEDIA_AUDIO")
-
-#define BT_STR_CONNECTED_HID_DEVICE \
-       _("IDS_BT_POP_CONNECTED_TO_HID_DEVICE")
-
-#define BT_STR_SCANNING \
-       _("IDS_BT_BODY_SCANNING_FOR_DEVICES_ING")
-
-#define BT_STR_SCAN \
-       _("IDS_BT_SK_SCAN")
-
-
-#define BT_STR_SVC_HEADSET  _("IDS_BT_BODY_HEADSET")
-#define BT_STR_SVC_HEADSET_D _("IDS_BT_BODY_INFOHEADSET")
-
-#define BT_STR_SVC_HF  _("IDS_BT_BODY_HANDSFREE")
-#define BT_STR_SVC_HF_D _("IDS_BT_BODY_INFOHANDSFREE")
-
-#define BT_STR_SVC_STEREO  _("IDS_BT_OPT_STEREO_HEADSET")
-#define BT_STR_SVC_STEREO_D _("IDS_BT_BODY_INFOAVHEADSET")
-
-#define BT_STR_SVC_FT  _("IDS_ST_BODY_TRANSFER_FILES")
-#define BT_STR_SVC_FT_D _("IDS_BT_BODY_INFOFILETRANSFER")
-
-#define BT_STR_SVC_OP  _("IDS_BT_BODY_OBJECT_PUSH")
-#define BT_STR_SVC_OP_D _("IDS_BT_BODY_INFOOBJECTPUSH")
-
-#define BT_STR_SVC_BPP  _("IDS_BT_BODY_BASIC_PRINTING")
-#define BT_STR_SVC_BPP_D  _("IDS_BT_BODY_PRINTER_SERVICEINFO")
-
-#define BT_STR_SVC_DUN  _("IDS_BT_BODY_DIAL_UP_NETWORKING")
-#define BT_STR_SVC_DUN_D _("IDS_BT_BODY_INFODIALUP")
-
-#define BT_STR_SVC_HID  _("IDS_BT_POP_HID_DEVICE")
-#define BT_STR_SVC_HID_D _("IDS_BT_BODY_HID_HKEYBOARD_MOUSE_ETC")
-
-#define BT_STR_SVC_SPP _("IDS_BT_BODY_SERIAL_PORT")
-
-#define BT_STR_SVC_SPP_D  \
-       _("IDS_BT_BODY_THIS_IS_USED_TO_CONNECT_TO_OTHER_BLUETOOTH_DEVICES_VIA_A_VIRTUAL_SERIAL_PORT")
-
-#define BT_STR_CONNECTION_EXISTS \
-       _("IDS_BT_POP_FAILED_TO_CONNECT_HEADSET_OTHER_DEVICE_REFUSED_CONNECTION")
-
-#define BT_STR_VISIBLE_TO_ALL_NEARBY _("IDS_ST_BODY_VISIBLE_TO_ALL_NEARBY_BLUETOOTH_DEVICES")
-#define BT_STR_ONLY_VISIBLE_TO_PAIRED_DEVICES _("IDS_BT_SBODY_ONLY_VISIBLE_TO_PAIRED_BLUETOOTH_DEVICES_ABB")
-#define BT_STR_VISIBLE _("IDS_BT_POP_VISIBILITY_TIMEOUT")
-#define BT_STR_TWO_MINUTES _("IDS_BT_BODY_2_MINUTES")
-#define BT_STR_UNPAIR _("IDS_BT_OPT_UNPAIR")
-#define BT_STR_CONNECTION_OPTIONS _("IDS_BT_BODY_CONNECTION_OPTIONS")
-#define BT_STR_CALL_AUDIO _("IDS_BT_BODY_CALL_AUDIO")
-#define BT_STR_MEDIA_AUDIO _("IDS_BT_BODY_MEDIA_AUDIO")
-#define BT_STR_PS_REMAINING _("IDS_BT_BODY_PS_REMAINING")
-#define BT_STR_PSD_PSD_REMAINING _("IDS_BT_MBODY_P1SD_CP2SD_REMAINING")
-#define BT_STR_TAP_TO_CONNECT _("IDS_BT_BODY_TAP_TO_CONNECT")
-#define BT_STR_TAP_TO_DISCONNECT _("IDS_BT_BODY_TAP_TO_DISCONNECT")
-#define BT_STR_AVAILABLE_DEVICES _("IDS_BT_BODY_AVAILABLE_DEVICES")
-#define BT_STR_FIVE_MINUTES _("IDS_BT_BODY_5_MINUTES")
-#define BT_STR_ONE_HOUR _("IDS_BT_BODY_1_HOUR")
-#define BT_STR_DISCONNECTING _("IDS_BT_BODY_DISCONNECTING")
-#define BT_STR_END_CONNECTION _("IDS_WMGR_POP_THIS_WILL_END_YOUR_CONNECTION_WITH_PS")
-#define BT_STR_DISCONNECT_P_FROM_THE_P_CONNECTION \
-               _("IDS_BT_BODY_DISCONNECT_P2SS_FROM_THE_P1SS_CONNECTION_Q")
-#define BT_STR_DISCONNECT_Q _("IDS_BT_POP_DISCONNECT")
-#define BT_STR_DETAILS _("IDS_BT_BODY_DETAILS")
-#define BT_STR_INPUT_DEVICE _("IDS_BT_BODY_INPUT_DEVICE")
-#define BT_STR_NO_DEVICE_FOUND _("IDS_BT_BODY_NO_DEVICES_FOUND_ABB")
-#define BT_STR_PAIRED _("IDS_BT_BODY_PAIRED")
-#define BT_STR_SEARCHING_SERVICES _("IDS_BT_POP_SEARCHING_SERVICES_ING")
-#define BT_STR_RENAME_DEVICE_TITLE _("IDS_ST_HEADER_RENAME_DEVICE")
-#define BT_STR_RENAME_DEVICE_LABEL \
-       _("IDS_BT_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_IN_THE_NEARBY_DEVICES_LIST_AND_VIA_BLUETOOTH_AND_OTHER_METHODS")
-#define BT_STR_BLUETOOTH_ERROR _("IDS_BT_HEADER_BLUETOOTH_ERROR_ABB")
-#define BT_STR_MAX_CHARACTER_REACHED _("IDS_CLOG_POP_MAXIMUM_NUMBER_OF_CHARACTERS_HPD_REACHED")
-#define BT_STR_NAME_IN_USE _("IDS_YSM_POP_THIS_NAME_IS_ALREADY_IN_USE_NENTER_ANOTHER_NAME")
-#define BT_STR_BLUETOOTH_TETHERING_CONNECTION_ERROR _("IDS_MOBILEAP_POP_UNABLE_TO_USE_BLUETOOTH_TETHERING_WHILE_CONNECTED_TO_WI_FI_NETWORK")
-
-/* We need to change this design ID */
-#define BT_STR_INTERNET_ACCESS _("IDS_BT_BODY_INTERNET_ACCESS_ABB2")
-
-/* System string */
-#define BT_STR_SEARCH _("IDS_BT_OPT_SEARCH")
-#define BT_STR_STOP _("IDS_BT_SK4_STOP")
-#define BT_STR_DONE _("IDS_BR_SK_DONE")
-#define BT_STR_OK _("IDS_BT_BUTTON_OK")
-#define BT_STR_CANCEL _("IDS_BR_SK_CANCEL")
-#define BT_STR_RENAME _("IDS_BT_OPT_RENAME")
-#define BT_STR_NO _("IDS_BR_SK_NO")
-#define BT_STR_BLUETOOTH _("IDS_BT_HEADER_BLUETOOTH")
-#define BT_STR_LOW_BATTERY _("IDS_ST_BODY_LEDOT_LOW_BATTERY")
-#define BT_STR_OFF _("IDS_BT_BUTTON_OFF")
-#define BT_STR_PHONE _("IDS_BT_OPT_PLAYVIAPHONE")
-
-#define BT_STR_RETRY _("IDS_ST_BUTTON_RETRY")
-#define BT_STR_INCORRECT_PIN_MESSAGE _("IDS_BT_POP_AN_INCORRECT_PIN_HAS_BEEN_ENTERED_TRY_AGAIN")
-#define BT_STR_UNABLE_TO_PAIR_WITH_PS _("IDS_BT_POP_UNABLE_TO_PAIR_WITH_PS")
-#define BT_STR_UNABLE_TO_CONNECT_TO_PS _("IDS_BT_POP_UNABLE_TO_CONNECT_TO_PS")
-
-#define BT_STR_CONNECTING _("IDS_BT_SBODY_CONNECTING_ING")
-#define BT_STR_BLUETOOTH_HELP _("IDS_BT_OPT_HELP")
-#define BT_STR_BLUETOOTH_CLOSE _("IDS_CAM_SK_CLOSE")
-#define BT_STR_MORE _("IDS_BT_BUTTON_MORE")
-
-/* Below needs to be added to PO files for use in bt-syspopup */
-#define BT_STR_RECEIVE_PS_FROM_PS_Q _("IDS_BT_POP_RECEIVE_PS_FROM_PS_Q?")
-#define BT_STR_OVERWRITE_FILE_Q _("IDS_BT_POP_PS_ALREADY_EXISTS_OVERWRITE_Q")
-#define BT_STR_PASSKEY_MATCH_Q _("IDS_BT_POP_MATCH_PASSKEYS_ON_PS_Q?")
-#define BT_STR_ENTER_PS_ON_PS_TO_PAIR \
-       _("IDS_BT_BODY_ENTER_P1SS_ON_P2SS_TO_PAIR_THEN_TAP_RETURN_OR_ENTER")
-
-#define BT_STR_RECEIVE_FILE_FROM_PS_Q \
-       _("IDS_BT_POP_RECEIVE_FILE_FROM_PS_Q")
-
-#define BT_STR_BLUETOOTH_PAIRING_REQUEST \
-       _("IDS_BT_HEADER_BLUETOOTH_PAIRING_REQUEST")
-
-#define BT_STR_SHOW_PASSWORD \
-       _("IDS_BT_BODY_SHOW_PASSWORD")
-
-/* Below needs to be added to PO files for use in bluetooth-share-ui */
-#define BT_STR_SHARING_FN  _("IDS_BT_POP_SHARING_ING")
-
-/* Below needs to be added to PO files for use in bluetooth-share */
-#define BT_STR_FILE_EXSIST_MSG _("IDS_BT_POP_PS_ALREADY_EXISTS_OVERWRITE_Q")
-#define BT_STR_FILE_DELETE_AUTHORIZE_MSG       _("Delete %s by %s ?")
-#define BT_STR_SENDING _("IDS_BT_POP_SENDING_ING")
-#define BT_STR_RECEIVING _("IDS_BT_POP_RECEIVING")
-#define BT_STR_MEMORY_FULL _("IDS_BT_POP_MEMORYFULL")
-
-/* Below needs to be added to PO files for use in beat-bluetooth */
-#define BT_STR_BLUETOOTH_ON            _("IDS_BT_POP_ACTIVATED")
-#define BT_STR_BLUETOOTH_AVAILABLE     _("IDS_BT_BODY_BLUETOOTH_AVAILABLE")
-
-/* String access info */
-#define BT_STR_DOUBLE_TAP_RENAME _("Double Tap to rename")
-#define BT_STR_DOUBLE_TAP_UNPAIR _("Double Tap to unpair device")
-#define BT_STR_RADIO_BUTTON _("IDS_TPLATFORM_BODY_RADIO_BUTTON_T_TTS")
-#define BT_STR_RADIO_SELECTED _("IDS_TPLATFORM_BODY_SELECTED_T_TTS")
-#define BT_STR_RADIO_UNSELECTED _("IDS_TPLATFORM_BODY_NOT_SELECTED_T_TTS")
-#define BT_STR_EXP_LIST _("Expandable list")
-#define BT_STR_EXP_LIST_OPEN _("IDS_ST_BODY_DOUBLE_TAP_TO_OPEN_THE_LIST_T_TTS")
-#define BT_STR_EXP_LIST_CLOSE _("IDS_ST_BODY_DOUBLE_TAP_TO_CLOSE_THE_LIST_T_TTS")
-#define BT_STR_ON_OFF_BUTTON _("IDS_TPLATFORM_BODY_ON_OFF_BUTTON_T_TTS")
-#define BT_STR_MORE_BUTTON _("More button")
-#define BT_STR_DOUBLE_TAP_CONNECT _("Double tap to connect")
-#define BT_STR_DOUBLE_TAP_CONNECT_D _("Double tap to connect device")
-#define BT_STR_DOUBLE_TAP_DISCONNECT_D _("Double tap to disconnect device")
-#define BT_STR_CAMERA _("IDS_TPLATFORM_BODY_CAMERA")
-#define BT_STR_DISPLAY _("Display device")
-#define BT_STR_KEYBOARD _("IDS_BT_OPT_KEYBOARD")
-#define BT_STR_MOUSE _("Mouse")
-#define BT_STR_GAMING_DEVICE _("IDS_ST_BODY_GAME_CONTROLLER")
-#define BT_STR_HEALTH_DEVICE _("Health device")
-#define BT_STR_COMPUTER _("IDS_BT_OPT_COMPUTER")
-#define BT_STR_LAN_ACCESS_POINT _("IDS_BT_OPT_MOBILE_AP")
-#define BT_STR_UNKNOWN _("IDS_BT_BODY_UNKNOWNDEVICE")
-#define BT_ACC_STR_GROUP_INDEX _("IDS_TPLATFORM_BODY_GROUP_INDEX")
-#define BT_STR_UNAVAILABLE _("IDS_ST_BODY_UNAVAILABLE")
-#define BT_STR_MINUTES _("IDS_BT_BODY_MINUTES")
-#define BT_STR_SECONDS _("IDS_ST_BODY_SECONDS")
-#define BT_STR_1_MINUTE _("IDS_BT_POP_1_MINUTE")
-#define BT_STR_1_SECOND _("IDS_ST_BODY_1_SECOND")
-
-/* Help */
-#define BT_STR_OPEN_PS_SETTINGS        \
-       _("IDS_HELP_BODY_OPEN_PS_SETTINGS")
-#define BT_STR_SET_UP_BLUETOOTH        \
-       _("IDS_HELP_MBODY_SET_UP_BLUETOOTH")
-#define BT_STR_SEND_PICTURES_VIA_BLUETOOTH     \
-       _("IDS_HELP_HEADER_SEND_PICTURES_VIA_BLUETOOTH")
-#define BT_STR_OPEN_PS_GALLERY         \
-       _("IDS_HELP_BODY_OPEN_PS_GALLERY")
-#define BT_STR_SELECT_THE_PICTURE_OR_ALBUM_YOU_WANT_TO_SEND            \
-       _("IDS_HELP_BODY_SELECT_THE_PICTURE_OR_ALBUM_YOU_WANT_TO_SEND")
-#define BT_STR_TAP_THE_SHARE_BUTTON_AND_SELECT_PS_BLUETOOTH            \
-       _("IDS_HELP_BODY_TAP_THE_SHARE_BUTTON_AND_SELECT_PS_BLUETOOTH")
-#define BT_STR_SELECT_THE_DEVICE_THAT_YOU_WANT_TO_SEND_THE_IMAGE_TO            \
-       _("IDS_HELP_BODY_SELECT_THE_DEVICE_THAT_YOU_WANT_TO_SEND_THE_IMAGE_TO")
-#define BT_STR_SEND_THE_PICTURE_YOU_CAN_TRACK_ITS_PROGRESS_IN_THE_NOTIFICATION_PANEL           \
-       _("IDS_HELP_BODY_SEND_THE_PICTURE_YOU_CAN_TRACK_ITS_PROGRESS_IN_THE_NOTIFICATION_PANEL")
-#define BT_STR_MAKE_THE_DEVICE_YOU_ARE_CONNECTING_TO_VISIBLE           \
-       _("IDS_HELP_BODY_MAKE_THE_DEVICE_YOU_ARE_CONNECTING_TO_VISIBLE")
-#define BT_STR_MAKE_THE_DEVICE_YOU_ARE_CONNECTING_TO_VISIBLE_THEN_TAP_SCAN             \
-       _("IDS_HELP_BODY_MAKE_THE_DEVICE_YOU_ARE_CONNECTING_TO_VISIBLE_THEN_TAP_SCAN")
-#define BT_STR_TOGGLE_THE_BUTTON_AND_TAP_SCAN_TO_TURN_ON_BLUETOOTH_AND_SCAN_FOR_DEVICES                \
-       _("IDS_HELP_BODY_TOGGLE_THE_BUTTON_AND_TAP_SCAN_TO_TURN_ON_BLUETOOTH_AND_SCAN_FOR_DEVICES")
-#define BT_STR_SELECT_PS_BLUETOOTH             \
-       _("IDS_HELP_BODY_SELECT_PS_BLUETOOTH")
-#define BT_STR_SELECT_THE_DEVICE_YOU_WANT_TO_CONNECT_TO_FROM_LIST              \
-       _("IDS_HELP_BODY_SELECT_THE_DEVICE_YOU_WANT_TO_CONNECT_TO_FROM_LIST")
-#define BT_STR_TAP_THE_DEVICE_YOU_WANT_TO_PAIR_WITH_OR_CONNECT_TO_IF_THE_DEVICE_IS_NOT_IN_THE_LIST_MAKE_SURE_IT_IS_VISIBLE_THEN_TAP_SCAN               \
-       _("IDS_HELP_BODY_TAP_THE_DEVICE_YOU_WANT_TO_PAIR_WITH_OR_CONNECT_TO_IF_THE_DEVICE_IS_NOT_IN_THE_LIST_MAKE_SURE_IT_IS_VISIBLE_THEN_TAP_SCAN")
-#define BT_STR_PAIRED_WITH_OR_CONNECTED_TO_SELECTED_DEVICE_SUCCESSFULLY_TAP_THE_CONFIGURATION_ICON_TO_CONFIGURE_THE_DEVICE_PROFILE             \
-       _("IDS_HELP_POP_PAIRED_WITH_OR_CONNECTED_TO_SELECTED_DEVICE_SUCCESSFULLY_TAP_THE_CONFIGURATION_ICON_TO_CONFIGURE_THE_DEVICE_PROFILE")
-#define BT_STR_YOUVE_COMPLETED_THE_STEP_BY_STEP_GUIDE_RETURN_TO_HELP           \
-       _("IDS_HELP_POP_YOUVE_COMPLETED_THE_STEP_BY_STEP_GUIDE_RETURN_TO_HELP")
-#define BT_STR_TUTORIAL_COMPLETED              \
-       _("IDS_HELP_POP_TUTORIAL_COMPLETE")
-#define BT_STR_SCANNING_DEVICES_ING            \
-       _("IDS_PB_MBODY_SCANNING_DEVICES_ING")
-#define BT_STR_INVALID_ACTION_TRY_AGAIN        \
-       _("IDS_HELP_POP_INVALID_ACTION_TRY_AGAIN")
-#define BT_STR_TURN_ON_BLUETOOTH_TO_SEE_A_LIST_OF_AVAILABLE_DEVICES    \
-       _("IDS_BT_BODY_TURN_ON_BLUETOOTH_TO_SEE_A_LIST_OF_DEVICES_YOU_CAN_PAIR_WITH_OR_HAVE_ALREADY_PAIRED_WITH")
-
-#define BT_STR_MY_DEVICE _("IDS_ST_HEADER_MY_DEVICE_NAME")
-
-#define BT_STR_TURNING_ON_BLUETOOTH _("IDS_BT_BODY_TURNING_ON_BLUETOOTH_ING")
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __BT_STRING_DEFINE_H__ */
similarity index 71%
rename from packaging/contacts.h
rename to include/bt-contacts.h
index 03f28e4..9395202 100644 (file)
 *
 */
 
-#ifndef __DUMMY_CONTACTS_FOR_TV_OPTIMIZATION__
-#define __DUMMY_CONTACTS_FOR_TV_OPTIMIZATION__
+#ifndef __BT_CONTACTS_WRAPPER_H__
+#define __BT_CONTACTS_WRAPPER_H__
 
+#ifndef BT_TV_PROFILE
+#include <contacts.h>
+#else //BT_TV_PROFILE
+/* It is a mock contatct-service2 becuase TV profile have No contacts-service2.
+ * Note that even if it includes contacts - service2, the behavior is not chanaged
+ * because the code determines profile at runtime.
+ */
 typedef int* contacts_record_h;
-
 static inline void dummy_void()
-{ }
+{
+}
 static inline int dummy_int(int x)
-{ return x; }
-
+{
+       return x;
+}
 #define contacts_vcard_make_from_my_profile(a, b) dummy_void()
 #define contacts_vcard_make_from_person(a, b) dummy_void()
 #define contacts_db_get_record(x, y, z) dummy_int(0)
 #define contacts_record_destroy(a, b) dummy_void()
 #define contacts_connect() dummy_int(-1)
 static inline int contacts_disconnect()
-{ return -1; }
+{
+       return -1;
+}
 #define contacts_record_get_str_p(x, y, z) dummy_void()
 #define CONTACTS_ERROR_NONE    (0)
+#endif //BT_TV_PROFILE
 
-#endif /* __DUMMY_CONTACTS_FOR_TV_OPTIMIZATION__ */
+#endif /* __BT_CONTACTS_WRAPPER_H__ */
diff --git a/include/bt-define.h b/include/bt-define.h
new file mode 100644 (file)
index 0000000..bd54b57
--- /dev/null
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://floralicense.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.
+ *
+ */
+#pragma once
+
+#ifndef UG_MODULE_API
+#define UG_MODULE_API __attribute__ ((visibility("default")))
+#endif
+
+#ifndef PKGNAME
+#define PKGNAME "ug-setting-bluetooth-efl"
+#warning "PKGNAME is redefined"
+#endif
+
+#ifndef PREFIX
+#define PREFIX "/usr/ug/"
+#warning "PREFIX is redefined"
+#endif
+
+#ifndef LOCALEDIR
+#define LOCALEDIR PREFIX"/res/locale"
+#warning "LOCALEDIR is redefined"
+#endif
+
+#ifndef EDJDIR
+#define EDJDIR PREFIX"/res/edje/" PKGNAME
+#warning "EDJDIR is redefined"
+#endif
+
+#define BT_ICON_EDJ EDJDIR"/bluetooth_images.edj"
+#define BT_GENLIST_EDJ EDJDIR"/bluetooth_genlist.edj"
+#define BT_COMMON_MAIN_LAYOUT_EDJ EDJDIR"/main_layout.edj"
similarity index 98%
rename from emulator/include/bt-resource.h
rename to include/bt-resource.h
index f8a2eea..3e4d394 100644 (file)
@@ -28,8 +28,6 @@
 extern "C" {
 #endif
 
-#include "bt-main-ug.h"
-
 /* Define icons */
 #define BT_ICON_UNKNOWN "buluetooth_Device_type_icon_unknown.png"
 #define BT_ICON_PHONE "buluetooth_Device_type_icon_mobilephone.png"
index 82ef17a..2907850 100644 (file)
@@ -2,22 +2,17 @@
 # should anchor any reverse-dependencies
 %global __provides_exclude_from ^(.*\\.emulator)$
 
-%define _optdir        /opt
-%define _usrdir        /usr
-%define _ugdir %{_usrdir}/ug
-
 Name:       ug-bluetooth-efl
 Summary:    UI gadget about the bluetooth
-Version:    0.5.4
-Release:    1
-Group:      App/Network
+Version:    0.5.5
+Release:    0
+Group:      Applications/Network
 License:    Flora-1.1
 Source0:    %{name}-%{version}.tar.gz
-Requires(post): vconf
-Requires(post): coreutils
+Source1001: %{name}.manifest
+
 BuildRequires: cmake
 BuildRequires: edje-tools
-BuildRequires: pkgconfig(edje)
 BuildRequires: gettext-tools
 BuildRequires: pkgconfig(elementary)
 BuildRequires: pkgconfig(efl-extension)
@@ -34,8 +29,8 @@ BuildRequires: pkgconfig(appcore-efl)
 BuildRequires: pkgconfig(syspopup-caller)
 BuildRequires: pkgconfig(capi-network-bluetooth)
 BuildRequires: pkgconfig(capi-network-connection)
-BuildRequires: pkgconfig(capi-system-device)
 BuildRequires: pkgconfig(capi-system-info)
+BuildRequires: pkgconfig(capi-system-device)
 BuildRequires: pkgconfig(motion)
 BuildRequires: pkgconfig(capi-appfw-application)
 BuildRequires: pkgconfig(notification)
@@ -50,10 +45,7 @@ BuildRequires: pkgconfig(dpm)
 %if "%{?profile}" != "tv"
 BuildRequires: pkgconfig(contacts-service2)
 %else
-# Dummy contacts for TV product optimization.
-# Note that even if it includes contacts-service2, the behavior is not chanaged
-# because the code determines profile at runtime.
-Source1:      contacts.h
+%define bt_TV on
 %endif
 
 %description
@@ -62,121 +54,68 @@ UI gadget about the bluetooth
 %ifarch %{ix86} x86_64
 %package extension-emulator
 Summary:    UI gadget about the bluetooth for emulator
-Requires:   %{name} = %{version}-%{release}
+Requires:      %{name} = %{version}
+
 %description extension-emulator
 UI gadget about the bluetooth for emulator
-%endif // ifarch %{ix86} x86_64
+%define bt_emul        on
+%endif
+
+%define _ugdir %{_prefix}/ug
+%define prj_name ug-setting-bluetooth-efl
 
 %prep
 %setup -q
+cp %{SOURCE1001} ./%{name}.manifest
 
 %build
-# TV profile does not have contacts-service2.
-# Do not build for unified environment if it is TV.
-# ==> The usage of "profile" in this spec file is allowed only for excluding TV profile
-#   from unified building.
-%if "%{?profile}" == "tv"
-cp %SOURCE1 standard/include/contacts.h
-%endif
-
-LDFLAGS="$LDFLAGS -Wl,-z -Wl,nodelete"
-
-export CFLAGS_BASE="${CFLAGS}"
-export CXXFLAGS_BASE="${CXXFLAGS}"
-export FFLAGS_BASE="${FFLAGS}"
+%cmake . -DCMAKE_VERBOSE_MAKEFILE=OFF \
+       -DCMAKE_INSTALL_PREFIX:PATH=%{_ugdir} \
+       -DLIB_INSTALL_DIR:PATH=%{_ugdir}/lib \
+       -DTV_PROFILE=%{?bt_TV:1}%{!?bt_TV:0} \
+       -DBUILD_EMUL=%{?bt_emul:1}%{!?bt_emul:0}
 
-# Uncomment to disable BT_HOG of mobile. (refer to the end of standard/include/bt-util.h)
-# Without TIZEN_FEATURE_DISBALE_BT_HOG, BT_HOG is enabled for mobile.
-#export CFLAGS+=" -DTIZEN_FEATURE_DISABLE_BT_HOG"
-
-# extension-emulator
-%ifarch %{ix86} x86_64
-export CFLAGS="${CFLAGS_BASE} -DTIZEN_TEST_EMUL"
-export CXXFLAGS="${CXXFLAGS_BASE} -DTIZEN_TEST_EMUL"
-export FFLAGS="${FFLAGS_BASE} -DTIZEN_TEST_EMUL"
-
-mkdir -p build_emulator
-pushd build_emulator
-# TV profile does not have contacts-service2.
-# Do not build for unified environment if it is TV.
-# ==> The usage of "profile" in this spec file is allowed only for excluding TV profile
-#   from unified building.
-%if "%{?profile}" != "tv"
-%cmake .. -DCMAKE_INSTALL_PREFIX=%{_ugdir}/
-%else
-%cmake .. -DTIZEN_WITHOUT_CONTACTS="1" -DCMAKE_INSTALL_PREFIX=%{_ugdir}/
-%endif
-popd
-%endif // ifarch %{ix86} x86_64
-
-# non-emulator
-export CFLAGS="${CFLAGS_BASE} -DTIZEN_DEBUG_ENABLE -DTIZEN_FEATURE_DISABLE_BT_HOG"
-export CXXFLAGS="${CXXFLAGS_BASE} -DTIZEN_DEBUG_ENABLE -DTIZEN_FEATURE_DISABLE_BT_HOG"
-export FFLAGS="${FFLAGS_BASE} -DTIZEN_DEBUG_ENABLE -DTIZEN_FEATURE_DISABLE_BT_HOG"
-
-# TV profile does not have contacts-service2.
-# Do not build for unified environment if it is TV.
-# ==> The usage of "profile" in this spec file is allowed only for excluding TV profile
-#   from unified building.
-%if "%{?profile}" != "tv"
-%cmake . -DCMAKE_INSTALL_PREFIX=%{_ugdir}/
-%else
-%cmake . -DTIZEN_WITHOUT_CONTACTS="1" -DCMAKE_INSTALL_PREFIX=%{_ugdir}/
-%endif
-
-make %{?jobs:-j%jobs}
+make %{?_smp_mflags}
 
 %post
-mkdir -p /usr/ug/bin/
-ln -sf /usr/bin/ug-client /usr/ug/bin/setting-bluetooth-efl
-ln -sf /usr/bin/ug-client /usr/ug/bin/setting-bluetooth-efl-single
+mkdir -p %{_ugdir}/bin/
+ln -sf /usr/bin/ug-client %{_ugdir}/bin/setting-bluetooth-efl
+ln -sf /usr/bin/ug-client %{_ugdir}/bin/setting-bluetooth-efl-single
 
 %install
 rm -rf %{buildroot}
-
-# extension-emulator
-%ifarch %{ix86} x86_64
-pushd build_emulator
-%make_install
-popd
-pushd %{buildroot}%{_ugdir}/lib/
-for FILE in libug-setting-bluetooth-efl.so*; do mv "${FILE}" "${FILE}.emulator"; done
-popd
-%endif // ifarch %{ix86} x86_64
-
-# non-emulator
 %make_install
+rm -f %{buildroot}%{_ugdir}/lib/libemul%{prj_name}.so
 
 %files
-%manifest ug-bluetooth-efl.manifest
-%license LICENSE
-%defattr(-,root,root,-)
-%{_ugdir}/res/help/*
-%{_ugdir}/res/edje/ug-setting-bluetooth-efl/*.edj
+%manifest %{name}.manifest
+%{_ugdir}/lib/lib%{prj_name}.so
+%{_ugdir}/lib/lib%{prj_name}.so.*
+%{_ugdir}/res/help/%{prj_name}/*
+%{_ugdir}/res/images/%{prj_name}/*
+%{_ugdir}/res/edje/%{prj_name}/*.edj
 %{_ugdir}/res/locale/*/LC_MESSAGES/*
-%{_ugdir}/res/images/ug-setting-bluetooth-efl/*
-%{_ugdir}/lib/libug-setting-bluetooth-efl.so
-%{_usrdir}/share/packages/ug-bluetooth-efl.xml
-%{_usrdir}/share/icons/default/small/ug-bluetooth-efl.png
-%exclude %{_ugdir}/res/tables/ug-setting-bluetooth-efl/ug-bluetooth-efl_ChangeableColorTable.xml
-%exclude %{_ugdir}/res/tables/ug-setting-bluetooth-efl/ug-bluetooth-efl_FontInfoTable.xml
-%{_ugdir}/lib/libug-setting-bluetooth-efl.so.*
-%exclude %{_ugdir}/lib/libug-setting-bluetooth-efl.so.emulator
-%exclude %{_ugdir}/lib/libug-setting-bluetooth-efl.so.*.emulator
+%{_datadir}/packages/%{name}.xml
+%{_datadir}/icons/default/small/%{name}.png
+#%%{_ugdir}/res/tables/%{prj_name}/%{name}*.xml
+%license LICENSE
 
 %ifarch %{ix86} x86_64
+
 %post  extension-emulator
-pushd %{_ugdir}/lib/
-for FILE in libug-setting-bluetooth-efl.so*.emulator; do mv "${FILE}" "${FILE%.emulator}"; done
-popd
-/sbin/ldconfig
+pushd %{_ugdir}/lib
+rename libug originug %{_ugdir}/lib/lib%{prj_name}.so.*
+rename libemulug libug %{_ugdir}/lib/libemul%{prj_name}.so.*
+
 %preun extension-emulator
-pushd %{_ugdir}/lib/
-for FILE in libug-setting-bluetooth-efl.so*; do mv "${FILE}" "${FILE}.emulator"; done
-popd
+rename libug libemulug %{_ugdir}/lib/lib%{prj_name}.so.*
+rename originug libug %{_ugdir}/lib/origin%{prj_name}.so.*
+
 %postun extension-emulator -p /sbin/ldconfig
+
 %files extension-emulator
-%manifest ug-bluetooth-efl.manifest
-%{_ugdir}/lib/libug-setting-bluetooth-efl.so.emulator
-%{_ugdir}/lib/libug-setting-bluetooth-efl.so.*.emulator
-%endif // ifarch %{ix86} x86_64
+%manifest %{name}.manifest
+%{_ugdir}/lib/libemul%{prj_name}.so.*
+%license LICENSE
+
+%endif //ifarch %{ix86} x86_64
index 4e912cf..72beabc 100644 (file)
@@ -1,32 +1,10 @@
-SET(TARGET "edje")
-
-ADD_CUSTOM_TARGET(bluetooth_images.edj
-                COMMAND edje_cc -id ${CMAKE_CURRENT_SOURCE_DIR}/images/WVGA
-                       ${CMAKE_CURRENT_SOURCE_DIR}/${TARGET}/bluetooth_images.edc
-                       ${CMAKE_CURRENT_SOURCE_DIR}/${TARGET}/bluetooth_images.edj
-               DEPENDS
-                       ${CMAKE_CURRENT_SOURCE_DIR}/${TARGET}/bluetooth_images.edc
-               )
-ADD_CUSTOM_TARGET(bluetooth_genlist.edj
-                COMMAND edje_cc -id ${CMAKE_CURRENT_SOURCE_DIR}/images/WVGA
-                        ${CMAKE_CURRENT_SOURCE_DIR}/${TARGET}/bluetooth_genlist.edc
-                        ${CMAKE_CURRENT_SOURCE_DIR}/${TARGET}/bluetooth_genlist.edj
-                DEPENDS
-                        ${CMAKE_CURRENT_SOURCE_DIR}/${TARGET}/bluetooth_genlist.edc
-               )
-
-ADD_CUSTOM_TARGET(main_layout.edj
-                COMMAND edje_cc -id ${CMAKE_CURRENT_SOURCE_DIR}/images/WVGA
-                        ${CMAKE_CURRENT_SOURCE_DIR}/${TARGET}/main_layout.edc
-                        ${CMAKE_CURRENT_SOURCE_DIR}/${TARGET}/main_layout.edj
-                DEPENDS
-                        ${CMAKE_CURRENT_SOURCE_DIR}/${TARGET}/main_layout.edc
-                )
-
-ADD_DEPENDENCIES(${PROJECT_NAME} bluetooth_images.edj)
-ADD_DEPENDENCIES(${PROJECT_NAME} bluetooth_genlist.edj)
-ADD_DEPENDENCIES(${PROJECT_NAME} main_layout.edj)
-
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${TARGET}/bluetooth_images.edj DESTINATION ${EDJDIR})
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${TARGET}/bluetooth_genlist.edj DESTINATION ${EDJDIR})
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${TARGET}/main_layout.edj DESTINATION ${EDJDIR})
+INSTALL(DIRECTORY images/ DESTINATION ${IMAGEDIR}
+       FILES_MATCHING PATTERN "*.png" PATTERN "*.jpg")
+INSTALL(DIRECTORY help/ DESTINATION ${HELPDIR} FILES_MATCHING PATTERN "*help_*")
+#INSTALL(DIRECTORY tables/ DESTINATION ${TABLEDIR} FILES_MATCHING PATTERN "*.xml")
+INSTALL(FILES ug-bluetooth-efl.xml DESTINATION ${SHARE_INSTALL_PREFIX}/packages/)
+INSTALL(FILES images/ug-bluetooth-efl.png
+       DESTINATION ${SHARE_INSTALL_PREFIX}/icons/default/small)
+
+ADD_SUBDIRECTORY(edje)
+ADD_SUBDIRECTORY(po)
diff --git a/res/edje/CMakeLists.txt b/res/edje/CMakeLists.txt
new file mode 100644 (file)
index 0000000..1c2f21e
--- /dev/null
@@ -0,0 +1,16 @@
+SET(EDC_DIR ${CMAKE_CURRENT_SOURCE_DIR})
+SET(IMAGE_DIR ${CMAKE_SOURCE_DIR}/res/images/WVGA)
+SET(EDC_FILES bluetooth_images.edc bluetooth_genlist.edc main_layout.edc)
+
+FOREACH(edc_file ${EDC_FILES})
+       GET_FILENAME_COMPONENT(FName ${edc_file} NAME_WE)
+       ADD_CUSTOM_TARGET(${FName}.edj
+               COMMAND edje_cc -id ${IMAGE_DIR}
+                               ${EDC_DIR}/${edc_file} ${EDC_DIR}/${FName}.edj
+               DEPENDS ${EDC_DIR}/${edc_file}
+       )
+       ADD_DEPENDENCIES(${PROJECT_NAME} ${FName}.edj)
+ENDFOREACH()
+
+# install edc files
+INSTALL(DIRECTORY ${EDC_DIR}/ DESTINATION ${EDJDIR} FILES_MATCHING PATTERN "*.edj")
diff --git a/res/tables/HD/ug-bluetooth-efl_ChangeableColorTable.xml b/res/tables/HD/ug-bluetooth-efl_ChangeableColorTable.xml
deleted file mode 100644 (file)
index 17cc6a4..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ChangeableColorTable num="1">
-       <Theme style="Dark">
-               <ChangeableColorInfo id="ATO001" inputColor="3" hue="0" saturation="0" value="0" alpha="100" />
-       </Theme>
-       <Theme style="Light">
-               <ChangeableColorInfo id="ATO001" inputColor="3" hue="" saturation="" value="" alpha="" />
-       </Theme>
-</ChangeableColorTable>
-<ChangeableColorTable num="2">
-       <Theme style="Dark">
-               <ChangeableColorInfo id="ATO001" inputColor="3" hue="0" saturation="0" value="0" alpha="100" />
-       </Theme>
-       <Theme style="Light">
-               <ChangeableColorInfo id="ATO001" inputColor="3" hue="" saturation="" value="" alpha="" />
-       </Theme>
-</ChangeableColorTable>
-<ChangeableColorTable num="3">
-       <Theme style="Dark">
-               <ChangeableColorInfo id="ATO001" inputColor="3" hue="0" saturation="0" value="0" alpha="100" />
-       </Theme>
-       <Theme style="Light">
-               <ChangeableColorInfo id="ATO001" inputColor="3" hue="" saturation="" value="" alpha="" />
-       </Theme>
-</ChangeableColorTable>
diff --git a/res/tables/HD/ug-bluetooth-efl_FontInfoTable.xml b/res/tables/HD/ug-bluetooth-efl_FontInfoTable.xml
deleted file mode 100644 (file)
index ad5198f..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<FontInfoTable>
-       <FontInfo id="ATO001" style="L" size="42" />
-</FontInfoTable>
index 10ae30f..dc9b026 100644 (file)
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+FILE(GLOB SRCS *.c)
 
-SET(SRCS
-bt-main-ug.c
-bt-widget.c
-bt-main-view.c
-bt-profile-view.c
-bt-util.c
-bt-callback.c
-bt-ipc-handler.c
-bt-net-connection.c
-)
+SET(PKG_MODULES elementary appcore-efl ui-gadget-1 dlog vconf evas edje ecore eina aul
+       syspopup-caller capi-network-bluetooth capi-appfw-application capi-system-info
+       capi-system-device notification efl-extension glib-2.0 gio-2.0 dpm motion
+       capi-network-connection)
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
+IF(NOT TV_PROFILE)
+       SET(PKG_MODULES ${PKG_MODULES} contacts-service2)
+ENDIF()
 
-IF(TIZEN_WITHOUT_CONTACTS)
-SET(PKG_MODULES
-       elementary
-       appcore-efl
-       ui-gadget-1
-       dlog
-       vconf
-       evas
-       edje
-       ecore
-       eina
-       aul
-       syspopup-caller
-       gobject-2.0
-       motion
-       capi-network-bluetooth
-       capi-network-connection
-       capi-system-device
-       capi-appfw-application
-       capi-system-info
-       notification
-       efl-extension
-       glib-2.0
-       gio-2.0
-       dpm
-)
-ELSE(TIZEN_WITHOUT_CONTACTS)
-SET(PKG_MODULES
-       elementary
-       appcore-efl
-       ui-gadget-1
-       dlog
-       vconf
-       evas
-       edje
-       ecore
-       eina
-       aul
-       syspopup-caller
-       gobject-2.0
-       motion
-       capi-network-bluetooth
-       capi-network-connection
-       capi-system-device
-       capi-appfw-application
-       capi-system-info
-       notification
-       efl-extension
-       glib-2.0
-       gio-2.0
-       dpm
-       contacts-service2
-)
-ENDIF(TIZEN_WITHOUT_CONTACTS)
-
-INCLUDE(FindPkgConfig)
 pkg_check_modules(pkgs REQUIRED ${PKG_MODULES})
-
-FOREACH(flag ${pkgs_CFLAGS})
-       SET(EXTRA_CXXFLAGS "${EXTRA_CXXFLAGS} ${flag}")
-ENDFOREACH(flag)
-
-SET(GC_SECTIONS_FLAGS "-fdata-sections -ffunction-sections -Wl,--gc-sections")
-SET(EXTRA_CXXFLAGS "${EXTRA_CXXFLAGS} -fvisibility=hidden -Wall")
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CXXFLAGS} ${GC_SECTIONS_FLAGS}")
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_CXX_FLAGS} ${GC_SECTIONS_FLAGS} -fPIC -Werror")
-
-ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
-ADD_DEFINITIONS("-DEDJDIR=\"${EDJDIR}\"")
-ADD_DEFINITIONS("-DRESDIR=\"${RESDIR}\"")
-ADD_DEFINITIONS("-DIMAGEDIR=\"${IMAGEDIR}\"")
-ADD_DEFINITIONS("-DBT_USE_PLATFORM_DBG")
-#ADD_DEFINITIONS("-D__TIZEN_OPEN__")
-
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/res/ug-bluetooth-efl.xml DESTINATION /usr/share/packages/)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/res/images/ug-bluetooth-efl.png DESTINATION /usr/share/icons/default/small)
+INCLUDE_DIRECTORIES(${pkgs_INCLUDE_DIRS})
+LINK_DIRECTORIES(${pkgs_LIBRARY_DIRS})
 
 ADD_LIBRARY(${PROJECT_NAME} SHARED ${SRCS})
-SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES SOVERSION 0.1.0)
-TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS})
-
-INSTALL(TARGETS ${PROJECT_NAME} DESTINATION /usr/ug/lib)
+SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES SOVERSION ${VERSION})
+TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LIBRARIES})
 
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/res/images/ug-bluetooth-efl.png DESTINATION ${IMAGEDIR})
-INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/res/images/ DESTINATION ${IMAGEDIR} FILES_MATCHING PATTERN "*.png")
-INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/res/images/ DESTINATION ${IMAGEDIR} FILES_MATCHING PATTERN "*.jpg")
-INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/res/help/ DESTINATION ${HELPDIR} FILES_MATCHING PATTERN "*help_*")
-INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/res/tables/WVGA/ DESTINATION ${TABLEDIR} FILES_MATCHING PATTERN "*.xml")
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR})
similarity index 90%
rename from standard/include/bt-main-ug.h
rename to standard/bt-main-ug.h
index 51a0510..906413f 100644 (file)
@@ -38,40 +38,23 @@ extern "C" {
 #include <bundle.h>
 #include <gio/gio.h>
 
+#include "bt-define.h"
 #include "bt-type-define.h"
 #include "bt-profile-view.h"
 
-#ifndef UG_MODULE_API
-#define UG_MODULE_API __attribute__ ((visibility("default")))
-#endif
-
-#define PKGNAME "ug-setting-bluetooth-efl"
-
-#ifdef PREFIX
-#undef PREFIX
-#endif
-#define PREFIX "/usr/ug/"
-
-#define LOCALEDIR PREFIX"/res/locale"
-
-#define BT_EDJ_PATH PREFIX"/res/edje/ug-setting-bluetooth-efl"
-
 #define _EDJ(o)                        elm_layout_edje_get(o)
-#define BT_ICON_EDJ BT_EDJ_PATH"/bluetooth_images.edj"
-#define BT_GENLIST_EDJ BT_EDJ_PATH"/bluetooth_genlist.edj"
-#define BT_COMMON_MAIN_LAYOUT_EDJ BT_EDJ_PATH"/main_layout.edj"
 
 #ifdef _
 #undef _
 #endif
-#define _(s)                   dgettext(PKGNAME, s)
+#define _(s) dgettext(PKGNAME, s)
 
-#define dgettext_noop(s)       (s)
+#define dgettext_noop(s) (s)
 
 #ifdef N_
 #undef N_
 #endif
-#define N_(s)                  dgettext_noop(s)
+#define N_(s) dgettext_noop(s)
 
 #define BT_UG_VCONF_PRINTSETTING               "memory/bluetooth/printsetting"
 
index 61430e8..266e98d 100644 (file)
 #include <aul.h>
 #include <notification.h>
 #include <dpm/restriction.h>
-
-// #ifndef TIZEN_PROFILE_TV
-#include <contacts.h>
 #include <dirent.h>
 #include <fcntl.h>
-// #endif
 
 #include <stdlib.h>
 #include <system_info.h>
 
+#include "bt-contacts.h"
 #include "bt-main-ug.h"
 #include "bt-util.h"
 #include "bt-debug.h"
similarity index 97%
rename from standard/include/bt-util.h
rename to standard/bt-util.h
index 21593e3..84452e5 100644 (file)
@@ -131,12 +131,8 @@ extern tizen_profile_t _get_tizen_profile();
 #define TIZEN_PROFILE_TV ((_get_tizen_profile()) == _PROFILE_TV)
 #define TIZEN_HID ((_get_tizen_profile()) & (_PROFILE_MOBILE | _PROFILE_COMMON))
 #define TIZEN_COMMON ((_get_tizen_profile()) == _PROFILE_COMMON)
-
-#ifdef TIZEN_FEATURE_DISABLE_BT_HOG
+//#define TIZEN_FEATURE_BT_HOG ((_get_tizen_profile() == _PROFILE_MOBILE))
 #define TIZEN_FEATURE_BT_HOG (0)
-#else
-#define TIZEN_FEATURE_BT_HOG ((_get_tizen_profile() == _PROFILE_MOBILE))
-#endif
 
 #ifdef __cplusplus
 }
diff --git a/standard/include/bt-resource.h b/standard/include/bt-resource.h
deleted file mode 100644 (file)
index f8a2eea..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-* ug-bluetooth-efl
-*
-* Copyright 2012 Samsung Electronics Co., Ltd
-*
-* Contact: Hocheol Seo <hocheol.seo@samsung.com>
-*           GirishAshok Joshi <girish.joshi@samsung.com>
-*           DoHyun Pyun <dh79.pyun@samsung.com>
-*
-* Licensed under the Flora License, Version 1.1 (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 __BT_RESOURCE_H
-#define __BT_RESOURCE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "bt-main-ug.h"
-
-/* Define icons */
-#define BT_ICON_UNKNOWN "buluetooth_Device_type_icon_unknown.png"
-#define BT_ICON_PHONE "buluetooth_Device_type_icon_mobilephone.png"
-#define BT_ICON_HEADSET "buluetooth_Device_type_icon_headset.png"
-#define BT_ICON_HEADPHONE "buluetooth_Device_type_icon_headphone.png"
-#define BT_ICON_PC "buluetooth_Device_type_icon_computer.png"
-#define BT_ICON_KEYBOARD "buluetooth_Device_type_icon_keyboard.png"
-#define BT_ICON_MOUSE "buluetooth_Device_type_icon_mouse.png"
-#define BT_ICON_PRINTER "buluetooth_Device_type_icon_printer.png"
-#define BT_ICON_HEALTH "bt_device_Medical.png"
-#define BT_ICON_NETWORK "buluetooth_Device_type_icon_network_infrastructure.png"
-#define BT_ICON_GAMING "buluetooth_Device_type_icon_gaming.png"
-#define BT_ICON_DISPLAY "buluetooth_Device_type_icon_display.png"
-#define BT_ICON_CAMERA "buluetooth_Device_type_icon_camera.png"
-#define BT_ICON_WATCH "buluetooth_Device_type_icon_wrist.png"
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __BT_RESOURCE_H */