equal
deleted
inserted
replaced
397 if ( ( aKeyEvent.iCode == EKeyOK && aKeyEvent.iRepeats == 0 && aType == EEventKey ) || |
397 if ( ( aKeyEvent.iCode == EKeyOK && aKeyEvent.iRepeats == 0 && aType == EEventKey ) || |
398 ( aType == EEventKeyDown && |
398 ( aType == EEventKeyDown && |
399 ( IsCaptureKeyL( aKeyEvent, aType ) || IsShutterKeyL( aKeyEvent, aType ) ) ) ) |
399 ( IsCaptureKeyL( aKeyEvent, aType ) || IsShutterKeyL( aKeyEvent, aType ) ) ) ) |
400 { |
400 { |
401 TKeyResponse response = iCaptureSetupControl->OfferKeyEventL( aKeyEvent, aType ); |
401 TKeyResponse response = iCaptureSetupControl->OfferKeyEventL( aKeyEvent, aType ); |
402 iView.HandleCommandL( EAknSoftkeyOk ); |
402 if ( aType == EEventKeyDown && IsShutterKeyL( aKeyEvent, aType ) && |
|
403 ( ECamSettingItemDynamicPhotoFlash == iControlHandler.SettingType() || |
|
404 ECamSettingItemDynamicSelfTimer == iControlHandler.SettingType() ) ) |
|
405 { |
|
406 iView.HandleCommandL( EAknSoftkeyCancel ); |
|
407 } |
|
408 else |
|
409 { |
|
410 iView.HandleCommandL( EAknSoftkeyOk ); |
|
411 } |
|
412 |
403 return response; |
413 return response; |
404 } |
414 } |
405 return iCaptureSetupControl->OfferKeyEventL( aKeyEvent, aType ); |
415 return iCaptureSetupControl->OfferKeyEventL( aKeyEvent, aType ); |
406 } |
416 } |
407 |
417 |