diff -r a8834a2e9a96 -r c52421ed5f07 uifw/AknGlobalUI/OldStyleNotif/Src/aknkeylocknotifier.cpp --- a/uifw/AknGlobalUI/OldStyleNotif/Src/aknkeylocknotifier.cpp Wed Jun 09 09:58:37 2010 +0300 +++ b/uifw/AknGlobalUI/OldStyleNotif/Src/aknkeylocknotifier.cpp Mon Jun 21 15:57:43 2010 +0300 @@ -50,7 +50,7 @@ #include #include #include "AknNotifyPlugin.hrh" - +#include "akntrace.h" #ifdef _DEBUG @@ -243,6 +243,8 @@ // TInt CAknKeylockScreenSaverObserver::Start() { + _AKNTRACE_FUNC_ENTER; + if ( IsActive() ) { return KErrInUse; @@ -250,7 +252,9 @@ iStatus = KRequestPending; iScreenSaverActiveProperty.Subscribe( iStatus ); SetActive(); - + + _AKNTRACE_FUNC_EXIT; + return KErrNone; } @@ -261,12 +265,16 @@ // void CAknKeylockScreenSaverObserver::Stop() { + _AKNTRACE_FUNC_ENTER; + if ( !IsActive() ) { return; } Cancel(); iScreenSaverActiveProperty.Cancel(); + + _AKNTRACE_FUNC_EXIT; } @@ -293,6 +301,8 @@ // void CAknKeylockScreenSaverObserver::ConstructL() { + _AKNTRACE_FUNC_ENTER; + // Add this active object to the scheduler. CActiveScheduler::Add( this ); User::LeaveIfError( iScreenSaverActiveProperty.Attach( KPSUidScreenSaver, @@ -313,6 +323,8 @@ delete iDevicelockPolicyApi; iDevicelockPolicyApi = NULL; } + + _AKNTRACE_FUNC_EXIT; } @@ -323,6 +335,8 @@ // void CAknKeylockScreenSaverObserver::RunL() { + _AKNTRACE_FUNC_ENTER; + if ( iKeylockEnabled || iAutolockEnabled ) { // Resubscribe before processing new value to prevent missing updates. @@ -349,6 +363,8 @@ } iScreenSaverActive = EFalse; } + + _AKNTRACE_FUNC_EXIT; } @@ -359,6 +375,8 @@ void CAknKeylockScreenSaverObserver::SetLockStatus( TBool aKeylockEnabled, TBool aAutolockEnabled ) { + _AKNTRACE_FUNC_ENTER; + iKeylockEnabled = aKeylockEnabled; iAutolockEnabled = aAutolockEnabled; @@ -376,6 +394,8 @@ // Screensaver is only observed when keylock is enabled. Stop(); } + + _AKNTRACE_FUNC_EXIT; } @@ -385,6 +405,8 @@ // void CAknKeylockScreenSaverObserver::CapturePrimaryKeys( TBool aCapture ) { + _AKNTRACE_FUNC_ENTER; + if ( aCapture ) { if ( iScreenSaverActive && !iCaptured ) @@ -410,8 +432,10 @@ primaryKey, secondaryKey ) == KErrNone ) { - iPrimaryKeyCaptures.Append( - iWindowGroup.CaptureKeyUpAndDowns( primaryKey, 0, 0 ) ); + if (KErrNone != iPrimaryKeyCaptures.Append(iWindowGroup.CaptureKeyUpAndDowns(primaryKey, 0, 0))) + { + return; + } index++; } } @@ -437,8 +461,10 @@ TUint32 secondaryKey( 0 ); while ( iDevicelockPolicyApi->GetKeyCombination( index, primaryKey, secondaryKey ) == KErrNone ) { - iPrimaryKeyCaptures.Append( - iWindowGroup.CaptureKeyUpAndDowns( primaryKey, 0, 0 ) ); + if (KErrNone != iPrimaryKeyCaptures.Append(iWindowGroup.CaptureKeyUpAndDowns(primaryKey, 0, 0))) + { + return; + } index++; } } @@ -468,6 +494,8 @@ iCaptured = EFalse; } } + + _AKNTRACE_FUNC_EXIT; } @@ -478,7 +506,11 @@ // void CAknKeylockScreenSaverObserver::DoCancel() { + _AKNTRACE_FUNC_ENTER; + iScreenSaverActiveProperty.Cancel(); + + _AKNTRACE_FUNC_EXIT; } @@ -506,11 +538,16 @@ // TBool CAknLockedNote::OkToExitL( TInt aCommand ) { + _AKNTRACE_FUNC_ENTER; + iLocked = EFalse; if ( iCommandObserver ) { iCommandObserver->ProcessCommandL( aCommand ); } + + _AKNTRACE_FUNC_EXIT; + return ETrue; } @@ -532,12 +569,16 @@ // void CAknLockedNote::CancelNote() { + _AKNTRACE_FUNC_ENTER; + if ( iTimer ) { iTimer->Cancel(); } ExitSleepingDialog(); iLocked = EFalse; + + _AKNTRACE_FUNC_EXIT; } @@ -548,10 +589,14 @@ // void CAknLockedNote::FocusChanged( TDrawNow /*aDrawNow*/ ) { + _AKNTRACE_FUNC_ENTER; + if ( !IsFocused() && iCommandObserver ) { TRAP_IGNORE( iCommandObserver->ProcessCommandL( KNoteCmdFocusLost ) ) } + + _AKNTRACE_FUNC_EXIT; } @@ -632,9 +677,14 @@ // TInt CAknSleepingNote::ShowNote( const TInt aTimeout, const TTone aTone ) { + _AKNTRACE_FUNC_ENTER; + TRAP_IGNORE(AknGlobalPopupPriorityController::SetPopupPriorityL( *this, KGlobalWindowPriority_KeyLock )); iTimeoutInMicroseconds = aTimeout; iTone = aTone; + + _AKNTRACE_FUNC_EXIT; + return RouseSleepingDialog(); } @@ -646,10 +696,15 @@ // TBool CAknSleepingNote::OkToExitL( TInt aCommand ) { + _AKNTRACE_FUNC_ENTER; + if ( iCommandObserver ) { iCommandObserver->ProcessCommandL( aCommand ); } + + _AKNTRACE_FUNC_EXIT; + return ETrue; } @@ -661,6 +716,8 @@ // void CAknSleepingNote::HandleResourceChange( TInt aType ) { + _AKNTRACE_FUNC_ENTER; + if ( aType == KAknsMessageSkinChange ) { TInt animationRes( 0 ); @@ -714,6 +771,8 @@ } CAknNoteDialog::HandleResourceChange( aType ); + + _AKNTRACE_FUNC_EXIT; } @@ -806,6 +865,8 @@ // void CAknEcsNote::SetEmergencyNumber( const TDesC& aMatchedNumber ) { + _AKNTRACE_FUNC_ENTER; + TRect mainPane; AknLayoutUtils::LayoutMetricsRect( AknLayoutUtils::EPopupParent, mainPane ); @@ -869,6 +930,8 @@ number.Append( aMatchedNumber ); TRAP_IGNORE( SetTextL( number ) ); + + _AKNTRACE_FUNC_EXIT; } @@ -878,12 +941,16 @@ // void CAknEcsNote::SleepNote() { + _AKNTRACE_FUNC_ENTER; + if ( iNoteOnScreen ) { // Causes flicker to other notes if called when note is not on screen. ExitSleepingDialog(); } iNoteOnScreen = EFalse; + + _AKNTRACE_FUNC_EXIT; } @@ -910,7 +977,11 @@ CAknKeyLockControl::CAknKeyLockControl( CAknKeyLockNotifierSubject* aNotif ) : iNotif( aNotif ) { + _AKNTRACE_FUNC_ENTER; + AKNTASHOOK_ADD( this, "CAknKeyLockControl" ); + + _AKNTRACE_FUNC_EXIT; } @@ -920,6 +991,8 @@ // CAknKeyLockControl::~CAknKeyLockControl() { + _AKNTRACE_FUNC_ENTER; + AKNTASHOOK_REMOVE(); // We implicitely trust that Eikon env exists // (though in practice it does not make the @@ -945,6 +1018,8 @@ delete iEcsNote; // Ecs change delete iKeylockApi; delete iKeylockScreenSaverObserver; + + _AKNTRACE_FUNC_EXIT; } @@ -954,7 +1029,7 @@ // void CAknKeyLockControl::ConstructL() { - TRACES( RDebug::Print(_L("(KeyGuard)CAknKeyLockControl::ConstructL ")); ) + _AKNTRACE_FUNC_ENTER; FeatureManager::InitializeLibL(); iFeatureKeypadNoSlider = @@ -1120,6 +1195,8 @@ iStatusProperty.Attach( KPSUidAvkonDomain, KAknKeyguardStatus ); iStatusProperty.Set( EKeyguardNotActive ); + + _AKNTRACE_FUNC_EXIT; } @@ -1129,8 +1206,10 @@ // void CAknKeyLockControl::EnableKeylock( TBool aShowNote, TBool aNotifySysApp ) { - TRACES( RDebug::Print(_L("(KeyGuard)CAknKeyLockControl::EnableKeylock %d"), aShowNote); ) - + _AKNTRACE_FUNC_ENTER; + _AKNTRACE("aShowNote:%d",aShowNote); + _AKNTRACE("aNotifySysApp:%d",aNotifySysApp); + // Policy can be used to disable support for keyguard. if ( !iAutolockEnabled && !CKeyLockPolicyApi::KeyguardAllowed() ) { @@ -1255,6 +1334,8 @@ // leave, but we trap it in just in case. TRAP_IGNORE( static_cast( iEikonEnv->EikAppUi() )->HandleResourceChangeL( KAknInternalFSWClose ); ); + + _AKNTRACE_FUNC_EXIT; } @@ -1264,7 +1345,8 @@ // void CAknKeyLockControl::DisableKeylock(TBool aNotifySysApp) { - TRACES( RDebug::Print(_L("(KeyGuard)CAknKeyLockControl::DisableKeylock")); ) + _AKNTRACE_FUNC_ENTER; + _AKNTRACE("aShowNote:%d",aNotifySysApp); // Keep locking status in sync. iKeylockScreenSaverObserver->SetLockStatus( EFalse, iAutolockEnabled ); @@ -1342,6 +1424,8 @@ iEikonEnv->EikAppUi() )->SuppressAppSwitching( EFalse ); iAutolockEnabled = EFalse; + + _AKNTRACE_FUNC_EXIT; } @@ -1351,6 +1435,8 @@ // void CAknKeyLockControl::SendMessageToSysAp( TInt aMessage ) { + _AKNTRACE_FUNC_ENTER; + RWsSession& ws = iEikonEnv->WsSession(); TInt wgId = 0; CApaWindowGroupName::FindByAppUid( KSysApUid, ws, wgId ); @@ -1361,6 +1447,8 @@ event.SetTimeNow(); ws.SendEventToWindowGroup( wgId, event ); } + + _AKNTRACE_FUNC_EXIT; } @@ -1370,9 +1458,13 @@ // void CAknKeyLockControl::OfferKeylock() { + _AKNTRACE_FUNC_ENTER; + iOfferLockNote->ShowNote( (CAknNoteDialog::TTimeout)KAknOfferKeyLockTimeout, CAknNoteDialog::ENoTone ); iOfferLockEnabled = ETrue; + + _AKNTRACE_FUNC_EXIT; } @@ -1406,8 +1498,12 @@ // void CAknKeyLockControl::DoUnlock() { + _AKNTRACE_FUNC_ENTER; + DisableKeylock(); DisplayKeyActiveNote(); + + _AKNTRACE_FUNC_EXIT; } @@ -1418,6 +1514,9 @@ // void CAknKeyLockControl::HandleResourceChange( TInt aType ) { + _AKNTRACE_FUNC_ENTER; + _AKNTRACE("aType:%d",aType); + if ( aType == KEikDynamicLayoutVariantSwitch ) { TRect screenRect; @@ -1440,6 +1539,8 @@ } } } + + _AKNTRACE_FUNC_EXIT; } @@ -1450,7 +1551,8 @@ // void CAknKeyLockControl::ProcessCommandL( TInt aCommandId ) { - TRACES( RDebug::Print(_L("(KeyGuard)CAknKeyLockControl::ProcessCommandL %d"), aCommandId); ) + _AKNTRACE_FUNC_ENTER; + _AKNTRACE("aCommandId:%d",aCommandId); switch ( aCommandId ) { @@ -1511,6 +1613,8 @@ break; } } + + _AKNTRACE_FUNC_EXIT; } @@ -1556,8 +1660,8 @@ // void CAknKeyLockControl::LeftSoftKeyPressed() { - TRACES( RDebug::Print(_L("(KeyGuard)CAknKeyLockControl::LeftSoftKeyPressed")); ) - + _AKNTRACE_FUNC_ENTER; + // Check that the confirmation note exists, as it's not created on // startup if touch layout is in use. In emulator this might cause // a problem, as layout can be changed to a non-touch one, and @@ -1580,6 +1684,8 @@ SendMessageToSysAp( EEikKeyLockLightsOnRequest ); iUnlockConfirmation = ETrue; } + + _AKNTRACE_FUNC_EXIT; } @@ -1591,15 +1697,17 @@ TKeyResponse CAknKeyLockControl::OfferKeyEventL( const TKeyEvent& aKeyEvent, TEventCode aType ) { + _AKNTRACE_FUNC_ENTER; + if ( AknLayoutUtils::PenEnabled() ) { - TRACES( RDebug::Print(_L("(KeyGuard)CAknKeyLockControl::OfferKeyEventL: PenEnabled"));) + _AKNTRACE("(KeyGuard)CAknKeyLockControl::OfferKeyEventL: PenEnabled"); if ( iAutolockEnabled ) { // The case when touch device is locked and so must be unlocked by hold switch. - TRACES( RDebug::Print(_L("(KeyGuard)CAknKeyLockControl::OfferKeyEventL: Autolock Enabled"));) + _AKNTRACE("(KeyGuard)CAknKeyLockControl::OfferKeyEventL: Autolock Enabled"); if ( aType == EEventKey && aKeyEvent.iCode == EKeyDeviceF ) { - TRACES( RDebug::Print(_L("(KeyGuard)CAknKeyLockControl::OfferKeyEventL: SysAp message"));) + _AKNTRACE("(KeyGuard)CAknKeyLockControl::OfferKeyEventL: SysAp message"); SendMessageToSysAp( EEikKeyLockLightsOnRequest ); if ( iAutolockEnabled && !iKeylockApi ) { @@ -1615,7 +1723,7 @@ autolocktask.SendKey( keyEvent ); } } - TRACES( RDebug::Print(_L("(KeyGuard)CAknKeyLockControl::OfferKeyEventL: return EKeyWasConsumed"));) + _AKNTRACE_FUNC_EXIT; return EKeyWasConsumed; } } @@ -1820,7 +1928,7 @@ ShowLockedNote(); } } - + _AKNTRACE_FUNC_EXIT; return EKeyWasConsumed; } @@ -1831,10 +1939,14 @@ // void CAknKeyLockControl::ShowLockedNote() { + _AKNTRACE_FUNC_ENTER; + if ( !iLockedNoteDisplayed ) { DoShowLockedNote(); } + + _AKNTRACE_FUNC_EXIT; } @@ -1856,11 +1968,15 @@ // void CAknKeyLockControl::ShowKeylockCba() { + _AKNTRACE_FUNC_ENTER; + RDrawableWindow* cbaWindow = iKeyLockCba->ButtonGroup()->AsControl()->DrawableWindow(); cbaWindow->SetFaded( EFalse, RWindowTreeNode::EFadeWindowOnly ); cbaWindow->SetOrdinalPosition( 0, 1 ); cbaWindow->SetNonFading( ETrue ); + + _AKNTRACE_FUNC_EXIT; } @@ -1870,6 +1986,8 @@ // void CAknKeyLockControl::CaptureSystemKeys() { + _AKNTRACE_FUNC_ENTER; + if ( !iKeysCaptured ) { RWindowGroup& groupWin = iCoeEnv->RootWin(); @@ -1897,15 +2015,17 @@ if ( AknLayoutUtils::PenEnabled() ) { - TRACES( RDebug::Print(_L("(KeyGuard)CAknKeyLockControl::CaptureSystemKeys PenEnabled"));) + _AKNTRACE("(KeyGuard)CAknKeyLockControl::CaptureSystemKeys PenEnabled"); if ( iAutolockEnabled ) { //Capture Hold Switch - TRACES( RDebug::Print(_L("(KeyGuard)CAknKeyLockControl::CaptureSystemKeys iAutolockEnabled"));) + _AKNTRACE("(KeyGuard)CAknKeyLockControl::CaptureSystemKeys iAutolockEnabled"); iHoldSwitch = groupWin.CaptureKey( EKeyDeviceF, 0, 0 ); } } iKeysCaptured = ETrue; } + + _AKNTRACE_FUNC_EXIT; } @@ -1915,6 +2035,8 @@ // void CAknKeyLockControl::UnCaptureSystemKeys() { + _AKNTRACE_FUNC_ENTER; + if ( iKeysCaptured ) { RWindowGroup& groupWin = iCoeEnv->RootWin(); @@ -1935,6 +2057,8 @@ iKeysCaptured = EFalse; } + + _AKNTRACE_FUNC_EXIT; } @@ -1946,6 +2070,8 @@ void CAknKeyLockControl::HandleEcsEvent( CAknEcsDetector* aEcsDetector, CAknEcsDetector::TState aState ) { + _AKNTRACE_FUNC_ENTER; + switch ( aState ) { case CAknEcsDetector::ECompleteMatchThenSendKey: @@ -1990,6 +2116,8 @@ break; } } + + _AKNTRACE_FUNC_EXIT; } @@ -1999,7 +2127,11 @@ // void CAknKeyLockControl::DoExitOfferKeylock() { + _AKNTRACE_FUNC_ENTER; + iOfferLockNote->CancelNote(); + + _AKNTRACE_FUNC_EXIT; } @@ -2009,7 +2141,11 @@ // void CAknKeyLockControl::OfferTimerExpired() { + _AKNTRACE_FUNC_ENTER; + DoExitOfferKeylock(); + + _AKNTRACE_FUNC_EXIT; } @@ -2019,7 +2155,11 @@ // void CAknKeyLockControl::AutolockEnabled( TBool aAutoLockOn ) { + _AKNTRACE_FUNC_ENTER; + iAutolockEnabled = aAutoLockOn; + + _AKNTRACE_FUNC_EXIT; } @@ -2047,11 +2187,15 @@ // void CAknKeyLockControl::CapturePointerEvents() { + _AKNTRACE_FUNC_ENTER; + if ( AknLayoutUtils::PenEnabled() ) { Window().SetPointerCapture( RWindowBase::TCaptureDragDrop ); Window().ClaimPointerGrab( ETrue ); } + + _AKNTRACE_FUNC_EXIT; } @@ -2061,20 +2205,30 @@ // void CAknKeyLockControl::UnCapturePointerEvents() { + _AKNTRACE_FUNC_ENTER; + if ( AknLayoutUtils::PenEnabled() ) { Window().SetPointerCapture( RWindowBase::TCaptureDisabled ); Window().ClaimPointerGrab( EFalse ); } + + _AKNTRACE_FUNC_EXIT; } TBool CAknKeyLockControl::HasSliderKey() { + _AKNTRACE_FUNC_ENTER; + TBool hasSlider(iHardwareSupport != EKeyguardDefaultHardware); if( FeatureManager::FeatureSupported( KFeatureIdFfPowerKeyAsKeyguard ) ) { hasSlider = ETrue; // the only purpose is to display empty sotkeys } + + _AKNTRACE( "hasSlider:%d",hasSlider); + _AKNTRACE_FUNC_EXIT; + return hasSlider; } @@ -2189,6 +2343,8 @@ // TPtrC8 CAknKeyLockNotifierSubject::StartL( const TDesC8& aBuffer ) { + _AKNTRACE_FUNC_ENTER; + SAknNotifierPackage* params = ( SAknNotifierPackage*)aBuffer.Ptr(); @@ -2199,6 +2355,8 @@ User::Leave( KErrArgument ); } + _AKNTRACE( "params->iParamData.iReason:%d",params->iParamData.iReason); + switch ( params->iParamData.iReason ) { case ELockEnabled: @@ -2224,6 +2382,8 @@ } } + _AKNTRACE_FUNC_EXIT; + return iRetPckg; } @@ -2237,6 +2397,8 @@ TInt /*aReplySlot*/, const RMessagePtr2& aMessage ) { + _AKNTRACE_FUNC_ENTER; + SAknNotifierPackage* params = ( SAknNotifierPackage*)aBuffer.Ptr(); @@ -2247,6 +2409,8 @@ User::Leave( KErrArgument ); } + _AKNTRACE( "params->iParamData.iReason:%d",params->iParamData.iReason); + switch ( params->iParamData.iReason ) { case ELockEnabled: @@ -2330,6 +2494,8 @@ } }; + _AKNTRACE_FUNC_EXIT; + aMessage.Complete( KErrNone ); } @@ -2384,10 +2550,14 @@ // void CAknKeyLockNotifierSubject::UnlockKeys() { + _AKNTRACE_FUNC_ENTER; + if ( IsKeyLockEnabled() ) { iKeyLockControl->DisableKeylock(); } + + _AKNTRACE_FUNC_EXIT; } @@ -2398,6 +2568,9 @@ // void CAknKeyLockNotifierSubject::LockKeys( TBool aAutoLockOn ) { + _AKNTRACE_FUNC_ENTER; + _AKNTRACE( "aAutoLockOn:%d",aAutoLockOn); + // We'll have to disable keylock if we are changing autolock status. if ( IsKeyLockEnabled() && aAutoLockOn != iKeyLockControl->iAutolockEnabled ) { @@ -2409,6 +2582,8 @@ iKeyLockControl->AutolockEnabled( aAutoLockOn ); iKeyLockControl->EnableKeylock(ETrue, EFalse); } + + _AKNTRACE_FUNC_EXIT; } @@ -2419,6 +2594,8 @@ // void CAknKeyLockNotifierSubject::AddObserverL( MAknKeyLockObserver* aObserver ) { + _AKNTRACE_FUNC_ENTER; + #if defined(_DEBUG) TInt count = iObserverList->Count(); for ( TInt index = 0; index < count; index++ ) @@ -2433,6 +2610,8 @@ // Make sure that the observer isn't obscuring the keylock CBA ShowKeylockCba(); + + _AKNTRACE_FUNC_EXIT; } @@ -2443,6 +2622,8 @@ // void CAknKeyLockNotifierSubject::RemoveObserver( MAknKeyLockObserver* aObserver ) { + _AKNTRACE_FUNC_ENTER; + TInt count = iObserverList->Count(); for ( TInt index = 0; index < count; index++ ) { @@ -2455,6 +2636,8 @@ #if defined(_DEBUG) Panic( EAknPanicKeyLockObserverNotFound ); #endif + + _AKNTRACE_FUNC_EXIT; } @@ -2464,11 +2647,16 @@ // void CAknKeyLockNotifierSubject::NotifyStatusChange( TKeyLockStatus aStatus ) { + _AKNTRACE_FUNC_ENTER; + _AKNTRACE( "aStatus:%d",aStatus); + TInt count = iObserverList->Count(); for ( TInt index = count - 1; index >= 0; index-- ) { ((*iObserverList)[index])->KeyLockStatusChange( aStatus ); } + + _AKNTRACE_FUNC_EXIT; } @@ -2478,10 +2666,14 @@ // void CAknKeyLockNotifierSubject::ShowKeylockCba() { + _AKNTRACE_FUNC_ENTER; + if ( IsKeyLockEnabled() ) { iKeyLockControl->ShowKeylockCba(); } + + _AKNTRACE_FUNC_EXIT; } @@ -2491,10 +2683,14 @@ // void CAknKeyLockNotifierSubject::DoEnableKeyLock() { + _AKNTRACE_FUNC_ENTER; + if ( !IsKeyLockEnabled() ) { iKeyLockControl->EnableKeylock(); } + + _AKNTRACE_FUNC_EXIT; } @@ -2504,6 +2700,8 @@ // void CAknKeyLockNotifierSubject::DoDisableKeyLock() { + _AKNTRACE_FUNC_ENTER; + if ( IsKeyLockEnabled() ) { iKeyLockControl->DisableKeylock(); @@ -2515,6 +2713,8 @@ // Remove the offer key lock CBA. iKeyLockControl->OfferTimerExpired(); } + + _AKNTRACE_FUNC_EXIT; } @@ -2524,9 +2724,13 @@ // void CAknKeyLockNotifierSubject::DoOfferKeyLock() { + _AKNTRACE_FUNC_ENTER; + if ( !IsKeyLockEnabled() ) { NotifyStatusChange( EKeyLockOffered ); iKeyLockControl->OfferKeylock(); } + + _AKNTRACE_FUNC_EXIT; }