--- a/camerauis/cameraapp/generic/src/CamUserSceneSetupContainer.cpp	Wed Apr 14 15:41:04 2010 +0300
+++ b/camerauis/cameraapp/generic/src/CamUserSceneSetupContainer.cpp	Tue Apr 27 16:19:06 2010 +0300
@@ -26,6 +26,7 @@
 #include <AknIconArray.h>
 #include <barsread.h>
 #include <aknview.h>
+#include "CameraUiConfigManager.h"
 
 #include "CamUtility.h"
 
@@ -211,7 +212,9 @@
     {
     const TInt KSettingItemArrayGranularity = 5;
 
-    CreateWindowL();
+    CCamContainerBase::BaseConstructL( aRect );
+    
+    //CreateWindowL();
 
     // Create the listbox in the right style
     iUserSceneSetupList = new ( ELeave ) CAknSettingStyleListBox;
@@ -442,6 +445,23 @@
     const TKeyEvent& aKeyEvent,
     TEventCode aType )
     {
+    if ( iController.UiConfigManagerPtr()
+         && iController.UiConfigManagerPtr()->IsAutoFocusSupported() )
+        {
+        if( aType == EEventKeyDown && IsShutterKeyL( aKeyEvent, aType ) )
+            {
+            TKeyResponse response = iUserSceneSetupList->OfferKeyEventL( aKeyEvent, aType );
+            iView.HandleCommandL( EAknSoftkeyBack );
+            return response;
+            }
+        }
+    else if( aType == EEventKeyDown && IsCaptureKeyL( aKeyEvent, aType ) )
+        {
+        TKeyResponse response = iUserSceneSetupList->OfferKeyEventL( aKeyEvent, aType );
+        iView.HandleCommandL( EAknSoftkeyBack );
+        return response;
+        }
+       
 	return iUserSceneSetupList->OfferKeyEventL( aKeyEvent, aType );
     }