--- a/startupservices/Startup/src/StartupAppUi.cpp Thu Jul 15 18:49:38 2010 +0300
+++ b/startupservices/Startup/src/StartupAppUi.cpp Thu Aug 19 10:05:08 2010 +0300
@@ -35,6 +35,7 @@
#include <startupdomaincrkeys.h>
#include <CoreApplicationUIsSDKCRKeys.h>
#include <starterclient.h>
+#include "StartupWelcomeCrKeys.h"
#ifdef RD_UI_TRANSITION_EFFECTS_PHASE2
// Transition effects
@@ -939,7 +940,21 @@
#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION
- UpdateStartupUiPhase( EStartupUiPhaseAllDone );
+ TBool fTUDone = ETrue;
+ TRAP_IGNORE(IsFTUAvailableL(fTUDone));
+
+ if(fTUDone)
+ {
+ UpdateStartupUiPhase( EStartupUiPhaseAllDone );
+ }
+ else
+ {
+ UpdateStartupUiPhase(EStartupUiPhaseAllDone+1);
+ }
+
+ //UpdateStartupUiPhase( EStartupUiPhaseAllDone );
+
+
#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
TRACES("CStartupAppUi::DoStartupEndPart(): Exit application.");
@@ -948,6 +963,15 @@
TRACES("CStartupAppUi::DoStartupEndPart(): End");
}
+void CStartupAppUi::IsFTUAvailableL(TBool& aFTUAvailable)
+ {
+ //From Startupwelcomecrkeys.h
+ CRepository* repo = CRepository::NewLC(KCRUidWelcome6);
+ repo->Get(KPhoneActicationCompleted, aFTUAvailable);
+ CleanupStack::PopAndDestroy(repo);
+ }
+
+
#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
// ---------------------------------------------------------------------------
// CStartupAppUi::ContinueStartupAfterToneL()