FCL/sf/app/phone: comparison phoneapp/phoneuicontrol/src/cphonestateidle.cpp

equal deleted inserted replaced

-:c84cf270c54f
+:92ab7f8d0eab
 #include "cphonemainresourceresolver.h"
 #include "cphonecenrepproxy.h"
 #include "cphonepubsubproxy.h"
 #include "phonelogger.h"
 #include "phoneui.pan"
-#include "phoneconstants.h"
+// <-- QT PHONE START -->
+//#include "phoneconstants.h"
+//#include <activeidle2domainpskeys.h>
+// <-- QT PHONE END -->
 #include "mphonecustomization.h"
 //CONSTANTS
 const TInt  KMaxParamLength = 1024;
 TPhoneCmdParamBoolean boolean;
 boolean.SetBoolean( ETrue );
 iViewCommandHandle->ExecuteCommandL( EPhoneViewSetSendKeyDialerActivationFlag,
 &boolean );
 iViewCommandHandle->ExecuteCommandL( EPhoneViewCreatePhoneBookServices );
 }
 // -----------------------------------------------------------
 // CPhoneStateIdle::NewL()
 // -----------------------------------------------------------
 {
 __LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateIdle::HandleKeyEventL( ) ");
 // Security mode check
 TPhoneCmdParamBoolean isSecurityMode;
 iViewCommandHandle->ExecuteCommandL( EPhoneViewGetSecurityModeStatus, &isSecurityMode );
 // Number entry is blocked, if active Query
 if ( !IsAnyQueryActiveL() )
 {
 // Handle numeric keys when key events are received in idle state
 HandleNumericKeyEventL( aKeyEvent, aEventCode );
 TKeyCode aCode )
 {
 __LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateIdle::HandleKeyMessageL( ) ");
 if( aMessage == EPhoneKeyLongPress && CheckAppLaunchingL( aCode ) )
-	{
+{
 return;
-	}
+}
 switch ( aCode )
 {
 case EKeyEnd:
 // This key even occur only in idle state, behaviour for this should
 }
 break;
 case EKeyApplication0:
 {
-// Security mode
-TPhoneCmdParamBoolean isSecurityMode;
-iViewCommandHandle->ExecuteCommandL( EPhoneViewGetSecurityModeStatus, &isSecurityMode );
 // If dialer is not open but phone is in foreground and phone receives
-// applicaion-key event we have to open emergency dialer.
+// applicaion-key event we have to open emergency dialer. No need own
-// Securitymode check because Applicationkey only open dialer in securitymode.
+// securitymode check because Applicationkey only captured in securitymode.
-if ( isSecurityMode.Boolean() && !IsNumberEntryUsedL() )
+if ( !IsNumberEntryUsedL() )
 {
 HandleCommandL(EPhoneNumberAcqSecurityDialer);
 }
 }
 break;
 {
 SetNumberEntryVisibilityL(EFalse);
 }
 // Close fast swap window if it's displayed
-CEikonEnv::Static()->DismissTaskList();
+// <-- QT PHONE START -->
+//    CEikonEnv::Static()->DismissTaskList();
+// Display incoming call
+DisplayIncomingCallL( aCallId );
 // Show incoming call buttons
 SetTouchPaneButtons( EPhoneIncomingCallButtons );
-SetTouchPaneButtonEnabled( EPhoneCallComingCmdSilent );
+// <-- QT PHONE END -->
-// Display incoming call
-DisplayIncomingCallL( aCallId );
 // Disable HW keys and Call UI if needed
 CheckDisableHWKeysAndCallUIL();
 EndUiUpdate();
 BeginTransEffectLC( ENumberEntryClose );
 BeginUiUpdateLC();
 SetNumberEntryVisibilityL(EFalse);
+// <-- QT PHONE START -->
+// Display call setup
+DisplayCallSetupL( aCallId );
 // Show call setup buttons
 SetTouchPaneButtons( EPhoneCallSetupButtons );
+// <-- QT PHONE END -->
-// Display call setup
-DisplayCallSetupL( aCallId );
 EndUiUpdate();
 // Remove any phone dialogs if they are displayed
 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemovePhoneDialogs );
 integerParam.SetInteger(
 CPhoneMainResourceResolver::Instance()->
 ResolveResourceID( EPhoneNumberAcqOkMenubar ) );
 iViewCommandHandle->ExecuteCommandL(
 EPhoneViewMenuBarOpen, &integerParam );
-	       commandStatus = ETrue;
+commandStatus = ETrue;
 }
 break;
 default:
 commandStatus = CPhoneState::ProcessCommandL( aCommand );
 // CPhoneStateIdle::HandlePhoneForegroundEventL
 // -----------------------------------------------------------
 EXPORT_C void CPhoneStateIdle::HandlePhoneForegroundEventL()
 {
-__LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateIdle::HandlePhoneForegroundEventL( ) ");
+// <-- QT PHONE START -->
+/*__LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateIdle::HandlePhoneForegroundEventL( ) ");
 TPhoneCmdParamBoolean isSecurityMode;
 iViewCommandHandle->ExecuteCommandL( EPhoneViewGetSecurityModeStatus, &isSecurityMode );
 TBool activatePhone = CPhonePubSubProxy::Instance()->Value(
 }
 else if ( !IsNumberEntryUsedL() && !isSecurityMode.Boolean() )
 {
 // Bring Idle app to the foreground
 iViewCommandHandle->ExecuteCommandL( EPhoneViewBringIdleToForeground );
-		}
+}*/
+// <-- QT PHONE END -->
 }
 // -----------------------------------------------------------
 // CPhoneStateIdle::HandlePhoneFocusLostEventL
 // -----------------------------------------------------------
 iStateMachine->PhoneEngineInfo()->SetServiceIdCommand( speedDialParam.ServiceId() );
 CleanupStack::PushL( phoneNumber );
 if ( NULL != phoneNumber && KNullDesC() != *phoneNumber )
 {
 DialL( *phoneNumber, speedDialParam.NumberType(), aDialMethod );
 if ( IsNumberEntryUsedL()  )
 {
 BeginTransEffectLC( ENumberEntryClose );
 keyEvent.iScanCode = EEikCmdExit;
 keyEvent.iModifiers = 0;
 keyEvent.iRepeats = 0;
 wsSession.SimulateKeyEvent( keyEvent );
 wsSession.Flush();
+// <-- QT PHONE START -->
+iViewCommandHandle->ExecuteCommandL( EPhoneAppShutDown );
+// <-- QT PHONE END -->
 }
 // -----------------------------------------------------------
 // CPhoneStateIdle::HandleEndKeyPressL
 // -----------------------------------------------------------
 // Remove number entry from screen
 iViewCommandHandle->ExecuteCommandL(
 EPhoneViewRemoveNumberEntry );
 }
-			    // Bring Idle app to the foreground
+// Bring Idle app to the foreground
 iViewCommandHandle->ExecuteCommandL( EPhoneViewBringIdleToForeground );
 }
 }
 else if ( IsNumberEntryUsedL() )
 {
 // -----------------------------------------------------------------------------
 // CPhoneStateIdle::CheckAppLaunchingL
 // -----------------------------------------------------------------------------
 //
 TBool CPhoneStateIdle::CheckAppLaunchingL( const TKeyCode aCode )
-	{
+{
-	TBool valuesFetched( EFalse );
+TBool valuesFetched( EFalse );
-	if( !IsSimOk() )
+if( !IsSimOk() )
-	    {
+{
-	    return valuesFetched;
+return valuesFetched;
-	    }
+}
-	TPhoneCmdParamAppInfo appInfo;
+TPhoneCmdParamAppInfo appInfo;
-	HBufC8* appParam = HBufC8::NewL( KMaxParamLength );
+HBufC8* appParam = HBufC8::NewL( KMaxParamLength );
-	CleanupStack::PushL( appParam );
+CleanupStack::PushL( appParam );
 TPhoneCmdParamInteger numberEntryCount;
 iViewCommandHandle->ExecuteCommandL( EPhoneViewGetNumberEntryCount,
 &numberEntryCount );
 if ( isValidAppLaunchingKeyEvent )
 {
 TRAPD( err,
 CPhoneCenRepProxy::Instance()->FetchValuesFromCenRepL(
-	appInfo, aCode, appParam, valuesFetched ) );
+appInfo, aCode, appParam, valuesFetched ) );
 if ( KErrNone == err && valuesFetched )
 {
 // Remove the number entry window
 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry );
-	// Stop playing DTMF tone
+// Stop playing DTMF tone
-	iStateMachine->SendPhoneEngineMessage( MPEPhoneModel::EPEMessageEndDTMF );
+iStateMachine->SendPhoneEngineMessage( MPEPhoneModel::EPEMessageEndDTMF );
 TPhoneCommandParam* phoneCommandParam =
 static_cast<TPhoneCommandParam*>( &appInfo );
-	iViewCommandHandle->ExecuteCommandL(
+iViewCommandHandle->ExecuteCommandL(
-				EPhoneViewActivateAppViewConventional,
+EPhoneViewActivateAppViewConventional,
-				phoneCommandParam );
+phoneCommandParam );
 // Continue displaying current app but set up the
 // idle screen in the background
 SetupIdleScreenInBackgroundL();
 }
 }
 CleanupStack::PopAndDestroy( appParam );
 return valuesFetched;
-	}
+}
 // -----------------------------------------------------------
 // CPhoneStateIdle::NumberForSpeedDialLocationL
 // -----------------------------------------------------------
 //

changeset 21	92ab7f8d0eab
parent 4	c84cf270c54f
child 22	6bb1b21d2484