--- a/phoneapp/phoneuicontrol/src/cphonenumberentrymanager.cpp Tue Sep 14 21:18:17 2010 +0300
+++ b/phoneapp/phoneuicontrol/src/cphonenumberentrymanager.cpp Wed Sep 15 12:12:21 2010 +0300
@@ -43,7 +43,7 @@
#include "mphonesecuritymodeobserver.h"
const TInt KPhoneKeyStart = 33;
-const TInt KPhoneKeyEnd = 127;
+const TInt KPhoneKeyEnd = 129;
const TInt KKeyCtrlA( 1 );
const TInt KKeyCtrlC( 3 );
@@ -433,7 +433,8 @@
else if( aKeyEvent.iCode == EKeyLeftArrow ||
aKeyEvent.iCode == EKeyRightArrow ||
aKeyEvent.iCode == EKeyUpArrow ||
- aKeyEvent.iCode == EKeyDownArrow )
+ aKeyEvent.iCode == EKeyDownArrow ||
+ aKeyEvent.iCode == EKeySpace )
{
iViewCommandHandle.HandleCommandL(
EPhoneViewSendKeyEventToNumberEntry, &keyEventParam );
--- a/phoneapp/phoneuiview/src/cphoneviewcontroller.cpp Tue Sep 14 21:18:17 2010 +0300
+++ b/phoneapp/phoneuiview/src/cphoneviewcontroller.cpp Wed Sep 15 12:12:21 2010 +0300
@@ -2311,6 +2311,16 @@
appKeyCaptureParam.SetCaptureType( EPhoneKeyAllEvents );
iKeyCaptureController->StopCapturingKey( &appKeyCaptureParam );
+
+ // Uncapture the Camera key for sure, if it exists
+ if ( !iSecurityMode && FeatureManager::FeatureSupported( KFeatureIdCamera ) )
+ {
+ TPhoneCmdParamKeyCapture cameraKeyCaptureParam;
+ cameraKeyCaptureParam.SetKey( EStdKeyDevice7 );
+ cameraKeyCaptureParam.SetKeyCode( EKeyDevice7 );
+ cameraKeyCaptureParam.SetCaptureType( EPhoneKeyAllEvents );
+ iKeyCaptureController->StopCapturingKey( &cameraKeyCaptureParam );
+ }
}
}