--- a/photosgallery/viewframework/views/gridview/src/glxgridviewimp.cpp	Wed Sep 15 12:13:06 2010 +0300
+++ b/photosgallery/viewframework/views/gridview/src/glxgridviewimp.cpp	Wed Oct 13 14:32:09 2010 +0300
@@ -127,6 +127,9 @@
 	{
 	TRACER("CGlxGridViewImp::DoMLViewActivateL()");
 
+    TUint transitionID = (iUiUtility->ViewNavigationDirection()==
+          EGlxNavigationForwards)?KActivateTransitionId:KFSDeActivateTransitionId; 
+    
     HBufC8* activationParam = HBufC8::NewLC(KMaxUidName);
     activationParam->Des().AppendNum(KGlxActivationCmdShowAll);    
 
@@ -177,8 +180,8 @@
         iToolbar = CAknToolbar::NewL(R_GLX_GRID_VIEW_TOOLBAR);
         SetGridToolBar(iToolbar);
         SetToolbarObserver(this);
-        iToolbar->SetDimmed(ETrue);
-        iToolbar->SetToolbarVisibility(ETrue);
+        //Make the toolbar visible only when the medialist is populated
+        iToolbar->SetToolbarVisibility(iMediaList->IsPopulated());
         }
 	//Create gridview container
 	iGlxGridViewContainer = CGlxGridViewContainer::NewL(iMediaList,
@@ -190,14 +193,11 @@
     // except if launched from Camera App.
     if (aCustomMessage.Compare(activationParam->Des()) != 0) 
         {
-		TUint transitionID = (iUiUtility->ViewNavigationDirection()
-				== EGlxNavigationForwards) ? KActivateTransitionId
-				: KFSDeActivateTransitionId;
         GfxTransEffect::BeginFullScreen( transitionID, TRect(),
                                     AknTransEffect::EParameterType, 
                                     AknTransEffect::GfxTransParam( KPhotosUid,
-                                    AknTransEffect::TParameter::EEnableEffects) );
-        iIsTransEffectStarted = ETrue;
+                                    AknTransEffect::TParameter::EEnableEffects) );	
+        GfxTransEffect::EndFullScreen();
         }	
 	CleanupStack::PopAndDestroy(activationParam);
 	}