equal
deleted
inserted
replaced
214 TPhoneCmdParamBoolean globalNotifierParam; |
214 TPhoneCmdParamBoolean globalNotifierParam; |
215 globalNotifierParam.SetBoolean( EFalse ); |
215 globalNotifierParam.SetBoolean( EFalse ); |
216 iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled, |
216 iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled, |
217 &globalNotifierParam ); |
217 &globalNotifierParam ); |
218 |
218 |
219 // Stop capturing keys |
|
220 CaptureKeysDuringCallNotificationL( EFalse ); |
|
221 |
|
222 // Remove the number entry if it isn't DTMF dialer |
219 // Remove the number entry if it isn't DTMF dialer |
223 if ( !iOnScreenDialer || !IsNumberEntryVisibleL() ) |
220 if ( !IsNumberEntryVisibleL() ) |
224 { |
221 { |
225 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry ); |
222 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry ); |
226 } |
223 } |
227 |
224 |
228 TPhoneCmdParamCallHeaderData callHeaderParam; |
225 TPhoneCmdParamCallHeaderData callHeaderParam; |
258 // Show bubble |
255 // Show bubble |
259 TPhoneCmdParamCallHeaderData callHeaderParam; |
256 TPhoneCmdParamCallHeaderData callHeaderParam; |
260 callHeaderParam.SetCallState( EPEStateConnected ); |
257 callHeaderParam.SetCallState( EPEStateConnected ); |
261 iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId, |
258 iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId, |
262 &callHeaderParam ); |
259 &callHeaderParam ); |
263 |
|
264 // Capturing keys and number entry must be removed because some |
|
265 // networks jump over connecting state directly to connected state. |
|
266 CaptureKeysDuringCallNotificationL( EFalse ); |
|
267 |
260 |
268 // Remove the number entry if it isn't DTMF dialer |
261 // Remove the number entry if it isn't DTMF dialer |
269 if ( !iOnScreenDialer || !IsNumberEntryVisibleL() ) |
262 if ( !IsNumberEntryVisibleL() ) |
270 { |
263 { |
271 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry ); |
264 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry ); |
272 } |
265 } |
273 |
266 |
274 // Set Hold flag to view |
267 // Set Hold flag to view |
304 iViewCommandHandle->ExecuteCommandL( |
297 iViewCommandHandle->ExecuteCommandL( |
305 EPhoneViewGetCountOfActiveCalls, &activeCallCount ); |
298 EPhoneViewGetCountOfActiveCalls, &activeCallCount ); |
306 |
299 |
307 if( activeCallCount.Integer() ) |
300 if( activeCallCount.Integer() ) |
308 { |
301 { |
309 CheckIfRestoreNEContentAfterDtmfDialer(); |
|
310 |
|
311 if ( IsNumberEntryUsedL() ) |
302 if ( IsNumberEntryUsedL() ) |
312 { |
303 { |
313 // Show the number entry if it exists |
304 // Show the number entry if it exists |
314 SetNumberEntryVisibilityL(ETrue); |
305 SetNumberEntryVisibilityL(ETrue); |
315 } |
306 } |
318 // Set incall CBAs |
309 // Set incall CBAs |
319 UpdateCbaL( EPhoneCallHandlingInCallCBA ); |
310 UpdateCbaL( EPhoneCallHandlingInCallCBA ); |
320 } |
311 } |
321 |
312 |
322 SetTouchPaneButtons( EPhoneIncallButtons ); |
313 SetTouchPaneButtons( EPhoneIncallButtons ); |
323 // UnCapture keys callsetup fails |
314 iStateMachine->ChangeState( EPhoneStateSingle ); |
324 CaptureKeysDuringCallNotificationL( EFalse ); |
|
325 // Setup call was terminated |
|
326 iStateMachine->ChangeState( EPhoneStateSingle ); |
|
327 } |
315 } |
328 else |
316 else |
329 { |
317 { |
330 // Display call termination note, if necessary |
318 // Display call termination note, if necessary |
331 DisplayCallTerminationNoteL(); |
319 DisplayCallTerminationNoteL(); |
333 // Single call was terminated |
321 // Single call was terminated |
334 SetTouchPaneButtons( EPhoneCallSetupButtons ); |
322 SetTouchPaneButtons( EPhoneCallSetupButtons ); |
335 SetToolbarButtonLoudspeakerEnabled(); |
323 SetToolbarButtonLoudspeakerEnabled(); |
336 // Update call setup CBAs |
324 // Update call setup CBAs |
337 UpdateCbaL( EPhoneCallHandlingCallSetupCBA ); |
325 UpdateCbaL( EPhoneCallHandlingCallSetupCBA ); |
338 iStateMachine->ChangeState( EPhoneStateCallSetup ); |
326 iStateMachine->ChangeState( EPhoneStateCallSetup ); |
339 } |
327 } |
340 |
328 |
341 EndUiUpdate(); |
329 EndUiUpdate(); |
342 } |
330 } |
343 |
331 |