Fixed jira issue and modified TableViewContextItem position

Change-Id: Ic72e41c0ed8d093f3cc1a02d7088029015fedcc6

diff --git a/src/MpAlbumListPanel.cpp b/src/MpAlbumListPanel.cpp
index e4ff43c..acb5a9a 100644 (file)
--- a/src/MpAlbumListPanel.cpp
+++ b/src/MpAlbumListPanel.cpp
@@ -282,6 +282,10 @@ AlbumListPanel::OnTableViewContextItemActivationStateChanged(Tizen::Ui::Controls
        if (activated == true)
        {
                __itemIndex = itemIndex;
+
+               pContextItem->SetSize(GetWidth(), ITEM_HEIGHT);
+               (pContextItem->GetControl(0))->SetSize(pContextItem->GetSize());
+               pContextItem->Invalidate(true);
        }
        AppLogDebug("EXIT");
 }

diff --git a/src/MpAllListPanel.cpp b/src/MpAllListPanel.cpp
index 709b966..14703a2 100644 (file)
--- a/src/MpAllListPanel.cpp
+++ b/src/MpAllListPanel.cpp
@@ -503,6 +503,10 @@ AllListPanel::OnTableViewContextItemActivationStateChanged(Tizen::Ui::Controls::
        if (activated == true)
        {
                __itemIndex = itemIndex;
+
+               pContextItem->SetSize(GetWidth(), ITEM_HEIGHT);
+               (pContextItem->GetControl(0))->SetSize(pContextItem->GetSize());
+               pContextItem->Invalidate(true);
        }
        AppLogDebug("EXIT");
 }

diff --git a/src/MpArtistContentListForm.cpp b/src/MpArtistContentListForm.cpp
index eeb5525..b7bbc87 100644 (file)
--- a/src/MpArtistContentListForm.cpp
+++ b/src/MpArtistContentListForm.cpp
@@ -376,6 +376,10 @@ ArtistContentListForm::OnGroupedTableViewContextItemActivationStateChanged(Tizen
        {
                __activatedStateContextItem.__groupIndex = groupIndex;
                __activatedStateContextItem.__itemIndex = itemIndex;
+
+               pContextItem->SetSize(GetWidth(), ITEM_HEIGHT);
+               (pContextItem->GetControl(0))->SetSize(pContextItem->GetSize());
+               pContextItem->Invalidate(true);
        }
        AppLogDebug("EXIT");
 }

diff --git a/src/MpArtistListPanel.cpp b/src/MpArtistListPanel.cpp
index f8c6e35..4eb5a5f 100644 (file)
--- a/src/MpArtistListPanel.cpp
+++ b/src/MpArtistListPanel.cpp
@@ -300,6 +300,10 @@ ArtistListPanel::OnTableViewContextItemActivationStateChanged(Tizen::Ui::Control
        if (activated == true)
        {
                __itemIndex = itemIndex;
+
+               pContextItem->SetSize(GetWidth(), ITEM_HEIGHT);
+               (pContextItem->GetControl(0))->SetSize(pContextItem->GetSize());
+               pContextItem->Invalidate(true);
        }
        AppLogDebug("EXIT");
 }

diff --git a/src/MpArtistListPresentationModel.cpp b/src/MpArtistListPresentationModel.cpp
index f97efda..c954a6a 100644 (file)
--- a/src/MpArtistListPresentationModel.cpp
+++ b/src/MpArtistListPresentationModel.cpp
@@ -400,9 +400,15 @@ ContentInformation*
 ArtistListPresentationModel::GetArtistAlbumContentInfoN(int contentIndex)
 {
        AppLogDebug("ENTER");
-       ContentSearchResult* pResult = static_cast<ContentSearchResult*>(__pArtistAlbumContentList->GetAt(contentIndex));
+       if (__pArtistAlbumContentList == null)
+       {
+               AppLogDebug("EXIT");
+               return null;
+       }
 
        ContentInformation* pContentInformation = null;
+       ContentSearchResult* pResult = static_cast<ContentSearchResult*>(__pArtistAlbumContentList->GetAt(contentIndex));
+
        if (pResult!= null && pResult->GetContentType() == CONTENT_TYPE_AUDIO)
        {
                pContentInformation = CommonUtil::GetContentInformationN(*static_cast<AudioContentInfo*>(pResult->GetContentInfo()));

diff --git a/src/MpCommonUtil.cpp b/src/MpCommonUtil.cpp
index 17df1eb..64a582c 100644 (file)
--- a/src/MpCommonUtil.cpp
+++ b/src/MpCommonUtil.cpp
@@ -777,23 +777,23 @@ CommonUtil::CreateTableViewContextItemN(Tizen::Ui::IActionEventListener& listene
        pTableViewContextItem->AddControl(*pItem);
        pTableViewContextItem->SetIndividualSelectionEnabled(pItem, true);
 
-       int controlCount = pItem->GetControlCount();
-       if (controlCount != INIT_VALUE)
-       {
-                Tizen::Ui::GridLayout* pGridLayout = dynamic_cast<Tizen::Ui::GridLayout*>(pItem->GetLandscapeLayoutN());
-                if (pGridLayout != null)
-                {
-                        int margin = 80;
-                        if (controlCount == 1)
-                        {
-                                margin = 106;
-                        }
-
-                        pGridLayout->SetColumnSpacing(controlCount, margin);
-                        pGridLayout->Update();
-                        delete pGridLayout;
-                }
-       }
+//     int controlCount = pItem->GetControlCount();
+//     if (controlCount != INIT_VALUE)
+//     {
+//              Tizen::Ui::GridLayout* pGridLayout = dynamic_cast<Tizen::Ui::GridLayout*>(pItem->GetLandscapeLayoutN());
+//              if (pGridLayout != null)
+//              {
+//                      int margin = 80;
+//                      if (controlCount == 1)
+//                      {
+//                              margin = 106;
+//                      }
+//
+//                      pGridLayout->SetColumnSpacing(controlCount, margin);
+//                      pGridLayout->Update();
+//                      delete pGridLayout;
+//              }
+//     }
        AppLogDebug("EXIT");
        return pTableViewContextItem;
 }

diff --git a/src/MpFolderListPanel.cpp b/src/MpFolderListPanel.cpp
index 991da17..c425ec1 100644 (file)
--- a/src/MpFolderListPanel.cpp
+++ b/src/MpFolderListPanel.cpp
@@ -266,6 +266,10 @@ FolderListPanel::OnTableViewContextItemActivationStateChanged(Tizen::Ui::Control
        if (activated == true)
        {
                __itemIndex = itemIndex;
+
+               pContextItem->SetSize(GetWidth(), ITEM_HEIGHT);
+               (pContextItem->GetControl(0))->SetSize(pContextItem->GetSize());
+               pContextItem->Invalidate(true);
        }
        AppLogDebug("EXIT");
 }

diff --git a/src/MpMusicPlayerPresentationModel.cpp b/src/MpMusicPlayerPresentationModel.cpp
index fb9d639..dbb143d 100644 (file)
--- a/src/MpMusicPlayerPresentationModel.cpp
+++ b/src/MpMusicPlayerPresentationModel.cpp
@@ -243,7 +243,7 @@ PlayerPresentationModel::OnTelephonyCallStatusChangedN(Tizen::Telephony::CallSta
 {
        AppLogDebug("ENTER");
        AppLogDebug("callStatus : %d", callStatus);
-       if (callStatus == CALL_STATUS_IDLE)
+       if (callStatus == CALL_STATUS_IDLE || callStatus == CALL_STATUS_COMMUNICATING)
        {
                CallOnPlayContentChanged(__currentContentIndex);
        }

diff --git a/src/MpPlaylistListPanel.cpp b/src/MpPlaylistListPanel.cpp
index 9feb07e..bffaca3 100644 (file)
--- a/src/MpPlaylistListPanel.cpp
+++ b/src/MpPlaylistListPanel.cpp
@@ -493,6 +493,12 @@ PlaylistListPanel::OnTableViewContextItemActivationStateChanged(Tizen::Ui::Contr
                AppLogDebug("EXIT");
                return;
        }
+       else
+       {
+               pContextItem->SetSize(GetWidth(), ITEM_HEIGHT);
+               (pContextItem->GetControl(0))->SetSize(pContextItem->GetSize());
+               pContextItem->Invalidate(true);
+       }
        __selectedItemIndex = itemIndex;
        AppLogDebug("EXIT");
 }