equal
deleted
inserted
replaced
391 if ( ( aKeyEvent.iCode == EKeyOK && aKeyEvent.iRepeats == 0 && aType == EEventKey ) || |
391 if ( ( aKeyEvent.iCode == EKeyOK && aKeyEvent.iRepeats == 0 && aType == EEventKey ) || |
392 ( aType == EEventKey && |
392 ( aType == EEventKey && |
393 ( IsCaptureKeyL( aKeyEvent, aType ) || IsShutterKeyL( aKeyEvent, aType ) ) ) ) |
393 ( IsCaptureKeyL( aKeyEvent, aType ) || IsShutterKeyL( aKeyEvent, aType ) ) ) ) |
394 { |
394 { |
395 TKeyResponse response = iCaptureSetupControl->OfferKeyEventL( aKeyEvent, aType ); |
395 TKeyResponse response = iCaptureSetupControl->OfferKeyEventL( aKeyEvent, aType ); |
396 if ( aType == EEventKey && response == EKeyWasNotConsumed && |
396 if ( aType == EEventKey && response == EKeyWasNotConsumed && aKeyEvent.iCode != EKeyOK && |
397 ( ECamSettingItemDynamicPhotoFlash == iControlHandler.SettingType() || |
397 ( ECamSettingItemDynamicPhotoFlash == iControlHandler.SettingType() || |
398 ECamSettingItemDynamicSelfTimer == iControlHandler.SettingType() ) ) |
398 ECamSettingItemDynamicSelfTimer == iControlHandler.SettingType() ) ) |
399 { |
399 { |
400 iView.HandleCommandL( EAknSoftkeyCancel ); |
400 iView.HandleCommandL( EAknSoftkeyCancel ); |
401 } |
401 } |