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

equal deleted inserted replaced

-:c84cf270c54f
+:8871b09be73b
 #include "cphonepubsubproxy.h"
 #include "phonelogger.h"
 #include "phoneui.pan"
 #include "phoneconstants.h"
 #include "mphonecustomization.h"
+#include <easydialingcommands.hrh>
 //CONSTANTS
 const TInt  KMaxParamLength = 1024;
 // ================= MEMBER FUNCTIONS =======================
 #ifdef RD_INTELLIGENT_TEXT_INPUT
 case EKeyEnter:
 if ( IsNumberEntryVisibleL() )
 {
-HandleCommandL( EPhoneCmdOptions );
+if ( IsDialingExtensionInFocusL() )
+{
+HandleCommandL( EEasyDialingEnterKeyAction );
+}
+else
+{
+HandleCommandL( EPhoneCmdOptions );
+}
 }
 break;
 #endif
 default:
 case EPhoneCmdOptions:
 {
 // Open number entry menubar
 TPhoneCmdParamInteger integerParam;
-integerParam.SetInteger(
+TInt menuId( GetNumberAcqMenuIdL() );
-CPhoneMainResourceResolver::Instance()->
+integerParam.SetInteger( menuId );
-ResolveResourceID( EPhoneNumberAcqMenubar ) );
 iViewCommandHandle->ExecuteCommandL(
 EPhoneViewMenuBarOpen, &integerParam );
 break;
 }
 DialVideoCallL();
 break;
 case EPhoneCmdBack:
 HandleBackCommandL();
 break;
+case EPhoneViewOpenNumberEntry:
+BeginTransEffectLC( ENumberEntryCreate );
+commandStatus = CPhoneState::HandleCommandL( aCommand );
+EndTransEffect();
+break;
 default:
 commandStatus = CPhoneState::HandleCommandL( aCommand );
 break;
 }
 // -----------------------------------------------------------
 //
 void CPhoneStateIdle::HandleBackCommandL()
 {
 TBool previousApp(EFalse);
 // If previous app activation is true then open
 // previous application.
 if ( iOnScreenDialer &&
 IsSimOk() )
 {
 TPhoneCmdParamBoolean booleanParam;
 iViewCommandHandle->ExecuteCommandL(
 EPhoneViewGetActivatePreviousApp, &booleanParam );
 if ( booleanParam.Boolean() )
 {
 // Open previous app.
 iViewCommandHandle->ExecuteCommandL(
 EPhoneViewActivatePreviousApp );
+BeginTransEffectLC( ENumberEntryClose );
 // Remove number entry from screen
 iViewCommandHandle->ExecuteCommandL(
 EPhoneViewRemoveNumberEntry );
+EndTransEffect();
 iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateFSW );
 previousApp = ETrue;
 }
 }
 if ( !previousApp )
 {
+BeginTransEffectLC( ENumberEntryClose );
 // Remove number entry from screen
 iViewCommandHandle->ExecuteCommandL(
 EPhoneViewRemoveNumberEntry );
+EndTransEffect();
 // Do state-specific operation when number entry is cleared
 HandleNumberEntryClearedL();
 }
 }
 // -----------------------------------------------------------
 // CPhoneStateIdle::DialVideoCallL
 // -----------------------------------------------------------
 HandleNumberEntryClearedL();
 }
 else if ( !TopAppIsDisplayedL() )
 {
 // Phone might not be the topmost app since it has
-// some dialog/query open therefore we need to check this
+// some dialog/query open therefore we need to remove dialog/phone.
-// and remove dialog/phone.
-if ( IsAnyQueryActiveL()  )
+if ( !IsSimStateNotPresentWithSecurityModeEnabled() )
 {
-if ( !IsSimStateNotPresentWithSecurityModeEnabled() )
+iViewCommandHandle->ExecuteCommandL( EPhoneViewRemovePhoneDialogs );
-{
+}
-iViewCommandHandle->ExecuteCommandL( EPhoneViewRemovePhoneDialogs );
+// Remove number entry from screen
-}
+iViewCommandHandle->ExecuteCommandL(
+EPhoneViewRemoveNumberEntry );
-// Remove number entry from screen
+// Bring Idle app to the foreground
-iViewCommandHandle->ExecuteCommandL(
-EPhoneViewRemoveNumberEntry );
-}
-			    // Bring Idle app to the foreground
 iViewCommandHandle->ExecuteCommandL( EPhoneViewBringIdleToForeground );
+// Updates Task list
+iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateFSW );
 }
 }
 else if ( IsNumberEntryUsedL() )
 {
 // Remove number entry from screen
 // -----------------------------------------------------------------------------
 // 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;
+TBool isValidAppLaunchingKeyEvent = ETrue;
-iViewCommandHandle->ExecuteCommandL( EPhoneViewGetNumberEntryCount,
-&numberEntryCount );
+// By-pass checking of number entry length in case of #-character.
+// #-character is handled differently from other keys, and number
-TBool isValidAppLaunchingKeyEvent = EFalse;
+// entry length has been checked earlier. Checking number entry length
-if ( iCustomization && iCustomization->AllowAlphaNumericMode() &&
+// for #-character is difficult here, because we cannot know if FEP
-TKeyCode( KPhoneDtmfHashCharacter ) == aCode )
+// has removed the long-# from number entry or not.
-{
+if ( TKeyCode( KPhoneDtmfHashCharacter ) != aCode )
-// If alphanumeric mode is supported FEP changes text input mode with
+{
-// long hash and removes hash from number entry.
+TPhoneCmdParamInteger numberEntryCount;
-isValidAppLaunchingKeyEvent = ( numberEntryCount.Integer() == 0 );
+iViewCommandHandle->ExecuteCommandL( EPhoneViewGetNumberEntryCount,
-}
+&numberEntryCount );
-else
-{
 isValidAppLaunchingKeyEvent = ( numberEntryCount.Integer() == 1 );
 }
 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
 // -----------------------------------------------------------
 //
 SendExitCommandL();
 }
 else
 #endif // _DEBUG
 {
-if ( IsSpeedDialNumber( *phoneNumber ) )
+if ( IsDialingExtensionInFocusL() )
+{
+CPhoneState::HandleCommandL( EEasyDialingVoiceCall );
+}
+else if ( IsSpeedDialNumber( *phoneNumber ) )
 {
 // Handle speed dial
 SpeedDialL( (*phoneNumber)[0], aSendKey ? EDialMethodSendCommand : EDialMethodMenuSelection );
 }
 else
 CleanupStack::PopAndDestroy( phoneNumber );
 }
 }
 }
+// -----------------------------------------------------------
+// CPhoneStateIdle::HandleVoiceCallCommandL()
+// -----------------------------------------------------------
+//
+TInt CPhoneStateIdle::GetNumberAcqMenuIdL()
+{
+TInt menuId = CPhoneMainResourceResolver::Instance()->
+ResolveResourceID( EPhoneNumberAcqMenubar );
+// Use easy dialing menu id, if easydialing is in focus.
+// Otherwise use number acquisition menu id.
+if ( IsDialingExtensionInFocusL() )
+{
+// Fetch easydialing menu id, check its validity and assign to menuId
+TPhoneCmdParamInteger integerParam;
+iViewCommandHandle->ExecuteCommandL(
+EPhoneViewGetEasyDialingMenuId, &integerParam );
+if ( integerParam.Integer() )
+{
+menuId = integerParam.Integer();
+}
+}
+return menuId;
+}
 // End of File

branch	RCL_3
changeset 3	8871b09be73b
parent 2	c84cf270c54f
child 4	24062c24fe38