equal
deleted
inserted
replaced
332 iDSASupported = iController.UiConfigManagerPtr()->IsDSAViewFinderSupported(); |
332 iDSASupported = iController.UiConfigManagerPtr()->IsDSAViewFinderSupported(); |
333 |
333 |
334 TBool uiOrientationOverride = iController.UiConfigManagerPtr()->IsUIOrientationOverrideSupported(); |
334 TBool uiOrientationOverride = iController.UiConfigManagerPtr()->IsUIOrientationOverrideSupported(); |
335 |
335 |
336 // Get the screenmode values used for setting the orientation |
336 // Get the screenmode values used for setting the orientation |
337 RArray<TInt> screenModeValues; |
337 |
338 if ( uiOrientationOverride ) |
338 if ( uiOrientationOverride ) |
339 { |
339 { |
|
340 RArray<TInt> screenModeValues; |
|
341 CleanupClosePushL( screenModeValues ); |
340 iController.UiConfigManagerPtr()->SupportedScreenModesL( screenModeValues ); |
342 iController.UiConfigManagerPtr()->SupportedScreenModesL( screenModeValues ); |
341 iLandscapeScreenMode = screenModeValues[0]; |
343 iLandscapeScreenMode = screenModeValues[0]; |
342 iPortraitScreenMode = screenModeValues[1]; |
344 iPortraitScreenMode = screenModeValues[1]; |
|
345 CleanupStack::PopAndDestroy( &screenModeValues ); |
343 } |
346 } |
344 |
347 |
345 // The embedded views are set after ConstructL completes |
348 // The embedded views are set after ConstructL completes |
346 // but the value is only of interest if the app is embedded |
349 // but the value is only of interest if the app is embedded |
347 iEmbeddedViewSet = !IsEmbedded(); |
350 iEmbeddedViewSet = !IsEmbedded(); |
5487 OstTrace0( CAMERAAPP_PERFORMANCE_DETAIL, CCAMAPPUI_INTERNALEXITL, "e_CCamAppUi_InternalExitL 1" ); |
5490 OstTrace0( CAMERAAPP_PERFORMANCE_DETAIL, CCAMAPPUI_INTERNALEXITL, "e_CCamAppUi_InternalExitL 1" ); |
5488 |
5491 |
5489 PRINT( _L("Camera => CCamAppUi::InternalExitL") ); |
5492 PRINT( _L("Camera => CCamAppUi::InternalExitL") ); |
5490 |
5493 |
5491 iController.StoreFaceTrackingValue(); // store the current FT setting |
5494 iController.StoreFaceTrackingValue(); // store the current FT setting |
|
5495 |
|
5496 if ( iMode == ECamControllerVideo ) |
|
5497 { |
|
5498 // Prevent flickering when returning to default Still image mode |
|
5499 CCamViewBase* precapView = static_cast<CCamViewBase*>( iView ); |
|
5500 __ASSERT_DEBUG( precapView, CamPanic( ECamPanicNullPointer )); |
|
5501 precapView->ViewCba()->MakeVisible( EFalse ); |
|
5502 } |
5492 |
5503 |
5493 if ( iController.UiConfigManagerPtr() && |
5504 if ( iController.UiConfigManagerPtr() && |
5494 iController.UiConfigManagerPtr()->IsLocationSupported() ) |
5505 iController.UiConfigManagerPtr()->IsLocationSupported() ) |
5495 { |
5506 { |
5496 // If record location setting is on, stop location trail |
5507 // If record location setting is on, stop location trail |
7866 SetActivePaletteVisibility( EFalse ); |
7877 SetActivePaletteVisibility( EFalse ); |
7867 } |
7878 } |
7868 |
7879 |
7869 if ( iViewState != ECamViewStateUserSceneSetup ) |
7880 if ( iViewState != ECamViewStateUserSceneSetup ) |
7870 { |
7881 { |
7871 if ( CamUtility::IsNhdDevice() ) |
7882 if ( AknLayoutUtils::PenEnabled() ) |
7872 { |
7883 { |
7873 StatusPane()->MakeVisible( aMode == ECamPreCapStandby || |
7884 StatusPane()->MakeVisible( aMode == ECamPreCapStandby || |
7874 IsSecondCameraEnabled() && |
7885 IsSecondCameraEnabled() && |
7875 !IsQwerty2ndCamera() || |
7886 !IsQwerty2ndCamera() || |
7876 SettingsLaunchedFromCamera() ); |
7887 SettingsLaunchedFromCamera() ); |