--- a/uifw/eikctl/src/EIKMFNE.CPP	Wed Sep 15 12:29:17 2010 +0300
+++ b/uifw/eikctl/src/EIKMFNE.CPP	Wed Oct 13 14:50:15 2010 +0300
@@ -151,7 +151,7 @@
     {
     }
 
-void CEikTimeEditorExtension::HandleInputCapabilitiesEventL( TInt aEvent, TAny* /*aParams*/ )
+void CEikTimeEditorExtension::HandleInputCapabilitiesEventL( TInt aEvent, TAny* aParams )
 	{
     switch ( aEvent )
         {
@@ -213,7 +213,7 @@
     {
     }
 
-void CEikTimeAndDateEditorExtension::HandleInputCapabilitiesEventL( TInt aEvent, TAny* /*aParams*/ )
+void CEikTimeAndDateEditorExtension::HandleInputCapabilitiesEventL( TInt aEvent, TAny* aParams )
 	{
     switch ( aEvent )
         {
@@ -2053,7 +2053,6 @@
                     iExtension->iDisablePenInput = !( iExtension->iFingerSupport );                    
                     iExtension->iFingerParam = aFeatureParam; 
                     iExtension->iHighlightAll = ( iExtension->iFingerSupport &&
-                        !iExtension->iTouchActivated &&
                         aFeatureParam == EnableWithAllHighlight );                  
                     }
                 else
@@ -4090,22 +4089,6 @@
 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*/ )
@@ -4499,22 +4482,6 @@
 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*/ )