--- a/videocollection/videocollectionview/src/videocollectionviewutils.cpp	Fri Jun 11 13:39:54 2010 +0300
+++ b/videocollection/videocollectionview/src/videocollectionviewutils.cpp	Wed Jun 23 18:14:16 2010 +0300
@@ -15,11 +15,9 @@
 *
 */
 
-// Version : %version: 39 %
+// Version : %version: 41 %
 
 // INCLUDE FILES
-#include <hbapplication.h>
-#include <hbactivitymanager.h>
 #include <hbglobal.h>
 #include <hblistview.h>
 #include <hbscrollbar.h>
@@ -32,6 +30,7 @@
 #include "videocollectioncommon.h"
 #include "videocollectionviewutils.h"
 #include "videosortfilterproxymodel.h"
+#include "videoactivitystate.h"
 #include "videocollectiontrace.h"
 
 // Object names.
@@ -51,7 +50,6 @@
 const int KAddToCollectionCountIndex(0);
 const int KAddToCollectionNameIndex(1);
 
-static const char* ACTIVITY_VIDEOS_MAINVIEW = "VideosMainView";
 
 // ---------------------------------------------------------------------------
 // instance
@@ -320,20 +318,9 @@
 //
 void VideoCollectionViewUtils::saveWidgetLevel(VideoCollectionCommon::TCollectionLevels &level)
 {
-    FUNC_LOG;
-    HbActivityManager* activityManager = qobject_cast<HbApplication*>(qApp)->activityManager();
-    if(!activityManager)
-    {
-        return;
-    }
-    // clean up any previous versions of this activity from the activity manager.
-   activityManager->removeActivity(ACTIVITY_VIDEOS_MAINVIEW);
-   
-   QVariant data = int(level);
-   
-   activityManager->addActivity(ACTIVITY_VIDEOS_MAINVIEW, data, QVariantHash());
-
-
+    FUNC_LOG; 
+    QVariant data = int(level);
+    VideoActivityState::instance().setActivityData(data, VideoActivityData::KEY_WIDGET_LEVEL);
 }
   
 // ---------------------------------------------------------------------------
@@ -346,13 +333,7 @@
     // all videos view is the default value to be returned in case nothing can be read
     // from the activity manager
     VideoCollectionCommon::TCollectionLevels level(VideoCollectionCommon::ELevelVideos);
-    
-    HbActivityManager* activityManager = qobject_cast<HbApplication*>(qApp)->activityManager();
-    if(!activityManager)
-    {
-        return level;
-    }
-    QVariant data =activityManager->activityData(ACTIVITY_VIDEOS_MAINVIEW);
+    QVariant data = VideoActivityState::instance().getActivityData(VideoActivityData::KEY_WIDGET_LEVEL);
     if(data.toInt() == VideoCollectionCommon::ELevelCategory)
     {
         level = VideoCollectionCommon::ELevelCategory;