FCL/sf/app/phone: comparison phoneapp/phoneuicontrol/src/cphonestateincoming.cpp

equal deleted inserted replaced

-:40a3f856b14d
+:41a7f70b3818
 #include <eikenv.h>
 #include <featmgr.h>
 #include <StringLoader.h>
 #include <dundomainpskeys.h>
 #include <telephonyvariant.hrh>
-#include <ScreensaverInternalPSKeys.h>
 #include <mpeengineinfo.h>
 #include <MediatorDomainUIDs.h>
 #include <videotelcontrolmediatorapi.h>
 #include "cphonepubsubproxy.h"
 #include "tphonecmdparamquery.h"
 #include "cphonemediatorfactory.h"
 #include "cphonemediatorsender.h"
 #include "cphonereleasecommand.h"
 #include "mphonecustomization.h"
-#include "mphonesecuritymodeobserver.h"
+#include "mphonestorage.h"
 // ================= MEMBER FUNCTIONS =======================
 // C++ default constructor can NOT contain any code, that
 // might leave.
 {
 __LOGMETHODSTARTEND(EPhoneControl,
 "CPhoneStateIncoming::HandleNumberEntryClearedL ()" );
 // Set incoming call CBA when number entry is cleared
 iCbaManager->UpdateIncomingCbaL( iRingingCallId );
-UpdateSilenceButtonDimming();
 }
 // -----------------------------------------------------------
 // CPhoneStateIncoming::HandleKeyMessageL
 // -----------------------------------------------------------
 if ( aMessage == EPhoneKeyLongPress )
 {
 // Answer the call if long press of selection key
 AnswerCallL();
 }
-else if ( CPhoneCenRepProxy::Instance()->IsTelephonyFeatureSupported(
+break;
-KTelephonyLVFlagCoverHideSendEndKey ))
+case EKeyDeviceF:
 {
-// Open number entry OK menubar
+__PHONELOG( EBasic, EPhoneUIStates,
-OpenMenuBarL();
+"CPhoneConferenceAndSingleAndWaiting::HandleKeyMessageL-deviceF" );
+HandleHoldSwitchL();
 }
 break;
 default:
 break;
 }
 }
 iStateMachine->PhoneEngineInfo()->SetPhoneNumber( ptr );
 iStateMachine->SendPhoneEngineMessage(
 MPEPhoneModel::EPEMessagePhoneNumberEdited );
 if ( phoneNumber->Des().Length() < KPhoneValidPhoneNumberLength
-		&& iStateMachine->PhoneEngineInfo()->PhoneNumberIsServiceCode() )
+&& iStateMachine->PhoneEngineInfo()->PhoneNumberIsServiceCode() )
 {
 // Send a manual control sequence by providing number
 // information with dial command
 CPhoneState::CallFromNumberEntryL();
 }
 //
 void CPhoneStateIncoming::HandleConnectedL( TInt aCallId )
 {
 __LOGMETHODSTARTEND(EPhoneControl,
 "CPhoneStateIncoming::HandleConnectedL ()" );
 // Re-enable global notes
 TPhoneCmdParamBoolean globalNotifierParam;
 globalNotifierParam.SetBoolean( EFalse );
 iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled,
 &globalNotifierParam );
 iViewCommandHandle->ExecuteCommandL( EPhoneViewSetEikonNotifiersDisabled,
 &globalNotifierParam );
 // Stop tone playing, if necessary
 iViewCommandHandle->ExecuteCommandL( EPhoneViewStopRingTone );
+if( IsVideoCall( aCallId ) && !IsAutoLockOn() )
+{
+// For keeping video call on top
+TPhoneCmdParamBoolean booleanParam;
+booleanParam.SetBoolean( EFalse );
+iViewCommandHandle->ExecuteCommandL(
+EPhoneViewSetNeedToSendToBackgroundStatus, &booleanParam );
+}
+if( FeatureManager::FeatureSupported( KFeatureIdFfTouchUnlockStroke )
+&& iStateMachine->PhoneStorage()->IsScreenLocked() )
+{
+EnableCallUIL();
+}
+// Reset blocked keys list
+iStateMachine->PhoneStorage()->ResetBlockedKeysList();
 BeginUiUpdateLC();
 // Update single call
 UpdateSingleActiveCallL( aCallId );
 SetTouchPaneButtons( EPhoneIncallButtons );
-SetToolbarDimming( EFalse );
+SetBackButtonActive(ETrue);
 EndUiUpdate();
+// Go to single state
 iCbaManager->UpdateCbaL( EPhoneCallHandlingInCallCBA );
 iStateMachine->ChangeState( EPhoneStateSingle );
 }
 // -----------------------------------------------------------
 // CPhoneStateIncoming::HandleAudioPlayStoppedL
 //
 EXPORT_C void CPhoneStateIncoming::HandleAudioPlayStoppedL()
 {
 __LOGMETHODSTARTEND(EPhoneControl,
 "CPhoneStateIncoming::HandleAudioPlayStoppedL ()" );
-// Update the CBA
 // Set the ringtone silenced status
 iCbaManager->SetRingtoneSilencedStatus( ETrue );
 TInt resourceId = EPhoneCallHandlingIncomingRejectCBA;
-// Get the soft reject flag status
+iCbaManager->SetCbaL( resourceId );
-TPhoneCmdParamBoolean softRejectParam;
-iViewCommandHandle->ExecuteCommandL( EPhoneViewGetSoftRejectFlag,
-&softRejectParam );
-if ( IsNumberEntryVisibleL() && !iOnScreenDialer )
-{
-resourceId = EPhoneNumberAcqCBA;
-}
-else if ( iStateMachine->SecurityMode()->IsSecurityMode() )
-	{
-		// Use 'answer & reject' softkeys if security mode is enabled.
-	resourceId = EPhoneCallHandlingIncomingRejectCBA;
-	}
-else if ( softRejectParam.Boolean() )
-{
-resourceId = EPhoneCallHandlingIncomingSoftRejectCBA;
-}
-	iCbaManager->SetCbaL( resourceId );
 }
 // -----------------------------------------------------------
 // CPhoneStateIncoming::HandleIdleL
 // -----------------------------------------------------------
 //
 void CPhoneStateIncoming::HandleIdleL( TInt aCallId )
 {
 __LOGMETHODSTARTEND(EPhoneControl,
 "CPhoneStateIncoming::HandleIdleL ()" );
-BeginTransEffectLC( ENumberEntryClose );
 BeginUiUpdateLC();
+// Enable call UI
+if( FeatureManager::FeatureSupported( KFeatureIdFfTouchUnlockStroke )
+&& iStateMachine->PhoneStorage()->IsScreenLocked() )
+{
+EnableCallUIL();
+}
+// Reset blocked keys list
+iStateMachine->PhoneStorage()->ResetBlockedKeysList();
+// Remove call
 iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId );
-iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
+// Stop tone playing, if necessary
 iViewCommandHandle->ExecuteCommandL( EPhoneViewStopRingTone );
 TPhoneCmdParamBoolean globalNotifierParam;
 globalNotifierParam.SetBoolean( EFalse );
 iViewCommandHandle->ExecuteCommandL( EPhoneViewSetEikonNotifiersDisabled,
 SetDefaultFlagsL();
 if ( IsNumberEntryUsedL() )
 {
-if ( NeedToReturnToForegroundAppL() )
+if ( NeedToSendToBackgroundL() )
 {
 // Return phone to the background if send to background is needed.
 iViewCommandHandle->ExecuteCommandL( EPhoneViewSendToBackground );
-iViewCommandHandle->ExecuteCommandL( EPhoneViewSetControlAndVisibility );
+// Set Number Entry CBA
 iCbaManager->SetCbaL( EPhoneNumberAcqCBA );
 }
 else
 {
 // Show the number entry if it exists.
 SetNumberEntryVisibilityL(ETrue);
 }
 }
-else if ( NeedToReturnToForegroundAppL() ||
+else if ( NeedToSendToBackgroundL() )
-SoftRejectMessageEditorIsDisplayedL() )
 {
 // Continue displaying current app but set up the
 // idle screen in the background
 SetupIdleScreenInBackgroundL();
 }
 else
 {
+// Display idle screen
 DisplayIdleScreenL();
 }
 DeleteTouchPaneButtons();
+SetBackButtonActive(ETrue);
 EndUiUpdate();
-EndTransEffect();
+// Go to idle state
 iCbaManager->UpdateCbaL( EPhoneEmptyCBA );
 iStateMachine->ChangeState( EPhoneStateIdle );
 }
 // -----------------------------------------------------------
 {
 case EPhoneCmdOptions:
 // Stop tone playing, if necessary.
 // And stop vibrating, if it is active.
 iViewCommandHandle->ExecuteCommandL( EPhoneViewStopRingTone );
-// Open the menu bar
-OpenMenuBarL();
 break;
 case EPhoneCallComingCmdAnswer:
 AnswerCallL();
 break;
 break;
 case EPhoneCallComingCmdSilent:
 // Silence the ringer. And stop vibrating, if it is active.
 iViewCommandHandle->ExecuteCommandL( EPhoneViewMuteRingTone );
-// Dim silence button
-SetTouchPaneButtonDisabled( EPhoneCallComingCmdSilent );
 HandleAudioPlayStoppedL();
 iStateMachine->SendPhoneEngineMessage(
 MPEPhoneModel::EPEMessageStopTonePlay );
 break;
 case EPhoneCallComingCmdSoftReject:
 // Open Soft reject message editor
-OpenSoftRejectMessageEditorL();
+OpenSoftRejectMessageL();
 break;
 case EPhoneNumberAcqCmdSendCommand:
 HandleSendL();
-break;
-case EPhoneInCallCmdHelp:
-{
-TPtrC contextName;
-if( IsVideoCall( iRingingCallId ) )
-{
-contextName.Set( KINCAL_HLP_VIDEOCALL() );
-}
-else
-{
-contextName.Set( KINCAL_HLP_CALL_HANDLING() );
-}
-iViewCommandHandle->ExecuteCommandL(
-EPhoneViewLaunchHelpApplication, 0, contextName );
-}
 break;
 default:
 commandStatus = CPhoneState::HandleCommandL( aCommand );
 break;
 iStateMachine->SetCallId( iRingingCallId );
 if( IsVideoCall( iRingingCallId ) )
 {
 // Video call can be released only after we get response to VT Shutdown Command
-CPhoneMediatorFactory::Instance()->Sender()->IssueCommand(
+CPhoneMediatorFactory::Instance()->Sender()->IssueCommand( KMediatorVideoTelephonyDomain,
-KMediatorVideoTelephonyDomain,
+KCatPhoneToVideotelCommands,
-KCatPhoneToVideotelCommands,
+EVtCmdReleaseDataport,
-EVtCmdReleaseDataport,
+TVersion( KPhoneToVideotelCmdVersionMajor,
-TVersion( KPhoneToVideotelCmdVersionMajor,
+KPhoneToVideotelCmdVersionMinor,
-KPhoneToVideotelCmdVersionMinor,
+KPhoneToVideotelCmdVersionBuild ),
-KPhoneToVideotelCmdVersionBuild ),
+KNullDesC8,
-KNullDesC8,
+CPhoneReleaseCommand::NewL( *iStateMachine ) );
-CPhoneReleaseCommand::NewL( *iStateMachine ) );
 }
 else
 {
 // Release the call
 iStateMachine->SendPhoneEngineMessage(
 // -----------------------------------------------------------
 // CPhoneStateIncoming::OpenSoftRejectMessageEditorL
 // -----------------------------------------------------------
 //
-void CPhoneStateIncoming::OpenSoftRejectMessageEditorL()
+void CPhoneStateIncoming::OpenSoftRejectMessageL()
 {
 __LOGMETHODSTARTEND(EPhoneControl,
 "CPhoneStateIncoming::OpenSoftRejectMessageEditorL ()" );
-// Clear the soft reject flag
-TPhoneCmdParamBoolean softRejectParam;
-softRejectParam.SetBoolean( EFalse );
-iViewCommandHandle->ExecuteCommandL( EPhoneViewSetSoftRejectFlag,
-&softRejectParam );
-// Dim silence button
-SetTouchPaneButtonDisabled( EPhoneCallComingCmdSilent );
 // Silence the vibrating
 iViewCommandHandle->ExecuteCommandL( EPhoneViewStopRingTone );
 iStateMachine->SendPhoneEngineMessage(
 MPEPhoneModel::EPEMessageStopTonePlay );
 iViewCommandHandle->ExecuteCommandL(
 EPhoneViewOpenSoftRejectEditor, &sfiDataParam );
 }
-// -----------------------------------------------------------
-// CPhoneStateIncoming::SoftRejectMessageEditorIsDisplayedL
+// -----------------------------------------------------------
-// -----------------------------------------------------------
+// CPhoneStateIncoming::GetNumberEntryVisibleMenuBar
-//
+// -----------------------------------------------------------
-TBool CPhoneStateIncoming::SoftRejectMessageEditorIsDisplayedL() const
+//
-{
+TInt CPhoneStateIncoming::GetNumberEntryVisibleMenuBar()
-__LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateIncoming::SoftRejectMessageEditorIsDisplayedL () ");
+{
-// Get the foreground application window group id
+if( CPhoneState::IsVideoCall ( iRingingCallId ) )
-TPhoneCmdParamInteger foregroundAppParam;
+{
-iViewCommandHandle->ExecuteCommandL( EPhoneViewGetForegroundApplication,
+return EPhoneIncomingVideoCallMenubarWithNumberEntry;
-&foregroundAppParam );
-// Get the soft reject message editor window group id
-TPhoneCmdParamInteger softRejectMessageEditorWgId;
-iViewCommandHandle->ExecuteCommandL( EPhoneViewGetSoftRejectWindowGroupId,
-&softRejectMessageEditorWgId );
-__PHONELOG1(
-EBasic,
-EPhoneControl,
-"CPhoneStateIncoming::SoftRejectMessageEditorIsDisplayedL() SoftRejectGroupId %d",
-softRejectMessageEditorWgId.Integer() );
-__PHONELOG1(
-EBasic,
-EPhoneControl,
-"CPhoneStateIncoming::SoftRejectMessageEditorIsDisplayedL() ForegroundAppGroupId %d",
-foregroundAppParam.Integer() );
-// Return ETrue if soft reject message editor is displayed
-return softRejectMessageEditorWgId.Integer() == foregroundAppParam.Integer();
-}
-// -----------------------------------------------------------
-// CPhoneStateIncoming::OpenMenuBarL
-// -----------------------------------------------------------
-//
-void CPhoneStateIncoming::OpenMenuBarL()
-{
-__LOGMETHODSTARTEND(EPhoneControl,
-"CPhoneStateIncoming::OpenMenuBarL ()" );
-TInt resourceId;
-// Determine the correct menu bar to display
-if ( CPhoneState::IsNumberEntryVisibleL() )
-{
-resourceId = GetNumberEntryVisibleMenuBar();
 }
 else
 {
-resourceId = GetNumberEntryNotVisibleMenuBar();
+return EPhoneIncomingCallMenubarWithNumberEntry;
 }
+}
-// Silence the ringer. And stop vibrating, if it is active.
-iViewCommandHandle->ExecuteCommandL( EPhoneViewStopRingTone );
+// -----------------------------------------------------------
-iStateMachine->SendPhoneEngineMessage(
+// CPhoneStateIncoming::GetNumberEntryNotVisibleMenuBar
-MPEPhoneModel::EPEMessageStopTonePlay );
+// -----------------------------------------------------------
+//
-//Set correct cba
+TInt CPhoneStateIncoming::GetNumberEntryNotVisibleMenuBar()
-HandleAudioPlayStoppedL();
-// Dim button
-SetTouchPaneButtonDisabled( EPhoneCallComingCmdSilent );
-// Open the menu bar
-TPhoneCmdParamInteger integerParam;
-integerParam.SetInteger(
-CPhoneMainResourceResolver::Instance()->
-ResolveResourceID( resourceId ) );
-iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarOpen,
-&integerParam );
-}
-// -----------------------------------------------------------
-// CPhoneStateIncoming::GetNumberEntryVisibleMenuBar
-// -----------------------------------------------------------
-//
-TInt CPhoneStateIncoming::GetNumberEntryVisibleMenuBar()
 {
 if( CPhoneState::IsVideoCall ( iRingingCallId ) )
 {
-return EPhoneIncomingVideoCallMenubarWithNumberEntry;
+return EPhoneIncomingVideoCallMenubar;
 }
 else
 {
-return EPhoneIncomingCallMenubarWithNumberEntry;
-}
-}
-// -----------------------------------------------------------
-// CPhoneStateIncoming::GetNumberEntryNotVisibleMenuBar
-// -----------------------------------------------------------
-//
-TInt CPhoneStateIncoming::GetNumberEntryNotVisibleMenuBar()
-{
-if( CPhoneState::IsVideoCall ( iRingingCallId ) )
-{
-return EPhoneIncomingVideoCallMenubar;
-}
-else
-{
 return EPhoneIncomingCallMenubar;
 }
-}
-// -----------------------------------------------------------
-// CPhoneStateIncoming::DynInitMenuPaneL
-// -----------------------------------------------------------
-//
-EXPORT_C void CPhoneStateIncoming::DynInitMenuPaneL(
-TInt aResourceId,
-CEikMenuPane* aMenuPane )
-{
-__LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateIncoming::DynInitMenuPaneL() ");
-__ASSERT_DEBUG( aMenuPane && aResourceId,
-Panic( EPhoneCtrlParameterNotInitialized ) );
-// Save the number of digits in the number entry before processing
-// the menu pane
-if ( IsNumberEntryUsedL() )
-{
-TPhoneCmdParamBoolean serviceCodeParam;
-serviceCodeParam.SetBoolean( ETrue );
-iViewCommandHandle->ExecuteCommandL( EPhoneViewSetServiceCodeFlag,
-&serviceCodeParam );
-}
-if ( iCustomization )
-{
-iCustomization->CustomizeMenuPaneL(aResourceId, aMenuPane);
-}
-// Process the menu pane
-TPhoneCmdParamDynMenu dynMenuPane;
-dynMenuPane.SetResourceId( aResourceId );
-dynMenuPane.SetDynMenu( aMenuPane );
-iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuPane, &dynMenuPane );
 }
 // -----------------------------------------------------------
 // CPhoneStateIncoming::ShowDisconnectingL
 // -----------------------------------------------------------
 iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId,
 &callHeaderParam );
 }
+// ---------------------------------------------------------
+// CPhoneStateIncoming::HandleKeyLockEnabledL
+// ---------------------------------------------------------
+//
+EXPORT_C void CPhoneStateIncoming::HandleKeyLockEnabled( TBool aKeylockEnabled )
+{
+__LOGMETHODSTARTEND(EPhoneControl, "CPhoneStateIncoming::HandleKeyLockEnabledL( ) ");
+if( !FeatureManager::FeatureSupported( KFeatureIdFfTouchUnlockStroke )
+&& CPhoneCenRepProxy::Instance()->
+IsTelephonyFeatureSupported( KTelephonyLVFlagDisableCallControlHardKeysWhileLocked ) )
+{
+if( aKeylockEnabled )
+{
+// Keylock enabled
+if( iStateMachine->PhoneStorage()->IsBlockedKeysListEmpty() )
+{
+// Disable HW Keys if needed
+DisableHWKeysL();
+}
+}
+else
+{
+// Keylock disabled
+// Reset blocked keys list
+iStateMachine->PhoneStorage()->ResetBlockedKeysList();
+}
+}
+}
 // End of File

branch	RCL_3
changeset 61	41a7f70b3818
parent 58	40a3f856b14d
child 62	5266b1f337bd