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 } |
218 dialerParam.SetBoolean( EFalse ); |
218 dialerParam.SetBoolean( EFalse ); |
219 } |
219 } |
220 |
220 |
221 SetToolbarDimming( EFalse ); |
221 SetToolbarDimming( EFalse ); |
222 |
222 |
223 // <-- QT PHONE START --> |
|
224 // Display incoming call |
223 // Display incoming call |
225 DisplayIncomingCallL( aCallId, dialerParam ); |
224 DisplayIncomingCallL( aCallId, dialerParam ); |
226 |
225 |
227 SetTouchPaneButtons( EPhoneWaitingCallButtons ); |
226 SetTouchPaneButtons( EPhoneWaitingCallButtons ); |
228 // <-- QT PHONE END --> |
227 |
229 if( FeatureManager::FeatureSupported( KFeatureIdFfTouchUnlockStroke ) |
228 if( FeatureManager::FeatureSupported( KFeatureIdFfTouchUnlockStroke ) |
230 && !CPhoneCenRepProxy::Instance()-> |
229 && !CPhoneCenRepProxy::Instance()-> |
231 IsTelephonyFeatureSupported( KTelephonyLVFlagAllowUnlockOnIncoming ) |
230 IsTelephonyFeatureSupported( KTelephonyLVFlagAllowUnlockOnIncoming ) |
232 && ( IsKeyLockOn() || IsAutoLockOn() ) ) |
231 && ( IsKeyLockOn() || IsAutoLockOn() ) ) |
233 { |
232 { |