--- a/camerauis/cameraapp/generic/src/CamPreCaptureContainerBase.cpp	Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/src/CamPreCaptureContainerBase.cpp	Wed Oct 13 14:09:54 2010 +0300
@@ -1981,7 +1981,7 @@
       {
       // Draw the resolution indicator
       if ( appUi->ActiveCamera() == ECamActiveCameraPrimary  
-           && ( AknLayoutUtils::PenEnabled() 
+           && ( CamUtility::IsNhdDevice() 
            || videoOperation == ECamNoOperation ) )
           {
           iResolutionIndicators[iCurrentIndicator]->Draw( aGc );
@@ -2633,7 +2633,7 @@
     if ( iController.UiConfigManagerPtr() && 
          iController.UiConfigManagerPtr()->IsAutoFocusSupported() )
         {
-        if ( AknLayoutUtils::PenEnabled() ) 
+        if ( CamUtility::IsNhdDevice() ) 
             {
             TouchLayout();
             }
@@ -2738,7 +2738,7 @@
     CCamAppUi* appUi = static_cast<CCamAppUi*>( CEikonEnv::Static()->AppUi() );
     TAknLayoutRect resolutionIconLayout;
     TAknLayoutRect indicatorPane;
-    if ( AknLayoutUtils::PenEnabled() )
+    if ( CamUtility::IsNhdDevice() )
         {
         TInt variant = Layout_Meta_Data::IsLandscapeOrientation();
         if ( appUi->TargetMode() ==  ECamControllerVideo ) 
@@ -2936,8 +2936,7 @@
         iDrawIndicator = ETrue;
         }
     
-    CCamAppUi* appUi = static_cast<CCamAppUi*>( iEikonEnv->AppUi() );
-    if ( iCaptureButtonContainer && !( appUi && appUi->SelfTimerEnabled() ) )
+    if ( iCaptureButtonContainer )
         {
         iCaptureButtonContainer->SetCaptureButtonShown( EFalse );
         }