equal
deleted
inserted
replaced
18 |
18 |
19 // INCLUDES |
19 // INCLUDES |
20 #include <StringLoader.h> |
20 #include <StringLoader.h> |
21 #include <cpephonemodelif.h> |
21 #include <cpephonemodelif.h> |
22 #include <featmgr.h> |
22 #include <featmgr.h> |
23 #include <TelephonyVariant.hrh> |
23 #include <telephonyvariant.hrh> |
24 #include "cphoneconferenceandwaiting.h" |
24 #include "cphoneconferenceandwaiting.h" |
25 #include "mphonestatemachine.h" |
25 #include "mphonestatemachine.h" |
26 #include "phoneviewcommanddefinitions.h" |
26 #include "phoneviewcommanddefinitions.h" |
27 #include "tphonecmdparamcallheaderdata.h" |
27 #include "tphonecmdparamcallheaderdata.h" |
28 #include "phonestatedefinitionsgsm.h" |
28 #include "phonestatedefinitionsgsm.h" |
128 |
128 |
129 case MEngineMonitor::EPEMessageWentOneToOne: |
129 case MEngineMonitor::EPEMessageWentOneToOne: |
130 HandleWentOneToOneL( aCallId ); |
130 HandleWentOneToOneL( aCallId ); |
131 break; |
131 break; |
132 |
132 |
|
133 // <-- QT PHONE START --> |
|
134 case MEngineMonitor::EPEMessageHeldConference: |
|
135 case MEngineMonitor::EPEMessageConnectedConference: |
|
136 { |
|
137 TPhoneCmdParamInteger callIdParam; |
|
138 iViewCommandHandle->ExecuteCommandL( |
|
139 EPhoneViewGetExpandedBubbleCallId, &callIdParam ); |
|
140 |
|
141 CPhoneConference::HandlePhoneEngineMessageL( aMessage, |
|
142 aCallId ); |
|
143 |
|
144 if ( KConferenceCallId == callIdParam.Integer() ) |
|
145 { |
|
146 iViewCommandHandle->ExecuteCommand(EPhoneSetConferenceExpanded); |
|
147 } |
|
148 } |
|
149 break; |
|
150 // <-- QT PHONE END --> |
|
151 |
133 default: |
152 default: |
134 CPhoneConference::HandlePhoneEngineMessageL( aMessage, |
153 CPhoneConference::HandlePhoneEngineMessageL( aMessage, |
135 aCallId ); |
154 aCallId ); |
136 break; |
155 break; |
137 } |
156 } |
174 // CPhoneConferenceAndWaiting::HandleKeyEventL |
193 // CPhoneConferenceAndWaiting::HandleKeyEventL |
175 // ----------------------------------------------------------- |
194 // ----------------------------------------------------------- |
176 // |
195 // |
177 void CPhoneConferenceAndWaiting::HandleKeyEventL( |
196 void CPhoneConferenceAndWaiting::HandleKeyEventL( |
178 const TKeyEvent& aKeyEvent, |
197 const TKeyEvent& aKeyEvent, |
179 TEventCode aEventCode ) |
198 TEventCode /*aEventCode*/ ) |
180 { |
199 { |
181 if( EKeyDeviceF == aKeyEvent.iCode ) |
200 if( EKeyDeviceF == aKeyEvent.iCode ) |
182 { |
201 { |
183 __PHONELOG( EBasic, EPhoneUIStates, |
202 __PHONELOG( EBasic, EPhoneUIStates, |
184 "CPhoneConferenceAndWaiting::HandleKeyMessageL-deviceF" ); |
203 "CPhoneConferenceAndWaiting::HandleKeyMessageL-deviceF" ); |
293 if ( IsNumberEntryUsedL() ) |
312 if ( IsNumberEntryUsedL() ) |
294 { |
313 { |
295 if ( NeedToSendToBackgroundL() ) |
314 if ( NeedToSendToBackgroundL() ) |
296 { |
315 { |
297 // Return phone to the background if send to background is needed. |
316 // Return phone to the background if send to background is needed. |
298 iViewCommandHandle->ExecuteCommandL( EPhoneViewSendToBackground ); |
317 // <-- QT PHONE START --> |
299 |
318 //iViewCommandHandle->ExecuteCommandL( EPhoneViewSendToBackground ); |
|
319 // <-- QT PHONE END --> |
300 iViewCommandHandle->ExecuteCommandL( EPhoneViewSetControlAndVisibility ); |
320 iViewCommandHandle->ExecuteCommandL( EPhoneViewSetControlAndVisibility ); |
301 |
321 |
302 UpdateCbaL( EPhoneCallHandlingInCallCBA ); |
322 UpdateCbaL( EPhoneCallHandlingInCallCBA ); |
303 } |
323 } |
304 else |
324 else |
310 else |
330 else |
311 { |
331 { |
312 UpdateCbaL( EPhoneCallHandlingNewCallSwapCBA ); |
332 UpdateCbaL( EPhoneCallHandlingNewCallSwapCBA ); |
313 // If numberentry is not open just check NeedToSendToBackgroundL and |
333 // If numberentry is not open just check NeedToSendToBackgroundL and |
314 // sendbackround if needed. |
334 // sendbackround if needed. |
315 if ( NeedToSendToBackgroundL() ) |
335 // <-- QT PHONE START --> |
|
336 /*if ( NeedToSendToBackgroundL() ) |
316 { |
337 { |
317 // Return phone to the background if send to background is needed. |
338 // Return phone to the background if send to background is needed. |
318 iViewCommandHandle->ExecuteCommandL( EPhoneViewSendToBackground ); |
339 iViewCommandHandle->ExecuteCommandL( EPhoneViewSendToBackground ); |
319 } |
340 }*/ |
|
341 // <-- QT PHONE END --> |
320 } |
342 } |
321 SetTouchPaneButtons( EPhoneConferenceAndSingleButtons ); |
343 SetTouchPaneButtons( EPhoneConferenceAndSingleButtons ); |
322 SetTouchPaneButtonDisabled( EPhoneInCallCmdPrivate ); |
344 SetTouchPaneButtonDisabled( EPhoneInCallCmdPrivate ); |
323 |
345 |
324 EndUiUpdate(); |
346 EndUiUpdate(); |
623 } |
645 } |
624 |
646 |
625 EndUiUpdate(); |
647 EndUiUpdate(); |
626 } |
648 } |
627 |
649 |
|
650 // <-- QT PHONE START --> |
|
651 // ----------------------------------------------------------- |
|
652 // CPhoneConferenceAndWaiting::HandleCommandL |
|
653 // ----------------------------------------------------------- |
|
654 // |
|
655 TBool CPhoneConferenceAndWaiting::HandleCommandL( TInt aCommand ) |
|
656 { |
|
657 __LOGMETHODSTARTEND( EPhoneUIStates, |
|
658 "CPhoneConferenceAndWaiting::HandleCommandL() "); |
|
659 TBool commandStatus = ETrue; |
|
660 |
|
661 switch( aCommand ) |
|
662 { |
|
663 case EPhoneCmdUpdateUiControls: |
|
664 UpdateUiControlsL(); |
|
665 break; |
|
666 |
|
667 default: |
|
668 commandStatus = CPhoneConference::HandleCommandL( aCommand ); |
|
669 break; |
|
670 } |
|
671 |
|
672 return commandStatus; |
|
673 } |
|
674 |
|
675 // ----------------------------------------------------------- |
|
676 // CPhoneConferenceAndWaiting::UpdateUiControlsL |
|
677 // ----------------------------------------------------------- |
|
678 // |
|
679 void CPhoneConferenceAndWaiting::UpdateUiControlsL() |
|
680 { |
|
681 __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneConferenceAndWaiting::UpdateUiControlsL( ) "); |
|
682 iViewCommandHandle->ExecuteCommand(EPhoneSetConferenceExpanded); |
|
683 UpdateCbaL( EPhoneCallHandlingInCallCBA ); |
|
684 } |
|
685 |
|
686 // <-- QT PHONE END --> |
|
687 |
|
688 |
628 // End of File |
689 // End of File |