diff -r 951aeeb3da43 -r eea20ed08f4b startupservices/Startup/src/StartupAppUi.cpp --- a/startupservices/Startup/src/StartupAppUi.cpp Fri Jun 11 13:48:03 2010 +0300 +++ b/startupservices/Startup/src/StartupAppUi.cpp Tue Jun 29 10:40:11 2010 +0300 @@ -30,6 +30,7 @@ #include #include #include "sanimstartupctrl.h" +#include // USER INCLUDES #include "StartupAppUi.h" @@ -98,6 +99,9 @@ // --------------------------------------------------------------------------- void CStartupAppUi::ConstructL() { + RThread thread; //increase the thread priority to smooth the animation + thread.SetPriority(EPriorityAbsoluteForeground); + thread.Close(); TRACES("CStartupAppUi::ConstructL()"); TInt flags = EStandardApp; BaseConstructL( flags ); @@ -609,12 +613,24 @@ { TRACES("CStartupAppUi::DoStartupEndPart()"); TRACES("CStartupAppUi::DoStartupEndPart(): STARTUP OK"); - - - - - UpdateStartupUiPhase( EStartupUiPhaseAllDone ); - + + TBool ftuenabled=EFalse; + TInt err=KErrNone; +#ifndef __WINSCW__ + TRAP(err, + TInt enabled=0; + //open cenrep; + CRepository *cenrep=CRepository::NewLC(KCRUidStartupConf); + //check if ftu is enabled or not + User::LeaveIfError(cenrep->Get(KFtuStartupEnabled,enabled)); + ftuenabled=!!enabled; //make sure we only have a boolean value here + CleanupStack::PopAndDestroy(cenrep); + ); +#endif + if(!ftuenabled) + { + UpdateStartupUiPhase( EStartupUiPhaseAllDone ); + } TRACES("CStartupAppUi::DoStartupEndPart(): Exit application."); iExitTimer->Start( 100000, 100000, TCallBack( DoExitApplication, this ) ); @@ -1244,9 +1260,9 @@ switch( toState ) { case EStartupStartupOK: - iInternalState = EStartupStartupOK; - TRACES("CStartupAppUi::DoNextStartupPhaseL(): InternalState : EStartupStartupOK"); - DoStartupEndPart(); + iInternalState = EStartupStartupOK; + TRACES("CStartupAppUi::DoNextStartupPhaseL(): InternalState : EStartupInvokeAndWaitForFtu"); + DoStartupEndPart(); break; case EStartupSystemFatalError: SystemFatalErrorL();