--- a/menufw/menufwui/mmwidgets/src/mmwidgetcontainer.cpp	Thu Jan 07 12:39:41 2010 +0200
+++ b/menufw/menufwui/mmwidgets/src/mmwidgetcontainer.cpp	Mon Jan 18 20:10:36 2010 +0200
@@ -12,7 +12,7 @@
 * Contributors:
 *
 * Description:
-*  Version     : %version: MM_71.1.17.1.44 % << Don't touch! Updated by Synergy at check-out.
+*  Version     : %version: MM_71.1.17.1.47 % << Don't touch! Updated by Synergy at check-out.
 *
 */
 
@@ -134,6 +134,18 @@
 //
 // -----------------------------------------------------------------------------
 //
+EXPORT_C void CMmWidgetContainer::EnableLongTapAnimation( TBool aEnable )
+    {
+    if ( iLongTapDetector )
+        {
+        iLongTapDetector->EnableLongTapAnimation( aEnable );
+        }
+    }
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+//
 void CMmWidgetContainer::SizeChanged()
     {
     if ( iWidget && iWidgetRect != Rect() )
@@ -222,9 +234,17 @@
             aType == KAknsMessageSkinChange )
         {
         static_cast<CMmListBoxItemDrawer*>( iDrawer )->InvalidateCache();
+        CMmTemplateLibrary * templateLibrary =
+        static_cast<CMmListBoxItemDrawer*>( iDrawer )->TemplateLibrary();
+        templateLibrary->CleanAndClearCache();
         }
 
     CCoeControl::HandleResourceChange( aType );
+
+	if ( aType == KEikDynamicLayoutVariantSwitch && !IsHighlightVisible() )
+		{
+		SetDefaultHighlightL( EFalse );
+		}
     }
 
 // -----------------------------------------------------------------------------
@@ -636,6 +656,10 @@
 
     if ( iLongTapDetector )
     	{
+    	if ( !itemExists )
+    	    {
+    	    iLongTapDetector->EnableLongTapAnimation( EFalse );
+    	    }
     	TPointerEvent longTapPointerEvent = aPointerEvent;
         if ( aPointerEvent.iType == TPointerEvent::EButtonRepeat )
         	{