diff -r 40a3f856b14d -r 41a7f70b3818 phoneapp/phoneuicontrol/src/cphoneaccessorybthandler.cpp --- a/phoneapp/phoneuicontrol/src/cphoneaccessorybthandler.cpp Thu Aug 19 09:54:27 2010 +0300 +++ b/phoneapp/phoneuicontrol/src/cphoneaccessorybthandler.cpp Tue Aug 31 15:14:29 2010 +0300 @@ -22,7 +22,6 @@ #include #include #include -#include #include "cphoneaccessorybthandler.h" #include "cphonecenrepproxy.h" @@ -35,8 +34,6 @@ #include "phoneui.pan" #include "phonerssbase.h" #include "tphonecmdparamnote.h" -#include "tphonecmdparamglobalnote.h" - // CONSTANTS @@ -79,31 +76,6 @@ { } -// ----------------------------------------------------------- -// CPhoneAccessoryBTHandler::SetBTDebugModeL -// Handling for message EPEMessageBTDebugMode. -// Sets BT debug mode PS key on. -// ----------------------------------------------------------- -// -void CPhoneAccessoryBTHandler::SetBTDebugModeL() - { - __LOGMETHODSTARTEND(EPhoneControl, "CPhoneAccessoryBTHandler::SetBTDebugModeL( ) "); - if ( FeatureManager::FeatureSupported( KFeatureIdOnScreenDialer ) ) - { - iViewCommandHandle->ExecuteCommandL( EPhoneViewClearNumberEntryContent ); - } - else - { - // Remove number entry from screen - iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry ); - } - iNEClearedHandler->HandleNumberEntryClearedL(); - if ( RProperty::Set( KPSUidBluetoothDutMode, KBTSspDebugmode, EBTSspDebugModeOn )) - { - __PHONELOG( EOnlyFatal, EPhoneControl, "CPhoneAccessoryBTHandler::SetBTDebugModeL PS key not defined" ); - } - } - // --------------------------------------------------------- // CPhoneAccessoryBTHandler::SetBTHandsfreeModeL // --------------------------------------------------------- @@ -238,18 +210,18 @@ // void CPhoneAccessoryBTHandler::ShowBTActivatedL() { - - TPhoneCmdParamGlobalNote globalNoteParam; - globalNoteParam.SetType( EAknGlobalInformationNote ); - globalNoteParam.SetTone( EAvkonSIDNoSound ); + // Get localised text + HBufC* buf = StringLoader::LoadLC( + CPhoneMainResourceResolver::Instance()-> + ResolveResourceID( EPhoneInfoBTAccActivated ) ); + + TPhoneCmdParamNote noteParam; + noteParam.SetType( EPhoneNoteConfirmation ); + noteParam.SetText( *buf ); - globalNoteParam.SetTextResourceId( - CPhoneMainResourceResolver::Instance()-> - ResolveResourceID( EPhoneInfoBTAccActivated ) ); - // Display note - iViewCommandHandle->ExecuteCommandL( - EPhoneViewShowGlobalNote, &globalNoteParam ); + iViewCommandHandle->ExecuteCommandL( EPhoneViewShowNote, ¬eParam ); + CleanupStack::PopAndDestroy( buf ); } // ---------------------------------------------------------