--- a/phoneapp/phoneuicontrol/src/cphonecbamanager.cpp	Thu Aug 19 09:54:27 2010 +0300
+++ b/phoneapp/phoneuicontrol/src/cphonecbamanager.cpp	Tue Aug 31 15:14:29 2010 +0300
@@ -22,7 +22,6 @@
 #include "mphonestatemachine.h"
 
 #include <featmgr.h>
-#include <callhandlingui.rsg>
 
 #include "phonerssbase.h"
 #include "phoneui.pan"
@@ -38,7 +37,7 @@
 #include "tphonecmdparamboolean.h"
 #include "tphonecmdparaminteger.h"
 #include "tphonecmdparamcallstatedata.h"
-#include "mphonesecuritymodeobserver.h"
+#include "tphonecmdparamboolean.h"
 
 
 // ======== MEMBER FUNCTIONS ========
@@ -114,9 +113,17 @@
 
     TBool btAvailable = iStateMachine.PhoneEngineInfo()->AudioOutputAvailable(
         EPEBTAudioAccessory );
+    
+    TPhoneCmdParamBoolean btParam;
+    btParam.SetBoolean( audioOutput == EPEBTAudioAccessory );        
+    iViewCommandHandle.ExecuteCommand(EPhoneViewSetBlueToothFlag,&btParam);
 
+    TPhoneCmdParamBoolean btAvailableParam;
+    btAvailableParam.SetBoolean( btAvailable );        
+    iViewCommandHandle.ExecuteCommand(
+            EPhoneViewSetBluetoothAvailableFlag,&btAvailableParam);
+    
     // Call setup cases
-    
     if ( EPhoneCallHandlingCallSetupCBA == aResource )
         {
         if ( !FeatureManager::FeatureSupported( KFeatureIdTouchCallHandling) )
@@ -133,7 +140,7 @@
         }
 
     // Is numberentry visible
-    else if ( iState->IsNumberEntryUsedL() && iState->IsNumberEntryVisibleL() )
+    else if ( iState->IsNumberEntryUsedL() )
         {
         if ( iState->IsAutoLockOn() || !(iState->IsSimOk()) )
             {
@@ -141,13 +148,35 @@
             }
         else
             {
-            resourceId = GetNumberEntryCbaIdL();
+            TPhoneCmdParamInteger activeCallCount;
+            iViewCommandHandle.ExecuteCommandL(
+                    EPhoneViewGetCountOfActiveCalls, &activeCallCount );
+            
+            TPhoneCmdParamCallStateData callStateData;
+            callStateData.SetCallState( EPEStateRinging );
+            iViewCommandHandle.HandleCommandL(
+                    EPhoneViewGetCallIdByState, &callStateData );
+            
+            TInt incomingCall = callStateData.CallId();
+
+            if( activeCallCount.Integer() == ENoActiveCalls )
+                {
+                resourceId = EPhoneNumberAcqCBA;
+                }
+            else if ( activeCallCount.Integer() > ENoActiveCalls &&  
+                      incomingCall > KErrNotFound )
+                {
+                resourceId = EPhoneCallHandlingCallWaitingCBA;
+                }
+            else
+                {
+                resourceId = EPhoneInCallNumberAcqCBA;
+                }
             }
         }
 
-    // Check if Audio is muted
-    else if ( iStateMachine.PhoneEngineInfo()->AudioMute() &&
-        !FeatureManager::FeatureSupported( KFeatureIdTouchCallHandling ))
+    // Check is Audio muted
+    else if ( iStateMachine.PhoneEngineInfo()->AudioMute() )
         {
         resourceId = EPhoneCallHandlingInCallUnmuteCBA;
         }
@@ -241,26 +270,16 @@
     TBool softRejectActivated( ETrue );
     // VoIP calls do not support sms sending
     if ( iStateMachine.PhoneEngineInfo()->CallType( aCallId ) == EPECallTypeVoIP 
-    	|| iStateMachine.PhoneEngineInfo()->RemotePhoneNumber( aCallId ).Length() == 0 )
-    	{
-    	softRejectActivated = EFalse;
-    	}
-    TPhoneCmdParamBoolean softRejectParam;
-    softRejectParam.SetBoolean( softRejectActivated );
-    iViewCommandHandle.ExecuteCommandL( EPhoneViewSetSoftRejectFlag,
-        &softRejectParam );
+        || iStateMachine.PhoneEngineInfo()->RemotePhoneNumber( aCallId ).Length() == 0 )
+        {
+        softRejectActivated = EFalse;
+        }
 
     TInt incomingCbaResourceId;
-    
-    TBool securityMode = iStateMachine.SecurityMode()->IsSecurityMode();
 
     if ( iState->IsSwivelClosed() )
         {
-        if ( securityMode )
-        	{
-        	incomingCbaResourceId = EPhoneCallHandlingIncomingSilentSliderCBA;
-        	}
-        else if ( !callIsAlerting || iRingtoneSilenced )
+        if ( !callIsAlerting || iRingtoneSilenced )
             {
             incomingCbaResourceId = EPhoneCallHandlingIncomingSilentSwivelClosedCBA;
             }
@@ -272,12 +291,7 @@
 
     else if ( coverHideSendEndKey )
         {
-        if ( securityMode )
-        	{
-        	// Set CBA to Options..Reject
-        	incomingCbaResourceId = EPhoneCallHandlingIncomingSilentSliderCBA;
-        	}
-        else if ( callIsAlerting )
+        if ( callIsAlerting )
             {
             // Set CBA to Options..Silence
             incomingCbaResourceId = EPhoneCallHandlingIncomingSliderCBA;
@@ -296,15 +310,7 @@
 
     else
         {
-        if ( securityMode && callIsAlerting )
-            {
-            incomingCbaResourceId = GetIncomingCallSilenceCBA( softRejectActivated );
-            }
-        else if ( securityMode )
-            {
-            incomingCbaResourceId = EPhoneCallHandlingIncomingRejectCBA;
-            }
-        else if ( callIsAlerting )
+        if ( callIsAlerting )
             {
             incomingCbaResourceId = GetIncomingCallSilenceCBA( softRejectActivated );
             }
@@ -334,18 +340,9 @@
             "CPhoneCbaManager::SetCbaL : %d",aResource );
 
     TPhoneCmdParamInteger integerParam;
-    
-    if ( EPhoneEasyDialingCba == aResource )
-        {
-        iViewCommandHandle.ExecuteCommandL( EPhoneViewGetEasyDialingCbaId, &integerParam );
-        }
-    else
-        {
-        integerParam.SetInteger(
-            CPhoneMainResourceResolver::Instance()->ResolveResourceID(
-            aResource ) );
-        }
-
+    integerParam.SetInteger(
+        CPhoneMainResourceResolver::Instance()->ResolveResourceID(
+        aResource ) );
     iViewCommandHandle.ExecuteCommandL( EPhoneViewUpdateCba,
         &integerParam );
     }
@@ -454,90 +451,10 @@
 // -----------------------------------------------------------
 //
 TInt CPhoneCbaManager::GetIncomingCallSilenceCBA( 
-        const TBool aSoftRejectActivated )
+        const TBool /*aSoftRejectActivated*/ )
     {
     __LOGMETHODSTARTEND(EPhoneControl, "CPhoneCbaManager::GetIncomingCallSilenceCBA ()" );
-    TInt ret = EPhoneCallHandlingIncomingSoftRejectCBA;
-    
-    //Get incoming call touchpane button set
-    TPhoneCmdParamInteger touchpaneButtonsParam;
-    touchpaneButtonsParam.SetInteger( CPhoneMainResourceResolver::Instance()->
-                             ResolveResourceID( EPhoneIncomingCallButtons ) );
-
-    if ( iStateMachine.SecurityMode()->IsSecurityMode() )
-        {
-        ret = EPhoneCallHandlingIncomingCBA;
-        }
-    else if ( touchpaneButtonsParam.Integer() 
-         == R_PHONEUI_INCOMING_CALL_SILENCE_BUTTONS )
-        {
-        aSoftRejectActivated ? 
-        ret = EPhoneCallHandlingIncomingSoftRejectCBA:
-        ret = EPhoneCallHandlingIncomingRejectCBA;
-        }
-    else
-        {
-        // Check if the ringtone has been silenced. If it is, then show
-        // "Send Message" in RSK, else show "Silence".
-        iRingtoneSilenced ?
-            ret = EPhoneCallHandlingIncomingSoftRejectCBA :
-            ret = EPhoneCallHandlingIncomingCBA;
-        }
-
-    // reset the iRingtoneSilence so it won't cause any problems with
-    // next calls.
-    SetRingtoneSilencedStatus( EFalse );
-
-    return ret;
-    }
-
-// -----------------------------------------------------------
-// CPhoneCbaManager::GetNumberEntryCbaIdL
-// -----------------------------------------------------------
-//
-TInt CPhoneCbaManager::GetNumberEntryCbaIdL()
-    {
-    TInt ret( EPhoneNumberAcqCBA );
-    
-    if ( iState->IsDialingExtensionInFocusL() )
-        {
-        ret = EPhoneEasyDialingCba;
-        }
-    else
-        {
-        TBool dtmfEditorVisible = iViewCommandHandle.HandleCommandL(
-                EPhoneViewIsDTMFEditorVisible ) ==
-                EPhoneViewResponseSuccess;
-        TPhoneCmdParamInteger activeCallCount;
-        iViewCommandHandle.ExecuteCommandL(
-                EPhoneViewGetCountOfActiveCalls, &activeCallCount );
-
-        TPhoneCmdParamCallStateData callStateData;
-        callStateData.SetCallState( EPEStateRinging );
-        iViewCommandHandle.HandleCommandL(
-                EPhoneViewGetCallIdByState, &callStateData );
-
-        TInt incomingCall = callStateData.CallId();
-
-        if( dtmfEditorVisible )
-            {
-            ret = EPhoneDtmfDialerCBA;
-            }                    
-        else if( activeCallCount.Integer() == ENoActiveCalls )
-            {
-            ret = EPhoneNumberAcqCBA;
-            }
-        else if ( activeCallCount.Integer() > ENoActiveCalls &&  
-                incomingCall > KErrNotFound )
-            {
-            ret = EPhoneCallHandlingCallWaitingCBA;
-            }
-        else
-            {
-            ret = EPhoneInCallNumberAcqCBA;
-            }
-        }
-    
+    TInt ret = EPhoneCallHandlingIncomingCBA;
     return ret;
     }