diff -r f0c0788c4de2 -r 756ad29ed18e camerauis/cameraapp/generic/src/CamNaviCounterModel.cpp --- a/camerauis/cameraapp/generic/src/CamNaviCounterModel.cpp Wed Sep 15 11:51:19 2010 +0300 +++ b/camerauis/cameraapp/generic/src/CamNaviCounterModel.cpp Wed Oct 13 14:09:54 2010 +0300 @@ -13,6 +13,17 @@ * * Description: Control for displaying remaining images/videos in Navi Pane * +* Copyright © 2007-2008 Nokia. All rights reserved. +* This material, including documentation and any related computer +* programs, is protected by copyright controlled by Nokia. All +* rights are reserved. Copying, including reproducing, storing, +* adapting or translating, any or all of this material requires the +* prior written consent of Nokia. This material also contains +* confidential information which may not be disclosed to others +* without the prior written consent of Nokia. + +* +* */ @@ -198,7 +209,7 @@ iCamOrientation = appUi->CamOrientation(); - if ( Layout_Meta_Data::IsLandscapeOrientation() || AknLayoutUtils::PenEnabled() ) + if ( Layout_Meta_Data::IsLandscapeOrientation() || CamUtility::IsNhdDevice() ) { TSize screenSize; AknLayoutUtils::LayoutMetricsSize( AknLayoutUtils::EScreen, screenSize ); @@ -211,7 +222,7 @@ iExtent = screenRect; } - if ( AknLayoutUtils::PenEnabled() ) + if ( CamUtility::IsNhdDevice() ) { TouchLayoutL(); } @@ -1501,7 +1512,7 @@ // Draw self timer icons, if set to on. if ( iDrawSelfTimer ) { - if ( AknLayoutUtils::PenEnabled() ) + if ( CamUtility::IsNhdDevice() ) { aGc.SetBrushColor( KRgbWhite ); aGc.SetBrushStyle( CGraphicsContext::ENullBrush );