equal
deleted
inserted
replaced
173 { |
173 { |
174 toolbar->SetItemDimmed(dimmedItems[i], ETrue, EFalse); |
174 toolbar->SetItemDimmed(dimmedItems[i], ETrue, EFalse); |
175 } |
175 } |
176 CleanupStack::PopAndDestroy(); // dimmedItems.Close() |
176 CleanupStack::PopAndDestroy(); // dimmedItems.Close() |
177 toolbar->SetToolbarObserver(this); |
177 toolbar->SetToolbarObserver(this); |
178 if(resourceId == R_FREESTYLE_EMAIL_UI_TOOLBAR_FOLDER_LIST) |
178 |
179 { |
179 TBool toolbarVisible = ( resourceId != R_FREESTYLE_EMAIL_UI_TOOLBAR_FOLDER_LIST ); |
180 toolbar->SetToolbarVisibility(EFalse); |
180 toolbar->SetToolbarVisibility( toolbarVisible ); |
181 } |
181 |
182 SetToolbar(toolbar); |
182 SetToolbar(toolbar); |
183 ShowToolbar(); |
183 ShowToolbar(); |
184 } |
184 } |
185 else |
185 else |
186 { |
186 { |
206 if (AknLayoutUtils::PenEnabled()) |
206 if (AknLayoutUtils::PenEnabled()) |
207 { |
207 { |
208 CAknToolbar* toolbar(Toolbar()); |
208 CAknToolbar* toolbar(Toolbar()); |
209 if (toolbar) |
209 if (toolbar) |
210 { |
210 { |
211 // toolbar->SetToolbarVisibility(EFalse); |
|
212 toolbar->MakeVisible(EFalse); |
211 toolbar->MakeVisible(EFalse); |
213 } |
212 } |
214 } |
213 } |
215 } |
214 } |
216 |
215 |
222 if (AknLayoutUtils::PenEnabled()) |
221 if (AknLayoutUtils::PenEnabled()) |
223 { |
222 { |
224 CAknToolbar* toolbar(Toolbar()); |
223 CAknToolbar* toolbar(Toolbar()); |
225 if (toolbar) |
224 if (toolbar) |
226 { |
225 { |
227 // toolbar->SetToolbarVisibility(ETrue); |
226 toolbar->MakeVisible( ETrue ); |
228 toolbar->MakeVisible(ETrue); |
|
229 } |
227 } |
230 } |
228 } |
231 } |
229 } |
232 |
230 |
233 // --------------------------------------------------------------------------- |
231 // --------------------------------------------------------------------------- |
267 |
265 |
268 // Try to bring calling external app into foreground if found |
266 // Try to bring calling external app into foreground if found |
269 TApaTaskList taskList( iEikonEnv->WsSession() ); |
267 TApaTaskList taskList( iEikonEnv->WsSession() ); |
270 TApaTask prevAppTask = taskList.FindApp( iPreviousAppUid ); |
268 TApaTask prevAppTask = taskList.FindApp( iPreviousAppUid ); |
271 TApaTask fsEmailTask = taskList.FindApp( KFSEmailUiUid ); |
269 TApaTask fsEmailTask = taskList.FindApp( KFSEmailUiUid ); |
|
270 if ( fsEmailTask.Exists() && iPreviousAppUid != KMessageReaderUid ) |
|
271 { |
|
272 fsEmailTask.SendToBackground(); |
|
273 } |
272 if ( prevAppTask.Exists() ) |
274 if ( prevAppTask.Exists() ) |
273 { |
275 { |
274 prevAppTask.BringToForeground(); |
276 prevAppTask.BringToForeground(); |
275 } |
|
276 if ( fsEmailTask.Exists() && iPreviousAppUid != KMessageReaderUid ) |
|
277 { |
|
278 fsEmailTask.SendToBackground(); |
|
279 } |
277 } |
280 |
278 |
281 iAppUi.SetSwitchingToBackground( EFalse ); |
279 iAppUi.SetSwitchingToBackground( EFalse ); |
282 } |
280 } |
283 } |
281 } |