Fixed jira issue(N_SE-36143, N_SE-36214, N_SE-36262, N_SE-36263, N_SE-36247, N_SE...

Change-Id: Ife5717a968eb6797bcbbadc844829d51e15c58ff

diff --git a/res/screen-size-normal/IDL_NOTIFICATION_TICKER_PANEL.xml b/res/screen-size-normal/IDL_NOTIFICATION_TICKER_PANEL.xml
new file mode 100644 (file)
index 0000000..9bcbbba
--- /dev/null
+++ b/res/screen-size-normal/IDL_NOTIFICATION_TICKER_PANEL.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+<!--\r
+       This XML file was automatically generated by UiBuilder - do not modify by hand.\r
+-->\r
+<!DOCTYPE ScenePanel SYSTEM "UIForm.dtd">\r
+<ScenePanel Bversion="2.0.0.201304191937" Dversion="20120315">\r
+    <Panel id="IDL_NOTIFICATION_TICKER_PANEL">\r
+        <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>\r
+        <layout height="48.0" mode="Portrait" type="LAYOUT_RELATIVE" width="720.0" x="0.0" y="0.0"/>\r
+        <layout height="48.0" mode="Landscape" type="LAYOUT_RELATIVE" width="1280.0" x="0.0" y="0.0"/>\r
+    </Panel>\r
+    <Label id="IDC_LABEL_NOTIFICATION_TEXT" parent="IDL_NOTIFICATION_TICKER_PANEL">\r
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="#444444" backgroundColorOpacity="100" horizontalAlign="ALIGN_CENTER" leftMargin="0" text="" textColor="#FFFFFF" textSize="33.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_MIDDLE"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="48.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_PARENT" width="720.0" x="0" y="0"/>\r
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="48.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_PARENT" width="1280.0" x="0" y="0"/>\r
+    </Label>\r
+</ScenePanel>\r

diff --git a/src/MpArtistContentListForm.cpp b/src/MpArtistContentListForm.cpp
index eeb5525..995794f 100644 (file)
--- a/src/MpArtistContentListForm.cpp
+++ b/src/MpArtistContentListForm.cpp
@@ -481,6 +481,11 @@ ArtistContentListForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                tableViewAnnexStyle = TABLE_VIEW_ANNEX_STYLE_MARK;
        }
 
+       if (__pPresentationModel->GetCurrentArtistAlbumIndex() != groupIndex)
+       {
+               __pPresentationModel->InitializeContentList(groupIndex);
+       }
+
        TableViewItem* pItem = new (std::nothrow) TableViewItem();
        ContentInformation* pContentInfo = __pPresentationModel->GetArtistAlbumContentInfoN(itemIndex);
 
@@ -488,11 +493,6 @@ ArtistContentListForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        TryCatch(r == E_SUCCESS, delete pItem, "pItem->Construct(%s)", GetErrorMessage(r));
        TryCatch(pContentInfo != null, delete pItem, "pContentInfo is null", GetErrorMessage(GetLastResult()));
 
-       if (__pPresentationModel->GetCurrentArtistAlbumIndex() != groupIndex)
-       {
-               __pPresentationModel->InitializeContentList(groupIndex);
-       }
-
        r = CreateTableViewItem(*pItem, *pContentInfo);
        TryCatch(r == E_SUCCESS, delete pItem, "CreateTableViewItem failed(%s)", GetErrorMessage(r));
        delete pContentInfo;

diff --git a/src/MpFolderContentListForm.cpp b/src/MpFolderContentListForm.cpp
index f66225b..e074555 100644 (file)
--- a/src/MpFolderContentListForm.cpp
+++ b/src/MpFolderContentListForm.cpp
@@ -555,11 +555,17 @@ FolderContentListForm::CreateTableViewItem(Tizen::Ui::Controls::TableViewItem& p
        tempPath.LastIndexOf(L"/", tempPath.GetLength() - 1, indexOf);
        tempPath.SubString(indexOf + 1, fileName);
 
-       if (IDS_STORAGE_PHONE_PATH.Contains(filePath))
+       String phonePath = IDS_STORAGE_PHONE_PATH;
+       phonePath.Remove(IDS_STORAGE_PHONE_PATH.GetLength() - 1, 1);
+
+       String sdCardPath = IDS_STORAGE_SDCARD_PATH;
+       phonePath.Remove(IDS_STORAGE_SDCARD_PATH.GetLength() - 1, 1);
+
+       if (filePath.Contains(phonePath))
        {
                StorageIconBitmap = ResourceManager::GetBitmapN(IDB_STORAGE_PHONE);
        }
-       else if (IDS_STORAGE_SDCARD_PATH.Contains(filePath))
+       else if (filePath.Contains(sdCardPath))
        {
                StorageIconBitmap = ResourceManager::GetBitmapN(IDB_STORAGE_SDCARD);
        }

diff --git a/src/MpFolderListEditorPanel.cpp b/src/MpFolderListEditorPanel.cpp
index 68aa2d2..d28c20e 100644 (file)
--- a/src/MpFolderListEditorPanel.cpp
+++ b/src/MpFolderListEditorPanel.cpp
@@ -331,11 +331,17 @@ FolderListEditorPanel::CreateTableViewItem(Tizen::Ui::Container& parent, const T
        contentPath.LastIndexOf(IDS_SEPARATOR_SLASH, contentPath.GetLength() - 1, folderNamePosition);
        contentPath.SubString(folderNamePosition + 1, strFolderName);
 
-       if (IDS_STORAGE_PHONE_PATH.Contains(contentPath))
+       String phonePath = IDS_STORAGE_PHONE_PATH;
+       phonePath.Remove(IDS_STORAGE_PHONE_PATH.GetLength() - 1, 1);
+
+       String sdCardPath = IDS_STORAGE_SDCARD_PATH;
+       phonePath.Remove(IDS_STORAGE_SDCARD_PATH.GetLength() - 1, 1);
+
+       if (contentPath.Contains(phonePath))
        {
                StorageIconBitmap = ResourceManager::GetBitmapN(IDB_STORAGE_PHONE);
        }
-       else if (IDS_STORAGE_SDCARD_PATH.Contains(contentPath))
+       else if (phonePath.Contains(sdCardPath))
        {
                StorageIconBitmap = ResourceManager::GetBitmapN(IDB_STORAGE_SDCARD);
        }

diff --git a/src/MpFolderListPanel.cpp b/src/MpFolderListPanel.cpp
index d169427..67c828f 100644 (file)
--- a/src/MpFolderListPanel.cpp
+++ b/src/MpFolderListPanel.cpp
@@ -338,11 +338,17 @@ FolderListPanel::CreateTableViewItem(Tizen::Ui::Container& parent, const Tizen::
        contentPath.LastIndexOf(IDS_SEPARATOR_SLASH, contentPath.GetLength() - 1, folderNamePosition);
        contentPath.SubString(folderNamePosition + 1, strFolderName);
 
-       if (IDS_STORAGE_PHONE_PATH.Contains(contentPath))
+       String phonePath = IDS_STORAGE_PHONE_PATH;
+       phonePath.Remove(IDS_STORAGE_PHONE_PATH.GetLength() - 1, 1);
+
+       String sdCardPath = IDS_STORAGE_SDCARD_PATH;
+       phonePath.Remove(IDS_STORAGE_SDCARD_PATH.GetLength() - 1, 1);
+
+       if (contentPath.Contains(phonePath))
        {
                StorageIconBitmap = ResourceManager::GetBitmapN(IDB_STORAGE_PHONE);
        }
-       else if (IDS_STORAGE_SDCARD_PATH.Contains(contentPath))
+       else if (contentPath.Contains(sdCardPath))
        {
                StorageIconBitmap = ResourceManager::GetBitmapN(IDB_STORAGE_SDCARD);
        }

diff --git a/src/MpMainFrame.cpp b/src/MpMainFrame.cpp
index c59d3fd..e1d6f27 100644 (file)
--- a/src/MpMainFrame.cpp
+++ b/src/MpMainFrame.cpp
@@ -88,7 +88,7 @@ void
 MainFrame::OnFrameRestored(const Tizen::Ui::Controls::Frame& source)
 {
        AppLogDebug("ENTER");
-#ifdef GO_TO_SCENE_AFTER_FRAME_MODE_FULL_SCREEN_ACTIVATED
+#if 1 //def GO_TO_SCENE_AFTER_FRAME_MODE_FULL_SCREEN_ACTIVATED
        SceneManager* pSceneManager = SceneManager::GetInstance();
        AppAssert(pSceneManager);
 

diff --git a/src/MpMiniPlayer.cpp b/src/MpMiniPlayer.cpp
index f09a200..88b2adb 100644 (file)
--- a/src/MpMiniPlayer.cpp
+++ b/src/MpMiniPlayer.cpp
@@ -364,6 +364,10 @@ MiniPlayer::OnPlayContentChanged(int currentContentIndex)
        {\r
                __pMinPlayerPlayToggleButton->SetEnabled(true);\r
        }\r
+       else if (__pPresentationModel->IsDuringCall() == true)\r
+       {\r
+               __pMinPlayerPlayToggleButton->SetEnabled(false);\r
+       }\r
        Invalidate(true);\r
        AppLogDebug("EXIT");\r
 }\r

diff --git a/src/MpMusicPlayerForm.cpp b/src/MpMusicPlayerForm.cpp
index 4ba4b90..c07a676 100644 (file)
--- a/src/MpMusicPlayerForm.cpp
+++ b/src/MpMusicPlayerForm.cpp
@@ -2043,12 +2043,19 @@ PlayerForm::SetPlayerScreenState(unsigned int playerScreenState)
                // fall through
        case PLAYER_SCREEN_STATE_APP_CONTROL:
                {
-                       __pContentsViewToggleButton->SetEnabled(false);
                        __pShuffleButton->SetEnabled(false);
                        __pRepeatButton->SetEnabled(false);
                        __prevRepeatStateRunByAppControl = __pPlayerPresentationModel->GetRepeatState();
                        SetRepeatButtonImage(IDA_TYPE_REPEAT_A);
 
+                       if (__pContentsListViewPanel->GetShowState() == true)
+                       {
+                               __pContentsListViewPanel->SetShowState(false);
+                               __pContentsViewToggleButton->SetActionId(IDA_BUTTON_CONTENTS_LIST_VIEW);
+                               __pContentsAlbumViewPanel->SetShowState(true);
+                       }
+                       __pContentsViewToggleButton->SetEnabled(false);
+
                        playerScreenState = PLAYER_SCREEN_STATE_APP_CONTROL;
                        __isRunByAppControl = true;
                }

diff --git a/src/MpMusicPlayerPresentationModel.cpp b/src/MpMusicPlayerPresentationModel.cpp
index a55510b..253fa9c 100644 (file)
--- a/src/MpMusicPlayerPresentationModel.cpp
+++ b/src/MpMusicPlayerPresentationModel.cpp
@@ -747,7 +747,7 @@ PlayerPresentationModel::Play(int contentIndex, int sliderPosition, bool bPauseP
                AppLogDebug("pPath = %ls", pPath->GetPointer());
                AppLogDebug("__pCurrentPlayContentPath = %ls", __pCurrentPlayContentPath->GetPointer());
                if (__pPlayer->GetState() == PLAYER_STATE_ENDOFCLIP
-                       || pPath->Equals(*__pCurrentPlayContentPath) == false)
+                       || pPath->Equals(*__pCurrentPlayContentPath) == false || __currentContentIndex != contentIndex)
                {
                        ClosePlayer();
                        InitializeProgress();

diff --git a/src/MpPlaylistReNameForm.cpp b/src/MpPlaylistReNameForm.cpp
index 9f7c4ad..fe37b0a 100644 (file)
--- a/src/MpPlaylistReNameForm.cpp
+++ b/src/MpPlaylistReNameForm.cpp
@@ -160,8 +160,20 @@ PlaylistReNameForm::OnActionPerformed(const Tizen::Ui::Control& source, int acti
        {
        case IDA_FOOTER_BUTTON_SAVE:
                {
-                       __pPlaylistEditorPresentationModel->SetPlayListName(*(static_cast<String*>(__pPlaylistEditorPresentationModel->GetAllPlayListNameN()->GetAt(__selectedPlaylistIndex))), __playlistName);
-                       pSceneManager->GoBackward(BackwardSceneTransition());
+                       result r = __pPlaylistEditorPresentationModel->SetPlayListName(*(static_cast<String*>(__pPlaylistEditorPresentationModel->GetAllPlayListNameN()->GetAt(__selectedPlaylistIndex))), __playlistName);
+                       if (r != E_SUCCESS)
+                       {
+                               MessageBox messageBox;
+                               messageBox.Construct(L"", ResourceManager::GetString(L"IDS_MUSIC_POP_UNABLE_RENAME_PLAYLIST"), MSGBOX_STYLE_NONE, 3000);
+                               int modalResult = 0;
+                               messageBox.ShowAndWait(modalResult);
+                               __pPlaylistEditField->SetFocus();
+                               __pPlaylistEditField->ShowKeypad();
+                       }
+                       else
+                       {
+                               pSceneManager->GoBackward(BackwardSceneTransition());
+                       }
                }
                break;
 
@@ -185,7 +197,7 @@ PlaylistReNameForm::OnTextValueChanged(const Tizen::Ui::Control& source)
        {
                CommonUtil::SetFooterItemEnabled(*pFooter, false);
        }
-       else
+       else if (__pPlaylistEditorPresentationModel->IsPlaylistExist(__orignalPlaylistName) == true)
        {
                CommonUtil::SetFooterItemEnabled(*pFooter, true);
        }

diff --git a/src/MpSearchForm.cpp b/src/MpSearchForm.cpp
index 19a45c9..79c7912 100644 (file)
--- a/src/MpSearchForm.cpp
+++ b/src/MpSearchForm.cpp
@@ -668,6 +668,7 @@ SearchForm::OnFormBackRequested(Tizen::Ui::Controls::Form& source)
        SceneManager* pSceneManager = SceneManager::GetInstance();
        AppAssert(pSceneManager);
 
+       __pSearchTableView->SetItemProvider(static_cast<ITableViewItemProvider*>(null));
        pSceneManager->GoForward(ForwardSceneTransition(__pSceneId->GetPointer(), SCENE_TRANSITION_ANIMATION_TYPE_NONE, SCENE_HISTORY_OPTION_NO_HISTORY, SCENE_DESTROY_OPTION_DESTROY));
        AppLogDebug("EXIT");
 }