Revision: 201003 default PDK_3.0.g
authorDremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
Tue, 02 Feb 2010 00:01:39 +0200
changeset 3 8b2d6d0384b0
parent 2 e8773a61782d
child 7 dbec5787fa68
Revision: 201003 Kit: 201005
camerauis/cameraapp/generic/camerauiconfigmanager/conf/camerauiconfigmanager.confml
camerauis/cameraapp/generic/camerauiconfigmanager/src/CameraUiConfigManager.cpp
camerauis/cameraapp/generic/common/src/CamCaptureSetupListBox.cpp
camerauis/cameraapp/generic/inc/CamVideoPreCaptureContainer.h
camerauis/cameraapp/generic/src/CamApp.cpp
camerauis/cameraapp/generic/src/CamAppController.cpp
camerauis/cameraapp/generic/src/CamAppui.cpp
camerauis/cameraapp/generic/src/CamLocationIconController.cpp
camerauis/cameraapp/generic/src/CamNaviCounterModel.cpp
camerauis/cameraapp/generic/src/CamPreCaptureContainerBase.cpp
camerauis/cameraapp/generic/src/CamSidePane.cpp
camerauis/cameraapp/generic/src/CamStillPreCaptureContainer.cpp
camerauis/cameraapp/generic/src/CamStillPreCaptureView.cpp
camerauis/cameraapp/generic/src/CamVideoPreCaptureContainer.cpp
camerauis/cameraapp/loc/cam.loc
Binary file camerauis/cameraapp/generic/camerauiconfigmanager/conf/camerauiconfigmanager.confml has changed
--- a/camerauis/cameraapp/generic/camerauiconfigmanager/src/CameraUiConfigManager.cpp	Tue Jan 26 11:44:00 2010 +0200
+++ b/camerauis/cameraapp/generic/camerauiconfigmanager/src/CameraUiConfigManager.cpp	Tue Feb 02 00:01:39 2010 +0200
@@ -249,7 +249,7 @@
 //
 EXPORT_C TBool CCameraUiConfigManager::IsAutoFocusSupported() const
     {
-#if defined(WINS) || defined(WINSCW)
+#if defined(__WINS__) || defined(__WINSCW__)
     return EFalse; // return
 #else
     return iConfigManagerImp->IsFeatureSupported( ECamDynamicSettingAutoFocus );
--- a/camerauis/cameraapp/generic/common/src/CamCaptureSetupListBox.cpp	Tue Jan 26 11:44:00 2010 +0200
+++ b/camerauis/cameraapp/generic/common/src/CamCaptureSetupListBox.cpp	Tue Feb 02 00:01:39 2010 +0200
@@ -134,7 +134,8 @@
 	    iView->SelectItemL( iView->CurrentItemIndex() );
         }
     //TInt oldCurrentItem = CurrentItemIndex();
-    TKeyResponse response = CEikListBox::OfferKeyEventL( aKeyEvent, aType );
+    //TKeyResponse response = CEikListBox::OfferKeyEventL( aKeyEvent, aType );
+    TKeyResponse response = EKeyWasConsumed;
     /*TInt newCurrentItem = CurrentItemIndex();
     if ( newCurrentItem != oldCurrentItem )
         {
--- a/camerauis/cameraapp/generic/inc/CamVideoPreCaptureContainer.h	Tue Jan 26 11:44:00 2010 +0200
+++ b/camerauis/cameraapp/generic/inc/CamVideoPreCaptureContainer.h	Tue Feb 02 00:01:39 2010 +0200
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -257,9 +257,7 @@
     
     // Video file type indicator
     CCamIndicator* iFileTypeIndicator;
-    
-    // Location of video file type indicator during video capture
-    TRect iFileTypeIndicatorVidcapPosition;
+
     
     // Normal location of video file type indicator
     TRect iFileTypeIndicatorPosition;
--- a/camerauis/cameraapp/generic/src/CamApp.cpp	Tue Jan 26 11:44:00 2010 +0200
+++ b/camerauis/cameraapp/generic/src/CamApp.cpp	Tue Feb 02 00:01:39 2010 +0200
@@ -78,6 +78,7 @@
 //
 GLDEF_C TInt E32Main()
     {
+    OstTrace0( CAMERAAPP_PERFORMANCE, DUP2__E32MAIN, "e_CAM_PRI_OFF_TO_ON 1" ); // Should be defined in DeviceModeHanlder/SysAp
     OstTrace0( CAMERAAPP_PERFORMANCE_DETAIL, _E32MAIN, "e_E32Main 1" );
     TInt ret = EikStart::RunApplication(NewApplication);
     OstTrace0( CAMERAAPP_PERFORMANCE_DETAIL, DUP1__E32MAIN, "e_E32Main 0" );
--- a/camerauis/cameraapp/generic/src/CamAppController.cpp	Tue Jan 26 11:44:00 2010 +0200
+++ b/camerauis/cameraapp/generic/src/CamAppController.cpp	Tue Feb 02 00:01:39 2010 +0200
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -4969,10 +4969,10 @@
     SetTargetMode     ( ECamControllerVideo  );
     SetTargetImageMode( ECamImageCaptureNone );
     // shutdown the orientation channel when going to videomode
-		if ( iConfigManager && iConfigManager->IsOrientationSensorSupported() )
-			{
+    if ( iConfigManager && iConfigManager->IsOrientationSensorSupported() )
+        {
 	    TRAP_IGNORE( UpdateSensorApiL( EFalse ) );
-			}
+		}
     }
   else if( ECamControllerImage == aMode )
     {
@@ -6194,7 +6194,6 @@
 
     if( iInfo.iActiveCamera == ECamActiveCameraSecondary &&
         iCaptureOrientation == ECamOrientation90 &&
-        ECamSettOn == iSettingsModel->IntegerSettingValue( ECamSettingItemImageRotation ) &&
         ECamSettOn == IntegerSettingValue( ECamSettingItemShowCapturedPhoto ) )
         {
         PRINT( _L( "Camera <> Rotate portrait secondary camera snapshot image 180 degrees" ) )
@@ -6342,7 +6341,8 @@
           }
         PRINT1( _L("Camera <> CCamAppController::HandleImageCaptureEventL array count:%d"), BurstCaptureArray()->Count() );  
         // check if snapshot bitmap needs to be rotated before creating a thumbnail from it
-        TBool rotate( ECamSettOn == iSettingsModel->IntegerSettingValue( ECamSettingItemImageRotation ) &&
+        TBool rotate( ( ECamSettOn == iSettingsModel->IntegerSettingValue( ECamSettingItemImageRotation ) || 
+                      iInfo.iActiveCamera == ECamActiveCameraSecondary ) &&
                       ECamSettOn == IntegerSettingValue( ECamSettingItemShowCapturedPhoto ) &&
                       iCaptureOrientation != ECamOrientation0 );
 
@@ -7415,7 +7415,8 @@
 
     if ( KSensrvChannelTypeIdOrientationData == aChannel.GetChannelInfo().iChannelType )
         {
-        TBool rotate( ECamSettOn == iSettingsModel->IntegerSettingValue( ECamSettingItemImageRotation ) );
+        TBool rotate( ECamSettOn == iSettingsModel->IntegerSettingValue( ECamSettingItemImageRotation ) 
+                      || iInfo.iActiveCamera == ECamActiveCameraSecondary );
 
         if( rotate )
             {
@@ -8479,7 +8480,8 @@
   if ( ECamImageCaptureTimeLapse == iInfo.iImageMode 
     || ECamControllerVideo == iInfo.iMode   
     || ( iConfigManager && iConfigManager->IsOrientationSensorSupported() &&
-        iSettingsModel->IntegerSettingValue( ECamSettingItemImageRotation ) == ECamSettOn )
+        ( iSettingsModel->IntegerSettingValue( ECamSettingItemImageRotation ) == ECamSettOn 
+          || iInfo.iActiveCamera == ECamActiveCameraSecondary ) )
      )
     {
     StopIdleTimer();
@@ -8934,6 +8936,8 @@
       if( iCaptureRequested && !EngineProcessingCapture() )
         {
         iCaptureRequested = EFalse;
+        OstTrace0( CAMERAAPP_PERFORMANCE, DUP7_CCAMAPPCONTROLLER_HANDLECAMERAEVENTL, "e_CAM_APP_AF 0" );
+        OstTrace0( CAMERAAPP_PERFORMANCE, DUP8_CCAMAPPCONTROLLER_HANDLECAMERAEVENTL, "e_CAM_PRI_AF_LOCK 0" );
         OstTrace0( CAMERAAPP_PERFORMANCE, CCAMAPPCONTROLLER_HANDLECAMERAEVENTL, "e_CAM_APP_SHOT_TO_SNAPSHOT 1" );
         OstTrace0( CAMERAAPP_PERFORMANCE, DUP1_CCAMAPPCONTROLLER_HANDLECAMERAEVENTL, "e_CAM_PRI_SHOT_TO_SNAPSHOT 1" );
         OstTrace0( CAMERAAPP_PERFORMANCE, DUP2_CCAMAPPCONTROLLER_HANDLECAMERAEVENTL, "e_CAM_PRI_SHOT_TO_SAVE 1" );
--- a/camerauis/cameraapp/generic/src/CamAppui.cpp	Tue Jan 26 11:44:00 2010 +0200
+++ b/camerauis/cameraapp/generic/src/CamAppui.cpp	Tue Feb 02 00:01:39 2010 +0200
@@ -7318,11 +7318,6 @@
 	                fixedToolbar->SetToolbarObserver( iStillCaptureView );
 	                SetToolbarVisibility();
 
-	                if ( IsEmbedded() )
-	                    {
-	                    iStillCaptureView->HideButton( ECamCmdNewVideo );
-	                    }                        
-
 	                // Make sure toolbar extension button has no background
 	                CAknButton* extensionButton = static_cast<CAknButton*>(
 	                    fixedToolbar->ControlOrNull( ECamCmdToolbarExtension ) );
@@ -7367,11 +7362,7 @@
                     
                     fixedToolbar->SetToolbarObserver( iVideoCaptureView );
                     SetToolbarVisibility();
-                    if ( IsEmbedded() )
-                        {
-                        iVideoCaptureView->HideButton( ECamCmdNewPhoto );
-                        }
-                    
+                       
                     // Make sure toolbar extension button has no background
                     CAknButton* extensionButton = static_cast<CAknButton*>(
                       fixedToolbar->ControlOrNull( ECamCmdToolbarExtension ) );
--- a/camerauis/cameraapp/generic/src/CamLocationIconController.cpp	Tue Jan 26 11:44:00 2010 +0200
+++ b/camerauis/cameraapp/generic/src/CamLocationIconController.cpp	Tue Feb 02 00:01:39 2010 +0200
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -308,12 +308,10 @@
                 {
                 if ( Layout_Meta_Data::IsLandscapeOrientation() )
                     {
-                    camIndicatorPane.LayoutRect(
-                        extent,
-                        AknLayoutScalable_Apps::vid4_indicators_pane( 1 ) );
-                    layoutRect.LayoutRect(
-                        camIndicatorPane.Rect(),
-                        AknLayoutScalable_Apps::vid4_indicators_pane_g5( 0 ) );
+                    camIndicatorPane.LayoutRect( extent,
+                             AknLayoutScalable_Apps::vid4_progress_pane( 1 ) ); // vid4_indicators_pane should be used
+                    layoutRect.LayoutRect( camIndicatorPane.Rect(),
+                        AknLayoutScalable_Apps::vid4_indicators_pane_g5( 0 ) );       
                     }
                 else  // portrait
                     {
--- a/camerauis/cameraapp/generic/src/CamNaviCounterModel.cpp	Tue Jan 26 11:44:00 2010 +0200
+++ b/camerauis/cameraapp/generic/src/CamNaviCounterModel.cpp	Tue Feb 02 00:01:39 2010 +0200
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -1933,7 +1933,7 @@
 
     TAknLayoutRect vidIndicatorPane;
     vidIndicatorPane.LayoutRect( iExtent,
-            AknLayoutScalable_Apps::vid4_indicators_pane( variant ) );
+        AknLayoutScalable_Apps::vid4_progress_pane( variant ) );// vid4_indicators_pane should be used
 
     iVidPreStorageIconRect.LayoutRect( vidIndicatorPane.Rect(),
             AknLayoutScalable_Apps::vid4_indicators_pane_g3( indicatorVariant ) );
@@ -2070,7 +2070,7 @@
         {
         iAudioMuteIconRect.LayoutRect(
             iExtent,
-            AknLayoutScalable_Apps::main_video4_pane_g3( variant ) );
+            AknLayoutScalable_Apps::main_video4_pane_g2( variant ) );
         }
     }
 
--- a/camerauis/cameraapp/generic/src/CamPreCaptureContainerBase.cpp	Tue Jan 26 11:44:00 2010 +0200
+++ b/camerauis/cameraapp/generic/src/CamPreCaptureContainerBase.cpp	Tue Feb 02 00:01:39 2010 +0200
@@ -430,13 +430,17 @@
     if( isCaptureKeyForSymbTrace )
         {
         PRINT( _L("Camera <> CCamPreCaptureContainerBase::OfferKeyEventL Symbian Traces Active") );
-        OstTrace0( CAMERAAPP_PERFORMANCE, CCAMPRECAPTURECONTAINERBASE_OFFERKEYEVENTL, "e_CAM_APP_SHOT_TO_SNAPSHOT 1" );   //CCORAPP_SHOT_TO_SNAPSHOT_START
-        OstTrace0( CAMERAAPP_PERFORMANCE, DUP1_CCAMPRECAPTURECONTAINERBASE_OFFERKEYEVENTL, "e_CAM_PRI_SHOT_TO_SNAPSHOT 1" );  //CCORAPP_PRI_SHOT_TO_SNAPSHOT_START
-        OstTrace0( CAMERAAPP_PERFORMANCE, DUP2_CCAMPRECAPTURECONTAINERBASE_OFFERKEYEVENTL, "e_CAM_PRI_SHOT_TO_SAVE 1" );  //CCORAPP_PRI_SHOT_TO_SAVE_START
-        OstTrace0( CAMERAAPP_PERFORMANCE, DUP3_CCAMPRECAPTURECONTAINERBASE_OFFERKEYEVENTL, "e_CAM_PRI_SHOT_TO_SHOT 1" );  //CCORAPP_PRI_SHOT_TO_SHOT_START
-        OstTrace0( CAMERAAPP_PERFORMANCE, DUP4_CCAMPRECAPTURECONTAINERBASE_OFFERKEYEVENTL, "e_CAM_APP_SHOT_TO_STILL 1" ); //CCORAPP_SHOT_TO_STILL_START
+        OstTrace0( CAMERAAPP_PERFORMANCE, DUP7_CCAMPRECAPTURECONTAINERBASE_OFFERKEYEVENTL, "e_CAM_PRI_SHUTTER_RELEASE_LAG 1" );
         OstTrace0( CAMERAAPP_PERFORMANCE, DUP5_CCAMPRECAPTURECONTAINERBASE_OFFERKEYEVENTL, "e_CAM_APP_CAPTURE_START 1" ); //CCORAPP_CAPTURE_START_START
-        OstTrace0( CAMERAAPP_PERFORMANCE, DUP6_CCAMPRECAPTURECONTAINERBASE_OFFERKEYEVENTL, "e_CAM_PRI_SERIAL_SHOOTING 1" );   //CCORAPP_PRI_SERIAL_SHOOTING_START
+        if ( iFocusState != EFocusStateFocusing )
+            {
+            OstTrace0( CAMERAAPP_PERFORMANCE, CCAMPRECAPTURECONTAINERBASE_OFFERKEYEVENTL, "e_CAM_APP_SHOT_TO_SNAPSHOT 1" );   //CCORAPP_SHOT_TO_SNAPSHOT_START
+            OstTrace0( CAMERAAPP_PERFORMANCE, DUP1_CCAMPRECAPTURECONTAINERBASE_OFFERKEYEVENTL, "e_CAM_PRI_SHOT_TO_SNAPSHOT 1" );  //CCORAPP_PRI_SHOT_TO_SNAPSHOT_START
+            OstTrace0( CAMERAAPP_PERFORMANCE, DUP2_CCAMPRECAPTURECONTAINERBASE_OFFERKEYEVENTL, "e_CAM_PRI_SHOT_TO_SAVE 1" );  //CCORAPP_PRI_SHOT_TO_SAVE_START
+            OstTrace0( CAMERAAPP_PERFORMANCE, DUP3_CCAMPRECAPTURECONTAINERBASE_OFFERKEYEVENTL, "e_CAM_PRI_SHOT_TO_SHOT 1" );  //CCORAPP_PRI_SHOT_TO_SHOT_START
+            OstTrace0( CAMERAAPP_PERFORMANCE, DUP4_CCAMPRECAPTURECONTAINERBASE_OFFERKEYEVENTL, "e_CAM_APP_SHOT_TO_STILL 1" ); //CCORAPP_SHOT_TO_STILL_START
+            OstTrace0( CAMERAAPP_PERFORMANCE, DUP6_CCAMPRECAPTURECONTAINERBASE_OFFERKEYEVENTL, "e_CAM_PRI_SERIAL_SHOOTING 1" );   //CCORAPP_PRI_SERIAL_SHOOTING_START
+            }
         }
 
     iController.StartIdleTimer();
@@ -2035,6 +2039,7 @@
                 OstTrace0( CAMERAAPP_PERFORMANCE, DUP1_CCAMPRECAPTURECONTAINERBASE_HANDLEOPERATIONSTATECHANGEEVENTL, "e_CAM_APP_AF 0" );    //CCORAPP_AF_END
                 
                 DrawDeferred();
+                OstTrace0( CAMERAAPP_PERFORMANCE, DUP6_CCAMPRECAPTURECONTAINERBASE_HANDLEOPERATIONSTATECHANGEEVENTL, "e_CAM_PRI_AF_LOCK 0" );
                 break;
                 }
               // ---------------------------------------------------
@@ -2052,6 +2057,7 @@
                 OstTrace0( CAMERAAPP_PERFORMANCE, DUP2_CCAMPRECAPTURECONTAINERBASE_HANDLEOPERATIONSTATECHANGEEVENTL, "e_CAM_APP_AF 0" );
 
                 DrawDeferred();
+                OstTrace0( CAMERAAPP_PERFORMANCE, DUP7_CCAMPRECAPTURECONTAINERBASE_HANDLEOPERATIONSTATECHANGEEVENTL, "e_CAM_PRI_AF_LOCK 0" );
                 break;
                 }
                 // ---------------------------------------------------
@@ -2091,6 +2097,7 @@
                     {
                     OstTrace0( CAMERAAPP_PERFORMANCE, DUP4_CCAMPRECAPTURECONTAINERBASE_HANDLEOPERATIONSTATECHANGEEVENTL, "e_CAM_APP_OVERLAY_UPD 0" );
                     OstTrace0( CAMERAAPP_PERFORMANCE, DUP5_CCAMPRECAPTURECONTAINERBASE_HANDLEOPERATIONSTATECHANGEEVENTL, "e_CAM_APP_AF 0" );
+                    OstTrace0( CAMERAAPP_PERFORMANCE, DUP8_CCAMPRECAPTURECONTAINERBASE_HANDLEOPERATIONSTATECHANGEEVENTL, "e_CAM_PRI_AF_LOCK 0" );
                     }
                     
                   // clear focus indicator
--- a/camerauis/cameraapp/generic/src/CamSidePane.cpp	Tue Jan 26 11:44:00 2010 +0200
+++ b/camerauis/cameraapp/generic/src/CamSidePane.cpp	Tue Feb 02 00:01:39 2010 +0200
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -999,8 +999,16 @@
                 {
                 case ECamIndicatorCaptureMode:
                     {
-                    l.LayoutRect( rect,
+                    if ( ECamControllerVideo == iMode )
+                        {
+                        l.LayoutRect( rect,
+                           AknLayoutScalable_Apps::main_video4_pane_g1( variant ) );
+                        }
+                    else
+                        {
+                        l.LayoutRect( rect,
                            AknLayoutScalable_Apps::main_camera4_pane_g1( variant ) );
+                        }
                     iIndicators[i]->SetRect( l.Rect() );
                     break;
                     }
@@ -1021,14 +1029,14 @@
                 case ECamIndicatorVideoStabiliser: 
                     {
                     l.LayoutRect( rect,
-                        AknLayoutScalable_Apps::main_video4_pane_g5( variant ) );
+                            AknLayoutScalable_Apps::main_video4_pane_g3( variant ) );
                     iIndicators[i]->SetRect( l.Rect() );
                     break;
                     }
-			    case ECamIndicatorFaceTracking: 
+                case ECamIndicatorFaceTracking: 
                     {
                      l.LayoutRect( rect,
-                        AknLayoutScalable_Apps::main_camera4_pane_g6( variant ) );
+                       AknLayoutScalable_Apps::main_camera4_pane_g2( variant ) );
                      iIndicators[i]->SetRect( l.Rect() );
                      break;  
                     }
--- a/camerauis/cameraapp/generic/src/CamStillPreCaptureContainer.cpp	Tue Jan 26 11:44:00 2010 +0200
+++ b/camerauis/cameraapp/generic/src/CamStillPreCaptureContainer.cpp	Tue Feb 02 00:01:39 2010 +0200
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -712,6 +712,7 @@
     {
     if ( aType == EEventKeyDown )
       {
+      OstTrace0( CAMERAAPP_PERFORMANCE, DUP1_CCAMSTILLPRECAPTURECONTAINER_HANDLESHUTTERKEYEVENTL, "e_CAM_PRI_AF_LOCK 1" );
       PRINT( _L("Camera => CCamStillPreCaptureContainer::HandleHalfKeyEventL DOWN"))
       PERF_MESSAGE_L2( EPerfMessageCaptureKeyHalfPressed );
       // If the shutter key has been half pressed
@@ -1006,7 +1007,7 @@
     parent.LayoutRect( rect, AknLayoutScalable_Apps::cam6_mode_pane( cba ) );
     TAknLayoutRect l;
     l.LayoutRect( parent.Rect(),
-                  AknLayoutScalable_Apps::cam6_mode_pane_g3( cba ) );
+                  AknLayoutScalable_Apps::main_camera4_pane_g3( 1 ) );
     iFlashIconRect = l.Rect();
     if( iFlashBitmap )
       {
--- a/camerauis/cameraapp/generic/src/CamStillPreCaptureView.cpp	Tue Jan 26 11:44:00 2010 +0200
+++ b/camerauis/cameraapp/generic/src/CamStillPreCaptureView.cpp	Tue Feb 02 00:01:39 2010 +0200
@@ -146,6 +146,7 @@
                // if the Camera in the Portrait mode
           	   // MSK event is handled like a capture key
           		{
+          		OstTrace0( CAMERAAPP_PERFORMANCE, DUP8_CCAMSTILLPRECAPTUREVIEW_HANDLECOMMANDL, "e_CAM_PRI_SHUTTER_RELEASE_LAG 1" );
           		if ( iController.IsViewFinding() && appUi->CheckMemoryL() )
                 	{
                     OstTrace0( CAMERAAPP_PERFORMANCE, CCAMSTILLPRECAPTUREVIEW_HANDLECOMMANDL, "e_CAM_APP_SHOT_TO_SNAPSHOT 1" );
@@ -163,6 +164,8 @@
         	}
         case ECamCmdCaptureImage:
             {
+      	    OstTrace0( CAMERAAPP_PERFORMANCE, DUP9_CCAMSTILLPRECAPTUREVIEW_HANDLECOMMANDL, "e_CAM_PRI_AF_LOCK 1" );
+      	    OstTrace0( CAMERAAPP_PERFORMANCE, DUP10_CCAMSTILLPRECAPTUREVIEW_HANDLECOMMANDL, "e_CAM_PRI_SHUTTER_RELEASE_LAG 1" );
       	    if ( iController.IsViewFinding() && appUi->CheckMemoryL() &&
                 !iController.CaptureModeTransitionInProgress() &&
                 !iController.IsProcessingCapture() ) 
@@ -1807,6 +1810,7 @@
 		     && iController.UiConfigManagerPtr() 
 		     && !iController.UiConfigManagerPtr()->IsOpticalJoyStickSupported() )
 		    {
+      	    OstTrace0( CAMERAAPP_PERFORMANCE, DUP1_CCAMSTILLPRECAPTUREVIEW_STARTMSKCAPTUREL, "e_CAM_PRI_AF_LOCK 1" );
       	    if ( iController.IsViewFinding() && appUi->CheckMemoryL() &&
                 !iController.CaptureModeTransitionInProgress() ) 
             	{
--- a/camerauis/cameraapp/generic/src/CamVideoPreCaptureContainer.cpp	Tue Jan 26 11:44:00 2010 +0200
+++ b/camerauis/cameraapp/generic/src/CamVideoPreCaptureContainer.cpp	Tue Feb 02 00:01:39 2010 +0200
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -172,7 +172,6 @@
           case ECamCapturing:
             {
             iRecordState = ECamRecording;
-            iFileTypeIndicator->SetRect(iFileTypeIndicatorVidcapPosition);
             iResolutionIndicators[iCurrentIndicator]->SetRect(iResolutionIndicatorVidcapPosition);
             break;
             }
@@ -539,13 +538,6 @@
             AknLayoutScalable_Apps::vid4_progress_pane( variant ) );  
         layoutRect.LayoutRect( vidProgressPane.Rect(),
             AknLayoutScalable_Apps::vid4_progress_pane_g2() );
-
-        TAknLayoutRect vidIndicatorPane;
-        vidIndicatorPane.LayoutRect( rect,
-            AknLayoutScalable_Apps::vid4_indicators_pane( variant ) );
-
-        fileTypeIconLayout.LayoutRect( vidIndicatorPane.Rect(),
-                AknLayoutScalable_Apps::vid4_indicators_pane_g2() );
         }
     else
         {
@@ -558,9 +550,8 @@
         fileTypeIconLayout = layoutRect;
         }
 
-    iFileTypeIndicatorVidcapPosition = layoutRect.Rect();
-    iFileTypeIndicator->SetRect( fileTypeIconLayout.Rect() );
-    iFileTypeIndicatorPosition = fileTypeIconLayout.Rect();
+    iFileTypeIndicator->SetRect( layoutRect.Rect() );
+    iFileTypeIndicatorPosition = layoutRect.Rect();
     // Initialise the indicator
     SetFileTypeIndicator();
     }
--- a/camerauis/cameraapp/loc/cam.loc	Tue Jan 26 11:44:00 2010 +0200
+++ b/camerauis/cameraapp/loc/cam.loc	Tue Feb 02 00:01:39 2010 +0200
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -2091,7 +2091,7 @@
 //d:This text is used in both image and video mode.
 //l:main_cset_text2_pane_t1
 //
-#define qtn_lcam_descr_location_on "Location data will be recorded to each image or video if GPS co-ordinates are found. It might take many minutes to acquire these co-ordinates, best conditions are obtained in open areas away from tall buildings."	
+#define qtn_lcam_descr_location_on "Captured photos and videos will be tagged with your location. If photos or videos are shared, the location data may also be visible to third parties. Phone will use network to get the location data. Data transfer charges may apply."
 
 //d:Description text for qtn_lcam_location_set_off setting.
 //d:Visible in location data setting page.
@@ -4202,7 +4202,7 @@
 //d:This is shown as a warning to the user 
 //d:for the default value of location setting.
 //l:popup_info_list_pane_t1
-#define qtn_lcam_descr_location_ftu "Location notification: Captured photos and videos will be tagged with your location. If you share the photos and videos, the location data may also be visible to third parties who have access to that picture. Phone will use network to get the location data and data transfer charges may apply. If you want to disable the geotagging, you can do it in camera settings."
+#define qtn_lcam_descr_location_ftu "Location recording can be disabled in camera settings."
 
 //d:Set as default scene mode setting title
 //d:Shown in user scene setting list