From 73aa502977b3ed02afa4933b5c2a9804f599e9f8 Mon Sep 17 00:00:00 2001 From: Igor Olshevskyi Date: Thu, 1 Dec 2016 13:32:49 +0200 Subject: [PATCH] TizenRefApp-7751 [Call-UI] Fix code style issues Change-Id: Id6bb0af42f6575c419000474a056fcfbc4ae7b98 --- inc/callui-common-types.h | 22 ++++++------- inc/callui-common.h | 6 ++-- inc/callui-debug.h | 19 +++++------ src/callui-action-bar.c | 22 ++++++------- src/callui-common.c | 31 +++++++++--------- src/callui-display.c | 4 +-- src/callui-indicator.c | 4 +-- src/callui-keypad.c | 6 ++-- src/callui-listeners-collection.c | 4 +-- src/callui-proximity-lock-manager.c | 62 ++++++++++++++++++------------------ src/callui-state-provider.c | 2 +- src/callui-touch-lock-manager.c | 40 +++++++++++------------ src/callui-view-elements.c | 20 ++++++------ src/callui-view-incoming-call-noti.c | 13 ++++---- src/callui-view-manager.c | 5 ++- src/callui-view-multi-call-split.c | 2 +- src/callui-view-quickpanel.c | 10 +++--- src/callui-window.c | 2 +- src/callui.c | 2 +- 19 files changed, 135 insertions(+), 141 deletions(-) diff --git a/inc/callui-common-types.h b/inc/callui-common-types.h index a18c495..29d888d 100644 --- a/inc/callui-common-types.h +++ b/inc/callui-common-types.h @@ -21,19 +21,15 @@ #include typedef enum { - - CALLUI_RESULT_OK, - - CALLUI_RESULT_FAIL, - CALLUI_RESULT_INVALID_PARAM, - CALLUI_RESULT_ALLOCATION_FAIL, - CALLUI_RESULT_PERMISSION_DENIED, - CALLUI_RESULT_NOT_SUPPORTED, - CALLUI_RESULT_NOT_REGISTERED, - CALLUI_RESULT_ALREADY_REGISTERED, - - CALLUI_RESULT_UNKNOWN_ERROR - + CALLUI_RESULT_OK, + CALLUI_RESULT_FAIL, + CALLUI_RESULT_INVALID_PARAM, + CALLUI_RESULT_ALLOCATION_FAIL, + CALLUI_RESULT_PERMISSION_DENIED, + CALLUI_RESULT_NOT_SUPPORTED, + CALLUI_RESULT_NOT_REGISTERED, + CALLUI_RESULT_ALREADY_REGISTERED, + CALLUI_RESULT_UNKNOWN_ERROR } callui_result_e; typedef enum { diff --git a/inc/callui-common.h b/inc/callui-common.h index 8ba96e5..3319130 100644 --- a/inc/callui-common.h +++ b/inc/callui-common.h @@ -22,7 +22,7 @@ #include "callui-common-defines.h" /* Set call duration function prototype */ -typedef void (*set_call_duration_time)(struct tm *cur_time, Evas_Object *obj, const char *part); +typedef void (*set_call_duration_time) (struct tm *cur_time, Evas_Object *obj, const char *part); /** * @brief Checks if headset is connected @@ -137,8 +137,8 @@ void _callui_common_exit_app(); * @param[in] appdata application data * * @return result of operation: CALLUI_RESULT_OK on success; - * CALLUI_RESULT_ALREADY_REGISTERED if client is already registered; - * CALLUI_RESULT_FAIL on error; + * CALLUI_RESULT_ALREADY_REGISTERED if client is already registered; + * CALLUI_RESULT_FAIL on error; */ callui_result_e _callui_common_init_msg_client(void *appdata); diff --git a/inc/callui-debug.h b/inc/callui-debug.h index 402e20a..ec81371 100644 --- a/inc/callui-debug.h +++ b/inc/callui-debug.h @@ -24,11 +24,11 @@ #define CALLUI_LOG_TAG "CALLUI" #endif -#define info(fmt,args...) { __dlog_print(LOG_ID_MAIN, DLOG_INFO, CALLUI_LOG_TAG, "%s: %s(%d) > " fmt "\n", __FILE__, __func__, __LINE__, ##args); } -#define dbg(fmt,args...) { __dlog_print(LOG_ID_MAIN, DLOG_DEBUG, CALLUI_LOG_TAG, "%s: %s(%d) > " fmt "\n", __FILE__, __func__, __LINE__, ##args); } -#define warn(fmt,args...) { __dlog_print(LOG_ID_MAIN, DLOG_WARN, CALLUI_LOG_TAG, "%s: %s(%d) > " fmt "\n", __FILE__, __func__, __LINE__, ##args); } -#define err(fmt,args...) { __dlog_print(LOG_ID_MAIN, DLOG_ERROR, CALLUI_LOG_TAG, "%s: %s(%d) > " fmt "\n", __FILE__, __func__, __LINE__, ##args); } -#define fatal(fmt,args...) { __dlog_print(LOG_ID_MAIN, DLOG_FATAL, CALLUI_LOG_TAG, "%s: %s(%d) > " fmt "\n", __FILE__, __func__, __LINE__, ##args); } +#define info(fmt, args...) { __dlog_print(LOG_ID_MAIN, DLOG_INFO, CALLUI_LOG_TAG, "%s: %s(%d) > " fmt "\n", __FILE__, __func__, __LINE__, ##args); } +#define dbg(fmt, args...) { __dlog_print(LOG_ID_MAIN, DLOG_DEBUG, CALLUI_LOG_TAG, "%s: %s(%d) > " fmt "\n", __FILE__, __func__, __LINE__, ##args); } +#define warn(fmt, args...) { __dlog_print(LOG_ID_MAIN, DLOG_WARN, CALLUI_LOG_TAG, "%s: %s(%d) > " fmt "\n", __FILE__, __func__, __LINE__, ##args); } +#define err(fmt, args...) { __dlog_print(LOG_ID_MAIN, DLOG_ERROR, CALLUI_LOG_TAG, "%s: %s(%d) > " fmt "\n", __FILE__, __func__, __LINE__, ##args); } +#define fatal(fmt, args...) { __dlog_print(LOG_ID_MAIN, DLOG_FATAL, CALLUI_LOG_TAG, "%s: %s(%d) > " fmt "\n", __FILE__, __func__, __LINE__, ##args); } #define sec_err(fmt, arg...) {SECURE_LOGE(CALLUI_LOG_TAG, "%s: %s(%d) > " fmt "\n", __FILE__, __func__, __LINE__, ##arg); } #define sec_warn(fmt, arg...) {SECURE_LOGW(CALLUI_LOG_TAG, "%s: %s(%d) > " fmt "\n", __FILE__, __func__, __LINE__, ##arg); } @@ -40,8 +40,7 @@ #ifndef CALLUI_RETURN_IF_FAIL #define CALLUI_RETURN_IF_FAIL(check_condition) {\ - if (!(check_condition)) \ - { \ + if (!(check_condition)) { \ err("%s: Failed", #check_condition); \ return; \ } \ @@ -50,8 +49,7 @@ #ifndef CALLUI_RETURN_VALUE_IF_FAIL #define CALLUI_RETURN_VALUE_IF_FAIL(check_condition, value) {\ - if (!(check_condition)) \ - { \ + if (!(check_condition)) { \ err("%s: Failed", #check_condition); \ return value; \ } \ @@ -60,8 +58,7 @@ #ifndef CALLUI_RETURN_NULL_IF_FAIL #define CALLUI_RETURN_NULL_IF_FAIL(check_condition) {\ - if (!(check_condition)) \ - { \ + if (!(check_condition)) { \ err("%s: Failed", #check_condition); \ return NULL; \ } \ diff --git a/src/callui-action-bar.c b/src/callui-action-bar.c index da5ebb2..935d034 100644 --- a/src/callui-action-bar.c +++ b/src/callui-action-bar.c @@ -60,7 +60,7 @@ struct _callui_action_bar { }; typedef struct _callui_action_bar _callui_action_bar_t; -typedef callui_result_e (*action_btn_update_func)(callui_action_bar_h action_bar); +typedef callui_result_e (*action_btn_update_func) (callui_action_bar_h action_bar); struct __action_btn_params { char *txt; @@ -117,7 +117,7 @@ static __action_btn_params_t btn_params[CALLUI_ACTION_BTN_COUNT] = { static callui_result_e __callui_action_bar_init(callui_action_bar_h action_bar, callui_app_data_t *ad); static void __callui_action_bar_deinit(callui_action_bar_h action_bar); -static Evas_Object *__create_action_button( callui_action_bar_h action_bar, callui_btn_type_e type); +static Evas_Object *__create_action_button(callui_action_bar_h action_bar, callui_btn_type_e type); static void __update_btns_state(callui_action_bar_h action_bar); static void __update_all_btns(callui_action_bar_h action_bar); @@ -152,7 +152,7 @@ static void __speaker_btn_click_cb(void *data, Evas_Object *obj, void *event_inf res = _callui_sdm_set_speaker_state(ad->sound_manager, !speaker_status); if (res != CALLUI_RESULT_OK) { - err("Set speaker state [%s] failed. res[%d]", ((!speaker_status)?"ON":"OFF"), res); + err("Set speaker state [%s] failed. res[%d]", ((!speaker_status) ? "ON" : "OFF"), res); } } @@ -219,7 +219,7 @@ static void __mute_btn_click_cb(void *data, Evas_Object *obj, void *event_info) bool mute_state = _callui_sdm_get_mute_state(ad->sound_manager); callui_result_e res = _callui_sdm_set_mute_state(ad->sound_manager, !mute_state); if (res != CALLUI_RESULT_OK) { - err("Set mute state [%s] failed. res[%d]", ((!mute_state)?"ON":"OFF"), res); + err("Set mute state [%s] failed. res[%d]", ((!mute_state) ? "ON" : "OFF"), res); } } @@ -247,15 +247,15 @@ static void __update_btn_accessibility_info(callui_action_bar_h action_bar, call snprintf(buff, CALLUI_BUFF_SIZE_HUG, "%s, %s", - (action_bar->is_active[type]? _("IDS_STORYALBUM_BODY_ON_T_TTS"):_("IDS_STORYALBUM_BODY_OFF_T_TTS")), - (action_bar->is_available[type]? "":_("IDS_GCTS_OPT_DIMMED_TTS"))); + (action_bar->is_active[type] ? _("IDS_STORYALBUM_BODY_ON_T_TTS") : _("IDS_STORYALBUM_BODY_OFF_T_TTS")), + (action_bar->is_available[type] ? "" : _("IDS_GCTS_OPT_DIMMED_TTS"))); elm_atspi_accessible_description_set(btn, buff); } break; case CALLUI_ACTION_BTN_KEYPAD: case CALLUI_ACTION_BTN_ADD_CALL: case CALLUI_ACTION_BTN_CONTACT: - elm_atspi_accessible_description_set(btn, ((action_bar->is_available[type])? "" : "IDS_GCTS_OPT_DIMMED_TTS" )); + elm_atspi_accessible_description_set(btn, ((action_bar->is_available[type]) ? "" : "IDS_GCTS_OPT_DIMMED_TTS")); break; default: return; @@ -420,7 +420,7 @@ static callui_result_e __update_contacts_btn(callui_action_bar_h action_bar) * * @return Action button on success or NULL otherwise */ -static Evas_Object *__create_action_button( callui_action_bar_h action_bar, callui_btn_type_e type) +static Evas_Object *__create_action_button(callui_action_bar_h action_bar, callui_btn_type_e type) { Evas_Object *parent = action_bar->main_layout; @@ -636,7 +636,7 @@ callui_result_e __create_ui_components(callui_action_bar_h action_bar) i = 0; int count = CALLUI_ACTION_BTN_COUNT - 1; for (; i < count; i++) { - _callui_au_append_symmetric_relationship(action_bar->buttons[i],action_bar->buttons[i+1]); + _callui_au_append_symmetric_relationship(action_bar->buttons[i], action_bar->buttons[i+1]); } return CALLUI_RESULT_OK; @@ -741,7 +741,7 @@ void _callui_action_bar_show(callui_action_bar_h action_bar) CALLUI_RETURN_IF_FAIL(__create_ui_components(action_bar) == CALLUI_RESULT_OK); action_bar->is_ui_initialized = true; - Evas_Object *view_layout = elm_object_part_content_get( _callui_vm_get_main_ly(action_bar->ad->view_manager), "elm.swallow.content"); + Evas_Object *view_layout = elm_object_part_content_get(_callui_vm_get_main_ly(action_bar->ad->view_manager), "elm.swallow.content"); elm_object_part_content_set(view_layout, CALLUI_PART_SWALLOW_ACTION_BAR, action_bar->main_layout); evas_object_show(action_bar->main_layout); } @@ -755,7 +755,7 @@ void _callui_action_bar_hide(callui_action_bar_h action_bar) { CALLUI_RETURN_IF_FAIL(action_bar); - Evas_Object *view_layout = elm_object_part_content_get( _callui_vm_get_main_ly(action_bar->ad->view_manager), "elm.swallow.content"); + Evas_Object *view_layout = elm_object_part_content_get(_callui_vm_get_main_ly(action_bar->ad->view_manager), "elm.swallow.content"); elm_object_part_content_unset(view_layout, CALLUI_PART_SWALLOW_ACTION_BAR); evas_object_hide(action_bar->main_layout); diff --git a/src/callui-common.c b/src/callui-common.c index 7a1a701..bfeff24 100755 --- a/src/callui-common.c +++ b/src/callui-common.c @@ -59,7 +59,7 @@ static bool g_is_headset_connected; static bool __bt_device_connected_profile(bt_profile_e profile, void *user_data); static bool __bt_adapter_bonded_device_cb(bt_device_info_s *device_info, void *user_data); -static void __lock_state_changed_cb (system_settings_key_e key, void *user_data); +static void __lock_state_changed_cb(system_settings_key_e key, void *user_data); static const char *__get_res_path(); static const char *__get_resource(const char *res_name); static char *__parse_vconf_string(char *input_string); @@ -177,8 +177,8 @@ static void __app_launch_reply_cb(app_control_h request, app_control_h reply, ap /** * @brief Tries to send application launch request * - * @param[in] ad Application data - * @param[in] app_control App_control to send launch request + * @param[in] ad Application data + * @param[in] app_control App_control to send launch request */ static void __try_send_app_launch_request(callui_app_data_t *ad, app_control_h app_control) { @@ -388,7 +388,7 @@ bool _callui_common_is_homekey_answering_call_mode_on(void) int answerMode = 0; int ret = vconf_get_bool(VCONFKEY_CISSAPPL_ANSWERING_KEY_BOOL, &answerMode); if (!ret) { - dbg("Home key answering call mode [%s]", answerMode ? "ON":"OFF"); + dbg("Home key answering call mode [%s]", answerMode ? "ON" : "OFF"); } else { dbg("vconf_get_bool failed. res[%d]", ret); } @@ -405,7 +405,7 @@ bool _callui_common_is_powerkey_ending_call_mode_on(void) int powerkey_mode = 0; int ret = vconf_get_bool(VCONFKEY_CISSAPPL_POWER_KEY_ENDS_CALL_BOOL, &powerkey_mode); if (!ret) { - dbg("Power key ending call mode [%s]", powerkey_mode ? "ON":"OFF"); + dbg("Power key ending call mode [%s]", powerkey_mode ? "ON" : "OFF"); } else { dbg("vconf_get_bool failed. res[%d]", ret); } @@ -637,9 +637,10 @@ void _callui_common_exit_app() * @param[in] ad Application data * * @return result of operation: CALLUI_RESULT_OK on success; - * CALLUI_RESULT_ALREADY_REGISTERED if client is already registered; - * CALLUI_RESULT_FAIL on error; + * CALLUI_RESULT_ALREADY_REGISTERED if client is already registered; + * CALLUI_RESULT_FAIL on error; */ + static callui_result_e __init_msg_client(callui_app_data_t *ad) { CALLUI_RETURN_VALUE_IF_FAIL(ad, CALLUI_RESULT_INVALID_PARAM); @@ -659,8 +660,8 @@ static callui_result_e __init_msg_client(callui_app_data_t *ad) * @param[in] appdata application data * * @return result of operation: CALLUI_RESULT_OK on success; - * CALLUI_RESULT_ALREADY_REGISTERED if client is already registered; - * CALLUI_RESULT_FAIL on error; + * CALLUI_RESULT_ALREADY_REGISTERED if client is already registered; + * CALLUI_RESULT_FAIL on error; */ callui_result_e _callui_common_init_msg_client(void *appdata) { @@ -918,7 +919,7 @@ char *_callui_common_get_duration_time_string(struct tm *time) * @param[in] obj Evas object to set call duration * @param[in] part Evas object text part name */ -void _callui_common_try_update_call_duration_time( struct tm *cur_time, struct tm *comp_time, set_call_duration_time func, Evas_Object *obj, const char *part) +void _callui_common_try_update_call_duration_time(struct tm *cur_time, struct tm *comp_time, set_call_duration_time func, Evas_Object *obj, const char *part) { CALLUI_RETURN_IF_FAIL(cur_time); CALLUI_RETURN_IF_FAIL(comp_time); @@ -945,7 +946,7 @@ void _callui_common_try_update_call_duration_time( struct tm *cur_time, struct t */ struct tm *_callui_common_get_current_time_diff_in_tm(long time) { - struct tm *time_tm = calloc(1, sizeof (struct tm)); + struct tm *time_tm = calloc(1, sizeof(struct tm)); CALLUI_RETURN_NULL_IF_FAIL(time_tm); long curr_time = 0; @@ -1132,7 +1133,7 @@ char *_callui_common_get_date_string_representation(time_t last_update_time) char update_time[CALLUI_TIME_STRING_BUFF_SIZE] = { '\0' }; bool is_format_24h; - int ret = system_settings_get_value_bool( SYSTEM_SETTINGS_KEY_LOCALE_TIMEFORMAT_24HOUR, &is_format_24h); + int ret = system_settings_get_value_bool(SYSTEM_SETTINGS_KEY_LOCALE_TIMEFORMAT_24HOUR, &is_format_24h); CALLUI_RETURN_NULL_IF_FAIL(ret == SYSTEM_SETTINGS_ERROR_NONE); i18n_udatepg_h pattern_generator = __create_pattern_generator(); @@ -1211,7 +1212,7 @@ bool _callui_common_is_handsfree_mode_on(void *appdata) callui_audio_state_type_e type = _callui_sdm_get_audio_state(ad->sound_manager); bool is_mode_on = (type != CALLUI_AUDIO_STATE_RECEIVER && type != CALLUI_AUDIO_STATE_NONE); - dbg("Handsfree mode [%s]", is_mode_on?"ON":"OFF"); + dbg("Handsfree mode [%s]", is_mode_on ? "ON" : "OFF"); return is_mode_on; } @@ -1224,7 +1225,7 @@ bool _callui_common_is_app_foreground() app_state_e state = APP_STATE_UNDEFINED; int res = app_context_get_app_state(app_context, &state); if (res == APP_MANAGER_ERROR_NONE) { - dbg("Application state [%s]", state == APP_STATE_FOREGROUND ? "Foreground":"Not foreground"); + dbg("Application state [%s]", state == APP_STATE_FOREGROUND ? "Foreground" : "Not foreground"); } else { err("Get application state failed. res[%d]", res); } @@ -1236,7 +1237,7 @@ bool _callui_common_is_app_foreground() bool _callui_common_is_mirrored_mode_on() { bool is_mirrored_mode = elm_config_mirrored_get(); - dbg("Mirrored mode [%s]", is_mirrored_mode?"ON":"OFF"); + dbg("Mirrored mode [%s]", is_mirrored_mode ? "ON" : "OFF"); return is_mirrored_mode; } diff --git a/src/callui-display.c b/src/callui-display.c index c3c8521..3d268a9 100644 --- a/src/callui-display.c +++ b/src/callui-display.c @@ -99,7 +99,7 @@ static callui_result_e _callui_display_init(callui_display_h disp, callui_app_da static void _callui_display_deinit(callui_display_h disp) { g_cancellable_cancel(disp->cancel_obj); - g_object_unref (disp->cancel_obj); + g_object_unref(disp->cancel_obj); g_object_unref(disp->conn); _callui_listeners_coll_deinit(&disp->display_state_lc); @@ -201,7 +201,7 @@ static callui_result_e __send_gdbus_msg_async(callui_display_h disp, int *param) __gdbus_reply_msg_async_cb, NULL); - g_object_unref (msg); + g_object_unref(msg); return CALLUI_RESULT_OK; } diff --git a/src/callui-indicator.c b/src/callui-indicator.c index 27d1d1f..070510a 100644 --- a/src/callui-indicator.c +++ b/src/callui-indicator.c @@ -38,7 +38,7 @@ typedef enum { } __callui_indicator_type_e; static const char *color_param[CALLUI_INDICATOR_COUNT] = { - "call/idle", /* Default bg color */ + "call/idle", /* Default bg color */ "call/during_call", /* Incoming call or during call */ "call/on_hold", /* Call on hold */ "call/end_call" /* Call ended */ @@ -265,7 +265,7 @@ void _callui_indicator_set_active(callui_indicator_h indicator, bool is_active) CALLUI_RETURN_IF_FAIL(indicator); if (indicator->locked) { - dbg("Indicator is locked. Set [%s] state ignored!", is_active? "active":"not active"); + dbg("Indicator is locked. Set [%s] state ignored!", is_active ? "active" : "not active"); return; } diff --git a/src/callui-keypad.c b/src/callui-keypad.c index 3bdd3f5..c10794b 100755 --- a/src/callui-keypad.c +++ b/src/callui-keypad.c @@ -75,7 +75,7 @@ typedef enum { CALLUI_KEYPAD_BTN_TYPE_SHARP, CALLUI_KEYPAD_BTN_TYPE_COUNT -}__callui_keypad_btn_types; +} __callui_keypad_btn_types; struct _callui_keypad { Evas_Object *main_layout; @@ -106,7 +106,7 @@ typedef struct { const char *btn_style; const char *layout_part; const char *display_symb; -}__callui_keypad_btn_data; +} __callui_keypad_btn_data; static __callui_keypad_btn_data __keypad_btn_params[CALLUI_KEYPAD_BTN_TYPE_COUNT] = { { "callui/keypad_1", "swl.keypad_1", "1" }, @@ -344,7 +344,7 @@ static void __arrow_mouse_up_event_cb(void *data, Evas *evas, Evas_Object *obj, if (((ev->cur.canvas.y-keypad_data->gesture_start_y) > CALLUI_KEYPAD_GEST_Y_COORD_MIN) && (keypad_data->gesture_momentum_y > CALLUI_KEYPAD_GEST_MOMENTUM_MIN)) { - __hide_keypad( keypad_data, EINA_FALSE); + __hide_keypad(keypad_data, EINA_FALSE); } } diff --git a/src/callui-listeners-collection.c b/src/callui-listeners-collection.c index c04bc1c..8bc060c 100644 --- a/src/callui-listeners-collection.c +++ b/src/callui-listeners-collection.c @@ -78,8 +78,8 @@ callui_result_e _callui_listeners_coll_deinit(_callui_listeners_coll_t *listener * @param[in] cb_func Callback function to search * @param[in] cb_data Callback data to search * - * @return CALLUI_RESULT_OK if listener is not found - * CALLUI_RESULT_ALREADY_REGISTERED if listener is already in the list + * @return CALLUI_RESULT_OK if listener is not found + * CALLUI_RESULT_ALREADY_REGISTERED if listener is already in the list */ static callui_result_e __search_listener(Eina_List *listener_list, void *cb_func, void *cb_data) { diff --git a/src/callui-proximity-lock-manager.c b/src/callui-proximity-lock-manager.c index 2a425f7..39e00b4 100644 --- a/src/callui-proximity-lock-manager.c +++ b/src/callui-proximity-lock-manager.c @@ -85,40 +85,40 @@ static void __callui_plm_audio_state_changed_cb(void *user_data, callui_audio_st _callui_proximity_lock_manager_h plm_h = user_data; switch (audio_state) { - case CALLUI_AUDIO_STATE_SPEAKER: - case CALLUI_AUDIO_STATE_EARJACK: - case CALLUI_AUDIO_STATE_BT: - { - plm_h->running_flags |= CALLUI_PLM_STATE_HANDSFREE_MODE; - dbg("Handsfree mode [ON]"); - - if (plm_h->lcd_state == CALLUI_PLM_LCD_OFF) { - dbg("PLM LCD state [OFF]"); - DELETE_ECORE_TIMER(plm_h->lcd_turn_on_timer); - _callui_indicator_set_locked(plm_h->base.ad->indicator, false); - _callui_display_set_control_state(plm_h->base.ad->display, CALLUI_DISPLAY_CONTROL_ON); - plm_h->unlock_cb = NULL; - plm_h->cb_data = NULL; - } - plm_h->lcd_state = CALLUI_PLM_LCD_UNDEFINED; + case CALLUI_AUDIO_STATE_SPEAKER: + case CALLUI_AUDIO_STATE_EARJACK: + case CALLUI_AUDIO_STATE_BT: + { + plm_h->running_flags |= CALLUI_PLM_STATE_HANDSFREE_MODE; + dbg("Handsfree mode [ON]"); + + if (plm_h->lcd_state == CALLUI_PLM_LCD_OFF) { + dbg("PLM LCD state [OFF]"); + DELETE_ECORE_TIMER(plm_h->lcd_turn_on_timer); + _callui_indicator_set_locked(plm_h->base.ad->indicator, false); + _callui_display_set_control_state(plm_h->base.ad->display, CALLUI_DISPLAY_CONTROL_ON); + plm_h->unlock_cb = NULL; + plm_h->cb_data = NULL; + } + plm_h->lcd_state = CALLUI_PLM_LCD_UNDEFINED; + break; + } + case CALLUI_AUDIO_STATE_RECEIVER: + { + if (!(plm_h->running_flags & CALLUI_PLM_STATE_HANDSFREE_MODE)) { + dbg("Ignore. Initial callback"); break; } - case CALLUI_AUDIO_STATE_RECEIVER: - { - if (!(plm_h->running_flags & CALLUI_PLM_STATE_HANDSFREE_MODE)) { - dbg("Ignore. Initial callback"); - break; - } - dbg("Handsfree mode [OFF]"); - plm_h->running_flags &= ~CALLUI_PLM_STATE_HANDSFREE_MODE; + dbg("Handsfree mode [OFF]"); + plm_h->running_flags &= ~CALLUI_PLM_STATE_HANDSFREE_MODE; - if (__callui_plm_check_need_to_turn_off_display(plm_h, NULL) && _callui_common_is_app_foreground()) { - __callui_plm_set_lcd_state(plm_h, CALLUI_PLM_LCD_OFF); - } - break; + if (__callui_plm_check_need_to_turn_off_display(plm_h, NULL) && _callui_common_is_app_foreground()) { + __callui_plm_set_lcd_state(plm_h, CALLUI_PLM_LCD_OFF); } - default: - break; + break; + } + default: + break; } dbg("Running flags [%d]", plm_h->running_flags); @@ -403,7 +403,7 @@ static bool __callui_plm_is_lcd_off(callui_lock_manager_h lock_h) CALLUI_RETURN_VALUE_IF_FAIL(lock_h, false); _callui_proximity_lock_manager_h plm_h = (_callui_proximity_lock_manager_h)lock_h; - dbg("PLM LCD state [%s]", (plm_h->lcd_state == CALLUI_PLM_LCD_OFF) ? "OFF":"ON"); + dbg("PLM LCD state [%s]", (plm_h->lcd_state == CALLUI_PLM_LCD_OFF) ? "OFF" : "ON"); return (plm_h->lcd_state == CALLUI_PLM_LCD_OFF); } diff --git a/src/callui-state-provider.c b/src/callui-state-provider.c index 099cc76..e3a6f40 100644 --- a/src/callui-state-provider.c +++ b/src/callui-state-provider.c @@ -134,7 +134,7 @@ static void __get_contact_info_from_contact_srv(callui_contact_data_t *ct_info) if (count > 0) { char *img_path = NULL; contacts_record_h child_record = NULL; - contacts_record_get_child_record_at_p(record,_contacts_contact.image, 0, &child_record); + contacts_record_get_child_record_at_p(record, _contacts_contact.image, 0, &child_record); contacts_record_get_str_p(child_record, _contacts_image.path, &img_path); if (img_path) { g_strlcpy(ct_info->caller_id_path, img_path, CALLUI_IMAGE_PATH_LENGTH_MAX); diff --git a/src/callui-touch-lock-manager.c b/src/callui-touch-lock-manager.c index d87d383..773e625 100755 --- a/src/callui-touch-lock-manager.c +++ b/src/callui-touch-lock-manager.c @@ -73,25 +73,25 @@ static void __callui_tlm_audio_state_changed_cb(void *user_data, callui_audio_st _callui_touch_lock_manager_h tlm_h = user_data; switch (audio_state) { - case CALLUI_AUDIO_STATE_SPEAKER: - case CALLUI_AUDIO_STATE_EARJACK: - case CALLUI_AUDIO_STATE_BT: - tlm_h->was_handsfree_mode = true; - DELETE_ECORE_TIMER(tlm_h->no_lock_timer); - if (tlm_h->is_locked) { - __callui_tlm_unlock(tlm_h); - } - break; - case CALLUI_AUDIO_STATE_RECEIVER: - if (tlm_h->was_handsfree_mode) { - tlm_h->was_handsfree_mode = false; - __callui_tlm_lock(tlm_h); - } else { - __callui_tlm_update_state(tlm_h); - } - break; - default: - break; + case CALLUI_AUDIO_STATE_SPEAKER: + case CALLUI_AUDIO_STATE_EARJACK: + case CALLUI_AUDIO_STATE_BT: + tlm_h->was_handsfree_mode = true; + DELETE_ECORE_TIMER(tlm_h->no_lock_timer); + if (tlm_h->is_locked) { + __callui_tlm_unlock(tlm_h); + } + break; + case CALLUI_AUDIO_STATE_RECEIVER: + if (tlm_h->was_handsfree_mode) { + tlm_h->was_handsfree_mode = false; + __callui_tlm_lock(tlm_h); + } else { + __callui_tlm_update_state(tlm_h); + } + break; + default: + break; } } @@ -113,7 +113,7 @@ static void __callui_tlm_update_state(_callui_touch_lock_manager_h tlm_h) Eina_Bool is_keypad_shown = _callui_keypad_is_visible(tlm_h->base.ad->keypad); - dbg("Touch lockscreen [%s]", tlm_h->is_locked? "ON":"OFF"); + dbg("Touch lockscreen [%s]", tlm_h->is_locked ? "ON" : "OFF"); if (_callui_stp_is_any_calls_available(tlm_h->base.ad->state_provider)) { dbg("Any calls available"); diff --git a/src/callui-view-elements.c b/src/callui-view-elements.c index 2e99f16..f5dbb41 100755 --- a/src/callui-view-elements.c +++ b/src/callui-view-elements.c @@ -41,7 +41,7 @@ #include "callui-bidi-text-utils.h" #define CALLUI_POPUP_LIST_W 300 -#define CALLUI_POPUP_LIST_ITEM_H 120 +#define CALLUI_POPUP_LIST_ITEM_H 120 #define CALLUI_CID_THUMBN_SIZE_DEFAULT 0 #define CALLUI_CID_THUMBN_SIZE_TINY 98 @@ -256,26 +256,26 @@ static void __callui_move_more_option(callui_app_data_t *ad, Evas_Object *ctxpop pos = _callui_window_get_rotation(ad->window); switch (pos) { - case 90: - case 270: - evas_object_move(ctxpopup, (h / 2), w); - break; - default: - evas_object_move(ctxpopup, (w / 2), h); - break; + case 90: + case 270: + evas_object_move(ctxpopup, (h / 2), w); + break; + default: + evas_object_move(ctxpopup, (w / 2), h); + break; } } static void __callui_more_option_dismissed_cb(void *data, Evas_Object *obj, void *event_info) { - dbg("..**********.."); + dbg(".."); callui_app_data_t *ad = (callui_app_data_t *)data; __callui_unload_more_option(ad); } static void __callui_more_option_delete_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) { - dbg("..**********.."); + dbg(".."); callui_app_data_t *ad = (callui_app_data_t *)data; __callui_unload_more_option(ad); } diff --git a/src/callui-view-incoming-call-noti.c b/src/callui-view-incoming-call-noti.c index d39db33..81addc9 100644 --- a/src/callui-view-incoming-call-noti.c +++ b/src/callui-view-incoming-call-noti.c @@ -184,7 +184,7 @@ static void __rm_calc_available_size(callui_view_incoming_call_noti_h vd); static void __set_caller_info_unknown_number(callui_view_incoming_call_noti_h vd); static void __set_caller_info_phone_number(callui_view_incoming_call_noti_h vd, const char *call_number); static void __set_caller_info_phone_number_and_name(callui_view_incoming_call_noti_h vd, const callui_call_data_t *call_data); - +static int __dtoi(double value); static callui_result_e __create_accessible_objects(callui_view_incoming_call_noti_h vd); static Evas_Object *__create_action_btn(callui_view_incoming_call_noti_h vd, @@ -495,7 +495,8 @@ static void __reject_msg_animation_end_cb(callui_view_incoming_call_noti_h vd) } } -static int dtoi(double value) { +static int __dtoi(double value) +{ if (value > 0) { return (value + 0.5); } else { @@ -510,14 +511,14 @@ static Eina_Bool __rm_animation_cb(void *data, double pos) callui_view_incoming_call_noti_h vd = data; - Evas_Coord path_step = dtoi((vd->rm_anim_path) * pos); + Evas_Coord path_step = __dtoi((vd->rm_anim_path) * pos); Evas_Coord new_scroller_h = 0; int dim_step = 0; if (CALLUI_REJ_MSG_DIMMER_ALPHA_END == vd->rm_dimmer_alpha_start) { - dim_step = dtoi(CALLUI_REJ_MSG_DIMMER_ALPHA_END * pos); + dim_step = __dtoi(CALLUI_REJ_MSG_DIMMER_ALPHA_END * pos); } else { - dim_step = dtoi((CALLUI_REJ_MSG_DIMMER_ALPHA_END - vd->rm_dimmer_alpha_start) * pos); + dim_step = __dtoi((CALLUI_REJ_MSG_DIMMER_ALPHA_END - vd->rm_dimmer_alpha_start) * pos); } if (vd->rm_state == CALLUI_REJ_MSG_SHOW_IN_PROG) { @@ -535,7 +536,7 @@ static Eina_Bool __rm_animation_cb(void *data, double pos) evas_object_color_set(vd->base_view.contents, CALLUI_REJ_MSG_DIMMER_COLOR, vd->rm_dimmer_alpha); - dbg("rm_scroller_x[%d] rm_scroller_y[%d]" ,vd->rm_scroller_x, vd->rm_scroller_y); + dbg("rm_scroller_x[%d] rm_scroller_y[%d]", vd->rm_scroller_x, vd->rm_scroller_y); evas_object_resize(vd->rm_scroller, vd->rm_scroller_anim_start_w, new_scroller_h); evas_object_geometry_set(vd->rm_scroller_bg, vd->rm_scroller_x, vd->rm_scroller_y, vd->rm_scroller_anim_start_w, new_scroller_h); diff --git a/src/callui-view-manager.c b/src/callui-view-manager.c index c43bedb..c45ae5e 100644 --- a/src/callui-view-manager.c +++ b/src/callui-view-manager.c @@ -76,8 +76,7 @@ static void __lock_state_change_cb(void *data, callui_lock_manager_type_e type, */ static call_view_data_base_t *__allocate_view(callui_view_type_e view_type) { - switch (view_type) - { + switch (view_type) { case CALLUI_VIEW_DIALLING: return (call_view_data_base_t *)_callui_dialing_view_dialing_new(); case CALLUI_VIEW_INCOMING_CALL_NOTI: @@ -152,7 +151,7 @@ static callui_result_e __auto_change_view(callui_vm_h vm, callui_call_data_t *ca (cur_type == CALLUI_VIEW_UNDEFINED || cur_type == CALLUI_VIEW_ENDCALL)) { type = CALLUI_VIEW_INCOMING_CALL_NOTI; } - res =__change_view(ad->view_manager, type); + res = __change_view(ad->view_manager, type); } else if (active) { if (active->is_dialing) { res = __change_view(vm, CALLUI_VIEW_DIALLING); diff --git a/src/callui-view-multi-call-split.c b/src/callui-view-multi-call-split.c index c595920..79db112 100755 --- a/src/callui-view-multi-call-split.c +++ b/src/callui-view-multi-call-split.c @@ -50,7 +50,7 @@ #define CALLUI_PART_SWL_END_BTN "swallow.end_btn" #define CALLUI_PART_SWL_MANAGE_CALLS "swallow.manage_calls" -#define CALLUI_PART_SWL_CALLER_INFO_SPLIT "swallow.caller_info_split" +#define CALLUI_PART_SWL_CALLER_INFO_SPLIT "swallow.caller_info_split" struct _callui_view_mc_split { call_view_data_base_t base_view; diff --git a/src/callui-view-quickpanel.c b/src/callui-view-quickpanel.c index 460b2a0..9434444 100755 --- a/src/callui-view-quickpanel.c +++ b/src/callui-view-quickpanel.c @@ -236,7 +236,7 @@ static void __callui_qp_mc_deinit(callui_qp_mc_h qp) { callui_app_data_t *ad = qp->ad; - if (qp->is_activated){ + if (qp->is_activated) { __deactivate(qp); } @@ -284,14 +284,14 @@ static void __update_btn_accessibility_info(callui_qp_mc_h qp, callui_qp_mc_btn_ snprintf(buff, CALLUI_BUFF_SIZE_HUG, "%s, %s", - (qp->is_active[type]? _("IDS_STORYALBUM_BODY_ON_T_TTS"):_("IDS_STORYALBUM_BODY_OFF_T_TTS")), - (qp->is_available[type]? "":_("IDS_GCTS_OPT_DIMMED_TTS"))); + (qp->is_active[type] ? _("IDS_STORYALBUM_BODY_ON_T_TTS") : _("IDS_STORYALBUM_BODY_OFF_T_TTS")), + (qp->is_available[type] ? "" : _("IDS_GCTS_OPT_DIMMED_TTS"))); elm_atspi_accessible_description_set(btn, buff); } break; case CALLUI_QP_BTN_CALL: case CALLUI_QP_BTN_RESUME: - elm_atspi_accessible_description_set(btn, ((qp->is_available[type])? "" : "IDS_GCTS_OPT_DIMMED_TTS" )); + elm_atspi_accessible_description_set(btn, ((qp->is_available[type]) ? "" : "IDS_GCTS_OPT_DIMMED_TTS")); break; case CALLUI_QP_BTN_END: if (_callui_stp_get_call_data(qp->ad->state_provider, CALLUI_CALL_DATA_INCOMING)) { @@ -299,7 +299,7 @@ static void __update_btn_accessibility_info(callui_qp_mc_h qp, callui_qp_mc_btn_ } else { elm_atspi_accessible_name_set(btn, btn_params[CALLUI_QP_BTN_END].name); } - elm_atspi_accessible_description_set(btn, ((qp->is_available[type])? "" : "IDS_GCTS_OPT_DIMMED_TTS" )); + elm_atspi_accessible_description_set(btn, ((qp->is_available[type]) ? "" : "IDS_GCTS_OPT_DIMMED_TTS")); break; default: return; diff --git a/src/callui-window.c b/src/callui-window.c index ad7e34b..d68caba 100644 --- a/src/callui-window.c +++ b/src/callui-window.c @@ -452,7 +452,7 @@ callui_result_e _callui_window_set_indicator_visible(callui_window_h window_h, b } else if (!is_visible && indicator_mode == ELM_WIN_INDICATOR_SHOW) { elm_win_indicator_mode_set(window_h->win, ELM_WIN_INDICATOR_HIDE); } else { - dbg("Indicator is already %s", is_visible ? "shown": "hidden"); + dbg("Indicator is already %s", is_visible ? "shown" : "hidden"); } return CALLUI_RESULT_OK; } diff --git a/src/callui.c b/src/callui.c index 5361b13..73e05a7 100755 --- a/src/callui.c +++ b/src/callui.c @@ -394,7 +394,7 @@ static bool __app_init(callui_app_data_t *ad) ad->action_bar = _callui_action_bar_create(ad); CALLUI_RETURN_VALUE_IF_FAIL(ad->action_bar, false); - ad->qp_minicontrol =_callui_qp_mc_create(ad); + ad->qp_minicontrol = _callui_qp_mc_create(ad); CALLUI_RETURN_VALUE_IF_FAIL(ad->qp_minicontrol, false); ad->display = _callui_display_create(ad); -- 2.7.4