--- a/camerauis/cameraapp/generic/common/src/CamUtility.cpp	Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/common/src/CamUtility.cpp	Tue Sep 14 20:46:07 2010 +0300
@@ -1532,12 +1532,12 @@
   {
   PRINT1( _L("Camera => CamUtility::ViewfinderLayout - resolution[%d]"), aResolution );
 
-  TAknWindowLineLayout l = IsNhdDevice() 
+  TAknWindowLineLayout l = AknLayoutUtils::PenEnabled() 
                          ? ViewfinderLayoutTouch(aMode, aResolution)
                          : ViewfinderLayoutNonTouch(aMode, aResolution);  
 
   TRect screenRect;
-  if ( Layout_Meta_Data::IsLandscapeOrientation() || IsNhdDevice() )
+  if ( Layout_Meta_Data::IsLandscapeOrientation() || AknLayoutUtils::PenEnabled() )
       {
       AknLayoutUtils::LayoutMetricsRect( AknLayoutUtils::EScreen, screenRect );
       }