equal
deleted
inserted
replaced
17 |
17 |
18 #include <aknlayoutscalable_apps.cdl.h> |
18 #include <aknlayoutscalable_apps.cdl.h> |
19 #include <data_caging_path_literals.hrh> |
19 #include <data_caging_path_literals.hrh> |
20 #include <AknsDrawUtils.h> |
20 #include <AknsDrawUtils.h> |
21 #include <AknUtils.h> |
21 #include <AknUtils.h> |
22 #ifdef RD_JAVA_UI_ALFDRAWER_ENABLED |
22 #ifdef RD_JAVA_S60_RELEASE_9_2 |
23 #include <alf/alfdrawer.h> |
23 #include <alf/alfdrawer.h> |
24 #endif // RD_JAVA_UI_ALFDRAWER_ENABLED |
24 #endif // RD_JAVA_S60_RELEASE_9_2 |
25 |
25 |
26 #include "startscreencontainer.h" |
26 #include "startscreencontainer.h" |
27 #include "startscreen.h" |
27 #include "startscreen.h" |
28 #include "logger.h" |
28 #include "logger.h" |
29 #include "eswt.h" |
29 #include "eswt.h" |
47 |
47 |
48 CStartScreenContainer::~CStartScreenContainer() |
48 CStartScreenContainer::~CStartScreenContainer() |
49 { |
49 { |
50 JELOG2(EJavaUI); |
50 JELOG2(EJavaUI); |
51 |
51 |
52 if (HidesIndicators()) |
52 if (!mAppUi.destroying()) |
53 ShowIndicators(ETrue); |
53 { |
|
54 if (HidesIndicators()) |
|
55 { |
|
56 ShowIndicators(ETrue); |
|
57 } |
|
58 } |
54 |
59 |
55 mFader.FadeBehindPopup(this, this, EFalse); |
60 mFader.FadeBehindPopup(this, this, EFalse); |
56 mAppUi.RemoveFromStack(this); |
61 mAppUi.RemoveFromStack(this); |
57 |
62 |
58 if (mStartScreenTimer) |
63 if (mStartScreenTimer) |
229 DrawNow(); |
234 DrawNow(); |
230 } |
235 } |
231 |
236 |
232 TBool CStartScreenContainer::HidesIndicators() const |
237 TBool CStartScreenContainer::HidesIndicators() const |
233 { |
238 { |
|
239 #ifdef RD_JAVA_S60_RELEASE_9_2 |
234 return (mStartScreen && mStartScreen->Type() == CStartScreen::EStartScreenAutomatic); |
240 return (mStartScreen && mStartScreen->Type() == CStartScreen::EStartScreenAutomatic); |
|
241 #else |
|
242 return EFalse; |
|
243 #endif |
235 } |
244 } |
236 |
245 |
237 void CStartScreenContainer::Draw(const TRect& aRect) const |
246 void CStartScreenContainer::Draw(const TRect& aRect) const |
238 { |
247 { |
239 JELOG2(EJavaUI); |
248 JELOG2(EJavaUI); |
307 void CStartScreenContainer::ConstructL() |
316 void CStartScreenContainer::ConstructL() |
308 { |
317 { |
309 JELOG2(EJavaUI); |
318 JELOG2(EJavaUI); |
310 |
319 |
311 mStartScreenTimer = CStartScreenTimer::NewL(*this); |
320 mStartScreenTimer = CStartScreenTimer::NewL(*this); |
|
321 mStartScreenTimer->Start(); |
312 |
322 |
313 CreateWindowL(); |
323 CreateWindowL(); |
314 SetMopParent(&mAppUi); |
324 SetMopParent(&mAppUi); |
315 |
325 |
316 // The start screen window needs to be on top of the ui, |
326 // The start screen window needs to be on top of the ui, |