--- a/uifw/AvKon/src/akncolourselectiongrid.cpp	Wed Mar 31 21:59:52 2010 +0300
+++ b/uifw/AvKon/src/akncolourselectiongrid.cpp	Wed Apr 14 16:14:00 2010 +0300
@@ -1723,17 +1723,32 @@
     // close the color grid: 
     // if the NGA effects are off, use “pop-up”.
     // If NGA effects are on, use “pop-up closed”.
-    MTouchFeedback* feedback = MTouchFeedback::Instance();
-
+    if( AknLayoutUtils::PenEnabled() )
+        {
+        MTouchFeedback* feedback = MTouchFeedback::Instance();
+        if ( feedback )
+            {
+            if ( CAknTransitionUtils::TransitionsEnabled( AknTransEffect::EComponentTransitionsOff ) )
+                {
+                feedback->InstantFeedback( this,
+                                            ETouchFeedbackIncreasingPopUp,
+                                            ETouchFeedbackVibra,
+                                            TPointerEvent() );
+                }
+            else
+                {
+                feedback->InstantFeedback( this,
+                                            ETouchFeedbackPopUp,
+                                            ETouchFeedbackVibra,
+                                            TPointerEvent() );
+                }
+            }
+        }
     switch (aButton)
         {
         case EAknSoftkeyInsert:
         case EEikBidOk:
             {
-            if ( feedback )
-                {
-                feedback->InstantFeedback( ETouchFeedbackBasic );
-                }
             TInt index = iGrid->CurrentItemIndex();
 
             if (iNoneBox)
@@ -1749,20 +1764,7 @@
             }
         default:
             {
-            if ( feedback )
-                {
-                if( AknLayoutUtils::PenEnabled() )
-                    {
-                    if ( CAknTransitionUtils::TransitionsEnabled( AknTransEffect::EComponentTransitionsOff ) )
-                        {
-                        feedback->InstantFeedback( ETouchFeedbackDecreasingPopUp );
-                        }
-                    else
-                        {
-                        feedback->InstantFeedback( ETouchFeedbackPopUp );
-                        }
-                    }
-                }
+
             break;
             }
         }
@@ -1827,18 +1829,24 @@
     // open the color grid: 
     // if the NGA effects are off, use “pop-up”.
     // If NGA effects are on, use “increasing long touch”.
+    if( AknLayoutUtils::PenEnabled() )
+        {
     MTouchFeedback* feedback = MTouchFeedback::Instance();
     if ( feedback )
-        {
-        if( AknLayoutUtils::PenEnabled() )
             {
             if ( CAknTransitionUtils::TransitionsEnabled( AknTransEffect::EComponentTransitionsOff ) )
                 {
-                feedback->InstantFeedback( ETouchFeedbackIncreasingPopUp );
+                feedback->InstantFeedback( this,
+                                            ETouchFeedbackIncreasingPopUp,
+                                            ETouchFeedbackVibra,
+                                            TPointerEvent() );
                 }
             else
                 {
-                feedback->InstantFeedback( ETouchFeedbackPopUp );
+                feedback->InstantFeedback( this,
+                                            ETouchFeedbackPopUp,
+                                            ETouchFeedbackVibra,
+                                            TPointerEvent() );
                 }
             }
         }