From: Jungmin Kim Date: Thu, 6 Sep 2012 03:50:07 +0000 (+0900) Subject: Disable entry point for other applications X-Git-Tag: 2.0_alpha~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7ff250d8b116c983760f4f7d1e95da8473be0aca;p=apps%2Fhome%2Fcall.git Disable entry point for other applications Patch set 2: Fixed some error Change-Id: Id6d210301dc87317c9384d74119dc329addd7b0e --- diff --git a/call-engine/core/vc-core-util.c b/call-engine/core/vc-core-util.c index 0855080..c15abec 100755 --- a/call-engine/core/vc-core-util.c +++ b/call-engine/core/vc-core-util.c @@ -837,3 +837,4 @@ void _vc_core_util_download_test_call(char *result) } } + diff --git a/packaging/org.tizen.call.spec b/packaging/org.tizen.call.spec index 6566c4d..980255a 100755 --- a/packaging/org.tizen.call.spec +++ b/packaging/org.tizen.call.spec @@ -34,6 +34,7 @@ BuildRequires: pkgconfig(minicontrol-provider) BuildRequires: pkgconfig(capi-media-sound-manager) BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(dbus-glib-1) +BuildRequires: pkgconfig(capi-system-info) BuildRequires: libug-contacts-devel BuildRequires: cmake BuildRequires: gettext-tools diff --git a/ui/CMakeLists.txt b/ui/CMakeLists.txt index da44636..3e5813c 100755 --- a/ui/CMakeLists.txt +++ b/ui/CMakeLists.txt @@ -111,6 +111,7 @@ pkg_check_modules(ui_pkgs REQUIRED minicontrol-provider dbus-1 dbus-glib-1 + capi-system-info ) diff --git a/ui/src/include/vcui-view-common.h b/ui/src/include/vcui-view-common.h index 39f8831..70aff3e 100755 --- a/ui/src/include/vcui-view-common.h +++ b/ui/src/include/vcui-view-common.h @@ -68,5 +68,6 @@ int _vcui_view_common_call_terminate_or_view_change(void); void _vcui_view_common_show_noid_image(Evas_Object *layout); void _vcui_view_common_update_mute_btn(void); - +gboolean _vcui_view_common_is_emul_bin(void); #endif + diff --git a/ui/src/vcui-view-callend.c b/ui/src/vcui-view-callend.c index 3412c58..dd237bf 100755 --- a/ui/src/vcui-view-callend.c +++ b/ui/src/vcui-view-callend.c @@ -99,18 +99,24 @@ static void __vcui_view_callend_draw_screen(Evas_Object *eo, void *data) } _vcui_create_voicecall_button(vd, call_number); - _vcui_create_videocall_button(vd, call_number); - _vcui_create_message_button(vd, call_number); + if (_vcui_view_common_is_emul_bin() == EINA_FALSE) { + _vcui_create_videocall_button(vd, call_number); + _vcui_create_message_button(vd, call_number); + } /* call name (if nothing, call number) */ if (strlen(call_name) == 0) { _vcui_show_caller_info_name(vd, call_number, EINA_FALSE); - _vcui_create_add_to_contacts_button(vd, call_number); + if (_vcui_view_common_is_emul_bin() == EINA_FALSE) { + _vcui_create_add_to_contacts_button(vd, call_number); + } } else { int ct_id = _vcui_doc_get_contact_index(call_data); _vcui_show_caller_info_name(vd, call_name, EINA_FALSE); _vcui_show_caller_info_number(vd, call_number, EINA_FALSE); - _vcui_create_view_contact_button(vd, ct_id); + if (_vcui_view_common_is_emul_bin() == EINA_FALSE) { + _vcui_create_view_contact_button(vd, ct_id); + } } _vcui_view_common_set_each_time(_vcui_doc_get_call_start_time(call_data)); } else if (ad->call_end_type == CALL_END_TYPE_CONF_CALL) { diff --git a/ui/src/vcui-view-common.c b/ui/src/vcui-view-common.c index 17e7cad..913fcfb 100755 --- a/ui/src/vcui-view-common.c +++ b/ui/src/vcui-view-common.c @@ -14,6 +14,7 @@ * limitations under the License. */ +#include #include "vcui-application.h" #include "vcui-view-common.h" @@ -392,3 +393,23 @@ void _vcui_view_common_update_mute_btn() _vcui_create_bottom_middle_button(vd); } +gboolean _vcui_view_common_is_emul_bin(void) +{ + char *model_str = NULL; + int ret = system_info_get_value_string(SYSTEM_INFO_KEY_MODEL, &model_str); + + if (ret != SYSTEM_INFO_ERROR_NONE) { + CALL_UI_DEBUG("fail to call system_info_get_value_string"); + free(model_str); + return FALSE; + } + + if (strncmp("Emulator", model_str, 8) == 0) { + free(model_str); + return TRUE; + } else { + free(model_str); + return FALSE; + } +} + diff --git a/ui/src/vcui-view-dialing.c b/ui/src/vcui-view-dialing.c index 4d8c1b3..52d3fe9 100755 --- a/ui/src/vcui-view-dialing.c +++ b/ui/src/vcui-view-dialing.c @@ -144,7 +144,11 @@ static void __vcui_view_dialing_draw_screen(Evas_Object *eo, void *data) _vcui_create_bottom_left_button(vd); _vcui_create_bottom_middle_button_disabled(vd); - _vcui_create_bottom_right_button(vd); + if (_vcui_view_common_is_emul_bin() == EINA_TRUE) { + _vcui_create_bottom_right_button_disabled(vd); + } else { + _vcui_create_bottom_right_button(vd); + } _vcui_elements_check_keypad_n_hide(vd); diff --git a/ui/src/vcui-view-incoming-lock.c b/ui/src/vcui-view-incoming-lock.c index 38d6df3..8858209 100755 --- a/ui/src/vcui-view-incoming-lock.c +++ b/ui/src/vcui-view-incoming-lock.c @@ -817,7 +817,12 @@ static void __reject_msg_create_toolbar(void *data) rej_msg_toolbar = elm_toolbar_add(priv->lock_reject_with_msg); elm_toolbar_homogeneous_set(rej_msg_toolbar, TRUE); elm_toolbar_shrink_mode_set(rej_msg_toolbar, ELM_TOOLBAR_SHRINK_EXPAND); - elm_toolbar_item_append(rej_msg_toolbar, REJ_MSG_CREATE_ICON, NULL, __create_new_msg_cb, vd); + if (_vcui_view_common_is_emul_bin() == EINA_TRUE) { + item = elm_toolbar_item_append(rej_msg_toolbar, NULL, NULL, NULL, NULL); + elm_object_item_disabled_set(item, EINA_TRUE); + } else { + elm_toolbar_item_append(rej_msg_toolbar, REJ_MSG_CREATE_ICON, NULL, __create_new_msg_cb, vd); + } item = elm_toolbar_item_append(rej_msg_toolbar, NULL, NULL, NULL, NULL); elm_object_item_disabled_set(item, EINA_TRUE); item = elm_toolbar_item_append(rej_msg_toolbar, NULL, NULL, NULL, NULL); diff --git a/ui/src/vcui-view-multi-call-conf.c b/ui/src/vcui-view-multi-call-conf.c index 94a1b39..b15d2e6 100755 --- a/ui/src/vcui-view-multi-call-conf.c +++ b/ui/src/vcui-view-multi-call-conf.c @@ -133,8 +133,13 @@ static void __vcui_view_multi_call_conf_draw_screen(Evas_Object *eo, void *data) _vcui_create_bottom_middle_button(vd); { - _vcui_create_top_left_button(vd); - _vcui_create_bottom_right_button(vd); + if (_vcui_view_common_is_emul_bin() == EINA_TRUE) { + _vcui_create_top_left_button_disabled(vd); + _vcui_create_bottom_right_button_disabled(vd); + } else { + _vcui_create_top_left_button(vd); + _vcui_create_bottom_right_button(vd); + } } } diff --git a/ui/src/vcui-view-multi-call-split.c b/ui/src/vcui-view-multi-call-split.c index 2506163..e585c57 100755 --- a/ui/src/vcui-view-multi-call-split.c +++ b/ui/src/vcui-view-multi-call-split.c @@ -184,8 +184,11 @@ static void __vcui_view_multi_call_split_draw_screen(Evas_Object *eo, void *data } else { _vcui_create_top_left_button(vd); } - - _vcui_create_bottom_right_button(vd); + if (_vcui_view_common_is_emul_bin() == EINA_TRUE) { + _vcui_create_bottom_right_button_disabled(vd); + } else { + _vcui_create_bottom_right_button(vd); + } } ad->beffect_needed = EINA_FALSE; diff --git a/ui/src/vcui-view-single-call.c b/ui/src/vcui-view-single-call.c index f7c7127..e3014c5 100755 --- a/ui/src/vcui-view-single-call.c +++ b/ui/src/vcui-view-single-call.c @@ -160,8 +160,13 @@ static void __vc_ui_view_single_call_draw_screen(Evas_Object *eo, void *data) _vcui_create_bottom_middle_button(vd); CALL_UI_KPI("_vcui_create_bottom_middle_button done"); { - _vcui_create_top_left_button(vd); - _vcui_create_bottom_right_button(vd); + if (_vcui_view_common_is_emul_bin() == EINA_TRUE) { + _vcui_create_top_left_button_disabled(vd); + _vcui_create_bottom_right_button_disabled(vd); + } else { + _vcui_create_top_left_button(vd); + _vcui_create_bottom_right_button(vd); + } } } CALL_UI_KPI("edje_object_signal_emit effect start");