equal
deleted
inserted
replaced
30 #include <hal_data.h> |
30 #include <hal_data.h> |
31 #include <pathinfo.h> |
31 #include <pathinfo.h> |
32 #include <barsread.h> |
32 #include <barsread.h> |
33 #include <AknUtils.h> |
33 #include <AknUtils.h> |
34 #include <akntoolbar.h> |
34 #include <akntoolbar.h> |
|
35 #include <akntoolbarextension.h> |
35 #include <centralrepository.h> |
36 #include <centralrepository.h> |
36 |
37 |
37 #include <ctsydomainpskeys.h> |
38 #include <ctsydomainpskeys.h> |
38 #include <ProfileEngineSDKCRKeys.h> |
39 #include <ProfileEngineSDKCRKeys.h> |
39 #include <sysutildomaincrkeys.h> |
40 #include <sysutildomaincrkeys.h> |
9656 if ( IsTouchScreenSupported() ) |
9657 if ( IsTouchScreenSupported() ) |
9657 { |
9658 { |
9658 CAknToolbar* fixedToolbar = appUi->CurrentFixedToolbar(); |
9659 CAknToolbar* fixedToolbar = appUi->CurrentFixedToolbar(); |
9659 if ( fixedToolbar ) |
9660 if ( fixedToolbar ) |
9660 { |
9661 { |
|
9662 CAknToolbarExtension* extension = fixedToolbar->ToolbarExtension(); |
|
9663 if ( extension ) |
|
9664 { |
|
9665 // Keep toolbar extension hidden after the half press key is released |
|
9666 extension->SetShown( EFalse ); |
|
9667 } |
9661 fixedToolbar->SetToolbarVisibility( EFalse ); |
9668 fixedToolbar->SetToolbarVisibility( EFalse ); |
9662 } |
9669 } |
9663 } |
9670 } |
9664 } |
9671 } |
9665 break; |
9672 break; |
10447 // |
10454 // |
10448 TBool CCamAppController::IsKeyLockOn() |
10455 TBool CCamAppController::IsKeyLockOn() |
10449 { |
10456 { |
10450 if ( iKeyLockStatusWatcher && iConfigManager && iConfigManager->IsKeyLockWatcherSupported() ) |
10457 if ( iKeyLockStatusWatcher && iConfigManager && iConfigManager->IsKeyLockWatcherSupported() ) |
10451 { |
10458 { |
10452 CCamAppUi* appUi = static_cast<CCamAppUi*>( CEikonEnv::Static()->AppUi() ); |
|
10453 TInt iKeyLockStatus = 0; |
10459 TInt iKeyLockStatus = 0; |
10454 iKeyLockStatusWatcher->Get( iKeyLockStatus ); |
10460 iKeyLockStatusWatcher->Get( iKeyLockStatus ); |
10455 if ( iKeyLockStatus == EKeyguardLocked && appUi ) |
10461 if ( iKeyLockStatus == EKeyguardLocked ) |
10456 { |
10462 { |
10457 return ETrue; |
10463 return ETrue; |
10458 } |
10464 } |
10459 else |
10465 else |
10460 { |
10466 { |