Merge branch 'tizen' into tizen_dev

Signed-off-by: Aleksandr Sapozhnik <a.sapozhnik@samsung.com>
Conflicts:
	lib-contacts/src/Contacts/List/ListSection.cpp
	lib-contacts/src/Contacts/List/ListView.cpp

Change-Id: Iea467f01a8aef0c2c4fc2ea21e53c45ce8279e05

diff --cc lib-contacts/inc/Contacts/List/ListSection.h
Simple merge

diff --cc lib-contacts/inc/Contacts/List/ListView.h
Simple merge

diff --cc lib-contacts/src/Contacts/Groups/MembersListView.cpp
index 069d270,fd67af4..849aa4f
--- 1/lib-contacts/src/Contacts/Groups/MembersListView.cpp
--- 2/lib-contacts/src/Contacts/Groups/MembersListView.cpp
+++ b/lib-contacts/src/Contacts/Groups/MembersListView.cpp
@@@ -187,11 -187,8 +189,9 @@@ bool MembersListView::onRemoveFinished(
        setSelectMode(SelectNone);
        setCancelCallback(nullptr);
        setSelectCallback(nullptr);
 +      setUpdateEnabled(true);
  
        getPage()->setTitleVisibility(true);
-       updateTitle();
- 
        return false;
  }
  

diff --cc lib-contacts/src/Contacts/List/ListSection.cpp
index 82bf1d6,0ffc10b..94a3451
--- 1/lib-contacts/src/Contacts/List/ListSection.cpp
--- 2/lib-contacts/src/Contacts/List/ListSection.cpp
+++ b/lib-contacts/src/Contacts/List/ListSection.cpp
@@@ -38,13 -38,7 +38,12 @@@ ListSection::ListSection(const char *ti
  
  ListSection::~ListSection()
  {
-       removeIndexItem();
 -      delete m_Provider;
 +      m_Provider->destroy();
 +}
 +
 +void ListSection::setUpdateEnabled(bool isEnabled)
 +{
 +      m_Provider->setUpdateEnabled(isEnabled);
  }
  
  void ListSection::setUpdateCallback(UpdateCallback callback)

diff --cc lib-contacts/src/Contacts/List/ListView.cpp
index f064266,9dd36c0..848586a
--- 1/lib-contacts/src/Contacts/List/ListView.cpp
--- 2/lib-contacts/src/Contacts/List/ListView.cpp
+++ b/lib-contacts/src/Contacts/List/ListView.cpp
@@@ -376,22 -358,20 +377,20 @@@ Ui::GenGroupItem *ListView::createListS
  
  void ListView::fillPersonList()
  {
-       if (m_PersonGroups.empty()) {
-               PersonGroupItem *group = nullptr;
+       PersonGroupItem *group = nullptr;
  
-               for (auto &&dataItem: m_SearchProvider->getDataList()) {
-                       SearchData &searchData = static_cast<SearchData &>(*dataItem);
-                       Person &person = static_cast<Person &>(searchData.getDataItem());
 -      for (auto &&dataItem: m_SearchProvider.getDataList()) {
++      for (auto &&dataItem: m_SearchProvider->getDataList()) {
+               SearchData &searchData = static_cast<SearchData &>(*dataItem);
+               Person &person = static_cast<Person &>(searchData.getDataItem());
  
-                       const UniString &nextLetter = person.getIndexLetter();
-                       if (!group || group->getTitle() != nextLetter) {
-                               group = getPersonGroupItem(nextLetter);
-                       }
- 
-                       PersonItem *item = createPersonItem(searchData);
-                       m_Genlist->insert(item, group);
-                       addSelectItem(item);
+               const UniString &nextLetter = person.getIndexLetter();
+               if (!group || group->getTitle() != nextLetter) {
+                       group = getPersonGroupItem(nextLetter);
                }
+ 
+               PersonItem *item = createPersonItem(searchData);
+               m_Genlist->insert(item, group);
+               addSelectItem(item);
        }
  }