equal
deleted
inserted
replaced
2553 } |
2553 } |
2554 } |
2554 } |
2555 SetCameraSwitchRequired( ESwitchDone ); |
2555 SetCameraSwitchRequired( ESwitchDone ); |
2556 CCamAppUi* appUi = static_cast<CCamAppUi*>( CEikonEnv::Static()->AppUi() ); |
2556 CCamAppUi* appUi = static_cast<CCamAppUi*>( CEikonEnv::Static()->AppUi() ); |
2557 iCameraController->SwitchCameraL( (ECamActiveCameraPrimary == targetCamera) ? 0 : 1 ); |
2557 iCameraController->SwitchCameraL( (ECamActiveCameraPrimary == targetCamera) ? 0 : 1 ); |
|
2558 if( UiConfigManagerPtr()->IsUIOrientationOverrideSupported() ) |
|
2559 { |
|
2560 RArray<TInt> screenModeValues; |
|
2561 UiConfigManagerPtr()->SupportedScreenModesL( screenModeValues ); |
|
2562 TInt landscapeScreenMode = screenModeValues[0]; |
|
2563 SetCameraOrientationModeL( landscapeScreenMode ); |
|
2564 } |
2558 iCameraController->CompleteSwitchCameraL(); |
2565 iCameraController->CompleteSwitchCameraL(); |
2559 |
2566 |
2560 // Camera switched. |
2567 // Camera switched. |
2561 // a) Set current camera index to the new one. |
2568 // a) Set current camera index to the new one. |
2562 // b) Set target mode (video/image) to the one before mode switch. |
2569 // b) Set target mode (video/image) to the one before mode switch. |
9243 if ( aStatus == KErrCancel ) |
9250 if ( aStatus == KErrCancel ) |
9244 { |
9251 { |
9245 // sequence canceled, no need to event further |
9252 // sequence canceled, no need to event further |
9246 return; |
9253 return; |
9247 } |
9254 } |
|
9255 else if( aStatus == KErrNone ) |
|
9256 { |
|
9257 //Reset standbystatus. Needed if recovered from error. |
|
9258 if( IsAppUiAvailable() ) |
|
9259 { |
|
9260 if ( !InVideocallOrRinging() ) |
|
9261 { |
|
9262 CCamAppUi* appUi = static_cast<CCamAppUi*>( CEikonEnv::Static()->AppUi() ); |
|
9263 appUi->SetStandbyStatus( aStatus ); |
|
9264 } |
|
9265 } |
|
9266 } |
9248 break; |
9267 break; |
9249 } |
9268 } |
9250 //Image capture event |
9269 //Image capture event |
9251 case ECamCameraEventImageCaptureEvent: |
9270 case ECamCameraEventImageCaptureEvent: |
9252 { |
9271 { |