equal
deleted
inserted
replaced
116 iViewCommandHandle->ExecuteCommandL( |
116 iViewCommandHandle->ExecuteCommandL( |
117 EPhoneViewSetGlobalNotifiersDisabled, |
117 EPhoneViewSetGlobalNotifiersDisabled, |
118 &globalNotifierParam ); |
118 &globalNotifierParam ); |
119 |
119 |
120 TPhoneCmdParamGlobalNote globalNoteParam; |
120 TPhoneCmdParamGlobalNote globalNoteParam; |
121 PhoneNotificationType type = aNotificationDialog ? |
121 TPhoneNotificationType type = aNotificationDialog ? |
122 EPhoneNotificationDialog : EPhoneMessageBoxInformation; |
122 EPhoneNotificationDialog : EPhoneMessageBoxInformation; |
123 globalNoteParam.SetType( type ); |
123 globalNoteParam.SetType( type ); |
124 globalNoteParam.SetNotificationDialog( aNotificationDialog ); |
124 globalNoteParam.SetNotificationDialog( aNotificationDialog ); |
125 |
125 |
126 TInt resourceID( aResourceId ); |
126 TInt resourceID( aResourceId ); |
138 { |
138 { |
139 globalNoteParam.SetTextResourceId( |
139 globalNoteParam.SetTextResourceId( |
140 CPhoneMainResourceResolver::Instance()-> |
140 CPhoneMainResourceResolver::Instance()-> |
141 ResolveResourceID( aResourceId ) ); |
141 ResolveResourceID( aResourceId ) ); |
142 } |
142 } |
|
143 globalNoteParam.SetToneType( EPhoneInformationTone ); |
143 iViewCommandHandle->ExecuteCommandL( |
144 iViewCommandHandle->ExecuteCommandL( |
144 EPhoneViewShowGlobalNote, &globalNoteParam ); |
145 EPhoneViewShowGlobalNote, &globalNoteParam ); |
145 |
146 |
146 } |
147 } |
147 |
148 |
160 iViewCommandHandle->ExecuteCommandL( |
161 iViewCommandHandle->ExecuteCommandL( |
161 EPhoneViewSetGlobalNotifiersDisabled, |
162 EPhoneViewSetGlobalNotifiersDisabled, |
162 &globalNotifierParam ); |
163 &globalNotifierParam ); |
163 |
164 |
164 TPhoneCmdParamGlobalNote globalNoteParam; |
165 TPhoneCmdParamGlobalNote globalNoteParam; |
165 PhoneNotificationType type = aNotificationDialog ? |
166 TPhoneNotificationType type = aNotificationDialog ? |
166 EPhoneNotificationDialog : EPhoneMessageBoxInformation; |
167 EPhoneNotificationDialog : EPhoneMessageBoxInformation; |
167 globalNoteParam.SetType( type ); |
168 globalNoteParam.SetType( type ); |
168 globalNoteParam.SetNotificationDialog( aNotificationDialog ); |
169 globalNoteParam.SetNotificationDialog( aNotificationDialog ); |
169 |
170 |
170 TInt resourceID( aResourceId ); |
171 TInt resourceID( aResourceId ); |
182 { |
183 { |
183 globalNoteParam.SetTextResourceId( |
184 globalNoteParam.SetTextResourceId( |
184 CPhoneMainResourceResolver::Instance()-> |
185 CPhoneMainResourceResolver::Instance()-> |
185 ResolveResourceID( aResourceId ) ); |
186 ResolveResourceID( aResourceId ) ); |
186 } |
187 } |
|
188 globalNoteParam.SetToneType( EPhoneErrorTone ); |
187 iViewCommandHandle->ExecuteCommandL( |
189 iViewCommandHandle->ExecuteCommandL( |
188 EPhoneViewShowGlobalNote, &globalNoteParam ); |
190 EPhoneViewShowGlobalNote, &globalNoteParam ); |
189 |
191 |
190 } |
192 } |
191 |
193 |
204 iViewCommandHandle->ExecuteCommandL( |
206 iViewCommandHandle->ExecuteCommandL( |
205 EPhoneViewSetGlobalNotifiersDisabled, |
207 EPhoneViewSetGlobalNotifiersDisabled, |
206 &globalNotifierParam ); |
208 &globalNotifierParam ); |
207 |
209 |
208 TPhoneCmdParamGlobalNote globalNoteParam; |
210 TPhoneCmdParamGlobalNote globalNoteParam; |
209 PhoneNotificationType type = aNotificationDialog ? |
211 TPhoneNotificationType type = aNotificationDialog ? |
210 EPhoneNotificationDialog : EPhoneMessageBoxInformation; |
212 EPhoneNotificationDialog : EPhoneMessageBoxInformation; |
211 globalNoteParam.SetType( type ); |
213 globalNoteParam.SetType( type ); |
212 globalNoteParam.SetNotificationDialog( aNotificationDialog ); |
214 globalNoteParam.SetNotificationDialog( aNotificationDialog ); |
213 |
215 |
214 TInt resourceID( aResourceId ); |
216 TInt resourceID( aResourceId ); |
226 { |
228 { |
227 globalNoteParam.SetTextResourceId( |
229 globalNoteParam.SetTextResourceId( |
228 CPhoneMainResourceResolver::Instance()-> |
230 CPhoneMainResourceResolver::Instance()-> |
229 ResolveResourceID( aResourceId ) ); |
231 ResolveResourceID( aResourceId ) ); |
230 } |
232 } |
|
233 globalNoteParam.SetToneType( EPhoneWarningTone ); |
231 iViewCommandHandle->ExecuteCommandL( |
234 iViewCommandHandle->ExecuteCommandL( |
232 EPhoneViewShowGlobalNote, &globalNoteParam ); |
235 EPhoneViewShowGlobalNote, &globalNoteParam ); |
233 } |
236 } |
234 |
237 |
235 // --------------------------------------------------------- |
238 // --------------------------------------------------------- |
433 { |
436 { |
434 SendGlobalInfoNoteL( EPhoneNoteCalledNumberHasBarredIncomingCalls ); |
437 SendGlobalInfoNoteL( EPhoneNoteCalledNumberHasBarredIncomingCalls ); |
435 } |
438 } |
436 else if ( IsVoiceCall( aErrorInfo.iCallId )) |
439 else if ( IsVoiceCall( aErrorInfo.iCallId )) |
437 { |
440 { |
438 SendGlobalWarningNoteL( EPhoneNoteCalledNumberHasBarredIncomingCalls, ETrue ); |
441 SendGlobalWarningNoteL( EPhoneNoteCallInfoCauseValue21, ETrue ); |
439 } |
442 } |
440 } |
443 } |
441 break; |
444 break; |
442 |
445 |
443 case ECCPErrorMovedPermanently: |
446 case ECCPErrorMovedPermanently: |
783 break; |
786 break; |
784 |
787 |
785 case KErrGsmCCCallRejected: |
788 case KErrGsmCCCallRejected: |
786 if ( !iStateMachine->PhoneEngineInfo()->IsOutgoingCallBarringActivated() ) |
789 if ( !iStateMachine->PhoneEngineInfo()->IsOutgoingCallBarringActivated() ) |
787 { |
790 { |
788 aResourceId = EPhoneNoteCalledNumberHasBarredIncomingCalls; |
791 if ( IsVideoCall( callId ) ) |
|
792 { |
|
793 aResourceId = EPhoneNoteCalledNumberHasBarredIncomingCalls; |
|
794 aNotification = EFalse; |
|
795 } |
|
796 else |
|
797 { |
|
798 aResourceId = EPhoneNoteCallInfoCauseValue21; |
|
799 } |
789 aCauseCode = 21; |
800 aCauseCode = 21; |
790 aNotification = (EFalse == IsVideoCall( callId )); |
|
791 } |
801 } |
792 break; |
802 break; |
793 |
803 |
794 case KErrGsmCCNumberChanged: |
804 case KErrGsmCCNumberChanged: |
795 aResourceId = EPhoneNumberNotInUse; |
805 aResourceId = EPhoneNumberNotInUse; |