Merge RCL_3 Fixes to Bug 2846,Bug 2584,Bug 2012.
--- a/lafagnosticuifoundation/bmpanimation/group/BLD.INF Tue Sep 14 21:48:24 2010 +0300
+++ b/lafagnosticuifoundation/bmpanimation/group/BLD.INF Fri Sep 17 17:02:05 2010 +0100
@@ -30,7 +30,7 @@
../inc/bmpansrv.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(bmpansrv.h)
../inc/bmpanconsts.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(bmpanconsts.h)
-../docs/animation_design_spec.doc /epoc32/engdoc/application_framework/bmpanim/animation_design_spec.doc
+//../docs/animation_design_spec.doc /epoc32/engdoc/application_framework/bmpanim/animation_design_spec.doc
../group/BmpAnim.iby /epoc32/rom/include/bmpanim.iby
PRJ_MMPFILES
--- a/uifw/EikStd/coctlsrc/AknClearer.cpp Tue Sep 14 21:48:24 2010 +0300
+++ b/uifw/EikStd/coctlsrc/AknClearer.cpp Fri Sep 17 17:02:05 2010 +0100
@@ -135,9 +135,11 @@
EnableWindowTransparency();
}
+#ifndef NO_ALF_OBSERVER
CAlfEffectObserver* alfEffectObserver = CAlfEffectObserver::NewL();
alfEffectObserver->SetDistractionWindow(*DrawableWindow());
delete alfEffectObserver;
+#endif
iFlags.Assign(EAknScreenClearerBlankAppStatusPane, aBlankAppStatusPane);
--- a/uifw/EikStd/coctlsrc/EIKCOCTL.MMP Tue Sep 14 21:48:24 2010 +0300
+++ b/uifw/EikStd/coctlsrc/EIKCOCTL.MMP Fri Sep 17 17:02:05 2010 +0100
@@ -40,6 +40,7 @@
APP_LAYER_SYSTEMINCLUDE
OS_LAYER_LIBC_SYSTEMINCLUDE
+MACRO NO_ALF_OBSERVER // break link to alf server
SOURCE Aknedsts.cpp
SOURCE Aknscbut.cpp