--- a/uifw/AvKon/src/aknbattery.cpp	Tue Apr 27 16:55:05 2010 +0300
+++ b/uifw/AvKon/src/aknbattery.cpp	Tue May 11 16:27:42 2010 +0300
@@ -578,10 +578,13 @@
                 {
                 // set flag that pointerdown was inside battery pane
                 iPrivateFlags |= EAknBatteryPaneButton1DownInBatteryRect;
-                MTouchFeedback* feedback = MTouchFeedback::Instance();
-                if ( feedback )
+                if ( !AknStatuspaneUtils::ExtendedFlatLayoutActive() )
                     {
-                    feedback->InstantFeedback( ETouchFeedbackSensitiveButton );
+                    MTouchFeedback* feedback = MTouchFeedback::Instance();
+                    if ( feedback )
+                        {
+                        feedback->InstantFeedback( ETouchFeedbackSensitiveButton );
+                        }
                     }
                 }
             }
@@ -647,6 +650,15 @@
                     CAknSmallIndicator* indicatorNotifier =
                         CAknSmallIndicator::NewLC( TUid::Uid( 0 ) );
                     indicatorNotifier->HandleIndicatorTapL();
+                    //for indicator popup event
+                    if ( feedback )
+                        {
+                        feedback->InstantFeedback(
+                                           this,
+                                           ETouchFeedbackPopUp,
+                                           ETouchFeedbackVibra,
+                                           aPointerEvent );
+                        }
                     CleanupStack::PopAndDestroy( indicatorNotifier );
                     }
                 }