FCL/sf/app/phone: comparison phoneapp/phoneuicontrol/src/cphonestateidle.cpp

equal deleted inserted replaced

-:e30d4a1b8bad
+:c26cc2a7c548
 // so that the security note can be seen.
 TPhoneCmdParamInteger foregroundAppParam;
 iViewCommandHandle->ExecuteCommandL( EPhoneViewGetForegroundApplication,
 &foregroundAppParam );
-if ( !IsSimOk() )
+if ( !IsSimOk() && KUidPhoneApplication.iUid != foregroundAppParam.Integer() )
 {
 TPhoneCmdParamInteger uidParam;
 // Bring Phone app in the foreground
 uidParam.SetInteger( KUidPhoneApplication.iUid );
 iViewCommandHandle->ExecuteCommandL( EPhoneViewBringAppToForeground,
 // -----------------------------------------------------------
 //
 void CPhoneStateIdle::HandleIncomingL( TInt aCallId )
 {
 __LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateIdle::HandleIncomingL( ) ");
 HandleAudioAvailableOutputChangedL();
 iViewCommandHandle->ExecuteCommandL( EPhoneViewShowNaviPaneAudioVolume );
 SetRingingTonePlaybackL( aCallId );
 CPhonePubSubProxy::Instance()->ChangePropertyValue(
 KPSUidScreenSaver,
 KScreenSaverAllowScreenSaver,
 EPhoneScreensaverNotAllowed );
-TransitionHandlerL().IncomingCallUiUpdateLC();
+IsNumberEntryUsedL() ?
+BeginTransEffectLC( ECallUiAppear ) :
+BeginTransEffectLC( ENumberEntryOpen );
+BeginUiUpdateLC();
 // Hide the number entry if it exists
 if ( IsNumberEntryUsedL() )
 {
 SetNumberEntryVisibilityL(EFalse);
 }
 // Close fast swap window if it's displayed
-EikonEnv()->DismissTaskList();
+CEikonEnv::Static()->DismissTaskList();
 // Show incoming call buttons
 SetTouchPaneButtons( EPhoneIncomingCallButtons );
 SetTouchPaneButtonEnabled( EPhoneCallComingCmdSilent );
 SetTouchPaneButtonEnabled( EPhoneInCallCmdHold );
+// Display incoming call
 DisplayIncomingCallL( aCallId );
-TransitionHandlerL().EndUiUpdateAndEffect();
+EndUiUpdate();
+EndTransEffect();
+// Go to incoming state
 iCbaManager->UpdateIncomingCbaL( aCallId );
 UpdateSilenceButtonDimming();
 UpdateIncomingContextMenuL( aCallId );
 //Dim toolbar items
 SetToolbarDimming( ETrue );
 //request that dimmed toolbar is visible.
 iViewCommandHandle->HandleCommandL( EPhoneViewShowToolbar );
 ChangeTo( EPhoneStateIncoming );
+// Reset divert indication
+SetDivertIndication( EFalse );
 }
 // -----------------------------------------------------------
 // CPhoneStateIdle::HandleDialingL
 // Default handling for dialling message
 // -----------------------------------------------------------
 //
 EXPORT_C void CPhoneStateIdle::HandleDialingL( TInt aCallId )
 {
 __LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateIdle::HandleDialingL( ) ");
-// Indicate that the Phone needs to be sent to the background if
-// an application other than phone or idle application is in the foreground
-SetNeedToReturnToForegroundAppStatusL( !TopAppIsDisplayedL() );
 DisplayCallSetupL( aCallId );
 ChangeTo( EPhoneStateCallSetup );
 }
 // -----------------------------------------------------------
 SetTouchPaneButtonDisabled( EPhoneInCallCmdHold );
 SetToolbarDimming( ETrue );
 SetToolbarButtonLoudspeakerEnabled();
 SetToolbarButtonHandsetEnabled();
-SetToolbarButtonBTHFEnabled();
 TPhoneCmdParamInteger uidParam;
 uidParam.SetInteger( KUidPhoneApplication.iUid );
 // Set Phone as the top application
 TPhoneCmdParamInteger uidParam;
 uidParam.SetInteger( KUidPhoneApplication.iUid );
 iViewCommandHandle->ExecuteCommandL( EPhoneViewBringAppToForeground,
 &uidParam );
 }
-TransitionHandlerL().BeginTransEffectLC( EPhoneTransEffectPhoneUiClose );
+BeginTransEffectLC( ENumberEntryClose );
-TransitionHandlerL().BeginUiUpdateLC();
+BeginUiUpdateLC();
 // Remove the number entry
 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry );
 // Display call setup header
 // Update touch buttons
 SetTouchPaneButtons( EPhoneIncallButtons );
 SetToolbarDimming( EFalse );
-TransitionHandlerL().EndUiUpdateAndEffect();
+EndUiUpdate();
+EndTransEffect();
+// Go to single state
 iCbaManager->UpdateCbaL( EPhoneCallHandlingInCallCBA );
 ChangeTo( EPhoneStateSingle );
 }
 // -----------------------------------------------------------
 case EPhoneNumberAcqCmdVideoCall:
 DialVideoCallL();
 break;
 case EPhoneCmdBack:
-TransitionHandlerL().BeginTransEffectLC( EPhoneTransEffectPhoneUiClose );
+BeginTransEffectLC( ENumberEntryClose );
 HandleBackCommandL();
-TransitionHandlerL().EndTransEffect();
+EndTransEffect();
 break;
 case EPhoneViewOpenNumberEntry:
-TransitionHandlerL().BeginTransEffectLC( EPhoneTransEffectPhoneUiOpen );
+BeginTransEffectLC( ENumberEntryOpen );
 commandStatus = CPhoneState::HandleCommandL( aCommand );
-TransitionHandlerL().EndTransEffect();
+EndTransEffect();
 break;
 default:
 commandStatus = CPhoneState::HandleCommandL( aCommand );
 break;
 // Capture keys when there is an incoming call
 CaptureKeysDuringCallNotificationL( ETrue );
 // Indicate that the Foreground application needs to be sent to the foreground
 // after call is ended.
-SetNeedToReturnToForegroundAppStatusL( !TopAppIsDisplayedL() );
+TPhoneCmdParamBoolean booleanParam;
+booleanParam.SetBoolean( !TopAppIsDisplayedL() );
+iViewCommandHandle->ExecuteCommandL(
+EPhoneViewSetNeedToReturnToForegroundAppStatus,
+&booleanParam );
 // Bring Phone app in the foreground
 TPhoneCmdParamInteger uidParam;
 uidParam.SetInteger( KUidPhoneApplication.iUid );
 iViewCommandHandle->ExecuteCommandL( EPhoneViewBringAppToForeground,
 &uidParam );
 // Set Phone as the top application
 iViewCommandHandle->ExecuteCommandL( EPhoneViewSetTopApplication,
 &uidParam );
 // Disable global notes when there is an incoming call
-TPhoneCmdParamBoolean globalNotifierParam;
+DisableGlobalNotifiersL();
-globalNotifierParam.SetBoolean( ETrue );
+DisableEikonNotifiersL();
-iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled,
-&globalNotifierParam );
-iViewCommandHandle->ExecuteCommandL( EPhoneViewSetEikonNotifiersDisabled,
-&globalNotifierParam );
 DisplayHeaderForCallComingInL( aCallId, EFalse ); //not waiting
 }
 // -----------------------------------------------------------
 //
 void CPhoneStateIdle::HandleIdleL( TInt /*aCallId*/ )
 {
 __LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateIdle::HandleIdleL()" );
 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveAllCallHeaders );
-CloseClearNumberEntryAndLoadEffectL( EPhoneTransEffectCallUiDisappear );
+CloseClearNumberEntryAndLoadEffectL( ECallUiDisappear );
 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemovePhoneDialogs );
 // Reset flag.
 SetCallInitialized( EFalse );
 }
 {
 __LOGMETHODSTARTEND(EPhoneControl,
 "CPhoneStateIdle::RemoveNumberEntryAndSetIdleToBackgroundIfNeededL( ) ");
 if ( IsNumberEntryUsedL() )
 {
-TransitionHandlerL().BeginTransEffectLC( EPhoneTransEffectCallUiAppear );
+BeginTransEffectLC( ECallUiAppear );
 /*NE should be removed because if speeddial dial is interupted during
 call setup phone should not return to NE/Dialler view.*/
 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry );
 /*It might be possible that some async operation was ongoing and
 if ( iStateMachine->State() == this )
 {
 iCbaManager->UpdateCbaL( EPhoneEmptyCBA );
 iViewCommandHandle->ExecuteCommandL( EPhoneViewSetIdleTopApplication );
 }
-TransitionHandlerL().EndTransEffect();
+EndTransEffect();
 }
 }
 // -----------------------------------------------------------
 // CPhoneStateIdle::SpeedDialCanceledL
 &numberEntryCountParam );
 if ( numberEntryCountParam.Integer() == 1 )
 {
 // Remove the number entry window
-iViewCommandHandle->ExecuteCommandL( EPhoneViewClearNumberEntryContent );
+iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry );
 iStateMachine->SendPhoneEngineMessage(
 MPEPhoneModel::EPEMessageEndDTMF );
 // Launch application.
 iViewCommandHandle->ExecuteCommandL(
 EPhoneViewLaunchApplication );
+// Continue displaying current app but set up the
+// idle screen in the background
+SetupIdleScreenInBackgroundL();
 }
 }
 // -----------------------------------------------------------
 // CPhoneStateIdle:SendExitCommandL
 // -----------------------------------------------------------
 //
 void CPhoneStateIdle::SendExitCommandL()
 {
 __LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateIdle::SendExitCommand( ) ");
 // Remove number entry from screen
 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry );
 // Simulate exit command
-RWsSession& wsSession = EikonEnv()->WsSession();
+RWsSession& wsSession = CEikonEnv::Static()->WsSession();
 TKeyEvent keyEvent;
 keyEvent.iCode = EEikCmdExit;
 keyEvent.iScanCode = EEikCmdExit;
 keyEvent.iModifiers = 0;
 keyEvent.iRepeats = 0;
 wsSession.SimulateKeyEvent( keyEvent );
 wsSession.Flush();
 }
 // -----------------------------------------------------------
 // CPhoneStateIdle::HandleEndKeyPressL
 // -----------------------------------------------------------
 if ( !( IsSimStateNotPresentWithSecurityModeEnabled() &&
 !FeatureManager::FeatureSupported( KFeatureIdFfSimlessOfflineSupport ) ) )
 {
 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemovePhoneDialogs );
 }
+// Handle end key if all startup related queries and graphics have been displayed.
-if ( IsSimOk() )
+if ( IsSimOk() && AllStartupQueriesDisplayed() )
 {
 if ( aMessage == EPhoneKeyLongPress )
 {
 // Close all connections
 iStateMachine->SendPhoneEngineMessage(
 MPEPhoneModel::EPEMessageTerminateAllConnections );
 if ( IsNumberEntryUsedL() )
 {
-CloseClearNumberEntryAndLoadEffectL( EPhoneTransEffectPhoneUiClose );
+CloseClearNumberEntryAndLoadEffectL( ENumberEntryClose );
 // If long end key event occures then all calls are terminated and
 // dialer is closed, therefore tel.icon must be removed from FSW.
 iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateFSW );
 }
 if ( !TopAppIsDisplayedL() )
 {
-// Display idle screen
 DisplayIdleScreenL();
 }
 }
 else if ( IsNumberEntryUsedL() && TopAppIsDisplayedL() )
 {
-CloseClearNumberEntryAndLoadEffectL( EPhoneTransEffectPhoneUiClose );
+CloseClearNumberEntryAndLoadEffectL( ENumberEntryClose );
 }
 else if ( !TopAppIsDisplayedL() )
 {
 // Phone might not be the topmost app since it has
 // some dialog/query open therefore we need to remove dialog/phone.

branch	RCL_3
changeset 81	c26cc2a7c548
parent 69	8baf28733c3d