diff -r 2a26698d78ba -r 38529f706030 phoneapp/phoneuicontrol/src/cphonecbamanager.cpp --- a/phoneapp/phoneuicontrol/src/cphonecbamanager.cpp Mon Mar 15 12:40:24 2010 +0200 +++ b/phoneapp/phoneuicontrol/src/cphonecbamanager.cpp Wed Mar 31 21:30:06 2010 +0300 @@ -38,6 +38,7 @@ #include "tphonecmdparamboolean.h" #include "tphonecmdparaminteger.h" #include "tphonecmdparamcallstatedata.h" +#include "mphonesecuritymodeobserver.h" // ======== MEMBER FUNCTIONS ======== @@ -115,6 +116,7 @@ EPEBTAudioAccessory ); // Call setup cases + if ( EPhoneCallHandlingCallSetupCBA == aResource ) { if ( !FeatureManager::FeatureSupported( KFeatureIdTouchCallHandling) ) @@ -249,10 +251,16 @@ &softRejectParam ); TInt incomingCbaResourceId; + + TBool securityMode = iStateMachine.SecurityMode()->IsSecurityMode(); if ( iState->IsSwivelClosed() ) { - if ( !callIsAlerting || iRingtoneSilenced ) + if ( securityMode ) + { + incomingCbaResourceId = EPhoneCallHandlingIncomingSilentSliderCBA; + } + else if ( !callIsAlerting || iRingtoneSilenced ) { incomingCbaResourceId = EPhoneCallHandlingIncomingSilentSwivelClosedCBA; } @@ -264,7 +272,12 @@ else if ( coverHideSendEndKey ) { - if ( callIsAlerting ) + if ( securityMode ) + { + // Set CBA to Options..Reject + incomingCbaResourceId = EPhoneCallHandlingIncomingSilentSliderCBA; + } + else if ( callIsAlerting ) { // Set CBA to Options..Silence incomingCbaResourceId = EPhoneCallHandlingIncomingSliderCBA; @@ -283,7 +296,11 @@ else { - if ( callIsAlerting ) + if ( securityMode ) + { + incomingCbaResourceId = EPhoneCallHandlingIncomingRejectCBA; + } + else if ( callIsAlerting ) { incomingCbaResourceId = GetIncomingCallSilenceCBA( softRejectActivated ); } @@ -443,7 +460,11 @@ touchpaneButtonsParam.SetInteger( CPhoneMainResourceResolver::Instance()-> ResolveResourceID( EPhoneIncomingCallButtons ) ); - if ( touchpaneButtonsParam.Integer() + if ( iStateMachine.SecurityMode()->IsSecurityMode() ) + { + ret = EPhoneCallHandlingIncomingRejectCBA; + } + else if ( touchpaneButtonsParam.Integer() == R_PHONEUI_INCOMING_CALL_SILENCE_BUTTONS ) { aSoftRejectActivated ?