--- a/phoneapp/phoneuiqtviewadapter/tsrc/ut_phonevisibilityhandler/unit_tests.cpp	Mon Oct 04 16:06:10 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/tsrc/ut_phonevisibilityhandler/unit_tests.cpp	Fri Oct 15 12:58:46 2010 +0300
@@ -60,7 +60,7 @@
 
     // From PhoneUIQtViewIF
     BubbleManagerIF& bubbleManager () {};
-    void addBubbleCommand (int , const PhoneAction& ) {};
+    void addBubbleCommand (int , HbAction * ) {};
     void clearBubbleCommands (int ) {};
     void addParticipantListAction(
             int ,  
@@ -69,7 +69,7 @@
     void clearParticipantListActions() {};
     void hideToolbar () {};
     void showToolbar () {};
-    void setToolbarActions (const QList<PhoneAction*>& ) {};
+    void setToolbarActions (const QList<HbAction *> & ) {};
     int volumeSliderValue () {};
     void removeVolumeSlider () {};
     void setVolumeSliderValue (
@@ -87,7 +87,8 @@
     void clearAndHideDialpad() {};
     void clearDialpad() {};
     void bringToForeground() { m_bringToForegroundCalled = true;};
-    void setMenuActions(const QList<PhoneAction*>& ) {};
+	  void hide() {};
+    void setMenuActions(const QList<HbAction *> & ) {};
     void shutdownPhoneApp() {};
     void setBackButtonVisible(bool ) {};
     HbMenu &menuReference() {};
@@ -219,7 +220,7 @@
     QCOMPARE(CEikonEnv::Static()->RootWin().OrdinalPriority(), ECoeWinPriorityAlwaysAtFront + 100);
     
     // send backgroud is called last
-    m_handler->sendToBackground(false);
+    m_handler->sendToBackground();
     QVERIFY(CEikonEnv::Static()->RootWin().OrdinalPosition() > 0);
     QCOMPARE(CEikonEnv::Static()->RootWin().OrdinalPriority(), m_startPriority);
 }
@@ -259,7 +260,7 @@
     QVERIFY(m_bringToForegroundCalled == false);
     
     // send backgroud is called last
-    m_handler->sendToBackground(false);
+    m_handler->sendToBackground();
     QVERIFY(CEikonEnv::Static()->RootWin().OrdinalPosition() > 0);
     QCOMPARE(CEikonEnv::Static()->RootWin().OrdinalPriority(), m_startPriority);
 }
@@ -303,7 +304,7 @@
 
     
     // send backgroud is called last
-    m_handler->sendToBackground(false);
+    m_handler->sendToBackground();
     QVERIFY(CEikonEnv::Static()->RootWin().OrdinalPosition() > 0);
     QCOMPARE(CEikonEnv::Static()->RootWin().OrdinalPriority(), m_startPriority);
     
@@ -317,6 +318,7 @@
     
     // bringToForeground is call
     m_handler->bringToForeground();
+    m_handler->windowVisibilityChange(true);
     QVERIFY(m_bringToForegroundCalled);
     QVERIFY(g_disableKeyGuardCalled);
     QCOMPARE(CEikonEnv::Static()->RootWin().OrdinalPosition(), 0);
@@ -324,7 +326,8 @@
     
     cleanup();
     // send backgroud is called last
-    m_handler->sendToBackground(false);
+    m_handler->sendToBackground();
+    m_handler->windowVisibilityChange(false);
     QVERIFY(!g_enableKeyGuardCalled);
     QVERIFY(CEikonEnv::Static()->RootWin().OrdinalPosition() > 0);
     QCOMPARE(CEikonEnv::Static()->RootWin().OrdinalPriority(), m_startPriority);
@@ -336,6 +339,7 @@
     
     // bringToForeground is call
     m_handler->bringToForeground();
+    m_handler->windowVisibilityChange(true);
     QVERIFY(m_bringToForegroundCalled);
     QVERIFY(g_disableKeyGuardCalled);
     QCOMPARE(CEikonEnv::Static()->RootWin().OrdinalPosition(), 0);
@@ -343,7 +347,8 @@
     
     cleanup();
     // send backgroud is called last
-    m_handler->sendToBackground(false);
+    m_handler->sendToBackground();
+    m_handler->windowVisibilityChange(false);
     QVERIFY(g_enableKeyGuardCalled);
     QVERIFY(CEikonEnv::Static()->RootWin().OrdinalPosition() > 0);
     QCOMPARE(CEikonEnv::Static()->RootWin().OrdinalPriority(), m_startPriority);
@@ -355,6 +360,7 @@
     
     // bringToForeground is call
     m_handler->bringToForeground();
+    m_handler->windowVisibilityChange(true);
     QVERIFY(m_bringToForegroundCalled);
     QVERIFY(g_disableKeyGuardCalled);
     QCOMPARE(CEikonEnv::Static()->RootWin().OrdinalPosition(), 0);
@@ -363,7 +369,9 @@
     cleanup();
     // Test that keyguard is not enabled when phone is background
     CEikonEnv::Static()->RootWin().SetOrdinalPosition(-1, ECoeWinPriorityNormal);
-    m_handler->sendToBackground(false);
+    m_handler->windowVisibilityChange(false);
+    m_handler->sendToBackground();
+    m_handler->windowVisibilityChange(false);
     QVERIFY(!g_enableKeyGuardCalled);
     QVERIFY(CEikonEnv::Static()->RootWin().OrdinalPosition() > 0);
     QCOMPARE(CEikonEnv::Static()->RootWin().OrdinalPriority(), m_startPriority);
@@ -375,6 +383,7 @@
     
     // bringToForeground is call
     m_handler->bringToForeground();
+    m_handler->windowVisibilityChange(true);
     QVERIFY(m_bringToForegroundCalled);
     QVERIFY(g_disableKeyGuardCalled);
     QCOMPARE(CEikonEnv::Static()->RootWin().OrdinalPosition(), 0);
@@ -382,13 +391,15 @@
     
     cleanup();
     m_handler->bringToForeground();
+    m_handler->windowVisibilityChange(true);
     QVERIFY(m_bringToForegroundCalled);
     QVERIFY(g_disableKeyGuardCalled);
     QCOMPARE(CEikonEnv::Static()->RootWin().OrdinalPosition(), 0);
     QCOMPARE(CEikonEnv::Static()->RootWin().OrdinalPriority(), ECoeWinPriorityAlwaysAtFront + 100);
     
     cleanup();
-    m_handler->sendToBackground(false);
+    m_handler->sendToBackground();
+    m_handler->windowVisibilityChange(false);
     QVERIFY(g_enableKeyGuardCalled);
     QVERIFY(CEikonEnv::Static()->RootWin().OrdinalPosition() > 0);
     QCOMPARE(CEikonEnv::Static()->RootWin().OrdinalPriority(), m_startPriority);
@@ -398,6 +409,7 @@
     
     // bringToForeground is call
     m_handler->bringToForeground();
+    m_handler->windowVisibilityChange(true);
     QVERIFY(m_bringToForegroundCalled);
     QVERIFY(g_disableKeyGuardCalled);
     QCOMPARE(CEikonEnv::Static()->RootWin().OrdinalPosition(), 0);
@@ -406,13 +418,15 @@
     cleanup();
     g_keyGuardEnabled = true; 
     m_handler->bringToForeground();
+    m_handler->windowVisibilityChange(true);
     QVERIFY(m_bringToForegroundCalled);
     QVERIFY(g_disableKeyGuardCalled);
     QCOMPARE(CEikonEnv::Static()->RootWin().OrdinalPosition(), 0);
     QCOMPARE(CEikonEnv::Static()->RootWin().OrdinalPriority(), ECoeWinPriorityAlwaysAtFront + 100);
     
     cleanup();
-    m_handler->sendToBackground(false);
+    m_handler->sendToBackground();
+    m_handler->windowVisibilityChange(false);
     QVERIFY(g_enableKeyGuardCalled);
     QVERIFY(CEikonEnv::Static()->RootWin().OrdinalPosition() > 0);
     QCOMPARE(CEikonEnv::Static()->RootWin().OrdinalPriority(), m_startPriority);