phoneapp/phoneuistates/src/cphoneconferenceandwaiting.cpp
branchRCL_3
changeset 9 91c2fb4b78df
parent 5 2a26698d78ba
child 23 40a3f856b14d
--- a/phoneapp/phoneuistates/src/cphoneconferenceandwaiting.cpp	Wed Apr 14 15:56:42 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphoneconferenceandwaiting.cpp	Tue Apr 27 16:37:10 2010 +0300
@@ -265,14 +265,6 @@
 void CPhoneConferenceAndWaiting::MakeStateTransitionToConferenceAndSingleL( TInt aCallId )
     {
     __LOGMETHODSTARTEND(EPhoneUIStates, "CPhoneConferenceAndWaiting::MakeStateTransitionToConferenceAndSingleL()");
-    
-    // Effect is shown when dialer exist.
-    TBool effectStarted ( EFalse );
-    if ( !NeedToReturnToForegroundAppL() )
-        {
-        BeginTransEffectLC( ENumberEntryOpen );
-        effectStarted = ETrue; 
-        }
         
     BeginUiUpdateLC();    
          
@@ -307,10 +299,7 @@
     SetTouchPaneButtonDisabled( EPhoneInCallCmdPrivate );
     
     EndUiUpdate();
-    if( effectStarted )
-        {
-        EndTransEffect();    
-        }
+
     // CBA updates in above if-else conditions
     iStateMachine->ChangeState( EPhoneStateConferenceAndSingle );                     
     }
@@ -335,14 +324,6 @@
     
     if( iRingingCallId == aCallId )
         {
-        // Effect is shown when dialer exist.
-        TBool effectStarted ( EFalse );
-        if ( !NeedToReturnToForegroundAppL() )
-            {
-            BeginTransEffectLC( ENumberEntryOpen );
-            effectStarted = ETrue;
-            }
-        
         BeginUiUpdateLC();    
  
         // Idle message came for waiting call            
@@ -386,11 +367,7 @@
             SetTouchPaneButtons( EPhoneConferenceButtons );    
             }
         EndUiUpdate();
-        if ( effectStarted )
-            {
-            EndTransEffect();    
-            }
-         
+
         // Go to conference state
         // CBA updates in above if-else conditions
         iStateMachine->ChangeState( EPhoneStateConference );                    
@@ -419,7 +396,6 @@
     {
     __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneConferenceAndWaiting::HandleConferenceIdleL()");
  
-    BeginTransEffectLC( ENumberEntryOpen );
     BeginUiUpdateLC();
     
     iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveConferenceBubble );
@@ -503,7 +479,6 @@
            break;            
         }
     EndUiUpdate();
-    EndTransEffect();  
     }
 
 // -----------------------------------------------------------
@@ -525,7 +500,6 @@
     __LOGMETHODSTARTEND( EPhoneUIStates, 
         "CPhoneConferenceAndWaiting::HandleDiallingL()");
     
-    BeginTransEffectLC( ENumberEntryClose );
     BeginUiUpdateLC();
     // Hide number entry if it exists
     SetNumberEntryVisibilityL(EFalse);        
@@ -536,7 +510,6 @@
     SetTouchPaneButtons( EPhoneCallSetupButtons ); 
 
     EndUiUpdate();
-    EndTransEffect();
     
     // Update conference and waiting and call setup softkeys
     UpdateCbaL( EPhoneCallHandlingCallSetupCBA );