equal
deleted
inserted
replaced
200 AllowShowingOfWaitingCallHeaderL( dialerParam ); |
200 AllowShowingOfWaitingCallHeaderL( dialerParam ); |
201 |
201 |
202 // Close fast swap window if it's displayed |
202 // Close fast swap window if it's displayed |
203 CEikonEnv::Static()->DismissTaskList(); |
203 CEikonEnv::Static()->DismissTaskList(); |
204 |
204 |
205 // If the 1st incoming call became Connected, this is waiting call |
205 // If the 1st incoming call became Connected, this is waiting call |
206 // If the 1st incoming call went just Idle, this is a normal call |
206 // If the 1st incoming call went just Idle, this is a normal call |
207 if ( connectedCall > KErrNotFound ) |
207 if ( connectedCall > KErrNotFound ) |
208 { |
208 { |
209 SetTouchPaneButtons( EPhoneWaitingCallButtons ); |
209 SetTouchPaneButtons( EPhoneWaitingCallButtons ); |
210 } |
210 } |
217 { |
217 { |
218 dialerParam.SetBoolean( EFalse ); |
218 dialerParam.SetBoolean( EFalse ); |
219 } |
219 } |
220 |
220 |
221 SetToolbarDimming( EFalse ); |
221 SetToolbarDimming( EFalse ); |
|
222 |
|
223 // <-- QT PHONE START --> |
222 // Display incoming call |
224 // Display incoming call |
223 DisplayIncomingCallL( aCallId, dialerParam ); |
225 DisplayIncomingCallL( aCallId, dialerParam ); |
224 |
226 |
|
227 SetTouchPaneButtons( EPhoneWaitingCallButtons ); |
|
228 // <-- QT PHONE END --> |
225 if( FeatureManager::FeatureSupported( KFeatureIdFfTouchUnlockStroke ) |
229 if( FeatureManager::FeatureSupported( KFeatureIdFfTouchUnlockStroke ) |
226 && !CPhoneCenRepProxy::Instance()-> |
230 && !CPhoneCenRepProxy::Instance()-> |
227 IsTelephonyFeatureSupported( KTelephonyLVFlagAllowUnlockOnIncoming ) |
231 IsTelephonyFeatureSupported( KTelephonyLVFlagAllowUnlockOnIncoming ) |
228 && ( IsKeyLockOn() || IsAutoLockOn() ) ) |
232 && ( IsKeyLockOn() || IsAutoLockOn() ) ) |
229 { |
233 { |
235 if ( IsKeyLockOn() ) |
239 if ( IsKeyLockOn() ) |
236 { |
240 { |
237 iViewCommandHandle->ExecuteCommandL( EPhoneViewDisableKeyLockWithoutNote ); |
241 iViewCommandHandle->ExecuteCommandL( EPhoneViewDisableKeyLockWithoutNote ); |
238 } |
242 } |
239 } |
243 } |
240 |
244 |
241 if( CPhoneCenRepProxy::Instance()-> |
245 if( CPhoneCenRepProxy::Instance()-> |
242 IsTelephonyFeatureSupported( KTelephonyLVFlagDisableCallControlHardKeysWhileLocked ) |
246 IsTelephonyFeatureSupported( KTelephonyLVFlagDisableCallControlHardKeysWhileLocked ) |
243 && ( IsKeyLockOn() || IsAutoLockOn() ) ) |
247 && ( IsKeyLockOn() || IsAutoLockOn() ) ) |
244 { |
248 { |
245 DisableHWKeysL(); |
249 DisableHWKeysL(); |
246 } |
250 } |
247 |
251 |
248 EndUiUpdate(); |
252 EndUiUpdate(); |
249 |
253 |
250 if ( connectedCall > KErrNotFound ) |
254 if ( connectedCall > KErrNotFound ) |
251 { |
255 { |
252 // Go to incoming state |
256 // Go to incoming state |
298 |
302 |
299 // Set Phone as the top application |
303 // Set Phone as the top application |
300 iViewCommandHandle->ExecuteCommandL( EPhoneViewSetTopApplication, |
304 iViewCommandHandle->ExecuteCommandL( EPhoneViewSetTopApplication, |
301 &uidParam ); |
305 &uidParam ); |
302 |
306 |
303 DisplayHeaderForCallComingInL( aCallId, aCommandParam.Boolean() ); //waiting call |
307 DisplayHeaderForCallComingInL( aCallId, ETrue ); //waiting call |
304 } |
308 } |
305 |
309 |
306 // ----------------------------------------------------------- |
310 // ----------------------------------------------------------- |
307 // CPhoneIncoming::AllowShowingOfWaitingCallHeaderL |
311 // CPhoneIncoming::AllowShowingOfWaitingCallHeaderL |
308 // ----------------------------------------------------------- |
312 // ----------------------------------------------------------- |