537 // Do not do softkey update if we are already exiting |
537 // Do not do softkey update if we are already exiting |
538 // (AppUi is not available) |
538 // (AppUi is not available) |
539 if( iController.IsAppUiAvailable() ) |
539 if( iController.IsAppUiAvailable() ) |
540 { |
540 { |
541 PRINT( _L( "Camera <> case ECamEventEngineStateChanged" ) ); |
541 PRINT( _L( "Camera <> case ECamEventEngineStateChanged" ) ); |
542 // <CAMERAAPP_CAPI_V2_MIGRATION/> |
|
543 // if ( iController.EngineState() == ECamEngineStillCapturePrepared || |
|
544 // iController.EngineState() == ECamEngineVideoCapturePrepared ) |
|
545 if ( ECamCameraPreparedVideo == iController.CameraState() || |
542 if ( ECamCameraPreparedVideo == iController.CameraState() || |
546 ECamCameraPreparedImage == iController.CameraState() ) |
543 ECamCameraPreparedImage == iController.CameraState() ) |
547 { |
544 { |
548 // Now that the view is initialised, we may need to put up the |
545 // Now that the view is initialised, we may need to put up the |
549 // mmc removal note. Perform this is required. |
546 // mmc removal note. Perform this is required. |
553 // Do not update (show) precapture view toolbar if capturing is almost |
550 // Do not update (show) precapture view toolbar if capturing is almost |
554 // finished, otherwise there is flickering and finally inactive toolbar |
551 // finished, otherwise there is flickering and finally inactive toolbar |
555 // when returning to prepactureview after image deletion. |
552 // when returning to prepactureview after image deletion. |
556 // This will happen only if camera is started directly to portrait |
553 // This will happen only if camera is started directly to portrait |
557 // secondary camera i.e. Lens cover feature is supported |
554 // secondary camera i.e. Lens cover feature is supported |
558 TBool noToolbar = (ECamCompleting == iController.CurrentOperation() ) && appUi->IsSecondCameraEnabled(); |
555 TBool noToolbar = ( ECamCompleting == iController.CurrentOperation() ) && appUi->IsSecondCameraEnabled(); |
559 |
556 |
560 if ( ECamCameraPreparedImage == iController.CameraState() && |
557 TBool showVideoModeToolbar = ( ECamCameraPreparedVideo == iController.CameraState() && |
561 !appUi->IsBurstEnabled() && !noToolbar |
558 ( iController.CurrentOperation() != ECamCapturing && iController.CurrentOperation() != ECamPaused ) ); |
562 && !iStandbyModeActive ) |
559 |
|
560 TBool precaptureToolbarState = !appUi->IsBurstEnabled() |
|
561 && !iStandbyModeActive && !appUi->IsInPretendExit(); |
|
562 |
|
563 if ( ( ECamCameraPreparedImage == iController.CameraState() || |
|
564 showVideoModeToolbar ) && |
|
565 !noToolbar && precaptureToolbarState ) |
563 { |
566 { |
564 // Also fixed toolbar might need to be enabled. |
567 // Also fixed toolbar might need to be enabled. |
565 appUi->SetToolbarVisibility(); |
568 appUi->SetToolbarVisibility(); |
566 } |
569 } |
567 } |
570 } |