Merge branch 'tizen_dev' into tizen_3.0

Signed-off-by: Aleksandr Sapozhnik <a.sapozhnik@samsung.com>
Conflicts:
	app-control/alert/CalAlertData.cpp
	main-app/src/search/CalSearchView.cpp
	main-app/src/search/CalSearchView.h
	main-app/src/setting/CalSettingsView.cpp

Change-Id: Id32642855655d961f38eefeedfe89d3d8943256f

diff --cc app-control/alert/CalAlertData.cpp
Simple merge

diff --cc common/CalCommon.h
Simple merge

diff --cc common/model/CalDataManager.cpp
Simple merge

diff --cc common/model/CalDataManager.h
Simple merge

diff --cc main-app/src/common/CalUnderlineEditField.cpp
Simple merge

diff --cc main-app/src/edit/CalEditView.cpp
Simple merge

diff --cc main-app/src/list/CalListControl.cpp
index c2bf593,be13bd3..e0a2de5
--- 1/main-app/src/list/CalListControl.cpp
--- 2/main-app/src/list/CalListControl.cpp
+++ b/main-app/src/list/CalListControl.cpp
@@@ -69,8 -69,9 +69,8 @@@ Evas_Object *CalListControl::onCreate(E
  
        evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-       elm_scroller_policy_set( genlist, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
+       elm_scroller_policy_set(genlist, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
        evas_object_show(genlist);
 -      elm_object_tree_focus_allow_set(genlist, EINA_FALSE);
  
        return genlist;
  }

diff --cc main-app/src/list/CalScheduleListControl.cpp
index 3893faa,03d86a4..86c68e2
--- 1/main-app/src/list/CalScheduleListControl.cpp
--- 2/main-app/src/list/CalScheduleListControl.cpp
+++ b/main-app/src/list/CalScheduleListControl.cpp
@@@ -589,11 -584,11 +589,11 @@@ void CalScheduleListControl::showCheckB
        __isHideCheck = !showCheck;
        Elm_Object_Item *it = __getFirstItem();
        Elm_Object_Item *next = it;
-       while(next) {
+       while (next) {
                Item *item = (Item *)elm_object_item_data_get(next);
 -              if (item->isGroupTitle()) {
 -                              item->setCheckable(showCheck);
 -                              elm_genlist_item_fields_update(next, "elm.swallow.content", ELM_GENLIST_ITEM_FIELD_CONTENT);
 +              if (item && item->isGroupTitle()) {
 +                      item->setCheckable(showCheck);
 +                      elm_genlist_item_fields_update(next, "elm.swallow.content", ELM_GENLIST_ITEM_FIELD_CONTENT);
                }
                next = elm_genlist_item_next_get(next);
        }

diff --cc main-app/src/search/CalSearchView.cpp
Simple merge

diff --cc main-app/src/search/CalSearchView.h
Simple merge

diff --cc main-app/src/setting/CalSettingsView.cpp
index 567020a,9c77dd8..7ccf03e
--- 1/main-app/src/setting/CalSettingsView.cpp
--- 2/main-app/src/setting/CalSettingsView.cpp
+++ b/main-app/src/setting/CalSettingsView.cpp
@@@ -157,13 -158,12 +158,13 @@@ void CalSettingsView::onNotificationSou
        app_control_set_launch_mode(service, APP_CONTROL_LAUNCH_MODE_GROUP);
  
        CalAppControlLauncher::getInstance().sendLaunchRequest(service,
-               [](app_control_h request, app_control_h reply, app_control_result_e result, void* data) {
+               [](app_control_h request, app_control_h reply, app_control_result_e result, void *data) {
                        CalSettingsView *self = (CalSettingsView *)data;
  
 -                      char *ringtone = NULL;
 -                      int error = 0;
 -                      error = app_control_get_extra_data(reply, APP_CONTROL_SETTING_RINGTONE_KEY_RESULT, &ringtone);
 +                      char **ringtone = nullptr;
 +                      int count = 0;
 +                      int error = app_control_get_extra_data_array(reply, APP_CONTROL_DATA_SELECTED, &ringtone, &count);
 +
                        if (error != APP_CONTROL_ERROR_NONE) {
                                WERROR("get extra data by key result is failed(%x)", error);
                                return;
@@@ -192,8 -187,9 +193,8 @@@
                        }
  
                        free(ringtone);
 -                      ringtone = NULL;
  
-                       elm_genlist_item_update((Elm_Object_Item*)self->__noti_sound_item->getElmObjectItem());
+                       elm_genlist_item_update((Elm_Object_Item *)self->__noti_sound_item->getElmObjectItem());
                },
                this,
                getEvasObj()

diff --cc widget/CalWidgetApp.cpp
Simple merge