--- a/javauis/lcdui_akn/lcdui/src/CMIDEdwinUtils.cpp Wed Jun 09 09:34:07 2010 +0300
+++ b/javauis/lcdui_akn/lcdui/src/CMIDEdwinUtils.cpp Mon Jun 21 15:32:50 2010 +0300
@@ -837,9 +837,14 @@
//on wheather the temporary char is displayed or the '*' is displayed.
TRAP_IGNORE(aEdwin->SetWordWrapL(aConstraints & MMIDTextField::EPassword ? EFalse : ETrue));
}
+
+#ifdef RD_JAVA_S60_RELEASE_9_2
+ aEdwin->SetAknEditorFlags(aEdwin->AknEdwinFlags() &
+ EAknEditorFlagEnablePartialScreen);
+#else
aEdwin->SetAknEditorFlags(EAknEditorFlagDefault);
+#endif // RD_JAVA_S60_RELEASE_9_2
aEdwin->SetAknEditorSpecialCharacterTable(-1);
-
// handle all constraints and the PASSWORD modifier
TUint constraint = aConstraints & MMIDTextField::EConstraintMask;
if ((constraint == MMIDTextField::EAny) && (aConstraints & MMIDTextField::EPassword))
@@ -857,11 +862,14 @@
// handle other modifiers
if ((aConstraints & MMIDTextField::ENonPredictive) || (aConstraints & MMIDTextField::ESensitive))
{
- aEdwin->SetAknEditorFlags(EAknEditorFlagNoT9 | EAknEditorFlagDeliverVirtualKeyEventsToApplication);
+ aEdwin->SetAknEditorFlags(aEdwin->AknEdwinFlags() |
+ EAknEditorFlagNoT9 |
+ EAknEditorFlagDeliverVirtualKeyEventsToApplication);
}
else
{
- aEdwin->SetAknEditorFlags(EAknEditorFlagDeliverVirtualKeyEventsToApplication);
+ aEdwin->SetAknEditorFlags(aEdwin->AknEdwinFlags() |
+ EAknEditorFlagDeliverVirtualKeyEventsToApplication);
}
if ((aConstraints & MMIDTextField::EInitialCapsWordSentence) || (aConstraints & MMIDTextField::EInitialCapsWord))
{
@@ -880,7 +888,9 @@
aEdwin->SetAknEditorCurrentInputMode(EAknEditorTextInputMode);
aEdwin->SetAknEditorCase(EAknEditorLowerCase);
aEdwin->SetAknEditorCurrentCase(EAknEditorLowerCase);
- aEdwin->SetAknEditorFlags(EAknEditorFlagNoT9 | EAknEditorFlagDeliverVirtualKeyEventsToApplication);
+ aEdwin->SetAknEditorFlags(aEdwin->AknEdwinFlags() |
+ EAknEditorFlagNoT9 |
+ EAknEditorFlagDeliverVirtualKeyEventsToApplication);
aEdwin->SetAknEditorSpecialCharacterTable(R_MIDP_TEXTBOX_SPECIAL_CHARACTER_TABLE_DIALOG);
break;
case MMIDTextField::ENumeric:
@@ -899,8 +909,10 @@
extendedInputCapabilities->Capabilities() |
CAknExtendedInputCapabilities::EDisableSCT);
}
- aEdwin->SetAknEditorFlags(EAknEditorFlagFixedCase | EAknEditorFlagNoT9 |
- EAknEditorFlagUseSCTNumericCharmap | EAknEditorFlagDeliverVirtualKeyEventsToApplication);
+ aEdwin->SetAknEditorFlags(aEdwin->AknEdwinFlags() |
+ EAknEditorFlagFixedCase | EAknEditorFlagNoT9 |
+ EAknEditorFlagUseSCTNumericCharmap |
+ EAknEditorFlagDeliverVirtualKeyEventsToApplication);
aEdwin->SetAknEditorSpecialCharacterTable(R_MIDP_TEXTBOX_NUMERIC_MODE_DIALOG);
}
break;
@@ -909,8 +921,10 @@
aEdwin->SetAknEditorAllowedInputModes(EAknEditorNumericInputMode);
aEdwin->SetAknEditorInputMode(EAknEditorNumericInputMode);
aEdwin->SetAknEditorCurrentInputMode(EAknEditorNumericInputMode);
- aEdwin->SetAknEditorFlags(EAknEditorFlagFixedCase | EAknEditorFlagNoT9 |
- EAknEditorFlagUseSCTNumericCharmap | EAknEditorFlagDeliverVirtualKeyEventsToApplication);
+ aEdwin->SetAknEditorFlags(aEdwin->AknEdwinFlags() |
+ EAknEditorFlagFixedCase | EAknEditorFlagNoT9 |
+ EAknEditorFlagUseSCTNumericCharmap |
+ EAknEditorFlagDeliverVirtualKeyEventsToApplication);
aEdwin->SetAknEditorNumericKeymap(EAknEditorPlainNumberModeKeymap);
if (iDecimalSeparator == ',')
{
@@ -925,7 +939,8 @@
aEdwin->SetAknEditorAllowedInputModes(EAknEditorNumericInputMode);
aEdwin->SetAknEditorInputMode(EAknEditorNumericInputMode);
aEdwin->SetAknEditorCurrentInputMode(EAknEditorNumericInputMode);
- aEdwin->SetAknEditorFlags(EAknEditorFlagFixedCase | EAknEditorFlagNoT9 |
+ aEdwin->SetAknEditorFlags(aEdwin->AknEdwinFlags() |
+ EAknEditorFlagFixedCase | EAknEditorFlagNoT9 |
EAknEditorFlagDeliverVirtualKeyEventsToApplication);
aEdwin->SetAknEditorNumericKeymap(EAknEditorStandardNumberModeKeymap);
break;