204 MakeStateTransitionToConferenceAndSingleL( aCallId ); |
204 MakeStateTransitionToConferenceAndSingleL( aCallId ); |
205 } |
205 } |
206 else |
206 else |
207 { |
207 { |
208 // member of conference call which is on hold |
208 // member of conference call which is on hold |
209 iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId ); |
209 UpdateCallHeader( aCallId ); |
210 } |
210 } |
211 } |
211 } |
212 |
212 |
213 // ----------------------------------------------------------- |
213 // ----------------------------------------------------------- |
214 // CPhoneConferenceAndWaiting::MakeStateTransitionToConferenceAndSingleL |
214 // CPhoneConferenceAndWaiting::MakeStateTransitionToConferenceAndSingleL |
215 // ----------------------------------------------------------- |
215 // ----------------------------------------------------------- |
216 // |
216 // |
217 void CPhoneConferenceAndWaiting::MakeStateTransitionToConferenceAndSingleL( TInt aCallId ) |
217 void CPhoneConferenceAndWaiting::MakeStateTransitionToConferenceAndSingleL( TInt aCallId ) |
218 { |
218 { |
219 __LOGMETHODSTARTEND(EPhoneUIStates, "CPhoneConferenceAndWaiting::MakeStateTransitionToConferenceAndSingleL()"); |
219 __LOGMETHODSTARTEND(EPhoneUIStates, "CPhoneConferenceAndWaiting::MakeStateTransitionToConferenceAndSingleL()"); |
220 |
220 UpdateCallHeaderAndUiCommandsL( aCallId ); |
221 BeginUiUpdateLC(); |
|
222 UpdateRemoteInfoDataL ( aCallId ); |
|
223 |
|
224 iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId ); |
|
225 |
|
226 iNumberEntryManager->SetVisibilityIfNumberEntryUsedL( ETrue ); |
221 iNumberEntryManager->SetVisibilityIfNumberEntryUsedL( ETrue ); |
227 UpdateUiCommands(); |
222 |
228 EndUiUpdate(); |
|
229 iStateMachine->ChangeState( EPhoneStateConferenceAndSingle ); |
223 iStateMachine->ChangeState( EPhoneStateConferenceAndSingle ); |
230 } |
224 } |
231 |
225 |
232 // ----------------------------------------------------------- |
226 // ----------------------------------------------------------- |
233 // CPhoneConferenceAndWaiting::HandleIdleL |
227 // CPhoneConferenceAndWaiting::HandleIdleL |
288 switch( activeCallCount.Integer() ) |
282 switch( activeCallCount.Integer() ) |
289 { |
283 { |
290 case ENoActiveCalls: // Go to incoming state |
284 case ENoActiveCalls: // Go to incoming state |
291 { |
285 { |
292 BringIncomingToForegroundL(); |
286 BringIncomingToForegroundL(); |
293 iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, |
287 UpdateCallHeaderAndUiCommandsL( iRingingCallId ); |
294 iRingingCallId ); |
|
295 |
288 |
296 if ( iNumberEntryManager->IsNumberEntryVisibleL() ) |
289 if ( iNumberEntryManager->IsNumberEntryVisibleL() ) |
297 { |
290 { |
298 iNumberEntryManager->SetNumberEntryVisibilityL(EFalse); |
291 iNumberEntryManager->SetNumberEntryVisibilityL(EFalse); |
299 } |
292 } |
300 |
293 |
301 SetRingingTonePlaybackL( iRingingCallId ); |
294 SetRingingTonePlaybackL( iRingingCallId ); |
302 UpdateUiCommands(); |
|
303 SetBackButtonActive(EFalse); |
295 SetBackButtonActive(EFalse); |
304 iStateMachine->ChangeState( EPhoneStateIncoming ); |
296 iStateMachine->ChangeState( EPhoneStateIncoming ); |
305 } |
297 } |
306 break; |
298 break; |
307 |
299 |