equal
deleted
inserted
replaced
1556 case EAknSoftkeyEmpty: // Must handle this key, but do nothing |
1556 case EAknSoftkeyEmpty: // Must handle this key, but do nothing |
1557 break; |
1557 break; |
1558 // ----------------------------------------------------- |
1558 // ----------------------------------------------------- |
1559 case ECamCmdPhotos: |
1559 case ECamCmdPhotos: |
1560 { |
1560 { |
|
1561 iController.ReleaseCamera(); |
1561 TUid msgUidLastModified(TUid::Uid(KGlxActivationCmdShowLastModified)); |
1562 TUid msgUidLastModified(TUid::Uid(KGlxActivationCmdShowLastModified)); |
1562 TUid msgUidCameraAlbum(TUid::Uid(KGlxActivationCameraAlbum)); |
1563 TUid msgUidCameraAlbum(TUid::Uid(KGlxActivationCameraAlbum)); |
1563 TApaTaskList apaTaskList( CCoeEnv::Static()->WsSession() ); |
1564 TApaTaskList apaTaskList( CCoeEnv::Static()->WsSession() ); |
1564 TApaTask apaTask = apaTaskList.FindApp( TUid::Uid( KGlxGalleryApplicationUid) ); |
1565 TApaTask apaTask = apaTaskList.FindApp( TUid::Uid( KGlxGalleryApplicationUid) ); |
1565 |
1566 |
3443 //so we need to display toolbar when keylock is set to off and camera gain focus again. |
3444 //so we need to display toolbar when keylock is set to off and camera gain focus again. |
3444 if ( ECamViewStatePreCapture == iViewState && |
3445 if ( ECamViewStatePreCapture == iViewState && |
3445 ECamPreCapViewfinder == iPreCaptureMode && |
3446 ECamPreCapViewfinder == iPreCaptureMode && |
3446 ( !( iSelfTimer && iSelfTimer->IsActive() ) ) && |
3447 ( !( iSelfTimer && iSelfTimer->IsActive() ) ) && |
3447 iController.CurrentOperation() != ECamCapturing && |
3448 iController.CurrentOperation() != ECamCapturing && |
3448 iController.CurrentOperation() != ECamPaused ) |
3449 iController.CurrentOperation() != ECamPaused && |
|
3450 !iReturningFromPretendExit ) |
3449 { |
3451 { |
3450 SetToolbarVisibility(); |
3452 SetToolbarVisibility(); |
3451 } |
3453 } |
3452 |
3454 |
3453 // If keylock is set on when recording is starting up but not yet |
3455 // If keylock is set on when recording is starting up but not yet |