diff -r f0c0788c4de2 -r 756ad29ed18e camerauis/cameraapp/generic/common/src/CamUtility.cpp --- a/camerauis/cameraapp/generic/common/src/CamUtility.cpp Wed Sep 15 11:51:19 2010 +0300 +++ b/camerauis/cameraapp/generic/common/src/CamUtility.cpp Wed Oct 13 14:09:54 2010 +0300 @@ -1532,12 +1532,12 @@ { PRINT1( _L("Camera => CamUtility::ViewfinderLayout - resolution[%d]"), aResolution ); - TAknWindowLineLayout l = AknLayoutUtils::PenEnabled() + TAknWindowLineLayout l = IsNhdDevice() ? ViewfinderLayoutTouch(aMode, aResolution) : ViewfinderLayoutNonTouch(aMode, aResolution); TRect screenRect; - if ( Layout_Meta_Data::IsLandscapeOrientation() || AknLayoutUtils::PenEnabled() ) + if ( Layout_Meta_Data::IsLandscapeOrientation() || IsNhdDevice() ) { AknLayoutUtils::LayoutMetricsRect( AknLayoutUtils::EScreen, screenRect ); }