--- a/phoneuis/dialer/inc/cdialerkeypadcontainer.h	Tue Feb 02 00:10:04 2010 +0200
+++ b/phoneuis/dialer/inc/cdialerkeypadcontainer.h	Fri Feb 19 22:50:26 2010 +0200
@@ -26,12 +26,14 @@
 #include    <coemain.h>
 
 #include    "cdialercontainerbase.h"
+#include    "cdialerkeypadlabelmanager.h"
 
 // CONSTANTS
 
 // FORWARD DECLARATIONS
 class CDialerKeyPadButton;
 
+
 // CLASS DECLARATION
  
 /**
@@ -41,7 +43,8 @@
 *  @since S60 v5.0
 */
 NONSHARABLE_CLASS(CDialerKeyPadContainer) : public CDialerContainerBase, 
-                                            public MCoeForegroundObserver
+                                            public MCoeForegroundObserver,
+                                            public MDialerKeyPadLabelManagerCallback
     {
     public:  // Constructors and destructor
         
@@ -69,6 +72,19 @@
         
         void EnableTactileFeedback( const TBool aEnable );
         
+        // moved from private to public
+        /**
+        * @see CCoeControl
+        */        
+        void MakeVisible( TBool aVisible );
+        
+        /**
+         * Sets the operation mode. New mode takes effect once the
+         * size of the component is reset.
+         * @param   aOperatingMode  New operation mode.
+         */
+        void SetOperationMode( TDialerOperationMode aOperatingMode );
+        
     private:  // Functions from base classes
         
         /**
@@ -92,11 +108,6 @@
         void HandleResourceChange( TInt aType );   
         
         /**
-        * @see CCoeControl
-        */        
-        void MakeVisible( TBool aVisible );     
-        
-        /**
         * @see MCoeControlObserver
         */        
         void HandleControlEventL( CCoeControl* aControl,TCoeEvent aEventType );      
@@ -111,6 +122,10 @@
         */         
         void HandleLosingForeground();      
         
+        /**
+         * @see MDialerKeyPadLabelManagerCallback
+         */
+        void KeyLabelsChanged();
         
     private: // From CDialerContainerBase
     
@@ -140,6 +155,11 @@
         void SetPhoneLayout();
 
         /**
+         * Set layout in Easy Dialing mode
+         */
+        void SetEasyDialingLayout();
+        
+        /**
         * Set layout in Video DTMF mode
         */
         void SetVideoLayout();
@@ -149,7 +169,6 @@
         */
         void CreateButtonsL();
         
-        
     private:    // Data
     
         TDialerOperationMode iOperatingMode;
@@ -174,6 +193,11 @@
          * Stores last pointer event. 
          */        
         TPointerEvent iPointerEvent;
+        
+        /**
+         * Helper to manage keypad button labels
+         */
+        CDialerKeyPadLabelManager* iKeyLabelManager;
     };
 
 #endif      // CDIALERKEYPADCONTAINER_H