--- a/clock2/clockui/uilayer/clockmainview/src/clockmaincontainer.cpp	Thu Jul 15 18:37:27 2010 +0300
+++ b/clock2/clockui/uilayer/clockmainview/src/clockmaincontainer.cpp	Thu Aug 19 09:53:43 2010 +0300
@@ -218,6 +218,14 @@
             else if( iNewAlarmButton->IsFocused() && itemCount > 0 )
                 {
                 iListBox->View()->ItemDrawer()->ClearFlags( CListItemDrawer::EDisableHighlight );
+                
+                //clear ESingleClickDisabledHighlight flag only when navigation key is used
+                if(iClearSingleClickFlag)
+                    {
+                    iListBox->View()->ItemDrawer()->ClearFlags( CListItemDrawer::ESingleClickDisabledHighlight );
+                    iClearSingleClickFlag = EFalse;
+                    }
+                
                 iNewAlarmButton->SetFocus( EFalse );
                 iListBox->SetFocus( ETrue );
                 if( EKeyDownArrow == aKeyEvent.iCode )
@@ -397,6 +405,7 @@
             aPointerEvent.iType == TPointerEvent::EButton1Down &&
             !iListBox->IsFocused() && iListBox->IsVisible() )
         {
+        iNewAlarmButton->SetFocus(EFalse);
         iListBox->View()->ItemDrawer()->ClearFlags( CListItemDrawer::EDisableHighlight );
         }
     
@@ -470,6 +479,7 @@
     iListBox->SetCurrentItemIndexAndDraw( itemIndex );
     SetCorrectRectForNewAlarmButton();
     iNewAlarmButton->DrawDeferred();
+    iClearSingleClickFlag = ETrue;
 	__PRINTS( "CClockMainContainer::UpdateAlarmListL - Exit" );
     }
 
@@ -1160,7 +1170,7 @@
 	
     iView = aView;
     iAlarmArray = aAlarmArray;
-    
+    iClearSingleClickFlag = ETrue;
 	CreateWindowL();
     
 	// Construct the basic skin context.
@@ -1709,4 +1719,14 @@
     iSkinnableClock->ActivateL();
     iSkinnableClock->DrawDeferred();
     }
+
+TBool CClockMainContainer::IsNewAlaramButtonFocused()
+    {
+    __PRINTS( "CClockMainContainer::IsNewAlaramFocused - Entry" );
+    
+    return (iNewAlarmButton->IsFocused());
+    
+    __PRINTS( "CClockMainContainer::IsNewAlaramFocused - Exit" );
+    
+    }
 // End of file