diff -r bc5a64e5bc3c -r 5bcb308bd24d phoneapp/phoneuivoipextension/src/cphoneunattendedtransfercmdhandler.cpp --- a/phoneapp/phoneuivoipextension/src/cphoneunattendedtransfercmdhandler.cpp Tue Jul 06 14:15:47 2010 +0300 +++ b/phoneapp/phoneuivoipextension/src/cphoneunattendedtransfercmdhandler.cpp Wed Aug 18 09:48:26 2010 +0300 @@ -160,66 +160,7 @@ { __LOGMETHODSTARTEND( PhoneUIVoIPExtension, "CPhoneUnattendedTransferCmdHandler::ShowTransferDialerL" ) - - CPhoneState* phoneState = static_cast( iStateMachine.State() ); - if ( FeatureManager::FeatureSupported( KFeatureIdOnScreenDialer ) ) - { - TPhoneCmdParamCustomDialer customDialerParam; - customDialerParam.SetDialerController( iTransferDialerController ); - - // Set dialer to transfer mode. - iViewCommandHandle.ExecuteCommandL( - EPhoneViewShowCustomizedDialer, - &customDialerParam ); - - // Open transfer dialer - phoneState->BeginTransEffectLC( ENumberEntryCreate ); - iViewCommandHandle.ExecuteCommandL( EPhoneViewCreateNumberEntry ); - phoneState->EndTransEffect(); - - // Update CBA to transfer dialer CBA - TPhoneCmdParamInteger resourceId; - resourceId.SetInteger( CPhoneMainResourceResolver::Instance()-> - ResolveResourceID( iTransferDialerController->CbaResourceId() ) ); - iViewCommandHandle.ExecuteCommandL( EPhoneViewUpdateCba, - &resourceId ); - } - else - { - HBufC *text = HBufC::NewLC( KPhoneNumberEntryBufferSize ); - TPtr ptr( text->Des() ); - // Pre-populate the query with the number entry contents, if it exists - if ( phoneState->IsNumberEntryUsedL() ) - { - // get the number entry contents - TPhoneCmdParamString stringParam; - stringParam.SetString( &ptr ); - iViewCommandHandle.ExecuteCommandL( - EPhoneViewGetLocalizedNumberFromEntry, - &stringParam ); - } - - TPhoneCmdParamQuery queryDialogParam; - queryDialogParam.SetQueryType( EPhoneGenericTextQuery ); - queryDialogParam.SetQueryResourceId( - CPhoneMainResourceResolver::Instance()-> - ResolveResourceID( EPhoneVoIPTransferAddressQuery ) ); - - queryDialogParam.SetDefaultCba( CPhoneMainResourceResolver::Instance()-> - ResolveResourceID( EPhoneVoIPTransferAddressQueryEmptySoftkeys ) ); - - queryDialogParam.SetContentCba( CPhoneMainResourceResolver::Instance()-> - ResolveResourceID( EPhoneVoIPTransferAddressQueryNotEmptySoftkeys ) ); - - queryDialogParam.SetDataText( &ptr ); - queryDialogParam.SetSendKeyEnabled( ETrue ); - - // Display dialog - iViewCommandHandle.ExecuteCommandL( - EPhoneViewShowQuery, &queryDialogParam ); - - CleanupStack::PopAndDestroy( text ); - } + } @@ -245,13 +186,6 @@ iViewCommandHandle.ExecuteCommand( EPhoneViewGetNumberFromEntry, &transferTarget ); - - phoneState->CloseCustomizedDialerL(); - } - else - { - iViewCommandHandle.ExecuteCommandL( - EPhoneViewGetTextQueryContent, &transferTarget ); } // Set transfer to address to the phoneengine @@ -275,7 +209,6 @@ CPhoneState* phoneState = static_cast< CPhoneState* >( iStateMachine.State() ); - phoneState->CloseCustomizedDialerL(); } @@ -292,9 +225,9 @@ TPhoneCmdParamInteger integerParam; integerParam.SetInteger( aFetchType ); - iViewCommandHandle.HandleCommandL( + /*iViewCommandHandle.HandleCommandL( EPhoneViewOpenSingleItemFetchDialog, - &integerParam ); + &integerParam );*/ } // --------------------------------------------------------------------------- @@ -305,13 +238,13 @@ { __LOGMETHODSTARTEND( PhoneUIVoIPExtension, "CPhoneUnattendedTransferCmdHandler::ShowWaitingAcceptanceNoteL" ) - // Show "Waiting acceptance..." note - TPhoneCmdParamGlobalNote globalNoteParam; - globalNoteParam.SetType( EAknGlobalWaitNote ); - globalNoteParam.SetTone( EAvkonSIDNoSound ); - globalNoteParam.SetSoftkeys( R_AVKON_SOFTKEYS_EMPTY ); - globalNoteParam.SetTextResourceId( CPhoneMainResourceResolver::Instance()-> - ResolveResourceID( EPhoneVoIPWaitingAcceptanceNote ) ); - iViewCommandHandle.ExecuteCommandL( - EPhoneViewShowGlobalNote, &globalNoteParam ); + //TODO: Show "Waiting acceptance..." note +// TPhoneCmdParamGlobalNote globalNoteParam; +// globalNoteParam.SetType( EAknGlobalWaitNote ); +// globalNoteParam.SetTone( EAvkonSIDNoSound ); +// globalNoteParam.SetSoftkeys( R_AVKON_SOFTKEYS_EMPTY ); +// globalNoteParam.SetTextResourceId( CPhoneMainResourceResolver::Instance()-> +// ResolveResourceID( EPhoneVoIPWaitingAcceptanceNote ) ); +// iViewCommandHandle.ExecuteCommandL( +// EPhoneViewShowGlobalNote, &globalNoteParam ); }