MCL/sf/app/phone: comparison phoneapp/phoneuicontrol/src/cphonestate.cpp

equal deleted inserted replaced

-:5266b1f337bd
+:8baf28733c3d
 #include <videotelcontrolmediatorapi.h>
 #include <textresolver.h>
 #include <phoneappvoipcommands.hrh>
 #include <hwrmdomainpskeys.h>
 #include <hal.h>
+#include <phoneui.rsg>
 #include "phoneui.pan"
 #include "cphonestate.h"
 #include "mphonestatemachine.h"
 #include "mphoneviewcommandhandle.h"
 #include "tphonecmdparamcallstatedata.h"
 #include "tphonecmdparambitmap.h"
 #include "tphonecmdparamaudiooutput.h"
 #include "tphonecmdparamaudioavailability.h"
 #include "tphonecmdparamappinfo.h"
-#include "tphonecmdparamtranseffect.h"
 #include "tphonecmdparamringtone.h"
 #include "tphonecmdparamcustomdialer.h"
 #include "cphonekeys.h"
 #include "phoneui.hrh"
 #include "phonerssbase.h"
 delete iAlsLineChangeKeyPressTimer;
 }
 delete iNumberEntryManager;
 delete iCallHeaderManager;
 delete iCbaManager;
+delete iTransitionHandler;
 }
 // <-------------------------- PHONE ENGINE EVENTS --------------------------->
 // -----------------------------------------------------------
 {
 case EPhoneEmergencyCmdExit:
 // this should be bypasses?
 case EPhoneDialerCallHandling:
 case EPhoneCmdBack:
-CloseClearNumberEntryAndLoadEffectL( ECallUiAppear );
+CloseClearNumberEntryAndLoadEffectL( EPhoneTransEffectCallUiAppear );
 break;
 case EPhoneDialerCmdTouchInput:
 OpenVkbL();
 break;
 // Call the number
 iStateMachine->PhoneEngineInfo()->SetPhoneNumber( *phoneNumber );
 if ( phoneNumber->Des().Length() < KPhoneValidPhoneNumberLength )
 {
-CloseClearNumberEntryAndLoadEffectL( ECallUiAppear );
+CloseClearNumberEntryAndLoadEffectL( EPhoneTransEffectCallUiAppear );
 }
 CleanupStack::PopAndDestroy( phoneNumber );
 if ( !iCustomization ||
 EXPORT_C void CPhoneState::UpdateSingleActiveCallL( TInt aCallId )
 {
 __LOGMETHODSTARTEND(EPhoneControl, "CPhoneState::UpdateSingleActiveCallL( ) ");
 // Stop capturing keys
 CaptureKeysDuringCallNotificationL( EFalse );
-BeginUiUpdateLC();
+TransitionHandlerL().BeginUiUpdateLC();
 SetTouchPaneButtonEnabled( EPhoneInCallCmdHold );
 // Update call state
 TPhoneCmdParamCallHeaderData callHeaderParam;
 if ( callDuration )
 {
 HandleChangedCallDurationL( aCallId );
 }
-EndUiUpdate();
+TransitionHandlerL().EndUiUpdate();
 // Go to current state implementation
 iCbaManager->UpdateInCallCbaL();
 //Update state of switch to video or voice call touch button.
 }
 // Show number busy note
 TPhoneCmdParamGlobalNote globalNoteParam;
 globalNoteParam.SetType( EAknGlobalInformationNote );
-globalNoteParam.SetTextResourceId(
-CPhoneMainResourceResolver::Instance()->
+if ( CPhoneCenRepProxy::Instance()->
-ResolveResourceID( resource ) );
+IsTelephonyFeatureSupported( KTelephonyLVFlagClearCodeCustomization ) )
+{
+		// Show varied Number busy -note when clear code customization
+		// is enabled
+globalNoteParam.SetTextResourceId( R_NOTE_VAR_CAUSE_17 );
+}
+else
+{
+globalNoteParam.SetTextResourceId(
+CPhoneMainResourceResolver::Instance()->
+ResolveResourceID( resource ) );
+}
 globalNoteParam.SetTone( EAvkonSIDInformationTone );
 iViewCommandHandle->ExecuteCommandL( EPhoneViewShowGlobalNote,
 &globalNoteParam );
 }
 //
 EXPORT_C void CPhoneState::SetTouchPaneButtons( TInt aResourceId )
 {
 if ( FeatureManager::FeatureSupported( KFeatureIdTouchCallHandling ) )
 {
-// Display Video Share button instead of Hold Button if
-// the feature is enabled and video sharing is currently available.
-if ( aResourceId == EPhoneIncallButtons &&
-FeatureManager::FeatureSupported( KFeatureIdFfEntryPointForVideoShare ) &&
-CPhonePubSubProxy::Instance()->Value
-( KPSUidCoreApplicationUIs, KCoreAppUIsVideoSharingIndicator )
-== ECoreAppUIsVideoSharingIndicatorOn )
-{
-aResourceId = EPhoneIncallVideoShareButtons;
-}
 TPhoneCmdParamInteger integerParam;
 integerParam.SetInteger( CPhoneMainResourceResolver::Instance()->
 ResolveResourceID( aResourceId ) );
 TRAP_IGNORE( iViewCommandHandle->ExecuteCommandL(
 EPhoneViewSetTouchPaneButtons,
 __LOGMETHODSTARTEND( EPhoneControl, "CPhoneState::OpenVKB() ");
 iViewCommandHandle->ExecuteCommandL( EPhoneViewOpenVirtualKeyBoard );
 }
 // -----------------------------------------------------------
-// CPhoneState::BeginUiUpdateLC
-// -----------------------------------------------------------
-//
-EXPORT_C void CPhoneState::BeginUiUpdateLC()
-{
-iViewCommandHandle->ExecuteCommand( EPhoneViewBeginUpdate );
-TCleanupItem operation( UiUpdateCleanup, this );
-CleanupStack::PushL( operation );
-}
-// -----------------------------------------------------------
-// CPhoneState::EndUiUpdate
-// -----------------------------------------------------------
-//
-EXPORT_C void CPhoneState::EndUiUpdate()
-{
-CleanupStack::PopAndDestroy(); // Call UiUpdateCleanup
-}
-// -----------------------------------------------------------
-// CPhoneState::BeginTransEffectLC
-// -----------------------------------------------------------
-//
-EXPORT_C void CPhoneState::BeginTransEffectLC( TStateTransEffectType aType )
-{
-__LOGMETHODSTARTEND( EPhoneControl, "CPhoneState::BeginTransEffectLC( ) ");
-TPhoneCmdParamTransEffect effectParam;
-switch ( aType )
-{
-case ENumberEntryOpen:
-effectParam.SetType( EPhoneTransEffectDialerOpen );
-break;
-case ENumberEntryClose:
-effectParam.SetType( EPhoneTransEffectDialerClose );
-break;
-case ENumberEntryCreate:
-effectParam.SetType( EPhoneTransEffectDialerCreate );
-break;
-case ECallUiAppear:
-effectParam.SetType( EPhoneTransEffectCallUiAppear );
-break;
-case ECallUiDisappear:
-effectParam.SetType( EPhoneTransEffectCallUiDisappear );
-break;
-default:
-effectParam.SetType( EPhoneTransEffectNone );
-}
-effectParam.SetAppUid( KUidPhoneApplication );
-iViewCommandHandle->ExecuteCommand(
-EPhoneViewBeginTransEffect,
-&effectParam );
-// Always put the cleanup item into stack as expected by the caller.
-TCleanupItem operation( EffectCleanup, this );
-CleanupStack::PushL( operation );
-}
-// -----------------------------------------------------------
-// CPhoneState::EndTransEffect
-// -----------------------------------------------------------
-//
-EXPORT_C void CPhoneState::EndTransEffect()
-{
-CleanupStack::PopAndDestroy(); // Call EffectCleanup
-}
-// -----------------------------------------------------------
 // CPhoneState::CheckIfShowTerminationNote
 // This method is intended to be overridden in states
 // that contain more info about decision.
 // -----------------------------------------------------------
 //
 {
 SendDtmfKeyEventL( aKeyEvent, aEventCode );
 }
 // -----------------------------------------------------------------------------
-// CPhoneState::UiUpdateCleanup
-// -----------------------------------------------------------------------------
-//
-void CPhoneState::UiUpdateCleanup(TAny* aThis )
-{
-static_cast<CPhoneState*>( aThis )->iViewCommandHandle->ExecuteCommand(
-EPhoneViewEndUpdate );
-}
-// -----------------------------------------------------------------------------
-// CPhoneState::EffectCleanup
-// -----------------------------------------------------------------------------
-//
-void CPhoneState::EffectCleanup(TAny* aThis )
-{
-TPhoneCmdParamTransEffect effectParam;
-effectParam.SetType( EPhoneTransEffectStop );
-// won't do anything if effect wasn't started
-static_cast<CPhoneState*>( aThis )->iViewCommandHandle->ExecuteCommand(
-EPhoneViewEndTransEffect, &effectParam );
-}
-// -----------------------------------------------------------------------------
 // CPhoneState::IsDTMFEditorVisibleL
 // -----------------------------------------------------------------------------
 //
 EXPORT_C TBool CPhoneState::IsDTMFEditorVisibleL() const
 {
 TPhoneCmdParamBoolean booleanParam;
 booleanParam.SetBoolean( EFalse );
 iViewCommandHandle->ExecuteCommandL(
 EPhoneViewSetDtmfDialerViewVisible,
 &booleanParam );
-CloseClearNumberEntryAndLoadEffectL( ECallUiAppear );
+CloseClearNumberEntryAndLoadEffectL( EPhoneTransEffectCallUiAppear );
 }
 else // Non-Touch
 {
 // If dtmf query is visible then remove number entry
 // because it should not be shown if user has pressed end key.
 	    CleanupStack::PopAndDestroy( buf );
 }
 }
 // -----------------------------------------------------------
+// CPhoneState::TransitionHandlerL
+// -----------------------------------------------------------
+//
+EXPORT_C TPhoneTransitionHandler& CPhoneState::TransitionHandlerL()
+{
+__LOGMETHODSTARTEND( EPhoneControl, "CPhoneState::TransitionHandlerL() ");
+if ( !iTransitionHandler )
+{
+iTransitionHandler = new (ELeave)TPhoneTransitionHandler(
+*this, *iViewCommandHandle );
+}
+return *iTransitionHandler;
+}
+// -----------------------------------------------------------
 // CPhoneState::CallheaderManagerL
 // -----------------------------------------------------------
 //
 CPhoneCallHeaderManager* CPhoneState::CallheaderManagerL()
 {
 EXPORT_C void CPhoneState::CloseCustomizedDialerL()
 {
 __LOGMETHODSTARTEND(EPhoneControl, "CPhoneState::CloseCustomizedDialerL( ) ");
 // Set dialer back to default mode.
 iViewCommandHandle->HandleCommandL( EPhoneViewHideCustomizedDialer );
-CloseClearNumberEntryAndLoadEffectL( ENumberEntryClose );
+CloseClearNumberEntryAndLoadEffectL( EPhoneTransEffectPhoneUiClose );
 }
 // -----------------------------------------------------------------------------
 // CPhoneState::CustomizedDialerMenuResourceId
 // -----------------------------------------------------------------------------
 // Set dialer to DTMF mode.
 TPhoneCmdParamBoolean booleanParam;
 booleanParam.SetBoolean( ETrue );
 iViewCommandHandle->ExecuteCommandL( EPhoneViewSetDtmfDialerViewVisible,
 &booleanParam );
-BeginTransEffectLC( ECallUiDisappear );
+TransitionHandlerL().
+BeginTransEffectLC( EPhoneTransEffectCallUiDisappear );
 if ( IsNumberEntryUsedL() )
 {
 // Store the number entry content to cache
 if ( !IsNumberEntryContentStored() )
 {
 else
 {
 // Create and display DTMF dialer
 NumberEntryManagerL()->CreateNumberEntryL();
 }
-EndTransEffect();
+TransitionHandlerL().EndTransEffect();
 // Update CBA
 iCbaManager->UpdateInCallCbaL();
 if( EPSCTsyCallStateDialling ==
 // -----------------------------------------------------------
 //
 EXPORT_C void CPhoneState::DisplayCallSetupL( TInt aCallId )
 {
 __LOGMETHODSTARTEND( EPhoneControl, "CPhoneState::DisplayCallSetupL() ");
-BeginTransEffectLC( ECallUiAppear );
+TransitionHandlerL().BeginTransEffectLC( EPhoneTransEffectCallUiAppear );
-BeginUiUpdateLC();
+TransitionHandlerL().BeginUiUpdateLC();
 SetNumberEntryVisibilityL( EFalse );
 CaptureKeysDuringCallNotificationL( ETrue );
 iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemovePhoneDialogs );
 TPhoneCmdParamInteger uidParam;
 iViewCommandHandle->ExecuteCommandL( EPhoneViewBringAppToForeground,
 &uidParam );
 // Do state-specific operations.
 DoStateSpecificCallSetUpDefinitionsL();
 DisplayHeaderForOutgoingCallL(aCallId);
-EndUiUpdate();
+TransitionHandlerL().EndUiUpdateAndEffect();
-EndTransEffect();
 iCbaManager->UpdateCbaL(EPhoneCallHandlingCallSetupCBA);
 }
 // -----------------------------------------------------------
 // Sends command to viewcontroller to store the flag
 // -----------------------------------------------------------
 // CPhoneState::CloseClearNumberEntryAndLoadEffect
 // -----------------------------------------------------------
 //
 EXPORT_C void CPhoneState::CloseClearNumberEntryAndLoadEffectL(
-TStateTransEffectType aType )
+TPhoneTransEffectType aType )
 {
 __LOGMETHODSTARTEND( EPhoneControl,
 "CPhoneState::CloseClearNumberEntryAndLoadEffectL() ");
-BeginTransEffectLC( aType );
+TransitionHandlerL().BeginTransEffectLC( aType );
 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry );
-EndTransEffect();
+TransitionHandlerL().EndTransEffect();
 // Do state-specific operation when number entry is cleared
 HandleNumberEntryClearedL();
 }
 //  End of File

branch	RCL_3
changeset 26	8baf28733c3d
parent 25	5266b1f337bd