equal
deleted
inserted
replaced
36 #include <AknsUtils.h> |
36 #include <AknsUtils.h> |
37 |
37 |
38 #include "cphonestatuspane.h" |
38 #include "cphonestatuspane.h" |
39 #include "tphonecmdparambitmap.h" |
39 #include "tphonecmdparambitmap.h" |
40 #include "phonelogger.h" |
40 #include "phonelogger.h" |
41 #include "mphoneviewobserver.h" |
41 #include "mphoneviewobserver.h" |
|
42 #include "mphoneviewcontrollerobserver.h" |
42 |
43 |
43 #include <AknUtils.h> // needed for AKN_LAF_COLOR in 3.0 environment |
44 #include <AknUtils.h> // needed for AKN_LAF_COLOR in 3.0 environment |
44 |
45 |
45 #include "phoneui.hrh" |
46 #include "phoneui.hrh" |
46 #include "phoneviewcommanddefinitions.h" |
47 #include "phoneviewcommanddefinitions.h" |
63 // CPhoneView::CPhoneView |
64 // CPhoneView::CPhoneView |
64 // C++ default constructor can NOT contain any code, that |
65 // C++ default constructor can NOT contain any code, that |
65 // might leave. |
66 // might leave. |
66 // ----------------------------------------------------------------------------- |
67 // ----------------------------------------------------------------------------- |
67 // |
68 // |
68 CPhoneView::CPhoneView( CEikButtonGroupContainer& aCba ) : |
69 CPhoneView::CPhoneView( CEikButtonGroupContainer& aCba, MPhoneViewControllerObserver* aViewController ) : |
69 iCba ( aCba ) |
70 iSecurityMode( ETrue ), |
|
71 iCba ( aCba ), |
|
72 iViewControllerObserver ( aViewController ) |
70 { |
73 { |
71 } |
74 } |
72 |
75 |
73 // ----------------------------------------------------------------------------- |
76 // ----------------------------------------------------------------------------- |
74 // CPhoneView::ConstructL |
77 // CPhoneView::ConstructL |
95 // ----------------------------------------------------------------------------- |
98 // ----------------------------------------------------------------------------- |
96 // CPhoneView::NewL |
99 // CPhoneView::NewL |
97 // Two-phased constructor. |
100 // Two-phased constructor. |
98 // ----------------------------------------------------------------------------- |
101 // ----------------------------------------------------------------------------- |
99 // |
102 // |
100 CPhoneView* CPhoneView::NewL( TRect aRect, CEikButtonGroupContainer& aCba ) |
103 CPhoneView* CPhoneView::NewL( TRect aRect, CEikButtonGroupContainer& aCba, MPhoneViewControllerObserver* aViewController ) |
101 { |
104 { |
102 CPhoneView* self = new ( ELeave ) CPhoneView( aCba ); |
105 CPhoneView* self = new ( ELeave ) CPhoneView( aCba, aViewController ); |
103 |
106 |
104 CleanupStack::PushL( self ); |
107 CleanupStack::PushL( self ); |
105 self->ConstructL( aRect ); |
108 self->ConstructL( aRect ); |
106 CleanupStack::Pop( self ); |
109 CleanupStack::Pop( self ); |
107 return self; |
110 return self; |
136 const TVwsViewId& /*aPrevViewId*/, |
139 const TVwsViewId& /*aPrevViewId*/, |
137 TUid aCustomMessageId, |
140 TUid aCustomMessageId, |
138 const TDesC8& /*aCustomMessage*/ ) |
141 const TDesC8& /*aCustomMessage*/ ) |
139 { |
142 { |
140 __LOGMETHODSTARTEND(EPhoneUIView, "CPhoneView::ViewActivatedL()"); |
143 __LOGMETHODSTARTEND(EPhoneUIView, "CPhoneView::ViewActivatedL()"); |
|
144 |
|
145 iViewControllerObserver->AllowInCallBubbleInSpecialCases(); |
|
146 |
141 switch ( aCustomMessageId.iUid ) |
147 switch ( aCustomMessageId.iUid ) |
142 { |
148 { |
143 case KTouchDiallerViewCommand: |
149 case KTouchDiallerViewCommand: |
144 { |
150 { |
145 if ( iDialerActivation ) |
151 if ( iDialerActivation ) |
184 // |
190 // |
185 void CPhoneView::ViewDeactivated() |
191 void CPhoneView::ViewDeactivated() |
186 { |
192 { |
187 __LOGMETHODSTARTEND(EPhoneUIView, "CPhoneView::ViewDeactivated()"); |
193 __LOGMETHODSTARTEND(EPhoneUIView, "CPhoneView::ViewDeactivated()"); |
188 SetActivatePreviousApp( EFalse ); |
194 SetActivatePreviousApp( EFalse ); |
189 |
195 iViewControllerObserver->SetIncallBubbleVisibility( EFalse ); |
190 DrawDeferred(); |
196 DrawDeferred(); |
191 } |
197 } |
192 |
198 |
193 // ----------------------------------------------------------------------------- |
199 // ----------------------------------------------------------------------------- |
194 // CPhoneView::SetControl |
200 // CPhoneView::SetControl |