equal
deleted
inserted
replaced
215 if ( KErrNotFound == connectedCall ) |
215 if ( KErrNotFound == connectedCall ) |
216 { |
216 { |
217 dialerParam.SetBoolean( EFalse ); |
217 dialerParam.SetBoolean( EFalse ); |
218 } |
218 } |
219 |
219 |
220 SetToolbarDimming( EFalse ); |
|
221 |
|
222 // Display incoming call |
220 // Display incoming call |
223 DisplayIncomingCallL( aCallId, dialerParam ); |
221 DisplayIncomingCallL( aCallId, dialerParam ); |
224 |
222 |
225 SetTouchPaneButtons( EPhoneWaitingCallButtons ); |
223 SetTouchPaneButtons( EPhoneWaitingCallButtons ); |
226 |
224 |
265 TInt aCallId, |
263 TInt aCallId, |
266 const TPhoneCmdParamBoolean aCommandParam ) |
264 const TPhoneCmdParamBoolean aCommandParam ) |
267 { |
265 { |
268 __LOGMETHODSTARTEND( EPhoneUIStates, |
266 __LOGMETHODSTARTEND( EPhoneUIStates, |
269 "CPhoneIncoming::DisplayIncomingCallL()"); |
267 "CPhoneIncoming::DisplayIncomingCallL()"); |
270 |
|
271 // Close menu bar, if it is displayed |
|
272 iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose ); |
|
273 |
268 |
274 // Cannot delete active note, e.g. New call query, |
269 // Cannot delete active note, e.g. New call query, |
275 // but show waiting note with or without caller name |
270 // but show waiting note with or without caller name |
276 if ( IsAnyQueryActiveL() || |
271 if ( IsAnyQueryActiveL() || |
277 ( aCommandParam.Boolean() && iOnScreenDialer ) ) |
272 ( aCommandParam.Boolean() && iOnScreenDialer ) ) |
312 void CPhoneIncoming::AllowShowingOfWaitingCallHeaderL( |
307 void CPhoneIncoming::AllowShowingOfWaitingCallHeaderL( |
313 TPhoneCmdParamBoolean& aCommandParam ) |
308 TPhoneCmdParamBoolean& aCommandParam ) |
314 { |
309 { |
315 __LOGMETHODSTARTEND(EPhoneUIStates, "CPhoneIncoming::AllowShowingOfWaitingCallHeaderL() "); |
310 __LOGMETHODSTARTEND(EPhoneUIStates, "CPhoneIncoming::AllowShowingOfWaitingCallHeaderL() "); |
316 |
311 |
317 iViewCommandHandle->ExecuteCommandL( |
312 if ( aCommandParam.Boolean() && IsNumberEntryUsedL() ) |
318 EPhoneViewAllowWaitingCallHeader, |
|
319 &aCommandParam ); |
|
320 |
|
321 // Non-touch :Hide number entry if it exists on |
|
322 // Touch : an internal operation ongoing |
|
323 // -> do not hide dialer |
|
324 if ( !iOnScreenDialer ) |
|
325 { |
|
326 SetNumberEntryVisibilityL(EFalse); |
|
327 } |
|
328 // If param is true and number entry is open only then |
|
329 // hide number entry. |
|
330 else if ( aCommandParam.Boolean() && IsNumberEntryUsedL() ) |
|
331 { |
313 { |
332 SetNumberEntryVisibilityL(EFalse); |
314 SetNumberEntryVisibilityL(EFalse); |
333 } |
315 } |
334 } |
316 } |
335 |
317 |