diff -r 8c55c525d5d7 -r d486e5e3cc9a camerauis/cameraapp/generic/src/CamAppui.cpp
--- a/camerauis/cameraapp/generic/src/CamAppui.cpp	Mon Mar 15 12:39:00 2010 +0200
+++ b/camerauis/cameraapp/generic/src/CamAppui.cpp	Wed Mar 31 21:06:44 2010 +0300
@@ -12,7 +12,7 @@
 * Contributors:
 *
 * Description:  App UI class for cameraapp
- *
+*
 */
 
 
@@ -114,6 +114,7 @@
 
 #include "camflashstatus.h"
 #include "CamMemoryMonitor.h"
+#include "camstartuplogocontroller.h"
 
 
 
@@ -163,6 +164,8 @@
         iMemoryMonitor = 0;
         }
 
+    delete iStartupLogoController;
+
     iController.SetAppUiAvailable( EFalse );
 
     iResourceLoaders.Close();
@@ -651,6 +654,10 @@
     }
   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" );
   }
@@ -1801,10 +1808,6 @@
 
                  iCamSidePane->UpdateLayout();          
                  iTargetViewState = ECamViewStatePreCapture;
-                 delete iScreenClearer;
-                 iScreenClearer = NULL;
-                 iScreenClearer = CAknLocalScreenClearer::NewL( 
-                              IsSecondCameraEnabled() || IsQwerty2ndCamera() );
                  TrySwitchViewL( ETrue );
                  iController.SwitchCameraL();       
                  }
@@ -2646,7 +2649,12 @@
     if( ECamViewStateStandby != iViewState )
       {
       DismissMemoryNoteL();  
-    
+
+      if (iStartupLogoController)
+          {
+          iStartupLogoController->HideLogo();
+          }
+
       if( IsInternalView( iViewState ) )
         {
          
@@ -2679,7 +2687,10 @@
               }
             else
               {    
-              static_cast<CCamViewBase*>( iView )->ExitAllModesL();
+              if( iView)
+                  {
+                  static_cast<CCamViewBase*>( iView )->ExitAllModesL();
+                  }
               }
              
             }
@@ -2939,7 +2950,12 @@
               }
     #endif
             }
-    
+
+          if (iStartupLogoController)
+            {
+            iStartupLogoController->HideLogo();
+            }
+
           if( AppInBackground(EFalse) || ( !CamUtility::IsBatteryPowerOK() && 
                                            !CamUtility::IsBatteryCharging() ) )
             {
@@ -3236,7 +3252,6 @@
               iController.CheckMemoryToUseL();
               }
                     
-          TBool returningFromPretendExit = iPretendExit;
           iPretendExit = EFalse; 
                  
           TCamViewSwitch switchNeeded = ECamViewSwitchNone;               
@@ -3327,6 +3342,11 @@
                      }
                  }
               }
+
+          if (iStartupLogoController && iReturningFromPretendExit)
+              {
+              iStartupLogoController->ShowLogo();
+              }
           break;
           }
         // -----------------------------------------------------
@@ -4369,20 +4389,19 @@
                                 iController.IntegerSettingValue( key ) );
                     }
                 if(currentLocation != ECamMediaStoragePhone && 
-                    !IsMemoryFullOrUnavailable(ECamMediaStoragePhone))
-                    {
-                    supportedMemTypes |= 
-                        AknCommonDialogsDynMem::EMemoryTypePhone;
-                    }
-                if(currentLocation != ECamMediaStorageCard && 
-                    !IsMemoryFullOrUnavailable(ECamMediaStorageCard))
-                    {
-                    supportedMemTypes |= 
-                        AknCommonDialogsDynMem::EMemoryTypeMMCExternal;
-                    }
-                if(currentLocation != ECamMediaStorageMassStorage && 
-                    !IsMemoryFullOrUnavailable(ECamMediaStorageMassStorage))
-                    {
+				!IsMemoryFullOrUnavailable(ECamMediaStoragePhone) &&
+				!iController.IntegerSettingValue( ECamSettingItemRemovePhoneMemoryUsage ) )
+				{
+				supportedMemTypes |= AknCommonDialogsDynMem::EMemoryTypePhone;
+				}
+			if(currentLocation != ECamMediaStorageCard && 
+				!IsMemoryFullOrUnavailable(ECamMediaStorageCard))
+				{
+				supportedMemTypes |= AknCommonDialogsDynMem::EMemoryTypeMMCExternal;
+				}
+			if(currentLocation != ECamMediaStorageMassStorage && 
+				!IsMemoryFullOrUnavailable(ECamMediaStorageMassStorage))
+				{
                     supportedMemTypes |= 
                         AknCommonDialogsDynMem::EMemoryTypeInternalMassStorage;
                     }
@@ -5312,6 +5331,11 @@
         iViewFinderStopped = ETrue;        
         } 
  
+    if ( iStartupLogoController )
+        {
+        iStartupLogoController->ShowLogo();
+        }
+
     PRINT( _L("Camera <= CCamAppUi::InternalExitL") );
     OstTrace0( CAMERAAPP_PERFORMANCE_DETAIL, DUP_CCAMAPPUI_INTERNALEXITL, "e_CCamAppUi_InternalExitL 0" );
     
@@ -8315,7 +8339,10 @@
 //
 TBool CCamAppUi::AllMemoriesFullOrUnavailable() const
 	{
-	return ( IsMemoryFullOrUnavailable(ECamMediaStoragePhone) &&
+	TBool phoneMemoryUnavailable = iController.IntegerSettingValue(ECamSettingItemRemovePhoneMemoryUsage)?
+                                    ETrue:
+                                    IsMemoryFullOrUnavailable(ECamMediaStoragePhone);
+    return ( phoneMemoryUnavailable &&
 		   IsMemoryFullOrUnavailable(ECamMediaStorageCard) &&
 		   IsMemoryFullOrUnavailable(ECamMediaStorageMassStorage) );
 	}
@@ -8476,6 +8503,11 @@
 void CCamAppUi::SetViewFinderStoppedStatus( TBool aViewFinderStopped )
     {
     iViewFinderStopped = aViewFinderStopped;
+
+    if (iStartupLogoController)
+        {
+        iStartupLogoController->HideLogo();
+        }
     }
 
 // -----------------------------------------------------------------------------
@@ -8500,9 +8532,8 @@
 // CCamAppUi::CheckMemoryAvailableForCapturing
 // -----------------------------------------------------------------------------
 //
-void 
-CCamAppUi::CheckMemoryAvailableForCapturing()
-	{
+void CCamAppUi::CheckMemoryAvailableForCapturing()
+    {
     PRINT( _L("Camera => CCamAppUi::CheckMemoryAvailableForCapturing") )
     OstTrace0( CAMERAAPP_PERFORMANCE_DETAIL, CCAMAPPUI_CHECKMEMORYAVAILABLEFORCAPTURING, "e_CCamAppUi_CheckMemoryAvailableForCapturing 1" );
     if ( ( ECamControllerVideo == iController.CurrentMode() ||
@@ -8523,11 +8554,19 @@
 // -----------------------------------------------------------------------------
 // CCamAppUi::IsMemoryAvailableForCapturing
 // -----------------------------------------------------------------------------
-//    
-TBool 
-CCamAppUi::IsMemoryAvailableForCapturing() const
+//
+TBool CCamAppUi::IsMemoryAvailableForCapturing() const
     {
     return iMemoryAvailableForCapturing;
     }
-        
+
+// -----------------------------------------------------------------------------
+// CCamAppUi::StartupLogoController
+// -----------------------------------------------------------------------------
+//
+CCamStartupLogoController* CCamAppUi::StartupLogoController()
+    {
+    return iStartupLogoController;
+    }
+
 //  End of File