--- a/uifw/AvKon/src/aknnotecontrol.cpp	Tue Feb 02 01:00:49 2010 +0200
+++ b/uifw/AvKon/src/aknnotecontrol.cpp	Fri Feb 19 23:04:46 2010 +0200
@@ -49,6 +49,8 @@
 #include <touchfeedback.h>
 
 #include <AknTasHook.h> // for testability hooks
+
+#include "akntrace.h"
 const TInt KRate = 95;    // 95% similar rate
 const TInt KFullColor = 255;
 
@@ -73,6 +75,7 @@
  */
 EXPORT_C CAknNoteControl::~CAknNoteControl()
     {
+    _AKNTRACE_FUNC_ENTER;
     AKNTASHOOK_REMOVE();
     MTouchFeedback* feedback = MTouchFeedback::Instance();
     if ( feedback )
@@ -82,6 +85,7 @@
 
     delete iAttributes;
     delete iLineWidths;
+    _AKNTRACE_FUNC_EXIT;
     }
 
 void CAknNoteControl::ConstructFromResourceL(TResourceReader &aRes)
@@ -128,7 +132,8 @@
 //  CCOECONTROL METHODS
 // -----------------------------------------
 void CAknNoteControl::Draw(const TRect& /*aRect*/) const
-    {   
+    {
+    _AKNTRACE_FUNC_ENTER;
     MAknsSkinInstance* skin = AknsUtils::SkinInstance();
 
     MAknsControlContext* cc = iAttributes->iBgContext;
@@ -187,6 +192,7 @@
         {
         iShadowRect.DrawRect( gc );
         }   
+    _AKNTRACE_FUNC_EXIT;
     }
     
 EXPORT_C void CAknNoteControl::HandlePointerEventL(const TPointerEvent& aPointerEvent) 
@@ -277,8 +283,10 @@
  * Call Layout instead.
  */
 void CAknNoteControl::SizeChanged()
-    {  
+    {
+    _AKNTRACE_FUNC_ENTER;
     DoLayout();
+    _AKNTRACE_FUNC_EXIT;
     }
 
 /** 
@@ -287,6 +295,8 @@
  */
 void CAknNoteControl::DoLayout()
     {
+    _AKNTRACE_FUNC_ENTER;
+    _AKNTRACE("iNoteLayout = %d", iNoteLayout);
     TextControl()->SetRect(LayoutRect());
     switch(iNoteLayout)
         {
@@ -333,6 +343,7 @@
             delete spec;
             }
         }
+    _AKNTRACE_FUNC_EXIT;
     }
 
 /**
@@ -342,6 +353,8 @@
  */
 void CAknNoteControl::WindowLayout( TAknWindowLineLayout& aLayout ) const
     {
+    _AKNTRACE_FUNC_ENTER;
+    _AKNTRACE("iNoteLayout = %d", iNoteLayout);
     TIndex laf(NumberOfLines());
     AknLayoutUtils::TAknCbaLocation cbaLocation( AknLayoutUtils::CbaLocation() );
     TInt variety( 0 );
@@ -436,6 +449,7 @@
                 laf.PopupNoteWindow() );
             break;
         }
+    _AKNTRACE_FUNC_EXIT;
     }
 
 /**
@@ -1182,8 +1196,9 @@
  */
 EXPORT_C void CAknNoteControl::SetTextL(const TDesC& aText, TInt aLineNum)
     {
+    _AKNTRACE_FUNC_ENTER;
     TAknLayoutText textRect;
-    
+    _AKNTRACE(_L("SetTextL = %S"), &aText);
     if ( iNoteLayout == ENotificationWithGraphicsLayout || iNoteLayout == ETextualNotificationLayout )
         {
         textRect.LayoutText(LayoutRect(), AKN_LAYOUT_TEXT_Notification_pop_up_window_texts__text__Line_1(1));
@@ -1197,6 +1212,7 @@
 
     Attributes()->SetTextL(aText, aLineNum, font, iLineWidths);
     Layout();
+    _AKNTRACE_FUNC_EXIT;
     }
 
 /**