--- a/uifw/eikctl/src/EIKMFNE.CPP	Wed Sep 01 12:16:19 2010 +0100
+++ b/uifw/eikctl/src/EIKMFNE.CPP	Tue Sep 14 21:48:24 2010 +0300
@@ -4090,6 +4090,22 @@
 EXPORT_C void CEikTimeEditor::HandlePointerEventL(const TPointerEvent& aPointerEvent) 
     { 
     CEikTTimeEditor::HandlePointerEventL(aPointerEvent); 
+    // If touch input is disabled or qwerty key board is opened, AM/PM will change when
+    // user taps at AM/PM filed; else touch input will be opened. 
+    if ( aPointerEvent.iType == TPointerEvent::EButton1Up &&
+         ( ( iExtension->iExtendedInputCapabilities->Capabilities() & 
+           CAknExtendedInputCapabilities::EInputEditorQwertyInputActive ) ||
+         iExtension->iDisablePenInput || iExtension->iPartialScreenInput ) )
+        {
+        TAmPmName amName( EAm );
+        TAmPmName pmName( EPm );
+        if ( !IsUninitialised() && 
+            ( !iFields[iCurrentField]->FieldText().Compare( amName ) ||
+             !iFields[iCurrentField]->FieldText().Compare( pmName ) ) )
+            {
+            ChangeAmPm();
+            }
+        }
     }   
 
 EXPORT_C void* CEikTimeEditor::ExtensionInterface( TUid /*aInterface*/ )
@@ -4483,6 +4499,22 @@
 EXPORT_C void CEikTimeAndDateEditor::HandlePointerEventL(const TPointerEvent& aPointerEvent) 
     { 
     CEikTTimeEditor::HandlePointerEventL(aPointerEvent); 
+    // If touch input is disabled or qwerty key board is opened, AM/PM will change when
+    // user taps at AM/PM filed; else touch input will be opened. 
+    if ( aPointerEvent.iType == TPointerEvent::EButton1Up &&
+         ( ( iExtension->iExtendedInputCapabilities->Capabilities() & 
+           CAknExtendedInputCapabilities::EInputEditorQwertyInputActive ) ||
+           iExtension->iDisablePenInput || iExtension->iPartialScreenInput ) )
+        {
+        TAmPmName amName( EAm );
+        TAmPmName pmName( EPm );
+        if ( !IsUninitialised() && 
+            ( !iFields[iCurrentField]->FieldText().Compare( amName ) ||
+             !iFields[iCurrentField]->FieldText().Compare( pmName ) ) )
+            {
+            ChangeAmPm();
+            }
+        }
     }
 
 EXPORT_C void* CEikTimeAndDateEditor::ExtensionInterface( TUid /*aInterface*/ )