FCL/sf/app/camera: comparison camerauis/cameraapp/generic/src/CamAppui.cpp

equal deleted inserted replaced

-:8c55c525d5d7
+:d486e5e3cc9a
 * Nokia Corporation - initial contribution.
 *
 * Contributors:
 *
 * Description:  App UI class for cameraapp
 *
 */
 // This needs to be included first, because other include files
 // may be variated using these flags.
 #include "s32mem.h"
 #include "camflashstatus.h"
 #include "CamMemoryMonitor.h"
+#include "camstartuplogocontroller.h"
 // ===========================================================================
 // Constants
 {
 iMemoryMonitor->StopMonitoring();
 delete iMemoryMonitor;
 iMemoryMonitor = 0;
 }
+delete iStartupLogoController;
 iController.SetAppUiAvailable( EFalse );
 iResourceLoaders.Close();
 {
 iUiConstructionComplete = ETrue;
 }
 iMemoryMonitor->StartMonitoring( iController.UiConfigManagerPtr()->CriticalLevelRamMemoryFocusGained(),
 iController.UiConfigManagerPtr()->RequiredRamMemoryFocusGained() );
+// TRAP errors so camera starts up even if startup animation fails
+TRAP_IGNORE(iStartupLogoController = CCamStartupLogoController::NewL(EStartupLogoVisible));
 PRINT( _L("Camera <= CCamAppUi::ConstructL") )
 OstTrace0( CAMERAAPP_PERFORMANCE_DETAIL, DUP3_CCAMAPPUI_CONSTRUCTL, "e_CCamAppUi_ConstructL 0" );
 }
 iResourceLoaders[rl]->ReloadResourceDataL();
 }
 iCamSidePane->UpdateLayout();
 iTargetViewState = ECamViewStatePreCapture;
-delete iScreenClearer;
-iScreenClearer = NULL;
-iScreenClearer = CAknLocalScreenClearer::NewL(
-IsSecondCameraEnabled() || IsQwerty2ndCamera() );
 TrySwitchViewL( ETrue );
 iController.SwitchCameraL();
 }
 }
 }
 !AppInBackground( EFalse )  )
 {
 if( ECamViewStateStandby != iViewState )
 {
 DismissMemoryNoteL();
+if (iStartupLogoController)
+{
+iStartupLogoController->HideLogo();
+}
 if( IsInternalView( iViewState ) )
 {
 if ( aStatus != KErrInUse &&
 iPreCaptureMode == ECamPreCapCaptureSetup ||
 {
 CompleteAppUIConstructionL();
 }
 else
 {
-static_cast<CCamViewBase*>( iView )->ExitAllModesL();
+if( iView)
+{
+static_cast<CCamViewBase*>( iView )->ExitAllModesL();
+}
 }
 }
 }
 // Not InternalView
 // relinquish capture keys
 UnRegisterCaptureKeys();
 }
 #endif
 }
+if (iStartupLogoController)
+{
+iStartupLogoController->HideLogo();
+}
 if( AppInBackground(EFalse) || ( !CamUtility::IsBatteryPowerOK() &&
 !CamUtility::IsBatteryCharging() ) )
 {
 if( ECamControllerVideo == iMode )
 {
 if ( !uiOverride )
 {
 iController.CheckMemoryToUseL();
 }
-TBool returningFromPretendExit = iPretendExit;
 iPretendExit = EFalse;
 TCamViewSwitch switchNeeded = ECamViewSwitchNone;
 // if a view switch has been waiting for the application to get
 toolbar->SetToolbarVisibility( EFalse );
 }
 }
 }
 }
+if (iStartupLogoController && iReturningFromPretendExit)
+{
+iStartupLogoController->ShowLogo();
+}
 break;
 }
 // -----------------------------------------------------
 case EEventFocusLost:
 {
 {
 currentLocation = static_cast<TCamMediaStorage>(
 iController.IntegerSettingValue( key ) );
 }
 if(currentLocation != ECamMediaStoragePhone &&
-!IsMemoryFullOrUnavailable(ECamMediaStoragePhone))
+				!IsMemoryFullOrUnavailable(ECamMediaStoragePhone) &&
-{
+				!iController.IntegerSettingValue( ECamSettingItemRemovePhoneMemoryUsage ) )
-supportedMemTypes |=
+				{
-AknCommonDialogsDynMem::EMemoryTypePhone;
+				supportedMemTypes |= AknCommonDialogsDynMem::EMemoryTypePhone;
-}
+				}
-if(currentLocation != ECamMediaStorageCard &&
+			if(currentLocation != ECamMediaStorageCard &&
-!IsMemoryFullOrUnavailable(ECamMediaStorageCard))
+				!IsMemoryFullOrUnavailable(ECamMediaStorageCard))
-{
+				{
-supportedMemTypes |=
+				supportedMemTypes |= AknCommonDialogsDynMem::EMemoryTypeMMCExternal;
-AknCommonDialogsDynMem::EMemoryTypeMMCExternal;
+				}
-}
+			if(currentLocation != ECamMediaStorageMassStorage &&
-if(currentLocation != ECamMediaStorageMassStorage &&
+				!IsMemoryFullOrUnavailable(ECamMediaStorageMassStorage))
-!IsMemoryFullOrUnavailable(ECamMediaStorageMassStorage))
+				{
-{
 supportedMemTypes |=
 AknCommonDialogsDynMem::EMemoryTypeInternalMassStorage;
 }
 CAknMemorySelectionDialogMultiDrive* memoryDialog =
 {
 iController.StopViewFinder();
 iViewFinderStopped = ETrue;
 }
+if ( iStartupLogoController )
+{
+iStartupLogoController->ShowLogo();
+}
 PRINT( _L("Camera <= CCamAppUi::InternalExitL") );
 OstTrace0( CAMERAAPP_PERFORMANCE_DETAIL, DUP_CCAMAPPUI_INTERNALEXITL, "e_CCamAppUi_InternalExitL 0" );
 }
 // CCamAppUi::AllMemoriesFullOrUnavailable
 // -----------------------------------------------------------------------------
 //
 TBool CCamAppUi::AllMemoriesFullOrUnavailable() const
 	{
-	return ( IsMemoryFullOrUnavailable(ECamMediaStoragePhone) &&
+	TBool phoneMemoryUnavailable = iController.IntegerSettingValue(ECamSettingItemRemovePhoneMemoryUsage)?
+ETrue:
+IsMemoryFullOrUnavailable(ECamMediaStoragePhone);
+return ( phoneMemoryUnavailable &&
 		   IsMemoryFullOrUnavailable(ECamMediaStorageCard) &&
 		   IsMemoryFullOrUnavailable(ECamMediaStorageMassStorage) );
 	}
 // -----------------------------------------------------------------------------
 //
 void CCamAppUi::SetViewFinderStoppedStatus( TBool aViewFinderStopped )
 {
 iViewFinderStopped = aViewFinderStopped;
+if (iStartupLogoController)
+{
+iStartupLogoController->HideLogo();
+}
 }
 // -----------------------------------------------------------------------------
 // CCamAppUi::IsViewFinderInTransit
 // -----------------------------------------------------------------------------
 // -----------------------------------------------------------------------------
 // CCamAppUi::CheckMemoryAvailableForCapturing
 // -----------------------------------------------------------------------------
 //
-void
+void CCamAppUi::CheckMemoryAvailableForCapturing()
-CCamAppUi::CheckMemoryAvailableForCapturing()
+{
-	{
 PRINT( _L("Camera => CCamAppUi::CheckMemoryAvailableForCapturing") )
 OstTrace0( CAMERAAPP_PERFORMANCE_DETAIL, CCAMAPPUI_CHECKMEMORYAVAILABLEFORCAPTURING, "e_CCamAppUi_CheckMemoryAvailableForCapturing 1" );
 if ( ( ECamControllerVideo == iController.CurrentMode() ||
 ECamControllerVideo == iController.TargetMode() ) &&
 ECamMediaStorageCard == iController.
 }
 // -----------------------------------------------------------------------------
 // CCamAppUi::IsMemoryAvailableForCapturing
 // -----------------------------------------------------------------------------
 //
-TBool
+TBool CCamAppUi::IsMemoryAvailableForCapturing() const
-CCamAppUi::IsMemoryAvailableForCapturing() const
 {
 return iMemoryAvailableForCapturing;
 }
+// -----------------------------------------------------------------------------
+// CCamAppUi::StartupLogoController
+// -----------------------------------------------------------------------------
+//
+CCamStartupLogoController* CCamAppUi::StartupLogoController()
+{
+return iStartupLogoController;
+}
 //  End of File

branch	RCL_3
changeset 16	d486e5e3cc9a
parent 12	8c55c525d5d7
child 18	51dda465e618