diff -r f0c0788c4de2 -r 756ad29ed18e camerauis/cameraapp/generic/src/cambatterypanedrawer.cpp --- a/camerauis/cameraapp/generic/src/cambatterypanedrawer.cpp Wed Sep 15 11:51:19 2010 +0300 +++ b/camerauis/cameraapp/generic/src/cambatterypanedrawer.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-2008 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" @@ -13,6 +13,17 @@ * * Description: Implemantation for CCamBatteryPaneDrawer class. * +* 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. + +* +* */ @@ -188,7 +199,7 @@ void CCamBatteryPaneDrawer::LoadLayoutsL() { PRINT( _L("Camera => CCamBatteryPaneDrawer::LoadLayoutsL") ); - if ( AknLayoutUtils::PenEnabled() ) + if ( CamUtility::IsNhdDevice() ) { TouchLayoutL(); }