--- a/camerauis/cameraapp/generic/src/CamContainerBase.cpp	Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/src/CamContainerBase.cpp	Wed Oct 13 14:09:54 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2007-2009 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"
@@ -394,12 +394,7 @@
             aKeyEvent.iCode == EKeyOK && 
             aKeyEvent.iRepeats == 0 )
     {
-    if( !iController.IsDemandKeyRelease() )
-        {
-        // Forward selection key event if button has been released 
-        // after last video capture
-        iView.HandleCommandL( EAknSoftkeySelect );
-        }
+    iView.HandleCommandL( EAknSoftkeySelect );
     return EKeyWasConsumed; // indicate key press was processed
     }
     // stop video or sequence if get applications key press (short or long)
@@ -627,7 +622,7 @@
                 AknLayoutUtils::EAknCbaLocationLeft? 
                 AknLayoutUtils::EAknCbaLocationLeft : 0;
     
-    if ( AknLayoutUtils::PenEnabled() )
+    if ( CamUtility::IsNhdDevice() )
         {
         vidProgressPane.LayoutRect( Rect(),
                 AknLayoutScalable_Apps::vid4_progress_pane( 
@@ -687,7 +682,7 @@
                 AknLayoutUtils::EAknCbaLocationLeft : 0;
     
     
-    if ( AknLayoutUtils::PenEnabled() )
+    if ( CamUtility::IsNhdDevice() )
         {
         vidProgressPane.LayoutRect(
                 Rect(),