Fixed jira issue and fixed prevent issue

[apps/osp/MusicPlayer.git] / src / MpMusicPlayerForm.cpp

diff --git a/src/MpMusicPlayerForm.cpp b/src/MpMusicPlayerForm.cpp
index c890183..2a6e8be 100644 (file)
--- a/src/MpMusicPlayerForm.cpp
+++ b/src/MpMusicPlayerForm.cpp
@@ -143,6 +143,7 @@ PlayerForm::PlayerForm(void)
        , __transactionID(ANIMATION_TRANSACTION_STATUS_STOPPED)
        , __playerScreenState(PLAYER_SCREEN_STATE_NORMAL)
        , __isAnimationPerformed(false)
+       , __isRunByAppControl(false)
        , __pAnimationFinishedTimer(null)
        , __pContentPlayTimer(null)
        , __pPreviousSceneId(null)
@@ -404,6 +405,8 @@ PlayerForm::OnTerminating(void)
                __pAlbumArtElements = null;
        }
 
+       __isRunByAppControl =  false;
+
        RemoveContextMenu();
        RemoveSharePicker();
        RemovePlayListPicker();
@@ -1190,9 +1193,14 @@ PlayerForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId,
                SetContentInfo( __pPlayerPresentationModel->GetCurrentContentIndex());
                OnPlayStateChanged(__pPlayerPresentationModel->GetPlayerState());
                OnPlayTimeChanged(__pPlayerPresentationModel->GetCurrentDuration(), __pPlayerPresentationModel->GetPlayPosition());
+
+               if (GetPlayerScreenState() == PLAYER_SCREEN_STATE_DURING_CALL)
+               {
+                       SetPlayerScreenState(PLAYER_SCREEN_STATE_NORMAL);
+               }
        }
 
-       if (__pContentsListViewPanel->GetShowState() == true)
+       if (__pContentsListViewPanel->IsEnabled() == true && __isRunByAppControl == false)
        {
                TableView* pContentsTableView = static_cast<TableView*>(__pContentsListViewPanel->GetControl(IDC_CONTENTS_TABLEVIEW));
                pContentsTableView->UpdateTableView();
@@ -1611,8 +1619,11 @@ PlayerForm::SetFileNotExistState(bool isFileExist)
        __pMoreContextButton->SetEnabled(isFileExist);
        __pMoreContextButton->Invalidate(true);
 
-       __pContentsViewToggleButton->SetEnabled(isFileExist);
-       __pContentsViewToggleButton->Invalidate(true);
+       if (__isRunByAppControl == false)
+       {
+               __pContentsViewToggleButton->SetEnabled(isFileExist);
+               __pContentsViewToggleButton->Invalidate(true);
+       }
        AppLogDebug("EXIT");
 }
 
@@ -1964,6 +1975,21 @@ PlayerForm::SetPlayerScreenState(unsigned int playerScreenState)
                        __pForwardButton->SetEnabled(true);
                        __pPlayStateSlider->SetEnabled(true);
                        __pMoreContextButton->SetEnabled(true);
+
+                       if (__isRunByAppControl == false)
+                       {
+                               break;
+                       }
+               }
+               // fall through
+       case PLAYER_SCREEN_STATE_APP_CONTROL:
+               {
+                       __pContentsViewToggleButton->SetEnabled(false);
+                       __pContentsViewToggleButton->Invalidate(true);
+                       __pShuffleButton->SetEnabled(false);
+                       __pRepeatButton->SetEnabled(false);
+
+                       __isRunByAppControl = true;
                }
                break;
 
@@ -1982,15 +2008,6 @@ PlayerForm::SetPlayerScreenState(unsigned int playerScreenState)
                        Bitmap* pThumb = ResourceManager::GetBitmapN(L"music_play_grid_thumb_loading.png");
                        static_cast<Label*>(__pContentsAlbumViewPanel->GetControl(IDC_CONTENTS_THUMBNAIL))->SetBackgroundBitmap(*pThumb);
                        delete pThumb;
-//                     static_cast<Label*>(__pContentsAlbumViewPanel->GetControl(IDC_CONTENTS_THUMBNAIL))->RemoveTouchEventListener(*this);
-               }
-               break;
-
-       case PLAYER_SCREEN_STATE_APP_CONTROL:
-               {
-                       __pContentsViewToggleButton->SetEnabled(false);
-                       __pShuffleButton->SetEnabled(false);
-                       __pRepeatButton->SetEnabled(false);
                }
                break;
 
@@ -2002,7 +2019,6 @@ PlayerForm::SetPlayerScreenState(unsigned int playerScreenState)
                        Bitmap* pThumb = ResourceManager::GetBitmapN(L"music_play_grid_thumb_loading.png");
                        static_cast<Label*>(__pContentsAlbumViewPanel->GetControl(IDC_CONTENTS_THUMBNAIL))->SetBackgroundBitmap(*pThumb);
                        delete pThumb;
-//                     static_cast<Label*>(__pContentsAlbumViewPanel->GetControl(IDC_CONTENTS_THUMBNAIL))->RemoveTouchEventListener(*this);
                }
                break;