From 79359d1ce0c59ca1fecd93ce4a0cddb5774ec065 Mon Sep 17 00:00:00 2001 From: "jk7744.park" Date: Wed, 24 Feb 2016 18:28:16 +0900 Subject: [PATCH] Tizen 2.4.0 rev3 SDK Public Release --- doc/attach_panel_doc.h | 34 ++++++++++++++++++++-------------- include/attach_panel.h | 35 +++++++++++++++-------------------- src/attach_panel.c | 10 ---------- 3 files changed, 35 insertions(+), 44 deletions(-) diff --git a/doc/attach_panel_doc.h b/doc/attach_panel_doc.h index b0aaff4..cc7da6d 100644 --- a/doc/attach_panel_doc.h +++ b/doc/attach_panel_doc.h @@ -18,32 +18,38 @@ #define __TIZEN_ATTACH_PANEL_DOC_H__ /** + * @defgroup CAPI_PANEL_MODULE Panel + * @brief The Panel module provides APIs to choose data or apps easily. * @ingroup CAPI_APPLICATION_FRAMEWORK + * + * @section CAPI_PANEL_MODULE_OVERVIEW Overview + * + * + * + * + * + *
APIDescription
@ref CAPI_PANEL_ATTACH_MODULEProvide functions to attach images, voices, contacts, events and files.
@ref CAPI_PANEL_STICKER_MODULEProvide functions to attach stickers easily.
@ref CAPI_PANEL_SHARE_MODULEProvide functions to share data with apps.
+ * * @defgroup CAPI_PANEL_ATTACH_MODULE Attach panel - * @brief Attach panel provides functions to attach images, voices, contacts, events and files. Users can attach images, take pictures, record voice and select files to attach into the caller app + * @brief The Attach Panel provides functions to attach data easily. Users can attach images, take pictures, record voice and select files to attach into the caller app + * @ingroup CAPI_PANEL_MODULE * * @section CAPI_PANEL_ATTACH_MODULE_HEADER Required Header * \#include - * * @section CAPI_PANEL_ATTACH_MODULE_OVERVIEW Overview - * - It provides functions for adding an attach panel (attach_panel_create()) and deleting it (attach_panel_destroy()) in an app.\n - * - Content categories can be added (attach_panel_add_content_category()) or removed (attach_panel_remove_content_category()).\n - * - Dynamic configurations can be handled with (attach_panel_set_extra_data()). This is used with a content category. - * - Results can be returned into the result callback that is set (attach_panel_set_result_cb()) or unset (attach_panel_unset_result_cb()).\n - * - Events are delivered into the event callback that is set with (attach_panel_set_event_cb()) or unset with (attach_panel_unset_event_cb()).\n - * - The panel can be shown with (attach_panel_show()) and hidden with (attach_panel_hide()).\n - * - You can get the state of the panel with (attach_panel_get_visibility()).\n + * It provides functions for adding an Attach Panel (attach_panel_create()) and deleting it (attach_panel_destroy()) in an app.\n + * It is shown with (attach_panel_show()) and hiden with (attach_panel_hide()).\n + * The results can be returned into the result callback that is set (attach_panel_set_result_cb()) or unset (attach_panel_unset_result_cb()).\n + * Content categories can be added (attach_panel_add_content_category()) or removed (attach_panel_remove_content_category()).\n * * @section CAPI_PANEL_ATTACH_MODULE_FEATURE Related Features * This API is related with the following features:\n - * - %http://tizen.org/feature/camera\n - * - %http://tizen.org/feature/microphone\n - * + * - http://tizen.org/feature/camera\n + * - http://tizen.org/feature/microphone\n * It is recommended to design feature related codes in your application for reliability.\n * You can check if a device supports the related features for this API by using @ref CAPI_SYSTEM_SYSTEM_INFO_MODULE, thereby controlling the procedure of your application.\n * To ensure your application is only running on the device with specific features, please define the features in your manifest file using the manifest editor in the SDK.\n - * More details on featuring your application can be found from Feature Element. + * More details on featuring your application can be found from Feature Element. */ - #endif diff --git a/include/attach_panel.h b/include/attach_panel.h index 83e5026..fd61e2f 100644 --- a/include/attach_panel.h +++ b/include/attach_panel.h @@ -248,7 +248,7 @@ typedef enum attach_panel_error { * * @endcode */ -int attach_panel_create(Evas_Object *conformant, attach_panel_h *attach_panel); +extern int attach_panel_create(Evas_Object *conformant, attach_panel_h *attach_panel); /** * @brief Destroys the attach panel. @@ -332,22 +332,17 @@ int attach_panel_create(Evas_Object *conformant, attach_panel_h *attach_panel); * * @endcode */ -int attach_panel_destroy(attach_panel_h attach_panel); +extern int attach_panel_destroy(attach_panel_h attach_panel); /** * @brief Adds a content category in the attach panel. * @since_tizen 2.4 * @privlevel public - * @privilege %http://tizen.org/privilege/mediastorage - * @privilege %http://tizen.org/privilege/camera - * @privilege %http://tizen.org/privilege/recorder - * @privilege %http://tizen.org/privilege/appmanager.launch * @remarks The caller app has to check the return value of this function.\n * Content categories will be shown as the sequence of using @a attach_panel_add_content_category.\n * Some contents need time to load it all.\n * So, it is needed to use this before the mainloop of attach_panel_show().\n * Privileges,\n - * %http://tizen.org/privilege/mediastorage, for using ATTACH_PANEL_CONTENT_CATEGORY_IMAGE or ATTACH_PANEL_CONTENT_CATEGORY_CAMERA\n * %http://tizen.org/privilege/camera, for using ATTACH_PANEL_CONTENT_CATEGORY_CAMERA\n * %http://tizen.org/privilege/recorder, for using ATTACH_PANEL_CONTENT_CATEGORY_VOICE\n * %http://tizen.org/privilege/appmanager.launch, for adding content categories on the More tab\n @@ -357,7 +352,7 @@ int attach_panel_destroy(attach_panel_h attach_panel); * * @param[in] attach_panel Attach panel handler * @param[in] content_category The content_category to be added in the @a attach_panel. - * @param[in] extra_data The attach panel send some information using @a bundle. + * @param[in] The attach panel send some information using @a bundle. * @return #ATTACH_PANEL_ERROR_NONE on success, * otherwise a negative error value * @retval #ATTACH_PANEL_ERROR_NONE Successful @@ -481,7 +476,7 @@ int attach_panel_destroy(attach_panel_h attach_panel); * * @endcode */ -int attach_panel_add_content_category(attach_panel_h attach_panel, attach_panel_content_category_e content_category, bundle *extra_data); +extern int attach_panel_add_content_category(attach_panel_h attach_panel, attach_panel_content_category_e content_category, bundle *extra_data); /** * @brief Removes the content category from the attach panel. @@ -574,7 +569,7 @@ int attach_panel_add_content_category(attach_panel_h attach_panel, attach_panel_ * * @endcode */ -int attach_panel_remove_content_category(attach_panel_h attach_panel, attach_panel_content_category_e content_category); +extern int attach_panel_remove_content_category(attach_panel_h attach_panel, attach_panel_content_category_e content_category); /** * @brief Sets extra data to send to the content category using a bundle. @@ -587,7 +582,7 @@ int attach_panel_remove_content_category(attach_panel_h attach_panel, attach_pan * * @param[in] attach_panel Attach panel handler * @param[in] content_category The content_category to be set the some information in the @a attach_panel. - * @param[in] extra_data The attach panel set some information using @a bundle. + * @param[in] The attach panel set some information using @a bundle. * @return #ATTACH_PANEL_ERROR_NONE on success, * otherwise a negative error value * @retval #ATTACH_PANEL_ERROR_NONE Successful @@ -746,7 +741,7 @@ int attach_panel_remove_content_category(attach_panel_h attach_panel, attach_pan * * @endcode */ -int attach_panel_set_extra_data(attach_panel_h attach_panel, attach_panel_content_category_e content_category, bundle *extra_data); +extern int attach_panel_set_extra_data(attach_panel_h attach_panel, attach_panel_content_category_e content_category, bundle *extra_data); /** * @brief Sets the result callback that will be called when an user selects and confirms something to attach in the attach panel. @@ -874,7 +869,7 @@ int attach_panel_set_extra_data(attach_panel_h attach_panel, attach_panel_conten * * @endcode */ -int attach_panel_set_result_cb(attach_panel_h attach_panel, attach_panel_result_cb result_cb, void *user_data); +extern int attach_panel_set_result_cb(attach_panel_h attach_panel, attach_panel_result_cb result_cb, void *user_data); /** * @brief Unsets the result callback that will be called when an user selects and confirms something to attach in the attach panel. @@ -957,7 +952,7 @@ int attach_panel_set_result_cb(attach_panel_h attach_panel, attach_panel_result_ * * @endcode */ -int attach_panel_unset_result_cb(attach_panel_h attach_panel); +extern int attach_panel_unset_result_cb(attach_panel_h attach_panel); /** * @brief Sets the event callback that will be called when reserved events are published from the panel-side. @@ -968,7 +963,7 @@ int attach_panel_unset_result_cb(attach_panel_h attach_panel); * the last one is registered only. * * @param[in] attach_panel Attach panel handler - * @param[in] panel_event_cb Attach panel event callback + * @param[in] event_cb Attach panel event callback * @param[in] user_data User data * @return #ATTACH_PANEL_ERROR_NONE on success, * otherwise a negative error value @@ -1046,7 +1041,7 @@ int attach_panel_unset_result_cb(attach_panel_h attach_panel); * * @endcode */ -int attach_panel_set_event_cb(attach_panel_h attach_panel, attach_panel_event_cb panel_event_cb, void *user_data); +extern int attach_panel_set_event_cb(attach_panel_h attach_panel, attach_panel_event_cb event_cb, void *user_data); /** * @brief Unsets the event callback @@ -1107,7 +1102,7 @@ int attach_panel_set_event_cb(attach_panel_h attach_panel, attach_panel_event_cb * * @endcode */ -int attach_panel_unset_event_cb(attach_panel_h attach_panel); +extern int attach_panel_unset_event_cb(attach_panel_h attach_panel); /** * @brief Shows the attach panel, asynchronously. @@ -1228,7 +1223,7 @@ int attach_panel_unset_event_cb(attach_panel_h attach_panel); * * @endcode */ -int attach_panel_show(attach_panel_h attach_panel); +extern int attach_panel_show(attach_panel_h attach_panel); /** * @brief Hides the attach panel, asynchronously. @@ -1311,7 +1306,7 @@ int attach_panel_show(attach_panel_h attach_panel); * * @endcode */ -int attach_panel_hide(attach_panel_h attach_panel); +extern int attach_panel_hide(attach_panel_h attach_panel); /** * @brief Gets a value that indicates whether the attach_panel is visible. @@ -1403,7 +1398,7 @@ int attach_panel_hide(attach_panel_h attach_panel); * * @endcode */ -int attach_panel_get_visibility(attach_panel_h attach_panel, bool *visible); +extern int attach_panel_get_visibility(attach_panel_h attach_panel, bool *visible); /** * @} diff --git a/src/attach_panel.c b/src/attach_panel.c index 314420b..1604815 100644 --- a/src/attach_panel.c +++ b/src/attach_panel.c @@ -559,16 +559,6 @@ EXPORT_API int attach_panel_set_extra_data(attach_panel_h attach_panel, attach_p } if (innate_content_info[content_category-1].is_ug) { - if (!content_info->content) { - _D("Create ug because ug is not created yet"); - content_info->content = _ui_manager_create_content(content_info->page, content_info, attach_panel); - retv_if(!content_info->content, ATTACH_PANEL_ERROR_OUT_OF_MEMORY); - if (ATTACH_PANEL_STATE_FULL == _gesture_get_state()) { - _content_list_send_message(attach_panel->content_list, APP_CONTROL_DATA_SELECTION_MODE, SELECTION_MODE_MULTIPLE, ATTACH_PANEL_CONTENT_CATEGORY_UG); - } else { - _content_list_send_message(attach_panel->content_list, APP_CONTROL_DATA_SELECTION_MODE, SELECTION_MODE_SINGLE, ATTACH_PANEL_CONTENT_CATEGORY_UG); - } - } ret = app_control_create(&app_control); retv_if(APP_CONTROL_ERROR_NONE != ret, ATTACH_PANEL_ERROR_OUT_OF_MEMORY); -- 2.7.4