--- a/appinstall_info/appinstall_metadata/appinstall_metadata.mrp	Thu May 27 12:58:35 2010 +0300
+++ b/appinstall_info/appinstall_metadata/appinstall_metadata.mrp	Fri Jun 11 13:45:18 2010 +0300
@@ -1,19 +1,3 @@
-#
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description: 
-#
-
 component           appinstall_metadata
 source   \sf\mw\appinstall\appinstall_info\appinstall_metadata 
 source   \sf\mw\appinstall\package_definition.xml

--- a/appinstall_plat/sifui_api/bwins/sifuiu.def	Thu May 27 12:58:35 2010 +0300
+++ b/appinstall_plat/sifui_api/bwins/sifuiu.def	Fri Jun 11 13:45:18 2010 +0300
@@ -5,25 +5,22 @@
 	?ShowCompleteL@CSifUi@@QAEXXZ @ 4 NONAME ; void CSifUi::ShowCompleteL(void)
 	?ExternalizeL@CSifUiAppInfo@@QBEXAAVRWriteStream@@@Z @ 5 NONAME ; void CSifUiAppInfo::ExternalizeL(class RWriteStream &) const
 	?ShowProgressL@CSifUi@@QAEXABVCSifUiAppInfo@@H@Z @ 6 NONAME ; void CSifUi::ShowProgressL(class CSifUiAppInfo const &, int)
-	?SetCertificateInfoL@CSifUi@@QAEXABV?$RPointerArray@VCCertificateInfo@Swi@@@@@Z @ 7 NONAME ; void CSifUi::SetCertificateInfoL(class RPointerArray<class Swi::CCertificateInfo> const &)
-	?NewLC@CSifUiCertificateInfo@@SAPAV1@AAVCCertificateInfo@Swi@@@Z @ 8 NONAME ; class CSifUiCertificateInfo * CSifUiCertificateInfo::NewLC(class Swi::CCertificateInfo &)
-	?Bitmaps@CSifUiAppInfo@@QBEPBVCApaMaskedBitmap@@XZ @ 9 NONAME ; class CApaMaskedBitmap const * CSifUiAppInfo::Bitmaps(void) const
-	?IncreaseProgressBarValueL@CSifUi@@QAEXH@Z @ 10 NONAME ; void CSifUi::IncreaseProgressBarValueL(int)
-	?ShowFailedL@CSifUi@@QAEXHABVTDesC16@@0@Z @ 11 NONAME ; void CSifUi::ShowFailedL(int, class TDesC16 const &, class TDesC16 const &)
-	?ExternalizeL@CSifUiCertificateInfo@@QBEXAAVRWriteStream@@@Z @ 12 NONAME ; void CSifUiCertificateInfo::ExternalizeL(class RWriteStream &) const
+	?NewLC@CSifUiCertificateInfo@@SAPAV1@AAVCCertificateInfo@Swi@@@Z @ 7 NONAME ; class CSifUiCertificateInfo * CSifUiCertificateInfo::NewLC(class Swi::CCertificateInfo &)
+	?Bitmaps@CSifUiAppInfo@@QBEPBVCApaMaskedBitmap@@XZ @ 8 NONAME ; class CApaMaskedBitmap const * CSifUiAppInfo::Bitmaps(void) const
+	?IncreaseProgressBarValueL@CSifUi@@QAEXH@Z @ 9 NONAME ; void CSifUi::IncreaseProgressBarValueL(int)
+	?ShowFailedL@CSifUi@@QAEXHABVTDesC16@@0@Z @ 10 NONAME ; void CSifUi::ShowFailedL(int, class TDesC16 const &, class TDesC16 const &)
+	?ExternalizeL@CSifUiCertificateInfo@@QBEXAAVRWriteStream@@@Z @ 11 NONAME ; void CSifUiCertificateInfo::ExternalizeL(class RWriteStream &) const
+	?IsCancelled@CSifUi@@QAEHXZ @ 12 NONAME ; int CSifUi::IsCancelled(void)
 	?Name@CSifUiAppInfo@@QBEABVTDesC16@@XZ @ 13 NONAME ; class TDesC16 const & CSifUiAppInfo::Name(void) const
 	?NewL@CSifUi@@SAPAV1@XZ @ 14 NONAME ; class CSifUi * CSifUi::NewL(void)
-	?Version@CSifUiAppInfo@@QBEABVTVersion@@XZ @ 15 NONAME ; class TVersion const & CSifUiAppInfo::Version(void) const
-	?SetCertificateInfoL@CSifUi@@QAEXABV?$RPointerArray@VCSifUiCertificateInfo@@@@@Z @ 16 NONAME ; void CSifUi::SetCertificateInfoL(class RPointerArray<class CSifUiCertificateInfo> const &)
-	?Size@CSifUiAppInfo@@QBEHXZ @ 17 NONAME ; int CSifUiAppInfo::Size(void) const
-	?ShowConfirmationL@CSifUi@@QAEHABVCAppInfo@Swi@@HPBVCApaMaskedBitmap@@@Z @ 18 NONAME ; int CSifUi::ShowConfirmationL(class Swi::CAppInfo const &, int, class CApaMaskedBitmap const *)
-	?NewLC@CSifUiAppInfo@@SAPAV1@ABVTDesC16@@0ABVTVersion@@HPBVCApaMaskedBitmap@@@Z @ 19 NONAME ; class CSifUiAppInfo * CSifUiAppInfo::NewLC(class TDesC16 const &, class TDesC16 const &, class TVersion const &, int, class CApaMaskedBitmap const *)
-	?SetMemorySelectionL@CSifUi@@QAEXABV?$RArray@H@@@Z @ 20 NONAME ; void CSifUi::SetMemorySelectionL(class RArray<int> const &)
+	?NewL@CSifUiAppInfo@@SAPAV1@ABV1@@Z @ 15 NONAME ; class CSifUiAppInfo * CSifUiAppInfo::NewL(class CSifUiAppInfo const &)
+	?Version@CSifUiAppInfo@@QBEABVTVersion@@XZ @ 16 NONAME ; class TVersion const & CSifUiAppInfo::Version(void) const
+	?SetCertificateInfoL@CSifUi@@QAEXABV?$RPointerArray@VCSifUiCertificateInfo@@@@@Z @ 17 NONAME ; void CSifUi::SetCertificateInfoL(class RPointerArray<class CSifUiCertificateInfo> const &)
+	?Size@CSifUiAppInfo@@QBEHXZ @ 18 NONAME ; int CSifUiAppInfo::Size(void) const
+	?SetMemorySelectionL@CSifUi@@QAEXABV?$RArray@H@@@Z @ 19 NONAME ; void CSifUi::SetMemorySelectionL(class RArray<int> const &)
+	?NewLC@CSifUiAppInfo@@SAPAV1@ABVTDesC16@@0ABVTVersion@@HPBVCApaMaskedBitmap@@@Z @ 20 NONAME ; class CSifUiAppInfo * CSifUiAppInfo::NewLC(class TDesC16 const &, class TDesC16 const &, class TVersion const &, int, class CApaMaskedBitmap const *)
 	?Vendor@CSifUiAppInfo@@QBEABVTDesC16@@XZ @ 21 NONAME ; class TDesC16 const & CSifUiAppInfo::Vendor(void) const
-	?Mode@CSifUi@@QAE?AW4TMode@1@XZ @ 22 NONAME ; enum CSifUi::TMode CSifUi::Mode(void)
-	?ShowFailedL@CSifUi@@QAEXH@Z @ 23 NONAME ; void CSifUi::ShowFailedL(int)
-	?SetMode@CSifUi@@QAEXW4TMode@1@@Z @ 24 NONAME ; void CSifUi::SetMode(enum CSifUi::TMode)
-	?SelectedDrive@CSifUi@@QAEHAAH@Z @ 25 NONAME ; int CSifUi::SelectedDrive(int &)
-	?ShowProgressL@CSifUi@@QAEXABVCAppInfo@Swi@@HH@Z @ 26 NONAME ; void CSifUi::ShowProgressL(class Swi::CAppInfo const &, int, int)
-	?NewLC@CSifUi@@SAPAV1@XZ @ 27 NONAME ; class CSifUi * CSifUi::NewLC(void)
+	?SetButtonVisible@CSifUi@@QAEXW4TOptionalButton@1@H@Z @ 22 NONAME ; void CSifUi::SetButtonVisible(enum CSifUi::TOptionalButton, int)
+	?SelectedDrive@CSifUi@@QAEHAAH@Z @ 23 NONAME ; int CSifUi::SelectedDrive(int &)
+	?NewLC@CSifUi@@SAPAV1@XZ @ 24 NONAME ; class CSifUi * CSifUi::NewLC(void)
 

--- a/appinstall_plat/sifui_api/eabi/sifuiu.def	Thu May 27 12:58:35 2010 +0300
+++ b/appinstall_plat/sifui_api/eabi/sifuiu.def	Fri Jun 11 13:45:18 2010 +0300
@@ -1,37 +1,34 @@
 EXPORTS
 	_ZN13CSifUiAppInfo4NewLERK7TDesC16S2_RK8TVersioniPK16CApaMaskedBitmap @ 1 NONAME
-	_ZN13CSifUiAppInfo5NewLCERK7TDesC16S2_RK8TVersioniPK16CApaMaskedBitmap @ 2 NONAME
-	_ZN21CSifUiCertificateInfo4NewLERN3Swi16CCertificateInfoE @ 3 NONAME
-	_ZN21CSifUiCertificateInfo5NewLCERN3Swi16CCertificateInfoE @ 4 NONAME
-	_ZN6CSifUi11ShowFailedLEi @ 5 NONAME
-	_ZN6CSifUi11ShowFailedLEiRK7TDesC16S2_ @ 6 NONAME
-	_ZN6CSifUi13SelectedDriveERi @ 7 NONAME
-	_ZN6CSifUi13ShowCompleteLEv @ 8 NONAME
-	_ZN6CSifUi13ShowProgressLERK13CSifUiAppInfoi @ 9 NONAME
-	_ZN6CSifUi13ShowProgressLERKN3Swi8CAppInfoEii @ 10 NONAME
-	_ZN6CSifUi17ShowConfirmationLERK13CSifUiAppInfo @ 11 NONAME
-	_ZN6CSifUi17ShowConfirmationLERKN3Swi8CAppInfoEiPK16CApaMaskedBitmap @ 12 NONAME
+	_ZN13CSifUiAppInfo4NewLERKS_ @ 2 NONAME
+	_ZN13CSifUiAppInfo5NewLCERK7TDesC16S2_RK8TVersioniPK16CApaMaskedBitmap @ 3 NONAME
+	_ZN21CSifUiCertificateInfo4NewLERN3Swi16CCertificateInfoE @ 4 NONAME
+	_ZN21CSifUiCertificateInfo5NewLCERN3Swi16CCertificateInfoE @ 5 NONAME
+	_ZN6CSifUi11IsCancelledEv @ 6 NONAME
+	_ZN6CSifUi11ShowFailedLEiRK7TDesC16S2_ @ 7 NONAME
+	_ZN6CSifUi13SelectedDriveERi @ 8 NONAME
+	_ZN6CSifUi13ShowCompleteLEv @ 9 NONAME
+	_ZN6CSifUi13ShowProgressLERK13CSifUiAppInfoi @ 10 NONAME
+	_ZN6CSifUi16SetButtonVisibleENS_15TOptionalButtonEi @ 11 NONAME
+	_ZN6CSifUi17ShowConfirmationLERK13CSifUiAppInfo @ 12 NONAME
 	_ZN6CSifUi19SetCertificateInfoLERK13RPointerArrayI21CSifUiCertificateInfoE @ 13 NONAME
-	_ZN6CSifUi19SetCertificateInfoLERK13RPointerArrayIN3Swi16CCertificateInfoEE @ 14 NONAME
-	_ZN6CSifUi19SetMemorySelectionLERK6RArrayIiE @ 15 NONAME
-	_ZN6CSifUi25IncreaseProgressBarValueLEi @ 16 NONAME
-	_ZN6CSifUi4ModeEv @ 17 NONAME
-	_ZN6CSifUi4NewLEv @ 18 NONAME
-	_ZN6CSifUi5NewLCEv @ 19 NONAME
-	_ZN6CSifUi7SetModeENS_5TModeE @ 20 NONAME
-	_ZNK13CSifUiAppInfo12ExternalizeLER12RWriteStream @ 21 NONAME
-	_ZNK13CSifUiAppInfo4NameEv @ 22 NONAME
-	_ZNK13CSifUiAppInfo4SizeEv @ 23 NONAME
-	_ZNK13CSifUiAppInfo6VendorEv @ 24 NONAME
-	_ZNK13CSifUiAppInfo7BitmapsEv @ 25 NONAME
-	_ZNK13CSifUiAppInfo7VersionEv @ 26 NONAME
-	_ZNK21CSifUiCertificateInfo12ExternalizeLER12RWriteStream @ 27 NONAME
-	_ZTI13CSifUiAppInfo @ 28 NONAME
-	_ZTI13CSifUiPrivate @ 29 NONAME
-	_ZTI21CSifUiCertificateInfo @ 30 NONAME
-	_ZTI6CSifUi @ 31 NONAME
-	_ZTV13CSifUiAppInfo @ 32 NONAME
-	_ZTV13CSifUiPrivate @ 33 NONAME
-	_ZTV21CSifUiCertificateInfo @ 34 NONAME
-	_ZTV6CSifUi @ 35 NONAME
+	_ZN6CSifUi19SetMemorySelectionLERK6RArrayIiE @ 14 NONAME
+	_ZN6CSifUi25IncreaseProgressBarValueLEi @ 15 NONAME
+	_ZN6CSifUi4NewLEv @ 16 NONAME
+	_ZN6CSifUi5NewLCEv @ 17 NONAME
+	_ZNK13CSifUiAppInfo12ExternalizeLER12RWriteStream @ 18 NONAME
+	_ZNK13CSifUiAppInfo4NameEv @ 19 NONAME
+	_ZNK13CSifUiAppInfo4SizeEv @ 20 NONAME
+	_ZNK13CSifUiAppInfo6VendorEv @ 21 NONAME
+	_ZNK13CSifUiAppInfo7BitmapsEv @ 22 NONAME
+	_ZNK13CSifUiAppInfo7VersionEv @ 23 NONAME
+	_ZNK21CSifUiCertificateInfo12ExternalizeLER12RWriteStream @ 24 NONAME
+	_ZTI13CSifUiAppInfo @ 25 NONAME
+	_ZTI13CSifUiPrivate @ 26 NONAME
+	_ZTI21CSifUiCertificateInfo @ 27 NONAME
+	_ZTI6CSifUi @ 28 NONAME
+	_ZTV13CSifUiAppInfo @ 29 NONAME
+	_ZTV13CSifUiPrivate @ 30 NONAME
+	_ZTV21CSifUiCertificateInfo @ 31 NONAME
+	_ZTV6CSifUi @ 32 NONAME
 

--- a/appinstall_plat/sifui_api/group/sifui.mmp	Thu May 27 12:58:35 2010 +0300
+++ b/appinstall_plat/sifui_api/group/sifui.mmp	Fri Jun 11 13:45:18 2010 +0300
@@ -38,9 +38,12 @@
 
 LIBRARY         euser.lib       // User
 LIBRARY         HbCore.lib      // CHbDeviceDialog
+LIBRARY         HbWidgets.lib   // CHbDeviceNotificationDialogSymbian 
 LIBRARY         apgrfx.lib      // CApaMaskedBitmap
 LIBRARY         fbscli.lib      // CFbsBitmap
 LIBRARY         bafl.lib        // CDesC16ArrayFlat
 LIBRARY         efsrv.lib       // RFs
 LIBRARY         estor.lib       // RBufWriteStream
 
+SMPSAFE
+

--- a/appinstall_plat/sifui_api/inc/sifui.h	Thu May 27 12:58:35 2010 +0300
+++ b/appinstall_plat/sifui_api/inc/sifui.h	Fri Jun 11 13:45:18 2010 +0300
@@ -64,7 +64,7 @@
         /**
          * Destructor.
          */
-        CSifUi::~CSifUi();
+        ~CSifUi();
 
     public:     // new functions
         /**
@@ -119,12 +119,40 @@
          * Updates the progress bar value displayed in progress note. Initially progress bar
          * shows 0%. Each aIncrement increases the value displayed in progress bar. When all
          * increments reach the final value defined in ShowProgressNoteL() method, then the
-         * progress bar shows full 100%.
+         * progress bar shows full 100%. Caller should check using IsCancelled() method if
+         * the user has cancelled the progress note before updating the progress bar value.
          * @param aIncrement - progress bar value increment
          */
         IMPORT_C void IncreaseProgressBarValueL( TInt aIncrement );
 
         /**
+         * Returns ETrue if the user has cancelled the progress dialog.
+         * @return TBool - ETrue if the progress dialog has been cancelled
+         */
+        IMPORT_C TBool IsCancelled();
+
+        /**
+         * Toolbar buttons in progress and complete notes that can be disabled/hidden.
+         */
+        enum TOptionalButton
+            {
+            EHideProgressButton,
+            ECancelProgressButton,
+            EShowInAppLibButton,
+            EErrorDetailsButton
+            };
+
+        /**
+         * Hides or shows optional toolbar buttons from installation progress note
+         * or installation complete note. All optional buttos are visible by default.
+         * Buttons visibility becomes effective in the next ShowProgressL(),
+         * ShowCompleteL(), or IncreseProgressBarValueL() method calls.
+         * @param aButton - button which visibility is changed
+         * @param aIsVisible - EFalse if button needs to be hidden
+         */
+        IMPORT_C void SetButtonVisible( TOptionalButton aButton, TBool aIsVisible );
+
+        /**
          * Displays main installation complete note. Installation complete note contains
          * button to launch the application libaray to show the recently installed apps.
          */
@@ -140,24 +168,6 @@
         IMPORT_C void ShowFailedL( TInt aErrorCode, const TDesC& aErrorMessage,
             const TDesC& aErrorDetails = KNullDesC );
 
-
-
-        /** DEPRECATED -- DO NOT USE -- WILL BE REMOVED */
-        enum TMode {
-            EUnspecified = 0,
-            EInstalling = 1,
-            EUninstalling = 2
-        };
-        IMPORT_C void SetMode( TMode aMode );
-        IMPORT_C TMode Mode();
-        IMPORT_C void ShowFailedL( TInt aErrorCode );
-        IMPORT_C void SetCertificateInfoL(
-                const RPointerArray<Swi::CCertificateInfo>& aCertificates );
-        IMPORT_C TBool ShowConfirmationL( const Swi::CAppInfo& aAppInfo,
-                TInt aAppSize = 0, const CApaMaskedBitmap* aAppIcon = NULL );
-        IMPORT_C void ShowProgressL( const Swi::CAppInfo& aAppInfo,
-                 TInt aAppSize, TInt aProgressBarFinalValue );
-
     private:    // new functions
         CSifUi();
         void ConstructL();

--- a/appinstall_plat/sifui_api/inc/sifuiappinfo.h	Thu May 27 12:58:35 2010 +0300
+++ b/appinstall_plat/sifui_api/inc/sifuiappinfo.h	Fri Jun 11 13:45:18 2010 +0300
@@ -63,6 +63,13 @@
                 const CApaMaskedBitmap* aAppIcon );
 
         /**
+         * Creates new CSifUiAppInfo object by copying existing object.
+         * @param aAppInfo - application info to copy
+         * @returns CSifUiAppInfo* -- new CSifUiAppInfo object
+         */
+        IMPORT_C static CSifUiAppInfo* NewL( const CSifUiAppInfo& aAppInfo );
+
+        /**
          * Destructor.
          */
         ~CSifUiAppInfo();
@@ -110,6 +117,7 @@
         void ConstructL( const TDesC& aAppName, const TDesC& aAppVendor,
                 const TVersion& aAppVersion, TInt aAppSize,
                 const CApaMaskedBitmap* aAppIcon );
+        void ConstructL( const CSifUiAppInfo& aAppInfo );
 
     private:    // data
         HBufC* iAppName;

--- a/appinstall_plat/sifui_api/inc/sifuidefs.h	Thu May 27 12:58:35 2010 +0300
+++ b/appinstall_plat/sifui_api/inc/sifuidefs.h	Fri Jun 11 13:45:18 2010 +0300
@@ -20,11 +20,11 @@
 
 // SifUi plugin literal and variant map key names defined as _LIT macros.
 // Note that _LIT macros defined in this file must match to the definitions
-// in sifuidevicedialogdefinitions.h file. This header is used in Symbian
-// code since Symbian code requires 16-bit descriptors, and definitions in
-// Qt side (in sifuidevicedialogdefinitions.h) are 8-bit wide.
+// in sifuidevicedialogdefinitions.h and sifuiinstallindicatorparams.h files.
+// Symbian code needs descriptor constants, as Qt code uses QString constants.
 
 _LIT( KSifUiDeviceDialog, "com.nokia.sifui/1.0" );
+_LIT( KSifUiInstallIndicatorType, "com.nokia.sifui.indi/1.0" );
 
 enum TSifUiDeviceDialogType
     {
@@ -34,11 +34,18 @@
     ESifUiErrorNote = 4
     };
 
+enum TSifUiDeviceDialogReturnValue
+    {
+    ESifUiContinue = 0,
+    ESifUiCancel = 1,
+    ESifUiIndicator = 3
+    };
+
 // Variant map keys for dialog type and title (common to all dialog types)
 _LIT( KSifUiDialogType, "type" );                   // enum TSifUiDeviceDialogType
 
 // Variant map keys for device dialog return values
-_LIT( KSifUiQueryAccepted, "accept" );              // boolean
+_LIT( KSifUiQueryReturnValue, "ret" );              // enum TSifUiDeviceDialogReturnValue
 _LIT( KSifUiSelectedMemory, "drv" );                // drive letter
 
 // Variant map keys for "confirmation query" dialog parameters
@@ -56,6 +63,12 @@
 _LIT( KSifUiProgressNoteFinalValue, "fin" );        // integer
 _LIT( KSifUiProgressNoteValue, "val" );             // integer
 
+// Variant map keys for "progress note" and "installation complete note" buttons
+_LIT( KSifUiProgressNoteIsHideButtonHidden, "hidebtn" );        // boolean
+_LIT( KSifUiProgressNoteIsCancelButtonHidden, "cancelbtn" );    // boolean
+_LIT( KSifUiCompleteNoteIsShowButtonHidden, "showbtn" );        // boolean
+_LIT( KSifUiErrorNoteIsDetailsButtonHidden, "errdtlbtn" );      // boolean
+
 // Variant map keys for "error" dialog parameters
 _LIT( KSifUiErrorCode, "err" );                     // integer
 _LIT( KSifUiErrorMessage, "msg" );                  // string

--- a/appinstall_plat/sifui_api/inc/sifuiprivate.h	Thu May 27 12:58:35 2010 +0300
+++ b/appinstall_plat/sifui_api/inc/sifuiprivate.h	Fri Jun 11 13:45:18 2010 +0300
@@ -20,15 +20,14 @@
 
 #include <e32base.h>                            // CActive
 #include <hb/hbcore/hbdevicedialogsymbian.h>    // MHbDeviceDialogObserver
+#include <hb/hbcore/hbindicatorsymbian.h>       // MHbIndicatorSymbianObserver
 #include <bamdesca.h>                           // MDesCArray
+#include <sifui.h>                              // CSifUi::TOptionalButtons
+#include <sifuidefs.h>                          // TSifUiDeviceDialogType
 
-class CHbDeviceDialog;
 class CHbSymbianVariantMap;
 class CHbSymbianVariant;
 class CActiveSchedulerWait;
-class CApaMaskedBitmap;
-class CSifUiCertificateInfo;
-class CSifUiAppInfo;
 
 namespace Swi {
     class CAppInfo;
@@ -39,11 +38,12 @@
  * Private part of the SIF UI API.
  * Only CSifUi class should use CSifUiPrivate class.
  */
-class CSifUiPrivate : public CActive, public MHbDeviceDialogObserver
+class CSifUiPrivate : public CActive, public MHbDeviceDialogObserver,
+        public MHbIndicatorSymbianObserver
     {
     public:     // constructor and destructor
         static CSifUiPrivate* NewL();
-        CSifUiPrivate::~CSifUiPrivate();
+        ~CSifUiPrivate();
 
     public:     // new functions
         TBool ShowConfirmationL( const CSifUiAppInfo& aAppInfo );
@@ -52,6 +52,8 @@
         void SetCertificateInfoL( const RPointerArray<CSifUiCertificateInfo>& aCertificates );
         void ShowProgressL( const CSifUiAppInfo& aAppInfo, TInt aProgressBarFinalValue );
         void IncreaseProgressBarValueL( TInt aIncrement );
+        TBool IsCancelled();
+        void SetButtonVisible( CSifUi::TOptionalButton aButton, TBool aIsVisible );
         void ShowCompleteL();
         void ShowFailedL( TInt aErrorCode, const TDesC& aErrorMessage,
                 const TDesC& aErrorDetails );
@@ -64,6 +66,9 @@
         void DataReceived( CHbSymbianVariantMap& aData );
         void DeviceDialogClosed( TInt aCompletionCode );
 
+    private:    // from MHbIndicatorSymbianObserver
+        void IndicatorUserActivated( const TDesC& aType, CHbSymbianVariantMap& aData );
+
     private:    // new functions
         CSifUiPrivate();
         void ConstructL();
@@ -74,23 +79,42 @@
         void AddParamL( const TDesC& aKey, const TDesC& aValue );
         void AddParamListL( const TDesC& aKey, const MDesCArray& aList );
         void AddParamsAppInfoL( const CSifUiAppInfo& aAppInfo );
-        void AddParamsIconL( const CApaMaskedBitmap* aIcon );
+        void AddParamsCertificatesL();
+        void AddParamsHiddenButtonsL();
+        void ResendAllInstallationDetailsL();
+        void ActivateInstallIndicatorL();
+        void UpdateInstallIndicatorProgressL();
+        void CloseInstallIndicator();
+        TBool IsIndicatorActive();
+        void ShowInstallIndicatorCompleteL( TInt aErrorCode );
+        void UpdateDialogAndWaitForResponseL();
+        void UpdateDialogOrIndicatorWithoutWaitingL();
+        void CompleteDialogOrIndicatorAndWaitForResponseL( TInt aErrorCode );
         void DisplayDeviceDialogL();
-        TInt WaitForResponse();
-        void ResponseReceived( TInt aCompletionCode );
+        void WaitForResponseL();
+        void WaitedResponseReceived( TInt aCompletionCode );
 
     private:    // data
         CHbDeviceDialogSymbian* iDeviceDialog;
+        CHbIndicatorSymbian* iIndicator;
         CHbSymbianVariantMap* iVariantMap;
         CActiveSchedulerWait* iWait;
         TBool iIsDisplayingDialog;
-        TInt iCompletionCode;
-        TInt iReturnValue;
-        CApaMaskedBitmap* iBitmap;
+        TBool iIsFirstTimeToDisplay;
+        TInt iWaitCompletionCode;
+        TInt iDialogReturnValue;
+        TSifUiDeviceDialogType iDialogType;
+        CSifUiAppInfo* iAppInfo;
+        CBufBase* iCertificateBuffer;
         HBufC* iSelectableDrives;
         TBool iSelectedDriveSet;
         TChar iSelectedDrive;
-        CHbSymbianVariant* iCertificateInfo;
+        TInt iProgressBarFinalValue;
+        TInt iProgressBarCurrentValue;
+        TBool iNoHideProgressButton;
+        TBool iNoCancelProgressButton;
+        TBool iNoShowInAppLibButton;
+        TBool iNoErrorDetailsButton;
     };
 
 

--- a/appinstall_plat/sifui_api/src/sifui.cpp	Thu May 27 12:58:35 2010 +0300
+++ b/appinstall_plat/sifui_api/src/sifui.cpp	Fri Jun 11 13:45:18 2010 +0300
@@ -18,10 +18,6 @@
 #include "sifui.h"                              // CSifUi
 #include "sifuiprivate.h"                       // CSifUiPrivate
 
-// TODO: remove
-#include <swi/msisuihandlers.h>                 // Swi::CAppInfo
-#include "sifuiappinfo.h"                       // CSifUiAppInfo
-
 
 // ======== MEMBER FUNCTIONS ========
 
@@ -114,6 +110,24 @@
     }
 
 // ---------------------------------------------------------------------------
+// CSifUi::IsCancelled()
+// ---------------------------------------------------------------------------
+//
+EXPORT_C TBool CSifUi::IsCancelled()
+    {
+    return iPrivate->IsCancelled();
+    }
+
+// ---------------------------------------------------------------------------
+// CSifUi::SetButtonVisible()
+// ---------------------------------------------------------------------------
+//
+EXPORT_C void CSifUi::SetButtonVisible( TOptionalButton aButton, TBool aIsVisible )
+    {
+    iPrivate->SetButtonVisible( aButton, aIsVisible );
+    }
+
+// ---------------------------------------------------------------------------
 // CSifUi::ShowCompleteL()
 // ---------------------------------------------------------------------------
 //
@@ -151,47 +165,3 @@
 
 
 
-
-// DEPRECATED FUNCTIONS -- TO BE REMOVED
-
-EXPORT_C void CSifUi::SetMode( TMode /*aMode*/ )
-    {
-    User::Invariant();
-    }
-
-EXPORT_C CSifUi::TMode CSifUi::Mode()
-    {
-    User::Invariant();
-    return EUnspecified;
-    }
-
-EXPORT_C void CSifUi::ShowFailedL( TInt /*aErrorCode*/ )
-    {
-    User::Invariant();
-    }
-
-EXPORT_C void CSifUi::SetCertificateInfoL(
-        const RPointerArray<Swi::CCertificateInfo>& /*aCertificates*/ )
-    {
-    User::Invariant();
-    }
-
-EXPORT_C TBool CSifUi::ShowConfirmationL( const Swi::CAppInfo& aAppInfo,
-    TInt aAppSize, const CApaMaskedBitmap* aAppIcon )
-    {
-    CSifUiAppInfo* appInfo = CSifUiAppInfo::NewLC( aAppInfo.AppName(),
-            aAppInfo.AppVendor(), aAppInfo.AppVersion(), aAppSize, aAppIcon );
-    TBool retVal = iPrivate->ShowConfirmationL( *appInfo );
-    CleanupStack::PopAndDestroy( appInfo );
-    return retVal;
-    }
-
-EXPORT_C void CSifUi::ShowProgressL( const Swi::CAppInfo& aAppInfo,
-        TInt aAppSize, TInt aProgressBarFinalValue )
-    {
-    CSifUiAppInfo* appInfo = CSifUiAppInfo::NewLC( aAppInfo.AppName(),
-            aAppInfo.AppVendor(), aAppInfo.AppVersion(), aAppSize, NULL );
-    iPrivate->ShowProgressL( *appInfo, aProgressBarFinalValue );
-    CleanupStack::PopAndDestroy( appInfo );
-    }
-

--- a/appinstall_plat/sifui_api/src/sifuiappinfo.cpp	Thu May 27 12:58:35 2010 +0300
+++ b/appinstall_plat/sifui_api/src/sifuiappinfo.cpp	Fri Jun 11 13:45:18 2010 +0300
@@ -32,7 +32,7 @@
     aStream.WriteL( buffer );
     }
 
-void WriteBitmapsToStreamL( RWriteStream& /*aStream*/, const CApaMaskedBitmap& /*aIcon*/ )
+void WriteBitmapsToStreamL( RWriteStream& /*aStream*/, const CApaMaskedBitmap* /*aIcon*/ )
     {
     // TODO: implement
     }
@@ -69,6 +69,19 @@
     }
 
 // ---------------------------------------------------------------------------
+// CSifUiAppInfo::NewL()
+// ---------------------------------------------------------------------------
+//
+EXPORT_C CSifUiAppInfo* CSifUiAppInfo::NewL( const CSifUiAppInfo& aAppInfo )
+    {
+    CSifUiAppInfo* self = new ( ELeave ) CSifUiAppInfo;
+    CleanupStack::PushL( self );
+    self->ConstructL( aAppInfo );
+    CleanupStack::Pop( self );
+    return self;
+    }
+
+// ---------------------------------------------------------------------------
 // CSifUiAppInfo::~CSifUiAppInfo()
 // ---------------------------------------------------------------------------
 //
@@ -142,10 +155,7 @@
     WriteBufToStreamL( aStream, *iAppVendor );
     WriteVersionToStreamL( aStream, iAppVersion );
     aStream.WriteInt32L( iAppSize );
-    if( iAppIcon )
-        {
-        WriteBitmapsToStreamL( aStream, *iAppIcon );
-        }
+    WriteBitmapsToStreamL( aStream, iAppIcon );
     }
 
 // ---------------------------------------------------------------------------
@@ -173,3 +183,19 @@
         }
     }
 
+// ---------------------------------------------------------------------------
+// CSifUiAppInfo::ConstructL()
+// ---------------------------------------------------------------------------
+//
+void CSifUiAppInfo::ConstructL( const CSifUiAppInfo& aAppInfo )
+    {
+    iAppName = aAppInfo.Name().AllocL();
+    iAppVendor = aAppInfo.Vendor().AllocL();
+    iAppVersion = aAppInfo.iAppVersion;
+    iAppSize = aAppInfo.iAppSize;
+    if( aAppInfo.iAppIcon )
+        {
+        iAppIcon = CApaMaskedBitmap::NewL( aAppInfo.iAppIcon );
+        }
+    }
+

--- a/appinstall_plat/sifui_api/src/sifuiprivate.cpp	Thu May 27 12:58:35 2010 +0300
+++ b/appinstall_plat/sifui_api/src/sifuiprivate.cpp	Fri Jun 11 13:45:18 2010 +0300
@@ -16,15 +16,22 @@
 */
 
 #include "sifuiprivate.h"                       // CSifUiPrivate
-#include "sifuidefs.h"                          // SIF UI device dialog parameters
 #include "sifuicertificateinfo.h"               // CSifUiCertificateInfo
 #include "sifuiappinfo.h"                       // CSifUiAppInfo
 #include <hb/hbcore/hbsymbianvariant.h>         // CHbSymbianVariantMap
+#include <hb/hbwidgets/hbdevicenotificationdialogsymbian.h> // CHbDeviceNotificationDialogSymbian
 #include <apgicnfl.h>                           // CApaMaskedBitmap
 #include <s32mem.h>                             // RDesReadStream
+#include <e32property.h>                        // RProperty
 
 const TInt KDriveLettersLen = 32;
 const TInt KCertificateBufferGranularity = 1024;
+const TInt KProgFull = 100;                     // 100%
+
+const TUid KInstallIndicatorCategory = { 0x20022FC5 };
+const TUint KInstallIndicatorStatus = 0x2002E690;
+
+_LIT( KSifUiDefaultApplicationIcon, "qtg_large_application" );
 
 
 // ======== MEMBER FUNCTIONS ========
@@ -52,9 +59,10 @@
     delete iWait;
     delete iDeviceDialog;
     delete iVariantMap;
-    delete iBitmap;
+    delete iIndicator;
+    delete iAppInfo;
     delete iSelectableDrives;
-    delete iCertificateInfo;
+    delete iCertificateBuffer;
     }
 
 // ---------------------------------------------------------------------------
@@ -70,15 +78,10 @@
         {
         AddParamL( KSifUiMemorySelection, *iSelectableDrives );
         }
-    if( iCertificateInfo )
-        {
-        User::LeaveIfError( VariantMapL()->Add( KSifUiCertificates, iCertificateInfo ) );
-        iCertificateInfo = NULL;
-        }
+    AddParamsCertificatesL();
 
-    DisplayDeviceDialogL();
-    User::LeaveIfError( WaitForResponse() );
-    return( iReturnValue == KErrNone );
+    UpdateDialogAndWaitForResponseL();
+    return( iDialogReturnValue == KErrNone );
     }
 
 // ---------------------------------------------------------------------------
@@ -132,16 +135,15 @@
 void CSifUiPrivate::SetCertificateInfoL(
         const RPointerArray<CSifUiCertificateInfo>& aCertificates )
     {
-    if( iCertificateInfo )
+    if( iCertificateBuffer )
         {
-        delete iCertificateInfo;
-        iCertificateInfo = NULL;
+        delete iCertificateBuffer;
+        iCertificateBuffer = NULL;
         }
     if( aCertificates.Count() )
         {
-        CBufBase* buf = CBufFlat::NewL( KCertificateBufferGranularity );
-        CleanupStack::PushL( buf );
-        RBufWriteStream writeStream( *buf );
+        iCertificateBuffer = CBufFlat::NewL( KCertificateBufferGranularity );
+        RBufWriteStream writeStream( *iCertificateBuffer );
         CleanupClosePushL( writeStream );
 
         TInt32 count = aCertificates.Count();
@@ -151,10 +153,7 @@
            aCertificates[ index ]->ExternalizeL( writeStream );
            }
 
-        const TPtrC8 dataPtr( buf->Ptr( 0 ).Ptr(), buf->Size() );
-        iCertificateInfo = CHbSymbianVariant::NewL( &dataPtr, CHbSymbianVariant::EBinary );
-
-        CleanupStack::PopAndDestroy( 2, buf );  // writeStream, buf
+        CleanupStack::PopAndDestroy( &writeStream );
         }
     }
 
@@ -169,8 +168,10 @@
 
     AddParamsAppInfoL( aAppInfo );
     AddParamL( KSifUiProgressNoteFinalValue, aProgressBarFinalValue );
+    iProgressBarFinalValue = aProgressBarFinalValue;
+    AddParamsHiddenButtonsL();
 
-    DisplayDeviceDialogL();
+    UpdateDialogOrIndicatorWithoutWaitingL();
     }
 
 // ---------------------------------------------------------------------------
@@ -182,8 +183,44 @@
     ChangeNoteTypeL( ESifUiProgressNote );
 
     AddParamL( KSifUiProgressNoteValue, aNewValue );
+    iProgressBarCurrentValue += aNewValue;
+    AddParamsHiddenButtonsL();
 
-    DisplayDeviceDialogL();
+    UpdateDialogOrIndicatorWithoutWaitingL();
+    }
+
+// ---------------------------------------------------------------------------
+// CSifUiPrivate::IsCancelled()
+// ---------------------------------------------------------------------------
+//
+TBool CSifUiPrivate::IsCancelled()
+    {
+    return( iDialogReturnValue == KErrCancel );
+    }
+
+// ---------------------------------------------------------------------------
+// CSifUiPrivate::SetButtonVisible()
+// ---------------------------------------------------------------------------
+//
+void CSifUiPrivate::SetButtonVisible( CSifUi::TOptionalButton aButton, TBool aIsVisible )
+    {
+    switch( aButton )
+        {
+        case CSifUi::EHideProgressButton:
+            iNoHideProgressButton = !aIsVisible;
+            break;
+        case CSifUi::ECancelProgressButton:
+            iNoCancelProgressButton = !aIsVisible;
+            break;
+        case CSifUi::EShowInAppLibButton:
+            iNoShowInAppLibButton = !aIsVisible;
+            break;
+        case CSifUi::EErrorDetailsButton:
+            iNoErrorDetailsButton = !aIsVisible;
+            break;
+        default:
+            break;
+        }
     }
 
 // ---------------------------------------------------------------------------
@@ -194,8 +231,9 @@
     {
     ChangeNoteTypeL( ESifUiCompleteNote );
 
-    DisplayDeviceDialogL();
-    User::LeaveIfError( WaitForResponse() );
+    AddParamsHiddenButtonsL();
+
+    CompleteDialogOrIndicatorAndWaitForResponseL( KErrNone );
     }
 
 // ---------------------------------------------------------------------------
@@ -214,8 +252,7 @@
         AddParamL( KSifUiErrorDetails, aErrorDetails );
         }
 
-    DisplayDeviceDialogL();
-    User::LeaveIfError( WaitForResponse() );
+    CompleteDialogOrIndicatorAndWaitForResponseL( aErrorCode );
     }
 
 // ---------------------------------------------------------------------------
@@ -226,7 +263,7 @@
     {
     if( iWait && iWait->IsStarted() && iWait->CanStopNow() )
         {
-        iCompletionCode = KErrCancel;
+        iWaitCompletionCode = KErrCancel;
         iWait->AsyncStop();
         }
     }
@@ -256,19 +293,36 @@
         iSelectedDriveSet = ETrue;
         }
 
-    const CHbSymbianVariant* acceptedVariant = aData.Get( KSifUiQueryAccepted );
-    if( acceptedVariant )
+    const CHbSymbianVariant* variant = aData.Get( KSifUiQueryReturnValue );
+    if( variant )
         {
-        TBool* acceptedValue = acceptedVariant->Value<TBool>();
-        if( acceptedValue && *acceptedValue )
+        TInt* value = variant->Value<TInt>();
+        if( value )
             {
-            iReturnValue = KErrNone;
+            TSifUiDeviceDialogReturnValue returnValue =
+                    static_cast<TSifUiDeviceDialogReturnValue>( *value );
+            switch( returnValue )
+                {
+                case ESifUiContinue:
+                    iDialogReturnValue = KErrNone;
+                    WaitedResponseReceived( KErrNone );
+                    break;
+                case ESifUiCancel:
+                    iDialogReturnValue = KErrCancel;
+                    WaitedResponseReceived( KErrNone );
+                    break;
+                case ESifUiIndicator:
+                    ActivateInstallIndicatorL();
+                    break;
+                default:
+                    __ASSERT_DEBUG( EFalse, User::Invariant() );
+                    break;
+                }
             }
         else
             {
-            iReturnValue = KErrCancel;
+            __ASSERT_DEBUG( EFalse, User::Invariant() );
             }
-        ResponseReceived( KErrNone );
         }
     }
 
@@ -279,14 +333,29 @@
 void CSifUiPrivate::DeviceDialogClosed( TInt aCompletionCode )
     {
     iIsDisplayingDialog = EFalse;
-    ResponseReceived( aCompletionCode );
+    WaitedResponseReceived( aCompletionCode );
+    }
+
+// ---------------------------------------------------------------------------
+// CSifUiPrivate::IndicatorUserActivated()
+// ---------------------------------------------------------------------------
+//
+void CSifUiPrivate::IndicatorUserActivated( const TDesC& aType,
+        CHbSymbianVariantMap& /*aData*/ )
+    {
+    if( aType == KSifUiInstallIndicatorType )
+        {
+        CloseInstallIndicator();
+        TRAP_IGNORE( DisplayDeviceDialogL() );
+        }
     }
 
 // ---------------------------------------------------------------------------
 // CSifUiPrivate::CSifUiPrivate()
 // ---------------------------------------------------------------------------
 //
-CSifUiPrivate::CSifUiPrivate() : CActive( CActive::EPriorityStandard )
+CSifUiPrivate::CSifUiPrivate() : CActive( CActive::EPriorityStandard ),
+        iIsFirstTimeToDisplay( ETrue )
     {
     CActiveScheduler::Add( this );
     }
@@ -298,7 +367,8 @@
 void CSifUiPrivate::ConstructL()
     {
     iWait = new( ELeave ) CActiveSchedulerWait;
-    // iDeviceDialog is allocated later, first call of DisplayDeviceDialogL()
+    // iDeviceDialog is created later, in the first call of DisplayDeviceDialogL()
+    // iIndicator is also created later, in the first call of ActivateInstallIndicator()
     }
 
 // ---------------------------------------------------------------------------
@@ -335,6 +405,7 @@
     {
     ClearParams();
     AddParamL( KSifUiDialogType, aType );
+    iDialogType = static_cast< TSifUiDeviceDialogType >( aType );
     }
 
 // ---------------------------------------------------------------------------
@@ -376,7 +447,6 @@
 //
 void CSifUiPrivate::AddParamsAppInfoL( const CSifUiAppInfo& aAppInfo )
     {
-    // TODO: icons missing, could use binary transfer as in certificates
     AddParamL( KSifUiApplicationName, aAppInfo.Name() );
     const TVersion& version( aAppInfo.Version() );
     if( version.iBuild || version.iMajor || version.iMinor )
@@ -391,32 +461,238 @@
         {
         AddParamL( KSifUiApplicationSize, aAppInfo.Size() );
         }
+    // TODO: icons missing, could use binary transfer as in certificates
+
+    if( iAppInfo != &aAppInfo )
+        {
+        if( iAppInfo )
+            {
+            delete iAppInfo;
+            iAppInfo = NULL;
+            }
+        iAppInfo = CSifUiAppInfo::NewL( aAppInfo );
+        }
+    }
+
+// ---------------------------------------------------------------------------
+// CSifUiPrivate::AddParamsCertificatesL()
+// ---------------------------------------------------------------------------
+//
+void CSifUiPrivate::AddParamsCertificatesL()
+    {
+    if( iCertificateBuffer )
+        {
+        const TPtrC8 dataPtr( iCertificateBuffer->Ptr( 0 ).Ptr(),
+                iCertificateBuffer->Size() );
+        CHbSymbianVariant* certificates = CHbSymbianVariant::NewL( &dataPtr,
+                CHbSymbianVariant::EBinary );
+        CleanupStack::PushL( certificates );
+        User::LeaveIfError( VariantMapL()->Add( KSifUiCertificates, certificates ) );
+        CleanupStack::Pop( certificates );
+        }
+    }
+
+// ---------------------------------------------------------------------------
+// CSifUiPrivate::AddParamsHiddenButtonsL()
+// ---------------------------------------------------------------------------
+//
+void CSifUiPrivate::AddParamsHiddenButtonsL()
+    {
+    CHbSymbianVariant* variant = NULL;
+    if( iNoHideProgressButton )
+        {
+        variant = CHbSymbianVariant::NewL( &iNoHideProgressButton, CHbSymbianVariant::EBool );
+        TInt err = VariantMapL()->Add( KSifUiProgressNoteIsHideButtonHidden, variant );
+        User::LeaveIfError( err );
+        }
+    if( iNoCancelProgressButton )
+        {
+        variant = CHbSymbianVariant::NewL( &iNoCancelProgressButton, CHbSymbianVariant::EBool );
+        TInt err = VariantMapL()->Add( KSifUiProgressNoteIsCancelButtonHidden, variant );
+        User::LeaveIfError( err );
+        }
+    if( iNoShowInAppLibButton )
+        {
+        variant = CHbSymbianVariant::NewL( &iNoShowInAppLibButton, CHbSymbianVariant::EBool );
+        TInt err = VariantMapL()->Add( KSifUiCompleteNoteIsShowButtonHidden, variant );
+        User::LeaveIfError( err );
+        }
+    if( iNoErrorDetailsButton )
+        {
+        variant = CHbSymbianVariant::NewL( &iNoErrorDetailsButton, CHbSymbianVariant::EBool );
+        TInt err = VariantMapL()->Add( KSifUiErrorNoteIsDetailsButtonHidden, variant );
+        User::LeaveIfError( err );
+        }
+    }
+
+// ---------------------------------------------------------------------------
+// CSifUiPrivate::ResendAllInstallationDetailsL()
+// ---------------------------------------------------------------------------
+//
+void CSifUiPrivate::ResendAllInstallationDetailsL()
+    {
+    AddParamL( KSifUiDialogType, iDialogType );
+    if( iAppInfo )
+        {
+        AddParamsAppInfoL( *iAppInfo );
+        }
+    AddParamsCertificatesL();
+    // TODO: AddParamsIconL();
+    AddParamsHiddenButtonsL();
+    }
+
+// ---------------------------------------------------------------------------
+// CSifUiPrivate::ActivateInstallIndicatorL()
+// ---------------------------------------------------------------------------
+//
+void CSifUiPrivate::ActivateInstallIndicatorL()
+    {
+    if( !iIndicator )
+        {
+        iIndicator = CHbIndicatorSymbian::NewL();
+        iIndicator->SetObserver( this );
+        }
+
+    if( iAppInfo && iAppInfo->Name().Length() )
+        {
+        CHbSymbianVariant* param = NULL;
+        TPtrC appName = iAppInfo->Name();
+        param = CHbSymbianVariant::NewL( &appName, CHbSymbianVariant::EDes );
+        CleanupStack::PushL( param );
+        iIndicator->Activate( KSifUiInstallIndicatorType, param );
+        CleanupStack::PopAndDestroy( param );
+        }
+    else
+        {
+        iIndicator->Activate( KSifUiInstallIndicatorType );
+        }
     }
 
 // ---------------------------------------------------------------------------
-// CSifUiPrivate::AddParamsIconL()
+// CSifUiPrivate::UpdateInstallIndicatorProgressL()
+// ---------------------------------------------------------------------------
+//
+void CSifUiPrivate::UpdateInstallIndicatorProgressL()
+    {
+    if( iProgressBarFinalValue )
+        {
+        CHbSymbianVariant* param = NULL;
+        TInt progressPercent = KProgFull * iProgressBarCurrentValue / iProgressBarFinalValue;
+        param = CHbSymbianVariant::NewL( &progressPercent, CHbSymbianVariant::EInt );
+        CleanupStack::PushL( param );
+        iIndicator->Activate( KSifUiInstallIndicatorType, param );
+        CleanupStack::PopAndDestroy( param );
+        }
+    }
+
+// ---------------------------------------------------------------------------
+// CSifUiPrivate::CloseInstallIndicator()
+// ---------------------------------------------------------------------------
+//
+void CSifUiPrivate::CloseInstallIndicator()
+    {
+    if( iIndicator )
+        {
+        iIndicator->Deactivate( KSifUiInstallIndicatorType );
+        delete iIndicator;
+        iIndicator = NULL;
+        }
+    }
+
+// ---------------------------------------------------------------------------
+// CSifUiPrivate::IsIndicatorActive()
+// ---------------------------------------------------------------------------
+//
+TBool CSifUiPrivate::IsIndicatorActive()
+    {
+    TBool isActive = EFalse;
+
+    if( iIndicator )
+        {
+        TInt value = 0;
+        TInt err = RProperty::Get( KInstallIndicatorCategory, KInstallIndicatorStatus,
+            value );
+        if( !err )
+            {
+            isActive = ( value > 0 );
+            }
+        }
+
+    return isActive;
+    }
+
+// ---------------------------------------------------------------------------
+// CSifUiPrivate::ShowInstallIndicatorCompleteL()
 // ---------------------------------------------------------------------------
 //
-void CSifUiPrivate::AddParamsIconL( const CApaMaskedBitmap* aIcon )
+void CSifUiPrivate::ShowInstallIndicatorCompleteL( TInt aErrorCode )
     {
-    // TODO: remove this function
-    if( aIcon )
+    CHbDeviceNotificationDialogSymbian* completeNote =
+            CHbDeviceNotificationDialogSymbian::NewL();
+    CleanupStack::PushL( completeNote );
+    completeNote->SetIconNameL( KSifUiDefaultApplicationIcon );
+    if( aErrorCode == KErrNone )
+        {
+        // TODO: use HbTextResolverSymbian to get localized text
+        _LIT( KInstalled, "Installed" );
+        completeNote->SetTitleL( KInstalled );
+        }
+    else
         {
-        if( iBitmap )
+        // TODO: use HbTextResolverSymbian to get localized text
+        _LIT( KInstallationFailed, "Installation failed" );
+        completeNote->SetTitleL( KInstallationFailed );
+        }
+    completeNote->ShowL();
+    CleanupStack::PopAndDestroy( completeNote );
+    }
+
+// ---------------------------------------------------------------------------
+// CSifUiPrivate::UpdateDialogAndWaitForResponseL()
+// ---------------------------------------------------------------------------
+//
+void CSifUiPrivate::UpdateDialogAndWaitForResponseL()
+    {
+    CloseInstallIndicator();
+    DisplayDeviceDialogL();
+    WaitForResponseL();
+    }
+
+// ---------------------------------------------------------------------------
+// CSifUiPrivate::UpdateDialogOrIndicatorWithoutWaitingL()
+// ---------------------------------------------------------------------------
+//
+void CSifUiPrivate::UpdateDialogOrIndicatorWithoutWaitingL()
+    {
+    if( IsIndicatorActive() )
+        {
+        UpdateInstallIndicatorProgressL();
+        }
+    else
+        {
+        DisplayDeviceDialogL();
+        }
+    }
+
+// ---------------------------------------------------------------------------
+// CSifUiPrivate::CompleteDialogOrIndicatorAndWaitForResponseL()
+// ---------------------------------------------------------------------------
+//
+void CSifUiPrivate::CompleteDialogOrIndicatorAndWaitForResponseL( TInt aErrorCode )
+    {
+    if( !IsCancelled() )
+        {
+        if( IsIndicatorActive() )
             {
-            delete iBitmap;
-            iBitmap = NULL;
+            UpdateInstallIndicatorProgressL();
+            ShowInstallIndicatorCompleteL( aErrorCode );
+            CloseInstallIndicator();
             }
-        iBitmap = CApaMaskedBitmap::NewL( aIcon );
-
-        CHbSymbianVariantMap* map = VariantMapL();
-        CHbSymbianVariant* variant = NULL;
-        TInt bitmapHandle = iBitmap->Handle();
-        variant = CHbSymbianVariant::NewL( &bitmapHandle, CHbSymbianVariant::EInt );
-        User::LeaveIfError( map->Add( KSifUiApplicationIconHandle, variant ) );
-        TInt bitmapMaskHandle = iBitmap->Mask()->Handle();
-        variant = CHbSymbianVariant::NewL( &bitmapMaskHandle, CHbSymbianVariant::EInt );
-        User::LeaveIfError( map->Add( KSifUiApplicationIconMaskHandle, variant ) );
+        else
+            {
+            DisplayDeviceDialogL();
+            WaitForResponseL();
+            }
         }
     }
 
@@ -436,37 +712,42 @@
             {
             iDeviceDialog = CHbDeviceDialogSymbian::NewL();
             }
+        if( !iIsFirstTimeToDisplay )
+            {
+            ResendAllInstallationDetailsL();
+            }
         User::LeaveIfError( iDeviceDialog->Show( KSifUiDeviceDialog, *VariantMapL(), this ) );
         iIsDisplayingDialog = ETrue;
         }
+    iIsFirstTimeToDisplay = EFalse;
     }
 
 // ---------------------------------------------------------------------------
-// CSifUiPrivate::WaitForResponse()
+// CSifUiPrivate::WaitForResponseL()
 // ---------------------------------------------------------------------------
 //
-TInt CSifUiPrivate::WaitForResponse()
+void CSifUiPrivate::WaitForResponseL()
     {
-    iCompletionCode = KErrInUse;
-    iReturnValue = KErrUnknown;
+    iWaitCompletionCode = KErrInUse;    // changed in WaitedResponseReceived() or in DoCancel()
+    iDialogReturnValue = KErrUnknown;   // changed in DataReceived()
     if( !IsActive() && iWait && !iWait->IsStarted() )
         {
         iStatus = KRequestPending;
         SetActive();
         iWait->Start();
         }
-    return iCompletionCode;
+    User::LeaveIfError( iWaitCompletionCode );
     }
 
 // ---------------------------------------------------------------------------
-// CSifUiPrivate::ResponseReceived()
+// CSifUiPrivate::WaitedResponseReceived()
 // ---------------------------------------------------------------------------
 //
-void CSifUiPrivate::ResponseReceived( TInt aCompletionCode )
+void CSifUiPrivate::WaitedResponseReceived( TInt aCompletionCode )
     {
     if( IsActive() )
         {
-        iCompletionCode = aCompletionCode;
+        iWaitCompletionCode = aCompletionCode;
         TRequestStatus* status( &iStatus );
         User::RequestComplete( status, KErrNone );
         }

--- a/appinstall_plat/sifui_api/tsrc/conf/sifuitestscripter.cfg	Thu May 27 12:58:35 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-#
-# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description:  SifUi STIF TestScripter configuration file
-#
-
-[Test]
-title Startup and Shutdown
-[Endtest]
-

Binary file appinstall_plat/sifui_api/tsrc/data/mmc/test_x509_cert.cer has changed

--- a/appinstall_plat/sifui_api/tsrc/group/bld.inf	Thu May 27 12:58:35 2010 +0300
+++ b/appinstall_plat/sifui_api/tsrc/group/bld.inf	Fri Jun 11 13:45:18 2010 +0300
@@ -10,8 +10,8 @@
 * Nokia Corporation - initial contribution.
 *
 * Contributors:
-* 
-* Description:
+*
+* Description:  SifUi API test code
 *
 */
 
@@ -19,7 +19,12 @@
 DEFAULT
 
 PRJ_EXPORTS
-../init/sifuitestscripter.ini   /epoc32/winscw/c/testframework/sifuitestscripter.ini
+../init/sifuitest.ini           /epoc32/winscw/c/testframework/TestFramework.ini
+../data/mmc/test_x509_cert.cer  /epoc32/winscw/c/testing/data/test_x509_cert.cer
+../init/sifuitest.ini           /epoc32/data/z/system/data/TestFramework.ini
+
+// Note: data files may need to be copied manually from ../data/mmc to memory card e:/testing/data/
+// See sifuitest.pkg file for details (i.e. which files needs to be installed to run the tests).
 
 PRJ_TESTMMPFILES
 sifuitest.mmp

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appinstall_plat/sifui_api/tsrc/group/ctc_compile_tests.bat	Fri Jun 11 13:45:18 2010 +0300
@@ -0,0 +1,26 @@
+@echo off
+rem
+rem Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+rem All rights reserved.
+rem This component and the accompanying materials are made available
+rem under the terms of "Eclipse Public License v1.0"
+rem which accompanies this distribution, and is available
+rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
+rem
+rem Initial Contributors:
+rem Nokia Corporation - initial contribution.
+rem
+rem Contributors:
+rem
+rem Description:  Module tests for SIF UI API.
+rem
+
+echo ----------------------------------------------------------------------
+echo.
+echo Compiling module tests
+echo.
+echo ----------------------------------------------------------------------
+echo.
+call sbs reallyclean
+call sbs
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appinstall_plat/sifui_api/tsrc/group/ctc_instrument_code.bat	Fri Jun 11 13:45:18 2010 +0300
@@ -0,0 +1,32 @@
+@echo off
+rem
+rem Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+rem All rights reserved.
+rem This component and the accompanying materials are made available
+rem under the terms of "Eclipse Public License v1.0"
+rem which accompanies this distribution, and is available
+rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
+rem
+rem Initial Contributors:
+rem Nokia Corporation - initial contribution.
+rem
+rem Contributors:
+rem
+rem Description:  Module tests for SIF UI API.
+rem
+
+echo ----------------------------------------------------------------------
+echo.
+echo Instrumenting code (armv5 urel and winscw udeb, function coverage)
+echo.
+echo ----------------------------------------------------------------------
+echo.
+pushd ..\..\group
+if exist MON.sym del MON.sym
+if exist MON.dat del MON.dat
+if exist profile.txt del profile.txt
+call sbs reallyclean
+call ctcwrap -i f -2comp -C "EXCLUDE+*.UID.CPP" sbs -c armv5_urel
+call ctcwrap -i f -2comp -C "EXCLUDE+*.UID.CPP" sbs -c winscw_udeb
+popd
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appinstall_plat/sifui_api/tsrc/group/ctc_process_results.bat	Fri Jun 11 13:45:18 2010 +0300
@@ -0,0 +1,28 @@
+@echo off
+rem
+rem Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+rem All rights reserved.
+rem This component and the accompanying materials are made available
+rem under the terms of "Eclipse Public License v1.0"
+rem which accompanies this distribution, and is available
+rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
+rem
+rem Initial Contributors:
+rem Nokia Corporation - initial contribution.
+rem
+rem Contributors:
+rem
+rem Description:  Module tests for SIF UI API.
+rem
+
+echo ----------------------------------------------------------------------
+echo.
+echo Processing test results
+echo.
+echo ----------------------------------------------------------------------
+echo.
+pushd ..\..\group
+call ctcpost MON.sym MON.dat -p profile.txt
+call ctc2html -i profile.txt
+popd
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appinstall_plat/sifui_api/tsrc/group/ctc_remove_instrumentation.bat	Fri Jun 11 13:45:18 2010 +0300
@@ -0,0 +1,28 @@
+@echo off
+rem
+rem Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+rem All rights reserved.
+rem This component and the accompanying materials are made available
+rem under the terms of "Eclipse Public License v1.0"
+rem which accompanies this distribution, and is available
+rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
+rem
+rem Initial Contributors:
+rem Nokia Corporation - initial contribution.
+rem
+rem Contributors:
+rem
+rem Description:  Module tests for SIF UI API.
+rem
+
+echo ----------------------------------------------------------------------
+echo.
+echo Removing instrumentation
+echo.
+echo ----------------------------------------------------------------------
+echo.
+pushd ..\..\group
+call sbs reallyclean
+call sbs
+popd
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appinstall_plat/sifui_api/tsrc/group/ctc_run_tests.bat	Fri Jun 11 13:45:18 2010 +0300
@@ -0,0 +1,27 @@
+@echo off
+rem
+rem Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+rem All rights reserved.
+rem This component and the accompanying materials are made available
+rem under the terms of "Eclipse Public License v1.0"
+rem which accompanies this distribution, and is available
+rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
+rem
+rem Initial Contributors:
+rem Nokia Corporation - initial contribution.
+rem
+rem Contributors:
+rem
+rem Description:  Module tests for SIF UI API.
+rem
+
+echo ----------------------------------------------------------------------
+echo.
+echo Running module tests
+echo.
+echo ----------------------------------------------------------------------
+echo.
+echo Note that closing dialogs automatically is not implemented yet.
+echo.
+call \epoc32\release\winscw\udeb\ATSInterface.exe -testmodule sifuitest
+

--- a/appinstall_plat/sifui_api/tsrc/group/sifuitest.mmp	Thu May 27 12:58:35 2010 +0300
+++ b/appinstall_plat/sifui_api/tsrc/group/sifuitest.mmp	Fri Jun 11 13:45:18 2010 +0300
@@ -11,7 +11,7 @@
 *
 * Contributors:
 * 
-* Description: MMP file for RSifUi STIF test module.
+* Description:  SifUi API test code
 *
 */
 
@@ -38,4 +38,10 @@
 LIBRARY         stiftestinterface.lib               // STIF Framework
 LIBRARY         stiftestengine.lib                  // STIF Framework
 LIBRARY         sifui.lib                           // CSifUi
+LIBRARY         estor.lib                           // RBufWriteStream
+LIBRARY         uissclient.lib                      // Swi::CCertificateInfo
+LIBRARY         x509.lib                            // CX509Certificate
+LIBRARY         apgrfx.lib                          // RApaLsSession 
 
+SMPSAFE
+

--- a/appinstall_plat/sifui_api/tsrc/group/sifuitest.pkg	Thu May 27 12:58:35 2010 +0300
+++ b/appinstall_plat/sifui_api/tsrc/group/sifuitest.pkg	Fri Jun 11 13:45:18 2010 +0300
@@ -11,9 +11,7 @@
 ;
 ; Contributors:
 ; 
-; Description:
-;
-; 	Installation file for STIF
+; Description:  SifUi API test code installation file
 ;
 
 ; Languages
@@ -33,7 +31,7 @@
 :"Nokia"
 
 ; Install files
-"\epoc32\release\armv5\udeb\sifuitest.dll" - "c:\sys\bin\sifuitest.dll"
-"..\init\sifuitestscripter.ini" - "c:\TestFramework\sifuitestscripter.ini"
-"..\conf\sifuitestscripter.cfg" - "c:\TestFramework\sifuitestscripter.cfg"
+"\epoc32\release\armv5\udeb\sifuitest.dll"-"c:\sys\bin\sifuitest.dll"
+"..\init\sifuitestscripter.ini"-"c:\TestFramework\sifuitestscripter.ini"
+"..\data\mmc\test_x509_cert.cer"-"e:\testing\data\test_x509_cert.cer"
 

--- a/appinstall_plat/sifui_api/tsrc/group/sifuitest_nrm.mmp	Thu May 27 12:58:35 2010 +0300
+++ b/appinstall_plat/sifui_api/tsrc/group/sifuitest_nrm.mmp	Fri Jun 11 13:45:18 2010 +0300
@@ -11,10 +11,12 @@
 *
 * Contributors:
 * 
-* Description: MMP file for RSifUi STIF test module.
+* Description:  SifUi API test code
 *
 */
 
-// Same MMP file is used for both "BUILD" and "TEST BUILD" ABLD commands
+// Same MMP file is used both in normal and in test builds
 #include "sifuitest.mmp"
 
+SMPSAFE
+

--- a/appinstall_plat/sifui_api/tsrc/inc/sifuidummydetailsprovider.h	Thu May 27 12:58:35 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-/*
-* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Dummy implementation for details provider interface.
-*
-*/
-
-#ifndef C_DUMMYDETAILSPROVIDER_H
-#define C_DUMMYDETAILSPROVIDER_H
-
-#include <e32base.h>            // CBase
-#include <sifuidetailsif.h>     // MSifUiDetailsIf, MSifUiListIterator, MSifUiDetailsIterator
-
-
-class CDummyDetailsProvider : public CBase, public MSifUiDetailsIf,
-        public MSifUiListIterator, public MSifUiDetailsIterator
-    {
-public:
-    CDummyDetailsProvider( RFs& aFs );
-    ~CDummyDetailsProvider();
-
-public:
-    // from MSifUiDetailsIterator
-    void SetToFirstFieldL();
-    TBool HasNextField();
-    void GetNextFieldL( TDes& aFieldName, TDes& aFieldValue );
-
-    // from MSifUiListIterator
-    void SetToFirstItemL();
-    TBool HasNextItem();
-    void GetNextItemL( TDes& aItemName );
-    MSifUiDetailsIterator* DetailsIterator( const TDesC& aItemName );
-
-    // from MSifUiDetailsIf
-    MSifUiDetailsIterator* AppDetailsIterator();
-    MSifUiListIterator* CertificatesListL();
-    MSifUiListIterator* DrmFilesListL();
-    void GetDriveListL( RArray<TDriveUnit>& aDriveList );
-    void GetFolderListL( const TDesC& aParent, CDesCArray& aFolderList );
-    TBool HasFolderSubfolders( const TDesC& aParent, const TDesC& aFolder );
-
-private:    // data
-    RFs& iFs;
-    TInt iCurrentField;
-    TInt iCurrentItem;
-    };
-
-#endif // C_DUMMYDETAILSPROVIDER_H
-

--- a/appinstall_plat/sifui_api/tsrc/inc/sifuitest.h	Thu May 27 12:58:35 2010 +0300
+++ b/appinstall_plat/sifui_api/tsrc/inc/sifuitest.h	Fri Jun 11 13:45:18 2010 +0300
@@ -38,6 +38,7 @@
 #define OOM_ENTRY(str,func,a,b,c) {_S(str), GETPTR func,a,b,c}
 #define OOM_FUNCENTRY(func,a,b,c) {_S(#func), GETPTR func,a,b,c}
 
+class CX509Certificate;
 class CSifUiTest;
 class CSifUi;
 
@@ -143,10 +144,9 @@
                 const TKeyEvent& aKeyEvent ) const;
 
         /**
-         * Helper function to create new CSifUi object in iSifUi member.
-         * @return TInt - result code for creating new CSifUi
+         * Helper function to create Swi::CCertificateInfo objects.
          */
-        TInt CreateSifUi();
+        CX509Certificate* ReadCertificateL( const TDesC& aFileName );
 
 
         // --- TEST CASE FUNCTIONS ---
@@ -159,53 +159,52 @@
         TInt CreateLowMemTest( TTestResult& aResult );
 
         /**
-         * Run information note test case.
+         * Run drive selection test case.
          * @param aResult - test case result (PASS/FAIL)
          * @return Symbian OS error code (other than test result)
          */
-        TInt InformationNoteTest( TTestResult& aResult );
+        TInt MemorySelectionTest( TTestResult& aResult );
 
         /**
-         * Run warning note test case.
-         * @param aResult - test case result (PASS/FAIL)
-         * @return Symbian OS error code (other than test result)
+         * Helper function for MemorySelectionTest()
          */
-        TInt WarningNoteTest( TTestResult& aResult );
+        void DoMemorySelectionTestL( TTestResult& aResult );
 
         /**
-         * Run error note test case.
+         * Run certificate info test case.
          * @param aResult - test case result (PASS/FAIL)
          * @return Symbian OS error code (other than test result)
          */
-        TInt ErrorNoteTest( TTestResult& aResult );
+        TInt CertificateInfoTest( TTestResult& aResult );
 
         /**
-         * Run permanent note test case.
-         * @param aResult - test case result (PASS/FAIL)
-         * @return Symbian OS error code (other than test result)
+         * Helper function for CertificateInfoTest()
          */
-        TInt PermanentNoteTest( TTestResult& aResult );
+        void DoCertificateInfoTestL( TTestResult& aResult );
 
         /**
-         * Run progress note test case.
+         * Run application info test case.
          * @param aResult - test case result (PASS/FAIL)
          * @return Symbian OS error code (other than test result)
          */
-        TInt ProgressNoteTest( TTestResult& aResult );
+        TInt AppInfoTest( TTestResult& aResult );
 
         /**
-         * Run wait note test case.
+         * Helper function for AppInfoTest()
+         */
+        void DoAppInfoTestL( TTestResult& aResult );
+        
+        /**
+         * Run progress dialogs test case.
          * @param aResult - test case result (PASS/FAIL)
          * @return Symbian OS error code (other than test result)
          */
-        TInt WaitNoteTest( TTestResult& aResult );
+        TInt ProgressDialogsTest( TTestResult& aResult );
 
         /**
-         * Run launch help test case.
-         * @param aResult - test case result (PASS/FAIL)
-         * @return Symbian OS error code (other than test result)
+         * Helper function for ProgressDialogsTest()
          */
-        TInt LaunchHelpTest( TTestResult& aResult );
+        void DoProgressDialogsTestL( TTestResult& aResult );
 
     private:        // data
         TestFunction iMethod;
@@ -216,8 +215,6 @@
         TBool iVersionLogged;
         RFs iFs;
         CActiveScheduler* iScheduler;
-
-        CSifUi* iSifUi;
     };
 
 #endif      // SIFUITEST_H

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appinstall_plat/sifui_api/tsrc/inc/sifuitestcleanuputils.h	Fri Jun 11 13:45:18 2010 +0300
@@ -0,0 +1,55 @@
+/*
+* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:   Defines CleanupResetAndDestroyPushL
+*
+*/
+
+
+#ifndef SIFUITESTCLEANUPUTILS_H
+#define SIFUITESTCLEANUPUTILS_H
+
+template <class T>
+class CleanupResetAndDestroy
+    {
+public:
+    inline static void PushL( T& aRef );
+private:
+    static void ResetAndDestroy( TAny *aPtr );
+    };
+
+template <class T>
+inline void CleanupResetAndDestroyPushL( T& aRef );
+
+template <class T>
+inline void CleanupResetAndDestroy<T>::PushL( T& aRef )
+    {
+    CleanupStack::PushL( TCleanupItem( &ResetAndDestroy, &aRef ) );
+    }
+
+template <class T>
+void CleanupResetAndDestroy<T>::ResetAndDestroy( TAny *aPtr )
+    {
+    if( aPtr )
+        {
+        static_cast<T*>( aPtr )->ResetAndDestroy();
+        }
+    }
+
+template <class T>
+inline void CleanupResetAndDestroyPushL( T& aRef )
+    {
+    CleanupResetAndDestroy<T>::PushL( aRef );
+    }
+
+#endif // SIFUITESTCLEANUPUTILS_H

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appinstall_plat/sifui_api/tsrc/init/sifuitest.ini	Fri Jun 11 13:45:18 2010 +0300
@@ -0,0 +1,36 @@
+#
+# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+# 
+# Description: SifUi STIF tests initialization file
+#
+#
+
+[Engine_Defaults]
+TestReportMode= FullReport
+CreateTestReport= YES
+TestReportFilePath= C:\LOGS\TestFramework\
+TestReportFileName= TestReport
+TestReportFormat= TXT
+TestReportOutput= FILE
+TestReportFileCreationMode= OVERWRITE
+DeviceResetDllName= StifResetForNokia.dll
+DisableMeasurement= stifmeasurementdisablenone
+Timeout= 0
+UITestingSupport= YES
+SeparateProcesses= NO
+[End_Defaults]
+
+[New_Module]
+ModuleName= sifuitest
+[End_Module]
+

--- a/appinstall_plat/sifui_api/tsrc/init/sifuitestscripter.ini	Thu May 27 12:58:35 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-#
-# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-# 
-# Description: SifUi STIF TestScripter initialization file
-#
-#
-
-[Engine_Defaults]
-TestReportMode= FullReport
-CreateTestReport= YES
-TestReportFilePath= C:\LOGS\TestFramework\
-TestReportFileName= TestReport
-TestReportFormat= TXT
-TestReportOutput= FILE
-TestReportFileCreationMode= OVERWRITE
-DeviceResetDllName= StifResetForNokia.dll
-DisableMeasurement= stifmeasurementdisablenone
-Timeout= 0
-UITestingSupport= YES
-SeparateProcesses= NO
-[End_Defaults]
-
-[New_Module]
-ModuleName= sifuitest
-[End_Module]
-

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/appinstall_plat/sifui_api/tsrc/run_module_tests.bat	Fri Jun 11 13:45:18 2010 +0300
@@ -0,0 +1,24 @@
+@echo off
+rem
+rem Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+rem All rights reserved.
+rem This component and the accompanying materials are made available
+rem under the terms of "Eclipse Public License v1.0"
+rem which accompanies this distribution, and is available
+rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
+rem
+rem Initial Contributors:
+rem Nokia Corporation - initial contribution.
+rem
+rem Contributors:
+rem
+rem Description:  Module tests for SIF UI API.
+rem
+
+pushd group
+call ctc_instrument_code.bat
+call ctc_compile_tests.bat
+call ctc_run_tests.bat
+call ctc_process_results.bat
+call ctc_remove_instrumentation.bat
+popd

--- a/appinstall_plat/sifui_api/tsrc/src/sifuidummydetailsprovider.cpp	Thu May 27 12:58:35 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,140 +0,0 @@
-/*
-* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Dummy implementation for details provider interface.
-*
-*/
-
-#include <sifuidummydetailsprovider.h>  // CDummyDetailsProvider
-#include <f32file.h>                    // RFs, TVolumeInfo
-
-
-CDummyDetailsProvider::CDummyDetailsProvider( RFs& aFs ) : iFs( aFs )
-    {
-    }
-
-CDummyDetailsProvider::~CDummyDetailsProvider()
-    {
-    }
-
-void CDummyDetailsProvider::SetToFirstFieldL()
-    {
-    iCurrentField = 0;
-    }
-
-TBool CDummyDetailsProvider::HasNextField()
-    {
-    return( iCurrentField < 3 );
-    }
-
-void CDummyDetailsProvider::GetNextFieldL( TDes& aFieldName, TDes& aFieldValue )
-    {
-    __ASSERT_ALWAYS( iCurrentField < 3, User::Invariant() );
-    aFieldName.Zero();
-    aFieldName.AppendFormat( _L("Field_%d"), iCurrentField );
-    aFieldValue.Zero();
-    aFieldValue.AppendFormat( _L("Value %d"), iCurrentField );
-    ++iCurrentField;
-    }
-
-void CDummyDetailsProvider::SetToFirstItemL()
-    {
-    iCurrentItem = 0;
-    }
-
-TBool CDummyDetailsProvider::HasNextItem()
-    {
-    return( iCurrentField < 3 );
-    }
-
-void CDummyDetailsProvider::GetNextItemL( TDes& aItemName )
-    {
-    __ASSERT_ALWAYS( iCurrentItem < 3, User::Invariant() );
-    aItemName.Zero();
-    aItemName.AppendFormat( _L("Item_%d"), iCurrentItem );
-    ++iCurrentItem;
-    }
-
-MSifUiDetailsIterator* CDummyDetailsProvider::DetailsIterator( const TDesC& aItemName )
-    {
-    return this;
-    }
-
-MSifUiDetailsIterator* CDummyDetailsProvider::AppDetailsIterator()
-    {
-    return this;
-    }
-
-MSifUiListIterator* CDummyDetailsProvider::CertificatesListL()
-    {
-    return this;
-    }
-
-MSifUiListIterator* CDummyDetailsProvider::DrmFilesListL()
-    {
-    return this;
-    }
-
-void CDummyDetailsProvider::GetDriveListL( RArray<TDriveUnit>& aDriveList )
-    {
-    aDriveList.Reset();
-    TDriveList driveList;
-    User::LeaveIfError( iFs.DriveList( driveList ) );
-    for( TInt driveNumber = EDriveA; driveNumber <= EDriveZ; ++driveNumber )
-        {
-        if( driveList[ driveNumber ] )
-            {
-            TVolumeInfo volInfo;
-            if( iFs.Volume( volInfo, driveNumber ) == KErrNone )
-                {
-                if( volInfo.iDrive.iType != EMediaNotPresent &&
-                    volInfo.iDrive.iType != EMediaRom &&
-                    volInfo.iDrive.iType != EMediaRemote &&
-                    !( volInfo.iDrive.iDriveAtt & KDriveAttRom ) &&
-                    !( volInfo.iDrive.iDriveAtt & KDriveAttSubsted ) )
-                    {
-                    aDriveList.AppendL( driveNumber );
-                    }
-                }
-            }
-        }
-    }
-
-void CDummyDetailsProvider::GetFolderListL( const TDesC& aParent, CDesCArray& aFolderList )
-    {
-    aFolderList.Reset();
-    if( aParent.Find( _L("SubSub") ) != KErrNotFound )
-        {
-        // no subfolders, should not get here
-        User::Invariant();
-        }
-    else if( ( aParent.Find( _L("Applications") ) != KErrNotFound ) ||
-             ( aParent.Find( _L("Programs") ) != KErrNotFound ) ||
-             ( aParent.Find( _L("Installations") ) != KErrNotFound ) )
-        {
-        aFolderList.AppendL( _L("SubSubDir") );
-        aFolderList.AppendL( _L("SubSubFolder") );
-        }
-    else
-        {
-        aFolderList.AppendL( _L("Applications") );
-        aFolderList.AppendL( _L("Programs") );
-        aFolderList.AppendL( _L("Installations") );
-        }
-    }
-
-TBool CDummyDetailsProvider::HasFolderSubfolders( const TDesC& aParent, const TDesC& aFolder )
-    {
-    return( aParent.Find( _L("SubSub") ) != KErrNotFound );
-    }
-