equal
deleted
inserted
replaced
2502 TUid /* aCustomMessageId */, |
2502 TUid /* aCustomMessageId */, |
2503 const TDesC8& /* aCustomMessage */ ) |
2503 const TDesC8& /* aCustomMessage */ ) |
2504 { |
2504 { |
2505 MPX_FUNC_EX( "CMPXCommonPlaybackViewImp::DoActivateL()" ); |
2505 MPX_FUNC_EX( "CMPXCommonPlaybackViewImp::DoActivateL()" ); |
2506 |
2506 |
2507 if( aPrevViewId.iAppUid == KAppUidMusicPlayerX && iContainer ) |
|
2508 { |
|
2509 // record the begin state for the transition animation. |
|
2510 iContainer->BeginTransition(); |
|
2511 } |
|
2512 |
|
2513 iSwitchingView = EFalse; |
2507 iSwitchingView = EFalse; |
2514 iDatabaseNotReady = EFalse; |
2508 iDatabaseNotReady = EFalse; |
2515 iUnsupportedNoteDisabled = EFalse; |
2509 iUnsupportedNoteDisabled = EFalse; |
2516 delete iOldUri; |
2510 delete iOldUri; |
2517 iOldUri = NULL; |
2511 iOldUri = NULL; |
2567 R_TEXT_SOFTKEY_EMPTY, |
2561 R_TEXT_SOFTKEY_EMPTY, |
2568 EAknSoftkeyForwardKeyEvent ); |
2562 EAknSoftkeyForwardKeyEvent ); |
2569 #endif // __ENABLE_MSK |
2563 #endif // __ENABLE_MSK |
2570 } |
2564 } |
2571 } |
2565 } |
|
2566 |
|
2567 if( aPrevViewId.iAppUid == KAppUidMusicPlayerX && iContainer ) |
|
2568 { |
|
2569 iContainer->SetTransitionType(EMPXTranstionToLeft); |
|
2570 // Transition was started in collection view, we end it here. |
|
2571 iContainer->EndTransition(); |
|
2572 } |
|
2573 |
2572 |
2574 |
2573 iPlaybackState = iPlaybackUtility->StateL(); |
2575 iPlaybackState = iPlaybackUtility->StateL(); |
2574 MPX_DEBUG2("CMPXCommonPlaybackViewImp::DoActivateL(): state = %d", iPlaybackState); |
2576 MPX_DEBUG2("CMPXCommonPlaybackViewImp::DoActivateL(): state = %d", iPlaybackState); |
2575 if ( iPlaybackState == EPbStateInitialising ) |
2577 if ( iPlaybackState == EPbStateInitialising ) |
2576 { |
2578 { |
4074 TRAP_IGNORE( iViewUtility->ActivateViewL( TUid::Uid(KMPXPluginTypeMetadataEditorUid) ) ); |
4076 TRAP_IGNORE( iViewUtility->ActivateViewL( TUid::Uid(KMPXPluginTypeMetadataEditorUid) ) ); |
4075 if ( toolbar ) |
4077 if ( toolbar ) |
4076 { |
4078 { |
4077 toolbar->SetToolbarVisibility(ETrue); |
4079 toolbar->SetToolbarVisibility(ETrue); |
4078 } |
4080 } |
|
4081 iContainer->SetRect( ClientRect()); |
|
4082 iContainer->DrawDeferred(); |
4079 } |
4083 } |
4080 |
4084 |
4081 // End of File |
4085 // End of File |