# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1268572191 0
# Node ID 28b356b7eb4b45f6d404ccc96efe874366609679
# Parent  ceea559c5bb9de17939b373913d507d1f01b405c# Parent  07d1685f0cd411db81f47b829d196ca601496426
Automatic merge from PDK_3.0.h

diff -r ceea559c5bb9 -r 28b356b7eb4b vtengines/videoteleng/Inc/Audio/CVtEngAudioHandler.h
--- a/vtengines/videoteleng/Inc/Audio/CVtEngAudioHandler.h	Mon Mar 08 21:43:32 2010 +0000
+++ b/vtengines/videoteleng/Inc/Audio/CVtEngAudioHandler.h	Sun Mar 14 13:09:51 2010 +0000
@@ -29,9 +29,9 @@
 #include    "CVtEngAccessoryHandler.h"
 #include    "MVtEngAccessoryObserver.h"
 // new audio routing
-#include    "telephonyaudiorouting.h"
-#include    "mtelephonyaudioroutingobserver.h"
-#include    <rphcltserver.h>
+#include    "TelephonyAudioRouting.h"
+#include    "MTelephonyAudioRoutingObserver.h"
+#include    <RPhCltServer.h>
 #include    <mmf/server/sounddevice.h>
 
 // FORWARD DECLARATIONS
diff -r ceea559c5bb9 -r 28b356b7eb4b vtengines/videoteleng/Inc/Base/CVtEngAccessoryHandler.h
--- a/vtengines/videoteleng/Inc/Base/CVtEngAccessoryHandler.h	Mon Mar 08 21:43:32 2010 +0000
+++ b/vtengines/videoteleng/Inc/Base/CVtEngAccessoryHandler.h	Sun Mar 14 13:09:51 2010 +0000
@@ -23,8 +23,8 @@
 //  INCLUDES
 #include    <e32base.h>
 #include    <AccPolAccessoryMode.h>
-#include    <accessoryserver.h>
-#include    <accessorymode.h>
+#include    <AccessoryServer.h>
+#include    <AccessoryMode.h>
 
 // FORWARD DECLARATIONS
 class MVtEngAccessoryObserver;
diff -r ceea559c5bb9 -r 28b356b7eb4b vtengines/videoteleng/Inc/Base/CVtEngSATClient.h
--- a/vtengines/videoteleng/Inc/Base/CVtEngSATClient.h	Mon Mar 08 21:43:32 2010 +0000
+++ b/vtengines/videoteleng/Inc/Base/CVtEngSATClient.h	Sun Mar 14 13:09:51 2010 +0000
@@ -24,7 +24,7 @@
 #include <e32base.h>
 #include <e32std.h>
 #include <RSatRefresh.h>
-#include <rsatsession.h>
+#include <RSatSession.h>
 
 
 // CLASS DECLARATION
diff -r ceea559c5bb9 -r 28b356b7eb4b vtengines/videoteleng/Inc/Base/MVtEngAccessoryObserver.h
--- a/vtengines/videoteleng/Inc/Base/MVtEngAccessoryObserver.h	Mon Mar 08 21:43:32 2010 +0000
+++ b/vtengines/videoteleng/Inc/Base/MVtEngAccessoryObserver.h	Sun Mar 14 13:09:51 2010 +0000
@@ -20,7 +20,7 @@
 
 //  INCLUDES
 #include    <e32std.h>
-#include    <accpolaccessorymode.h>
+#include    <AccPolAccessoryMode.h>
 
 // CLASS DECLARATION
 
diff -r ceea559c5bb9 -r 28b356b7eb4b vtengines/videoteleng/Inc/Base/cvtengmdtrmessagelistener.h
--- a/vtengines/videoteleng/Inc/Base/cvtengmdtrmessagelistener.h	Mon Mar 08 21:43:32 2010 +0000
+++ b/vtengines/videoteleng/Inc/Base/cvtengmdtrmessagelistener.h	Sun Mar 14 13:09:51 2010 +0000
@@ -23,7 +23,7 @@
 
 //#include <e32cmn.h>
 #include <MediatorCommandResponder.h>
-#include <mediatoreventconsumer.h>
+#include <MediatorEventConsumer.h>
 #include "MVtEngEventObserver.h"
 #include  "CVtEngStateManager.h"
 #include  "MVtEngSessionInfo.h"
diff -r ceea559c5bb9 -r 28b356b7eb4b vtengines/videoteleng/Inc/Media/CVtEngDrawNGA.h
--- a/vtengines/videoteleng/Inc/Media/CVtEngDrawNGA.h	Mon Mar 08 21:43:32 2010 +0000
+++ b/vtengines/videoteleng/Inc/Media/CVtEngDrawNGA.h	Sun Mar 14 13:09:51 2010 +0000
@@ -22,7 +22,7 @@
 //  INCLUDES
 //#include <videorenderer.h>
 #include <Posting_Surface.h>
-#include <posting_surface_factory.h>
+#include <Posting_Surface_Factory.h>
 #include <pixelformats.h>
 //#include <videoframebuffer.h>
 // GCE Surface
diff -r ceea559c5bb9 -r 28b356b7eb4b vtengines/videoteleng/Src/Audio/CVtEngAudioHandler.cpp
--- a/vtengines/videoteleng/Src/Audio/CVtEngAudioHandler.cpp	Mon Mar 08 21:43:32 2010 +0000
+++ b/vtengines/videoteleng/Src/Audio/CVtEngAudioHandler.cpp	Sun Mar 14 13:09:51 2010 +0000
@@ -24,7 +24,7 @@
 #include    <cvtlogger.h>
 #include    <featmgr.h>
 #include    <mmf/server/sounddevice.h>
-#include    <audiopreference.h>
+#include    <AudioPreference.h>
 #include    "VtEngUtils.h"
 #include    "CVtEngStateManager.h"
 #include    "MVtEngSessionInfo.h"
diff -r ceea559c5bb9 -r 28b356b7eb4b vtengines/videoteleng/Src/Base/CVtEngSettings.cpp
--- a/vtengines/videoteleng/Src/Base/CVtEngSettings.cpp	Mon Mar 08 21:43:32 2010 +0000
+++ b/vtengines/videoteleng/Src/Base/CVtEngSettings.cpp	Sun Mar 14 13:09:51 2010 +0000
@@ -25,9 +25,9 @@
 #include    "VtEngPanic.h"
 #include    <telincallvolcntrlcrkeys.h>
 #include    <RPhCltServer.h>
-#include    <cphcltimagehandler.h>
+#include    <CPhCltImageHandler.h>
 #include    <videotelephonyinternalcrkeys.h>
-#include    <logsdomaincrkeys.h>
+#include    <LogsDomainCRKeys.h>
 #include    <settingsinternalcrkeys.h>
 #include    <videotelephonyvariant.hrh>
 
diff -r ceea559c5bb9 -r 28b356b7eb4b vtengines/videoteleng/Src/Base/cvtengmdtrcommandsender.cpp
--- a/vtengines/videoteleng/Src/Base/cvtengmdtrcommandsender.cpp	Mon Mar 08 21:43:32 2010 +0000
+++ b/vtengines/videoteleng/Src/Base/cvtengmdtrcommandsender.cpp	Sun Mar 14 13:09:51 2010 +0000
@@ -26,8 +26,8 @@
 #include    "vtengcommands.h"
 #include    "CVtEngStateManager.h"
 #include    "VtEngPanic.h"
-#include    <mediatorcommandinitiator.h>
-#include    <mediatordomainuids.h> 
+#include    <MediatorCommandInitiator.h>
+#include    <MediatorDomainUIDs.h> 
 #include    <mediatorcommandstotelephonyapi.h>
 #include    <mediatoraudiocommandstotelephonyapi.h>
 #include    <videoteltophonecommandsapi.h>
diff -r ceea559c5bb9 -r 28b356b7eb4b vtengines/videoteleng/Src/Base/cvtengmdtrmessagelistener.cpp
--- a/vtengines/videoteleng/Src/Base/cvtengmdtrmessagelistener.cpp	Mon Mar 08 21:43:32 2010 +0000
+++ b/vtengines/videoteleng/Src/Base/cvtengmdtrmessagelistener.cpp	Sun Mar 14 13:09:51 2010 +0000
@@ -26,8 +26,8 @@
 
 #include    <cvtlogger.h>
 #include    <videotelcontrolmediatorapi.h>
-#include    <mediatorcommandresponder.h>
-#include    <mediatordomainuids.h>
+#include    <MediatorCommandResponder.h>
+#include    <MediatorDomainUIDs.h>
 #include    <mediatoreventsfromtelephonyapi.h>
 #include    <vtinternalmediatorapi.h>
 
diff -r ceea559c5bb9 -r 28b356b7eb4b vtengines/videoteleng/Src/Base/cvtengmediatorservice.cpp
--- a/vtengines/videoteleng/Src/Base/cvtengmediatorservice.cpp	Mon Mar 08 21:43:32 2010 +0000
+++ b/vtengines/videoteleng/Src/Base/cvtengmediatorservice.cpp	Sun Mar 14 13:09:51 2010 +0000
@@ -26,7 +26,7 @@
 #include    "CVtEngSettings.h"
 #include    <cvtlogger.h>
 #include    <MediatorCommandResponder.h>
-#include    <mediatordomainuids.h>
+#include    <MediatorDomainUIDs.h>
 #include    <videotelcontrolmediatorapi.h> 
 #include    <videoteltophonecommandsapi.h>
 #include    <vtinternalmediatorapi.h>
diff -r ceea559c5bb9 -r 28b356b7eb4b vtengines/videoteleng/Src/Media/CVtEngDrawDP.cpp
--- a/vtengines/videoteleng/Src/Media/CVtEngDrawDP.cpp	Mon Mar 08 21:43:32 2010 +0000
+++ b/vtengines/videoteleng/Src/Media/CVtEngDrawDP.cpp	Sun Mar 14 13:09:51 2010 +0000
@@ -26,7 +26,7 @@
 #include    <videotelephonyvariant.hrh>
 #include    <tdisplaysinkparamsdp.h>
 #include    <cvtlogger.h>
-#include    <posting_surface_factory.h>
+#include    <Posting_Surface_Factory.h>
 
 #include <cvtimagebitmap.h>
 
diff -r ceea559c5bb9 -r 28b356b7eb4b vtengines/videoteleng/Src/Media/CVtEngDrawNGA.cpp
--- a/vtengines/videoteleng/Src/Media/CVtEngDrawNGA.cpp	Mon Mar 08 21:43:32 2010 +0000
+++ b/vtengines/videoteleng/Src/Media/CVtEngDrawNGA.cpp	Sun Mar 14 13:09:51 2010 +0000
@@ -752,6 +752,9 @@
     iConfig.iWsSession->RegisterSurface(0, iSurfaceId);   
     iConfig.iRemoteWindow->SetBackgroundSurface(iSurfaceId);
     
+    iConfig.iRemoteWindow->BeginRedraw();
+    iConfig.iRemoteWindow->EndRedraw();
+    
     iCallBackTable[0] = new(ELeave) CActiveCallBack(
             TCallBack(SurfaceBuffer0Ready, this), 
             CActive::EPriorityStandard-1);
diff -r ceea559c5bb9 -r 28b356b7eb4b vtengines/vtmediatorplugin/inc/cvtmediatorplugin.h
--- a/vtengines/vtmediatorplugin/inc/cvtmediatorplugin.h	Mon Mar 08 21:43:32 2010 +0000
+++ b/vtengines/vtmediatorplugin/inc/cvtmediatorplugin.h	Sun Mar 14 13:09:51 2010 +0000
@@ -21,13 +21,13 @@
 
 // INCLUDES
 #include <MediatorPluginBase.h>
-#include <mediatornotifications.h>
-#include <mediatoreventconsumer.h>
-#include <mediatoreventprovider.h>
-#include <mediatorcommandresponder.h>
+#include <MediatorNotifications.h>
+#include <MediatorEventConsumer.h>
+#include <MediatorEventProvider.h>
+#include <MediatorCommandResponder.h>
 #include <vtinternalmediatorapi.h>
 #include <mediatoreventsfromtelephonyapi.h>
-#include <mediatorcommandinitiator.h>
+#include <MediatorCommandInitiator.h>
 #include <w32std.h>
 
 
diff -r ceea559c5bb9 -r 28b356b7eb4b vtprotocolplugins/VideoSource/src/CVSStillImageDataProvider.cpp
--- a/vtprotocolplugins/VideoSource/src/CVSStillImageDataProvider.cpp	Mon Mar 08 21:43:32 2010 +0000
+++ b/vtprotocolplugins/VideoSource/src/CVSStillImageDataProvider.cpp	Sun Mar 14 13:09:51 2010 +0000
@@ -23,7 +23,7 @@
 #include <imageconversion.h>
 #include <cvtimageconverter.h>
 #include <RPhCltServer.h>
-#include <cphcltimagehandler.h>
+#include <CPhCltImageHandler.h>
 #include <w32std.h>
 
 #include "CVSStillImageDataProvider.h"
diff -r ceea559c5bb9 -r 28b356b7eb4b vtprotocolplugins/VideoSource/src/cmultiframeprovider.cpp
--- a/vtprotocolplugins/VideoSource/src/cmultiframeprovider.cpp	Mon Mar 08 21:43:32 2010 +0000
+++ b/vtprotocolplugins/VideoSource/src/cmultiframeprovider.cpp	Sun Mar 14 13:09:51 2010 +0000
@@ -20,7 +20,7 @@
 #include <imageconversion.h>
 #include <cvtimageconverter.h>
 #include <RPhCltServer.h>
-#include <cphcltimagehandler.h>
+#include <CPhCltImageHandler.h>
 #include <bautils.h>
 
 #include "cmultiframeprovider.h"
diff -r ceea559c5bb9 -r 28b356b7eb4b vtuis/videotelui/inc/CVtUiRemoteVideoControl.h
--- a/vtuis/videotelui/inc/CVtUiRemoteVideoControl.h	Mon Mar 08 21:43:32 2010 +0000
+++ b/vtuis/videotelui/inc/CVtUiRemoteVideoControl.h	Sun Mar 14 13:09:51 2010 +0000
@@ -19,7 +19,7 @@
 #define CVTUIREMOTEVIDEOCONTROL_H_
 
 #include    <coecntrl.h>
-#include    <aknwseventobserver.h>
+#include    <AknWsEventObserver.h>
 
 class CVtUiVideoControlBase;
 class CVtUiAppUi;
diff -r ceea559c5bb9 -r 28b356b7eb4b vtuis/videotelui/inc/CVtUiZoomControl.h
--- a/vtuis/videotelui/inc/CVtUiZoomControl.h	Mon Mar 08 21:43:32 2010 +0000
+++ b/vtuis/videotelui/inc/CVtUiZoomControl.h	Sun Mar 14 13:09:51 2010 +0000
@@ -23,7 +23,7 @@
 
 //  INCLUDES
 #include    <coecntrl.h>
-#include    <aknutils.h>
+#include    <AknUtils.h>
 #include    "CVtUiBitmapManager.h"
 
 // CLASS DECLARATION
diff -r ceea559c5bb9 -r 28b356b7eb4b vtuis/videotelui/inc/cvtuiappshutter.h
--- a/vtuis/videotelui/inc/cvtuiappshutter.h	Mon Mar 08 21:43:32 2010 +0000
+++ b/vtuis/videotelui/inc/cvtuiappshutter.h	Sun Mar 14 13:09:51 2010 +0000
@@ -22,8 +22,8 @@
 #include <babitflags.h>
 
 #include 	<MPhCltEmergencyCallObserver.h>
-#include    <cphcltemergencycall.h>
-#include    <rphcltserver.h>
+#include    <CPhCltEmergencyCall.h>
+#include    <RPhCltServer.h>
 
 class CAsyncCallBack;
 class MVtUiShutterObserver;
diff -r ceea559c5bb9 -r 28b356b7eb4b vtuis/videotelui/inc/features/prefs/cvtuiprefsettinglistbase.h
--- a/vtuis/videotelui/inc/features/prefs/cvtuiprefsettinglistbase.h	Mon Mar 08 21:43:32 2010 +0000
+++ b/vtuis/videotelui/inc/features/prefs/cvtuiprefsettinglistbase.h	Sun Mar 14 13:09:51 2010 +0000
@@ -193,12 +193,16 @@
     CVtUiAppUi& iAppUi;
     
     // Window priority for context control
-    TInt iWindowPriority;
+    TInt iContextControlWindowPriority;
     
     // Window position for context control
-    TInt iWindowPosition;
-
+    TInt iContextControlWindowPosition;
     
+    // Window priority for context control
+    TInt iRemoteVideoControlWindowPriority;
+    
+    // Window position for context control
+    TInt iRemoteVideoControlWindowPosition;
     };
 
 #endif // CVTUIPEFSETTINGLISTBASE_H
diff -r ceea559c5bb9 -r 28b356b7eb4b vtuis/videotelui/src/CVtUiAllowVideoDialog.cpp
--- a/vtuis/videotelui/src/CVtUiAllowVideoDialog.cpp	Mon Mar 08 21:43:32 2010 +0000
+++ b/vtuis/videotelui/src/CVtUiAllowVideoDialog.cpp	Sun Mar 14 13:09:51 2010 +0000
@@ -19,7 +19,7 @@
 
 // INCLUDE FILES
 #include    "CVtUiAllowVideoDialog.h"
-#include    <stringloader.h>
+#include    <StringLoader.h>
 #include    <videotelui.rsg>
 
 // CONSTANTS
diff -r ceea559c5bb9 -r 28b356b7eb4b vtuis/videotelui/src/CVtUiAppUi.cpp
--- a/vtuis/videotelui/src/CVtUiAppUi.cpp	Mon Mar 08 21:43:32 2010 +0000
+++ b/vtuis/videotelui/src/CVtUiAppUi.cpp	Sun Mar 14 13:09:51 2010 +0000
@@ -37,12 +37,12 @@
 #include    <csxhelp/incl.hlp.hrh>
 
 
-#include    <aknincallbubblenotify.h>
-#include    <aknslayeredbackgroundcontrolcontext.h>
-#include    <aknutils.h>
+#include    <AknIncallBubbleNotify.h>
+#include    <AknsLayeredBackgroundControlContext.h>
+#include    <AknUtils.h>
 #include    <aknnavi.h>
 #include    <akntitle.h>
-#include    <akndlgshut.h>
+#include    <AknDlgShut.h>
 #include    <aknnotedialog.h>
 #include    <aknnotewrappers.h>
 #include    <akncontext.h>
@@ -54,15 +54,15 @@
 #include    <videotelui.rsg>
 #include    <hlplch.h>
 #include    <apgwgnam.h>
-#include    <stringloader.h>
-#include    <akndef.h>
+#include    <StringLoader.h>
+#include    <AknDef.h>
 #include    <aknconsts.h>
 
 
 #include    <e32property.h>
 #include    <ecom/ecom.h>
 #include    <coreapplicationuisdomainpskeys.h>
-#include    <uikoninternalpskeys.h>
+#include    <UikonInternalPSKeys.h>
 #include    <centralrepository.h>
 #include    <videotelephonyinternalcrkeys.h>
 #include    <settingsinternalcrkeys.h>
@@ -72,8 +72,8 @@
 #include    <activeidle2domainpskeys.h>
 #include 	<ctsydomainpskeys.h>
 
-#include    <aknquerydialog.h>
-#include 	<aknglobalnote.h>
+#include    <AknQueryDialog.h>
+#include 	<AknGlobalNote.h>
 #include 	<aknsoundsystem.h>
 
 
@@ -90,8 +90,8 @@
 
 #include    "CVtUiBitmapManager.h"
 
-#include    <mgfetch.h>
-#include    <mmgfetchverifier.h>
+#include    <MGFetch.h>
+#include    <MMGFetchVerifier.h>
 #include    <caf/manager.h>
 #include    <caf/virtualpathptr.h>
 
@@ -1493,6 +1493,7 @@
             }
             break;
 
+        case EEventFocusGained:
         case KAknFullOrPartialForegroundGained:
             {
             SetIncallBubbleAllowedInUsualL( EFalse );
@@ -4781,6 +4782,7 @@
         iDownlinkWindow->SetWaiting( EFalse );
         iUiStates->SetWaitingForFirstFrame( EFalse );
         RemoteVideoControl().MakeVisible(ETrue);
+        iDownlinkWindow->LayoutRemoteVideo();
         }
     }
 
diff -r ceea559c5bb9 -r 28b356b7eb4b vtuis/videotelui/src/CVtUiBitmapManager.cpp
--- a/vtuis/videotelui/src/CVtUiBitmapManager.cpp	Mon Mar 08 21:43:32 2010 +0000
+++ b/vtuis/videotelui/src/CVtUiBitmapManager.cpp	Sun Mar 14 13:09:51 2010 +0000
@@ -22,8 +22,8 @@
 #include    "VtUiLayout.h"
 #include    "VtUiPanic.h"
 
-#include    <aknsutils.h>
-#include    <akniconutils.h>
+#include    <AknsUtils.h>
+#include    <AknIconUtils.h>
 #include    <fbs.h>
 
 // CONSTANTS
diff -r ceea559c5bb9 -r 28b356b7eb4b vtuis/videotelui/src/CVtUiContextControl.cpp
--- a/vtuis/videotelui/src/CVtUiContextControl.cpp	Mon Mar 08 21:43:32 2010 +0000
+++ b/vtuis/videotelui/src/CVtUiContextControl.cpp	Sun Mar 14 13:09:51 2010 +0000
@@ -20,13 +20,12 @@
 // INCLUDE FILES
 #include    "CVtUiContextControl.h"
 #include    "VtUiLayout.h"
-#include    <aknsutils.h>
-#include    <aknsdrawutils.h>
+#include    <AknsUtils.h>
+#include    <AknsDrawUtils.h>
 #include    <cvtlogger.h>
 #include    <featmgr.h>
 #include    "CVtUiAppUi.h"
 #include    "tvtuistates.h"
-#include    <aknsutils.h>
 #include	"tVtuifeaturevariation.h"
 
 
@@ -322,7 +321,7 @@
 void CVtUiContextControl::LayoutRemoteVideo()
     {
     __VTPRINTENTER( "CVtUiContextControl.LayoutRemoteVideo" )
-    if ( NULL != iRemoteVideoControl )
+    if ( NULL != iRemoteVideoControl && iRemoteVideoControl->IsVisible() )
         {
         TRect rectRemoteVideo(StreamClippingRect());
         rectRemoteVideo.Move(PositionRelativeToScreen());
diff -r ceea559c5bb9 -r 28b356b7eb4b vtuis/videotelui/src/CVtUiMainControl.cpp
--- a/vtuis/videotelui/src/CVtUiMainControl.cpp	Mon Mar 08 21:43:32 2010 +0000
+++ b/vtuis/videotelui/src/CVtUiMainControl.cpp	Sun Mar 14 13:09:51 2010 +0000
@@ -20,13 +20,12 @@
 // INCLUDE FILES
 #include    "CVtUiMainControl.h"
 #include    "VtUiLayout.h"
-#include    <aknsutils.h>
-#include    <aknsdrawutils.h>
+#include    <AknsUtils.h>
+#include    <AknsDrawUtils.h>
 #include    <cvtlogger.h>
 #include    <featmgr.h>
 #include    "CVtUiAppUi.h"
 #include    "tvtuistates.h"
-#include    <aknsutils.h>
 #include	"tVtuifeaturevariation.h"
 
 // ============================ MEMBER FUNCTIONS ===============================
@@ -234,7 +233,7 @@
 void CVtUiMainControl::LayoutRemoteVideo( )
     {    
     __VTPRINTENTER( "MainCtrl.LayoutRemoteVideo" )
-    if ( NULL != iRemoteVideoControl )
+    if ( NULL != iRemoteVideoControl && iRemoteVideoControl->IsVisible() )
         {
         TRect rectRemoteVideo(StreamClippingRect());
         rectRemoteVideo.Move(PositionRelativeToScreen());
diff -r ceea559c5bb9 -r 28b356b7eb4b vtuis/videotelui/src/CVtUiMutedControl.cpp
--- a/vtuis/videotelui/src/CVtUiMutedControl.cpp	Mon Mar 08 21:43:32 2010 +0000
+++ b/vtuis/videotelui/src/CVtUiMutedControl.cpp	Sun Mar 14 13:09:51 2010 +0000
@@ -21,9 +21,9 @@
 #include    "CVtUiMutedControl.h"
 #include    "VtUiLayout.h"
 #include    <eiklabel.h>
-#include    <aknsutils.h>
-#include    <aknsdrawutils.h>
-#include    <stringloader.h>
+#include    <AknsUtils.h>
+#include    <AknsDrawUtils.h>
+#include    <StringLoader.h>
 #include    <videotelui.rsg>
 
 // ============================ MEMBER FUNCTIONS ===============================
diff -r ceea559c5bb9 -r 28b356b7eb4b vtuis/videotelui/src/CVtUiNaviPane.cpp
--- a/vtuis/videotelui/src/CVtUiNaviPane.cpp	Mon Mar 08 21:43:32 2010 +0000
+++ b/vtuis/videotelui/src/CVtUiNaviPane.cpp	Sun Mar 14 13:09:51 2010 +0000
@@ -29,7 +29,7 @@
 #include    <aknnavide.h>
 #include    <featmgr.h>
 #include	"tVtuifeaturevariation.h"
-#include    <stringloader.h>
+#include    <StringLoader.h>
 #include    <videotelui.rsg>
 
 // CONSTANTS
diff -r ceea559c5bb9 -r 28b356b7eb4b vtuis/videotelui/src/CVtUiNaviPaneControl.cpp
--- a/vtuis/videotelui/src/CVtUiNaviPaneControl.cpp	Mon Mar 08 21:43:32 2010 +0000
+++ b/vtuis/videotelui/src/CVtUiNaviPaneControl.cpp	Sun Mar 14 13:09:51 2010 +0000
@@ -21,8 +21,8 @@
 #include    "CVtUiNaviPaneControl.h"
 #include    "CVtUiNaviPane.h"
 #include    "VtUiLayout.h"
-#include    <aknsutils.h>
-#include    <aknsdrawutils.h>
+#include    <AknsUtils.h>
+#include    <AknsDrawUtils.h>
 
 // CONSTANTS
 
diff -r ceea559c5bb9 -r 28b356b7eb4b vtuis/videotelui/src/CVtUiNumberEntryActivationControl.cpp
--- a/vtuis/videotelui/src/CVtUiNumberEntryActivationControl.cpp	Mon Mar 08 21:43:32 2010 +0000
+++ b/vtuis/videotelui/src/CVtUiNumberEntryActivationControl.cpp	Sun Mar 14 13:09:51 2010 +0000
@@ -23,8 +23,8 @@
 #include    "CVtUiAppUi.h"
 #include    "VtUiUtility.h"
 
-#include    <aknutils.h>
-#include    <aknsutils.h>
+#include    <AknUtils.h>
+#include    <AknsUtils.h>
 #include    <eikenv.h>
 #include    <cvtlogger.h>
 
diff -r ceea559c5bb9 -r 28b356b7eb4b vtuis/videotelui/src/CVtUiRemoteVideoControl.cpp
--- a/vtuis/videotelui/src/CVtUiRemoteVideoControl.cpp	Mon Mar 08 21:43:32 2010 +0000
+++ b/vtuis/videotelui/src/CVtUiRemoteVideoControl.cpp	Sun Mar 14 13:09:51 2010 +0000
@@ -21,11 +21,11 @@
 #include    <cvtlogger.h>
 #include   <eikdef.h>
 #include    <AknIncallBubbleNotify.h>
-#include    <aknslayeredbackgroundcontrolcontext.h>
-#include    <aknutils.h>
+#include    <AknsLayeredBackgroundControlContext.h>
+#include    <AknUtils.h>
 #include    <aknnavi.h>
 #include    <akntitle.h>
-#include    <akndlgshut.h>
+#include    <AknDlgShut.h>
 #include    <aknnotedialog.h>
 #include    <aknnotewrappers.h>
 #include    <akncontext.h>
@@ -37,8 +37,8 @@
 #include    <videotelui.rsg>
 #include    <hlplch.h>
 #include    <apgwgnam.h>
-#include    <stringloader.h>
-#include    <akndef.h>
+#include    <StringLoader.h>
+#include    <AknDef.h>
 #include    <aknconsts.h>
 #include    "CVtUiRemoteVideoControl.h"
 #include    "CVtUiAppUi.h"
diff -r ceea559c5bb9 -r 28b356b7eb4b vtuis/videotelui/src/CVtUiZoomControl.cpp
--- a/vtuis/videotelui/src/CVtUiZoomControl.cpp	Mon Mar 08 21:43:32 2010 +0000
+++ b/vtuis/videotelui/src/CVtUiZoomControl.cpp	Sun Mar 14 13:09:51 2010 +0000
@@ -20,8 +20,8 @@
 // INCLUDE FILES
 #include    "CVtUiZoomControl.h"
 #include    "VtUiLayout.h"
-#include    <aknsutils.h>
-#include    <aknsdrawutils.h>
+#include    <AknsUtils.h>
+#include    <AknsDrawUtils.h>
 #include    "videotelui.hrh"
 
 #include    <cvtlogger.h>
diff -r ceea559c5bb9 -r 28b356b7eb4b vtuis/videotelui/src/VtUiLayout.cpp
--- a/vtuis/videotelui/src/VtUiLayout.cpp	Mon Mar 08 21:43:32 2010 +0000
+++ b/vtuis/videotelui/src/VtUiLayout.cpp	Sun Mar 14 13:09:51 2010 +0000
@@ -23,10 +23,10 @@
 #include    <fbs.h>
 #include    <avkon.mbg>
 #include    <videotelui.mbg>
-#include    <aknsconstants.h>
+#include    <AknsConstants.h>
 #include    <aknconsts.h>
-#include    <akniconutils.h>
-#include    <aknutils.h>
+#include    <AknIconUtils.h>
+#include    <AknUtils.h>
 
 #include    <aknlayout.cdl.h>
 #include    <applayout.cdl.h>
diff -r ceea559c5bb9 -r 28b356b7eb4b vtuis/videotelui/src/cvtuiappshutter.cpp
--- a/vtuis/videotelui/src/cvtuiappshutter.cpp	Mon Mar 08 21:43:32 2010 +0000
+++ b/vtuis/videotelui/src/cvtuiappshutter.cpp	Sun Mar 14 13:09:51 2010 +0000
@@ -23,9 +23,9 @@
 #include "tvtuilocalvariation.h"
 #include <cvtlogger.h>
 #include <eikenv.h>
-#include <aknutils.h>
+#include <AknUtils.h>
 #include <aknnotewrappers.h>
-#include <stringloader.h>
+#include <StringLoader.h>
 
 // singleton instance
 static CVtUiAppShutter* iAppShutter = NULL;
diff -r ceea559c5bb9 -r 28b356b7eb4b vtuis/videotelui/src/cvtuivideocontrolbase.cpp
--- a/vtuis/videotelui/src/cvtuivideocontrolbase.cpp	Mon Mar 08 21:43:32 2010 +0000
+++ b/vtuis/videotelui/src/cvtuivideocontrolbase.cpp	Sun Mar 14 13:09:51 2010 +0000
@@ -19,13 +19,13 @@
 #include    <cvtlogger.h>
 #include    <featmgr.h>
 #include    <AknsDrawUtils.h>
-#include    <aknsutils.h>
-#include    <aknbiditextutils.h>
-#include    <stringloader.h>
+#include    <AknsUtils.h>
+#include    <AknBidiTextUtils.h>
+#include    <StringLoader.h>
 #include    <videotelui.rsg>
 
-#include     <aknsbasicbackgroundcontrolcontext.h>
-#include    <aknstatuspaneutils.h>
+#include    <AknsBasicBackgroundControlContext.h>
+#include    <AknStatuspaneUtils.h>
 #include    "cvtuivideocontrolbase.h"
 #include    "mvtuicomponentmanager.h"
 #include    "VtUiLayout.h"
diff -r ceea559c5bb9 -r 28b356b7eb4b vtuis/videotelui/src/features/dialer/cvtuidialercontainer.cpp
--- a/vtuis/videotelui/src/features/dialer/cvtuidialercontainer.cpp	Mon Mar 08 21:43:32 2010 +0000
+++ b/vtuis/videotelui/src/features/dialer/cvtuidialercontainer.cpp	Sun Mar 14 13:09:51 2010 +0000
@@ -19,12 +19,12 @@
 #include    <cvtlogger.h>
 #include    <cvideodtmfdialer.h>
 #include    <AknsDrawUtils.h>
-#include    <aknsutils.h>
+#include    <AknsUtils.h>
 #include    <aknlayoutscalable_apps.cdl.h>
 #include    <aknlayoutscalable_avkon.cdl.h>
 #include    <layoutmetadata.cdl.h>
 #include    <featmgr.h>
-#include    <aknsbasicbackgroundcontrolcontext.h>
+#include    <AknsBasicBackgroundControlContext.h>
 
 #include    "VtUiUtility.h"
 #include    "VtUiLayout.h"
@@ -379,12 +379,12 @@
     if ( Layout_Meta_Data::IsLandscapeOrientation() )
         {
         // Landscape: Option11 (thin status pane, lsc)
-        mainPaneLL = AknLayoutScalable_Avkon::main_pane( 9 ).LayoutLine();
+        mainPaneLL = AknLayoutScalable_Apps::main_pane( 15 ).LayoutLine();
         }
     else
         {
         // Portrait: main pane with status pane off, control pane on
-        mainPaneLL = AknLayoutScalable_Avkon::main_pane( 7 ).LayoutLine();
+        mainPaneLL = AknLayoutScalable_Apps::main_pane( 12 ).LayoutLine();
         }
 
     TRect appWinRect;
diff -r ceea559c5bb9 -r 28b356b7eb4b vtuis/videotelui/src/features/dialer/cvtuidialervideocontrol.cpp
--- a/vtuis/videotelui/src/features/dialer/cvtuidialervideocontrol.cpp	Mon Mar 08 21:43:32 2010 +0000
+++ b/vtuis/videotelui/src/features/dialer/cvtuidialervideocontrol.cpp	Sun Mar 14 13:09:51 2010 +0000
@@ -144,11 +144,10 @@
 void CVtUiDialerVideoControl::LayoutRemoteVideo( )
     {    
     __VTPRINTENTER( "DialCtrl.LayoutRemoteVideo" )
-    if ( NULL != iRemoteVideoControl )
+    if ( NULL != iRemoteVideoControl && iRemoteVideoControl->IsVisible() )
         {
         TRect rectRemoteVideo(StreamClippingRect());
-        rectRemoteVideo.Move(PositionRelativeToScreen());
-        iRemoteVideoControl->SetExtent(rectRemoteVideo.iTl,rectRemoteVideo.Size());
+        iRemoteVideoControl->SetExtent( PositionRelativeToScreen(),rectRemoteVideo.Size() );
         }
     __VTPRINTEXIT( "DialCtrl.LayoutRemoteVideo" )
     }
diff -r ceea559c5bb9 -r 28b356b7eb4b vtuis/videotelui/src/features/numberentry/CVtUiNumberEntryControl.cpp
--- a/vtuis/videotelui/src/features/numberentry/CVtUiNumberEntryControl.cpp	Mon Mar 08 21:43:32 2010 +0000
+++ b/vtuis/videotelui/src/features/numberentry/CVtUiNumberEntryControl.cpp	Sun Mar 14 13:09:51 2010 +0000
@@ -27,7 +27,7 @@
 #include    "mvtuinumberentrycontrolobserver.h"
 #include    "cvtuidtmfbuffer.h"
 
-#include    <aknsutils.h>
+#include    <AknsUtils.h>
 #include    <cvtlogger.h>
 #include    <eikenv.h>
 
diff -r ceea559c5bb9 -r 28b356b7eb4b vtuis/videotelui/src/features/prefs/cvtuiprefsettinglistbase.cpp
--- a/vtuis/videotelui/src/features/prefs/cvtuiprefsettinglistbase.cpp	Mon Mar 08 21:43:32 2010 +0000
+++ b/vtuis/videotelui/src/features/prefs/cvtuiprefsettinglistbase.cpp	Sun Mar 14 13:09:51 2010 +0000
@@ -27,6 +27,7 @@
 #include    "cvtuitransparentsettingpage.h"
 #include    "CVtUiMainControl.h"
 #include    "CVtUiContextControl.h"
+#include    "CVtUiRemoteVideoControl.h"
 #include    "cvtuifeaturemanager.h"
 #include    "VtUiLayout.h"
 
@@ -156,15 +157,27 @@
     iAppUi.SwitchViewFinderToMainPaneL();
 	    
     // Get context control's window priority and position
-    iWindowPriority = iAppUi.ContextControl().DrawableWindow()
+    iContextControlWindowPriority = iAppUi.ContextControl().DrawableWindow()
         ->OrdinalPriority();
-    iWindowPosition = iAppUi.ContextControl().DrawableWindow()
+    iContextControlWindowPosition = iAppUi.ContextControl().DrawableWindow()
         ->OrdinalPosition();
     
+    // Get remote video control's window priority and position
+    iRemoteVideoControlWindowPriority = 
+            iAppUi.RemoteVideoControl().DrawableWindow()->OrdinalPriority();
+    iRemoteVideoControlWindowPosition = 
+            iAppUi.RemoteVideoControl().DrawableWindow()->OrdinalPosition();
+    
     // Rise context control's window priority othwerwise setting page will be
     // drawn partially over the context control window.
     iAppUi.ContextControl().DrawableWindow()->SetOrdinalPosition( 
-        iWindowPosition, iWindowPriority + 1 );
+        iContextControlWindowPosition, iContextControlWindowPriority + 1 );
+    
+    // Rise remote video control's window priority othwerwise setting page 
+    // will be drawn partially over the context control window.
+    iAppUi.RemoteVideoControl().DrawableWindow()->SetOrdinalPosition(
+        iRemoteVideoControlWindowPosition, 
+        iRemoteVideoControlWindowPriority + 2 );
 
     // Creates setting page
     CreateSettingPageL();
@@ -192,9 +205,17 @@
         iSettingPage->OfferKeyEventL( keyEvent, EEventKey );
         }
         
-    // Set contex control's window priority and position back to orginal value.
+    // Set remote video control's window priority and position back to 
+    // orginal value.
+    iAppUi.RemoteVideoControl().DrawableWindow()->SetOrdinalPosition(
+            iRemoteVideoControlWindowPosition, 
+            iRemoteVideoControlWindowPriority );
+    
+    // Set contex control's window priority and position back to 
+    // orginal value.
     iAppUi.ContextControl().DrawableWindow()->SetOrdinalPosition( 
-       iWindowPosition, iWindowPriority );
+        iContextControlWindowPosition, iContextControlWindowPriority );
+    
     __VTPRINTEXIT( "CVtUiPrefSettingListBase.StopSettingPageL" )
     }
 
diff -r ceea559c5bb9 -r 28b356b7eb4b vtuis/videotelui/src/features/prefs/cvtuivideoquality.cpp
--- a/vtuis/videotelui/src/features/prefs/cvtuivideoquality.cpp	Mon Mar 08 21:43:32 2010 +0000
+++ b/vtuis/videotelui/src/features/prefs/cvtuivideoquality.cpp	Sun Mar 14 13:09:51 2010 +0000
@@ -18,10 +18,10 @@
 
 #include    <badesca.h>
 #include    <AknIconArray.h>
-#include    <aknsutils.h>
-#include    <stringloader.h>
+#include    <AknsUtils.h>
+#include    <StringLoader.h>
 #include    <aknlists.h>
-#include    <aknpopup.h>
+#include    <aknPopup.h>
 #include    <aknselectionlist.h>
 #include    <mvtengmedia.h>
 #include    <cvtengmodel.h>
diff -r ceea559c5bb9 -r 28b356b7eb4b vtuis/videotelui/src/features/toolbar/cvtuifloatingtoolbar.cpp
--- a/vtuis/videotelui/src/features/toolbar/cvtuifloatingtoolbar.cpp	Mon Mar 08 21:43:32 2010 +0000
+++ b/vtuis/videotelui/src/features/toolbar/cvtuifloatingtoolbar.cpp	Sun Mar 14 13:09:51 2010 +0000
@@ -32,7 +32,7 @@
 #include    <videotelui.rsg>
 #include    <cvtlogger.h>
 #include    <akntoolbar.h>
-#include    <aknutils.h>
+#include    <AknUtils.h>
 #include    <aknlayoutscalable_apps.cdl.h>
 #include    <layoutmetadata.cdl.h>
 #include    <gfxtranseffect/gfxtranseffect.h>
diff -r ceea559c5bb9 -r 28b356b7eb4b vtuis/videotelui/src/sliders/cvtuipopupbase.cpp
--- a/vtuis/videotelui/src/sliders/cvtuipopupbase.cpp	Mon Mar 08 21:43:32 2010 +0000
+++ b/vtuis/videotelui/src/sliders/cvtuipopupbase.cpp	Sun Mar 14 13:09:51 2010 +0000
@@ -18,7 +18,7 @@
 
 #include    <cvtlogger.h>
 #include    <AknUtils.h>
-#include    <aknvolumepopup.h>
+#include    <AknVolumePopup.h>
 #include    <fbs.h>
 
 #include    "cvtuipopupbase.h"
diff -r ceea559c5bb9 -r 28b356b7eb4b vtuis/videotelui/src/tvtuiappstatebase.cpp
--- a/vtuis/videotelui/src/tvtuiappstatebase.cpp	Mon Mar 08 21:43:32 2010 +0000
+++ b/vtuis/videotelui/src/tvtuiappstatebase.cpp	Sun Mar 14 13:09:51 2010 +0000
@@ -22,8 +22,8 @@
 #include "cvtuiappshutter.h"
 #include "mvtuistatecontext.h"
 #include <videotelui.rsg>
-#include <aknquerydialog.h>
-#include <stringloader.h>
+#include <AknQueryDialog.h>
+#include <StringLoader.h>
 #include <cvtlogger.h>
 #include <cvtengmodel.h>
 #include <vtengevents.h>
diff -r ceea559c5bb9 -r 28b356b7eb4b vtuis/videotelui/src/tvtuistaterunning.cpp
--- a/vtuis/videotelui/src/tvtuistaterunning.cpp	Mon Mar 08 21:43:32 2010 +0000
+++ b/vtuis/videotelui/src/tvtuistaterunning.cpp	Sun Mar 14 13:09:51 2010 +0000
@@ -23,8 +23,8 @@
 #include "videotelui.hrh"
 #include <cvtlogger.h>
 #include <vtengevents.h>
-#include <stringloader.h>
-#include <aknquerydialog.h>
+#include <StringLoader.h>
+#include <AknQueryDialog.h>
 #include <videotelui.rsg>
 
 TVtUiStateRunning* TVtUiStateRunning::iInstance = NULL;