Merge branch 'tizen_dev' into tizen

Signed-off-by: Andrey Klimenko <and.klimenko@samsung.com>
Conflicts:
	src/Common/SystemSettingsManager/inc/SystemSettingsManager.h
	src/Common/SystemSettingsManager/src/SystemSettingsManager.cpp
	src/MsgThread/Controller/src/MsgThread.cpp

Change-Id: Iacd2b2c78c01a175c0ca916cdccc6c824e40cf56

diff --cc src/Common/SystemSettingsManager/inc/SystemSettingsManager.h
index bf05c7b,6ae6f27..b9e8aec
--- 1/src/Common/SystemSettingsManager/inc/SystemSettingsManager.h
--- 2/src/Common/SystemSettingsManager/inc/SystemSettingsManager.h
+++ b/src/Common/SystemSettingsManager/inc/SystemSettingsManager.h
@@@ -72,7 -79,8 +79,9 @@@ namespace Ms
  
              void onTimeFormatChanged();
              void onLanguageChanged();
 +            void prepareTel();
+             void initDpmHandle() const;
+             void deinitDpmHandle();
  
          private:
              std::vector<ISystemSettingsManager*> m_Listeners;

diff --cc src/Common/SystemSettingsManager/src/SystemSettingsManager.cpp
index 7aadd6f,37720bf..6f83d9c
--- 1/src/Common/SystemSettingsManager/src/SystemSettingsManager.cpp
--- 2/src/Common/SystemSettingsManager/src/SystemSettingsManager.cpp
+++ b/src/Common/SystemSettingsManager/src/SystemSettingsManager.cpp
@@@ -30,25 -31,21 +31,28 @@@ using namespace Msg
  
  SystemSettingsManager::SystemSettingsManager()
      : m_TelHandleList()
+     , m_DpmHandle(nullptr)
  {
 -    int err = telephony_init(&m_TelHandleList);
 -    MSG_LOG("telephony_init = ", err);
 -
      system_settings_set_changed_cb(SYSTEM_SETTINGS_KEY_LOCALE_TIMEFORMAT_24HOUR, CALLBACK(onTimeFormatChanged), this);
      system_settings_set_changed_cb(SYSTEM_SETTINGS_KEY_LOCALE_LANGUAGE, CALLBACK(onLanguageChanged), this);
  }
  
  SystemSettingsManager::~SystemSettingsManager()
  {
 -    telephony_deinit(&m_TelHandleList);
 +    if(m_TelHandleList.handle != nullptr)
 +        telephony_deinit(&m_TelHandleList);
++
+     deinitDpmHandle();
  }
  
 +void SystemSettingsManager::prepareTel()
 +{
 +    if(m_TelHandleList.handle != nullptr)
 +        return;
 +    int err = telephony_init(&m_TelHandleList);
 +    MSG_LOG("telephony_init = ", err);
 +}
 +
  void SystemSettingsManager::addListener(ISystemSettingsManager &l)
  {
      auto it = std::find(m_Listeners.begin(), m_Listeners.end(), &l);

diff --cc src/MsgThread/Controller/src/MsgThread.cpp
index 7dc15ba,9fe4353..55c64b0
--- 1/src/MsgThread/Controller/src/MsgThread.cpp
--- 2/src/MsgThread/Controller/src/MsgThread.cpp
+++ b/src/MsgThread/Controller/src/MsgThread.cpp
@@@ -54,47 -66,11 +54,46 @@@ MsgThread::~MsgThread(
      getApp().getSysSettingsManager().removeListener(*this);
  }
  
 -Evas_Object *MsgThread::createSearchPanel(Evas_Object *parent)
 +void MsgThread::prepareSearchPanel()
 +{
 +    if(!m_pSearchPanel)
 +    {
 +        m_pSearchPanel = new MsgThreadSearchPanel(*m_pLayout);
 +        m_pSearchPanel->setListener(this);
-         m_pSearchPanel->setGuideText("Search");
 +        getNaviBar().setSearch(*m_pSearchPanel);
 +    }
 +}
 +
 +void MsgThread::prepareSearchList()
 +{
 +    if(!m_pSearchList)
 +    {
 +        m_pSearchList = new ThreadSearchList(*m_pLayout, getApp());
 +        m_pSearchList->setListener(this);
 +        m_pSearchList->show();
 +        m_pLayout->setSearchList(*m_pSearchList);
 +    }
 +}
 +
 +void MsgThread::prepareNoContentLayout()
 +{
 +    if(!m_pNoContent)
 +    {
 +        m_pNoContent = new NoContentLayout(*m_pLayout);
 +        m_pNoContent->show();
 +        m_pLayout->setNoContent(*m_pNoContent);
 +    }
 +}
 +
 +void MsgThread::prepareThreadList()
  {
 -    m_pSearchPanel = new MsgThreadSearchPanel(*m_pLayout);
 -    m_pSearchPanel->setListener(this);
 -    return *m_pSearchPanel;
 +    if(!m_pThreadList)
 +    {
 +        m_pThreadList = new ThreadList(*m_pLayout, getApp());
 +        m_pThreadList->setListener(this);
 +        m_pThreadList->show();
 +        m_pLayout->setList(*m_pThreadList);
 +    }
  }
  
  void MsgThread::onAttached(ViewItem &item)