--- a/appfw/apparchitecture/apgrfx/APGCLI.CPP Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/apgrfx/APGCLI.CPP Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1997-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"
@@ -17,6 +17,10 @@
#include "../apserv/APSCLSV.H"
#include "../apserv/apsserv.h"
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+#include "../apgrfx/apgcommonutils.h"
+#endif
+
#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
#if !defined(__APA_INTERNAL_H__)
#include "apainternal.h"
@@ -1547,25 +1551,41 @@
/** @publishedPartner */
EXPORT_C void RApaLsSession::RegisterNonNativeApplicationTypeL(TUid aApplicationType, const TDesC& aNativeExecutable)
{
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
User::LeaveIfError(SendReceiveWithReconnect(EAppListServRegisterNonNativeApplicationType, TIpcArgs(aApplicationType.iUid, &aNativeExecutable)));
+#else
+ (void)aApplicationType; //to make compiler happy
+ (void)aNativeExecutable;
+ User::Leave(KErrNotSupported);
+#endif
} //lint !e1762 Suppress member function could be made const
/** @publishedPartner */
EXPORT_C void RApaLsSession::DeregisterNonNativeApplicationTypeL(TUid aApplicationType)
{
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
User::LeaveIfError(SendReceiveWithReconnect(EAppListServDeregisterNonNativeApplicationType, TIpcArgs(aApplicationType.iUid)));
+#else
+ (void)aApplicationType; //to make compiler happy
+ User::Leave(KErrNotSupported);
+#endif
} //lint !e1762 Suppress member function could be made const
/** @publishedPartner */
EXPORT_C void RApaLsSession::PrepareNonNativeApplicationsUpdatesL()
{
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
TIpcArgs ipcArgs(0, 0, 0, 0);
User::LeaveIfError(SendReceiveWithReconnect(EAppListServPrepareNonNativeApplicationsUpdates, ipcArgs));
+#else
+ User::Leave(KErrNotSupported);
+#endif
} //lint !e1762 Suppress member function could be made const
/** @publishedPartner */
EXPORT_C void RApaLsSession::RegisterNonNativeApplicationL(TUid aApplicationType, const TDriveUnit& aDrive, CApaRegistrationResourceFileWriter& aRegistrationResourceFile, CApaLocalisableResourceFileWriter* aLocalisableResourceFile, const RFile* aIconFile)
{
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
TIpcArgs ipcArgs(0, 0, 0, 0);
RBuf8 ipcParameter0;
CleanupClosePushL(ipcParameter0);
@@ -1616,12 +1636,26 @@
User::LeaveIfError(SendReceiveWithReconnect(EAppListServRegisterNonNativeApplication, ipcArgs));
CleanupStack::PopAndDestroy(2, &ipcParameter0);
+#else
+ (void) aApplicationType; //to make compiler happy
+ (void) aDrive;
+ (void) aRegistrationResourceFile;
+ (void) aRegistrationResourceFile;
+ (void) aLocalisableResourceFile;
+ (void) aIconFile;
+ User::Leave(KErrNotSupported);
+#endif
} //lint !e1762 Suppress member function could be made const
/** @publishedPartner */
EXPORT_C void RApaLsSession::DeregisterNonNativeApplicationL(TUid aApplication)
{
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
User::LeaveIfError(SendReceiveWithReconnect(EAppListServDeregisterNonNativeApplication, TIpcArgs(aApplication.iUid)));
+#else
+ (void) aApplication;
+ User::Leave(KErrNotSupported);
+#endif
} //lint !e1762 Suppress member function could be made const
/**
@@ -1635,8 +1669,12 @@
EXPORT_C void RApaLsSession::CommitNonNativeApplicationsUpdatesL()
{
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
TIpcArgs ipcArgs(EFalse, 0, 0, 0);
User::LeaveIfError(SendReceiveWithReconnect(EAppListServCommitNonNativeApplications, ipcArgs));
+#else
+ User::Leave(KErrNotSupported);
+#endif
} //lint !e1762 Suppress member function could be made const
@@ -1653,8 +1691,12 @@
EXPORT_C void RApaLsSession::ForceCommitNonNativeApplicationsUpdatesL()
{
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
TIpcArgs ipcArgs(ETrue, 0, 0, 0);
User::LeaveIfError(SendReceiveWithReconnect(EAppListServCommitNonNativeApplications, ipcArgs));
+#else
+ User::Leave(KErrNotSupported);
+#endif
}
/**
@@ -1668,8 +1710,12 @@
*/
EXPORT_C TInt RApaLsSession::RollbackNonNativeApplicationsUpdates()
{
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
TIpcArgs ipcArgs(0, 0, 0, 0);
return SendReceiveWithReconnect(EAppListServRollbackNonNativeApplications, ipcArgs);
+#else
+ return KErrNotSupported;
+#endif
} //lint !e1762 Suppress member function could be made const
/**
@@ -1724,6 +1770,7 @@
*/
EXPORT_C TInt RApaLsSession::ForceRegistration(const RPointerArray<TDesC>& aRegFiles)
{
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
CBufFlat* buffer = 0;
TRAPD(err, buffer = CreateRegFilesBufferL(aRegFiles));
if (err)
@@ -1733,6 +1780,10 @@
const TInt returnValue=SendReceiveWithReconnect(EAppListServForceRegistration,TIpcArgs(&ptr));
delete buffer;
return returnValue;
+#else
+ (void) aRegFiles;
+ return KErrNotSupported;
+#endif
} //lint !e1762 Suppress member function could be made const
@@ -1840,7 +1891,7 @@
SendReceive(ECancelNotifyOnDataMappingChange,TIpcArgs());
} //lint !e1762 Suppress member function could be made const
-
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
CBufFlat* RApaLsSession::CreateRegFilesBufferL(const RPointerArray<TDesC>& aRegFiles)
{
// Serialize the array
@@ -1873,3 +1924,211 @@
CleanupStack::Pop(buffer);
return buffer;
}
+#endif
+
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+
+/* This function is only for use by Installers.
+
+Installers can provide the information about installed, uninstaleld and upgraded applications using this function.
+The function takes list of TApaAppUpdateInfo objects. TApaAppUpdateInfo object contains the application uid and
+corresponding action done on that application like installed, uninstalled and upgraded.
+
+Apparc updates the application list based on the information provided in the list.
+
+UpdateAppListL initiates applist update. It will not wait till the applist update completed.
+
+@param aAppUpdateInfo List of TApaAppUpdateInfo objects, which contains application uid and corresponding action information
+ like installed, uninstalled and changed.
+@return A standard error code.
+@publishedAll
+@released
+*/
+
+EXPORT_C TInt RApaLsSession::UpdateAppListL(RArray<TApaAppUpdateInfo>& aAppUpdateInfo)
+ {
+ //Create a buffer with the application UID and corresponding action information.
+ CBufFlat* buffer = 0;
+ TRAPD(err, buffer = CreateAppUpdateInfoBufferL(aAppUpdateInfo));
+ if (err)
+ return err;
+
+ TPtr8 ptr = buffer->Ptr(0);
+ const TInt returnValue=SendReceiveWithReconnect(EAppListServUpdateAppList,TIpcArgs(&ptr));
+ delete buffer;
+ return returnValue;
+ }
+
+
+/**
+This function is only for use by Software Install.
+
+ForceRegistration allows Software Install to provide a list of application information that need to be
+included in apparc's application list even if they have not been marked as installed in the SISRegistry.
+The force registered applications will be removed from application list once Software Install notifies
+the end of the installation by calling UpdateApplist.
+
+
+@param aAppsData The list of application information needs to be added to application list. Apparc don't take the
+ ownership of this array.
+@return A standard error code.
+@publishedAll
+@released
+*/
+
+EXPORT_C TInt RApaLsSession::ForceRegistration(const RPointerArray<Usif::CApplicationRegistrationData>& aForceRegAppsInfo)
+{
+ //If there are no applications to update, just return.
+ if(aForceRegAppsInfo.Count()==0)
+ return(KErrNone);
+
+ //Create a buffer with the application uid and corresponding action information.
+ CBufFlat* buffer = 0;
+ TRAPD(err, buffer = CreateForceRegAppInfoBufferL(aForceRegAppsInfo));
+ if (err)
+ return err;
+
+ TPtr8 ptr = buffer->Ptr(0);
+ const TInt returnValue=SendReceiveWithReconnect(EAppListServForceRegistration,TIpcArgs(&ptr));
+ delete buffer;
+ return returnValue;
+}
+
+
+/*
+ * Creates a buffer for applications uids and action information.
+ */
+CBufFlat* RApaLsSession::CreateAppUpdateInfoBufferL(RArray<TApaAppUpdateInfo>& aAppUpdateInfo)
+ {
+ TInt count=aAppUpdateInfo.Count();
+ TInt requiredBufferSize=sizeof(TInt32)+(count*sizeof(TApaAppUpdateInfo)); //Size of count + size of TApaAppUpdateInfo objects
+
+ CBufFlat* const buffer = CBufFlat::NewL(requiredBufferSize);
+ CleanupStack::PushL(buffer);
+ buffer->ExpandL(0,requiredBufferSize);
+ RBufWriteStream writeStream;
+ writeStream.Open(*buffer);
+ CleanupClosePushL(writeStream);
+
+ //Write number of TApaAppUpdateInfo objects to stream.
+ writeStream.WriteUint32L(count);
+
+ for(TInt index=0;index<count;index++)
+ {
+ //Write one application information at a time
+ writeStream<<aAppUpdateInfo[index];
+ }
+
+ writeStream.CommitL();
+ CleanupStack::PopAndDestroy(&writeStream);
+ CleanupStack::Pop(buffer);
+
+ return buffer;
+ }
+
+
+/* Creates buffer for force registered application information array*/
+
+CBufFlat* RApaLsSession::CreateForceRegAppInfoBufferL(const RPointerArray<Usif::CApplicationRegistrationData>& aForceRegAppsInfo)
+ {
+ TInt count=aForceRegAppsInfo.Count();
+ TInt requiredBufferSize=sizeof(TInt32); //For count
+
+ for(TInt index=0; index<count; index++)
+ {
+ //Get each application information size and add it to required size.
+ requiredBufferSize += GetObjectSizeL(aForceRegAppsInfo[index]);
+ }
+
+ CBufFlat* const buffer = CBufFlat::NewL(requiredBufferSize);
+ CleanupStack::PushL(buffer);
+ buffer->ExpandL(0,requiredBufferSize);
+
+ RBufWriteStream writeStream;
+ writeStream.Open(*buffer);
+ CleanupClosePushL(writeStream);
+
+ //Write count to stream.
+ writeStream.WriteUint32L(count);
+
+ for(TInt index=0;index<count;index++)
+ {
+ //Write one applciation information at a time to stream.
+ writeStream<<*aForceRegAppsInfo[index];
+ }
+
+ writeStream.CommitL();
+ CleanupStack::PopAndDestroy(&writeStream);
+ CleanupStack::Pop(buffer);
+
+ return buffer;
+ }
+
+
+
+/*
+Provides updated application information after apparc notifies application list change. It provides list of TApaAppUpdateInfo
+objects which contains the information about updated application UID and the action, i.e installed, uninstalled and changed.
+
+The function returns empty list if the application list is changed due to initial application list creation or because of phone
+language change. During that time the list of changed applications can be large.
+
+This function should be called only after the client receives the applist notification from AppArc registered through SetNotify(). Otherwise the
+return values are unpredictable.
+
+@param aUpdatedAppsInfo On return, provides the list of TApaAppUpdateInfo objects, which contains changed application uids and
+ corresponding action information like installed, uninstalled and changed. If this list is empty, then
+ the applist is updated because of initial applist creation or because of phone language change. In that
+ case use GetAllApps and GetNextApp APIs to retrieve the complete applist information.
+
+@return A standard error code.
+@publishedAll
+@released
+*/
+
+EXPORT_C TInt RApaLsSession::UpdatedAppsInfoL(RArray<TApaAppUpdateInfo>& aUpdatedAppsInfo)
+ {
+ const TInt KDefaultUpdateAppEntries=10;
+
+ //Create a buffer with default size
+ TInt sizeRequired=(KDefaultUpdateAppEntries * sizeof(TApaAppUpdateInfo)) + 2;
+ CBufFlat* buffer=CBufFlat::NewL(sizeRequired);
+ CleanupStack::PushL(buffer);
+ buffer->ExpandL(0, sizeRequired);
+ TPtr8 ptr = buffer->Ptr(0);
+
+ TPckgBuf<TInt> pckg(sizeRequired);
+
+ //pass the buffer and size of the buffer.
+ TInt returnValue=SendReceiveWithReconnect(EAppListUpdatedAppsInfo,TIpcArgs(&ptr, &pckg));
+
+ //If the size of the buffer is not enough expand it to required size and pass it again.
+ if(returnValue==KErrOverflow)
+ {
+ buffer->ExpandL(0, sizeRequired);
+ returnValue=SendReceiveWithReconnect(EAppListUpdatedAppsInfo,TIpcArgs(&ptr, &pckg));
+ }
+
+ if(returnValue==KErrNone)
+ {
+ RBufReadStream readStream;
+ readStream.Open(*buffer);
+
+ //Read count from the stream
+ TInt count=readStream.ReadUint32L();
+
+ //Read updated applications information and add it to array
+ for(TInt index=0; index<count; index++)
+ {
+ TApaAppUpdateInfo appUpdateInfo;
+ readStream>>appUpdateInfo;
+ aUpdatedAppsInfo.AppendL(appUpdateInfo);
+ }
+ }
+
+ CleanupStack::PopAndDestroy(buffer);
+ return returnValue;
+ }
+
+#endif
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/apgrfx/apgcommonutils.h Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,96 @@
+// 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:
+//
+
+#ifndef __APGCOMMONUTILS_H__
+#define __APGCOMMONUTILS_H__
+
+#include <e32base.h>
+#include <s32strm.h>
+#include <s32buf.h>
+#include<usif/scr/appregentries.h>
+
+
+/**
+Implementation of the MStreamBuf interface that throws away all
+data written to it but keeps track of how many bytes have been
+written to it. It does not support reading.
+*/
+class TNullBuf : public MStreamBuf
+ {
+public:
+ inline TNullBuf();
+ inline TUint BytesWritten();
+private:
+ inline virtual void DoWriteL(const TAny* aPtr,TInt aLength);
+private:
+ TUint iBytesWritten;
+ };
+
+/**
+A write stream that throws away all its input, but keeps track of how many
+bytes have been written to it. It is used for determining the amount of
+memory needed to store externalised objects.
+*/
+class RNullWriteStream : public RWriteStream
+ {
+public:
+ inline RNullWriteStream();
+ inline TUint BytesWritten();
+private:
+ TNullBuf iSink;
+ };
+
+inline TNullBuf::TNullBuf() : iBytesWritten(0)
+ {
+ }
+
+inline TUint TNullBuf::BytesWritten()
+ {
+ return iBytesWritten;
+ }
+
+inline void TNullBuf::DoWriteL(const TAny*,TInt aLength)
+ {
+ iBytesWritten += aLength;
+ }
+
+inline RNullWriteStream::RNullWriteStream()
+ {
+ Attach(&iSink);
+ }
+
+inline TUint RNullWriteStream::BytesWritten()
+ {
+ return iSink.BytesWritten();
+ }
+
+template <class T>
+TInt GetObjectSizeL(T* aObject)
+ {
+ TInt size(0);
+ if(aObject)
+ {
+ RNullWriteStream nullstream;
+ CleanupClosePushL(nullstream);
+ nullstream << *aObject;
+ nullstream.CommitL();
+ size = nullstream.BytesWritten();
+ CleanupStack::PopAndDestroy(&nullstream);
+ return size;
+ }
+ return -1;
+ }
+
+#endif //__APGCOMMONUTILS_H__
--- a/appfw/apparchitecture/apgrfx/apgrecog.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/apgrfx/apgrecog.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -460,7 +460,7 @@
/** Tests whether data taken from a named file has the specified
- * data (MIME) type.
+data (MIME) type.
@param aName The name of the file containing the data.
@param aBuffer A buffer containing data taken from the specified file; Provide preferred size of buffer
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/apgrfx/apgupdate.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,50 @@
+// 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:
+// apgupdate.cpp
+//
+
+#include "apgupdate.h"
+
+/**
+ * Default Constructor.
+ */
+EXPORT_C TApaAppUpdateInfo::TApaAppUpdateInfo()
+ {
+
+ }
+
+/**
+ * Constructor for TApaAppUpdateInfo.
+ * @param aAppUid Application UID.
+ * @param aAction Action performed by installer on the application.
+ */
+EXPORT_C TApaAppUpdateInfo::TApaAppUpdateInfo(TUid aAppUid, TApaAppUpdateInfo::TApaAppAction aAction):
+ iAppUid(aAppUid),
+ iAction(aAction)
+ {
+
+ }
+
+EXPORT_C void TApaAppUpdateInfo::InternalizeL(RReadStream& aReadStream)
+ {
+ iAppUid.iUid=aReadStream.ReadInt32L();
+ iAction=TApaAppAction(aReadStream.ReadInt32L());
+ }
+
+EXPORT_C void TApaAppUpdateInfo::ExternalizeL(RWriteStream& aWriteStream) const
+ {
+ aWriteStream.WriteInt32L(iAppUid.iUid);
+ aWriteStream.WriteInt32L(iAction);
+ }
+
--- a/appfw/apparchitecture/aplist/aplappinforeader.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/aplist/aplappinforeader.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+ // Copyright (c) 2004-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"
@@ -28,6 +28,8 @@
#include "../apgrfx/APGSTD.H" // EPanicNullPointer
#include "../apgrfx/apsecutils.h" // CApaSecurityUtils
+
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
const TUint KResourceOffsetMask = 0xFFFFF000;
_LIT(KAppBinaryPathAndExtension, "\\sys\\bin\\.exe");
@@ -35,6 +37,9 @@
// The 2nd UID that defines a resource file as being an application registration resource file.
const TUid KUidAppRegistrationFile = {0x101F8021};
+#endif
+
+
//
// Local functions
@@ -42,14 +47,16 @@
extern void CleanupServiceArray(TAny* aServiceArray); // Implemented in AplAppList.cpp
+
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
// ApaUtils
TBool ApaUtils::TypeUidIsForRegistrationFile(const TUidType& aUidType)
- { // static
- return (aUidType[1].iUid==KUidAppRegistrationFile.iUid ||
- aUidType[0].iUid==KUidPrefixedNonNativeRegistrationResourceFile);
- }
-
+ { // static
+ return (aUidType[1].iUid==KUidAppRegistrationFile.iUid ||
+ aUidType[0].iUid==KUidPrefixedNonNativeRegistrationResourceFile);
+ }
+#endif
//
// CApaAppInfoReader
@@ -63,29 +70,6 @@
// instead of having to copy the object (copying could be expensive for the methods
// of this class that need to return arrays).
-
-CApaAppInfoReader* CApaAppInfoReader::NewL(RFs& aFs, const TDesC& aRegistrationFileName, TUid aAppUid)
- {
- CApaAppInfoReader* self = new(ELeave) CApaAppInfoReader(aFs, aRegistrationFileName, aAppUid);
- CleanupStack::PushL(self);
- self->ConstructL();
- CleanupStack::Pop(self);
- return self;
- }
-
-CApaAppInfoReader::CApaAppInfoReader(RFs& aFs, const TDesC& aRegistrationFileName, TUid aAppUid) :
- iFs(aFs),
- iAppUid(aAppUid),
- iTimeStamp(0),
- iDefaultScreenNumber(0),
- iNonMbmIconFile(EFalse),
- iLocalisableResourceFileTimeStamp(0),
- iApplicationLanguage(ELangNone),
- iIndexOfFirstOpenService(KErrNotFound),
- iRegistrationFileName(aRegistrationFileName)
- {
- }
-
void CApaAppInfoReader::ConstructL()
{
iIconLoader = CApaIconLoader::NewL(iFs);
@@ -103,7 +87,9 @@
delete iViewDataArray;
delete iOwnedFileArray;
delete iIconFileName;
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
delete iLocalisableResourceFileName;
+#endif
if (iServiceArray)
{
@@ -127,16 +113,6 @@
return iAppBinaryUidType;
}
-TTime CApaAppInfoReader::TimeStamp() const
- {
- return iTimeStamp;
- }
-
-TTime CApaAppInfoReader::IconFileTimeStamp() const
- {
- return iIconFileTimeStamp;
- }
-
void CApaAppInfoReader::Capability(TDes8& aCapabilityBuf) const
{
TApaAppCapabilityBuf buf(iCapability);
@@ -200,18 +176,7 @@
return iNonMbmIconFile;
}
-HBufC* CApaAppInfoReader::LocalisableResourceFileName()
- {
- HBufC* localisableResourceFileName = iLocalisableResourceFileName;
- iLocalisableResourceFileName = NULL; // ownership transferred to caller
- return localisableResourceFileName;
- }
-TTime CApaAppInfoReader::LocalisableResourceFileTimeStamp() const
- {
- return iLocalisableResourceFileTimeStamp;
- }
-
TLanguage CApaAppInfoReader::AppLanguage() const
{
return iApplicationLanguage;
@@ -239,6 +204,518 @@
return iconLoader;
}
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+
+CApaAppInfoReader::CApaAppInfoReader(RFs& aFs, const Usif::CApplicationRegistrationData& aAppInfo, const Usif::RSoftwareComponentRegistry& aScr) :
+ iFs(aFs),
+ iDefaultScreenNumber(0),
+ iNonMbmIconFile(EFalse),
+ iApplicationLanguage(ELangNone),
+ iIndexOfFirstOpenService(KErrNotFound),
+ iAppInfo(aAppInfo),
+ iScr(aScr)
+ {
+ }
+
+CApaAppInfoReader* CApaAppInfoReader::NewL(RFs& aFs, const Usif::CApplicationRegistrationData& aAppInfo, const Usif::RSoftwareComponentRegistry& aScr)
+ {
+ CApaAppInfoReader* self = new(ELeave) CApaAppInfoReader(aFs, aAppInfo, aScr);
+ CleanupStack::PushL(self);
+ self->ConstructL();
+ CleanupStack::Pop(self);
+ return self;
+ }
+
+/*
+ * Reads the application information from SCR.
+ */
+TBool CApaAppInfoReader::ReadL()
+ {
+ ReadAppRegistrationInfoL();
+ ReadLocalisationInfoL();
+#ifdef APPARC_SHOW_TRACE
+ DisplayAppInfo();
+#endif
+ return ETrue;
+ }
+
+#ifdef APPARC_SHOW_TRACE
+void CApaAppInfoReader::DisplayAppInfo()
+ {
+ RDebug::Print(_L("[Apparc] Application UID: %X"), iAppUid.iUid);
+ if(iAppBinaryFullName)
+ RDebug::Print(_L("[Apparc] AppBinary Name: %S"), iAppBinaryFullName);
+
+ RDebug::Print(_L("[Apparc] Embeddability: %d"), iCapability.iEmbeddability);
+ RDebug::Print(_L("[Apparc] Hidden: %d"), iCapability.iAppIsHidden);
+ RDebug::Print(_L("[Apparc] NewFile: %d"), iCapability.iSupportsNewFile);
+ RDebug::Print(_L("[Apparc] Launch in Foreground: %d"), iCapability.iLaunchInBackground);
+ RDebug::Print(_L("[Apparc] Attributes: %X"), iCapability.iAttributes);
+ RDebug::Print(_L("[Apparc] Group Name: %S"), &iCapability.iGroupName);
+
+ RDebug::Print(_L("[Apparc] Default Screen Number: %d"), iDefaultScreenNumber);
+ RDebug::Print(_L("[Apparc] Application Language: %d"), iApplicationLanguage);
+
+ if(iCaption)
+ RDebug::Print(_L("[Apparc] Short Cpation: %S"), iCaption);
+
+ if(iShortCaption)
+ RDebug::Print(_L("[Apparc] Caption: %S"), iShortCaption);
+
+ if(iServiceArray)
+ {
+ for(TInt index=0;index<iServiceArray->Count();index++)
+ {
+ TApaAppServiceInfo serviceInfo=(*iServiceArray)[index];
+ RDebug::Print(_L("[Apparc] Service Uid: %X"), serviceInfo.Uid().iUid);
+
+ for(TInt j=0;j<serviceInfo.DataTypes().Count();j++)
+ {
+ TDataTypeWithPriority dataType=(serviceInfo.DataTypes())[j];
+ RDebug::Print(_L("[Apparc] Data Type: %s Priority:%d"), &dataType.iDataType, dataType.iPriority);
+ }
+
+ }
+ }
+
+ if(iIconFileName)
+ {
+ RDebug::Print(_L("[Apparc] Icon File: %S"), iIconFileName);
+
+ if(iNonMbmIconFile)
+ RDebug::Print(_L("[Apparc] Its Non MBM icon file"));
+ RDebug::Print(_L("[Apparc] Num Icons: %d"), iNumOfAppIcons);
+ }
+
+ if(iViewDataArray)
+ {
+ for(TInt index=0; index<iViewDataArray->Count();index++)
+ {
+ CApaAppViewData* view= (*iViewDataArray)[index];
+ RDebug::Print(_L("[Apparc] ViewID: %X"), view->Uid().iUid);
+ //RDebug::Print(_L("[Apparc] View Caption: %s"), view->Caption());
+ //RDebug::Print(_L("[Apparc] View Icon File: %s"), view->IconFileName());
+ if(view->NonMbmIconFile())
+ RDebug::Print(_L("[Apparc] Its Non MBM icon file"));
+ RDebug::Print(_L("[Apparc] Screen Mode: %d"), view->ScreenMode());
+ }
+ }
+ }
+
+#endif
+
+
+void CApaAppInfoReader::ReadAppRegistrationInfoL()
+ {
+ //Get 3rd UID of the application
+ iAppUid=iAppInfo.AppUid();
+
+ iCapability.iAttributes=iAppInfo.Attributes();
+ TUid firstUid(KExecutableImageUid);
+ TUid middleUid(KUidApp);
+
+ //If the application is non-native, first UID should be Null UID and second uid is the non-native application type(i.e type ID of java, widget etc.).
+ if (iCapability.iAttributes & TApaAppCapability::ENonNative)
+ {
+ firstUid=KNullUid;
+ middleUid.iUid=iAppInfo.TypeId();
+ }
+ else if (iCapability.iAttributes & TApaAppCapability::EBuiltAsDll)
+ {
+ User::Leave(KErrNotSupported); // legacy dll-style app
+ }
+
+ iAppBinaryUidType=TUidType(firstUid, middleUid, iAppUid);
+
+ //If executable file name is not given then just leave.
+ if(iAppInfo.AppFile().Length() ==0 )
+ User::Leave(KErrGeneral);
+
+ //Absolute path of the executable file is stored in iAppBinaryFullName
+ iAppBinaryFullName=iAppInfo.AppFile().AllocL();
+
+// //Check whether the binary exists.
+ /*RLibrary::TInfoBuf infoBuf;
+ TInt ret = RLibrary::GetInfo(*iAppBinaryFullName, infoBuf);
+ User::LeaveIfError(ret);
+
+ if(infoBuf().iUids[2]!=iAppUid && iAppBinaryUidType[1]==KUidApp)
+ User::Leave(KErrNotFound);*/
+
+ iCapability.iAppIsHidden=iAppInfo.Hidden();
+ iCapability.iEmbeddability = static_cast<TApaAppCapability::TEmbeddability>(iAppInfo.Embeddability());
+ iCapability.iLaunchInBackground=iAppInfo.Launch();
+ iCapability.iSupportsNewFile=iAppInfo.NewFile();
+
+ iDefaultScreenNumber=iAppInfo.DefaultScreenNumber();
+
+ iCapability.iGroupName=iAppInfo.GroupName();
+
+ RPointerArray<Usif::COpaqueData> appOpaqueData=iAppInfo.AppOpaqueData();
+ ASSERT(!(appOpaqueData.Count()>1));
+
+ if(appOpaqueData.Count()>0)
+ {
+ iOpaqueData=appOpaqueData[0]->OpaqueData().AllocL();
+ }
+ else
+ {
+ //If opaque data is not available, create an empty object and assign to iOpaqueData
+ iOpaqueData=HBufC8::NewL(0);
+ }
+
+ ReadServiceInfoL(iAppInfo.ServiceArray());
+ ReadOwnedFilesInfoL(iAppInfo.OwnedFileArray());
+ }
+
+
+/*
+ * Reads service information of the application.
+ */
+void CApaAppInfoReader::ReadServiceInfoL(const RPointerArray<Usif::CServiceInfo>& aServiceInfo)
+ {
+ TInt serviceCount=aServiceInfo.Count();
+
+ if (serviceCount > 0)
+ {
+ iServiceArray = new(ELeave) CArrayFixFlat<TApaAppServiceInfo>(4);
+ }
+ else
+ {
+ //if service information is not avaliable, just return.
+ return;
+ }
+
+ //Read application service info one at a time and store in iServiceArray.
+ for (TInt index=0;index<serviceCount;index++)
+ {
+ TUid serviceUid=aServiceInfo[index]->Uid();
+
+ CArrayFixFlat<TDataTypeWithPriority>* mimeTypesSupported = new(ELeave) CArrayFixFlat<TDataTypeWithPriority>(5);
+ CleanupStack::PushL(mimeTypesSupported);
+
+ //Read supported mime types of a service
+ ReadMimeTypesSupportedL(aServiceInfo[index]->DataTypes(), *mimeTypesSupported);
+
+ RPointerArray<Usif::COpaqueData> serviceOpaqueData=aServiceInfo[index]->OpaqueData();
+ //SCR schould give atmost only one opaque data for a service.
+ ASSERT(!(serviceOpaqueData.Count()>1));
+
+ HBufC8* opaqueData=NULL;
+ if(serviceOpaqueData.Count()>0)
+ {
+ opaqueData= serviceOpaqueData[0]->OpaqueData().AllocL();
+ }
+ else
+ {
+ //If opaque data is not available, create an empty object and assign to opaqueData
+ opaqueData=HBufC8::NewL(0);
+ }
+
+ TApaAppServiceInfo serviceInfo(serviceUid, mimeTypesSupported,opaqueData); // takes ownership of mimeTypesSupported and opaqueData
+ CleanupStack::PushL(opaqueData);
+ iServiceArray->AppendL(serviceInfo);
+ CleanupStack::Pop(2, mimeTypesSupported);
+
+ //If service UID is KOpenServiceUid and it is first open service then initialize iIndexOfFirstOpenService
+ if ((serviceUid == KOpenServiceUid) && (iIndexOfFirstOpenService < 0))
+ iIndexOfFirstOpenService = iServiceArray->Count() - 1;
+ }
+ }
+
+
+/*
+ * Reads supported mime types and its handling priorities of a service
+ */
+void CApaAppInfoReader::ReadMimeTypesSupportedL(const RPointerArray<Usif::CDataType>& dataTypes, CArrayFixFlat<TDataTypeWithPriority>& aMimeTypesSupported)
+ {
+
+ const TInt dataTypeArraySize = dataTypes.Count();
+ //if there are no data types available, just return.
+ if (dataTypeArraySize <= 0)
+ return;
+
+ for (TInt i=0; i < dataTypeArraySize; i++)
+ {
+ TDataTypePriority priority = static_cast<TDataTypePriority>(dataTypes[i]->Priority());
+
+ //Check for data priority of UnTrusted apps however the trusted apps will not have any restrictions
+ //over the data priority.
+ //If an untrusted app has write device data capability (i.e. still has priority = KDataTypePrioritySystem),
+ //do not restrict to KDataTypeUnTrustedPriorityThreshold
+ if (priority > KDataTypeUnTrustedPriorityThreshold || priority == KDataTypePrioritySystem )
+ {
+ ReadAppSecurityInfo();
+
+ if (priority == KDataTypePrioritySystem)
+ {
+ // Check that the app has capability WriteDeviceData
+ if (!iHasWriteDeviceDataCap)
+ priority = KDataTypePriorityNormal;
+ }
+ else
+ {
+ //data priority for UnTrusted apps would be capped if it is greater than the threshold priority i.e, KMaxTInt16.
+ //Component ID is zero if the application is shipped with phone.
+ TBool isInstalledApp=(iScr.GetComponentIdForAppL(iAppBinaryUidType[2])!=0);
+ if (!iIsSidTrusted && isInstalledApp)
+ {
+ //if application sid is in unprotected range and the applciation is instaleld with
+ //one of the installers after phone marketed, then priority needs to be downgraded.
+ priority = KDataTypeUnTrustedPriorityThreshold;
+ }
+ }
+ }
+
+ TBuf8<KMaxDataTypeLength> buf;
+ //Convert 16-bit descriptor to 8-bit descriptor.
+ buf.Copy(dataTypes[i]->Type());
+
+ TDataType dataType(buf);
+ TDataTypeWithPriority dataTypeWithPriority(dataType, priority);
+ aMimeTypesSupported.AppendL(dataTypeWithPriority);
+ }
+ }
+
+
+/*
+ * Reads owned files information.
+ */
+void CApaAppInfoReader::ReadOwnedFilesInfoL(const RPointerArray<HBufC>& aOwnedFiles)
+ {
+ const TInt fileOwnershipArraySize = aOwnedFiles.Count();
+
+ //if owned files information is not avaliable, just return.
+ if (fileOwnershipArraySize <= 0)
+ return;
+
+ iOwnedFileArray = new(ELeave) CDesCArraySeg(fileOwnershipArraySize);
+
+ for (TInt index=0; index < fileOwnershipArraySize; index++)
+ {
+ HBufC *fileowned=aOwnedFiles[index]->Des().AllocL();
+ CleanupStack::PushL(fileowned);
+ iOwnedFileArray->AppendL(*fileowned); //takes the ownership of fileowned
+ CleanupStack::Pop(fileowned);
+ }
+ }
+
+void CApaAppInfoReader::ReadLocalisationInfoL()
+ {
+ RPointerArray<Usif::CLocalizableAppInfo> localisationInfo;
+ localisationInfo=iAppInfo.LocalizableAppInfoList();
+ ASSERT(localisationInfo.Count() <= 1);
+
+ if(localisationInfo.Count()<=0)
+ {
+ //If localisable information is not avaialable then assign default icons.
+ TRAP_IGNORE(iIcons = CApaAppIconArray::NewDefaultIconsL());
+ return;
+ }
+
+ //Group name provided in localisation file takes precedence over group name provided in registration file name.
+ const TDesC& groupName=localisationInfo[0]->GroupName();
+
+ if(groupName.Length()>0)
+ {
+ iCapability.iGroupName=groupName;
+ }
+
+ //Get application language for current phone language.
+ iApplicationLanguage=localisationInfo[0]->ApplicationLanguage();
+
+ const Usif::CCaptionAndIconInfo* captionIconInfo=localisationInfo[0]->CaptionAndIconInfo();
+
+ TBool useDefaultIcons=ETrue;
+
+ if(captionIconInfo!=NULL)
+ {
+ iShortCaption=localisationInfo[0]->ShortCaption().AllocL();
+ if(iShortCaption && iShortCaption->Length() == 0)
+ {
+ delete iShortCaption;
+ iShortCaption=NULL;
+ }
+
+ iCaption=captionIconInfo->Caption().AllocL();
+ if(iCaption && iCaption->Length() == 0)
+ {
+ delete iCaption;
+ iCaption=NULL;
+ }
+
+ iNumOfAppIcons=captionIconInfo->NumOfAppIcons();
+
+ if(captionIconInfo->IconFileName().Length()>0)
+ iIconFileName=captionIconInfo->IconFileName().AllocL();
+
+
+ if (iIconFileName && iIconFileName->Length())
+ {
+ if (iFs.IsValidName(*iIconFileName))
+ {
+ RFile file;
+ TInt fileSize( 0 );
+ TInt err= file.Open(iFs, *iIconFileName, EFileShareReadersOnly );
+
+ //If the icon file does not exist, use default icons.
+ if(err==KErrNone)
+ {
+ User::LeaveIfError(err);
+ CleanupClosePushL( file );
+ User::LeaveIfError( file.Size( fileSize ) );
+ CleanupStack::PopAndDestroy(&file);//file
+
+ if ( fileSize > 0 )
+ {
+ if(FileIsMbmWithGenericExtensionL(*iIconFileName))
+ {
+ if (iNumOfAppIcons > 0)
+ {
+ //Icon file is valid and contains mbm icons.
+ iIcons = CApaAppIconArray::NewAppIconsL(iNumOfAppIcons, *iIconFileName, *iIconLoader);
+ useDefaultIcons=EFalse;
+ }
+ }
+ else
+ {
+ //If the icon file is not a mbm icon file then the file is treated as a non-mbm file.
+ iNonMbmIconFile = ETrue;
+ useDefaultIcons=EFalse;
+ }
+
+ }
+ }
+ }
+ else
+ {
+ //If the filename is not a valid name then the file is treated as a non-mbm file.
+ iNonMbmIconFile = ETrue;
+ useDefaultIcons=EFalse;
+ }
+ }
+ }
+
+ if(useDefaultIcons)
+ TRAP_IGNORE(iIcons = CApaAppIconArray::NewDefaultIconsL());
+
+ ReadViewInfoL(localisationInfo[0]->ViewDataList());
+ }
+
+/*
+ * Read application view information.
+ */
+
+void CApaAppInfoReader::ReadViewInfoL(const RPointerArray<Usif::CAppViewData>& aViewData)
+ {
+ const TInt numOfViews = aViewData.Count();
+
+ //if view information not avaliable, just return.
+ if(numOfViews <=0 )
+ return;
+
+ iViewDataArray = new(ELeave) CArrayPtrFlat<CApaAppViewData>(numOfViews);
+
+ //Read one view information at time and add it iViewDataArray
+ for(TInt view = 0; view < numOfViews; ++view)
+ {
+ CApaAppViewData* viewData = CApaAppViewData::NewLC();
+
+ const TUid viewUid = aViewData[view]->Uid();
+ viewData->SetUid(viewUid);
+
+ const TInt screenMode = {aViewData[view]->ScreenMode()};
+ viewData->SetScreenMode(screenMode);
+
+ const Usif::CCaptionAndIconInfo* viewCaptionIconInfo=aViewData[view]->CaptionAndIconInfo();
+
+ if(viewCaptionIconInfo!=NULL)
+ {
+ viewData->SetCaptionL(viewCaptionIconInfo->Caption());
+
+ const TInt numOfViewIcons = viewCaptionIconInfo->NumOfAppIcons();
+ viewData->SetNumOfViewIcons(numOfViewIcons);
+
+ TPtrC viewIconFile = viewCaptionIconInfo->IconFileName();
+
+ if (viewIconFile.Length())
+ {
+ viewData->SetIconFileNameL(viewIconFile);
+
+ if (iFs.IsValidName(viewIconFile))
+ {
+ if(!FileIsMbmWithGenericExtensionL(viewIconFile))
+ viewData->SetNonMbmIconFile(ETrue);
+ }
+ else //If the filename is not a valid name then the file is treated as a non-mbm file.
+ viewData->SetNonMbmIconFile(ETrue);
+ }
+ else
+ {
+ viewIconFile.Set(KNullDesC);
+ if (numOfViewIcons > 0 && iIconFileName)
+ viewIconFile.Set(*iIconFileName); // default to app icon filename
+ }
+
+ if (numOfViewIcons > 0 && iFs.IsValidName(viewIconFile) && FileIsMbmWithGenericExtensionL(viewIconFile))
+ {
+ CApaAppIconArray* iconArray = CApaAppIconArray::NewViewIconsL(numOfViewIcons, viewIconFile, *iIconLoader);
+ viewData->SetIconArray(iconArray);
+ iconArray = NULL;
+ }
+ }
+
+ iViewDataArray->AppendL(viewData);
+ CleanupStack::Pop(viewData);
+ }
+ }
+
+#else
+
+CApaAppInfoReader* CApaAppInfoReader::NewL(RFs& aFs, const TDesC& aRegistrationFileName, TUid aAppUid)
+ {
+ CApaAppInfoReader* self = new(ELeave) CApaAppInfoReader(aFs, aRegistrationFileName, aAppUid);
+ CleanupStack::PushL(self);
+ self->ConstructL();
+ CleanupStack::Pop(self);
+ return self;
+ }
+
+CApaAppInfoReader::CApaAppInfoReader(RFs& aFs, const TDesC& aRegistrationFileName, TUid aAppUid) :
+ iFs(aFs),
+ iAppUid(aAppUid),
+ iTimeStamp(0),
+ iDefaultScreenNumber(0),
+ iNonMbmIconFile(EFalse),
+ iLocalisableResourceFileTimeStamp(0),
+ iApplicationLanguage(ELangNone),
+ iIndexOfFirstOpenService(KErrNotFound),
+ iRegistrationFileName(aRegistrationFileName)
+ {
+ }
+
+TTime CApaAppInfoReader::TimeStamp() const
+ {
+ return iTimeStamp;
+ }
+
+TTime CApaAppInfoReader::IconFileTimeStamp() const
+ {
+ return iIconFileTimeStamp;
+ }
+
+HBufC* CApaAppInfoReader::LocalisableResourceFileName()
+ {
+ HBufC* localisableResourceFileName = iLocalisableResourceFileName;
+ iLocalisableResourceFileName = NULL; // ownership transferred to caller
+ return localisableResourceFileName;
+ }
+
+TTime CApaAppInfoReader::LocalisableResourceFileTimeStamp() const
+ {
+ return iLocalisableResourceFileTimeStamp;
+ }
+
// reads as much info as it can
// at least captions and icons must be setup on return from this method (using defaults if necessary)
TBool CApaAppInfoReader::ReadL()
@@ -361,54 +838,6 @@
iAppBinaryFullName = parse.FullName().AllocL();
}
-
-HBufC* CApaAppInfoReader::CreateFullIconFileNameL(const TDesC& aIconFileName) const
- {
- HBufC* filename = NULL;
- if (aIconFileName.Length() == 0)
- return NULL;
- /*
- * aIconFileName may contain a valid string in some format (for eg. URI format) other than path to a regular file on disk
- * and that can be a mbm or non-mbm file. Such a filename will be reported as invalid filename by iFs.IsValidName() method.
- * aIconFileName will be returned since it is a valid string.
- */
- if(!iFs.IsValidName(aIconFileName))
- {
- filename = aIconFileName.AllocL();
- return filename;
- }
-
- TParsePtrC parsePtr(aIconFileName);
- if (parsePtr.IsWild() || !parsePtr.PathPresent() || !parsePtr.NamePresent())
- return NULL;
-
- // check for fully qualified icon filename
- if (parsePtr.DrivePresent() && BaflUtils::FileExists(iFs, aIconFileName))
- filename = aIconFileName.AllocL();
- else
- {
- // check for icon file on same drive as localisable resource file
- TParse parse;
- TPtrC localisableResourceFileDrive = TParsePtrC(*iLocalisableResourceFileName).Drive();
- TInt ret = parse.SetNoWild(localisableResourceFileDrive, &aIconFileName, NULL);
- if (ret == KErrNone && BaflUtils::FileExists(iFs, parse.FullName()))
- filename = parse.FullName().AllocL();
- else
- {
- TPtrC registrationFileDrive = TParsePtrC(iRegistrationFileName).Drive();
- if (TInt(TDriveUnit(registrationFileDrive)) != TInt(TDriveUnit(localisableResourceFileDrive)))
- {
- // check for icon file on same drive as registration file
- ret = parse.SetNoWild(registrationFileDrive, &aIconFileName, NULL);
- if (ret == KErrNone && BaflUtils::FileExists(iFs, parse.FullName()))
- filename = parse.FullName().AllocL();
- }
- }
- }
-
- return filename;
- }
-
void CApaAppInfoReader::ReadLocalisableInfoL(const CResourceFile& aResourceFile, TUint aResourceId, TBool& aUseDefaultIcons)
{
RResourceReader resourceReader;
@@ -570,68 +999,6 @@
CleanupStack::PopAndDestroy(&resourceReader);
}
-/*An MBM file may have a generic icon extension. In this case, as a way to check whether the file is an MBM one,
-it is necessary to read the content of the fist four 32bit words of it and find out whether these words correspond to
-KWriteonceFileStoreUid, KMultiBitmapFileImageUid, zero and KMultiBitmapFileImageChecksum respectively (defined in graphics/gditools/bmconv/bmconv.h).
-So the file is opened and the first 4 32 bit words are extracted and compared with the header information of standard MBM file.
-If they match, the function returns ETrue, else it returns EFalse */
-TBool CApaAppInfoReader::FileIsMbmWithGenericExtensionL(const TDesC& aFileName)
- {
- if (aFileName.Length() > 0)
- {
- //open a file in Share mode - this will allow other methods to access it too
- RFile file;
- RFs fs;
- User::LeaveIfError(fs.Connect());
- CleanupClosePushL(fs);
- User::LeaveIfError(file.Open(fs,aFileName,EFileShareReadersOnly));
- //this is done beacuse the file can also be accessed by applist at the same time
- //buffer stores the 16 bytes of the file
- CleanupClosePushL(file);
- TBuf8<16> buffer;
- User::LeaveIfError(file.Read(buffer,16));
- CleanupStack::PopAndDestroy();//file
- CleanupStack::PopAndDestroy(&fs);//fs
- //we use a constant pointer to the buffer to read header info
- TPtrC8 filePointer(buffer);
-
- /*The first 16 bytes of an MBM file are the same for any generic MBM file.
- These are :
- KWriteOnceFileStoreUid = 0x10000037(Emulator MBM file) 0x10000041(ROM image)
- KMultiBitMapFileImageUid = 0x10000042(Emulator MBM file) 0x00000001(ROM image)
- Zero = 0x00000000(Emulator MBM file) 0x0000000C(ROM image)
- checksum = 0x47396439(Emulator MBM file) 0x10000040(ROM image)
- The first 16 bytes of the given file is compared with these standard values to ascertain it is MBM file*/
- if((filePointer[3]==0x10)&&(filePointer[2]==0x00)&&(filePointer[1]==0x00)&&(filePointer[0]==0x37))
- {//KWriteOnceFileStoreUid = 0x10000037
- if((filePointer[7]==0x10)&&(filePointer[6]==0x00)&&(filePointer[5]==0x00)&&(filePointer[4]==0x42))
- {//KMultiBitMapFileImageUid = 0x10000042
- if((filePointer[11]==0x00)&&(filePointer[10]==0x00)&&(filePointer[9]==0x00)&&(filePointer[8]==0x00))
- {//Zero = 0x00000000)
- if((filePointer[15]==0x47)&&(filePointer[14]==0x39)&&(filePointer[13]==0x64)&&(filePointer[12]==0x39))
- {//checksum = 0x47396439
- return ETrue;
- }
- }
- }
- }
- //Else Check for ROM Image MBM file's header
- else if((filePointer[3]==0x10)&&(filePointer[2]==0x00)&&(filePointer[1]==0x00)&&(filePointer[0]==0x41))
- {//KWriteOnceFileStoreUid = 0x10000041
- if((filePointer[7]==0x00)&&(filePointer[6]==0x00)&&(filePointer[5]==0x00)&&(filePointer[4]==0x01))
- {//KMultiBitMapFileImageUid = 0x00000001
- if((filePointer[11]==0x00)&&(filePointer[10]==0x00)&&(filePointer[9]==0x00)&&(filePointer[8]==0x0C))
- {//Zero = 0x0000000C)
- if((filePointer[15]==0x10)&&(filePointer[14]==0x00)&&(filePointer[13]==0x00)&&(filePointer[12]==0x40))
- {//checksum = 0x10000040
- return ETrue;
- }
- }
- }
- }
- }
- return EFalse;
- }
HBufC8* CApaAppInfoReader::ReadOpaqueDataL(TUint aResourceId, const CResourceFile* aRegistrationFile, CResourceFile* aLocalisableResourceFile)
{ // static
@@ -844,6 +1211,119 @@
}
}
+
+HBufC* CApaAppInfoReader::CreateFullIconFileNameL(const TDesC& aIconFileName) const
+ {
+ HBufC* filename = NULL;
+ if (aIconFileName.Length() == 0)
+ return NULL;
+ /*
+ * aIconFileName may contain a valid string in some format (for eg. URI format) other than path to a regular file on disk
+ * and that can be a mbm or non-mbm file. Such a filename will be reported as invalid filename by iFs.IsValidName() method.
+ * aIconFileName will be returned since it is a valid string.
+ */
+ if(!iFs.IsValidName(aIconFileName))
+ {
+ filename = aIconFileName.AllocL();
+ return filename;
+ }
+
+ TParsePtrC parsePtr(aIconFileName);
+ if (parsePtr.IsWild() || !parsePtr.PathPresent() || !parsePtr.NamePresent())
+ return NULL;
+
+ // check for fully qualified icon filename
+ if (parsePtr.DrivePresent() && BaflUtils::FileExists(iFs, aIconFileName))
+ filename = aIconFileName.AllocL();
+ else
+ {
+ // check for icon file on same drive as localisable resource file
+ TParse parse;
+ TPtrC localisableResourceFileDrive = TParsePtrC(*iLocalisableResourceFileName).Drive();
+ TInt ret = parse.SetNoWild(localisableResourceFileDrive, &aIconFileName, NULL);
+ if (ret == KErrNone && BaflUtils::FileExists(iFs, parse.FullName()))
+ filename = parse.FullName().AllocL();
+ else
+ {
+ TPtrC registrationFileDrive = TParsePtrC(iRegistrationFileName).Drive();
+ if (TInt(TDriveUnit(registrationFileDrive)) != TInt(TDriveUnit(localisableResourceFileDrive)))
+ {
+ // check for icon file on same drive as registration file
+ ret = parse.SetNoWild(registrationFileDrive, &aIconFileName, NULL);
+ if (ret == KErrNone && BaflUtils::FileExists(iFs, parse.FullName()))
+ filename = parse.FullName().AllocL();
+ }
+ }
+ }
+
+ return filename;
+ }
+
+#endif
+
+/*An MBM file may have a generic icon extension. In this case, as a way to check whether the file is an MBM one,
+it is necessary to read the content of the fist four 32bit words of it and find out whether these words correspond to
+KWriteonceFileStoreUid, KMultiBitmapFileImageUid, zero and KMultiBitmapFileImageChecksum respectively (defined in graphics/gditools/bmconv/bmconv.h).
+So the file is opened and the first 4 32 bit words are extracted and compared with the header information of standard MBM file.
+If they match, the function returns ETrue, else it returns EFalse */
+TBool CApaAppInfoReader::FileIsMbmWithGenericExtensionL(const TDesC& aFileName)
+ {
+ if (aFileName.Length() > 0)
+ {
+ //open a file in Share mode - this will allow other methods to access it too
+ RFile file;
+ RFs fs;
+ User::LeaveIfError(fs.Connect());
+ CleanupClosePushL(fs);
+ User::LeaveIfError(file.Open(fs,aFileName,EFileShareReadersOnly));
+ //this is done beacuse the file can also be accessed by applist at the same time
+ //buffer stores the 16 bytes of the file
+ CleanupClosePushL(file);
+ TBuf8<16> buffer;
+ User::LeaveIfError(file.Read(buffer,16));
+ CleanupStack::PopAndDestroy();//file
+ CleanupStack::PopAndDestroy(&fs);//file, fs
+ //we use a constant pointer to the buffer to read header info
+ TPtrC8 filePointer(buffer);
+
+ /*The first 16 bytes of an MBM file are the same for any generic MBM file.
+ These are :
+ KWriteOnceFileStoreUid = 0x10000037(Emulator MBM file) 0x10000041(ROM image)
+ KMultiBitMapFileImageUid = 0x10000042(Emulator MBM file) 0x00000001(ROM image)
+ Zero = 0x00000000(Emulator MBM file) 0x0000000C(ROM image)
+ checksum = 0x47396439(Emulator MBM file) 0x10000040(ROM image)
+ The first 16 bytes of the given file is compared with these standard values to ascertain it is MBM file*/
+ if((filePointer[3]==0x10)&&(filePointer[2]==0x00)&&(filePointer[1]==0x00)&&(filePointer[0]==0x37))
+ {//KWriteOnceFileStoreUid = 0x10000037
+ if((filePointer[7]==0x10)&&(filePointer[6]==0x00)&&(filePointer[5]==0x00)&&(filePointer[4]==0x42))
+ {//KMultiBitMapFileImageUid = 0x10000042
+ if((filePointer[11]==0x00)&&(filePointer[10]==0x00)&&(filePointer[9]==0x00)&&(filePointer[8]==0x00))
+ {//Zero = 0x00000000)
+ if((filePointer[15]==0x47)&&(filePointer[14]==0x39)&&(filePointer[13]==0x64)&&(filePointer[12]==0x39))
+ {//checksum = 0x47396439
+ return ETrue;
+ }
+ }
+ }
+ }
+ //Else Check for ROM Image MBM file's header
+ else if((filePointer[3]==0x10)&&(filePointer[2]==0x00)&&(filePointer[1]==0x00)&&(filePointer[0]==0x41))
+ {//KWriteOnceFileStoreUid = 0x10000041
+ if((filePointer[7]==0x00)&&(filePointer[6]==0x00)&&(filePointer[5]==0x00)&&(filePointer[4]==0x01))
+ {//KMultiBitMapFileImageUid = 0x00000001
+ if((filePointer[11]==0x00)&&(filePointer[10]==0x00)&&(filePointer[9]==0x00)&&(filePointer[8]==0x0C))
+ {//Zero = 0x0000000C)
+ if((filePointer[15]==0x10)&&(filePointer[14]==0x00)&&(filePointer[13]==0x00)&&(filePointer[12]==0x40))
+ {//checksum = 0x10000040
+ return ETrue;
+ }
+ }
+ }
+ }
+ }
+ return EFalse;
+ }
+
// This method can be used to check whether app has a WriteDeviceCap
// and its sid is trusted
void CApaAppInfoReader::ReadAppSecurityInfo()
@@ -925,7 +1405,7 @@
return ret;
}
else
- aUseCache = ETrue;
+ aUseCache = ETrue;
// if filename in array, get the next index
TInt ret = 0;
@@ -963,6 +1443,7 @@
// Leaves if an error occurs while trying to populate aIcons or sort icons
TBool CApaIconLoader::LoadIconsL(TInt aNumOfIcons, const TDesC& aMbmFileName, CArrayPtr<CApaMaskedBitmap>& aIcons)
{
+
TEntry entry;
TInt error=iFs.Entry(aMbmFileName,entry);
if (error!=KErrNone)
@@ -985,7 +1466,8 @@
CApaMaskedBitmap* bitmap = CApaMaskedBitmap::NewLC();
fileIndex = IconIndexL(aMbmFileName, useCache);
User::LeaveIfError(bitmap->Load(mbmFile, 2*fileIndex));
- User::LeaveIfError((bitmap->Mask())->Load(mbmFile,2*fileIndex+1));
+ User::LeaveIfError((bitmap->Mask())->Load(mbmFile,2*fileIndex+1));
+
aIcons.AppendL(bitmap);
CleanupStack::Pop(bitmap);
}
--- a/appfw/apparchitecture/aplist/aplappinforeader.h Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/aplist/aplappinforeader.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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"
@@ -26,6 +26,11 @@
#include <barsread.h>
#include <apgicnfl.h>
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+#include <usif/scr/scr.h>
+#include <usif/scr/appregentries.h>
+#endif
+
class TEntry;
class RFs;
class CResourceFile;
@@ -34,6 +39,7 @@
class CApaAppIconArray;
class CApaAppViewData;
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
/**
@internalComponent
*/
@@ -42,7 +48,7 @@
public:
static TBool TypeUidIsForRegistrationFile(const TUidType& aUidType);
};
-
+#endif
/**
@internalComponent
@@ -126,8 +132,16 @@
class CApaAppInfoReader : public CBase
{
public:
- static CApaAppInfoReader* NewL(RFs& aFs, const TDesC& aRegistrationFileName, TUid aAppUid);
- TBool ReadL();
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+ static CApaAppInfoReader* NewL(RFs& aFs, const Usif::CApplicationRegistrationData& aAppInfo, const Usif::RSoftwareComponentRegistry& aScr);
+#else
+ static CApaAppInfoReader* NewL(RFs& aFs, const TDesC& aRegistrationFileName, TUid aAppUid);
+ HBufC* LocalisableResourceFileName();
+ TTime LocalisableResourceFileTimeStamp() const;
+ TTime TimeStamp() const;
+ TTime IconFileTimeStamp() const;
+#endif
+ TBool ReadL();
static TBool FileIsMbmWithGenericExtensionL(const TDesC& aFileName);
~CApaAppInfoReader();
public:
@@ -145,35 +159,41 @@
HBufC* IconFileName();
TBool NonMbmIconFile() const;
CApaIconLoader* IconLoader();
-
- TTime TimeStamp() const;
- TTime IconFileTimeStamp() const;
-
- HBufC* LocalisableResourceFileName();
- TTime LocalisableResourceFileTimeStamp() const;
TLanguage AppLanguage() const;
CArrayFixFlat<TApaAppServiceInfo>* ServiceArray(TInt& aIndexOfFirstOpenService);
HBufC8* OpaqueData();
+
private:
- CApaAppInfoReader(RFs& aFs, const TDesC& aRegistrationFileName, TUid aAppUid);
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+ CApaAppInfoReader(RFs& aFs, const Usif::CApplicationRegistrationData& aAppInfo, const Usif::RSoftwareComponentRegistry& aScr);
+ void ReadAppRegistrationInfoL();
+ void ReadServiceInfoL(const RPointerArray<Usif::CServiceInfo>& aServiceInfo);
+ void ReadOwnedFilesInfoL(const RPointerArray<HBufC>& aOwnedFiles);
+ void ReadMimeTypesSupportedL(const RPointerArray<Usif::CDataType>& dataTypes, CArrayFixFlat<TDataTypeWithPriority>& aMimeTypesSupported);
+ void ReadLocalisationInfoL();
+ void ReadViewInfoL(const RPointerArray<Usif::CAppViewData>& aViewData);
+#ifdef APPARC_SHOW_TRACE
+ void DisplayAppInfo();
+#endif
+
+#else
+ CApaAppInfoReader(RFs& aFs, const TDesC& aRegistrationFileName, TUid aAppUid);
+ void ReadMandatoryInfoL(RResourceReader& aResourceReader);
+ void ReadNonLocalisableInfoL(RResourceReader& aResourceReader, CResourceFile*& aLocalisableResourceFile, TUint& aLocalisableResourceId);
+ void ReadNonLocalisableOptionalInfoL(RResourceReader& aResourceReader, const CResourceFile* aRegistrationFile, CResourceFile* aLocalisableResourceFile);
+ void ReadMimeTypesSupportedL(RResourceReader& aResourceReader, CArrayFixFlat<TDataTypeWithPriority>& aMimeTypesSupported);
+ void ReadLocalisableInfoL(const CResourceFile& aResourceFile, TUint aResourceId, TBool& aUseDefaultIcons);
+ HBufC* CreateFullIconFileNameL(const TDesC& aIconFileName) const;
+#endif
void ConstructL();
- void ReadMandatoryInfoL(RResourceReader& aResourceReader);
- void ReadNonLocalisableInfoL(RResourceReader& aResourceReader, CResourceFile*& aLocalisableResourceFile, TUint& aLocalisableResourceId);
- void ReadNonLocalisableOptionalInfoL(RResourceReader& aResourceReader, const CResourceFile* aRegistrationFile, CResourceFile* aLocalisableResourceFile);
- void ReadMimeTypesSupportedL(RResourceReader& aResourceReader, CArrayFixFlat<TDataTypeWithPriority>& aMimeTypesSupported);
- void ReadLocalisableInfoL(const CResourceFile& aResourceFile, TUint aResourceId, TBool& aUseDefaultIcons);
- HBufC* CreateFullIconFileNameL(const TDesC& aIconFileName) const;
TBool HasWriteDeviceDataCap();
void ReadAppSecurityInfo();
-
static HBufC8* ReadOpaqueDataL(TUint aResourceId, const CResourceFile* aRegistrationFile, CResourceFile* aLocalisableResourceFile);
private:
RFs& iFs;
TUid iAppUid;
HBufC* iAppBinaryFullName;
TUidType iAppBinaryUidType;
- TTime iTimeStamp;
- TTime iIconFileTimeStamp;
TApaAppCapability iCapability;
TUint iDefaultScreenNumber;
HBufC* iCaption;
@@ -184,20 +204,28 @@
CDesCArray* iOwnedFileArray;
HBufC* iIconFileName;
TBool iNonMbmIconFile; // ETrue if icon filename is not an MBM file, however, EFalse does not necessarily mean it is an MBM file
- HBufC* iLocalisableResourceFileName;
- TTime iLocalisableResourceFileTimeStamp;
TLanguage iApplicationLanguage;
CArrayFixFlat<TApaAppServiceInfo>* iServiceArray;
- TInt iIndexOfFirstOpenService;
- TBool iOpenServiceIsLegacy;
+ TInt iIndexOfFirstOpenService;
HBufC8* iOpaqueData;
private:
- const TDesC& iRegistrationFileName;
TBool iHasWriteDeviceDataCap;
TBool iIsSidTrusted;
// This flag is used to determine if app security info was allready read
TBool iSecurityInfoHasBeenRead;
- CApaIconLoader* iIconLoader;
+ CApaIconLoader* iIconLoader;
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+ const Usif::CApplicationRegistrationData& iAppInfo; //The ownership is not taken
+ const Usif::RSoftwareComponentRegistry& iScr; //The ownership is not taken
+#else
+ const TDesC& iRegistrationFileName;
+ TTime iTimeStamp;
+ TTime iIconFileTimeStamp;
+ HBufC* iLocalisableResourceFileName;
+ TTime iLocalisableResourceFileTimeStamp;
+ TBool iOpenServiceIsLegacy;
+#endif
+
};
--- a/appfw/apparchitecture/aplist/aplapplist.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/aplist/aplapplist.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -21,7 +21,6 @@
#include "APFDEF.H"
#include "../apparc/TRACE.H"
#include "apgnotif.h" // MApaAppListServObserver
-#include "aplappregfinder.h" // CApaAppRegFinder
#include <bautils.h> // BaflUtils::NearestLanguageFile()
#include <s32mem.h> // RBufWriteStream
#include "aplappinforeader.h"
@@ -30,6 +29,13 @@
#include <bafl/sysutil.h>
#endif
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+#include<usif/scr/scr.h>
+#include<usif/scr/appregentries.h>
+#else
+#include "aplappregfinder.h" // CApaAppRegFinder
+#endif
+
// Delays in the pseudo idle object that builds the application list
//
@@ -49,6 +55,13 @@
const TInt16 KROMVersionCacheFileBuildVersion=0;
#endif
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+const TInt KNumAppEntriesFromSCR=10;
+
+const TInt KSCRConnectionWaitTime=20000; //Time to wait if SCR is busy
+const TUid KUidSisLaunchServer={0x1020473f};
+#endif
+
GLDEF_C void Panic(TApgPanic aPanic)
{
@@ -84,7 +97,373 @@
TLanguage iPrevLanguage;
};
-
+
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+
+enum TApaSCRFetchAction
+ {
+ EGetAllAppsInfo, //Fetch all application the information from SCR
+ EGetSpecificAppsInfo //Fetch only provided application uids information
+ };
+
+/*
+ * Contain information about appliations to be fetched from SCR.
+ */
+
+NONSHARABLE_CLASS(CApaAppSCRFetchInfo : public CBase)
+ {
+public:
+ static CApaAppSCRFetchInfo* NewL(TApaSCRFetchAction aSCRFetchAction, RArray<TApaAppUpdateInfo>* aAppUpdateInfo);
+ ~CApaAppSCRFetchInfo();
+ RArray<TApaAppUpdateInfo>* AppUpdateInfo();
+ TApaSCRFetchAction SCRFetchAction();
+
+private:
+ CApaAppSCRFetchInfo(TApaSCRFetchAction aSCRFetchAction, RArray<TApaAppUpdateInfo>* aAppUpdateInfo);
+
+private:
+ TApaSCRFetchAction iSCRFetchAction;
+ RArray<TApaAppUpdateInfo>* iAppUpdateInfo;
+ };
+
+
+/*
+ * Reads multiple application information from SCR and caches it. When requested provides one application
+ * information at a time.
+ */
+NONSHARABLE_CLASS(CApaAppList::CApaScrAppInfo)
+ {
+public:
+ static CApaScrAppInfo* NewL(const Usif::RSoftwareComponentRegistry& aScrCon, TInt aNumEntries);
+ void GetAllAppsInfoL();
+ void GetSpecificAppsInfoL(RArray<TApaAppUpdateInfo>* aAppUpdateInfo);
+ TUid GetNextApplicationInfo(TApaAppUpdateInfo::TApaAppAction& aAppAction, Usif::CApplicationRegistrationData*& aAppData);
+ TApaSCRFetchAction GetSCRFetchAction();
+ ~CApaScrAppInfo();
+
+private:
+ void ConstructL();
+ CApaScrAppInfo(const Usif::RSoftwareComponentRegistry& aScr, TInt aNumEntries);
+ void GetAppUidListL(RArray<TApaAppUpdateInfo>& aAppUpdateInfoArr, RArray<TUid>& aAppUids);
+ TUid GetAllAppsNextApplicationInfoL(TApaAppUpdateInfo::TApaAppAction& aAppAction, Usif::CApplicationRegistrationData*& aAppData);
+ TUid GetSpecificAppsNextApplicationInfoL(TApaAppUpdateInfo::TApaAppAction& aAppAction, Usif::CApplicationRegistrationData*& aAppData);
+private:
+ Usif::RApplicationRegistryView iScrAppView;
+ RPointerArray<Usif::CApplicationRegistrationData> iAppInfo;
+ RPointerArray<CApaAppSCRFetchInfo> iSCRFetchInfoQueue;
+ const Usif::RSoftwareComponentRegistry& iSCR;
+ TBool iIsSCRRegViewOpen;
+ TInt iSpecificAppsIndex;
+ CApaAppSCRFetchInfo* iAppSCRFetchInfo;
+ TBool iMoreAppInfo;
+ TInt iNumEntriesToFetch;
+ };
+
+
+
+CApaAppSCRFetchInfo* CApaAppSCRFetchInfo::NewL(TApaSCRFetchAction aSCRFetchAction, RArray<TApaAppUpdateInfo>* aAppUpdateInfo)
+ {
+ //Ownership of aAppUpdateInfo is transfered to this object.
+ CApaAppSCRFetchInfo* self=new (ELeave) CApaAppSCRFetchInfo(aSCRFetchAction, aAppUpdateInfo);
+ return(self);
+ }
+
+
+CApaAppSCRFetchInfo::CApaAppSCRFetchInfo(TApaSCRFetchAction aSCRFetchAction, RArray<TApaAppUpdateInfo>* aAppUpdateInfo):
+ iSCRFetchAction(aSCRFetchAction),
+ iAppUpdateInfo(aAppUpdateInfo)
+ {
+ }
+
+CApaAppSCRFetchInfo::~CApaAppSCRFetchInfo()
+ {
+ delete iAppUpdateInfo;
+ }
+
+RArray<TApaAppUpdateInfo>* CApaAppSCRFetchInfo::AppUpdateInfo()
+ {
+ return iAppUpdateInfo;
+ }
+
+
+TApaSCRFetchAction CApaAppSCRFetchInfo::SCRFetchAction()
+ {
+ return iSCRFetchAction;
+ }
+
+
+//CApaAppList::CApaScrAppInfo
+
+CApaAppList::CApaScrAppInfo* CApaAppList::CApaScrAppInfo::NewL(const Usif::RSoftwareComponentRegistry& aScrCon, TInt aNumEntries)
+ {
+ CApaScrAppInfo* self=new(ELeave) CApaScrAppInfo(aScrCon, aNumEntries);
+ CleanupStack::PushL(self);
+ self->ConstructL();
+ CleanupStack::Pop();
+ return self;
+ }
+
+
+CApaAppList::CApaScrAppInfo::CApaScrAppInfo(const Usif::RSoftwareComponentRegistry& aScr, TInt aNumEntries):
+ iSCR(aScr),
+ iIsSCRRegViewOpen(EFalse),
+ iSpecificAppsIndex(-1),
+ iAppSCRFetchInfo(NULL),
+ iMoreAppInfo(EFalse),
+ iNumEntriesToFetch(aNumEntries)
+
+ {
+ }
+
+void CApaAppList::CApaScrAppInfo::ConstructL()
+ {
+ }
+
+
+CApaAppList::CApaScrAppInfo::~CApaScrAppInfo()
+ {
+ if(iAppSCRFetchInfo)
+ {
+ delete iAppSCRFetchInfo;
+ iAppSCRFetchInfo=NULL;
+ }
+
+ iAppInfo.ResetAndDestroy();
+ iSCRFetchInfoQueue.ResetAndDestroy();
+ iScrAppView.Close();
+ }
+
+/*
+ * Gets all the application information available in the SCR. It adds SCR fetch info with action EGetAllAppsInfo to a queue
+ * to get all the application information. The information can be obtained one at a time by calling GetNextApplicationInfoL
+ * function.
+ */
+void CApaAppList::CApaScrAppInfo::GetAllAppsInfoL()
+ {
+ CApaAppSCRFetchInfo* appSCRFetchInfo = CApaAppSCRFetchInfo::NewL(EGetAllAppsInfo, NULL);
+ CleanupStack::PushL(appSCRFetchInfo);
+ iSCRFetchInfoQueue.AppendL(appSCRFetchInfo);
+ CleanupStack::Pop();
+ }
+
+
+/*
+ * Gets specific application information from the SCR. It adds SCR fetch info request with action EGetSpecificAppsInfo
+ * along with the required uid list to the queue. The information can be obtained one at a time by calling GetNextApplicationInfoL
+ * function.
+ */
+void CApaAppList::CApaScrAppInfo::GetSpecificAppsInfoL(RArray<TApaAppUpdateInfo>* aAppUpdateInfo)
+ {
+ CApaAppSCRFetchInfo* appSCRFetchInfo=CApaAppSCRFetchInfo::NewL(EGetSpecificAppsInfo, aAppUpdateInfo);
+ CleanupStack::PushL(appSCRFetchInfo);
+ iSCRFetchInfoQueue.AppendL(appSCRFetchInfo);
+ CleanupStack::Pop();
+ }
+
+/*
+ * Create array of uids from TApaAppUpdateInfo array.
+ */
+void CApaAppList::CApaScrAppInfo::GetAppUidListL(RArray<TApaAppUpdateInfo>& aAppUpdateInfoArr, RArray<TUid>& aAppUids)
+ {
+ TInt count=aAppUpdateInfoArr.Count();
+
+ for(TInt index=0;index<count;index++)
+ {
+ TApaAppUpdateInfo appUpdateInfo=aAppUpdateInfoArr[index];
+ aAppUids.AppendL(appUpdateInfo.iAppUid);
+ }
+ }
+
+
+TApaSCRFetchAction CApaAppList::CApaScrAppInfo::GetSCRFetchAction()
+{
+ return iAppSCRFetchInfo->SCRFetchAction();
+}
+
+
+/*
+ * Provides one application information at a time. Returns Null UID if no more application information available.
+ * Ownership of aAppData is transfered to calling function.
+ */
+TUid CApaAppList::CApaScrAppInfo::GetNextApplicationInfo(TApaAppUpdateInfo::TApaAppAction& aAppAction, Usif::CApplicationRegistrationData*& aAppData)
+ {
+ aAppData=NULL;
+ TUid appUid=KNullUid;
+
+ while(appUid==KNullUid)
+ {
+ //If there is no valid current SCR fetch information, get it from SCR fetch info queue
+ if(!iAppSCRFetchInfo)
+ {
+ if(iSCRFetchInfoQueue.Count()>0)
+ {
+ //Get next SCR fetch info
+ iAppSCRFetchInfo=iSCRFetchInfoQueue[0];
+ iSCRFetchInfoQueue.Remove(0);
+ iMoreAppInfo=ETrue;
+ }
+ else
+ {
+ //No more SCR fetch information avaialable.
+ break;
+ }
+ }
+
+ //Get next application information
+ if(iAppSCRFetchInfo->SCRFetchAction()==EGetAllAppsInfo)
+ {
+ //If there is a leave with current SCR fetch info, ignore and proceed with next SCR fetch info
+ TRAP_IGNORE(appUid=GetAllAppsNextApplicationInfoL(aAppAction, aAppData));
+ }
+ else
+ {
+ //If there is a leave with current SCR fetch info, ignore and proceed with next SCR fetch info
+ TRAP_IGNORE(appUid=GetSpecificAppsNextApplicationInfoL(aAppAction, aAppData));
+ }
+
+ if(appUid==KNullUid)
+ {
+ //If no application information avaialble with current fetch action reset the values for next SCR fetch action.
+ delete iAppSCRFetchInfo;
+ iAppSCRFetchInfo=NULL;
+ iScrAppView.Close();
+ iIsSCRRegViewOpen=EFalse;
+ }
+ }
+
+ return(appUid);
+ }
+
+TUid CApaAppList::CApaScrAppInfo::GetAllAppsNextApplicationInfoL(TApaAppUpdateInfo::TApaAppAction& aAppAction, Usif::CApplicationRegistrationData*& aAppData)
+ {
+ TUid appUid=KNullUid;
+
+ if(iAppInfo.Count()==0 && iMoreAppInfo)
+ {
+ //Open registry view if its not open.
+ if(!iIsSCRRegViewOpen)
+ {
+ TInt err=KErrNone;
+ TInt timeOut=KSCRConnectionWaitTime;
+
+ //Retry if an error occurs while opening a SCR view.
+ while(timeOut < KSCRConnectionWaitTime*8)
+ {
+ TRAP(err, iScrAppView.OpenViewL(iSCR));
+ if(err != KErrNone)
+ {
+ User::After(timeOut);
+ timeOut= (2*timeOut);
+ }
+ else
+ {
+ break;
+ }
+ }
+ User::LeaveIfError(err);
+ iIsSCRRegViewOpen=ETrue;
+ }
+
+ //Get next available applications information.
+ iScrAppView.GetNextApplicationRegistrationInfoL(iNumEntriesToFetch, iAppInfo);
+ if(iAppInfo.Count()<KNumAppEntriesFromSCR)
+ iMoreAppInfo=EFalse;
+ }
+
+ //If no application information avaialble, return Null UID.
+ if(iAppInfo.Count()==0)
+ return KNullUid;
+
+ aAppData=iAppInfo[0];
+ aAppAction=TApaAppUpdateInfo::EAppPresent;
+ iAppInfo.Remove(0);
+ appUid=aAppData->AppUid();
+ return appUid;
+ }
+
+
+/*
+ * Gets next application information when specific applications information requested.
+ */
+TUid CApaAppList::CApaScrAppInfo::GetSpecificAppsNextApplicationInfoL(TApaAppUpdateInfo::TApaAppAction& aAppAction, Usif::CApplicationRegistrationData*& aAppData)
+ {
+ TUid appUid=KNullUid;
+ TApaAppUpdateInfo::TApaAppAction action = TApaAppUpdateInfo::EAppNotPresent; //To make compiler happy
+ Usif::CApplicationRegistrationData* appData=NULL;
+
+ while(appUid==KNullUid)
+ {
+ if(iAppInfo.Count()==0 && iMoreAppInfo)
+ {
+ //Open registry view if its not open and also provides application uid list for which applist needs to be updated.
+ if(!iIsSCRRegViewOpen)
+ {
+ RArray<TUid> appUids;
+ CleanupClosePushL(appUids);
+ //Get application uids list.
+ GetAppUidListL(*iAppSCRFetchInfo->AppUpdateInfo(), appUids);
+
+ TInt err=KErrNone;
+ do
+ {
+ TRAP(err, iScrAppView.OpenViewL(iSCR, appUids));
+ if(err)
+ User::After(KSCRConnectionWaitTime);
+ }
+ while(err!=KErrNone);
+
+ CleanupStack::PopAndDestroy();
+ iIsSCRRegViewOpen=ETrue;
+ iSpecificAppsIndex=0;
+ }
+
+ //Get next available applications information.
+ iScrAppView.GetNextApplicationRegistrationInfoL(iNumEntriesToFetch,iAppInfo);
+ if(iAppInfo.Count()<KNumAppEntriesFromSCR)
+ iMoreAppInfo=EFalse;
+ }
+
+ RArray<TApaAppUpdateInfo>& appUpdateInfo=*iAppSCRFetchInfo->AppUpdateInfo();
+
+
+ if(iSpecificAppsIndex<appUpdateInfo.Count())
+ {
+ appUid=appUpdateInfo[iSpecificAppsIndex].iAppUid;
+ action=appUpdateInfo[iSpecificAppsIndex].iAction;
+
+ //If application information avaialable, and if application action is not uninstalled or
+ //If application action is uninstalled and the uninstalled application exists in SCR,
+ //then get the info and assign to aAppData.
+ if(iAppInfo.Count()>0)
+ {
+ if(iAppInfo[0]->AppUid()==appUid)
+ {
+ appData=iAppInfo[0];
+ iAppInfo.Remove(0);
+ }
+ }
+
+ iSpecificAppsIndex++;
+
+ //If action is not uninstalled, there should be application data in SCR. Otherwise skip the application action.
+ if((action!=TApaAppUpdateInfo::EAppNotPresent) && appData==NULL)
+ {
+ appUid=KNullUid;
+ }
+
+ }
+ //If there are no more applications in the current update applist, break the loop;
+ if(appUpdateInfo.Count()==iSpecificAppsIndex)
+ break;
+ }
+
+ aAppData=appData;
+ aAppAction=action;
+ return appUid;
+ }
+
+#endif
+
//
// Local functions
//
@@ -108,26 +487,29 @@
//
EXPORT_C CApaAppList* CApaAppList::NewL(RFs& aFs, TBool aLoadMbmIconsOnDemand, TInt aIdlePeriodicDelay)
- {
- CApaAppList* self=new (ELeave) CApaAppList(aFs, aLoadMbmIconsOnDemand, aIdlePeriodicDelay);
- CleanupStack::PushL(self);
- self->ConstructL();
- CleanupStack::Pop(self);
- return self;
- }
+ {
+ CApaAppList* self=new (ELeave) CApaAppList(aFs, aLoadMbmIconsOnDemand, aIdlePeriodicDelay);
+ CleanupStack::PushL(self);
+ self->ConstructL();
+ CleanupStack::Pop(self);
+ return self;
+ }
CApaAppList::CApaAppList(RFs& aFs, TBool aLoadMbmIconsOnDemand, TInt aIdlePeriodicDelay)
- :iFs(aFs),
- iFlags(0),
- iIdlePeriodicDelay(aIdlePeriodicDelay),
- iLoadMbmIconsOnDemand(aLoadMbmIconsOnDemand),
- iUninstalledApps(NULL)
- {
- }
+ :iFs(aFs),
+ iFlags(0),
+ iIdlePeriodicDelay(aIdlePeriodicDelay),
+ iLoadMbmIconsOnDemand(aLoadMbmIconsOnDemand),
+ iUninstalledApps(NULL)
+ {
+ }
+
void CApaAppList::ConstructL()
{
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
iAppRegFinder = CApaAppRegFinder::NewL(iFs);
+#endif
User::LeaveIfError(iFsShareProtected.Connect());
User::LeaveIfError(iFsShareProtected.ShareProtected());
@@ -135,8 +517,11 @@
//Start language change monitor.
iAppLangMonitor = CApaLangChangeMonitor::NewL(*this);
+
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
const TInt KArrayGranularity = 128;
iForcedRegistrations = new (ELeave) CDesCArraySeg(KArrayGranularity);
+#endif
// Init the AppsList cache paths
_LIT(KAppsListCacheFileName, ":\\private\\10003a3f\\AppsListCache\\AppsList.bin");
@@ -176,12 +561,14 @@
delete iDefaultIconArray;
delete iDefaultAppIconMbmFileName;
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
delete iAppRegFinder;
+ delete iForcedRegistrations;
+#endif
delete iAppIdler;
delete iAppListStorer;
delete iAppIconLoader;
delete iAppLangMonitor;
- delete iForcedRegistrations;
delete iIconCaptionObserver;
delete iIconCaptionOverrides;
iAppsListCacheFileName.Close();
@@ -190,8 +577,16 @@
iCustomAppList.ResetAndDestroy();
iCustomAppList.Close();
+
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+ iForceRegAppUids.Close();
+ delete iScrAppInfo;
+ iScr.Close();
+#endif
}
+
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
// Stop scanning applications if installation or uninstallation has started
EXPORT_C void CApaAppList::StopScan(TBool aNNAInstall)
{
@@ -206,7 +601,7 @@
}
UndoSetPending(iAppData);
}
-
+
// Allow scanning when installation or uninstallation is complete
EXPORT_C void CApaAppList::RestartScanL()
{
@@ -218,18 +613,7 @@
{
return iNNAInstallation;
}
-
-void CApaAppList::UndoSetPending(CApaAppData* aAppData)
- // Reset all apps to pevious pending state so they don't get purged
- {
- for (; aAppData; aAppData = aAppData->iNext)
- {
- if (aAppData->iIsPresent == CApaAppData::EPresentPendingUpdate)
- {
- aAppData->iIsPresent = CApaAppData::EIsPresent;
- }
- }
- }
+#endif
EXPORT_C void CApaAppList::StartIdleUpdateL()
/** Updates the list asynchronously, using an idle time active object,
@@ -267,7 +651,8 @@
delete iAppIdler;
iAppIdler=NULL;
}
-
+
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
// DEF072701
// When performing the update scan let the idle object have lower priority.
if (IsFirstScanComplete())
@@ -280,16 +665,133 @@
}
SetPending(iAppData);
iAppRegFinder->FindAllAppsL(CApaAppRegFinder::EScanAllDrives);
-
- // DEF072701
- // If this is the first scan i.e the boot scan then it may take some time. Thus
- // the periodic delay value should be used so that this process will stop periodically
- // to allow time for other processes.
- // If this is just a re-scan it should take much less time. Therefore it should just
- // be completed in one go rather than periodically delayed. Thus the delay value
- // should be set to 0.
- iAppIdler->Start(KIdleStartDelay, IsFirstScanComplete()? 0 : iIdlePeriodicDelay, TCallBack(IdleUpdateCallbackL, this));
- }
+ // DEF072701
+ // If this is the first scan i.e the boot scan then it may take some time. Thus
+ // the periodic delay value should be used so that this process will stop periodically
+ // to allow time for other processes.
+ // If this is just a re-scan it should take much less time. Therefore it should just
+ // be completed in one go rather than periodically delayed. Thus the delay value
+ // should be set to 0.
+ iAppIdler->Start(KIdleStartDelay, IsFirstScanComplete()? 0 : iIdlePeriodicDelay, TCallBack(IdleUpdateCallbackL, this));
+#else
+
+ iAppIdler=CPeriodic::NewL(CActive::EPriorityStandard);
+ iAppIdler->Start(KIdleStartDelay, IsFirstScanComplete()? 0 : iIdlePeriodicDelay, TCallBack(IdleUpdateCallbackL, this));
+
+#endif
+ }
+
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+EXPORT_C void CApaAppList::InitializeApplistL(MApaAppListObserver* aObserver)
+ {
+ if(!iScr.Handle())
+ User::LeaveIfError(iScr.Connect());
+
+ if(iScrAppInfo==NULL)
+ iScrAppInfo=CApaScrAppInfo::NewL(iScr, KNumAppEntriesFromSCR);
+
+ iScrAppInfo->GetAllAppsInfoL();
+
+ StartIdleUpdateL(aObserver);
+ }
+
+
+void CApaAppList::InitializeLangAppListL()
+ {
+ if(!iScr.Handle())
+ User::LeaveIfError(iScr.Connect());
+
+ if(iScrAppInfo==NULL)
+ iScrAppInfo=CApaScrAppInfo::NewL(iScr, KNumAppEntriesFromSCR);
+
+ iScrAppInfo->GetAllAppsInfoL();
+
+ // set iIsLangChangePending=ETrue, to all the application present in the applist
+ CApaAppData* appData=iAppData;
+ while(appData)
+ {
+ appData->iIsLangChangePending=ETrue;
+ appData=appData->iNext;
+ }
+ }
+
+
+EXPORT_C void CApaAppList::UpdateApplistL(MApaAppListObserver* aObserver, RArray<TApaAppUpdateInfo>* aAppUpdateInfo, TUid aSecureID)
+ {
+ //If update applist is called by SWI, clear force registrations from applist.
+ if(aSecureID == KUidSisLaunchServer)
+ {
+ TInt count=iForceRegAppUids.Count();
+ for(TInt index=0; index<count; index++)
+ FindAndDeleteApp(iForceRegAppUids[index]);
+ iForceRegAppUids.Reset();
+ }
+
+ if(aAppUpdateInfo->Count() == 0)
+ return;
+
+ //If SCR connection is not valid then connect.
+ if(!iScr.Handle())
+ User::LeaveIfError(iScr.Connect());
+
+ if(iScrAppInfo==NULL)
+ iScrAppInfo=CApaScrAppInfo::NewL(iScr, KNumAppEntriesFromSCR);
+
+ iScrAppInfo->GetSpecificAppsInfoL(aAppUpdateInfo);
+
+ if(IsIdleUpdateComplete())
+ StartIdleUpdateL(aObserver);
+ }
+
+void CleanupAndDestroyAppInfoArray(TAny* aRPArray)
+ {
+ RPointerArray<Usif::CApplicationRegistrationData>* rpArray = (static_cast<RPointerArray<Usif::CApplicationRegistrationData>*>(aRPArray));
+ rpArray->ResetAndDestroy();
+ rpArray->Close();
+ }
+
+
+EXPORT_C void CApaAppList::UpdateApplistByForceRegAppsL(RPointerArray<Usif::CApplicationRegistrationData>& aForceRegAppsInfo)
+ {
+ //Get number of force registered application information.
+ TInt count=aForceRegAppsInfo.Count();
+ Usif::RSoftwareComponentRegistry scr;
+ User::LeaveIfError(scr.Connect());
+ CleanupClosePushL(scr);
+
+ //As this function takes the ownership of aForceRegAppsInfo, this needs to be destroyed if any leave occurs.
+ TCleanupItem cleanup(CleanupAndDestroyAppInfoArray, &aForceRegAppsInfo);
+ CleanupStack::PushL(cleanup);
+
+ //Get each force registered application information and add it to applist.
+ for(TInt index=0; index<count; index++)
+ {
+ Usif::CApplicationRegistrationData* appInfo=aForceRegAppsInfo[index];
+ CApaAppData* appData = CApaAppData::NewL(*appInfo, iFs, scr);
+ TUid appUid=appInfo->AppUid();
+
+ //Delete if the application already exist in the applist.
+ FindAndDeleteApp(appUid);
+ AddToList(appData);
+ //Maintain added force registered application uids so that it can be cleared from applist
+ //once installation complete.
+ iForceRegAppUids.AppendL(appUid);
+ }
+
+ CleanupStack::PopAndDestroy(2); //cleanup, scr
+ }
+
+
+// The function transfers ownership of the pointer owned by a CApaAppList to the caller
+// to avoid copying the array.
+EXPORT_C CArrayFixFlat<TApaAppUpdateInfo>* CApaAppList::UpdatedAppsInfo()
+{
+ CArrayFixFlat<TApaAppUpdateInfo>* updatedAppsInfo=iAppsUpdated;
+ iAppsUpdated=NULL;
+ return updatedAppsInfo;
+}
+
+#endif
EXPORT_C void CApaAppList::StartIdleUpdateL(MApaAppListObserver* aObserver)
/** Updates the list asynchronously, using an idle time active object
@@ -327,7 +829,13 @@
@param aObserver Observer to be notified when the update has finished. */
{
+
+#ifdef APPARC_SHOW_TRACE
+ RDebug::Printf("[Apparc] *****************START CREATING APPLIST ****************************");
+#endif
+
DeleteAppsListBackUpAndTempFiles();
+
TInt ret = KErrGeneral;
#ifndef __WINS__ // on the emulator, don't read app list from file, as doing so means apps
// built while the emulator isn't running won't appear in the list
@@ -338,7 +846,12 @@
// There was an error during restore, so update the list asynchronously.
DeleteAppData();
iFs.Delete(iAppsListCacheFileName);
- StartIdleUpdateL(aObserver);
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+ InitializeApplistL(aObserver);
+#else
+ StartIdleUpdateL(aObserver);
+#endif
+
}
else
{
@@ -360,36 +873,6 @@
iAppIconLoader->Start();
}
-void CApaAppList::ScanRemovableDrivesAndUpdateL()
-/** Rename Appslist.bin file to AppsList_Backup.bin, so that it can be renamed back,
- if the update scan on removable media drives does not change applist. */
- {
- const TArray<const TDriveUnitInfo> listOfRemovableMediaDrives = iAppRegFinder->DriveList();
- const TInt count = listOfRemovableMediaDrives.Count();
-
- // Removable media scan would take place only if removable drives are present.
- if (count)
- {
- CApaAppData* appData = iAppData;
- while (appData)
- {
- for (TInt driveIndex = 0; driveIndex < count; ++driveIndex)
- {
- if (TParsePtrC(*appData->iRegistrationFile).Drive() == listOfRemovableMediaDrives[driveIndex].iUnit.Name())
- {
- appData->SetAppPending();
- break;
- }
- }
- appData = appData->iNext;
- }
-
- while (IdleUpdateL())
- { // It updates the removable media apps present in AppList if it has changed.
-
- };
- }
- }
void CApaAppList::DeleteAppsListBackUpAndTempFiles()
/** Deletes all files inside AppsListCache folder except AppsList.bin */
@@ -484,7 +967,7 @@
{
//Leave if the current version is different from the previous stored version and recreate applist.
#ifdef _DEBUG
- RDebug::Print(_L("!!Firmware update detected!! Rebuilding AppList"));
+ RDebug::Print(_L("[Apparc] !!Firmware update detected!! Rebuilding AppList"));
#endif
User::Leave(KErrGeneral);
}
@@ -495,7 +978,7 @@
if (err != KErrPathNotFound && err != KErrNotFound)
{
#ifdef _DEBUG
- RDebug::Print(_L("!!Error %d reading Firmware version. Rebuilding AppList"),err);
+ RDebug::Print(_L("[Apparc] !!Error %d reading Firmware version. Rebuilding AppList"),err);
#endif
User::Leave(err);
}
@@ -533,6 +1016,9 @@
// Close the stream;
CleanupStack::PopAndDestroy(&theReadStream);
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+ iFlags |= ENotifyUpdateOnFirstScanComplete;
+#else
iFs.Rename(iAppsListCacheFileName, iAppsListCacheBackUpFileName);
iAppRegFinder->FindAllAppsL(CApaAppRegFinder::EScanRemovableDrives); // Builds the Removable Media Drive List
@@ -540,6 +1026,7 @@
// It runs an update scan on removable media apps.
ScanRemovableDrivesAndUpdateL();
+#endif
}
EXPORT_C TBool CApaAppList::IsLanguageChangePending() const
@@ -587,7 +1074,7 @@
else
iObserver->NotifyScanComplete(); // NotifyScanComplete will notify clients for scan complete.
- iObserver=NULL;
+ //iObserver=NULL;
}
}
@@ -597,9 +1084,219 @@
iAppIdler=NULL;
}
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+
+// returns ETrue if there more application information avaialable.
+TInt CApaAppList::IdleUpdateL()
+ {
+
+ Usif::CApplicationRegistrationData* appInfo=NULL;
+ TApaAppUpdateInfo::TApaAppAction action=TApaAppUpdateInfo::EAppPresent; //to make compiler happy. Actual value is assigned by GetNextApplicationInfo
+ TUid appUid;
+
+ //Ownership of appInfo is transfered to this function.
+ appUid=iScrAppInfo->GetNextApplicationInfo(action,appInfo);
+
+ if(appUid==KNullUid)
+ return EFalse;
+
+ CleanupStack::PushL(appInfo);
+ CApaAppData *appData=NULL;
+ CApaAppData* app = NULL;
+
+ switch(action)
+ {
+ case TApaAppUpdateInfo::EAppNotPresent:
+ if(appInfo==NULL)
+ {
+ TInt ret=FindAndDeleteApp(appUid);
+ if(ret==KErrNone)
+ iFlags |= EAppListHasChanged;
+
+ //Add uninstalled application UID to a list
+ if(iUninstalledApps==NULL)
+ iUninstalledApps=new(ELeave) CArrayFixFlat<TUid>(1);
+
+ iUninstalledApps->AppendL(appUid);
+ }
+ break;
+
+ case TApaAppUpdateInfo::EAppPresent:
+ // holds the application information from Applist
+ app = AppDataByUid(appInfo->AppUid());
+
+ if( app && IsLanguageChangePending() && (iScrAppInfo->GetSCRFetchAction() == EGetAllAppsInfo))
+ {
+ //Application needs to be updated because of language change
+ RPointerArray<Usif::CLocalizableAppInfo> localisationInfo;
+ localisationInfo=appInfo->LocalizableAppInfoList();
+ ASSERT(!(localisationInfo.Count()>1));
+
+ if((localisationInfo.Count()>0) && (app->ApplicationLanguage() != localisationInfo[0]->ApplicationLanguage()))
+ {
+ // holds the application information read from SCR db
+ appData=CApaAppData::NewL(*appInfo, iFs, iScr);
+ FindAndDeleteApp(appUid);
+ AddToList(appData);
+ iFlags |= EAppListHasChanged;
+ }
+ else
+ {
+ app->iIsLangChangePending=EFalse;
+ }
+ }
+ else
+ {
+ // holds the application information read from SCR db
+ appData=CApaAppData::NewL(*appInfo, iFs, iScr);
+ if(app)
+ {
+ //Application found in applist. Delete existing application information from applist and create new
+ //application information object and add to the applist.
+ FindAndDeleteApp(appUid);
+ AddToList( appData );
+ }
+ else
+ {
+ AddToList( appData );
+ }
+ iFlags |= EAppListHasChanged;
+ }
+
+ break;
+
+ case TApaAppUpdateInfo::EAppInfoChanged:
+ appData=CApaAppData::NewL(*appInfo, iFs, iScr);
+ //Delete existing application information from applist and create new application information object and
+ //add to the applist.
+ FindAndDeleteApp(appUid);
+ AddToList( appData );
+ iFlags |= EAppListHasChanged;
+ break;
+ }
+
+ //If first scan not complete or if phone language is changed then clear the updated application list
+ //Otherwise add application updated apps list
+ if(!(iFlags&EFirstScanComplete) || (iFlags&ELangChangePending))
+ {
+ if(!iAppsUpdated)
+ delete iAppsUpdated;
+ iAppsUpdated=NULL;
+ }
+ else
+ {
+ if(!iAppsUpdated)
+ iAppsUpdated= new(ELeave) CArrayFixFlat<TApaAppUpdateInfo>(1);
+
+ TApaAppUpdateInfo appUpdateInfo(appUid, action);
+ iAppsUpdated->AppendL(appUpdateInfo);
+ }
+
+ CleanupStack::PopAndDestroy(appInfo);
+ return ETrue;
+ }
+
+
+
+/*
+ * Finds and delete an application from applist.
+ */
+TInt CApaAppList::FindAndDeleteApp(TUid aAppUid)
+ {
+ CApaAppData* appData=iAppData;
+ CApaAppData* prevAppData=NULL;
+
+ while(appData && appData->iUidType[2] != aAppUid)
+ {
+ prevAppData=appData;
+ appData=appData->iNext;
+ }
+
+ if(appData)
+ {
+ if(prevAppData)
+ {
+ //If the application position is not the first application in the list
+ prevAppData->iNext=appData->iNext;
+ }
+ else
+ {
+ //If the application position is first in the list
+ iAppData=appData->iNext;
+ }
+
+#ifdef APPARC_SHOW_TRACE
+ if(appData)
+ {
+ RDebug::Print(_L("[Apparc] Application with UID: %X is deleted from applist"), appData->iUidType[2]);
+ }
+#endif
+
+ delete appData;
+ return(KErrNone);
+ }
+
+ //if application not found, return KErrNotFound
+ return(KErrNotFound);
+ }
+
+/**
+@internalComponent
+*/
+EXPORT_C CApaAppData* CApaAppList::FindAndAddSpecificAppL(TUid aAppUid)
+ {
+ Usif::RSoftwareComponentRegistry scrCon;
+ //If SCR connection not avaialable then connect to SCR. Otherwise use the
+ //existing connection.
+ if(!iScr.Handle())
+ {
+ User::LeaveIfError(scrCon.Connect());
+ CleanupClosePushL(scrCon);
+ }
+ else
+ scrCon=iScr;
+
+
+ //Pass 1 as number of entries to fetch from SCR as only specific application information is required.
+ CApaScrAppInfo *scrAppInfo=CApaScrAppInfo::NewL(scrCon, 1);
+ CleanupStack::PushL(scrAppInfo);
+
+ RArray<TApaAppUpdateInfo>* appUpdateInfoList=new (ELeave) RArray<TApaAppUpdateInfo>(1);
+ CleanupStack::PushL(appUpdateInfoList);
+ TApaAppUpdateInfo appUpdateInfo(aAppUid, TApaAppUpdateInfo::EAppPresent) ;
+ appUpdateInfoList->AppendL(appUpdateInfo);
+
+ scrAppInfo->GetSpecificAppsInfoL(appUpdateInfoList);
+ CleanupStack::Pop(appUpdateInfoList);
+
+ Usif::CApplicationRegistrationData* appInfo=NULL;
+ TApaAppUpdateInfo::TApaAppAction action;
+ TUid uid;
+ uid=scrAppInfo->GetNextApplicationInfo(action, appInfo);
+ CleanupStack::PushL(appInfo);
+
+ CApaAppData *appData=NULL;
+ if(appInfo)
+ {
+ appData=CApaAppData::NewL(*appInfo, iFs, scrCon);
+ FindAndDeleteApp(uid);
+ AddToList(appData);
+ iFlags |= EAppListHasChanged;
+ }
+ CleanupStack::PopAndDestroy(2, scrAppInfo);
+
+ //If SCR session established in this function, then close it.
+ if(!iScr.Handle())
+ CleanupStack::PopAndDestroy();
+
+ return appData;
+ }
+
+#else
TInt CApaAppList::IdleUpdateL()
// returns ETrue if there is more scanning to be done.
{
+
TBool more=EFalse;
TApaAppEntry currentApp = TApaAppEntry();
TRAPD(err, more = iAppRegFinder->NextL(currentApp, *iForcedRegistrations));
@@ -635,6 +1332,205 @@
return more;
}
+void CApaAppList::UpdateNextAppL(const TApaAppEntry& aAppEntry,TBool& aHasChanged)
+ {
+ CApaAppData* appData=AppDataByUid(aAppEntry.iUidType[2]);
+ if (appData==NULL)
+ {// not in list, so add it at the start
+ TRAPD(err,appData=CApaAppData::NewL(aAppEntry, iFs));
+ if (err==KErrNone)
+ {
+ AddToList( appData );
+ aHasChanged=ETrue;
+ }
+ }
+ else if (appData->IsPending())
+ { // not found yet during current scan - we may need to override this one
+
+ // On a system which scans for registration .RSC files (V2 apps) first, followed by
+ // .APP files (V1 apps), it's valid for a V1 app to override a V2 app (if the V2 app
+ // has just been removed). If this is the case, assume it's ok to compare the V1 .APP filename,
+ // with the V2 .RSC filename as their filenames will never match (which is what we want in this case).
+ TPtrC currentFileName;
+ if (appData->RegistrationFileUsed())
+ currentFileName.Set(*appData->iRegistrationFile);
+ else
+ currentFileName.Set(*appData->iFullName);
+
+ if (aAppEntry.iFullName.CompareF(currentFileName)!=0)
+ {
+ delete appData->iSuccessor;
+ appData->iSuccessor = NULL;
+ appData->iSuccessor = CApaAppEntry::NewL(aAppEntry);
+
+ appData->iIsPresent = CApaAppData::ESuperseded;
+ aHasChanged=ETrue;
+ }
+ else
+ {
+ if (appData->Update() || appData->iIsPresent==CApaAppData::ENotPresentPendingUpdate)
+ aHasChanged=ETrue;
+
+ appData->iIsPresent = CApaAppData::EIsPresent;
+ }
+ }
+ }
+
+void CApaAppList::SetPending(CApaAppData* aAppData)
+ // set all apps to pending update - we'll find them again as we scan
+ {
+ for (; aAppData; aAppData = aAppData->iNext)
+ aAppData->SetAppPending();
+ }
+
+void CApaAppList::SetNotFound(CApaAppData* aAppData, TBool& aHasChanged)
+ // mark any unfound apps not present
+ {
+ while (aAppData)
+ {
+ if (aAppData->IsPending())
+ {
+ aAppData->iIsPresent = CApaAppData::ENotPresent;
+ aHasChanged = ETrue;
+ }
+ aAppData = aAppData->iNext;
+ }
+ }
+
+EXPORT_C void CApaAppList::PurgeL()
+/** Removes any applications from the list if they are no longer present
+on the phone. It updates applications that have been
+superceded. */
+ {
+ CApaAppData* appData=iAppData;
+ CApaAppData* prev=NULL;
+ while (appData)
+ {
+ CApaAppData* next=appData->iNext;
+ if (appData->iIsPresent==CApaAppData::ENotPresent)
+ {
+ if (prev)
+ prev->iNext=next;
+ else
+ iAppData=next;
+
+ //Add uninstalled application UID to a list
+ if(iUninstalledApps==NULL)
+ iUninstalledApps=new(ELeave) CArrayFixFlat<TUid>(1);
+
+ iUninstalledApps->AppendL(appData->AppEntry().iUidType[2]);
+
+ delete appData;
+ }
+ else if (appData->iIsPresent==CApaAppData::ESuperseded)
+ {
+ CApaAppData* newApp=NULL;
+ TApaAppEntry appEntry;
+ appData->iSuccessor->Get(appEntry);
+ TRAPD(err,newApp=CApaAppData::NewL(appEntry, iFs));
+ if (err==KErrNone)
+ {
+ // remove the old one and add the new one in its place
+ if (prev)
+ prev->iNext=newApp;
+ else
+ iAppData=newApp;
+
+ newApp->iNext = appData->iNext;
+ delete appData;
+ // increment the iterator
+ prev = newApp;
+ }
+ }
+ else
+ prev=appData;
+
+ appData=next;
+ }
+ }
+
+void CApaAppList::ScanRemovableDrivesAndUpdateL()
+/** Rename Appslist.bin file to AppsList_Backup.bin, so that it can be renamed back,
+ if the update scan on removable media drives does not change applist. */
+ {
+ const TArray<const TDriveUnitInfo> listOfRemovableMediaDrives = iAppRegFinder->DriveList();
+ const TInt count = listOfRemovableMediaDrives.Count();
+
+ // Removable media scan would take place only if removable drives are present.
+ if (count)
+ {
+ CApaAppData* appData = iAppData;
+ while (appData)
+ {
+ for (TInt driveIndex = 0; driveIndex < count; ++driveIndex)
+ {
+ if (TParsePtrC(*appData->iRegistrationFile).Drive() == listOfRemovableMediaDrives[driveIndex].iUnit.Name())
+ {
+ appData->SetAppPending();
+ break;
+ }
+ }
+ appData = appData->iNext;
+ }
+
+ while (IdleUpdateL())
+ { // It updates the removable media apps present in AppList if it has changed.
+
+ };
+ }
+ }
+
+void CApaAppList::UndoSetPending(CApaAppData* aAppData)
+ // Reset all apps to pevious pending state so they don't get purged
+ {
+ for (; aAppData; aAppData = aAppData->iNext)
+ {
+ if (aAppData->iIsPresent == CApaAppData::EPresentPendingUpdate)
+ {
+ aAppData->iIsPresent = CApaAppData::EIsPresent;
+ }
+ }
+ }
+
+/**
+@internalComponent
+*/
+EXPORT_C CApaAppData* CApaAppList::FindAndAddSpecificAppL(CApaAppRegFinder* aFinder, TUid aAppUid)
+ {
+//Scans and adds the specified application to the app list if found
+ __ASSERT_DEBUG(aFinder, Panic(EPanicNullPointer));
+ TBool found = EFalse;
+ TApaAppEntry appEntry;
+ aFinder->FindAllAppsL(CApaAppRegFinder::EScanAllDrives);
+ while (aFinder->NextL(appEntry, *iForcedRegistrations))
+ {
+ if (appEntry.iUidType[2] == aAppUid)
+ {
+ found = ETrue;
+ break;
+ }
+ }
+
+ CApaAppData* app = NULL;
+ if (found)
+ {
+ // add the app to the list
+ TBool hasChanged = EFalse;
+ CApaAppData* prevFirstAppInList = iAppData;
+ UpdateNextAppL(appEntry, hasChanged);
+ if (iAppData != prevFirstAppInList)
+ app = iAppData; // assume the new app was added to the list
+
+ if (hasChanged)
+ iFlags |= EAppListHasChanged;
+ }
+
+ return app;
+ return NULL;
+ }
+
+#endif
+
EXPORT_C TBool CApaAppList::IsIdleUpdateComplete() const
/** Tests whether an asynchronous update of the list is currently in progress.
@@ -644,165 +1540,19 @@
return iAppIdler == NULL;
}
-void CApaAppList::SetPending(CApaAppData* aAppData)
- // set all apps to pending update - we'll find them again as we scan
- {
- for (; aAppData; aAppData = aAppData->iNext)
- aAppData->SetAppPending();
- }
-
-void CApaAppList::SetNotFound(CApaAppData* aAppData, TBool& aHasChanged)
- // mark any unfound apps not present
- {
- while (aAppData)
- {
- if (aAppData->IsPending())
- {
- aAppData->iIsPresent = CApaAppData::ENotPresent;
- aHasChanged = ETrue;
- }
- aAppData = aAppData->iNext;
- }
- }
void CApaAppList::AddToList( CApaAppData* aAppData )
{
__ASSERT_DEBUG(aAppData, Panic(EPanicNullPointer));
aAppData->iNext=iAppData;
iAppData=aAppData;
- }
-
-void CApaAppList::UpdateNextAppL(const TApaAppEntry& aAppEntry,TBool& aHasChanged)
- {
- CApaAppData* appData=AppDataByUid(aAppEntry.iUidType[2]);
- if (appData==NULL)
- {// not in list, so add it at the start
- TRAPD(err,appData=CApaAppData::NewL(aAppEntry, iFs));
- if (err==KErrNone)
- {
- AddToList( appData );
- aHasChanged=ETrue;
- }
- }
- else if (appData->IsPending())
- { // not found yet during current scan - we may need to override this one
-
- // On a system which scans for registration .RSC files (V2 apps) first, followed by
- // .APP files (V1 apps), it's valid for a V1 app to override a V2 app (if the V2 app
- // has just been removed). If this is the case, assume it's ok to compare the V1 .APP filename,
- // with the V2 .RSC filename as their filenames will never match (which is what we want in this case).
- TPtrC currentFileName;
- if (appData->RegistrationFileUsed())
- currentFileName.Set(*appData->iRegistrationFile);
- else
- currentFileName.Set(*appData->iFullName);
- if (aAppEntry.iFullName.CompareF(currentFileName)!=0)
- {
- delete appData->iSuccessor;
- appData->iSuccessor = NULL;
- appData->iSuccessor = CApaAppEntry::NewL(aAppEntry);
-
- appData->iIsPresent = CApaAppData::ESuperseded;
- aHasChanged=ETrue;
- }
- else
- {
- if (appData->Update() || appData->iIsPresent==CApaAppData::ENotPresentPendingUpdate)
- aHasChanged=ETrue;
-
- appData->iIsPresent = CApaAppData::EIsPresent;
- }
- }
+#ifdef APPARC_SHOW_TRACE
+ RDebug::Print(_L("[Apparc] Application with UID: %X is added to applist"), aAppData->iUidType[2]);
+#endif
+
}
-/**
-@internalComponent
-*/
-EXPORT_C CApaAppData* CApaAppList::FindAndAddSpecificAppL(CApaAppRegFinder* aFinder, TUid aAppUid)
- {
-//Scans and adds the specified application to the app list if found
- __ASSERT_DEBUG(aFinder, Panic(EPanicNullPointer));
- TBool found = EFalse;
- TApaAppEntry appEntry;
- aFinder->FindAllAppsL(CApaAppRegFinder::EScanAllDrives);
- while (aFinder->NextL(appEntry, *iForcedRegistrations))
- {
- if (appEntry.iUidType[2] == aAppUid)
- {
- found = ETrue;
- break;
- }
- }
-
- CApaAppData* app = NULL;
- if (found)
- {
- // add the app to the list
- TBool hasChanged = EFalse;
- CApaAppData* prevFirstAppInList = iAppData;
- UpdateNextAppL(appEntry, hasChanged);
- if (iAppData != prevFirstAppInList)
- app = iAppData; // assume the new app was added to the list
-
- if (hasChanged)
- iFlags |= EAppListHasChanged;
- }
-
- return app;
- }
-
-EXPORT_C void CApaAppList::PurgeL()
-/** Removes any applications from the list if they are no longer present
-on the phone. It updates applications that have been
-superceded. */
- {
- CApaAppData* appData=iAppData;
- CApaAppData* prev=NULL;
- while (appData)
- {
- CApaAppData* next=appData->iNext;
- if (appData->iIsPresent==CApaAppData::ENotPresent)
- {
- if (prev)
- prev->iNext=next;
- else
- iAppData=next;
-
- //Add uninstalled application UID to a list
- if(iUninstalledApps==NULL)
- iUninstalledApps=new(ELeave) CArrayFixFlat<TUid>(1);
-
- iUninstalledApps->AppendL(appData->AppEntry().iUidType[2]);
-
- delete appData;
- }
- else if (appData->iIsPresent==CApaAppData::ESuperseded)
- {
- CApaAppData* newApp=NULL;
- TApaAppEntry appEntry;
- appData->iSuccessor->Get(appEntry);
- TRAPD(err,newApp=CApaAppData::NewL(appEntry, iFs));
- if (err==KErrNone)
- {
- // remove the old one and add the new one in its place
- if (prev)
- prev->iNext=newApp;
- else
- iAppData=newApp;
-
- newApp->iNext = appData->iNext;
- delete appData;
- // increment the iterator
- prev = newApp;
- }
- }
- else
- prev=appData;
-
- appData=next;
- }
- }
EXPORT_C TInt CApaAppList::Count() const
/** Gets the count of applications present in the app list.
@@ -841,7 +1591,7 @@
specified screen mode. */
{
- CApaAppData* appData=iValidFirstAppData;
+ CApaAppData* appData=iAppData;
if(aScreenMode!=KIgnoreScreenMode)
{
@@ -935,6 +1685,7 @@
return NULL;
}
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
/**
Adds a registration file to the iForcedRegistrations array.
@@ -954,6 +1705,7 @@
if(iForcedRegistrations)
iForcedRegistrations->Reset();
}
+#endif
/** Finds the preferred application to handle the specified data type.
@@ -1047,7 +1799,19 @@
iObserver->InitialListPopulationComplete();
iValidFirstAppData = iAppData;
iFlags|=EFirstScanComplete;
+
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
iNNAInstallation = EFalse;
+#endif
+
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+ delete iScrAppInfo;
+ iScrAppInfo=NULL;
+ iScr.Close();
+#endif
+#ifdef APPARC_SHOW_TRACE
+ RDebug::Printf("[Apparc] *****************END CREATING APPLIST ****************************");
+#endif
}
/**
@@ -1080,8 +1844,10 @@
if (app)
{
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
if (!app->RegistrationFileUsed())
User::Leave(KErrNotSupported);
+#endif
if (app->iServiceArray)
{
@@ -1111,9 +1877,12 @@
if (app)
{
+
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
if (!app->RegistrationFileUsed())
User::Leave(KErrNotSupported);
-
+#endif
+
if (app->iServiceArray)
{
CArrayFixFlat<TApaAppServiceInfo>& serviceArray = *(app->iServiceArray);
@@ -1149,8 +1918,10 @@
if (app)
{
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
if (!app->RegistrationFileUsed())
User::Leave(KErrNotSupported);
+#endif
if (app->iServiceArray)
{
@@ -1704,6 +2475,9 @@
{
iPrevLanguage = User::Language();
iAppList.iFlags |= CApaAppList::ELangChangePending;
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+ iAppList.InitializeLangAppListL();
+#endif
iAppList.StartIdleUpdateL(iAppList.iObserver);
}
}
--- a/appfw/apparchitecture/aplist/aplapplist.h Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/aplist/aplapplist.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1997-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"
@@ -27,6 +27,12 @@
#include <badesca.h>
#include <s32file.h>
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+#include <usif/scr/scr.h>
+#include <usif/scr/appregentries.h>
+#include <apgcli.h>
+#endif
+
// classes defined:
class CApaAppList;
class CApaAppViewData;
@@ -34,7 +40,9 @@
class CApaMaskedBitmap;
class TEntry;
class RFs;
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
class CApaAppRegFinder;
+#endif
class CApaAppIconArray;
class CApaIconLoader;
class TApaAppEntry;
@@ -72,19 +80,26 @@
*/
class CApaAppList : public CBase
{
-public:
- IMPORT_C static CApaAppList* NewL(RFs& aFs, TBool aLoadMbmIconsOnDemand, TInt aTimeoutDelay = 50000); // takes ownership of aAppRegFinder
public:
+ IMPORT_C static CApaAppList* NewL(RFs& aFs, TBool aLoadMbmIconsOnDemand, TInt aTimeoutDelay = 50000);
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
IMPORT_C void PurgeL();
+ IMPORT_C CApaAppData* FindAndAddSpecificAppL(CApaAppRegFinder* aFinder, TUid aAppUid);
+ IMPORT_C void StopScan(TBool aNNAInstall = EFalse);
+ IMPORT_C void RestartScanL();
+ IMPORT_C TBool AppListUpdatePending();
+ IMPORT_C void AddForcedRegistrationL(const TDesC& aRegistrationFile);
+ IMPORT_C void ResetForcedRegistrations();
+#else
+ IMPORT_C CApaAppData* FindAndAddSpecificAppL(TUid aAppUid);
+#endif
+
IMPORT_C TInt Count() const;
IMPORT_C CApaAppData* FirstApp() const;
IMPORT_C CApaAppData* FirstApp(TInt aScreenMode) const;
IMPORT_C CApaAppData* NextApp(const CApaAppData* aApp) const;
IMPORT_C CApaAppData* NextApp(const CApaAppData* aApp, TInt aScreenMode) const;
IMPORT_C CApaAppData* AppDataByUid(TUid aAppUid) const;
- IMPORT_C void StopScan(TBool aNNAInstall = EFalse);
- IMPORT_C void RestartScanL();
- IMPORT_C TBool AppListUpdatePending();
// ER5
IMPORT_C TUid PreferredDataHandlerL(const TDataType& aDataType) const;
IMPORT_C void StartIdleUpdateL();
@@ -99,15 +114,12 @@
IMPORT_C CBufFlat* ServiceImplArrayBufferL(TUid aServiceUid, const TDataType& aDataType) const;
IMPORT_C CBufFlat* ServiceUidBufferL(TUid aAppUid) const;
IMPORT_C CBufFlat* ServiceOpaqueDataBufferL(TUid aAppUid, TUid aServiceUid) const;
- IMPORT_C CApaAppData* FindAndAddSpecificAppL(CApaAppRegFinder* aFinder, TUid aAppUid);
IMPORT_C TUid PreferredDataHandlerL(const TDataType& aDataType, const TUid* aServiceUid,
TInt& aPriority) const;
IMPORT_C ~CApaAppList();
// 9.1
IMPORT_C CApaAppData* AppDataByFileName(const TDesC& aFullFileName) const;
/*IMPORT_C*/ RFs& ShareProtectedFileServer();
- IMPORT_C void AddForcedRegistrationL(const TDesC& aRegistrationFile);
- IMPORT_C void ResetForcedRegistrations();
IMPORT_C TBool IsLanguageChangePending() const;
IMPORT_C static CApaAppList* Self();
IMPORT_C CArrayFixFlat<TUid>* UninstalledAppArray();
@@ -125,6 +137,15 @@
IMPORT_C void AddCustomAppInfoInListL(TUid aAppUid, TLanguage aLanguage, const TDesC& aShortCaption);
IMPORT_C void UpdateAppListByShortCaptionL();
IMPORT_C void UpdateAppListByIconCaptionOverridesL();
+
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+ IMPORT_C void InitializeApplistL(MApaAppListObserver* aObserver);
+ void InitializeLangAppListL();
+ IMPORT_C void UpdateApplistL(MApaAppListObserver* aObserver, RArray<TApaAppUpdateInfo>* aAppUpdateInfo, TUid aSecureID);
+ IMPORT_C void UpdateApplistByForceRegAppsL(RPointerArray<Usif::CApplicationRegistrationData>& aForceRegAppsInfo);
+ IMPORT_C CArrayFixFlat<TApaAppUpdateInfo>* UpdatedAppsInfo();
+#endif
+
private:
enum
{
@@ -134,15 +155,11 @@
ELangChangePending = 0x08 // This flag is used to check if applist update is in progress on language change event.
};
private:
- CApaAppList(RFs& aFs, TBool aLoadMbmIconsOnDemand, TInt aIdlePeriodicDelay);
- void UpdateNextAppL(const TApaAppEntry& aAppEntry,TBool& aHasChanged);
+ CApaAppList(RFs& aFs, TBool aLoadMbmIconsOnDemand, TInt aIdlePeriodicDelay);
void AddToList( CApaAppData* aAppData );
- static void SetPending(CApaAppData* aAppData);
- static void SetNotFound(CApaAppData* aAppData, TBool& aHasChanged);
static TInt IdleUpdateCallbackL(TAny* aObject);
TInt IdleUpdateL();
void ScanComplete();
- void UndoSetPending(CApaAppData* aAppData);
void StopIdler();
void DeleteAppData();
@@ -154,6 +171,16 @@
void DeleteAppsListBackUpAndTempFiles();
void ScanRemovableDrivesAndUpdateL();
void CreateDefaultAppIconFileNameL();
+
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+ void UndoSetPending(CApaAppData* aAppData);
+ static void SetPending(CApaAppData* aAppData);
+ static void SetNotFound(CApaAppData* aAppData, TBool& aHasChanged);
+ void UpdateNextAppL(const TApaAppEntry& aAppEntry,TBool& aHasChanged);
+#else
+ TInt FindAndDeleteApp(TUid aAppUid);
+#endif
+
private:
// Persistence Layer
void RestoreL();
@@ -236,13 +263,18 @@
MApaAppListObserver* iObserver;
CApaAppData* iValidFirstAppData; //First valid app data in linked list!
TInt iFlags;
- CApaAppRegFinder* iAppRegFinder;
- TInt iIdlePeriodicDelay; // idle timeout periodic delay
+ TInt iIdlePeriodicDelay; // idle timeout periodic delay
RFs iFsShareProtected;
mutable CApaAppIconArray* iDefaultIconArray;
mutable TInt iDefaultIconUsageCount;
- CDesCArray* iForcedRegistrations;
class CApaLangChangeMonitor; //inner class of CApaAppList.
+
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+ class CApaScrAppInfo;
+#else
+ CDesCArray* iForcedRegistrations;
+#endif
+
CApaLangChangeMonitor* iAppLangMonitor; // Active Object used for language change monitoring.
RBuf iAppsListCacheFileName;
@@ -256,8 +288,17 @@
RPointerArray<CCustomAppInfoData> iCustomAppList;
CApaIconCaptionOverrides* iIconCaptionOverrides;
CApaIconCaptionCenrepObserver* iIconCaptionObserver;
- TBool iNNAInstallation;
- CArrayFixFlat<TUid>* iUninstalledApps;
+ CArrayFixFlat<TUid>* iUninstalledApps;
+
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+ Usif::RSoftwareComponentRegistry iScr;
+ CApaScrAppInfo *iScrAppInfo;
+ RArray<TUid> iForceRegAppUids;
+ CArrayFixFlat<TApaAppUpdateInfo>* iAppsUpdated;
+#else
+ CApaAppRegFinder* iAppRegFinder;
+ TBool iNNAInstallation;
+#endif
private:
friend class CApaLangChangeMonitor;
--- a/appfw/apparchitecture/aplist/aplapplistitem.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/aplist/aplapplistitem.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -25,6 +25,9 @@
#include "aplappinforeader.h"
#include <e32uid.h>
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+#include <usif/scr/appregentries.h>
+#endif
// Delays in the pseudo idle object that builds the application list
//
@@ -233,43 +236,196 @@
// Class CApaAppData
//
-EXPORT_C CApaAppData* CApaAppData::NewL(const TApaAppEntry& aAppEntry, RFs& aFs)
- {
- CApaAppData* self=new(ELeave) CApaAppData(aFs);
- CleanupStack::PushL(self);
- self->ConstructL(aAppEntry);
- CleanupStack::Pop(); // self
- return self;
- }
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+CApaAppData::CApaAppData(RFs& aFs)
+ :iCaption(NULL), iShortCaption(NULL),
+ iFs(aFs),
+ iNonMbmIconFile(EFalse),
+ iApplicationLanguage(ELangNone), iIndexOfFirstOpenService(-1),
+ iShortCaptionFromResourceFile(NULL)
+ {
+ }
+EXPORT_C CApaAppData* CApaAppData::NewL(const Usif::CApplicationRegistrationData& aAppInfo, RFs& aFs, const Usif::RSoftwareComponentRegistry& aScrCon)
+ {
+ CApaAppData* self=new(ELeave) CApaAppData(aFs);
+ CleanupStack::PushL(self);
+ self->ConstructL(aAppInfo, aScrCon);
+ CleanupStack::Pop(self); // self
+ return self;
+ }
+
+void CApaAppData::ConstructL(const Usif::CApplicationRegistrationData& aAppInfo, const Usif::RSoftwareComponentRegistry& aScrCon)
+ {
+ iCapabilityBuf.FillZ(iCapabilityBuf.MaxLength());
+ iIcons = CApaAppIconArray::NewL();
+ iViewDataArray=new(ELeave) CArrayPtrFlat<CApaAppViewData>(1);
+ iOwnedFileArray=new(ELeave) CDesCArraySeg(1);
+ User::LeaveIfError(ReadApplicationInformationFromSCRL(aAppInfo, aScrCon));
+ }
+
+//Initializes the CApaAppData object with information read from SCR. Leaves if any error occurs during initialization.
+
+TInt CApaAppData::ReadApplicationInformationFromSCRL(const Usif::CApplicationRegistrationData& aAppInfo, const Usif::RSoftwareComponentRegistry& aScrCon)
+ {
+ HBufC* caption = NULL;
+ HBufC* shortCaption = NULL;
+
+ CApaAppInfoReader* appInfoReader = NULL;
+ appInfoReader = CApaAppInfoReader::NewL(iFs, aAppInfo, aScrCon);
+ CleanupStack::PushL(appInfoReader);
+ TBool readSuccessful=EFalse;
+ readSuccessful= appInfoReader->ReadL();
+
+ iFullName=appInfoReader->AppBinaryFullName();
+
+ iUidType = appInfoReader->AppBinaryUidType();
+
+ caption = appInfoReader->Caption();
+ shortCaption = appInfoReader->ShortCaption();
+
+ CApaAppIconArray* icons = appInfoReader->Icons();
+ if(icons)
+ {
+ delete iIcons;
+ iIcons = icons;
+ iIconLoader = appInfoReader->IconLoader();
+ }
+ else
+ {
+ TRAPD(err, icons = CApaAppIconArray::NewL());
+ if(err == KErrNone)
+ {
+ delete iIcons;
+ iIcons = icons;
+ }
+ }
+
+
+ iOpaqueData = appInfoReader->OpaqueData();
+
+ if (readSuccessful)
+ {
+ appInfoReader->Capability(iCapabilityBuf);
+
+ iDefaultScreenNumber = appInfoReader->DefaultScreenNumber();
+ delete iIconFileName;
+ iIconFileName = appInfoReader->IconFileName();
+ iNonMbmIconFile = appInfoReader->NonMbmIconFile();
+ iNumOfAppIcons = appInfoReader->NumOfAppIcons();
+ iApplicationLanguage = appInfoReader->AppLanguage();
+
+ // views
+ iViewDataArray->ResetAndDestroy();
+ CArrayPtrFlat<CApaAppViewData>* viewDataArray = appInfoReader->Views();
+ if (viewDataArray)
+ {
+ delete iViewDataArray;
+ iViewDataArray = viewDataArray;
+
+ if(!iIconLoader && ViewMbmIconsRequireLoading())
+ {
+ //if VIEW_DATA contains a MBM icon we need to initialize iIconLoader
+ iIconLoader = appInfoReader->IconLoader();
+ }
+ }
+
+ // owned files
+ iOwnedFileArray->Reset();
+ CDesCArray* const ownedFileArray = appInfoReader->OwnedFiles();
+ if (ownedFileArray)
+ {
+ delete iOwnedFileArray;
+ iOwnedFileArray = ownedFileArray;
+ }
+
+ UpdateServiceArray(appInfoReader->ServiceArray(iIndexOfFirstOpenService));
+ }
+
+ CleanupStack::PopAndDestroy(appInfoReader);
+
+ if (!caption)
+ {
+ TParsePtrC parse (*iFullName);
+ caption = parse.Name().Alloc();
+ }
+
+ // Put the captions into place
+ if (caption)
+ {
+ if (!shortCaption)
+ {
+ shortCaption = caption->Alloc();
+ if (!shortCaption)
+ {
+ delete caption;
+ caption = NULL;
+ }
+ }
+
+ delete iCaption;
+ iCaption = caption;
+ delete iShortCaption;
+ iShortCaption = shortCaption;
+ }
+
+ return caption ? KErrNone : KErrNoMemory;
+ }
+
+
+EXPORT_C TUid CApaAppData::NonNativeApplicationType() const
+/** @internalComponent */
+ {
+ if (iCapabilityBuf().iAttributes & TApaAppCapability::ENonNative)
+ return iUidType[1];
+ else
+ return TUid::Null();
+ }
+
+EXPORT_C TBool CApaAppData::IsLangChangePending()
+{
+ return iIsLangChangePending;
+}
+
+#else
CApaAppData::CApaAppData(RFs& aFs)
- :iCaption(NULL), iShortCaption(NULL),
- iIsPresent(CApaAppData::EIsPresent), iFs(aFs),
- iNonMbmIconFile(EFalse),
- iApplicationLanguage(ELangNone), iIndexOfFirstOpenService(-1),
- iNonNativeApplicationType(TUid::Null()),
- iShortCaptionFromResourceFile(NULL)
- {
- }
+ :iCaption(NULL), iShortCaption(NULL),
+ iIsPresent(CApaAppData::EIsPresent), iFs(aFs),
+ iNonMbmIconFile(EFalse),
+ iApplicationLanguage(ELangNone), iIndexOfFirstOpenService(-1),
+ iNonNativeApplicationType(TUid::Null()),
+ iShortCaptionFromResourceFile(NULL)
+ {
+ }
+
+EXPORT_C CApaAppData* CApaAppData::NewL(const TApaAppEntry& aAppEntry, RFs& aFs)
+ {
+ CApaAppData* self=new(ELeave) CApaAppData(aFs);
+ CleanupStack::PushL(self);
+ self->ConstructL(aAppEntry);
+ CleanupStack::Pop(); // self
+ return self;
+ }
void CApaAppData::ConstructL(const TApaAppEntry& aAppEntry)
- {
- iUidType = aAppEntry.iUidType; // if the 2nd UID is KUidAppRegistrationFile, iUidType will be updated in ReadApplicationInformationFromResourceFiles() to reflect the TUidType for the application binary
- if (ApaUtils::TypeUidIsForRegistrationFile(aAppEntry.iUidType))
- {
- iRegistrationFile = aAppEntry.iFullName.AllocL();
- }
- else
- {
- iFullName = aAppEntry.iFullName.AllocL();
- }
+ {
+ iUidType = aAppEntry.iUidType; // if the 2nd UID is KUidAppRegistrationFile, iUidType will be updated in ReadApplicationInformationFromResourceFiles() to reflect the TUidType for the application binary
- iCapabilityBuf.FillZ(iCapabilityBuf.MaxLength());
- iIcons = CApaAppIconArray::NewL();
- iViewDataArray=new(ELeave) CArrayPtrFlat<CApaAppViewData>(1);
- iOwnedFileArray=new(ELeave) CDesCArraySeg(1);
- User::LeaveIfError(ReadApplicationInformationFromResourceFiles());
- }
+ if (ApaUtils::TypeUidIsForRegistrationFile(aAppEntry.iUidType))
+ {
+ iRegistrationFile = aAppEntry.iFullName.AllocL();
+ }
+ else
+ {
+ iFullName = aAppEntry.iFullName.AllocL();
+ }
+
+ iCapabilityBuf.FillZ(iCapabilityBuf.MaxLength());
+ iIcons = CApaAppIconArray::NewL();
+ iViewDataArray=new(ELeave) CArrayPtrFlat<CApaAppViewData>(1);
+ iOwnedFileArray=new(ELeave) CDesCArraySeg(1);
+ User::LeaveIfError(ReadApplicationInformationFromResourceFiles());
+ }
// Return a standard error code
// The value returned only reflect the caption status
@@ -281,172 +437,330 @@
// 2. Be very careful in this method, because it can be called on a newly constructed object,
// or on an existing object, so don't assume member data pointers will be NULL
TInt CApaAppData::ReadApplicationInformationFromResourceFiles()
- {
- HBufC* caption = NULL;
- HBufC* shortCaption = NULL;
+ {
+ HBufC* caption = NULL;
+ HBufC* shortCaption = NULL;
+
+ iTimeStamp = TTime(0); // cannot init in constructor because this function can be called on an existing CApaAppData object
- iTimeStamp = TTime(0); // cannot init in constructor because this function can be called on an existing CApaAppData object
+ if(iRegistrationFile)
+ {
+ CApaAppInfoReader* appInfoReader = NULL;
+ TRAP_IGNORE(appInfoReader = CApaAppInfoReader::NewL(iFs, *iRegistrationFile, iUidType[2]));
+ if (!appInfoReader)
+ {
+ if (!iFullName)
+ {
+ // assume that if iFullName is NULL, this method has been called as part
+ // of constructing a new app data object. The CApaAppInfoReader derived object
+ // could not be created, therefore we have no way to determine the full filename
+ // of the app binary, so give up
+ return KErrNoMemory;
+ }
+ }
+ else
+ {
+ TBool readSuccessful=EFalse;
+ TRAP_IGNORE(readSuccessful= appInfoReader->ReadL());
- if(iRegistrationFile)
- {
- CApaAppInfoReader* appInfoReader = NULL;
- TRAP_IGNORE(appInfoReader = CApaAppInfoReader::NewL(iFs, *iRegistrationFile, iUidType[2]));
- if (!appInfoReader)
- {
- if (!iFullName)
- {
- // assume that if iFullName is NULL, this method has been called as part
- // of constructing a new app data object. The CApaAppInfoReader derived object
- // could not be created, therefore we have no way to determine the full filename
- // of the app binary, so give up
- return KErrNoMemory;
- }
- }
- else
- {
- TBool readSuccessful=EFalse;
- TRAP_IGNORE(readSuccessful= appInfoReader->ReadL());
+ HBufC* const appBinaryFullName = appInfoReader->AppBinaryFullName();
+ if (appBinaryFullName)
+ {
+ delete iFullName;
+ iFullName = appBinaryFullName;
+ }
+
+ if (!iFullName)
+ {
+ delete appInfoReader;
+ return KErrNoMemory;
+ }
+
+ // if this object has just been constructed, iUidType is currently the TUidType
+ // of the registration file, it should be the TUidType of the app binary file
+ TUidType uidType = appInfoReader->AppBinaryUidType();
+ if (uidType[1].iUid != KNullUid.iUid)
+ iUidType = uidType;
+
+ // must get captions regardless of value of readSuccessful,
+ // because the V1 reader might have read captions
+ // this is done to maintain behavioural compatibility with V1
+ caption = appInfoReader->Caption();
+ shortCaption = appInfoReader->ShortCaption();
+
+ CApaAppIconArray* icons = appInfoReader->Icons();
+ if(icons)
+ {
+ delete iIcons;
+ iIcons = icons;
+ iIconLoader = appInfoReader->IconLoader();
+ }
+ else
+ {
+ TRAPD(err, icons = CApaAppIconArray::NewL());
+ if(err == KErrNone)
+ {
+ delete iIcons;
+ iIcons = icons;
+ }
+ }
+
+ iTimeStamp = appInfoReader->TimeStamp();
+ delete iLocalisableResourceFileName;
+ iLocalisableResourceFileName = appInfoReader->LocalisableResourceFileName();
+ iLocalisableResourceFileTimeStamp = appInfoReader->LocalisableResourceFileTimeStamp();
- HBufC* const appBinaryFullName = appInfoReader->AppBinaryFullName();
- if (appBinaryFullName)
- {
- delete iFullName;
- iFullName = appBinaryFullName;
- }
-
- if (!iFullName)
- {
- delete appInfoReader;
- return KErrNoMemory;
- }
-
- // if this object has just been constructed, iUidType is currently the TUidType
- // of the registration file, it should be the TUidType of the app binary file
- TUidType uidType = appInfoReader->AppBinaryUidType();
- if (uidType[1].iUid != KNullUid.iUid)
- iUidType = uidType;
+ const TBool isNonNativeApp =
+ (TParsePtrC(*iRegistrationFile).Path().CompareF(KLitPathForNonNativeResourceAndIconFiles) == 0);
+
+ if (isNonNativeApp)
+ {
+ // In the case of a non-native app, the resource file has been prefixed with a
+ // TCheckedUid, the second of whose UIDs is the non-native application type uid.
+ TEntry entry;
+ const TInt error=iFs.Entry(*iRegistrationFile, entry);
+ if (error!=KErrNone)
+ {
+ delete appInfoReader;
+ return error;
+ }
+
+ __ASSERT_DEBUG(entry.iType[0].iUid==KUidPrefixedNonNativeRegistrationResourceFile, Panic(EPanicUnexpectedUid));
+ iNonNativeApplicationType=entry.iType[1];
+ }
+
+ delete iOpaqueData;
+ iOpaqueData = appInfoReader->OpaqueData();
+
+ if (readSuccessful)
+ {
+ appInfoReader->Capability(iCapabilityBuf);
+
+ iDefaultScreenNumber = appInfoReader->DefaultScreenNumber();
- // must get captions regardless of value of readSuccessful,
- // because the V1 reader might have read captions
- // this is done to maintain behavioural compatibility with V1
- caption = appInfoReader->Caption();
- shortCaption = appInfoReader->ShortCaption();
+ delete iIconFileName;
+ iIconFileName = appInfoReader->IconFileName();
+ iIconFileTimeStamp = appInfoReader->IconFileTimeStamp();
+ iNonMbmIconFile = appInfoReader->NonMbmIconFile();
+ iNumOfAppIcons = appInfoReader->NumOfAppIcons();
+ iApplicationLanguage = appInfoReader->AppLanguage();
+
+ // views
+ iViewDataArray->ResetAndDestroy();
+ CArrayPtrFlat<CApaAppViewData>* viewDataArray = appInfoReader->Views();
+ if (viewDataArray)
+ {
+ delete iViewDataArray;
+ iViewDataArray = viewDataArray;
+
+ if(!iIconLoader && ViewMbmIconsRequireLoading())
+ {
+ //if VIEW_DATA contains a MBM icon we need to initialize iIconLoader
+ iIconLoader = appInfoReader->IconLoader();
+ }
+ }
- CApaAppIconArray* icons = appInfoReader->Icons();
- if(icons)
- {
- delete iIcons;
- iIcons = icons;
- iIconLoader = appInfoReader->IconLoader();
- }
- else
- {
- TRAPD(err, icons = CApaAppIconArray::NewL());
- if(err == KErrNone)
- {
- delete iIcons;
- iIcons = icons;
- }
- }
-
- iTimeStamp = appInfoReader->TimeStamp();
- delete iLocalisableResourceFileName;
- iLocalisableResourceFileName = appInfoReader->LocalisableResourceFileName();
- iLocalisableResourceFileTimeStamp = appInfoReader->LocalisableResourceFileTimeStamp();
+ // owned files
+ iOwnedFileArray->Reset();
+ CDesCArray* const ownedFileArray = appInfoReader->OwnedFiles();
+ if (ownedFileArray)
+ {
+ delete iOwnedFileArray;
+ iOwnedFileArray = ownedFileArray;
+ }
+
+ UpdateServiceArray(appInfoReader->ServiceArray(iIndexOfFirstOpenService));
+ }
+
+ delete appInfoReader;
+ }
+ }
+
+ if (!caption)
+ {
+ TParsePtrC parse (*iFullName);
+ caption = parse.Name().Alloc();
+ }
+
+ // Put the captions into place
+ if (caption)
+ {
+ if (!shortCaption)
+ {
+ shortCaption = caption->Alloc();
+ if (!shortCaption)
+ {
+ delete caption;
+ caption = NULL;
+ }
+ }
- const TBool isNonNativeApp =
- (TParsePtrC(*iRegistrationFile).Path().CompareF(KLitPathForNonNativeResourceAndIconFiles) == 0);
-
- if (isNonNativeApp)
- {
- // In the case of a non-native app, the resource file has been prefixed with a
- // TCheckedUid, the second of whose UIDs is the non-native application type uid.
- TEntry entry;
- const TInt error=iFs.Entry(*iRegistrationFile, entry);
- if (error!=KErrNone)
- {
- delete appInfoReader;
- return error;
- }
-
- __ASSERT_DEBUG(entry.iType[0].iUid==KUidPrefixedNonNativeRegistrationResourceFile, Panic(EPanicUnexpectedUid));
- iNonNativeApplicationType=entry.iType[1];
- }
+ delete iCaption;
+ iCaption = caption;
+ delete iShortCaption;
+ iShortCaption = shortCaption;
+ }
+
+ return caption ? KErrNone : KErrNoMemory;
+ }
+
+
+/** Returns true if app info was provided by a registration file
+
+@return true if app info was provided by a registration file
+*/
+EXPORT_C TBool CApaAppData::RegistrationFileUsed() const
+ {
+ return iRegistrationFile != NULL;
+ }
+
+/** Returns the full filename of the registration resource file
- delete iOpaqueData;
- iOpaqueData = appInfoReader->OpaqueData();
+@return The full path and filename of the registration resource file.
+@internalTechnology
+*/
+EXPORT_C TPtrC CApaAppData::RegistrationFileName() const
+ {
+ if (iRegistrationFile)
+ {
+ return *iRegistrationFile;
+ }
+ else
+ {
+ return TPtrC(KNullDesC);
+ }
+ }
+
+
+/** Returns the full filename of the localisable resource file
- if (readSuccessful)
- {
- appInfoReader->Capability(iCapabilityBuf);
+@return The full path and filename of the localisable resource file.
+@internalTechnology
+*/
+EXPORT_C TPtrC CApaAppData::LocalisableResourceFileName() const
+ {
+ if (iLocalisableResourceFileName)
+ {
+ return *iLocalisableResourceFileName;
+ }
+ else
+ {
+ return TPtrC(KNullDesC);
+ }
+ }
- iDefaultScreenNumber = appInfoReader->DefaultScreenNumber();
+
+TBool CApaAppData::Update()
+// returns true if changes were made to the cached data
+ {
+ __APA_PROFILE_START(17);
+ TBool changed=EFalse;
- delete iIconFileName;
- iIconFileName = appInfoReader->IconFileName();
- iIconFileTimeStamp = appInfoReader->IconFileTimeStamp();
- iNonMbmIconFile = appInfoReader->NonMbmIconFile();
- iNumOfAppIcons = appInfoReader->NumOfAppIcons();
- iApplicationLanguage = appInfoReader->AppLanguage();
-
- // views
- iViewDataArray->ResetAndDestroy();
- CArrayPtrFlat<CApaAppViewData>* viewDataArray = appInfoReader->Views();
- if (viewDataArray)
- {
- delete iViewDataArray;
- iViewDataArray = viewDataArray;
-
- if(!iIconLoader && ViewMbmIconsRequireLoading())
- {
- //if VIEW_DATA contains a MBM icon we need to initialize iIconLoader
- iIconLoader = appInfoReader->IconLoader();
- }
- }
+ // Get app info file entry
+ TEntry entry;
+ TInt ret;
+ if (iRegistrationFile != NULL)
+ {
+ ret = iFs.Entry(*iRegistrationFile, entry);
+ if (ret==KErrNone && entry.iModified!=iTimeStamp)
+ {
+ // assume registration file may have changed
+ changed = ETrue;
+ }
+ else
+ {
+ if (iLocalisableResourceFileName)
+ {
+ // see if localisable resource information might have changed
+ TParse parse;
+ ret = parse.SetNoWild(KAppResourceFileExtension, iLocalisableResourceFileName, NULL);
+ if (ret == KErrNone)
+ {
+ TFileName resourceFileName(parse.FullName());
+ TLanguage language;
+ BaflUtils::NearestLanguageFileV2(iFs, resourceFileName, language);
+ (void)language;
+ if (resourceFileName.CompareF(*iLocalisableResourceFileName)!=0)
+ {
+ changed = ETrue;
+ }
+ else
+ {
+ ret = iFs.Entry(*iLocalisableResourceFileName, entry);
+ if ((ret==KErrNotFound && iLocalisableResourceFileTimeStamp!=TTime(0)) ||
+ (ret==KErrNone && entry.iModified!=iLocalisableResourceFileTimeStamp))
+ {
+ changed = ETrue;
+ }
+ }
+ }
+ }
+ }
+ }
+ if (changed)
+ {
+ // re-read data
+ // Ignore result, nothing we can do in case failure
+ // and the old values should be preserved
+ const TInt ignore = ReadApplicationInformationFromResourceFiles();
+ } //lint !e529 Symbol 'ignore' not subsequently referenced
+
+ else
+ {
+ if (iIconFileName)
+ {
+ ret = iFs.Entry(*iIconFileName, entry);
+ // See if the icon file has been "modified"
+ // It could have been replaced with a differnt version, deleted or added
+ // if the icon file specified in the resource was missing
+ if ((ret==KErrNotFound && iIconFileTimeStamp!=TTime(0)) ||
+ (ret==KErrNone && entry.iModified!=iIconFileTimeStamp))
+ {
+ // Assume the icon file has changed
+ iIconFileTimeStamp = entry.iModified;
+ changed = ETrue;
+ }
+ }
+ }
- // owned files
- iOwnedFileArray->Reset();
- CDesCArray* const ownedFileArray = appInfoReader->OwnedFiles();
- if (ownedFileArray)
- {
- delete iOwnedFileArray;
- iOwnedFileArray = ownedFileArray;
- }
-
- UpdateServiceArray(appInfoReader->ServiceArray(iIndexOfFirstOpenService));
- }
+ __APA_PROFILE_END(17);
+ return changed;
+ }
- delete appInfoReader;
- }
- }
-
- if (!caption)
- {
- TParsePtrC parse (*iFullName);
- caption = parse.Name().Alloc();
- }
+EXPORT_C TBool CApaAppData::IsPending() const
+/* Returns true if the app info is not yet updated by the current scan. */
+ {
+ return (iIsPresent==CApaAppData::EPresentPendingUpdate
+ || iIsPresent==CApaAppData::ENotPresentPendingUpdate);
+ }
+
+EXPORT_C TUid CApaAppData::NonNativeApplicationType() const
+/** @internalComponent */
+ {
+ return iNonNativeApplicationType;
+ }
- // Put the captions into place
- if (caption)
- {
- if (!shortCaption)
- {
- shortCaption = caption->Alloc();
- if (!shortCaption)
- {
- delete caption;
- caption = NULL;
- }
- }
+void CApaAppData::SetAppPending()
+ {
+ if (iIsPresent == CApaAppData::ENotPresent
+ || iIsPresent == CApaAppData::ENotPresentPendingUpdate)
+ {
+ iIsPresent = CApaAppData::ENotPresentPendingUpdate;
+ }
+ else
+ {
+ iIsPresent = CApaAppData::EPresentPendingUpdate;
+ }
+ }
+#endif
- delete iCaption;
- iCaption = caption;
- delete iShortCaption;
- iShortCaption = shortCaption;
- }
+EXPORT_C TApaAppEntry CApaAppData::AppEntry() const
+/** Constructs an application entry based on this object.
- return caption ? KErrNone : KErrNoMemory;
- }
+@return The application entry. */
+ {
+ return TApaAppEntry(iUidType,*iFullName);
+ }
EXPORT_C CApaAppData::~CApaAppData()
// Just delete components, NOT iNext (next CApaAppData in the list).
@@ -465,17 +779,20 @@
}
delete iOwnedFileArray;
delete iIconFileName;
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
delete iLocalisableResourceFileName;
+ delete iRegistrationFile;
+#endif
if (iServiceArray)
{
CleanupServiceArray(iServiceArray);
iServiceArray = NULL;
}
delete iOpaqueData;
- delete iRegistrationFile;
iNext = NULL;
}
+
void CApaAppData::UpdateServiceArray(CArrayFixFlat<TApaAppServiceInfo>* aNewServiceArray)
{
// clear out any existing service info
@@ -576,14 +893,6 @@
return iIcons->IconSizesL();
}
-EXPORT_C TApaAppEntry CApaAppData::AppEntry() const
-/** Constructs an application entry based on this object.
-
-@return The application entry. */
- {
- return TApaAppEntry(iUidType,*iFullName);
- }
-
EXPORT_C void CApaAppData::Capability(TDes8& aCapabilityBuf)const
/** Gets the application's capabilities.
@@ -614,82 +923,6 @@
return iOwnedFileArray;
}
-TBool CApaAppData::Update()
-// returns true if changes were made to the cached data
- {
- __APA_PROFILE_START(17);
- TBool changed=EFalse;
-
- // Get app info file entry
- TEntry entry;
- TInt ret;
- if (iRegistrationFile != NULL)
- {
- ret = iFs.Entry(*iRegistrationFile, entry);
- if (ret==KErrNone && entry.iModified!=iTimeStamp)
- {
- // assume registration file may have changed
- changed = ETrue;
- }
- else
- {
- if (iLocalisableResourceFileName)
- {
- // see if localisable resource information might have changed
- TParse parse;
- ret = parse.SetNoWild(KAppResourceFileExtension, iLocalisableResourceFileName, NULL);
- if (ret == KErrNone)
- {
- TFileName resourceFileName(parse.FullName());
- TLanguage language;
- BaflUtils::NearestLanguageFileV2(iFs, resourceFileName, language);
- (void)language;
- if (resourceFileName.CompareF(*iLocalisableResourceFileName)!=0)
- {
- changed = ETrue;
- }
- else
- {
- ret = iFs.Entry(*iLocalisableResourceFileName, entry);
- if ((ret==KErrNotFound && iLocalisableResourceFileTimeStamp!=TTime(0)) ||
- (ret==KErrNone && entry.iModified!=iLocalisableResourceFileTimeStamp))
- {
- changed = ETrue;
- }
- }
- }
- }
- }
- }
- if (changed)
- {
- // re-read data
- // Ignore result, nothing we can do in case failure
- // and the old values should be preserved
- const TInt ignore = ReadApplicationInformationFromResourceFiles();
- } //lint !e529 Symbol 'ignore' not subsequently referenced
-
- else
- {
- if (iIconFileName)
- {
- ret = iFs.Entry(*iIconFileName, entry);
- // See if the icon file has been "modified"
- // It could have been replaced with a differnt version, deleted or added
- // if the icon file specified in the resource was missing
- if ((ret==KErrNotFound && iIconFileTimeStamp!=TTime(0)) ||
- (ret==KErrNone && entry.iModified!=iIconFileTimeStamp))
- {
- // Assume the icon file has changed
- iIconFileTimeStamp = entry.iModified;
- changed = ETrue;
- }
- }
- }
-
- __APA_PROFILE_END(17);
- return changed;
- }
EXPORT_C TDataTypePriority CApaAppData::DataType(const TDataType& aDataType) const
// returns the priority of the data type
@@ -719,12 +952,6 @@
}
-EXPORT_C TBool CApaAppData::IsPending() const
-/* Returns true if the app info is not yet updated by the current scan. */
- {
- return (iIsPresent==CApaAppData::EPresentPendingUpdate
- || iIsPresent==CApaAppData::ENotPresentPendingUpdate);
- }
EXPORT_C TBool CApaAppData::CanUseScreenMode(TInt aScreenMode)
/** Tests whether the specified screen mode is valid for any of
@@ -775,51 +1002,6 @@
return iDefaultScreenNumber;
}
-/** Returns true if app info was provided by a registration file
-
-@return true if app info was provided by a registration file
-*/
-EXPORT_C TBool CApaAppData::RegistrationFileUsed() const
- {
- return iRegistrationFile != NULL;
- }
-
-/** Returns the full filename of the registration resource file
-
-@return The full path and filename of the registration resource file.
-@internalTechnology
-*/
-EXPORT_C TPtrC CApaAppData::RegistrationFileName() const
- {
- if (iRegistrationFile)
- {
- return *iRegistrationFile;
- }
- else
- {
- return TPtrC(KNullDesC);
- }
- }
-
-
-/** Returns the full filename of the localisable resource file
-
-@return The full path and filename of the localisable resource file.
-@internalTechnology
-*/
-EXPORT_C TPtrC CApaAppData::LocalisableResourceFileName() const
- {
- if (iLocalisableResourceFileName)
- {
- return *iLocalisableResourceFileName;
- }
- else
- {
- return TPtrC(KNullDesC);
- }
- }
-
-
/** Returns the non-native application opaque data
@return The non-native application opaque data.
@@ -837,11 +1019,6 @@
}
}
-EXPORT_C TUid CApaAppData::NonNativeApplicationType() const
-/** @internalComponent */
- {
- return iNonNativeApplicationType;
- }
/** Returns the full filename of the file containing application icons
@@ -991,7 +1168,9 @@
iIconFileNameFromResourceFile = iIconFileName;
iIconFileName = NULL;
iNonMbmIconFileFromResourceFile = iNonMbmIconFile;
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
iIconFileTimeStampFromResourceFile = iIconFileTimeStamp;
+#endif
}
iNonMbmIconFile = !CApaAppInfoReader::FileIsMbmWithGenericExtensionL(aFileName);
@@ -1025,29 +1204,19 @@
}
}
-void CApaAppData::SetAppPending()
- {
- if (iIsPresent == CApaAppData::ENotPresent
- || iIsPresent == CApaAppData::ENotPresentPendingUpdate)
- {
- iIsPresent = CApaAppData::ENotPresentPendingUpdate;
- }
- else
- {
- iIsPresent = CApaAppData::EPresentPendingUpdate;
- }
- }
-
void CApaAppData::InternalizeL(RReadStream& aReadStream)
/** Internalizes the appdata from the AppsList.bin file */
{
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
TUint highTime = aReadStream.ReadUint32L();
TUint lowTime = aReadStream.ReadUint32L();
iTimeStamp = TTime(MAKE_TINT64(highTime, lowTime));
-
+
highTime = aReadStream.ReadUint32L();
lowTime = aReadStream.ReadUint32L();
iIconFileTimeStamp = TTime(MAKE_TINT64(highTime, lowTime));
+#endif
+
iCaption = HBufC::NewL(aReadStream, KMaxFileName); // Caption
iShortCaption = HBufC::NewL(aReadStream, KMaxFileName); // Shortcaption
iFullName = HBufC::NewL(aReadStream, KMaxFileName); // Filename of application binary
@@ -1061,7 +1230,9 @@
iUidType = TUidType(uid1, uid2, uid3); // Application UID
aReadStream >> iCapabilityBuf;
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
iRegistrationFile = HBufC::NewL(aReadStream, KMaxFileName); // Registration Filename
+#endif
iDefaultScreenNumber = aReadStream.ReadUint32L(); // Default Screen number
iNumOfAppIcons = aReadStream.ReadInt32L(); // No. of icons
iNonMbmIconFile = aReadStream.ReadUint32L();
@@ -1092,6 +1263,7 @@
TRAP_IGNORE(iIcons = CApaAppIconArray::NewDefaultIconsL()); // Creates and Loads Default Icons.
}
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
HBufC* localisableResourceFileName = HBufC::NewL(aReadStream, KMaxFileName); // Registration Filename
if (*localisableResourceFileName != KNullDesC)
iLocalisableResourceFileName = localisableResourceFileName;
@@ -1101,10 +1273,13 @@
highTime = aReadStream.ReadUint32L();
lowTime = aReadStream.ReadUint32L();
iLocalisableResourceFileTimeStamp = TTime(MAKE_TINT64(highTime, lowTime)); // Localisable file timestamp
-
+#endif
+
iApplicationLanguage = (TLanguage)aReadStream.ReadInt32L(); // Application Language
iIndexOfFirstOpenService = aReadStream.ReadUint32L(); // Index of first open service
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
iNonNativeApplicationType.iUid = aReadStream.ReadUint32L();
+#endif
HBufC8* opaqueData = HBufC8::NewL(aReadStream, KMaxFileName); // Opaque Data
if (*opaqueData != KNullDesC8)
@@ -1203,6 +1378,7 @@
void CApaAppData::ExternalizeL(RWriteStream& aWriteStream) const
{
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
aWriteStream.WriteUint32L(I64HIGH(iTimeStamp.Int64()));
aWriteStream.WriteUint32L(I64LOW(iTimeStamp.Int64()));
@@ -1216,6 +1392,7 @@
aWriteStream.WriteUint32L(I64HIGH(iIconFileTimeStamp.Int64()));
aWriteStream.WriteUint32L(I64LOW(iIconFileTimeStamp.Int64()));
}
+#endif
if (iCaptionFromResourceFile) // Caption present in the resource file would be externalized if the one in applist has dynamically changed
{
@@ -1238,7 +1415,9 @@
aWriteStream << iUidType[i]; // Uid Type
aWriteStream << iCapabilityBuf;
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
aWriteStream << RegistrationFileName(); // Registration filename
+#endif
aWriteStream.WriteUint32L(iDefaultScreenNumber); // Default screen number
if (iIconFileNameFromResourceFile)
@@ -1253,17 +1432,20 @@
aWriteStream.WriteUint32L(iNonMbmIconFile);
aWriteStream << IconFileName();
}
-
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
aWriteStream << LocalisableResourceFileName();
aWriteStream.WriteUint32L(I64HIGH(iLocalisableResourceFileTimeStamp.Int64()));
aWriteStream.WriteUint32L(I64LOW(iLocalisableResourceFileTimeStamp.Int64()));
+#endif
aWriteStream.WriteInt32L(iApplicationLanguage);
aWriteStream.WriteUint32L(iIndexOfFirstOpenService);
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
aWriteStream.WriteUint32L(iNonNativeApplicationType.iUid);
+#endif
aWriteStream << OpaqueData();
--- a/appfw/apparchitecture/aplist/aplapplistitem.h Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/aplist/aplapplistitem.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1997-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"
@@ -29,6 +29,13 @@
#include <badesca.h>
#include <s32file.h>
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+#include<usif/scr/appregentries.h>
+#include<usif/scr/scr.h>
+#endif
+
+
+
// classes defined:
class CApaAppData;
class CApaAppList;
@@ -94,15 +101,25 @@
*/
class CApaAppData : public CBase
{
-public:
- IMPORT_C static CApaAppData* NewL(const TApaAppEntry& aAppEntry, RFs& aFs);
+public:
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+ IMPORT_C static CApaAppData* NewL(const Usif::CApplicationRegistrationData& aAppInfo, RFs& aFs, const Usif::RSoftwareComponentRegistry& aScrCon);
+ IMPORT_C TBool IsLangChangePending();
+#else
+ IMPORT_C static CApaAppData* NewL(const TApaAppEntry& aAppEntry, RFs& aFs);
+ inline TBool IsPresent() const;
+ IMPORT_C TBool RegistrationFileUsed() const;
+ IMPORT_C TPtrC RegistrationFileName() const;
+ IMPORT_C TBool IsPending()const;
+ IMPORT_C TPtrC LocalisableResourceFileName() const;
+#endif
+
IMPORT_C ~CApaAppData();
IMPORT_C TApaAppEntry AppEntry() const;
inline TPtrC Caption() const;
inline TPtrC ShortCaption() const;
IMPORT_C CApaMaskedBitmap* Icon(TInt aIconIndex) const;
IMPORT_C void Capability(TDes8& aCapabilityBuf)const;
- inline TBool IsPresent() const;
// ER5
IMPORT_C TDataTypePriority DataType(const TDataType& aDataType) const;
// ER6
@@ -116,22 +133,17 @@
IMPORT_C void GetIconInfo(TInt& aIconCount, TInt& aDefaultIconsUsed) const;
// 8.1
IMPORT_C TUint DefaultScreenNumber() const;
- IMPORT_C TBool RegistrationFileUsed() const;
IMPORT_C TPtrC IconFileName() const;
IMPORT_C TBool NonMbmIconFile() const;
-
// 9.0
IMPORT_C TBool ImplementsService(TUid aServiceUid) const;
TInt ImplementsServiceWithDataType(TUid aServiceUid, const TDataType& aDataType) const;
// 9.1
IMPORT_C TLanguage ApplicationLanguage() const;
- IMPORT_C TPtrC RegistrationFileName() const;
IMPORT_C TPtrC8 OpaqueData() const;
- IMPORT_C TUid NonNativeApplicationType() const;
- IMPORT_C TPtrC LocalisableResourceFileName() const;
+ IMPORT_C TUid NonNativeApplicationType() const;
IMPORT_C void SetShortCaptionL(const TDesC& aShortCaption);
- IMPORT_C TBool IsPending()const;
// 9.5
IMPORT_C void SetCaptionL(const TDesC& aCaption);
IMPORT_C void SetIconsL(const TDesC& aFileName, TInt aNumIcons);
@@ -142,15 +154,21 @@
inline CApaAppData* Next() const;
private:
CApaAppData(RFs& aFs);
- TBool Update();
- void SetAppPending();
-
- void ConstructL(const TApaAppEntry& aAppEntry);
- TInt ReadApplicationInformationFromResourceFiles();
void UpdateServiceArray(CArrayFixFlat<TApaAppServiceInfo>* aNewServiceArray);
TDataTypePriority DataType(const TDataType& aDataType, const CArrayFixFlat<TDataTypeWithPriority>& aDataTypeArray) const;
void InternalizeL(RReadStream& aReadStream);
TBool ViewMbmIconsRequireLoading() const;
+
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+ void ConstructL(const Usif::CApplicationRegistrationData& aAppInfo, const Usif::RSoftwareComponentRegistry& aScrCon);
+ TInt ReadApplicationInformationFromSCRL(const Usif::CApplicationRegistrationData& aAppInfo, const Usif::RSoftwareComponentRegistry& aScrCon);
+#else
+ TBool Update();
+ void SetAppPending();
+ void ConstructL(const TApaAppEntry& aAppEntry);
+ TInt ReadApplicationInformationFromResourceFiles();
+#endif
+
private:
enum { ENotPresent, ENotPresentPendingUpdate, EPresentPendingUpdate, EIsPresent, ESuperseded };
private:
@@ -158,35 +176,43 @@
HBufC* iCaption;
HBufC* iShortCaption;
HBufC* iFullName; // filename of application binary
- TInt iIsPresent; // uses enum
- TUidType iUidType;
+ TUid iUid;
+ TUidType iUidType;
CApaAppData* iNext;
TApaAppCapabilityBuf iCapabilityBuf;
CApaAppEntry* iSuccessor;
- TTime iTimeStamp;
CArrayPtrFlat<CApaAppViewData>* iViewDataArray;
CDesCArray* iOwnedFileArray;
RFs& iFs;
- HBufC* iRegistrationFile;
TUint iDefaultScreenNumber;
HBufC* iIconFileName;
TBool iNonMbmIconFile;
- HBufC* iLocalisableResourceFileName;
- TTime iLocalisableResourceFileTimeStamp;
- TTime iIconFileTimeStamp;
TLanguage iApplicationLanguage;
CArrayFixFlat<TApaAppServiceInfo>* iServiceArray;
TInt iIndexOfFirstOpenService;
- TUid iNonNativeApplicationType;
HBufC8* iOpaqueData;
TInt iNumOfAppIcons;
TInt iNumOfAppIconsFromResourceFile;
HBufC* iIconFileNameFromResourceFile; // Icon file name as found in the localisable resource file
TBool iNonMbmIconFileFromResourceFile; // A Flag that tells whether the icon in resource file is non MBM file format
- TTime iIconFileTimeStampFromResourceFile;
HBufC* iShortCaptionFromResourceFile; // Short Caption as found in the localisable resource file
HBufC* iCaptionFromResourceFile; // Caption as found in the localisable resource file
CApaIconLoader* iIconLoader;
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+ TInt iIsPresent; // uses enum
+ TTime iTimeStamp;
+ HBufC* iRegistrationFile;
+ HBufC* iLocalisableResourceFileName;
+ TTime iLocalisableResourceFileTimeStamp;
+ TTime iIconFileTimeStamp;
+ TUid iNonNativeApplicationType;
+ TTime iIconFileTimeStampFromResourceFile;
+#endif
+
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+ TBool iIsLangChangePending;
+#endif
+
private:
friend class CApaAppList;
};
@@ -249,11 +275,13 @@
inline TPtrC CApaAppData::ShortCaption() const
{ return *iShortCaption; }
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
/** Tests whether the application is present or not on the device.
@return True if application exists, else false. */
inline TBool CApaAppData::IsPresent() const
{ return iIsPresent; }
+#endif
/** Gets the Next Appdata in the list
--- a/appfw/apparchitecture/aplist/aplappregfinder.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/aplist/aplappregfinder.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -186,7 +186,7 @@
TParse regFileNameParser;
const TDriveName driveName = currentDrive.iUnit.Name();
regFileNameParser.Set(entry.iName, &appFolderOnDrive, &driveName);
-
+
// Apparc will call sidchecker to verify if an application is a valid registered application.
// Apparc will call sidchecker in the following conditions
// 1. If the current drive is a removable drive
--- a/appfw/apparchitecture/apserv/APSCLSV.H Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/apserv/APSCLSV.H Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1997-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"
@@ -126,6 +126,8 @@
EDebugAddFailingNonNativeApplicationsUpdate,
EDebugAddPanicingNonNativeApplicationsUpdate,
EDebugAddRollbackPanicingNonNativeApplicationsUpdate, // = 89
+ EAppListServUpdateAppList,
+ EAppListUpdatedAppsInfo,
EAppListServAppInfoProvidedByRegistrationFile = 99, // = 99
//WriteDeviceData Capability requirement
// ER5
--- a/appfw/apparchitecture/apserv/APSSERV.CPP Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/apserv/APSSERV.CPP Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-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"
@@ -26,24 +26,38 @@
#include "APFREC.H"
#include "APSSES.H"
#include "APSSTD.H"
-#include "../aplist/aplappregfinder.h"
#include "../aplist/aplapplistitem.h"
#include "APSSCAN.H"
#include "APSSTD.H"
#include "APASVST.H"
#include <datastor.h>
#include "APSRECCACHE.h"
-#include "apsnnapps.h"
-#include "../apfile/apinstallationmonitor.h"
#include "../apgrfx/apprivate.h"
#include "apgnotif.h"
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+#include<usif/scr/scr.h>
+#include<usif/scr/appregentries.h>
+#include<swi/sisregistrysession.h>
+#else
+#include "../aplist/aplappregfinder.h"
+#include "apsnnapps.h"
+#include "../apfile/apinstallationmonitor.h"
+#endif
+
+
_LIT(KAppArcServerSemaphore,"AppArcServerSemaphore");
_LIT(KAppArcServerThread,"AppArcServerThread");
+
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
_LIT(KAppRegistrationFileImportLocation, "?:\\private\\10003a3f\\import\\apps\\");
_LIT(KAppResourceAppsLocation, "?:\\resource\\apps\\");
_LIT(KNonNativeApplicationTypeRegistry, ":\\private\\10003a3f\\NonNativeTypes.dat");
+//To monitor all drives.
+const TInt KApaMonitorAllDrives = 0x3FFFFFF;
+#endif
+
/*
* patchable const data values defined in ApsConstData.cpp
*/
@@ -55,9 +69,6 @@
const TUint8 KPolicyElementWriteDeviceData = 0;
-//To monitor all drives.
-const TInt KApaMonitorAllDrives = 0x3FFFFFF;
-
const TUint KRangeCount = 3;
const TInt KAppListServRanges[KRangeCount] =
@@ -139,8 +150,10 @@
iAppList(0),
iTypeStoreModified(0),
iLoadRecognizersOnDemand(KApaLoadDataRecognizersOnDemand),
- iLoadMbmIconsOnDemand(KApaLoadMbmIconsOnDemand),
- iForceRegistrationStatus(EForceRegistrationNone)
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+ iForceRegistrationStatus(EForceRegistrationNone),
+#endif
+ iLoadMbmIconsOnDemand(KApaLoadMbmIconsOnDemand)
{
#ifdef __WINS__
@@ -163,7 +176,16 @@
StartL(KAppListServerName);
User::LeaveIfError(Dll::SetTls(this));
User::LeaveIfError(iFs.Connect());
-
+
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+ //Connect to sisregistrysession to initially populate the applications information and
+ //store it to SCR.
+ Swi::RSisRegistrySession sisReg;
+ sisReg.Connect();
+ sisReg.Close();
+#endif
+
+
// Get the idle timeout delay from the commandline if specified. The default is 50000ms
const TInt cmdLineLen = User::CommandLineLength();
TInt idlePeriodicDelay=50000; //default value
@@ -226,12 +248,15 @@
iAppList=CApaAppList::NewL(iFs, iLoadMbmIconsOnDemand, idlePeriodicDelay); // takes ownership of scanner
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
// If the phone rebooted halfway through processing updates, there will be a log file left
// look for one and recover if neccessary
CApsNonNativeApplicationsManager::RecoverFromUpdateLogL(iFs);
+#endif
iMimeTypeRecognizer=CApaScanningDataRecognizer::NewL(iFs, !iLoadRecognizersOnDemand);
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
ConstructPathsToMonitorL();
if ( iAppFsMonitor )
@@ -239,6 +264,8 @@
iAppFsMonitor->Start(ENotifyFile);
iAppFsMonitor->SetBlocked(ETrue);
}
+#endif
+
TRAP_IGNORE(iAppList->InitListL(this));
//
@@ -260,22 +287,29 @@
iBaBackupSessionWrapper=CBaBackupSessionWrapper::NewL();
iBaBackupSessionWrapper->RegisterBackupOperationObserverL(*((MBackupOperationObserver*)this));
- //
- TChar sysDrive = RFs::GetSystemDriveChar();
- TInt maxSizeofFileName = KNonNativeApplicationTypeRegistry().Length() + 1;
- iNonNativeApplicationTypeRegistry.CreateL(maxSizeofFileName);
- iNonNativeApplicationTypeRegistry.Append(sysDrive);
- iNonNativeApplicationTypeRegistry.Append(KNonNativeApplicationTypeRegistry());
-
- TRAP_IGNORE(InternalizeNonNativeApplicationTypeArrayL()); // We don't want a corrupt file to prevent from starting
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+ TRAP_IGNORE(InitNonNativeApplicationTypeArrayL());
+#else
+ //
+ TChar sysDrive = RFs::GetSystemDriveChar();
+ TInt maxSizeofFileName = KNonNativeApplicationTypeRegistry().Length() + 1;
+ iNonNativeApplicationTypeRegistry.CreateL(maxSizeofFileName);
+ iNonNativeApplicationTypeRegistry.Append(sysDrive);
+ iNonNativeApplicationTypeRegistry.Append(KNonNativeApplicationTypeRegistry());
+
+ TRAP_IGNORE(InternalizeNonNativeApplicationTypeArrayL()); // We don't want a corrupt file to prevent from starting
+#endif
+
if(iLoadRecognizersOnDemand)
iRecognizerUnloadTimer=CPeriodic::NewL(EPriorityNormal);
- //
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
iAppInstallationMonitor = CApaAppInstallationMonitor::NewL(this);
iAppInstallationMonitor->Start();
+#endif
}
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
void CApaAppArcServer::ConstructPathsToMonitorL()
{
TInt drivesToMonitor = KApaDrivesToMonitor;
@@ -337,16 +371,20 @@
iAppFsMonitor->AddLocationL(KAppResourceAppsLocation);
}
}
-
+#endif
+
EXPORT_C CApaAppArcServer::~CApaAppArcServer()
{
if(iBaBackupSessionWrapper)
iBaBackupSessionWrapper->DeRegisterBackupOperationObserver(*this);
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
delete iAppInstallationMonitor;
+ delete iAppFsMonitor;
+ iNonNativeApplicationTypeRegistry.Close();
+#endif
delete iAppList; // deletes scanners
delete iMimeTypeRecognizer;
delete iMimeTypeToAppMappingsManager;
- delete iAppFsMonitor;
delete iTypeStoreMonitor;
delete iBaBackupSessionWrapper;
delete iRecognitionCache;
@@ -361,9 +399,9 @@
iNonNativeApplicationTypeArray.Close();
delete iRecognizerUnloadTimer;
- iNonNativeApplicationTypeRegistry.Close();
}
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
EXPORT_C void CApaAppArcServer::HandleInstallationStartEvent()
{
if ( iAppFsMonitor )
@@ -381,6 +419,7 @@
}
AppList().RestartScanL();
}
+#endif
CSession2* CApaAppArcServer::NewSessionL(const TVersion& aVersion,const RMessage2&/* aMessage*/) const
// Create a new server session.
@@ -396,7 +435,7 @@
//
// scanning code here
//
-
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
EXPORT_C TCallBack CApaAppArcServer::RescanCallBack()
{
return TCallBack(&AppFsNotifyWithForcedRegistrationsResetCallBack,this);
@@ -415,6 +454,7 @@
reinterpret_cast<CApaAppArcServer*>(aObject)->UpdateApps();
return KErrNone;
}
+#endif
TInt CApaAppArcServer::PlugInNotifyCallBack(TAny* aObject)
{
@@ -431,6 +471,7 @@
return KErrNone;
}
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
void CApaAppArcServer::UpdateApps()
// update the list
{
@@ -446,7 +487,8 @@
{
iForceRegistrationStatus|=EForceRegistrationRequested;
UpdateApps();
- }
+ }
+#endif
void CApaAppArcServer::NotifyUpdate(TInt aReason)
// tell all sessions to update their clients
@@ -480,10 +522,23 @@
if(modificationStatus)
TRAP_IGNORE(iMimeTypeToAppMappingsManager->StoreL());
}
-
+
// iterate through sessions
iSessionIter.SetToFirst();
CApaAppArcServSession* ses=static_cast<CApaAppArcServSession*>(&(*iSessionIter++));
+
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+ //Get the updated application information from iAppList
+ CArrayFixFlat<TApaAppUpdateInfo>* updatedAppsInfo=iAppList->UpdatedAppsInfo();
+
+ while (ses!=NULL)
+ {
+ //Call session object NotifyClients and pass the updated application information.
+ ses->NotifyClients(aReason, updatedAppsInfo);
+ ses=static_cast<CApaAppArcServSession*>(&(*iSessionIter++));
+ }
+#else
+
while (ses!=NULL)
{
if(iForceRegistrationStatus & EForceRegistrationRequested)
@@ -510,6 +565,7 @@
//If this function is called not because of force registration, clear force registration applist change status.
iForceRegistrationStatus &= (~EForceRegistrationAppListChanged);
}
+#endif
}
void CApaAppArcServer::UpdatePlugIns()
@@ -576,16 +632,20 @@
case MBackupOperationObserver::EAbort:
break;
case MBackupOperationObserver::EStart:
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
if ( iAppFsMonitor )
{
iAppFsMonitor->SetBlocked(ETrue);
}
+#endif
break;
case MBackupOperationObserver::EEnd:
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
if ( iAppFsMonitor )
{
iAppFsMonitor->SetBlocked(EFalse);
}
+#endif
break;
default:
Panic(EEventFromBackupObserverError);
@@ -595,10 +655,12 @@
void CApaAppArcServer::InitialListPopulationComplete()
{
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
if ( iAppFsMonitor )
{
iAppFsMonitor->SetBlocked(EFalse);
}
+#endif
// notify clients (whoever is interested) that initial population of list is completed
iSessionIter.SetToFirst();
@@ -611,41 +673,90 @@
}
}
+
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+
+/*
+ * Cleanup RPointerArray
+ */
+void CleanupAndDestroyLauncherArray(TAny* aRPrray)
+ {
+ RPointerArray<Usif::CLauncherExecutable>* rpArray = (static_cast<RPointerArray<Usif::CLauncherExecutable>*>(aRPrray));
+ rpArray->ResetAndDestroy();
+ rpArray->Close();
+ }
+
+
+/*
+ * Gets non-native type to its run time mapping information from SCR and initialzes
+ * a mapping array
+ */
+void CApaAppArcServer::InitNonNativeApplicationTypeArrayL()
+ {
+ Usif::RSoftwareComponentRegistry scrSession;
+ User::LeaveIfError(scrSession.Connect());
+ CleanupClosePushL(scrSession);
+
+ RPointerArray<Usif::CLauncherExecutable> launchers;
+ //Get non-native type to its run-time mappings
+ scrSession.GetApplicationLaunchersL(launchers);
+ TCleanupItem cleanup(CleanupAndDestroyLauncherArray, &launchers);
+ CleanupStack::PushL(cleanup);
+
+ //Get each mapping and add it to mapping array
+ for(TInt index=0;index<launchers.Count();index++)
+ {
+ Usif::CLauncherExecutable* launcherInfo=launchers[index];
+ SNonNativeApplicationType nonNativeApplicationType;
+ nonNativeApplicationType.iTypeUid.iUid=launcherInfo->TypeId();
+ nonNativeApplicationType.iNativeExecutable=launcherInfo->Launcher().AllocLC();
+ iNonNativeApplicationTypeArray.AppendL(nonNativeApplicationType);
+ CleanupStack::Pop(nonNativeApplicationType.iNativeExecutable);
+ }
+ CleanupStack::PopAndDestroy(2, &scrSession);
+ }
+
+void CApaAppArcServer::UpdateAppListL(RArray<TApaAppUpdateInfo>* aAppUpdateInfo, TUid aSecureID)
+{
+ iAppList->UpdateApplistL(this, aAppUpdateInfo, aSecureID);
+}
+#else
+
void CApaAppArcServer::RegisterNonNativeApplicationTypeL(TUid aApplicationType, const TDesC& aNativeExecutable)
- {
- for (TInt i=iNonNativeApplicationTypeArray.Count()-1; i>=0; --i)
- {
- if (iNonNativeApplicationTypeArray[i].iTypeUid.iUid==aApplicationType.iUid)
- User::Leave(KErrAlreadyExists);
- }
-
- SNonNativeApplicationType nonNativeApplicationType;
- nonNativeApplicationType.iTypeUid.iUid=aApplicationType.iUid;
- nonNativeApplicationType.iNativeExecutable=aNativeExecutable.AllocLC();
- iNonNativeApplicationTypeArray.AppendL(nonNativeApplicationType);
- CleanupStack::Pop(nonNativeApplicationType.iNativeExecutable);
- CleanupStack::PushL(TCleanupItem(DeleteLastNonNativeApplicationType, this));
- ExternalizeNonNativeApplicationTypeArrayL();
- CleanupStack::Pop(this); // the TCleanupItem
- }
+ {
+ for (TInt i=iNonNativeApplicationTypeArray.Count()-1; i>=0; --i)
+ {
+ if (iNonNativeApplicationTypeArray[i].iTypeUid.iUid==aApplicationType.iUid)
+ User::Leave(KErrAlreadyExists);
+ }
+
+ SNonNativeApplicationType nonNativeApplicationType;
+ nonNativeApplicationType.iTypeUid.iUid=aApplicationType.iUid;
+ nonNativeApplicationType.iNativeExecutable=aNativeExecutable.AllocLC();
+ iNonNativeApplicationTypeArray.AppendL(nonNativeApplicationType);
+ CleanupStack::Pop(nonNativeApplicationType.iNativeExecutable);
+ CleanupStack::PushL(TCleanupItem(DeleteLastNonNativeApplicationType, this));
+ ExternalizeNonNativeApplicationTypeArrayL();
+ CleanupStack::Pop(this); // the TCleanupItem
+ }
void CApaAppArcServer::DeregisterNonNativeApplicationTypeL(TUid aApplicationType)
- {
- TInt i;
- for (i=iNonNativeApplicationTypeArray.Count()-1; i>=0; --i)
- {
- if (iNonNativeApplicationTypeArray[i].iTypeUid.iUid==aApplicationType.iUid)
- break;
- }
-
- if (i>=0)
- {
- ExternalizeNonNativeApplicationTypeArrayL(i);
- delete iNonNativeApplicationTypeArray[i].iNativeExecutable;
- iNonNativeApplicationTypeArray[i].iNativeExecutable = NULL;
- iNonNativeApplicationTypeArray.Remove(i);
- }
- }
+ {
+ TInt i;
+ for (i=iNonNativeApplicationTypeArray.Count()-1; i>=0; --i)
+ {
+ if (iNonNativeApplicationTypeArray[i].iTypeUid.iUid==aApplicationType.iUid)
+ break;
+ }
+
+ if (i>=0)
+ {
+ ExternalizeNonNativeApplicationTypeArrayL(i);
+ delete iNonNativeApplicationTypeArray[i].iNativeExecutable;
+ iNonNativeApplicationTypeArray[i].iNativeExecutable = NULL;
+ iNonNativeApplicationTypeArray.Remove(i);
+ }
+ }
void CApaAppArcServer::InternalizeNonNativeApplicationTypeArrayL()
{
@@ -673,37 +784,39 @@
CleanupStack::PopAndDestroy(&file);
}
+
void CApaAppArcServer::ExternalizeNonNativeApplicationTypeArrayL(TInt aIndexToIgnore/*=-1*/) const
- {
- RFs& fs=const_cast<RFs&>(iFs);
- fs.MkDirAll(iNonNativeApplicationTypeRegistry); // ignore any error
- RFile file;
- CleanupClosePushL(file);
- User::LeaveIfError(file.Replace(fs, iNonNativeApplicationTypeRegistry, EFileShareExclusive|EFileStream|EFileWrite));
- RFileWriteStream targetStream;
- targetStream.Attach(file); // file gets closed by this call, but that's okay, we don't need it any more (targetStream has its own copy of this RFile object that it owns)
- CleanupClosePushL(targetStream);
- const TInt arrayCount(iNonNativeApplicationTypeArray.Count());
- TInt arrayCountToExternalize=arrayCount;
- if (aIndexToIgnore>=0)
- --arrayCountToExternalize;
+ {
+ RFs& fs=const_cast<RFs&>(iFs);
+ fs.MkDirAll(iNonNativeApplicationTypeRegistry); // ignore any error
+ RFile file;
+ CleanupClosePushL(file);
+ User::LeaveIfError(file.Replace(fs, iNonNativeApplicationTypeRegistry, EFileShareExclusive|EFileStream|EFileWrite));
+ RFileWriteStream targetStream;
+ targetStream.Attach(file); // file gets closed by this call, but that's okay, we don't need it any more (targetStream has its own copy of this RFile object that it owns)
+ CleanupClosePushL(targetStream);
+ const TInt arrayCount(iNonNativeApplicationTypeArray.Count());
+ TInt arrayCountToExternalize=arrayCount;
+ if (aIndexToIgnore>=0)
+ --arrayCountToExternalize;
- TCardinality(arrayCountToExternalize).ExternalizeL(targetStream);
- for (TInt i=0; i<arrayCount; ++i)
- {
- if (i!=aIndexToIgnore)
- {
- const SNonNativeApplicationType& nonNativeApplicationType=iNonNativeApplicationTypeArray[i];
- targetStream.WriteUint32L(nonNativeApplicationType.iTypeUid.iUid);
- targetStream << *nonNativeApplicationType.iNativeExecutable;
- }
- }
-
- targetStream.CommitL();
- CleanupStack::PopAndDestroy(2, &file);
- }
+ TCardinality(arrayCountToExternalize).ExternalizeL(targetStream);
+ for (TInt i=0; i<arrayCount; ++i)
+ {
+ if (i!=aIndexToIgnore)
+ {
+ const SNonNativeApplicationType& nonNativeApplicationType=iNonNativeApplicationTypeArray[i];
+ targetStream.WriteUint32L(nonNativeApplicationType.iTypeUid.iUid);
+ targetStream << *nonNativeApplicationType.iNativeExecutable;
+ }
+ }
+
+ targetStream.CommitL();
+ CleanupStack::PopAndDestroy(2, &file);
+ }
+#endif
-TPtrC CApaAppArcServer::NativeExecutableL(TUid aNonNativeApplicationType) const
+TPtrC CApaAppArcServer::NativeExecutableL(TUid aNonNativeApplicationType)
{
for (TInt i=iNonNativeApplicationTypeArray.Count()-1; i>=0; --i)
{
@@ -711,11 +824,56 @@
if (nonNativeApplicationType.iTypeUid.iUid==aNonNativeApplicationType.iUid)
return *nonNativeApplicationType.iNativeExecutable;
}
-
+
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+ //If the mapping is not available in the list, search in SCR and add it to the list.
+ TPtrC nativeExecutableName=FindAndAddNonNativeRuntimeMappingL(aNonNativeApplicationType);
+ if(nativeExecutableName==KNullDesC())
+ User::Leave(KErrNotSupported); // not KErrNotFound
+
+ return nativeExecutableName;
+#else
User::Leave(KErrNotSupported); // not KErrNotFound
return KNullDesC();
+#endif
}
+
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+TPtrC CApaAppArcServer::FindAndAddNonNativeRuntimeMappingL(TUid aNonNativeApplicationType)
+{
+ //If non-native type to its runtime is not available search in SCR and update in list
+ Usif::RSoftwareComponentRegistry scrSession;
+ User::LeaveIfError(scrSession.Connect());
+ CleanupClosePushL(scrSession);
+
+ RPointerArray<Usif::CLauncherExecutable> launchers;
+ //Get non-native type to its run-time mappings
+ scrSession.GetApplicationLaunchersL(launchers);
+ TCleanupItem cleanup(CleanupAndDestroyLauncherArray, &launchers);
+ CleanupStack::PushL(cleanup);
+
+ //Search for mapping and add it mapping list.
+ for(TInt index=0;index<launchers.Count();index++)
+ {
+ Usif::CLauncherExecutable* launcherInfo=launchers[index];
+ if(aNonNativeApplicationType.iUid==launcherInfo->TypeId())
+ {
+ SNonNativeApplicationType nonNativeApplicationType;
+ nonNativeApplicationType.iTypeUid.iUid=launcherInfo->TypeId();
+ nonNativeApplicationType.iNativeExecutable=launcherInfo->Launcher().AllocLC();
+ iNonNativeApplicationTypeArray.AppendL(nonNativeApplicationType);
+ CleanupStack::Pop(nonNativeApplicationType.iNativeExecutable);
+ CleanupStack::PopAndDestroy(2, &scrSession);
+ return *nonNativeApplicationType.iNativeExecutable;
+ }
+ }
+
+ CleanupStack::PopAndDestroy(2, &scrSession);
+ return KNullDesC();
+}
+#endif
+
void CApaAppArcServer::DeleteLastNonNativeApplicationType(TAny* aThis)
{ // static
CApaAppArcServer& self=*static_cast<CApaAppArcServer*>(aThis);
@@ -736,6 +894,13 @@
// iterate through sessions
iSessionIter.SetToFirst();
CApaAppArcServSession* ses=static_cast<CApaAppArcServSession*>(&(*iSessionIter++));
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+ while (ses)
+ {
+ ses->NotifyScanComplete();
+ ses=static_cast<CApaAppArcServSession*>(&(*iSessionIter++));
+ }
+#else
while (ses)
{
if((iForceRegistrationStatus & EForceRegistrationRequested) ||
@@ -760,6 +925,7 @@
}
//Clear force registration request status
iForceRegistrationStatus &= (~EForceRegistrationRequested);
+#endif
}
/*
--- a/appfw/apparchitecture/apserv/APSSES.CPP Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/apserv/APSSES.CPP Tue Aug 31 15:24:25 2010 +0300
@@ -38,13 +38,18 @@
#include <s32file.h>
#include "../apgrfx/apprivate.h"
#include "apgnotif.h"
-#include "../aplist/aplappregfinder.h"
#include "ApLaunchChecker.h"
-#include "apsnnapps.h"
#include "../aplist/aplapplistitem.h"
#include "apsecutils.h"
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+#include "../aplist/aplappregfinder.h"
+#include "apsnnapps.h"
+#else
+#include "usif/scr/scr.h"
+#endif
+
const TInt KApaAppListServMaxBuffer=256;
#include "APSRECCACHE.h"
const TInt KApaAppInfoArrayGranularity = 4;
@@ -147,21 +152,34 @@
return self;
}
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
CApaAppListServSession::CApaAppListServSession(RFs& aFs, CApaAppArcServer& aAppArcSrv, CApaAppList& aAppList)
: iFs(aFs), iAppArcSrv(aAppArcSrv), iAppList(aAppList), iApaAppInfoArray(KApaAppInfoArrayGranularity)
{
}
+#else
+CApaAppListServSession::CApaAppListServSession(RFs& aFs, CApaAppArcServer& aAppArcSrv, CApaAppList& aAppList)
+ : iFs(aFs), iAppArcSrv(aAppArcSrv), iAppList(aAppList), iApaAppInfoArray(KApaAppInfoArrayGranularity),
+ iNotificationRequested(EFalse)
+ {
+
+ }
+#endif
void CApaAppListServSession::ConstructL()
{
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
iNonNativeApplicationsManager = CApsNonNativeApplicationsManager::NewL(iAppArcSrv,iFs);
+#endif
}
CApaAppListServSession::~CApaAppListServSession()
{
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
delete iNonNativeApplicationsManager;
+#endif
iApaAppInfoArray.ResetAndDestroy();
iApaAppInfoArray.Close();
}
@@ -251,36 +269,68 @@
ApplicationLanguageL(aMessage);
break;
case EAppListServAppInfoProvidedByRegistrationFile: // private OpCode for CEikApplication's use only
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
AppInfoProvidedByRegistrationFileL(aMessage);
+#else
+ ASSERT(0); // panic debug only
+ User::Leave(KErrNotSupported);
+#endif
break;
case EAppListServAppIconFileName:
IconFileNameL(aMessage);
break;
case EAppListServAppViewIconFileName:
ViewIconFileNameL(aMessage);
- break;
+ break;
case EAppListServPrepareNonNativeApplicationsUpdates:
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
iNonNativeApplicationsManager->PrepareNonNativeApplicationsUpdatesL();
+#else
+ ASSERT(0); // panic debug only
+ User::Leave(KErrNotSupported);
+#endif
break;
case EAppListServRegisterNonNativeApplication:
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
iNonNativeApplicationsManager->RegisterNonNativeApplicationL(aMessage);
+#else
+ ASSERT(0); // panic debug only
+ User::Leave(KErrNotSupported);
+#endif
break;
case EAppListServDeregisterNonNativeApplication:
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
iNonNativeApplicationsManager->DeregisterNonNativeApplicationL(aMessage);
+#else
+ ASSERT(0); // panic debug only
+ User::Leave(KErrNotSupported);
+#endif
break;
case EAppListServCommitNonNativeApplications:
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
iNonNativeApplicationsManager->CommitNonNativeApplicationsUpdatesL(aMessage);
completeMessage=EFalse;
+#else
+ ASSERT(0); // panic debug only
+ User::Leave(KErrNotSupported);
+#endif
break;
case EAppListServRollbackNonNativeApplications:
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
iNonNativeApplicationsManager->RollbackNonNativeApplicationsUpdates();
+#else
+ ASSERT(0); // panic debug only
+ User::Leave(KErrNotSupported);
+#endif
break;
case EAppListServGetAppType:
GetAppTypeL(aMessage);
break;
case EAppListServForceRegistration:
ForceRegistrationL(aMessage);
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
completeMessage=EFalse;
+#endif
break;
case EMatchesSecurityPolicy:
MatchesSecurityPolicyL(aMessage);
@@ -295,25 +345,41 @@
#endif
break;
case EDebugAddFailingNonNativeApplicationsUpdate:
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
#ifdef _DEBUG
iNonNativeApplicationsManager->ForceFailInNonNativeApplicationsUpdatesL();
#endif
+#endif
break;
case EDebugAddPanicingNonNativeApplicationsUpdate:
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
#ifdef _DEBUG
iNonNativeApplicationsManager->ForcePanicInNonNativeApplicationsUpdatesL();
#endif
+#endif
break;
case EDebugAddRollbackPanicingNonNativeApplicationsUpdate:
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
#ifdef _DEBUG
iNonNativeApplicationsManager->ForcePanicInNonNativeApplicationsRollbackL();
#endif
+#endif
break;
+
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+ case EAppListServUpdateAppList:
+ UpdateAppListL(aMessage);
+ break;
+ case EAppListUpdatedAppsInfo:
+ UpdatedAppsInfoL(aMessage);
+ break;
+#endif
default:
aMessage.Panic(KApaPanicCli,EClientBadRequest);
break;
+
}
-
+
if (completeMessage && !aMessage.IsNull())
aMessage.Complete(KErrNone);
}
@@ -355,6 +421,18 @@
void CApaAppArcServSession::ServiceL(const RMessage2& aMessage)
{
+#ifdef APPARC_SHOW_TRACE
+ TFullName* name = new(ELeave) TFullName();
+ RThread client;
+ if ( aMessage.Client( client ) == KErrNone )
+ {
+ client.FullName( *name );
+ client.Close();
+ }
+ RDebug::Print( _L("[Apparc] CApaAppListServSession::ServiceL(0x%08x) - START - op code: %04d, client: %S"), this, aMessage.Function(), name );
+ delete name;
+#endif
+
TBool completeMessage = ETrue;
switch (aMessage.Function())
{
@@ -472,10 +550,20 @@
}
break;
case EAppListServRegisterNonNativeApplicationType:
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
RegisterNonNativeApplicationTypeL(aMessage);
+#else
+ ASSERT(0); // panic debug only
+ User::Leave(KErrNotSupported);
+#endif
break;
case EAppListServDeregisterNonNativeApplicationType:
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
DeregisterNonNativeApplicationTypeL(aMessage);
+#else
+ ASSERT(0); // panic debug only
+ User::Leave(KErrNotSupported);
+#endif
break;
case EAppListServPreferredBufSize:
aMessage.Complete(PreferredBufSize());
@@ -536,9 +624,15 @@
break;
default:
iAppListSession->DoServiceL(aMessage);
+#ifdef APPARC_SHOW_TRACE
+ RDebug::Print( _L("[Apparc] CApaAppListServSession::ServiceL(0x%08x) - END - op code: %04d, completeMessage: %d"), this, aMessage.Function(), completeMessage );
+#endif
return;
}
-
+
+#ifdef APPARC_SHOW_TRACE
+ RDebug::Print( _L("[Apparc] CApaAppListServSession::ServiceL(0x%08x) - END - op code: %04d, completeMessage: %d"), this, aMessage.Function(), completeMessage );
+#endif
if (completeMessage && !aMessage.IsNull())
aMessage.Complete(KErrNone);
}
@@ -566,6 +660,7 @@
return (err==KErrNone) ? Min(iMaxBufSize, preferredBufferSize) : iMaxBufSize;
}
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
void CApaAppArcServSession::RegisterNonNativeApplicationTypeL(const RMessage2& aMessage)
{
const TUid applicationType(TUid::Uid(aMessage.Int0()));
@@ -581,23 +676,55 @@
const TUid applicationType(TUid::Uid(aMessage.Int0()));
iServ.DeregisterNonNativeApplicationTypeL(applicationType);
}
+#endif
void CApaAppListServSession::GetAppTypeL(const RMessage2& aMessage)
{
+ const TUid KTypeIDToNonNativeUidMapping[2][2]={ {TUid::Uid(0xB031C52A), TUid::Uid(0x10210E26)}, //Java
+ {TUid::Uid(0x7BDB6DA1), TUid::Uid(0x10282821)}}; //Widget
+
TInt uid = aMessage.Int0();
CApaAppData* appData = iAppList.AppDataByUid(TUid::Uid(uid));
if (!appData)
+ {
aMessage.Complete(KErrNotFound);
+ }
else
{
- TPckgBuf<TUid> typeUid(appData->NonNativeApplicationType());
- aMessage.WriteL(1,typeUid);
+ TUid typeId(appData->NonNativeApplicationType());
+
+ //Check if non-native type to non-native UID mapping available. Otherwise
+ //return whatever returned by NonNativeApplicationType.
+ TUid nonNativeUid=typeId;
+ TInt numMappings= (sizeof(KTypeIDToNonNativeUidMapping)/ (2*sizeof(TUid)));
+
+ for(TInt index=0; index<numMappings; index++)
+ {
+ if(typeId == KTypeIDToNonNativeUidMapping[index][0])
+ {
+ nonNativeUid = KTypeIDToNonNativeUidMapping[index][1];
+ break;
+ }
+ }
+
+ TPckgBuf<TUid> nonNativeUidBuf(nonNativeUid);
+ aMessage.WriteL(1,nonNativeUidBuf);
aMessage.Complete(KErrNone);
}
}
-
+
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+void CleanupAndDestroyAppInfoArray(TAny* aRPArray)
+ {
+ RPointerArray<Usif::CApplicationRegistrationData>* rpArray = (static_cast<RPointerArray<Usif::CApplicationRegistrationData>*>(aRPArray));
+ rpArray->ResetAndDestroy();
+ rpArray->Close();
+ }
+#endif
+
void CApaAppListServSession::ForceRegistrationL(const RMessage2& aMessage)
{
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
TInt bufferSize = aMessage.GetDesLength(0);
User::LeaveIfError(bufferSize);
HBufC8* const buffer=HBufC8::NewLC(bufferSize);
@@ -623,8 +750,46 @@
// Trigger a rescan, when rescan completes it will complete iNotifyOnScanCompleteMsg
iNotifyOnScanCompleteMsg=aMessage;
iAppArcSrv.UpdateAppsByForceRegistration();
+#else
+ const TUid KUidSisLaunchServer={0x1020473f};
+
+ if(aMessage.SecureId().iId != KUidSisLaunchServer.iUid)
+ User::Leave(KErrNotSupported);
+
+ //Get the size of the updated apps info buffer
+ TInt bufferSize = aMessage.GetDesLength(0);
+
+ //Allocate the buffer of bufferSize and read.
+ HBufC8* const buffer=HBufC8::NewLC(bufferSize);
+ TPtr8 buffer_asWritable(buffer->Des());
+ aMessage.ReadL(0,buffer_asWritable);
+
+ RDesReadStream readStream(*buffer);
+ CleanupClosePushL(readStream);
+
+ //Read the number of application information available in the buffer.
+ const TUint count=readStream.ReadUint32L();
+
+ RPointerArray<Usif::CApplicationRegistrationData> appsInfo;
+ TCleanupItem cleanup(CleanupAndDestroyAppInfoArray, &appsInfo);
+ CleanupStack::PushL(cleanup);
+
+ //Read one applciation information at a time and create list of application information.
+ for(TUint index=0; index<count; index++)
+ {
+ Usif::CApplicationRegistrationData* appData= Usif::CApplicationRegistrationData::NewL();
+ CleanupStack::PushL(appData);
+ readStream>>*appData;
+ appsInfo.AppendL(appData);
+ CleanupStack::Pop(appData);
+ }
+ CleanupStack::Pop(); //Remove cleanup
+ CleanupStack::PopAndDestroy(2, buffer); //delete readStream, buffer
+
+ iAppList.UpdateApplistByForceRegAppsL(appsInfo);
+#endif
}
-
+
void CApaAppArcServSession::AppForDocumentPassedByFileHandleL(const RMessage2& aMessage, const TUid* aServiceUid)
{
#if defined(__PROFILE)
@@ -757,8 +922,75 @@
if (!FindAppInList(app, dummy, aUid))
User::Leave(KErrNotFound);
- return *app;
- }
+ return *app;
+ }
+
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+/**
+locate app in list, return EFalse if it isn't present
+search is regardless of screen mode.
+@internalComponent
+*/
+TBool CApaAppListServSession::FindAppInList(CApaAppData*& aApp, TApaAppEntry& aEntry, TUid aAppUid)
+ {
+ // Look for the app with aAppUid in the applist we keep
+ const CApaAppList& list = iAppList;
+ aApp = list.AppDataByUid(aAppUid);
+ if (aApp)
+ aEntry = aApp->AppEntry();
+
+ // If the app list is currently in flux, try to nail down the app by looking for it specifically
+ const TBool appPendingOnLangChange = (aApp && list.IsLanguageChangePending() && aApp->IsPending());
+
+ if ((!aApp || appPendingOnLangChange) && !list.IsIdleUpdateComplete())
+ {
+ // 1. App wasn't found, but an app scan is currently in progress,
+ // so try to find and add the specific app we're looking for to the list
+
+ // 2. On language change event, current app scan could not yet update the found app,
+ // so try to update the specific app we're looking for, in the list.
+ if(aAppUid != KNullUid)
+ {
+ CApaAppData* app = NULL;
+ TRAPD(err, app = FindSpecificAppL(aAppUid));
+ if (!err && app)
+ {
+ // app has been found and added to the app list
+ aApp = app;
+ aEntry = aApp->AppEntry();
+ }
+ }
+ }
+
+ return (aApp != NULL);
+ }
+
+#else
+/**
+locate app in list, return EFalse if it isn't present
+search is regardless of screen mode.
+@internalComponent
+*/
+TBool CApaAppListServSession::FindAppInList(CApaAppData*& aApp, TApaAppEntry& aEntry, TUid aAppUid)
+ {
+ // Look for the application with aAppUid in the applist
+ const CApaAppList& list = iAppList;
+ aApp = list.AppDataByUid(aAppUid);
+
+ TBool appListChanging= (list.IsLanguageChangePending()||!list.IsIdleUpdateComplete());
+ //If the application is not in the applist and applist is still getting updated then find the
+ //requested application specifically and add to applist.
+ TInt err=KErrNone;
+ if( (!aApp && appListChanging) || (aApp && aApp->IsLangChangePending()))
+ TRAP(err, aApp=FindSpecificAppL(aAppUid));
+
+ if (!err && aApp)
+ aEntry = aApp->AppEntry();
+
+ return (aApp != NULL);
+ }
+
+#endif
void CApaAppListServSession::SendArrayL(const MArrayItemWriter& aArrayItemWriter,const RMessage2& aMessage) const
{
@@ -1027,6 +1259,23 @@
}
else
{
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+ Usif::RSoftwareComponentRegistry scrCon;
+ User::LeaveIfError(scrCon.Connect());
+ CleanupClosePushL(scrCon);
+ TApaAppEntry appEntry=appData->AppEntry();
+
+ //If component id of an application is non-zero then it is installed by installer
+ //after phone marketed.
+ TBool isInstalledApp=(scrCon.GetComponentIdForAppL(appEntry.iUidType[2])!=0);
+
+ //data priority for UnTrusted apps would be capped if it is greater than the threshold priority i.e, KMaxTInt16.
+ if (!isSidTrusted && isInstalledApp)
+ {
+ priority = KDataTypeUnTrustedPriorityThreshold;
+ }
+ CleanupStack::PopAndDestroy(); //scrCon
+#else
TPtrC registrationFilePath = appData->RegistrationFileName();
TInt match = registrationFilePath.MatchF (
KLitPathForUntrustedRegistrationResourceFiles );
@@ -1038,6 +1287,7 @@
// than UnTrusted apps Threshold priority
priority = KDataTypeUnTrustedPriorityThreshold;
}
+#endif
}
}
else
@@ -1207,7 +1457,7 @@
}
TPtrC8 CApaAppArcServSession::DoRecognizeUnpackLC(HBufC*& aName, RChunk& aLocalChunk, const RMessage2& aMessage)
- {
+ {
ASSERT(aName==NULL);
aName=HBufC::NewLC(User::LeaveIfError(aMessage.GetDesLength(1)));
@@ -1244,21 +1494,21 @@
TPtrC8 bufPtr(NULL,0); //Never executed. To make compiler happy
return bufPtr;
- }
+ }
void CApaAppArcServSession::RecognizeDataL(const RMessage2& aMessage)
// Recognize the data type of an object
- {
- HBufC* name=NULL;
+ {
+ HBufC* name=NULL;
RChunk localChunk;
- TPtrC8 bufPtr=DoRecognizeUnpackLC(name, localChunk, aMessage);
+ TPtrC8 bufPtr=DoRecognizeUnpackLC(name, localChunk, aMessage);
- const TDataRecognitionResult result = iServ.RecognizeDataL(*name, bufPtr);
+ const TDataRecognitionResult result = iServ.RecognizeDataL(*name, bufPtr);
- CleanupStack::PopAndDestroy(2); // name & buffer or localChunk
- aMessage.WriteL(0,TPckgC<TDataRecognitionResult>(result));
- }
+ CleanupStack::PopAndDestroy(2); // name & buffer or localChunk
+ aMessage.WriteL(0,TPckgC<TDataRecognitionResult>(result));
+ }
void CApaAppArcServSession::RecognizeFilesL(const RMessage2& aMessage)
@@ -1533,17 +1783,17 @@
void CApaAppArcServSession::RecognizeSpecificDataL(const RMessage2& aMessage)
// Determine whether an object is of a specific data type
- {
- HBufC* name=NULL;
- RChunk localChunk;
-
- TPtrC8 bufPtr=DoRecognizeUnpackLC(name, localChunk, aMessage);
- TDataType dataType;
- {TPckg<TDataType> dataType_asDescriptor(dataType);
- aMessage.ReadL(0, dataType_asDescriptor);}
- aMessage.Complete(iServ.RecognizeDataL(*name,bufPtr,dataType));
- CleanupStack::PopAndDestroy(2); // name & buffer or localChunk
- }
+ {
+ HBufC* name=NULL;
+ RChunk localChunk;
+
+ TPtrC8 bufPtr=DoRecognizeUnpackLC(name, localChunk, aMessage);
+ TDataType dataType;
+ {TPckg<TDataType> dataType_asDescriptor(dataType);
+ aMessage.ReadL(0, dataType_asDescriptor);}
+ aMessage.Complete(iServ.RecognizeDataL(*name,bufPtr,dataType));
+ CleanupStack::PopAndDestroy(2); // name & buffer or localChunk
+ }
void CApaAppArcServSession::RecognizeSpecificDataPassedByFileHandleL(const RMessage2& aMessage)
{
@@ -1702,50 +1952,17 @@
return (capabilityBuf().iAttributes & TApaAppCapability::EControlPanelItem);
}
-/**
-locate app in list, return EFalse if it isn't present
-search is regardless of screen mode.
-@internalComponent
-*/
-TBool CApaAppListServSession::FindAppInList(CApaAppData*& aApp, TApaAppEntry& aEntry, TUid aAppUid)
- {
- // Look for the app with aAppUid in the app list we keep
- const CApaAppList& list = iAppList;
- aApp = list.AppDataByUid(aAppUid);
- if (aApp)
- aEntry = aApp->AppEntry();
-
- // If the app list is currently in flux, try to nail down the app by looking for it specifically
- const TBool appPendingOnLangChange = (aApp && list.IsLanguageChangePending() && aApp->IsPending());
- if ((!aApp || appPendingOnLangChange) && !list.IsIdleUpdateComplete())
- {
- // 1. App wasn't found, but an app scan is currently in progress,
- // so try to find and add the specific app we're looking for to the list
-
- // 2. On language change event, current app scan could not yet update the found app,
- // so try to update the specific app we're looking for, in the list.
- if(aAppUid != KNullUid)
- {
- CApaAppData* app = NULL;
- TRAPD(err, app = FindSpecificAppL(aAppUid));
- if (!err && app)
- {
- // app has been found and added to the app list
- aApp = app;
- aEntry = aApp->AppEntry();
- }
- }
- }
-
- return (aApp != NULL);
- }
CApaAppData* CApaAppListServSession::FindSpecificAppL(TUid aAppUid)
{
- //Scans the drives and folder lists for the specific app
- CApaAppRegFinder* regFinder = CApaAppRegFinder::NewLC(iFs);
- CApaAppData* app = iAppList.FindAndAddSpecificAppL(regFinder, aAppUid);
- CleanupStack::PopAndDestroy(regFinder);
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+ CApaAppData* app = iAppList.FindAndAddSpecificAppL(aAppUid);
+#else
+ //Scans the drives and folder lists for the specific app
+ CApaAppRegFinder* regFinder = CApaAppRegFinder::NewLC(iFs);
+ CApaAppData* app = iAppList.FindAndAddSpecificAppL(regFinder, aAppUid);
+ CleanupStack::PopAndDestroy(regFinder);
+#endif
return app;
}
@@ -1791,34 +2008,79 @@
else
{
const TBool completeImmediatelyIfNoScanImpendingOrInProgress=aMessage.Int0();
- if ((!completeImmediatelyIfNoScanImpendingOrInProgress) ||
- iAppArcSrv.AppFsMonitor().AnyNotificationImpending() ||
- iAppList.AppScanInProgress())
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+ if ((!completeImmediatelyIfNoScanImpendingOrInProgress) ||
+ iAppList.AppScanInProgress())
+#else
+ if ((!completeImmediatelyIfNoScanImpendingOrInProgress) ||
+ iAppArcSrv.AppFsMonitor().AnyNotificationImpending() ||
+ iAppList.AppScanInProgress())
+#endif
iNotifyMessage=aMessage;
else
aMessage.Complete(KErrNone);
}
+
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+ iNotificationRequested=ETrue;
+#endif
}
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+void CApaAppArcServSession::NotifyClients(TInt aReason, CArrayFixFlat<TApaAppUpdateInfo>* aUpdatedAppsInfo)
+#else
void CApaAppArcServSession::NotifyClients(TInt aReason)
+#endif
+
{
- iAppListSession->NotifyClients(aReason);
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+ iAppListSession->NotifyClients(aReason, aUpdatedAppsInfo);
+#else
+ iAppListSession->NotifyClients(aReason);
+#endif
}
+
void CApaAppListServSession::CancelNotify()
{
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+ NotifyClients(KErrCancel, NULL);
+#else
NotifyClients(KErrCancel);
+#endif
}
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+void CApaAppListServSession::NotifyClients(TInt aReason, CArrayFixFlat<TApaAppUpdateInfo>* aUpdatedAppsInfo)
+#else
void CApaAppListServSession::NotifyClients(TInt aReason)
+#endif
{
if (!iNotifyMessage.IsNull())
iNotifyMessage.Complete(aReason);
//Notify client for scan complete.
NotifyScanComplete();
+
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+ if(aUpdatedAppsInfo && iNotificationRequested)
+ {
+ //Append the updated applications information to iAppsUpdated
+ TInt count=aUpdatedAppsInfo->Count();
+ for(TInt index=0; index<count; index++)
+ {
+ TRAPD(err, iAppsUpdated.AppendL((*aUpdatedAppsInfo)[index]));
+ if(err != KErrNone)
+ {
+ iAppsUpdated.Reset();
+ break;
+ }
+ }
+ }
+#endif
}
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
void CApaAppListServSession::AppInfoProvidedByRegistrationFileL(const RMessage2& aMessage)
{
// get UID of required app
@@ -1831,6 +2093,8 @@
TPckgC<TBool> pckg(registrationFileUsed);
aMessage.WriteL(1, pckg);
}
+#endif
+
void CApaAppListServSession::IconFileNameL(const RMessage2& aMessage)
{
@@ -1840,20 +2104,27 @@
// locate app in list
const CApaAppData& app = FindAppInListL(uid);
- if (!app.RegistrationFileUsed())
- User::Leave(KErrNotSupported);
- else
- {
- TPtrC iconFileName(app.IconFileName());
- if (iconFileName.Length() == 0)
- User::Leave(KErrNotFound);
- else
- {
- TFileName fileName = iconFileName;
- TPckgC<TFileName> pckg(fileName);
- aMessage.WriteL(1, pckg);
- }
- }
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+ if (!app.RegistrationFileUsed())
+ User::Leave(KErrNotSupported);
+ else
+ {
+#endif
+
+ TPtrC iconFileName(app.IconFileName());
+ if (iconFileName.Length() == 0)
+ User::Leave(KErrNotFound);
+ else
+ {
+ TFileName fileName = iconFileName;
+ TPckgC<TFileName> pckg(fileName);
+ aMessage.WriteL(1, pckg);
+ }
+
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+ }
+#endif
+
}
void CApaAppListServSession::ViewIconFileNameL(const RMessage2& aMessage)
@@ -1868,31 +2139,38 @@
// locate app in list
const CApaAppData& app = FindAppInListL(uid);
- if (!app.RegistrationFileUsed())
- User::Leave(KErrNotSupported);
- else
- {
- const CArrayPtr<CApaAppViewData>& viewDataArray = *app.Views();
- const TInt count = viewDataArray.Count();
- for (TInt ii=0; ii<count; ii++)
- {
- const CApaAppViewData& appViewData = *viewDataArray[ii];
- if (appViewData.Uid() == viewUid)
- {
- viewIconFileName.Set(appViewData.IconFileName());
- break;
- }
- }
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+ if (!app.RegistrationFileUsed())
+ User::Leave(KErrNotSupported);
+ else
+ {
+#endif
+
+ const CArrayPtr<CApaAppViewData>& viewDataArray = *app.Views();
+ const TInt count = viewDataArray.Count();
+ for (TInt ii=0; ii<count; ii++)
+ {
+ const CApaAppViewData& appViewData = *viewDataArray[ii];
+ if (appViewData.Uid() == viewUid)
+ {
+ viewIconFileName.Set(appViewData.IconFileName());
+ break;
+ }
+ }
+
+ if (viewIconFileName.Length() == 0)
+ User::Leave(KErrNotFound);
+ else
+ {
+ TFileName fileName = viewIconFileName;
+ TPckgC<TFileName> pckg(fileName);
+ aMessage.WriteL(2, pckg);
+ }
- if (viewIconFileName.Length() == 0)
- User::Leave(KErrNotFound);
- else
- {
- TFileName fileName = viewIconFileName;
- TPckgC<TFileName> pckg(fileName);
- aMessage.WriteL(2, pckg);
- }
- }
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+ }
+#endif
+
}
void CApaAppArcServSession::GetAppServicesL(const RMessage2& aMessage)
@@ -2091,9 +2369,87 @@
{
iNotifyOnScanCompleteMsg.Complete(KErrNone);
}
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
iNonNativeApplicationsManager->NotifyScanComplete();
+#endif
} //lint !e1762 Suppress member function could be made const
+
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+
+//Update applist based on the information provided by the installers.
+void CApaAppListServSession::UpdateAppListL(const RMessage2& aMessage)
+{
+ //Create the update info array from the buffer.
+ TInt bufferSize = aMessage.GetDesLength(0);
+ User::LeaveIfError(bufferSize);
+ HBufC8* const buffer=HBufC8::NewLC(bufferSize);
+ TPtr8 buffer_asWritable(buffer->Des());
+ aMessage.ReadL(0,buffer_asWritable);
+
+ RDesReadStream readStream(*buffer);
+ CleanupClosePushL(readStream);
+ const TUint count=readStream.ReadUint32L();
+
+ RArray<TApaAppUpdateInfo> *appUpdateInfo=new (ELeave) RArray<TApaAppUpdateInfo>(5);
+ CleanupStack::PushL(appUpdateInfo);
+
+ for(TUint index=0; index<count; index++)
+ {
+ TApaAppUpdateInfo appInfo;
+ readStream>>appInfo;
+ appUpdateInfo->AppendL(appInfo);
+ }
+ CleanupStack::Pop(appUpdateInfo);
+ CleanupStack::PopAndDestroy(2, buffer); //delete readStream, buffer
+
+ iAppArcSrv.UpdateAppListL(appUpdateInfo, TUid::Uid(aMessage.SecureId()));
+}
+
+
+void CApaAppListServSession::UpdatedAppsInfoL(const RMessage2& aMessage)
+ {
+ //Read the buffer size
+ TInt sizeOfBuffer=aMessage.Int1();
+ TInt count=iAppsUpdated.Count();
+ TInt sizeRequired= sizeof(TInt)+(sizeof(TApaAppUpdateInfo) * count);
+
+ TPckgBuf<TInt> pckg(sizeRequired);
+
+ //If size of the buffer is not enough write the required size and leave.
+ if(sizeOfBuffer<sizeRequired)
+ {
+ aMessage.WriteL(1, pckg);
+ User::Leave(KErrOverflow);
+ }
+
+ //If the passed buffer size is enough, create a buffer to write updates application information.
+ CBufFlat* buffer=CBufFlat::NewL(sizeRequired);
+ CleanupStack::PushL(buffer);
+ buffer->ExpandL(0, sizeRequired);
+
+ RBufWriteStream writeStream;
+ writeStream.Open(*buffer);
+
+ //Write count to stream.
+ writeStream.WriteUint32L(count);
+
+ //Write updated applications information to stream.
+ for(TInt index=0; index<count; index++)
+ {
+ writeStream<<iAppsUpdated[index];
+ }
+ //Write the buffer into passed buffer.
+ aMessage.WriteL(0, buffer->Ptr(0));
+ //Write size of the buffer
+ aMessage.WriteL(1, pckg);
+
+ CleanupStack::PopAndDestroy(buffer);
+ iAppsUpdated.Reset();
+ iNotificationRequested=EFalse;
+ }
+#endif
+
// TSizeArrayItemWriter
TInt TSizeArrayItemWriter::ArrayItemCount() const
--- a/appfw/apparchitecture/apserv/APSSES.H Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/apserv/APSSES.H Tue Aug 31 15:24:25 2010 +0300
@@ -44,7 +44,12 @@
void NotifyScanComplete();
void SetNotify(const RMessage2& aMessage);
void CancelNotify();
- void NotifyClients(TInt aReason);
+
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+ void NotifyClients(TInt aReason, CArrayFixFlat<TApaAppUpdateInfo>* aUpdatedAppsInfo);
+#else
+ void NotifyClients(TInt aReason);
+#endif
void NotifyClientForCompletionOfListPopulation();
void CancelListPopulationCompleteObserver();
@@ -99,6 +104,11 @@
void ApplicationLanguageL(const RMessage2& aMessage);
void SetAppShortCaptionL(const RMessage2& aMessage);
+
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+ void UpdateAppListL(const RMessage2& aMessage);
+ void UpdatedAppsInfoL(const RMessage2& aMessage);
+#endif
private:
static TInt NextDriveToScan(TInt aCurrentDrive);
static TBool AppIsControlPanelItem(const CApaAppData& aAppData);
@@ -120,7 +130,9 @@
CApaAppList& iAppList;
RMessage2 iNotifyMessage;
RMessage2 iNotifyOnScanCompleteMsg;
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
CApsNonNativeApplicationsManager* iNonNativeApplicationsManager;
+#endif
RMessage2 iCompletionOfListPopulationObserverMsg;
TAppListType iAppListType;
@@ -130,6 +142,11 @@
TUint iCapabilityAttrFilterValue; // contains bit flags from TCapabilityAttribute
TUid iServiceUid;
RPointerArray<CApaAppInfo> iApaAppInfoArray; //contains the most recent "snapshot" of the applist taken by GetNextAppL.
+
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+ RArray<TApaAppUpdateInfo> iAppsUpdated;
+ TBool iNotificationRequested; //If its true updated application information is maintained in session object.
+#endif
};
@@ -143,7 +160,11 @@
virtual void ServiceL(const RMessage2 &aMessage);
void NotifyClientOfDataMappingChange();
- void NotifyClients(TInt aReason);
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+ void NotifyClients(TInt aReason, CArrayFixFlat<TApaAppUpdateInfo>* aUpdatedAppsInfo);
+#else
+ void NotifyClients(TInt aReason);
+#endif
void NotifyScanComplete();
void NotifyClientForCompletionOfListPopulation();
private:
@@ -157,7 +178,7 @@
void RecognizeDataPassedByFileHandleL(const RMessage2& aMessage);
void RecognizeSpecificDataL(const RMessage2& aMessage);
void RecognizeSpecificDataPassedByFileHandleL(const RMessage2& aMessage);
- static TPtrC8 DoRecognizeUnpackLC(HBufC*& aName, RChunk& aLocalChunk, const RMessage2& aMessage);
+ static TPtrC8 DoRecognizeUnpackLC(HBufC*& aName, RChunk& aLocalChunk, const RMessage2& aMessage);
void AppForDataTypeL(const RMessage2& aMessage);
TUid AppForDataTypeL(const TDataType& aDataType, const TUid* aServiceUid);
@@ -178,8 +199,10 @@
void AppForDataTypeAndServiceL(const RMessage2& aMessage);
void AppForDocumentPassedByFileHandleL(const RMessage2& aMessage, const TUid* aServiceUid);
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
void RegisterNonNativeApplicationTypeL(const RMessage2& aMessage);
void DeregisterNonNativeApplicationTypeL(const RMessage2& aMessage);
+#endif
void GetExecutableNameGivenDocumentL(const RMessage2& aMessage);
void GetExecutableNameGivenDocumentPassedByFileHandleL(const RMessage2& aMessage);
--- a/appfw/apparchitecture/apserv/apsserv.h Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/apserv/apsserv.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1997-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"
@@ -55,21 +55,22 @@
inline RWsSession& WsSession();
- inline const CApaFsMonitor& AppFsMonitor() const {return *iAppFsMonitor;}
-
inline CApaScanningRuleBasedPlugIns* RuleBasedPlugIns();
// Application list stuff
inline CApaAppList& AppList();
- void UpdateApps();
- IMPORT_C TCallBack RescanCallBack();
-
- void RegisterNonNativeApplicationTypeL(TUid aApplicationType, const TDesC& aNativeExecutable);
- void DeregisterNonNativeApplicationTypeL(TUid aApplicationType);
- TPtrC NativeExecutableL(TUid aNonNativeApplicationType) const;
-
+ TPtrC NativeExecutableL(TUid aNonNativeApplicationType);
+
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+ void UpdateApps();
+ IMPORT_C TCallBack RescanCallBack();
+ void UpdateAppsByForceRegistration();
+ void RegisterNonNativeApplicationTypeL(TUid aApplicationType, const TDesC& aNativeExecutable);
+ void DeregisterNonNativeApplicationTypeL(TUid aApplicationType);
+ inline const CApaFsMonitor& AppFsMonitor() const {return *iAppFsMonitor;}
IMPORT_C void HandleInstallationStartEvent();
IMPORT_C void HandleInstallationEndEventL();
+#endif
// MIME-type recognition
inline CApaDataRecognizer* MimeTypeRecognizer();
@@ -101,23 +102,34 @@
void HandleBackupOperationEventL(const TBackupOperationAttributes& aBackupOperationAttributes);
public: //
IMPORT_C ~CApaAppArcServer();
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
TBool NonNativeRecovery() const;
void SetNonNativeRecovery(TBool aValue);
+#else
+ void UpdateAppListL(RArray<TApaAppUpdateInfo>* aAppUpdateInfo, TUid aSecureID);
+#endif
TBool LoadMbmIconsOnDemand() const;
- void UpdateAppsByForceRegistration();
+
private:
CApaAppArcServer(TInt aPriority);
void ConstructL();
virtual CSession2* NewSessionL(const TVersion& aVersion,const RMessage2& aMessage) const;
- static TInt AppFsNotifyWithForcedRegistrationsResetCallBack(TAny* aPtr);
- static TInt AppFsNotifyCallBack(TAny* aPtr);
static TInt PlugInNotifyCallBack(TAny* aPtr);
static TInt TypeStoreNotifyCallback(TAny* aPtr);
void UpdatePlugIns();
void UpdateTypeStore();
void DoUpdateTypeStoreL();
+
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+ void InitNonNativeApplicationTypeArrayL();
+ TPtrC FindAndAddNonNativeRuntimeMappingL(TUid aNonNativeApplicationType);
+#else
+ static TInt AppFsNotifyWithForcedRegistrationsResetCallBack(TAny* aPtr);
+ static TInt AppFsNotifyCallBack(TAny* aPtr);
void InternalizeNonNativeApplicationTypeArrayL();
- void ExternalizeNonNativeApplicationTypeArrayL(TInt aIndexToIgnore=-1) const;
+ void ExternalizeNonNativeApplicationTypeArrayL(TInt aIndexToIgnore=-1) const;
+ void ConstructPathsToMonitorL();
+#endif
static void DeleteLastNonNativeApplicationType(TAny* aThis);
void NotifyScanComplete();
void DeleteCustomAppInfoList();
@@ -131,7 +143,6 @@
CRecognitionResult* CachedRecognitionResult(const RFile& aFile, const TParseBase& aParser) const;
void CacheRecognitionResultL(const TParseBase& aParser, const TDataRecognitionResult& aResult);
void CacheRecognitionResultL(const RFile& aFile, const TParseBase& aParser, const TDataRecognitionResult& aResult);
- void ConstructPathsToMonitorL();
private:
enum
{
@@ -157,7 +168,9 @@
CApaAppList* iAppList;
CPeriodic* iRecognizerUnloadTimer;
CApaScanningDataRecognizer* iMimeTypeRecognizer;
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
CApaFsMonitor* iAppFsMonitor;
+#endif
CApaFsMonitor* iTypeStoreMonitor;
CTypeStoreManager* iMimeTypeToAppMappingsManager;
TTime iTypeStoreModified;
@@ -174,10 +187,17 @@
TBool iNonNativeRecovery;
TBool iLoadRecognizersOnDemand;
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
CApaAppInstallationMonitor* iAppInstallationMonitor; //CApaAppInstallationMonitor monitors installation and uninstallation of applications.
+ RBuf iNonNativeApplicationTypeRegistry;
+ TInt iForceRegistrationStatus;
+#endif
TBool iLoadMbmIconsOnDemand;
- RBuf iNonNativeApplicationTypeRegistry;
- TInt iForceRegistrationStatus;
+
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+ RArray<TApaAppUpdateInfo> iAppUpdateInfo;
+#endif
+
};
--- a/appfw/apparchitecture/bwins/APFILEU.DEF Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/bwins/APFILEU.DEF Tue Aug 31 15:24:25 2010 +0300
@@ -55,9 +55,9 @@
?reserved3@CAppSidChecker@@EAEXXZ @ 54 NONAME ABSENT ; void CAppSidChecker::reserved3(void)
?DriveList@CApaAppRegFinder@@QBEABV?$RArray@VTDriveUnitInfo@@@@XZ @ 55 NONAME ABSENT ; class RArray<class TDriveUnitInfo> const & CApaAppRegFinder::DriveList(void) const
?FindAllRemovableMediaAppsL@CApaAppRegFinder@@QAEXXZ @ 56 NONAME ABSENT ; void CApaAppRegFinder::FindAllRemovableMediaAppsL(void)
- ??1CApaAppInstallationMonitor@@UAE@XZ @ 57 NONAME ; CApaAppInstallationMonitor::~CApaAppInstallationMonitor(void)
- ?NewL@CApaAppInstallationMonitor@@SAPAV1@PAVCApaAppArcServer@@@Z @ 58 NONAME ; class CApaAppInstallationMonitor * CApaAppInstallationMonitor::NewL(class CApaAppArcServer *)
- ?Start@CApaAppInstallationMonitor@@QAEXXZ @ 59 NONAME ; void CApaAppInstallationMonitor::Start(void)
+ ??1CApaAppInstallationMonitor@@UAE@XZ @ 57 NONAME ABSENT; CApaAppInstallationMonitor::~CApaAppInstallationMonitor(void)
+ ?NewL@CApaAppInstallationMonitor@@SAPAV1@PAVCApaAppArcServer@@@Z @ 58 NONAME ABSENT; class CApaAppInstallationMonitor * CApaAppInstallationMonitor::NewL(class CApaAppArcServer *)
+ ?Start@CApaAppInstallationMonitor@@QAEXXZ @ 59 NONAME ABSENT; void CApaAppInstallationMonitor::Start(void)
??1CApfMimeContentPolicy@@UAE@XZ @ 60 NONAME ; CApfMimeContentPolicy::~CApfMimeContentPolicy(void)
?IsClosedExtension@CApfMimeContentPolicy@@QAEHABVTDesC16@@@Z @ 61 NONAME ; int CApfMimeContentPolicy::IsClosedExtension(class TDesC16 const &)
?IsClosedFileL@CApfMimeContentPolicy@@QAEHAAVRFile@@@Z @ 62 NONAME ; int CApfMimeContentPolicy::IsClosedFileL(class RFile &)
@@ -69,5 +69,4 @@
?NewL@CApfMimeContentPolicy@@SAPAV1@XZ @ 68 NONAME ; class CApfMimeContentPolicy * CApfMimeContentPolicy::NewL(void)
?NewLC@CApfMimeContentPolicy@@SAPAV1@AAVRFs@@@Z @ 69 NONAME ; class CApfMimeContentPolicy * CApfMimeContentPolicy::NewLC(class RFs &)
?NewLC@CApfMimeContentPolicy@@SAPAV1@XZ @ 70 NONAME ; class CApfMimeContentPolicy * CApfMimeContentPolicy::NewLC(void)
- _E32Dll=__E32Dll ; Entry point for emulation
--- a/appfw/apparchitecture/bwins/APGRFXU.DEF Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/bwins/APGRFXU.DEF Tue Aug 31 15:24:25 2010 +0300
@@ -331,7 +331,15 @@
?IsPending@CApaAppData@@QBEHXZ @ 330 NONAME ABSENT ; int CApaAppData::IsPending(void) const
?GetAppIcon@RApaLsSession@@QBEHVTUid@@AAVRFile@@@Z @ 331 NONAME ; int RApaLsSession::GetAppIcon(class TUid, class RFile &) const
?CheckAppSecurity@CApaSecurityUtils@@SAHABVTPtrC16@@AAH1@Z @ 332 NONAME ; int CApaSecurityUtils::CheckAppSecurity(class TPtrC16 const &, int &, int &)
- X @ 333 NONAME ABSENT ;
- X @ 334 NONAME ABSENT ;
+ X @ 333 NONAME ABSENT
+ X @ 334 NONAME ABSENT
?ForceCommitNonNativeApplicationsUpdatesL@RApaLsSession@@QAEXXZ @ 335 NONAME ; void RApaLsSession::ForceCommitNonNativeApplicationsUpdatesL(void)
- ?RecognizeData@RApaLsSession@@QBEHABVTDesC8@@AAVTDataRecognitionResult@@@Z @336 NONAME;TInt RecognizeData(const TDesC8& aBuffer, TDataRecognitionResult& aDataType) const
+ ?RecognizeData@RApaLsSession@@QBEHABVTDesC8@@AAVTDataRecognitionResult@@@Z @ 336 NONAME ; TInt RecognizeData(const TDesC8& aBuffer, TDataRecognitionResult& aDataType) const
+ ??0TApaAppUpdateInfo@@QAE@XZ @ 337 NONAME ; TApaAppUpdateInfo::TApaAppUpdateInfo(void)
+ ?InternalizeL@TApaAppUpdateInfo@@QAEXAAVRReadStream@@@Z @ 338 NONAME ; void TApaAppUpdateInfo::InternalizeL(class RReadStream &)
+ ?UpdateAppListL@RApaLsSession@@QAEHAAV?$RArray@VTApaAppUpdateInfo@@@@@Z @ 339 NONAME ; int RApaLsSession::UpdateAppListL(class RArray<class TApaAppUpdateInfo> &)
+ ?ExternalizeL@TApaAppUpdateInfo@@QBEXAAVRWriteStream@@@Z @ 340 NONAME ; void TApaAppUpdateInfo::ExternalizeL(class RWriteStream &) const
+ ??0TApaAppUpdateInfo@@QAE@VTUid@@W4TApaAppAction@0@@Z @ 341 NONAME ; TApaAppUpdateInfo::TApaAppUpdateInfo(class TUid, enum TApaAppUpdateInfo::TApaAppAction)
+ ?ForceRegistration@RApaLsSession@@QAEHABV?$RPointerArray@VCApplicationRegistrationData@Usif@@@@@Z @ 342 NONAME ; int RApaLsSession::ForceRegistration(class RPointerArray<class Usif::CApplicationRegistrationData> const &)
+ ?UpdatedAppsInfoL@RApaLsSession@@QAEHAAV?$RArray@VTApaAppUpdateInfo@@@@@Z @ 343 NONAME ; int RApaLsSession::UpdatedAppsInfoL(class RArray<class TApaAppUpdateInfo> &)
+
--- a/appfw/apparchitecture/bwins/APSERVU.DEF Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/bwins/APSERVU.DEF Tue Aug 31 15:24:25 2010 +0300
@@ -16,11 +16,11 @@
??1CUpdatedAppsList@@UAE@XZ @ 15 NONAME ABSENT ; CUpdatedAppsList::~CUpdatedAppsList(void)
?CloseAndDeletePermanentStore@CUpdatedAppsList@@QAEXXZ @ 16 NONAME ABSENT ; void CUpdatedAppsList::CloseAndDeletePermanentStore(void)
?IsInList@CUpdatedAppsList@@QBEHABVTDesC16@@@Z @ 17 NONAME ABSENT ; int CUpdatedAppsList::IsInList(class TDesC16 const &) const
- ?RescanCallBack@CApaAppArcServer@@QAE?AVTCallBack@@XZ @ 18 NONAME ; class TCallBack CApaAppArcServer::RescanCallBack(void)
+ ?RescanCallBack@CApaAppArcServer@@QAE?AVTCallBack@@XZ @ 18 NONAME ABSENT; class TCallBack CApaAppArcServer::RescanCallBack(void)
?KApaLoadDataRecognizersOnDemand@@3HB @ 19 NONAME DATA 4 ; int const KApaLoadDataRecognizersOnDemand
?KApaUnloadRecognizersTimeout@@3HB @ 20 NONAME DATA 4 ; int const KApaUnloadRecognizersTimeout
- ?HandleInstallationEndEventL@CApaAppArcServer@@QAEXXZ @ 21 NONAME ; void CApaAppArcServer::HandleEndUninstallEventL(void)
- ?HandleInstallationStartEvent@CApaAppArcServer@@QAEXXZ @ 22 NONAME ; void CApaAppArcServer::HandleStartUninstallEvent(void)
+ ?HandleInstallationEndEventL@CApaAppArcServer@@QAEXXZ @ 21 NONAME ABSENT; void CApaAppArcServer::HandleEndUninstallEventL(void)
+ ?HandleInstallationStartEvent@CApaAppArcServer@@QAEXXZ @ 22 NONAME ABSENT; void CApaAppArcServer::HandleStartUninstallEvent(void)
?KApaDrivesToMonitor@@3HB @ 23 NONAME ; int const KApaDrivesToMonitor
?KApaLoadMbmIconsOnDemand@@3HB @ 24 NONAME ; int const KApaLoadMbmIconsOnDemand
--- a/appfw/apparchitecture/bwins/TICONFORLEAKSu.DEF Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/bwins/TICONFORLEAKSu.DEF Tue Aug 31 15:24:25 2010 +0300
@@ -77,7 +77,7 @@
?Exists@TApaTask@@QBEHXZ @ 76 NONAME ; int TApaTask::Exists(void) const
?ExternalizeL@CApaMaskedBitmap@@QBEXAAVRWriteStream@@@Z @ 77 NONAME ; void CApaMaskedBitmap::ExternalizeL(class RWriteStream &) const
?FileName@CApaSystemControl@@QBE?AV?$TBuf@$0BAA@@@XZ @ 78 NONAME ; class TBuf<256> CApaSystemControl::FileName(void) const
- ?FindAndAddSpecificAppL@CApaAppList@@QAEPAVCApaAppData@@PAVCApaAppRegFinder@@VTUid@@@Z @ 79 NONAME ; class CApaAppData * CApaAppList::FindAndAddSpecificAppL(class CApaAppRegFinder *, class TUid)
+ ?FindAndAddSpecificAppL@CApaAppList@@QAEPAVCApaAppData@@PAVCApaAppRegFinder@@VTUid@@@Z @ 79 NONAME ABSENT ; class CApaAppData * CApaAppList::FindAndAddSpecificAppL(class CApaAppRegFinder *, class TUid)
?FindApp@TApaTaskList@@QAE?AVTApaTask@@ABVTDesC16@@@Z @ 80 NONAME ; class TApaTask TApaTaskList::FindApp(class TDesC16 const &)
?FindApp@TApaTaskList@@QAE?AVTApaTask@@VTUid@@@Z @ 81 NONAME ; class TApaTask TApaTaskList::FindApp(class TUid)
?FindByAppUid@CApaWindowGroupName@@SAXVTUid@@AAVRWsSession@@AAH@Z @ 82 NONAME ; void CApaWindowGroupName::FindByAppUid(class TUid, class RWsSession &, int &)
@@ -87,7 +87,7 @@
?FindDoc@TApaTaskList@@QAE?AVTApaTask@@ABVTDesC16@@@Z @ 86 NONAME ; class TApaTask TApaTaskList::FindDoc(class TDesC16 const &)
?FirstApp@CApaAppList@@QBEPAVCApaAppData@@H@Z @ 87 NONAME ; class CApaAppData * CApaAppList::FirstApp(int) const
?FirstApp@CApaAppList@@QBEPAVCApaAppData@@XZ @ 88 NONAME ; class CApaAppData * CApaAppList::FirstApp(void) const
- ?ForceRegistration@RApaLsSession@@QAEHABV?$RPointerArray@VTDesC16@@@@@Z @ 89 NONAME ; int RApaLsSession::ForceRegistration(class RPointerArray<class TDesC16> const &)
+ ?ForceRegistration@RApaLsSession@@QAEHABV?$RPointerArray@VTDesC16@@@@@Z @ 89 NONAME ABSENT; int RApaLsSession::ForceRegistration(class RPointerArray<class TDesC16> const &)
?FsSession@RApaLsSession@@SAPAVRFs@@XZ @ 90 NONAME ; class RFs * RApaLsSession::FsSession(void)
?GetAcceptedConfidence@RApaLsSession@@QBEHAAH@Z @ 91 NONAME ; int RApaLsSession::GetAcceptedConfidence(int &) const
?GetAllApps@RApaLsSession@@QBEHH@Z @ 92 NONAME ; int RApaLsSession::GetAllApps(int) const
@@ -150,11 +150,11 @@
?IsFirstScanComplete@CApaAppList@@QBEHXZ @ 149 NONAME ; int CApaAppList::IsFirstScanComplete(void) const
?IsIdleUpdateComplete@CApaAppList@@QBEHXZ @ 150 NONAME ; int CApaAppList::IsIdleUpdateComplete(void) const
?IsLanguageChangePending@CApaAppList@@QBEHXZ @ 151 NONAME ; int CApaAppList::IsLanguageChangePending(void) const
- ?IsPending@CApaAppData@@QBEHXZ @ 152 NONAME ; int CApaAppData::IsPending(void) const
+ ?IsPending@CApaAppData@@QBEHXZ @ 152 NONAME ABSENT ; int CApaAppData::IsPending(void) const
?IsProgram@RApaLsSession@@QBEHABVTDesC16@@AAH@Z @ 153 NONAME ; int RApaLsSession::IsProgram(class TDesC16 const &, int &) const
?IsSystem@CApaWindowGroupName@@QBEHXZ @ 154 NONAME ; int CApaWindowGroupName::IsSystem(void) const
?KillTask@TApaTask@@QAEXXZ @ 155 NONAME ; void TApaTask::KillTask(void)
- ?LocalisableResourceFileName@CApaAppData@@QBE?AVTPtrC16@@XZ @ 156 NONAME ; class TPtrC16 CApaAppData::LocalisableResourceFileName(void) const
+ ?LocalisableResourceFileName@CApaAppData@@QBE?AVTPtrC16@@XZ @ 156 NONAME ABSENT ; class TPtrC16 CApaAppData::LocalisableResourceFileName(void) const
?MApaAppListServObserver_Reserved1@MApaAppListServObserver@@EAEXXZ @ 157 NONAME ; void MApaAppListServObserver::MApaAppListServObserver_Reserved1(void)
?MApaAppListServObserver_Reserved2@MApaAppListServObserver@@EAEXXZ @ 158 NONAME ; void MApaAppListServObserver::MApaAppListServObserver_Reserved2(void)
?Mask@CApaMaskedBitmap@@QBEPAVCFbsBitmap@@XZ @ 159 NONAME ; class CFbsBitmap * CApaMaskedBitmap::Mask(void) const
@@ -162,7 +162,7 @@
?MinApplicationStackSize@@YAIXZ @ 161 NONAME ; unsigned int MinApplicationStackSize(void)
?New@CApaWindowGroupName@@SAPAV1@ABVRWsSession@@PAVHBufC16@@@Z @ 162 NONAME ; class CApaWindowGroupName * CApaWindowGroupName::New(class RWsSession const &, class HBufC16 *)
?NewInterimFormatFileWriterLC@ForJavaMIDletInstaller@@SAPAVCApaAppInfoFileWriter@@AAVRFs@@ABVTDesC16@@VTUid@@KH@Z @ 163 NONAME ABSENT ; class CApaAppInfoFileWriter * ForJavaMIDletInstaller::NewInterimFormatFileWriterLC(class RFs &, class TDesC16 const &, class TUid, unsigned long, int)
- ?NewL@CApaAppData@@SAPAV1@ABVTApaAppEntry@@AAVRFs@@@Z @ 164 NONAME ; class CApaAppData * CApaAppData::NewL(class TApaAppEntry const &, class RFs &)
+ ?NewL@CApaAppData@@SAPAV1@ABVTApaAppEntry@@AAVRFs@@@Z @ 164 NONAME ABSENT ; class CApaAppData * CApaAppData::NewL(class TApaAppEntry const &, class RFs &)
?NewL@CApaAppList@@SAPAV1@AAVRFs@@PAVCApaAppRegFinder@@HH@Z @ 165 NONAME ABSENT ; class CApaAppList * CApaAppList::NewL(class RFs &, class CApaAppRegFinder *, int, int)
?NewL@CApaAppListNotifier@@SAPAV1@PAVMApaAppListServObserver@@W4TPriority@CActive@@@Z @ 166 NONAME ; class CApaAppListNotifier * CApaAppListNotifier::NewL(class MApaAppListServObserver *, enum CActive::TPriority)
?NewL@CApaDoor@@SAPAV1@AAVRFs@@AAVCApaDocument@@ABVTSize@@@Z @ 167 NONAME ; class CApaDoor * CApaDoor::NewL(class RFs &, class CApaDocument &, class TSize const &)
@@ -194,7 +194,7 @@
?PreferredDataHandlerL@CApaAppList@@QBE?AVTUid@@ABVTDataType@@@Z @ 193 NONAME ; class TUid CApaAppList::PreferredDataHandlerL(class TDataType const &) const
?PreferredDataHandlerL@CApaAppList@@QBE?AVTUid@@ABVTDataType@@PBV2@AAH@Z @ 194 NONAME ; class TUid CApaAppList::PreferredDataHandlerL(class TDataType const &, class TUid const *, int &) const
?PrepareNonNativeApplicationsUpdatesL@RApaLsSession@@QAEXXZ @ 195 NONAME ; void RApaLsSession::PrepareNonNativeApplicationsUpdatesL(void)
- ?PurgeL@CApaAppList@@QAEXXZ @ 196 NONAME ; void CApaAppList::PurgeL(void)
+ ?PurgeL@CApaAppList@@QAEXXZ @ 196 NONAME ABSENT ; void CApaAppList::PurgeL(void)
?RApaLsSession_Reserved1@RApaLsSession@@EAEXXZ @ 197 NONAME ; void RApaLsSession::RApaLsSession_Reserved1(void)
?RApaLsSession_Reserved2@RApaLsSession@@EAEXXZ @ 198 NONAME ; void RApaLsSession::RApaLsSession_Reserved2(void)
?RecognizeData@RApaLsSession@@QBEHABVRFile@@AAVTDataRecognitionResult@@@Z @ 199 NONAME ; int RApaLsSession::RecognizeData(class RFile const &, class TDataRecognitionResult &) const
@@ -208,12 +208,12 @@
?RegisterListPopulationCompleteObserver@RApaLsSession@@QBEXAAVTRequestStatus@@@Z @ 207 NONAME ; void RApaLsSession::RegisterListPopulationCompleteObserver(class TRequestStatus &) const
?RegisterNonNativeApplicationL@RApaLsSession@@QAEXVTUid@@ABVTDriveUnit@@AAVCApaRegistrationResourceFileWriter@@PAVCApaLocalisableResourceFileWriter@@PBVRFile@@@Z @ 208 NONAME ; void RApaLsSession::RegisterNonNativeApplicationL(class TUid, class TDriveUnit const &, class CApaRegistrationResourceFileWriter &, class CApaLocalisableResourceFileWriter *, class RFile const *)
?RegisterNonNativeApplicationTypeL@RApaLsSession@@QAEXVTUid@@ABVTDesC16@@@Z @ 209 NONAME ; void RApaLsSession::RegisterNonNativeApplicationTypeL(class TUid, class TDesC16 const &)
- ?RegistrationFileName@CApaAppData@@QBE?AVTPtrC16@@XZ @ 210 NONAME ; class TPtrC16 CApaAppData::RegistrationFileName(void) const
- ?RegistrationFileUsed@CApaAppData@@QBEHXZ @ 211 NONAME ; int CApaAppData::RegistrationFileUsed(void) const
- ?ResetForcedRegistrations@CApaAppList@@QAEXXZ @ 212 NONAME ; void CApaAppList::ResetForcedRegistrations(void)
+ ?RegistrationFileName@CApaAppData@@QBE?AVTPtrC16@@XZ @ 210 NONAME ABSENT ; class TPtrC16 CApaAppData::RegistrationFileName(void) const
+ ?RegistrationFileUsed@CApaAppData@@QBEHXZ @ 211 NONAME ABSENT ; int CApaAppData::RegistrationFileUsed(void) const
+ ?ResetForcedRegistrations@CApaAppList@@QAEXXZ @ 212 NONAME ABSENT; void CApaAppList::ResetForcedRegistrations(void)
?RespondsToShutdownEvent@CApaWindowGroupName@@QBEHXZ @ 213 NONAME ; int CApaWindowGroupName::RespondsToShutdownEvent(void) const
?RespondsToSwitchFilesEvent@CApaWindowGroupName@@QBEHXZ @ 214 NONAME ; int CApaWindowGroupName::RespondsToSwitchFilesEvent(void) const
- ?RestartScanL@CApaAppList@@QAEXXZ @ 215 NONAME ; void CApaAppList::RestartScanL(void)
+ ?RestartScanL@CApaAppList@@QAEXXZ @ 215 NONAME ABSENT ; void CApaAppList::RestartScanL(void)
?RestoreL@CApaDoor@@QAEXABVCStreamStore@@VTStreamId@@@Z @ 216 NONAME ; void CApaDoor::RestoreL(class CStreamStore const &, class TStreamId)
?RollbackNonNativeApplicationsUpdates@RApaLsSession@@QAEHXZ @ 217 NONAME ; int RApaLsSession::RollbackNonNativeApplicationsUpdates(void)
?ScreenMode@CApaAppViewData@@QBEHXZ @ 218 NONAME ; int CApaAppViewData::ScreenMode(void) const
@@ -275,7 +275,7 @@
?StartIdleUpdateL@CApaAppList@@QAEXXZ @ 274 NONAME ; void CApaAppList::StartIdleUpdateL(void)
?StartupApaServer@@YAHAAVMApaAppStarter@@@Z @ 275 NONAME ABSENT ; int StartupApaServer(class MApaAppStarter &)
?StartupApaServerProcess@@YAHXZ @ 276 NONAME ; int StartupApaServerProcess(void)
- ?StopScan@CApaAppList@@QAEXH@Z @ 277 NONAME ; void CApaAppList::StopScan(int)
+ ?StopScan@CApaAppList@@QAEXH@Z @ 277 NONAME ABSENT ; void CApaAppList::StopScan(int)
?StoreL@CApaAppInfoFileWriter@@QAEXXZ @ 278 NONAME ABSENT ; void CApaAppInfoFileWriter::StoreL(void)
?SwitchCreateFile@TApaTask@@QAEHABVTDesC16@@@Z @ 279 NONAME ; int TApaTask::SwitchCreateFile(class TDesC16 const &)
?SwitchOpenFile@TApaTask@@QAEHABVTDesC16@@@Z @ 280 NONAME ; int TApaTask::SwitchOpenFile(class TDesC16 const &)
@@ -298,7 +298,7 @@
?ForceCommitNonNativeApplicationsUpdatesL@RApaLsSession@@QAEXXZ @ 297 NONAME ; void RApaLsSession::ForceCommitNonNativeApplicationsUpdatesL(void)
?DataTypes@TApaAppServiceInfo@@QAEAAV?$CArrayFixFlat@VTDataTypeWithPriority@@@@XZ @ 298 NONAME ; class CArrayFixFlat<class TDataTypeWithPriority> & TApaAppServiceInfo::DataTypes(void)
??0TApaAppIdentifier@@QAE@XZ @ 299 NONAME ; TApaAppIdentifier::TApaAppIdentifier(void)
- ?AddForcedRegistrationL@CApaAppList@@QAEXABVTDesC16@@@Z @ 300 NONAME ; void CApaAppList::AddForcedRegistrationL(class TDesC16 const &)
+ ?AddForcedRegistrationL@CApaAppList@@QAEXABVTDesC16@@@Z @ 300 NONAME ABSENT; void CApaAppList::AddForcedRegistrationL(class TDesC16 const &)
?ExternalizeL@TApaAppCapability@@QBEXAAVRWriteStream@@@Z @ 301 NONAME ; void TApaAppCapability::ExternalizeL(class RWriteStream &) const
??0TApaAppInfo@@QAE@VTUid@@ABV?$TBuf@$0BAA@@@11@Z @ 302 NONAME ; TApaAppInfo::TApaAppInfo(class TUid, class TBuf<256> const &, class TBuf<256> const &, class TBuf<256> const &)
?AddEmbeddability@TApaEmbeddabilityFilter@@QAEXW4TEmbeddability@TApaAppCapability@@@Z @ 303 NONAME ; void TApaEmbeddabilityFilter::AddEmbeddability(enum TApaAppCapability::TEmbeddability)
@@ -330,6 +330,21 @@
??0TApaAppInfo@@QAE@XZ @ 329 NONAME ; TApaAppInfo::TApaAppInfo(void)
??0TApaAppViewInfo@@QAE@VTUid@@ABV?$TBuf@$0BAA@@@H@Z @ 330 NONAME ; TApaAppViewInfo::TApaAppViewInfo(class TUid, class TBuf<256> const &, int)
??0TApaAppServiceInfo@@QAE@VTUid@@PAV?$CArrayFixFlat@VTDataTypeWithPriority@@@@PAVHBufC8@@@Z @ 331 NONAME ; TApaAppServiceInfo::TApaAppServiceInfo(class TUid, class CArrayFixFlat<class TDataTypeWithPriority> *, class HBufC8 *)
- ?AppListUpdatePending@CApaAppList@@QAEHXZ @ 332 NONAME ; int CApaAppList::AppListUpdatePending(void)
- ?RecognizeData@RApaLsSession@@QBEHABVTDesC8@@AAVTDataRecognitionResult@@@Z @333 NONAME ; TInt RecognizeData(class TDesC8 const &, class TDataRecognitionResult & ) const
+ ?AppListUpdatePending@CApaAppList@@QAEHXZ @ 332 NONAME ABSENT ; int CApaAppList::AppListUpdatePending(void)
+ ?RecognizeData@RApaLsSession@@QBEHABVTDesC8@@AAVTDataRecognitionResult@@@Z @ 333 NONAME ; TInt RecognizeData(class TDesC8 const &, class TDataRecognitionResult & ) const
?UninstalledAppArray@CApaAppList@@QAEPAV?$CArrayFixFlat@VTUid@@@@XZ @ 334 NONAME ; class CArrayFixFlat<class TUid> * CApaAppList::UninstalledAppArray(void)
+ ?FindAndAddSpecificAppL@CApaAppList@@QAEPAVCApaAppData@@VTUid@@@Z @ 335 NONAME ; class CApaAppData * CApaAppList::FindAndAddSpecificAppL(class TUid)
+ ?NewL@CApaAppData@@SAPAV1@ABVCApplicationRegistrationData@Usif@@AAVRFs@@ABVRSoftwareComponentRegistry@3@@Z @ 336 NONAME ; class CApaAppData * CApaAppData::NewL(class Usif::CApplicationRegistrationData const &, class RFs &, class Usif::RSoftwareComponentRegistry const &)
+ ?InitializeApplistL@CApaAppList@@QAEXPAVMApaAppListObserver@@@Z @ 337 NONAME ; void CApaAppList::InitializeApplistL(class MApaAppListObserver *)
+ ??0TApaAppUpdateInfo@@QAE@XZ @ 338 NONAME ; TApaAppUpdateInfo::TApaAppUpdateInfo(void)
+ ?InternalizeL@TApaAppUpdateInfo@@QAEXAAVRReadStream@@@Z @ 339 NONAME ; void TApaAppUpdateInfo::InternalizeL(class RReadStream &)
+ ?UpdateAppListL@RApaLsSession@@QAEHAAV?$RArray@VTApaAppUpdateInfo@@@@@Z @ 340 NONAME ; int RApaLsSession::UpdateAppListL(class RArray<class TApaAppUpdateInfo> &)
+ ?ExternalizeL@TApaAppUpdateInfo@@QBEXAAVRWriteStream@@@Z @ 341 NONAME ; void TApaAppUpdateInfo::ExternalizeL(class RWriteStream &) const
+ ??0TApaAppUpdateInfo@@QAE@VTUid@@W4TApaAppAction@0@@Z @ 342 NONAME ; TApaAppUpdateInfo::TApaAppUpdateInfo(class TUid, enum TApaAppUpdateInfo::TApaAppAction)
+ ?UpdateApplistByForceRegAppsL@CApaAppList@@QAEXAAV?$RPointerArray@VCApplicationRegistrationData@Usif@@@@@Z @ 343 NONAME ; void CApaAppList::UpdateApplistByForceRegAppsL(class RPointerArray<class Usif::CApplicationRegistrationData> &)
+ ?UpdatedAppsInfo@CApaAppList@@QAEPAV?$CArrayFixFlat@VTApaAppUpdateInfo@@@@XZ @ 344 NONAME ; class CArrayFixFlat<class TApaAppUpdateInfo> * CApaAppList::UpdatedAppsInfo(void)
+ ?UpdateApplistL@CApaAppList@@QAEXPAVMApaAppListObserver@@PAV?$RArray@VTApaAppUpdateInfo@@@@VTUid@@@Z @ 345 NONAME ; void CApaAppList::UpdateApplistL(class MApaAppListObserver *, class RArray<class TApaAppUpdateInfo> *, class TUid)
+ ?ForceRegistration@RApaLsSession@@QAEHABV?$RPointerArray@VCApplicationRegistrationData@Usif@@@@@Z @ 346 NONAME ; int RApaLsSession::ForceRegistration(class RPointerArray<class Usif::CApplicationRegistrationData> const &)
+ ?UpdatedAppsInfoL@RApaLsSession@@QAEHAAV?$RArray@VTApaAppUpdateInfo@@@@@Z @ 347 NONAME ; int RApaLsSession::UpdatedAppsInfoL(class RArray<class TApaAppUpdateInfo> &)
+ ?IsLangChangePending@CApaAppData@@QAEHXZ @ 348 NONAME ; int CApaAppData::IsLangChangePending(void)
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/bwins/apfile_legacyu.def Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,73 @@
+EXPORTS
+ ??0CApaScanningFileRecognizer@@IAE@AAVRFs@@PAVMApaAppStarter@@@Z @ 1 NONAME ABSENT
+ ??1CApaAppLocatorProxy@@UAE@XZ @ 2 NONAME ABSENT
+ ??1CApaScanningAppFinder@@UAE@XZ @ 3 NONAME ABSENT
+ ??1CApaScanningFileRecognizer@@UAE@XZ @ 4 NONAME ABSENT
+ ?ConstructL@CApaScanningFileRecognizer@@IAEXXZ @ 5 NONAME ABSENT
+ ?DefaultAppInfoFileName@CApaScanningAppFinder@@UBE?AV?$TBuf@$0BAA@@@XZ @ 6 NONAME ABSENT
+ ?FindAllAppsL@CApaScanningAppFinder@@UAEXXZ @ 7 NONAME ABSENT
+ ?FindAppL@CApaScanningAppFinder@@UAE?AV?$TBuf@$0BAA@@@ABVTDesC16@@VTUid@@@Z @ 8 NONAME ABSENT
+ ?GetAppCapabilityByUid@CApaAppLocatorProxy@@UAEHAAVTDes8@@VTUid@@@Z @ 9 NONAME ABSENT
+ ?GetAppEntryByUid@CApaAppLocatorProxy@@UAEHAAVTApaAppEntry@@VTUid@@@Z @ 10 NONAME ABSENT
+ ?NewL@CApaAppLocatorProxy@@SAPAV1@AAVRFs@@@Z @ 11 NONAME ABSENT
+ ?NewL@CApaScanningAppFinder@@SAPAV1@ABVRFs@@@Z @ 12 NONAME ABSENT
+ ?NewL@CApaScanningFileRecognizer@@SAPAV1@AAVRFs@@PAVMApaAppStarter@@@Z @ 13 NONAME ABSENT
+ ?NewLC@CApaScanningAppFinder@@SAPAV1@ABVRFs@@@Z @ 14 NONAME ABSENT
+ ?NextL@CApaScanningAppFinder@@UAEHAAVTApaAppEntry@@@Z @ 15 NONAME ABSENT
+ ?RecognizerCount@CApaScanningFileRecognizer@@QAEHXZ @ 16 NONAME ABSENT
+ ?RecognizerListLC@CApaScanningFileRecognizer@@QBEPAV?$CArrayFixFlat@VRRecognizer@CApaScanningFileRecognizer@@@@XZ @ 17 NONAME ABSENT
+ ?ScanForRecognizersL@CApaScanningFileRecognizer@@QAEXXZ @ 18 NONAME ABSENT
+ ?SetRecognizersFromListL@CApaScanningFileRecognizer@@QAEXABV?$CArrayFixFlat@VTRecognizer@CApaScanningFileRecognizer@@@@@Z @ 19 NONAME ABSENT
+ ?TempPath@CApaScanningAppFinder@@UBE?AV?$TBuf@$0BAA@@@XZ @ 20 NONAME ABSENT
+ ?TempPath@Apfile@@SA?AVTPtrC16@@XZ @ 21 NONAME ABSENT
+ ??ACApaScanningFileRecognizer@@QBEABVRRecognizer@0@H@Z @ 22 NONAME ABSENT ; class CApaScanningFileRecognizer::RRecognizer const & CApaScanningFileRecognizer::operator[](int) const
+ ?SetRecognizerL@CApaScanningFileRecognizer@@QAEXABVTRecognizer@1@@Z @ 23 NONAME ABSENT
+ ?UpdateCounter@CApaScanningFileRecognizer@@QBEHXZ @ 24 NONAME ABSENT
+ ??1CApaScanningControlFinder@@UAE@XZ @ 25 NONAME ABSENT
+ ?DefaultAppInfoFileName@CApaScanningControlFinder@@UBE?AV?$TBuf@$0BAA@@@XZ @ 26 NONAME ABSENT
+ ?FindAllAppsL@CApaScanningControlFinder@@UAEXXZ @ 27 NONAME ABSENT
+ ?FindAppL@CApaScanningControlFinder@@UAE?AV?$TBuf@$0BAA@@@ABVTDesC16@@VTUid@@@Z @ 28 NONAME ABSENT
+ ?NewL@CApaScanningControlFinder@@SAPAV1@ABVRFs@@@Z @ 29 NONAME ABSENT
+ ?NewLC@CApaScanningControlFinder@@SAPAV1@ABVRFs@@@Z @ 30 NONAME ABSENT
+ ?NextL@CApaScanningControlFinder@@UAEHAAVTApaAppEntry@@@Z @ 31 NONAME ABSENT
+ ?TempPath@CApaScanningControlFinder@@UBE?AV?$TBuf@$0BAA@@@XZ @ 32 NONAME ABSENT
+ ?SetEcomRecognizerL@CApaScanningFileRecognizer@@QAEXABVRRecognizer@1@@Z @ 33 NONAME ABSENT
+ ?SetEcomRecognizersFromListL@CApaScanningFileRecognizer@@QAEXABV?$CArrayFixFlat@VRRecognizer@CApaScanningFileRecognizer@@@@@Z @ 34 NONAME ABSENT
+ ?FindAllAppsL@CApaAppRegFinder@@QAEXXZ @ 35 NONAME ABSENT ; void CApaAppRegFinder::FindAllAppsL(void)
+ ?FindAppL@CApaAppRegFinder@@QAE?AV?$TBuf@$0BAA@@@ABVTDesC16@@VTUid@@@Z @ 36 NONAME ABSENT ; class TBuf<256> CApaAppRegFinder::FindAppL(class TDesC16 const &, class TUid)
+ ?NewL@CApaAppRegFinder@@SAPAV1@ABVRFs@@@Z @ 37 NONAME ABSENT ; class CApaAppRegFinder * CApaAppRegFinder::NewL(class RFs const &)
+ ?NewLC@CApaAppRegFinder@@SAPAV1@ABVRFs@@@Z @ 38 NONAME ABSENT ; class CApaAppRegFinder * CApaAppRegFinder::NewLC(class RFs const &)
+ ?NextL@CApaAppRegFinder@@QAEHAAVTApaAppEntry@@ABV?$RPointerArray@VHBufC16@@@@@Z @ 39 NONAME ABSENT ; int CApaAppRegFinder::NextL(class TApaAppEntry &, class RPointerArray<class HBufC16> const &)
+ ?TempPath@CApaAppRegFinder@@UBE?AV?$TBuf@$0BAA@@@XZ @ 40 NONAME ABSENT ; class TBuf<256> CApaAppRegFinder::TempPath(void) const
+ ??1CAppLaunchChecker@@UAE@XZ @ 41 NONAME ; CAppLaunchChecker::~CAppLaunchChecker(void)
+ ??ACApaScanningRuleBasedPlugIns@@QBEPAVCAppLaunchChecker@@H@Z @ 42 NONAME ; class CAppLaunchChecker * CApaScanningRuleBasedPlugIns::operator[](int) const
+ ??1CApaScanningRuleBasedPlugIns@@UAE@XZ @ 43 NONAME ; CApaScanningRuleBasedPlugIns::~CApaScanningRuleBasedPlugIns(void)
+ ?NewL@CApaScanningRuleBasedPlugIns@@SAPAV1@XZ @ 44 NONAME ; class CApaScanningRuleBasedPlugIns * CApaScanningRuleBasedPlugIns::NewL(void)
+ ?ScanForRuleBasedPlugInsL@CApaScanningRuleBasedPlugIns@@QAEXXZ @ 45 NONAME ; void CApaScanningRuleBasedPlugIns::ScanForRuleBasedPlugInsL(void)
+ ?ImplementationCount@CApaScanningRuleBasedPlugIns@@QBEHXZ @ 46 NONAME ; int CApaScanningRuleBasedPlugIns::ImplementationCount(void) const
+ ?Reserved_1@CAppLaunchChecker@@EAEXXZ @ 47 NONAME ; void CAppLaunchChecker::Reserved_1(void)
+ ?Reserved_2@CAppLaunchChecker@@EAEXXZ @ 48 NONAME ; void CAppLaunchChecker::Reserved_2(void)
+ ?Reserved_3@CAppLaunchChecker@@EAEXXZ @ 49 NONAME ; void CAppLaunchChecker::Reserved_3(void)
+ ??1CAppSidChecker@@UAE@XZ @ 50 NONAME ABSENT ; CAppSidChecker::~CAppSidChecker(void)
+ ?SetRescanCallBackL@CAppSidChecker@@UAEXABVTCallBack@@@Z @ 51 NONAME ABSENT ; void CAppSidChecker::SetRescanCallBackL(class TCallBack const &)
+ ?reserved1@CAppSidChecker@@EAEXXZ @ 52 NONAME ABSENT ; void CAppSidChecker::reserved1(void)
+ ?reserved2@CAppSidChecker@@EAEXXZ @ 53 NONAME ABSENT ; void CAppSidChecker::reserved2(void)
+ ?reserved3@CAppSidChecker@@EAEXXZ @ 54 NONAME ABSENT ; void CAppSidChecker::reserved3(void)
+ ?DriveList@CApaAppRegFinder@@QBEABV?$RArray@VTDriveUnitInfo@@@@XZ @ 55 NONAME ABSENT ; class RArray<class TDriveUnitInfo> const & CApaAppRegFinder::DriveList(void) const
+ ?FindAllRemovableMediaAppsL@CApaAppRegFinder@@QAEXXZ @ 56 NONAME ABSENT ; void CApaAppRegFinder::FindAllRemovableMediaAppsL(void)
+ ??1CApaAppInstallationMonitor@@UAE@XZ @ 57 NONAME ; CApaAppInstallationMonitor::~CApaAppInstallationMonitor(void)
+ ?NewL@CApaAppInstallationMonitor@@SAPAV1@PAVCApaAppArcServer@@@Z @ 58 NONAME ; class CApaAppInstallationMonitor * CApaAppInstallationMonitor::NewL(class CApaAppArcServer *)
+ ?Start@CApaAppInstallationMonitor@@QAEXXZ @ 59 NONAME ; void CApaAppInstallationMonitor::Start(void)
+ ??1CApfMimeContentPolicy@@UAE@XZ @ 60 NONAME ; CApfMimeContentPolicy::~CApfMimeContentPolicy(void)
+ ?IsClosedExtension@CApfMimeContentPolicy@@QAEHABVTDesC16@@@Z @ 61 NONAME ; int CApfMimeContentPolicy::IsClosedExtension(class TDesC16 const &)
+ ?IsClosedFileL@CApfMimeContentPolicy@@QAEHAAVRFile@@@Z @ 62 NONAME ; int CApfMimeContentPolicy::IsClosedFileL(class RFile &)
+ ?IsClosedFileL@CApfMimeContentPolicy@@QAEHABVTDesC16@@@Z @ 63 NONAME ; int CApfMimeContentPolicy::IsClosedFileL(class TDesC16 const &)
+ ?IsClosedType@CApfMimeContentPolicy@@QAEHABVTDesC16@@@Z @ 64 NONAME ; int CApfMimeContentPolicy::IsClosedType(class TDesC16 const &)
+ ?IsDRMEnvelopeL@CApfMimeContentPolicy@@QAEHAAVRFile@@@Z @ 65 NONAME ; int CApfMimeContentPolicy::IsDRMEnvelopeL(class RFile &)
+ ?IsDRMEnvelopeL@CApfMimeContentPolicy@@QAEHABVTDesC16@@@Z @ 66 NONAME ; int CApfMimeContentPolicy::IsDRMEnvelopeL(class TDesC16 const &)
+ ?NewL@CApfMimeContentPolicy@@SAPAV1@AAVRFs@@@Z @ 67 NONAME ; class CApfMimeContentPolicy * CApfMimeContentPolicy::NewL(class RFs &)
+ ?NewL@CApfMimeContentPolicy@@SAPAV1@XZ @ 68 NONAME ; class CApfMimeContentPolicy * CApfMimeContentPolicy::NewL(void)
+ ?NewLC@CApfMimeContentPolicy@@SAPAV1@AAVRFs@@@Z @ 69 NONAME ; class CApfMimeContentPolicy * CApfMimeContentPolicy::NewLC(class RFs &)
+ ?NewLC@CApfMimeContentPolicy@@SAPAV1@XZ @ 70 NONAME ; class CApfMimeContentPolicy * CApfMimeContentPolicy::NewLC(void)
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/bwins/apgrfx_legacyu.def Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,344 @@
+EXPORTS
+ ??0RApaLsSession@@QAE@XZ @ 1 NONAME ; public: __thiscall RApaLsSession::RApaLsSession(void)
+ ??0TApaPictureFactory@@QAE@PAVCApaProcess@@@Z @ 2 NONAME ; public: __thiscall TApaPictureFactory::TApaPictureFactory(class CApaProcess *)
+ ??0TApaTask@@QAE@AAVRWsSession@@@Z @ 3 NONAME ; public: __thiscall TApaTask::TApaTask(class RWsSession &)
+ ??0TApaTaskList@@QAE@AAVRWsSession@@@Z @ 4 NONAME ; public: __thiscall TApaTaskList::TApaTaskList(class RWsSession &)
+ ??1CApaAppInfoFileReader@@UAE@XZ @ 5 NONAME ABSENT ; public: virtual __thiscall CApaAppInfoFileReader::~CApaAppInfoFileReader(void)
+ ??1CApaAppInfoFileWriter@@UAE@XZ @ 6 NONAME ABSENT ; public: virtual __thiscall CApaAppInfoFileWriter::~CApaAppInfoFileWriter(void)
+ ??1CApaAppList@@UAE@XZ @ 7 NONAME ABSENT ; public: virtual __thiscall CApaAppList::~CApaAppList(void)
+ ??1CApaDoor@@UAE@XZ @ 8 NONAME ; public: virtual __thiscall CApaDoor::~CApaDoor(void)
+ ??1CApaMaskedBitmap@@UAE@XZ @ 9 NONAME ; public: virtual __thiscall CApaMaskedBitmap::~CApaMaskedBitmap(void)
+ ??1CApaWindowGroupName@@UAE@XZ @ 10 NONAME ; public: virtual __thiscall CApaWindowGroupName::~CApaWindowGroupName(void)
+ ?AddCaptionL@CApaAppInfoFileWriter@@QAEXW4TLanguage@@ABVTDesC16@@@Z @ 11 NONAME ABSENT ; public: void __thiscall CApaAppInfoFileWriter::AddCaptionL(enum TLanguage,class TDesC16 const &)
+ ?AddIconL@CApaAppInfoFileWriter@@QAEXAAVCApaMaskedBitmap@@@Z @ 12 NONAME ABSENT ; public: void __thiscall CApaAppInfoFileWriter::AddIconL(class CApaMaskedBitmap &)
+ ?AddIconL@CApaAppInfoFileWriter@@QAEXABVTDesC16@@@Z @ 13 NONAME ABSENT ; public: void __thiscall CApaAppInfoFileWriter::AddIconL(class TDesC16 const &)
+ ?AppCount@RApaLsSession@@QBEHAAH@Z @ 14 NONAME ; public: int __thiscall RApaLsSession::AppCount(int &)const
+ ?AppDataByUid@CApaAppList@@QBEPAVCApaAppData@@VTUid@@@Z @ 15 NONAME ABSENT ; public: class CApaAppData * __thiscall CApaAppList::AppDataByUid(class TUid)const
+ ?AppEntry@CApaAppData@@QBE?AVTApaAppEntry@@XZ @ 16 NONAME ABSENT ; public: class TApaAppEntry __thiscall CApaAppData::AppEntry(void)const
+ ?AppUid@CApaWindowGroupName@@QBE?AVTUid@@XZ @ 17 NONAME ; public: class TUid __thiscall CApaWindowGroupName::AppUid(void)const
+ ?AppUidL@CApaDoor@@QBE?AVTUid@@XZ @ 18 NONAME ; public: class TUid __thiscall CApaDoor::AppUidL(void)const
+ ?BringToForeground@TApaTask@@QAEXXZ @ 19 NONAME ; public: void __thiscall TApaTask::BringToForeground(void)
+ ?Capability@CApaAppData@@QBEXAAVTDes8@@@Z @ 20 NONAME ABSENT ; public: void __thiscall CApaAppData::Capability(class TDes8 &)const
+ ?Capability@CApaAppInfoFileReader@@QBEXAAVTDes8@@@Z @ 21 NONAME ABSENT ; public: void __thiscall CApaAppInfoFileReader::Capability(class TDes8 &)const
+ ?Caption@CApaWindowGroupName@@QBE?AVTPtrC16@@XZ @ 22 NONAME ; public: class TPtrC16 __thiscall CApaWindowGroupName::Caption(void)const
+ ?CaptionL@CApaAppInfoFileReader@@QAE?AV?$TBuf@$0BAA@@@W4TLanguage@@@Z @ 23 NONAME ABSENT ; public: class TBuf<256> __thiscall CApaAppInfoFileReader::CaptionL(enum TLanguage)
+ ?Connect@RApaLsSession@@QAEHXZ @ 24 NONAME ; public: int __thiscall RApaLsSession::Connect(void)
+ ?ConstructFromWgIdL@CApaWindowGroupName@@QAEXH@Z @ 25 NONAME ; public: void __thiscall CApaWindowGroupName::ConstructFromWgIdL(int)
+ ?Count@CApaAppList@@QBEHXZ @ 26 NONAME ABSENT ; public: int __thiscall CApaAppList::Count(void)const
+ ?CreateMaskedBitmapL@CApaAppInfoFileReader@@QAEPAVCApaMaskedBitmap@@H@Z @ 27 NONAME ABSENT ; public: class CApaMaskedBitmap * __thiscall CApaAppInfoFileReader::CreateMaskedBitmapL(int)
+ ?CycleTasks@TApaTaskList@@QAEHVTUid@@W4TCycleDirection@1@@Z @ 28 NONAME ; public: int __thiscall TApaTaskList::CycleTasks(class TUid,enum TApaTaskList::TCycleDirection)
+ ?DocName@CApaWindowGroupName@@QBE?AVTPtrC16@@XZ @ 29 NONAME ; public: class TPtrC16 __thiscall CApaWindowGroupName::DocName(void)const
+ ?DocNameIsAFile@CApaWindowGroupName@@QBEHXZ @ 30 NONAME ; public: int __thiscall CApaWindowGroupName::DocNameIsAFile(void)const
+ ?DocumentL@CApaDoor@@QAEPAVCApaDocument@@H@Z @ 31 NONAME ; public: class CApaDocument * __thiscall CApaDoor::DocumentL(int)
+ ?EmbeddableAppCount@RApaLsSession@@QBEHAAH@Z @ 32 NONAME ; public: int __thiscall RApaLsSession::EmbeddableAppCount(int &)const
+ ?EndTask@TApaTask@@QAEXXZ @ 33 NONAME ; public: void __thiscall TApaTask::EndTask(void)
+ ?Exists@TApaTask@@QBEHXZ @ 34 NONAME ; public: int __thiscall TApaTask::Exists(void)const
+ ?ExternalizeL@CApaMaskedBitmap@@QBEXAAVRWriteStream@@@Z @ 35 NONAME ; public: void __thiscall CApaMaskedBitmap::ExternalizeL(class RWriteStream &)const
+ ?FindApp@TApaTaskList@@QAE?AVTApaTask@@ABVTDesC16@@@Z @ 36 NONAME ; public: class TApaTask __thiscall TApaTaskList::FindApp(class TDesC16 const &)
+ ?FindApp@TApaTaskList@@QAE?AVTApaTask@@VTUid@@@Z @ 37 NONAME ; public: class TApaTask __thiscall TApaTaskList::FindApp(class TUid)
+ ?FindByAppUid@CApaWindowGroupName@@SAXVTUid@@AAVRWsSession@@AAH@Z @ 38 NONAME ; public: static void __cdecl CApaWindowGroupName::FindByAppUid(class TUid,class RWsSession &,int &)
+ ?FindByCaption@CApaWindowGroupName@@SAXABVTDesC16@@AAVRWsSession@@AAH@Z @ 39 NONAME ; public: static void __cdecl CApaWindowGroupName::FindByCaption(class TDesC16 const &,class RWsSession &,int &)
+ ?FindByDocName@CApaWindowGroupName@@SAXABVTDesC16@@AAVRWsSession@@AAH@Z @ 40 NONAME ; public: static void __cdecl CApaWindowGroupName::FindByDocName(class TDesC16 const &,class RWsSession &,int &)
+ ?FindByPos@TApaTaskList@@QAE?AVTApaTask@@H@Z @ 41 NONAME ; public: class TApaTask __thiscall TApaTaskList::FindByPos(int)
+ ?FindDoc@TApaTaskList@@QAE?AVTApaTask@@ABVTDesC16@@@Z @ 42 NONAME ; public: class TApaTask __thiscall TApaTaskList::FindDoc(class TDesC16 const &)
+ ?FirstApp@CApaAppList@@QBEPAVCApaAppData@@XZ @ 43 NONAME ABSENT ; public: class CApaAppData * __thiscall CApaAppList::FirstApp(void)const
+ ?GetAllApps@RApaLsSession@@QBEHXZ @ 44 NONAME ; public: int __thiscall RApaLsSession::GetAllApps(void)const
+ ?GetAppCapability@RApaLsSession@@QBEHAAVTDes8@@VTUid@@@Z @ 45 NONAME ; public: int __thiscall RApaLsSession::GetAppCapability(class TDes8 &,class TUid)const
+ ?GetAppInfo@RApaLsSession@@QBEHAAVTApaAppInfo@@VTUid@@@Z @ 46 NONAME ; public: int __thiscall RApaLsSession::GetAppInfo(class TApaAppInfo &,class TUid)const
+ ?GetEmbeddableApps@RApaLsSession@@QBEHXZ @ 47 NONAME ; public: int __thiscall RApaLsSession::GetEmbeddableApps(void)const
+ ?GetNextApp@RApaLsSession@@QBEHAAVTApaAppInfo@@@Z @ 48 NONAME ; public: int __thiscall RApaLsSession::GetNextApp(class TApaAppInfo &)const
+ ?InternalizeL@CApaMaskedBitmap@@QAEXAAVRReadStream@@@Z @ 49 NONAME ; public: void __thiscall CApaMaskedBitmap::InternalizeL(class RReadStream &)
+ ?IsBusy@CApaWindowGroupName@@QBEHXZ @ 50 NONAME ; public: int __thiscall CApaWindowGroupName::IsBusy(void)const
+ ?IsSystem@CApaWindowGroupName@@QBEHXZ @ 51 NONAME ; public: int __thiscall CApaWindowGroupName::IsSystem(void)const
+ ?KillTask@TApaTask@@QAEXXZ @ 52 NONAME ; public: void __thiscall TApaTask::KillTask(void)
+ ?Mask@CApaMaskedBitmap@@QBEPAVCFbsBitmap@@XZ @ 53 NONAME ; public: class CFbsBitmap * __thiscall CApaMaskedBitmap::Mask(void)const
+ ?New@CApaWindowGroupName@@SAPAV1@ABVRWsSession@@PAVHBufC16@@@Z @ 54 NONAME ; public: static class CApaWindowGroupName * __cdecl CApaWindowGroupName::New(class RWsSession const &,class HBufC16 *)
+ ?NewL@CApaAppInfoFileReader@@SAPAV1@AAVRFs@@ABVTDesC16@@VTUid@@@Z @ 55 NONAME ABSENT ; public: static class CApaAppInfoFileReader * __cdecl CApaAppInfoFileReader::NewL(class RFs &,class TDesC16 const &,class TUid)
+ ?NewL@CApaAppList@@SAPAV1@AAVRFs@@PAVCApaAppRegFinder@@HH@Z @ 56 NONAME ABSENT ; class CApaAppList * CApaAppList::NewL(class RFs &, class CApaAppRegFinder *, int, int)
+ ?NewL@CApaDoor@@SAPAV1@AAVRFs@@AAVCApaDocument@@ABVTSize@@@Z @ 57 NONAME ; public: static class CApaDoor * __cdecl CApaDoor::NewL(class RFs &,class CApaDocument &,class TSize const &)
+ ?NewL@CApaDoor@@SAPAV1@AAVRFs@@ABVCStreamStore@@VTStreamId@@AAVCApaProcess@@@Z @ 58 NONAME ; public: static class CApaDoor * __cdecl CApaDoor::NewL(class RFs &,class CStreamStore const &,class TStreamId,class CApaProcess &)
+ ?NewL@CApaMaskedBitmap@@SAPAV1@PBV1@@Z @ 59 NONAME ; class CApaMaskedBitmap * CApaMaskedBitmap::NewL(class CApaMaskedBitmap const *)
+ ?NewL@CApaWindowGroupName@@SAPAV1@ABVRWsSession@@@Z @ 60 NONAME ; public: static class CApaWindowGroupName * __cdecl CApaWindowGroupName::NewL(class RWsSession const &)
+ ?NewL@CApaWindowGroupName@@SAPAV1@ABVRWsSession@@ABVTDesC16@@@Z @ 61 NONAME ; public: static class CApaWindowGroupName * __cdecl CApaWindowGroupName::NewL(class RWsSession const &,class TDesC16 const &)
+ ?NewL@CApaWindowGroupName@@SAPAV1@ABVRWsSession@@H@Z @ 62 NONAME ; public: static class CApaWindowGroupName * __cdecl CApaWindowGroupName::NewL(class RWsSession const &,int)
+ ?NewLC@CApaAppInfoFileReader@@SAPAV1@AAVRFs@@ABVTDesC16@@VTUid@@@Z @ 63 NONAME ABSENT ; public: static class CApaAppInfoFileReader * __cdecl CApaAppInfoFileReader::NewLC(class RFs &,class TDesC16 const &,class TUid)
+ ?NewLC@CApaAppInfoFileWriter@@SAPAV1@AAVRFs@@ABVTDesC16@@VTUid@@@Z @ 64 NONAME ABSENT ; public: static class CApaAppInfoFileWriter * __cdecl CApaAppInfoFileWriter::NewLC(class RFs &,class TDesC16 const &,class TUid)
+ ?NewLC@CApaDoor@@SAPAV1@AAVRFs@@AAVCApaDocument@@ABVTSize@@@Z @ 65 NONAME ; public: static class CApaDoor * __cdecl CApaDoor::NewLC(class RFs &,class CApaDocument &,class TSize const &)
+ ?NewLC@CApaMaskedBitmap@@SAPAV1@XZ @ 66 NONAME ; public: static class CApaMaskedBitmap * __cdecl CApaMaskedBitmap::NewLC(void)
+ ?NewLC@CApaWindowGroupName@@SAPAV1@ABVRWsSession@@@Z @ 67 NONAME ; public: static class CApaWindowGroupName * __cdecl CApaWindowGroupName::NewLC(class RWsSession const &)
+ ?NewLC@CApaWindowGroupName@@SAPAV1@ABVRWsSession@@ABVTDesC16@@@Z @ 68 NONAME ; public: static class CApaWindowGroupName * __cdecl CApaWindowGroupName::NewLC(class RWsSession const &,class TDesC16 const &)
+ ?NewLC@CApaWindowGroupName@@SAPAV1@ABVRWsSession@@H@Z @ 69 NONAME ; public: static class CApaWindowGroupName * __cdecl CApaWindowGroupName::NewLC(class RWsSession const &,int)
+ ?NewPictureL@TApaPictureFactory@@UBEXAAVTPictureHeader@@ABVCStreamStore@@@Z @ 70 NONAME ; public: virtual void __thiscall TApaPictureFactory::NewPictureL(class TPictureHeader &,class CStreamStore const &)const
+ ?NextApp@CApaAppList@@QBEPAVCApaAppData@@PBV2@@Z @ 71 NONAME ABSENT ; public: class CApaAppData * __thiscall CApaAppList::NextApp(class CApaAppData const *)const
+ ?PurgeL@CApaAppList@@QAEXXZ @ 72 NONAME ABSENT ; public: void __thiscall CApaAppList::PurgeL(void)
+ ?RespondsToShutdownEvent@CApaWindowGroupName@@QBEHXZ @ 73 NONAME ; public: int __thiscall CApaWindowGroupName::RespondsToShutdownEvent(void)const
+ ?RespondsToSwitchFilesEvent@CApaWindowGroupName@@QBEHXZ @ 74 NONAME ; public: int __thiscall CApaWindowGroupName::RespondsToSwitchFilesEvent(void)const
+ ?RestoreL@CApaDoor@@QAEXABVCStreamStore@@VTStreamId@@@Z @ 75 NONAME ; public: void __thiscall CApaDoor::RestoreL(class CStreamStore const &,class TStreamId)
+ ?SendKey@TApaTask@@QAEXABUTKeyEvent@@@Z @ 76 NONAME ; public: void __thiscall TApaTask::SendKey(struct TKeyEvent const &)
+ ?SendKey@TApaTask@@QAEXHH@Z @ 77 NONAME ; public: void __thiscall TApaTask::SendKey(int,int)
+ ?SendMessage@TApaTask@@QAEHVTUid@@ABVTDesC8@@@Z @ 78 NONAME ; public: int __thiscall TApaTask::SendMessage(class TUid,class TDesC8 const &)
+ ?SendSystemEvent@TApaTask@@QAEXW4TApaSystemEvent@@@Z @ 79 NONAME ; public: void __thiscall TApaTask::SendSystemEvent(enum TApaSystemEvent)
+ ?SendToBackground@TApaTask@@QAEXXZ @ 80 NONAME ; public: void __thiscall TApaTask::SendToBackground(void)
+ ?SetAppUid@CApaWindowGroupName@@QAEXVTUid@@@Z @ 81 NONAME ; public: void __thiscall CApaWindowGroupName::SetAppUid(class TUid)
+ ?SetBusy@CApaWindowGroupName@@QAEXH@Z @ 82 NONAME ; public: void __thiscall CApaWindowGroupName::SetBusy(int)
+ ?SetCapability@CApaAppInfoFileWriter@@QAEHABVTDesC8@@@Z @ 83 NONAME ABSENT ; public: int __thiscall CApaAppInfoFileWriter::SetCapability(class TDesC8 const &)
+ ?SetCaptionL@CApaWindowGroupName@@QAEXABVTDesC16@@@Z @ 84 NONAME ; public: void __thiscall CApaWindowGroupName::SetCaptionL(class TDesC16 const &)
+ ?SetDocNameIsAFile@CApaWindowGroupName@@QAEXH@Z @ 85 NONAME ; public: void __thiscall CApaWindowGroupName::SetDocNameIsAFile(int)
+ ?SetDocNameL@CApaWindowGroupName@@QAEXABVTDesC16@@@Z @ 86 NONAME ; public: void __thiscall CApaWindowGroupName::SetDocNameL(class TDesC16 const &)
+ ?SetFormatToGlassL@CApaDoor@@QAEXXZ @ 87 NONAME ; public: void __thiscall CApaDoor::SetFormatToGlassL(void)
+ ?SetFormatToIconL@CApaDoor@@QAEXXZ @ 88 NONAME ; public: void __thiscall CApaDoor::SetFormatToIconL(void)
+ ?SetFormatToTemporaryIconL@CApaDoor@@QAEXH@Z @ 89 NONAME ; public: void __thiscall CApaDoor::SetFormatToTemporaryIconL(int)
+ ?SetRespondsToShutdownEvent@CApaWindowGroupName@@QAEXH@Z @ 90 NONAME ; public: void __thiscall CApaWindowGroupName::SetRespondsToShutdownEvent(int)
+ ?SetRespondsToSwitchFilesEvent@CApaWindowGroupName@@QAEXH@Z @ 91 NONAME ; public: void __thiscall CApaWindowGroupName::SetRespondsToSwitchFilesEvent(int)
+ ?SetSystem@CApaWindowGroupName@@QAEXH@Z @ 92 NONAME ; public: void __thiscall CApaWindowGroupName::SetSystem(int)
+ ?SetWgId@TApaTask@@QAEXH@Z @ 93 NONAME ; public: void __thiscall TApaTask::SetWgId(int)
+ ?SetWindowGroupName@CApaWindowGroupName@@QAEXPAVHBufC16@@@Z @ 94 NONAME ; public: void __thiscall CApaWindowGroupName::SetWindowGroupName(class HBufC16 *)
+ ?SetWindowGroupName@CApaWindowGroupName@@QBEHAAVRWindowGroup@@@Z @ 95 NONAME ; public: int __thiscall CApaWindowGroupName::SetWindowGroupName(class RWindowGroup &)const
+ ?SetWindowGroupNameL@CApaWindowGroupName@@QAEXABVTDesC16@@@Z @ 96 NONAME ; public: void __thiscall CApaWindowGroupName::SetWindowGroupNameL(class TDesC16 const &)
+ ?StartApp@RApaLsSession@@QAEHABVCApaCommandLine@@@Z @ 97 NONAME ; public: int __thiscall RApaLsSession::StartApp(class CApaCommandLine const &)
+ ?StoreL@CApaAppInfoFileWriter@@QAEXXZ @ 98 NONAME ABSENT ; public: void __thiscall CApaAppInfoFileWriter::StoreL(void)
+ ?StretchDrawL@CApaAppInfoFileReader@@SAXPAVCFbsBitmap@@0VTSize@@@Z @ 99 NONAME ABSENT ; public: static void __cdecl CApaAppInfoFileReader::StretchDrawL(class CFbsBitmap *,class CFbsBitmap *,class TSize)
+ ?SwitchCreateFile@TApaTask@@QAEHABVTDesC16@@@Z @ 100 NONAME ; public: int __thiscall TApaTask::SwitchCreateFile(class TDesC16 const &)
+ ?SwitchOpenFile@TApaTask@@QAEHABVTDesC16@@@Z @ 101 NONAME ; public: int __thiscall TApaTask::SwitchOpenFile(class TDesC16 const &)
+ ?ThreadId@TApaTask@@QBE?AVTThreadId@@XZ @ 102 NONAME ; public: class TThreadId __thiscall TApaTask::ThreadId(void)const
+ ?UpdateCounter@CApaAppList@@QBEHXZ @ 103 NONAME ABSENT ; public: int __thiscall CApaAppList::UpdateCounter(void)const
+ ?UpdateL@CApaAppList@@QAEXXZ @ 104 NONAME ABSENT ; public: void __thiscall CApaAppList::UpdateL(void)
+ ?Version@RApaLsSession@@QBE?AVTVersion@@XZ @ 105 NONAME ; public: class TVersion __thiscall RApaLsSession::Version(void)const
+ ?WgId@TApaTask@@QBEHXZ @ 106 NONAME ; public: int __thiscall TApaTask::WgId(void)const
+ ?WindowGroupName@CApaWindowGroupName@@QBE?AVTPtrC16@@XZ @ 107 NONAME ; public: class TPtrC16 __thiscall CApaWindowGroupName::WindowGroupName(void)const
+ ??1CApaSystemControlList@@UAE@XZ @ 108 NONAME ; public: virtual __thiscall CApaSystemControlList::~CApaSystemControlList(void)
+ ?Caption@CApaSystemControl@@QBE?AVTPtrC16@@XZ @ 109 NONAME ; public: class TPtrC16 __thiscall CApaSystemControl::Caption(void)const
+ ?Control@CApaSystemControlList@@QBEPAVCApaSystemControl@@H@Z @ 110 NONAME ; public: class CApaSystemControl * __thiscall CApaSystemControlList::Control(int)const
+ ?Control@CApaSystemControlList@@QBEPAVCApaSystemControl@@VTUid@@@Z @ 111 NONAME ; public: class CApaSystemControl * __thiscall CApaSystemControlList::Control(class TUid)const
+ ?Count@CApaSystemControlList@@QBEHXZ @ 112 NONAME ; public: int __thiscall CApaSystemControlList::Count(void)const
+ ?CreateL@CApaSystemControl@@QAEXXZ @ 113 NONAME ; public: void __thiscall CApaSystemControl::CreateL(void)
+ ?FileName@CApaSystemControl@@QBE?AV?$TBuf@$0BAA@@@XZ @ 114 NONAME ; public: class TBuf<256> __thiscall CApaSystemControl::FileName(void)const
+ ?Icon@CApaSystemControl@@QBEPAVCApaMaskedBitmap@@XZ @ 115 NONAME ; public: class CApaMaskedBitmap * __thiscall CApaSystemControl::Icon(void)const
+ ?Index@CApaSystemControlList@@QBEHVTUid@@@Z @ 116 NONAME ; public: int __thiscall CApaSystemControlList::Index(class TUid)const
+ ?NewL@CApaSystemControlList@@SAPAV1@AAVRFs@@AAVCApaAppFinder@@ABVTDesC16@@@Z @ 117 NONAME ABSENT ; public: static class CApaSystemControlList * __cdecl CApaSystemControlList::NewL(class RFs &,class CApaAppFinder &,class TDesC16 const &)
+ ?Type@CApaSystemControl@@QBE?AVTUid@@XZ @ 118 NONAME ; public: class TUid __thiscall CApaSystemControl::Type(void)const
+ ?UpdateL@CApaSystemControlList@@QAEXXZ @ 119 NONAME ; public: void __thiscall CApaSystemControlList::UpdateL(void)
+ ?AddDataTypeL@CApaAppInfoFileWriter@@QAEXABVTDataTypeWithPriority@@@Z @ 120 NONAME ABSENT ; public: void __thiscall CApaAppInfoFileWriter::AddDataTypeL(class TDataTypeWithPriority const &)
+ ?AppForDataType@RApaLsSession@@QBEHABVTDataType@@AAVTUid@@@Z @ 121 NONAME ; public: int __thiscall RApaLsSession::AppForDataType(class TDataType const &,class TUid &)const
+ ?AppForDocument@RApaLsSession@@QBEHABVTDesC16@@AAVTUid@@AAVTDataType@@@Z @ 122 NONAME ; public: int __thiscall RApaLsSession::AppForDocument(class TDesC16 const &,class TUid &,class TDataType &)const
+ ?CreateDocument@RApaLsSession@@QAEHABVTDesC16@@VTUid@@AAVTThreadId@@W4TLaunchType@1@@Z @ 123 NONAME ; public: int __thiscall RApaLsSession::CreateDocument(class TDesC16 const &,class TUid,class TThreadId &,enum RApaLsSession::TLaunchType)
+ ?DataType@CApaAppData@@QBEJABVTDataType@@@Z @ 124 NONAME ABSENT ; long CApaAppData::DataType(class TDataType const &) const
+ ?DataTypesSupportedL@CApaAppInfoFileReader@@QBEXAAV?$CArrayFix@VTDataTypeWithPriority@@@@@Z @ 125 NONAME ABSENT ; public: void __thiscall CApaAppInfoFileReader::DataTypesSupportedL(class CArrayFix<class TDataTypeWithPriority> &)const
+ ?GetAcceptedConfidence@RApaLsSession@@QBEHAAH@Z @ 126 NONAME ; public: int __thiscall RApaLsSession::GetAcceptedConfidence(int &)const
+ ?GetAppIcon@RApaLsSession@@QBEHVTUid@@HAAVCApaMaskedBitmap@@@Z @ 127 NONAME ; public: int __thiscall RApaLsSession::GetAppIcon(class TUid,int,class CApaMaskedBitmap &)const
+ ?GetMaxDataBufSize@RApaLsSession@@QBEHAAH@Z @ 128 NONAME ; public: int __thiscall RApaLsSession::GetMaxDataBufSize(int &)const
+ ?GetSupportedDataTypesL@RApaLsSession@@QBEHAAV?$CArrayFixFlat@VTDataType@@@@@Z @ 129 NONAME ; public: int __thiscall RApaLsSession::GetSupportedDataTypesL(class CArrayFixFlat<class TDataType> &)const
+ ?IsProgram@RApaLsSession@@QBEHABVTDesC16@@AAH@Z @ 130 NONAME ; public: int __thiscall RApaLsSession::IsProgram(class TDesC16 const &,int &)const
+ ?PreferredDataHandlerL@CApaAppList@@QBE?AVTUid@@ABVTDataType@@@Z @ 131 NONAME ABSENT ; public: class TUid __thiscall CApaAppList::PreferredDataHandlerL(class TDataType const &)const
+ ?RecognizeData@RApaLsSession@@QBEHABVTDesC16@@ABVTDesC8@@AAVTDataRecognitionResult@@@Z @ 132 NONAME ; public: int __thiscall RApaLsSession::RecognizeData(class TDesC16 const &,class TDesC8 const &,class TDataRecognitionResult &)const
+ ?RecognizeSpecificData@RApaLsSession@@QBEHABVTDesC16@@ABVTDesC8@@ABVTDataType@@AAH@Z @ 133 NONAME ; public: int __thiscall RApaLsSession::RecognizeSpecificData(class TDesC16 const &,class TDesC8 const &,class TDataType const &,int &)const
+ ?SetAcceptedConfidence@RApaLsSession@@QAEHH@Z @ 134 NONAME ; public: int __thiscall RApaLsSession::SetAcceptedConfidence(int)
+ ?SetMaxDataBufSize@RApaLsSession@@QAEHH@Z @ 135 NONAME ; public: int __thiscall RApaLsSession::SetMaxDataBufSize(int)
+ ?StartDocument@RApaLsSession@@QAEHABVTDesC16@@AAVTThreadId@@W4TLaunchType@1@@Z @ 136 NONAME ; public: int __thiscall RApaLsSession::StartDocument(class TDesC16 const &,class TThreadId &,enum RApaLsSession::TLaunchType)
+ ?StartDocument@RApaLsSession@@QAEHABVTDesC16@@ABVTDataType@@AAVTThreadId@@W4TLaunchType@1@@Z @ 137 NONAME ; public: int __thiscall RApaLsSession::StartDocument(class TDesC16 const &,class TDataType const &,class TThreadId &,enum RApaLsSession::TLaunchType)
+ ?StartDocument@RApaLsSession@@QAEHABVTDesC16@@VTUid@@AAVTThreadId@@W4TLaunchType@1@@Z @ 138 NONAME ; public: int __thiscall RApaLsSession::StartDocument(class TDesC16 const &,class TUid,class TThreadId &,enum RApaLsSession::TLaunchType)
+ ?StartIdleUpdateL@CApaAppList@@QAEXXZ @ 139 NONAME ABSENT ; public: void __thiscall CApaAppList::StartIdleUpdateL(void)
+ ??1CApaAppListNotifier@@UAE@XZ @ 140 NONAME ; public: virtual __thiscall CApaAppListNotifier::~CApaAppListNotifier(void)
+ ?NewL@CApaAppListNotifier@@SAPAV1@PAVMApaAppListServObserver@@W4TPriority@CActive@@@Z @ 141 NONAME ; public: static class CApaAppListNotifier * __cdecl CApaAppListNotifier::NewL(class MApaAppListServObserver *,enum CActive::TPriority)
+ ?StartIdleUpdateL@CApaAppList@@QAEXPAVMApaAppListObserver@@@Z @ 142 NONAME ABSENT ; public: void __thiscall CApaAppList::StartIdleUpdateL(class MApaAppListObserver *)
+ ?GetAppIcon@RApaLsSession@@QBEHVTUid@@VTSize@@AAVCApaMaskedBitmap@@@Z @ 143 NONAME ; public: int __thiscall RApaLsSession::GetAppIcon(class TUid,class TSize,class CApaMaskedBitmap &)const
+ ?GetAppIconSizes@RApaLsSession@@QBEHVTUid@@AAV?$CArrayFixFlat@VTSize@@@@@Z @ 144 NONAME ; public: int __thiscall RApaLsSession::GetAppIconSizes(class TUid,class CArrayFixFlat<class TSize> &)const
+ ?Icon@CApaAppData@@QBEPAVCApaMaskedBitmap@@VTSize@@@Z @ 145 NONAME ABSENT ; public: class CApaMaskedBitmap * __thiscall CApaAppData::Icon(class TSize)const
+ ?IconSizesL@CApaAppData@@QBEPAV?$CArrayFixFlat@VTSize@@@@XZ @ 146 NONAME ABSENT ; public: class CArrayFixFlat<class TSize> * __thiscall CApaAppData::IconSizesL(void)const
+ ?Icon@CApaAppData@@QBEPAVCApaMaskedBitmap@@H@Z @ 147 NONAME ABSENT ; public: class CApaMaskedBitmap * __thiscall CApaAppData::Icon(int)const
+ ?Hidden@CApaWindowGroupName@@QBEHXZ @ 148 NONAME ; int CApaWindowGroupName::Hidden(void) const
+ ?SetHidden@CApaWindowGroupName@@QAEXH@Z @ 149 NONAME ; public: void __thiscall CApaWindowGroupName::SetHidden(int)
+ ?AddViewCaptionL@CApaAppInfoFileWriter@@QAEXW4TLanguage@@ABVTDesC16@@VTUid@@@Z @ 150 NONAME ABSENT ; public: void __thiscall CApaAppInfoFileWriter::AddViewCaptionL(enum TLanguage,class TDesC16 const &,class TUid)
+ ?AddViewIconL@CApaAppInfoFileWriter@@QAEXAAVCApaMaskedBitmap@@VTUid@@@Z @ 151 NONAME ABSENT ; public: void __thiscall CApaAppInfoFileWriter::AddViewIconL(class CApaMaskedBitmap &,class TUid)
+ ?AddViewL@CApaAppInfoFileWriter@@QAEXVTUid@@@Z @ 152 NONAME ABSENT ; public: void __thiscall CApaAppInfoFileWriter::AddViewL(class TUid)
+ ?CaptionL@CApaAIFViewData@@QBE?AV?$TBuf@$0BAA@@@W4TLanguage@@@Z @ 153 NONAME ABSENT ; public: class TBuf<256> __thiscall CApaAIFViewData::CaptionL(enum TLanguage)const
+ ?GetAppViewIcon@RApaLsSession@@QBEHVTUid@@0ABVTSize@@AAVCApaMaskedBitmap@@@Z @ 154 NONAME ; public: int __thiscall RApaLsSession::GetAppViewIcon(class TUid,class TUid,class TSize const &,class CApaMaskedBitmap &)const
+ ?GetAppViews@RApaLsSession@@QBEHAAV?$CArrayFixFlat@VTApaAppViewInfo@@@@VTUid@@@Z @ 155 NONAME ; public: int __thiscall RApaLsSession::GetAppViews(class CArrayFixFlat<class TApaAppViewInfo> &,class TUid)const
+ ?GetViewsL@CApaAppInfoFileReader@@QBEXAAV?$CArrayPtr@VCApaAIFViewData@@@@@Z @ 156 NONAME ABSENT ; public: void __thiscall CApaAppInfoFileReader::GetViewsL(class CArrayPtr<class CApaAIFViewData> &)const
+ ?Icon@CApaAppViewData@@QBEPAVCApaMaskedBitmap@@ABVTSize@@@Z @ 157 NONAME ABSENT ; public: class CApaMaskedBitmap * __thiscall CApaAppViewData::Icon(class TSize const &)const
+ ?IconByIndexL@CApaAIFViewData@@QBEPAVCApaMaskedBitmap@@H@Z @ 158 NONAME ABSENT ; public: class CApaMaskedBitmap * __thiscall CApaAIFViewData::IconByIndexL(int)const
+ ?IconSizesL@CApaAppViewData@@QBEPAV?$CArrayFixFlat@VTSize@@@@XZ @ 159 NONAME ABSENT ; public: class CArrayFixFlat<class TSize> * __thiscall CApaAppViewData::IconSizesL(void)const
+ ?NumberOfIcons@CApaAIFViewData@@QBEHXZ @ 160 NONAME ABSENT ; public: int __thiscall CApaAIFViewData::NumberOfIcons(void)const
+ ?StoreViewL@CApaAppInfoFileWriter@@QAEXVTUid@@@Z @ 161 NONAME ABSENT ; public: void __thiscall CApaAppInfoFileWriter::StoreViewL(class TUid)
+ ?Uid@CApaAppViewData@@QBE?AVTUid@@XZ @ 162 NONAME ABSENT ; public: class TUid __thiscall CApaAppViewData::Uid(void)const
+ ?ViewUid@CApaAIFViewData@@QBE?AVTUid@@XZ @ 163 NONAME ABSENT ; public: class TUid __thiscall CApaAIFViewData::ViewUid(void)const
+ ?Views@CApaAppData@@QBEPAV?$CArrayPtrFlat@VCApaAppViewData@@@@XZ @ 164 NONAME ABSENT ; public: class CArrayPtrFlat<class CApaAppViewData> * __thiscall CApaAppData::Views(void)const
+ ?AddOwnedFileL@CApaAppInfoFileWriter@@QAEXABVTDesC16@@@Z @ 165 NONAME ABSENT ; public: void __thiscall CApaAppInfoFileWriter::AddOwnedFileL(class TDesC16 const &)
+ ?GetOwnedFilesL@CApaAppInfoFileReader@@QBEXAAVCDesC16Array@@@Z @ 166 NONAME ABSENT ; public: void __thiscall CApaAppInfoFileReader::GetOwnedFilesL(class CDesC16Array &)const
+ ?OwnedFiles@CApaAppData@@QBEPAVCDesC16Array@@XZ @ 167 NONAME ABSENT ; public: class CDesC16Array * __thiscall CApaAppData::OwnedFiles(void)const
+ ?GetAppOwnedFiles@RApaLsSession@@QBEHAAVCDesC16Array@@VTUid@@@Z @ 168 NONAME ; public: int __thiscall RApaLsSession::GetAppOwnedFiles(class CDesC16Array &,class TUid)const
+ ?StartApp@RApaLsSession@@QAEHABVCApaCommandLine@@AAVTThreadId@@@Z @ 169 NONAME ; public: int __thiscall RApaLsSession::StartApp(class CApaCommandLine const &,class TThreadId &)
+ ?GetAifFileName@AppInfoFileUtils@@SAXABVRFs@@AAVTDes16@@@Z @ 170 NONAME ABSENT ; public: static void __cdecl AppInfoFileUtils::GetAifFileName(class RFs const &,class TDes16 &)
+ ?AddViewL@CApaAppInfoFileWriter@@QAEXVTUid@@H@Z @ 171 NONAME ABSENT ; public: void __thiscall CApaAppInfoFileWriter::AddViewL(class TUid,int)
+ ?CanUseScreenMode@CApaAppData@@QAEHH@Z @ 172 NONAME ABSENT ; public: int __thiscall CApaAppData::CanUseScreenMode(int)
+ ?FirstApp@CApaAppList@@QBEPAVCApaAppData@@H@Z @ 173 NONAME ABSENT ; public: class CApaAppData * __thiscall CApaAppList::FirstApp(int)const
+ ?GetAllApps@RApaLsSession@@QBEHH@Z @ 174 NONAME ; public: int __thiscall RApaLsSession::GetAllApps(int)const
+ ?GetEmbeddableApps@RApaLsSession@@QBEHH@Z @ 175 NONAME ; public: int __thiscall RApaLsSession::GetEmbeddableApps(int)const
+ ?GetNextApp@RApaLsSession@@QBEHAAVTApaAppInfo@@H@Z @ 176 NONAME ; public: int __thiscall RApaLsSession::GetNextApp(class TApaAppInfo &,int)const
+ ?NextApp@CApaAppList@@QBEPAVCApaAppData@@PBV2@H@Z @ 177 NONAME ABSENT ; public: class CApaAppData * __thiscall CApaAppList::NextApp(class CApaAppData const *,int)const
+ ?ScreenMode@CApaAIFViewData@@QBEHXZ @ 178 NONAME ABSENT ; public: int __thiscall CApaAIFViewData::ScreenMode(void)const
+ ?ScreenMode@CApaAppViewData@@QBEHXZ @ 179 NONAME ABSENT ; public: int __thiscall CApaAppViewData::ScreenMode(void)const
+ ?ShortCaption@CApaSystemControl@@QBE?AVTPtrC16@@XZ @ 180 NONAME ; public: class TPtrC16 __thiscall CApaSystemControl::ShortCaption(void)const
+ ?IsIdleUpdateComplete@CApaAppList@@QBEHXZ @ 181 NONAME ABSENT ; public: int __thiscall CApaAppList::IsIdleUpdateComplete(void)const
+ ?IsAppReady@CApaWindowGroupName@@QBEHXZ @ 182 NONAME ; public: int __thiscall CApaWindowGroupName::IsAppReady(void)const
+ ?SetAppReady@CApaWindowGroupName@@QAEXH@Z @ 183 NONAME ; public: void __thiscall CApaWindowGroupName::SetAppReady(int)
+ ?InitListL@CApaAppList@@QAEXPAVMApaAppListObserver@@@Z @ 184 NONAME ABSENT ; public: void __thiscall CApaAppList::InitListL(class MApaAppListObserver *)
+ ?NumberOfBitmaps@CApaAppInfoFileReader@@QBEHXZ @ 185 NONAME ABSENT ; public: int __thiscall CApaAppInfoFileReader::NumberOfBitmaps(void)const
+ ?IsFirstScanComplete@CApaAppList@@QBEHXZ @ 186 NONAME ABSENT ; public: int __thiscall CApaAppList::IsFirstScanComplete(void)const
+ ?SetMaskBitmap@CApaMaskedBitmap@@QAEXPAVCFbsBitmap@@@Z @ 187 NONAME ; public: void __thiscall CApaMaskedBitmap::SetMaskBitmap(class CFbsBitmap *)
+ ?GetAppInfo_7_0@RApaLsSession@@ABEHAAVTApaAppInfo_7_0@@VTUid@@@Z @ 188 NONAME ABSENT ; int RApaLsSession::GetAppInfo_7_0(class TApaAppInfo_7_0 &, class TUid) const
+ ?GetNextApp_7_0@RApaLsSession@@ABEHAAVTApaAppInfo_7_0@@@Z @ 189 NONAME ABSENT ; int RApaLsSession::GetNextApp_7_0(class TApaAppInfo_7_0 &) const
+ ?GetNextApp_7_0@RApaLsSession@@ABEHAAVTApaAppInfo_7_0@@H@Z @ 190 NONAME ABSENT ; int RApaLsSession::GetNextApp_7_0(class TApaAppInfo_7_0 &, int) const
+ ?GetIconInfo@CApaAppData@@QBEXAAH0@Z @ 191 NONAME ABSENT ; void CApaAppData::GetIconInfo(int &, int &) const
+ ?NumberOfOwnDefinedIcons@RApaLsSession@@QBEHVTUid@@AAH@Z @ 192 NONAME ; public: int __thiscall RApaLsSession::NumberOfOwnDefinedIcons(class TUid,int &)const
+ ?GetFilteredApps@RApaLsSession@@QBEHABVTApaEmbeddabilityFilter@@@Z @ 193 NONAME ; public: int __thiscall RApaLsSession::GetFilteredApps(class TApaEmbeddabilityFilter const &)const
+ ?GetFilteredApps@RApaLsSession@@QBEHABVTApaEmbeddabilityFilter@@H@Z @ 194 NONAME ; public: int __thiscall RApaLsSession::GetFilteredApps(class TApaEmbeddabilityFilter const &,int)const
+ ?NewL@CApaAppList@@SAPAV1@AAVRFs@@PAVCApaAppFinder@@PAVCApaAppRegFinder@@H@Z @ 195 NONAME ABSENT ; class CApaAppList * CApaAppList::NewL(class RFs &, class CApaAppFinder *, class CApaAppRegFinder *, int)
+ ?DefaultScreenNumber@CApaAppData@@QBEIXZ @ 196 NONAME ABSENT ; unsigned int CApaAppData::DefaultScreenNumber(void) const
+ ?GetFilteredApps@RApaLsSession@@QBEHII@Z @ 197 NONAME ; int RApaLsSession::GetFilteredApps(unsigned int, unsigned int) const
+ ?GetFilteredApps@RApaLsSession@@QBEHIIH@Z @ 198 NONAME ; int RApaLsSession::GetFilteredApps(unsigned int, unsigned int, int) const
+ ?RegistrationFileUsed@CApaAppData@@QBEHXZ @ 199 NONAME ABSENT ; int CApaAppData::RegistrationFileUsed(void) const
+ ?GetAppIcon@RApaLsSession@@QBEHVTUid@@AAPAVHBufC16@@@Z @ 200 NONAME ; int RApaLsSession::GetAppIcon(class TUid, class HBufC16 * &) const
+ ?IconFileName@CApaAppData@@QBE?AVTPtrC16@@XZ @ 201 NONAME ABSENT ; class TPtrC16 CApaAppData::IconFileName(void) const
+ ?GetAppViewIcon@RApaLsSession@@QBEHVTUid@@0AAPAVHBufC16@@@Z @ 202 NONAME ; int RApaLsSession::GetAppViewIcon(class TUid, class TUid, class HBufC16 * &) const
+ ?IconFileName@CApaAppViewData@@QBE?AVTPtrC16@@XZ @ 203 NONAME ABSENT ; class TPtrC16 CApaAppViewData::IconFileName(void) const
+ ?NonMbmIconFile@CApaAppData@@QBEHXZ @ 204 NONAME ABSENT ; int CApaAppData::NonMbmIconFile(void) const
+ ?NonMbmIconFile@CApaAppViewData@@QBEHXZ @ 205 NONAME ABSENT ; int CApaAppViewData::NonMbmIconFile(void) const
+ ?StartupApaServer@@YAHAAVMApaAppStarter@@@Z @ 206 NONAME ABSENT ; int StartupApaServer(class MApaAppStarter &)
+ ?StartupApaServerProcess@@YAHXZ @ 207 NONAME ; int StartupApaServerProcess(void)
+ ?DeleteDataMapping@RApaLsSession@@QAEHABVTDataType@@@Z @ 208 NONAME ; int RApaLsSession::DeleteDataMapping(class TDataType const &)
+ ?InsertDataMapping@RApaLsSession@@QAEHABVTDataType@@JVTUid@@@Z @ 209 NONAME ; int RApaLsSession::InsertDataMapping(class TDataType const &, long, class TUid)
+ ?InsertDataMappingIfHigher@RApaLsSession@@QAEHABVTDataType@@JVTUid@@AAH@Z @ 210 NONAME ; int RApaLsSession::InsertDataMappingIfHigher(class TDataType const &, long, class TUid, int &)
+ ?ApplicationLanguage@CApaAppData@@QBE?AW4TLanguage@@XZ @ 211 NONAME ABSENT ; enum TLanguage CApaAppData::ApplicationLanguage(void) const
+ ?ApplicationLanguage@RApaLsSession@@QBEHVTUid@@AAW4TLanguage@@@Z @ 212 NONAME ; int RApaLsSession::ApplicationLanguage(class TUid, enum TLanguage &) const
+ ?NewL@CApaSystemControlList@@SAPAV1@AAVRFs@@@Z @ 213 NONAME ; class CApaSystemControlList * CApaSystemControlList::NewL(class RFs &)
+ ?AppForDataTypeAndService@RApaLsSession@@QBEHABVTDataType@@VTUid@@AAV3@@Z @ 214 NONAME ; int RApaLsSession::AppForDataTypeAndService(class TDataType const &, class TUid, class TUid &) const
+ ?AppForDocumentAndService@RApaLsSession@@QBEHABVRFile@@VTUid@@AAV3@AAVTDataType@@@Z @ 215 NONAME ; int RApaLsSession::AppForDocumentAndService(class RFile const &, class TUid, class TUid &, class TDataType &) const
+ ?AppForDocumentAndService@RApaLsSession@@QBEHABVTDesC16@@VTUid@@AAV3@AAVTDataType@@@Z @ 216 NONAME ; int RApaLsSession::AppForDocumentAndService(class TDesC16 const &, class TUid, class TUid &, class TDataType &) const
+ ?GetAppServiceOpaqueDataLC@RApaLsSession@@QBEPAVCApaAppServiceInfoArray@@VTUid@@0@Z @ 217 NONAME ; class CApaAppServiceInfoArray * RApaLsSession::GetAppServiceOpaqueDataLC(class TUid, class TUid) const
+ ?GetAppServicesL@RApaLsSession@@QBEXVTUid@@AAV?$CArrayFixFlat@VTUid@@@@@Z @ 218 NONAME ; void RApaLsSession::GetAppServicesL(class TUid, class CArrayFixFlat<class TUid> &) const
+ ?GetAppServicesLC@RApaLsSession@@QBEPAVCApaAppServiceInfoArray@@VTUid@@@Z @ 219 NONAME ; class CApaAppServiceInfoArray * RApaLsSession::GetAppServicesLC(class TUid) const
+ ?GetServerApps@RApaLsSession@@QBEHVTUid@@@Z @ 220 NONAME ; int RApaLsSession::GetServerApps(class TUid) const
+ ?GetServerApps@RApaLsSession@@QBEHVTUid@@H@Z @ 221 NONAME ; int RApaLsSession::GetServerApps(class TUid, int) const
+ ?GetServiceImplementationsLC@RApaLsSession@@QBEPAVCApaAppServiceInfoArray@@VTUid@@@Z @ 222 NONAME ; class CApaAppServiceInfoArray * RApaLsSession::GetServiceImplementationsLC(class TUid) const
+ ?ImplementsService@CApaAppData@@QBEHVTUid@@@Z @ 223 NONAME ABSENT ; int CApaAppData::ImplementsService(class TUid) const
+ ?OpaqueData@TApaAppServiceInfo@@QBEABVTDesC8@@XZ @ 224 NONAME ABSENT ; class TDesC8 const & TApaAppServiceInfo::OpaqueData(void) const
+ ?PreferredDataHandlerL@CApaAppList@@QBE?AVTUid@@ABVTDataType@@PBV2@AAH@Z @ 225 NONAME ABSENT ; class TUid CApaAppList::PreferredDataHandlerL(class TDataType const &, class TUid const *, int &) const
+ ?ServiceArrayBufferL@CApaAppList@@QBEPAVCBufFlat@@VTUid@@@Z @ 226 NONAME ABSENT ; class CBufFlat * CApaAppList::ServiceArrayBufferL(class TUid) const
+ ?ServiceImplArrayBufferL@CApaAppList@@QBEPAVCBufFlat@@VTUid@@@Z @ 227 NONAME ABSENT ; class CBufFlat * CApaAppList::ServiceImplArrayBufferL(class TUid) const
+ ?ServiceOpaqueDataBufferL@CApaAppList@@QBEPAVCBufFlat@@VTUid@@0@Z @ 228 NONAME ABSENT ; class CBufFlat * CApaAppList::ServiceOpaqueDataBufferL(class TUid, class TUid) const
+ ?ServiceUidBufferL@CApaAppList@@QBEPAVCBufFlat@@VTUid@@@Z @ 229 NONAME ABSENT ; class CBufFlat * CApaAppList::ServiceUidBufferL(class TUid) const
+ ?Uid@TApaAppServiceInfo@@QBE?AVTUid@@XZ @ 230 NONAME ABSENT ; class TUid TApaAppServiceInfo::Uid(void) const
+ ?StartDocument@RApaLsSession@@QAEHAAVRFile@@AAVTThreadId@@PAVTRequestStatus@@@Z @ 231 NONAME ; int RApaLsSession::StartDocument(class RFile &, class TThreadId &, class TRequestStatus *)
+ ?CreateMaskedBitmapByIndexLC@CApaAppInfoFileReader@@QAEPAVCApaMaskedBitmap@@H@Z @ 232 NONAME ABSENT ; class CApaMaskedBitmap * CApaAppInfoFileReader::CreateMaskedBitmapByIndexLC(int)
+ ?CancelListPopulationCompleteObserver@RApaLsSession@@QBEHXZ @ 233 NONAME ; int RApaLsSession::CancelListPopulationCompleteObserver(void) const
+ ?RegisterListPopulationCompleteObserver@RApaLsSession@@QBEXAAVTRequestStatus@@@Z @ 234 NONAME ; void RApaLsSession::RegisterListPopulationCompleteObserver(class TRequestStatus &) const
+ ?NewInterimFormatFileWriterLC@ForJavaMIDletInstaller@@SAPAVCApaAppInfoFileWriter@@AAVRFs@@ABVTDesC16@@VTUid@@KH@Z @ 235 NONAME ABSENT ; class CApaAppInfoFileWriter * ForJavaMIDletInstaller::NewInterimFormatFileWriterLC(class RFs &, class TDesC16 const &, class TUid, unsigned long, int)
+ ?CheckInterimFormatFileNotCorruptL@ForJavaMIDletInstaller@@SAXAAVRFile@@@Z @ 236 NONAME ABSENT ; void ForJavaMIDletInstaller::CheckInterimFormatFileNotCorruptL(class RFile &)
+ ?RegisterJavaMIDletViaIterimFormat@RApaLsSession@@QAEHABVTDesC16@@AAVRFile@@@Z @ 237 NONAME ABSENT ; int RApaLsSession::RegisterJavaMIDletViaIterimFormat(class TDesC16 const &, class RFile &)
+ ?DeregisterJavaMIDlet@RApaLsSession@@QAEHABVTDesC16@@@Z @ 238 NONAME ABSENT ; int RApaLsSession::DeregisterJavaMIDlet(class TDesC16 const &)
+ ?AppForDocument@RApaLsSession@@QBEHABVRFile@@AAVTUid@@AAVTDataType@@@Z @ 239 NONAME ; int RApaLsSession::AppForDocument(class RFile const &, class TUid &, class TDataType &) const
+ ?ClearFsSession@RApaLsSession@@SAXXZ @ 240 NONAME ; void RApaLsSession::ClearFsSession(void)
+ ?FsSession@RApaLsSession@@SAPAVRFs@@XZ @ 241 NONAME ; class RFs * RApaLsSession::FsSession(void)
+ ?RecognizeData@RApaLsSession@@QBEHABVRFile@@AAVTDataRecognitionResult@@@Z @ 242 NONAME ; int RApaLsSession::RecognizeData(class RFile const &, class TDataRecognitionResult &) const
+ ?RecognizeSpecificData@RApaLsSession@@QBEHABVRFile@@ABVTDataType@@AAH@Z @ 243 NONAME ; int RApaLsSession::RecognizeSpecificData(class RFile const &, class TDataType const &, int &) const
+ ?SetFsSessionL@RApaLsSession@@SAXAAVRFs@@@Z @ 244 NONAME ; void RApaLsSession::SetFsSessionL(class RFs &)
+ ?StartDocument@RApaLsSession@@QAEHAAVRFile@@ABVTDataType@@AAVTThreadId@@PAVTRequestStatus@@@Z @ 245 NONAME ; int RApaLsSession::StartDocument(class RFile &, class TDataType const &, class TThreadId &, class TRequestStatus *)
+ ?StartDocument@RApaLsSession@@QAEHAAVRFile@@VTUid@@AAVTThreadId@@PAVTRequestStatus@@@Z @ 246 NONAME ; int RApaLsSession::StartDocument(class RFile &, class TUid, class TThreadId &, class TRequestStatus *)
+ ?GetPreferredBufSize@RApaLsSession@@QBEHAAH@Z @ 247 NONAME ; public: int __thiscall RApaLsSession::GetPreferredBufSize(int &)const
+ ?GetJavaMIDletInfoL@ForJavaMIDletInstaller@@SAXAAVRFs@@ABVTDesC16@@AAK2@Z @ 248 NONAME ABSENT ; void ForJavaMIDletInstaller::GetJavaMIDletInfoL(class RFs &, class TDesC16 const &, unsigned long &, unsigned long &)
+ ?HandleAsRegistrationFile@ApaUtils@@SAHABVTUidType@@@Z @ 249 NONAME ABSENT ; int ApaUtils::HandleAsRegistrationFile(class TUidType const &)
+ ?DataTypes@TApaAppServiceInfo@@QBEABV?$CArrayFixFlat@VTDataTypeWithPriority@@@@XZ @ 250 NONAME ABSENT ; class CArrayFixFlat<class TDataTypeWithPriority> const & TApaAppServiceInfo::DataTypes(void) const
+ ?GetServiceImplementationsLC@RApaLsSession@@QBEPAVCApaAppServiceInfoArray@@VTUid@@ABVTDataType@@@Z @ 251 NONAME ; class CApaAppServiceInfoArray * RApaLsSession::GetServiceImplementationsLC(class TUid, class TDataType const &) const
+ ?ServiceImplArrayBufferL@CApaAppList@@QBEPAVCBufFlat@@VTUid@@ABVTDataType@@@Z @ 252 NONAME ABSENT ; class CBufFlat * CApaAppList::ServiceImplArrayBufferL(class TUid, class TDataType const &) const
+ ?Close@RApaLsSession@@QAEXXZ @ 253 NONAME ; void RApaLsSession::Close(void)
+ ??0MApaAppListServObserver@@IAE@XZ @ 254 NONAME ; MApaAppListServObserver::MApaAppListServObserver(void)
+ ??0TApaPictureFactory@@IAE@XZ @ 255 NONAME ; TApaPictureFactory::TApaPictureFactory(void)
+ ?MApaAppListServObserver_Reserved1@MApaAppListServObserver@@EAEXXZ @ 256 NONAME ; void MApaAppListServObserver::MApaAppListServObserver_Reserved1(void)
+ ?MApaAppListServObserver_Reserved2@MApaAppListServObserver@@EAEXXZ @ 257 NONAME ; void MApaAppListServObserver::MApaAppListServObserver_Reserved2(void)
+ ?RApaLsSession_Reserved1@RApaLsSession@@EAEXXZ @ 258 NONAME ; void RApaLsSession::RApaLsSession_Reserved1(void)
+ ?RApaLsSession_Reserved2@RApaLsSession@@EAEXXZ @ 259 NONAME ; void RApaLsSession::RApaLsSession_Reserved2(void)
+ ??0CDataRecognitionResultArray@@QAE@XZ @ 260 NONAME ; CDataRecognitionResultArray::CDataRecognitionResultArray(void)
+ ??1CDataRecognitionResultArray@@UAE@XZ @ 261 NONAME ; CDataRecognitionResultArray::~CDataRecognitionResultArray(void)
+ ?CancelRecognizeFiles@RApaLsSession@@QAEXXZ @ 262 NONAME ; void RApaLsSession::CancelRecognizeFiles(void)
+ ?Count@CDataRecognitionResultArray@@QBEIXZ @ 263 NONAME ; unsigned int CDataRecognitionResultArray::Count(void) const
+ ?GetDataRecognitionResultL@CDataRecognitionResultArray@@QBEXAAVTDataRecognitionResult@@I@Z @ 264 NONAME ; void CDataRecognitionResultArray::GetDataRecognitionResultL(class TDataRecognitionResult &, unsigned int) const
+ ?GetFileNameL@CDataRecognitionResultArray@@QBEXAAV?$TBuf@$0BAA@@@I@Z @ 265 NONAME ; void CDataRecognitionResultArray::GetFileNameL(class TBuf<256> &, unsigned int) const
+ ?Path@CDataRecognitionResultArray@@QBEABV?$TBuf@$0BAA@@@XZ @ 266 NONAME ; class TBuf<256> const & CDataRecognitionResultArray::Path(void) const
+ ?RecognizeFilesL@RApaLsSession@@QBEHABVTDesC16@@AAVCDataRecognitionResultArray@@@Z @ 267 NONAME ; int RApaLsSession::RecognizeFilesL(class TDesC16 const &, class CDataRecognitionResultArray &) const
+ ?RecognizeFilesL@RApaLsSession@@QBEHABVTDesC16@@ABVTDesC8@@AAVCDataRecognitionResultArray@@@Z @ 268 NONAME ; int RApaLsSession::RecognizeFilesL(class TDesC16 const &, class TDesC8 const &, class CDataRecognitionResultArray &) const
+ ?RecognizeFilesL@RApaLsSession@@QAEXABVTDesC16@@AAVCDataRecognitionResultArray@@AAVTRequestStatus@@@Z @ 269 NONAME ; void RApaLsSession::RecognizeFilesL(class TDesC16 const &, class CDataRecognitionResultArray &, class TRequestStatus &)
+ ?RecognizeFilesL@RApaLsSession@@QAEXABVTDesC16@@ABVTDesC8@@AAVCDataRecognitionResultArray@@AAVTRequestStatus@@@Z @ 270 NONAME ; void RApaLsSession::RecognizeFilesL(class TDesC16 const &, class TDesC8 const &, class CDataRecognitionResultArray &, class TRequestStatus &)
+ ?InsertDataMapping@RApaLsSession@@QAEHABVTDataType@@JVTUid@@1@Z @ 271 NONAME ; int RApaLsSession::InsertDataMapping(class TDataType const &, long, class TUid, class TUid)
+ ?DeleteDataMapping@RApaLsSession@@QAEHABVTDataType@@VTUid@@@Z @ 272 NONAME ; int RApaLsSession::DeleteDataMapping(class TDataType const &, class TUid)
+ ?GetAppByDataType@RApaLsSession@@QBEHABVTDataType@@VTUid@@AAV3@@Z @ 273 NONAME ; int RApaLsSession::GetAppByDataType(class TDataType const &, class TUid, class TUid &) const
+ ?StartApp@RApaLsSession@@QAEHABVCApaCommandLine@@AAVTThreadId@@PAVTRequestStatus@@@Z @ 274 NONAME ; int RApaLsSession::StartApp(class CApaCommandLine const &, class TThreadId &, class TRequestStatus *)
+ ?RegisterNonNativeApplicationTypeL@RApaLsSession@@QAEXVTUid@@ABVTDesC16@@@Z @ 275 NONAME ; void RApaLsSession::RegisterNonNativeApplicationTypeL(class TUid, class TDesC16 const &)
+ ?DeregisterNonNativeApplicationTypeL@RApaLsSession@@QAEXVTUid@@@Z @ 276 NONAME ; void RApaLsSession::DeregisterNonNativeApplicationTypeL(class TUid)
+ ?RegisterNonNativeApplicationL@RApaLsSession@@QAEXVTUid@@ABVTDriveUnit@@AAVCApaRegistrationResourceFileWriter@@PAVCApaLocalisableResourceFileWriter@@PBVRFile@@@Z @ 277 NONAME ; void RApaLsSession::RegisterNonNativeApplicationL(class TUid, class TDriveUnit const &, class CApaRegistrationResourceFileWriter &, class CApaLocalisableResourceFileWriter *, class RFile const *)
+ ?DeregisterNonNativeApplicationL@RApaLsSession@@QAEXVTUid@@@Z @ 278 NONAME ; void RApaLsSession::DeregisterNonNativeApplicationL(class TUid)
+ ?AppDataByFileName@CApaAppList@@QBEPAVCApaAppData@@ABVTDesC16@@@Z @ 279 NONAME ABSENT ; class CApaAppData* CApaAppList::AppDataByFileName(class TDesC16 const &) const
+ ?LocalisableResourceFileName@CApaAppData@@QBE?AVTPtrC16@@XZ @ 280 NONAME ABSENT ; class TPtrC16 CApaAppData::LocalisableResourceFileName(void) const
+ ?OpaqueData@CApaAppData@@QBE?AVTPtrC8@@XZ @ 281 NONAME ABSENT ; class TPtrC8 CApaAppData::OpaqueData(void) const
+ ?RegistrationFileName@CApaAppData@@QBE?AVTPtrC16@@XZ @ 282 NONAME ABSENT ; class TPtrC16 CApaAppData::RegistrationFileName(void) const
+ ?GetDefaultScreenNumber@RApaLsSession@@QBEHAAHVTUid@@@Z @ 283 NONAME ; int RApaLsSession::GetDefaultScreenNumber(int &, class TUid) const
+ ?FindAndAddSpecificAppL@CApaAppList@@QAEPAVCApaAppData@@PAVCApaAppRegFinder@@VTUid@@@Z @ 284 NONAME ABSENT ; class CApaAppData * CApaAppList::FindAndAddSpecificAppL(class CApaAppRegFinder *, class TUid)
+ ?MatchesSecurityPolicy@RApaLsSession@@QBEHAAHVTUid@@ABVTSecurityPolicy@@@Z @ 285 NONAME ; int RApaLsSession::MatchesSecurityPolicy(int &, class TUid, class TSecurityPolicy const &) const
+ ?AddDataTypeL@CApaRegistrationResourceFileWriter@@QAEXHABVTDesC8@@@Z @ 286 NONAME ; void CApaRegistrationResourceFileWriter::AddDataTypeL(int, class TDesC8 const &)
+ ?AddFileOwnershipInfoL@CApaRegistrationResourceFileWriter@@QAEXABVTDesC16@@@Z @ 287 NONAME ; void CApaRegistrationResourceFileWriter::AddFileOwnershipInfoL(class TDesC16 const &)
+ ?NewL@CApaLocalisableResourceFileWriter@@SAPAV1@ABVTDesC16@@0H0@Z @ 288 NONAME ; class CApaLocalisableResourceFileWriter * CApaLocalisableResourceFileWriter::NewL(class TDesC16 const &, class TDesC16 const &, int, class TDesC16 const &)
+ ?NewL@CApaRegistrationResourceFileWriter@@SAPAV1@VTUid@@ABVTDesC16@@I@Z @ 289 NONAME ; class CApaRegistrationResourceFileWriter * CApaRegistrationResourceFileWriter::NewL(class TUid, class TDesC16 const &, unsigned int)
+ ?NonNativeApplicationType@CApaAppData@@QBE?AVTUid@@XZ @ 290 NONAME ABSENT ; class TUid CApaAppData::NonNativeApplicationType(void) const
+ ?SetAppIsHiddenL@CApaRegistrationResourceFileWriter@@QAEXH@Z @ 291 NONAME ; void CApaRegistrationResourceFileWriter::SetAppIsHiddenL(int)
+ ?SetDefaultScreenNumberL@CApaRegistrationResourceFileWriter@@QAEXH@Z @ 292 NONAME ; void CApaRegistrationResourceFileWriter::SetDefaultScreenNumberL(int)
+ ?SetEmbeddabilityL@CApaRegistrationResourceFileWriter@@QAEXW4TEmbeddability@TApaAppCapability@@@Z @ 293 NONAME ; void CApaRegistrationResourceFileWriter::SetEmbeddabilityL(enum TApaAppCapability::TEmbeddability)
+ ?SetGroupNameL@CApaRegistrationResourceFileWriter@@QAEXABVTDesC16@@@Z @ 294 NONAME ; void CApaRegistrationResourceFileWriter::SetGroupNameL(class TDesC16 const &)
+ ?SetLaunchInBackgroundL@CApaRegistrationResourceFileWriter@@QAEXH@Z @ 295 NONAME ; void CApaRegistrationResourceFileWriter::SetLaunchInBackgroundL(int)
+ ?SetOpaqueDataL@CApaRegistrationResourceFileWriter@@QAEXABVTDesC8@@@Z @ 296 NONAME ; void CApaRegistrationResourceFileWriter::SetOpaqueDataL(class TDesC8 const &)
+ ?SetSupportsNewFileL@CApaRegistrationResourceFileWriter@@QAEXH@Z @ 297 NONAME ; void CApaRegistrationResourceFileWriter::SetSupportsNewFileL(int)
+ ??1CApaLocalisableResourceFileWriter@@UAE@XZ @ 298 NONAME ; CApaLocalisableResourceFileWriter::~CApaLocalisableResourceFileWriter(void)
+ ??1CApaRegistrationResourceFileWriter@@UAE@XZ @ 299 NONAME ; CApaRegistrationResourceFileWriter::~CApaRegistrationResourceFileWriter(void)
+ ?AppScanInProgress@CApaAppList@@QBEHXZ @ 300 NONAME ABSENT ; int CApaAppList::AppScanInProgress(void) const
+ ?CancelNotify@RApaLsSession@@QAEXXZ @ 301 NONAME ; void RApaLsSession::CancelNotify(void)
+ ?SetNotify@RApaLsSession@@QAEXHAAVTRequestStatus@@@Z @ 302 NONAME ; void RApaLsSession::SetNotify(int, class TRequestStatus &)
+ ?CancelNotifyOnDataMappingChange@RApaLsSession@@QAEXXZ @ 303 NONAME ; void RApaLsSession::CancelNotifyOnDataMappingChange(void)
+ ?NotifyOnDataMappingChange@RApaLsSession@@QAEXAAVTRequestStatus@@@Z @ 304 NONAME ; void RApaLsSession::NotifyOnDataMappingChange(class TRequestStatus &)
+ ?GetAppType@RApaLsSession@@QBEHAAVTUid@@V2@@Z @ 305 NONAME ; int RApaLsSession::GetAppType(class TUid &, class TUid) const
+ ?CommitNonNativeApplicationsUpdatesL@RApaLsSession@@QAEXXZ @ 306 NONAME ; void RApaLsSession::CommitNonNativeApplicationsUpdatesL(void)
+ ?PrepareNonNativeApplicationsUpdatesL@RApaLsSession@@QAEXXZ @ 307 NONAME ; void RApaLsSession::PrepareNonNativeApplicationsUpdatesL(void)
+ ?RollbackNonNativeApplicationsUpdates@RApaLsSession@@QAEHXZ @ 308 NONAME ; int RApaLsSession::RollbackNonNativeApplicationsUpdates(void)
+ ?SetUpdatedAppsList@CApaAppList@@QAEXPAVCUpdatedAppsList@@@Z @ 309 NONAME ABSENT ; void CApaAppList::SetUpdatedAppsList(class CUpdatedAppsList *)
+ ?UpdatedAppsList@CApaAppList@@QAEPAVCUpdatedAppsList@@XZ @ 310 NONAME ABSENT ; class CUpdatedAppsList * CApaAppList::UpdatedAppsList(void)
+ ??1CApaAppData@@UAE@XZ @ 311 NONAME ABSENT ; CApaAppData::~CApaAppData(void)
+ ?NewL@CApaAppData@@SAPAV1@ABVTApaAppEntry@@AAVRFs@@@Z @ 312 NONAME ABSENT ; class CApaAppData * CApaAppData::NewL(class TApaAppEntry const &, class RFs &)
+ ?Self@CApaAppList@@SAPAV1@XZ @ 313 NONAME ABSENT ; class CApaAppList * CApaAppList::Self(void)
+ ?ShareProtectedFileServer@CApaAppList@@QAEAAVRFs@@XZ @ 314 NONAME ABSENT ; class RFs & CApaAppList::ShareProtectedFileServer(void)
+ X @ 315 NONAME ABSENT ; Old @internalComponent function that never needed to be exported
+ X @ 316 NONAME ABSENT ; Old @internalComponent function that never needed to be exported
+ X @ 317 NONAME ABSENT ; Old @internalComponent function that never needed to be exported
+ X @ 318 NONAME ABSENT ; Old @internalComponent function that never needed to be exported
+ ?SetAppShortCaption@RApaLsSession@@QAEHABVTDesC16@@W4TLanguage@@VTUid@@@Z @ 319 NONAME ; int RApaLsSession::SetAppShortCaption(class TDesC16 const &, enum TLanguage, class TUid)
+ ?SetShortCaptionL@CApaAppData@@QAEXABVTDesC16@@@Z @ 320 NONAME ABSENT ; void CApaAppData::SetShortCaptionL(class TDesC16 const &)
+ ?ForceRegistration@RApaLsSession@@QAEHABV?$RPointerArray@VTDesC16@@@@@Z @ 321 NONAME ; int RApaLsSession::ForceRegistration(class RPointerArray<class TDesC16> const &)
+ ?AddForcedRegistrationL@CApaAppList@@QAEXPAVHBufC16@@@Z @ 322 NONAME ABSENT ; void CApaAppList::AddForcedRegistrationL(class HBufC16 *)
+ ?CompareStrings@CApaAppList@@SAHABVHBufC16@@0@Z @ 323 NONAME ABSENT ; int CApaAppList::CompareStrings(class HBufC16 const &, class HBufC16 const &)
+ ?ResetForcedRegistrations@CApaAppList@@QAEXXZ @ 324 NONAME ABSENT ; void CApaAppList::ResetForcedRegistrations(void)
+ ?RestartScanL@CApaAppList@@QAEXXZ @ 325 NONAME ABSENT ; void CApaAppList::RestartScanL(void)
+ ?StopScan@CApaAppList@@QAEXXZ @ 326 NONAME ABSENT ; void CApaAppList::StopScan(void)
+ ?MinApplicationStackSize@@YAIXZ @ 327 NONAME ; unsigned int MinApplicationStackSize(void)
+ ?KMinApplicationStackSize@@3HB @ 328 NONAME ; int const KMinApplicationStackSize
+ ?IsLanguageChangePending@CApaAppList@@QBEHXZ @ 329 NONAME ABSENT ; int CApaAppList::IsLanguageChangePending(void) const
+ ?IsPending@CApaAppData@@QBEHXZ @ 330 NONAME ABSENT ; int CApaAppData::IsPending(void) const
+ ?GetAppIcon@RApaLsSession@@QBEHVTUid@@AAVRFile@@@Z @ 331 NONAME ; int RApaLsSession::GetAppIcon(class TUid, class RFile &) const
+ ?CheckAppSecurity@CApaSecurityUtils@@SAHABVTPtrC16@@AAH1@Z @ 332 NONAME ; int CApaSecurityUtils::CheckAppSecurity(class TPtrC16 const &, int &, int &)
+ X @ 333 NONAME ABSENT ;
+ X @ 334 NONAME ABSENT ;
+ ?ForceCommitNonNativeApplicationsUpdatesL@RApaLsSession@@QAEXXZ @ 335 NONAME ; void RApaLsSession::ForceCommitNonNativeApplicationsUpdatesL(void)
+ ?RecognizeData@RApaLsSession@@QBEHABVTDesC8@@AAVTDataRecognitionResult@@@Z @336 NONAME;TInt RecognizeData(const TDesC8& aBuffer, TDataRecognitionResult& aDataType) const
+ X @ 337 NONAME ABSENT ;
+ X @ 338 NONAME ABSENT ;
+ X @ 339 NONAME ABSENT ;
+ X @ 340 NONAME ABSENT ;
+ X @ 341 NONAME ABSENT ;
+ X @ 342 NONAME ABSENT ;
+ X @ 343 NONAME ABSENT ;
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/bwins/aplist_legacyu.def Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,87 @@
+EXPORTS
+ ??0TApaAppEntry@@QAE@XZ @ 1 NONAME ; TApaAppEntry::TApaAppEntry(void)
+ ??1CApaAppData@@UAE@XZ @ 2 NONAME ; CApaAppData::~CApaAppData(void)
+ ??1CApaAppList@@UAE@XZ @ 3 NONAME ; CApaAppList::~CApaAppList(void)
+ ??1CAppSidChecker@@UAE@XZ @ 4 NONAME ; CAppSidChecker::~CAppSidChecker(void)
+ ?AddForcedRegistrationL@CApaAppList@@QAEXABVTDesC16@@@Z @ 5 NONAME ; void CApaAppList::AddForcedRegistrationL(class TDesC16 const &)
+ ?AppDataByFileName@CApaAppList@@QBEPAVCApaAppData@@ABVTDesC16@@@Z @ 6 NONAME ; class CApaAppData * CApaAppList::AppDataByFileName(class TDesC16 const &) const
+ ?AppDataByUid@CApaAppList@@QBEPAVCApaAppData@@VTUid@@@Z @ 7 NONAME ; class CApaAppData * CApaAppList::AppDataByUid(class TUid) const
+ ?AppEntry@CApaAppData@@QBE?AVTApaAppEntry@@XZ @ 8 NONAME ; class TApaAppEntry CApaAppData::AppEntry(void) const
+ ?AppScanInProgress@CApaAppList@@QBEHXZ @ 9 NONAME ; int CApaAppList::AppScanInProgress(void) const
+ ?ApplicationLanguage@CApaAppData@@QBE?AW4TLanguage@@XZ @ 10 NONAME ; enum TLanguage CApaAppData::ApplicationLanguage(void) const
+ ?CanUseScreenMode@CApaAppData@@QAEHH@Z @ 11 NONAME ; int CApaAppData::CanUseScreenMode(int)
+ ?Capability@CApaAppData@@QBEXAAVTDes8@@@Z @ 12 NONAME ; void CApaAppData::Capability(class TDes8 &) const
+ ?Count@CApaAppList@@QBEHXZ @ 13 NONAME ; int CApaAppList::Count(void) const
+ ?DataType@CApaAppData@@QBEJABVTDataType@@@Z @ 14 NONAME ; long CApaAppData::DataType(class TDataType const &) const
+ ?DefaultScreenNumber@CApaAppData@@QBEIXZ @ 15 NONAME ; unsigned int CApaAppData::DefaultScreenNumber(void) const
+ ?DriveList@CApaAppRegFinder@@QBE?AV?$TArray@$$CBVTDriveUnitInfo@@@@XZ @ 16 NONAME ; class TArray<class TDriveUnitInfo const > CApaAppRegFinder::DriveList(void) const
+ ?FindAllAppsL@CApaAppRegFinder@@QAEXW4TScanScope@1@@Z @ 17 NONAME ; void CApaAppRegFinder::FindAllAppsL(enum CApaAppRegFinder::TScanScope)
+ ?FindAndAddSpecificAppL@CApaAppList@@QAEPAVCApaAppData@@PAVCApaAppRegFinder@@VTUid@@@Z @ 18 NONAME ; class CApaAppData * CApaAppList::FindAndAddSpecificAppL(class CApaAppRegFinder *, class TUid)
+ ?FirstApp@CApaAppList@@QBEPAVCApaAppData@@H@Z @ 19 NONAME ; class CApaAppData * CApaAppList::FirstApp(int) const
+ ?FirstApp@CApaAppList@@QBEPAVCApaAppData@@XZ @ 20 NONAME ; class CApaAppData * CApaAppList::FirstApp(void) const
+ ?GetIconInfo@CApaAppData@@QBEXAAH0@Z @ 21 NONAME ; void CApaAppData::GetIconInfo(int &, int &) const
+ ?Icon@CApaAppData@@QBEPAVCApaMaskedBitmap@@H@Z @ 22 NONAME ; class CApaMaskedBitmap * CApaAppData::Icon(int) const
+ ?Icon@CApaAppData@@QBEPAVCApaMaskedBitmap@@VTSize@@@Z @ 23 NONAME ; class CApaMaskedBitmap * CApaAppData::Icon(class TSize) const
+ ?Icon@CApaAppViewData@@QBEPAVCApaMaskedBitmap@@ABVTSize@@@Z @ 24 NONAME ; class CApaMaskedBitmap * CApaAppViewData::Icon(class TSize const &) const
+ ?IconFileName@CApaAppData@@QBE?AVTPtrC16@@XZ @ 25 NONAME ; class TPtrC16 CApaAppData::IconFileName(void) const
+ ?IconFileName@CApaAppViewData@@QBE?AVTPtrC16@@XZ @ 26 NONAME ; class TPtrC16 CApaAppViewData::IconFileName(void) const
+ ?IconSizesL@CApaAppData@@QBEPAV?$CArrayFixFlat@VTSize@@@@XZ @ 27 NONAME ; class CArrayFixFlat<class TSize> * CApaAppData::IconSizesL(void) const
+ ?IconSizesL@CApaAppViewData@@QBEPAV?$CArrayFixFlat@VTSize@@@@XZ @ 28 NONAME ; class CArrayFixFlat<class TSize> * CApaAppViewData::IconSizesL(void) const
+ ?ImplementsService@CApaAppData@@QBEHVTUid@@@Z @ 29 NONAME ; int CApaAppData::ImplementsService(class TUid) const
+ ?InitListL@CApaAppList@@QAEXPAVMApaAppListObserver@@@Z @ 30 NONAME ; void CApaAppList::InitListL(class MApaAppListObserver *)
+ ?IsFirstScanComplete@CApaAppList@@QBEHXZ @ 31 NONAME ; int CApaAppList::IsFirstScanComplete(void) const
+ ?IsIdleUpdateComplete@CApaAppList@@QBEHXZ @ 32 NONAME ; int CApaAppList::IsIdleUpdateComplete(void) const
+ ?IsLanguageChangePending@CApaAppList@@QBEHXZ @ 33 NONAME ; int CApaAppList::IsLanguageChangePending(void) const
+ ?IsPending@CApaAppData@@QBEHXZ @ 34 NONAME ; int CApaAppData::IsPending(void) const
+ ?LocalisableResourceFileName@CApaAppData@@QBE?AVTPtrC16@@XZ @ 35 NONAME ; class TPtrC16 CApaAppData::LocalisableResourceFileName(void) const
+ ?NewL@CApaAppData@@SAPAV1@ABVTApaAppEntry@@AAVRFs@@@Z @ 36 NONAME ; class CApaAppData * CApaAppData::NewL(class TApaAppEntry const &, class RFs &)
+ ?NewL@CApaAppList@@SAPAV1@AAVRFs@@HH@Z @ 37 NONAME ; class CApaAppList * CApaAppList::NewL(class RFs &, int, int)
+ ?NewL@CApaAppRegFinder@@SAPAV1@ABVRFs@@@Z @ 38 NONAME ; class CApaAppRegFinder * CApaAppRegFinder::NewL(class RFs const &)
+ ?NewLC@CApaAppRegFinder@@SAPAV1@ABVRFs@@@Z @ 39 NONAME ; class CApaAppRegFinder * CApaAppRegFinder::NewLC(class RFs const &)
+ ?NextApp@CApaAppList@@QBEPAVCApaAppData@@PBV2@@Z @ 40 NONAME ; class CApaAppData * CApaAppList::NextApp(class CApaAppData const *) const
+ ?NextApp@CApaAppList@@QBEPAVCApaAppData@@PBV2@H@Z @ 41 NONAME ; class CApaAppData * CApaAppList::NextApp(class CApaAppData const *, int) const
+ ?NextL@CApaAppRegFinder@@QAEHAAVTApaAppEntry@@ABVCDesC16Array@@@Z @ 42 NONAME ; int CApaAppRegFinder::NextL(class TApaAppEntry &, class CDesC16Array const &)
+ ?NonMbmIconFile@CApaAppData@@QBEHXZ @ 43 NONAME ; int CApaAppData::NonMbmIconFile(void) const
+ ?NonMbmIconFile@CApaAppViewData@@QBEHXZ @ 44 NONAME ; int CApaAppViewData::NonMbmIconFile(void) const
+ ?NonNativeApplicationType@CApaAppData@@QBE?AVTUid@@XZ @ 45 NONAME ; class TUid CApaAppData::NonNativeApplicationType(void) const
+ ?OpaqueData@CApaAppData@@QBE?AVTPtrC8@@XZ @ 46 NONAME ; class TPtrC8 CApaAppData::OpaqueData(void) const
+ ?OwnedFiles@CApaAppData@@QBEPAVCDesC16Array@@XZ @ 47 NONAME ; class CDesC16Array * CApaAppData::OwnedFiles(void) const
+ ?PreferredDataHandlerL@CApaAppList@@QBE?AVTUid@@ABVTDataType@@@Z @ 48 NONAME ; class TUid CApaAppList::PreferredDataHandlerL(class TDataType const &) const
+ ?PreferredDataHandlerL@CApaAppList@@QBE?AVTUid@@ABVTDataType@@PBV2@AAH@Z @ 49 NONAME ; class TUid CApaAppList::PreferredDataHandlerL(class TDataType const &, class TUid const *, int &) const
+ ?PurgeL@CApaAppList@@QAEXXZ @ 50 NONAME ; void CApaAppList::PurgeL(void)
+ ?RegistrationFileName@CApaAppData@@QBE?AVTPtrC16@@XZ @ 51 NONAME ; class TPtrC16 CApaAppData::RegistrationFileName(void) const
+ ?RegistrationFileUsed@CApaAppData@@QBEHXZ @ 52 NONAME ; int CApaAppData::RegistrationFileUsed(void) const
+ ?ResetForcedRegistrations@CApaAppList@@QAEXXZ @ 53 NONAME ; void CApaAppList::ResetForcedRegistrations(void)
+ ?RestartScanL@CApaAppList@@QAEXXZ @ 54 NONAME ; void CApaAppList::RestartScanL(void)
+ ?ScreenMode@CApaAppViewData@@QBEHXZ @ 55 NONAME ; int CApaAppViewData::ScreenMode(void) const
+ ?Self@CApaAppList@@SAPAV1@XZ @ 56 NONAME ; class CApaAppList * CApaAppList::Self(void)
+ ?ServiceArrayBufferL@CApaAppList@@QBEPAVCBufFlat@@VTUid@@@Z @ 57 NONAME ; class CBufFlat * CApaAppList::ServiceArrayBufferL(class TUid) const
+ ?ServiceImplArrayBufferL@CApaAppList@@QBEPAVCBufFlat@@VTUid@@@Z @ 58 NONAME ; class CBufFlat * CApaAppList::ServiceImplArrayBufferL(class TUid) const
+ ?ServiceImplArrayBufferL@CApaAppList@@QBEPAVCBufFlat@@VTUid@@ABVTDataType@@@Z @ 59 NONAME ; class CBufFlat * CApaAppList::ServiceImplArrayBufferL(class TUid, class TDataType const &) const
+ ?ServiceOpaqueDataBufferL@CApaAppList@@QBEPAVCBufFlat@@VTUid@@0@Z @ 60 NONAME ; class CBufFlat * CApaAppList::ServiceOpaqueDataBufferL(class TUid, class TUid) const
+ ?ServiceUidBufferL@CApaAppList@@QBEPAVCBufFlat@@VTUid@@@Z @ 61 NONAME ; class CBufFlat * CApaAppList::ServiceUidBufferL(class TUid) const
+ ?SetRescanCallBackL@CAppSidChecker@@UAEXABVTCallBack@@@Z @ 62 NONAME ; void CAppSidChecker::SetRescanCallBackL(class TCallBack const &)
+ ?SetShortCaptionL@CApaAppData@@QAEXABVTDesC16@@@Z @ 63 NONAME ; void CApaAppData::SetShortCaptionL(class TDesC16 const &)
+ ?StartIdleUpdateL@CApaAppList@@QAEXPAVMApaAppListObserver@@@Z @ 64 NONAME ; void CApaAppList::StartIdleUpdateL(class MApaAppListObserver *)
+ ?StartIdleUpdateL@CApaAppList@@QAEXXZ @ 65 NONAME ; void CApaAppList::StartIdleUpdateL(void)
+ ?StopScan@CApaAppList@@QAEXH@Z @ 66 NONAME ; void CApaAppList::StopScan(int)
+ ?Uid@CApaAppViewData@@QBE?AVTUid@@XZ @ 67 NONAME ; class TUid CApaAppViewData::Uid(void) const
+ ?Views@CApaAppData@@QBEPAV?$CArrayPtrFlat@VCApaAppViewData@@@@XZ @ 68 NONAME ; class CArrayPtrFlat<class CApaAppViewData> * CApaAppData::Views(void) const
+ ?reserved1@CAppSidChecker@@EAEXXZ @ 69 NONAME ; void CAppSidChecker::reserved1(void)
+ ?reserved2@CAppSidChecker@@EAEXXZ @ 70 NONAME ; void CAppSidChecker::reserved2(void)
+ ?reserved3@CAppSidChecker@@EAEXXZ @ 71 NONAME ; void CAppSidChecker::reserved3(void)
+ ?AddCustomAppInfoInListL@CApaAppList@@QAEXVTUid@@W4TLanguage@@ABVTDesC16@@@Z @ 72 NONAME ; void CApaAppList::AddCustomAppInfoInListL(class TUid, enum TLanguage, class TDesC16 const &)
+ ?UpdateAppListByShortCaptionL@CApaAppList@@QAEXXZ @ 73 NONAME ; void CApaAppList::UpdateAppListByShortCaptionL(void)
+ ?SetCaptionL@CApaAppData@@QAEXABVTDesC16@@@Z @ 74 NONAME ; void CApaAppData::SetCaptionL(class TDesC16 const &)
+ ?UpdateAppListByIconCaptionOverridesL@CApaAppList@@QAEXXZ @ 75 NONAME ; void CApaAppList::UpdateAppListByIconCaptionOverridesL(void)
+ ?SetIconsL@CApaAppData@@QAEXABVTDesC16@@H@Z @ 76 NONAME ; void CApaAppData::SetIconsL(class TDesC16 const &, int)
+ ?AppListUpdatePending@CApaAppList@@QAEHXZ @ 77 NONAME ; int CApaAppList::AppListUpdatePending(void)
+ ?UninstalledAppArray@CApaAppList@@QAEPAV?$CArrayFixFlat@VTUid@@@@XZ @ 78 NONAME ; class CArrayFixFlat<class TUid> * CApaAppList::UninstalledAppArray(void)
+ X @ 79 NONAME ABSENT ;
+ X @ 80 NONAME ABSENT ;
+ X @ 81 NONAME ABSENT ;
+ X @ 82 NONAME ABSENT ;
+ X @ 83 NONAME ABSENT ;
+ X @ 84 NONAME ABSENT ;
+ X @ 85 NONAME ABSENT ;
+ X @ 86 NONAME ABSENT ;
--- a/appfw/apparchitecture/bwins/aplistu.def Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/bwins/aplistu.def Tue Aug 31 15:24:25 2010 +0300
@@ -3,7 +3,7 @@
??1CApaAppData@@UAE@XZ @ 2 NONAME ; CApaAppData::~CApaAppData(void)
??1CApaAppList@@UAE@XZ @ 3 NONAME ; CApaAppList::~CApaAppList(void)
??1CAppSidChecker@@UAE@XZ @ 4 NONAME ; CAppSidChecker::~CAppSidChecker(void)
- ?AddForcedRegistrationL@CApaAppList@@QAEXABVTDesC16@@@Z @ 5 NONAME ; void CApaAppList::AddForcedRegistrationL(class TDesC16 const &)
+ ?AddForcedRegistrationL@CApaAppList@@QAEXABVTDesC16@@@Z @ 5 NONAME ABSENT; void CApaAppList::AddForcedRegistrationL(class TDesC16 const &)
?AppDataByFileName@CApaAppList@@QBEPAVCApaAppData@@ABVTDesC16@@@Z @ 6 NONAME ; class CApaAppData * CApaAppList::AppDataByFileName(class TDesC16 const &) const
?AppDataByUid@CApaAppList@@QBEPAVCApaAppData@@VTUid@@@Z @ 7 NONAME ; class CApaAppData * CApaAppList::AppDataByUid(class TUid) const
?AppEntry@CApaAppData@@QBE?AVTApaAppEntry@@XZ @ 8 NONAME ; class TApaAppEntry CApaAppData::AppEntry(void) const
@@ -14,9 +14,9 @@
?Count@CApaAppList@@QBEHXZ @ 13 NONAME ; int CApaAppList::Count(void) const
?DataType@CApaAppData@@QBEJABVTDataType@@@Z @ 14 NONAME ; long CApaAppData::DataType(class TDataType const &) const
?DefaultScreenNumber@CApaAppData@@QBEIXZ @ 15 NONAME ; unsigned int CApaAppData::DefaultScreenNumber(void) const
- ?DriveList@CApaAppRegFinder@@QBE?AV?$TArray@$$CBVTDriveUnitInfo@@@@XZ @ 16 NONAME ; class TArray<class TDriveUnitInfo const > CApaAppRegFinder::DriveList(void) const
- ?FindAllAppsL@CApaAppRegFinder@@QAEXW4TScanScope@1@@Z @ 17 NONAME ; void CApaAppRegFinder::FindAllAppsL(enum CApaAppRegFinder::TScanScope)
- ?FindAndAddSpecificAppL@CApaAppList@@QAEPAVCApaAppData@@PAVCApaAppRegFinder@@VTUid@@@Z @ 18 NONAME ; class CApaAppData * CApaAppList::FindAndAddSpecificAppL(class CApaAppRegFinder *, class TUid)
+ ?DriveList@CApaAppRegFinder@@QBE?AV?$TArray@$$CBVTDriveUnitInfo@@@@XZ @ 16 NONAME ABSENT ; class TArray<class TDriveUnitInfo const > CApaAppRegFinder::DriveList(void) const
+ ?FindAllAppsL@CApaAppRegFinder@@QAEXW4TScanScope@1@@Z @ 17 NONAME ABSENT ; void CApaAppRegFinder::FindAllAppsL(enum CApaAppRegFinder::TScanScope)
+ ?FindAndAddSpecificAppL@CApaAppList@@QAEPAVCApaAppData@@PAVCApaAppRegFinder@@VTUid@@@Z @ 18 NONAME ABSENT ; class CApaAppData * CApaAppList::FindAndAddSpecificAppL(class CApaAppRegFinder *, class TUid)
?FirstApp@CApaAppList@@QBEPAVCApaAppData@@H@Z @ 19 NONAME ; class CApaAppData * CApaAppList::FirstApp(int) const
?FirstApp@CApaAppList@@QBEPAVCApaAppData@@XZ @ 20 NONAME ; class CApaAppData * CApaAppList::FirstApp(void) const
?GetIconInfo@CApaAppData@@QBEXAAH0@Z @ 21 NONAME ; void CApaAppData::GetIconInfo(int &, int &) const
@@ -32,15 +32,15 @@
?IsFirstScanComplete@CApaAppList@@QBEHXZ @ 31 NONAME ; int CApaAppList::IsFirstScanComplete(void) const
?IsIdleUpdateComplete@CApaAppList@@QBEHXZ @ 32 NONAME ; int CApaAppList::IsIdleUpdateComplete(void) const
?IsLanguageChangePending@CApaAppList@@QBEHXZ @ 33 NONAME ; int CApaAppList::IsLanguageChangePending(void) const
- ?IsPending@CApaAppData@@QBEHXZ @ 34 NONAME ; int CApaAppData::IsPending(void) const
- ?LocalisableResourceFileName@CApaAppData@@QBE?AVTPtrC16@@XZ @ 35 NONAME ; class TPtrC16 CApaAppData::LocalisableResourceFileName(void) const
- ?NewL@CApaAppData@@SAPAV1@ABVTApaAppEntry@@AAVRFs@@@Z @ 36 NONAME ; class CApaAppData * CApaAppData::NewL(class TApaAppEntry const &, class RFs &)
+ ?IsPending@CApaAppData@@QBEHXZ @ 34 NONAME ABSENT ; int CApaAppData::IsPending(void) const
+ ?LocalisableResourceFileName@CApaAppData@@QBE?AVTPtrC16@@XZ @ 35 NONAME ABSENT ; class TPtrC16 CApaAppData::LocalisableResourceFileName(void) const
+ ?NewL@CApaAppData@@SAPAV1@ABVTApaAppEntry@@AAVRFs@@@Z @ 36 NONAME ABSENT ; class CApaAppData * CApaAppData::NewL(class TApaAppEntry const &, class RFs &)
?NewL@CApaAppList@@SAPAV1@AAVRFs@@HH@Z @ 37 NONAME ; class CApaAppList * CApaAppList::NewL(class RFs &, int, int)
- ?NewL@CApaAppRegFinder@@SAPAV1@ABVRFs@@@Z @ 38 NONAME ; class CApaAppRegFinder * CApaAppRegFinder::NewL(class RFs const &)
- ?NewLC@CApaAppRegFinder@@SAPAV1@ABVRFs@@@Z @ 39 NONAME ; class CApaAppRegFinder * CApaAppRegFinder::NewLC(class RFs const &)
+ ?NewL@CApaAppRegFinder@@SAPAV1@ABVRFs@@@Z @ 38 NONAME ABSENT ; class CApaAppRegFinder * CApaAppRegFinder::NewL(class RFs const &)
+ ?NewLC@CApaAppRegFinder@@SAPAV1@ABVRFs@@@Z @ 39 NONAME ABSENT ; class CApaAppRegFinder * CApaAppRegFinder::NewLC(class RFs const &)
?NextApp@CApaAppList@@QBEPAVCApaAppData@@PBV2@@Z @ 40 NONAME ; class CApaAppData * CApaAppList::NextApp(class CApaAppData const *) const
?NextApp@CApaAppList@@QBEPAVCApaAppData@@PBV2@H@Z @ 41 NONAME ; class CApaAppData * CApaAppList::NextApp(class CApaAppData const *, int) const
- ?NextL@CApaAppRegFinder@@QAEHAAVTApaAppEntry@@ABVCDesC16Array@@@Z @ 42 NONAME ; int CApaAppRegFinder::NextL(class TApaAppEntry &, class CDesC16Array const &)
+ ?NextL@CApaAppRegFinder@@QAEHAAVTApaAppEntry@@ABVCDesC16Array@@@Z @ 42 NONAME ABSENT ; int CApaAppRegFinder::NextL(class TApaAppEntry &, class CDesC16Array const &)
?NonMbmIconFile@CApaAppData@@QBEHXZ @ 43 NONAME ; int CApaAppData::NonMbmIconFile(void) const
?NonMbmIconFile@CApaAppViewData@@QBEHXZ @ 44 NONAME ; int CApaAppViewData::NonMbmIconFile(void) const
?NonNativeApplicationType@CApaAppData@@QBE?AVTUid@@XZ @ 45 NONAME ; class TUid CApaAppData::NonNativeApplicationType(void) const
@@ -48,11 +48,11 @@
?OwnedFiles@CApaAppData@@QBEPAVCDesC16Array@@XZ @ 47 NONAME ; class CDesC16Array * CApaAppData::OwnedFiles(void) const
?PreferredDataHandlerL@CApaAppList@@QBE?AVTUid@@ABVTDataType@@@Z @ 48 NONAME ; class TUid CApaAppList::PreferredDataHandlerL(class TDataType const &) const
?PreferredDataHandlerL@CApaAppList@@QBE?AVTUid@@ABVTDataType@@PBV2@AAH@Z @ 49 NONAME ; class TUid CApaAppList::PreferredDataHandlerL(class TDataType const &, class TUid const *, int &) const
- ?PurgeL@CApaAppList@@QAEXXZ @ 50 NONAME ; void CApaAppList::PurgeL(void)
- ?RegistrationFileName@CApaAppData@@QBE?AVTPtrC16@@XZ @ 51 NONAME ; class TPtrC16 CApaAppData::RegistrationFileName(void) const
- ?RegistrationFileUsed@CApaAppData@@QBEHXZ @ 52 NONAME ; int CApaAppData::RegistrationFileUsed(void) const
- ?ResetForcedRegistrations@CApaAppList@@QAEXXZ @ 53 NONAME ; void CApaAppList::ResetForcedRegistrations(void)
- ?RestartScanL@CApaAppList@@QAEXXZ @ 54 NONAME ; void CApaAppList::RestartScanL(void)
+ ?PurgeL@CApaAppList@@QAEXXZ @ 50 NONAME ABSENT ; void CApaAppList::PurgeL(void)
+ ?RegistrationFileName@CApaAppData@@QBE?AVTPtrC16@@XZ @ 51 NONAME ABSENT ; class TPtrC16 CApaAppData::RegistrationFileName(void) const
+ ?RegistrationFileUsed@CApaAppData@@QBEHXZ @ 52 NONAME ABSENT ; int CApaAppData::RegistrationFileUsed(void) const
+ ?ResetForcedRegistrations@CApaAppList@@QAEXXZ @ 53 NONAME ABSENT; void CApaAppList::ResetForcedRegistrations(void)
+ ?RestartScanL@CApaAppList@@QAEXXZ @ 54 NONAME ABSENT ; void CApaAppList::RestartScanL(void)
?ScreenMode@CApaAppViewData@@QBEHXZ @ 55 NONAME ; int CApaAppViewData::ScreenMode(void) const
?Self@CApaAppList@@SAPAV1@XZ @ 56 NONAME ; class CApaAppList * CApaAppList::Self(void)
?ServiceArrayBufferL@CApaAppList@@QBEPAVCBufFlat@@VTUid@@@Z @ 57 NONAME ; class CBufFlat * CApaAppList::ServiceArrayBufferL(class TUid) const
@@ -64,7 +64,7 @@
?SetShortCaptionL@CApaAppData@@QAEXABVTDesC16@@@Z @ 63 NONAME ; void CApaAppData::SetShortCaptionL(class TDesC16 const &)
?StartIdleUpdateL@CApaAppList@@QAEXPAVMApaAppListObserver@@@Z @ 64 NONAME ; void CApaAppList::StartIdleUpdateL(class MApaAppListObserver *)
?StartIdleUpdateL@CApaAppList@@QAEXXZ @ 65 NONAME ; void CApaAppList::StartIdleUpdateL(void)
- ?StopScan@CApaAppList@@QAEXH@Z @ 66 NONAME ; void CApaAppList::StopScan(int)
+ ?StopScan@CApaAppList@@QAEXH@Z @ 66 NONAME ABSENT ; void CApaAppList::StopScan(int)
?Uid@CApaAppViewData@@QBE?AVTUid@@XZ @ 67 NONAME ; class TUid CApaAppViewData::Uid(void) const
?Views@CApaAppData@@QBEPAV?$CArrayPtrFlat@VCApaAppViewData@@@@XZ @ 68 NONAME ; class CArrayPtrFlat<class CApaAppViewData> * CApaAppData::Views(void) const
?reserved1@CAppSidChecker@@EAEXXZ @ 69 NONAME ; void CAppSidChecker::reserved1(void)
@@ -75,6 +75,13 @@
?SetCaptionL@CApaAppData@@QAEXABVTDesC16@@@Z @ 74 NONAME ; void CApaAppData::SetCaptionL(class TDesC16 const &)
?UpdateAppListByIconCaptionOverridesL@CApaAppList@@QAEXXZ @ 75 NONAME ; void CApaAppList::UpdateAppListByIconCaptionOverridesL(void)
?SetIconsL@CApaAppData@@QAEXABVTDesC16@@H@Z @ 76 NONAME ; void CApaAppData::SetIconsL(class TDesC16 const &, int)
- ?AppListUpdatePending@CApaAppList@@QAEHXZ @ 77 NONAME ; int CApaAppList::AppListUpdatePending(void)
+ ?AppListUpdatePending@CApaAppList@@QAEHXZ @ 77 NONAME ABSENT ; int CApaAppList::AppListUpdatePending(void)
?UninstalledAppArray@CApaAppList@@QAEPAV?$CArrayFixFlat@VTUid@@@@XZ @ 78 NONAME ; class CArrayFixFlat<class TUid> * CApaAppList::UninstalledAppArray(void)
+ ?FindAndAddSpecificAppL@CApaAppList@@QAEPAVCApaAppData@@VTUid@@@Z @ 79 NONAME ; class CApaAppData * CApaAppList::FindAndAddSpecificAppL(class TUid)
+ ?NewL@CApaAppData@@SAPAV1@ABVCApplicationRegistrationData@Usif@@AAVRFs@@ABVRSoftwareComponentRegistry@3@@Z @ 80 NONAME ; class CApaAppData * CApaAppData::NewL(class Usif::CApplicationRegistrationData const &, class RFs &, class Usif::RSoftwareComponentRegistry const &)
+ ?UpdateApplistL@CApaAppList@@QAEXPAVMApaAppListObserver@@PAV?$RArray@VTApaAppUpdateInfo@@@@VTUid@@@Z @ 81 NONAME ; void CApaAppList::UpdateApplistL(class MApaAppListObserver *, class RArray<class TApaAppUpdateInfo> *, class TUid)
+ ?InitializeApplistL@CApaAppList@@QAEXPAVMApaAppListObserver@@@Z @ 82 NONAME ; void CApaAppList::InitializeApplistL(class MApaAppListObserver *)
+ ?UpdateApplistByForceRegAppsL@CApaAppList@@QAEXAAV?$RPointerArray@VCApplicationRegistrationData@Usif@@@@@Z @ 83 NONAME ; void CApaAppList::UpdateApplistByForceRegAppsL(class RPointerArray<class Usif::CApplicationRegistrationData> &)
+ ?UpdatedAppsInfo@CApaAppList@@QAEPAV?$CArrayFixFlat@VTApaAppUpdateInfo@@@@XZ @ 84 NONAME ; class CArrayFixFlat<class TApaAppUpdateInfo> * CApaAppList::UpdatedAppsInfo(void)
+ ?IsLangChangePending@CApaAppData@@QAEHXZ @ 85 NONAME ; int CApaAppData::IsLangChangePending(void)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/bwins/apserv_legacyu.def Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,27 @@
+EXPORTS
+ ??1CApaAppArcServer@@UAE@XZ @ 1 NONAME ; public: virtual __thiscall CApaAppArcServer::~CApaAppArcServer(void)
+ ?NewL@CApaAppArcServer@@SAPAV1@PAVCApaAppList@@PAVCApaFileRecognizer@@@Z @ 2 NONAME ABSENT ; public: static class CApaAppArcServer * __cdecl CApaAppArcServer::NewL(class CApaAppList *,class CApaFileRecognizer *)
+ ??1CApaFsMonitor@@UAE@XZ @ 3 NONAME ; public: virtual __thiscall CApaFsMonitor::~CApaFsMonitor(void)
+ ?NameApaServServerThread@@YA?AVTPtrC16@@XZ @ 4 NONAME ; class TPtrC16 __cdecl NameApaServServerThread(void)
+ ?NameApaServStartSemaphore@@YA?AVTPtrC16@@XZ @ 5 NONAME ; class TPtrC16 __cdecl NameApaServStartSemaphore(void)
+ ?NewL@CApaAppArcServer@@SAPAV1@XZ @ 6 NONAME ; class CApaAppArcServer * CApaAppArcServer::NewL(void)
+ ?NewL@CApaFsMonitor@@SAPAV1@AAVRFs@@ABVTDesC16@@VTCallBack@@@Z @ 7 NONAME ; public: static class CApaFsMonitor * __cdecl CApaFsMonitor::NewL(class RFs &,class TDesC16 const &,class TCallBack)
+ ?NotifyType@CApaFsMonitor@@QBE?AW4TNotifyType@@XZ @ 8 NONAME ; public: enum TNotifyType __thiscall CApaFsMonitor::NotifyType(void)const
+ ?SetBlocked@CApaFsMonitor@@QAEXH@Z @ 9 NONAME ; public: void __thiscall CApaFsMonitor::SetBlocked(int)
+ ?Start@CApaFsMonitor@@QAEXW4TNotifyType@@@Z @ 10 NONAME ; public: void __thiscall CApaFsMonitor::Start(enum TNotifyType)
+ ?Self@CApaAppArcServer@@SAPAV1@XZ @ 11 NONAME ; class CApaAppArcServer * CApaAppArcServer::Self(void)
+ ?AddLocationL@CApaFsMonitor@@QAEXABVTDesC16@@@Z @ 12 NONAME ; void CApaFsMonitor::AddLocationL(class TDesC16 const &)
+ ?Cancel@CApaFsMonitor@@QAEXXZ @ 13 NONAME ; void CApaFsMonitor::Cancel(void)
+ ?ApaServThreadStart@@YAHPAX@Z @ 14 NONAME ; int ApaServThreadStart(void *)
+ ??1CUpdatedAppsList@@UAE@XZ @ 15 NONAME ABSENT ; CUpdatedAppsList::~CUpdatedAppsList(void)
+ ?CloseAndDeletePermanentStore@CUpdatedAppsList@@QAEXXZ @ 16 NONAME ABSENT ; void CUpdatedAppsList::CloseAndDeletePermanentStore(void)
+ ?IsInList@CUpdatedAppsList@@QBEHABVTDesC16@@@Z @ 17 NONAME ABSENT ; int CUpdatedAppsList::IsInList(class TDesC16 const &) const
+ ?RescanCallBack@CApaAppArcServer@@QAE?AVTCallBack@@XZ @ 18 NONAME ; class TCallBack CApaAppArcServer::RescanCallBack(void)
+ ?KApaLoadDataRecognizersOnDemand@@3HB @ 19 NONAME DATA 4 ; int const KApaLoadDataRecognizersOnDemand
+ ?KApaUnloadRecognizersTimeout@@3HB @ 20 NONAME DATA 4 ; int const KApaUnloadRecognizersTimeout
+ ?HandleInstallationEndEventL@CApaAppArcServer@@QAEXXZ @ 21 NONAME ; void CApaAppArcServer::HandleEndUninstallEventL(void)
+ ?HandleInstallationStartEvent@CApaAppArcServer@@QAEXXZ @ 22 NONAME ; void CApaAppArcServer::HandleStartUninstallEvent(void)
+ ?KApaDrivesToMonitor@@3HB @ 23 NONAME ; int const KApaDrivesToMonitor
+ ?KApaLoadMbmIconsOnDemand@@3HB @ 24 NONAME ; int const KApaLoadMbmIconsOnDemand
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/bwins/ticonforleaks_leagacyu.def Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,351 @@
+EXPORTS
+ ??0CDataRecognitionResultArray@@QAE@XZ @ 1 NONAME ; CDataRecognitionResultArray::CDataRecognitionResultArray(void)
+ ??0MApaAppListServObserver@@IAE@XZ @ 2 NONAME ; MApaAppListServObserver::MApaAppListServObserver(void)
+ ??0RApaLsSession@@QAE@XZ @ 3 NONAME ; RApaLsSession::RApaLsSession(void)
+ ??0TApaPictureFactory@@IAE@XZ @ 4 NONAME ; TApaPictureFactory::TApaPictureFactory(void)
+ ??0TApaPictureFactory@@QAE@PAVCApaProcess@@@Z @ 5 NONAME ; TApaPictureFactory::TApaPictureFactory(class CApaProcess *)
+ ??0TApaTask@@QAE@AAVRWsSession@@@Z @ 6 NONAME ; TApaTask::TApaTask(class RWsSession &)
+ ??0TApaTaskList@@QAE@AAVRWsSession@@@Z @ 7 NONAME ; TApaTaskList::TApaTaskList(class RWsSession &)
+ ??1CApaAppData@@UAE@XZ @ 8 NONAME ; CApaAppData::~CApaAppData(void)
+ ??1CApaAppInfoFileWriter@@UAE@XZ @ 9 NONAME ABSENT ; CApaAppInfoFileWriter::~CApaAppInfoFileWriter(void)
+ ??1CApaAppList@@UAE@XZ @ 10 NONAME ; CApaAppList::~CApaAppList(void)
+ ??1CApaAppListNotifier@@UAE@XZ @ 11 NONAME ; CApaAppListNotifier::~CApaAppListNotifier(void)
+ ??1CApaDoor@@UAE@XZ @ 12 NONAME ; CApaDoor::~CApaDoor(void)
+ ??1CApaLocalisableResourceFileWriter@@UAE@XZ @ 13 NONAME ; CApaLocalisableResourceFileWriter::~CApaLocalisableResourceFileWriter(void)
+ ??1CApaMaskedBitmap@@UAE@XZ @ 14 NONAME ; CApaMaskedBitmap::~CApaMaskedBitmap(void)
+ ??1CApaRegistrationResourceFileWriter@@UAE@XZ @ 15 NONAME ; CApaRegistrationResourceFileWriter::~CApaRegistrationResourceFileWriter(void)
+ ??1CApaSystemControlList@@UAE@XZ @ 16 NONAME ; CApaSystemControlList::~CApaSystemControlList(void)
+ ??1CApaWindowGroupName@@UAE@XZ @ 17 NONAME ; CApaWindowGroupName::~CApaWindowGroupName(void)
+ ??1CDataRecognitionResultArray@@UAE@XZ @ 18 NONAME ; CDataRecognitionResultArray::~CDataRecognitionResultArray(void)
+ ?AddCaptionL@CApaAppInfoFileWriter@@QAEXW4TLanguage@@ABVTDesC16@@@Z @ 19 NONAME ABSENT ; void CApaAppInfoFileWriter::AddCaptionL(enum TLanguage, class TDesC16 const &)
+ ?AddDataTypeL@CApaAppInfoFileWriter@@QAEXABVTDataTypeWithPriority@@@Z @ 20 NONAME ABSENT ; void CApaAppInfoFileWriter::AddDataTypeL(class TDataTypeWithPriority const &)
+ ?AddDataTypeL@CApaRegistrationResourceFileWriter@@QAEXHABVTDesC8@@@Z @ 21 NONAME ; void CApaRegistrationResourceFileWriter::AddDataTypeL(int, class TDesC8 const &)
+ ?AddFileOwnershipInfoL@CApaRegistrationResourceFileWriter@@QAEXABVTDesC16@@@Z @ 22 NONAME ; void CApaRegistrationResourceFileWriter::AddFileOwnershipInfoL(class TDesC16 const &)
+ ?AddForcedRegistrationL@CApaAppList@@QAEXPAVHBufC16@@@Z @ 23 NONAME ABSENT ; void CApaAppList::AddForcedRegistrationL(class HBufC16 *)
+ ?AddIconL@CApaAppInfoFileWriter@@QAEXAAVCApaMaskedBitmap@@@Z @ 24 NONAME ABSENT ; void CApaAppInfoFileWriter::AddIconL(class CApaMaskedBitmap &)
+ ?AppCount@RApaLsSession@@QBEHAAH@Z @ 25 NONAME ; int RApaLsSession::AppCount(int &) const
+ ?AppDataByFileName@CApaAppList@@QBEPAVCApaAppData@@ABVTDesC16@@@Z @ 26 NONAME ; class CApaAppData * CApaAppList::AppDataByFileName(class TDesC16 const &) const
+ ?AppDataByUid@CApaAppList@@QBEPAVCApaAppData@@VTUid@@@Z @ 27 NONAME ; class CApaAppData * CApaAppList::AppDataByUid(class TUid) const
+ ?AppEntry@CApaAppData@@QBE?AVTApaAppEntry@@XZ @ 28 NONAME ; class TApaAppEntry CApaAppData::AppEntry(void) const
+ ?AppForDataType@RApaLsSession@@QBEHABVTDataType@@AAVTUid@@@Z @ 29 NONAME ; int RApaLsSession::AppForDataType(class TDataType const &, class TUid &) const
+ ?AppForDataTypeAndService@RApaLsSession@@QBEHABVTDataType@@VTUid@@AAV3@@Z @ 30 NONAME ; int RApaLsSession::AppForDataTypeAndService(class TDataType const &, class TUid, class TUid &) const
+ ?AppForDocument@RApaLsSession@@QBEHABVRFile@@AAVTUid@@AAVTDataType@@@Z @ 31 NONAME ; int RApaLsSession::AppForDocument(class RFile const &, class TUid &, class TDataType &) const
+ ?AppForDocument@RApaLsSession@@QBEHABVTDesC16@@AAVTUid@@AAVTDataType@@@Z @ 32 NONAME ; int RApaLsSession::AppForDocument(class TDesC16 const &, class TUid &, class TDataType &) const
+ ?AppForDocumentAndService@RApaLsSession@@QBEHABVRFile@@VTUid@@AAV3@AAVTDataType@@@Z @ 33 NONAME ; int RApaLsSession::AppForDocumentAndService(class RFile const &, class TUid, class TUid &, class TDataType &) const
+ ?AppForDocumentAndService@RApaLsSession@@QBEHABVTDesC16@@VTUid@@AAV3@AAVTDataType@@@Z @ 34 NONAME ; int RApaLsSession::AppForDocumentAndService(class TDesC16 const &, class TUid, class TUid &, class TDataType &) const
+ ?AppScanInProgress@CApaAppList@@QBEHXZ @ 35 NONAME ; int CApaAppList::AppScanInProgress(void) const
+ ?AppUid@CApaWindowGroupName@@QBE?AVTUid@@XZ @ 36 NONAME ; class TUid CApaWindowGroupName::AppUid(void) const
+ ?AppUidL@CApaDoor@@QBE?AVTUid@@XZ @ 37 NONAME ; class TUid CApaDoor::AppUidL(void) const
+ ?ApplicationLanguage@CApaAppData@@QBE?AW4TLanguage@@XZ @ 38 NONAME ; enum TLanguage CApaAppData::ApplicationLanguage(void) const
+ ?ApplicationLanguage@RApaLsSession@@QBEHVTUid@@AAW4TLanguage@@@Z @ 39 NONAME ; int RApaLsSession::ApplicationLanguage(class TUid, enum TLanguage &) const
+ ?BringToForeground@TApaTask@@QAEXXZ @ 40 NONAME ; void TApaTask::BringToForeground(void)
+ ?CanUseScreenMode@CApaAppData@@QAEHH@Z @ 41 NONAME ; int CApaAppData::CanUseScreenMode(int)
+ ?CancelListPopulationCompleteObserver@RApaLsSession@@QBEHXZ @ 42 NONAME ; int RApaLsSession::CancelListPopulationCompleteObserver(void) const
+ ?CancelNotify@RApaLsSession@@QAEXXZ @ 43 NONAME ; void RApaLsSession::CancelNotify(void)
+ ?CancelNotifyOnDataMappingChange@RApaLsSession@@QAEXXZ @ 44 NONAME ; void RApaLsSession::CancelNotifyOnDataMappingChange(void)
+ ?CancelRecognizeFiles@RApaLsSession@@QAEXXZ @ 45 NONAME ; void RApaLsSession::CancelRecognizeFiles(void)
+ ?Capability@CApaAppData@@QBEXAAVTDes8@@@Z @ 46 NONAME ; void CApaAppData::Capability(class TDes8 &) const
+ ?Caption@CApaSystemControl@@QBE?AVTPtrC16@@XZ @ 47 NONAME ; class TPtrC16 CApaSystemControl::Caption(void) const
+ ?Caption@CApaWindowGroupName@@QBE?AVTPtrC16@@XZ @ 48 NONAME ; class TPtrC16 CApaWindowGroupName::Caption(void) const
+ ?CheckInterimFormatFileNotCorruptL@ForJavaMIDletInstaller@@SAXAAVRFile@@@Z @ 49 NONAME ABSENT ; void ForJavaMIDletInstaller::CheckInterimFormatFileNotCorruptL(class RFile &)
+ ?ClearFsSession@RApaLsSession@@SAXXZ @ 50 NONAME ; void RApaLsSession::ClearFsSession(void)
+ ?Close@RApaLsSession@@QAEXXZ @ 51 NONAME ; void RApaLsSession::Close(void)
+ ?CommitNonNativeApplicationsUpdatesL@RApaLsSession@@QAEXXZ @ 52 NONAME ; void RApaLsSession::CommitNonNativeApplicationsUpdatesL(void)
+ ?CompareStrings@CApaAppList@@SAHABVHBufC16@@0@Z @ 53 NONAME ABSENT ; int CApaAppList::CompareStrings(class HBufC16 const &, class HBufC16 const &)
+ ?Connect@RApaLsSession@@QAEHXZ @ 54 NONAME ; int RApaLsSession::Connect(void)
+ ?ConstructFromWgIdL@CApaWindowGroupName@@QAEXH@Z @ 55 NONAME ; void CApaWindowGroupName::ConstructFromWgIdL(int)
+ ?Control@CApaSystemControlList@@QBEPAVCApaSystemControl@@H@Z @ 56 NONAME ; class CApaSystemControl * CApaSystemControlList::Control(int) const
+ ?Control@CApaSystemControlList@@QBEPAVCApaSystemControl@@VTUid@@@Z @ 57 NONAME ; class CApaSystemControl * CApaSystemControlList::Control(class TUid) const
+ ?Count@CApaAppList@@QBEHXZ @ 58 NONAME ; int CApaAppList::Count(void) const
+ ?Count@CApaSystemControlList@@QBEHXZ @ 59 NONAME ; int CApaSystemControlList::Count(void) const
+ ?Count@CDataRecognitionResultArray@@QBEIXZ @ 60 NONAME ; unsigned int CDataRecognitionResultArray::Count(void) const
+ ?CreateDocument@RApaLsSession@@QAEHABVTDesC16@@VTUid@@AAVTThreadId@@W4TLaunchType@1@@Z @ 61 NONAME ; int RApaLsSession::CreateDocument(class TDesC16 const &, class TUid, class TThreadId &, enum RApaLsSession::TLaunchType)
+ ?CreateL@CApaSystemControl@@QAEXXZ @ 62 NONAME ; void CApaSystemControl::CreateL(void)
+ ?CycleTasks@TApaTaskList@@QAEHVTUid@@W4TCycleDirection@1@@Z @ 63 NONAME ; int TApaTaskList::CycleTasks(class TUid, enum TApaTaskList::TCycleDirection)
+ ?DataType@CApaAppData@@QBEJABVTDataType@@@Z @ 64 NONAME ; long CApaAppData::DataType(class TDataType const &) const
+ ?DataTypes@TApaAppServiceInfo@@QBEABV?$CArrayFixFlat@VTDataTypeWithPriority@@@@XZ @ 65 NONAME ; class CArrayFixFlat<class TDataTypeWithPriority> const & TApaAppServiceInfo::DataTypes(void) const
+ ?DefaultScreenNumber@CApaAppData@@QBEIXZ @ 66 NONAME ; unsigned int CApaAppData::DefaultScreenNumber(void) const
+ ?DeleteDataMapping@RApaLsSession@@QAEHABVTDataType@@@Z @ 67 NONAME ; int RApaLsSession::DeleteDataMapping(class TDataType const &)
+ ?DeleteDataMapping@RApaLsSession@@QAEHABVTDataType@@VTUid@@@Z @ 68 NONAME ; int RApaLsSession::DeleteDataMapping(class TDataType const &, class TUid)
+ ?DeregisterNonNativeApplicationL@RApaLsSession@@QAEXVTUid@@@Z @ 69 NONAME ; void RApaLsSession::DeregisterNonNativeApplicationL(class TUid)
+ ?DeregisterNonNativeApplicationTypeL@RApaLsSession@@QAEXVTUid@@@Z @ 70 NONAME ; void RApaLsSession::DeregisterNonNativeApplicationTypeL(class TUid)
+ ?DocName@CApaWindowGroupName@@QBE?AVTPtrC16@@XZ @ 71 NONAME ; class TPtrC16 CApaWindowGroupName::DocName(void) const
+ ?DocNameIsAFile@CApaWindowGroupName@@QBEHXZ @ 72 NONAME ; int CApaWindowGroupName::DocNameIsAFile(void) const
+ ?DocumentL@CApaDoor@@QAEPAVCApaDocument@@H@Z @ 73 NONAME ; class CApaDocument * CApaDoor::DocumentL(int)
+ ?EmbeddableAppCount@RApaLsSession@@QBEHAAH@Z @ 74 NONAME ; int RApaLsSession::EmbeddableAppCount(int &) const
+ ?EndTask@TApaTask@@QAEXXZ @ 75 NONAME ; void TApaTask::EndTask(void)
+ ?Exists@TApaTask@@QBEHXZ @ 76 NONAME ; int TApaTask::Exists(void) const
+ ?ExternalizeL@CApaMaskedBitmap@@QBEXAAVRWriteStream@@@Z @ 77 NONAME ; void CApaMaskedBitmap::ExternalizeL(class RWriteStream &) const
+ ?FileName@CApaSystemControl@@QBE?AV?$TBuf@$0BAA@@@XZ @ 78 NONAME ; class TBuf<256> CApaSystemControl::FileName(void) const
+ ?FindAndAddSpecificAppL@CApaAppList@@QAEPAVCApaAppData@@PAVCApaAppRegFinder@@VTUid@@@Z @ 79 NONAME ; class CApaAppData * CApaAppList::FindAndAddSpecificAppL(class CApaAppRegFinder *, class TUid)
+ ?FindApp@TApaTaskList@@QAE?AVTApaTask@@ABVTDesC16@@@Z @ 80 NONAME ; class TApaTask TApaTaskList::FindApp(class TDesC16 const &)
+ ?FindApp@TApaTaskList@@QAE?AVTApaTask@@VTUid@@@Z @ 81 NONAME ; class TApaTask TApaTaskList::FindApp(class TUid)
+ ?FindByAppUid@CApaWindowGroupName@@SAXVTUid@@AAVRWsSession@@AAH@Z @ 82 NONAME ; void CApaWindowGroupName::FindByAppUid(class TUid, class RWsSession &, int &)
+ ?FindByCaption@CApaWindowGroupName@@SAXABVTDesC16@@AAVRWsSession@@AAH@Z @ 83 NONAME ; void CApaWindowGroupName::FindByCaption(class TDesC16 const &, class RWsSession &, int &)
+ ?FindByDocName@CApaWindowGroupName@@SAXABVTDesC16@@AAVRWsSession@@AAH@Z @ 84 NONAME ; void CApaWindowGroupName::FindByDocName(class TDesC16 const &, class RWsSession &, int &)
+ ?FindByPos@TApaTaskList@@QAE?AVTApaTask@@H@Z @ 85 NONAME ; class TApaTask TApaTaskList::FindByPos(int)
+ ?FindDoc@TApaTaskList@@QAE?AVTApaTask@@ABVTDesC16@@@Z @ 86 NONAME ; class TApaTask TApaTaskList::FindDoc(class TDesC16 const &)
+ ?FirstApp@CApaAppList@@QBEPAVCApaAppData@@H@Z @ 87 NONAME ; class CApaAppData * CApaAppList::FirstApp(int) const
+ ?FirstApp@CApaAppList@@QBEPAVCApaAppData@@XZ @ 88 NONAME ; class CApaAppData * CApaAppList::FirstApp(void) const
+ ?ForceRegistration@RApaLsSession@@QAEHABV?$RPointerArray@VTDesC16@@@@@Z @ 89 NONAME ; int RApaLsSession::ForceRegistration(class RPointerArray<class TDesC16> const &)
+ ?FsSession@RApaLsSession@@SAPAVRFs@@XZ @ 90 NONAME ; class RFs * RApaLsSession::FsSession(void)
+ ?GetAcceptedConfidence@RApaLsSession@@QBEHAAH@Z @ 91 NONAME ; int RApaLsSession::GetAcceptedConfidence(int &) const
+ ?GetAllApps@RApaLsSession@@QBEHH@Z @ 92 NONAME ; int RApaLsSession::GetAllApps(int) const
+ ?GetAllApps@RApaLsSession@@QBEHXZ @ 93 NONAME ; int RApaLsSession::GetAllApps(void) const
+ ?GetAppByDataType@RApaLsSession@@QBEHABVTDataType@@VTUid@@AAV3@@Z @ 94 NONAME ; int RApaLsSession::GetAppByDataType(class TDataType const &, class TUid, class TUid &) const
+ ?GetAppCapability@RApaLsSession@@QBEHAAVTDes8@@VTUid@@@Z @ 95 NONAME ; int RApaLsSession::GetAppCapability(class TDes8 &, class TUid) const
+ ?GetAppIcon@RApaLsSession@@QBEHVTUid@@AAPAVHBufC16@@@Z @ 96 NONAME ; int RApaLsSession::GetAppIcon(class TUid, class HBufC16 * &) const
+ ?GetAppIcon@RApaLsSession@@QBEHVTUid@@AAVRFile@@@Z @ 97 NONAME ; int RApaLsSession::GetAppIcon(class TUid, class RFile &) const
+ ?GetAppIcon@RApaLsSession@@QBEHVTUid@@HAAVCApaMaskedBitmap@@@Z @ 98 NONAME ; int RApaLsSession::GetAppIcon(class TUid, int, class CApaMaskedBitmap &) const
+ ?GetAppIcon@RApaLsSession@@QBEHVTUid@@VTSize@@AAVCApaMaskedBitmap@@@Z @ 99 NONAME ; int RApaLsSession::GetAppIcon(class TUid, class TSize, class CApaMaskedBitmap &) const
+ ?GetAppIconSizes@RApaLsSession@@QBEHVTUid@@AAV?$CArrayFixFlat@VTSize@@@@@Z @ 100 NONAME ; int RApaLsSession::GetAppIconSizes(class TUid, class CArrayFixFlat<class TSize> &) const
+ ?GetAppInfo@RApaLsSession@@QBEHAAVTApaAppInfo@@VTUid@@@Z @ 101 NONAME ; int RApaLsSession::GetAppInfo(class TApaAppInfo &, class TUid) const
+ ?GetAppOwnedFiles@RApaLsSession@@QBEHAAVCDesC16Array@@VTUid@@@Z @ 102 NONAME ; int RApaLsSession::GetAppOwnedFiles(class CDesC16Array &, class TUid) const
+ ?GetAppServiceOpaqueDataLC@RApaLsSession@@QBEPAVCApaAppServiceInfoArray@@VTUid@@0@Z @ 103 NONAME ; class CApaAppServiceInfoArray * RApaLsSession::GetAppServiceOpaqueDataLC(class TUid, class TUid) const
+ ?GetAppServicesL@RApaLsSession@@QBEXVTUid@@AAV?$CArrayFixFlat@VTUid@@@@@Z @ 104 NONAME ; void RApaLsSession::GetAppServicesL(class TUid, class CArrayFixFlat<class TUid> &) const
+ ?GetAppServicesLC@RApaLsSession@@QBEPAVCApaAppServiceInfoArray@@VTUid@@@Z @ 105 NONAME ; class CApaAppServiceInfoArray * RApaLsSession::GetAppServicesLC(class TUid) const
+ ?GetAppType@RApaLsSession@@QBEHAAVTUid@@V2@@Z @ 106 NONAME ; int RApaLsSession::GetAppType(class TUid &, class TUid) const
+ ?GetAppViewIcon@RApaLsSession@@QBEHVTUid@@0AAPAVHBufC16@@@Z @ 107 NONAME ; int RApaLsSession::GetAppViewIcon(class TUid, class TUid, class HBufC16 * &) const
+ ?GetAppViewIcon@RApaLsSession@@QBEHVTUid@@0ABVTSize@@AAVCApaMaskedBitmap@@@Z @ 108 NONAME ; int RApaLsSession::GetAppViewIcon(class TUid, class TUid, class TSize const &, class CApaMaskedBitmap &) const
+ ?GetAppViews@RApaLsSession@@QBEHAAV?$CArrayFixFlat@VTApaAppViewInfo@@@@VTUid@@@Z @ 109 NONAME ; int RApaLsSession::GetAppViews(class CArrayFixFlat<class TApaAppViewInfo> &, class TUid) const
+ ?GetDataRecognitionResultL@CDataRecognitionResultArray@@QBEXAAVTDataRecognitionResult@@I@Z @ 110 NONAME ; void CDataRecognitionResultArray::GetDataRecognitionResultL(class TDataRecognitionResult &, unsigned int) const
+ ?GetDefaultScreenNumber@RApaLsSession@@QBEHAAHVTUid@@@Z @ 111 NONAME ; int RApaLsSession::GetDefaultScreenNumber(int &, class TUid) const
+ ?GetEmbeddableApps@RApaLsSession@@QBEHH@Z @ 112 NONAME ; int RApaLsSession::GetEmbeddableApps(int) const
+ ?GetEmbeddableApps@RApaLsSession@@QBEHXZ @ 113 NONAME ; int RApaLsSession::GetEmbeddableApps(void) const
+ ?GetFileNameL@CDataRecognitionResultArray@@QBEXAAV?$TBuf@$0BAA@@@I@Z @ 114 NONAME ; void CDataRecognitionResultArray::GetFileNameL(class TBuf<256> &, unsigned int) const
+ ?GetFilteredApps@RApaLsSession@@QBEHABVTApaEmbeddabilityFilter@@@Z @ 115 NONAME ; int RApaLsSession::GetFilteredApps(class TApaEmbeddabilityFilter const &) const
+ ?GetFilteredApps@RApaLsSession@@QBEHABVTApaEmbeddabilityFilter@@H@Z @ 116 NONAME ; int RApaLsSession::GetFilteredApps(class TApaEmbeddabilityFilter const &, int) const
+ ?GetFilteredApps@RApaLsSession@@QBEHII@Z @ 117 NONAME ; int RApaLsSession::GetFilteredApps(unsigned int, unsigned int) const
+ ?GetFilteredApps@RApaLsSession@@QBEHIIH@Z @ 118 NONAME ; int RApaLsSession::GetFilteredApps(unsigned int, unsigned int, int) const
+ ?GetIconInfo@CApaAppData@@QBEXAAH0@Z @ 119 NONAME ; void CApaAppData::GetIconInfo(int &, int &) const
+ ?GetJavaMIDletInfoL@ForJavaMIDletInstaller@@SAXAAVRFs@@ABVTDesC16@@AAK2@Z @ 120 NONAME ABSENT ; void ForJavaMIDletInstaller::GetJavaMIDletInfoL(class RFs &, class TDesC16 const &, unsigned long &, unsigned long &)
+ ?GetMaxDataBufSize@RApaLsSession@@QBEHAAH@Z @ 121 NONAME ; int RApaLsSession::GetMaxDataBufSize(int &) const
+ ?GetNextApp@RApaLsSession@@QBEHAAVTApaAppInfo@@@Z @ 122 NONAME ; int RApaLsSession::GetNextApp(class TApaAppInfo &) const
+ ?GetNextApp@RApaLsSession@@QBEHAAVTApaAppInfo@@H@Z @ 123 NONAME ; int RApaLsSession::GetNextApp(class TApaAppInfo &, int) const
+ ?GetPreferredBufSize@RApaLsSession@@QBEHAAH@Z @ 124 NONAME ; int RApaLsSession::GetPreferredBufSize(int &) const
+ ?GetServerApps@RApaLsSession@@QBEHVTUid@@@Z @ 125 NONAME ; int RApaLsSession::GetServerApps(class TUid) const
+ ?GetServerApps@RApaLsSession@@QBEHVTUid@@H@Z @ 126 NONAME ; int RApaLsSession::GetServerApps(class TUid, int) const
+ ?GetServiceImplementationsLC@RApaLsSession@@QBEPAVCApaAppServiceInfoArray@@VTUid@@@Z @ 127 NONAME ; class CApaAppServiceInfoArray * RApaLsSession::GetServiceImplementationsLC(class TUid) const
+ ?GetServiceImplementationsLC@RApaLsSession@@QBEPAVCApaAppServiceInfoArray@@VTUid@@ABVTDataType@@@Z @ 128 NONAME ; class CApaAppServiceInfoArray * RApaLsSession::GetServiceImplementationsLC(class TUid, class TDataType const &) const
+ ?GetSupportedDataTypesL@RApaLsSession@@QBEHAAV?$CArrayFixFlat@VTDataType@@@@@Z @ 129 NONAME ; int RApaLsSession::GetSupportedDataTypesL(class CArrayFixFlat<class TDataType> &) const
+ ?HandleAsRegistrationFile@ApaUtils@@SAHABVTUidType@@@Z @ 130 NONAME ABSENT ; int ApaUtils::HandleAsRegistrationFile(class TUidType const &)
+ ?Hidden@CApaWindowGroupName@@QBEHXZ @ 131 NONAME ; int CApaWindowGroupName::Hidden(void) const
+ ?Icon@CApaAppData@@QBEPAVCApaMaskedBitmap@@H@Z @ 132 NONAME ; class CApaMaskedBitmap * CApaAppData::Icon(int) const
+ ?Icon@CApaAppData@@QBEPAVCApaMaskedBitmap@@VTSize@@@Z @ 133 NONAME ; class CApaMaskedBitmap * CApaAppData::Icon(class TSize) const
+ ?Icon@CApaAppViewData@@QBEPAVCApaMaskedBitmap@@ABVTSize@@@Z @ 134 NONAME ; class CApaMaskedBitmap * CApaAppViewData::Icon(class TSize const &) const
+ ?Icon@CApaSystemControl@@QBEPAVCApaMaskedBitmap@@XZ @ 135 NONAME ; class CApaMaskedBitmap * CApaSystemControl::Icon(void) const
+ ?IconFileName@CApaAppData@@QBE?AVTPtrC16@@XZ @ 136 NONAME ; class TPtrC16 CApaAppData::IconFileName(void) const
+ ?IconFileName@CApaAppViewData@@QBE?AVTPtrC16@@XZ @ 137 NONAME ; class TPtrC16 CApaAppViewData::IconFileName(void) const
+ ?IconSizesL@CApaAppData@@QBEPAV?$CArrayFixFlat@VTSize@@@@XZ @ 138 NONAME ; class CArrayFixFlat<class TSize> * CApaAppData::IconSizesL(void) const
+ ?IconSizesL@CApaAppViewData@@QBEPAV?$CArrayFixFlat@VTSize@@@@XZ @ 139 NONAME ; class CArrayFixFlat<class TSize> * CApaAppViewData::IconSizesL(void) const
+ ?ImplementsService@CApaAppData@@QBEHVTUid@@@Z @ 140 NONAME ; int CApaAppData::ImplementsService(class TUid) const
+ ?Index@CApaSystemControlList@@QBEHVTUid@@@Z @ 141 NONAME ; int CApaSystemControlList::Index(class TUid) const
+ ?InitListL@CApaAppList@@QAEXPAVMApaAppListObserver@@@Z @ 142 NONAME ; void CApaAppList::InitListL(class MApaAppListObserver *)
+ ?InsertDataMapping@RApaLsSession@@QAEHABVTDataType@@JVTUid@@1@Z @ 143 NONAME ; int RApaLsSession::InsertDataMapping(class TDataType const &, long, class TUid, class TUid)
+ ?InsertDataMapping@RApaLsSession@@QAEHABVTDataType@@JVTUid@@@Z @ 144 NONAME ; int RApaLsSession::InsertDataMapping(class TDataType const &, long, class TUid)
+ ?InsertDataMappingIfHigher@RApaLsSession@@QAEHABVTDataType@@JVTUid@@AAH@Z @ 145 NONAME ; int RApaLsSession::InsertDataMappingIfHigher(class TDataType const &, long, class TUid, int &)
+ ?InternalizeL@CApaMaskedBitmap@@QAEXAAVRReadStream@@@Z @ 146 NONAME ; void CApaMaskedBitmap::InternalizeL(class RReadStream &)
+ ?IsAppReady@CApaWindowGroupName@@QBEHXZ @ 147 NONAME ; int CApaWindowGroupName::IsAppReady(void) const
+ ?IsBusy@CApaWindowGroupName@@QBEHXZ @ 148 NONAME ; int CApaWindowGroupName::IsBusy(void) const
+ ?IsFirstScanComplete@CApaAppList@@QBEHXZ @ 149 NONAME ; int CApaAppList::IsFirstScanComplete(void) const
+ ?IsIdleUpdateComplete@CApaAppList@@QBEHXZ @ 150 NONAME ; int CApaAppList::IsIdleUpdateComplete(void) const
+ ?IsLanguageChangePending@CApaAppList@@QBEHXZ @ 151 NONAME ; int CApaAppList::IsLanguageChangePending(void) const
+ ?IsPending@CApaAppData@@QBEHXZ @ 152 NONAME ; int CApaAppData::IsPending(void) const
+ ?IsProgram@RApaLsSession@@QBEHABVTDesC16@@AAH@Z @ 153 NONAME ; int RApaLsSession::IsProgram(class TDesC16 const &, int &) const
+ ?IsSystem@CApaWindowGroupName@@QBEHXZ @ 154 NONAME ; int CApaWindowGroupName::IsSystem(void) const
+ ?KillTask@TApaTask@@QAEXXZ @ 155 NONAME ; void TApaTask::KillTask(void)
+ ?LocalisableResourceFileName@CApaAppData@@QBE?AVTPtrC16@@XZ @ 156 NONAME ; class TPtrC16 CApaAppData::LocalisableResourceFileName(void) const
+ ?MApaAppListServObserver_Reserved1@MApaAppListServObserver@@EAEXXZ @ 157 NONAME ; void MApaAppListServObserver::MApaAppListServObserver_Reserved1(void)
+ ?MApaAppListServObserver_Reserved2@MApaAppListServObserver@@EAEXXZ @ 158 NONAME ; void MApaAppListServObserver::MApaAppListServObserver_Reserved2(void)
+ ?Mask@CApaMaskedBitmap@@QBEPAVCFbsBitmap@@XZ @ 159 NONAME ; class CFbsBitmap * CApaMaskedBitmap::Mask(void) const
+ ?MatchesSecurityPolicy@RApaLsSession@@QBEHAAHVTUid@@ABVTSecurityPolicy@@@Z @ 160 NONAME ; int RApaLsSession::MatchesSecurityPolicy(int &, class TUid, class TSecurityPolicy const &) const
+ ?MinApplicationStackSize@@YAIXZ @ 161 NONAME ; unsigned int MinApplicationStackSize(void)
+ ?New@CApaWindowGroupName@@SAPAV1@ABVRWsSession@@PAVHBufC16@@@Z @ 162 NONAME ; class CApaWindowGroupName * CApaWindowGroupName::New(class RWsSession const &, class HBufC16 *)
+ ?NewInterimFormatFileWriterLC@ForJavaMIDletInstaller@@SAPAVCApaAppInfoFileWriter@@AAVRFs@@ABVTDesC16@@VTUid@@KH@Z @ 163 NONAME ABSENT ; class CApaAppInfoFileWriter * ForJavaMIDletInstaller::NewInterimFormatFileWriterLC(class RFs &, class TDesC16 const &, class TUid, unsigned long, int)
+ ?NewL@CApaAppData@@SAPAV1@ABVTApaAppEntry@@AAVRFs@@@Z @ 164 NONAME ; class CApaAppData * CApaAppData::NewL(class TApaAppEntry const &, class RFs &)
+ ?NewL@CApaAppList@@SAPAV1@AAVRFs@@PAVCApaAppRegFinder@@HH@Z @ 165 NONAME ABSENT ; class CApaAppList * CApaAppList::NewL(class RFs &, class CApaAppRegFinder *, int, int)
+ ?NewL@CApaAppListNotifier@@SAPAV1@PAVMApaAppListServObserver@@W4TPriority@CActive@@@Z @ 166 NONAME ; class CApaAppListNotifier * CApaAppListNotifier::NewL(class MApaAppListServObserver *, enum CActive::TPriority)
+ ?NewL@CApaDoor@@SAPAV1@AAVRFs@@AAVCApaDocument@@ABVTSize@@@Z @ 167 NONAME ; class CApaDoor * CApaDoor::NewL(class RFs &, class CApaDocument &, class TSize const &)
+ ?NewL@CApaDoor@@SAPAV1@AAVRFs@@ABVCStreamStore@@VTStreamId@@AAVCApaProcess@@@Z @ 168 NONAME ; class CApaDoor * CApaDoor::NewL(class RFs &, class CStreamStore const &, class TStreamId, class CApaProcess &)
+ ?NewL@CApaLocalisableResourceFileWriter@@SAPAV1@ABVTDesC16@@0H0@Z @ 169 NONAME ; class CApaLocalisableResourceFileWriter * CApaLocalisableResourceFileWriter::NewL(class TDesC16 const &, class TDesC16 const &, int, class TDesC16 const &)
+ ?NewL@CApaMaskedBitmap@@SAPAV1@PBV1@@Z @ 170 NONAME ; class CApaMaskedBitmap * CApaMaskedBitmap::NewL(class CApaMaskedBitmap const *)
+ ?NewL@CApaRegistrationResourceFileWriter@@SAPAV1@VTUid@@ABVTDesC16@@I@Z @ 171 NONAME ; class CApaRegistrationResourceFileWriter * CApaRegistrationResourceFileWriter::NewL(class TUid, class TDesC16 const &, unsigned int)
+ ?NewL@CApaSystemControlList@@SAPAV1@AAVRFs@@@Z @ 172 NONAME ; class CApaSystemControlList * CApaSystemControlList::NewL(class RFs &)
+ ?NewL@CApaWindowGroupName@@SAPAV1@ABVRWsSession@@@Z @ 173 NONAME ; class CApaWindowGroupName * CApaWindowGroupName::NewL(class RWsSession const &)
+ ?NewL@CApaWindowGroupName@@SAPAV1@ABVRWsSession@@ABVTDesC16@@@Z @ 174 NONAME ; class CApaWindowGroupName * CApaWindowGroupName::NewL(class RWsSession const &, class TDesC16 const &)
+ ?NewL@CApaWindowGroupName@@SAPAV1@ABVRWsSession@@H@Z @ 175 NONAME ; class CApaWindowGroupName * CApaWindowGroupName::NewL(class RWsSession const &, int)
+ ?NewLC@CApaDoor@@SAPAV1@AAVRFs@@AAVCApaDocument@@ABVTSize@@@Z @ 176 NONAME ; class CApaDoor * CApaDoor::NewLC(class RFs &, class CApaDocument &, class TSize const &)
+ ?NewLC@CApaMaskedBitmap@@SAPAV1@XZ @ 177 NONAME ; class CApaMaskedBitmap * CApaMaskedBitmap::NewLC(void)
+ ?NewLC@CApaWindowGroupName@@SAPAV1@ABVRWsSession@@@Z @ 178 NONAME ; class CApaWindowGroupName * CApaWindowGroupName::NewLC(class RWsSession const &)
+ ?NewLC@CApaWindowGroupName@@SAPAV1@ABVRWsSession@@ABVTDesC16@@@Z @ 179 NONAME ; class CApaWindowGroupName * CApaWindowGroupName::NewLC(class RWsSession const &, class TDesC16 const &)
+ ?NewLC@CApaWindowGroupName@@SAPAV1@ABVRWsSession@@H@Z @ 180 NONAME ; class CApaWindowGroupName * CApaWindowGroupName::NewLC(class RWsSession const &, int)
+ ?NewPictureL@TApaPictureFactory@@UBEXAAVTPictureHeader@@ABVCStreamStore@@@Z @ 181 NONAME ; void TApaPictureFactory::NewPictureL(class TPictureHeader &, class CStreamStore const &) const
+ ?NextApp@CApaAppList@@QBEPAVCApaAppData@@PBV2@@Z @ 182 NONAME ; class CApaAppData * CApaAppList::NextApp(class CApaAppData const *) const
+ ?NextApp@CApaAppList@@QBEPAVCApaAppData@@PBV2@H@Z @ 183 NONAME ; class CApaAppData * CApaAppList::NextApp(class CApaAppData const *, int) const
+ ?NonMbmIconFile@CApaAppData@@QBEHXZ @ 184 NONAME ; int CApaAppData::NonMbmIconFile(void) const
+ ?NonMbmIconFile@CApaAppViewData@@QBEHXZ @ 185 NONAME ; int CApaAppViewData::NonMbmIconFile(void) const
+ ?NonNativeApplicationType@CApaAppData@@QBE?AVTUid@@XZ @ 186 NONAME ; class TUid CApaAppData::NonNativeApplicationType(void) const
+ ?NotifyOnDataMappingChange@RApaLsSession@@QAEXAAVTRequestStatus@@@Z @ 187 NONAME ; void RApaLsSession::NotifyOnDataMappingChange(class TRequestStatus &)
+ ?NumberOfOwnDefinedIcons@RApaLsSession@@QBEHVTUid@@AAH@Z @ 188 NONAME ; int RApaLsSession::NumberOfOwnDefinedIcons(class TUid, int &) const
+ ?OpaqueData@CApaAppData@@QBE?AVTPtrC8@@XZ @ 189 NONAME ; class TPtrC8 CApaAppData::OpaqueData(void) const
+ ?OpaqueData@TApaAppServiceInfo@@QBEABVTDesC8@@XZ @ 190 NONAME ; class TDesC8 const & TApaAppServiceInfo::OpaqueData(void) const
+ ?OwnedFiles@CApaAppData@@QBEPAVCDesC16Array@@XZ @ 191 NONAME ; class CDesC16Array * CApaAppData::OwnedFiles(void) const
+ ?Path@CDataRecognitionResultArray@@QBEABV?$TBuf@$0BAA@@@XZ @ 192 NONAME ; class TBuf<256> const & CDataRecognitionResultArray::Path(void) const
+ ?PreferredDataHandlerL@CApaAppList@@QBE?AVTUid@@ABVTDataType@@@Z @ 193 NONAME ; class TUid CApaAppList::PreferredDataHandlerL(class TDataType const &) const
+ ?PreferredDataHandlerL@CApaAppList@@QBE?AVTUid@@ABVTDataType@@PBV2@AAH@Z @ 194 NONAME ; class TUid CApaAppList::PreferredDataHandlerL(class TDataType const &, class TUid const *, int &) const
+ ?PrepareNonNativeApplicationsUpdatesL@RApaLsSession@@QAEXXZ @ 195 NONAME ; void RApaLsSession::PrepareNonNativeApplicationsUpdatesL(void)
+ ?PurgeL@CApaAppList@@QAEXXZ @ 196 NONAME ; void CApaAppList::PurgeL(void)
+ ?RApaLsSession_Reserved1@RApaLsSession@@EAEXXZ @ 197 NONAME ; void RApaLsSession::RApaLsSession_Reserved1(void)
+ ?RApaLsSession_Reserved2@RApaLsSession@@EAEXXZ @ 198 NONAME ; void RApaLsSession::RApaLsSession_Reserved2(void)
+ ?RecognizeData@RApaLsSession@@QBEHABVRFile@@AAVTDataRecognitionResult@@@Z @ 199 NONAME ; int RApaLsSession::RecognizeData(class RFile const &, class TDataRecognitionResult &) const
+ ?RecognizeData@RApaLsSession@@QBEHABVTDesC16@@ABVTDesC8@@AAVTDataRecognitionResult@@@Z @ 200 NONAME ; int RApaLsSession::RecognizeData(class TDesC16 const &, class TDesC8 const &, class TDataRecognitionResult &) const
+ ?RecognizeFilesL@RApaLsSession@@QAEXABVTDesC16@@AAVCDataRecognitionResultArray@@AAVTRequestStatus@@@Z @ 201 NONAME ; void RApaLsSession::RecognizeFilesL(class TDesC16 const &, class CDataRecognitionResultArray &, class TRequestStatus &)
+ ?RecognizeFilesL@RApaLsSession@@QAEXABVTDesC16@@ABVTDesC8@@AAVCDataRecognitionResultArray@@AAVTRequestStatus@@@Z @ 202 NONAME ; void RApaLsSession::RecognizeFilesL(class TDesC16 const &, class TDesC8 const &, class CDataRecognitionResultArray &, class TRequestStatus &)
+ ?RecognizeFilesL@RApaLsSession@@QBEHABVTDesC16@@AAVCDataRecognitionResultArray@@@Z @ 203 NONAME ; int RApaLsSession::RecognizeFilesL(class TDesC16 const &, class CDataRecognitionResultArray &) const
+ ?RecognizeFilesL@RApaLsSession@@QBEHABVTDesC16@@ABVTDesC8@@AAVCDataRecognitionResultArray@@@Z @ 204 NONAME ; int RApaLsSession::RecognizeFilesL(class TDesC16 const &, class TDesC8 const &, class CDataRecognitionResultArray &) const
+ ?RecognizeSpecificData@RApaLsSession@@QBEHABVRFile@@ABVTDataType@@AAH@Z @ 205 NONAME ; int RApaLsSession::RecognizeSpecificData(class RFile const &, class TDataType const &, int &) const
+ ?RecognizeSpecificData@RApaLsSession@@QBEHABVTDesC16@@ABVTDesC8@@ABVTDataType@@AAH@Z @ 206 NONAME ; int RApaLsSession::RecognizeSpecificData(class TDesC16 const &, class TDesC8 const &, class TDataType const &, int &) const
+ ?RegisterListPopulationCompleteObserver@RApaLsSession@@QBEXAAVTRequestStatus@@@Z @ 207 NONAME ; void RApaLsSession::RegisterListPopulationCompleteObserver(class TRequestStatus &) const
+ ?RegisterNonNativeApplicationL@RApaLsSession@@QAEXVTUid@@ABVTDriveUnit@@AAVCApaRegistrationResourceFileWriter@@PAVCApaLocalisableResourceFileWriter@@PBVRFile@@@Z @ 208 NONAME ; void RApaLsSession::RegisterNonNativeApplicationL(class TUid, class TDriveUnit const &, class CApaRegistrationResourceFileWriter &, class CApaLocalisableResourceFileWriter *, class RFile const *)
+ ?RegisterNonNativeApplicationTypeL@RApaLsSession@@QAEXVTUid@@ABVTDesC16@@@Z @ 209 NONAME ; void RApaLsSession::RegisterNonNativeApplicationTypeL(class TUid, class TDesC16 const &)
+ ?RegistrationFileName@CApaAppData@@QBE?AVTPtrC16@@XZ @ 210 NONAME ; class TPtrC16 CApaAppData::RegistrationFileName(void) const
+ ?RegistrationFileUsed@CApaAppData@@QBEHXZ @ 211 NONAME ; int CApaAppData::RegistrationFileUsed(void) const
+ ?ResetForcedRegistrations@CApaAppList@@QAEXXZ @ 212 NONAME ; void CApaAppList::ResetForcedRegistrations(void)
+ ?RespondsToShutdownEvent@CApaWindowGroupName@@QBEHXZ @ 213 NONAME ; int CApaWindowGroupName::RespondsToShutdownEvent(void) const
+ ?RespondsToSwitchFilesEvent@CApaWindowGroupName@@QBEHXZ @ 214 NONAME ; int CApaWindowGroupName::RespondsToSwitchFilesEvent(void) const
+ ?RestartScanL@CApaAppList@@QAEXXZ @ 215 NONAME ; void CApaAppList::RestartScanL(void)
+ ?RestoreL@CApaDoor@@QAEXABVCStreamStore@@VTStreamId@@@Z @ 216 NONAME ; void CApaDoor::RestoreL(class CStreamStore const &, class TStreamId)
+ ?RollbackNonNativeApplicationsUpdates@RApaLsSession@@QAEHXZ @ 217 NONAME ; int RApaLsSession::RollbackNonNativeApplicationsUpdates(void)
+ ?ScreenMode@CApaAppViewData@@QBEHXZ @ 218 NONAME ; int CApaAppViewData::ScreenMode(void) const
+ ?Self@CApaAppList@@SAPAV1@XZ @ 219 NONAME ; class CApaAppList * CApaAppList::Self(void)
+ ?SendKey@TApaTask@@QAEXABUTKeyEvent@@@Z @ 220 NONAME ; void TApaTask::SendKey(struct TKeyEvent const &)
+ ?SendKey@TApaTask@@QAEXHH@Z @ 221 NONAME ; void TApaTask::SendKey(int, int)
+ ?SendMessage@TApaTask@@QAEHVTUid@@ABVTDesC8@@@Z @ 222 NONAME ; int TApaTask::SendMessage(class TUid, class TDesC8 const &)
+ ?SendSystemEvent@TApaTask@@QAEXW4TApaSystemEvent@@@Z @ 223 NONAME ; void TApaTask::SendSystemEvent(enum TApaSystemEvent)
+ ?SendToBackground@TApaTask@@QAEXXZ @ 224 NONAME ; void TApaTask::SendToBackground(void)
+ ?ServiceArrayBufferL@CApaAppList@@QBEPAVCBufFlat@@VTUid@@@Z @ 225 NONAME ; class CBufFlat * CApaAppList::ServiceArrayBufferL(class TUid) const
+ ?ServiceImplArrayBufferL@CApaAppList@@QBEPAVCBufFlat@@VTUid@@@Z @ 226 NONAME ; class CBufFlat * CApaAppList::ServiceImplArrayBufferL(class TUid) const
+ ?ServiceImplArrayBufferL@CApaAppList@@QBEPAVCBufFlat@@VTUid@@ABVTDataType@@@Z @ 227 NONAME ; class CBufFlat * CApaAppList::ServiceImplArrayBufferL(class TUid, class TDataType const &) const
+ ?ServiceOpaqueDataBufferL@CApaAppList@@QBEPAVCBufFlat@@VTUid@@0@Z @ 228 NONAME ; class CBufFlat * CApaAppList::ServiceOpaqueDataBufferL(class TUid, class TUid) const
+ ?ServiceUidBufferL@CApaAppList@@QBEPAVCBufFlat@@VTUid@@@Z @ 229 NONAME ; class CBufFlat * CApaAppList::ServiceUidBufferL(class TUid) const
+ ?SetAcceptedConfidence@RApaLsSession@@QAEHH@Z @ 230 NONAME ; int RApaLsSession::SetAcceptedConfidence(int)
+ ?SetAppIsHiddenL@CApaRegistrationResourceFileWriter@@QAEXH@Z @ 231 NONAME ; void CApaRegistrationResourceFileWriter::SetAppIsHiddenL(int)
+ ?SetAppReady@CApaWindowGroupName@@QAEXH@Z @ 232 NONAME ; void CApaWindowGroupName::SetAppReady(int)
+ ?SetAppShortCaption@RApaLsSession@@QAEHABVTDesC16@@W4TLanguage@@VTUid@@@Z @ 233 NONAME ; int RApaLsSession::SetAppShortCaption(class TDesC16 const &, enum TLanguage, class TUid)
+ ?SetAppUid@CApaWindowGroupName@@QAEXVTUid@@@Z @ 234 NONAME ; void CApaWindowGroupName::SetAppUid(class TUid)
+ ?SetBusy@CApaWindowGroupName@@QAEXH@Z @ 235 NONAME ; void CApaWindowGroupName::SetBusy(int)
+ ?SetCapability@CApaAppInfoFileWriter@@QAEHABVTDesC8@@@Z @ 236 NONAME ABSENT ; int CApaAppInfoFileWriter::SetCapability(class TDesC8 const &)
+ ?SetCaptionL@CApaWindowGroupName@@QAEXABVTDesC16@@@Z @ 237 NONAME ; void CApaWindowGroupName::SetCaptionL(class TDesC16 const &)
+ ?SetDefaultScreenNumberL@CApaRegistrationResourceFileWriter@@QAEXH@Z @ 238 NONAME ; void CApaRegistrationResourceFileWriter::SetDefaultScreenNumberL(int)
+ ?SetDocNameIsAFile@CApaWindowGroupName@@QAEXH@Z @ 239 NONAME ; void CApaWindowGroupName::SetDocNameIsAFile(int)
+ ?SetDocNameL@CApaWindowGroupName@@QAEXABVTDesC16@@@Z @ 240 NONAME ; void CApaWindowGroupName::SetDocNameL(class TDesC16 const &)
+ ?SetEmbeddabilityL@CApaRegistrationResourceFileWriter@@QAEXW4TEmbeddability@TApaAppCapability@@@Z @ 241 NONAME ; void CApaRegistrationResourceFileWriter::SetEmbeddabilityL(enum TApaAppCapability::TEmbeddability)
+ ?SetFormatToGlassL@CApaDoor@@QAEXXZ @ 242 NONAME ; void CApaDoor::SetFormatToGlassL(void)
+ ?SetFormatToIconL@CApaDoor@@QAEXXZ @ 243 NONAME ; void CApaDoor::SetFormatToIconL(void)
+ ?SetFormatToTemporaryIconL@CApaDoor@@QAEXH@Z @ 244 NONAME ; void CApaDoor::SetFormatToTemporaryIconL(int)
+ ?SetFsSessionL@RApaLsSession@@SAXAAVRFs@@@Z @ 245 NONAME ; void RApaLsSession::SetFsSessionL(class RFs &)
+ ?SetGroupNameL@CApaRegistrationResourceFileWriter@@QAEXABVTDesC16@@@Z @ 246 NONAME ; void CApaRegistrationResourceFileWriter::SetGroupNameL(class TDesC16 const &)
+ ?SetHidden@CApaWindowGroupName@@QAEXH@Z @ 247 NONAME ; void CApaWindowGroupName::SetHidden(int)
+ ?SetLaunchInBackgroundL@CApaRegistrationResourceFileWriter@@QAEXH@Z @ 248 NONAME ; void CApaRegistrationResourceFileWriter::SetLaunchInBackgroundL(int)
+ ?SetMaskBitmap@CApaMaskedBitmap@@QAEXPAVCFbsBitmap@@@Z @ 249 NONAME ; void CApaMaskedBitmap::SetMaskBitmap(class CFbsBitmap *)
+ ?SetMaxDataBufSize@RApaLsSession@@QAEHH@Z @ 250 NONAME ; int RApaLsSession::SetMaxDataBufSize(int)
+ ?SetNotify@RApaLsSession@@QAEXHAAVTRequestStatus@@@Z @ 251 NONAME ; void RApaLsSession::SetNotify(int, class TRequestStatus &)
+ ?SetOpaqueDataL@CApaRegistrationResourceFileWriter@@QAEXABVTDesC8@@@Z @ 252 NONAME ; void CApaRegistrationResourceFileWriter::SetOpaqueDataL(class TDesC8 const &)
+ ?SetRespondsToShutdownEvent@CApaWindowGroupName@@QAEXH@Z @ 253 NONAME ; void CApaWindowGroupName::SetRespondsToShutdownEvent(int)
+ ?SetRespondsToSwitchFilesEvent@CApaWindowGroupName@@QAEXH@Z @ 254 NONAME ; void CApaWindowGroupName::SetRespondsToSwitchFilesEvent(int)
+ ?SetShortCaptionL@CApaAppData@@QAEXABVTDesC16@@@Z @ 255 NONAME ; void CApaAppData::SetShortCaptionL(class TDesC16 const &)
+ ?SetSupportsNewFileL@CApaRegistrationResourceFileWriter@@QAEXH@Z @ 256 NONAME ; void CApaRegistrationResourceFileWriter::SetSupportsNewFileL(int)
+ ?SetSystem@CApaWindowGroupName@@QAEXH@Z @ 257 NONAME ; void CApaWindowGroupName::SetSystem(int)
+ ?SetUpdatedAppsList@CApaAppList@@QAEXPAVCUpdatedAppsList@@@Z @ 258 NONAME ABSENT ; void CApaAppList::SetUpdatedAppsList(class CUpdatedAppsList *)
+ ?SetWgId@TApaTask@@QAEXH@Z @ 259 NONAME ; void TApaTask::SetWgId(int)
+ ?SetWindowGroupName@CApaWindowGroupName@@QAEXPAVHBufC16@@@Z @ 260 NONAME ; void CApaWindowGroupName::SetWindowGroupName(class HBufC16 *)
+ ?SetWindowGroupName@CApaWindowGroupName@@QBEHAAVRWindowGroup@@@Z @ 261 NONAME ; int CApaWindowGroupName::SetWindowGroupName(class RWindowGroup &) const
+ ?SetWindowGroupNameL@CApaWindowGroupName@@QAEXABVTDesC16@@@Z @ 262 NONAME ; void CApaWindowGroupName::SetWindowGroupNameL(class TDesC16 const &)
+ ?ShortCaption@CApaSystemControl@@QBE?AVTPtrC16@@XZ @ 263 NONAME ; class TPtrC16 CApaSystemControl::ShortCaption(void) const
+ ?StartApp@RApaLsSession@@QAEHABVCApaCommandLine@@@Z @ 264 NONAME ; int RApaLsSession::StartApp(class CApaCommandLine const &)
+ ?StartApp@RApaLsSession@@QAEHABVCApaCommandLine@@AAVTThreadId@@@Z @ 265 NONAME ; int RApaLsSession::StartApp(class CApaCommandLine const &, class TThreadId &)
+ ?StartApp@RApaLsSession@@QAEHABVCApaCommandLine@@AAVTThreadId@@PAVTRequestStatus@@@Z @ 266 NONAME ; int RApaLsSession::StartApp(class CApaCommandLine const &, class TThreadId &, class TRequestStatus *)
+ ?StartDocument@RApaLsSession@@QAEHAAVRFile@@AAVTThreadId@@PAVTRequestStatus@@@Z @ 267 NONAME ; int RApaLsSession::StartDocument(class RFile &, class TThreadId &, class TRequestStatus *)
+ ?StartDocument@RApaLsSession@@QAEHAAVRFile@@ABVTDataType@@AAVTThreadId@@PAVTRequestStatus@@@Z @ 268 NONAME ; int RApaLsSession::StartDocument(class RFile &, class TDataType const &, class TThreadId &, class TRequestStatus *)
+ ?StartDocument@RApaLsSession@@QAEHAAVRFile@@VTUid@@AAVTThreadId@@PAVTRequestStatus@@@Z @ 269 NONAME ; int RApaLsSession::StartDocument(class RFile &, class TUid, class TThreadId &, class TRequestStatus *)
+ ?StartDocument@RApaLsSession@@QAEHABVTDesC16@@AAVTThreadId@@W4TLaunchType@1@@Z @ 270 NONAME ; int RApaLsSession::StartDocument(class TDesC16 const &, class TThreadId &, enum RApaLsSession::TLaunchType)
+ ?StartDocument@RApaLsSession@@QAEHABVTDesC16@@ABVTDataType@@AAVTThreadId@@W4TLaunchType@1@@Z @ 271 NONAME ; int RApaLsSession::StartDocument(class TDesC16 const &, class TDataType const &, class TThreadId &, enum RApaLsSession::TLaunchType)
+ ?StartDocument@RApaLsSession@@QAEHABVTDesC16@@VTUid@@AAVTThreadId@@W4TLaunchType@1@@Z @ 272 NONAME ; int RApaLsSession::StartDocument(class TDesC16 const &, class TUid, class TThreadId &, enum RApaLsSession::TLaunchType)
+ ?StartIdleUpdateL@CApaAppList@@QAEXPAVMApaAppListObserver@@@Z @ 273 NONAME ; void CApaAppList::StartIdleUpdateL(class MApaAppListObserver *)
+ ?StartIdleUpdateL@CApaAppList@@QAEXXZ @ 274 NONAME ; void CApaAppList::StartIdleUpdateL(void)
+ ?StartupApaServer@@YAHAAVMApaAppStarter@@@Z @ 275 NONAME ABSENT ; int StartupApaServer(class MApaAppStarter &)
+ ?StartupApaServerProcess@@YAHXZ @ 276 NONAME ; int StartupApaServerProcess(void)
+ ?StopScan@CApaAppList@@QAEXH@Z @ 277 NONAME ; void CApaAppList::StopScan(int)
+ ?StoreL@CApaAppInfoFileWriter@@QAEXXZ @ 278 NONAME ABSENT ; void CApaAppInfoFileWriter::StoreL(void)
+ ?SwitchCreateFile@TApaTask@@QAEHABVTDesC16@@@Z @ 279 NONAME ; int TApaTask::SwitchCreateFile(class TDesC16 const &)
+ ?SwitchOpenFile@TApaTask@@QAEHABVTDesC16@@@Z @ 280 NONAME ; int TApaTask::SwitchOpenFile(class TDesC16 const &)
+ ?TestIconLoaderAndIconArrayL@TIconLoaderAndIconArrayForLeaks@@SAXXZ @ 281 NONAME ; void TIconLoaderAndIconArrayForLeaks::TestIconLoaderAndIconArrayL(void)
+ ?ThreadId@TApaTask@@QBE?AVTThreadId@@XZ @ 282 NONAME ; class TThreadId TApaTask::ThreadId(void) const
+ ?Type@CApaSystemControl@@QBE?AVTUid@@XZ @ 283 NONAME ; class TUid CApaSystemControl::Type(void) const
+ ?Uid@CApaAppViewData@@QBE?AVTUid@@XZ @ 284 NONAME ; class TUid CApaAppViewData::Uid(void) const
+ ?Uid@TApaAppServiceInfo@@QBE?AVTUid@@XZ @ 285 NONAME ; class TUid TApaAppServiceInfo::Uid(void) const
+ ?UpdateL@CApaSystemControlList@@QAEXXZ @ 286 NONAME ; void CApaSystemControlList::UpdateL(void)
+ ?UpdatedAppsList@CApaAppList@@QAEPAVCUpdatedAppsList@@XZ @ 287 NONAME ABSENT ; class CUpdatedAppsList * CApaAppList::UpdatedAppsList(void)
+ ?Version@RApaLsSession@@QBE?AVTVersion@@XZ @ 288 NONAME ; class TVersion RApaLsSession::Version(void) const
+ ?Views@CApaAppData@@QBEPAV?$CArrayPtrFlat@VCApaAppViewData@@@@XZ @ 289 NONAME ; class CArrayPtrFlat<class CApaAppViewData> * CApaAppData::Views(void) const
+ ?WgId@TApaTask@@QBEHXZ @ 290 NONAME ; int TApaTask::WgId(void) const
+ ?WindowGroupName@CApaWindowGroupName@@QBE?AVTPtrC16@@XZ @ 291 NONAME ; class TPtrC16 CApaWindowGroupName::WindowGroupName(void) const
+ ?KMinApplicationStackSize@@3HB @ 292 NONAME ; int const KMinApplicationStackSize
+ ?CheckAppSecurity@CApaSecurityUtils@@SAHABVTPtrC16@@AAH1@Z @ 293 NONAME ; int CApaSecurityUtils::CheckAppSecurity(class TPtrC16 const &, int &, int &)
+ ?SetCaptionL@CApaAppData@@QAEXABVTDesC16@@@Z @ 294 NONAME ; void CApaAppData::SetCaptionL(class TDesC16 const &)
+ ?SetIconsL@CApaAppData@@QAEXABVTDesC16@@H@Z @ 295 NONAME ; void CApaAppData::SetIconsL(class TDesC16 const &, int)
+ ?TestIconCaptionOverridesL@TIconLoaderAndIconArrayForLeaks@@SAXXZ @ 296 NONAME ; void TIconLoaderAndIconArrayForLeaks::TestIconCaptionOverridesL(void)
+ ?ForceCommitNonNativeApplicationsUpdatesL@RApaLsSession@@QAEXXZ @ 297 NONAME ; void RApaLsSession::ForceCommitNonNativeApplicationsUpdatesL(void)
+ ?DataTypes@TApaAppServiceInfo@@QAEAAV?$CArrayFixFlat@VTDataTypeWithPriority@@@@XZ @ 298 NONAME ; class CArrayFixFlat<class TDataTypeWithPriority> & TApaAppServiceInfo::DataTypes(void)
+ ??0TApaAppIdentifier@@QAE@XZ @ 299 NONAME ; TApaAppIdentifier::TApaAppIdentifier(void)
+ ?AddForcedRegistrationL@CApaAppList@@QAEXABVTDesC16@@@Z @ 300 NONAME ; void CApaAppList::AddForcedRegistrationL(class TDesC16 const &)
+ ?ExternalizeL@TApaAppCapability@@QBEXAAVRWriteStream@@@Z @ 301 NONAME ; void TApaAppCapability::ExternalizeL(class RWriteStream &) const
+ ??0TApaAppInfo@@QAE@VTUid@@ABV?$TBuf@$0BAA@@@11@Z @ 302 NONAME ; TApaAppInfo::TApaAppInfo(class TUid, class TBuf<256> const &, class TBuf<256> const &, class TBuf<256> const &)
+ ?AddEmbeddability@TApaEmbeddabilityFilter@@QAEXW4TEmbeddability@TApaAppCapability@@@Z @ 303 NONAME ; void TApaEmbeddabilityFilter::AddEmbeddability(enum TApaAppCapability::TEmbeddability)
+ ?InternalizeL@TApaAppServiceInfo@@QAEXAAVRReadStream@@@Z @ 304 NONAME ; void TApaAppServiceInfo::InternalizeL(class RReadStream &)
+ ?InternalizeL@TApaAppViewInfo@@QAEXAAVRReadStream@@@Z @ 305 NONAME ; void TApaAppViewInfo::InternalizeL(class RReadStream &)
+ ?MatchesEmbeddability@TApaEmbeddabilityFilter@@QBEHW4TEmbeddability@TApaAppCapability@@@Z @ 306 NONAME ; int TApaEmbeddabilityFilter::MatchesEmbeddability(enum TApaAppCapability::TEmbeddability) const
+ ?ExternalizeL@TApaAppServiceInfo@@QBEXAAVRWriteStream@@@Z @ 307 NONAME ; void TApaAppServiceInfo::ExternalizeL(class RWriteStream &) const
+ ??0CApaAppServiceInfoArray@@IAE@XZ @ 308 NONAME ; CApaAppServiceInfoArray::CApaAppServiceInfoArray(void)
+ ??0TApaAppIdentifier@@QAE@VTUid@@ABV?$TBuf@$0BAA@@@@Z @ 309 NONAME ; TApaAppIdentifier::TApaAppIdentifier(class TUid, class TBuf<256> const &)
+ ?CopyCapability@TApaAppCapability@@SAXAAVTDes8@@ABVTDesC8@@@Z @ 310 NONAME ; void TApaAppCapability::CopyCapability(class TDes8 &, class TDesC8 const &)
+ ??0TApaAppServiceInfo@@QAE@XZ @ 311 NONAME ; TApaAppServiceInfo::TApaAppServiceInfo(void)
+ ?Release@TApaAppServiceInfo@@QAEXXZ @ 312 NONAME ; void TApaAppServiceInfo::Release(void)
+ ?UpdateAppListByShortCaptionL@CApaAppList@@QAEXXZ @ 313 NONAME ; void CApaAppList::UpdateAppListByShortCaptionL(void)
+ ?ExternalizeL@TApaAppIdentifier@@QBEXAAVRWriteStream@@@Z @ 314 NONAME ; void TApaAppIdentifier::ExternalizeL(class RWriteStream &) const
+ ?ExternalizeL@TApaAppViewInfo@@QBEXAAVRWriteStream@@@Z @ 315 NONAME ; void TApaAppViewInfo::ExternalizeL(class RWriteStream &) const
+ ?NewL@CApaAppList@@SAPAV1@AAVRFs@@HH@Z @ 316 NONAME ; class CApaAppList * CApaAppList::NewL(class RFs &, int, int)
+ ?CApaAppServiceInfoArray_Reserved1@CApaAppServiceInfoArray@@EAEXXZ @ 317 NONAME ; void CApaAppServiceInfoArray::CApaAppServiceInfoArray_Reserved1(void)
+ ?ExternalizeL@TApaAppInfo@@QBEXAAVRWriteStream@@@Z @ 318 NONAME ; void TApaAppInfo::ExternalizeL(class RWriteStream &) const
+ ?InternalizeL@TApaAppCapability@@QAEXAAVRReadStream@@@Z @ 319 NONAME ; void TApaAppCapability::InternalizeL(class RReadStream &)
+ ??0TApaAppEntry@@QAE@XZ @ 320 NONAME ; TApaAppEntry::TApaAppEntry(void)
+ ?AddCustomAppInfoInListL@CApaAppList@@QAEXVTUid@@W4TLanguage@@ABVTDesC16@@@Z @ 321 NONAME ; void CApaAppList::AddCustomAppInfoInListL(class TUid, enum TLanguage, class TDesC16 const &)
+ ?CApaAppServiceInfoArray_Reserved2@CApaAppServiceInfoArray@@EAEXXZ @ 322 NONAME ; void CApaAppServiceInfoArray::CApaAppServiceInfoArray_Reserved2(void)
+ ?UpdateAppListByIconCaptionOverridesL@CApaAppList@@QAEXXZ @ 323 NONAME ; void CApaAppList::UpdateAppListByIconCaptionOverridesL(void)
+ ??0TApaAppInfo@@QAE@VTUid@@ABV?$TBuf@$0BAA@@@1@Z @ 324 NONAME ; TApaAppInfo::TApaAppInfo(class TUid, class TBuf<256> const &, class TBuf<256> const &)
+ ?InternalizeL@TApaAppInfo@@QAEXAAVRReadStream@@@Z @ 325 NONAME ; void TApaAppInfo::InternalizeL(class RReadStream &)
+ ??0TApaEmbeddabilityFilter@@QAE@XZ @ 326 NONAME ; TApaEmbeddabilityFilter::TApaEmbeddabilityFilter(void)
+ ?InternalizeL@TApaAppIdentifier@@QAEXAAVRReadStream@@@Z @ 327 NONAME ; void TApaAppIdentifier::InternalizeL(class RReadStream &)
+ ??0TApaAppViewInfo@@QAE@XZ @ 328 NONAME ; TApaAppViewInfo::TApaAppViewInfo(void)
+ ??0TApaAppInfo@@QAE@XZ @ 329 NONAME ; TApaAppInfo::TApaAppInfo(void)
+ ??0TApaAppViewInfo@@QAE@VTUid@@ABV?$TBuf@$0BAA@@@H@Z @ 330 NONAME ; TApaAppViewInfo::TApaAppViewInfo(class TUid, class TBuf<256> const &, int)
+ ??0TApaAppServiceInfo@@QAE@VTUid@@PAV?$CArrayFixFlat@VTDataTypeWithPriority@@@@PAVHBufC8@@@Z @ 331 NONAME ; TApaAppServiceInfo::TApaAppServiceInfo(class TUid, class CArrayFixFlat<class TDataTypeWithPriority> *, class HBufC8 *)
+ ?AppListUpdatePending@CApaAppList@@QAEHXZ @ 332 NONAME ; int CApaAppList::AppListUpdatePending(void)
+ ?RecognizeData@RApaLsSession@@QBEHABVTDesC8@@AAVTDataRecognitionResult@@@Z @333 NONAME ; TInt RecognizeData(class TDesC8 const &, class TDataRecognitionResult & ) const
+ ?UninstalledAppArray@CApaAppList@@QAEPAV?$CArrayFixFlat@VTUid@@@@XZ @ 334 NONAME ; class CArrayFixFlat<class TUid> * CApaAppList::UninstalledAppArray(void)
+ X @ 335 NONAME ABSENT ;
+ X @ 336 NONAME ABSENT ;
+ X @ 337 NONAME ABSENT ;
+ X @ 338 NONAME ABSENT ;
+ X @ 339 NONAME ABSENT ;
+ X @ 340 NONAME ABSENT ;
+ X @ 341 NONAME ABSENT ;
+ X @ 342 NONAME ABSENT ;
+ X @ 343 NONAME ABSENT ;
+ X @ 344 NONAME ABSENT ;
+ X @ 345 NONAME ABSENT ;
+ X @ 346 NONAME ABSENT ;
+ X @ 347 NONAME ABSENT ;
+ X @ 348 NONAME ABSENT ;
+ X @ 349 NONAME ABSENT ;
+
\ No newline at end of file
--- a/appfw/apparchitecture/eabi/APFILEU.DEF Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/eabi/APFILEU.DEF Tue Aug 31 15:24:25 2010 +0300
@@ -92,11 +92,11 @@
_ZTV14CAppSidChecker @ 91 NONAME ABSENT ; #<VT>#
_ZNK16CApaAppRegFinder9DriveListEv @ 92 NONAME ABSENT
_ZN16CApaAppRegFinder26FindAllRemovableMediaAppsLEv @ 93 NONAME ABSENT
- _ZN26CApaAppInstallationMonitor4NewLEP16CApaAppArcServer @ 94 NONAME
- _ZN26CApaAppInstallationMonitor5StartEv @ 95 NONAME
- _ZN26CApaAppInstallationMonitorD0Ev @ 96 NONAME
- _ZN26CApaAppInstallationMonitorD1Ev @ 97 NONAME
- _ZN26CApaAppInstallationMonitorD2Ev @ 98 NONAME
+ _ZN26CApaAppInstallationMonitor4NewLEP16CApaAppArcServer @ 94 NONAME ABSENT
+ _ZN26CApaAppInstallationMonitor5StartEv @ 95 NONAME ABSENT
+ _ZN26CApaAppInstallationMonitorD0Ev @ 96 NONAME ABSENT
+ _ZN26CApaAppInstallationMonitorD1Ev @ 97 NONAME ABSENT
+ _ZN26CApaAppInstallationMonitorD2Ev @ 98 NONAME ABSENT
_ZN21CApfMimeContentPolicy12IsClosedTypeERK7TDesC16 @ 99 NONAME
_ZN21CApfMimeContentPolicy13IsClosedFileLER5RFile @ 100 NONAME
_ZN21CApfMimeContentPolicy13IsClosedFileLERK7TDesC16 @ 101 NONAME
--- a/appfw/apparchitecture/eabi/APGRFXU.DEF Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/eabi/APGRFXU.DEF Tue Aug 31 15:24:25 2010 +0300
@@ -433,3 +433,13 @@
X @ 432 NONAME ABSENT
_ZN13RApaLsSession40ForceCommitNonNativeApplicationsUpdatesLEv @ 433 NONAME
_ZNK13RApaLsSession13RecognizeDataERK6TDesC8R22TDataRecognitionResult @ 434 NONAME
+ _ZN13RApaLsSession14UpdateAppListLER6RArrayI17TApaAppUpdateInfoE @ 435 NONAME
+ _ZN17TApaAppUpdateInfo12InternalizeLER11RReadStream @ 436 NONAME
+ _ZN17TApaAppUpdateInfoC1Ev @ 437 NONAME
+ _ZN17TApaAppUpdateInfoC2Ev @ 438 NONAME
+ _ZNK17TApaAppUpdateInfo12ExternalizeLER12RWriteStream @ 439 NONAME
+ _ZN17TApaAppUpdateInfoC1E4TUidNS_13TApaAppActionE @ 440 NONAME
+ _ZN17TApaAppUpdateInfoC2E4TUidNS_13TApaAppActionE @ 441 NONAME
+ _ZN13RApaLsSession16UpdatedAppsInfoLER6RArrayI17TApaAppUpdateInfoE @ 442 NONAME
+ _ZN13RApaLsSession17ForceRegistrationERK13RPointerArrayIN4Usif28CApplicationRegistrationDataEE @ 443 NONAME
+
--- a/appfw/apparchitecture/eabi/APSERVU.DEF Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/eabi/APSERVU.DEF Tue Aug 31 15:24:25 2010 +0300
@@ -56,13 +56,13 @@
_ZNK16CUpdatedAppsList8IsInListERK7TDesC16 @ 55 NONAME ABSENT
_ZTIN16CUpdatedAppsList15CUpdatedAppInfoE @ 56 NONAME ABSENT ; #<TI>#
_ZTVN16CUpdatedAppsList15CUpdatedAppInfoE @ 57 NONAME ABSENT ; #<VT>#
- _ZN16CApaAppArcServer14RescanCallBackEv @ 58 NONAME
+ _ZN16CApaAppArcServer14RescanCallBackEv @ 58 NONAME ABSENT
_ZTI18CCustomAppInfoData @ 59 NONAME ABSENT ; #<TI>#
_ZTV18CCustomAppInfoData @ 60 NONAME ABSENT ; #<VT>#
KApaLoadDataRecognizersOnDemand @ 61 NONAME DATA 4
KApaUnloadRecognizersTimeout @ 62 NONAME DATA 4
- _ZN16CApaAppArcServer27HandleInstallationEndEventLEv @ 63 NONAME
- _ZN16CApaAppArcServer28HandleInstallationStartEventEv @ 64 NONAME
+ _ZN16CApaAppArcServer27HandleInstallationEndEventLEv @ 63 NONAME ABSENT
+ _ZN16CApaAppArcServer28HandleInstallationStartEventEv @ 64 NONAME ABSENT
KApaDrivesToMonitor @ 65 NONAME DATA 4
KApaLoadMbmIconsOnDemand @ 66 NONAME DATA 4
_ZTI21CApaAppArcServSession @ 67 NONAME
--- a/appfw/apparchitecture/eabi/TICONFORLEAKSu.DEF Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/eabi/TICONFORLEAKSu.DEF Tue Aug 31 15:24:25 2010 +0300
@@ -5,23 +5,23 @@
_Z23StartupApaServerProcessv @ 4 NONAME
_ZN11CApaAppData16CanUseScreenModeEi @ 5 NONAME
_ZN11CApaAppData16SetShortCaptionLERK7TDesC16 @ 6 NONAME
- _ZN11CApaAppData4NewLERK12TApaAppEntryR3RFs @ 7 NONAME
+ _ZN11CApaAppData4NewLERK12TApaAppEntryR3RFs @ 7 NONAME ABSENT
_ZN11CApaAppDataD0Ev @ 8 NONAME
_ZN11CApaAppDataD1Ev @ 9 NONAME
_ZN11CApaAppDataD2Ev @ 10 NONAME
- _ZN11CApaAppList12RestartScanLEv @ 11 NONAME
+ _ZN11CApaAppList12RestartScanLEv @ 11 NONAME ABSENT
_ZN11CApaAppList14CompareStringsERK7HBufC16S2_ @ 12 NONAME ABSENT
_ZN11CApaAppList15UpdatedAppsListEv @ 13 NONAME ABSENT
_ZN11CApaAppList16StartIdleUpdateLEP19MApaAppListObserver @ 14 NONAME
_ZN11CApaAppList16StartIdleUpdateLEv @ 15 NONAME
_ZN11CApaAppList18SetUpdatedAppsListEP16CUpdatedAppsList @ 16 NONAME ABSENT
_ZN11CApaAppList22AddForcedRegistrationLEP7HBufC16 @ 17 NONAME ABSENT
- _ZN11CApaAppList22FindAndAddSpecificAppLEP16CApaAppRegFinder4TUid @ 18 NONAME
- _ZN11CApaAppList24ResetForcedRegistrationsEv @ 19 NONAME
+ _ZN11CApaAppList22FindAndAddSpecificAppLEP16CApaAppRegFinder4TUid @ 18 NONAME ABSENT
+ _ZN11CApaAppList24ResetForcedRegistrationsEv @ 19 NONAME ABSENT
_ZN11CApaAppList4NewLER3RFsP16CApaAppRegFinderii @ 20 NONAME ABSENT
_ZN11CApaAppList4SelfEv @ 21 NONAME
- _ZN11CApaAppList6PurgeLEv @ 22 NONAME
- _ZN11CApaAppList8StopScanEi @ 23 NONAME
+ _ZN11CApaAppList6PurgeLEv @ 22 NONAME ABSENT
+ _ZN11CApaAppList8StopScanEi @ 23 NONAME ABSENT
_ZN11CApaAppList9InitListLEP19MApaAppListObserver @ 24 NONAME
_ZN11CApaAppListD0Ev @ 25 NONAME
_ZN11CApaAppListD1Ev @ 26 NONAME
@@ -194,16 +194,16 @@
_ZNK11CApaAppData17ImplementsServiceE4TUid @ 193 NONAME
_ZNK11CApaAppData19ApplicationLanguageEv @ 194 NONAME
_ZNK11CApaAppData19DefaultScreenNumberEv @ 195 NONAME
- _ZNK11CApaAppData20RegistrationFileNameEv @ 196 NONAME
- _ZNK11CApaAppData20RegistrationFileUsedEv @ 197 NONAME
+ _ZNK11CApaAppData20RegistrationFileNameEv @ 196 NONAME ABSENT
+ _ZNK11CApaAppData20RegistrationFileUsedEv @ 197 NONAME ABSENT
_ZNK11CApaAppData24NonNativeApplicationTypeEv @ 198 NONAME
- _ZNK11CApaAppData27LocalisableResourceFileNameEv @ 199 NONAME
+ _ZNK11CApaAppData27LocalisableResourceFileNameEv @ 199 NONAME ABSENT
_ZNK11CApaAppData4IconE5TSize @ 200 NONAME
_ZNK11CApaAppData4IconEi @ 201 NONAME
_ZNK11CApaAppData5ViewsEv @ 202 NONAME
_ZNK11CApaAppData8AppEntryEv @ 203 NONAME
_ZNK11CApaAppData8DataTypeERK9TDataType @ 204 NONAME
- _ZNK11CApaAppData9IsPendingEv @ 205 NONAME
+ _ZNK11CApaAppData9IsPendingEv @ 205 NONAME ABSENT
_ZNK11CApaAppList12AppDataByUidE4TUid @ 206 NONAME
_ZNK11CApaAppList17AppDataByFileNameERK7TDesC16 @ 207 NONAME
_ZNK11CApaAppList17AppScanInProgressEv @ 208 NONAME
@@ -320,7 +320,7 @@
_ZNK8TApaTask6ExistsEv @ 319 NONAME
_ZNK8TApaTask8ThreadIdEv @ 320 NONAME
_ZN17CApaSecurityUtils16CheckAppSecurityERK7TPtrC16RiS3_ @ 321 NONAME
- _ZN11CApaAppList22AddForcedRegistrationLERK7TDesC16 @ 322 NONAME
+ _ZN11CApaAppList22AddForcedRegistrationLERK7TDesC16 @ 322 NONAME ABSENT
_ZN11CApaAppList23AddCustomAppInfoInListLE4TUid9TLanguageRK7TDesC16 @ 323 NONAME
_ZN11CApaAppList28UpdateAppListByShortCaptionLEv @ 324 NONAME
_ZN11CApaAppList4NewLER3RFsii @ 325 NONAME
@@ -411,6 +411,23 @@
_ZN11CApaAppList36UpdateAppListByIconCaptionOverridesLEv @ 410 NONAME
_ZN13RApaLsSession40ForceCommitNonNativeApplicationsUpdatesLEv @ 411 NONAME
_ZN31TIconLoaderAndIconArrayForLeaks25TestIconCaptionOverridesLEv @ 412 NONAME
- _ZN11CApaAppList20AppListUpdatePendingEv @ 413 NONAME
+ _ZN11CApaAppList20AppListUpdatePendingEv @ 413 NONAME ABSENT
_ZNK13RApaLsSession13RecognizeDataERK6TDesC8R22TDataRecognitionResult @ 414 NONAME
_ZN11CApaAppList19UninstalledAppArrayEv @ 415 NONAME
+ _ZN11CApaAppData4NewLERKN4Usif28CApplicationRegistrationDataER3RFsRKNS0_26RSoftwareComponentRegistryE @ 416 NONAME
+ _ZN11CApaAppList18InitializeApplistLEP19MApaAppListObserver @ 417 NONAME
+ _ZN11CApaAppList22FindAndAddSpecificAppLE4TUid @ 418 NONAME
+ _ZN13RApaLsSession14UpdateAppListLER6RArrayI17TApaAppUpdateInfoE @ 419 NONAME
+ _ZN17TApaAppUpdateInfo12InternalizeLER11RReadStream @ 420 NONAME
+ _ZN17TApaAppUpdateInfoC1Ev @ 421 NONAME
+ _ZN17TApaAppUpdateInfoC2Ev @ 422 NONAME
+ _ZNK17TApaAppUpdateInfo12ExternalizeLER12RWriteStream @ 423 NONAME
+ _ZN17TApaAppUpdateInfoC1E4TUidNS_13TApaAppActionE @ 424 NONAME
+ _ZN17TApaAppUpdateInfoC2E4TUidNS_13TApaAppActionE @ 425 NONAME
+ _ZN11CApaAppData19IsLangChangePendingEv @ 426 NONAME
+ _ZN11CApaAppList14UpdateApplistLEP19MApaAppListObserverP6RArrayI17TApaAppUpdateInfoE4TUid @ 427 NONAME
+ _ZN11CApaAppList15UpdatedAppsInfoEv @ 428 NONAME
+ _ZN11CApaAppList28UpdateApplistByForceRegAppsLER13RPointerArrayIN4Usif28CApplicationRegistrationDataEE @ 429 NONAME
+ _ZN13RApaLsSession16UpdatedAppsInfoLER6RArrayI17TApaAppUpdateInfoE @ 430 NONAME
+ _ZN13RApaLsSession17ForceRegistrationERK13RPointerArrayIN4Usif28CApplicationRegistrationDataEE @ 431 NONAME
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/eabi/apfile_legacyu.def Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,115 @@
+EXPORTS
+ _ZN19CApaAppLocatorProxy16GetAppEntryByUidER12TApaAppEntry4TUid @ 1 NONAME ABSENT
+ _ZN19CApaAppLocatorProxy21GetAppCapabilityByUidER5TDes84TUid @ 2 NONAME ABSENT
+ _ZN19CApaAppLocatorProxy4NewLER3RFs @ 3 NONAME ABSENT
+ _ZN19CApaAppLocatorProxyD0Ev @ 4 NONAME ABSENT
+ _ZN19CApaAppLocatorProxyD1Ev @ 5 NONAME ABSENT
+ _ZN19CApaAppLocatorProxyD2Ev @ 6 NONAME ABSENT
+ _ZN21CApaScanningAppFinder12FindAllAppsLEv @ 7 NONAME ABSENT
+ _ZN21CApaScanningAppFinder4NewLERK3RFs @ 8 NONAME ABSENT
+ _ZN21CApaScanningAppFinder5NewLCERK3RFs @ 9 NONAME ABSENT
+ _ZN21CApaScanningAppFinder5NextLER12TApaAppEntry @ 10 NONAME ABSENT
+ _ZN21CApaScanningAppFinder8FindAppLERK7TDesC164TUid @ 11 NONAME ABSENT
+ _ZN21CApaScanningAppFinderD0Ev @ 12 NONAME ABSENT
+ _ZN21CApaScanningAppFinderD1Ev @ 13 NONAME ABSENT
+ _ZN21CApaScanningAppFinderD2Ev @ 14 NONAME ABSENT
+ _ZN25CApaScanningControlFinder12FindAllAppsLEv @ 15 NONAME ABSENT
+ _ZN25CApaScanningControlFinder4NewLERK3RFs @ 16 NONAME ABSENT
+ _ZN25CApaScanningControlFinder5NewLCERK3RFs @ 17 NONAME ABSENT
+ _ZN25CApaScanningControlFinder5NextLER12TApaAppEntry @ 18 NONAME ABSENT
+ _ZN25CApaScanningControlFinder8FindAppLERK7TDesC164TUid @ 19 NONAME ABSENT
+ _ZN25CApaScanningControlFinderD0Ev @ 20 NONAME ABSENT
+ _ZN25CApaScanningControlFinderD1Ev @ 21 NONAME ABSENT
+ _ZN25CApaScanningControlFinderD2Ev @ 22 NONAME ABSENT
+ _ZN26CApaScanningFileRecognizer10ConstructLEv @ 23 NONAME ABSENT
+ _ZN26CApaScanningFileRecognizer14SetRecognizerLERKNS_11TRecognizerE @ 24 NONAME ABSENT
+ _ZN26CApaScanningFileRecognizer15RecognizerCountEv @ 25 NONAME ABSENT
+ _ZN26CApaScanningFileRecognizer19ScanForRecognizersLEv @ 26 NONAME ABSENT
+ _ZN26CApaScanningFileRecognizer23SetRecognizersFromListLERK13CArrayFixFlatINS_11TRecognizerEE @ 27 NONAME ABSENT
+ _ZN26CApaScanningFileRecognizer4NewLER3RFsP14MApaAppStarter @ 28 NONAME ABSENT
+ _ZN26CApaScanningFileRecognizerC1ER3RFsP14MApaAppStarter @ 29 NONAME ABSENT
+ _ZN26CApaScanningFileRecognizerC2ER3RFsP14MApaAppStarter @ 30 NONAME ABSENT
+ _ZN26CApaScanningFileRecognizerD0Ev @ 31 NONAME ABSENT
+ _ZN26CApaScanningFileRecognizerD1Ev @ 32 NONAME ABSENT
+ _ZN26CApaScanningFileRecognizerD2Ev @ 33 NONAME ABSENT
+ _ZN6Apfile8TempPathEv @ 34 NONAME ABSENT
+ _ZNK21CApaScanningAppFinder22DefaultAppInfoFileNameEv @ 35 NONAME ABSENT
+ _ZNK21CApaScanningAppFinder8TempPathEv @ 36 NONAME ABSENT
+ _ZNK25CApaScanningControlFinder22DefaultAppInfoFileNameEv @ 37 NONAME ABSENT
+ _ZNK25CApaScanningControlFinder8TempPathEv @ 38 NONAME ABSENT
+ _ZNK26CApaScanningFileRecognizer13UpdateCounterEv @ 39 NONAME ABSENT
+ _ZNK26CApaScanningFileRecognizer16RecognizerListLCEv @ 40 NONAME ABSENT
+ _ZNK26CApaScanningFileRecognizerixEi @ 41 NONAME ABSENT
+ _ZTI26CApaScanningFileRecognizer @ 42 NONAME ABSENT ; #<TI>#
+ _ZTV26CApaScanningFileRecognizer @ 43 NONAME ABSENT ; #<VT>#
+ _ZN26CApaScanningFileRecognizer18SetEcomRecognizerLERKNS_11TRecognizerE @ 44 NONAME ABSENT
+ _ZN26CApaScanningFileRecognizer27SetEcomRecognizersFromListLERK13CArrayFixFlatINS_11TRecognizerEE @ 45 NONAME ABSENT
+ _ZTI17CApaRecognizerDll @ 46 NONAME ABSENT ; #<TI>#
+ _ZTI19CApaAppLocatorProxy @ 47 NONAME ABSENT ; #<TI>#
+ _ZTI21CApaScanningAppFinder @ 48 NONAME ABSENT ; #<TI>#
+ _ZTI25CApaScanningControlFinder @ 49 NONAME ABSENT ; #<TI>#
+ _ZTIN26CApaScanningFileRecognizer27CApaBackupOperationObserverE @ 50 NONAME ABSENT ; #<TI>#
+ _ZTV17CApaRecognizerDll @ 51 NONAME ABSENT ; #<VT>#
+ _ZTV19CApaAppLocatorProxy @ 52 NONAME ABSENT ; #<VT>#
+ _ZTV21CApaScanningAppFinder @ 53 NONAME ABSENT ; #<VT>#
+ _ZTV25CApaScanningControlFinder @ 54 NONAME ABSENT ; #<VT>#
+ _ZTVN26CApaScanningFileRecognizer27CApaBackupOperationObserverE @ 55 NONAME ABSENT ; #<VT>#
+ _ZN16CApaAppRegFinder12FindAllAppsLEv @ 56 NONAME ABSENT
+ _ZN16CApaAppRegFinder4NewLERK3RFs @ 57 NONAME ABSENT
+ _ZN16CApaAppRegFinder5NewLCERK3RFs @ 58 NONAME ABSENT
+ _ZN16CApaAppRegFinder5NextLER12TApaAppEntry @ 59 NONAME ABSENT
+ _ZN16CApaAppRegFinder5NextLER12TApaAppEntryRK13RPointerArrayI7HBufC16E @ 60 NONAME ABSENT
+ _ZNK16CApaAppRegFinder8TempPathEv @ 61 NONAME ABSENT
+ _ZTI16CApaAppRegFinder @ 62 NONAME ABSENT ; #<TI>#
+ _ZTV16CApaAppRegFinder @ 63 NONAME ABSENT ; #<VT>#
+ _ZN17CAppLaunchChecker10Reserved_1Ev @ 64 NONAME
+ _ZN17CAppLaunchChecker10Reserved_2Ev @ 65 NONAME
+ _ZN17CAppLaunchChecker10Reserved_3Ev @ 66 NONAME
+ _ZN17CAppLaunchCheckerD0Ev @ 67 NONAME
+ _ZN17CAppLaunchCheckerD1Ev @ 68 NONAME
+ _ZN17CAppLaunchCheckerD2Ev @ 69 NONAME
+ _ZN28CApaScanningRuleBasedPlugIns4NewLEv @ 70 NONAME
+ _ZNK28CApaScanningRuleBasedPlugInsixEi @ 71 NONAME
+ _ZTI16CApaRuleBasedDll @ 72 NONAME ; #<TI>#
+ _ZTI17CAppLaunchChecker @ 73 NONAME ; #<TI>#
+ _ZTV16CApaRuleBasedDll @ 74 NONAME ; #<VT>#
+ _ZTV17CAppLaunchChecker @ 75 NONAME ; #<VT>#
+ _ZN28CApaScanningRuleBasedPlugInsD0Ev @ 76 NONAME
+ _ZN28CApaScanningRuleBasedPlugInsD1Ev @ 77 NONAME
+ _ZN28CApaScanningRuleBasedPlugInsD2Ev @ 78 NONAME
+ _ZTI28CApaScanningRuleBasedPlugIns @ 79 NONAME ; #<TI>#
+ _ZTV28CApaScanningRuleBasedPlugIns @ 80 NONAME ; #<VT>#
+ _ZN28CApaScanningRuleBasedPlugIns24ScanForRuleBasedPlugInsLEv @ 81 NONAME
+ _ZNK28CApaScanningRuleBasedPlugIns19ImplementationCountEv @ 82 NONAME
+ _ZN14CAppSidChecker18SetRescanCallBackLERK9TCallBack @ 83 NONAME ABSENT
+ _ZN14CAppSidChecker9reserved1Ev @ 84 NONAME ABSENT
+ _ZN14CAppSidChecker9reserved2Ev @ 85 NONAME ABSENT
+ _ZN14CAppSidChecker9reserved3Ev @ 86 NONAME ABSENT
+ _ZN14CAppSidCheckerD0Ev @ 87 NONAME ABSENT
+ _ZN14CAppSidCheckerD1Ev @ 88 NONAME ABSENT
+ _ZN14CAppSidCheckerD2Ev @ 89 NONAME ABSENT
+ _ZTI14CAppSidChecker @ 90 NONAME ABSENT ; #<TI>#
+ _ZTV14CAppSidChecker @ 91 NONAME ABSENT ; #<VT>#
+ _ZNK16CApaAppRegFinder9DriveListEv @ 92 NONAME ABSENT
+ _ZN16CApaAppRegFinder26FindAllRemovableMediaAppsLEv @ 93 NONAME ABSENT
+ _ZN26CApaAppInstallationMonitor4NewLEP16CApaAppArcServer @ 94 NONAME
+ _ZN26CApaAppInstallationMonitor5StartEv @ 95 NONAME
+ _ZN26CApaAppInstallationMonitorD0Ev @ 96 NONAME
+ _ZN26CApaAppInstallationMonitorD1Ev @ 97 NONAME
+ _ZN26CApaAppInstallationMonitorD2Ev @ 98 NONAME
+ _ZN21CApfMimeContentPolicy12IsClosedTypeERK7TDesC16 @ 99 NONAME
+ _ZN21CApfMimeContentPolicy13IsClosedFileLER5RFile @ 100 NONAME
+ _ZN21CApfMimeContentPolicy13IsClosedFileLERK7TDesC16 @ 101 NONAME
+ _ZN21CApfMimeContentPolicy14IsDRMEnvelopeLER5RFile @ 102 NONAME
+ _ZN21CApfMimeContentPolicy14IsDRMEnvelopeLERK7TDesC16 @ 103 NONAME
+ _ZN21CApfMimeContentPolicy17IsClosedExtensionERK7TDesC16 @ 104 NONAME
+ _ZN21CApfMimeContentPolicy4NewLER3RFs @ 105 NONAME
+ _ZN21CApfMimeContentPolicy4NewLEv @ 106 NONAME
+ _ZN21CApfMimeContentPolicy5NewLCER3RFs @ 107 NONAME
+ _ZN21CApfMimeContentPolicy5NewLCEv @ 108 NONAME
+ _ZN21CApfMimeContentPolicyD0Ev @ 109 NONAME
+ _ZN21CApfMimeContentPolicyD1Ev @ 110 NONAME
+ _ZN21CApfMimeContentPolicyD2Ev @ 111 NONAME
+ _ZTI21CApfMimeContentPolicy @ 112 NONAME
+ _ZTV21CApfMimeContentPolicy @ 113 NONAME
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/eabi/apgrfx_legacyu.def Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,445 @@
+EXPORTS
+ _ZNK11CApaAppData11GetIconInfoERiS0_ @ 1 NONAME ABSENT
+ _ZN11CApaAppData16CanUseScreenModeEi @ 2 NONAME ABSENT
+ _ZN11CApaAppList16StartIdleUpdateLEP19MApaAppListObserver @ 3 NONAME ABSENT
+ _ZN11CApaAppList16StartIdleUpdateLEv @ 4 NONAME ABSENT
+ _ZN11CApaAppList4NewLER3RFsP16CApaAppRegFinderii @ 5 NONAME ABSENT
+ _ZN11CApaAppList6PurgeLEv @ 6 NONAME ABSENT
+ _ZN11CApaAppList7UpdateLEv @ 7 NONAME ABSENT
+ _ZN11CApaAppList9InitListLEP19MApaAppListObserver @ 8 NONAME ABSENT
+ _ZN11CApaAppListD0Ev @ 9 NONAME ABSENT
+ _ZN11CApaAppListD1Ev @ 10 NONAME ABSENT
+ _ZN11CApaAppListD2Ev @ 11 NONAME ABSENT
+ _ZN12TApaTaskList10CycleTasksE4TUidNS_15TCycleDirectionE @ 12 NONAME
+ _ZN12TApaTaskList7FindAppE4TUid @ 13 NONAME
+ _ZN12TApaTaskList7FindAppERK7TDesC16 @ 14 NONAME
+ _ZN12TApaTaskList7FindDocERK7TDesC16 @ 15 NONAME
+ _ZN12TApaTaskList9FindByPosEi @ 16 NONAME
+ _ZN12TApaTaskListC1ER10RWsSession @ 17 NONAME
+ _ZN12TApaTaskListC2ER10RWsSession @ 18 NONAME
+ _ZN13RApaLsSession13StartDocumentERK7TDesC164TUidR9TThreadIdNS_11TLaunchTypeE @ 19 NONAME
+ _ZN13RApaLsSession13StartDocumentERK7TDesC16R9TThreadIdNS_11TLaunchTypeE @ 20 NONAME
+ _ZN13RApaLsSession13StartDocumentERK7TDesC16RK9TDataTypeR9TThreadIdNS_11TLaunchTypeE @ 21 NONAME
+ _ZN13RApaLsSession14CreateDocumentERK7TDesC164TUidR9TThreadIdNS_11TLaunchTypeE @ 22 NONAME
+ _ZN13RApaLsSession17SetMaxDataBufSizeEi @ 23 NONAME
+ _ZN13RApaLsSession21SetAcceptedConfidenceEi @ 24 NONAME
+ _ZN13RApaLsSession7ConnectEv @ 25 NONAME
+ _ZN13RApaLsSession8StartAppERK15CApaCommandLine @ 26 NONAME
+ _ZN13RApaLsSession8StartAppERK15CApaCommandLineR9TThreadId @ 27 NONAME
+ _ZN13RApaLsSessionC1Ev @ 28 NONAME
+ _ZN13RApaLsSessionC2Ev @ 29 NONAME
+ _ZN16AppInfoFileUtils14GetAifFileNameERK3RFsR6TDes16 @ 30 NONAME ABSENT
+ _ZN16CApaMaskedBitmap12InternalizeLER11RReadStream @ 31 NONAME
+ _ZN16CApaMaskedBitmap13SetMaskBitmapEP10CFbsBitmap @ 32 NONAME
+ _ZN16CApaMaskedBitmap4NewLEPKS_ @ 33 NONAME
+ _ZN16CApaMaskedBitmap5NewLCEv @ 34 NONAME
+ _ZN16CApaMaskedBitmapD0Ev @ 35 NONAME
+ _ZN16CApaMaskedBitmapD1Ev @ 36 NONAME
+ _ZN16CApaMaskedBitmapD2Ev @ 37 NONAME
+ _ZN17CApaSystemControl7CreateLEv @ 38 NONAME
+ _ZN18TApaPictureFactoryC1EP11CApaProcess @ 39 NONAME
+ _ZN18TApaPictureFactoryC2EP11CApaProcess @ 40 NONAME
+ _ZN19CApaAppListNotifier4NewLEP23MApaAppListServObserverN7CActive9TPriorityE @ 41 NONAME
+ _ZN19CApaAppListNotifierD0Ev @ 42 NONAME
+ _ZN19CApaAppListNotifierD1Ev @ 43 NONAME
+ _ZN19CApaAppListNotifierD2Ev @ 44 NONAME
+ _ZN19CApaWindowGroupName11SetAppReadyEi @ 45 NONAME
+ _ZN19CApaWindowGroupName11SetCaptionLERK7TDesC16 @ 46 NONAME
+ _ZN19CApaWindowGroupName11SetDocNameLERK7TDesC16 @ 47 NONAME
+ _ZN19CApaWindowGroupName12FindByAppUidE4TUidR10RWsSessionRi @ 48 NONAME
+ _ZN19CApaWindowGroupName13FindByCaptionERK7TDesC16R10RWsSessionRi @ 49 NONAME
+ _ZN19CApaWindowGroupName13FindByDocNameERK7TDesC16R10RWsSessionRi @ 50 NONAME
+ _ZN19CApaWindowGroupName17SetDocNameIsAFileEi @ 51 NONAME
+ _ZN19CApaWindowGroupName18ConstructFromWgIdLEi @ 52 NONAME
+ _ZN19CApaWindowGroupName18SetWindowGroupNameEP7HBufC16 @ 53 NONAME
+ _ZN19CApaWindowGroupName19SetWindowGroupNameLERK7TDesC16 @ 54 NONAME
+ _ZN19CApaWindowGroupName26SetRespondsToShutdownEventEi @ 55 NONAME
+ _ZN19CApaWindowGroupName29SetRespondsToSwitchFilesEventEi @ 56 NONAME
+ _ZN19CApaWindowGroupName3NewERK10RWsSessionP7HBufC16 @ 57 NONAME
+ _ZN19CApaWindowGroupName4NewLERK10RWsSession @ 58 NONAME
+ _ZN19CApaWindowGroupName4NewLERK10RWsSessionRK7TDesC16 @ 59 NONAME
+ _ZN19CApaWindowGroupName4NewLERK10RWsSessioni @ 60 NONAME
+ _ZN19CApaWindowGroupName5NewLCERK10RWsSession @ 61 NONAME
+ _ZN19CApaWindowGroupName5NewLCERK10RWsSessionRK7TDesC16 @ 62 NONAME
+ _ZN19CApaWindowGroupName5NewLCERK10RWsSessioni @ 63 NONAME
+ _ZNK19CApaWindowGroupName6HiddenEv @ 64 NONAME
+ _ZN19CApaWindowGroupName7SetBusyEi @ 65 NONAME
+ _ZN19CApaWindowGroupName9SetAppUidE4TUid @ 66 NONAME
+ _ZN19CApaWindowGroupName9SetHiddenEi @ 67 NONAME
+ _ZN19CApaWindowGroupName9SetSystemEi @ 68 NONAME
+ _ZN19CApaWindowGroupNameD0Ev @ 69 NONAME
+ _ZN19CApaWindowGroupNameD1Ev @ 70 NONAME
+ _ZN19CApaWindowGroupNameD2Ev @ 71 NONAME
+ _ZN21CApaAppInfoFileReader12StretchDrawLEP10CFbsBitmapS1_5TSize @ 72 NONAME ABSENT
+ _ZN21CApaAppInfoFileReader19CreateMaskedBitmapLEi @ 73 NONAME ABSENT
+ _ZN21CApaAppInfoFileReader4NewLER3RFsRK7TDesC164TUid @ 74 NONAME ABSENT
+ _ZN21CApaAppInfoFileReader5NewLCER3RFsRK7TDesC164TUid @ 75 NONAME ABSENT
+ _ZN21CApaAppInfoFileReader8CaptionLE9TLanguage @ 76 NONAME ABSENT
+ _ZN21CApaAppInfoFileReaderD0Ev @ 77 NONAME ABSENT
+ _ZN21CApaAppInfoFileReaderD1Ev @ 78 NONAME ABSENT
+ _ZN21CApaAppInfoFileReaderD2Ev @ 79 NONAME ABSENT
+ _ZN21CApaAppInfoFileWriter10StoreViewLE4TUid @ 80 NONAME ABSENT
+ _ZN21CApaAppInfoFileWriter11AddCaptionLE9TLanguageRK7TDesC16 @ 81 NONAME ABSENT
+ _ZN21CApaAppInfoFileWriter12AddDataTypeLERK21TDataTypeWithPriority @ 82 NONAME ABSENT
+ _ZN21CApaAppInfoFileWriter12AddViewIconLER16CApaMaskedBitmap4TUid @ 83 NONAME ABSENT
+ _ZN21CApaAppInfoFileWriter13AddOwnedFileLERK7TDesC16 @ 84 NONAME ABSENT
+ _ZN21CApaAppInfoFileWriter13SetCapabilityERK6TDesC8 @ 85 NONAME ABSENT
+ _ZN21CApaAppInfoFileWriter15AddViewCaptionLE9TLanguageRK7TDesC164TUid @ 86 NONAME ABSENT
+ _ZN21CApaAppInfoFileWriter5NewLCER3RFsRK7TDesC164TUid @ 87 NONAME ABSENT
+ _ZN21CApaAppInfoFileWriter6StoreLEv @ 88 NONAME ABSENT
+ _ZN21CApaAppInfoFileWriter8AddIconLER16CApaMaskedBitmap @ 89 NONAME ABSENT
+ _ZN21CApaAppInfoFileWriter8AddIconLERK7TDesC16 @ 90 NONAME ABSENT
+ _ZN21CApaAppInfoFileWriter8AddViewLE4TUid @ 91 NONAME ABSENT
+ _ZN21CApaAppInfoFileWriter8AddViewLE4TUidi @ 92 NONAME ABSENT
+ _ZN21CApaAppInfoFileWriterD0Ev @ 93 NONAME ABSENT
+ _ZN21CApaAppInfoFileWriterD1Ev @ 94 NONAME ABSENT
+ _ZN21CApaAppInfoFileWriterD2Ev @ 95 NONAME ABSENT
+ _ZN21CApaSystemControlList4NewLER3RFsR13CApaAppFinderRK7TDesC16 @ 96 NONAME ABSENT
+ _ZN21CApaSystemControlList7UpdateLEv @ 97 NONAME
+ _ZN21CApaSystemControlListD0Ev @ 98 NONAME
+ _ZN21CApaSystemControlListD1Ev @ 99 NONAME
+ _ZN21CApaSystemControlListD2Ev @ 100 NONAME
+ _ZN8CApaDoor16SetFormatToIconLEv @ 101 NONAME
+ _ZN8CApaDoor17SetFormatToGlassLEv @ 102 NONAME
+ _ZN8CApaDoor25SetFormatToTemporaryIconLEi @ 103 NONAME
+ _ZN8CApaDoor4NewLER3RFsR12CApaDocumentRK5TSize @ 104 NONAME
+ _ZN8CApaDoor4NewLER3RFsRK12CStreamStore9TStreamIdR11CApaProcess @ 105 NONAME
+ _ZN8CApaDoor5NewLCER3RFsR12CApaDocumentRK5TSize @ 106 NONAME
+ _ZN8CApaDoor8RestoreLERK12CStreamStore9TStreamId @ 107 NONAME
+ _ZN8CApaDoor9DocumentLEi @ 108 NONAME
+ _ZN8CApaDoorD0Ev @ 109 NONAME
+ _ZN8CApaDoorD1Ev @ 110 NONAME
+ _ZN8CApaDoorD2Ev @ 111 NONAME
+ _ZN8TApaTask11SendMessageE4TUidRK6TDesC8 @ 112 NONAME
+ _ZN8TApaTask14SwitchOpenFileERK7TDesC16 @ 113 NONAME
+ _ZN8TApaTask15SendSystemEventE15TApaSystemEvent @ 114 NONAME
+ _ZN8TApaTask16SendToBackgroundEv @ 115 NONAME
+ _ZN8TApaTask16SwitchCreateFileERK7TDesC16 @ 116 NONAME
+ _ZN8TApaTask17BringToForegroundEv @ 117 NONAME
+ _ZN8TApaTask7EndTaskEv @ 118 NONAME
+ _ZN8TApaTask7SendKeyERK9TKeyEvent @ 119 NONAME
+ _ZN8TApaTask7SendKeyEii @ 120 NONAME
+ _ZN8TApaTask7SetWgIdEi @ 121 NONAME
+ _ZN8TApaTask8KillTaskEv @ 122 NONAME
+ _ZN8TApaTaskC1ER10RWsSession @ 123 NONAME
+ _ZN8TApaTaskC2ER10RWsSession @ 124 NONAME
+ _ZNK11CApaAppData10CapabilityER5TDes8 @ 125 NONAME ABSENT
+ _ZNK11CApaAppData10IconSizesLEv @ 126 NONAME ABSENT
+ _ZNK11CApaAppData10OwnedFilesEv @ 127 NONAME ABSENT
+ _ZNK11CApaAppData4IconE5TSize @ 128 NONAME ABSENT
+ _ZNK11CApaAppData4IconEi @ 129 NONAME ABSENT
+ _ZNK11CApaAppData5ViewsEv @ 130 NONAME ABSENT
+ _ZNK11CApaAppData8AppEntryEv @ 131 NONAME ABSENT
+ _ZNK11CApaAppData8DataTypeERK9TDataType @ 132 NONAME ABSENT
+ _ZNK11CApaAppList12AppDataByUidE4TUid @ 133 NONAME ABSENT
+ _ZNK11CApaAppList13UpdateCounterEv @ 134 NONAME ABSENT
+ _ZNK11CApaAppList19IsFirstScanCompleteEv @ 135 NONAME ABSENT
+ _ZNK11CApaAppList20IsIdleUpdateCompleteEv @ 136 NONAME ABSENT
+ _ZNK11CApaAppList21PreferredDataHandlerLERK9TDataType @ 137 NONAME ABSENT
+ _ZNK11CApaAppList5CountEv @ 138 NONAME ABSENT
+ _ZNK11CApaAppList7NextAppEPK11CApaAppData @ 139 NONAME ABSENT
+ _ZNK11CApaAppList7NextAppEPK11CApaAppDatai @ 140 NONAME ABSENT
+ _ZNK11CApaAppList8FirstAppEi @ 141 NONAME ABSENT
+ _ZNK11CApaAppList8FirstAppEv @ 142 NONAME ABSENT
+ _ZNK13RApaLsSession10GetAllAppsEi @ 143 NONAME
+ _ZNK13RApaLsSession10GetAllAppsEv @ 144 NONAME
+ _ZNK13RApaLsSession10GetAppIconE4TUid5TSizeR16CApaMaskedBitmap @ 145 NONAME
+ _ZNK13RApaLsSession10GetAppIconE4TUidiR16CApaMaskedBitmap @ 146 NONAME
+ _ZNK13RApaLsSession10GetAppInfoER11TApaAppInfo4TUid @ 147 NONAME
+ _ZNK13RApaLsSession10GetNextAppER11TApaAppInfo @ 148 NONAME
+ _ZNK13RApaLsSession10GetNextAppER11TApaAppInfoi @ 149 NONAME
+ _ZNK13RApaLsSession11GetAppViewsER13CArrayFixFlatI15TApaAppViewInfoE4TUid @ 150 NONAME
+ _ZNK13RApaLsSession13RecognizeDataERK7TDesC16RK6TDesC8R22TDataRecognitionResult @ 151 NONAME
+ _ZNK13RApaLsSession14AppForDataTypeERK9TDataTypeR4TUid @ 152 NONAME
+ _ZNK13RApaLsSession14AppForDocumentERK7TDesC16R4TUidR9TDataType @ 153 NONAME
+ _ZNK13RApaLsSession14GetAppInfo_7_0ER15TApaAppInfo_7_04TUid @ 154 NONAME ABSENT
+ _ZNK13RApaLsSession14GetAppViewIconE4TUidS0_RK5TSizeR16CApaMaskedBitmap @ 155 NONAME
+ _ZNK13RApaLsSession14GetNextApp_7_0ER15TApaAppInfo_7_0 @ 156 NONAME ABSENT
+ _ZNK13RApaLsSession14GetNextApp_7_0ER15TApaAppInfo_7_0i @ 157 NONAME ABSENT
+ _ZNK13RApaLsSession15GetAppIconSizesE4TUidR13CArrayFixFlatI5TSizeE @ 158 NONAME
+ _ZNK13RApaLsSession15GetFilteredAppsERK23TApaEmbeddabilityFilter @ 159 NONAME
+ _ZNK13RApaLsSession15GetFilteredAppsERK23TApaEmbeddabilityFilteri @ 160 NONAME
+ _ZNK13RApaLsSession16GetAppCapabilityER5TDes84TUid @ 161 NONAME
+ _ZNK13RApaLsSession16GetAppOwnedFilesER12CDesC16Array4TUid @ 162 NONAME
+ _ZNK13RApaLsSession17GetEmbeddableAppsEi @ 163 NONAME
+ _ZNK13RApaLsSession17GetEmbeddableAppsEv @ 164 NONAME
+ _ZNK13RApaLsSession17GetMaxDataBufSizeERi @ 165 NONAME
+ _ZNK13RApaLsSession18EmbeddableAppCountERi @ 166 NONAME
+ _ZNK13RApaLsSession21GetAcceptedConfidenceERi @ 167 NONAME
+ _ZNK13RApaLsSession21RecognizeSpecificDataERK7TDesC16RK6TDesC8RK9TDataTypeRi @ 168 NONAME
+ _ZNK13RApaLsSession22GetSupportedDataTypesLER13CArrayFixFlatI9TDataTypeE @ 169 NONAME
+ _ZNK13RApaLsSession23NumberOfOwnDefinedIconsE4TUidRi @ 170 NONAME
+ _ZNK13RApaLsSession7VersionEv @ 171 NONAME
+ _ZNK13RApaLsSession8AppCountERi @ 172 NONAME
+ _ZNK13RApaLsSession9IsProgramERK7TDesC16Ri @ 173 NONAME
+ _ZNK15CApaAIFViewData10ScreenModeEv @ 174 NONAME ABSENT
+ _ZNK15CApaAIFViewData12IconByIndexLEi @ 175 NONAME ABSENT
+ _ZNK15CApaAIFViewData13NumberOfIconsEv @ 176 NONAME ABSENT
+ _ZNK15CApaAIFViewData7ViewUidEv @ 177 NONAME ABSENT
+ _ZNK15CApaAIFViewData8CaptionLE9TLanguage @ 178 NONAME ABSENT
+ _ZNK15CApaAppViewData10IconSizesLEv @ 179 NONAME ABSENT
+ _ZNK15CApaAppViewData10ScreenModeEv @ 180 NONAME ABSENT
+ _ZNK15CApaAppViewData3UidEv @ 181 NONAME ABSENT
+ _ZNK15CApaAppViewData4IconERK5TSize @ 182 NONAME ABSENT
+ _ZNK16CApaMaskedBitmap12ExternalizeLER12RWriteStream @ 183 NONAME
+ _ZNK16CApaMaskedBitmap4MaskEv @ 184 NONAME
+ _ZNK17CApaSystemControl12ShortCaptionEv @ 185 NONAME
+ _ZNK17CApaSystemControl4IconEv @ 186 NONAME
+ _ZNK17CApaSystemControl4TypeEv @ 187 NONAME
+ _ZNK17CApaSystemControl7CaptionEv @ 188 NONAME
+ _ZNK17CApaSystemControl8FileNameEv @ 189 NONAME
+ _ZNK18TApaPictureFactory11NewPictureLER14TPictureHeaderRK12CStreamStore @ 190 NONAME
+ _ZNK19CApaWindowGroupName10IsAppReadyEv @ 191 NONAME
+ _ZNK19CApaWindowGroupName14DocNameIsAFileEv @ 192 NONAME
+ _ZNK19CApaWindowGroupName15WindowGroupNameEv @ 193 NONAME
+ _ZNK19CApaWindowGroupName18SetWindowGroupNameER12RWindowGroup @ 194 NONAME
+ _ZNK19CApaWindowGroupName23RespondsToShutdownEventEv @ 195 NONAME
+ _ZNK19CApaWindowGroupName26RespondsToSwitchFilesEventEv @ 196 NONAME
+ _ZNK19CApaWindowGroupName6AppUidEv @ 197 NONAME
+ _ZNK19CApaWindowGroupName6IsBusyEv @ 198 NONAME
+ _ZNK19CApaWindowGroupName7CaptionEv @ 199 NONAME
+ _ZNK19CApaWindowGroupName7DocNameEv @ 200 NONAME
+ _ZNK19CApaWindowGroupName8IsSystemEv @ 201 NONAME
+ _ZNK21CApaAppInfoFileReader10CapabilityER5TDes8 @ 202 NONAME ABSENT
+ _ZNK21CApaAppInfoFileReader14GetOwnedFilesLER12CDesC16Array @ 203 NONAME ABSENT
+ _ZNK21CApaAppInfoFileReader15NumberOfBitmapsEv @ 204 NONAME ABSENT
+ _ZNK21CApaAppInfoFileReader19DataTypesSupportedLER9CArrayFixI21TDataTypeWithPriorityE @ 205 NONAME ABSENT
+ _ZNK21CApaAppInfoFileReader9GetViewsLER9CArrayPtrI15CApaAIFViewDataE @ 206 NONAME ABSENT
+ _ZNK21CApaSystemControlList5CountEv @ 207 NONAME
+ _ZNK21CApaSystemControlList5IndexE4TUid @ 208 NONAME
+ _ZNK21CApaSystemControlList7ControlE4TUid @ 209 NONAME
+ _ZNK21CApaSystemControlList7ControlEi @ 210 NONAME
+ _ZNK8CApaDoor7AppUidLEv @ 211 NONAME
+ _ZNK8TApaTask4WgIdEv @ 212 NONAME
+ _ZNK8TApaTask6ExistsEv @ 213 NONAME
+ _ZNK8TApaTask8ThreadIdEv @ 214 NONAME
+ _ZTI18TApaPictureFactory @ 215 NONAME ; #<TI>#
+ _ZTV18TApaPictureFactory @ 216 NONAME ; #<VT>#
+ _ZTI11CApaAppData @ 217 NONAME ABSENT ; #<TI>#
+ _ZTI11CApaAppList @ 218 NONAME ABSENT ; #<TI>#
+ _ZTI12CApaAppEntry @ 219 NONAME ABSENT ; #<TI>#
+ _ZTI14CApaAIFCaption @ 220 NONAME ABSENT ; #<TI>#
+ _ZTI15CApaAIFViewData @ 221 NONAME ABSENT ; #<TI>#
+ _ZTI15CApaAppInfoFile @ 222 NONAME ABSENT ; #<TI>#
+ _ZTI15CApaAppViewData @ 223 NONAME ABSENT ; #<TI>#
+ _ZTI15CApaIconPicture @ 224 NONAME ; #<TI>#
+ _ZTI16CApaMaskedBitmap @ 225 NONAME ; #<TI>#
+ _ZTI16TDesCArrayFiller @ 226 NONAME ABSENT ; #<TI>#
+ _ZTI16TSizeArrayFiller @ 227 NONAME ABSENT ; #<TI>#
+ _ZTI17CApaSystemControl @ 228 NONAME ; #<TI>#
+ _ZTI19CApaAppListNotifier @ 229 NONAME ; #<TI>#
+ _ZTI19CApaWindowGroupName @ 230 NONAME ; #<TI>#
+ _ZTI20TViewDataArrayFiller @ 231 NONAME ABSENT ; #<TI>#
+ _ZTI21CApaAppInfoFileReader @ 232 NONAME ABSENT ; #<TI>#
+ _ZTI21CApaAppInfoFileWriter @ 233 NONAME ABSENT ; #<TI>#
+ _ZTI21CApaSystemControlList @ 234 NONAME ; #<TI>#
+ _ZTI7HBufBuf @ 235 NONAME ; #<TI>#
+ _ZTI8CApaDoor @ 236 NONAME ; #<TI>#
+ _ZTV11CApaAppData @ 237 NONAME ABSENT ; #<VT>#
+ _ZTV11CApaAppList @ 238 NONAME ABSENT ; #<VT>#
+ _ZTV12CApaAppEntry @ 239 NONAME ABSENT ; #<VT>#
+ _ZTV14CApaAIFCaption @ 240 NONAME ABSENT ; #<VT>#
+ _ZTV15CApaAIFViewData @ 241 NONAME ABSENT ; #<VT>#
+ _ZTV15CApaAppInfoFile @ 242 NONAME ABSENT ; #<VT>#
+ _ZTV15CApaAppViewData @ 243 NONAME ABSENT ; #<VT>#
+ _ZTV15CApaIconPicture @ 244 NONAME ; #<VT>#
+ _ZTV16CApaMaskedBitmap @ 245 NONAME ; #<VT>#
+ _ZTV16TDesCArrayFiller @ 246 NONAME ABSENT ; #<VT>#
+ _ZTV16TSizeArrayFiller @ 247 NONAME ABSENT ; #<VT>#
+ _ZTV17CApaSystemControl @ 248 NONAME ; #<VT>#
+ _ZTV19CApaAppListNotifier @ 249 NONAME ; #<VT>#
+ _ZTV19CApaWindowGroupName @ 250 NONAME ; #<VT>#
+ _ZTV20TViewDataArrayFiller @ 251 NONAME ABSENT ; #<VT>#
+ _ZTV21CApaAppInfoFileReader @ 252 NONAME ABSENT ; #<VT>#
+ _ZTV21CApaAppInfoFileWriter @ 253 NONAME ABSENT ; #<VT>#
+ _ZTV21CApaSystemControlList @ 254 NONAME ; #<VT>#
+ _ZTV7HBufBuf @ 255 NONAME ; #<VT>#
+ _ZTV8CApaDoor @ 256 NONAME ; #<VT>#
+ _ZN11CApaAppList4NewLER3RFsP13CApaAppFinderP16CApaAppRegFinderi @ 257 NONAME ABSENT
+ _ZNK11CApaAppData12IconFileNameEv @ 258 NONAME ABSENT
+ _ZNK11CApaAppData14NonMbmIconFileEv @ 259 NONAME ABSENT
+ _ZNK11CApaAppData19DefaultScreenNumberEv @ 260 NONAME ABSENT
+ _ZNK11CApaAppData20RegistrationFileUsedEv @ 261 NONAME ABSENT
+ _ZNK13RApaLsSession10GetAppIconE4TUidRP7HBufC16 @ 262 NONAME
+ _ZNK13RApaLsSession14GetAppViewIconE4TUidS0_RP7HBufC16 @ 263 NONAME
+ _ZNK13RApaLsSession15GetFilteredAppsEjj @ 264 NONAME
+ _ZNK13RApaLsSession15GetFilteredAppsEjji @ 265 NONAME
+ _ZNK15CApaAppViewData12IconFileNameEv @ 266 NONAME ABSENT
+ _ZNK15CApaAppViewData14NonMbmIconFileEv @ 267 NONAME ABSENT
+ _ZTI17CApaAppInfoReader @ 268 NONAME ABSENT ; #<TI>#
+ _ZTI19CApaAppInfoReaderV1 @ 269 NONAME ABSENT ; #<TI>#
+ _ZTI19CApaAppInfoReaderV2 @ 270 NONAME ABSENT ; #<TI>#
+ _ZTV17CApaAppInfoReader @ 271 NONAME ABSENT ; #<VT>#
+ _ZTV19CApaAppInfoReaderV1 @ 272 NONAME ABSENT ; #<VT>#
+ _ZTV19CApaAppInfoReaderV2 @ 273 NONAME ABSENT ; #<VT>#
+ _Z16StartupApaServerR14MApaAppStarter @ 274 NONAME ABSENT
+ _Z23StartupApaServerProcessv @ 275 NONAME
+ _ZN13RApaLsSession17DeleteDataMappingERK9TDataType @ 276 NONAME
+ _ZN13RApaLsSession17InsertDataMappingERK9TDataTypel4TUid @ 277 NONAME
+ _ZN13RApaLsSession25InsertDataMappingIfHigherERK9TDataTypel4TUidRi @ 278 NONAME
+ _ZNK11CApaAppData19ApplicationLanguageEv @ 279 NONAME ABSENT
+ _ZNK13RApaLsSession19ApplicationLanguageE4TUidR9TLanguage @ 280 NONAME
+ _ZN21CApaSystemControlList4NewLER3RFs @ 281 NONAME
+ _ZNK11CApaAppData17ImplementsServiceE4TUid @ 282 NONAME ABSENT
+ _ZNK11CApaAppList17ServiceUidBufferLE4TUid @ 283 NONAME ABSENT
+ _ZNK11CApaAppList19ServiceArrayBufferLE4TUid @ 284 NONAME ABSENT
+ _ZNK11CApaAppList21PreferredDataHandlerLERK9TDataTypePK4TUidRi @ 285 NONAME ABSENT
+ _ZNK11CApaAppList23ServiceImplArrayBufferLE4TUid @ 286 NONAME ABSENT
+ _ZNK11CApaAppList24ServiceOpaqueDataBufferLE4TUidS0_ @ 287 NONAME ABSENT
+ _ZNK13RApaLsSession13GetServerAppsE4TUid @ 288 NONAME
+ _ZNK13RApaLsSession13GetServerAppsE4TUidi @ 289 NONAME
+ _ZNK13RApaLsSession15GetAppServicesLE4TUidR13CArrayFixFlatIS0_E @ 290 NONAME
+ _ZNK13RApaLsSession16GetAppServicesLCE4TUid @ 291 NONAME
+ _ZNK13RApaLsSession24AppForDataTypeAndServiceERK9TDataType4TUidRS3_ @ 292 NONAME
+ _ZNK13RApaLsSession24AppForDocumentAndServiceERK5RFile4TUidRS3_R9TDataType @ 293 NONAME
+ _ZNK13RApaLsSession24AppForDocumentAndServiceERK7TDesC164TUidRS3_R9TDataType @ 294 NONAME
+ _ZNK13RApaLsSession25GetAppServiceOpaqueDataLCE4TUidS0_ @ 295 NONAME
+ _ZNK13RApaLsSession27GetServiceImplementationsLCE4TUid @ 296 NONAME
+ _ZNK18TApaAppServiceInfo10OpaqueDataEv @ 297 NONAME ABSENT
+ _ZNK18TApaAppServiceInfo3UidEv @ 298 NONAME ABSENT
+ _ZTI30CApaAppServiceInfoArrayWrapper @ 299 NONAME ABSENT ; #<TI>#
+ _ZTV30CApaAppServiceInfoArrayWrapper @ 300 NONAME ABSENT ; #<VT>#
+ _ZN13RApaLsSession13StartDocumentER5RFileR9TThreadIdP14TRequestStatus @ 301 NONAME
+ _ZN21CApaAppInfoFileReader27CreateMaskedBitmapByIndexLCEi @ 302 NONAME ABSENT
+ _ZNK13RApaLsSession36CancelListPopulationCompleteObserverEv @ 303 NONAME
+ _ZNK13RApaLsSession38RegisterListPopulationCompleteObserverER14TRequestStatus @ 304 NONAME
+ _ZN8ApaUtils24HandleAsRegistrationFileERK8TUidType @ 305 NONAME ABSENT
+ _ZN13RApaLsSession33RegisterJavaMIDletViaIterimFormatERK7TDesC16R5RFile @ 306 NONAME ABSENT
+ _ZN22ForJavaMIDletInstaller33CheckInterimFormatFileNotCorruptLER5RFile @ 307 NONAME ABSENT
+ _ZN13RApaLsSession20DeregisterJavaMIDletERK7TDesC16 @ 308 NONAME ABSENT
+ _ZN13RApaLsSession13SetFsSessionLER3RFs @ 309 NONAME
+ _ZN13RApaLsSession13StartDocumentER5RFile4TUidR9TThreadIdP14TRequestStatus @ 310 NONAME
+ _ZN13RApaLsSession13StartDocumentER5RFileRK9TDataTypeR9TThreadIdP14TRequestStatus @ 311 NONAME
+ _ZN13RApaLsSession14ClearFsSessionEv @ 312 NONAME
+ _ZN13RApaLsSession9FsSessionEv @ 313 NONAME
+ _ZNK13RApaLsSession13RecognizeDataERK5RFileR22TDataRecognitionResult @ 314 NONAME
+ _ZNK13RApaLsSession14AppForDocumentERK5RFileR4TUidR9TDataType @ 315 NONAME
+ _ZNK13RApaLsSession21RecognizeSpecificDataERK5RFileRK9TDataTypeRi @ 316 NONAME
+ _ZNK13RApaLsSession19GetPreferredBufSizeERi @ 317 NONAME
+ _ZN22ForJavaMIDletInstaller18GetJavaMIDletInfoLER3RFsRK7TDesC16RmS5_ @ 318 NONAME ABSENT
+ _ZN22ForJavaMIDletInstaller28NewInterimFormatFileWriterLCER3RFsRK7TDesC164TUidmi @ 319 NONAME ABSENT
+ _ZNK18TApaAppServiceInfo9DataTypesEv @ 320 NONAME ABSENT
+ _ZNK11CApaAppList23ServiceImplArrayBufferLE4TUidRK9TDataType @ 321 NONAME ABSENT
+ _ZNK13RApaLsSession27GetServiceImplementationsLCE4TUidRK9TDataType @ 322 NONAME
+ _ZN13RApaLsSession5CloseEv @ 323 NONAME
+ _ZTI22CApaLsSessionExtension @ 324 NONAME ABSENT ; #<TI>#
+ _ZTV22CApaLsSessionExtension @ 325 NONAME ABSENT ; #<VT>#
+ _ZN13RApaLsSession23RApaLsSession_Reserved1Ev @ 326 NONAME
+ _ZN13RApaLsSession23RApaLsSession_Reserved2Ev @ 327 NONAME
+ _ZN18TApaPictureFactoryC1Ev @ 328 NONAME
+ _ZN18TApaPictureFactoryC2Ev @ 329 NONAME
+ _ZN23MApaAppListServObserver33MApaAppListServObserver_Reserved1Ev @ 330 NONAME
+ _ZN23MApaAppListServObserver33MApaAppListServObserver_Reserved2Ev @ 331 NONAME
+ _ZN23MApaAppListServObserverC2Ev @ 332 NONAME
+ _ZTI13RApaLsSession @ 333 NONAME ; #<TI>#
+ _ZTI23MApaAppListServObserver @ 334 NONAME ; #<TI>#
+ _ZTV13RApaLsSession @ 335 NONAME ; #<VT>#
+ _ZTV23MApaAppListServObserver @ 336 NONAME ; #<VT>#
+ _ZNK13RApaLsSession15RecognizeFilesLERK7TDesC16R27CDataRecognitionResultArray @ 337 NONAME
+ _ZN13RApaLsSession15RecognizeFilesLERK7TDesC16R27CDataRecognitionResultArrayR14TRequestStatus @ 338 NONAME
+ _ZNK13RApaLsSession15RecognizeFilesLERK7TDesC16RK6TDesC8R27CDataRecognitionResultArray @ 339 NONAME
+ _ZN13RApaLsSession15RecognizeFilesLERK7TDesC16RK6TDesC8R27CDataRecognitionResultArrayR14TRequestStatus @ 340 NONAME
+ _ZN13RApaLsSession20CancelRecognizeFilesEv @ 341 NONAME
+ _ZN27CDataRecognitionResultArrayC1Ev @ 342 NONAME
+ _ZN27CDataRecognitionResultArrayC2Ev @ 343 NONAME
+ _ZN27CDataRecognitionResultArrayD0Ev @ 344 NONAME
+ _ZN27CDataRecognitionResultArrayD1Ev @ 345 NONAME
+ _ZN27CDataRecognitionResultArrayD2Ev @ 346 NONAME
+ _ZNK27CDataRecognitionResultArray12GetFileNameLER4TBufILi256EEj @ 347 NONAME
+ _ZNK27CDataRecognitionResultArray25GetDataRecognitionResultLER22TDataRecognitionResultj @ 348 NONAME
+ _ZNK27CDataRecognitionResultArray4PathEv @ 349 NONAME
+ _ZNK27CDataRecognitionResultArray5CountEv @ 350 NONAME
+ _ZTI21CAsyncFileRecognition @ 351 NONAME ABSENT ; #<TI>#
+ _ZTI27CDataRecognitionResultArray @ 352 NONAME ; #<TI>#
+ _ZTI32CDataRecognitionResultArrayEntry @ 353 NONAME ABSENT ; #<TI>#
+ _ZTV21CAsyncFileRecognition @ 354 NONAME ABSENT ; #<VT>#
+ _ZTV27CDataRecognitionResultArray @ 355 NONAME ; #<VT>#
+ _ZTV32CDataRecognitionResultArrayEntry @ 356 NONAME ABSENT ; #<VT>#
+ _ZNK13RApaLsSession16GetAppByDataTypeERK9TDataType4TUidRS3_ @ 357 NONAME
+ _ZN13RApaLsSession17DeleteDataMappingERK9TDataType4TUid @ 358 NONAME
+ _ZN13RApaLsSession17InsertDataMappingERK9TDataTypel4TUidS3_ @ 359 NONAME
+ _ZN13RApaLsSession29RegisterNonNativeApplicationLE4TUidRK10TDriveUnitR34CApaRegistrationResourceFileWriterP33CApaLocalisableResourceFileWriterPK5RFile @ 360 NONAME
+ _ZN13RApaLsSession31DeregisterNonNativeApplicationLE4TUid @ 361 NONAME
+ _ZN13RApaLsSession33RegisterNonNativeApplicationTypeLE4TUidRK7TDesC16 @ 362 NONAME
+ _ZN13RApaLsSession35DeregisterNonNativeApplicationTypeLE4TUid @ 363 NONAME
+ _ZN13RApaLsSession8StartAppERK15CApaCommandLineR9TThreadIdP14TRequestStatus @ 364 NONAME
+ _ZNK11CApaAppData10OpaqueDataEv @ 365 NONAME ABSENT
+ _ZNK11CApaAppData20RegistrationFileNameEv @ 366 NONAME ABSENT
+ _ZNK11CApaAppData27LocalisableResourceFileNameEv @ 367 NONAME ABSENT
+ _ZNK11CApaAppList17AppDataByFileNameERK7TDesC16 @ 368 NONAME ABSENT
+ _ZNK13RApaLsSession22GetDefaultScreenNumberERi4TUid @ 369 NONAME
+ _ZN11CApaAppList22FindAndAddSpecificAppLEP16CApaAppRegFinder4TUid @ 370 NONAME ABSENT
+ _ZNK13RApaLsSession21MatchesSecurityPolicyERi4TUidRK15TSecurityPolicy @ 371 NONAME
+ _ZN33CApaLocalisableResourceFileWriterD1Ev @ 372 NONAME
+ _ZN33CApaLocalisableResourceFileWriterD2Ev @ 373 NONAME
+ _ZN34CApaRegistrationResourceFileWriter12AddDataTypeLEiRK6TDesC8 @ 374 NONAME
+ _ZN34CApaRegistrationResourceFileWriter13SetGroupNameLERK7TDesC16 @ 375 NONAME
+ _ZN34CApaRegistrationResourceFileWriter14SetOpaqueDataLERK6TDesC8 @ 376 NONAME
+ _ZN34CApaRegistrationResourceFileWriter15SetAppIsHiddenLEi @ 377 NONAME
+ _ZN34CApaRegistrationResourceFileWriter17SetEmbeddabilityLEN17TApaAppCapability14TEmbeddabilityE @ 378 NONAME
+ _ZN34CApaRegistrationResourceFileWriter19SetSupportsNewFileLEi @ 379 NONAME
+ _ZN34CApaRegistrationResourceFileWriter21AddFileOwnershipInfoLERK7TDesC16 @ 380 NONAME
+ _ZN34CApaRegistrationResourceFileWriter22SetLaunchInBackgroundLEi @ 381 NONAME
+ _ZN34CApaRegistrationResourceFileWriter23SetDefaultScreenNumberLEi @ 382 NONAME
+ _ZN34CApaRegistrationResourceFileWriter4NewLE4TUidRK7TDesC16j @ 383 NONAME
+ _ZN34CApaRegistrationResourceFileWriterD0Ev @ 384 NONAME
+ _ZN34CApaRegistrationResourceFileWriterD1Ev @ 385 NONAME
+ _ZN34CApaRegistrationResourceFileWriterD2Ev @ 386 NONAME
+ _ZNK11CApaAppData24NonNativeApplicationTypeEv @ 387 NONAME ABSENT
+ _ZTI33CApaLocalisableResourceFileWriter @ 388 NONAME ; #<TI>#
+ _ZTI34CApaRegistrationResourceFileWriter @ 389 NONAME ; #<TI>#
+ _ZTIN26CApaResourceFileWriterBase11RBufferSinkE @ 390 NONAME ; #<TI>#
+ _ZTV33CApaLocalisableResourceFileWriter @ 391 NONAME ; #<VT>#
+ _ZTV34CApaRegistrationResourceFileWriter @ 392 NONAME ; #<VT>#
+ _ZTVN26CApaResourceFileWriterBase11RBufferSinkE @ 393 NONAME ; #<VT>#
+ _ZN33CApaLocalisableResourceFileWriter4NewLERK7TDesC16S2_iS2_ @ 394 NONAME
+ _ZN33CApaLocalisableResourceFileWriterD0Ev @ 395 NONAME
+ _ZN13RApaLsSession12CancelNotifyEv @ 396 NONAME
+ _ZN13RApaLsSession9SetNotifyEiR14TRequestStatus @ 397 NONAME
+ _ZNK11CApaAppList17AppScanInProgressEv @ 398 NONAME ABSENT
+ _ZN13RApaLsSession25NotifyOnDataMappingChangeER14TRequestStatus @ 399 NONAME
+ _ZN13RApaLsSession31CancelNotifyOnDataMappingChangeEv @ 400 NONAME
+ _ZNK13RApaLsSession10GetAppTypeER4TUidS0_ @ 401 NONAME
+ _ZN13RApaLsSession35CommitNonNativeApplicationsUpdatesLEv @ 402 NONAME
+ _ZN13RApaLsSession36PrepareNonNativeApplicationsUpdatesLEv @ 403 NONAME
+ _ZN13RApaLsSession36RollbackNonNativeApplicationsUpdatesEv @ 404 NONAME
+ _ZN11CApaAppList15UpdatedAppsListEv @ 405 NONAME ABSENT
+ _ZN11CApaAppList18SetUpdatedAppsListEP16CUpdatedAppsList @ 406 NONAME ABSENT
+ _ZN11CApaAppData4NewLERK12TApaAppEntryR3RFs @ 407 NONAME ABSENT
+ _ZN11CApaAppDataD0Ev @ 408 NONAME ABSENT
+ _ZN11CApaAppDataD1Ev @ 409 NONAME ABSENT
+ _ZN11CApaAppDataD2Ev @ 410 NONAME ABSENT
+ _ZN11CApaAppList24ShareProtectedFileServerEv @ 411 NONAME ABSENT
+ _ZN11CApaAppList4SelfEv @ 412 NONAME ABSENT
+ X @ 413 NONAME ABSENT
+ X @ 414 NONAME ABSENT
+ X @ 415 NONAME ABSENT
+ X @ 416 NONAME ABSENT
+ _ZN13RApaLsSession18SetAppShortCaptionERK7TDesC169TLanguage4TUid @ 417 NONAME
+ _ZN11CApaAppData16SetShortCaptionLERK7TDesC16 @ 418 NONAME ABSENT
+ _ZN11CApaAppList14CompareStringsERK7HBufC16S2_ @ 419 NONAME ABSENT
+ _ZN11CApaAppList22AddForcedRegistrationLEP7HBufC16 @ 420 NONAME ABSENT
+ _ZN13RApaLsSession17ForceRegistrationERK13RPointerArrayI7TDesC16E @ 421 NONAME
+ _ZN11CApaAppList24ResetForcedRegistrationsEv @ 422 NONAME ABSENT
+ _ZN11CApaAppList12RestartScanLEv @ 423 NONAME ABSENT
+ _ZN11CApaAppList8StopScanEv @ 424 NONAME ABSENT
+ KMinApplicationStackSize @ 425 NONAME DATA 4
+ _Z23MinApplicationStackSizev @ 426 NONAME
+ _ZNK11CApaAppData9IsPendingEv @ 427 NONAME ABSENT
+ _ZNK11CApaAppList23IsLanguageChangePendingEv @ 428 NONAME ABSENT
+ _ZNK13RApaLsSession10GetAppIconE4TUidR5RFile @ 429 NONAME
+ _ZN17CApaSecurityUtils16CheckAppSecurityERK7TPtrC16RiS3_ @ 430 NONAME
+ X @ 431 NONAME ABSENT
+ X @ 432 NONAME ABSENT
+ _ZN13RApaLsSession40ForceCommitNonNativeApplicationsUpdatesLEv @ 433 NONAME
+ _ZNK13RApaLsSession13RecognizeDataERK6TDesC8R22TDataRecognitionResult @ 434 NONAME
+ X @ 435 NONAME ABSENT
+ X @ 436 NONAME ABSENT
+ X @ 437 NONAME ABSENT
+ X @ 438 NONAME ABSENT
+ X @ 439 NONAME ABSENT
+ X @ 440 NONAME ABSENT
+ X @ 441 NONAME ABSENT
+ X @ 442 NONAME ABSENT
+ X @ 443 NONAME ABSENT
+
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/eabi/aplist_legacyu.def Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,108 @@
+EXPORTS
+ _ZN11CApaAppData16CanUseScreenModeEi @ 1 NONAME
+ _ZN11CApaAppData16SetShortCaptionLERK7TDesC16 @ 2 NONAME
+ _ZN11CApaAppData4NewLERK12TApaAppEntryR3RFs @ 3 NONAME
+ _ZN11CApaAppDataD0Ev @ 4 NONAME
+ _ZN11CApaAppDataD1Ev @ 5 NONAME
+ _ZN11CApaAppDataD2Ev @ 6 NONAME
+ _ZN11CApaAppList12RestartScanLEv @ 7 NONAME
+ _ZN11CApaAppList16StartIdleUpdateLEP19MApaAppListObserver @ 8 NONAME
+ _ZN11CApaAppList16StartIdleUpdateLEv @ 9 NONAME
+ _ZN11CApaAppList22AddForcedRegistrationLERK7TDesC16 @ 10 NONAME
+ _ZN11CApaAppList22FindAndAddSpecificAppLEP16CApaAppRegFinder4TUid @ 11 NONAME
+ _ZN11CApaAppList23AddCustomAppInfoInListLE4TUid9TLanguageRK7TDesC16 @ 12 NONAME
+ _ZN11CApaAppList24ResetForcedRegistrationsEv @ 13 NONAME
+ _ZN11CApaAppList28UpdateAppListByShortCaptionLEv @ 14 NONAME
+ _ZN11CApaAppList4NewLER3RFsii @ 15 NONAME
+ _ZN11CApaAppList4SelfEv @ 16 NONAME
+ _ZN11CApaAppList6PurgeLEv @ 17 NONAME
+ _ZN11CApaAppList8StopScanEi @ 18 NONAME
+ _ZN11CApaAppList9InitListLEP19MApaAppListObserver @ 19 NONAME
+ _ZN11CApaAppListD0Ev @ 20 NONAME
+ _ZN11CApaAppListD1Ev @ 21 NONAME
+ _ZN11CApaAppListD2Ev @ 22 NONAME
+ _ZN12TApaAppEntryC1Ev @ 23 NONAME
+ _ZN12TApaAppEntryC2Ev @ 24 NONAME
+ _ZN14CAppSidChecker18SetRescanCallBackLERK9TCallBack @ 25 NONAME
+ _ZN14CAppSidChecker9reserved1Ev @ 26 NONAME
+ _ZN14CAppSidChecker9reserved2Ev @ 27 NONAME
+ _ZN14CAppSidChecker9reserved3Ev @ 28 NONAME
+ _ZN14CAppSidCheckerD0Ev @ 29 NONAME
+ _ZN14CAppSidCheckerD1Ev @ 30 NONAME
+ _ZN14CAppSidCheckerD2Ev @ 31 NONAME
+ _ZN16CApaAppRegFinder12FindAllAppsLENS_10TScanScopeE @ 32 NONAME
+ _ZN16CApaAppRegFinder4NewLERK3RFs @ 33 NONAME
+ _ZN16CApaAppRegFinder5NewLCERK3RFs @ 34 NONAME
+ _ZN16CApaAppRegFinder5NextLER12TApaAppEntryRK12CDesC16Array @ 35 NONAME
+ _ZNK11CApaAppData10CapabilityER5TDes8 @ 36 NONAME
+ _ZNK11CApaAppData10IconSizesLEv @ 37 NONAME
+ _ZNK11CApaAppData10OpaqueDataEv @ 38 NONAME
+ _ZNK11CApaAppData10OwnedFilesEv @ 39 NONAME
+ _ZNK11CApaAppData11GetIconInfoERiS0_ @ 40 NONAME
+ _ZNK11CApaAppData12IconFileNameEv @ 41 NONAME
+ _ZNK11CApaAppData14NonMbmIconFileEv @ 42 NONAME
+ _ZNK11CApaAppData17ImplementsServiceE4TUid @ 43 NONAME
+ _ZNK11CApaAppData19ApplicationLanguageEv @ 44 NONAME
+ _ZNK11CApaAppData19DefaultScreenNumberEv @ 45 NONAME
+ _ZNK11CApaAppData20RegistrationFileNameEv @ 46 NONAME
+ _ZNK11CApaAppData20RegistrationFileUsedEv @ 47 NONAME
+ _ZNK11CApaAppData24NonNativeApplicationTypeEv @ 48 NONAME
+ _ZNK11CApaAppData27LocalisableResourceFileNameEv @ 49 NONAME
+ _ZNK11CApaAppData4IconE5TSize @ 50 NONAME
+ _ZNK11CApaAppData4IconEi @ 51 NONAME
+ _ZNK11CApaAppData5ViewsEv @ 52 NONAME
+ _ZNK11CApaAppData8AppEntryEv @ 53 NONAME
+ _ZNK11CApaAppData8DataTypeERK9TDataType @ 54 NONAME
+ _ZNK11CApaAppData9IsPendingEv @ 55 NONAME
+ _ZNK11CApaAppList12AppDataByUidE4TUid @ 56 NONAME
+ _ZNK11CApaAppList17AppDataByFileNameERK7TDesC16 @ 57 NONAME
+ _ZNK11CApaAppList17AppScanInProgressEv @ 58 NONAME
+ _ZNK11CApaAppList17ServiceUidBufferLE4TUid @ 59 NONAME
+ _ZNK11CApaAppList19IsFirstScanCompleteEv @ 60 NONAME
+ _ZNK11CApaAppList19ServiceArrayBufferLE4TUid @ 61 NONAME
+ _ZNK11CApaAppList20IsIdleUpdateCompleteEv @ 62 NONAME
+ _ZNK11CApaAppList21PreferredDataHandlerLERK9TDataType @ 63 NONAME
+ _ZNK11CApaAppList21PreferredDataHandlerLERK9TDataTypePK4TUidRi @ 64 NONAME
+ _ZNK11CApaAppList23IsLanguageChangePendingEv @ 65 NONAME
+ _ZNK11CApaAppList23ServiceImplArrayBufferLE4TUid @ 66 NONAME
+ _ZNK11CApaAppList23ServiceImplArrayBufferLE4TUidRK9TDataType @ 67 NONAME
+ _ZNK11CApaAppList24ServiceOpaqueDataBufferLE4TUidS0_ @ 68 NONAME
+ _ZNK11CApaAppList5CountEv @ 69 NONAME
+ _ZNK11CApaAppList7NextAppEPK11CApaAppData @ 70 NONAME
+ _ZNK11CApaAppList7NextAppEPK11CApaAppDatai @ 71 NONAME
+ _ZNK11CApaAppList8FirstAppEi @ 72 NONAME
+ _ZNK11CApaAppList8FirstAppEv @ 73 NONAME
+ _ZNK15CApaAppViewData10IconSizesLEv @ 74 NONAME
+ _ZNK15CApaAppViewData10ScreenModeEv @ 75 NONAME
+ _ZNK15CApaAppViewData12IconFileNameEv @ 76 NONAME
+ _ZNK15CApaAppViewData14NonMbmIconFileEv @ 77 NONAME
+ _ZNK15CApaAppViewData3UidEv @ 78 NONAME
+ _ZNK15CApaAppViewData4IconERK5TSize @ 79 NONAME
+ _ZNK16CApaAppRegFinder9DriveListEv @ 80 NONAME
+ _ZTI11CApaAppData @ 81 NONAME
+ _ZTI11CApaAppList @ 82 NONAME
+ _ZTI12CApaAppEntry @ 83 NONAME
+ _ZTI14CAppSidChecker @ 84 NONAME
+ _ZTI15CApaAppViewData @ 85 NONAME
+ _ZTI16CApaAppRegFinder @ 86 NONAME
+ _ZTI17CApaAppInfoReader @ 87 NONAME
+ _ZTV11CApaAppData @ 88 NONAME
+ _ZTV11CApaAppList @ 89 NONAME
+ _ZTV12CApaAppEntry @ 90 NONAME
+ _ZTV14CAppSidChecker @ 91 NONAME
+ _ZTV15CApaAppViewData @ 92 NONAME
+ _ZTV16CApaAppRegFinder @ 93 NONAME
+ _ZTV17CApaAppInfoReader @ 94 NONAME
+ _ZN11CApaAppData11SetCaptionLERK7TDesC16 @ 95 NONAME
+ _ZN11CApaAppData9SetIconsLERK7TDesC16i @ 96 NONAME
+ _ZN11CApaAppList36UpdateAppListByIconCaptionOverridesLEv @ 97 NONAME
+ _ZN11CApaAppList20AppListUpdatePendingEv @ 98 NONAME
+ _ZN11CApaAppList19UninstalledAppArrayEv @ 99 NONAME
+ X @ 100 NONAME ABSENT
+ X @ 101 NONAME ABSENT
+ X @ 102 NONAME ABSENT
+ X @ 103 NONAME ABSENT
+ X @ 104 NONAME ABSENT
+ X @ 105 NONAME ABSENT
+ X @ 106 NONAME ABSENT
+ X @ 107 NONAME ABSENT
\ No newline at end of file
--- a/appfw/apparchitecture/eabi/aplistu.def Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/eabi/aplistu.def Tue Aug 31 15:24:25 2010 +0300
@@ -1,22 +1,22 @@
EXPORTS
_ZN11CApaAppData16CanUseScreenModeEi @ 1 NONAME
_ZN11CApaAppData16SetShortCaptionLERK7TDesC16 @ 2 NONAME
- _ZN11CApaAppData4NewLERK12TApaAppEntryR3RFs @ 3 NONAME
+ _ZN11CApaAppData4NewLERK12TApaAppEntryR3RFs @ 3 NONAME ABSENT
_ZN11CApaAppDataD0Ev @ 4 NONAME
_ZN11CApaAppDataD1Ev @ 5 NONAME
_ZN11CApaAppDataD2Ev @ 6 NONAME
- _ZN11CApaAppList12RestartScanLEv @ 7 NONAME
+ _ZN11CApaAppList12RestartScanLEv @ 7 NONAME ABSENT
_ZN11CApaAppList16StartIdleUpdateLEP19MApaAppListObserver @ 8 NONAME
_ZN11CApaAppList16StartIdleUpdateLEv @ 9 NONAME
- _ZN11CApaAppList22AddForcedRegistrationLERK7TDesC16 @ 10 NONAME
- _ZN11CApaAppList22FindAndAddSpecificAppLEP16CApaAppRegFinder4TUid @ 11 NONAME
+ _ZN11CApaAppList22AddForcedRegistrationLERK7TDesC16 @ 10 NONAME ABSENT
+ _ZN11CApaAppList22FindAndAddSpecificAppLEP16CApaAppRegFinder4TUid @ 11 NONAME ABSENT
_ZN11CApaAppList23AddCustomAppInfoInListLE4TUid9TLanguageRK7TDesC16 @ 12 NONAME
- _ZN11CApaAppList24ResetForcedRegistrationsEv @ 13 NONAME
+ _ZN11CApaAppList24ResetForcedRegistrationsEv @ 13 NONAME ABSENT
_ZN11CApaAppList28UpdateAppListByShortCaptionLEv @ 14 NONAME
_ZN11CApaAppList4NewLER3RFsii @ 15 NONAME
_ZN11CApaAppList4SelfEv @ 16 NONAME
- _ZN11CApaAppList6PurgeLEv @ 17 NONAME
- _ZN11CApaAppList8StopScanEi @ 18 NONAME
+ _ZN11CApaAppList6PurgeLEv @ 17 NONAME ABSENT
+ _ZN11CApaAppList8StopScanEi @ 18 NONAME ABSENT
_ZN11CApaAppList9InitListLEP19MApaAppListObserver @ 19 NONAME
_ZN11CApaAppListD0Ev @ 20 NONAME
_ZN11CApaAppListD1Ev @ 21 NONAME
@@ -30,10 +30,10 @@
_ZN14CAppSidCheckerD0Ev @ 29 NONAME
_ZN14CAppSidCheckerD1Ev @ 30 NONAME
_ZN14CAppSidCheckerD2Ev @ 31 NONAME
- _ZN16CApaAppRegFinder12FindAllAppsLENS_10TScanScopeE @ 32 NONAME
- _ZN16CApaAppRegFinder4NewLERK3RFs @ 33 NONAME
- _ZN16CApaAppRegFinder5NewLCERK3RFs @ 34 NONAME
- _ZN16CApaAppRegFinder5NextLER12TApaAppEntryRK12CDesC16Array @ 35 NONAME
+ _ZN16CApaAppRegFinder12FindAllAppsLENS_10TScanScopeE @ 32 NONAME ABSENT
+ _ZN16CApaAppRegFinder4NewLERK3RFs @ 33 NONAME ABSENT
+ _ZN16CApaAppRegFinder5NewLCERK3RFs @ 34 NONAME ABSENT
+ _ZN16CApaAppRegFinder5NextLER12TApaAppEntryRK12CDesC16Array @ 35 NONAME ABSENT
_ZNK11CApaAppData10CapabilityER5TDes8 @ 36 NONAME
_ZNK11CApaAppData10IconSizesLEv @ 37 NONAME
_ZNK11CApaAppData10OpaqueDataEv @ 38 NONAME
@@ -44,16 +44,16 @@
_ZNK11CApaAppData17ImplementsServiceE4TUid @ 43 NONAME
_ZNK11CApaAppData19ApplicationLanguageEv @ 44 NONAME
_ZNK11CApaAppData19DefaultScreenNumberEv @ 45 NONAME
- _ZNK11CApaAppData20RegistrationFileNameEv @ 46 NONAME
- _ZNK11CApaAppData20RegistrationFileUsedEv @ 47 NONAME
+ _ZNK11CApaAppData20RegistrationFileNameEv @ 46 NONAME ABSENT
+ _ZNK11CApaAppData20RegistrationFileUsedEv @ 47 NONAME ABSENT
_ZNK11CApaAppData24NonNativeApplicationTypeEv @ 48 NONAME
- _ZNK11CApaAppData27LocalisableResourceFileNameEv @ 49 NONAME
+ _ZNK11CApaAppData27LocalisableResourceFileNameEv @ 49 NONAME ABSENT
_ZNK11CApaAppData4IconE5TSize @ 50 NONAME
_ZNK11CApaAppData4IconEi @ 51 NONAME
_ZNK11CApaAppData5ViewsEv @ 52 NONAME
_ZNK11CApaAppData8AppEntryEv @ 53 NONAME
_ZNK11CApaAppData8DataTypeERK9TDataType @ 54 NONAME
- _ZNK11CApaAppData9IsPendingEv @ 55 NONAME
+ _ZNK11CApaAppData9IsPendingEv @ 55 NONAME ABSENT
_ZNK11CApaAppList12AppDataByUidE4TUid @ 56 NONAME
_ZNK11CApaAppList17AppDataByFileNameERK7TDesC16 @ 57 NONAME
_ZNK11CApaAppList17AppScanInProgressEv @ 58 NONAME
@@ -78,24 +78,31 @@
_ZNK15CApaAppViewData14NonMbmIconFileEv @ 77 NONAME
_ZNK15CApaAppViewData3UidEv @ 78 NONAME
_ZNK15CApaAppViewData4IconERK5TSize @ 79 NONAME
- _ZNK16CApaAppRegFinder9DriveListEv @ 80 NONAME
+ _ZNK16CApaAppRegFinder9DriveListEv @ 80 NONAME ABSENT
_ZTI11CApaAppData @ 81 NONAME
_ZTI11CApaAppList @ 82 NONAME
_ZTI12CApaAppEntry @ 83 NONAME
_ZTI14CAppSidChecker @ 84 NONAME
_ZTI15CApaAppViewData @ 85 NONAME
- _ZTI16CApaAppRegFinder @ 86 NONAME
+ _ZTI16CApaAppRegFinder @ 86 NONAME ABSENT
_ZTI17CApaAppInfoReader @ 87 NONAME
_ZTV11CApaAppData @ 88 NONAME
_ZTV11CApaAppList @ 89 NONAME
_ZTV12CApaAppEntry @ 90 NONAME
_ZTV14CAppSidChecker @ 91 NONAME
_ZTV15CApaAppViewData @ 92 NONAME
- _ZTV16CApaAppRegFinder @ 93 NONAME
+ _ZTV16CApaAppRegFinder @ 93 NONAME ABSENT
_ZTV17CApaAppInfoReader @ 94 NONAME
_ZN11CApaAppData11SetCaptionLERK7TDesC16 @ 95 NONAME
_ZN11CApaAppData9SetIconsLERK7TDesC16i @ 96 NONAME
_ZN11CApaAppList36UpdateAppListByIconCaptionOverridesLEv @ 97 NONAME
- _ZN11CApaAppList20AppListUpdatePendingEv @ 98 NONAME
+ _ZN11CApaAppList20AppListUpdatePendingEv @ 98 NONAME ABSENT
_ZN11CApaAppList19UninstalledAppArrayEv @ 99 NONAME
+ _ZN11CApaAppData4NewLERKN4Usif28CApplicationRegistrationDataER3RFsRKNS0_26RSoftwareComponentRegistryE @ 100 NONAME
+ _ZN11CApaAppList22FindAndAddSpecificAppLE4TUid @ 101 NONAME
+ _ZN11CApaAppList18InitializeApplistLEP19MApaAppListObserver @ 102 NONAME
+ _ZN11CApaAppData19IsLangChangePendingEv @ 103 NONAME
+ _ZN11CApaAppList14UpdateApplistLEP19MApaAppListObserverP6RArrayI17TApaAppUpdateInfoE4TUid @ 104 NONAME
+ _ZN11CApaAppList15UpdatedAppsInfoEv @ 105 NONAME
+ _ZN11CApaAppList28UpdateApplistByForceRegAppsLER13RPointerArrayIN4Usif28CApplicationRegistrationDataEE @ 106 NONAME
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/eabi/apserv_legacyu.def Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,70 @@
+EXPORTS
+ _Z23NameApaServServerThreadv @ 1 NONAME
+ _Z25NameApaServStartSemaphorev @ 2 NONAME
+ _ZN13CApaFsMonitor10SetBlockedEi @ 3 NONAME
+ _ZN13CApaFsMonitor4NewLER3RFsRK7TDesC169TCallBack @ 4 NONAME
+ _ZN13CApaFsMonitor5StartE11TNotifyType @ 5 NONAME
+ _ZN13CApaFsMonitorD0Ev @ 6 NONAME
+ _ZN13CApaFsMonitorD1Ev @ 7 NONAME
+ _ZN13CApaFsMonitorD2Ev @ 8 NONAME
+ _ZN16CApaAppArcServer4NewLEP11CApaAppListP18CApaFileRecognizer @ 9 NONAME ABSENT
+ _ZN16CApaAppArcServer4NewLEv @ 10 NONAME
+ _ZN16CApaAppArcServerD0Ev @ 11 NONAME
+ _ZN16CApaAppArcServerD1Ev @ 12 NONAME
+ _ZN16CApaAppArcServerD2Ev @ 13 NONAME
+ _ZNK13CApaFsMonitor10NotifyTypeEv @ 14 NONAME
+ _ZTI13CApaFsMonitor @ 15 NONAME ; #<TI>#
+ _ZTI15CApaEComMonitor @ 16 NONAME ; #<TI>#
+ _ZTI16CApaAppArcServer @ 17 NONAME ; #<TI>#
+ _ZTI20TDesCArrayItemWriter @ 18 NONAME ABSENT ; #<TI>#
+ _ZTI20TSizeArrayItemWriter @ 19 NONAME ABSENT ; #<TI>#
+ _ZTI22CApaAppListServSession @ 20 NONAME ; #<TI>#
+ _ZTI24TViewDataArrayItemWriter @ 21 NONAME ABSENT ; #<TI>#
+ _ZTV13CApaFsMonitor @ 22 NONAME ; #<VT>#
+ _ZTV15CApaEComMonitor @ 23 NONAME ; #<VT>#
+ _ZTV16CApaAppArcServer @ 24 NONAME ; #<VT>#
+ _ZTV20TDesCArrayItemWriter @ 25 NONAME ABSENT ; #<VT>#
+ _ZTV20TSizeArrayItemWriter @ 26 NONAME ABSENT ; #<VT>#
+ _ZTV22CApaAppListServSession @ 27 NONAME ; #<VT>#
+ _ZTV24TViewDataArrayItemWriter @ 28 NONAME ABSENT ; #<VT>#
+ _ZN13CApaFsMonitor12AddLocationLERK7TDesC16 @ 29 NONAME
+ _ZTIN13CApaFsMonitor14CApaFsNotifierE @ 30 NONAME ; #<TI>#
+ _ZTVN13CApaFsMonitor14CApaFsNotifierE @ 31 NONAME ; #<VT>#
+ _ZN16CApaAppArcServer4SelfEv @ 32 NONAME
+ _ZN13CApaFsMonitor6CancelEv @ 33 NONAME
+ _Z18ApaServThreadStartPv @ 34 NONAME
+ _ZTI18CRecognitionResult @ 35 NONAME ABSENT ; #<TI>#
+ _ZTI20CApsRecognitionCache @ 36 NONAME ; #<TI>#
+ _ZTI20CCacheDirectoryEntry @ 37 NONAME ; #<TI>#
+ _ZTI23CFileRecognitionUtility @ 38 NONAME ABSENT ; #<TI>#
+ _ZTI25CRecognitionResultHashMap @ 39 NONAME ; #<TI>#
+ _ZTI27CDirectoryRecognitionResult @ 40 NONAME ABSENT ; #<TI>#
+ _ZTI30CRecognitionResultHashMapEntry @ 41 NONAME ; #<TI>#
+ _ZTV18CRecognitionResult @ 42 NONAME ABSENT ; #<VT>#
+ _ZTV20CApsRecognitionCache @ 43 NONAME ; #<VT>#
+ _ZTV20CCacheDirectoryEntry @ 44 NONAME ; #<VT>#
+ _ZTV23CFileRecognitionUtility @ 45 NONAME ABSENT ; #<VT>#
+ _ZTV25CRecognitionResultHashMap @ 46 NONAME ; #<VT>#
+ _ZTV27CDirectoryRecognitionResult @ 47 NONAME ABSENT ; #<VT>#
+ _ZTV30CRecognitionResultHashMapEntry @ 48 NONAME ; #<VT>#
+ _ZN16CUpdatedAppsList28CloseAndDeletePermanentStoreEv @ 49 NONAME ABSENT
+ _ZN16CUpdatedAppsListD0Ev @ 50 NONAME ABSENT
+ _ZN16CUpdatedAppsListD1Ev @ 51 NONAME ABSENT
+ _ZN16CUpdatedAppsListD2Ev @ 52 NONAME ABSENT
+ _ZTI16CUpdatedAppsList @ 53 NONAME ABSENT ; #<TI>#
+ _ZTV16CUpdatedAppsList @ 54 NONAME ABSENT ; #<VT>#
+ _ZNK16CUpdatedAppsList8IsInListERK7TDesC16 @ 55 NONAME ABSENT
+ _ZTIN16CUpdatedAppsList15CUpdatedAppInfoE @ 56 NONAME ABSENT ; #<TI>#
+ _ZTVN16CUpdatedAppsList15CUpdatedAppInfoE @ 57 NONAME ABSENT ; #<VT>#
+ _ZN16CApaAppArcServer14RescanCallBackEv @ 58 NONAME
+ _ZTI18CCustomAppInfoData @ 59 NONAME ABSENT ; #<TI>#
+ _ZTV18CCustomAppInfoData @ 60 NONAME ABSENT ; #<VT>#
+ KApaLoadDataRecognizersOnDemand @ 61 NONAME DATA 4
+ KApaUnloadRecognizersTimeout @ 62 NONAME DATA 4
+ _ZN16CApaAppArcServer27HandleInstallationEndEventLEv @ 63 NONAME
+ _ZN16CApaAppArcServer28HandleInstallationStartEventEv @ 64 NONAME
+ KApaDrivesToMonitor @ 65 NONAME DATA 4
+ KApaLoadMbmIconsOnDemand @ 66 NONAME DATA 4
+ _ZTI21CApaAppArcServSession @ 67 NONAME
+ _ZTV21CApaAppArcServSession @ 68 NONAME
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/eabi/ticonforleaks_leagacyu.def Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,433 @@
+EXPORTS
+ KMinApplicationStackSize @ 1 NONAME DATA 4
+ _Z16StartupApaServerR14MApaAppStarter @ 2 NONAME ABSENT
+ _Z23MinApplicationStackSizev @ 3 NONAME
+ _Z23StartupApaServerProcessv @ 4 NONAME
+ _ZN11CApaAppData16CanUseScreenModeEi @ 5 NONAME
+ _ZN11CApaAppData16SetShortCaptionLERK7TDesC16 @ 6 NONAME
+ _ZN11CApaAppData4NewLERK12TApaAppEntryR3RFs @ 7 NONAME
+ _ZN11CApaAppDataD0Ev @ 8 NONAME
+ _ZN11CApaAppDataD1Ev @ 9 NONAME
+ _ZN11CApaAppDataD2Ev @ 10 NONAME
+ _ZN11CApaAppList12RestartScanLEv @ 11 NONAME
+ _ZN11CApaAppList14CompareStringsERK7HBufC16S2_ @ 12 NONAME ABSENT
+ _ZN11CApaAppList15UpdatedAppsListEv @ 13 NONAME ABSENT
+ _ZN11CApaAppList16StartIdleUpdateLEP19MApaAppListObserver @ 14 NONAME
+ _ZN11CApaAppList16StartIdleUpdateLEv @ 15 NONAME
+ _ZN11CApaAppList18SetUpdatedAppsListEP16CUpdatedAppsList @ 16 NONAME ABSENT
+ _ZN11CApaAppList22AddForcedRegistrationLEP7HBufC16 @ 17 NONAME ABSENT
+ _ZN11CApaAppList22FindAndAddSpecificAppLEP16CApaAppRegFinder4TUid @ 18 NONAME
+ _ZN11CApaAppList24ResetForcedRegistrationsEv @ 19 NONAME
+ _ZN11CApaAppList4NewLER3RFsP16CApaAppRegFinderii @ 20 NONAME ABSENT
+ _ZN11CApaAppList4SelfEv @ 21 NONAME
+ _ZN11CApaAppList6PurgeLEv @ 22 NONAME
+ _ZN11CApaAppList8StopScanEi @ 23 NONAME
+ _ZN11CApaAppList9InitListLEP19MApaAppListObserver @ 24 NONAME
+ _ZN11CApaAppListD0Ev @ 25 NONAME
+ _ZN11CApaAppListD1Ev @ 26 NONAME
+ _ZN11CApaAppListD2Ev @ 27 NONAME
+ _ZN12TApaTaskList10CycleTasksE4TUidNS_15TCycleDirectionE @ 28 NONAME
+ _ZN12TApaTaskList7FindAppE4TUid @ 29 NONAME
+ _ZN12TApaTaskList7FindAppERK7TDesC16 @ 30 NONAME
+ _ZN12TApaTaskList7FindDocERK7TDesC16 @ 31 NONAME
+ _ZN12TApaTaskList9FindByPosEi @ 32 NONAME
+ _ZN12TApaTaskListC1ER10RWsSession @ 33 NONAME
+ _ZN12TApaTaskListC2ER10RWsSession @ 34 NONAME
+ _ZN13RApaLsSession12CancelNotifyEv @ 35 NONAME
+ _ZN13RApaLsSession13SetFsSessionLER3RFs @ 36 NONAME
+ _ZN13RApaLsSession13StartDocumentER5RFile4TUidR9TThreadIdP14TRequestStatus @ 37 NONAME
+ _ZN13RApaLsSession13StartDocumentER5RFileR9TThreadIdP14TRequestStatus @ 38 NONAME
+ _ZN13RApaLsSession13StartDocumentER5RFileRK9TDataTypeR9TThreadIdP14TRequestStatus @ 39 NONAME
+ _ZN13RApaLsSession13StartDocumentERK7TDesC164TUidR9TThreadIdNS_11TLaunchTypeE @ 40 NONAME
+ _ZN13RApaLsSession13StartDocumentERK7TDesC16R9TThreadIdNS_11TLaunchTypeE @ 41 NONAME
+ _ZN13RApaLsSession13StartDocumentERK7TDesC16RK9TDataTypeR9TThreadIdNS_11TLaunchTypeE @ 42 NONAME
+ _ZN13RApaLsSession14ClearFsSessionEv @ 43 NONAME
+ _ZN13RApaLsSession14CreateDocumentERK7TDesC164TUidR9TThreadIdNS_11TLaunchTypeE @ 44 NONAME
+ _ZN13RApaLsSession15RecognizeFilesLERK7TDesC16R27CDataRecognitionResultArrayR14TRequestStatus @ 45 NONAME
+ _ZN13RApaLsSession15RecognizeFilesLERK7TDesC16RK6TDesC8R27CDataRecognitionResultArrayR14TRequestStatus @ 46 NONAME
+ _ZN13RApaLsSession17DeleteDataMappingERK9TDataType @ 47 NONAME
+ _ZN13RApaLsSession17DeleteDataMappingERK9TDataType4TUid @ 48 NONAME
+ _ZN13RApaLsSession17ForceRegistrationERK13RPointerArrayI7TDesC16E @ 49 NONAME
+ _ZN13RApaLsSession17InsertDataMappingERK9TDataTypel4TUid @ 50 NONAME
+ _ZN13RApaLsSession17InsertDataMappingERK9TDataTypel4TUidS3_ @ 51 NONAME
+ _ZN13RApaLsSession17SetMaxDataBufSizeEi @ 52 NONAME
+ _ZN13RApaLsSession18SetAppShortCaptionERK7TDesC169TLanguage4TUid @ 53 NONAME
+ _ZN13RApaLsSession20CancelRecognizeFilesEv @ 54 NONAME
+ _ZN13RApaLsSession21SetAcceptedConfidenceEi @ 55 NONAME
+ _ZN13RApaLsSession23RApaLsSession_Reserved1Ev @ 56 NONAME
+ _ZN13RApaLsSession23RApaLsSession_Reserved2Ev @ 57 NONAME
+ _ZN13RApaLsSession25InsertDataMappingIfHigherERK9TDataTypel4TUidRi @ 58 NONAME
+ _ZN13RApaLsSession25NotifyOnDataMappingChangeER14TRequestStatus @ 59 NONAME
+ _ZN13RApaLsSession29RegisterNonNativeApplicationLE4TUidRK10TDriveUnitR34CApaRegistrationResourceFileWriterP33CApaLocalisableResourceFileWriterPK5RFile @ 60 NONAME
+ _ZN13RApaLsSession31CancelNotifyOnDataMappingChangeEv @ 61 NONAME
+ _ZN13RApaLsSession31DeregisterNonNativeApplicationLE4TUid @ 62 NONAME
+ _ZN13RApaLsSession33RegisterNonNativeApplicationTypeLE4TUidRK7TDesC16 @ 63 NONAME
+ _ZN13RApaLsSession35CommitNonNativeApplicationsUpdatesLEv @ 64 NONAME
+ _ZN13RApaLsSession35DeregisterNonNativeApplicationTypeLE4TUid @ 65 NONAME
+ _ZN13RApaLsSession36PrepareNonNativeApplicationsUpdatesLEv @ 66 NONAME
+ _ZN13RApaLsSession36RollbackNonNativeApplicationsUpdatesEv @ 67 NONAME
+ _ZN13RApaLsSession5CloseEv @ 68 NONAME
+ _ZN13RApaLsSession7ConnectEv @ 69 NONAME
+ _ZN13RApaLsSession8StartAppERK15CApaCommandLine @ 70 NONAME
+ _ZN13RApaLsSession8StartAppERK15CApaCommandLineR9TThreadId @ 71 NONAME
+ _ZN13RApaLsSession8StartAppERK15CApaCommandLineR9TThreadIdP14TRequestStatus @ 72 NONAME
+ _ZN13RApaLsSession9FsSessionEv @ 73 NONAME
+ _ZN13RApaLsSession9SetNotifyEiR14TRequestStatus @ 74 NONAME
+ _ZN13RApaLsSessionC1Ev @ 75 NONAME
+ _ZN13RApaLsSessionC2Ev @ 76 NONAME
+ _ZN16CApaMaskedBitmap12InternalizeLER11RReadStream @ 77 NONAME
+ _ZN16CApaMaskedBitmap13SetMaskBitmapEP10CFbsBitmap @ 78 NONAME
+ _ZN16CApaMaskedBitmap4NewLEPKS_ @ 79 NONAME
+ _ZN16CApaMaskedBitmap5NewLCEv @ 80 NONAME
+ _ZN16CApaMaskedBitmapD0Ev @ 81 NONAME
+ _ZN16CApaMaskedBitmapD1Ev @ 82 NONAME
+ _ZN16CApaMaskedBitmapD2Ev @ 83 NONAME
+ _ZN17CApaSystemControl7CreateLEv @ 84 NONAME
+ _ZN18TApaPictureFactoryC1EP11CApaProcess @ 85 NONAME
+ _ZN18TApaPictureFactoryC1Ev @ 86 NONAME
+ _ZN18TApaPictureFactoryC2EP11CApaProcess @ 87 NONAME
+ _ZN18TApaPictureFactoryC2Ev @ 88 NONAME
+ _ZN19CApaAppListNotifier4NewLEP23MApaAppListServObserverN7CActive9TPriorityE @ 89 NONAME
+ _ZN19CApaAppListNotifierD0Ev @ 90 NONAME
+ _ZN19CApaAppListNotifierD1Ev @ 91 NONAME
+ _ZN19CApaAppListNotifierD2Ev @ 92 NONAME
+ _ZN19CApaWindowGroupName11SetAppReadyEi @ 93 NONAME
+ _ZN19CApaWindowGroupName11SetCaptionLERK7TDesC16 @ 94 NONAME
+ _ZN19CApaWindowGroupName11SetDocNameLERK7TDesC16 @ 95 NONAME
+ _ZN19CApaWindowGroupName12FindByAppUidE4TUidR10RWsSessionRi @ 96 NONAME
+ _ZN19CApaWindowGroupName13FindByCaptionERK7TDesC16R10RWsSessionRi @ 97 NONAME
+ _ZN19CApaWindowGroupName13FindByDocNameERK7TDesC16R10RWsSessionRi @ 98 NONAME
+ _ZN19CApaWindowGroupName17SetDocNameIsAFileEi @ 99 NONAME
+ _ZN19CApaWindowGroupName18ConstructFromWgIdLEi @ 100 NONAME
+ _ZN19CApaWindowGroupName18SetWindowGroupNameEP7HBufC16 @ 101 NONAME
+ _ZN19CApaWindowGroupName19SetWindowGroupNameLERK7TDesC16 @ 102 NONAME
+ _ZN19CApaWindowGroupName26SetRespondsToShutdownEventEi @ 103 NONAME
+ _ZN19CApaWindowGroupName29SetRespondsToSwitchFilesEventEi @ 104 NONAME
+ _ZN19CApaWindowGroupName3NewERK10RWsSessionP7HBufC16 @ 105 NONAME
+ _ZN19CApaWindowGroupName4NewLERK10RWsSession @ 106 NONAME
+ _ZN19CApaWindowGroupName4NewLERK10RWsSessionRK7TDesC16 @ 107 NONAME
+ _ZN19CApaWindowGroupName4NewLERK10RWsSessioni @ 108 NONAME
+ _ZN19CApaWindowGroupName5NewLCERK10RWsSession @ 109 NONAME
+ _ZN19CApaWindowGroupName5NewLCERK10RWsSessionRK7TDesC16 @ 110 NONAME
+ _ZN19CApaWindowGroupName5NewLCERK10RWsSessioni @ 111 NONAME
+ _ZN19CApaWindowGroupName7SetBusyEi @ 112 NONAME
+ _ZN19CApaWindowGroupName9SetAppUidE4TUid @ 113 NONAME
+ _ZN19CApaWindowGroupName9SetHiddenEi @ 114 NONAME
+ _ZN19CApaWindowGroupName9SetSystemEi @ 115 NONAME
+ _ZN19CApaWindowGroupNameD0Ev @ 116 NONAME
+ _ZN19CApaWindowGroupNameD1Ev @ 117 NONAME
+ _ZN19CApaWindowGroupNameD2Ev @ 118 NONAME
+ _ZN21CApaAppInfoFileWriter11AddCaptionLE9TLanguageRK7TDesC16 @ 119 NONAME ABSENT
+ _ZN21CApaAppInfoFileWriter12AddDataTypeLERK21TDataTypeWithPriority @ 120 NONAME ABSENT
+ _ZN21CApaAppInfoFileWriter13SetCapabilityERK6TDesC8 @ 121 NONAME ABSENT
+ _ZN21CApaAppInfoFileWriter6StoreLEv @ 122 NONAME ABSENT
+ _ZN21CApaAppInfoFileWriter8AddIconLER16CApaMaskedBitmap @ 123 NONAME ABSENT
+ _ZN21CApaAppInfoFileWriterD0Ev @ 124 NONAME ABSENT
+ _ZN21CApaAppInfoFileWriterD1Ev @ 125 NONAME ABSENT
+ _ZN21CApaAppInfoFileWriterD2Ev @ 126 NONAME ABSENT
+ _ZN21CApaSystemControlList4NewLER3RFs @ 127 NONAME
+ _ZN21CApaSystemControlList7UpdateLEv @ 128 NONAME
+ _ZN21CApaSystemControlListD0Ev @ 129 NONAME
+ _ZN21CApaSystemControlListD1Ev @ 130 NONAME
+ _ZN21CApaSystemControlListD2Ev @ 131 NONAME
+ _ZN22ForJavaMIDletInstaller18GetJavaMIDletInfoLER3RFsRK7TDesC16RmS5_ @ 132 NONAME ABSENT
+ _ZN22ForJavaMIDletInstaller28NewInterimFormatFileWriterLCER3RFsRK7TDesC164TUidmi @ 133 NONAME ABSENT
+ _ZN22ForJavaMIDletInstaller33CheckInterimFormatFileNotCorruptLER5RFile @ 134 NONAME ABSENT
+ _ZN23MApaAppListServObserver33MApaAppListServObserver_Reserved1Ev @ 135 NONAME
+ _ZN23MApaAppListServObserver33MApaAppListServObserver_Reserved2Ev @ 136 NONAME
+ _ZN23MApaAppListServObserverC2Ev @ 137 NONAME
+ _ZN27CDataRecognitionResultArrayC1Ev @ 138 NONAME
+ _ZN27CDataRecognitionResultArrayC2Ev @ 139 NONAME
+ _ZN27CDataRecognitionResultArrayD0Ev @ 140 NONAME
+ _ZN27CDataRecognitionResultArrayD1Ev @ 141 NONAME
+ _ZN27CDataRecognitionResultArrayD2Ev @ 142 NONAME
+ _ZN31TIconLoaderAndIconArrayForLeaks27TestIconLoaderAndIconArrayLEv @ 143 NONAME
+ _ZN33CApaLocalisableResourceFileWriter4NewLERK7TDesC16S2_iS2_ @ 144 NONAME
+ _ZN33CApaLocalisableResourceFileWriterD0Ev @ 145 NONAME
+ _ZN33CApaLocalisableResourceFileWriterD1Ev @ 146 NONAME
+ _ZN33CApaLocalisableResourceFileWriterD2Ev @ 147 NONAME
+ _ZN34CApaRegistrationResourceFileWriter12AddDataTypeLEiRK6TDesC8 @ 148 NONAME
+ _ZN34CApaRegistrationResourceFileWriter13SetGroupNameLERK7TDesC16 @ 149 NONAME
+ _ZN34CApaRegistrationResourceFileWriter14SetOpaqueDataLERK6TDesC8 @ 150 NONAME
+ _ZN34CApaRegistrationResourceFileWriter15SetAppIsHiddenLEi @ 151 NONAME
+ _ZN34CApaRegistrationResourceFileWriter17SetEmbeddabilityLEN17TApaAppCapability14TEmbeddabilityE @ 152 NONAME
+ _ZN34CApaRegistrationResourceFileWriter19SetSupportsNewFileLEi @ 153 NONAME
+ _ZN34CApaRegistrationResourceFileWriter21AddFileOwnershipInfoLERK7TDesC16 @ 154 NONAME
+ _ZN34CApaRegistrationResourceFileWriter22SetLaunchInBackgroundLEi @ 155 NONAME
+ _ZN34CApaRegistrationResourceFileWriter23SetDefaultScreenNumberLEi @ 156 NONAME
+ _ZN34CApaRegistrationResourceFileWriter4NewLE4TUidRK7TDesC16j @ 157 NONAME
+ _ZN34CApaRegistrationResourceFileWriterD0Ev @ 158 NONAME
+ _ZN34CApaRegistrationResourceFileWriterD1Ev @ 159 NONAME
+ _ZN34CApaRegistrationResourceFileWriterD2Ev @ 160 NONAME
+ _ZN8ApaUtils24HandleAsRegistrationFileERK8TUidType @ 161 NONAME ABSENT
+ _ZN8CApaDoor16SetFormatToIconLEv @ 162 NONAME
+ _ZN8CApaDoor17SetFormatToGlassLEv @ 163 NONAME
+ _ZN8CApaDoor25SetFormatToTemporaryIconLEi @ 164 NONAME
+ _ZN8CApaDoor4NewLER3RFsR12CApaDocumentRK5TSize @ 165 NONAME
+ _ZN8CApaDoor4NewLER3RFsRK12CStreamStore9TStreamIdR11CApaProcess @ 166 NONAME
+ _ZN8CApaDoor5NewLCER3RFsR12CApaDocumentRK5TSize @ 167 NONAME
+ _ZN8CApaDoor8RestoreLERK12CStreamStore9TStreamId @ 168 NONAME
+ _ZN8CApaDoor9DocumentLEi @ 169 NONAME
+ _ZN8CApaDoorD0Ev @ 170 NONAME
+ _ZN8CApaDoorD1Ev @ 171 NONAME
+ _ZN8CApaDoorD2Ev @ 172 NONAME
+ _ZN8TApaTask11SendMessageE4TUidRK6TDesC8 @ 173 NONAME
+ _ZN8TApaTask14SwitchOpenFileERK7TDesC16 @ 174 NONAME
+ _ZN8TApaTask15SendSystemEventE15TApaSystemEvent @ 175 NONAME
+ _ZN8TApaTask16SendToBackgroundEv @ 176 NONAME
+ _ZN8TApaTask16SwitchCreateFileERK7TDesC16 @ 177 NONAME
+ _ZN8TApaTask17BringToForegroundEv @ 178 NONAME
+ _ZN8TApaTask7EndTaskEv @ 179 NONAME
+ _ZN8TApaTask7SendKeyERK9TKeyEvent @ 180 NONAME
+ _ZN8TApaTask7SendKeyEii @ 181 NONAME
+ _ZN8TApaTask7SetWgIdEi @ 182 NONAME
+ _ZN8TApaTask8KillTaskEv @ 183 NONAME
+ _ZN8TApaTaskC1ER10RWsSession @ 184 NONAME
+ _ZN8TApaTaskC2ER10RWsSession @ 185 NONAME
+ _ZNK11CApaAppData10CapabilityER5TDes8 @ 186 NONAME
+ _ZNK11CApaAppData10IconSizesLEv @ 187 NONAME
+ _ZNK11CApaAppData10OpaqueDataEv @ 188 NONAME
+ _ZNK11CApaAppData10OwnedFilesEv @ 189 NONAME
+ _ZNK11CApaAppData11GetIconInfoERiS0_ @ 190 NONAME
+ _ZNK11CApaAppData12IconFileNameEv @ 191 NONAME
+ _ZNK11CApaAppData14NonMbmIconFileEv @ 192 NONAME
+ _ZNK11CApaAppData17ImplementsServiceE4TUid @ 193 NONAME
+ _ZNK11CApaAppData19ApplicationLanguageEv @ 194 NONAME
+ _ZNK11CApaAppData19DefaultScreenNumberEv @ 195 NONAME
+ _ZNK11CApaAppData20RegistrationFileNameEv @ 196 NONAME
+ _ZNK11CApaAppData20RegistrationFileUsedEv @ 197 NONAME
+ _ZNK11CApaAppData24NonNativeApplicationTypeEv @ 198 NONAME
+ _ZNK11CApaAppData27LocalisableResourceFileNameEv @ 199 NONAME
+ _ZNK11CApaAppData4IconE5TSize @ 200 NONAME
+ _ZNK11CApaAppData4IconEi @ 201 NONAME
+ _ZNK11CApaAppData5ViewsEv @ 202 NONAME
+ _ZNK11CApaAppData8AppEntryEv @ 203 NONAME
+ _ZNK11CApaAppData8DataTypeERK9TDataType @ 204 NONAME
+ _ZNK11CApaAppData9IsPendingEv @ 205 NONAME
+ _ZNK11CApaAppList12AppDataByUidE4TUid @ 206 NONAME
+ _ZNK11CApaAppList17AppDataByFileNameERK7TDesC16 @ 207 NONAME
+ _ZNK11CApaAppList17AppScanInProgressEv @ 208 NONAME
+ _ZNK11CApaAppList17ServiceUidBufferLE4TUid @ 209 NONAME
+ _ZNK11CApaAppList19IsFirstScanCompleteEv @ 210 NONAME
+ _ZNK11CApaAppList19ServiceArrayBufferLE4TUid @ 211 NONAME
+ _ZNK11CApaAppList20IsIdleUpdateCompleteEv @ 212 NONAME
+ _ZNK11CApaAppList21PreferredDataHandlerLERK9TDataType @ 213 NONAME
+ _ZNK11CApaAppList21PreferredDataHandlerLERK9TDataTypePK4TUidRi @ 214 NONAME
+ _ZNK11CApaAppList23IsLanguageChangePendingEv @ 215 NONAME
+ _ZNK11CApaAppList23ServiceImplArrayBufferLE4TUid @ 216 NONAME
+ _ZNK11CApaAppList23ServiceImplArrayBufferLE4TUidRK9TDataType @ 217 NONAME
+ _ZNK11CApaAppList24ServiceOpaqueDataBufferLE4TUidS0_ @ 218 NONAME
+ _ZNK11CApaAppList5CountEv @ 219 NONAME
+ _ZNK11CApaAppList7NextAppEPK11CApaAppData @ 220 NONAME
+ _ZNK11CApaAppList7NextAppEPK11CApaAppDatai @ 221 NONAME
+ _ZNK11CApaAppList8FirstAppEi @ 222 NONAME
+ _ZNK11CApaAppList8FirstAppEv @ 223 NONAME
+ _ZNK13RApaLsSession10GetAllAppsEi @ 224 NONAME
+ _ZNK13RApaLsSession10GetAllAppsEv @ 225 NONAME
+ _ZNK13RApaLsSession10GetAppIconE4TUid5TSizeR16CApaMaskedBitmap @ 226 NONAME
+ _ZNK13RApaLsSession10GetAppIconE4TUidR5RFile @ 227 NONAME
+ _ZNK13RApaLsSession10GetAppIconE4TUidRP7HBufC16 @ 228 NONAME
+ _ZNK13RApaLsSession10GetAppIconE4TUidiR16CApaMaskedBitmap @ 229 NONAME
+ _ZNK13RApaLsSession10GetAppInfoER11TApaAppInfo4TUid @ 230 NONAME
+ _ZNK13RApaLsSession10GetAppTypeER4TUidS0_ @ 231 NONAME
+ _ZNK13RApaLsSession10GetNextAppER11TApaAppInfo @ 232 NONAME
+ _ZNK13RApaLsSession10GetNextAppER11TApaAppInfoi @ 233 NONAME
+ _ZNK13RApaLsSession11GetAppViewsER13CArrayFixFlatI15TApaAppViewInfoE4TUid @ 234 NONAME
+ _ZNK13RApaLsSession13GetServerAppsE4TUid @ 235 NONAME
+ _ZNK13RApaLsSession13GetServerAppsE4TUidi @ 236 NONAME
+ _ZNK13RApaLsSession13RecognizeDataERK5RFileR22TDataRecognitionResult @ 237 NONAME
+ _ZNK13RApaLsSession13RecognizeDataERK7TDesC16RK6TDesC8R22TDataRecognitionResult @ 238 NONAME
+ _ZNK13RApaLsSession14AppForDataTypeERK9TDataTypeR4TUid @ 239 NONAME
+ _ZNK13RApaLsSession14AppForDocumentERK5RFileR4TUidR9TDataType @ 240 NONAME
+ _ZNK13RApaLsSession14AppForDocumentERK7TDesC16R4TUidR9TDataType @ 241 NONAME
+ _ZNK13RApaLsSession14GetAppViewIconE4TUidS0_RK5TSizeR16CApaMaskedBitmap @ 242 NONAME
+ _ZNK13RApaLsSession14GetAppViewIconE4TUidS0_RP7HBufC16 @ 243 NONAME
+ _ZNK13RApaLsSession15GetAppIconSizesE4TUidR13CArrayFixFlatI5TSizeE @ 244 NONAME
+ _ZNK13RApaLsSession15GetAppServicesLE4TUidR13CArrayFixFlatIS0_E @ 245 NONAME
+ _ZNK13RApaLsSession15GetFilteredAppsERK23TApaEmbeddabilityFilter @ 246 NONAME
+ _ZNK13RApaLsSession15GetFilteredAppsERK23TApaEmbeddabilityFilteri @ 247 NONAME
+ _ZNK13RApaLsSession15GetFilteredAppsEjj @ 248 NONAME
+ _ZNK13RApaLsSession15GetFilteredAppsEjji @ 249 NONAME
+ _ZNK13RApaLsSession15RecognizeFilesLERK7TDesC16R27CDataRecognitionResultArray @ 250 NONAME
+ _ZNK13RApaLsSession15RecognizeFilesLERK7TDesC16RK6TDesC8R27CDataRecognitionResultArray @ 251 NONAME
+ _ZNK13RApaLsSession16GetAppByDataTypeERK9TDataType4TUidRS3_ @ 252 NONAME
+ _ZNK13RApaLsSession16GetAppCapabilityER5TDes84TUid @ 253 NONAME
+ _ZNK13RApaLsSession16GetAppOwnedFilesER12CDesC16Array4TUid @ 254 NONAME
+ _ZNK13RApaLsSession16GetAppServicesLCE4TUid @ 255 NONAME
+ _ZNK13RApaLsSession17GetEmbeddableAppsEi @ 256 NONAME
+ _ZNK13RApaLsSession17GetEmbeddableAppsEv @ 257 NONAME
+ _ZNK13RApaLsSession17GetMaxDataBufSizeERi @ 258 NONAME
+ _ZNK13RApaLsSession18EmbeddableAppCountERi @ 259 NONAME
+ _ZNK13RApaLsSession19ApplicationLanguageE4TUidR9TLanguage @ 260 NONAME
+ _ZNK13RApaLsSession19GetPreferredBufSizeERi @ 261 NONAME
+ _ZNK13RApaLsSession21GetAcceptedConfidenceERi @ 262 NONAME
+ _ZNK13RApaLsSession21MatchesSecurityPolicyERi4TUidRK15TSecurityPolicy @ 263 NONAME
+ _ZNK13RApaLsSession21RecognizeSpecificDataERK5RFileRK9TDataTypeRi @ 264 NONAME
+ _ZNK13RApaLsSession21RecognizeSpecificDataERK7TDesC16RK6TDesC8RK9TDataTypeRi @ 265 NONAME
+ _ZNK13RApaLsSession22GetDefaultScreenNumberERi4TUid @ 266 NONAME
+ _ZNK13RApaLsSession22GetSupportedDataTypesLER13CArrayFixFlatI9TDataTypeE @ 267 NONAME
+ _ZNK13RApaLsSession23NumberOfOwnDefinedIconsE4TUidRi @ 268 NONAME
+ _ZNK13RApaLsSession24AppForDataTypeAndServiceERK9TDataType4TUidRS3_ @ 269 NONAME
+ _ZNK13RApaLsSession24AppForDocumentAndServiceERK5RFile4TUidRS3_R9TDataType @ 270 NONAME
+ _ZNK13RApaLsSession24AppForDocumentAndServiceERK7TDesC164TUidRS3_R9TDataType @ 271 NONAME
+ _ZNK13RApaLsSession25GetAppServiceOpaqueDataLCE4TUidS0_ @ 272 NONAME
+ _ZNK13RApaLsSession27GetServiceImplementationsLCE4TUid @ 273 NONAME
+ _ZNK13RApaLsSession27GetServiceImplementationsLCE4TUidRK9TDataType @ 274 NONAME
+ _ZNK13RApaLsSession36CancelListPopulationCompleteObserverEv @ 275 NONAME
+ _ZNK13RApaLsSession38RegisterListPopulationCompleteObserverER14TRequestStatus @ 276 NONAME
+ _ZNK13RApaLsSession7VersionEv @ 277 NONAME
+ _ZNK13RApaLsSession8AppCountERi @ 278 NONAME
+ _ZNK13RApaLsSession9IsProgramERK7TDesC16Ri @ 279 NONAME
+ _ZNK15CApaAppViewData10IconSizesLEv @ 280 NONAME
+ _ZNK15CApaAppViewData10ScreenModeEv @ 281 NONAME
+ _ZNK15CApaAppViewData12IconFileNameEv @ 282 NONAME
+ _ZNK15CApaAppViewData14NonMbmIconFileEv @ 283 NONAME
+ _ZNK15CApaAppViewData3UidEv @ 284 NONAME
+ _ZNK15CApaAppViewData4IconERK5TSize @ 285 NONAME
+ _ZNK16CApaMaskedBitmap12ExternalizeLER12RWriteStream @ 286 NONAME
+ _ZNK16CApaMaskedBitmap4MaskEv @ 287 NONAME
+ _ZNK17CApaSystemControl12ShortCaptionEv @ 288 NONAME
+ _ZNK17CApaSystemControl4IconEv @ 289 NONAME
+ _ZNK17CApaSystemControl4TypeEv @ 290 NONAME
+ _ZNK17CApaSystemControl7CaptionEv @ 291 NONAME
+ _ZNK17CApaSystemControl8FileNameEv @ 292 NONAME
+ _ZNK18TApaAppServiceInfo10OpaqueDataEv @ 293 NONAME
+ _ZNK18TApaAppServiceInfo3UidEv @ 294 NONAME
+ _ZNK18TApaAppServiceInfo9DataTypesEv @ 295 NONAME
+ _ZNK18TApaPictureFactory11NewPictureLER14TPictureHeaderRK12CStreamStore @ 296 NONAME
+ _ZNK19CApaWindowGroupName10IsAppReadyEv @ 297 NONAME
+ _ZNK19CApaWindowGroupName14DocNameIsAFileEv @ 298 NONAME
+ _ZNK19CApaWindowGroupName15WindowGroupNameEv @ 299 NONAME
+ _ZNK19CApaWindowGroupName18SetWindowGroupNameER12RWindowGroup @ 300 NONAME
+ _ZNK19CApaWindowGroupName23RespondsToShutdownEventEv @ 301 NONAME
+ _ZNK19CApaWindowGroupName26RespondsToSwitchFilesEventEv @ 302 NONAME
+ _ZNK19CApaWindowGroupName6AppUidEv @ 303 NONAME
+ _ZNK19CApaWindowGroupName6HiddenEv @ 304 NONAME
+ _ZNK19CApaWindowGroupName6IsBusyEv @ 305 NONAME
+ _ZNK19CApaWindowGroupName7CaptionEv @ 306 NONAME
+ _ZNK19CApaWindowGroupName7DocNameEv @ 307 NONAME
+ _ZNK19CApaWindowGroupName8IsSystemEv @ 308 NONAME
+ _ZNK21CApaSystemControlList5CountEv @ 309 NONAME
+ _ZNK21CApaSystemControlList5IndexE4TUid @ 310 NONAME
+ _ZNK21CApaSystemControlList7ControlE4TUid @ 311 NONAME
+ _ZNK21CApaSystemControlList7ControlEi @ 312 NONAME
+ _ZNK27CDataRecognitionResultArray12GetFileNameLER4TBufILi256EEj @ 313 NONAME
+ _ZNK27CDataRecognitionResultArray25GetDataRecognitionResultLER22TDataRecognitionResultj @ 314 NONAME
+ _ZNK27CDataRecognitionResultArray4PathEv @ 315 NONAME
+ _ZNK27CDataRecognitionResultArray5CountEv @ 316 NONAME
+ _ZNK8CApaDoor7AppUidLEv @ 317 NONAME
+ _ZNK8TApaTask4WgIdEv @ 318 NONAME
+ _ZNK8TApaTask6ExistsEv @ 319 NONAME
+ _ZNK8TApaTask8ThreadIdEv @ 320 NONAME
+ _ZN17CApaSecurityUtils16CheckAppSecurityERK7TPtrC16RiS3_ @ 321 NONAME
+ _ZN11CApaAppList22AddForcedRegistrationLERK7TDesC16 @ 322 NONAME
+ _ZN11CApaAppList23AddCustomAppInfoInListLE4TUid9TLanguageRK7TDesC16 @ 323 NONAME
+ _ZN11CApaAppList28UpdateAppListByShortCaptionLEv @ 324 NONAME
+ _ZN11CApaAppList4NewLER3RFsii @ 325 NONAME
+ _ZN11TApaAppInfo12InternalizeLER11RReadStream @ 326 NONAME
+ _ZN11TApaAppInfoC1E4TUidRK4TBufILi256EES4_ @ 327 NONAME
+ _ZN11TApaAppInfoC1E4TUidRK4TBufILi256EES4_S4_ @ 328 NONAME
+ _ZN11TApaAppInfoC1Ev @ 329 NONAME
+ _ZN11TApaAppInfoC2E4TUidRK4TBufILi256EES4_ @ 330 NONAME
+ _ZN11TApaAppInfoC2E4TUidRK4TBufILi256EES4_S4_ @ 331 NONAME
+ _ZN11TApaAppInfoC2Ev @ 332 NONAME
+ _ZN12TApaAppEntryC1Ev @ 333 NONAME
+ _ZN12TApaAppEntryC2Ev @ 334 NONAME
+ _ZN15TApaAppViewInfo12InternalizeLER11RReadStream @ 335 NONAME
+ _ZN15TApaAppViewInfoC1E4TUidRK4TBufILi256EEi @ 336 NONAME
+ _ZN15TApaAppViewInfoC1Ev @ 337 NONAME
+ _ZN15TApaAppViewInfoC2E4TUidRK4TBufILi256EEi @ 338 NONAME
+ _ZN15TApaAppViewInfoC2Ev @ 339 NONAME
+ _ZN17TApaAppCapability12InternalizeLER11RReadStream @ 340 NONAME
+ _ZN17TApaAppCapability14CopyCapabilityER5TDes8RK6TDesC8 @ 341 NONAME
+ _ZN17TApaAppIdentifier12InternalizeLER11RReadStream @ 342 NONAME
+ _ZN17TApaAppIdentifierC1E4TUidRK4TBufILi256EE @ 343 NONAME
+ _ZN17TApaAppIdentifierC1Ev @ 344 NONAME
+ _ZN17TApaAppIdentifierC2E4TUidRK4TBufILi256EE @ 345 NONAME
+ _ZN17TApaAppIdentifierC2Ev @ 346 NONAME
+ _ZN18TApaAppServiceInfo12InternalizeLER11RReadStream @ 347 NONAME
+ _ZN18TApaAppServiceInfo7ReleaseEv @ 348 NONAME
+ _ZN18TApaAppServiceInfo9DataTypesEv @ 349 NONAME
+ _ZN18TApaAppServiceInfoC1E4TUidP13CArrayFixFlatI21TDataTypeWithPriorityEP6HBufC8 @ 350 NONAME
+ _ZN18TApaAppServiceInfoC1Ev @ 351 NONAME
+ _ZN18TApaAppServiceInfoC2E4TUidP13CArrayFixFlatI21TDataTypeWithPriorityEP6HBufC8 @ 352 NONAME
+ _ZN18TApaAppServiceInfoC2Ev @ 353 NONAME
+ _ZN23CApaAppServiceInfoArray33CApaAppServiceInfoArray_Reserved1Ev @ 354 NONAME
+ _ZN23CApaAppServiceInfoArray33CApaAppServiceInfoArray_Reserved2Ev @ 355 NONAME
+ _ZN23CApaAppServiceInfoArrayC2Ev @ 356 NONAME
+ _ZN23TApaEmbeddabilityFilter16AddEmbeddabilityEN17TApaAppCapability14TEmbeddabilityE @ 357 NONAME
+ _ZN23TApaEmbeddabilityFilterC1Ev @ 358 NONAME
+ _ZN23TApaEmbeddabilityFilterC2Ev @ 359 NONAME
+ _ZNK11TApaAppInfo12ExternalizeLER12RWriteStream @ 360 NONAME
+ _ZNK15TApaAppViewInfo12ExternalizeLER12RWriteStream @ 361 NONAME
+ _ZNK17TApaAppCapability12ExternalizeLER12RWriteStream @ 362 NONAME
+ _ZNK17TApaAppIdentifier12ExternalizeLER12RWriteStream @ 363 NONAME
+ _ZNK18TApaAppServiceInfo12ExternalizeLER12RWriteStream @ 364 NONAME
+ _ZNK23TApaEmbeddabilityFilter20MatchesEmbeddabilityEN17TApaAppCapability14TEmbeddabilityE @ 365 NONAME
+ _ZTI11CApaAppData @ 366 NONAME
+ _ZTI11CApaAppList @ 367 NONAME
+ _ZTI12CApaAppEntry @ 368 NONAME
+ _ZTI13RApaLsSession @ 369 NONAME
+ _ZTI15CApaAppViewData @ 370 NONAME
+ _ZTI15CApaIconPicture @ 371 NONAME
+ _ZTI16CApaMaskedBitmap @ 372 NONAME
+ _ZTI17CApaAppInfoReader @ 373 NONAME
+ _ZTI17CApaSystemControl @ 374 NONAME
+ _ZTI18TApaPictureFactory @ 375 NONAME
+ _ZTI19CApaAppListNotifier @ 376 NONAME
+ _ZTI19CApaWindowGroupName @ 377 NONAME
+ _ZTI21CApaSystemControlList @ 378 NONAME
+ _ZTI23CApaAppServiceInfoArray @ 379 NONAME
+ _ZTI23MApaAppListServObserver @ 380 NONAME
+ _ZTI27CDataRecognitionResultArray @ 381 NONAME
+ _ZTI33CApaLocalisableResourceFileWriter @ 382 NONAME
+ _ZTI34CApaRegistrationResourceFileWriter @ 383 NONAME
+ _ZTI7HBufBuf @ 384 NONAME
+ _ZTI8CApaDoor @ 385 NONAME
+ _ZTIN26CApaResourceFileWriterBase11RBufferSinkE @ 386 NONAME
+ _ZTV11CApaAppData @ 387 NONAME
+ _ZTV11CApaAppList @ 388 NONAME
+ _ZTV12CApaAppEntry @ 389 NONAME
+ _ZTV13RApaLsSession @ 390 NONAME
+ _ZTV15CApaAppViewData @ 391 NONAME
+ _ZTV15CApaIconPicture @ 392 NONAME
+ _ZTV16CApaMaskedBitmap @ 393 NONAME
+ _ZTV17CApaAppInfoReader @ 394 NONAME
+ _ZTV17CApaSystemControl @ 395 NONAME
+ _ZTV18TApaPictureFactory @ 396 NONAME
+ _ZTV19CApaAppListNotifier @ 397 NONAME
+ _ZTV19CApaWindowGroupName @ 398 NONAME
+ _ZTV21CApaSystemControlList @ 399 NONAME
+ _ZTV23CApaAppServiceInfoArray @ 400 NONAME
+ _ZTV23MApaAppListServObserver @ 401 NONAME
+ _ZTV27CDataRecognitionResultArray @ 402 NONAME
+ _ZTV33CApaLocalisableResourceFileWriter @ 403 NONAME
+ _ZTV34CApaRegistrationResourceFileWriter @ 404 NONAME
+ _ZTV7HBufBuf @ 405 NONAME
+ _ZTV8CApaDoor @ 406 NONAME
+ _ZTVN26CApaResourceFileWriterBase11RBufferSinkE @ 407 NONAME
+ _ZN11CApaAppData11SetCaptionLERK7TDesC16 @ 408 NONAME
+ _ZN11CApaAppData9SetIconsLERK7TDesC16i @ 409 NONAME
+ _ZN11CApaAppList36UpdateAppListByIconCaptionOverridesLEv @ 410 NONAME
+ _ZN13RApaLsSession40ForceCommitNonNativeApplicationsUpdatesLEv @ 411 NONAME
+ _ZN31TIconLoaderAndIconArrayForLeaks25TestIconCaptionOverridesLEv @ 412 NONAME
+ _ZN11CApaAppList20AppListUpdatePendingEv @ 413 NONAME
+ _ZNK13RApaLsSession13RecognizeDataERK6TDesC8R22TDataRecognitionResult @ 414 NONAME
+ _ZN11CApaAppList19UninstalledAppArrayEv @ 415 NONAME
+ X @ 416 NONAME ABSENT
+ X @ 417 NONAME ABSENT
+ X @ 418 NONAME ABSENT
+ X @ 419 NONAME ABSENT
+ X @ 420 NONAME ABSENT
+ X @ 421 NONAME ABSENT
+ X @ 422 NONAME ABSENT
+ X @ 423 NONAME ABSENT
+ X @ 424 NONAME ABSENT
+ X @ 425 NONAME ABSENT
+ X @ 426 NONAME ABSENT
+ X @ 427 NONAME ABSENT
+ X @ 428 NONAME ABSENT
+ X @ 429 NONAME ABSENT
+ X @ 430 NONAME ABSENT
+ X @ 431 NONAME ABSENT
+ X @ 432 NONAME ABSENT
\ No newline at end of file
--- a/appfw/apparchitecture/group/APFILE.MMP Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/group/APFILE.MMP Tue Aug 31 15:24:25 2010 +0300
@@ -38,9 +38,13 @@
macro UI_FRAMEWORKS_V1_REMNANT_FOR_JAVA_MIDLET_INSTALLER
-source APFREC.CPP APFSTD.CPP APRuleBased.CPP ApLaunchChecker.cpp apinstallationmonitor.cpp
+source APFREC.CPP APFSTD.CPP APRuleBased.CPP ApLaunchChecker.cpp
source apfmimecontentpolicy.cpp
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+source apinstallationmonitor.cpp
+#endif
+
library euser.lib efsrv.lib apparc.lib apgrfx.lib bafl.lib apserv.lib ecom.lib
library apmime.lib caf.lib
library centralrepository.lib
@@ -53,6 +57,12 @@
START MARM
END
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+ deffile APFILE.DEF
+#else
+ deffile apfile_legacy.def
+#endif
+
// For the benefit of Eshell which cannot build a resource registration file
START RESOURCE eshell_reg.rss
TARGETPATH /private/10003a3f/apps
--- a/appfw/apparchitecture/group/APGRFX.MMP Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/group/APGRFX.MMP Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009-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"
@@ -42,12 +42,19 @@
source apgnotif.cpp APSCLI.CPP apgconstdata.cpp
SOURCE apsecutils.cpp
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+SOURCE apgupdate.cpp
+#endif
+
library euser.lib apparc.lib apmime.lib gdi.lib estor.lib efsrv.lib fbscli.lib
library bitgdi.lib ws32.lib bafl.lib
library apserv.lib apfile.lib
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+library scrclient.lib
+#endif
+
#ifdef USE_IH_RAISE_EVENT
-APP_LAYER_SYSTEMINCLUDE_SYMBIAN
LIBRARY instrumentationhandler.lib
#endif // USE_IH_RAISE_EVENT
@@ -57,7 +64,12 @@
macro SYMBIAN_SUPPORT_UI_FRAMEWORKS_V1
-deffile APGRFX.DEF
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+ deffile APGRFX.DEF
+#else
+ deffile apgrfx_legacy.def
+#endif
+
START WINS
baseaddress 0x42F00000
--- a/appfw/apparchitecture/group/APLIST.MMP Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/group/APLIST.MMP Tue Aug 31 15:24:25 2010 +0300
@@ -32,18 +32,18 @@
option MSVC /Od
+
SOURCEPATH ../aplist
userinclude ../inc
MW_LAYER_SYSTEMINCLUDE_SYMBIAN
-source aplapplist.cpp aplapplistitem.cpp aplappinforeader.cpp aplappregfinder.cpp apsidchecker.cpp
+source aplapplist.cpp aplapplistitem.cpp aplappinforeader.cpp apsidchecker.cpp
source apsiconcaptionoverride.cpp
-// source APGCTL.CPP apgdoor.cpp APGICNFL.CPP APGSTD.CPP APGTASK.CPP
-// source APGWGNAM.CPP apgcli.cpp apgstart.cpp apgrecog.cpp APGPRIV.CPP
-// source apgnotif.cpp APGAIR.CPP APGAIRV2.CPP APSCLI.CPP APGCONSTDATA.CPP
-// SOURCE apsecutils.cpp
-// source APGAPLSTV2.CPP
+
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+source aplappregfinder.cpp
+#endif
library euser.lib gdi.lib estor.lib efsrv.lib fbscli.lib
library bitgdi.lib ws32.lib bafl.lib ecom.lib
@@ -59,10 +59,13 @@
library apmime.lib // TDataType referenced from CApaAppData
library centralrepository.lib
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+library scrclient.lib
+#endif
+
//library apserv.lib apfile.lib apparc.lib
#ifdef USE_IH_RAISE_EVENT
-APP_LAYER_SYSTEMINCLUDE_SYMBIAN
LIBRARY instrumentationhandler.lib
#endif // USE_IH_RAISE_EVENT
@@ -76,4 +79,12 @@
START MARM
END
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+ deffile aplist.def
+#else
+ deffile aplist_legacy.def
+#endif
+
+
+
SMPSAFE
--- a/appfw/apparchitecture/group/APSERV.MMP Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/group/APSERV.MMP Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009-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"
@@ -41,16 +41,27 @@
source APSSERV.CPP APSSES.CPP APSSTD.CPP APSSCAN.CPP
source APSSTART.CPP APSRECCACHE.cpp APSRECUTIL.CPP
source APSCONSTDATA.CPP
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
source apsnnapps.cpp apsnnappupdates.cpp
+#endif
library euser.lib efsrv.lib apparc.lib apgrfx.lib apmime.lib fbscli.lib apfile.lib
library estor.lib bafl.lib ws32.lib ecom.lib
library aplist.lib
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+library scrclient.lib
+library sisregistryclient.lib
+#endif
+
macro UI_FRAMEWORKS_V1_REMNANT_FOR_JAVA_MIDLET_INSTALLER
-deffile APSERV.DEF
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+ deffile APSERV.DEF
+#else
+ deffile apserv_legacy.def
+#endif
START WINS
baseaddress 0x43700000
--- a/appfw/apparchitecture/group/BLD.INF Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/group/BLD.INF Tue Aug 31 15:24:25 2010 +0300
@@ -29,7 +29,7 @@
// specify the source file followed by its destination here
// copy will be used to copy the source file to its destination
// If there's no destination then the source file will be copied
-// to the same name in \epoc32\include
+// to the same name in /epoc32/include
// Files from aincc.prj
../inc/APACLN.H SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(apacln.h)
@@ -60,11 +60,17 @@
../inc/APFCTLF.H SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(apfctlf.h)
../inc/APRuleBased.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(aprulebased.h)
../inc/ApLaunchChecker.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(aplaunchchecker.h)
+
../inc/ApSidChecker.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(apsidchecker.h)
// Files from gincc.prj
../inc/APGAPLST.H SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(apgaplst.h)
../inc/APGCLI.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(apgcli.h)
+
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+../inc/apgupdate.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(apgupdate.h)
+#endif
+
../inc/APGDOOR.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(apgdoor.h)
../inc/APGICNFL.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(apgicnfl.h)
#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
@@ -89,7 +95,7 @@
../group/apparc.iby /epoc32/rom/include/apparc.iby
-// File from ..\inc (which is relocated from app-framework\aiftool\inc)
+// File from ../inc (which is relocated from app-framework/aiftool/inc)
../inc/AIFTOOL.RH /epoc32/include/aiftool.rh
//Backup and restore exports
@@ -130,13 +136,28 @@
// i.e. tests where no user input is required. The default will apply if neither "manual"
// or "support" is specified.
../tef/apparctestserver.MMP
+
../tef/TAppInstall/TestAppInstall.mmp
-../tef/TSTAPP_embedded.MMP support
-../tef/TSTAPP_standalone.MMP support
-../tef/m_ctrl_v2.mmp support
+../tef/CustomiseDefaultIconApp.mmp support
+../tef/TCtrlPnlApp.mmp support
+../tef/T_DataPrioritySystem3.mmp support
+../tef/T_groupname.mmp support
+../tef/T_groupname_ver1.mmp support
+../tef/T_groupname_ver2.mmp support
+../tef/TestTrustedPriorityApp1.mmp support
+../tef/TestTrustedPriorityApp2.mmp support
+../tef/TestUnTrustedPriorityApp1.mmp support
+../tef/TestUnTrustedPriorityApp2.mmp support
+../tef/openservice1app.mmp support
+../tef/openservice2app.mmp support
+../tef/serverapp.mmp support
+../tef/serverapp2.mmp support
+../tef/serverapp3.mmp support
+../tef/serverapp4.mmp support
+../tef/serverapp6.mmp support
+../tef/serverapp7.mmp support
../tef/SimpleApparcTestApp.mmp support
../tef/zerosizedicontestapp.mmp support
-../tef/TEXE_V2.MMP support
../tef/TAppNotEmbeddable_v2.mmp support
../tef/TAppEmbeddable_embedded.mmp support
../tef/TAppEmbeddable_standalone.mmp support
@@ -147,77 +168,115 @@
../tef/TStartDocApp_v2.mmp support
../tef/t_winchainChild.mmp support
../tef/t_winchainLaunch.mmp support
-../tef/TLongUrlRecognizer_v2.mmp support
-../tef/TRApaLsSessionStartAppTestRecognizer_v2.mmp support
../tef/TRApaLsSessionStartAppTestApp_v2.mmp support
../tef/tRuleBasedApps/tRuleBasedApp1.mmp support
../tef/tRuleBasedApps/tRuleBasedApp2.mmp support
../tef/tRuleBasedApps/tRuleBasedApp3.mmp support
../tef/tRuleBasedApps/tRuleBasedApp4.mmp support
-../tef/TCmdLineExe.mmp support
../tef/TApparcTestApp.mmp support
-../tef/TAppLaunchChecker.mmp support
-../tef/TAppLaunchChecker2.mmp support
-../tef/TNonNativeAppLaunchChecker.mmp support
../tef/app_CTRL.MMP
-../tef/app_CTRL2.MMP
../tef/T_EnvSlots/T_EnvSlots.MMP
-../tef/TESTREC/TESTREC.MMP
../tef/ParentProcess.mmp
../tef/ChildI.mmp
../tef/ChildII.mmp
../tef/ChildIII.mmp
-../tef/tssaac/tssaac.mmp
-../tef/tssaac/tssaac_tapp.mmp
../tef/T_DataPrioritySystem1/T_DataPrioritySystem1.MMP
../tef/T_DataPrioritySystem2/T_DataPrioritySystem2.MMP
-../tef/TBufferOnlyRec/TBufferOnlyRec.mmp
-../tef/TNonNative/TNonNativeRec.mmp
../tef/TNonNative/TNNApp1.mmp
../tef/TNonNative/TNNApp2.mmp
+
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
../tef/TSidChecker/TestSidChecker.mmp
-../tef/TMimeRec/recmime.MMP
+#endif
+
../tef/TEndTaskTestApp/EndTaskTestApp.mmp
../tef/tlargestack/tlargestackapp.mmp
../tef/UnProctectedUidApp.mmp support
-../tef/TIconLoaderAndIconArrayForLeaks.mmp
-// RecMime_1 binaries are used to install and uninstall the mime type recognizer during runtime in TRApaLsSessionTestStep.
-//../tef/TMimeRec1/RecMime_1.MMP
../tef/tupgradeiconapp/tupgradeiconapp.mmp
../tef/tnotifydrivesapp/tnotifydrivesapp.mmp
-../tef/TRecUpgrade/recupgrade.mmp
-//*****************************************************************************************************************************************************************************************************
-//recupgrade_1 plug-in is used to upgrade the mime type recognizer during runtime in T_RecUpgrade test.
-// It is build for armv5 and rename to recupgrade_armv5_rel.dll and copied to apparc\Tdata before actual code builds. If you are making any change in recupgrade_1.cpp then uncomment
-// “recupgrade_1.MMP” , build , rename (.dll) and copy as mentioned above .
-//*****************************************************************************************************************************************************************************************************
-//../tef/TRecUpgrade_1/recupgrade_1.MMP
-
+../tef/ticoncaptionoverride.mmp
../tef/testapp/testforceregistrationapp1/testforceregistrationapp1.mmp
-// ***************************************************************************************************************************************************************************************************
-// recupgrade_2 plug-in is used to upgrade the mime type recognizer during runtime in T_RecUpgrade test.
-// It is build for armv5 and rename to recupgrade2_armv5_rel.dll and copied to apparc\Tdata before actual code builds. If you are making any change in recupgrade_2.cpp then uncomment
-// “recupgrade_2.MMP” , build , rename (.dll) and copy as mentioned above .
-// ***************************************************************************************************************************************************************************************************
-//../tef/TRecUpgrade_2/recupgrade_2.MMP
-../tef/ticoncaptionoverride.mmp
// testupdregappuninstallation is used in t_serviceregistry test. If any changes done to
// this application, uncomment testupdregappuninstallation.mmp file and build it.
-// Then comment it and copy the testupdregappuninstallation_reg.rsc file to ..\tdata folder.
+// Then comment it and copy the testupdregappuninstallation_reg.rsc file to ../tdata folder.
// Delete any testupdregappuninstallation* files from epoc32 directory.
//../tef/testapp/testupdregappuninstallation/testupdregappuninstallation.mmp
// testupgradeupdregappuninstallation is used in t_serviceregistry test. If any changes done to
// this application, uncomment testupdregappuninstallation.mmp file and build it.
-// Then comment it and copy the testupgradeupdregappuninstallation_reg.rsc file to ..\tdata folder.
+// Then comment it and copy the testupgradeupdregappuninstallation_reg.rsc file to ../tdata folder.
// Delete any testupdregappuninstallation* files from epoc32 directory.
//../tef/testapp/testupgradeupdregappuninstallation/testupgradeupdregappuninstallation.mmp
+//plugins
+../tef/TNonNativeAppLaunchChecker.mmp support
+../tef/TAppLaunchChecker.mmp support
+../tef/TAppLaunchChecker2.mmp support
+../tef/TESTREC/TESTREC.MMP
+../tef/TBufferOnlyRec/TBufferOnlyRec.mmp
+../tef/TMimeRec/recmime.MMP
+// RecMime_1 binaries are used to install and uninstall the mime type recognizer during runtime in TRApaLsSessionTestStep.
+//../tef/TMimeRec1/RecMime_1.MMP
+
+
+../tef/m_ctrl_v2.mmp support
+../tef/m_ctrl_v2_Stub.mmp
+../tef/TSTAPP_embedded.MMP support
+../tef/TCmdLineExe.mmp support
+../tef/app_CTRL2.MMP
+../tef/app_CTRL2_stub.MMP
+../tef/tssaac/tssaac.mmp
+../tef/tssaac/tssaac_tapp.mmp
+../tef/TEXE_V2.MMP support
+
+
+../tef/TSTAPP_standalone.MMP support
+../tef/TSTAPP_standalone_Stub.MMP
+../tef/TNonNative/TNonNativeRec.mmp
+../tef/TLongUrlRecognizer_v2.mmp support
+../tef/TRApaLsSessionStartAppTestRecognizer_v2.mmp support
+
+../tef/TIconLoaderAndIconArrayForLeaks.mmp
+
+../tef/TRecUpgrade/recupgrade.mmp
+../tef/refnativeplugin/refnativeplugin.mmp
+
+//*****************************************************************************************************************************************************************************************************
+//recupgrade_1 plug-in is used to upgrade the mime type recognizer during runtime in T_RecUpgrade test.
+// It is build for armv5 and rename to recupgrade_armv5_rel.dll and copied to apparc/Tdata before actual code builds. If you are making any change in recupgrade_1.cpp then uncomment
+// “recupgrade_1.MMP” , build , rename (.dll) and copy as mentioned above .
+//*****************************************************************************************************************************************************************************************************
+//../tef/TRecUpgrade_1/recupgrade_1.MMP
+
+
+// ***************************************************************************************************************************************************************************************************
+// recupgrade_2 plug-in is used to upgrade the mime type recognizer during runtime in T_RecUpgrade test.
+// It is build for armv5 and rename to recupgrade2_armv5_rel.dll and copied to apparc/Tdata before actual code builds. If you are making any change in recupgrade_2.cpp then uncomment
+// “recupgrade_2.MMP” , build , rename (.dll) and copy as mentioned above .
+// ***************************************************************************************************************************************************************************************************
+//../tef/TRecUpgrade_2/recupgrade_2.MMP
+
+
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+../tef/forceregapps/forceregapp1.mmp
+../tef/forceregapps/forceregapp2.mmp
+../tef/forceregapps/TForceRegAppRec.mmp
+../tef/tnonnativeruntime/tnonnativeruntime.mmp
+#endif
+
+makefile ../tef/testpkg/preparesis.fil
+makefile ../tef/testpkg/preparesis_stub.fil
+
PRJ_TESTEXPORTS
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
../group/apparcTest.iby /epoc32/rom/include/apparctest.iby
+#else
+../group/apparcTest_new.iby /epoc32/rom/include/apparctest.iby
+#endif
+
../tef/scripts/hardware/apparctest_run.bat z:/apparctest/apparctest_run.bat
../tef/scripts/emulator/apparctest_run.bat /epoc32/release/winscw/udeb/apparctest_run.bat
@@ -276,6 +335,12 @@
../tef/scripts/apparctest_t_servicebase.script z:/apparctest/apparctest_t_servicebase.script
../tef/scripts/apparctest_t_RecUpgrade.script z:/apparctest/apparctest_t_recupgrade.script
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+../tef/scripts/apparctest_t_UpdateAppList.script z:/apparctest/apparctest_t_updateapplist.script
+../tef/scripts/apparctest_t_forcereg.script z:/apparctest/apparctest_t_forcereg.script
+../tef/scripts/apparctest_t_clientnotif.script z:/apparctest/apparctest_t_clientnotif.script
+../tef/scripts/apparctest_t_nonnativetest.script z:/apparctest/apparctest_t_nonnativetest.script
+#endif
//SysStart Apparc Scripts
../tef/scripts/apparctest_T_TestStartApp1L.script z:/apparctest/apparctest_t_teststartapp1l.script
@@ -311,17 +376,38 @@
../tef/tssaac/scripts/emulator/sysstart_apparc_setup.bat /epoc32/release/winscw/urel/z/apparctest/sysstart_apparc_setup.bat
../tef/tssaac/scripts/emulator/sysstart_apparc_checkEpocWind.bat /epoc32/release/winscw/urel/z/apparctest/sysstart_apparc_checkepocwind.bat
-../tef/tupgradeiconapp/tupgradeiconapp.mbm /epoc32/winscw/c/resource/apps/tupgradeiconapp.mbm
+../tef/tupgradeiconapp/tupgradeiconapp.mbm /epoc32/release/winscw/udeb/z/apparctestregfiles/tupgradeiconapp.mbm
+
+// epoc32/data
+
+// export certificates for creating sis files
+../tef/testpkg/Nokia_RnDCert_02.der /epoc32/tools/Nokia_RnDCert_02.der
+../tef/testpkg/Nokia_RnDCert_02.key /epoc32/tools/Nokia_RnDCert_02.key
+../tef/testpkg/swicertstore.dat /epoc32/release/winscw/udeb/z/resource/swicertstore.dat
+
-// epoc32\data
-../tef/tstappviewneg.xyz /epoc32/data/z/resource/apps/tstappviewneg.xyz
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+../tef/tstnnapp.mbm /epoc32/data/z/resource/apps/tstnnapp.mbm
+../tdata/AAA_reg.Rsc /epoc32/data/z/apparctest/aaa_reg.rsc
+#endif
+
+../tdata/forcegtestapp1.frg1 /epoc32/data/z/apparctest/forcegtestapp1.frg1
+../tdata/forcegtestapp2.frg2 /epoc32/data/z/apparctest/forcegtestapp2.frg2
+../tdata/scr_test.db /epoc32/data/z/apparctest/scr_test.db
+
../tef/tstappviewneg.mbm /epoc32/data/z/resource/apps/tstappviewneg.mbm
-../tef/tstnnapp.mbm /epoc32/data/z/resource/apps/tstnnapp.mbm
-../tef/App_ctrl.MBM /epoc32/data/z/system/data/app_ctrl.mbm
-../tef/zerosizedicon.mbm /epoc32/data/Z/resource/apps/zerosizedicon.mbm
-../tef/svg_icon.svg /epoc32/data/z/system/data/svg_icon.svg
-../tdata/AAA_reg.Rsc /epoc32/data/z/apparctest/aaa_reg.rsc
+../tef/App_ctrl.MBM /epoc32/release/winscw/udeb/z/apparctestregfiles/app_ctrl.mbm
+../tef/svg_icon.svg /epoc32/release/winscw/udeb/z/apparctestregfiles/svg_icon.svg
+../tef/zerosizedicon.mbm /epoc32/release/winscw/udeb/z/apparctestregfiles/zerosizedicon.mbm
../tdata/Corrupted_reg.RSC /epoc32/data/z/apparctest/corrupted_reg.rsc
+
+../tdata/testfile4.txt /epoc32/data/z/system/data/testpath/filtertests/testfile4.txt
+../tef/tstappviewneg.xyz /epoc32/release/winscw/udeb/z/apparctestregfiles/tstappviewneg.xyz
+../tef/tstappviewneg.xyz /epoc32/data/z/resource/apps/tstappviewneg.xyz
+../tdata/GIF.NNA1 /epoc32/data/z/private/101f289c/gif.nna1
+../tdata/HTML.NNA2 /epoc32/data/z/private/101f289c/html.nna2
+../tdata/CONTACT.NNA3 /epoc32/data/z/private/101f289c/contact.nna3
+../tdata/TXT.NNA4 /epoc32/data/z/private/101f289c/txt.nna4
../tdata/TSTAPPU.DOC /epoc32/data/z/system/data/tstapp.doc
../tdata/zero_len.txt /epoc32/data/z/system/data/zero_len.txt
../tdata/one_byte.txt /epoc32/data/z/system/data/one_byte.txt
@@ -331,34 +417,48 @@
../tdata/testfile1.txt /epoc32/data/z/system/data/testpath/filtertests/testfile1.txt
../tdata/testfile2.txt /epoc32/data/z/system/data/testpath/filtertests/testfile2.txt
../tdata/testfile3.txt /epoc32/data/z/system/data/testpath/filtertests/testfile3.txt
-../tdata/testfile4.txt /epoc32/data/z/system/data/testpath/filtertests/testfile4.txt
-../tdata/GIF.NNA1 /epoc32/data/z/private/101f289c/gif.nna1
-../tdata/HTML.NNA2 /epoc32/data/z/private/101f289c/html.nna2
-../tdata/CONTACT.NNA3 /epoc32/data/z/private/101f289c/contact.nna3
-../tdata/TXT.NNA4 /epoc32/data/z/private/101f289c/txt.nna4
../tdata/FileWithUnknownMimeType.UnrecognisableExtention /epoc32/data/z/system/data/filewithunknownmimetype.unrecognisableextention
../tdata/TApsRecogAppTest.mmr /epoc32/data/z/system/data/tapsrecogapptest.mmr
-../tdata/TApsRecogUpgradeTest.upg /epoc32/data/z/system/data/tapsrecogupgradetest.upg
-../tdata/TApsRecogUpgradeTest.upr /epoc32/data/z/system/data/tapsrecogupgradetest.upr
+../tdata/TApsRecogUpgradeTest.upg /epoc32/data/z/system/data/tapsrecogupgradetest.upg
+../tdata/TApsRecogUpgradeTest.upr /epoc32/data/z/system/data/tapsrecogupgradetest.upr
../tdata/mimecontentpolicy/sd_goo.dcf /epoc32/data/z/system/data/sd_goo.dcf
../tdata/mimecontentpolicy/fl_goo.dm /epoc32/data/z/system/data/fl_goo.dm
-../tdata/mimecontentpolicy/jpeg_wes.dm /epoc32/data/z/system/data/jpeg_wes.dm
-../tdata/mimecontentpolicy/gif_wallpaper.gif /epoc32/data/z/system/data/gif_wallpaper.gif
+../tdata/mimecontentpolicy/jpeg_wes.dm /epoc32/data/z/system/data/jpeg_wes.dm
+../tdata/mimecontentpolicy/gif_wallpaper.gif /epoc32/data/z/system/data/gif_wallpaper.gif
../tdata/mimecontentpolicy/propelli.jpg /epoc32/data/z/system/data/propelli.jpg
../tdata/mimecontentpolicy/type-r.jpg /epoc32/data/z/system/data/type-r.jpg
../tdata/1028583d.txt /epoc32/data/z/private/10202be9/1028583d.txt //test Central Repository initialisation file
../tdata/10003a3f.txt /epoc32/data/z/private/10202be9/10003a3f.txt //Test repository file contains closed content and extension information
+
// WINSCW UDEB
-../tef/tstappviewneg.xyz /epoc32/release/winscw/udeb/z/resource/apps/tstappviewneg.xyz
-../tef/tstappviewneg.mbm /epoc32/release/winscw/udeb/z/resource/apps/tstappviewneg.mbm
+// exporting db & certstore for winscw
+../tdata/scr.db /epoc32/release/winscw/udeb/z/sys/install/scr/provisioned/scr.db
+
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
../tef/tstnnapp.mbm /epoc32/release/winscw/udeb/z/resource/apps/tstnnapp.mbm
../tef/App_ctrl.MBM /epoc32/release/winscw/udeb/z/resource/apps/app_ctrl.mbm
-../tef/zerosizedicon.mbm /epoc32/release/winscw/udeb/z/resource/apps/zerosizedicon.mbm
../tef/svg_icon.svg /epoc32/release/winscw/udeb/z/resource/apps/svg_icon.svg
../tdata/AAA_reg.Rsc /epoc32/release/winscw/udeb/z/apparctest/aaa_reg.rsc
+../tdata/102081cf_reg.rsc /epoc32/release/winscw/udeb/z/system/data/102081cf_reg.rsc
+../tdata/102081ce_reg.rsc /epoc32/release/winscw/udeb/z/system/data/102081ce_reg.rsc
+../tdata/testupdregappuninstallation_reg.rsc /epoc32/release/winscw/udeb/z/system/data/testupdregappuninstallation_reg.rsc
+../tdata/testupgradeupdregappuninstallation_reg.rsc /epoc32/release/winscw/udeb/z/system/data/testupgradeupdregappuninstallation_reg.rsc
+../tef/zerosizedicon.mbm /epoc32/release/winscw/udeb/z/apparctestregfiles/zerosizedicon.mbm
+../tef/tstappviewneg.xyz /epoc32/release/winscw/udeb/z/apparctestregfiles/tstappviewneg.xyz
+#endif
+
+../tdata/scr_test.db /epoc32/release/winscw/udeb/z/apparctest/scr_test.db
+../tef/tstappviewneg.xyz /epoc32/release/winscw/udeb/z/resource/apps/tstappviewneg.xyz
+../tef/tstappviewneg.mbm /epoc32/release/winscw/udeb/z/apparctestregfiles/tstappviewneg.mbm
+../tef/tstappviewneg.mbm /epoc32/release/winscw/udeb/z/resource/apps/tstappviewneg.mbm
../tdata/Corrupted_reg.RSC /epoc32/release/winscw/udeb/z/apparctest/corrupted_reg.rsc
+
+../tdata/GIF.NNA1 /epoc32/release/winscw/udeb/z/private/101f289c/gif.nna1
+../tdata/HTML.NNA2 /epoc32/release/winscw/udeb/z/private/101f289c/html.nna2
+../tdata/CONTACT.NNA3 /epoc32/release/winscw/udeb/z/private/101f289c/contact.nna3
+../tdata/TXT.NNA4 /epoc32/release/winscw/udeb/z/private/101f289c/txt.nna4
../tdata/TSTAPPU.DOC /epoc32/release/winscw/udeb/z/system/data/tstapp.doc
../tdata/zero_len.txt /epoc32/release/winscw/udeb/z/system/data/zero_len.txt
../tdata/one_byte.txt /epoc32/release/winscw/udeb/z/system/data/one_byte.txt
@@ -369,38 +469,42 @@
../tdata/testfile2.txt /epoc32/release/winscw/udeb/z/system/data/testpath/filtertests/testfile2.txt
../tdata/testfile3.txt /epoc32/release/winscw/udeb/z/system/data/testpath/filtertests/testfile3.txt
../tdata/testfile4.txt /epoc32/release/winscw/udeb/z/system/data/testpath/filtertests/testfile4.txt
-../tdata/GIF.NNA1 /epoc32/release/winscw/udeb/z/private/101f289c/gif.nna1
-../tdata/HTML.NNA2 /epoc32/release/winscw/udeb/z/private/101f289c/html.nna2
-../tdata/CONTACT.NNA3 /epoc32/release/winscw/udeb/z/private/101f289c/contact.nna3
-../tdata/TXT.NNA4 /epoc32/release/winscw/udeb/z/private/101f289c/txt.nna4
../tdata/UpdatedAppsList.bin /epoc32/release/winscw/udeb/z/system/data/updatedappslist.bin
-../tdata/102081cf_reg.rsc /epoc32/release/winscw/udeb/z/system/data/102081cf_reg.rsc
-../tdata/102081ce_reg.rsc /epoc32/release/winscw/udeb/z/system/data/102081ce_reg.rsc
../tdata/FileWithUnknownMimeType.UnrecognisableExtention /epoc32/release/winscw/udeb/z/system/data/filewithunknownmimetype.unrecognisableextention
../tdata/TApsRecogAppTest.mmr /epoc32/release/winscw/udeb/z/system/data/tapsrecogapptest.mmr
-../tdata/recmime_1.rsc /epoc32/release/winscw/udeb/z/system/data/recmime_1.rsc
+../tdata/recmime_1.rsc /epoc32/release/winscw/udeb/z/system/data/recmime_1.rsc
../tdata/recmime_winscw.dll /epoc32/release/winscw/udeb/z/system/data/recmime_winscw.dll
../tdata/mimecontentpolicy/sd_goo.dcf /epoc32/release/winscw/udeb/z/system/data/sd_goo.dcf
../tdata/mimecontentpolicy/fl_goo.dm /epoc32/release/winscw/udeb/z/system/data/fl_goo.dm
-../tdata/mimecontentpolicy/jpeg_wes.dm /epoc32/release/winscw/udeb/z/system/data/jpeg_wes.dm
-../tdata/mimecontentpolicy/gif_wallpaper.gif /epoc32/release/winscw/udeb/z/system/data/gif_wallpaper.gif
+../tdata/mimecontentpolicy/jpeg_wes.dm /epoc32/release/winscw/udeb/z/system/data/jpeg_wes.dm
+../tdata/mimecontentpolicy/gif_wallpaper.gif /epoc32/release/winscw/udeb/z/system/data/gif_wallpaper.gif
../tdata/mimecontentpolicy/propelli.jpg /epoc32/release/winscw/udeb/z/system/data/propelli.jpg
../tdata/mimecontentpolicy/type-r.jpg /epoc32/release/winscw/udeb/z/system/data/type-r.jpg
../tdata/1028583d.txt /epoc32/release/winscw/udeb/z/private/10202be9/1028583d.txt //test Central Repository initialisation file
../tdata/10003a3f.txt /epoc32/release/winscw/udeb/z/private/10202be9/10003a3f.txt //Test repository file contains closed content and extension information
-../tdata/testupdregappuninstallation_reg.rsc /epoc32/release/winscw/udeb/z/system/data/testupdregappuninstallation_reg.rsc
-../tdata/testupgradeupdregappuninstallation_reg.rsc /epoc32/release/winscw/udeb/z/system/data/testupgradeupdregappuninstallation_reg.rsc
+
// WINSCW UREL
-../tef/tstappviewneg.xyz /epoc32/release/winscw/urel/z/resource/apps/tstappviewneg.xyz
-../tef/tstappviewneg.mbm /epoc32/release/winscw/urel/z/resource/apps/tstappviewneg.mbm
-../tef/tstnnapp.mbm /epoc32/release/winscw/urel/z/resource/apps/tstnnapp.mbm
+
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+../tef/tstnnapp.mbm /epoc32/release/winscw/urel/z/resource/apps/tstnnapp.mbm
../tef/App_ctrl.MBM /epoc32/release/winscw/urel/z/resource/apps/app_ctrl.mbm
-../tef/zerosizedicon.mbm /epoc32/release/winscw/urel/z/resource/apps/zerosizedicon.mbm
../tef/svg_icon.svg /epoc32/release/winscw/urel/z/resource/apps/svg_icon.svg
../tdata/AAA_reg.Rsc /epoc32/release/winscw/urel/z/apparctest/aaa_reg.rsc
../tdata/Corrupted_reg.RSC /epoc32/release/winscw/urel/z/apparctest/corrupted_reg.rsc
+../tdata/testupdregappuninstallation_reg.rsc /epoc32/release/winscw/urel/z/system/data/testupdregappuninstallation_reg.rsc
+../tdata/testupgradeupdregappuninstallation_reg.rsc /epoc32/release/winscw/urel/z/system/data/testupgradeupdregappuninstallation_reg.rsc
+../tef/zerosizedicon.mbm /epoc32/release/winscw/udeb/z/apparctestregfiles/zerosizedicon.mbm
+../tef/tstappviewneg.xyz /epoc32/release/winscw/udeb/z/apparctestregfiles/tstappviewneg.xyz
+#endif
+
+../tef/tstappviewneg.mbm /epoc32/release/winscw/urel/z/resource/apps/tstappviewneg.mbm
+../tef/tstappviewneg.xyz /epoc32/release/winscw/urel/z/resource/apps/tstappviewneg.xyz
+../tdata/GIF.NNA1 /epoc32/release/winscw/urel/z/private/101f289c/gif.nna1
+../tdata/HTML.NNA2 /epoc32/release/winscw/urel/z/private/101f289c/html.nna2
+../tdata/CONTACT.NNA3 /epoc32/release/winscw/urel/z/private/101f289c/contact.nna3
+../tdata/TXT.NNA4 /epoc32/release/winscw/urel/z/private/101f289c/txt.nna4
../tdata/TSTAPPU.DOC /epoc32/release/winscw/urel/z/system/data/tstapp.doc
../tdata/zero_len.txt /epoc32/release/winscw/urel/z/system/data/zero_len.txt
../tdata/one_byte.txt /epoc32/release/winscw/urel/z/system/data/one_byte.txt
@@ -411,35 +515,41 @@
../tdata/testfile2.txt /epoc32/release/winscw/urel/z/system/data/testpath/filtertests/testfile2.txt
../tdata/testfile3.txt /epoc32/release/winscw/urel/z/system/data/testpath/filtertests/testfile3.txt
../tdata/testfile4.txt /epoc32/release/winscw/urel/z/system/data/testpath/filtertests/testfile4.txt
-../tdata/GIF.NNA1 /epoc32/release/winscw/urel/z/private/101f289c/gif.nna1
-../tdata/HTML.NNA2 /epoc32/release/winscw/urel/z/private/101f289c/html.nna2
-../tdata/CONTACT.NNA3 /epoc32/release/winscw/urel/z/private/101f289c/contact.nna3
-../tdata/TXT.NNA4 /epoc32/release/winscw/urel/z/private/101f289c/txt.nna4
../tdata/FileWithUnknownMimeType.UnrecognisableExtention /epoc32/release/winscw/urel/z/system/data/filewithunknownmimetype.unrecognisableextention
../tdata/TApsRecogAppTest.mmr /epoc32/release/winscw/urel/z/system/data/tapsrecogapptest.mmr
-../tdata/recmime_1.rsc /epoc32/release/winscw/urel/z/system/data/recmime_1.rsc
+../tdata/recmime_1.rsc /epoc32/release/winscw/urel/z/system/data/recmime_1.rsc
../tdata/recmime_winscw.dll /epoc32/release/winscw/urel/z/system/data/recmime_winscw.dll
-../tdata/mimecontentpolicy/sd_goo.dcf /epoc32/release/winscw/urel/z/system/data/sd_goo.dcf
-../tdata/mimecontentpolicy/fl_goo.dm /epoc32/release/winscw/urel/z/system/data/fl_goo.dm
-../tdata/mimecontentpolicy/jpeg_wes.dm /epoc32/release/winscw/urel/z/system/data/jpeg_wes.dm
-../tdata/mimecontentpolicy/gif_wallpaper.gif /epoc32/release/winscw/urel/z/system/data/gif_wallpaper.gif
-../tdata/mimecontentpolicy/propelli.jpg /epoc32/release/winscw/urel/z/system/data/propelli.jpg
-../tdata/mimecontentpolicy/type-r.jpg /epoc32/release/winscw/urel/z/system/data/type-r.jpg
-../tdata/1028583d.txt /epoc32/release/winscw/urel/z/private/10202be9/1028583d.txt //test Central Repository initialisation file
-../tdata/10003a3f.txt /epoc32/release/winscw/urel/z/private/10202be9/10003a3f.txt //Test repository file contains closed content and extension information
-../tdata/testupdregappuninstallation_reg.rsc /epoc32/release/winscw/urel/z/system/data/testupdregappuninstallation_reg.rsc
-../tdata/testupgradeupdregappuninstallation_reg.rsc /epoc32/release/winscw/urel/z/system/data/testupgradeupdregappuninstallation_reg.rsc
+../tdata/mimecontentpolicy/sd_goo.dcf /epoc32/release/winscw/urel/z/system/data/sd_goo.dcf
+../tdata/mimecontentpolicy/fl_goo.dm /epoc32/release/winscw/urel/z/system/data/fl_goo.dm
+../tdata/mimecontentpolicy/jpeg_wes.dm /epoc32/release/winscw/urel/z/system/data/jpeg_wes.dm
+../tdata/mimecontentpolicy/gif_wallpaper.gif /epoc32/release/winscw/urel/z/system/data/gif_wallpaper.gif
+../tdata/mimecontentpolicy/propelli.jpg /epoc32/release/winscw/urel/z/system/data/propelli.jpg
+../tdata/mimecontentpolicy/type-r.jpg /epoc32/release/winscw/urel/z/system/data/type-r.jpg
+../tdata/1028583d.txt /epoc32/release/winscw/urel/z/private/10202be9/1028583d.txt //test Central Repository initialisation file
+../tdata/10003a3f.txt /epoc32/release/winscw/urel/z/private/10202be9/10003a3f.txt //Test repository file contains closed content and extension information
// ARMV5 UDEB
-../tef/tstappviewneg.xyz /epoc32/release/armv5/udeb/z/resource/apps/tstappviewneg.xyz
-../tef/tstappviewneg.mbm /epoc32/release/armv5/udeb/z/resource/apps/tstappviewneg.mbm
+
+// exporting db & certstore for armv5
+../tdata/scr.db /epoc32/data/z/sys/install/scr/provisioned/scr.db
+../tef/testpkg/swicertstore.dat /epoc32/data/z/resource/swicertstore.dat
+
+
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
../tef/tstnnapp.mbm /epoc32/release/armv5/udeb/z/resource/apps/tstnnapp.mbm
-../tef/App_ctrl.MBM /epoc32/release/armv5/udeb/z/resource/apps/app_ctrl.mbm
-../tef/zerosizedicon.mbm /epoc32/release/armv5/udeb/z/resource/apps/zerosizedicon.mbm
-../tef/svg_icon.svg /epoc32/release/armv5/udeb/z/resource/apps/svg_icon.svg
../tdata/AAA_reg.Rsc /epoc32/release/armv5/udeb/z/apparctest/aaa_reg.rsc
../tdata/Corrupted_reg.RSC /epoc32/release/armv5/udeb/z/apparctest/corrupted_reg.rsc
+../tdata/testupdregappuninstallation_reg.rsc /epoc32/release/armv5/udeb/z/system/data/testupdregappuninstallation_reg.rsc
+../tdata/testupgradeupdregappuninstallation_reg.rsc /epoc32/release/armv5/udeb/z/system/data/testupgradeupdregappuninstallation_reg.rsc
+#endif
+../tef/tstappviewneg.mbm /epoc32/release/armv5/udeb/z/resource/apps/tstappviewneg.mbm
+../tef/tstappviewneg.xyz /epoc32/release/armv5/udeb/z/resource/apps/tstappviewneg.xyz
+
+../tdata/GIF.NNA1 /epoc32/release/armv5/udeb/z/private/101f289c/gif.nna1
+../tdata/HTML.NNA2 /epoc32/release/armv5/udeb/z/private/101f289c/html.nna2
+../tdata/CONTACT.NNA3 /epoc32/release/armv5/udeb/z/private/101f289c/contact.nna3
+../tdata/TXT.NNA4 /epoc32/release/armv5/udeb/z/private/101f289c/txt.nna4
../tdata/TSTAPPU.DOC /epoc32/release/armv5/udeb/tstapp.doc
../tdata/zero_len.txt /epoc32/release/armv5/udeb/zero_len.txt
../tdata/one_byte.txt /epoc32/release/armv5/udeb/one_byte.txt
@@ -450,10 +560,6 @@
../tdata/testfile2.txt /epoc32/release/armv5/udeb/z/system/data/testpath/filtertests/testfile2.txt
../tdata/testfile3.txt /epoc32/release/armv5/udeb/z/system/data/testpath/filtertests/testfile3.txt
../tdata/testfile4.txt /epoc32/release/armv5/udeb/z/system/data/testpath/filtertests/testfile4.txt
-../tdata/GIF.NNA1 /epoc32/release/armv5/udeb/z/private/101f289c/gif.nna1
-../tdata/HTML.NNA2 /epoc32/release/armv5/udeb/z/private/101f289c/html.nna2
-../tdata/CONTACT.NNA3 /epoc32/release/armv5/udeb/z/private/101f289c/contact.nna3
-../tdata/TXT.NNA4 /epoc32/release/armv5/udeb/z/private/101f289c/txt.nna4
../tdata/FileWithUnknownMimeType.UnrecognisableExtention /epoc32/release/armv5/udeb/z/system/data/filewithunknownmimetype.unrecognisableextention
../tdata/TApsRecogAppTest.mmr /epoc32/release/armv5/udeb/z/system/data/tapsrecogapptest.mmr
../tdata/recmime_1.rsc /epoc32/release/armv5/udeb/z/system/data/recmime_1.rsc
@@ -471,19 +577,34 @@
../tdata/recupgrade2.rsc /epoc32/release/armv5/udeb/z/system/data/recupgrade2.rsc
../tdata/recupgrade_armv5_rel.dll /epoc32/release/armv5/udeb/z/system/data/recupgrade_armv5_rel.dll
../tdata/recupgrade2_armv5_rel.dll /epoc32/release/armv5/udeb/z/system/data/recupgrade2_armv5_rel.dll
-../tdata/testupdregappuninstallation_reg.rsc /epoc32/release/armv5/udeb/z/system/data/testupdregappuninstallation_reg.rsc
-../tdata/testupgradeupdregappuninstallation_reg.rsc /epoc32/release/armv5/udeb/z/system/data/testupgradeupdregappuninstallation_reg.rsc
// ARMV5 UREL
-../tef/tstappviewneg.xyz /epoc32/release/armv5/urel/z/resource/apps/tstappviewneg.xyz
-../tef/tstappviewneg.mbm /epoc32/release/armv5/urel/z/resource/apps/tstappviewneg.mbm
+
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
../tef/tstnnapp.mbm /epoc32/release/armv5/urel/z/resource/apps/tstnnapp.mbm
../tef/App_ctrl.MBM /epoc32/release/armv5/urel/z/resource/apps/app_ctrl.mbm
-../tef/zerosizedicon.mbm /epoc32/release/armv5/urel/z/resource/apps/zerosizedicon.mbm
../tef/svg_icon.svg /epoc32/release/armv5/urel/z/resource/apps/svg_icon.svg
../tdata/AAA_reg.Rsc /epoc32/release/armv5/urel/z/apparctest/aaa_reg.rsc
../tdata/Corrupted_reg.RSC /epoc32/release/armv5/urel/z/apparctest/corrupted_reg.rsc
+../tdata/testupdregappuninstallation_reg.rsc /epoc32/release/armv5/urel/z/system/data/testupdregappuninstallation_reg.rsc
+../tdata/testupgradeupdregappuninstallation_reg.rsc /epoc32/release/armv5/urel/z/system/data/testupgradeupdregappuninstallation_reg.rsc
+../tef/zerosizedicon.mbm /epoc32/release/winscw/udeb/z/apparctestregfiles/zerosizedicon.mbm
+../tef/tstappviewneg.xyz /epoc32/release/winscw/udeb/z/apparctestregfiles/tstappviewneg.xyz
+#endif
+../tef/tstappviewneg.xyz /epoc32/release/armv5/urel/z/resource/apps/tstappviewneg.xyz
+../tef/tstappviewneg.mbm /epoc32/release/armv5/urel/z/resource/apps/tstappviewneg.mbm
+../tef/tstappviewneg.mbm /epoc32/data/z/apparctestregfiles/tstappviewneg.mbm
+../tef/App_ctrl.MBM /epoc32/data/z/apparctestregfiles/App_ctrl.MBM
+../tef/svg_icon.svg /epoc32/data/z/apparctestregfiles/svg_icon.svg
+../tef/tstappviewneg.xyz /epoc32/data/z/apparctestregfiles/tstappviewneg.xyz
+../tef/tupgradeiconapp/tupgradeiconapp.mbm /epoc32/data/z/apparctestregfiles/tupgradeiconapp.mbm
+../tef/zerosizedicon.mbm /epoc32/data/z/apparctestregfiles/zerosizedicon.mbm
+
+../tdata/GIF.NNA1 /epoc32/release/armv5/urel/z/private/101f289c/gif.nna1
+../tdata/HTML.NNA2 /epoc32/release/armv5/urel/z/private/101f289c/html.nna2
+../tdata/CONTACT.NNA3 /epoc32/release/armv5/urel/z/private/101f289c/contact.nna3
+../tdata/TXT.NNA4 /epoc32/release/armv5/urel/z/private/101f289c/txt.nna4
../tdata/TSTAPPU.DOC /epoc32/release/armv5/urel/tstapp.doc
../tdata/zero_len.txt /epoc32/release/armv5/urel/zero_len.txt
../tdata/one_byte.txt /epoc32/release/armv5/urel/one_byte.txt
@@ -494,10 +615,6 @@
../tdata/testfile2.txt /epoc32/release/armv5/urel/z/system/data/testpath/filtertests/testfile2.txt
../tdata/testfile3.txt /epoc32/release/armv5/urel/z/system/data/testpath/filtertests/testfile3.txt
../tdata/testfile4.txt /epoc32/release/armv5/urel/z/system/data/testpath/filtertests/testfile4.txt
-../tdata/GIF.NNA1 /epoc32/release/armv5/urel/z/private/101f289c/gif.nna1
-../tdata/HTML.NNA2 /epoc32/release/armv5/urel/z/private/101f289c/html.nna2
-../tdata/CONTACT.NNA3 /epoc32/release/armv5/urel/z/private/101f289c/contact.nna3
-../tdata/TXT.NNA4 /epoc32/release/armv5/urel/z/private/101f289c/txt.nna4
../tdata/FileWithUnknownMimeType.UnrecognisableExtention /epoc32/release/armv5/urel/z/system/data/filewithunknownmimetype.unrecognisableextention
../tdata/TApsRecogAppTest.mmr /epoc32/release/armv5/urel/z/system/data/tapsrecogapptest.mmr
../tdata/recmime_1.rsc /epoc32/release/armv5/urel/z/system/data/recmime_1.rsc
@@ -515,6 +632,4 @@
../tdata/recupgrade2.rsc /epoc32/release/armv5/urel/z/system/data/recupgrade2.rsc
../tdata/recupgrade_armv5_rel.dll /epoc32/release/armv5/urel/z/system/data/recupgrade_armv5_rel.dll
../tdata/recupgrade2_armv5_rel.dll /epoc32/release/armv5/urel/z/system/data/recupgrade2_armv5_rel.dll
-../tdata/testupdregappuninstallation_reg.rsc /epoc32/release/armv5/urel/z/system/data/testupdregappuninstallation_reg.rsc
-../tdata/testupgradeupdregappuninstallation_reg.rsc /epoc32/release/armv5/urel/z/system/data/testupgradeupdregappuninstallation_reg.rsc
--- a/appfw/apparchitecture/group/apparc.iby Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/group/apparc.iby Tue Aug 31 15:24:25 2010 +0300
@@ -17,6 +17,37 @@
#ifndef __APPARC_IBY__
#define __APPARC_IBY__
+#ifdef __TEXTSHELL_OBY__
+
+#include <openenv.iby>
+#include <scr.iby>
+#include <sts.iby>
+file=ABI_DIR\BUILD_DIR\sisregistryclient.dll sys\bin\sisregistryclient.dll
+file=ABI_DIR\BUILD_DIR\sisregistryserver.exe sys\bin\sisregistryserver.exe
+file=ABI_DIR\BUILD_DIR\plan.dll sys\bin\plan.dll
+file=ABI_DIR\BUILD_DIR\siscontroller.dll sys\bin\siscontroller.dll
+file=ABI_DIR\BUILD_DIR\apprscparser.dll sys\bin\apprscparser.dll
+file=ABI_DIR\BUILD_DIR\swtypereginfo.dll sys\bin\swtypereginfo.dll
+file=ABI_DIR\BUILD_DIR\swidataprovider.dll sys\bin\swidataprovider.dll
+file=ABI_DIR\BUILD_DIR\securitymanager.dll sys\bin\securitymanager.dll
+file=ABI_DIR\BUILD_DIR\sislauncherclient.dll sys\bin\sislauncherclient.dll
+file=ABI_DIR\BUILD_DIR\sislauncherserver.exe sys\bin\sislauncherserver.exe
+file=ABI_DIR\BUILD_DIR\swiobserverclient.dll sys\bin\swiobserverclient.dll
+file=ABI_DIR\BUILD_DIR\uissclient.dll sys\bin\uissclient.dll
+#include <asnpkcs.iby>
+#include <filetokens.iby>
+#include <certman.iby>
+#include <ocsp.iby>
+file=ABI_DIR\BUILD_DIR\devinfosupportclient.dll sys\bin\devinfosupportclient.dll
+file=ABI_DIR\BUILD_DIR\devinfosupportcommon.dll sys\bin\devinfosupportcommon.dll
+file=ABI_DIR\BUILD_DIR\ocspsupportclient.dll sys\bin\ocspsupportclient.dll
+file=ABI_DIR\BUILD_DIR\ocspsupport.exe sys\bin\ocspsupport.exe
+file=ABI_DIR\BUILD_DIR\swiobserver.exe sys\bin\swiobserver.exe
+file=ABI_DIR\BUILD_DIR\Http.dll System\Libs\Http.dll
+file=ABI_DIR\BUILD_DIR\httputils.dll System\Libs\httputils.dll
+
+#endif
+
REM Application Architecture
file=ABI_DIR\BUILD_DIR\apparc.dll System\Libs\apparc.dll
@@ -28,7 +59,6 @@
file=ABI_DIR\BUILD_DIR\ServiceRegistry.dll System\Libs\ServiceRegistry.dll
-
#ifndef SYMBIAN_SYSTEM_STATE_MANAGEMENT
file=ABI_DIR\BUILD_DIR\apstart.dll System\Libs\apstart.dll
#endif // SYMBIAN_SYSTEM_STATE_MANAGEMENT
--- a/appfw/apparchitecture/group/apparcTest.iby Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/group/apparcTest.iby Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+* 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"
@@ -135,7 +135,6 @@
data=EPOCROOTepoc32\data\Z\private\10003a3f\apps\TCtrlPnlApp_reg.RSC private\10003a3f\apps\TCtrlPnlApp_reg.RSC
data=EPOCROOTepoc32\data\Z\private\10202be9\1028583d.txt private\10202be9\1028583d.txt
-data=EPOCROOTepoc32\data\Z\private\10202be9\10003a3f.txt private\10202be9\10003a3f.txt
// Change for Control panel Start
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/group/apparcTest_new.iby Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,313 @@
+/*
+* Copyright (c) 2009-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:
+*
+*/
+#ifndef __APPARCTEST_IBY__
+#define __APPARCTEST_IBY__
+
+REM Application Architecture Framework unit test iby file
+
+
+#ifndef __APPFWK_TEST_FRAMEWORK_IBY__
+ #include <appfwk_test_framework.iby>
+#endif
+
+
+file=ABI_DIR\BUILD_DIR\texe.exe sys\bin\texe.exe
+
+file=ABI_DIR\BUILD_DIR\TCmdLineExe.exe sys\bin\TCmdLineExe.exe
+
+file=ABI_DIR\BUILD_DIR\tstapp.exe sys\bin\tstapp.exe
+data=EPOCROOTepoc32\data\Z\private\10003a3f\import\apps\tstapp_reg.rsc private\10003a3f\import\apps\tstapp_reg.rsc
+file=ABI_DIR\BUILD_DIR\tnonnativeruntime.exe sys\bin\tnonnativeruntime.exe
+data=EPOCROOTepoc32\data\Z\private\10003a3f\import\apps\tnonnativeruntime_reg.rsc private\10003a3f\import\apps\tnonnativeruntime_reg.rsc
+data=ZRESOURCE\apps\tstapp.rsc Resource\apps\tstapp.rsc
+data=ZRESOURCE\apps\tstapp_loc.r01 Resource\apps\tstapp_loc.r01
+data=ZRESOURCE\apps\tstapp_loc.r02 Resource\apps\tstapp_loc.r02
+data=ZRESOURCE\apps\tstapp_loc.r03 Resource\apps\tstapp_loc.r03
+data=ZRESOURCE\apps\tstapp_loc.r04 Resource\apps\tstapp_loc.r04
+data=ZRESOURCE\apps\tstapp_loc.r05 Resource\apps\tstapp_loc.r05
+data=ZRESOURCE\apps\tstapp_loc.rsc Resource\apps\tstapp_loc.rsc
+data=ZRESOURCE\apps\tstapp.mbm Resource\apps\tstapp.mbm
+data=ZRESOURCE\apps\tstapp02.m02 Resource\apps\tstapp02.m02
+data=ZRESOURCE\apps\tstappview01.m01 Resource\apps\tstappview01.m01
+data=ZRESOURCE\apps\tstappview02.k Resource\apps\tstappview02.k
+data=ZRESOURCE\apps\tstappview01.m02 Resource\apps\tstappview01.m02
+data=ZRESOURCE\apps\tstappview Resource\apps\tstappview
+data=ZRESOURCE\apps\tstappviewneg.xyz Resource\apps\tstappviewneg.xyz
+data=ZRESOURCE\apps\tstappviewneg.mbm Resource\apps\tstappviewneg.mbm
+
+
+file=ABI_DIR\BUILD_DIR\m_ctrl.exe sys\bin\m_ctrl.exe
+data=ZRESOURCE\apps\m_ctrl.rsc Resource\Apps\m_ctrl.rsc
+data=ZRESOURCE\apps\m_ctrl_loc.rsc Resource\Apps\m_ctrl_loc.rsc
+data=EPOCROOTepoc32\data\Z\private\10003a3f\import\apps\m_ctrl_reg.rsc private\10003a3f\import\apps\m_ctrl_reg.rsc
+
+data=EPOCROOT##epoc32\data\Z\resource\swicertstore.dat resource\swicertstore.dat
+data=EPOCROOT##epoc32\data\z\apparctest\scr_test.db apparctest\scr_test.db
+
+
+ECOM_PLUGIN(refnativeplugin.dll,10285BC3.rsc)
+ECOM_PLUGIN(tstapp_embedded.dll,10004c66.rsc)
+
+data=ZSYSTEM\install\TSTAPP_standalone_Stub.sis system\install\TSTAPP_standalone_Stub.sis
+data=ZSYSTEM\install\app_CTRL2_stub.sis system\install\app_CTRL2_stub.sis
+data=ZSYSTEM\install\m_ctrl_v2_Stub.sis system\install\m_ctrl_v2_Stub.sis
+
+data=ZSYSTEM\apparctestsisfiles\app_CTRL2.sis apparctest\apparctestsisfiles\app_CTRL2.sis
+data=ZSYSTEM\apparctestsisfiles\EndTaskTestApp.sis apparctest\apparctestsisfiles\EndTaskTestApp.sis
+data=ZSYSTEM\apparctestsisfiles\SimpleApparcTestApp.sis apparctest\apparctestsisfiles\SimpleApparcTestApp.sis
+data=ZSYSTEM\apparctestsisfiles\T_EnvSlots.sis apparctest\apparctestsisfiles\T_EnvSlots.sis
+data=ZSYSTEM\apparctestsisfiles\t_groupname.sis apparctest\apparctestsisfiles\t_groupname.sis
+data=ZSYSTEM\apparctestsisfiles\t_winchainChild.sis apparctest\apparctestsisfiles\t_winchainChild.sis
+data=ZSYSTEM\apparctestsisfiles\t_winchainLaunch.sis apparctest\apparctestsisfiles\t_winchainLaunch.sis
+data=ZSYSTEM\apparctestsisfiles\TApparcTestApp.sis apparctest\apparctestsisfiles\TApparcTestApp.sis
+data=ZSYSTEM\apparctestsisfiles\TestTrustedPriorityApp2.sis apparctest\apparctestsisfiles\TestTrustedPriorityApp2.sis
+data=ZSYSTEM\apparctestsisfiles\TestUnTrustedPriorityApp2.sis apparctest\apparctestsisfiles\TestUnTrustedPriorityApp2.sis
+data=ZSYSTEM\apparctestsisfiles\TSTAPP_standalone.sis apparctest\apparctestsisfiles\TSTAPP_standalone.sis
+data=ZSYSTEM\apparctestsisfiles\TStartDocApp_v2.sis apparctest\apparctestsisfiles\TStartDocApp_v2.sis
+data=ZSYSTEM\apparctestsisfiles\UnProctectedUidApp.sis apparctest\apparctestsisfiles\UnProctectedUidApp.sis
+data=ZSYSTEM\apparctestsisfiles\tnotifydrivesapp.sis apparctest\apparctestsisfiles\tnotifydrivesapp.sis
+data=ZSYSTEM\apparctestsisfiles\T_groupname_ver1.sis apparctest\apparctestsisfiles\T_groupname_ver1.sis
+data=ZSYSTEM\apparctestsisfiles\T_groupname_ver2.sis apparctest\apparctestsisfiles\T_groupname_ver2.sis
+data=ZSYSTEM\apparctestsisfiles\tlargestackapp.sis apparctest\apparctestsisfiles\tlargestackapp.sis
+data=ZSYSTEM\apparctestsisfiles\TAppEmbeddable_embedded.sis apparctest\apparctestsisfiles\TAppEmbeddable_embedded.sis
+data=ZSYSTEM\apparctestsisfiles\TAppEmbeddable_standalone.sis apparctest\apparctestsisfiles\TAppEmbeddable_standalone.sis
+data=ZSYSTEM\apparctestsisfiles\TAppEmbeddableOnly_v2.sis apparctest\apparctestsisfiles\TAppEmbeddableOnly_v2.sis
+data=ZSYSTEM\apparctestsisfiles\TAppEmbeddableUiNotStandAlone_v2.sis apparctest\apparctestsisfiles\TAppEmbeddableUiNotStandAlone_v2.sis
+data=ZSYSTEM\apparctestsisfiles\TAppEmbeddableUiOrStandAlone_embedded.sis apparctest\apparctestsisfiles\TAppEmbeddableUiOrStandAlone_embedded.sis
+data=ZSYSTEM\apparctestsisfiles\TAppEmbeddableUiOrStandalone_standalone.sis apparctest\apparctestsisfiles\TAppEmbeddableUiOrStandalone_standalone.sis
+data=ZSYSTEM\apparctestsisfiles\TAppNotEmbeddable_v2.sis apparctest\apparctestsisfiles\TAppNotEmbeddable_v2.sis
+data=ZSYSTEM\apparctestsisfiles\TNNApp1.sis apparctest\apparctestsisfiles\TNNApp1.sis
+data=ZSYSTEM\apparctestsisfiles\serverapp2.sis apparctest\apparctestsisfiles\serverapp2.sis
+data=ZSYSTEM\apparctestsisfiles\serverapp4.sis apparctest\apparctestsisfiles\serverapp4.sis
+data=ZSYSTEM\apparctestsisfiles\serverapp6.sis apparctest\apparctestsisfiles\serverapp6.sis
+data=ZSYSTEM\apparctestsisfiles\serverapp7.sis apparctest\apparctestsisfiles\serverapp7.sis
+data=ZSYSTEM\apparctestsisfiles\TRApaLsSessionStartAppTestApp_v2.sis apparctest\apparctestsisfiles\TRApaLsSessionStartAppTestApp_v2.sis
+data=ZSYSTEM\apparctestsisfiles\TestMultipleApps.sis apparctest\apparctestsisfiles\TestMultipleApps.sis
+//data=ZSYSTEM\apparctestsisfiles\TInvalidApp.sis apparctest\apparctestsisfiles\TInvalidApp.sis
+data=ZSYSTEM\apparctestsisfiles\m_ctrl_v2.sis apparctest\apparctestsisfiles\m_ctrl_v2.sis
+data=ZSYSTEM\apparctestsisfiles\openservice1app.sis apparctest\apparctestsisfiles\openservice1app.sis
+data=ZSYSTEM\apparctestsisfiles\openservice2app.sis apparctest\apparctestsisfiles\openservice2app.sis
+data=ZSYSTEM\apparctestsisfiles\T_DataPrioritySystem1.sis apparctest\apparctestsisfiles\T_DataPrioritySystem1.sis
+data=ZSYSTEM\apparctestsisfiles\T_DataPrioritySystem2.sis apparctest\apparctestsisfiles\T_DataPrioritySystem2.sis
+data=ZSYSTEM\apparctestsisfiles\T_DataPrioritySystem3.sis apparctest\apparctestsisfiles\T_DataPrioritySystem3.sis
+data=ZSYSTEM\apparctestsisfiles\TCtrlPnlApp.sis apparctest\apparctestsisfiles\TCtrlPnlApp.sis
+data=ZSYSTEM\apparctestsisfiles\TestTrustedPriorityApp1.sis apparctest\apparctestsisfiles\TestTrustedPriorityApp1.sis
+data=ZSYSTEM\apparctestsisfiles\TestUnTrustedPriorityApp1.sis apparctest\apparctestsisfiles\TestUnTrustedPriorityApp1.sis
+data=ZSYSTEM\apparctestsisfiles\tRuleBasedApp1.sis apparctest\apparctestsisfiles\tRuleBasedApp1.sis
+data=ZSYSTEM\apparctestsisfiles\tRuleBasedApp2.sis apparctest\apparctestsisfiles\tRuleBasedApp2.sis
+data=ZSYSTEM\apparctestsisfiles\tRuleBasedApp3.sis apparctest\apparctestsisfiles\tRuleBasedApp3.sis
+data=ZSYSTEM\apparctestsisfiles\tRuleBasedApp4.sis apparctest\apparctestsisfiles\tRuleBasedApp4.sis
+data=ZSYSTEM\apparctestsisfiles\zerosizedicontestapp.sis apparctest\apparctestsisfiles\zerosizedicontestapp.sis
+data=ZSYSTEM\apparctestsisfiles\ForceRegApp1.sis apparctest\apparctestsisfiles\ForceRegApp1.sis
+data=ZSYSTEM\apparctestsisfiles\ForceRegApp2.sis apparctest\apparctestsisfiles\ForceRegApp2.sis
+data=ZSYSTEM\apparctestsisfiles\ForceRegMultipleApps.sis apparctest\apparctestsisfiles\ForceRegMultipleApps.sis
+data=ZSYSTEM\apparctestsisfiles\CustomiseDefaultIconApp.sis apparctest\apparctestsisfiles\CustomiseDefaultIconApp.sis
+data=ZSYSTEM\apparctestsisfiles\TestMultipleAppsDowngrade.sis apparctest\apparctestsisfiles\TestMultipleAppsDowngrade.sis
+data=ZSYSTEM\apparctestsisfiles\ticoncaptionoverride.sis apparctest\apparctestsisfiles\ticoncaptionoverride.sis
+
+file=ABI_DIR\BUILD_DIR\ParentProcess.exe Sys\bin\ParentProcess.exe
+file=ABI_DIR\BUILD_DIR\ChildI.exe Sys\bin\ChildI.exe
+file=ABI_DIR\BUILD_DIR\ChildII.exe Sys\bin\ChildII.exe
+file=ABI_DIR\BUILD_DIR\ChildIII.exe Sys\bin\ChildIII.exe
+data=EPOCROOTepoc32\data\Z\private\10003a3f\apps\ParentProcess_reg.Rsc private\10003a3f\apps\ParentProcess_reg.RSC
+data=EPOCROOTepoc32\data\z\Resource\apps\ParentProcess.Rsc Resource\apps\ParentProcess.Rsc
+data=EPOCROOTepoc32\data\Z\private\10003a3f\apps\ChildI_reg.RSC private\10003a3f\apps\ChildI_reg.RSC
+data=EPOCROOTepoc32\data\z\Resource\apps\ChildI.Rsc Resource\apps\ChildI.Rsc
+data=EPOCROOTepoc32\data\Z\private\10003a3f\apps\ChildII_reg.RSC private\10003a3f\apps\ChildII_reg.RSC
+data=EPOCROOTepoc32\data\z\Resource\apps\ChildII.Rsc Resource\apps\ChildII.Rsc
+data=EPOCROOTepoc32\data\Z\private\10003a3f\apps\ChildIII_reg.RSC private\10003a3f\apps\ChildIII_reg.RSC
+data=EPOCROOTepoc32\data\z\Resource\apps\ChildIII.Rsc Resource\apps\ChildIII.Rsc
+
+data=ABI_DIR\BUILD_DIR\tstapp.doc System\data\tstapp.doc
+data=ABI_DIR\BUILD_DIR\zero_len.txt System\data\zero_len.txt
+data=ABI_DIR\BUILD_DIR\one_byte.txt System\data\one_byte.txt
+
+
+#ifdef SYMBIAN_DISTINCT_LOCALE_MODEL
+REM Copy new locale language dlls to ROM SFTB10.1 onwards
+file=ABI_DIR\BUILD_DIR\elocl_lan.002 Sys\bin\elocl_lan.002
+file=ABI_DIR\BUILD_DIR\elocl_lan.004 Sys\bin\elocl_lan.004
+file=ABI_DIR\BUILD_DIR\elocl_lan.005 Sys\bin\elocl_lan.005
+file=ABI_DIR\BUILD_DIR\elocl_lan.032 Sys\bin\elocl_lan.032
+#else
+// These are pre SYMBIAN_DISTINCT_LOCALE_MODEL language locale dlls.Not to be use SFTB10.1 onwards.
+file=ABI_DIR\BUILD_DIR\ELOCL.01 Sys\bin\ELOCL.01
+file=ABI_DIR\BUILD_DIR\ELOCL.02 Sys\bin\ELOCL.02
+file=ABI_DIR\BUILD_DIR\ELOCL.03 Sys\bin\ELOCL.03
+file=ABI_DIR\BUILD_DIR\ELOCL.04 Sys\bin\ELOCL.04
+file=ABI_DIR\BUILD_DIR\ELOCL.05 Sys\bin\ELOCL.05
+file=ABI_DIR\BUILD_DIR\ELOCL.10 Sys\bin\ELOCL.10
+file=ABI_DIR\BUILD_DIR\ELOCL.32 Sys\bin\ELOCL.32
+#endif
+// This is now included in techview, from initlocale.iby
+//file=ABI_DIR\BUILD_DIR\ELOCL.LOC Sys\bin\ELOCL.LOC
+
+
+data=EPOCROOT##epoc32\data\Z\Apparctest\Corrupted_reg.rsc ApparcTest\Corrupted_reg.rsc
+data=EPOCROOT##epoc32\data\z\system\data\Testpath\file1.txt System\data\Testpath\file1.txt
+data=EPOCROOT##epoc32\data\z\system\data\Testpath\file2.txt System\data\Testpath\file2.txt
+data=EPOCROOT##epoc32\data\z\system\data\Testpath\FilterTests\testfile1.txt System\data\Testpath\FilterTests\testfile1.txt
+data=EPOCROOT##epoc32\data\z\system\data\Testpath\FilterTests\testfile2.txt System\data\Testpath\FilterTests\testfile2.txt
+data=EPOCROOT##epoc32\data\z\system\data\Testpath\FilterTests\testfile3.txt System\data\Testpath\FilterTests\testfile3.txt
+data=EPOCROOT##epoc32\data\z\system\data\Testpath\FilterTests\testfile4.txt System\data\Testpath\FilterTests\testfile4.txt
+data=EPOCROOT##epoc32\data\z\system\data\FileWithUnknownMimeType.UnrecognisableExtention System\data\FileWithUnknownMimeType.UnrecognisableExtention
+data=ABI_DIR\BUILD_DIR\z\system\data\recmime_1.rsc System\data\recmime_1.rsc
+data=ABI_DIR\BUILD_DIR\z\system\data\recmime_armv5.dll System\data\recmime_armv5.dll
+data=ABI_DIR\BUILD_DIR\z\system\data\TApsRecogAppTest.mmr System\data\TApsRecogAppTest.mmr
+data=ABI_DIR\BUILD_DIR\z\system\data\recupgrade.rsc System\data\recupgrade.rsc
+data=ABI_DIR\BUILD_DIR\z\system\data\recupgrade2.rsc System\data\recupgrade2.rsc
+data=ABI_DIR\BUILD_DIR\z\system\data\recupgrade_armv5_rel.dll System\data\recupgrade_armv5_rel.dll
+data=ABI_DIR\BUILD_DIR\z\system\data\recupgrade2_armv5_rel.dll System\data\recupgrade2_armv5_rel.dll
+data=ABI_DIR\BUILD_DIR\z\system\data\TApsRecogUpgradeTest.upg System\data\TApsRecogUpgradeTest.upg
+data=ABI_DIR\BUILD_DIR\z\system\data\TApsRecogUpgradeTest.upr System\data\TApsRecogUpgradeTest.upr
+
+
+data=EPOCROOT##epoc32\data\Z\Apparctest\testforceregistrationapp1_reg.rsc ApparcTest\testforceregistrationapp1_reg.rsc
+data=EPOCROOT##epoc32\data\Z\Apparctest\testforceregistrationapp1_loc.rsc ApparcTest\testforceregistrationapp1_loc.rsc
+
+data=EPOCROOTepoc32\data\Z\resource\apps\default_app_icon.m02 resource\apps\default_app_icon.m02
+
+data=EPOCROOTepoc32\data\Z\private\10202be9\1028583d.txt private\10202be9\1028583d.txt
+data=EPOCROOTepoc32\data\Z\private\10202be9\10003a3f.txt private\10202be9\10003a3f.txt
+
+
+// Change for Control panel Start
+file=ABI_DIR\BUILD_DIR\app_ctrl.exe Sys\bin\app_ctrl.exe
+file=ABI_DIR\BUILD_DIR\app_ctrl2.exe Sys\bin\app_ctrl2.exe
+data=EPOCROOTepoc32\data\z\private\10003a3f\import\apps\App_CTRL2_reg.Rsc private\10003a3f\import\apps\App_CTRL2_reg.Rsc
+data=EPOCROOTepoc32\data\z\Resource\apps\App_CTRL2.Rsc Resource\apps\App_CTRL2.Rsc
+// Change for Control panel End
+
+ECOM_PLUGIN(tforceregapprec.dll, A0001010.rsc)
+
+ECOM_PLUGIN(TLongUrlRecognizer.DLL,10004c4e.rsc)
+ECOM_PLUGIN(TBufferOnlyRec.DLL, 10207f88.rsc)
+
+data=ABI_DIR\BUILD_DIR\z\system\data\TRApaLsSessionStartAppTest.tst System\data\TRApaLsSessionStartAppTest.tst
+ECOM_PLUGIN(TRApaLsSessionStartAppTestRecognizer.DLL,10000182.rsc)
+
+ECOM_PLUGIN(TAppLaunchChecker.DLL,1020d465.rsc)
+ECOM_PLUGIN(TAppLaunchChecker2.DLL,102722ba.rsc)
+ECOM_PLUGIN(TNonNativeAppLaunchChecker.DLL,A0000B70.rsc)
+
+ECOM_PLUGIN(testrec.dll,102032A5.rsc)
+
+file=ABI_DIR\BUILD_DIR\tssaac.exe sys\bin\tssaac.exe
+file=ABI_DIR\BUILD_DIR\tssaac_tapp.exe sys\bin\tssaac_tapp.exe
+data=EPOCROOTepoc32\data\Z\private\10003a3f\apps\tssaac_tapp_reg.rsc private\10003a3f\apps\tssaac_tapp_reg.rsc
+data=ZRESOURCE\apps\tssaac_tapp.rsc resource\apps\tssaac_tapp.rsc
+data=ZRESOURCE\apps\tssaac_tapp_loc.rsc resource\apps\tssaac_tapp_loc.rsc
+
+ECOM_PLUGIN(TNonNativeRec.DLL, 10207f95.rsc)
+data=EPOCROOTepoc32\data\Z\private\101F289C\gif.nna1 private\101F289C\gif.nna1
+data=EPOCROOTepoc32\data\Z\private\101F289C\html.nna2 private\101F289C\html.nna2
+data=EPOCROOTepoc32\data\Z\private\101F289C\contact.nna3 private\101F289C\contact.nna3
+data=EPOCROOTepoc32\data\Z\private\101F289C\txt.nna4 private\101F289C\txt.nna4
+
+data=EPOCROOT##epoc32\data\z\system\data\fl_goo.dm System\data\fl_goo.dm
+data=EPOCROOT##epoc32\data\z\system\data\jpeg_wes.dm System\data\jpeg_wes.dm
+data=EPOCROOT##epoc32\data\z\system\data\gif_wallpaper.gif System\data\gif_wallpaper.gif
+data=EPOCROOT##epoc32\data\z\system\data\propelli.jpg System\data\propelli.jpg
+data=EPOCROOT##epoc32\data\z\system\data\type-r.jpg System\data\type-r.jpg
+data=EPOCROOT##epoc32\data\z\system\data\sd_goo.dcf System\data\sd_goo.dcf
+
+ECOM_PLUGIN(recmime.DLL, 102822B7.rsc)
+data=EPOCROOTepoc32\data\z\Resource\Plugins\recmime.RSC apparctest\dummy.rsc
+
+ECOM_PLUGIN(recupgrade.DLL, recupgrade.rsc)
+
+data=ABI_DIR\DEBUG_DIR\ApparcTestServer.exe sys\bin\ApparcTestServer.exe
+data=ABI_DIR\DEBUG_DIR\TIconLoaderAndIconArrayForLeaks.dll sys\bin\TIconLoaderAndIconArrayForLeaks.dll
+
+data=DATAZ_\apparctest\apparctest_run.bat \apparctest_run.bat
+
+data=DATAZ_\apparctest\apparctest_t_ApsScan.script \apparctest\apparctest_t_ApsScan.script
+data=DATAZ_\apparctest\apparctest_t_AppList.script \apparctest\apparctest_t_AppList.script
+data=DATAZ_\apparctest\apparctest_t_AppListFileUpdate.script \apparctest\apparctest_t_AppListFileUpdate.script
+data=DATAZ_\apparctest\apparctest_t_AutoMMCReaderOpen.script \apparctest\apparctest_t_AutoMMCReaderOpen.script
+data=DATAZ_\apparctest\apparctest_t_Backup.script \apparctest\apparctest_t_Backup.script
+data=DATAZ_\apparctest\apparctest_t_Capability1.script \apparctest\apparctest_t_Capability1.script
+data=DATAZ_\apparctest\apparctest_t_Capability2.script \apparctest\apparctest_t_Capability2.script
+data=DATAZ_\apparctest\apparctest_t_DataTypeMappingWithSid.script \apparctest\apparctest_t_DataTypeMappingWithSid.script
+data=DATAZ_\apparctest\apparctest_t_Caption.script \apparctest\apparctest_t_Caption.script
+data=DATAZ_\apparctest\apparctest_t_Cmdln.script \apparctest\apparctest_t_Cmdln.script
+data=DATAZ_\apparctest\apparctest_t_ControlPanelTest.script \apparctest\apparctest_t_ControlPanelTest.script
+data=DATAZ_\apparctest\apparctest_T_DataMappingPersistenceA.script \apparctest\apparctest_T_DataMappingPersistenceA.script
+data=DATAZ_\apparctest\apparctest_T_DataMappingPersistenceB.script \apparctest\apparctest_T_DataMappingPersistenceB.script
+data=DATAZ_\apparctest\apparctest_T_DataMappingPersistenceC.script \apparctest\apparctest_T_DataMappingPersistenceC.script
+data=DATAZ_\apparctest\apparctest_t_EndTask.script \apparctest\apparctest_t_EndTask.script
+data=DATAZ_\apparctest\apparctest_t_Exe.script \apparctest\apparctest_t_Exe.script
+data=DATAZ_\apparctest\apparctest_t_File2.script \apparctest\apparctest_t_File2.script
+data=DATAZ_\apparctest\apparctest_t_File3.script \apparctest\apparctest_t_File3.script
+data=DATAZ_\apparctest\apparctest_t_Foreground.script \apparctest\apparctest_t_Foreground.script
+data=DATAZ_\apparctest\apparctest_t_GroupName.script \apparctest\apparctest_t_GroupName.script
+data=DATAZ_\apparctest\apparctest_t_GroupName_ver1.script \apparctest\apparctest_t_GroupName_ver1.script
+data=DATAZ_\apparctest\apparctest_t_GroupName_ver2.script \apparctest\apparctest_t_GroupName_ver2.script
+data=DATAZ_\apparctest\apparctest_t_Locale.script \apparctest\apparctest_t_Locale.script
+data=DATAZ_\apparctest\apparctest_t_Mdr.script \apparctest\apparctest_t_Mdr.script
+data=DATAZ_\apparctest\apparctest_t_mimecontentpolicy.script \apparctest\apparctest_t_mimecontentpolicy.script
+data=DATAZ_\apparctest\apparctest_t_Mru.script \apparctest\apparctest_t_Mru.script
+data=DATAZ_\apparctest\apparctest_t_NonNativeApps.script \apparctest\apparctest_t_NonNativeApps.script
+data=DATAZ_\apparctest\apparctest_t_Notif.script \apparctest\apparctest_t_Notif.script
+data=DATAZ_\apparctest\apparctest_t_OOM.script \apparctest\apparctest_t_OOM.script
+data=DATAZ_\apparctest\apparctest_t_Pro.script \apparctest\apparctest_t_Pro.script
+data=DATAZ_\apparctest\apparctest_t_Proc.script \apparctest\apparctest_t_Proc.script
+data=DATAZ_\apparctest\apparctest_t_RApaLsSession.script \apparctest\apparctest_t_RApaLsSession.script
+data=DATAZ_\apparctest\apparctest_t_RuleBasedLaunching.script \apparctest\apparctest_t_RuleBasedLaunching.script
+data=DATAZ_\apparctest\apparctest_t_Serv2.script \apparctest\apparctest_t_Serv2.script
+data=DATAZ_\apparctest\apparctest_t_Serv3.script \apparctest\apparctest_t_Serv3.script
+data=DATAZ_\apparctest\apparctest_t_ServiceRegistry.script \apparctest\apparctest_t_ServiceRegistry.script
+data=DATAZ_\apparctest\apparctest_t_Services.script \apparctest\apparctest_t_Services.script
+data=DATAZ_\apparctest\apparctest_t_StartApp.script \apparctest\apparctest_t_StartApp.script
+data=DATAZ_\apparctest\apparctest_t_StartDoc.script \apparctest\apparctest_t_StartDoc.script
+data=DATAZ_\apparctest\apparctest_t_WindowChaining.script \apparctest\apparctest_t_WindowChaining.script
+data=DATAZ_\apparctest\apparctest_t_Wgnam.script \apparctest\apparctest_t_Wgnam.script
+data=DATAZ_\apparctest\apparctest_t_IntegritySupport.script \apparctest\apparctest_t_IntegritySupport.script
+data=DATAZ_\apparctest\apparctest_t_IntegritySupportReboot1.script \apparctest\apparctest_t_IntegritySupportReboot1.script
+data=DATAZ_\apparctest\apparctest_t_IntegritySupportReboot2.script \apparctest\apparctest_t_IntegritySupportReboot2.script
+data=DATAZ_\apparctest\apparctest_t_largestack.script \apparctest\apparctest_t_largestack.script
+data=DATAZ_\apparctest\apparctest_t_drivenotification.script \apparctest\apparctest_t_drivenotification.script
+data=DATAZ_\apparctest\apparctest_t_servicebase.script \apparctest\apparctest_t_servicebase.script
+data=DATAZ_\apparctest\apparctest_t_RecUpgrade.script \apparctest\apparctest_t_RecUpgrade.script
+data=DATAZ_\apparctest\apparctest_t_UpdateAppList.script \apparctest\apparctest_t_UpdateAppList.script
+
+data=DATAZ_\apparctest\apparctest_t_forcereg.script \apparctest\apparctest_t_forcereg.script
+data=DATAZ_\apparctest\apparctest_t_clientnotif.script \apparctest\apparctest_t_clientnotif.script
+data=DATAZ_\apparctest\apparctest_t_nonnativetest.script \apparctest\apparctest_t_nonnativetest.script
+
+REM SysStart Apparc Scripts
+data=DATAZ_\apparctest\apparctest_T_TestStartApp1L.script \apparctest\apparctest_T_TestStartApp1L.script
+data=DATAZ_\apparctest\apparctest_T_TestStartApp2L.script \apparctest\apparctest_T_TestStartApp2L.script
+data=DATAZ_\apparctest\apparctest_T_TestStartApp3L.script \apparctest\apparctest_T_TestStartApp3L.script
+data=DATAZ_\apparctest\apparctest_T_TestStartApp4L.script \apparctest\apparctest_T_TestStartApp4L.script
+data=DATAZ_\apparctest\apparctest_T_TestStartApp5L.script \apparctest\apparctest_T_TestStartApp5L.script
+data=DATAZ_\apparctest\apparctest_T_TestStartApp6L.script \apparctest\apparctest_T_TestStartApp6L.script
+data=DATAZ_\apparctest\apparctest_T_TestGetAllApps.script \apparctest\apparctest_T_TestGetAllApps.script
+data=DATAZ_\apparctest\apparctest_T_TestInsertDataTypeL.script \apparctest\apparctest_T_TestInsertDataTypeL.script
+data=DATAZ_\apparctest\apparctest_T_TestAppForDataTypeL.script \apparctest\apparctest_T_TestAppForDataTypeL.script
+data=DATAZ_\apparctest\apparctest_T_TestDeleteDataTypeL.script \apparctest\apparctest_T_TestDeleteDataTypeL.script
+data=DATAZ_\apparctest\apparctest_T_TestServiceDiscovery.script \apparctest\apparctest_T_TestServiceDiscovery.script
+data=DATAZ_\apparctest\apparctest_T_TestGetAppInfo.script \apparctest\apparctest_T_TestGetAppInfo.script
+data=DATAZ_\apparctest\apparctest_T_TestAppCount.script \apparctest\apparctest_T_TestAppCount.script
+data=DATAZ_\apparctest\apparctest_T_TestCreateDoc.script \apparctest\apparctest_T_TestCreateDoc.script
+data=DATAZ_\apparctest\apparctest_T_TestLocalisedCaptionL.script \apparctest\apparctest_T_TestLocalisedCaptionL.script
+
+REM End of Application Architecture Framework unit test iby file
+
+patchdata apgrfx.dll @ KMinApplicationStackSize 0xf000
+patchdata apserv.dll @ KApaDrivesToMonitor 4
+#endif
--- a/appfw/apparchitecture/inc/APGCLI.H Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/inc/APGCLI.H Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1997-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"
@@ -24,6 +24,12 @@
#include <badesca.h>
#include <f32file.h>
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+#include "apgupdate.h"
+//#include<usif/scr/scr.h>
+#include<usif/scr/appregentries.h>
+#endif
+
// classes referenced
class RFile;
class MArrayFiller;
@@ -65,7 +71,6 @@
RPointerArray<CItem> iItems;
};
-
/** A session with the application architecture server.
The server provides access to a cached list of the applications on the device.
@@ -234,6 +239,7 @@
IMPORT_C TInt RollbackNonNativeApplicationsUpdates();
IMPORT_C TInt GetAppType(TUid& aTypeUid, TUid aAppUid) const;
IMPORT_C TInt ForceRegistration(const RPointerArray<TDesC>& aRegFiles);
+
private: // Reserved for future use
IMPORT_C virtual void RApaLsSession_Reserved1();
IMPORT_C virtual void RApaLsSession_Reserved2();
@@ -245,6 +251,12 @@
*/
IMPORT_C void ForceCommitNonNativeApplicationsUpdatesL();
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+ IMPORT_C TInt UpdateAppListL(RArray<TApaAppUpdateInfo>& aAppUpdateInfo);
+ IMPORT_C TInt ForceRegistration(const RPointerArray<Usif::CApplicationRegistrationData>& aForceRegAppsInfo);
+ IMPORT_C TInt UpdatedAppsInfoL(RArray<TApaAppUpdateInfo>& aUpdatedApps);
+#endif
+
private:
void DoGetAppOwnedFilesL(CDesCArray& aArrayToFill, TUid aAppUid) const;
void DoGetAppViewsL(CApaAppViewArray& aArrayToFill, TUid aAppUid) const;
@@ -267,9 +279,17 @@
void DoStartAppL(const CApaCommandLine& aCommandLine, TThreadId* aThreadId, TRequestStatus* aRequestStatusForRendezvous);
static void GetMainThreadIdL(TThreadId& aThreadId, const RProcess& aProcess);
static void DeletePointerToPointerToTAny(TAny* aPointerToPointerToTAny);
+
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
static CBufFlat* CreateRegFilesBufferL(const RPointerArray<TDesC>& aRegFiles);
+#endif
+
static void CleanupOperation(TAny* aAny);
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+ CBufFlat* CreateAppUpdateInfoBufferL(RArray<TApaAppUpdateInfo>& aAppUpdateInfo);
+ CBufFlat* CreateForceRegAppInfoBufferL(const RPointerArray<Usif::CApplicationRegistrationData>& aForceRegAppsInfo);
+#endif
private: // data
friend class CApaLsSessionExtension;
CApaLsSessionExtension* iExtension;
--- a/appfw/apparchitecture/inc/apaapp.h Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/inc/apaapp.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1997-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"
@@ -19,11 +19,6 @@
#ifndef __APAAPP_H__
#define __APAAPP_H__
-#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
-#if !defined(__APAID_PARTNER_H__)
-#include "apaidpartner.h"
-#endif
-#endif //SYMBIAN_ENABLE_SPLIT_HEADERS
#include <e32std.h>
#include <e32base.h>
#include <apadef.h>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/inc/apgupdate.h Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,55 @@
+// 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:
+// apgupdate.h
+//
+
+#ifndef __APGUPDATE_H__
+#define __APGUPDATE_H__
+
+#include <e32std.h>
+#include <f32file.h>
+#include <s32strm.h>
+
+
+/*
+ * Contains application uid and corresponding action performed by installer.
+ * @publishedAll
+ */
+class TApaAppUpdateInfo
+ {
+public:
+ /*
+ * Defines actions performed by installers on an application.
+ * @publishedAll
+ */
+ enum TApaAppAction
+ {
+ //Application is installed or upgraded.
+ EAppPresent,
+ //Application is uninstalled.
+ EAppNotPresent,
+ //Application information is changed.
+ EAppInfoChanged
+ };
+
+public:
+ IMPORT_C void InternalizeL(RReadStream& aReadStream);
+ IMPORT_C void ExternalizeL(RWriteStream& aWriteStream) const;
+ IMPORT_C TApaAppUpdateInfo(TUid aAppUid, TApaAppUpdateInfo::TApaAppAction aAction);
+ IMPORT_C TApaAppUpdateInfo();
+public:
+ TUid iAppUid;
+ TApaAppAction iAction;
+ };
+#endif //__APGUPDATE_H__
Binary file appfw/apparchitecture/tdata/1028583d.txt has changed
Binary file appfw/apparchitecture/tdata/scr.db has changed
Binary file appfw/apparchitecture/tdata/scr_test.db has changed
--- a/appfw/apparchitecture/tef/App_ctrl_loc.RSS Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/App_ctrl_loc.RSS Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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"
@@ -28,7 +28,7 @@
{
caption="Test icon";
number_of_icons=1;
- icon_file="Z:\\Resource\\Apps\\APP_CTRL.MBM";
+ icon_file="C:\\Resource\\Apps\\APP_CTRL.MBM";
}
};
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/CustomiseDefaultIconApp.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,58 @@
+// Copyright (c) 2005-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:
+//
+
+/**
+ @file
+ @internalComponent - Internal Symbian test code
+*/
+
+TARGET CustomiseDefaultIconApp.exe
+TARGETTYPE exe
+UID 0x100039CE 0x10208181
+VENDORID 0x70000001
+
+
+USERINCLUDE .
+
+MW_LAYER_SYSTEMINCLUDE_SYMBIAN
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN
+//SYSTEMINCLUDE /epoc32/include/techview
+
+
+// Application localisable resource file
+resource CustomiseDefaultIconApp_loc.RSS
+start resource CustomiseDefaultIconApp_loc.RSS
+HEADER
+targetpath /apparctestregfiles
+lang sc
+end
+
+START RESOURCE CustomiseDefaultIconApp_reg.rss
+TARGETPATH /apparctestregfiles
+lang sc
+END
+
+SOURCEPATH ../tef
+SOURCE app_CTRL.CPP
+
+LIBRARY cone.lib ws32.lib appfwk_test_appui.lib euser.lib ecom.lib
+LIBRARY testexecuteutils.lib testexecutelogclient.lib
+LIBRARY apparc.lib efsrv.lib estor.lib gdi.lib fbscli.lib
+LIBRARY apfile.lib apgrfx.lib bafl.lib apmime.lib apserv.lib
+LIBRARY eikcore.lib appfwk_test_utils.lib serviceregistry.lib
+LIBRARY aplist.lib
+LIBRARY ticonloaderandiconarrayforleaks.lib centralrepository.lib
+
+SMPSAFE
--- a/appfw/apparchitecture/tef/SimpleApparcTestApp.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/SimpleApparcTestApp.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2000-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2000-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"
@@ -36,14 +36,14 @@
// Application exe specific resource which is localised to the application
RESOURCE SimpleApparcTestApp.rss
start resource SimpleApparcTestApp.rss
-targetpath /resource/apps
+targetpath /apparctestregfiles
lang sc
end
// Application exe registration resource file
START RESOURCE SimpleApparcTestApp_Reg.RSS
-TARGETPATH /private/10003a3f/apps
+TARGETPATH /apparctestregfiles
lang sc
END
--- a/appfw/apparchitecture/tef/TAppEmbeddableOnly_v2.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/TAppEmbeddableOnly_v2.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-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"
@@ -36,11 +36,12 @@
//reg added for Datacaging
START RESOURCE TAppEmbeddableOnly_reg.rss
-TARGETPATH /private/10003a3f/apps
+TARGETPATH /apparctestregfiles
END
START RESOURCE 10004c5C.rss
-TARGET tappembeddableonly.rsc
+TARGET /tappembeddableonly.rsc
+targetpath /apparctestregfiles
END
--- a/appfw/apparchitecture/tef/TAppEmbeddableUiNotStandAlone_v2.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/TAppEmbeddableUiNotStandAlone_v2.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-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"
@@ -36,11 +36,12 @@
//reg added for Datacaging
START RESOURCE TAppEmbeddableUiNotStandAlone_reg.rss
-TARGETPATH /private/10003a3f/apps
+TARGETPATH /apparctestregfiles
END
START RESOURCE 10004c5E.rss
-TARGET tappembeddableuinotstandalone.rsc
+TARGET /tappembeddableuinotstandalone.rsc
+targetpath /apparctestregfiles
END
LIBRARY apparc.lib
--- a/appfw/apparchitecture/tef/TAppEmbeddableUiOrStandAlone_embedded.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/TAppEmbeddableUiOrStandAlone_embedded.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-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"
@@ -35,7 +35,8 @@
//SYSTEMINCLUDE /epoc32/include/ecom
START RESOURCE 10004c5D.rss
-TARGET tappembeddableuiorstandalone_embedded.rsc
+TARGET /tappembeddableuiorstandalone_embedded.rsc
+targetpath /apparctestregfiles
END
--- a/appfw/apparchitecture/tef/TAppEmbeddableUiOrStandalone_standalone.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/TAppEmbeddableUiOrStandalone_standalone.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-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"
@@ -37,7 +37,7 @@
//reg added for Datacaging
START RESOURCE TAppEmbeddableUiOrStandAlone_reg.rss
-TARGETPATH /private/10003a3f/apps
+TARGETPATH /apparctestregfiles
END
LIBRARY euser.lib apparc.lib eikcore.lib cone.lib //added cone.lib from original?
--- a/appfw/apparchitecture/tef/TAppEmbeddable_embedded.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/TAppEmbeddable_embedded.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-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"
@@ -35,7 +35,9 @@
START RESOURCE 10004c5B.rss
-TARGET tappembeddable_embedded.rsc
+// TARGET /apparctestregfiles/tappembeddable_embedded.rsc //bpermi
+TARGET /tappembeddable_embedded.rsc
+targetpath /apparctestregfiles
END
LIBRARY apparc.lib
--- a/appfw/apparchitecture/tef/TAppEmbeddable_standalone.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/TAppEmbeddable_standalone.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-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"
@@ -38,7 +38,7 @@
//reg added for Datacaging
START RESOURCE TAppEmbeddable_reg.rss
-TARGETPATH /private/10003a3f/apps
+TARGETPATH /apparctestregfiles
END
LIBRARY euser.lib apparc.lib eikcore.lib cone.lib
--- a/appfw/apparchitecture/tef/TAppInstall/TestAppInstall.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/TAppInstall/TestAppInstall.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -38,11 +38,11 @@
START RESOURCE TestAppInstall.rss
HEADER
-TARGETPATH /resource/apps
+TARGETPATH /apparctestregfiles
end
START RESOURCE TestAppInstall_reg.rss
-TARGETPATH /apparctest
+TARGETPATH /apparctestregfiles
END
LIBRARY euser.lib apparc.lib cone.lib eikcore.lib gdi.lib
--- a/appfw/apparchitecture/tef/TAppNotEmbeddable_v2.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/TAppNotEmbeddable_v2.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-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"
@@ -36,7 +36,7 @@
//reg added for Datacaging
START RESOURCE TAppNotEmbeddable_reg.rss
-TARGETPATH /private/10003a3f/apps
+TARGETPATH /apparctestregfiles
END
--- a/appfw/apparchitecture/tef/TApparcTestApp.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/TApparcTestApp.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-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"
@@ -44,15 +44,15 @@
START RESOURCE tapparctestapp.rss
HEADER
-TARGETPATH /resource/apps
+TARGETPATH /apparctestregfiles
END
START RESOURCE tapparctestapp_reg.rss
-TARGETPATH /private/10003a3f/import/apps
+TARGETPATH /apparctestregfiles
END
START RESOURCE tapparctestapp_loc.rss
-TARGETPATH /resource/apps
+TARGETPATH /apparctestregfiles
LANG sc
END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/TCtrlPnlApp.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,48 @@
+// Copyright (c) 2005-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:
+//
+
+/**
+ @file
+ @internalComponent - Internal Symbian test code
+*/
+
+TARGET TCtrlPnlApp.exe
+TARGETTYPE exe
+UID 0x100039CE 0x10207f79
+VENDORID 0x70000001
+
+USERINCLUDE .
+
+MW_LAYER_SYSTEMINCLUDE_SYMBIAN
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN
+//SYSTEMINCLUDE /epoc32/include/techview
+
+START RESOURCE TCtrlPnlApp_reg.rss
+TARGETPATH /apparctestregfiles
+lang sc
+END
+
+SOURCEPATH ../tef
+SOURCE app_CTRL.CPP
+
+LIBRARY cone.lib ws32.lib appfwk_test_appui.lib euser.lib ecom.lib
+LIBRARY testexecuteutils.lib testexecutelogclient.lib
+LIBRARY apparc.lib efsrv.lib estor.lib gdi.lib fbscli.lib
+LIBRARY apfile.lib apgrfx.lib bafl.lib apmime.lib apserv.lib
+LIBRARY eikcore.lib appfwk_test_utils.lib serviceregistry.lib
+LIBRARY aplist.lib
+LIBRARY ticonloaderandiconarrayforleaks.lib centralrepository.lib
+
+SMPSAFE
--- a/appfw/apparchitecture/tef/TEndTaskTestApp/EndTaskTestApp.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/TEndTaskTestApp/EndTaskTestApp.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -42,14 +42,14 @@
// Registration file
SOURCEPATH .
START RESOURCE EndTask_reg.rss
-TARGETPATH /private/10003a3f/apps
+TARGETPATH /apparctestregfiles
END
// Application resource file
SOURCEPATH .
START RESOURCE EndTaskTestApp.rss
HEADER
-TARGETPATH /resource/apps
+TARGETPATH /apparctestregfiles
END
SMPSAFE
--- a/appfw/apparchitecture/tef/TIconLoaderAndIconArrayForLeaks.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/TIconLoaderAndIconArrayForLeaks.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-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"
@@ -38,9 +38,15 @@
source APGWGNAM.CPP apgcli.cpp APGPRIV.CPP apgstart.cpp apgrecog.cpp
source apgnotif.cpp APSCLI.CPP apgconstdata.cpp
source apsecutils.cpp
+
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+SOURCE apgupdate.cpp
+#endif
+
SOURCEPATH ../apparc
source apaid.cpp apastd.cpp
+
USERINCLUDE .
USERINCLUDE ../apgrfx
USERINCLUDE ../apserv
@@ -57,9 +63,17 @@
library sysutil.lib
#endif
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+library scrclient.lib
+#endif
+
macro UI_FRAMEWORKS_V1_REMNANT_FOR_JAVA_MIDLET_INSTALLER
-deffile TICONFORLEAKS.DEF
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+ deffile ticonforleaks.def
+#else
+ deffile ticonforleaks_legacy.def
+#endif
SMPSAFE
--- a/appfw/apparchitecture/tef/TNonNative/TNNApp1.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/TNonNative/TNNApp1.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-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"
@@ -38,7 +38,7 @@
resource TNNApp1_reg.rss
start resource TNNApp1_reg.rss
-targetpath /private/10003a3f/apps
+targetpath /apparctestregfiles
lang sc
end
--- a/appfw/apparchitecture/tef/TNonNative/TNNApp2.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/TNonNative/TNNApp2.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-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"
@@ -32,7 +32,7 @@
resource TNNApp2_reg.rss
start resource TNNApp2_reg.rss
-targetpath /private/10003a3f/apps
+targetpath /apparctestregfiles
lang sc
end
--- a/appfw/apparchitecture/tef/TRApaLsSessionStartAppTestApp_v2.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/TRApaLsSessionStartAppTestApp_v2.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-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"
@@ -34,7 +34,7 @@
// Application exe registration resource file
START RESOURCE TRApaLsSessionStartAppTestApp_reg.rss
-TARGETPATH /private/10003a3f/apps
+TARGETPATH /apparctestregfiles
END
SOURCE TRApaLsSessionStartAppTestApp.cpp
--- a/appfw/apparchitecture/tef/TSTAPP_standalone.MMP Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/TSTAPP_standalone.MMP Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-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"
@@ -44,20 +44,20 @@
//reg added for Datacaging
START RESOURCE tstapp_reg.rss
-TARGETPATH /private/10003a3f/import/apps
+TARGETPATH /apparctestregfiles
END
START RESOURCE TSTAPP.rss
-TARGETPATH /resource/apps
+TARGETPATH /apparctestregfiles
END
START RESOURCE tstapp_loc.rss
-TARGETPATH /resource/apps
+TARGETPATH /apparctestregfiles
LANG SC 01 02 03 04 05
END
START BITMAP tstapp.mbm
-TARGETPATH /resource/apps
+TARGETPATH /apparctestregfiles
SOURCEPATH ../tdatasrc
SOURCE c8,1 tstappicon24x20.bmp tstappicon24x20m.bmp
SOURCE c8,1 tstappicon24x20.bmp tstappicon24x20m.bmp
@@ -66,19 +66,19 @@
END
START BITMAP tstapp02.m02
-TARGETPATH /resource/apps
+TARGETPATH /apparctestregfiles
SOURCEPATH ../tdatasrc
SOURCE c8,1 def25.bmp def25m.bmp def25.bmp def25m.bmp def50.bmp def50m.bmp
END
START BITMAP tstappview01.m01
-TARGETPATH /resource/apps
+TARGETPATH /apparctestregfiles
SOURCEPATH ../tdatasrc
SOURCE c8,1 def25.bmp def25m.bmp def35.bmp def35m.bmp def50.bmp def50m.bmp
END
START BITMAP tstappview02.k
-TARGETPATH /resource/apps
+TARGETPATH /apparctestregfiles
SOURCEPATH ../tdatasrc
SOURCE c8,1 tstappicon24x20.bmp tstappicon24x20m.bmp
SOURCE c8,1 tstappicon24x20.bmp tstappicon24x20m.bmp
@@ -86,13 +86,13 @@
END
START BITMAP tstappview01.m02
-TARGETPATH /resource/apps
+TARGETPATH /apparctestregfiles
SOURCEPATH ../tdatasrc
SOURCE c8,1 def25.bmp def25m.bmp def35.bmp def35m.bmp def50.bmp def50m.bmp
END
START BITMAP tstappview
-TARGETPATH /resource/apps
+TARGETPATH /apparctestregfiles
SOURCEPATH ../tdatasrc
SOURCE c8,1 tstappicon24x20.bmp tstappicon24x20m.bmp
SOURCE c8,1 tstappicon24x20.bmp tstappicon24x20m.bmp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/TSTAPP_standalone_Stub.MMP Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,104 @@
+// 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:
+//
+
+/**
+ @file
+ @test
+ @internalComponent - Internal Symbian test code
+*/
+
+
+
+ TARGET tstapp.exe
+ TARGETTYPE exe
+ TARGETPATH /sys/bin
+
+CAPABILITY All -Tcb
+
+UID 0x100039CE 10 //the original UID
+VENDORID 0x70000001
+EPOCSTACKSIZE 0x5000
+
+SOURCEPATH .
+SOURCE TSTAPP_standalone.CPP
+
+USERINCLUDE .
+
+MW_LAYER_SYSTEMINCLUDE_SYMBIAN
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN
+//SYSTEMINCLUDE /epoc32/include/techview
+//systeminclude /epoc32/include/ecom
+
+
+//reg added for Datacaging
+START RESOURCE tstapp_reg.rss
+TARGETPATH /private/10003a3f/import/apps
+END
+
+START RESOURCE TSTAPP.rss
+TARGETPATH /resource/apps
+END
+
+START RESOURCE tstapp_loc.rss
+TARGETPATH /resource/apps
+LANG SC 01 02 03 04 05
+END
+
+START BITMAP tstapp.mbm
+TARGETPATH /resource/apps
+SOURCEPATH ../tdatasrc
+SOURCE c8,1 tstappicon24x20.bmp tstappicon24x20m.bmp
+SOURCE c8,1 tstappicon24x20.bmp tstappicon24x20m.bmp
+SOURCE c8,1 tstappicon40x55.bmp tstappicon40x55m.bmp
+
+END
+
+START BITMAP tstapp02.m02
+TARGETPATH /resource/apps
+SOURCEPATH ../tdatasrc
+SOURCE c8,1 def25.bmp def25m.bmp def25.bmp def25m.bmp def50.bmp def50m.bmp
+END
+
+START BITMAP tstappview01.m01
+TARGETPATH /resource/apps
+SOURCEPATH ../tdatasrc
+SOURCE c8,1 def25.bmp def25m.bmp def35.bmp def35m.bmp def50.bmp def50m.bmp
+END
+
+START BITMAP tstappview02.k
+TARGETPATH /resource/apps
+SOURCEPATH ../tdatasrc
+SOURCE c8,1 tstappicon24x20.bmp tstappicon24x20m.bmp
+SOURCE c8,1 tstappicon24x20.bmp tstappicon24x20m.bmp
+SOURCE c8,1 tstappicon40x55.bmp tstappicon40x55m.bmp
+END
+
+START BITMAP tstappview01.m02
+TARGETPATH /resource/apps
+SOURCEPATH ../tdatasrc
+SOURCE c8,1 def25.bmp def25m.bmp def35.bmp def35m.bmp def50.bmp def50m.bmp
+END
+
+START BITMAP tstappview
+TARGETPATH /resource/apps
+SOURCEPATH ../tdatasrc
+SOURCE c8,1 tstappicon24x20.bmp tstappicon24x20m.bmp
+SOURCE c8,1 tstappicon24x20.bmp tstappicon24x20m.bmp
+SOURCE c8,1 tstappicon40x55.bmp tstappicon40x55m.bmp
+END
+
+LIBRARY euser.lib apparc.lib eikcore.lib cone.lib
+
+SMPSAFE
--- a/appfw/apparchitecture/tef/TStartDocApp_v2.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/TStartDocApp_v2.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-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"
@@ -28,7 +28,7 @@
SOURCE TStartDocApp.cpp
START RESOURCE TStartDocApp_reg.rss
-TARGETPATH /private/10003a3f/apps
+TARGETPATH /apparctestregfiles
END
USERINCLUDE .
--- a/appfw/apparchitecture/tef/TWindowChaining.h Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/TWindowChaining.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-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"
@@ -44,6 +44,6 @@
const TInt KQueryChainChild1 = 428;
const TInt KQueryChainChild2 = 429;
-_LIT(KWinChainChildAppFileName, "z:\\sys\\bin\\t_winchainLaunch.exe");
+_LIT(KWinChainChildAppFileName, "c:\\sys\\bin\\t_winchainLaunch.exe");
#endif // __TWINDOWCHAINING_H__
--- a/appfw/apparchitecture/tef/T_AppList.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/T_AppList.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-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"
@@ -23,6 +23,12 @@
#include <apgcli.h>
#include "T_AppList.h"
+#include "T_SisFileInstaller.h"
+
+_LIT(KApparcTestAppSisFile, "z:\\apparctest\\apparctestsisfiles\\TApparcTestApp.sis");
+_LIT(KApparcTestAppComponent, "TApparcTestApp");
+
+
CTestAppListStep::CTestAppListStep()
{
@@ -60,6 +66,23 @@
TEST(ret==KErrNone);
}
+TVerdict CTestAppListStep::doTestStepPreambleL()
+ {
+ CSisFileInstaller sisFileInstaller;
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KApparcTestAppSisFile);
+ sisFileInstaller.InstallSisAndWaitForAppListUpdateL(KApparcTestAppSisFile);
+
+ SetTestStepResult(EPass);
+ return TestStepResult();
+ }
+
+TVerdict CTestAppListStep::doTestStepPostambleL()
+ {
+ CSisFileInstaller sisFileInstaller;
+ sisFileInstaller.UninstallSisL(KApparcTestAppComponent);
+
+ return TestStepResult();
+ }
TVerdict CTestAppListStep::doTestStepL()
{
@@ -75,3 +98,5 @@
INFO_PRINTF1(_L("Test Finished"));
return TestStepResult();
}
+
+
--- a/appfw/apparchitecture/tef/T_AppList.h Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/T_AppList.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-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"
@@ -38,6 +38,8 @@
CTestAppListStep();
~CTestAppListStep();
void TestAppList();
+ virtual TVerdict doTestStepPreambleL();
+ virtual TVerdict doTestStepPostambleL();
virtual TVerdict doTestStepL();
private:
RTestableApaLsSession iApaLsSession;
--- a/appfw/apparchitecture/tef/T_AppListFileUpdateStep.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/T_AppListFileUpdateStep.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -34,12 +34,13 @@
#include <apgcli.h>
#include "T_AppListFileUpdateStep.h"
+#include "T_SisFileInstaller.h"
-_LIT(KTestAppZPath,"Z:\\ApparcTest\\TestAppInstall_reg.RSC");
+_LIT(KApparcTestAppSisFile, "z:\\apparctest\\apparctestsisfiles\\TApparcTestApp.sis");
+_LIT(KApparcTestAppComponent, "TApparcTestApp");
+
_LIT(KAppListFileName,"C:\\private\\10003a3f\\AppsListCache\\AppsList.bin");
_LIT(KAppTimeFormat,"%:0%H%:1%T%:2%S%:3");
-_LIT(KAppDirectory,"C:\\Private\\10003a3f\\Import\\apps\\");
-_LIT(KTestAppObsolutePath1,"C:\\Private\\10003a3f\\Import\\apps\\TestAppInstall_reg.RSC");
const TInt KMaxTimeCount = 18; // 18 * 10 is 180 Seconds
@@ -128,9 +129,6 @@
void CT_AppListFileUpdateStep::TestTimeStampL()
{
- // Create KAppDirectory
- TInt err = iUtils.CreateDirectoryL(KAppDirectory);
- TEST(err == KErrNone || err == KErrAlreadyExists);
// Wait until KAppListFileName is present and check that the file has been created indeed
TBool present = CheckForFilePresent();
@@ -143,8 +141,11 @@
// Install an application
INFO_PRINTF1(_L("Install application..."));
- InstallApplicationL(KTestAppObsolutePath1);
-
+
+ CSisFileInstaller sisFileInstaller;
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KApparcTestAppSisFile);
+ sisFileInstaller.InstallSisAndWaitForAppListUpdateL(KApparcTestAppSisFile);
+
// wait 5 seconds for the app to be properly installed
User::After(5 * 1000000);
@@ -162,34 +163,10 @@
// Uninstall & delete...
INFO_PRINTF1(_L("Uninstalling application..."));
- DeleteApplicationL(KTestAppObsolutePath1);
+ sisFileInstaller.UninstallSisAndWaitForAppListUpdateL(KApparcTestAppComponent);
}
-/*
-Delete a registration resource file (TestAppInstall.rsc) in the path "C:\private\10003a3f\import\apps" .
-*/
-void CT_AppListFileUpdateStep::DeleteApplicationL(const TDesC& aAppName)
- {
- INFO_PRINTF2(_L("Deleting file '%S'"), &aAppName);
-
- TInt ret = iUtils.SetReadOnly(aAppName, 0);
- TEST(ret == KErrNone);
- ret = iUtils.DeleteFileL(aAppName);
- TEST(ret == KErrNone);
- }
-
-
-/*
-Copy a registration resource file (TestAppInstall.rsc) in the path "c:\private\10003a3f\import\apps" .
-*/
-void CT_AppListFileUpdateStep::InstallApplicationL(const TDesC& aAppName)
- {
- INFO_PRINTF3(_L("Copying file '%S' to folder '%S'"), &aAppName, &KTestAppZPath);
-
- TInt ret = iUtils.CopyFileL(KTestAppZPath, aAppName);
- TEST(ret == KErrNone);
- }
/*
@@ -247,10 +224,13 @@
// Do a rescan and check that the file exists again.
INFO_PRINTF1(_L("Do a rescan and check that the file exists again...."));
- RPointerArray<TDesC> dummy;
- TEST(iSession.ForceRegistration(dummy) == KErrNone);
+ CSisFileInstaller sisFileInstaller;
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KApparcTestAppSisFile);
+ sisFileInstaller.InstallSisAndWaitForAppListUpdateL(KApparcTestAppSisFile);
+
present = CheckForFilePresent();
TEST(present);
+ sisFileInstaller.UninstallSisAndWaitForAppListUpdateL(KApparcTestAppComponent);
}
--- a/appfw/apparchitecture/tef/T_AppListFileUpdateStep.h Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/T_AppListFileUpdateStep.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -40,8 +40,6 @@
private:
void TestTimeStampL();
void AppsListModifiedTimeL(TTime &);
- void DeleteApplicationL(const TDesC&);
- void InstallApplicationL(const TDesC&);
private:
void TestDeleteAppListFileL();
--- a/appfw/apparchitecture/tef/T_CaptionStep.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/T_CaptionStep.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -57,6 +57,7 @@
#include "appfwk_test.h"
#include "ticoncaptionoverride.h" //KUidTestIconCapOverride defined here
#include "TIconLoaderAndIconArrayForLeaks.h"
+#include "T_SisFileInstaller.h"
//
@@ -89,11 +90,21 @@
// Cenrep configuration details for English language
_LIT(KCenRepCaption, "CRTstCap UK");
_LIT(KCenRepShortCaption, "CRTC UK");
-_LIT(KCenRepIconFilename, "Z:\\resource\\apps\\ticoncapoverride.mbm");
+_LIT(KCenRepIconFilename, "C:\\resource\\apps\\ticoncapoverride.mbm");
+
+_LIT(KTstAppStandAloneSisFile, "z:\\apparctest\\apparctestsisfiles\\TSTAPP_standalone.sis");
+_LIT(KTstAppStandAloneComponent, "TSTAPP_standalone");
+
+_LIT(KTstAppTiconcaptionoverrideSisFile, "z:\\apparctest\\apparctestsisfiles\\ticoncaptionoverride.sis");
+_LIT(KTstAppTiconcaptionoverrideComponent, "ticoncaptionoverride");
+
+_LIT(KForceRegAppSisFile, "z:\\apparctest\\apparctestsisfiles\\ForceRegApp1.sis");
+_LIT(KForceRegAppComponent, "ForceRegApp1");
const TUid KUidIconCaptionRepository = {0x1028583d}; // Central Repository UID.
const TInt KTextSize = 100;
+const TInt KDelay = 4000000;
//
//
// CT_CaptionStep
@@ -104,41 +115,61 @@
void CT_CaptionStep::ChangeLocaleL(TLanguage aLanguage)
{
#ifdef SYMBIAN_DISTINCT_LOCALE_MODEL
- _LIT(KLitLocaleDllNameBase, "elocl_lan");
- _LIT(KLitLocaleDllNameExtension, ".loc");
+ _LIT(KLitLanguageLocaleDllNameBase, "elocl_lan");
+ //Region and collation code values are hard coded, as the check, after changing the locale is made for the language only.
+ _LIT(KLitRegionLocaleDllNameBase, "elocl_reg.826");
+ _LIT(KLitCollationLocaleDllNameBase, "elocl_col.001");
+ _LIT(ThreeDigExt,".%03d");
+ TExtendedLocale localeDll;
+ const TUidType uidType(TUid::Uid(0x10000079),TUid::Uid(0x100039e6));
+ TBuf<16> languageLocaleDllName(KLitLanguageLocaleDllNameBase);
+ languageLocaleDllName.AppendFormat(ThreeDigExt, aLanguage);
+ TBuf<16> regionLocaleDllName(KLitRegionLocaleDllNameBase);
+ TBuf<16> collationLocaleDllName(KLitCollationLocaleDllNameBase);
+ // Try to load the locale dll
+ TInt error=localeDll.LoadLocale(languageLocaleDllName, regionLocaleDllName, collationLocaleDllName);
+
+ if (error==KErrNotFound)
+ {
+ // Locale dll is not found for the asked language.
+ ERR_PRINTF2(_L("Failed to find the locale dll for %d"), aLanguage);
+ }
+
+ User::LeaveIfError(error);
+ localeDll.SaveSystemSettings();
#else
_LIT(KLitLocaleDllNameBase, "ELOCL");
- _LIT(KLitLocaleDllNameExtension, ".LOC");
-#endif
- RLibrary localeDll;
- TBuf<16> localeDllName(KLitLocaleDllNameBase);
+ _LIT(TwoDigExt,".%02d");
+
+ RLibrary localeDll;
CleanupClosePushL(localeDll);
+
const TUidType uidType(TUid::Uid(0x10000079),TUid::Uid(0x100039e6));
-#ifdef SYMBIAN_DISTINCT_LOCALE_MODEL
- _LIT(ThreeDigExt,".%03d");
- localeDllName.AppendFormat(ThreeDigExt, aLanguage);
-#else
- _LIT(TwoDigExt,".%02d");
- localeDllName.AppendFormat(TwoDigExt, aLanguage);
-#endif
-
+ TBuf<16> localeDllName(KLitLocaleDllNameBase);
+ localeDllName.AppendFormat(TwoDigExt, language);
+
+ // Try to load the locale dll
TInt error=localeDll.Load(localeDllName, uidType);
if (error==KErrNotFound)
{
- localeDllName=KLitLocaleDllNameBase;
- localeDllName.Append(KLitLocaleDllNameExtension);
- error=localeDll.Load(localeDllName, uidType);
+ // Locale dll is not found for the asked language.
+ ERR_PRINTF2(_L("Failed to find the locale dll for %d"), language);
}
+
User::LeaveIfError(error);
-
-#ifdef SYMBIAN_DISTINCT_LOCALE_MODEL
- TExtendedLocale myExtendedLocale;
- User::LeaveIfError(myExtendedLocale.LoadLocaleAspect(localeDllName));
- User::LeaveIfError(myExtendedLocale.SaveSystemSettings());
-#else
User::LeaveIfError(UserSvr::ChangeLocale(localeDllName));
+ CleanupStack: opAndDestroy(); // localeDll
#endif
- CleanupStack::PopAndDestroy(&localeDll);
+
+ // Check if the device locale has changed
+ if (aLanguage == User::Language())
+ {
+ SetTestStepResult(EPass);
+ }
+ else
+ {
+ ERR_PRINTF3(_L("Failed to change the locale to %d whereas the current locale is"), aLanguage, User::Language());
+ }
}
@@ -182,12 +213,11 @@
};
// Change the locale
- ChangeLocaleL(languageToTest);
- TEST(User::Language() == languageToTest);
-
- // Force the applist to be updated (so test app gets new language settings)
- RPointerArray<TDesC> dummy;
- User::LeaveIfError(iLs.ForceRegistration(dummy));
+ if(languageToTest != User::Language())
+ {
+ ChangeLocaleWaitForApplistUpdate(languageToTest);
+ TEST(User::Language() == languageToTest);
+ }
// Do the same set of tests for each language
TestCApaSystemControlListL();
@@ -199,7 +229,9 @@
}
// restore original locale, just in case...
- ChangeLocaleL(language);
+ if(User::Language() != language)
+ ChangeLocaleWaitForApplistUpdate(language);
+
TEST(User::Language() == language);
}
@@ -408,7 +440,7 @@
{
INFO_PRINTF1(_L("Testing TApaAppInfo streams... "));
- TApaAppInfo appInfoShort(KUidTestApp, _L("z:\\sys\\bin\\tstapp.exe"), _L("TstCap UK"),_L("TC UK"));
+ TApaAppInfo appInfoShort(KUidTestApp, _L("c:\\sys\\bin\\tstapp.exe"), _L("TstCap UK"),_L("TC UK"));
TEST(appInfoShort.iShortCaption.Compare(_L("TC UK"))==0);
TFileName tempFile=_L("c:\\system\\test\\TC_temp.txt");
@@ -470,8 +502,7 @@
TEST(User::Language() == ELangEnglish);
// Force the applist to be updated (so test app gets new language settings)
- RPointerArray<TDesC> dummy;
- User::LeaveIfError(iLs.ForceRegistration(dummy));
+ ForceApplistUpdate();
// SetAppShortCaption should return KErrNotFound if it could not find the app
INFO_PRINTF1(_L(".....setting short caption for an unknown app"));
@@ -509,18 +540,16 @@
// Check short caption remains updated after a refresh of the applist
INFO_PRINTF1(_L(".....checking short caption remains updated after a refresh of the applist"));
- User::LeaveIfError(iLs.ForceRegistration(dummy));
+ ForceApplistUpdate();
iLs.GetAppInfo(appInfo, KUidTestApp);
TEST(appInfo.iShortCaption == KShortCaption1);
// Check short caption remains updated after a locale change
INFO_PRINTF1(_L(".....checking short caption remains updated after a locale change"));
- ChangeLocaleL(ELangJapanese);
+ ChangeLocaleWaitForApplistUpdate(ELangJapanese);
TEST(User::Language() == ELangJapanese); // Japanese locale exists in epoc32 tree but not defined in test app
- User::LeaveIfError(iLs.ForceRegistration(dummy));
- ChangeLocaleL(ELangEnglish); // back to English to see what happened in between
+ ChangeLocaleWaitForApplistUpdate(ELangEnglish); // back to English to see what happened in between
TEST(User::Language() == ELangEnglish);
- User::LeaveIfError(iLs.ForceRegistration(dummy));
iLs.GetAppInfo(appInfo, KUidTestApp);
TEST(appInfo.iShortCaption == KShortCaption1);
@@ -530,17 +559,15 @@
TEST(err == KErrNone);
iLs.GetAppInfo(appInfo, KUidTestApp);
TEST(appInfo.iShortCaption == KShortCaption1); // English, the current app language, doesn't change...
- ChangeLocaleL(ELangFrench);
+ ChangeLocaleWaitForApplistUpdate(ELangFrench);
TEST(User::Language() == ELangFrench);
- User::LeaveIfError(iLs.ForceRegistration(dummy));
iLs.GetAppInfo(appInfo, KUidTestApp);
TEST(appInfo.iShortCaption == KShortCaption2);
// Set short caption of an app for a language which the app does not include (ELangAmerican)
INFO_PRINTF1(_L(".....setting short caption of an app for a language which the app does not include"));
- ChangeLocaleL(ELangAmerican);
+ ChangeLocaleWaitForApplistUpdate(ELangAmerican);
TEST(User::Language() == ELangAmerican);
- User::LeaveIfError(iLs.ForceRegistration(dummy));
err = iLs.SetAppShortCaption(KShortCaption2, ELangAmerican, KUidTestApp);
iLs.GetAppInfo(appInfo, KUidTestApp);
TEST(appInfo.iShortCaption == KShortCaption1); // American takes the default...so English...which has just been updated.
@@ -551,37 +578,31 @@
TEST(err == KErrNone);
iLs.GetAppInfo(appInfo, KUidTestApp);
TEST(appInfo.iShortCaption == KShortCaption1); // American takes the default...so English...which has just been updated.
- ChangeLocaleL(ELangEnglish);
+ ChangeLocaleWaitForApplistUpdate(ELangEnglish);
TEST(User::Language() == ELangEnglish);
- User::LeaveIfError(iLs.ForceRegistration(dummy));
iLs.GetAppInfo(appInfo, KUidTestApp);
TEST(appInfo.iShortCaption == KShortCaption1); // English set individually ===> not updated by ELangNone
- ChangeLocaleL(ELangFrench);
+ ChangeLocaleWaitForApplistUpdate(ELangFrench);
TEST(User::Language() == ELangFrench);
- User::LeaveIfError(iLs.ForceRegistration(dummy));
iLs.GetAppInfo(appInfo, KUidTestApp);
TEST(appInfo.iShortCaption == KShortCaption2); // French set individually ===> not updated by ELangNone
- ChangeLocaleL(ELangGerman);
+ ChangeLocaleWaitForApplistUpdate(ELangGerman);
TEST(User::Language() == ELangGerman);
- User::LeaveIfError(iLs.ForceRegistration(dummy));
iLs.GetAppInfo(appInfo, KUidTestApp);
TEST(appInfo.iShortCaption == KShortCaption3); // German takes the one set by ELangNone
- ChangeLocaleL(ELangItalian);
+ ChangeLocaleWaitForApplistUpdate(ELangItalian);
TEST(User::Language() == ELangItalian);
- User::LeaveIfError(iLs.ForceRegistration(dummy));
iLs.GetAppInfo(appInfo, KUidTestApp);
TEST(appInfo.iShortCaption == KShortCaption3); // Italian takes the one set by ELangNone
- ChangeLocaleL(ELangSpanish);
+ ChangeLocaleWaitForApplistUpdate(ELangSpanish);
TEST(User::Language() == ELangSpanish);
- User::LeaveIfError(iLs.ForceRegistration(dummy));
iLs.GetAppInfo(appInfo, KUidTestApp);
TEST(appInfo.iShortCaption == KShortCaption3); // Spanish takes the one set by ELangNone
// Set short caption of an app for a language which was set by the previous ELangNone
INFO_PRINTF1(_L(".....setting short caption of an app which was set by the previous ELangNone"));
- ChangeLocaleL(ELangItalian);
+ ChangeLocaleWaitForApplistUpdate(ELangItalian);
TEST(User::Language() == ELangItalian);
- User::LeaveIfError(iLs.ForceRegistration(dummy));
err = iLs.SetAppShortCaption(KShortCaption4, ELangItalian, KUidTestApp);
iLs.GetAppInfo(appInfo, KUidTestApp);
TEST(appInfo.iShortCaption == KShortCaption4);
@@ -592,35 +613,30 @@
TEST(err == KErrNone);
iLs.GetAppInfo(appInfo, KUidTestApp);
TEST(appInfo.iShortCaption == KShortCaption4); // Italian set individually ===> not updated by ELangNone
- ChangeLocaleL(ELangEnglish);
+ ChangeLocaleWaitForApplistUpdate(ELangEnglish);
TEST(User::Language() == ELangEnglish);
- User::LeaveIfError(iLs.ForceRegistration(dummy));
iLs.GetAppInfo(appInfo, KUidTestApp);
TEST(appInfo.iShortCaption == KShortCaption1); // English set individually ===> not updated by ELangNone
- ChangeLocaleL(ELangFrench);
+ ChangeLocaleWaitForApplistUpdate(ELangFrench);
TEST(User::Language() == ELangFrench);
- User::LeaveIfError(iLs.ForceRegistration(dummy));
iLs.GetAppInfo(appInfo, KUidTestApp);
TEST(appInfo.iShortCaption == KShortCaption2); // French set individually ===> not updated by ELangNone
- ChangeLocaleL(ELangGerman);
+ ChangeLocaleWaitForApplistUpdate(ELangGerman);
TEST(User::Language() == ELangGerman);
- User::LeaveIfError(iLs.ForceRegistration(dummy));
iLs.GetAppInfo(appInfo, KUidTestApp);
TEST(appInfo.iShortCaption == KShortCaption5); // German takes the one set by ELangNone
- ChangeLocaleL(ELangSpanish);
+ ChangeLocaleWaitForApplistUpdate(ELangSpanish);
TEST(User::Language() == ELangSpanish);
- User::LeaveIfError(iLs.ForceRegistration(dummy));
iLs.GetAppInfo(appInfo, KUidTestApp);
TEST(appInfo.iShortCaption == KShortCaption5); // Spanish takes the one set by ELangNone
- ChangeLocaleL(ELangAmerican);
+ ChangeLocaleWaitForApplistUpdate(ELangAmerican);
TEST(User::Language() == ELangAmerican);
- User::LeaveIfError(iLs.ForceRegistration(dummy));
iLs.GetAppInfo(appInfo, KUidTestApp);
TEST(appInfo.iShortCaption == KShortCaption1); // American takes the default...so English...which has just been updated.
// restore original settings....
INFO_PRINTF1(_L(".....restoring original settings"));
- ChangeLocaleL(language);
+ ChangeLocaleWaitForApplistUpdate(language);
TEST(User::Language() == language);
// restore original short captions for all langs....(h4 doesn't perform reboots between tests)
TEST(iLs.SetAppShortCaption(KTestTApaAppInfoShortCaptionEnglish, ELangEnglish, KUidTestApp) == KErrNone);
@@ -662,9 +678,11 @@
{
INFO_PRINTF1(_L("APPFWK-APPARC-0087:TestIconCaptionOverridesL started..."));
- //Change the system language to English before starting the tests
- TRAPD(ret,ChangeLocaleL(ELangEnglish));
- TEST(ret == KErrNone);
+ //Change the system language to English before starting the tests
+ TRAPD(ret,ChangeLocaleL(ELangEnglish));
+ TEST(ret == KErrNone);
+ TEST(User::Language() == ELangEnglish);
+ ForceApplistUpdate();
TApaAppInfo appInfo;
//Get test app's information
@@ -778,10 +796,8 @@
//tests whether the process with WriteDeviceData capability can update the configuration settings.
TEST(error == KErrNone);
- // Force the applist to be updated (so test app gets new language settings)
- RPointerArray<TDesC> dummy;
- User::LeaveIfError(iLs.ForceRegistration(dummy));
-
+ ForceApplistUpdate();
+
TApaAppInfo appInfo;
//Get test app's information
iLs.GetAppInfo(appInfo, KUidTestIconCapOverride);
@@ -797,8 +813,8 @@
//sets the short caption back to the actual for other tests to work
error = cenRep->Set(shortCapKey,KCenRepShortCaption);
- // Force the applist to be updated (so test app gets new language settings)
- User::LeaveIfError(iLs.ForceRegistration(dummy));
+ // Force the applist to be updated (so test app gets new language settings)
+ ForceApplistUpdate();
CleanupStack::PopAndDestroy(cenRep); //cenRep object
INFO_PRINTF1(_L("APPFWK-APPARC-0089:TestCenRepChangeNotificationL finished..."));
@@ -836,12 +852,12 @@
//French
_LIT(KCaptionFrench, "CRTstCap FR");
_LIT(KShortCaptionFrench, "CRTC FR");
- _LIT(KIconFilenameFrench, "Z:\\resource\\apps\\svg_icon.svg");
+ _LIT(KIconFilenameFrench, "C:\\resource\\apps\\svg_icon.svg");
//German
_LIT(KCaptionGerman, "TstCap GE");
_LIT(KShortCaptionGerman, "TC GE");
- _LIT(KIconFilenameGerman, "Z:\\resource\\apps\\ticoncapoverride.mbm");
+ _LIT(KIconFilenameGerman, "C:\\resource\\apps\\ticoncapoverride.mbm");
TApaAppInfo appInfo;
RFile file;
@@ -855,9 +871,7 @@
TEST(User::Language() == ELangFrench);//check language is set to French.
- // Force the applist to be updated (so test app gets new language settings)
- RPointerArray<TDesC> dummy;
- User::LeaveIfError(iLs.ForceRegistration(dummy));
+ ForceApplistUpdate();
//Get test app's information
iLs.GetAppInfo(appInfo, KUidTestIconCapOverride);
@@ -896,7 +910,7 @@
TEST(User::Language() == ELangGerman);//check language is set to German.
// Force the applist to be updated (so test app gets new language settings)
- User::LeaveIfError(iLs.ForceRegistration(dummy));
+ ForceApplistUpdate();
//Get test app's information
iLs.GetAppInfo(appInfo, KUidTestIconCapOverride);
@@ -940,7 +954,7 @@
TEST(User::Language() == ELangEnglish);//check language is set to English.
// Force the applist to be updated (so test app gets new language settings)
- User::LeaveIfError(iLs.ForceRegistration(dummy));
+ ForceApplistUpdate();
//Get test app's information
iLs.GetAppInfo(appInfo, KUidTestIconCapOverride);
@@ -973,7 +987,7 @@
INFO_PRINTF2(_L("----Expected icon filename==>%S"), &printString);
INFO_PRINTF2(_L("----Retrieved icon filename==>%S"), &fileName);
TEST(fileName.Compare(KCenRepIconFilename)==0);
-
+ file.Close();
INFO_PRINTF1(_L("APPFWK-APPARC-0090:TestIconCaptionOverridesWithChangeLangL finished..."));
}
@@ -1011,6 +1025,42 @@
TestApiPrecedenceOverCenRepConfigInfoL();
}
+void CT_CaptionStep::ForceApplistUpdate()
+{
+ // Force the applist to be updated (so test app gets new language settings)
+ CSisFileInstaller sisFileInstaller;
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KForceRegAppSisFile);
+ sisFileInstaller.InstallSisL(KForceRegAppSisFile);
+ sisFileInstaller.UninstallSisAndWaitForAppListUpdateL(KForceRegAppComponent);
+}
+
+void CT_CaptionStep::ChangeLocaleWaitForApplistUpdate(TLanguage aLanguage)
+ {
+ TRequestStatus status;
+ iLs.SetNotify(EFalse, status);
+ ChangeLocaleL(aLanguage);
+ User::WaitForRequest(status);
+ }
+
+TVerdict CT_CaptionStep::doTestStepPreambleL()
+ {
+ CSisFileInstaller sisFileInstaller;
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KTstAppStandAloneSisFile);
+ sisFileInstaller.InstallSisAndWaitForAppListUpdateL(KTstAppStandAloneSisFile);
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KTstAppTiconcaptionoverrideSisFile);
+ sisFileInstaller.InstallSisAndWaitForAppListUpdateL(KTstAppTiconcaptionoverrideSisFile);
+ SetTestStepResult(EPass);
+ return TestStepResult();
+ }
+
+TVerdict CT_CaptionStep::doTestStepPostambleL()
+ {
+ CSisFileInstaller sisFileInstaller;
+ sisFileInstaller.UninstallSisL(KTstAppStandAloneComponent);
+ sisFileInstaller.UninstallSisL(KTstAppTiconcaptionoverrideComponent);
+ return TestStepResult();
+ }
+
TVerdict CT_CaptionStep::doTestStepL()
{
INFO_PRINTF1(_L("Test T_Caption step started....\n"));
@@ -1019,6 +1069,11 @@
TEST(iFs.Connect() == KErrNone);
TEST(iLs.Connect() == KErrNone);
+ // Change the locale
+ ChangeLocaleL(ELangEnglish);
+ TEST(User::Language() == ELangEnglish);
+ ForceApplistUpdate();
+
// run language tests for the test caption
TRAPD(r, DoLanguageTestL());
TEST(r==KErrNone);
--- a/appfw/apparchitecture/tef/T_CaptionStep.h Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/T_CaptionStep.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -42,6 +42,8 @@
public:
CT_CaptionStep();
~CT_CaptionStep();
+ virtual TVerdict doTestStepPreambleL();
+ virtual TVerdict doTestStepPostambleL();
virtual TVerdict doTestStepL();
private:
void DoLanguageTestL();
@@ -58,6 +60,8 @@
void TestCenRepChangeNotificationL();
void TestIconCaptionOverridesWithChangeLangL();
void TestIconCaptionOverridesMemoryLeaksL();
+ void ForceApplistUpdate();
+ void ChangeLocaleWaitForApplistUpdate(TLanguage aLanguage);
private:
RFs iFs;
RTestableApaLsSession iLs;
--- a/appfw/apparchitecture/tef/T_CmdlnStep.CPP Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/T_CmdlnStep.CPP Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-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"
@@ -24,6 +24,10 @@
#include "T_CmdlnStep.h"
#include "testableapalssession.h"
+#include "T_SisFileInstaller.h"
+
+_LIT(KTEnvSlotsAppSisFile, "z:\\apparctest\\apparctestsisfiles\\T_EnvSlots.sis");
+_LIT(KTEnvSlotsAppComponent, "T_EnvSlots");
/**
@SYMTestCaseID T-CmdlnStep-testSecureCmdLinesL
@@ -638,6 +642,10 @@
Override of base class virtual
*/
{
+ CSisFileInstaller sisFileInstaller;
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KTEnvSlotsAppSisFile);
+ sisFileInstaller.InstallSisAndWaitForAppListUpdateL(KTEnvSlotsAppSisFile);
+
SetTestStepResult(EPass);
return TestStepResult();
}
@@ -648,6 +656,9 @@
Override of base class virtual
*/
{
+ CSisFileInstaller sisFileInstaller;
+ sisFileInstaller.UninstallSisL(KTEnvSlotsAppComponent);
+
return TestStepResult();
}
--- a/appfw/apparchitecture/tef/T_CmdlnStep.h Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/T_CmdlnStep.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-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"
@@ -69,7 +69,7 @@
_LIT(KTLogFileAccess,"TestLogFile");
_LIT(KEnvFilePath,"c:\\Logs\\TestExecute\\EnvSlots.txt");
-_LIT(KTAppName,"Z:\\sys\\bin\\T_EnvSlots.exe");
+_LIT(KTAppName,"C:\\sys\\bin\\T_EnvSlots.exe");
_LIT(KTDocName,"C:\\System\\data\\temp.test");
_LIT(KTempDir,"C:\\System\\data\\");
_LIT(KTNoDocName,"C:\\Logs\\TestExecute\\NotFound.aaa");
--- a/appfw/apparchitecture/tef/T_ControlPanelTest.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/T_ControlPanelTest.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-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"
@@ -48,15 +48,16 @@
#if !defined(__E32TEST_H__)
#include <e32test.h>
#endif
+#include "T_SisFileInstaller.h"
_LIT(KCompleted, "Completed.");
-_LIT(KRSCDIR,"C:\\Resource\\apps\\");
-_LIT(KRSCREGDIR,"C:\\private\\10003a3f\\import\\apps\\");
+_LIT(KCtrlApp2SisFile, "z:\\apparctest\\apparctestsisfiles\\app_CTRL2.sis");
+_LIT(KCtrlApp2Component, "app_CTRL2");
+
_LIT(KNEWCTLPATH,"C:\\sys\\bin\\app_CTRL2.exe");
-_LIT(KSRCRESOURCEPATH,"Z:\\private\\10003a3f\\import\\apps\\App_CTRL2_reg.Rsc");
-_LIT(KDESTRESOURCEPATH,"C:\\private\\10003a3f\\import\\apps\\App_CTRL2_reg.Rsc");
+
LOCAL_D TInt SimulateKeyL(TAny*)
{
@@ -87,17 +88,6 @@
return KErrNone;
}
-void CT_ControlPanelTestStep::RemoveFilesFromCDrive()
- {
- TInt ret = iTestServ.SetReadOnly(KDESTRESOURCEPATH,0); //remove READ ONLY option
- TEST(ret==KErrNone);
-
- TRAP(ret,iTestServ.DeleteFileL(KDESTRESOURCEPATH));
- TEST(ret==KErrNone);
- }
-
-
-
/**
Auxiliary Fn for Test Case ID T-ControlPanelStep-testControls1L,
T-ControlPanelStep-testControls2L, T-ControlPanelStep-testControls3L
@@ -209,15 +199,15 @@
{
INFO_PRINTF1(_L("In testControls2L......"));
- iTestServ.CreateDirectoryL(KRSCDIR);
- iTestServ.CreateDirectoryL(KRSCREGDIR);
+ INFO_PRINTF1(_L("Application installing to C Drive......"));
- TInt ret=iTestServ.CopyFileL(KSRCRESOURCEPATH,KDESTRESOURCEPATH);
- TEST(ret==KErrNone);
-
- INFO_PRINTF1(_L("Files Copied to C Drive......"));
- INFO_PRINTF1(_L("Updating the list ......"));
- iControlCount=iControlList->UpdateCount();
+ CSisFileInstaller sisFileInstaller;
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KCtrlApp2SisFile);
+ sisFileInstaller.InstallSisL(KCtrlApp2SisFile);
+
+ INFO_PRINTF1(_L("Updating the list ......"));
+ TInt ret;
+ iControlCount=iControlList->UpdateCount();
while(iControlList->UpdateCount()<=iControlCount)
{
TRAP(ret, iControlList->UpdateL());
@@ -238,8 +228,9 @@
TFileName name=iControlList->Control(iIndex)->FileName();
TEST(name.CompareF(KNEWCTLPATH)==0);
- RemoveFilesFromCDrive();
- INFO_PRINTF1(_L("Removed the file from C Drive......"));
+
+ sisFileInstaller.UninstallSisL(KCtrlApp2Component);
+ INFO_PRINTF1(_L("Removed application from C Drive......"));
INFO_PRINTF1(_L("Updating the list ......"));
iControlCount=iControlList->UpdateCount();
while(iControlList->UpdateCount()<=iControlCount)
@@ -449,6 +440,14 @@
// connect to the test utils server
User::LeaveIfError(iTestServ.Connect());
+ RApaLsSession ls;
+ User::LeaveIfError(ls.Connect());
+
+ TRequestStatus status;
+ ls.SetNotify(ETrue, status);
+ User::WaitForRequest(status);
+ ls.Close();
+
// Run the tests...w
TRAPD(ret,DoStepTestsInCallbackL())
TEST(ret==KErrNone);
--- a/appfw/apparchitecture/tef/T_DataMappingPersistenceA.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/T_DataMappingPersistenceA.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-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"
@@ -19,7 +19,9 @@
*/
#include "T_DataMappingPersistenceA.h"
+#include "T_SisFileInstaller.h"
+_LIT(KServerApp2SisFile, "z:\\apparctest\\apparctestsisfiles\\serverapp2.sis");
/**
* Constructor
@@ -44,7 +46,11 @@
*/
TVerdict CT_DataMappingPersistenceATestStep::doTestStepPreambleL()
{
- SetTestStepResult(EPass);
+ CSisFileInstaller sisFileInstaller;
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KServerApp2SisFile);
+ sisFileInstaller.InstallSisAndWaitForAppListUpdateL(KServerApp2SisFile);
+
+ SetTestStepResult(EPass);
TInt error = iSession.Connect();
TEST(error==KErrNone);
return TestStepResult();
--- a/appfw/apparchitecture/tef/T_DataMappingPersistenceC.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/T_DataMappingPersistenceC.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-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"
@@ -20,7 +20,9 @@
#include "T_DataMappingPersistenceC.h"
+#include "T_SisFileInstaller.h"
+_LIT(KServerApp2Component, "serverapp2");
/**
@@ -58,6 +60,9 @@
*/
TVerdict CT_DataMappingPersistenceCTestStep::doTestStepPostambleL()
{
+ CSisFileInstaller sisFileInstaller;
+ sisFileInstaller.UninstallSisL(KServerApp2Component);
+
return TestStepResult();
}
--- a/appfw/apparchitecture/tef/T_DataPrioritySystem1/T_DataPrioritySystem1.MMP Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/T_DataPrioritySystem1/T_DataPrioritySystem1.MMP Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-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"
@@ -42,11 +42,11 @@
userinclude ../../../uiftestfw/inc
start resource T_DataPrioritySystem1_reg.rss
-targetpath /private/10003a3f/apps
+targetpath /apparctestregfiles
end
start resource T_DataPrioritySystem1_loc.rss
-targetpath /resource/apps
+targetpath /apparctestregfiles
end
LIBRARY cone.lib ws32.lib
--- a/appfw/apparchitecture/tef/T_DataPrioritySystem2/T_DataPrioritySystem2.MMP Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/T_DataPrioritySystem2/T_DataPrioritySystem2.MMP Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-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"
@@ -42,11 +42,11 @@
userinclude ../../../uiftestfw/inc
start resource T_DataPrioritySystem2_reg.rss
-targetpath /private/10003a3f/apps
+targetpath /apparctestregfiles
end
start resource T_DataPrioritySystem2_loc.rss
-targetpath /resource/apps
+targetpath /apparctestregfiles
end
LIBRARY cone.lib ws32.lib
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/T_DataPrioritySystem3.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,51 @@
+// 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:
+//
+
+/**
+ @file
+ @internalComponent - Internal Symbian test code
+*/
+
+TARGET T_DataPrioritySystem3.exe
+TARGETTYPE exe
+UID 0x100039CE 0x10207f7f
+VENDORID 0x70000001
+
+USERINCLUDE .
+
+MW_LAYER_SYSTEMINCLUDE_SYMBIAN
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN
+//SYSTEMINCLUDE /epoc32/include/techview
+
+// Application exe registration resource file
+resource T_DataPrioritySystem3_reg.rss
+start resource T_DataPrioritySystem3_reg.rss
+targetpath /apparctestregfiles
+lang sc
+end
+
+SOURCEPATH ../tef
+//SOURCE T_ServicesStep.cpp
+SOURCE app_CTRL.CPP
+
+LIBRARY cone.lib ws32.lib appfwk_test_appui.lib euser.lib ecom.lib
+LIBRARY testexecuteutils.lib testexecutelogclient.lib
+LIBRARY apparc.lib efsrv.lib estor.lib gdi.lib fbscli.lib
+LIBRARY apfile.lib apgrfx.lib bafl.lib apmime.lib apserv.lib
+LIBRARY eikcore.lib appfwk_test_utils.lib serviceregistry.lib
+LIBRARY aplist.lib
+LIBRARY ticonloaderandiconarrayforleaks.lib centralrepository.lib
+
+SMPSAFE
--- a/appfw/apparchitecture/tef/T_DataTypeMappingWithSid1.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/T_DataTypeMappingWithSid1.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-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"
@@ -28,6 +28,14 @@
#include "tstapp.h"
#include "testableapalssession.h"
#include "appfwk_test.h"
+#include "T_SisFileInstaller.h"
+
+_LIT(KTestTrustedPriorityApp2SisFile, "z:\\apparctest\\apparctestsisfiles\\TestTrustedPriorityApp2.sis");
+_LIT(KTestTrustedPriorityApp2Component, "TestTrustedPriorityApp2");
+
+_LIT(KTestUntrustedPriorityApp2SisFile, "z:\\apparctest\\apparctestsisfiles\\TestUnTrustedPriorityApp2.sis");
+_LIT(KTestUntrustedPriorityApp2Component, "TestUnTrustedPriorityApp2");
+
/**
@SYMTestCaseID APPFWK-APPARC-0036
@@ -115,6 +123,24 @@
{
}
+TVerdict CT_DataTypeMappingWithSid1::doTestStepPreambleL()
+ {
+ CSisFileInstaller sisFileInstaller;
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KTestUntrustedPriorityApp2SisFile);
+ sisFileInstaller.InstallSisL(KTestUntrustedPriorityApp2SisFile);
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KTestTrustedPriorityApp2SisFile);
+ sisFileInstaller.InstallSisAndWaitForAppListUpdateL(KTestTrustedPriorityApp2SisFile);
+
+ SetTestStepResult(EPass);
+ return TestStepResult();
+ }
+
+TVerdict CT_DataTypeMappingWithSid1::doTestStepPostambleL()
+ {
+ return TestStepResult();
+ }
+
+
TVerdict CT_DataTypeMappingWithSid1::doTestStepL()
{
INFO_PRINTF1(_L("APPFWK-APPARC-0036: DataTypeMappingWithSid1 - Started"));
--- a/appfw/apparchitecture/tef/T_DataTypeMappingWithSid1.h Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/T_DataTypeMappingWithSid1.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-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"
@@ -39,6 +39,8 @@
{
public:
CT_DataTypeMappingWithSid1();
+ virtual TVerdict doTestStepPreambleL();
+ virtual TVerdict doTestStepPostambleL();
virtual TVerdict doTestStepL();
void ExecuteL(RApaLsSession& aLs);
private:
--- a/appfw/apparchitecture/tef/T_EndTaskStep.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/T_EndTaskStep.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -27,6 +27,10 @@
#include "appfwk_test.h"
#include "T_EndTaskStep.h"
#include "TEndTaskTestApp/EndTaskTestAppExternalInterface.h"
+#include "T_SisFileInstaller.h"
+
+_LIT(KEndTaskAppSisFile, "z:\\apparctest\\apparctestsisfiles\\EndTaskTestApp.sis");
+_LIT(KEndTaskAppComponent, "EndTaskTestApp");
CTEndTaskStep::CTEndTaskStep()
{
@@ -271,6 +275,32 @@
return result;
}
+/**
+ * @return - TVerdict code
+ * Override of base class virtual
+ */
+TVerdict CTEndTaskStep::doTestStepPreambleL()
+ {
+ CSisFileInstaller sisFileInstaller;
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KEndTaskAppSisFile);
+ sisFileInstaller.InstallSisAndWaitForAppListUpdateL(KEndTaskAppSisFile);
+
+ SetTestStepResult(EPass);
+ return TestStepResult();
+ }
+
+/**
+ * @return - TVerdict code
+ * Override of base class virtual
+ */
+TVerdict CTEndTaskStep::doTestStepPostambleL()
+ {
+ CSisFileInstaller sisFileInstaller;
+ sisFileInstaller.UninstallSisL(KEndTaskAppComponent);
+
+ return TestStepResult();
+ }
+
TVerdict CTEndTaskStep::doTestStepL()
{
INFO_PRINTF1(_L("TEndTaskStep test started...."));
--- a/appfw/apparchitecture/tef/T_EndTaskStep.h Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/T_EndTaskStep.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -30,6 +30,8 @@
{
public:
CTEndTaskStep();
+ virtual TVerdict doTestStepPreambleL();
+ virtual TVerdict doTestStepPostambleL();
virtual TVerdict doTestStepL();
void ExecuteL();
private:
--- a/appfw/apparchitecture/tef/T_EnvSlots/T_EnvSlots.H Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/T_EnvSlots/T_EnvSlots.H Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-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"
@@ -44,7 +44,7 @@
_LIT(KTLogFileAccess,"TestLogFile");
_LIT(KFilePath,"c:\\logs\\TestExecute\\EnvSlots.txt");
-_LIT(KTAppName,"Z:\\sys\\bin\\T_EnvSlots.exe");
+_LIT(KTAppName,"C:\\sys\\bin\\T_EnvSlots.exe");
_LIT(KTDocName,"C:\\System\\data\\temp.test");
_LIT(KTEnvSlots,"T_EnvSlots");
--- a/appfw/apparchitecture/tef/T_EnvSlots/T_EnvSlots.MMP Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/T_EnvSlots/T_EnvSlots.MMP Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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"
@@ -40,11 +40,11 @@
userinclude ../../../uiftestfw/inc
start resource T_EnvSlots_reg.rss
-targetpath /private/10003a3f/apps
+targetpath /apparctestregfiles
end
start resource T_EnvSlots_loc.rss
-targetpath /resource/apps
+targetpath /apparctestregfiles
end
LIBRARY cone.lib ws32.lib
--- a/appfw/apparchitecture/tef/T_Foreground.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/T_Foreground.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-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"
@@ -54,10 +54,15 @@
#include <eikenv.h>
#include "t_foreground.h"
+#include "T_SisFileInstaller.h"
_LIT(KAppName, "SimpleApparcTestApp");
-_LIT(KAppFileName, "z:\\sys\\bin\\SimpleApparcTestApp.exe");
+_LIT(KAppFileName, "c:\\sys\\bin\\SimpleApparcTestApp.exe");
_LIT(KAppFile, "c:\\logs\\testApp.txt");
+
+_LIT(KSimpleAppSisFile, "z:\\apparctest\\apparctestsisfiles\\SimpleApparcTestApp.sis");
+_LIT(KSimpleAppComponent, "SimpleApparcTestApp");
+
const TInt KNonExistantWgId = KErrNotFound;
//
@@ -304,6 +309,25 @@
}
+TVerdict CTestForegroundStep::doTestStepPreambleL()
+ {
+ CSisFileInstaller sisFileInstaller;
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KSimpleAppSisFile);
+ sisFileInstaller.InstallSisL(KSimpleAppSisFile);
+
+ SetTestStepResult(EPass);
+ return TestStepResult();
+ }
+
+TVerdict CTestForegroundStep::doTestStepPostambleL()
+ {
+ CSisFileInstaller sisFileInstaller;
+ sisFileInstaller.UninstallSisL(KSimpleAppComponent);
+
+ return TestStepResult();
+ }
+
+
TVerdict CTestForegroundStep::doTestStepL() // main function called by E32
{
INFO_PRINTF1(_L("Test Started"));
--- a/appfw/apparchitecture/tef/T_Foreground.h Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/T_Foreground.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-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"
@@ -61,6 +61,8 @@
public:
CTestForegroundStep();
~CTestForegroundStep();
+ virtual TVerdict doTestStepPreambleL();
+ virtual TVerdict doTestStepPostambleL();
virtual TVerdict doTestStepL();
void ConstructAppL(CCoeEnv* aCoe);
private:
--- a/appfw/apparchitecture/tef/T_LocaleStep.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/T_LocaleStep.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-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"
@@ -35,13 +35,19 @@
#include <hal.h>
#include <apgcli.h>
#include "T_LocaleStep.h"
+#include "T_SisFileInstaller.h"
const TUid KUidTestApp = { 10 }; //uid of tstapp.
const TUid KUidCustomiseDefaultIconApp = {0x10208181}; // uid of CustomiseDefaultIconApp.
-const TInt KDelayForOnDemand = 20000; //a small delay
+const TInt KDelayForOnDemand = 4000000; //a small delay
const TInt KDelay = 4000000; // Most apparc tests have 2.5 secs wait time to let apparc update the app-list, but on safer side let us give 4 secs.
const TInt KViewCount = 3; // Total no of views in tstapp
+_LIT(KTstAppStandAloneSisFile, "z:\\apparctest\\apparctestsisfiles\\TSTAPP_standalone.sis");
+_LIT(KTstAppStandAloneComponent, "TSTAPP_standalone");
+
+_LIT(KTstCustomiseDefaultIconAppSisFile, "z:\\apparctest\\apparctestsisfiles\\CustomiseDefaultIconApp.sis");
+_LIT(KTstCustomiseDefaultIconAppComponent, "CustomiseDefaultIconApp");
/**
Auxiliary Fn for Test Case ID T-LocaleStep-TestAllLanguages
@@ -51,7 +57,7 @@
*/
void CT_LocaleStep::ChangeLocaleL(TLanguage aLanguage)
- {
+ {/*
#ifdef SYMBIAN_DISTINCT_LOCALE_MODEL
_LIT(KLitLocaleDllNameBase, "elocl_lan");
_LIT(KLitLocaleDllNameExtension, ".loc");
@@ -87,7 +93,64 @@
#else
User::LeaveIfError(UserSvr::ChangeLocale(localeDllName));
#endif
- CleanupStack::PopAndDestroy(); // localeDll
+ CleanupStack::PopAndDestroy(); // localeDll */
+
+#ifdef SYMBIAN_DISTINCT_LOCALE_MODEL
+ _LIT(KLitLanguageLocaleDllNameBase, "elocl_lan");
+ //Region and collation code values are hard coded, as the check, after changing the locale is made for the language only.
+ _LIT(KLitRegionLocaleDllNameBase, "elocl_reg.826");
+ _LIT(KLitCollationLocaleDllNameBase, "elocl_col.001");
+ _LIT(ThreeDigExt,".%03d");
+ TExtendedLocale localeDll;
+ const TUidType uidType(TUid::Uid(0x10000079),TUid::Uid(0x100039e6));
+ TBuf<16> languageLocaleDllName(KLitLanguageLocaleDllNameBase);
+ languageLocaleDllName.AppendFormat(ThreeDigExt, aLanguage);
+ TBuf<16> regionLocaleDllName(KLitRegionLocaleDllNameBase);
+ TBuf<16> collationLocaleDllName(KLitCollationLocaleDllNameBase);
+ // Try to load the locale dll
+ TInt error=localeDll.LoadLocale(languageLocaleDllName, regionLocaleDllName, collationLocaleDllName);
+
+ if (error==KErrNotFound)
+ {
+ // Locale dll is not found for the asked language.
+ ERR_PRINTF2(_L("Failed to find the locale dll for %d"), aLanguage);
+ }
+
+ User::LeaveIfError(error);
+ localeDll.SaveSystemSettings();
+#else
+ _LIT(KLitLocaleDllNameBase, "ELOCL");
+ _LIT(TwoDigExt,".%02d");
+
+ RLibrary localeDll;
+ CleanupClosePushL(localeDll);
+
+ const TUidType uidType(TUid::Uid(0x10000079),TUid::Uid(0x100039e6));
+ TBuf<16> localeDllName(KLitLocaleDllNameBase);
+ localeDllName.AppendFormat(TwoDigExt, language);
+
+ // Try to load the locale dll
+ TInt error=localeDll.Load(localeDllName, uidType);
+ if (error==KErrNotFound)
+ {
+ // Locale dll is not found for the asked language.
+ ERR_PRINTF2(_L("Failed to find the locale dll for %d"), language);
+ }
+
+ User::LeaveIfError(error);
+ User::LeaveIfError(UserSvr::ChangeLocale(localeDllName));
+ CleanupStack::PopAndDestroy(); // localeDll
+#endif
+
+ // Check if the device locale has changed
+ if (aLanguage == User::Language())
+ {
+ SetTestStepResult(EPass);
+ }
+ else
+ {
+ ERR_PRINTF3(_L("Failed to change the locale to %d whereas the current locale is"), aLanguage, User::Language());
+ }
}
// CheckIcons is a function used in testcase TestLocaleDefaultIconL to check the size of the default icons
@@ -758,6 +821,11 @@
Override of base class virtual
*/
{
+ CSisFileInstaller sisFileInstaller;
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KTstAppStandAloneSisFile);
+ sisFileInstaller.InstallSisAndWaitForAppListUpdateL(KTstAppStandAloneSisFile);
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KTstCustomiseDefaultIconAppSisFile);
+ sisFileInstaller.InstallSisAndWaitForAppListUpdateL(KTstCustomiseDefaultIconAppSisFile);
SetTestStepResult(EPass);
return TestStepResult();
}
@@ -768,6 +836,9 @@
Override of base class virtual
*/
{
+ CSisFileInstaller sisFileInstaller;
+ sisFileInstaller.UninstallSisL(KTstAppStandAloneComponent);
+ sisFileInstaller.UninstallSisL(KTstCustomiseDefaultIconAppComponent);
return TestStepResult();
}
--- a/appfw/apparchitecture/tef/T_NotifStep.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/T_NotifStep.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-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"
@@ -42,6 +42,11 @@
#include "appfwk_test_utils.h"
#include "T_NotifStep.h"
+#include "T_SisFileInstaller.h"
+
+_LIT(KApparcTestAppSisFile, "z:\\apparctest\\apparctestsisfiles\\TApparcTestApp.sis");
+_LIT(KApparcTestAppComponent, "TApparcTestApp");
+
_LIT(KImportAppsDir,"c:\\private\\10003a3f\\import\\apps\\");
_LIT(KResourceAppsDir,"c:\\resource\\apps\\");
@@ -140,9 +145,10 @@
{
// Force the applist to be updated
//To ensure that server has time to count all applications in the system
- RPointerArray<TDesC> dummy;
- User::LeaveIfError(iSession.ForceRegistration(dummy));
-
+ TRequestStatus status;
+ iSession.SetNotify(ETrue, status);
+ User::WaitForRequest(status);
+
TInt theAppCount = 0;
TInt theErr1 = iSession.AppCount(theAppCount);
TEST(theErr1==KErrNone);
@@ -155,10 +161,12 @@
CleanupStack::PushL(notif);
obs->iNotifier=notif;
INFO_PRINTF1(_L("Creating and deleting apps for notification"));
- CreateAppL(_L("AAA"));
+ CSisFileInstaller sisFileInstaller;
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KApparcTestAppSisFile);
+ sisFileInstaller.InstallSisAndWaitForAppListUpdateL(KApparcTestAppSisFile);
CActiveScheduler::Start();
-
+
TInt theAppCount1 = 0;
theErr1 = iSession.AppCount(theAppCount1);
TEST((theAppCount1 - 1) == theAppCount);
@@ -169,13 +177,12 @@
CleanupStack::PushL(notif);
obs->iNotifier = notif;
INFO_PRINTF1(_L("Deleting the application"));
- DeleteAppL(_L("AAA"));
-
+ sisFileInstaller.UninstallSisL(KApparcTestAppComponent);
CActiveScheduler::Start();
CleanupStack::PopAndDestroy(notif);
- User::LeaveIfError(iSession.ForceRegistration(dummy));
theErr1 = iSession.AppCount(theAppCount1);
+
TEST(theErr1==KErrNone);
TEST(theAppCount1 == theAppCount);
@@ -476,24 +483,33 @@
TEST(KErrNone == iSession.Connect());
TEST(KErrNone == iUtils.Connect());
+ TApaAppInfo info;
+ TUid uid = {0x100048F3};
+ TInt err = iSession.GetAppInfo(info, uid);
+ if(err == KErrNone)
+ {
+ CSisFileInstaller sisFileInstaller;
+ sisFileInstaller.UninstallSisL(KApparcTestAppComponent);
+ }
+
// run the testcode (inside an alloc heaven harness)
__UHEAP_MARK;
iUtils.Connect();
-#if defined (__WINSCW__)
- INFO_PRINTF1(_L("T-NotifStep-TTestIconFileNotificationL Test Started..."));
- TRAP(ret,TestIconFileNotificationL());
- TEST(ret==KErrNone);
- INFO_PRINTF2(_L("TestIconFileNotificationL() finished with return code '%d'\n"), ret);
-#endif
+//#if defined (__WINSCW__)
+// INFO_PRINTF1(_L("T-NotifStep-TTestIconFileNotificationL Test Started..."));
+// TRAP(ret,TestIconFileNotificationL());
+// TEST(ret==KErrNone);
+// INFO_PRINTF2(_L("TestIconFileNotificationL() finished with return code '%d'\n"), ret);
+//#endif
INFO_PRINTF1(_L("T-NotifStep-TestAppNotificationL Test Started..."));
TRAP(ret,TestAppNotificationL());
TEST(ret==KErrNone);
INFO_PRINTF2(_L("TestAppNotificationL() finished with return code '%d'\n"), ret);
- INFO_PRINTF1(_L("TestForceRegistrationNotificationL Test Started..."));
- TRAP(ret, TestForceRegistrationNotificationL());
- TEST(ret==KErrNone);
- INFO_PRINTF2(_L("TestForceRegistrationNotificationL() finished with return code '%d'\n"), ret);
+// INFO_PRINTF1(_L("TestForceRegistrationNotificationL Test Started..."));
+// TRAP(ret, TestForceRegistrationNotificationL());
+// TEST(ret==KErrNone);
+// INFO_PRINTF2(_L("TestForceRegistrationNotificationL() finished with return code '%d'\n"), ret);
iUtils.Close();
__UHEAP_MARKEND;
--- a/appfw/apparchitecture/tef/T_ProStep.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/T_ProStep.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-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"
@@ -50,6 +50,14 @@
#if !defined(__E32TEST_H__)
#include <e32test.h>
#endif
+#include "T_SisFileInstaller.h"
+
+_LIT(KMCtrlAppV2SisFile, "z:\\apparctest\\apparctestsisfiles\\m_ctrl_v2.sis");
+_LIT(KMCtrlAppV2Component, "m_ctrl_v2");
+
+_LIT(KTstAppStandAloneSisFile, "z:\\apparctest\\apparctestsisfiles\\TSTAPP_standalone.sis");
+_LIT(KTstAppStandAloneComponent, "TSTAPP_standalone");
+
TInt PanicTestThread(TAny* aOption);
@@ -61,16 +69,9 @@
ELast
};
-
-_LIT(KCTLDIR,"C:\\private\\10003a3f\\import\\apps\\");
-_LIT(KSOURCEPATH,"z:\\private\\10003a3f\\import\\apps\\m_ctrl_reg.rsc");
-_LIT(KNEWCTLPATH,"C:\\private\\10003a3f\\import\\apps\\m_ctrl_reg.rsc");
_LIT(KNEWPATH,"C:\\cm.txt");
_LIT(KEMPTYFILEPATH,"z:\\system\\data\\Testpath\\FilterTests\\testfile1.txt");
-_LIT(KRSCDIR,"C:\\Resource\\apps\\");
-_LIT(KLOCPATH,"z:\\Resource\\apps\\M_ctrl_loc.rsc");
-_LIT(KNEWLOCPATH,"C:\\Resource\\apps\\M_ctrl_loc.rsc");
_LIT(KCTRLNAME,"C:\\sys\\bin\\m_ctrl.exe");
TFileName ctlPath=_L("z:\\sys\\bin\\m_ctrl.exe");
@@ -1015,14 +1016,10 @@
RSmlTestUtils testSession;
User::LeaveIfError(testSession.Connect());
- testSession.CreateDirectoryL(KCTLDIR);
- testSession.CreateDirectoryL(KRSCDIR);
-
- TInt ret=testSession.CopyFileL(KSOURCEPATH,KNEWCTLPATH);
- TEST(ret==KErrNone);
- ret=testSession.CopyFileL(KLOCPATH,KNEWLOCPATH);
- TEST(ret==KErrNone);
-
+ CSisFileInstaller sisFileInstaller;
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KMCtrlAppV2SisFile);
+ sisFileInstaller.InstallSisL(KMCtrlAppV2SisFile);
+ TInt ret;
TInt controlCount=iControlList->UpdateCount();
while(iControlList->UpdateCount()<=controlCount)
{
@@ -1048,11 +1045,8 @@
}
// hide the control and do an update - there should be changes
- testSession.SetReadOnly(KNEWCTLPATH,0); // remove the read only attribute
- ret=testSession.DeleteFileL(KNEWCTLPATH);
- TEST(ret==KErrNone);
- testSession.SetReadOnly(KNEWLOCPATH,0); // remove the read only attribute
- ret=testSession.DeleteFileL(KNEWLOCPATH);
+ sisFileInstaller.UninstallSisAndWaitForAppListUpdateL(KMCtrlAppV2Component);
+
TEST(ret==KErrNone);
controlCount=iControlList->UpdateCount();
while(iControlList->UpdateCount()<=controlCount)
@@ -1145,6 +1139,13 @@
{
INFO_PRINTF1(_L("Testing CApaSystemControlList"));
+ RApaLsSession ls;
+ User::LeaveIfError(ls.Connect());
+
+ TRequestStatus status;
+ ls.SetNotify(ETrue, status);
+ User::WaitForRequest(status);
+
//Create a session with F & B server
TInt ret = RFbsSession::Connect();
TEST(ret == KErrNone);
@@ -1300,38 +1301,29 @@
*/
void CT_ProStep::DoAppListInvalidTestL(RApaLsSession& aLs)
{
- _LIT(KTempAppDir, "C:\\private\\10003a3f\\import\\apps\\");
- _LIT(KTempRegPath, "C:\\private\\10003a3f\\import\\apps\\tstapp_reg.rsc");
+
TFullName regPath=_L("z:\\private\\10003a3f\\import\\apps\\tstapp_reg.rsc");
CFileMan* fileMan = CFileMan::NewL (iFs);
CleanupStack::PushL(fileMan);
INFO_PRINTF1(_L("Copy tstapp files to C: drive......."));
- TInt ret = iFs.MkDirAll(KTempAppDir);
- TEST(ret==KErrNone || ret==KErrAlreadyExists);
- TEST(fileMan->Copy(regPath, KTempRegPath)==KErrNone); //Just to start the idle update.
- User::After(8000000);
+ CSisFileInstaller sisFileInstaller;
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KTstAppStandAloneSisFile);
+ sisFileInstaller.InstallSisAndWaitForAppListUpdateL(KTstAppStandAloneSisFile);
INFO_PRINTF1(_L("Get app list......."));
+ TInt ret;
ret = aLs.GetAllApps();
TEST(ret==KErrNone);
INFO_PRINTF1(_L("Remove temp files from C: drive......."));
- TRequestStatus status;
- TTime tempTime(0); // added tempTime to avoid asynch CFileMan::Attribs request completing with KErrArgument
- TInt err=fileMan->Attribs(KTempAppDir,0,KEntryAttReadOnly, tempTime, CFileMan::ERecurse, status);
- TEST(err==KErrNone);
- User::WaitForRequest(status);
- TEST(status.Int() == KErrNone);
- TEST(fileMan->Delete(KTempRegPath)==KErrNone); //Just to start the idle update.
- TEST(fileMan->RmDir(KTempAppDir)==KErrNone);
- User::After(8000000);
-
+ sisFileInstaller.UninstallSisAndWaitForAppListUpdateL(KTstAppStandAloneComponent);
INFO_PRINTF1(_L("Testing GetNextApp() never returns RApaLsSession::EAppListInvalid."));
TApaAppInfo info;
+
while(ret==KErrNone)
{
ret=aLs.GetNextApp(info);
@@ -1535,7 +1527,7 @@
iFs.Connect();
setup();
-
+
TRAPD(ret,DoStepTestsInCallbackL())
TEST(ret==KErrNone);
--- a/appfw/apparchitecture/tef/T_ProcStep.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/T_ProcStep.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -22,6 +22,9 @@
*/
#include "T_ProcStep.h"
+#include "T_SisFileInstaller.h"
+
+
const TInt KTProcTerminatingChildI = 1246;
const TInt KTProcTerminatingChildII = 1247;
const TInt KTProcTerminatingChildIII = 1248;
@@ -1376,6 +1379,18 @@
INFO_PRINTF1(_L("End - testIdNotAvailableToChildL ----------- \n"));
}
+
+TVerdict CT_ProcStep::doTestStepPreambleL()
+ {
+ SetTestStepResult(EPass);
+ return TestStepResult();
+ }
+
+TVerdict CT_ProcStep::doTestStepPostambleL()
+ {
+ return TestStepResult();
+ }
+
TVerdict CT_ProcStep::doTestStepL()
/**
@return - TVerdict code
--- a/appfw/apparchitecture/tef/T_ProcStep.h Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/T_ProcStep.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-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"
@@ -37,6 +37,7 @@
_LIT8(KTResultFail, "FAIL");
+
//! A CT_ProcStep test class.
/** Checks for child process existence when its parent terminates. */
@@ -46,6 +47,8 @@
public:
CT_ProcStep();
~CT_ProcStep();
+ virtual TVerdict doTestStepPreambleL();
+ virtual TVerdict doTestStepPostambleL();
virtual TVerdict doTestStepL();
private:
void testChildExistsL(void);
--- a/appfw/apparchitecture/tef/T_RApaLsSessionStep.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/T_RApaLsSessionStep.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-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"
@@ -61,8 +61,60 @@
#if !defined(__E32TEST_H__)
#include <e32test.h>
#endif
+#include "T_SisFileInstaller.h"
-// Literals & Constants
+_LIT(KTstAppStandAloneSisFile, "z:\\apparctest\\apparctestsisfiles\\TSTAPP_standalone.sis");
+_LIT(KTstAppStandAloneComponent, "TSTAPP_standalone");
+
+_LIT(KZeroSizeIconAppSisFile, "z:\\apparctest\\apparctestsisfiles\\zerosizedicontestapp.sis");
+_LIT(KZeroSizeIconAppComponent, "zerosizedicontestapp");
+
+_LIT(KApparcTestAppSisFile, "z:\\apparctest\\apparctestsisfiles\\TApparcTestApp.sis");
+_LIT(KApparcTestAppComponent, "TApparcTestApp");
+
+_LIT(KGroupNameTestAppSisFile, "z:\\apparctest\\apparctestsisfiles\\t_groupname.sis");
+_LIT(KGroupNameTestAppComponent, "T_groupname");
+
+_LIT(KAppNotEmbeddableSisFile, "z:\\apparctest\\apparctestsisfiles\\TAppNotEmbeddable_v2.sis");
+_LIT(KAppNotEmbeddableComponent, "TAppNotEmbeddable_v2");
+
+_LIT(KAppEmbeddableOnlySisFile, "z:\\apparctest\\apparctestsisfiles\\TAppEmbeddableOnly_v2.sis");
+_LIT(KAppEmbeddableOnlyComponent, "TAppEmbeddableOnly_v2");
+
+_LIT(KAppEmbeddableStandaloneSisFile, "z:\\apparctest\\apparctestsisfiles\\TAppEmbeddable_standalone.sis");
+_LIT(KAppEmbeddableStandaloneComponent, "TAppEmbeddable_standalone");
+
+_LIT(KAppEmbeddableEmbeddedSisFile, "z:\\apparctest\\apparctestsisfiles\\TAppEmbeddable_embedded.sis");
+_LIT(KAppEmbeddableEmbeddedComponent, "TAppEmbeddable_embedded");
+
+_LIT(KAppEmbeddableUiNotStandAloneSisFile, "z:\\apparctest\\apparctestsisfiles\\TAppEmbeddableUiNotStandAlone_v2.sis");
+_LIT(KAppEmbeddableUiNotStandAloneComponent, "TAppEmbeddableUiNotStandAlone_v2");
+
+_LIT(KAppEmbeddableUiOrStandAloneEmbeddedSisFile, "z:\\apparctest\\apparctestsisfiles\\TAppEmbeddableUiOrStandAlone_embedded.sis");
+_LIT(KAppEmbeddableUiOrStandAloneEmbeddedComponent, "TAppEmbeddableUiOrStandAlone_embedded");
+
+_LIT(KAppEmbeddableUiOrStandAloneStandaloneSisFile, "z:\\apparctest\\apparctestsisfiles\\TAppEmbeddableUiOrStandalone_standalone.sis");
+_LIT(KAppEmbeddableUiOrStandAloneStandaloneComponent, "TAppEmbeddableUiOrStandalone_standalone");
+
+_LIT(KSimpleAppSisFile, "z:\\apparctest\\apparctestsisfiles\\SimpleApparcTestApp.sis");
+_LIT(KSimpleAppComponent, "SimpleApparcTestApp");
+
+_LIT(KWinChainAppSisFile, "z:\\apparctest\\apparctestsisfiles\\t_winchainLaunch.sis");
+_LIT(KWinChainAppComponent, "t_winchainLaunch");
+
+_LIT(KServerApp7SisFile, "z:\\apparctest\\apparctestsisfiles\\serverapp7.sis");
+_LIT(KServerApp7Component, "serverapp7");
+
+_LIT(KTestTrustedPriorityApp1SisFile, "z:\\apparctest\\apparctestsisfiles\\TestTrustedPriorityApp1.sis");
+_LIT(KTestTrustedPriorityApp1Component, "TestTrustedPriorityApp1");
+
+_LIT(KTestUnTrustedPriorityApp1SisFile, "z:\\apparctest\\apparctestsisfiles\\TestUnTrustedPriorityApp1.sis");
+_LIT(KTestUnTrustedPriorityApp1Component, "TestUnTrustedPriorityApp1");
+
+_LIT(KTestTrustedPriorityApp2SisFile, "z:\\apparctest\\apparctestsisfiles\\TestTrustedPriorityApp2.sis");
+_LIT(KTestTrustedPriorityApp2Component, "TestTrustedPriorityApp2");
+
+// Literals & Constants
_LIT(KCompleted, "Completed.");
const TUint KBytesToRead=100;
@@ -496,35 +548,19 @@
{
INFO_PRINTF1(_L("Setting up Applist invalid test."));
- _LIT(KTempAppDir, "C:\\private\\10003a3f\\import\\apps\\");
- _LIT(KTempRegPath, "C:\\private\\10003a3f\\import\\apps\\tstapp_reg.rsc");
- TFullName regPath=_L("z:\\private\\10003a3f\\import\\apps\\tstapp_reg.rsc");
-
- CFileMan* iAppListInvalidTestFileMan = CFileMan::NewL (iFs);
- CleanupStack::PushL(iAppListInvalidTestFileMan);
-
- INFO_PRINTF1(_L("Copy tstapp files to C: drive......."));
- TInt rtn=iFs.MkDirAll(KTempAppDir);
- TEST(rtn==KErrNone||rtn==KErrAlreadyExists);
- TEST(iAppListInvalidTestFileMan->Copy(regPath, KTempRegPath)==KErrNone); //Just to start the idle update.
+ TRequestStatus status;
+ iLs.SetNotify(EFalse,status);
+ CSisFileInstaller sisFileInstaller;
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KTstAppStandAloneSisFile);
+ sisFileInstaller.InstallSisL(KTstAppStandAloneSisFile);
INFO_PRINTF1(_L("Get app list......."));
TInt ret = iLs.GetAllApps();
TEST(ret==KErrNone);
-
- INFO_PRINTF1(_L("Remove temp files from C: drive......."));
- TRequestStatus status;
- TTime tempTime(0); // added tempTime to avoid asynch CFileMan::Attribs request completing with KErrArgument
- TEST(iAppListInvalidTestFileMan->Attribs(KTempAppDir,0,KEntryAttReadOnly, tempTime, CFileMan::ERecurse, status)==KErrNone);
User::WaitForRequest(status);
- TEST(status.Int() == KErrNone);
- INFO_PRINTF1(_L("Deleting Reg file......."));
- TEST(iAppListInvalidTestFileMan->Delete(KTempRegPath)==KErrNone); //Just to start the idle update.
- INFO_PRINTF1(_L("Removing App dir......."));
- TEST(iAppListInvalidTestFileMan->RmDir(KTempAppDir)==KErrNone);
- CleanupStack::PopAndDestroy(iAppListInvalidTestFileMan);
+ sisFileInstaller.UninstallSisAndWaitForAppListUpdateL(KTstAppStandAloneComponent);
INFO_PRINTF1(KCompleted);
}
@@ -1746,12 +1782,13 @@
HBufC* fullIconFileName = NULL;
ret = iLs.GetAppViewIcon(TUid::Uid(KGroupNameApp), viewInfo.iUid, fullIconFileName);
- TEST(ret == KErrNone);
- TEST(fullIconFileName != NULL);
- INFO_PRINTF2(_L("The View icon's UID is - %X"), viewInfo.iUid);
- TEST(!fullIconFileName->Compare(_L("file://c/resource/apps/tcheckiconapp.xyz")));
- INFO_PRINTF2(_L("View's icon file name is - %S"), fullIconFileName);
-
+
+ TEST(ret == KErrNone);
+ TEST(fullIconFileName != NULL);
+ INFO_PRINTF2(_L("The View icon's UID is - %X"), viewInfo.iUid);
+ TEST(!fullIconFileName->Compare(_L("file://c/resource/apps/tcheckiconapp.xyz")));
+ INFO_PRINTF2(_L("View's icon file name is - %S"), fullIconFileName);
+
delete fullIconFileName;
CleanupStack::PopAndDestroy(appViews);
@@ -1827,7 +1864,7 @@
TInt err = iLs.GetAppIcon(TUid::Uid(KApparcTestApp), svgIconFile);
TEST(err == KErrNone);
- _LIT(KSVGIconFileName, "z:\\resource\\apps\\svg_icon.svg");
+ _LIT(KSVGIconFileName, "c:\\resource\\apps\\svg_icon.svg");
//Get the name of the icon file
TBuf<KMaxFileName> svgIconFileName;
svgIconFile.FullName(svgIconFileName);
@@ -1895,27 +1932,15 @@
*/
void CT_RApaLsSessionTestStep::TestAppListInstallationL()
{
- _LIT(KTestAppDestDir, "C:\\private\\10003a3f\\import\\apps\\" );
- _LIT(KTestAppSource, "Z:\\private\\10003a3f\\import\\apps\\tstapp_reg.rsc" );
- _LIT(KTestAppDest, "C:\\private\\10003a3f\\import\\apps\\tstapp_reg.rsc" );
-
- _LIT(KTestWaitingForApplistUpdate,"Waiting %d microseconds for applist to be updated");
- const TInt KApplistUpdateTime = 10000000;
// Copy App files around and delete them to check whether
// the app list updates and stores the cache correctly.
- RFs theFS;
- theFS.Connect();
-
- // Remove Test app from the file system
- CFileMan* fileManager = CFileMan::NewL (theFS);
-
- INFO_PRINTF1(_L("Copying the app to C"));
- TEST(KErrNone == fileManager->Copy (KTestAppSource, KTestAppDest, CFileMan::ERecurse));
- INFO_PRINTF2(KTestWaitingForApplistUpdate, KApplistUpdateTime);
- User::After(KApplistUpdateTime);
-
+ INFO_PRINTF1(_L("Installing the app from C"));
+ CSisFileInstaller sisInstaller;
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KTstAppStandAloneSisFile);
+ sisInstaller.InstallSisAndWaitForAppListUpdateL(KTstAppStandAloneSisFile);
+
TApaAppInfo aInfo;
TEST(KErrNone == iLs.GetAppInfo (aInfo, KUidTestApp));
@@ -1925,18 +1950,8 @@
TEST(parse.Drive ().CompareF (KCdrive) == 0);
INFO_PRINTF1(_L("Removing the app from C"));
- TRequestStatus status;
- TTime tempTime(0); // added tempTime to avoid asynch CFileMan::Attribs request completing with KErrArgument
- TEST(fileManager->Attribs(KTestAppDest,0,KEntryAttReadOnly, tempTime, CFileMan::ERecurse, status)==KErrNone);
- User::WaitForRequest(status);
- TEST(status.Int() == KErrNone);
- TEST(KErrNone == fileManager->Delete (KTestAppDest, CFileMan::ERecurse));
- INFO_PRINTF1(_L("Removing the app dir from C"));
- TEST(fileManager->RmDir(KTestAppDestDir)==KErrNone);
-
- INFO_PRINTF2(KTestWaitingForApplistUpdate, KApplistUpdateTime);
- User::After(KApplistUpdateTime);
-
+ sisInstaller.UninstallSisAndWaitForAppListUpdateL(KTstAppStandAloneComponent);
+
// That should put the file in the right place
TEST(KErrNone == iLs.GetAppInfo( aInfo, KUidTestApp));
@@ -1945,12 +1960,10 @@
INFO_PRINTF1(_L("Comparing App drive location is Z:... "));
TEST((parse1.Drive().CompareF(KZdrive)) == 0);
- delete fileManager;
- theFS.Close();
-
INFO_PRINTF1(_L("Test TestAppListInstallationL completed"));
}
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
/**
@SYMTestCaseID T-RApaLsSessionTestStep-TestAppListInstallation1L
@@ -2039,6 +2052,7 @@
INFO_PRINTF1(_L("Test TestAppListInstallation1L completed"));
}
+#endif
/**
@SYMTestCaseID APPFWK-APPARC-0107
@@ -2063,18 +2077,6 @@
INFO_PRINTF1(_L("Test TestZeroSizedIconFileL Started.........."));
- _LIT(KTestAppDestDir, "C:\\private\\10003a3f\\import\\apps\\" );
- _LIT(KTestAppResourceDir, "C:\\resource\\apps\\" );
-
- _LIT(KTestAppSource, "Z:\\apparctest\\zerosizedicon_reg.rsc" );
- _LIT(KTestAppDest, "C:\\private\\10003a3f\\import\\apps\\zerosizedicon_reg.rsc" );
-
- _LIT(KTestMbmSource, "Z:\\resource\\apps\\zerosizedicon.mbm");
- _LIT(KTestMbmDest, "C:\\resource\\apps\\zerosizedicon.mbm");
-
- _LIT(KTestLocSource, "Z:\\apparctest\\zerosizedicon_loc.rsc");
- _LIT(KTestLocDest, "C:\\resource\\apps\\zerosizedicon_loc.rsc");
-
TRequestStatus appScanCompleted=KRequestPending;
iLs.SetNotify(EFalse,appScanCompleted);
@@ -2082,33 +2084,17 @@
CleanupClosePushL(utils);
TEST(KErrNone == utils.Connect());
- INFO_PRINTF1(_L("Creating directory C:\\private\\10003a3f\\import\\apps\\ folder"));
- TInt err=utils.CreateDirectoryL(KTestAppDestDir);
- TESTEL((err==KErrNone) || (err==KErrAlreadyExists),err);
-
- INFO_PRINTF1(_L("Creating directory C:\\resource\\apps\\ folder"));
- err=utils.CreateDirectoryL(KTestAppResourceDir);
- TESTEL((err==KErrNone) || (err==KErrAlreadyExists),err);
-
- INFO_PRINTF1(_L("Copying _reg.rsc to C:\\private\\10003a3f\\import\\apps\\ folder"));
- User::LeaveIfError(utils.CopyFileL(KTestAppSource,KTestAppDest));
- INFO_PRINTF1(_L("Copying the mbm and _loc.rsc to C:\\resource\\apps\\ folder"));
- User::LeaveIfError(utils.CopyFileL(KTestMbmSource,KTestMbmDest));
- User::LeaveIfError(utils.CopyFileL(KTestLocSource,KTestLocDest));
-
+ CSisFileInstaller sisFileInstaller;
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KZeroSizeIconAppSisFile);
+ sisFileInstaller.InstallSisL(KZeroSizeIconAppSisFile);
+
User::WaitForRequest(appScanCompleted);
TEST(appScanCompleted.Int()==MApaAppListServObserver::EAppListChanged);
appScanCompleted=KRequestPending;
iLs.SetNotify(EFalse,appScanCompleted);
- INFO_PRINTF1(_L("Removing _reg.rsc from C:\\private\\10003a3f\\import\\apps\\ folder"));
- TEST(KErrNone == DeleteFileL(utils, KTestAppDest));
- INFO_PRINTF1(_L("Removing the mbm and _loc.rsc from C:\\resource\\apps\\ folder"));
- TEST(KErrNone == DeleteFileL(utils, KTestMbmDest));
- TEST(KErrNone == DeleteFileL(utils, KTestLocDest));
- INFO_PRINTF1(_L("Removing the C:\\private\\10003a3f\\import\\apps\\ dir "));
- TEST(KErrNone == utils.DeleteDirectoryL(KTestAppDestDir));
-
+
+ sisFileInstaller.UninstallSisL(KZeroSizeIconAppComponent);
User::WaitForRequest(appScanCompleted);
CleanupStack::PopAndDestroy(&utils);//utils
INFO_PRINTF1(_L("Test TestZeroSizedIconFileL completed"));
@@ -2137,7 +2123,8 @@
return(err);
}
-
+
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
/**
@SYMTestCaseID T-RApaLsSessionTestStep-TestAppFolderNonRomDrivesL
@@ -2213,7 +2200,8 @@
INFO_PRINTF1(_L("Test scanning of app folder for non-ROM drives completed"));
}
-
+#endif
+
/**
@SYMTestCaseID T-RApaLsSessionTestStep-DoNumDefIconsTestL
@@ -2445,7 +2433,7 @@
void CT_RApaLsSessionTestStep::TestDataPriorityForUnTrustedApps()
{
INFO_PRINTF1(_L("TestDataPriorityForUnTrustedApps about to start..."));
- const TUid KUidUnTrustedApp = {0x10207f8C};
+ const TUid KUidUnTrustedApp = {0x80207f8C};
const TUid KUidTrustedApp = {0x10207f8D};
TInt ret;
TBool insertVal = EFalse;
@@ -2527,24 +2515,29 @@
bufferAllocator->Create(TSize(200,1), EColor16M);
CleanupStack::PopAndDestroy(bufferAllocator);
-
- HEAP_TEST_LS_SESSION(iLs, 0, 0, TestAppListInvalidL(), iLs.ClearAppInfoArray() );
+ TRequestStatus status;
+ iLs.SetNotify(ETrue, status);
+ User::WaitForRequest(status);
+
+ HEAP_TEST_LS_SESSION(iLs, 0, DONT_CHECK, TestAppListInvalidL(), iLs.ClearAppInfoArray() );
//DONT_CHECK due to file system changes
HEAP_TEST_LS_SESSION(iLs, 0, DONT_CHECK, TestAppListInstallationL(), NO_CLEANUP);
- HEAP_TEST_LS_SESSION(iLs, 0, DONT_CHECK, TestAppListInstallation1L(), NO_CLEANUP);
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+ HEAP_TEST_LS_SESSION(iLs, 0, DONT_CHECK, TestAppListInstallation1L(), NO_CLEANUP);
HEAP_TEST_LS_SESSION(iLs, 0, DONT_CHECK, TestAppFolderNonRomDrivesL(), NO_CLEANUP);
+#endif
HEAP_TEST_LS_SESSION(iLs, 0, DONT_CHECK, TestZeroSizedIconFileL(), NO_CLEANUP);
HEAP_TEST_LS_SESSION(iLs, 0, 0, IconLoadingTestCasesL(), NO_CLEANUP);
- HEAP_TEST_LS_SESSION(iLs, 0, 0, AppInfoTestCasesL(), iLs.ClearAppInfoArray(); NO_CLEANUP);
- HEAP_TEST_LS_SESSION(iLs, 0, 0, EmbeddedAppsTestCases(), iLs.ClearAppInfoArray() );
+ HEAP_TEST_LS_SESSION(iLs, 0, DONT_CHECK, AppInfoTestCasesL(), iLs.ClearAppInfoArray(); NO_CLEANUP);
+ HEAP_TEST_LS_SESSION(iLs, 0, DONT_CHECK, EmbeddedAppsTestCases(), iLs.ClearAppInfoArray() );
HEAP_TEST_LS_SESSION(iLs, 0, DONT_CHECK, DoNumDefIconsTestL(), NO_CLEANUP);
HEAP_TEST_LS_SESSION(iLs, 0, 0, TestMatchesSecurityPolicy(), NO_CLEANUP);
//DONT_CHECK since there's a new typestore
HEAP_TEST_LS_SESSION(iLs, 0, DONT_CHECK, TestNotifyOnDataMappingChangeL(), NO_CLEANUP);
HEAP_TEST_LS_SESSION(iLs, 0, 0, TestAppListRecognizeDataBufferOnlyL(), iLs.FlushRecognitionCache() );
HEAP_TEST_LS_SESSION(iLs, 0, 0, TestAppListRecognizeDataPassedByBufferL(), iLs.FlushRecognitionCache() );
- HEAP_TEST_LS_SESSION(iLs, 0, 0, TestAppListRecognizeDataL(), iLs.FlushRecognitionCache() );
- HEAP_TEST_LS_SESSION(iLs, 0, 0, TestDataPriorityForUnTrustedApps(), NO_CLEANUP);
+ HEAP_TEST_LS_SESSION(iLs, 0, DONT_CHECK, TestAppListRecognizeDataL(), iLs.FlushRecognitionCache() );
+ HEAP_TEST_LS_SESSION(iLs, 0, DONT_CHECK, TestDataPriorityForUnTrustedApps(), NO_CLEANUP);
HEAP_TEST_LS_SESSION(iLs, 0, 0, TestDataPriorityForUnTrustedAppsRegFile(), NO_CLEANUP);
TestIconLoaderAndIconArrayMemoryLeaksL();
}
@@ -2586,16 +2579,65 @@
*/
TVerdict CT_RApaLsSessionTestStep::doTestStepPreambleL()
{
+ CSisFileInstaller sisFIleInstaller;
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KApparcTestAppSisFile);
+ sisFIleInstaller.InstallSisL(KApparcTestAppSisFile);
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KGroupNameTestAppSisFile);
+ sisFIleInstaller.InstallSisL(KGroupNameTestAppSisFile);
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KAppNotEmbeddableSisFile);
+ sisFIleInstaller.InstallSisL(KAppNotEmbeddableSisFile);
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KAppEmbeddableOnlySisFile);
+ sisFIleInstaller.InstallSisL(KAppEmbeddableOnlySisFile);
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KAppEmbeddableStandaloneSisFile);
+ sisFIleInstaller.InstallSisL(KAppEmbeddableStandaloneSisFile);
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KAppEmbeddableEmbeddedSisFile);
+ sisFIleInstaller.InstallSisL(KAppEmbeddableEmbeddedSisFile);
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KAppEmbeddableUiNotStandAloneSisFile);
+ sisFIleInstaller.InstallSisL(KAppEmbeddableUiNotStandAloneSisFile);
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KAppEmbeddableUiOrStandAloneEmbeddedSisFile);
+ sisFIleInstaller.InstallSisL(KAppEmbeddableUiOrStandAloneEmbeddedSisFile);
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KSimpleAppSisFile);
+ sisFIleInstaller.InstallSisL(KSimpleAppSisFile);
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KWinChainAppSisFile);
+ sisFIleInstaller.InstallSisL(KWinChainAppSisFile);
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KServerApp7SisFile);
+ sisFIleInstaller.InstallSisL(KServerApp7SisFile);
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KTestTrustedPriorityApp1SisFile);
+ sisFIleInstaller.InstallSisL(KTestTrustedPriorityApp1SisFile);
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KTestUnTrustedPriorityApp1SisFile);
+ sisFIleInstaller.InstallSisL(KTestUnTrustedPriorityApp1SisFile);
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KTestTrustedPriorityApp2SisFile);
+ sisFIleInstaller.InstallSisL(KTestTrustedPriorityApp2SisFile);
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KAppEmbeddableUiOrStandAloneStandaloneSisFile);
+ sisFIleInstaller.InstallSisAndWaitForAppListUpdateL(KAppEmbeddableUiOrStandAloneStandaloneSisFile);
+
SetTestStepResult(EPass);
return TestStepResult();
}
+
/**
@return - TVerdict code
Override of base class virtual
*/
TVerdict CT_RApaLsSessionTestStep::doTestStepPostambleL()
{
+ CSisFileInstaller sisFIleInstaller;
+ sisFIleInstaller.UninstallSisL(KApparcTestAppComponent);
+ sisFIleInstaller.UninstallSisL(KGroupNameTestAppComponent);
+ sisFIleInstaller.UninstallSisL(KAppNotEmbeddableComponent);
+ sisFIleInstaller.UninstallSisL(KAppEmbeddableOnlyComponent);
+ sisFIleInstaller.UninstallSisL(KAppEmbeddableStandaloneComponent);
+ sisFIleInstaller.UninstallSisL(KAppEmbeddableEmbeddedComponent);
+ sisFIleInstaller.UninstallSisL(KAppEmbeddableUiNotStandAloneComponent);
+ sisFIleInstaller.UninstallSisL(KAppEmbeddableUiOrStandAloneEmbeddedComponent);
+ sisFIleInstaller.UninstallSisL(KAppEmbeddableUiOrStandAloneStandaloneComponent);
+ sisFIleInstaller.UninstallSisL(KSimpleAppComponent);
+ sisFIleInstaller.UninstallSisL(KWinChainAppComponent);
+ sisFIleInstaller.UninstallSisL(KServerApp7Component);
+ sisFIleInstaller.UninstallSisL(KTestTrustedPriorityApp1Component);
+ sisFIleInstaller.UninstallSisL(KTestUnTrustedPriorityApp1Component);
+ sisFIleInstaller.UninstallSisL(KTestTrustedPriorityApp2Component);
return TestStepResult();
}
@@ -2603,7 +2645,15 @@
TVerdict CT_RApaLsSessionTestStep::doTestStepL()
{
INFO_PRINTF1(_L("Testing Apparc...T_RApaLsSession Test Cases Running..."));
-
+
+ TApaAppInfo info;
+ TUid uid = {0xABCD0000};
+ TInt err = iLs.GetAppInfo(info, uid);
+ if(err == KErrNone)
+ {
+ CSisFileInstaller sisFileInstaller;
+ sisFileInstaller.UninstallSisL(KZeroSizeIconAppComponent);
+ }
TRAPD(ret,RunTestCasesL())
TEST(ret==KErrNone);
--- a/appfw/apparchitecture/tef/T_RApaLsSessionStep.h Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/T_RApaLsSessionStep.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-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"
@@ -112,7 +112,9 @@
void TestAppListRecognizeDataPassedByBufferL();
void TestAppListInstallationL();
void TestAppListInstallation1L();
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
void TestAppFolderNonRomDrivesL();
+#endif
void TestZeroSizedIconFileL();
void EmbeddedAppsTestCases();
--- a/appfw/apparchitecture/tef/T_RuleBasedLaunchingStep.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/T_RuleBasedLaunchingStep.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-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"
@@ -29,6 +29,20 @@
#endif //SYMBIAN_ENABLE_SPLIT_HEADERS
#include "testableapalssession.h"
+#include "T_SisFileInstaller.h"
+
+_LIT(KRuleBasedApp1SisFile, "z:\\apparctest\\apparctestsisfiles\\tRuleBasedApp1.sis");
+_LIT(KRuleBasedApp1Component, "tRuleBasedApp1");
+
+_LIT(KRuleBasedApp2SisFile, "z:\\apparctest\\apparctestsisfiles\\tRuleBasedApp2.sis");
+_LIT(KRuleBasedApp2Component, "tRuleBasedApp2");
+
+_LIT(KRuleBasedApp3SisFile, "z:\\apparctest\\apparctestsisfiles\\tRuleBasedApp3.sis");
+_LIT(KRuleBasedApp3Component, "tRuleBasedApp3");
+
+_LIT(KRuleBasedApp4SisFile, "z:\\apparctest\\apparctestsisfiles\\tRuleBasedApp4.sis");
+_LIT(KRuleBasedApp4Component, "tRuleBasedApp4");
+
const TUint KNonNativeApplicationType = 0x10207f90;
const TUint KNonNativeApplication = 0xA0000B6E;
@@ -55,7 +69,9 @@
CleanupClosePushL(theLs);
//DONT_CHECK since app list is updated
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
HEAP_TEST_LS_SESSION(theLs, 0, DONT_CHECK, TestLaunchNonNativeApplicationForRuleBasedL(theLs), NO_CLEANUP);
+#endif
//DONT_CHECK since result is unstable
HEAP_TEST_LS_SESSION(theLs, 0, DONT_CHECK, LaunchAppTests1L(theLs), theLs.FlushRecognitionCache() );
HEAP_TEST_LS_SESSION(theLs, 0, 0, LaunchAppTests2L(theLs), theLs.FlushRecognitionCache() );
@@ -445,6 +461,38 @@
AppClosed(KUidApp4);
}
+TVerdict CTRuleBasedLaunchingStep::doTestStepPreambleL()
+ {
+ CSisFileInstaller sisFIleInstaller;
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KRuleBasedApp1SisFile);
+ sisFIleInstaller.InstallSisL(KRuleBasedApp1SisFile);
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KRuleBasedApp2SisFile);
+ sisFIleInstaller.InstallSisL(KRuleBasedApp2SisFile);
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KRuleBasedApp3SisFile);
+ sisFIleInstaller.InstallSisL(KRuleBasedApp3SisFile);
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KRuleBasedApp4SisFile);
+ sisFIleInstaller.InstallSisAndWaitForAppListUpdateL(KRuleBasedApp4SisFile);
+
+ SetTestStepResult(EPass);
+ return TestStepResult();
+ }
+
+
+/**
+ @return - TVerdict code
+ Override of base class virtual
+ */
+TVerdict CTRuleBasedLaunchingStep::doTestStepPostambleL()
+ {
+ CSisFileInstaller sisFIleInstaller;
+ sisFIleInstaller.UninstallSisL(KRuleBasedApp1Component);
+ sisFIleInstaller.UninstallSisL(KRuleBasedApp2Component);
+ sisFIleInstaller.UninstallSisL(KRuleBasedApp3Component);
+ sisFIleInstaller.UninstallSisL(KRuleBasedApp4Component);
+ return TestStepResult();
+ }
+
+
TVerdict CTRuleBasedLaunchingStep::doTestStepL()
{
INFO_PRINTF1(_L("TRuleBasedLaunchingStep test started...."));
--- a/appfw/apparchitecture/tef/T_RuleBasedLaunchingStep.h Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/T_RuleBasedLaunchingStep.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-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"
@@ -31,6 +31,8 @@
{
public:
CTRuleBasedLaunchingStep();
+ virtual TVerdict doTestStepPreambleL();
+ virtual TVerdict doTestStepPostambleL();
virtual TVerdict doTestStepL();
void ExecuteL();
private:
--- a/appfw/apparchitecture/tef/T_Serv2Step.CPP Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/T_Serv2Step.CPP Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-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"
@@ -48,6 +48,36 @@
#include <eikenv.h>
#include "TAppEmbedUids.h"
#include "appfwk_test_utils.h"
+#include "T_SisFileInstaller.h"
+
+_LIT(KTstAppStandAloneSisFile, "z:\\apparctest\\apparctestsisfiles\\TSTAPP_standalone.sis");
+_LIT(KTstAppStandAloneComponent, "TSTAPP_standalone");
+
+_LIT(KAppEmbeddableEmbeddedSisFile, "z:\\apparctest\\apparctestsisfiles\\TAppEmbeddable_embedded.sis");
+_LIT(KAppEmbeddableEmbeddedComponent, "TAppEmbeddable_embedded");
+
+_LIT(KAppNotEmbeddableV2SisFile, "z:\\apparctest\\apparctestsisfiles\\TAppNotEmbeddable_v2.sis");
+_LIT(KAppNotEmbeddableV2Component, "TAppNotEmbeddable_v2");
+
+_LIT(KAppEmbeddableOnlyV2SisFile, "z:\\apparctest\\apparctestsisfiles\\TAppEmbeddableOnly_v2.sis");
+_LIT(KAppEmbeddableOnlyV2Component, "TAppEmbeddableOnly_v2");
+
+_LIT(KAppEmbeddableStandaloneSisFile, "z:\\apparctest\\apparctestsisfiles\\TAppEmbeddable_standalone.sis");
+_LIT(KAppEmbeddableStandaloneComponent, "TAppEmbeddable_standalone");
+
+_LIT(KAppEmbeddableUiNotStandAloneV2SisFile, "z:\\apparctest\\apparctestsisfiles\\TAppEmbeddableUiNotStandAlone_v2.sis");
+_LIT(KAppEmbeddableUiNotStandAloneV2Component, "TAppEmbeddableUiNotStandAlone_v2");
+
+_LIT(KAppEmbeddableUiOrStandAloneEmbeddedSisFile, "z:\\apparctest\\apparctestsisfiles\\TAppEmbeddableUiOrStandAlone_embedded.sis");
+_LIT(KAppEmbeddableUiOrStandAloneEmbeddedComponent, "TAppEmbeddableUiOrStandAlone_embedded");
+
+
+_LIT(KAppEmbeddableUiOrStandAloneStandaloneSisFile, "z:\\apparctest\\apparctestsisfiles\\TAppEmbeddableUiOrStandAlone_standalone.sis");
+_LIT(KAppEmbeddableUiOrStandAloneStandaloneComponent, "TAppEmbeddableUiOrStandalone_standalone");
+
+_LIT(KSimpleAppSisFile, "z:\\apparctest\\apparctestsisfiles\\SimpleApparcTestApp.sis");
+_LIT(KSimpleAppComponent, "SimpleApparcTestApp");
+
// Constants
const TInt KOneSecondDelay = 1000000;
@@ -105,8 +135,11 @@
{
_LIT(KLitAppPath,"z:\\sys\\bin\\tstapp.exe");
TFullName appPath(KLitAppPath);
+
+
//Search for TestApp
TApaAppInfo info;
+
TInt ret = aLs.GetAllApps();
TEST(ret==KErrNone);
@@ -1387,27 +1420,12 @@
*/
void CT_Serv2Step::DoInstallationTestL (RApaLsSession ls)
{
- _LIT(KTestAppDestDir, "C:\\private\\10003a3f\\import\\apps\\" );
- _LIT(KTestAppSource, "Z:\\private\\10003a3f\\import\\apps\\tstapp_reg.rsc" );
- _LIT(KTestAppDest, "C:\\private\\10003a3f\\import\\apps\\tstapp_reg.rsc" );
- _LIT(KTestWaitingForApplistUpdate,"\nWaiting %d microseconds for applist to be updated");
- const TInt KApplistUpdateTime = 8000000;
-
- // Copy App files around and delete them to check whether
- // the app list updates and stores the cache correctly.
- RFs theFs;
- theFs.Connect();
- // Remove Test app from the file system
- CFileMan* fileManager = CFileMan::NewL (theFs);
-
- INFO_PRINTF1(_L("Copying the app to C"));
- TEST(KErrNone == fileManager->Copy (KTestAppSource, KTestAppDest, CFileMan::ERecurse));
-
- INFO_PRINTF2(KTestWaitingForApplistUpdate, KApplistUpdateTime);
- User::After(KApplistUpdateTime);
-
+ CSisFileInstaller sisFileInstaller;
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KTstAppStandAloneSisFile);
+ sisFileInstaller.InstallSisAndWaitForAppListUpdateL(KTstAppStandAloneSisFile);
+
TApaAppInfo aInfo;
TEST(KErrNone == ls.GetAppInfo (aInfo, KUidTestApp));
@@ -1417,15 +1435,10 @@
TEST(parse.Drive ().CompareF (KCdrive) == 0);
INFO_PRINTF1(_L("Removing the app from C"));
- TTime tempTime(0);
- fileManager->Attribs(KTestAppDest,0,KEntryAttReadOnly, tempTime, CFileMan::ERecurse);
- TEST(KErrNone == fileManager->Delete (KTestAppDest, CFileMan::ERecurse));
- INFO_PRINTF1(_L("Removing the app dir from C"));
- TEST(fileManager->RmDir(KTestAppDestDir)==KErrNone);
+
+
- INFO_PRINTF2(KTestWaitingForApplistUpdate, KApplistUpdateTime);
- User::After(KApplistUpdateTime);
-
+ sisFileInstaller.UninstallSisAndWaitForAppListUpdateL(KTstAppStandAloneComponent);
// That should put the file in the right place
TEST(KErrNone == ls.GetAppInfo( aInfo, KUidTestApp));
@@ -1433,9 +1446,7 @@
_LIT (KZdrive, "Z:");
INFO_PRINTF1(_L("Comparing App drive location is Z:... "));
TEST((parse1.Drive().CompareF(KZdrive)) == 0);
-
- delete fileManager;
- theFs.Close();
+
}
//
@@ -1757,6 +1768,24 @@
Override of base class virtual
*/
{
+ CSisFileInstaller sisFileInstaller;
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KAppEmbeddableEmbeddedSisFile);
+ sisFileInstaller.InstallSisL(KAppEmbeddableEmbeddedSisFile);
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KAppNotEmbeddableV2SisFile);
+ sisFileInstaller.InstallSisL(KAppNotEmbeddableV2SisFile);
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KAppEmbeddableOnlyV2SisFile);
+ sisFileInstaller.InstallSisL(KAppEmbeddableOnlyV2SisFile);
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KAppEmbeddableStandaloneSisFile);
+ sisFileInstaller.InstallSisL(KAppEmbeddableStandaloneSisFile);
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KAppEmbeddableUiNotStandAloneV2SisFile);
+ sisFileInstaller.InstallSisL(KAppEmbeddableUiNotStandAloneV2SisFile);
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KAppEmbeddableUiOrStandAloneEmbeddedSisFile);
+ sisFileInstaller.InstallSisL(KAppEmbeddableUiOrStandAloneEmbeddedSisFile);
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KSimpleAppSisFile);
+ sisFileInstaller.InstallSisL(KSimpleAppSisFile);
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KAppEmbeddableUiOrStandAloneStandaloneSisFile);
+ sisFileInstaller.InstallSisAndWaitForAppListUpdateL(KAppEmbeddableUiOrStandAloneStandaloneSisFile);
+
SetTestStepResult(EPass);
return TestStepResult();
}
@@ -1767,6 +1796,16 @@
Override of base class virtual
*/
{
+ CSisFileInstaller sisFileInstaller;
+ sisFileInstaller.UninstallSisL(KAppEmbeddableEmbeddedComponent);
+ sisFileInstaller.UninstallSisL(KAppNotEmbeddableV2Component);
+ sisFileInstaller.UninstallSisL(KAppEmbeddableOnlyV2Component);
+ sisFileInstaller.UninstallSisL(KAppEmbeddableStandaloneComponent);
+ sisFileInstaller.UninstallSisL(KAppEmbeddableUiNotStandAloneV2Component);
+ sisFileInstaller.UninstallSisL(KAppEmbeddableUiOrStandAloneEmbeddedComponent);
+ sisFileInstaller.UninstallSisL(KAppEmbeddableUiOrStandAloneStandaloneComponent);
+ sisFileInstaller.UninstallSisL(KSimpleAppComponent);
+
return TestStepResult();
}
--- a/appfw/apparchitecture/tef/T_ServiceRegistryStep.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/T_ServiceRegistryStep.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-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"
@@ -25,16 +25,18 @@
#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
#include <apaidpartner.h>
#endif
-
-
+#include "T_SisFileInstaller.h"
+
+_LIT(KTstAppStandAloneSisFile, "z:\\apparctest\\apparctestsisfiles\\TSTAPP_standalone.sis");
+_LIT(KTstAppStandAloneComponent, "TSTAPP_standalone");
-_LIT(KImportAppsDir,"c:\\private\\10003a3f\\import\\apps\\");
-_LIT(KAppRscSourcePath,"z:\\system\\data\\TestUpdRegAppUninstallation_reg.rsc");
-_LIT(KUpgradeAppRscSourcePath,"z:\\system\\data\\TestUpgradeUpdRegAppUninstallation_reg.rsc");
-_LIT(KAppRscTargetPath,"c:\\private\\10003a3f\\import\\apps\\TestUpdRegAppUninstallation_reg.rsc");
+_LIT(KServerApp2SisFile, "z:\\apparctest\\apparctestsisfiles\\serverapp2.sis");
+_LIT(KServerApp2Component, "serverapp2");
+
+_LIT(KApparcTestAppSisFile, "z:\\apparctest\\apparctestsisfiles\\TApparcTestApp.sis");
+_LIT(KApparcTestAppComponent, "TApparcTestApp");
_LIT8(KLitMimeType,"mime/updregappuninstall");
-_LIT8(KLitUpgradeAppMimeType,"mime/upgradeupdregappuninstall");
/**
* Constructor
@@ -58,6 +60,10 @@
*/
TVerdict CT_ServiceRegistryTestStep::doTestStepPreambleL()
{
+ CSisFileInstaller sisFileInstaller;
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KServerApp2SisFile);
+ sisFileInstaller.InstallSisAndWaitForAppListUpdateL(KServerApp2SisFile);
+
SetTestStepResult(EPass);
return TestStepResult();
}
@@ -68,6 +74,9 @@
*/
TVerdict CT_ServiceRegistryTestStep::doTestStepPostambleL()
{
+ CSisFileInstaller sisFileInstaller;
+ sisFileInstaller.UninstallSisL(KServerApp2Component);
+
return TestStepResult();
}
@@ -95,6 +104,15 @@
RTestableApaLsSession ls;
TEST(KErrNone == ls.Connect());
CleanupClosePushL(ls);
+
+ TApaAppInfo info;
+ TUid uid = {0x100048F3};
+ TInt err = ls.GetAppInfo(info, uid);
+ if(err == KErrNone)
+ {
+ CSisFileInstaller sisFileInstaller;
+ sisFileInstaller.UninstallSisL(KApparcTestAppComponent);
+ }
// Use DONT_CHECK because it complaints of heap unbalance (a CTypeStoreManager object, althought it is not actually leaked,
// but reallocated in CApaAppListServer::DoUpdateTypeStoreL(void)).
@@ -102,7 +120,9 @@
// a CApaFsMonitor object, which introduces an extra 0.25 second delay before invoking the callback.
// *** See DEF101056 ****
HEAP_TEST_LS_SESSION(ls, 0, DONT_CHECK, TestAssociation1L(), NO_CLEANUP);
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
HEAP_TEST_LS_SESSION(ls, 0, DONT_CHECK, TestAppForDataTypeAndServiceL(ls), NO_CLEANUP);
+#endif
HEAP_TEST_LS_SESSION(ls, 0, DONT_CHECK, TestUpdateOfServiceRegistryOnAppUninstallationL(ls), NO_CLEANUP);
HEAP_TEST_LS_SESSION(ls, 0, DONT_CHECK, TestServiceRegistryOnAppUpgradeL(ls), NO_CLEANUP);
@@ -279,42 +299,27 @@
CleanupClosePushL(fs);
User::LeaveIfError(fs.Connect());
- TInt err = fs.CreateDirectoryL(KImportAppsDir);
- TESTEL((err == KErrNone || err == KErrAlreadyExists), err);
- INFO_PRINTF1(_L("c:\\private\\10003a3f\\import\\apps is created successfully or already exists"));
-
- //Make sure that the target file does not exist.
- DeleteFileL(fs, KAppRscTargetPath);
-
- // Copy TestUpdRegAppUninstallation_reg.rsc from z:\ to c:\private\10003a3f\import\apps\.
- err = fs.CopyFileL(KAppRscSourcePath, KAppRscTargetPath);
- TEST(err == KErrNone);
- INFO_PRINTF1(_L("Successfully copied TestUpdRegAppUninstallation_reg.rsc from Z:\\system\\data to c:\\private\\10003a3f\\import\\apps"));
-
- //Wait till the applist is updated.
- WaitForAppListUpdateL();
-
+ CSisFileInstaller sisFileInstaller;
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KApparcTestAppSisFile);
+ sisFileInstaller.InstallSisAndWaitForAppListUpdateL(KApparcTestAppSisFile);
+
CServiceRegistry* registry = CServiceRegistry::NewL();
CleanupStack::PushL(registry);
- TUid appUid = {0x10207f80};
+ TUid appUid = {0x100048f3};
TUid resultUid={KNullUidValue};
TDataType dataType (KLitMimeType);
- //Test whether 0x10207f80 application is in application list.
+ //Test whether 0x100048f3 application is in application list.
TApaAppInfo appInfo;
TEST(aLs.GetAppInfo(appInfo,appUid)==KErrNone);
- //Set 0x10207f80 as default application for "mime/updregappuninstall" MIME type.
+ //Set 0x100048f3 as default application for "mime/updregappuninstall" MIME type.
registry->SetDefault(KOpenServiceUid,dataType, appUid);
registry->GetDefault(KOpenServiceUid,dataType, resultUid);
TEST(appUid==resultUid);
- //Delete file c:\\private\\10003a3f\\import\\apps\\TestUpdRegAppUninstallation_reg.rsc
- DeleteFileL(fs, KAppRscTargetPath);
-
- //Wait till the application list is updated.
- WaitForAppListUpdateL();
+ sisFileInstaller.UninstallSisAndWaitForAppListUpdateL(KApparcTestAppComponent);
//Check the application is removed from the application list
TEST(aLs.GetAppInfo(appInfo,appUid)==KErrNotFound);
@@ -353,62 +358,26 @@
{
INFO_PRINTF1(_L("TestServiceRegistryOnAppUpgrade"));
- RSmlTestUtils fs;
- CleanupClosePushL(fs);
- User::LeaveIfError(fs.Connect());
-
- TInt err = fs.CreateDirectoryL(KImportAppsDir);
- TESTEL((err == KErrNone || err == KErrAlreadyExists), err);
- INFO_PRINTF1(_L("c:\\private\\10003a3f\\import\\apps is created successfully or already exists"));
-
- //Make sure that the target file does not exist.
- DeleteFileL(fs, KAppRscTargetPath);
-
- // Copy TestUpdRegAppUninstallation_reg.rsc from z:\ to c:\private\10003a3f\import\apps\.
- err = fs.CopyFileL(KAppRscSourcePath, KAppRscTargetPath);
- TEST(err == KErrNone);
- INFO_PRINTF1(_L("Successfully copied TestUpdRegAppUninstallation_reg.rsc from Z:\\system\\data to c:\\private\\10003a3f\\import\\apps"));
-
- //Wait till the applist is updated.
- WaitForAppListUpdateL();
-
CServiceRegistry* registry = CServiceRegistry::NewL();
CleanupStack::PushL(registry);
- TUid appUid = {0x10207f80};
+ TUid appUid = {0xA};
TUid resultUid={KNullUidValue};
TDataType dataType (KLitMimeType);
- //Test whether 0x10207f80 application is in application list.
+ //Test whether 0xA application is in application list.
TApaAppInfo appInfo;
TEST(aLs.GetAppInfo(appInfo,appUid)==KErrNone);
- //Set 0x10207f80 as default application for "mime/updregappuninstall" MIME type.
+ //Set 0xA as default application for "mime/updregappuninstall" MIME type.
registry->SetDefault(KOpenServiceUid,dataType, appUid);
registry->GetDefault(KOpenServiceUid,dataType, resultUid);
TEST(appUid==resultUid);
- TDataType upgDataType(KLitUpgradeAppMimeType);
- err=aLs.AppForDataType(upgDataType,resultUid);
- TEST(resultUid.iUid==KNullUidValue);
-
- DeleteFileL(fs, KAppRscTargetPath);
+ CSisFileInstaller sisFIleInstaller;
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KTstAppStandAloneSisFile);
+ sisFIleInstaller.InstallSisAndWaitForAppListUpdateL(KTstAppStandAloneSisFile);
- err = fs.CopyFileL(KUpgradeAppRscSourcePath, KAppRscTargetPath);
- TEST(err == KErrNone);
- INFO_PRINTF1(_L("Successfully copied TestUpgradeUpdRegAppUninstallation_reg.rsc from Z:\\system\\data to c:\\private\\10003a3f\\import\\apps"));
-
- //Change the modified time of the file to current time
- RFs aFs;
- TEST(aFs.Connect()==KErrNone);
- TTime modifiedTime(0);
- modifiedTime.HomeTime();
- TEST(aFs.SetModified(KAppRscTargetPath, modifiedTime)==KErrNone);
- aFs.Close();
-
- //Wait till the applist is updated.
- WaitForAppListUpdateL();
-
//Check the application is not removed from the application list
TEST(aLs.GetAppInfo(appInfo,appUid)==KErrNone);
@@ -416,13 +385,9 @@
TEST(registry->GetDefault(KOpenServiceUid,dataType, resultUid)==KErrNone);
TEST(resultUid==appUid);
- err=aLs.AppForDataType(upgDataType,resultUid);
- TEST((err==KErrNone) && (resultUid==appUid));
-
- DeleteFileL(fs,KAppRscTargetPath);
+ sisFIleInstaller.UninstallSisL(KTstAppStandAloneComponent);
CleanupStack::PopAndDestroy(registry);
- CleanupStack::PopAndDestroy(&fs);
}
--- a/appfw/apparchitecture/tef/T_ServicesStep.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/T_ServicesStep.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-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"
@@ -21,6 +21,8 @@
#include <barsread.h>
#include "T_ServicesStep.h"
+#include "T_SisFileInstaller.h"
+
#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
#include <apaidpartner.h>
#endif //SYMBIAN_ENABLE_SPLIT_HEADERS
@@ -30,6 +32,37 @@
_LIT8(KLitPriorityText,"text/priority");
_LIT8(KLitCustom1Text, "text/custom1");
+
+_LIT(KServerApp2SisFile, "z:\\apparctest\\apparctestsisfiles\\serverapp2.sis");
+_LIT(KServerApp2Component, "serverapp2");
+
+_LIT(KServerApp4SisFile, "z:\\apparctest\\apparctestsisfiles\\serverapp4.sis");
+_LIT(KServerApp4Component, "serverapp4");
+
+_LIT(KServerApp6SisFile, "z:\\apparctest\\apparctestsisfiles\\serverapp6.sis");
+_LIT(KServerApp6Component, "serverapp6");
+
+_LIT(KServerApp7SisFile, "z:\\apparctest\\apparctestsisfiles\\serverapp7.sis");
+_LIT(KServerApp7Component, "serverapp7");
+
+_LIT(KOpenServiceApp1SisFile, "z:\\apparctest\\apparctestsisfiles\\openservice1app.sis");
+_LIT(KOpenServiceApp1Component, "openservice1app");
+
+_LIT(KOpenServiceApp2SisFile, "z:\\apparctest\\apparctestsisfiles\\openservice2app.sis");
+_LIT(KOpenServiceApp2Component, "openservice2app");
+
+_LIT(KCtrlPanelAppSisFile, "z:\\apparctest\\apparctestsisfiles\\TCtrlPnlApp.sis");
+_LIT(KCtrlPanelAppComponent, "TCtrlPnlApp");
+
+_LIT(KDataPrioritySystem1SisFile, "z:\\apparctest\\apparctestsisfiles\\T_DataPrioritySystem1.sis");
+_LIT(KDataPrioritySystem1Component, "T_DataPrioritySystem1");
+
+_LIT(KDataPrioritySystem2SisFile, "z:\\apparctest\\apparctestsisfiles\\T_DataPrioritySystem2.sis");
+_LIT(KDataPrioritySystem2Component, "T_DataPrioritySystem2");
+
+_LIT(KDataPrioritySystem3SisFile, "z:\\apparctest\\apparctestsisfiles\\T_DataPrioritySystem3.sis");
+_LIT(KDataPrioritySystem3Component, "T_DataPrioritySystem3");
+
/**
Constructor
*/
@@ -53,6 +86,28 @@
*/
TVerdict CT_ServicesTestStep::doTestStepPreambleL()
{
+ CSisFileInstaller sisInstaller;
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KServerApp2SisFile);
+ sisInstaller.InstallSisL(KServerApp2SisFile);
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KServerApp4SisFile);
+ sisInstaller.InstallSisL(KServerApp4SisFile);
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KServerApp6SisFile);
+ sisInstaller.InstallSisL(KServerApp6SisFile);
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KOpenServiceApp1SisFile);
+ sisInstaller.InstallSisL(KOpenServiceApp1SisFile);
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KOpenServiceApp2SisFile);
+ sisInstaller.InstallSisL(KOpenServiceApp2SisFile);
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KCtrlPanelAppSisFile);
+ sisInstaller.InstallSisL(KCtrlPanelAppSisFile);
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KDataPrioritySystem1SisFile);
+ sisInstaller.InstallSisL(KDataPrioritySystem1SisFile);
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KDataPrioritySystem2SisFile);
+ sisInstaller.InstallSisL(KDataPrioritySystem2SisFile);
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KDataPrioritySystem3SisFile);
+ sisInstaller.InstallSisL(KDataPrioritySystem3SisFile);
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KServerApp7SisFile);
+ sisInstaller.InstallSisAndWaitForAppListUpdateL(KServerApp7SisFile);
+
SetTestStepResult(EPass);
TInt error = iApaLsSession.Connect();
TEST(error==KErrNone);
@@ -65,6 +120,17 @@
*/
TVerdict CT_ServicesTestStep::doTestStepPostambleL()
{
+ CSisFileInstaller sisInstaller;
+ sisInstaller.UninstallSisL(KServerApp2Component);
+ sisInstaller.UninstallSisL(KServerApp4Component);
+ sisInstaller.UninstallSisL(KServerApp6Component);
+ sisInstaller.UninstallSisL(KServerApp7Component);
+ sisInstaller.UninstallSisL(KOpenServiceApp1Component);
+ sisInstaller.UninstallSisL(KOpenServiceApp2Component);
+ sisInstaller.UninstallSisL(KCtrlPanelAppComponent);
+ sisInstaller.UninstallSisL(KDataPrioritySystem1Component);
+ sisInstaller.UninstallSisL(KDataPrioritySystem2Component);
+ sisInstaller.UninstallSisL(KDataPrioritySystem3Component);
return TestStepResult();
}
@@ -85,6 +151,7 @@
TInt CT_ServicesTestStep::RunTestCasesL()
{
HEAP_TEST_LS_SESSION(iApaLsSession, 0, 0, TestServiceDiscovery1L(), iApaLsSession.ClearAppInfoArray() );
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
HEAP_TEST_LS_SESSION(iApaLsSession, 0, 0, TestServiceDiscovery2L(), iApaLsSession.ClearAppInfoArray() );
HEAP_TEST_LS_SESSION(iApaLsSession, 0, 0, TestServiceDiscovery3L(), NO_CLEANUP);
HEAP_TEST_LS_SESSION(iApaLsSession, 0, 0, TestServiceDiscovery4L(), NO_CLEANUP);
@@ -92,10 +159,13 @@
HEAP_TEST_LS_SESSION(iApaLsSession, 0, 0, TestServiceDiscovery6(), NO_CLEANUP);
HEAP_TEST_LS_SESSION(iApaLsSession, 0, 0, TestServiceDiscovery7L(), NO_CLEANUP);
HEAP_TEST_LS_SESSION(iApaLsSession, 0, 0, TestServiceDiscovery8L(), NO_CLEANUP);
+#endif
// The following two APIs InsertDataMappingL() & DeleteDataMappingL(), update the type store on the server side.
// This update takes place on the server side while the test case is still running, which causes the heap check to fail.
// To avoid the heap check on the server side, DONT_CHECK macro is used.
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
HEAP_TEST_LS_SESSION(iApaLsSession, 0, DONT_CHECK, TestServiceDiscovery9(), NO_CLEANUP );
+#endif
HEAP_TEST_LS_SESSION(iApaLsSession, 0, 0, TestServiceDiscovery10L(), NO_CLEANUP);
HEAP_TEST_LS_SESSION(iApaLsSession, 0, 0, TestServiceDiscovery11L(), NO_CLEANUP);
HEAP_TEST_LS_SESSION(iApaLsSession, 0, 0, TestServiceDiscovery12L(), NO_CLEANUP);
@@ -135,7 +205,7 @@
HEAP_TEST_LS_SESSION(iApaLsSession, 0, 0, TestServiceDiscovery24(), NO_CLEANUP);
HEAP_TEST_LS_SESSION(iApaLsSession, 0, 0, TestServiceDiscovery25(), iApaLsSession.FlushRecognitionCache() );
HEAP_TEST_LS_SESSION(iApaLsSession, 0, 0, TestServiceDiscovery27(), iApaLsSession.FlushRecognitionCache() );
- HEAP_TEST_LS_SESSION(iApaLsSession, 0, 0, TestServiceDiscovery28L(), NO_CLEANUP);
+ //HEAP_TEST_LS_SESSION(iApaLsSession, 0, 0, TestServiceDiscovery28L(), NO_CLEANUP);
HEAP_TEST_LS_SESSION(iApaLsSession, 0, 0, TestOpenService1L(), NO_CLEANUP);
HEAP_TEST_LS_SESSION(iApaLsSession, 0, 0, TestCtrlPnlAppL(), NO_CLEANUP);
// The following two APIs InsertDataMappingL() & DeleteDataMappingL(), update the type store on the server side.
--- a/appfw/apparchitecture/tef/T_StartAppStep.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/T_StartAppStep.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-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"
@@ -24,10 +24,18 @@
#include "tstapp.h"
#include "TRApaLsSessionStartAppTest.h"
#include <apacmdln.h>
+#include "T_SisFileInstaller.h"
_LIT(KCompleted, "Completed.");
_LIT8(KLitPlainText,"text/plain");
+_LIT(KUnprotectedAppSisFile, "z:\\apparctest\\apparctestsisfiles\\UnProctectedUidApp.sis");
+_LIT(KUnprotectedAppComponent, "UnProctectedUidApp");
+
+_LIT(KRApaLsSessionStartAppSisFile, "z:\\apparctest\\apparctestsisfiles\\TRApaLsSessionStartAppTestApp_v2.sis");
+_LIT(KRApaLsSessionStartAppComponent, "TRApaLsSessionStartAppTestApp_v2");
+
+
const TInt KTUnProtectedAppTestPassed = 1234;
class RIpcApparcFuzzTest : public RSessionBase
@@ -108,6 +116,13 @@
*/
TVerdict CT_StartAppTestStep::doTestStepPreambleL()
{
+ CSisFileInstaller sisFileInstaller;
+
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KUnprotectedAppSisFile);
+ sisFileInstaller.InstallSisL(KUnprotectedAppSisFile);
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KRApaLsSessionStartAppSisFile);
+ sisFileInstaller.InstallSisAndWaitForAppListUpdateL(KRApaLsSessionStartAppSisFile);
+
SetTestStepResult(EPass);
TInt error = iApaLsSession.Connect();
TEST(error==KErrNone);
@@ -120,6 +135,11 @@
*/
TVerdict CT_StartAppTestStep::doTestStepPostambleL()
{
+ CSisFileInstaller sisFileInstaller;
+
+ sisFileInstaller.UninstallSisL(KUnprotectedAppComponent);
+ sisFileInstaller.UninstallSisL(KRApaLsSessionStartAppComponent);
+
return TestStepResult();
}
--- a/appfw/apparchitecture/tef/T_StartDocStep.CPP Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/T_StartDocStep.CPP Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-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"
@@ -22,6 +22,12 @@
#include "testableapalssession.h"
#include "T_StartDocStep.h"
#include "TStartDoc.h"
+#include "T_SisFileInstaller.h"
+
+_LIT(KStartDocAppSisFile, "z:\\apparctest\\apparctestsisfiles\\TStartDocApp_v2.sis");
+_LIT(KStartDocAppComponent, "TStartDocApp_v2");
+
+
/**
@SYMTestCaseID T-StartDocStep-TestStartDocL
@@ -119,6 +125,23 @@
User::After(1500000);
}
+TVerdict CT_StartDocStep::doTestStepPreambleL()
+ {
+ CSisFileInstaller sisInstaller;
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KStartDocAppSisFile);
+ sisInstaller.InstallSisAndWaitForAppListUpdateL(KStartDocAppSisFile);
+
+ SetTestStepResult(EPass);
+ return TestStepResult();
+ }
+
+TVerdict CT_StartDocStep::doTestStepPostambleL()
+ {
+ CSisFileInstaller sisInstaller;
+ sisInstaller.UninstallSisL(KStartDocAppComponent);
+ return TestStepResult();
+ }
+
TVerdict CT_StartDocStep::doTestStepL()
{
INFO_PRINTF1(_L("Test Started"));
@@ -131,7 +154,7 @@
User::After(1500000);
// run the test
- HEAP_TEST_LS_SESSION(ls, 0, 0, TestStartDocL(ls), NO_CLEANUP);
+ HEAP_TEST_LS_SESSION(ls, 0, DONT_CHECK, TestStartDocL(ls), NO_CLEANUP);
CleanupStack::PopAndDestroy(&ls);
--- a/appfw/apparchitecture/tef/T_StartDocStep.h Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/T_StartDocStep.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-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"
@@ -27,6 +27,8 @@
class CT_StartDocStep : public CTestStep
{
public:
+ virtual TVerdict doTestStepPreambleL();
+ virtual TVerdict doTestStepPostambleL();
virtual TVerdict doTestStepL();
private:
void TestStartDocL(RApaLsSession& aLs);
--- a/appfw/apparchitecture/tef/T_WindowChainingStep.CPP Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/T_WindowChainingStep.CPP Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-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"
@@ -23,6 +23,15 @@
#include "T_WindowChainingStep.h"
#include "TWindowChaining.h"
#include <apacmdln.h>
+#include "T_SisFileInstaller.h"
+
+_LIT(KWinChainAppSisFile, "z:\\apparctest\\apparctestsisfiles\\t_winchainLaunch.sis");
+_LIT(KWinChainAppComponent, "t_winchainLaunch");
+
+_LIT(KWinChainChildAppSisFile, "z:\\apparctest\\apparctestsisfiles\\t_winchainChild.sis");
+_LIT(KWinChainChildAppComponent, "t_winchainChild");
+
+
/**
@SYMTestCaseID TODO
@@ -112,6 +121,30 @@
SetTestStepResult(EFail);
}
+
+TVerdict CT_WindowChainingStep::doTestStepPreambleL()
+ {
+ CSisFileInstaller sisInstaller;
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KWinChainChildAppSisFile);
+ sisInstaller.InstallSisL(KWinChainChildAppSisFile);
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KWinChainAppSisFile);
+ sisInstaller.InstallSisAndWaitForAppListUpdateL(KWinChainAppSisFile);
+
+ SetTestStepResult(EPass);
+ return TestStepResult();
+ }
+
+
+TVerdict CT_WindowChainingStep::doTestStepPostambleL()
+ {
+ CSisFileInstaller sisInstaller;
+ sisInstaller.UninstallSisL(KWinChainChildAppComponent);
+ sisInstaller.UninstallSisL(KWinChainAppComponent);
+
+ return TestStepResult();
+ }
+
+
TVerdict CT_WindowChainingStep::doTestStepL()
{
__UHEAP_MARK;
--- a/appfw/apparchitecture/tef/T_WindowChainingStep.h Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/T_WindowChainingStep.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-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"
@@ -27,6 +27,8 @@
class CT_WindowChainingStep : public CTestStep
{
public:
+ virtual TVerdict doTestStepPreambleL();
+ virtual TVerdict doTestStepPostambleL();
virtual TVerdict doTestStepL();
private:
void TestWindowChainingL();
--- a/appfw/apparchitecture/tef/T_groupNametest.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/T_groupNametest.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-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"
@@ -30,6 +30,11 @@
#include "T_groupNametest.h"
#include "apparctestserver.h"
#include <test/testexecutestepbase.h>
+#include "T_SisFileInstaller.h"
+
+_LIT(KGroupNameTestAppSisFile, "z:\\apparctest\\apparctestsisfiles\\t_groupname.sis");
+_LIT(KGroupNameTestAppComponent, "T_groupname");
+
// CT_GroupNameStep
@@ -99,6 +104,23 @@
}
+TVerdict CT_GroupNameStep::doTestStepPreambleL()
+ {
+ CSisFileInstaller sisFileInstaller;
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KGroupNameTestAppSisFile);
+ sisFileInstaller.InstallSisAndWaitForAppListUpdateL(KGroupNameTestAppSisFile);
+
+ SetTestStepResult(EPass);
+ return TestStepResult();
+ }
+TVerdict CT_GroupNameStep::doTestStepPostambleL()
+ {
+ CSisFileInstaller sisFileInstaller;
+ sisFileInstaller.UninstallSisL(KGroupNameTestAppComponent);
+
+ return TestStepResult();
+ }
+
/**
@return - TVerdict code
Override of base class virtual
--- a/appfw/apparchitecture/tef/T_groupNametest.h Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/T_groupNametest.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-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"
@@ -32,6 +32,8 @@
CT_GroupNameStep();
~CT_GroupNameStep();
virtual TVerdict doTestStepL();
+ virtual TVerdict doTestStepPreambleL();
+ virtual TVerdict doTestStepPostambleL();
void DoTestGroupNameL(RApaLsSession& aLs);
private:
--- a/appfw/apparchitecture/tef/T_groupNametest_ver1.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/T_groupNametest_ver1.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-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"
@@ -30,6 +30,10 @@
#include "T_groupNametest_ver1.h"
#include "apparctestserver.h"
#include <test/testexecutestepbase.h>
+#include "T_SisFileInstaller.h"
+
+_LIT(KGroupNameVer1AppSisFile, "z:\\apparctest\\apparctestsisfiles\\T_groupname_ver1.sis");
+_LIT(KGroupNameVer1AppComponent, "T_groupname_ver1");
// CT_GroupNameStep_ver1
@@ -90,6 +94,24 @@
TEST(capability.iGroupName == KGroupname);
}
+TVerdict CT_GroupNameStep_ver1::doTestStepPreambleL()
+ {
+ CSisFileInstaller sisFileInstaller;
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KGroupNameVer1AppSisFile);
+ sisFileInstaller.InstallSisAndWaitForAppListUpdateL(KGroupNameVer1AppSisFile);
+
+ SetTestStepResult(EPass);
+ return TestStepResult();
+ }
+
+TVerdict CT_GroupNameStep_ver1::doTestStepPostambleL()
+ {
+ CSisFileInstaller sisFileInstaller;
+ sisFileInstaller.UninstallSisL(KGroupNameVer1AppComponent);
+
+ return TestStepResult();
+ }
+
/**
@return - TVerdict code
Override of base class virtual
--- a/appfw/apparchitecture/tef/T_groupNametest_ver1.h Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/T_groupNametest_ver1.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-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"
@@ -31,6 +31,8 @@
public:
CT_GroupNameStep_ver1();
~CT_GroupNameStep_ver1();
+ virtual TVerdict doTestStepPreambleL();
+ virtual TVerdict doTestStepPostambleL();
virtual TVerdict doTestStepL();
void DoTestGroupNameL(RApaLsSession& aLs);
--- a/appfw/apparchitecture/tef/T_groupNametest_ver2.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/T_groupNametest_ver2.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-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"
@@ -30,6 +30,10 @@
#include "T_groupNametest_ver2.h"
#include "apparctestserver.h"
#include <test/testexecutestepbase.h>
+#include "T_SisFileInstaller.h"
+
+_LIT(KGroupNameVer2AppSisFile, "z:\\apparctest\\apparctestsisfiles\\T_groupname_ver2.sis");
+_LIT(KGroupNameVer2AppComponent, "T_groupname_ver2");
// CT_GroupNameStep_ver2
@@ -87,6 +91,25 @@
TEST(info.iShortCaption == KShortCaption);
}
+TVerdict CT_GroupNameStep_ver2::doTestStepPreambleL()
+ {
+ CSisFileInstaller sisFileInstaller;
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KGroupNameVer2AppSisFile);
+ sisFileInstaller.InstallSisAndWaitForAppListUpdateL(KGroupNameVer2AppSisFile);
+
+ SetTestStepResult(EPass);
+ return TestStepResult();
+ }
+
+TVerdict CT_GroupNameStep_ver2::doTestStepPostambleL()
+ {
+ CSisFileInstaller sisFileInstaller;
+ sisFileInstaller.UninstallSisL(KGroupNameVer2AppComponent);
+
+ return TestStepResult();
+ }
+
+
/**
@return - TVerdict code
Override of base class virtual
--- a/appfw/apparchitecture/tef/T_groupNametest_ver2.h Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/T_groupNametest_ver2.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-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"
@@ -30,6 +30,8 @@
public:
CT_GroupNameStep_ver2();
~CT_GroupNameStep_ver2();
+ virtual TVerdict doTestStepPreambleL();
+ virtual TVerdict doTestStepPostambleL();
virtual TVerdict doTestStepL();
void DoTestCaptionNameL(RApaLsSession& aLs);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/T_groupname.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,58 @@
+// 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:
+//
+
+/**
+ @file
+ @internalComponent - Internal Symbian test code
+*/
+
+TARGET T_groupname.exe
+TARGETTYPE exe
+UID 0x100039CE 0x10208185
+VENDORID 0x70000001
+
+USERINCLUDE .
+
+MW_LAYER_SYSTEMINCLUDE_SYMBIAN
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN
+//SYSTEMINCLUDE /epoc32/include/techview
+
+// Application localisable resource file
+resource T_groupname_loc.RSS
+start resource T_groupname_loc.RSS
+HEADER
+targetpath /apparctestregfiles
+lang sc
+end
+
+
+START RESOURCE T_groupname_reg.rss
+TARGETPATH /apparctestregfiles
+lang sc
+END
+
+
+SOURCEPATH ../tef
+SOURCE app_CTRL.CPP
+
+LIBRARY cone.lib ws32.lib appfwk_test_appui.lib euser.lib ecom.lib
+LIBRARY testexecuteutils.lib testexecutelogclient.lib
+LIBRARY apparc.lib efsrv.lib estor.lib gdi.lib fbscli.lib
+LIBRARY apfile.lib apgrfx.lib bafl.lib apmime.lib apserv.lib
+LIBRARY eikcore.lib appfwk_test_utils.lib serviceregistry.lib
+LIBRARY aplist.lib
+LIBRARY ticonloaderandiconarrayforleaks.lib centralrepository.lib
+
+SMPSAFE
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/T_groupname_ver1.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,58 @@
+// 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:
+//
+
+/**
+ @file
+ @internalComponent - Internal Symbian test code
+*/
+
+TARGET T_groupname_ver1.exe
+TARGETTYPE exe
+UID 0x100039CE 0x10208183
+VENDORID 0x70000001
+
+USERINCLUDE .
+
+MW_LAYER_SYSTEMINCLUDE_SYMBIAN
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN
+//SYSTEMINCLUDE /epoc32/include/techview
+
+// Application localisable resource file
+resource T_groupnamever1_loc.RSS
+start resource T_groupnamever1_loc.RSS
+HEADER
+targetpath /apparctestregfiles
+lang sc
+end
+
+
+START RESOURCE T_groupnamever1_reg.rss
+TARGETPATH /apparctestregfiles
+lang sc
+END
+
+
+SOURCEPATH ../tef
+SOURCE app_CTRL.CPP
+
+LIBRARY cone.lib ws32.lib appfwk_test_appui.lib euser.lib ecom.lib
+LIBRARY testexecuteutils.lib testexecutelogclient.lib
+LIBRARY apparc.lib efsrv.lib estor.lib gdi.lib fbscli.lib
+LIBRARY apfile.lib apgrfx.lib bafl.lib apmime.lib apserv.lib
+LIBRARY eikcore.lib appfwk_test_utils.lib serviceregistry.lib
+LIBRARY aplist.lib
+LIBRARY ticonloaderandiconarrayforleaks.lib centralrepository.lib
+
+SMPSAFE
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/T_groupname_ver2.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,58 @@
+// 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:
+//
+
+/**
+ @file
+ @internalComponent - Internal Symbian test code
+*/
+
+TARGET T_groupname_ver2.exe
+TARGETTYPE exe
+UID 0x100039CE 0x10208184
+VENDORID 0x70000001
+
+USERINCLUDE .
+
+MW_LAYER_SYSTEMINCLUDE_SYMBIAN
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN
+//SYSTEMINCLUDE /epoc32/include/techview
+
+// Application localisable resource file
+resource T_groupnamever2_loc.RSS
+start resource T_groupnamever2_loc.RSS
+HEADER
+targetpath /apparctestregfiles
+lang sc
+end
+
+
+START RESOURCE T_groupnamever2_reg.rss
+TARGETPATH /apparctestregfiles
+lang sc
+END
+
+
+SOURCEPATH ../tef
+SOURCE app_CTRL.CPP
+
+LIBRARY cone.lib ws32.lib appfwk_test_appui.lib euser.lib ecom.lib
+LIBRARY testexecuteutils.lib testexecutelogclient.lib
+LIBRARY apparc.lib efsrv.lib estor.lib gdi.lib fbscli.lib
+LIBRARY apfile.lib apgrfx.lib bafl.lib apmime.lib apserv.lib
+LIBRARY eikcore.lib appfwk_test_utils.lib serviceregistry.lib
+LIBRARY aplist.lib
+LIBRARY ticonloaderandiconarrayforleaks.lib centralrepository.lib
+
+SMPSAFE
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/TestTrustedPriorityApp1.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,51 @@
+// Copyright (c) 2005-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:
+//
+
+/**
+ @file
+ @internalComponent - Internal Symbian test code
+*/
+
+TARGET TestTrustedPriorityApp1.exe
+TARGETTYPE exe
+UID 0x100039CE 0x10207f8D
+VENDORID 0x70000001
+
+USERINCLUDE .
+
+MW_LAYER_SYSTEMINCLUDE_SYMBIAN
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN
+//SYSTEMINCLUDE /epoc32/include/techview
+
+// Application exe registration resource file
+resource TestTrustedPriorityApp1_reg.rss
+start resource TestTrustedPriorityApp1_reg.rss
+targetpath /apparctestregfiles
+lang sc
+end
+
+SOURCEPATH ../tef
+// SOURCE T_RApaLsSessionStep.cpp
+SOURCE app_CTRL.CPP
+
+LIBRARY cone.lib ws32.lib appfwk_test_appui.lib euser.lib ecom.lib
+LIBRARY testexecuteutils.lib testexecutelogclient.lib
+LIBRARY apparc.lib efsrv.lib estor.lib gdi.lib fbscli.lib
+LIBRARY apfile.lib apgrfx.lib bafl.lib apmime.lib apserv.lib
+LIBRARY eikcore.lib appfwk_test_utils.lib serviceregistry.lib
+LIBRARY aplist.lib
+LIBRARY ticonloaderandiconarrayforleaks.lib centralrepository.lib
+
+SMPSAFE
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/TestTrustedPriorityApp2.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,51 @@
+// Copyright (c) 2005-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:
+//
+
+/**
+ @file
+ @internalComponent - Internal Symbian test code
+*/
+
+TARGET TestTrustedPriorityApp2.exe
+TARGETTYPE exe
+UID 0x100039CE 0x10207f8F
+VENDORID 0x70000001
+
+USERINCLUDE .
+
+MW_LAYER_SYSTEMINCLUDE_SYMBIAN
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN
+//SYSTEMINCLUDE /epoc32/include/techview
+
+// Application exe registration resource file
+resource TestTrustedPriorityApp2_reg.rss
+start resource TestTrustedPriorityApp2_reg.rss
+targetpath /apparctestregfiles
+lang sc
+end
+
+SOURCEPATH ../tef
+// SOURCE T_RApaLsSessionStep.cpp T_DataTypeMappingWithSid1.cpp
+SOURCE app_CTRL.CPP
+
+LIBRARY cone.lib ws32.lib appfwk_test_appui.lib euser.lib ecom.lib
+LIBRARY testexecuteutils.lib testexecutelogclient.lib
+LIBRARY apparc.lib efsrv.lib estor.lib gdi.lib fbscli.lib
+LIBRARY apfile.lib apgrfx.lib bafl.lib apmime.lib apserv.lib
+LIBRARY eikcore.lib appfwk_test_utils.lib serviceregistry.lib
+LIBRARY aplist.lib
+LIBRARY ticonloaderandiconarrayforleaks.lib centralrepository.lib
+
+SMPSAFE
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/TestUnTrustedPriorityApp1.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,51 @@
+// Copyright (c) 2005-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:
+//
+
+/**
+ @file
+ @internalComponent - Internal Symbian test code
+*/
+
+TARGET TestUnTrustedPriorityApp1.exe
+TARGETTYPE exe
+UID 0x100039CE 0x10207f8C
+VENDORID 0x70000001
+
+USERINCLUDE .
+
+MW_LAYER_SYSTEMINCLUDE_SYMBIAN
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN
+//SYSTEMINCLUDE /epoc32/include/techview
+
+// Application exe registration resource file
+resource TestUnTrustedPriorityApp1_reg.rss
+start resource TestUnTrustedPriorityApp1_reg.rss
+targetpath /apparctestregfiles
+lang sc
+end
+
+SOURCEPATH ../tef
+// SOURCE T_RApaLsSessionStep.cpp T_DataTypeMappingWithSid1.cpp
+SOURCE app_CTRL.CPP
+
+LIBRARY cone.lib ws32.lib appfwk_test_appui.lib euser.lib ecom.lib
+LIBRARY testexecuteutils.lib testexecutelogclient.lib
+LIBRARY apparc.lib efsrv.lib estor.lib gdi.lib fbscli.lib
+LIBRARY apfile.lib apgrfx.lib bafl.lib apmime.lib apserv.lib
+LIBRARY eikcore.lib appfwk_test_utils.lib serviceregistry.lib
+LIBRARY aplist.lib
+LIBRARY ticonloaderandiconarrayforleaks.lib centralrepository.lib
+
+SMPSAFE
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/TestUnTrustedPriorityApp2.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,51 @@
+// Copyright (c) 2005-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:
+//
+
+/**
+ @file
+ @internalComponent - Internal Symbian test code
+*/
+
+TARGET TestUnTrustedPriorityApp2.exe
+TARGETTYPE exe
+UID 0x100039CE 0xA3010010
+VENDORID 0x70000001
+
+USERINCLUDE .
+
+MW_LAYER_SYSTEMINCLUDE_SYMBIAN
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN
+//SYSTEMINCLUDE /epoc32/include/techview
+
+// Application exe registration resource file
+resource TestUnTrustedPriorityApp2_reg.rss
+start resource TestUnTrustedPriorityApp2_reg.rss
+targetpath /apparctestregfiles
+lang sc
+end
+
+SOURCEPATH ../tef
+// SOURCE T_RApaLsSessionStep.cpp T_DataTypeMappingWithSid1.cpp
+SOURCE app_CTRL.CPP
+
+LIBRARY cone.lib ws32.lib appfwk_test_appui.lib euser.lib ecom.lib
+LIBRARY testexecuteutils.lib testexecutelogclient.lib
+LIBRARY apparc.lib efsrv.lib estor.lib gdi.lib fbscli.lib
+LIBRARY apfile.lib apgrfx.lib bafl.lib apmime.lib apserv.lib
+LIBRARY eikcore.lib appfwk_test_utils.lib serviceregistry.lib
+LIBRARY aplist.lib
+LIBRARY ticonloaderandiconarrayforleaks.lib centralrepository.lib
+
+SMPSAFE
--- a/appfw/apparchitecture/tef/UnProctectedUidApp.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/UnProctectedUidApp.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-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"
@@ -36,13 +36,13 @@
start resource UnProctectedUidApp.rss
HEADER
-targetpath /resource/apps
+targetpath /apparctestregfiles
end
// Application exe registration resource file
resource UnProctectedUidApp_reg.rss
start resource UnProctectedUidApp_reg.rss
-targetpath /private/10003a3f/apps
+targetpath /apparctestregfiles
lang sc
end
--- a/appfw/apparchitecture/tef/app_CTRL.MMP Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/app_CTRL.MMP Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009-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"
@@ -38,21 +38,21 @@
// Application exe specific resource which is localised to the application
resource App_CTRL.rss
start resource App_CTRL.rss
-targetpath /resource/apps
+targetpath /apparctestregfiles
lang sc
end
// Application exe registration resource file
resource App_CTRL_reg.rss
start resource App_CTRL_reg.rss
-targetpath /private/10003a3f/apps
+targetpath /apparctestregfiles
lang sc
end
// Application localisable resource file
resource App_ctrl_loc.RSS
start resource App_ctrl_loc.RSS
-targetpath /resource/apps
+targetpath /apparctestregfiles
lang sc
end
--- a/appfw/apparchitecture/tef/app_CTRL2.MMP Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/app_CTRL2.MMP Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009-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"
@@ -41,14 +41,14 @@
// Application exe specific resource which is localised to the application
resource App_CTRL2.rss
start resource App_CTRL2.rss
-targetpath /resource/apps
+targetpath /apparctestregfiles
lang sc
end
// Application exe registration resource file
resource App_CTRL2_reg.rss
start resource App_CTRL2_reg.rss
-targetpath /private/10003a3f/import/apps
+targetpath /apparctestregfiles
lang sc
end
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/app_CTRL2_stub.MMP Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,62 @@
+/*
+* 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:
+*
+*/
+//
+// App_CTRL2.MMP for test component App_CTRL2 (released in APPARC)
+//
+
+target app_ctrl2.exe
+TARGETTYPE exe
+
+CAPABILITY All -Tcb
+VENDORID 0x70000001
+
+UID 0x100039CE 0x13008ADE
+targetpath /sys/bin
+SOURCEPATH .
+
+// your public include directory should be here
+userinclude ../inc
+
+MW_LAYER_SYSTEMINCLUDE_SYMBIAN
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN
+//systeminclude /epoc32/include/techview
+//systeminclude /epoc32/include/kernel
+
+source app_CTRL2.CPP
+
+// Application exe specific resource which is localised to the application
+resource App_CTRL2.rss
+start resource App_CTRL2.rss
+targetpath /resource/apps
+lang sc
+end
+
+// Application exe registration resource file
+resource App_CTRL2_reg.rss
+start resource App_CTRL2_reg.rss
+targetpath /private/10003a3f/import/apps
+lang sc
+end
+
+
+LIBRARY apparc.lib
+LIBRARY cone.lib
+LIBRARY eikcore.lib
+LIBRARY euser.lib
+LIBRARY gdi.lib
+
+SMPSAFE
--- a/appfw/apparchitecture/tef/apparctestserver.MMP Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/apparctestserver.MMP Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1997-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"
@@ -16,7 +16,7 @@
target apparctestserver.exe
targettype exe
UID 0x1000007A 0x101F289C
-CAPABILITY AllFiles WriteDeviceData PowerMgmt Protserv SwEvent
+CAPABILITY AllFiles WriteDeviceData PowerMgmt Protserv SwEvent ReadUserData
MW_LAYER_SYSTEMINCLUDE_SYMBIAN
@@ -32,7 +32,12 @@
//-------START
SOURCE T_Foreground.cpp
-SOURCE T_ProStep.cpp T_OOMStep.cpp T_File2Step.cpp T_File3Step.cpp
+SOURCE T_ProStep.cpp T_OOMStep.cpp
+
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+SOURCE T_File2Step.cpp T_File3Step.cpp
+#endif
+
SOURCE T_BackupStep.cpp T_MdrStep.cpp
SOURCE T_Serv2Step.CPP T_Serv3Step.cpp
SOURCE T_MRUStep.CPP T_WgnamStep.CPP
@@ -75,6 +80,15 @@
SOURCE t_servicebasestep.cpp
SOURCE T_RecUpgrade.cpp
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+SOURCE t_updateapplist.cpp
+SOURCE t_forceregstep.cpp
+SOURCE t_clientnotifstep.cpp
+SOURCE t_nonnativetest.cpp
+#endif
+
+source t_sisfileinstaller.cpp
+
resource t_rapalssessionstep.rss
start resource t_rapalssessionstep.rss
@@ -82,7 +96,9 @@
lang SC
end
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
// START resource files for service registration and discovery tests
+
start resource serverapp_loc.RSS
HEADER
targetpath /resource/apps
@@ -154,6 +170,7 @@
targetpath /private/10003a3f/import/apps
lang SC
end
+#endif
start bitmap default_app_icon.m02
targetpath /resource/apps
@@ -163,6 +180,7 @@
//END resource files for customising the default icon wrt locale
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
start resource TestUnTrustedPriorityApp1_reg.rss
targetpath /private/10003a3f/import/apps
lang sc
@@ -215,6 +233,7 @@
start resource T_groupnamever2_reg.rss
targetpath /private/10003a3f/apps
end
+#endif
//-------END
@@ -227,7 +246,13 @@
LIBRARY apfile.lib apgrfx.lib bafl.lib apmime.lib apserv.lib
LIBRARY eikcore.lib appfwk_test_utils.lib serviceregistry.lib
LIBRARY aplist.lib
-LIBRARY ticonloaderandiconarrayforleaks.lib centralrepository.lib
+LIBRARY ticonloaderandiconarrayforleaks.lib centralrepository.lib
+
+LIBRARY sif.lib
+LIBRARY siftransport.lib
+LIBRARY scsclient.lib
+LIBRARY scrclient.lib sisregistryclient.lib scrdatabase.lib sishelper.lib
+
// We're quite heavy on the stack... 4k in WinS isn't enough...
EPOCSTACKSIZE 0xf000
--- a/appfw/apparchitecture/tef/apparctestserver.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/apparctestserver.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -38,8 +38,6 @@
#include "t_foreground.h"
#include "T_ProStep.h"
#include "T_OOMStep.h"
-#include "T_File2Step.h"
-#include "T_File3Step.h"
#include "T_BackupStep.h"
#include "T_MdrStep.h"
#include "T_Serv2Step.h"
@@ -72,19 +70,29 @@
#include "T_DataMappingPersistenceA.h"
#include "T_DataMappingPersistenceB.h"
#include "T_DataMappingPersistenceC.h"
-#include "T_NonNativeAppsStep.h"
-#include "T_IntegritySupportStep.h"
-#include "T_IntegritySupportRebootStep.h"
#include "T_ApsScan.h"
#include "T_EndTaskStep.h"
#include "T_RecUpgrade.h"
#include "T_AppListFileBootStep.h"
#include "T_AppListFileUpdateStep.h"
#include "t_largestackstep.h"
-#include "t_drivenotification.h"
#include "t_mimecontentpolicystep.h"
#include "t_servicebasestep.h"
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+#include "t_updateapplist.h"
+#include "t_forceregstep.h"
+#include "t_clientnotifstep.h"
+#include "t_nonnativetest.h"
+#else
+#include "T_File2Step.h"
+#include "T_File3Step.h"
+#include "T_NonNativeAppsStep.h"
+#include "T_IntegritySupportStep.h"
+#include "T_IntegritySupportRebootStep.h"
+#include "t_drivenotification.h"
+#endif
+
CApparctestServer* CApparctestServer::NewL()
/**
@return - Instance of the test server
@@ -131,6 +139,7 @@
{
testStep = new CT_OOMStep();
}
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
else if(aStepName == KT_File2Step)
{
testStep = new CT_File2Step();
@@ -139,6 +148,7 @@
{
testStep = new CT_File3Step();
}
+#endif
else if(aStepName == KT_BackupStep)
{
testStep = new CT_BackupStep();
@@ -278,6 +288,7 @@
{
testStep = new CT_DataMappingPersistenceCTestStep();
}
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
else if (aStepName == _L("T_NonNativeApps"))
{
testStep = new CT_NonNativeAppsStep();
@@ -294,6 +305,7 @@
{
testStep = new CT_IntegritySupportReboot2TestStep();
}
+#endif
else if (aStepName == KT_ApsScanStep)
{
testStep = new CT_ApsScanStep();
@@ -322,10 +334,12 @@
{
testStep = new CT_LargeStackStep();
}
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
else if (aStepName == KT_DriveNotificationStep)
{
testStep = new CT_DriveNotificationStep();
}
+#endif
else if (aStepName == KT_MimeContentPolicyStep)
{
testStep = new CT_MimeContentPolicyStep();
@@ -338,6 +352,24 @@
{
testStep = new CT_RecUpgradeStep();
}
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+ else if (aStepName == KT_TestUpdateAppListStep)
+ {
+ testStep = new CT_TestUpdateAppListStep();
+ }
+ else if (aStepName == KT_ForceRegStep)
+ {
+ testStep = new CT_ForceRegStep();
+ }
+ else if (aStepName == KT_ClientNotifStep)
+ {
+ testStep = new CT_ClientNotifStep();
+ }
+ else if (aStepName == KT_NonNativeTestStep)
+ {
+ testStep = new CT_NonNativeTestStep();
+ }
+#endif
return testStep;
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/forceregapps/A0001010.rss Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,54 @@
+// 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:
+//
+
+/**
+ @file
+ @internalComponent - Internal Symbian test code
+*/
+
+
+// INCLUDES
+#include <ecom/registryinfo.rh>
+
+
+// RESOURCE DEFINITIONS
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+//
+RESOURCE REGISTRY_INFO r_registry
+ {
+ dll_uid = 0xA0001010;
+ interfaces =
+ {
+ INTERFACE_INFO
+ {
+ interface_uid = 0x101F7D87; // Const for all Data Recognizers
+ implementations =
+ {
+ IMPLEMENTATION_INFO
+ {
+ implementation_uid = 0xA0001010;
+ version_no = 1;
+ display_name = "TForceRegAppRec";
+ default_data = "";
+ opaque_data = "";
+ }
+ };
+ }
+ };
+ }
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/forceregapps/TForceRegAppRec.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,157 @@
+// 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:
+// This recognizer is part of the supporting test code for T_ForceRegStep.CPP
+//
+//
+
+/**
+ @file
+ @internalComponent - Internal Symbian test code
+*/
+
+#include <e32std.h>
+#include <e32base.h>
+#include <apmstd.h>
+#include <apmrec.h>
+#include <f32file.h>
+
+#include <apfrec.h>
+#include <ecom/implementationproxy.h>
+
+_LIT8(KLit8_DataType_ForceRegApp1, "x-epoc/forcregapp1");
+_LIT8(KLit8_DataType_ForceRegApp2, "x-epoc/forcregapp2");
+_LIT8(KLit8_DataType_ForceRegApp3, "x-epoc/forcregapp3");
+_LIT8(KLit8_DataType_ForceRegApp4, "x-epoc/forcregapp4");
+
+const TUid KUidForceRegAppRecognizer={0xA0001010};
+const TUint KImplForceRegAppRecognizer=0xA0001010;
+
+enum TMimeTypes
+ {
+ EMimeType1 = 0,
+ EMimeType2,
+ EMimeType3,
+ EMimeType4,
+ EMimeLast
+ };
+
+_LIT(KLitMimeExtension1, ".FRG1");
+_LIT(KLitMimeExtension2, ".FRG2");
+_LIT(KLitMimeExtension3, ".FRG3");
+_LIT(KLitMimeExtension4, ".FRG4");
+
+
+// CTForceRegAppRec definition
+
+class CTForceRegAppRec : public CApaDataRecognizerType
+ {
+public:
+ CTForceRegAppRec();
+ static CApaDataRecognizerType* CreateRecognizerL();
+private:
+ // from CApaDataRecognizerType
+ virtual TUint PreferredBufSize();
+ virtual TDataType SupportedDataTypeL(TInt aIndex) const;
+ virtual void DoRecognizeL(const TDesC& aName, const TDesC8& aBuffer);
+ };
+
+
+// CTForceRegAppRec implementation
+
+CTForceRegAppRec::CTForceRegAppRec()
+ :CApaDataRecognizerType(KUidForceRegAppRecognizer, EHigh)
+ {
+ iCountDataTypes = EMimeLast;
+ }
+
+TUint CTForceRegAppRec::PreferredBufSize()
+ {
+ return 0;
+ }
+
+TDataType CTForceRegAppRec::SupportedDataTypeL(TInt aIndex) const
+ {
+ if (aIndex == EMimeType1)
+ return TDataType(KLit8_DataType_ForceRegApp1);
+
+ else if (aIndex == EMimeType2)
+ return TDataType(KLit8_DataType_ForceRegApp2);
+
+ else if (aIndex == EMimeType3)
+ return TDataType(KLit8_DataType_ForceRegApp3);
+
+ else if (aIndex == EMimeType4)
+ return TDataType(KLit8_DataType_ForceRegApp4);
+
+ else
+ return TDataType(KNullDesC8);
+ }
+
+
+void CTForceRegAppRec::DoRecognizeL(const TDesC& aName, const TDesC8&)
+ {
+
+ // Compare if the file extension is known
+ if (aName.Length() < 5)
+ {
+ iDataType = TDataType(KNullDesC8);
+ iConfidence = ENotRecognized;
+ return;
+ }
+
+ if (aName.Right(5).CompareF(KLitMimeExtension1) == 0)
+ {
+ iDataType = TDataType(KLit8_DataType_ForceRegApp1);
+ iConfidence = ECertain;
+ }
+ else if (aName.Right(5).CompareF(KLitMimeExtension2) == 0)
+ {
+ iDataType = TDataType(KLit8_DataType_ForceRegApp2);
+ iConfidence = ECertain;
+ }
+ else if (aName.Right(5).CompareF(KLitMimeExtension3) == 0)
+ {
+ iDataType = TDataType(KLit8_DataType_ForceRegApp3);
+ iConfidence = ECertain;
+ }
+ else if (aName.Right(5).CompareF(KLitMimeExtension4) == 0)
+ {
+ iDataType = TDataType(KLit8_DataType_ForceRegApp4);
+ iConfidence = ECertain;
+ }
+ else
+ {
+ iDataType = TDataType(KNullDesC8);
+ iConfidence = ENotRecognized;
+ }
+ }
+
+// stand-alone functions
+
+CApaDataRecognizerType* CTForceRegAppRec::CreateRecognizerL()
+ {
+ return new (ELeave) CTForceRegAppRec();
+ }
+
+const TImplementationProxy ImplementationTable[] =
+ {
+ IMPLEMENTATION_PROXY_ENTRY(KImplForceRegAppRecognizer, CTForceRegAppRec::CreateRecognizerL)
+ };
+
+EXPORT_C const TImplementationProxy* ImplementationGroupProxy(TInt& aTableCount)
+ {
+ aTableCount = sizeof(ImplementationTable) / sizeof(TImplementationProxy);
+ return ImplementationTable;
+ }
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/forceregapps/TForceRegAppRec.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,41 @@
+// 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:
+//
+
+/**
+ @file
+ @internalComponent - Internal Symbian test code
+*/
+
+
+TARGET tforceregapprec.dll
+CAPABILITY All -Tcb
+TARGETTYPE PLUGIN
+UID 0x10009d8d 0xA0001010
+VENDORID 0x70000001
+
+SOURCEPATH .
+SOURCE TForceRegAppRec.cpp
+
+userinclude ../../inc
+
+MW_LAYER_SYSTEMINCLUDE_SYMBIAN
+
+LIBRARY euser.lib apmime.lib apparc.lib efsrv.lib
+
+start resource A0001010.rss
+target tforceregapprec.rsc
+end
+
+SMPSAFE
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/forceregapps/forceregapp1.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,38 @@
+// 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:
+//
+
+/**
+ @file
+ @internalComponent - Internal Symbian test code
+*/
+
+#include <e32base.h>
+#include "../t_forceregstep.h"
+#include <e32property.h>
+
+
+TInt E32Main()
+ {
+ RProperty forceRegStatus;
+ User::LeaveIfError(forceRegStatus.Attach(KPropertyCategory, KForceRegTestPropertyKey, EOwnerThread));
+
+ TInt status;
+ forceRegStatus.Get(status);
+ status |= KForceRegApp1Executed;
+ forceRegStatus.Set(status);
+ forceRegStatus.Close();
+
+ return(KErrNone);
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/forceregapps/forceregapp1.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,44 @@
+// 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:
+// using relative paths for sourcepath and user includes
+//
+//
+
+/**
+ @file
+ @test
+ @internalComponent - Internal Symbian test code
+*/
+
+TARGET forceregapp1.exe
+TARGETTYPE exe
+UID 0x100039CE 0xA0001000
+VENDORID 0x70000001
+
+SOURCEPATH .
+SOURCE forceregapp1.cpp
+
+USERINCLUDE .
+
+MW_LAYER_SYSTEMINCLUDE_SYMBIAN
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN
+
+
+START RESOURCE forceregapp1_reg.rss
+TARGETPATH /apparctestregfiles
+END
+
+LIBRARY euser.lib apparc.lib cone.lib eikcore.lib gdi.lib
+
+SMPSAFE
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/forceregapps/forceregapp1_reg.rss Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,35 @@
+// 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:
+//
+
+/**
+ @file
+ @test
+ @internalComponent - Internal Symbian test code
+*/
+
+#include <appinfo.rh>
+
+UID2 KUidAppRegistrationResourceFile
+UID3 0xA0001000 // application UID
+
+RESOURCE APP_REGISTRATION_INFO
+ {
+ app_file = "forceregapp1";
+ datatype_list =
+ {
+ DATATYPE { priority=EDataTypePriorityNormal; type="x-epoc/forcregapp1"; }
+ };
+ }
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/forceregapps/forceregapp2.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,49 @@
+// 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:
+//
+
+/**
+ @file
+ @internalComponent - Internal Symbian test code
+*/
+
+#include <e32base.h>
+#include "../t_forceregstep.h"
+#include <e32property.h>
+
+
+TInt E32Main()
+ {
+ RProperty forceRegStatus;
+ User::LeaveIfError(forceRegStatus.Attach(KPropertyCategory, KForceRegTestPropertyKey, EOwnerThread));
+
+ TInt status;
+ forceRegStatus.Get(status);
+ status |= KForceRegApp2Executed;
+ forceRegStatus.Set(status);
+
+ TRequestStatus propertyChanged;
+
+ while(!(status & KStopForceRegApp2))
+ {
+ propertyChanged=KRequestPending;
+ forceRegStatus.Subscribe(propertyChanged);
+ User::WaitForRequest(propertyChanged);
+ forceRegStatus.Get(status);
+ }
+
+ forceRegStatus.Close();
+
+ return(KErrNone);
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/forceregapps/forceregapp2.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,44 @@
+// 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:
+// using relative paths for sourcepath and user includes
+//
+//
+
+/**
+ @file
+ @test
+ @internalComponent - Internal Symbian test code
+*/
+
+TARGET forceregapp2.exe
+TARGETTYPE exe
+UID 0x100039CE 0xA0001001
+VENDORID 0x70000001
+
+SOURCEPATH .
+SOURCE forceregapp2.cpp
+
+USERINCLUDE .
+
+MW_LAYER_SYSTEMINCLUDE_SYMBIAN
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN
+
+
+START RESOURCE forceregapp2_reg.rss
+TARGETPATH /apparctestregfiles
+END
+
+LIBRARY euser.lib apparc.lib cone.lib eikcore.lib gdi.lib
+
+SMPSAFE
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/forceregapps/forceregapp2_reg.rss Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,35 @@
+// 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:
+//
+
+/**
+ @file
+ @test
+ @internalComponent - Internal Symbian test code
+*/
+
+#include <appinfo.rh>
+
+UID2 KUidAppRegistrationResourceFile
+UID3 0xA0001001 // application UID
+
+RESOURCE APP_REGISTRATION_INFO
+ {
+ app_file = "forceregapp2";
+ datatype_list =
+ {
+ DATATYPE { priority=EDataTypePriorityNormal; type="x-epoc/forcregapp2"; }
+ };
+ }
+
--- a/appfw/apparchitecture/tef/m_ctrl_v2.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/m_ctrl_v2.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009-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"
@@ -43,19 +43,19 @@
// Application exe specific resource which is localised to the application
resource M_CTRL.rss
start resource M_CTRL.rss
-targetpath /resource/apps
+targetpath /apparctestregfiles
lang sc
end
// Application exe registration resource file
start resource M_CTRL_reg.rss
-targetpath /private/10003a3f/import/apps
+targetpath /apparctestregfiles
lang sc
end
// Application localisable resource file
start resource M_CTRL_loc.RSS
-targetpath /resource/apps
+targetpath /apparctestregfiles
lang sc
end
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/m_ctrl_v2_Stub.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,72 @@
+/*
+* 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:
+*
+*/
+//
+// M_CTRL.MMP for test component M_CTRL (released in APPARC)
+// New style APP/EXE built for a secure environment
+//
+
+target m_ctrl.exe
+TARGETTYPE exe
+
+targetpath /sys/bin
+UID 0x100039CE 0x13008AEE
+CAPABILITY All -Tcb
+VENDORID 0x70000001
+
+epocstacksize 0x5000
+
+SOURCEPATH .
+
+
+userinclude ../inc
+
+MW_LAYER_SYSTEMINCLUDE_SYMBIAN
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN
+//systeminclude /epoc32/include/techview
+
+userinclude .
+
+// Application exe specific resource which is localised to the application
+resource M_CTRL.rss
+start resource M_CTRL.rss
+targetpath /resource/apps
+lang sc
+end
+
+// Application exe registration resource file
+start resource M_CTRL_reg.rss
+targetpath /private/10003a3f/import/apps
+lang sc
+end
+
+// Application localisable resource file
+start resource M_CTRL_loc.RSS
+targetpath /resource/apps
+lang sc
+end
+
+SOURCE M_CTRL_V2.CPP
+
+LIBRARY apparc.lib
+LIBRARY cone.lib
+LIBRARY efsrv.lib
+LIBRARY eikcore.lib
+LIBRARY euser.lib
+LIBRARY gdi.lib
+LIBRARY appfwk_test_appui.lib
+
+SMPSAFE
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/openservice1app.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,48 @@
+// Copyright (c) 2005-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:
+//
+
+/**
+ @file
+ @internalComponent - Internal Symbian test code
+*/
+
+TARGET openservice1app.exe
+TARGETTYPE exe
+UID 0x100039CE 0x10208200
+VENDORID 0x70000001
+
+USERINCLUDE .
+
+MW_LAYER_SYSTEMINCLUDE_SYMBIAN
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN
+//SYSTEMINCLUDE /epoc32/include/techview
+
+START RESOURCE openservice1a.rss
+TARGETPATH /apparctestregfiles
+lang sc
+END
+
+SOURCEPATH ../tef
+SOURCE app_CTRL.CPP
+
+LIBRARY cone.lib ws32.lib appfwk_test_appui.lib euser.lib ecom.lib
+LIBRARY testexecuteutils.lib testexecutelogclient.lib
+LIBRARY apparc.lib efsrv.lib estor.lib gdi.lib fbscli.lib
+LIBRARY apfile.lib apgrfx.lib bafl.lib apmime.lib apserv.lib
+LIBRARY eikcore.lib appfwk_test_utils.lib serviceregistry.lib
+LIBRARY aplist.lib
+LIBRARY ticonloaderandiconarrayforleaks.lib centralrepository.lib
+
+SMPSAFE
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/openservice2app.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,48 @@
+// Copyright (c) 2005-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:
+//
+
+/**
+ @file
+ @internalComponent - Internal Symbian test code
+*/
+
+TARGET openservice2app.exe
+TARGETTYPE exe
+UID 0x100039CE 0x10208201
+VENDORID 0x70000001
+
+USERINCLUDE .
+
+MW_LAYER_SYSTEMINCLUDE_SYMBIAN
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN
+//SYSTEMINCLUDE /epoc32/include/techview
+
+START RESOURCE openservice1b.rss
+TARGETPATH /apparctestregfiles
+lang sc
+END
+
+SOURCEPATH ../tef
+SOURCE app_CTRL.CPP
+
+LIBRARY cone.lib ws32.lib appfwk_test_appui.lib euser.lib ecom.lib
+LIBRARY testexecuteutils.lib testexecutelogclient.lib
+LIBRARY apparc.lib efsrv.lib estor.lib gdi.lib fbscli.lib
+LIBRARY apfile.lib apgrfx.lib bafl.lib apmime.lib apserv.lib
+LIBRARY eikcore.lib appfwk_test_utils.lib serviceregistry.lib
+LIBRARY aplist.lib
+LIBRARY ticonloaderandiconarrayforleaks.lib centralrepository.lib
+
+SMPSAFE
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/refnativeplugin/10285BC3.rss Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,45 @@
+/*
+* 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 the License "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:
+* ECOM DLL UID: 0x10285BC3
+* ECOM interface UID: 0x10285BC2 (KUidSifPlugin)
+* ECOM Implementation: 0x10285BC4
+*
+*/
+
+
+#include <ecom/registryinfo.rh>
+
+RESOURCE REGISTRY_INFO so_registry
+ {
+ dll_uid = 0x10285BC3;
+ interfaces =
+ {
+ INTERFACE_INFO
+ {
+ interface_uid = 0x10285BC2;
+
+ implementations =
+ {
+ IMPLEMENTATION_INFO
+ {
+ implementation_uid = 0x10285BC4;
+ version_no = 1;
+ default_data = "";
+ opaque_data = "";
+ }
+ };
+ }
+ };
+ }
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/refnativeplugin/refnativeplugin.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,619 @@
+/*
+* 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 the License "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:
+*
+*/
+
+
+#include "refnativeplugin.h"
+#include "usiflog.h"
+#include "sisregistrywritablesession.h"
+
+#include <usif/sif/sif.h>
+#include <usif/sif/sifcommon.h>
+#include <usif/usiferror.h>
+#include <usif/sif/sifplugin.h>
+#include <usif/scr/screntries.h>
+#include <usif/scr/scr.h>
+#include <swi/msisuihandlers.h>
+#include <swi/asynclauncher.h>
+#include <swi/sisinstallerrors.h>
+#include <e32property.h>
+#include <sacls.h>
+#include <swi/sisregistrysession.h>
+
+using namespace Usif;
+
+static const TInt KRefNativePluginImpId = 0x10285BC4;
+
+static const TImplementationProxy ImplementationTable[] =
+ {
+ IMPLEMENTATION_PROXY_ENTRY(KRefNativePluginImpId, CRefNativePlugin::NewL)
+ };
+
+EXPORT_C const TImplementationProxy* ImplementationGroupProxy(TInt& aTableCount)
+ {
+ aTableCount = sizeof(ImplementationTable) / sizeof(TImplementationProxy);
+ return ImplementationTable;
+ }
+
+CRefNativePlugin* CRefNativePlugin::NewL()
+ {
+ DEBUG_PRINTF(_L8("Constructing CRefNativePlugin"));
+ CRefNativePlugin *self = new (ELeave) CRefNativePlugin();
+ CleanupStack::PushL(self);
+ self->ConstructL();
+ CleanupStack::Pop(self);
+ return self;
+ }
+
+void CRefNativePlugin::ConstructL()
+ {
+ iImpl = CRefNativePluginActiveImpl::NewL();
+ }
+
+CRefNativePlugin::~CRefNativePlugin()
+ {
+ delete iImpl;
+ }
+
+void CRefNativePlugin::CancelOperation()
+ {
+ DEBUG_PRINTF(_L8("Reference native plugin - Cancel"));
+ iImpl->Cancel();
+ }
+
+void CRefNativePlugin::GetComponentInfo(const TDesC& aFileName, const TSecurityContext& /*aSecurityContext*/,
+ CComponentInfo& aComponentInfo, TRequestStatus& aStatus)
+ {
+ iImpl->GetComponentInfo(aFileName, aComponentInfo, aStatus);
+ }
+
+void CRefNativePlugin::GetComponentInfo(RFile& aFileHandle, const TSecurityContext& /*aSecurityContext*/,
+ CComponentInfo& aComponentInfo, TRequestStatus& aStatus)
+ {
+ iImpl->GetComponentInfo(aFileHandle, aComponentInfo, aStatus);
+ }
+
+void CRefNativePlugin::Install(const TDesC& aFileName, const TSecurityContext& aSecurityContext,
+ const COpaqueNamedParams& aInputParams, COpaqueNamedParams& aOutputParams,
+ TRequestStatus& aStatus)
+ {
+ iImpl->Install(aFileName, aSecurityContext, aInputParams, aOutputParams, aStatus);
+ }
+
+void CRefNativePlugin::Install(RFile& aFileHandle, const TSecurityContext& aSecurityContext,
+ const COpaqueNamedParams& aInputParams, COpaqueNamedParams& aOutputParams,
+ TRequestStatus& aStatus)
+ {
+ iImpl->Install(aFileHandle, aSecurityContext, aInputParams, aOutputParams, aStatus);
+ }
+
+void CRefNativePlugin::Uninstall(TComponentId aComponentId, const TSecurityContext& aSecurityContext,
+ const COpaqueNamedParams& aInputParams, COpaqueNamedParams& aOutputParams, TRequestStatus& aStatus)
+ {
+ iImpl->Uninstall(aComponentId, aSecurityContext, aInputParams, aOutputParams, aStatus);
+ }
+
+void CRefNativePlugin::Activate(TComponentId aComponentId, const TSecurityContext& aSecurityContext, TRequestStatus& aStatus)
+
+ {
+ DEBUG_PRINTF(_L8("Reference native plugin - Activate"));
+ iImpl->Activate(aComponentId, aSecurityContext, aStatus);
+ }
+
+void CRefNativePlugin::Deactivate(TComponentId aComponentId, const TSecurityContext& aSecurityContext, TRequestStatus& aStatus)
+ {
+ DEBUG_PRINTF(_L8("Reference native plugin - Deactivate"));
+ iImpl->Deactivate(aComponentId, aSecurityContext, aStatus);
+ }
+
+//------------------CRefNativePluginActiveImpl---------------------
+
+CRefNativePluginActiveImpl* CRefNativePluginActiveImpl::NewL()
+ {
+ DEBUG_PRINTF(_L8("Reference native plugin - Constructing CRefNativePluginActiveImpl"));
+ CRefNativePluginActiveImpl *self = new (ELeave) CRefNativePluginActiveImpl();
+ CleanupStack::PushL(self);
+ self->ConstructL();
+ CleanupStack::Pop(1, self);
+ return self;
+ }
+
+void CRefNativePluginActiveImpl::ConstructL()
+ {
+ iInstallPrefs = Swi::CInstallPrefs::NewL();
+ iAsyncLauncher = Swi::CAsyncLauncher::NewL();
+ iComponentInfo = CComponentInfo::NewL();
+ CActiveScheduler::Add(this);
+ }
+
+CRefNativePluginActiveImpl::~CRefNativePluginActiveImpl()
+ {
+ delete iAsyncLauncher;
+ delete iInstallPrefs;
+ delete iComponentInfo;
+ }
+
+TBool CRefNativePluginActiveImpl::NeedUserCapabilityL()
+ {
+ // Silent install is not allowed when the package requires additional capabilities
+ // than what it is signed for (Pakage may request for some capability that is not
+ // granted by the certificate used to sign it).
+ for(TInt cap=0; cap<ECapability_Limit; ++cap)
+ {
+ if (iComponentInfo->RootNodeL().UserGrantableCaps().HasCapability(TCapability(cap)))
+ {
+ DEBUG_PRINTF2(_L("Package requires additional capability - %d"), cap);
+ return ETrue;
+ }
+ }
+
+ return EFalse;
+ }
+
+void CRefNativePluginActiveImpl::RunL()
+ {
+ if (iSilentInstall)
+ {
+ DEBUG_PRINTF(_L("Silent install - CRefNativePluginActiveImpl::RunL"));
+ ProcessSilentInstallL();
+ }
+ else
+ {
+ TInt res = iStatus.Int();
+ DEBUG_PRINTF2(_L8("Reference native plugin - Operation finished with result %d"), res);
+
+ // Output options
+ if (iOutputParams != NULL)
+ {
+ iOutputParams->AddIntL(KSifOutParam_ExtendedErrCode, res);
+
+ if (iInstallRequest && res == KErrNone)
+ {
+ TComponentId resultComponentId = 0;
+ TRAPD(getLastIdErr, resultComponentId = GetLastInstalledComponentIdL());
+ if (getLastIdErr == KErrNone)
+ iOutputParams->AddIntL(KSifOutParam_ComponentId, resultComponentId);
+ }
+ }
+
+ User::RequestComplete(iClientStatus, res);
+ iClientStatus = NULL;
+ }
+ }
+
+void CRefNativePluginActiveImpl::ProcessSilentInstallL()
+ {
+ // We need to do this only once per installation request
+ iSilentInstall = EFalse;
+ iInstallRequest = ETrue;
+
+ TBool isNotAuthenticated = (ENotAuthenticated == iComponentInfo->RootNodeL().Authenticity());
+ TBool reqUserCap = NeedUserCapabilityL();
+ if (isNotAuthenticated || reqUserCap)
+ {
+ if (isNotAuthenticated)
+ {
+ DEBUG_PRINTF(_L("Silent Install is not allowed on unsigned or self-signed packages"));
+ }
+
+ if (reqUserCap)
+ {
+ DEBUG_PRINTF(_L("Silent Install is not allowed when user capabilities are required"));
+ }
+
+ User::RequestComplete(iClientStatus, KErrNotSupported);
+ iClientStatus = NULL;
+ }
+ else
+ {
+ TInt err;
+ if (iFileHandle)
+ {
+ TRAP(err, iAsyncLauncher->InstallL(*this, *iFileHandle, *iInstallPrefs, iStatus));
+ }
+ else
+ {
+ //DEBUG_PRINTF2(_L("!!!Silent install for %S"), iFileName);
+ TRAP(err, iAsyncLauncher->InstallL(*this, iFileName, *iInstallPrefs, iStatus));
+ }
+
+ if (err != KErrNone)
+ {
+ User::RequestComplete(iClientStatus, err);
+ iClientStatus = NULL;
+ }
+
+ SetActive();
+ }
+ }
+
+void CRefNativePluginActiveImpl::DoCancel()
+ {
+ if (iClientStatus)
+ {
+ iAsyncLauncher->CancelOperation();
+ delete iAsyncLauncher;
+ iAsyncLauncher = NULL;
+
+ User::RequestComplete(iClientStatus, KErrCancel);
+ iClientStatus = NULL;
+ }
+ }
+
+void CRefNativePluginActiveImpl::CommonRequestPreamble(const TSecurityContext& aSecurityContext, const COpaqueNamedParams& aInputParams,
+ COpaqueNamedParams& aOutputParams, TRequestStatus& aStatus)
+ {
+ aStatus = KRequestPending;
+ iClientStatus = &aStatus;
+
+ iInputParams = &aInputParams;
+ iOutputParams = &aOutputParams;
+
+ TInt declineOperation = 0;
+ TRAPD(err, aInputParams.GetIntByNameL(KDeclineOperationOptionName, declineOperation));
+ if(err == KErrNone && declineOperation)
+ {
+ iDeclineOperation = ETrue;
+ }
+
+ // Check to see if we have the opaque input argument - InstallSilently
+ TInt silentInstall = 0;
+ TRAP_IGNORE(aInputParams.GetIntByNameL(KSifInParam_InstallSilently, silentInstall));
+ if (silentInstall)
+ {
+ iSilentInstall = ETrue;
+ if (!aSecurityContext.HasCapability(ECapabilityTrustedUI))
+ {
+ User::RequestComplete(iClientStatus, KErrPermissionDenied);
+ iClientStatus = NULL;
+ }
+ }
+ }
+
+TComponentId CRefNativePluginActiveImpl::GetLastInstalledComponentIdL()
+ {
+ ASSERT(iInstallRequest);
+
+ // Find the id of the last installed component and return it
+ TInt uid;
+ User::LeaveIfError(RProperty::Get(KUidSystemCategory, KUidSwiLatestInstallation, uid));
+
+ Swi::RSisRegistrySession sisRegistrySession;
+ User::LeaveIfError(sisRegistrySession.Connect());
+ CleanupClosePushL(sisRegistrySession);
+
+ TUid tuid(TUid::Uid(uid));
+ TComponentId componentId = sisRegistrySession.GetComponentIdForUidL(tuid);
+ CleanupStack::PopAndDestroy(&sisRegistrySession);
+
+ return componentId;
+ }
+
+void CRefNativePluginActiveImpl::GetComponentInfo(const TDesC& aFileName, CComponentInfo& aComponentInfo, TRequestStatus& aStatus)
+ {
+ DEBUG_PRINTF2(_L("Reference native plugin - retrieving component info for %S"), &aFileName);
+
+ aStatus = KRequestPending;
+ iClientStatus = &aStatus;
+
+ TRAPD(err, iAsyncLauncher->GetComponentInfoL(*this, aFileName, *iInstallPrefs, aComponentInfo, iStatus));
+ if (err != KErrNone)
+ {
+ TRequestStatus *statusPtr(&aStatus);
+ User::RequestComplete(statusPtr, err);
+ return;
+ }
+
+ SetActive();
+ }
+
+void CRefNativePluginActiveImpl::GetComponentInfo(RFile& aFileHandle, CComponentInfo& aComponentInfo, TRequestStatus& aStatus)
+ {
+ DEBUG_PRINTF(_L8("Reference native plugin - getting component info by file handle"));
+
+ aStatus = KRequestPending;
+ iClientStatus = &aStatus;
+
+ TRAPD(err, iAsyncLauncher->GetComponentInfoL(*this, aFileHandle, *iInstallPrefs, aComponentInfo, iStatus));
+ if (err != KErrNone)
+ {
+ TRequestStatus *statusPtr(&aStatus);
+ User::RequestComplete(statusPtr, err);
+ return;
+ }
+
+ SetActive();
+ }
+
+void CRefNativePluginActiveImpl::Install(const TDesC& aFileName, const TSecurityContext& aSecurityContext,
+ const COpaqueNamedParams& aInputParams, COpaqueNamedParams& aOutputParams,
+ TRequestStatus& aStatus)
+ {
+ DEBUG_PRINTF2(_L("Reference native plugin - install for %S"), &aFileName);
+
+ CommonRequestPreamble(aSecurityContext, aInputParams, aOutputParams, aStatus);
+
+ TInt err;
+ if (iSilentInstall)
+ {
+ // Silent install does a few addtional checks on the package to see if is
+ // signed and had the required capabilities. So we need to the get the
+ // package component information with out installing it.
+ DEBUG_PRINTF2(_L("Silent install - Get the ComponentInfo for %S"), &aFileName);
+ iFileName = aFileName;
+ TRAP(err, iAsyncLauncher->GetComponentInfoL(*this, aFileName, *iInstallPrefs, *iComponentInfo, iStatus));
+ }
+ else
+ {
+ // Proceed with the normal installation.
+ RArray<TInt> tmp;
+ tmp.Append(01);
+ tmp.Append(02);
+ tmp.Append(03);
+ tmp.Append(04);
+ tmp.Append(05);
+ TRAP(err, iAsyncLauncher->InstallL(*this, aFileName, *iInstallPrefs, tmp, iStatus));
+ tmp.Close();
+ iInstallRequest = ETrue;
+ }
+
+ if (err != KErrNone)
+ {
+ TRequestStatus *statusPtr(&aStatus);
+ User::RequestComplete(statusPtr, err);
+ return;
+ }
+
+ SetActive();
+ }
+
+void CRefNativePluginActiveImpl::Install(RFile& aFileHandle, const TSecurityContext& aSecurityContext,
+ const COpaqueNamedParams& aInputParams, COpaqueNamedParams& aOutputParams,
+ TRequestStatus& aStatus)
+ {
+ DEBUG_PRINTF(_L8("Reference native plugin - install by file handle"));
+
+ CommonRequestPreamble(aSecurityContext, aInputParams, aOutputParams, aStatus);
+
+ TInt err;
+ if (iSilentInstall)
+ {
+ // Silent install does a few addtional checks on the package to see if is
+ // signed and had the required capabilities. So we need to the get the
+ // package component information with out installing it.
+ iFileHandle = &aFileHandle;
+ TRAP(err, iAsyncLauncher->GetComponentInfoL(*this, aFileHandle, *iInstallPrefs, *iComponentInfo, iStatus));
+ }
+ else
+ {
+ // Proceed with the normal installation.
+ TRAP(err, iAsyncLauncher->InstallL(*this, aFileHandle, *iInstallPrefs, iStatus));
+ iInstallRequest = ETrue;
+ }
+
+ if (err != KErrNone)
+ {
+ TRequestStatus *statusPtr(&aStatus);
+ User::RequestComplete(statusPtr, err);
+ return;
+ }
+
+ SetActive();
+ }
+
+void CRefNativePluginActiveImpl::Uninstall(TComponentId aComponentId, const TSecurityContext& aSecurityContext,
+ const COpaqueNamedParams& aInputParams, COpaqueNamedParams& aOutputParams, TRequestStatus& aStatus)
+ {
+ TRAPD(err, UninstallL(aComponentId, aSecurityContext, aInputParams, aOutputParams, aStatus));
+ if (err != KErrNone)
+ {
+ TRequestStatus *statusPtr(&aStatus);
+ User::RequestComplete(statusPtr, err);
+ return;
+ }
+ SetActive();
+ }
+
+void CRefNativePluginActiveImpl::UninstallL(TComponentId aComponentId, const TSecurityContext& aSecurityContext,
+ const COpaqueNamedParams& aInputParams, COpaqueNamedParams& aOutputParams, TRequestStatus& aStatus)
+ {
+ DEBUG_PRINTF(_L8("Reference native plugin - uninstall"));
+ CommonRequestPreamble(aSecurityContext, aInputParams, aOutputParams, aStatus);
+ // Get UID for given component id
+ RSoftwareComponentRegistry scrSession;
+ User::LeaveIfError(scrSession.Connect());
+ CleanupClosePushL(scrSession);
+
+ CPropertyEntry* propertyEntry = scrSession.GetComponentPropertyL(aComponentId, _L("CompUid"));
+ CleanupStack::PushL(propertyEntry);
+
+ CIntPropertyEntry* intPropertyEntry = dynamic_cast<CIntPropertyEntry *>(propertyEntry);
+
+ TRequestStatus *statusPtr(&aStatus);
+ if (intPropertyEntry == NULL)
+ {
+ DEBUG_PRINTF2(_L8("UID property for component %d was not found"), aComponentId);
+ User::RequestComplete(statusPtr, KErrNotFound);
+ return;
+ }
+
+ TUid objectId = TUid::Uid(intPropertyEntry->IntValue());
+ CleanupStack::PopAndDestroy(2, &scrSession);
+
+ iAsyncLauncher->UninstallL(*this, objectId, iStatus);
+ }
+
+void CRefNativePluginActiveImpl::Activate(TComponentId aComponentId, const TSecurityContext& /*aSecurityContext*/, TRequestStatus& aStatus)
+ {
+ DEBUG_PRINTF(_L8("Reference native plugin - activate"));
+ iStatus = KRequestPending;
+ aStatus = KRequestPending;
+ iClientStatus = &aStatus;
+
+ TRequestStatus* rs(&iStatus);
+
+ Swi::RSisRegistryWritableSession sisRegSession;
+ TRAPD(err,
+ User::LeaveIfError(sisRegSession.Connect());
+ sisRegSession.ActivateComponentL(aComponentId);
+ )
+ sisRegSession.Close();
+
+ User::RequestComplete(rs, err);
+ SetActive();
+ }
+
+void CRefNativePluginActiveImpl::Deactivate(TComponentId aComponentId, const TSecurityContext& /*aSecurityContext*/, TRequestStatus& aStatus)
+ {
+ DEBUG_PRINTF(_L8("Reference native plugin - deactivate"));
+ iStatus = KRequestPending;
+ aStatus = KRequestPending;
+ iClientStatus = &aStatus;
+
+ TRequestStatus* rs(&iStatus);
+
+ Swi::RSisRegistryWritableSession sisRegSession;
+ TRAPD(err,
+ User::LeaveIfError(sisRegSession.Connect());
+ sisRegSession.DeactivateComponentL(aComponentId);
+ )
+ sisRegSession.Close();
+
+ User::RequestComplete(rs, err);
+ SetActive();
+ }
+
+// SWI::MUiHandler implementation
+TInt CRefNativePluginActiveImpl::DisplayLanguageL(const Swi::CAppInfo& /*aAppInfo*/,const RArray<TLanguage>& /*aLanguages*/)
+ {
+ DEBUG_PRINTF(_L8("Reference native plugin - DisplayLanguageL"));
+ return 0;
+ }
+
+TInt CRefNativePluginActiveImpl::DisplayDriveL(const Swi::CAppInfo& /*aAppInfo*/,TInt64 /*aSize*/, const RArray<TChar>& /*aDriveLetters*/, const RArray<TInt64>& /*aDriveSpaces*/)
+ {
+ DEBUG_PRINTF(_L8("Reference native plugin - DisplayDriveL"));
+ return 0;
+ }
+
+TBool CRefNativePluginActiveImpl::DisplayUninstallL(const Swi::CAppInfo& /*aAppInfo*/)
+ {
+ DEBUG_PRINTF(_L8("Reference native plugin - DisplayUninstallL"));
+ if (iDeclineOperation)
+ {
+ DEBUG_PRINTF(_L8("Reference native plugin - Received an option to decline operation - stopping uninstall"));
+ return EFalse;
+ }
+ return ETrue;
+ }
+
+TBool CRefNativePluginActiveImpl::DisplayTextL(const Swi::CAppInfo& /*aAppInfo*/, Swi::TFileTextOption /*aOption*/, const TDesC& /*aText*/)
+ {
+ DEBUG_PRINTF(_L8("Reference native plugin - DisplayTextL"));
+ return ETrue;
+ }
+
+TBool CRefNativePluginActiveImpl::DisplayDependencyBreakL(const Swi::CAppInfo& /*aAppInfo*/, const RPointerArray<TDesC>& /*aComponents*/)
+ {
+ DEBUG_PRINTF(_L8("Reference native plugin - DisplayDependencyBreakL"));
+ return ETrue;
+ }
+
+TBool CRefNativePluginActiveImpl::DisplayApplicationsInUseL(const Swi::CAppInfo& /*aAppInfo*/, const RPointerArray<TDesC>& /*aAppNames*/)
+ {
+ DEBUG_PRINTF(_L8("Reference native plugin - DisplayApplicationsInUseL"));
+ return ETrue;
+ }
+
+TBool CRefNativePluginActiveImpl::DisplayQuestionL(const Swi::CAppInfo& /*aAppInfo*/, Swi::TQuestionDialog /*aQuestion*/, const TDesC& /*aDes*/)
+ {
+ DEBUG_PRINTF(_L8("Reference native plugin - DisplayQuestionL"));
+ return ETrue;
+ }
+
+TBool CRefNativePluginActiveImpl::DisplayInstallL(const Swi::CAppInfo& /*aAppInfo*/, const CApaMaskedBitmap* /*aLogo*/, const RPointerArray<Swi::CCertificateInfo>& /*aCertificates*/)
+ {
+ DEBUG_PRINTF(_L8("Reference native plugin - DisplayInstallL"));
+
+ if (iDeclineOperation)
+ {
+ DEBUG_PRINTF(_L8("Reference native plugin - Received an option to decline operation - stopping install"));
+ return EFalse;
+ }
+ return ETrue;
+ }
+
+TBool CRefNativePluginActiveImpl::DisplayGrantCapabilitiesL(const Swi::CAppInfo& /*aAppInfo*/, const TCapabilitySet& /*aCapabilitySet*/)
+ {
+ DEBUG_PRINTF(_L8("Reference native plugin - DisplayGrantCapabilitiesL"));
+ return ETrue;
+ }
+
+TBool CRefNativePluginActiveImpl::DisplayUpgradeL(const Swi::CAppInfo& /*aAppInfo*/, const Swi::CAppInfo& /*aExistingAppInfo*/)
+ {
+ DEBUG_PRINTF(_L8("Reference native plugin - DisplayUpgradeL"));
+ return ETrue;
+ }
+
+TBool CRefNativePluginActiveImpl::DisplayOptionsL(const Swi::CAppInfo& /*aAppInfo*/, const RPointerArray<TDesC>& /*aOptions*/, RArray<TBool>& /*aSelections*/)
+ {
+ DEBUG_PRINTF(_L8("Reference native plugin - DisplayOptionsL"));
+ return ETrue;
+ }
+
+TBool CRefNativePluginActiveImpl::DisplaySecurityWarningL(const Swi::CAppInfo& /*aAppInfo*/, Swi::TSignatureValidationResult /*aSigValidationResult*/,
+ RPointerArray<CPKIXValidationResultBase>& /*aPkixResults*/, RPointerArray<Swi::CCertificateInfo>& /*aCertificates*/, TBool /*aInstallAnyway*/)
+ {
+ DEBUG_PRINTF(_L8("Reference native plugin - DisplaySecurityWarningL"));
+ return ETrue;
+ }
+
+TBool CRefNativePluginActiveImpl::DisplayOcspResultL(const Swi::CAppInfo& /*aAppInfo*/, Swi::TRevocationDialogMessage /*aMessage*/, RPointerArray<TOCSPOutcome>& /*aOutcomes*/,
+ RPointerArray<Swi::CCertificateInfo>& /*aCertificates*/,TBool /*aWarningOnly*/)
+ {
+ DEBUG_PRINTF(_L8("Reference native plugin - DisplayOcspResultL"));
+ return ETrue;
+ }
+
+TBool CRefNativePluginActiveImpl::DisplayMissingDependencyL(const Swi::CAppInfo& /*aAppInfo*/, const TDesC& /*aDependencyName*/, TVersion /*aWantedVersionFrom*/,
+ TVersion /*aWantedVersionTo*/, TVersion /*aInstalledVersion*/)
+ {
+ DEBUG_PRINTF(_L8("Reference native plugin - DisplayMissingDependencyL"));
+ return ETrue;
+ }
+
+TBool CRefNativePluginActiveImpl::HandleInstallEventL(const Swi::CAppInfo& /*aAppInfo*/, Swi::TInstallEvent /*aEvent*/, TInt /*aValue*/, const TDesC& /*aDes*/)
+ {
+ DEBUG_PRINTF(_L8("Reference native plugin - HandleInstallEventL"));
+ return ETrue;
+ }
+
+void CRefNativePluginActiveImpl::HandleCancellableInstallEventL(const Swi::CAppInfo& /*aAppInfo*/, Swi::TInstallCancellableEvent /*aEvent*/, Swi::MCancelHandler& /*aCancelHandler*/,
+ TInt /*aValue*/,const TDesC& /*aDes*/)
+ {
+ DEBUG_PRINTF(_L8("Reference native plugin - HandleCancellableInstallEventL"));
+ }
+
+void CRefNativePluginActiveImpl::DisplayCannotOverwriteFileL(const Swi::CAppInfo& /*aAppInfo*/, const Swi::CAppInfo& /*aInstalledAppInfo*/,const TDesC& /*aFileName*/)
+ {
+ DEBUG_PRINTF(_L8("Reference native plugin - DisplayCannotOverwriteFileL"));
+ }
+
+void CRefNativePluginActiveImpl::DisplayErrorL(const Swi::CAppInfo& /*aAppInfo*/, Swi::TErrorDialog /*aType*/, const TDesC& /*aParam*/)
+ {
+ DEBUG_PRINTF(_L8("Reference native plugin - DisplayErrorL"));
+ }
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/refnativeplugin/refnativeplugin.h Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,173 @@
+/*
+* 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 the License "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:
+* This class implements a test SIF plugin for native software
+*
+*/
+
+
+/**
+ @file
+ @internalComponent
+*/
+
+#ifndef REFNATIVEPLUGIN_H
+#define REFNATIVEPLUGIN_H
+
+#include <usif/sif/sifplugin.h>
+#include <usif/scr/screntries.h>
+#include <swi/msisuihandlers.h>
+#include <e32base.h>
+#include <e32std.h>
+
+namespace Swi
+{
+ class CAsyncLauncher;
+ class CInstallPrefs;
+}
+
+namespace Usif
+ {
+
+ _LIT(KDeclineOperationOptionName, "SwiDeclineOperation");
+ // ECOM objects and CActive do not interact well - especially since SIFPlugin inherits from CBase
+ // and double C-inheritance is impossible. So, a separate class is used to drive the asynchronous interaction
+ // to the CAsyncLauncher
+ NONSHARABLE_CLASS(CRefNativePluginActiveImpl) : public CActive, public Swi::MUiHandler
+ {
+ public:
+ static CRefNativePluginActiveImpl* NewL();
+ ~CRefNativePluginActiveImpl();
+
+ // CActive interface
+ void RunL();
+ void DoCancel();
+
+ void Install(const TDesC& aFileName, const TSecurityContext& aSecurityContext,
+ const COpaqueNamedParams& aInputParams, COpaqueNamedParams& aOutputParams,
+ TRequestStatus& aStatus);
+
+ void Install(RFile& aFileHandle, const TSecurityContext& aSecurityContext,
+ const COpaqueNamedParams& aInputParams, COpaqueNamedParams& aOutputParams,
+ TRequestStatus& aStatus);
+
+ void GetComponentInfo(const TDesC& aFileName, CComponentInfo& aComponentInfo, TRequestStatus& aStatus);
+
+ void GetComponentInfo(RFile& aFileHandle, CComponentInfo& aComponentInfo, TRequestStatus& aStatus);
+
+ void Uninstall(TComponentId aComponentId, const TSecurityContext& aSecurityContext,
+ const COpaqueNamedParams& aInputParams, COpaqueNamedParams& aOutputParams,
+ TRequestStatus& aStatus);
+
+ void Activate(TComponentId aComponentId, const TSecurityContext& aSecurityContext,
+ TRequestStatus& aStatus);
+
+ void Deactivate(TComponentId aComponentId, const TSecurityContext& aSecurityContext,
+ TRequestStatus& aStatus);
+
+ // Swi::MUiHandler interface
+ TInt DisplayLanguageL(const Swi::CAppInfo& aAppInfo,const RArray<TLanguage>& aLanguages);
+ TInt DisplayDriveL(const Swi::CAppInfo& aAppInfo,TInt64 aSize, const RArray<TChar>& aDriveLetters,const RArray<TInt64>& aDriveSpaces);
+ TBool DisplayUninstallL(const Swi::CAppInfo& aAppInfo);
+ TBool DisplayTextL(const Swi::CAppInfo& aAppInfo,Swi::TFileTextOption aOption,const TDesC& aText);
+ TBool DisplayDependencyBreakL(const Swi::CAppInfo& aAppInfo, const RPointerArray<TDesC>& aComponents);
+ TBool DisplayApplicationsInUseL(const Swi::CAppInfo& aAppInfo, const RPointerArray<TDesC>& aAppNames);
+ TBool DisplayQuestionL(const Swi::CAppInfo& aAppInfo, Swi::TQuestionDialog aQuestion, const TDesC& aDes);
+ TBool DisplayInstallL(const Swi::CAppInfo& aAppInfo,const CApaMaskedBitmap* aLogo, const RPointerArray<Swi::CCertificateInfo>& aCertificates);
+ TBool DisplayGrantCapabilitiesL(const Swi::CAppInfo& aAppInfo, const TCapabilitySet& aCapabilitySet);
+ TBool DisplayUpgradeL(const Swi::CAppInfo& aAppInfo, const Swi::CAppInfo& aExistingAppInfo);
+ TBool DisplayOptionsL(const Swi::CAppInfo& aAppInfo, const RPointerArray<TDesC>& aOptions,RArray<TBool>& aSelections);
+ TBool DisplaySecurityWarningL(const Swi::CAppInfo& aAppInfo, Swi::TSignatureValidationResult aSigValidationResult,
+ RPointerArray<CPKIXValidationResultBase>& aPkixResults, RPointerArray<Swi::CCertificateInfo>& aCertificates,TBool aInstallAnyway);
+ TBool DisplayOcspResultL(const Swi::CAppInfo& aAppInfo, Swi::TRevocationDialogMessage aMessage,RPointerArray<TOCSPOutcome>& aOutcomes,
+ RPointerArray<Swi::CCertificateInfo>& aCertificates,TBool aWarningOnly);
+ TBool DisplayMissingDependencyL(const Swi::CAppInfo& aAppInfo, const TDesC& aDependencyName,TVersion aWantedVersionFrom,
+ TVersion aWantedVersionTo,TVersion aInstalledVersion);
+ TBool HandleInstallEventL(const Swi::CAppInfo& aAppInfo, Swi::TInstallEvent aEvent,TInt aValue = 0,const TDesC& aDes = KNullDesC);
+ void HandleCancellableInstallEventL(const Swi::CAppInfo& aAppInfo, Swi::TInstallCancellableEvent aEvent,Swi::MCancelHandler& aCancelHandler,
+ TInt aValue = 0,const TDesC& aDes=KNullDesC);
+ void DisplayCannotOverwriteFileL(const Swi::CAppInfo& aAppInfo, const Swi::CAppInfo& aInstalledAppInfo,const TDesC& aFileName);
+ void DisplayErrorL(const Swi::CAppInfo& aAppInfo,Swi::TErrorDialog aType,const TDesC& aParam);
+ private:
+ CRefNativePluginActiveImpl() : CActive(EPriorityStandard) {}
+ CRefNativePluginActiveImpl(const CRefNativePluginActiveImpl &);
+ CRefNativePluginActiveImpl & operator =(const CRefNativePluginActiveImpl &);
+ void ConstructL();
+ void CommonRequestPreamble(const TSecurityContext& aSecurityContext, const COpaqueNamedParams& aInputParams,
+ COpaqueNamedParams& aOutputParams, TRequestStatus& aStatus);
+ void UninstallL(TComponentId aComponentId, const TSecurityContext& aSecurityContext,
+ const COpaqueNamedParams& aInputParams, COpaqueNamedParams& aOutputParams,
+ TRequestStatus& aStatus);
+
+ TComponentId GetLastInstalledComponentIdL();
+ TBool NeedUserCapabilityL();
+ void ProcessSilentInstallL();
+ private:
+ Swi::CAsyncLauncher* iAsyncLauncher;
+ Swi::CInstallPrefs* iInstallPrefs;
+ TRequestStatus* iClientStatus;
+ const COpaqueNamedParams* iInputParams;
+ COpaqueNamedParams* iOutputParams;
+ CComponentInfo* iComponentInfo;
+ TFileName iFileName;
+ RFile* iFileHandle; // FileHandle is not owned by the plug-in
+ TBool iDeclineOperation; // Used for plugin options - optionally specifies that the operation will not be confirmed at the first callback
+ TBool iInstallRequest; // Used to identify the type of the current requst in RunL() so we know if the id of an installed component should be sent
+ TBool iSilentInstall; // Used to identify a silent install
+ };
+
+
+ NONSHARABLE_CLASS(CRefNativePlugin) : public CSifPlugin
+ {
+ public:
+ static CRefNativePlugin* NewL();
+ ~CRefNativePlugin();
+
+ // MSIFPlugin interface
+ void GetComponentInfo(const TDesC& aFileName, const TSecurityContext& aSecurityContext,
+ CComponentInfo& aComponentInfo, TRequestStatus& aStatus);
+
+ void GetComponentInfo(RFile& aFileHandle, const TSecurityContext& aSecurityContext,
+ CComponentInfo& aComponentInfo, TRequestStatus& aStatus);
+
+ void Install(const TDesC& aFileName, const TSecurityContext& aSecurityContext,
+ const COpaqueNamedParams& aInputParams, COpaqueNamedParams& aOutputParams,
+ TRequestStatus& aStatus);
+
+ void Install(RFile& aFileHandle, const TSecurityContext& aSecurityContext,
+ const COpaqueNamedParams& aInputParams, COpaqueNamedParams& aOutputParams,
+ TRequestStatus& aStatus);
+
+ virtual void Uninstall(TComponentId aComponentId, const TSecurityContext& aSecurityContext,
+ const COpaqueNamedParams& aInputParams, COpaqueNamedParams& aOutputParams,
+ TRequestStatus& aStatus);
+
+ virtual void Activate(TComponentId aComponentId, const TSecurityContext& aSecurityContext,
+ TRequestStatus& aStatus);
+
+ virtual void Deactivate(TComponentId aComponentId, const TSecurityContext& aSecurityContext,
+ TRequestStatus& aStatus);
+
+ void CancelOperation();
+ private:
+ CRefNativePlugin() {}
+ void ConstructL();
+ CRefNativePlugin(const CRefNativePlugin &);
+ CRefNativePlugin & operator =(const CRefNativePlugin &);
+ private:
+ CRefNativePluginActiveImpl *iImpl;
+ };
+ } // end namespace Usif
+
+#endif // REFNATIVEPLUGIN_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/refnativeplugin/refnativeplugin.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,44 @@
+/*
+* 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 the License "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:
+* Project specification file for SIF plugin for native software
+*
+*/
+
+
+/**
+ @file
+ @test
+*/
+
+TARGET refnativeplugin.dll
+TARGETTYPE PLUGIN
+
+UID 0x10009D8D 0x10285BC3
+
+CAPABILITY ProtServ TrustedUI ReadUserData WriteDeviceData
+
+SOURCEPATH .
+SOURCE refnativeplugin.cpp
+
+USERINCLUDE .
+
+MW_LAYER_SYSTEMINCLUDE_SYMBIAN
+
+START RESOURCE 10285BC3.rss
+ TARGET refnativeplugin.rsc
+END
+LIBRARY euser.lib sishelper.lib sif.lib scrclient.lib
+LIBRARY sisregistryclient.lib
+SMPSAFE
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/refnativeplugin/sisregistrywritablesession.h Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,214 @@
+/*
+* Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "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:
+* RSisRegistryWritableSession - restricted client registry session interface
+*
+*/
+
+
+/**
+ @file
+ @internalTechnology
+ @released
+*/
+
+#ifndef __SISREGISTRYWRITABLESESSION_H__
+#define __SISREGISTRYWRITABLESESSION_H__
+
+#include <e32std.h>
+#include <swi/sisregistrysession.h>
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+#include <usif/usifcommon.h>
+#endif
+namespace Swi
+{
+class CApplication;
+class CSisRegistryPackage;
+
+namespace Sis
+ {
+ class CController;
+ }
+
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+using Usif::TComponentId;
+using Usif::TScomoState;
+
+class CSoftwareTypeRegInfo;
+#endif
+
+class RSisRegistryWritableSession : public RSisRegistrySession
+ {
+public:
+
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+ /**
+ * Starts a transaction with SCR for the mutable operations of this session.
+ * The APIs that this transaction covers are AddEntryL, UpdateEntryL and DeleteEntryL.
+ * Note that this transaction has no relation with the transaction ID (aTransactionID)
+ * parameter being supplied to the mutable APIs.
+ */
+ IMPORT_C void CreateTransactionL();
+
+ /**
+ * Commits the changes performed in the SCR after the call to BeginTransactionL.
+ */
+ IMPORT_C void CommitTransactionL();
+
+ /**
+ * Discards the changes performed in the SCR after the call to BeginTransactionL.
+ */
+ IMPORT_C void RollbackTransactionL();
+#endif
+
+ /**
+ * Adds a registry entry representing this package
+ *
+ * @param aApplication The application description provided by Swi
+ * @param aController The controller in a buffer
+ * @param aTransactionID The TransactionID for IntegrityServices provided
+ * by Swis of TInt64 type
+ *
+ */
+ IMPORT_C void AddEntryL(const CApplication& aApplication, const TDesC8& aController, TInt64 aTransactionID);
+
+ /**
+ * Updates the registry entry representing this package
+ *
+ * @param aApplication The application description provided by Swi
+ * @param aController The controller in a buffer
+ * @param aTransactionID The TransactionID for IntegrityServices provided
+ * by Swis of TInt64 type
+ *
+ */
+ IMPORT_C void UpdateEntryL(const CApplication& aApplication, const TDesC8& aController, TInt64 aTransactionID);
+
+ /**
+ * Deletes the entry from the registry represented by the given package
+ *
+ * @param aPackage The package to search for
+ * @param aTransactionID The TransactionID for IntegrityServices provided
+ * by Swis of TInt64 type
+ *
+ */
+ IMPORT_C void DeleteEntryL(const CSisRegistryPackage& aPackage, TInt64 aTransactionID);
+
+ /**
+ * Notification to registry that a drive has been mounted
+ *
+ * @param aDrive Drive number;
+ *
+ * @note valid value are between 0 and KMaxDrives - 1 inclusive
+ * 0 stands for A drive and KMaxDrives - 1 for Z
+ *
+ */
+ IMPORT_C void AddDriveL(const TInt aDrive);
+
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+ /**
+ * Notification to registry that a drive has been dismounted
+ *
+ * @param aDrive Drive as a number;
+ *
+ * @note valid value are between 0 and KMaxDrives - 1 inclusive
+ * 0 stands for A drive and KMaxDrives - 1 for Z
+ *
+ */
+ IMPORT_C void RemoveDriveL(const TInt aDrive);
+
+ /**
+ * Notification to the registry that Software Installation has been rolled
+ * back and the cache needs to be regenerated from the contents on disk.
+ */
+ IMPORT_C void RegenerateCacheL();
+#endif
+
+ /**
+ * Returns ETrue if any ROM stub in the filesystem has the package uid specified
+ * in aPackageId
+ * With the addition of SA upgrades to ROM, a package may be both in ROM, upgraded
+ * on another drive and this method can be used to check for the presence
+ * of an upgraded ROM package.
+ *
+ *
+ * @param aPackageId Package Id to be searched in the ROM stub files.
+ *
+ * @return ETrue if it can find the aPackageId in any of the ROM stub SIS.
+ * EFalse otherwise
+ */
+ IMPORT_C TBool PackageExistsInRomL(const TUid& aPackageId);
+
+
+
+ /**
+ * Gets all the eclipsable file's entries from the ROM stub file of a ROM based package.
+ *
+ * @param aUid Package UId to identify the right stub file.
+ *
+ * @param aFiles A pointer array of file names to be populated.
+ *
+ */
+ IMPORT_C void GetFilesForRomApplicationL(const TUid& aPackageId, RPointerArray<HBufC>& aFiles);
+
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+ /**
+ * Activates the component identified by the supplied parameter.
+ *
+ * @param aComponentId Identifies the installed component, which is to be activated.
+ *
+ */
+ IMPORT_C void ActivateComponentL(TComponentId aComponentId);
+
+ /**
+ * Deactivates the component identified by the supplied parameter.
+ *
+ * @param aComponentId Identifies the installed component, which is to be deactivated.
+ *
+ */
+ IMPORT_C void DeactivateComponentL(TComponentId aComponentId);
+
+ /**
+ * Adds a registry entry representing a package containing a Layered Execution Environment
+ *
+ * @param aApplication The application description provided by Swi
+ * @param aController The controller in a buffer
+ * @param aSwTypeRegInfoArray The array of the software types to be registered
+ * @param aTransactionID The TransactionID for IntegrityServices provided by Swis of TInt64 type
+ *
+ */
+ IMPORT_C void AddEntryL(const CApplication& aApplication, const TDesC8& aController, const RPointerArray<CSoftwareTypeRegInfo>& aSwTypeRegInfoArray, TInt64 aTransactionID);
+
+ /**
+ * Updates the registry entry representing a package containing a Layered Execution Environment.
+ * The SISRegistryServer checks if the registration info passed in aSwTypeRegInfoArray matches
+ * the data passed during the installation of the base package. If they differ the installation terinates.
+ * Hence, this upgrade package may upgarde the LEE but cannot change its registration data.
+ *
+ * @param aApplication The application description provided by Swi
+ * @param aController The controller in a buffer
+ * @param aSwTypeRegInfoArray The array of the software types to be verified against the already registered base package
+ * @param aTransactionID The TransactionID for IntegrityServices provided by Swis of TInt64 type
+ *
+ */
+ IMPORT_C void UpdateEntryL(const CApplication& aApplication, const TDesC8& aController, const RPointerArray<CSoftwareTypeRegInfo>& aSwTypeRegInfoArray, TInt64 aTransactionID);
+
+private:
+ void SetComponentStateL(TComponentId aComponentId, TScomoState aState);
+#endif
+ void AddEntryImplL(TInt aMessage, const CApplication& aApplication, const TDesC8& aController, TInt64 aTransactionID, TIpcArgs& aIpcArgs);
+ void UpdateEntryImplL(TInt aMessage, const CApplication& aApplication, const TDesC8& aController, TInt64 aTransactionID, TIpcArgs& aIpcArgs);
+ };
+
+} // namespace
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/refnativeplugin/usiflog.h Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,45 @@
+/*
+* 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 the License "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:
+* Implements print functions for the Universal Software Install Framework components.
+*
+*/
+
+
+/**
+ @file
+ @internalComponent
+ @released
+*/
+
+#ifndef USIFLOG_H
+#define USIFLOG_H
+
+#include <scs/securitylog.h>
+
+namespace Usif
+ {
+ _LIT8(KComponentName, "[USIF]");
+
+ #define DEBUG_PRINTF(a) {SEC_DEBUG_PRINTF(KComponentName, a);}
+ #define DEBUG_PRINTF2(a, b) {SEC_DEBUG_PRINTF2(KComponentName, a, b);}
+ #define DEBUG_PRINTF3(a, b, c) {SEC_DEBUG_PRINTF3(KComponentName, a, b, c);}
+ #define DEBUG_PRINTF4(a, b, c, d) {SEC_DEBUG_PRINTF4(KComponentName, a, b, c, d);}
+ #define DEBUG_PRINTF5(a, b, c, d, e) {SEC_DEBUG_PRINTF5(KComponentName, a, b, c, d, e);}
+
+ #define DEBUG_CODE_SECTION(a) {SEC_DEBUG_CODE_SECTION(a);}
+
+ } // End of namespace StreamAccess
+
+#endif // USIFLOG_H
--- a/appfw/apparchitecture/tef/scripts/apparctest_T_AppListFileUpdate.script Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/scripts/apparctest_T_AppListFileUpdate.script Tue Aug 31 15:24:25 2010 +0300
@@ -37,6 +37,6 @@
PRINT Run T_AppListFileUpdate Apparc test
//
LOAD_SUITE ApparcTestServer
-RUN_TEST_STEP 500 ApparcTestServer T_AppListFileUpdate
+RUN_TEST_STEP 800 ApparcTestServer T_AppListFileUpdate
END_TESTCASE API-APPFWK-APPARC-0032
--- a/appfw/apparchitecture/tef/scripts/apparctest_T_RApaLsSession.script Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/scripts/apparctest_T_RApaLsSession.script Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
//
-// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -35,6 +35,6 @@
DELAY 5000
//
LOAD_SUITE ApparcTestServer
-RUN_TEST_STEP 100 ApparcTestServer T_RApaLsSession
+RUN_TEST_STEP 500 ApparcTestServer T_RApaLsSession
END_TESTCASE API-APPFWK-T-RApaLsSessionTestStep-TestAppInfo1-0001
--- a/appfw/apparchitecture/tef/scripts/apparctest_T_RuleBasedLaunching.script Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/scripts/apparctest_T_RuleBasedLaunching.script Tue Aug 31 15:24:25 2010 +0300
@@ -27,6 +27,6 @@
PRINT Run T_RuleBasedLaunching Apparc test
//
LOAD_SUITE ApparcTestServer
-RUN_TEST_STEP 100 ApparcTestServer T_RuleBasedLaunching
+RUN_TEST_STEP 200 ApparcTestServer T_RuleBasedLaunching
END_TESTCASE API-APPFWK-APPARC-0023
--- a/appfw/apparchitecture/tef/scripts/apparctest_T_Serv2.script Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/scripts/apparctest_T_Serv2.script Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
//
-// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -31,6 +31,6 @@
PRINT Run T_Serv2 Apparc test
//
LOAD_SUITE ApparcTestServer
-RUN_TEST_STEP 100 ApparcTestServer T_Serv2
+RUN_TEST_STEP 400 ApparcTestServer T_Serv2
END_TESTCASE API-APPFWK-T-Serv2Step-AppInfoTest1-0001
\ No newline at end of file
--- a/appfw/apparchitecture/tef/scripts/apparctest_T_Services.script Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/scripts/apparctest_T_Services.script Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
//
-// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -33,6 +33,6 @@
DELAY 5000
//
LOAD_SUITE ApparcTestServer
-RUN_TEST_STEP 100 ApparcTestServer T_Services
+RUN_TEST_STEP 300 ApparcTestServer T_Services
END_TESTCASE API-APPFWK-T-RApaLsSessionTestStep-TestServiceDiscovery1L-0001
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/scripts/apparctest_t_UpdateAppList.script Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,20 @@
+//
+// 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:
+//
+//
+PRINT Run T_UpdateAppList Apparc test
+//
+LOAD_SUITE ApparcTestServer
+RUN_TEST_STEP 100 ApparcTestServer T_UpdateAppList
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/scripts/apparctest_t_clientnotif.script Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,20 @@
+//
+// 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:
+//
+//
+PRINT Run T_ClientNotif Apparc test
+//
+LOAD_SUITE ApparcTestServer
+RUN_TEST_STEP 400 ApparcTestServer T_ClientNotif
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/scripts/apparctest_t_forcereg.script Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,20 @@
+//
+// 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:
+//
+//
+PRINT Run T_ForceReg Apparc test
+//
+LOAD_SUITE ApparcTestServer
+RUN_TEST_STEP 100 ApparcTestServer T_ForceReg
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/scripts/apparctest_t_nonnativetest.script Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,20 @@
+//
+// 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:
+//
+//
+PRINT Run T_NonNativeTest Apparc test
+//
+LOAD_SUITE ApparcTestServer
+RUN_TEST_STEP 100 ApparcTestServer T_NonNativeTest
\ No newline at end of file
--- a/appfw/apparchitecture/tef/scripts/emulator/apparctest_CACHE_OFF_run.bat Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/scripts/emulator/apparctest_CACHE_OFF_run.bat Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
@rem
-@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem Copyright (c) 2009-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"
@@ -75,6 +75,11 @@
call :test T_Wgnam
call :test T_WindowChaining
::call :test T_RecUpgrade This test can not run on emulator as it requires loading, unloading and deletion of a plug-in and Windows OS don’t allow deletion of loaded binaries
+call :test T_UpdateAppList
+call :test T_ForceReg
+call :test T_ClientNotif
+call :test T_NonNativeTest
+
call sysstart_apparc_run.bat
type \epoc32\winscw\c\logs\testexecute\sysstart_apparctest_summary.txt >> %APPARCTEST_SUMMARY%
--- a/appfw/apparchitecture/tef/scripts/emulator/apparctest_run.bat Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/scripts/emulator/apparctest_run.bat Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
@rem
-@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem Copyright (c) 2009-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"
@@ -78,6 +78,10 @@
call :test T_Wgnam
call :test T_WindowChaining
::call :test T_RecUpgrade This test can not run on emulator as it requires loading, unloading and deletion of a plug-in and Windows OS don’t allow deletion of loaded binaries
+call :test T_UpdateAppList
+call :test T_ForceReg
+call :test T_ClientNotif
+call :test T_NonNativeTest
call sysstart_apparc_run.bat
type \epoc32\winscw\c\logs\testexecute\sysstart_apparctest_summary.txt >> %APPARCTEST_SUMMARY%
--- a/appfw/apparchitecture/tef/scripts/hardware/apparctest_run.bat Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/scripts/hardware/apparctest_run.bat Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
@rem
-@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem Copyright (c) 2009-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"
@@ -62,6 +62,11 @@
testexecute.exe z:\apparctest\apparctest_t_Wgnam.script
testexecute.exe z:\apparctest\apparctest_t_WindowChaining.script
testexecute.exe z:\apparctest\apparctest_t_RecUpgrade.script
+testexecute.exe z:\apparctest\apparctest_t_UpdateAppList.script
+testexecute.exe z:\apparctest\apparctest_t_forcereg.script
+testexecute.exe z:\apparctest\apparctest_t_clientnotif.script
+testexecute.exe z:\apparctest\apparctest_t_nonnativetest.script
+
:: *******************************************************************
:: This batch file is used to run tests on 9.3 and higher versions.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/serverapp.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,49 @@
+// Copyright (c) 2005-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:
+//
+
+/**
+ @file
+ @internalComponent - Internal Symbian test code
+*/
+
+TARGET serverapp.exe
+TARGETTYPE exe
+UID 0x100039CE 0x10004c56
+VENDORID 0x70000001
+
+USERINCLUDE .
+
+MW_LAYER_SYSTEMINCLUDE_SYMBIAN
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN
+//SYSTEMINCLUDE /epoc32/include/techview
+
+START RESOURCE serverapp_reg.rss
+TARGETPATH /apparctestregfiles
+lang sc
+END
+
+SOURCEPATH ../tef
+// SOURCE T_ServicesStep.cpp
+SOURCE app_CTRL.CPP
+
+LIBRARY cone.lib ws32.lib appfwk_test_appui.lib euser.lib ecom.lib
+LIBRARY testexecuteutils.lib testexecutelogclient.lib
+LIBRARY apparc.lib efsrv.lib estor.lib gdi.lib fbscli.lib
+LIBRARY apfile.lib apgrfx.lib bafl.lib apmime.lib apserv.lib
+LIBRARY eikcore.lib appfwk_test_utils.lib serviceregistry.lib
+LIBRARY aplist.lib
+LIBRARY ticonloaderandiconarrayforleaks.lib centralrepository.lib
+
+SMPSAFE
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/serverapp2.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,49 @@
+// 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:
+//
+
+/**
+ @file
+ @internalComponent - Internal Symbian test code
+*/
+
+TARGET serverapp2.exe
+TARGETTYPE exe
+UID 0x100039CE 0x10004c58
+VENDORID 0x70000001
+
+USERINCLUDE .
+
+MW_LAYER_SYSTEMINCLUDE_SYMBIAN
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN
+//SYSTEMINCLUDE /epoc32/include/techview
+
+START RESOURCE serverapp2_reg.rss
+TARGETPATH /apparctestregfiles
+lang sc
+END
+
+SOURCEPATH ../tef
+//SOURCE T_ServicesStep.cpp
+SOURCE app_CTRL.CPP
+
+LIBRARY cone.lib ws32.lib appfwk_test_appui.lib euser.lib ecom.lib
+LIBRARY testexecuteutils.lib testexecutelogclient.lib
+LIBRARY apparc.lib efsrv.lib estor.lib gdi.lib fbscli.lib
+LIBRARY apfile.lib apgrfx.lib bafl.lib apmime.lib apserv.lib
+LIBRARY eikcore.lib appfwk_test_utils.lib serviceregistry.lib
+LIBRARY aplist.lib
+LIBRARY ticonloaderandiconarrayforleaks.lib centralrepository.lib
+
+SMPSAFE
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/serverapp3.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,49 @@
+// 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:
+//
+
+/**
+ @file
+ @internalComponent - Internal Symbian test code
+*/
+
+TARGET serverapp3.exe
+TARGETTYPE exe
+UID 0x100039CE 0x10004c57
+VENDORID 0x70000001
+
+USERINCLUDE .
+
+MW_LAYER_SYSTEMINCLUDE_SYMBIAN
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN
+//SYSTEMINCLUDE /epoc32/include/techview
+
+START RESOURCE serverapp3_reg.rss
+TARGETPATH /apparctestregfiles
+lang sc
+END
+
+SOURCEPATH ../tef
+//SOURCE T_ServicesStep.cpp
+SOURCE app_CTRL.CPP
+
+LIBRARY cone.lib ws32.lib appfwk_test_appui.lib euser.lib ecom.lib
+LIBRARY testexecuteutils.lib testexecutelogclient.lib
+LIBRARY apparc.lib efsrv.lib estor.lib gdi.lib fbscli.lib
+LIBRARY apfile.lib apgrfx.lib bafl.lib apmime.lib apserv.lib
+LIBRARY eikcore.lib appfwk_test_utils.lib serviceregistry.lib
+LIBRARY aplist.lib
+LIBRARY ticonloaderandiconarrayforleaks.lib centralrepository.lib
+
+SMPSAFE
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/serverapp4.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,49 @@
+// 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:
+//
+
+/**
+ @file
+ @internalComponent - Internal Symbian test code
+*/
+
+TARGET serverapp4.exe
+TARGETTYPE exe
+UID 0x100039CE 0x10004c76
+VENDORID 0x70000001
+
+USERINCLUDE .
+
+MW_LAYER_SYSTEMINCLUDE_SYMBIAN
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN
+//SYSTEMINCLUDE /epoc32/include/techview
+
+START RESOURCE serverapp4_reg.rss
+TARGETPATH /apparctestregfiles
+lang sc
+END
+
+SOURCEPATH ../tef
+//SOURCE T_ServicesStep.cpp
+SOURCE app_CTRL.CPP
+
+LIBRARY cone.lib ws32.lib appfwk_test_appui.lib euser.lib ecom.lib
+LIBRARY testexecuteutils.lib testexecutelogclient.lib
+LIBRARY apparc.lib efsrv.lib estor.lib gdi.lib fbscli.lib
+LIBRARY apfile.lib apgrfx.lib bafl.lib apmime.lib apserv.lib
+LIBRARY eikcore.lib appfwk_test_utils.lib serviceregistry.lib
+LIBRARY aplist.lib
+LIBRARY ticonloaderandiconarrayforleaks.lib centralrepository.lib
+
+SMPSAFE
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/serverapp6.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,58 @@
+// 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:
+//
+
+/**
+ @file
+ @internalComponent - Internal Symbian test code
+*/
+
+TARGET serverapp6.exe
+TARGETTYPE exe
+UID 0x100039CE 0x10004c55
+VENDORID 0x70000001
+
+USERINCLUDE .
+
+MW_LAYER_SYSTEMINCLUDE_SYMBIAN
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN
+//SYSTEMINCLUDE /epoc32/include/techview
+
+// Application localisable resource file
+resource serverapp_loc.RSS
+start resource serverapp_loc.RSS
+HEADER
+targetpath /apparctestregfiles
+lang sc
+end
+
+
+START RESOURCE serverapp6_reg.rss
+TARGETPATH /apparctestregfiles
+lang sc
+END
+
+SOURCEPATH ../tef
+//SOURCE T_ServicesStep.cpp
+SOURCE app_CTRL.CPP
+
+LIBRARY cone.lib ws32.lib appfwk_test_appui.lib euser.lib ecom.lib
+LIBRARY testexecuteutils.lib testexecutelogclient.lib
+LIBRARY apparc.lib efsrv.lib estor.lib gdi.lib fbscli.lib
+LIBRARY apfile.lib apgrfx.lib bafl.lib apmime.lib apserv.lib
+LIBRARY eikcore.lib appfwk_test_utils.lib serviceregistry.lib
+LIBRARY aplist.lib
+LIBRARY ticonloaderandiconarrayforleaks.lib centralrepository.lib
+
+SMPSAFE
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/serverapp7.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,57 @@
+// 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:
+//
+
+/**
+ @file
+ @internalComponent - Internal Symbian test code
+*/
+
+TARGET serverapp7.exe
+TARGETTYPE exe
+UID 0x100039CE 0x10004c54
+VENDORID 0x70000001
+
+USERINCLUDE .
+
+MW_LAYER_SYSTEMINCLUDE_SYMBIAN
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN
+//SYSTEMINCLUDE /epoc32/include/techview
+
+// Application localisable resource file
+resource serverapp_loc.RSS
+start resource serverapp_loc.RSS
+HEADER
+targetpath /apparctestregfiles
+lang sc
+end
+
+START RESOURCE serverapp7_reg.rss
+TARGETPATH /apparctestregfiles
+lang sc
+END
+
+SOURCEPATH ../tef
+// SOURCE T_ServicesStep.cpp
+SOURCE app_CTRL.CPP
+
+LIBRARY cone.lib ws32.lib appfwk_test_appui.lib euser.lib ecom.lib
+LIBRARY testexecuteutils.lib testexecutelogclient.lib
+LIBRARY apparc.lib efsrv.lib estor.lib gdi.lib fbscli.lib
+LIBRARY apfile.lib apgrfx.lib bafl.lib apmime.lib apserv.lib
+LIBRARY eikcore.lib appfwk_test_utils.lib serviceregistry.lib
+LIBRARY aplist.lib
+LIBRARY ticonloaderandiconarrayforleaks.lib centralrepository.lib
+
+SMPSAFE
--- a/appfw/apparchitecture/tef/tRuleBasedApps/tRuleBasedApp1.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/tRuleBasedApps/tRuleBasedApp1.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-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"
@@ -46,11 +46,11 @@
START RESOURCE tRuleBasedApp1.rss
HEADER
-TARGETPATH /resource/apps
+TARGETPATH /apparctestregfiles
END
START RESOURCE tRuleBasedApp1_reg.rss
-TARGETPATH /private/10003a3f/apps
+TARGETPATH /apparctestregfiles
END
SMPSAFE
--- a/appfw/apparchitecture/tef/tRuleBasedApps/tRuleBasedApp2.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/tRuleBasedApps/tRuleBasedApp2.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-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"
@@ -46,11 +46,11 @@
START RESOURCE tRuleBasedApp2.rss
HEADER
-TARGETPATH /resource/apps
+TARGETPATH /apparctestregfiles
END
START RESOURCE tRuleBasedApp2_reg.rss
-TARGETPATH /private/10003a3f/apps
+TARGETPATH /apparctestregfiles
END
SMPSAFE
--- a/appfw/apparchitecture/tef/tRuleBasedApps/tRuleBasedApp3.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/tRuleBasedApps/tRuleBasedApp3.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-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"
@@ -46,11 +46,11 @@
START RESOURCE tRuleBasedApp3.rss
HEADER
-TARGETPATH /resource/apps
+TARGETPATH /apparctestregfiles
END
START RESOURCE tRuleBasedApp3_reg.rss
-TARGETPATH /private/10003a3f/apps
+TARGETPATH /apparctestregfiles
END
SMPSAFE
--- a/appfw/apparchitecture/tef/tRuleBasedApps/tRuleBasedApp4.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/tRuleBasedApps/tRuleBasedApp4.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-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"
@@ -45,11 +45,11 @@
START RESOURCE tRuleBasedApp4.rss
HEADER
-TARGETPATH /resource/apps
+TARGETPATH /apparctestregfiles
END
START RESOURCE tRuleBasedApp4_reg.rss
-TARGETPATH /private/10003a3f/apps
+TARGETPATH /apparctestregfiles
END
SMPSAFE
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/t_clientnotifstep.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,851 @@
+// 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:
+//
+
+/**
+ @file
+ @internalComponent - Internal Symbian test code
+*/
+
+#include "t_clientnotifstep.h"
+#include <e32base.h>
+#include <e32cmn.h>
+#include "T_SisFileInstaller.h"
+#include <apgtask.h>
+#include <apgnotif.h>
+
+_LIT(KSimpleAppSisFile, "z:\\apparctest\\apparctestsisfiles\\SimpleApparcTestApp.sis");
+_LIT(KSimpleAppComponent, "SimpleApparcTestApp");
+
+_LIT(KTestMultipleAppsSisFile, "z:\\apparctest\\apparctestsisfiles\\TestMultipleApps.sis");
+_LIT(KTestMultipleAppsComponent, "TestMultipleApps");
+
+_LIT(KTestMultipleAppsDowngradeSisFile, "z:\\apparctest\\apparctestsisfiles\\TestMultipleAppsDowngrade.sis");
+_LIT(KTestMultipleAppsDowngradeComponent, "TestMultipleApps");
+
+_LIT(KTstAppStandAloneSisFile, "z:\\apparctest\\apparctestsisfiles\\TSTAPP_standalone.sis");
+_LIT(KTstAppStandAloneComponent, "TSTAPP_standalone");
+
+const TUid KUidSimpleApp={0x12008ACE};
+const TUid KUidMultipleApp1={0x102032AB};
+const TUid KUidMultipleApp2={0x10208183};
+const TUid KUidMultipleApp3={0x10208184};
+const TUid KUidTstAppStandalone={10};
+
+CT_ClientNotifStep::~CT_ClientNotifStep()
+/**
+ Destructor
+ */
+ {
+ }
+
+CT_ClientNotifStep::CT_ClientNotifStep()
+/**
+ Constructor
+ */
+ {
+ // Call base class method to set up the human readable name for logging
+ SetTestStepName(KT_ClientNotifStep);
+ }
+
+TVerdict CT_ClientNotifStep::doTestStepPreambleL()
+/**
+ @return - TVerdict code
+ Override of base class virtual
+ */
+ {
+ SetTestStepResult(EPass);
+ return TestStepResult();
+ }
+
+TVerdict CT_ClientNotifStep::doTestStepPostambleL()
+/**
+ @return - TVerdict code
+ Override of base class virtual
+ */
+ {
+ return TestStepResult();
+ }
+
+
+TVerdict CT_ClientNotifStep::doTestStepL()
+{
+ RunTestCases();
+ return TestStepResult();
+}
+
+
+void CT_ClientNotifStep::RunTestCases()
+ {
+ RTestableApaLsSession ls;
+ User::LeaveIfError(ls.Connect());
+
+ TApaAppInfo info;
+ TUid uid = {0x12008ACE};
+ TInt err = ls.GetAppInfo(info, uid);
+ if(err == KErrNone)
+ {
+ CSisFileInstaller sisFileInstaller;
+ sisFileInstaller.UninstallSisL(KSimpleAppComponent);
+ }
+
+ //DONT_CHECK is used because when an application is installed the updated application
+ //information is added in the session objects. This causes increase of memory at server side.
+ //As there can be multiple applications registered with apparc for applist change notifications,
+ //its not possible to clear the information in all the session objects.
+ HEAP_TEST_LS_SESSION(ls, 0, DONT_CHECK, TestClientNotifInitialApplistCreation(ls), NO_CLEANUP);
+ HEAP_TEST_LS_SESSION(ls, 0, DONT_CHECK, TestClientNotifLanguageChange(ls), NO_CLEANUP);
+ HEAP_TEST_LS_SESSION(ls, 0, DONT_CHECK, TestClientNotifSingleAppInstallation(ls), NO_CLEANUP);
+ HEAP_TEST_LS_SESSION(ls, 0, DONT_CHECK, TestClientNotifMultipleAppInstallation(ls), NO_CLEANUP);
+ HEAP_TEST_LS_SESSION(ls, 0, DONT_CHECK, TestClientNotifUpgradeApp(ls), NO_CLEANUP);
+ HEAP_TEST_LS_SESSION(ls, 0, DONT_CHECK, TestClientNotifMultipleInstallations(ls), NO_CLEANUP);
+ HEAP_TEST_LS_SESSION(ls, 0, DONT_CHECK, TestClientNotifWithoutSetNotify(ls), NO_CLEANUP);
+ HEAP_TEST_LS_SESSION(ls, 0, DONT_CHECK, TestClientNotifOnPackageUpgrade(ls), NO_CLEANUP);
+ HEAP_TEST_LS_SESSION(ls, 0, DONT_CHECK, TestClientNotifOnPackageDowngrade(ls), NO_CLEANUP);
+ ls.Close();
+ }
+
+
+/**
+ @SYMTestCaseID APPFWK-APPARC-0106
+
+
+ @SYMTestCaseDesc Tests apparc will not provide updated application information when the application list
+ created first time after device bootup.
+
+ @SYMTestPriority High
+
+ @SYMTestStatus Implemented
+
+ @SYMTestActions 1. Wait till the applist got created after phone boot.
+ 2. Retrieve the updated application information and check it is empty.
+
+
+ @SYMTestExpectedResults Apparc will not provide updated application information.
+ */
+void CT_ClientNotifStep::TestClientNotifInitialApplistCreation(RTestableApaLsSession &aLs)
+ {
+ INFO_PRINTF1(_L("TestClientNotifInitialApplistCreation started............"));
+
+ TRequestStatus applistChangeStatus;
+ TRequestStatus applistCreationStatus;
+ //Register with apparc for applist change notification
+ aLs.SetNotify(ETrue, applistChangeStatus);
+ aLs.RegisterListPopulationCompleteObserver(applistCreationStatus);
+ User::WaitForRequest(applistCreationStatus);
+ User::WaitForRequest(applistChangeStatus);
+
+ //Get the updated application information from apparc.
+ RArray<TApaAppUpdateInfo> updatedAppsInfo;
+ CleanupClosePushL(updatedAppsInfo);
+ INFO_PRINTF1(_L("Retrieving updated application information after installation"));
+ aLs.UpdatedAppsInfoL(updatedAppsInfo);
+ INFO_PRINTF2(_L("Updated application count: %d expected: 0"), updatedAppsInfo.Count());
+ TEST(updatedAppsInfo.Count() == 0);
+
+ CleanupStack::PopAndDestroy(); //updatedAppsInfo
+ INFO_PRINTF1(_L("TestClientNotifInitialApplistCreation ended............"));
+ }
+
+
+void CT_ClientNotifStep::ChangeLocaleL(TLanguage aLanguage)
+ {
+ _LIT(KLitLanguageLocaleDllNameBase, "elocl_lan");
+ //Region and collation code values are hard coded, as the check, after changing the locale is made for the language only.
+ _LIT(KLitRegionLocaleDllNameBase, "elocl_reg.826");
+ _LIT(KLitCollationLocaleDllNameBase, "elocl_col.001");
+ _LIT(ThreeDigExt,".%03d");
+ TExtendedLocale localeDll;
+ const TUidType uidType(TUid::Uid(0x10000079),TUid::Uid(0x100039e6));
+ TBuf<16> languageLocaleDllName(KLitLanguageLocaleDllNameBase);
+ languageLocaleDllName.AppendFormat(ThreeDigExt, aLanguage);
+ TBuf<16> regionLocaleDllName(KLitRegionLocaleDllNameBase);
+ TBuf<16> collationLocaleDllName(KLitCollationLocaleDllNameBase);
+ // Try to load the locale dll
+ TInt error=localeDll.LoadLocale(languageLocaleDllName, regionLocaleDllName, collationLocaleDllName);
+
+ if (error==KErrNotFound)
+ {
+ // Locale dll is not found for the asked language.
+ ERR_PRINTF2(_L("Failed to find the locale dll for %d"), aLanguage);
+ }
+
+ User::LeaveIfError(error);
+ localeDll.SaveSystemSettings();
+ }
+
+
+
+/**
+ @SYMTestCaseID APPFWK-APPARC-0106
+
+
+ @SYMTestCaseDesc Tests apparc will not provide updated application information when the application list
+ updated due phone language change.
+
+ @SYMTestPriority High
+
+ @SYMTestStatus Implemented
+
+ @SYMTestActions 1. Wait till the applist got updated after phone language change.
+ 2. Retrieve the updated application information and check it is empty.
+
+
+ @SYMTestExpectedResults Apparc will not provide updated application information.
+ */
+void CT_ClientNotifStep::TestClientNotifLanguageChange(RTestableApaLsSession &aLs)
+ {
+ INFO_PRINTF1(_L("TestClientNotifLanguageChange started............"));
+
+ TRequestStatus applistChangeStatus;
+ aLs.SetNotify(EFalse, applistChangeStatus);
+ //Change language
+ ChangeLocaleL(ELangGerman);
+ User::WaitForRequest(applistChangeStatus);
+
+ //Get the updated application information from apparc.
+ RArray<TApaAppUpdateInfo> updatedAppsInfo;
+ CleanupClosePushL(updatedAppsInfo);
+ INFO_PRINTF1(_L("Retrieving updated application information after installation"));
+ aLs.UpdatedAppsInfoL(updatedAppsInfo);
+ INFO_PRINTF2(_L("Updated application count: %d"), updatedAppsInfo.Count());
+ TEST(updatedAppsInfo.Count() == 0);
+
+ applistChangeStatus=KRequestPending;
+ aLs.SetNotify(EFalse, applistChangeStatus);
+ ChangeLocaleL(ELangEnglish);
+ User::WaitForRequest(applistChangeStatus);
+
+ CleanupStack::PopAndDestroy(); //updatedAppsInfo
+ INFO_PRINTF1(_L("TestClientNotifInitialApplistCreation ended............"));
+ }
+
+/**
+ @SYMTestCaseID APPFWK-APPARC-0106
+
+
+ @SYMTestCaseDesc Tests whether apparc provides updated application information when single application is installed
+ and uninstalled.
+
+ @SYMTestPriority High
+
+ @SYMTestStatus Implemented
+
+ @SYMTestActions 1. Installs a sis file which has single application and waits till applist is changed.
+ 2. Checks the updated information provided by apparc is as expected.
+ 3. Uninstalls the component installed in Step 1
+ 4. Checks the updated information provided by apparc is as expected.
+
+
+ @SYMTestExpectedResults Apparc provides updated application information.,
+ */
+void CT_ClientNotifStep::TestClientNotifSingleAppInstallation(RTestableApaLsSession &aLs)
+ {
+ INFO_PRINTF1(_L("TestSingleAppInstallation started............"));
+ CSisFileInstaller sisInstaller;
+ TRequestStatus applistChangeStatus;
+
+ INFO_PRINTF1(_L("Installing single application"));
+ aLs.SetNotify(EFalse, applistChangeStatus);
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KSimpleAppSisFile);
+ sisInstaller.InstallSisL(KSimpleAppSisFile);
+ User::WaitForRequest(applistChangeStatus);
+
+ //Get the updated application information from apparc.
+ RArray<TApaAppUpdateInfo> updatedAppsInfo;
+ CleanupClosePushL(updatedAppsInfo);
+ INFO_PRINTF1(_L("Retrieving updated application information after installation"));
+ aLs.UpdatedAppsInfoL(updatedAppsInfo);
+ INFO_PRINTF2(_L("Updated application count: %d"), updatedAppsInfo.Count());
+
+ //Check the information provided by apparc is what is expected.
+ TEST(updatedAppsInfo.Count()== 1);
+ TEST(updatedAppsInfo[0].iAppUid == KUidSimpleApp);
+ TEST(updatedAppsInfo[0].iAction == TApaAppUpdateInfo::EAppPresent);
+
+ //Check the application is available in the applist.
+ TApaAppInfo appInfo;
+ TEST(aLs.GetAppInfo(appInfo, KUidSimpleApp) == KErrNone);
+
+ INFO_PRINTF1(_L("Unnstalling single application"));
+ applistChangeStatus=KRequestPending;
+ aLs.SetNotify(EFalse, applistChangeStatus);
+ sisInstaller.UninstallSisL(KSimpleAppComponent);
+ User::WaitForRequest(applistChangeStatus);
+
+ //Get the updated application information from apparc.
+ updatedAppsInfo.Reset();
+ INFO_PRINTF1(_L("Retrieving updated application information after uninstallation"));
+ aLs.UpdatedAppsInfoL(updatedAppsInfo);
+ INFO_PRINTF2(_L("Updated application count: %d"), updatedAppsInfo.Count());
+
+ //Check the information provided by apparc is what is expected.
+ TEST(updatedAppsInfo.Count()== 1);
+ TEST(updatedAppsInfo[0].iAppUid == KUidSimpleApp);
+ TEST(updatedAppsInfo[0].iAction == TApaAppUpdateInfo::EAppNotPresent);
+
+ //Check the application is not available in the applist.
+ TEST(aLs.GetAppInfo(appInfo, KUidSimpleApp) == KErrNotFound);
+
+ CleanupStack::PopAndDestroy(); //updatedAppsInfo
+ INFO_PRINTF1(_L("TestSingleAppInstallation ended............"));
+ }
+
+
+/**
+ @SYMTestCaseID APPFWK-APPARC-0106
+
+
+ @SYMTestCaseDesc Tests whether apparc provides updated application information when multiple applications are installed
+ and uninstalled.
+
+ @SYMTestPriority High
+
+ @SYMTestStatus Implemented
+
+ @SYMTestActions 1. Installs a sis file which has multiple applications and waits till applist is changed.
+ 2. Checks the updated information provided by apparc is as expected.
+ 3. Uninstalls the component installed in Step 1
+ 4. Checks the updated information provided by apparc is as expected.
+
+
+ @SYMTestExpectedResults Apparc provides updated application information.
+ */
+
+void CT_ClientNotifStep::TestClientNotifMultipleAppInstallation(RTestableApaLsSession &aLs)
+ {
+ INFO_PRINTF1(_L("TestMultipleAppInstallation started............"));
+ CSisFileInstaller sisInstaller;
+ TRequestStatus applistChangeStatus;
+
+ INFO_PRINTF1(_L("Installing multiple applications"));
+ aLs.SetNotify(EFalse, applistChangeStatus);
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KTestMultipleAppsSisFile);
+ sisInstaller.InstallSisL(KTestMultipleAppsSisFile);
+ User::WaitForRequest(applistChangeStatus);
+
+ //Get the updated application information from apparc.
+ RArray<TApaAppUpdateInfo> updatedAppsInfo;
+ CleanupClosePushL(updatedAppsInfo);
+ INFO_PRINTF1(_L("Retrieving updated application information after installation"));
+ aLs.UpdatedAppsInfoL(updatedAppsInfo);
+ INFO_PRINTF2(_L("Updated application count: %d"), updatedAppsInfo.Count());
+
+ //Check the information provided by apparc is what is expected.
+ TEST(updatedAppsInfo.Count()== 3);
+ TEST(updatedAppsInfo[0].iAppUid == KUidMultipleApp1);
+ TEST(updatedAppsInfo[0].iAction == TApaAppUpdateInfo::EAppPresent);
+ TEST(updatedAppsInfo[1].iAppUid == KUidMultipleApp2);
+ TEST(updatedAppsInfo[1].iAction == TApaAppUpdateInfo::EAppPresent);
+ TEST(updatedAppsInfo[2].iAppUid == KUidMultipleApp3);
+ TEST(updatedAppsInfo[2].iAction == TApaAppUpdateInfo::EAppPresent);
+
+ //Check the application is available in the applist.
+ TApaAppInfo appInfo;
+ TEST(aLs.GetAppInfo(appInfo, KUidMultipleApp1) == KErrNone);
+ TEST(aLs.GetAppInfo(appInfo, KUidMultipleApp2) == KErrNone);
+ TEST(aLs.GetAppInfo(appInfo, KUidMultipleApp3) == KErrNone);
+
+ INFO_PRINTF1(_L("Uninstalling multiple applications"));
+ applistChangeStatus=KRequestPending;
+ aLs.SetNotify(EFalse, applistChangeStatus);
+ sisInstaller.UninstallSisL(KTestMultipleAppsComponent);
+ User::WaitForRequest(applistChangeStatus);
+
+ //Get the updated application information from apparc.
+ updatedAppsInfo.Reset();
+ INFO_PRINTF1(_L("Retrieving updated application information after uninstallation"));
+ aLs.UpdatedAppsInfoL(updatedAppsInfo);
+ INFO_PRINTF2(_L("Updated application count: %d"), updatedAppsInfo.Count());
+ TEST(updatedAppsInfo.Count()== 3);
+
+ //Check the information provided by apparc is what is expected.
+ TEST(updatedAppsInfo[0].iAppUid == KUidMultipleApp1);
+ TEST(updatedAppsInfo[0].iAction == TApaAppUpdateInfo::EAppNotPresent);
+ TEST(updatedAppsInfo[1].iAppUid == KUidMultipleApp2);
+ TEST(updatedAppsInfo[1].iAction == TApaAppUpdateInfo::EAppNotPresent);
+ TEST(updatedAppsInfo[2].iAppUid == KUidMultipleApp3);
+ TEST(updatedAppsInfo[2].iAction == TApaAppUpdateInfo::EAppNotPresent);
+
+ //Check the application is not available in the applist.
+ TEST(aLs.GetAppInfo(appInfo, KUidMultipleApp1) == KErrNotFound);
+ TEST(aLs.GetAppInfo(appInfo, KUidMultipleApp2) == KErrNotFound);
+ TEST(aLs.GetAppInfo(appInfo, KUidMultipleApp3) == KErrNotFound);
+
+ CleanupStack::PopAndDestroy(); //updatedAppsInfo
+ INFO_PRINTF1(_L("TestMultipleAppInstallation ended............"));
+ }
+
+
+/**
+ @SYMTestCaseID APPFWK-APPARC-0106
+
+
+ @SYMTestCaseDesc Tests whether apparc provides updated application information when an applications is
+ upgraded.
+
+ @SYMTestPriority High
+
+ @SYMTestStatus Implemented
+
+ @SYMTestActions 1. Checks whether upgrading application exists in applist.
+ 2. Installs a sis file which upgrades existing applications and waits till applist is changed.
+ 2. Checks the updated information provided by apparc is as expected.
+ 3. Uninstalls the component installed in Step 2
+ 4. Checks the updated information provided by apparc is as expected.
+
+
+ @SYMTestExpectedResults Apparc provides updated application information.
+ */
+void CT_ClientNotifStep::TestClientNotifUpgradeApp(RTestableApaLsSession &aLs)
+{
+ INFO_PRINTF1(_L("TestClientNotifUpgradeApp started............"));
+ CSisFileInstaller sisInstaller;
+ TRequestStatus applistChangeStatus;
+
+ INFO_PRINTF1(_L("Check the application is present before upgrade"));
+ //Check the application is available in the applist.
+ TApaAppInfo appInfo;
+ TEST(aLs.GetAppInfo(appInfo, KUidTstAppStandalone) == KErrNone);
+
+ INFO_PRINTF1(_L("Installing upgrade application"));
+ aLs.SetNotify(EFalse, applistChangeStatus);
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KTstAppStandAloneSisFile);
+ sisInstaller.InstallSisL(KTstAppStandAloneSisFile);
+ User::WaitForRequest(applistChangeStatus);
+
+ //Get the updated application information from apparc.
+ RArray<TApaAppUpdateInfo> updatedAppsInfo;
+ CleanupClosePushL(updatedAppsInfo);
+ INFO_PRINTF1(_L("Retrieving updated application information after installation"));
+ aLs.UpdatedAppsInfoL(updatedAppsInfo);
+ INFO_PRINTF2(_L("Updated application count: %d"), updatedAppsInfo.Count());
+
+ //Check the information provided by apparc is what is expected.
+ TEST(updatedAppsInfo.Count()== 1);
+ TEST(updatedAppsInfo[0].iAppUid == KUidTstAppStandalone);
+ TEST(updatedAppsInfo[0].iAction == TApaAppUpdateInfo::EAppPresent);
+
+ //Check the application is available in the applist.
+ TEST(aLs.GetAppInfo(appInfo, KUidTstAppStandalone) == KErrNone);
+
+ INFO_PRINTF1(_L("Unnstalling upgrade application"));
+ applistChangeStatus=KRequestPending;
+ aLs.SetNotify(EFalse, applistChangeStatus);
+ sisInstaller.UninstallSisL(KTstAppStandAloneComponent);
+ User::WaitForRequest(applistChangeStatus);
+
+ //Get the updated application information from apparc.
+ updatedAppsInfo.Reset();
+ INFO_PRINTF1(_L("Retrieving updated application information after uninstallation"));
+ aLs.UpdatedAppsInfoL(updatedAppsInfo);
+ INFO_PRINTF2(_L("Updated application count: %d"), updatedAppsInfo.Count());
+
+ //Check the information provided by apparc is what is expected.
+ TEST(updatedAppsInfo.Count()== 1);
+ TEST(updatedAppsInfo[0].iAppUid == KUidTstAppStandalone);
+ TEST(updatedAppsInfo[0].iAction == TApaAppUpdateInfo::EAppPresent);
+
+ //Check the application is still available in the applist.
+ TEST(aLs.GetAppInfo(appInfo, KUidTstAppStandalone) == KErrNone);
+
+ CleanupStack::PopAndDestroy(); //updatedAppsInfo
+ INFO_PRINTF1(_L("TestClientNotifUpgradeApp ended............"));
+}
+
+
+/**
+ @SYMTestCaseID APPFWK-APPARC-0106
+
+
+ @SYMTestCaseDesc Tests whether apparc provides updated application information when there are multiple installations
+ happened before the clients requests for updated application information.
+
+ @SYMTestPriority High
+
+ @SYMTestStatus Implemented
+
+ @SYMTestActions 1. Installs a sis file and waits till applist is changed.
+ 2. Installs another sis file and waits till applist is changed.
+ 3. Checks the updated information provided by apparc is as expected.
+ 4. Uninstalls the component installed in Step 1 and waits till applist is changed.
+ 5. Uninstalls the component installed in Step 2 and waits till applist is changed.
+ 6. Checks the updated information provided by apparc is as expected.
+
+
+ @SYMTestExpectedResults Apparc provides updated application information.
+ */
+void CT_ClientNotifStep::TestClientNotifMultipleInstallations(RTestableApaLsSession &aLs)
+{
+ INFO_PRINTF1(_L("TestClientNotifMultipleInstallations started............"));
+ CSisFileInstaller sisInstaller;
+ TRequestStatus applistChangeStatus;
+
+ INFO_PRINTF1(_L("Installing first sis file"));
+ aLs.SetNotify(EFalse, applistChangeStatus);
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KSimpleAppSisFile);
+ sisInstaller.InstallSisL(KSimpleAppSisFile);
+ User::WaitForRequest(applistChangeStatus);
+
+ INFO_PRINTF1(_L("Installing second sis file"));
+ applistChangeStatus=KRequestPending;
+ aLs.SetNotify(EFalse, applistChangeStatus);
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KTestMultipleAppsSisFile);
+ sisInstaller.InstallSisL(KTestMultipleAppsSisFile);
+ User::WaitForRequest(applistChangeStatus);
+
+ //Get the updated application information from apparc.
+ RArray<TApaAppUpdateInfo> updatedAppsInfo;
+ CleanupClosePushL(updatedAppsInfo);
+ INFO_PRINTF1(_L("Retrieving updated application information after installations"));
+ aLs.UpdatedAppsInfoL(updatedAppsInfo);
+ INFO_PRINTF2(_L("Updated application count: %d"), updatedAppsInfo.Count());
+
+ //Check the information provided by apparc is what is expected.
+ TEST(updatedAppsInfo.Count()== 4);
+ TEST(updatedAppsInfo[0].iAppUid == KUidSimpleApp);
+ TEST(updatedAppsInfo[0].iAction == TApaAppUpdateInfo::EAppPresent);
+ TEST(updatedAppsInfo[1].iAppUid == KUidMultipleApp1);
+ TEST(updatedAppsInfo[1].iAction == TApaAppUpdateInfo::EAppPresent);
+ TEST(updatedAppsInfo[2].iAppUid == KUidMultipleApp2);
+ TEST(updatedAppsInfo[2].iAction == TApaAppUpdateInfo::EAppPresent);
+ TEST(updatedAppsInfo[3].iAppUid == KUidMultipleApp3);
+ TEST(updatedAppsInfo[2].iAction == TApaAppUpdateInfo::EAppPresent);
+
+ //Check the applications is available in the applist.
+ TApaAppInfo appInfo;
+ TEST(aLs.GetAppInfo(appInfo, KUidSimpleApp) == KErrNone);
+ TEST(aLs.GetAppInfo(appInfo, KUidMultipleApp1) == KErrNone);
+ TEST(aLs.GetAppInfo(appInfo, KUidMultipleApp2) == KErrNone);
+ TEST(aLs.GetAppInfo(appInfo, KUidMultipleApp3) == KErrNone);
+
+ INFO_PRINTF1(_L("Unnstalling first component"));
+ applistChangeStatus=KRequestPending;
+ aLs.SetNotify(EFalse, applistChangeStatus);
+ sisInstaller.UninstallSisL(KSimpleAppComponent);
+ User::WaitForRequest(applistChangeStatus);
+
+ INFO_PRINTF1(_L("Unnstalling second component"));
+ applistChangeStatus=KRequestPending;
+ aLs.SetNotify(EFalse, applistChangeStatus);
+ sisInstaller.UninstallSisL(KTestMultipleAppsComponent);
+ User::WaitForRequest(applistChangeStatus);
+
+ //Get the updated application information from apparc.
+ updatedAppsInfo.Reset();
+ INFO_PRINTF1(_L("Retrieving updated application information after uninstallation"));
+ aLs.UpdatedAppsInfoL(updatedAppsInfo);
+ INFO_PRINTF2(_L("Updated application count: %d"), updatedAppsInfo.Count());
+
+ //Check the information provided by apparc is what is expected.
+ TEST(updatedAppsInfo.Count()== 4);
+ TEST(updatedAppsInfo[0].iAppUid == KUidSimpleApp);
+ TEST(updatedAppsInfo[0].iAction == TApaAppUpdateInfo::EAppNotPresent);
+ TEST(updatedAppsInfo[1].iAppUid == KUidMultipleApp1);
+ TEST(updatedAppsInfo[1].iAction == TApaAppUpdateInfo::EAppNotPresent);
+ TEST(updatedAppsInfo[2].iAppUid == KUidMultipleApp2);
+ TEST(updatedAppsInfo[2].iAction == TApaAppUpdateInfo::EAppNotPresent);
+ TEST(updatedAppsInfo[3].iAppUid == KUidMultipleApp3);
+ TEST(updatedAppsInfo[3].iAction == TApaAppUpdateInfo::EAppNotPresent);
+
+ //Check the applications are not available in the applist.
+ TEST(aLs.GetAppInfo(appInfo, KUidSimpleApp) == KErrNotFound);
+ TEST(aLs.GetAppInfo(appInfo, KUidMultipleApp1) == KErrNotFound);
+ TEST(aLs.GetAppInfo(appInfo, KUidMultipleApp2) == KErrNotFound);
+ TEST(aLs.GetAppInfo(appInfo, KUidMultipleApp3) == KErrNotFound);
+
+ CleanupStack::PopAndDestroy(); //updatedAppsInfo
+ INFO_PRINTF1(_L("TestClientNotifMultipleInstallations ended............"));
+}
+
+
+/**
+ @SYMTestCaseID APPFWK-APPARC-0106
+
+
+ @SYMTestCaseDesc Tests apparc will not provide updated application information if SetNotify is not called
+ on an apparc session. Apparc only maintains updated application information with the sessions
+ which actually requested SetNotify and not yet called UpdatedAppsInfoL API.
+
+ @SYMTestPriority High
+
+ @SYMTestStatus Implemented
+
+ @SYMTestActions 1. Installs a sis file which has single application and waits till applist is changed.
+ 2. Retrieves the updated applist from different apparc session and checks the list is empty.
+
+
+ @SYMTestExpectedResults Apparc provides updated application information.
+ */
+void CT_ClientNotifStep::TestClientNotifWithoutSetNotify(RTestableApaLsSession &aLs)
+ {
+ INFO_PRINTF1(_L("TestClientNotifWithoutSetNotify started............"));
+ CSisFileInstaller sisInstaller;
+ TRequestStatus applistChangeStatus;
+
+ INFO_PRINTF1(_L("Installing application"));
+ sisInstaller.InstallSisAndWaitForAppListUpdateL(KSimpleAppSisFile);
+
+ //Get the updated application information from apparc.
+ RArray<TApaAppUpdateInfo> updatedAppsInfo;
+ CleanupClosePushL(updatedAppsInfo);
+ INFO_PRINTF1(_L("Retrieving updated application information after installation"));
+ aLs.UpdatedAppsInfoL(updatedAppsInfo);
+ INFO_PRINTF2(_L("Updated application count: %d"), updatedAppsInfo.Count());
+
+ //Check the information provided by apparc is what is expected.
+ TEST(updatedAppsInfo.Count()== 0);
+
+ INFO_PRINTF1(_L("Unnstalling application"));
+ sisInstaller.UninstallSisAndWaitForAppListUpdateL(KSimpleAppComponent);
+
+ //Get the updated application information from apparc.
+ updatedAppsInfo.Reset();
+ INFO_PRINTF1(_L("Retrieving updated application information after uninstallation"));
+ aLs.UpdatedAppsInfoL(updatedAppsInfo);
+ INFO_PRINTF2(_L("Updated application count: %d"), updatedAppsInfo.Count());
+
+ //Check the information provided by apparc is what is expected.
+ TEST(updatedAppsInfo.Count()== 0);
+
+ CleanupStack::PopAndDestroy(); //updatedAppsInfo
+ INFO_PRINTF1(_L("TestClientNotifWithoutSetNotify ended............"));
+ }
+
+
+/**
+ @SYMTestCaseID APPFWK-APPARC-0106
+
+
+ @SYMTestCaseDesc Tests whether apparc provides updated application information a component is upgraded.
+
+ @SYMTestPriority High
+
+ @SYMTestStatus Implemented
+
+ @SYMTestActions 1. Installs a sis file which has 2 applications and waits till applist is changed.
+ 2. Checks the updated information provided by apparc is as expected.
+ 3. Upgrades the component which is installed in Step 1 which has one more application.
+ 4. Checks the updated information provided by apparc is as expected.
+ 3. Uninstalls the component installed in Step 3
+ 4. Checks the updated information provided by apparc is as expected.
+
+
+ @SYMTestExpectedResults Apparc provides updated application information.
+ */
+
+void CT_ClientNotifStep::TestClientNotifOnPackageUpgrade(RTestableApaLsSession &aLs)
+ {
+ INFO_PRINTF1(_L("TestClientNotifOnPackageUpgrade started............"));
+ CSisFileInstaller sisInstaller;
+ TRequestStatus applistChangeStatus;
+
+ INFO_PRINTF1(_L("Installing sis file which has 2 applications"));
+ aLs.SetNotify(EFalse, applistChangeStatus);
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KTestMultipleAppsDowngradeSisFile);
+ sisInstaller.InstallSisL(KTestMultipleAppsDowngradeSisFile);
+ User::WaitForRequest(applistChangeStatus);
+
+ //Get the updated application information from apparc.
+ RArray<TApaAppUpdateInfo> updatedAppsInfo;
+ CleanupClosePushL(updatedAppsInfo);
+ INFO_PRINTF1(_L("Retrieving updated application information after installation"));
+ aLs.UpdatedAppsInfoL(updatedAppsInfo);
+ INFO_PRINTF2(_L("Updated application count: %d"), updatedAppsInfo.Count());
+
+ //Check the information provided by apparc is what is expected.
+ TEST(updatedAppsInfo.Count()== 2);
+ TEST(updatedAppsInfo[0].iAppUid == KUidMultipleApp2);
+ TEST(updatedAppsInfo[0].iAction == TApaAppUpdateInfo::EAppPresent);
+ TEST(updatedAppsInfo[1].iAppUid == KUidMultipleApp3);
+ TEST(updatedAppsInfo[1].iAction == TApaAppUpdateInfo::EAppPresent);
+
+ //Check the application is available in the applist.
+ TApaAppInfo appInfo;
+ TEST(aLs.GetAppInfo(appInfo, KUidMultipleApp2) == KErrNone);
+ TEST(aLs.GetAppInfo(appInfo, KUidMultipleApp3) == KErrNone);
+
+
+ INFO_PRINTF1(_L("Installing upgrade sis file which has 3 applications"));
+ applistChangeStatus=KRequestPending;
+ aLs.SetNotify(EFalse, applistChangeStatus);
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KTestMultipleAppsSisFile);
+ sisInstaller.InstallSisL(KTestMultipleAppsSisFile);
+ User::WaitForRequest(applistChangeStatus);
+
+ //Get the updated application information from apparc.
+ updatedAppsInfo.Reset();
+ INFO_PRINTF1(_L("Retrieving updated application information after installation"));
+ aLs.UpdatedAppsInfoL(updatedAppsInfo);
+ INFO_PRINTF2(_L("Updated application count: %d"), updatedAppsInfo.Count());
+
+ //Check the information provided by apparc is what is expected.
+ TEST(updatedAppsInfo.Count()== 3);
+ TEST(updatedAppsInfo[0].iAppUid == KUidMultipleApp1);
+ TEST(updatedAppsInfo[0].iAction == TApaAppUpdateInfo::EAppPresent);
+ TEST(updatedAppsInfo[1].iAppUid == KUidMultipleApp2);
+ TEST(updatedAppsInfo[1].iAction == TApaAppUpdateInfo::EAppPresent);
+ TEST(updatedAppsInfo[2].iAppUid == KUidMultipleApp3);
+ TEST(updatedAppsInfo[2].iAction == TApaAppUpdateInfo::EAppPresent);
+
+ //Check the application is available in the applist.
+ TEST(aLs.GetAppInfo(appInfo, KUidMultipleApp1) == KErrNone);
+ TEST(aLs.GetAppInfo(appInfo, KUidMultipleApp2) == KErrNone);
+ TEST(aLs.GetAppInfo(appInfo, KUidMultipleApp3) == KErrNone);
+
+ INFO_PRINTF1(_L("Uninstalling applications ............"));
+ applistChangeStatus=KRequestPending;
+ aLs.SetNotify(EFalse, applistChangeStatus);
+ sisInstaller.UninstallSisL(KTestMultipleAppsComponent);
+ User::WaitForRequest(applistChangeStatus);
+
+ //Get the updated application information from apparc.
+ updatedAppsInfo.Reset();
+ INFO_PRINTF1(_L("Retrieving updated application information after uninstallation"));
+ aLs.UpdatedAppsInfoL(updatedAppsInfo);
+ INFO_PRINTF2(_L("Updated application count: %d"), updatedAppsInfo.Count());
+ TEST(updatedAppsInfo.Count()== 3);
+
+ //Check the information provided by apparc is what is expected.
+ TEST(updatedAppsInfo[0].iAppUid == KUidMultipleApp1);
+ TEST(updatedAppsInfo[0].iAction == TApaAppUpdateInfo::EAppNotPresent);
+ TEST(updatedAppsInfo[1].iAppUid == KUidMultipleApp2);
+ TEST(updatedAppsInfo[1].iAction == TApaAppUpdateInfo::EAppNotPresent);
+ TEST(updatedAppsInfo[2].iAppUid == KUidMultipleApp3);
+ TEST(updatedAppsInfo[2].iAction == TApaAppUpdateInfo::EAppNotPresent);
+
+ //Check the application is not available in the applist.
+ TEST(aLs.GetAppInfo(appInfo, KUidMultipleApp1) == KErrNotFound);
+ TEST(aLs.GetAppInfo(appInfo, KUidMultipleApp2) == KErrNotFound);
+ TEST(aLs.GetAppInfo(appInfo, KUidMultipleApp3) == KErrNotFound);
+
+ CleanupStack::PopAndDestroy(); //updatedAppsInfo
+ INFO_PRINTF1(_L("TestMultipleAppInstallation ended............"));
+ }
+
+
+
+/**
+ @SYMTestCaseID APPFWK-APPARC-0106
+
+
+ @SYMTestCaseDesc Tests whether apparc provides updated application information a component is upgraded.
+
+ @SYMTestPriority High
+
+ @SYMTestStatus Implemented
+
+ @SYMTestActions 1. Installs a sis file which has 3 applications and waits till applist is changed.
+ 2. Checks the updated information provided by apparc is as expected.
+ 3. Degrades the component which is installed in Step 1 which has only 2 applications.
+ 4. Checks the updated information provided by apparc is as expected.
+ 3. Uninstalls the component installed in Step 3
+ 4. Checks the updated information provided by apparc is as expected.
+
+
+ @SYMTestExpectedResults Apparc provides updated application information.
+ */
+
+void CT_ClientNotifStep::TestClientNotifOnPackageDowngrade(RTestableApaLsSession &aLs)
+ {
+ INFO_PRINTF1(_L("TestClientNotifOnPackageDowngrade started............"));
+ CSisFileInstaller sisInstaller;
+ TRequestStatus applistChangeStatus;
+
+ INFO_PRINTF1(_L("Installing sis file which has 3 applications"));
+ aLs.SetNotify(EFalse, applistChangeStatus);
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KTestMultipleAppsSisFile);
+ sisInstaller.InstallSisL(KTestMultipleAppsSisFile);
+ User::WaitForRequest(applistChangeStatus);
+
+ //Get the updated application information from apparc.
+ RArray<TApaAppUpdateInfo> updatedAppsInfo;
+ CleanupClosePushL(updatedAppsInfo);
+ INFO_PRINTF1(_L("Retrieving updated application information after installation"));
+ aLs.UpdatedAppsInfoL(updatedAppsInfo);
+ INFO_PRINTF2(_L("Updated application count: %d"), updatedAppsInfo.Count());
+
+ //Check the information provided by apparc is what is expected.
+ TEST(updatedAppsInfo.Count()== 3);
+ TEST(updatedAppsInfo[0].iAppUid == KUidMultipleApp1);
+ TEST(updatedAppsInfo[0].iAction == TApaAppUpdateInfo::EAppPresent);
+ TEST(updatedAppsInfo[1].iAppUid == KUidMultipleApp2);
+ TEST(updatedAppsInfo[1].iAction == TApaAppUpdateInfo::EAppPresent);
+ TEST(updatedAppsInfo[2].iAppUid == KUidMultipleApp3);
+ TEST(updatedAppsInfo[2].iAction == TApaAppUpdateInfo::EAppPresent);
+
+
+ //Check the application is available in the applist.
+ TApaAppInfo appInfo;
+ TEST(aLs.GetAppInfo(appInfo, KUidMultipleApp1) == KErrNone);
+ TEST(aLs.GetAppInfo(appInfo, KUidMultipleApp2) == KErrNone);
+ TEST(aLs.GetAppInfo(appInfo, KUidMultipleApp3) == KErrNone);
+
+
+ INFO_PRINTF1(_L("Installing sis file which has only 2 applications"));
+ applistChangeStatus=KRequestPending;
+ aLs.SetNotify(EFalse, applistChangeStatus);
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KTestMultipleAppsDowngradeSisFile);
+ sisInstaller.InstallSisL(KTestMultipleAppsDowngradeSisFile);
+ User::WaitForRequest(applistChangeStatus);
+
+ //Get the updated application information from apparc.
+ updatedAppsInfo.Reset();
+ INFO_PRINTF1(_L("Retrieving updated application information after installation"));
+ aLs.UpdatedAppsInfoL(updatedAppsInfo);
+ INFO_PRINTF2(_L("Updated application count: %d"), updatedAppsInfo.Count());
+
+ //Check the information provided by apparc is what is expected.
+ TEST(updatedAppsInfo.Count()== 3);
+ TEST(updatedAppsInfo[0].iAppUid == KUidMultipleApp1);
+ TEST(updatedAppsInfo[0].iAction == TApaAppUpdateInfo::EAppNotPresent);
+ TEST(updatedAppsInfo[1].iAppUid == KUidMultipleApp2);
+ TEST(updatedAppsInfo[1].iAction == TApaAppUpdateInfo::EAppPresent);
+ TEST(updatedAppsInfo[2].iAppUid == KUidMultipleApp3);
+ TEST(updatedAppsInfo[2].iAction == TApaAppUpdateInfo::EAppPresent);
+
+ //Check the application is not available in the applist.
+ TEST(aLs.GetAppInfo(appInfo, KUidMultipleApp1) == KErrNotFound);
+
+ //Check the application is available in the applist.
+ TEST(aLs.GetAppInfo(appInfo, KUidMultipleApp2) == KErrNone);
+ TEST(aLs.GetAppInfo(appInfo, KUidMultipleApp3) == KErrNone);
+
+
+ INFO_PRINTF1(_L("Uninstalling applications"));
+ applistChangeStatus=KRequestPending;
+ aLs.SetNotify(EFalse, applistChangeStatus);
+ sisInstaller.UninstallSisL(KTestMultipleAppsDowngradeComponent);
+ User::WaitForRequest(applistChangeStatus);
+
+ //Get the updated application information from apparc.
+ updatedAppsInfo.Reset();
+ INFO_PRINTF1(_L("Retrieving updated application information after uninstallation"));
+ aLs.UpdatedAppsInfoL(updatedAppsInfo);
+ INFO_PRINTF2(_L("Updated application count: %d"), updatedAppsInfo.Count());
+ TEST(updatedAppsInfo.Count()== 2);
+
+ //Check the information provided by apparc is what is expected.
+ TEST(updatedAppsInfo[0].iAppUid == KUidMultipleApp2);
+ TEST(updatedAppsInfo[0].iAction == TApaAppUpdateInfo::EAppNotPresent);
+ TEST(updatedAppsInfo[1].iAppUid == KUidMultipleApp3);
+ TEST(updatedAppsInfo[1].iAction == TApaAppUpdateInfo::EAppNotPresent);
+
+ //Check the application is not available in the applist.
+ TEST(aLs.GetAppInfo(appInfo, KUidMultipleApp2) == KErrNotFound);
+ TEST(aLs.GetAppInfo(appInfo, KUidMultipleApp3) == KErrNotFound);
+
+ CleanupStack::PopAndDestroy(); //updatedAppsInfo
+ INFO_PRINTF1(_L("TestClientNotifOnPackageDowngrade ended............"));
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/t_clientnotifstep.h Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,60 @@
+// 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:
+//
+
+/**
+ @file
+ @internalComponent - Internal Symbian test code
+*/
+
+#if (!defined __T_CLIENTNOTIF_H__)
+#define __T_CLIENTNOTIF_H__
+
+
+#include <test/testexecutestepbase.h>
+
+class RTestableApaLsSession;
+
+
+/*Tests force registration functionality */
+
+class CT_ClientNotifStep : public CTestStep
+ {
+public:
+ CT_ClientNotifStep();
+ ~CT_ClientNotifStep();
+ virtual TVerdict doTestStepPreambleL();
+ virtual TVerdict doTestStepPostambleL();
+ virtual TVerdict doTestStepL();
+
+private:
+ void RunTestCases();
+ void TestClientNotifInitialApplistCreation(RTestableApaLsSession &aLs);
+ void ChangeLocaleL(TLanguage aLanguage);
+ void TestClientNotifLanguageChange(RTestableApaLsSession &aLs);
+
+ void TestClientNotifSingleAppInstallation(RTestableApaLsSession &aLs);
+ void TestClientNotifMultipleAppInstallation(RTestableApaLsSession &aLs);
+ void TestClientNotifUpgradeApp(RTestableApaLsSession &aLs);
+ void TestClientNotifMultipleInstallations(RTestableApaLsSession &aLs);
+ void TestClientNotifWithoutSetNotify(RTestableApaLsSession &aLs);
+ void TestClientNotifOnPackageUpgrade(RTestableApaLsSession &aLs);
+ void TestClientNotifOnPackageDowngrade(RTestableApaLsSession &aLs);
+
+ };
+
+
+_LIT(KT_ClientNotifStep,"T_ClientNotif");
+
+#endif
--- a/appfw/apparchitecture/tef/t_drivenotification.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/t_drivenotification.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-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"
@@ -29,8 +29,11 @@
#include <e32test.h>
#include "appfwk_test_utils.h"
#include "t_drivenotification.h"
+#include "T_SisFileInstaller.h"
-_LIT(KResourceFileSourceZ, "z:\\system\\data\\tnotifydrivesapp_reg.rsc");
+_LIT(KNotifyDriveAppSisFile, "z:\\apparctest\\apparctestsisfiles\\tnotifydrivesapp.sis");
+_LIT(KNotifyDriveAppComponent, "tnotifydrivesapp");
+
void CDriveTestObserver::HandleAppListEvent(TInt /*aEvent*/)
{
@@ -82,16 +85,16 @@
CleanupClosePushL(theLs);
// Wait for applist to be updated....
- RPointerArray<TDesC> dummy;
- User::LeaveIfError(theLs.ForceRegistration(dummy));
+ TRequestStatus status;
+ theLs.SetNotify(ETrue, status);
+ User::WaitForRequest(status);
//Check whether app is not present in the applist
TInt ret = theLs.GetAppInfo(appInfo,appUid);
INFO_PRINTF3(_L(" Expected value is %d, Call to GetAppInfo returned : %d "), KErrNotFound, ret);
TEST(ret==KErrNotFound);
- //Copy the registration file to C: drive.
- CopyRegFileL(EDriveC);
+ //Install the application.
CDriveTestObserver* obs = new(ELeave) CDriveTestObserver();
CleanupStack::PushL(obs);
@@ -99,7 +102,10 @@
CleanupStack::PushL(notif);
obs->iNotifier = notif;
-
+
+ CSisFileInstaller sisFileInstaller;
+ sisFileInstaller.InstallSisL(KNotifyDriveAppSisFile);
+
CActiveScheduler::Start();
//Since c:\\private\\10003a3f\\Import\\apps\\ path is Monitored, a notification is issued and applist is updated.
TEST(obs->iNotified > 0);
@@ -110,11 +116,8 @@
INFO_PRINTF3(_L(" Expected value is %d, Call to GetAppInfo returned : %d "), KErrNone, ret);
TEST(ret==KErrNone);
- //Deleting the rsc file that is present in c:\\private\\10003a3f\\Import\\apps\\ path.
- DeleteRegFileL(EDriveC);
-
- // Wait for applist to be updated....
- User::LeaveIfError(theLs.ForceRegistration(dummy));
+ //Uninstall the application
+ sisFileInstaller.UninstallSisAndWaitForAppListUpdateL(KNotifyDriveAppComponent);
//Check whether applist is updated and app is absent in the applist.
ret = theLs.GetAppInfo(appInfo,appUid);
@@ -128,8 +131,8 @@
//Copy the registration file to drive specified.
CopyRegFileL(drive);
- // Wait for applist to be updated....
- User::LeaveIfError(theLs.ForceRegistration(dummy));
+// // Wait for applist to be updated....
+// User::LeaveIfError(theLs.ForceRegistration(dummy));
//Check whether applist is updated and app is present in the applist.
#ifdef __EABI__
@@ -143,7 +146,7 @@
TEST(ret==KErrNone);
INFO_PRINTF3(_L(" Expected value is %d, Call to GetAppInfo returned : %d "),KErrNone, ret);
//Deleting the rsc file.
- DeleteRegFileL(drive);
+// DeleteRegFileL(drive);
#endif
CleanupStack::PopAndDestroy(3, &theLs);
@@ -184,7 +187,7 @@
{
User::LeaveIfError(ret);
}
- ret = smlServer.CopyFileL(KResourceFileSourceZ, tempPathToBeCopied);
+// ret = smlServer.CopyFileL(KResourceFileSourceZ, tempPathToBeCopied);
TEST(ret == KErrNone);
INFO_PRINTF2(_L("Copied Registration file. Finished with the value : %d "), ret);
CleanupStack::PopAndDestroy(4, &fs);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/t_forceregstep.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,471 @@
+// 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:
+//
+
+/**
+ @file
+ @internalComponent - Internal Symbian test code
+*/
+
+#include "t_forceregstep.h"
+#include <e32base.h>
+#include <e32cmn.h>
+#include "T_SisFileInstaller.h"
+#include <apgtask.h>
+#include <apgnotif.h>
+#include <e32property.h>
+#include<usif/scr/appregentries.h>
+#include "testableapalssession.h"
+
+_LIT(KForceRegApp1SisFile, "z:\\apparctest\\apparctestsisfiles\\ForceRegApp1.sis");
+_LIT(KForceRegApp1Component, "ForceRegApp1");
+
+_LIT(KForceRegMultipleAppsSisFile, "z:\\apparctest\\apparctestsisfiles\\ForceRegMultipleApps.sis");
+_LIT(KForceRegMultipleAppsComponent, "ForceRegMultipleApps");
+
+_LIT(KForceRegApp2SisFile, "z:\\apparctest\\apparctestsisfiles\\ForceRegApp2.sis");
+_LIT(KForceRegApp2Component, "ForceRegApp2");
+
+const TUint KForceRegistratioWaitTime=5000000; //5s
+const TUid KUidForceRegApp2={0xA0001001};
+_LIT(KTestClientNotificationThreadName, "TestClientNotificationThreadName");
+
+
+CT_ForceRegStep::~CT_ForceRegStep()
+/**
+ Destructor
+ */
+ {
+ }
+
+CT_ForceRegStep::CT_ForceRegStep()
+/**
+ Constructor
+ */
+ {
+ // Call base class method to set up the human readable name for logging
+ SetTestStepName(KT_ForceRegStep);
+ }
+
+TVerdict CT_ForceRegStep::doTestStepPreambleL()
+/**
+ @return - TVerdict code
+ Override of base class virtual
+ */
+ {
+
+ //Create property which is used for communication between test and force registered applications.
+ TInt error;
+ error=RProperty::Define(KPropertyCategory, KForceRegTestPropertyKey, RProperty::EInt);
+ if((error != KErrNone) && (error != KErrAlreadyExists))
+ User::Leave(error);
+
+ SetTestStepResult(EPass);
+ return TestStepResult();
+ }
+
+TVerdict CT_ForceRegStep::doTestStepPostambleL()
+/**
+ @return - TVerdict code
+ Override of base class virtual
+ */
+ {
+ RProperty::Delete(KPropertyCategory, KForceRegTestPropertyKey);
+
+ return TestStepResult();
+ }
+
+
+TVerdict CT_ForceRegStep::doTestStepL()
+{
+ RunTestCases();
+ return TestStepResult();
+}
+
+
+void CT_ForceRegStep::RunTestCases()
+ {
+ RTestableApaLsSession ls;
+ User::LeaveIfError(ls.Connect());
+ RPointerArray<TDesC> regFiles;
+ //Check the earlier force registration API is not supported
+ TEST(ls.ForceRegistration(regFiles) == KErrNotSupported);
+
+ CSisFileInstaller sisFileInstaller;
+ TApaAppInfo info;
+ TUid uid1 = {0xA0001000};
+ TInt err = ls.GetAppInfo(info, uid1);
+ if(err == KErrNone)
+ {
+ sisFileInstaller.UninstallSisL(KForceRegApp1Component);
+ }
+
+ TUid uid2 = {0xA0001001};
+ err = ls.GetAppInfo(info, uid2);
+ if(err == KErrNone)
+ {
+ sisFileInstaller.UninstallSisL(KForceRegApp2Component);
+ }
+
+ //Wait if apparc updating the applist
+ TRequestStatus applistChangeStatus;
+ ls.SetNotify(ETrue, applistChangeStatus);
+ User::WaitForRequest(applistChangeStatus);
+
+ //DONT_CHECK is used because when an application is installed the updated application
+ //information is added in the session objects. This causes increase of memory at server side.
+ //As there can be multiple applications registered with apparc for applist change notifications,
+ //its not possible to clear the information in all the session objects.
+ HEAP_TEST_LS_SESSION(ls, 0, DONT_CHECK, TestSingleForceRegistration(ls), NO_CLEANUP);
+ HEAP_TEST_LS_SESSION(ls, 0, DONT_CHECK, TestMultipleForceRegistration(ls), NO_CLEANUP);
+ HEAP_TEST_LS_SESSION(ls, 0, 0, TestForceRegistrationSecurity(ls), NO_CLEANUP);
+ //HEAP_TEST_LS_SESSION(ls, 0, 0, TestForceRegistrationWhenInstallationFailed(ls), NO_CLEANUP);
+ HEAP_TEST_LS_SESSION(ls, 0, DONT_CHECK, TestForceRegistrationAndNoClientNotification(ls), NO_CLEANUP);
+ ls.Close();
+ }
+
+
+/**
+ @SYMTestCaseID APPFWK-APPARC-0106
+
+
+ @SYMTestCaseDesc Tests whether force registration works with a sis file which has single run on install
+ application.
+
+ @SYMTestPriority High
+
+ @SYMTestStatus Implemented
+
+ @SYMTestActions 1. Attaches to a property which will be set by force registered (or run on install)
+ application when it got executed.
+ 2. Installs sis file which has run on install application.
+ 3. Waits till the run on install application changes the propery or a timer expires.
+ 4. Checks the property is changed by run on install application.
+
+ @SYMTestExpectedResults The property is changed by run on install application.
+ */
+void CT_ForceRegStep::TestSingleForceRegistration(RTestableApaLsSession &aLs)
+ {
+ INFO_PRINTF1(_L("TestSingleForceRegistration test started..........."));
+ RProperty forceRegStatus;
+ User::LeaveIfError(forceRegStatus.Attach(KPropertyCategory, KForceRegTestPropertyKey, EOwnerThread));
+ CleanupClosePushL(forceRegStatus);
+
+ TRequestStatus forceRegStatusChange;
+ TRequestStatus forceRegWait; //Timer expiration status
+
+ //Timer to wait for definite time.
+ RTimer timerToWait;
+ User::LeaveIfError(timerToWait.CreateLocal());
+ CleanupClosePushL(timerToWait);
+ timerToWait.After(forceRegWait, KForceRegistratioWaitTime);
+
+ //The property value will be changed by forceregistered application when its executed.
+ forceRegStatus.Subscribe(forceRegStatusChange);
+
+ INFO_PRINTF1(_L("Install forceregapp1 application"));
+ //Install the forceregapp1
+ CSisFileInstaller sisFileInstaller;
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KForceRegApp1SisFile);
+ sisFileInstaller.InstallSisL(KForceRegApp1SisFile);
+
+ INFO_PRINTF1(_L("Wait till the timer expires or force registered application changes the property"));
+ //Wait till the property is changed by forceregapp1 or till timer expires
+ User::WaitForRequest(forceRegWait, forceRegStatusChange);
+
+ TInt value;
+ forceRegStatus.Get(value);
+ INFO_PRINTF2(_L("Property value: %d"), value);
+ //Check the property value is changed by forceregapp1
+ TEST(value == KForceRegApp1Executed);
+
+ INFO_PRINTF1(_L("Uninstall forceregapp1 application"));
+ //Uninstall the forceregapp1
+ sisFileInstaller.UninstallSisAndWaitForAppListUpdateL(KForceRegApp1Component);
+ CleanupStack::PopAndDestroy(2); //forceRegStatus, timerToWait
+ INFO_PRINTF1(_L("TestSingleForceRegistration test ended..........."));
+ }
+
+
+/**
+ @SYMTestCaseID APPFWK-APPARC-0106
+
+
+ @SYMTestCaseDesc Tests whether force registration works with a sis file which has multiple run on install
+ applications.
+
+ @SYMTestPriority High
+
+ @SYMTestStatus Implemented
+
+ @SYMTestActions 1. Attaches to a property which will be set by force registered (or run on install)
+ application when it got executed.
+ 2. Installs sis file which has multiple run on install applications.
+ 3. Waits till the run on install applications changes the propery or a timer expires.
+ 4. Checks the property is changed by run on install applications.
+
+ @SYMTestExpectedResults The property is changed by run on install applications.
+ */
+
+void CT_ForceRegStep::TestMultipleForceRegistration(RTestableApaLsSession &aLs)
+ {
+ INFO_PRINTF1(_L("TestMultipleForceRegistration test started..........."));
+ RProperty forceRegStatus;
+ User::LeaveIfError(forceRegStatus.Attach(KPropertyCategory, KForceRegTestPropertyKey, EOwnerThread));
+ //Set the property to a KStopForceRegApp2 to make the forceregapp2 to exit.
+ forceRegStatus.Set(KStopForceRegApp2);
+
+ TRequestStatus forceRegApp1Executed, forceRegApp2Executed;
+ TRequestStatus forceRegWait;
+
+ //Timer to wait for definite time.
+ RTimer timeToWait;
+ User::LeaveIfError(timeToWait.CreateLocal());
+ timeToWait.After(forceRegWait, KForceRegistratioWaitTime);
+ //The property value will be changed by forceregistered application. Subscribe to property change.
+ forceRegStatus.Subscribe(forceRegApp1Executed);
+
+ INFO_PRINTF1(_L("Install forceregapp1 and forceregapp2 application"));
+ //Install the forceregapp1
+ CSisFileInstaller sisFileInstaller;
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KForceRegMultipleAppsSisFile);
+ sisFileInstaller.InstallSisL(KForceRegMultipleAppsSisFile);
+
+ INFO_PRINTF1(_L("Wait till the timer expires or force registered applications changes the property"));
+ User::WaitForRequest(forceRegWait, forceRegApp1Executed);
+
+ TInt value;
+ forceRegStatus.Get(value);
+
+ //If the property value is not as expected, wait till the forceregapp2 is executed.
+ if(value != (KForceRegApp1Executed|KForceRegApp2Executed|KStopForceRegApp2))
+ {
+ forceRegStatus.Subscribe(forceRegApp2Executed);
+ forceRegWait=KRequestPending;
+ timeToWait.After(forceRegWait, KForceRegistratioWaitTime);
+ User::WaitForRequest(forceRegWait, forceRegApp2Executed);
+ }
+
+ forceRegStatus.Get(value);
+ INFO_PRINTF2(_L("Property value: %d"), value);
+ //Check whether both force registered applications executed.
+ TEST(value == (KForceRegApp1Executed|KForceRegApp2Executed|KStopForceRegApp2));
+
+ INFO_PRINTF1(_L("Uninstall forceregapp1 and forceregapp2 application"));
+ sisFileInstaller.UninstallSisAndWaitForAppListUpdateL(KForceRegMultipleAppsComponent);
+ forceRegStatus.Close();
+ //Wait for time so that appac completes applist cache creation.
+ User::After(2000000);
+ }
+
+
+/**
+ @SYMTestCaseID APPFWK-APPARC-0106
+
+
+ @SYMTestCaseDesc Tests force registration security. Force registration can only be used by SWI.
+
+ @SYMTestPriority High
+
+ @SYMTestStatus Implemented
+
+ @SYMTestActions 1. Creates dummy application information.
+ 2. Call the force registration with this application info.
+ 3. Check return value is KErrNotSupported.
+
+ @SYMTestExpectedResults ForceRegistration should return KErrNotSupported if other Software Installer
+ trying to use it.
+ */
+
+void CT_ForceRegStep::TestForceRegistrationSecurity(RTestableApaLsSession &aLs)
+ {
+ INFO_PRINTF1(_L("TestForceRegistrationSecurity test started..........."));
+ Usif::CApplicationRegistrationData *appData=Usif::CApplicationRegistrationData::NewL();
+ CleanupStack::PushL(appData);
+ RPointerArray<Usif::CApplicationRegistrationData> appArray;
+
+ INFO_PRINTF1(_L("Call ForceRegistration with empty TApaAppUpdate info array.........."));
+ TEST(aLs.ForceRegistration(appArray)==KErrNone);
+ appArray.AppendL(appData);
+ INFO_PRINTF1(_L("Call ForceRegistration with TApaAppUpdate info array.........."));
+ TEST(aLs.ForceRegistration(appArray)==KErrNotSupported);
+
+ CleanupStack::PopAndDestroy(appData);
+ appArray.Close();
+ INFO_PRINTF1(_L("TestForceRegistrationSecurity test ended..........."));
+ }
+
+
+/**
+ @SYMTestCaseID APPFWK-APPARC-0106
+
+ @SYMTestCaseDesc Tests force registered applications information removed from the applist if
+ installation fails.
+
+ @SYMTestPriority High
+
+ @SYMTestStatus Implemented
+
+ @SYMTestActions 1. Install sis file which has force registered application.
+ 2. Cancel the installation.
+ 2. Check the force registered application is not available in the applist.
+
+ @SYMTestExpectedResults Force registered application information is removed from the applist
+ */
+
+void CT_ForceRegStep::TestForceRegistrationWhenInstallationFailed(RTestableApaLsSession &aLs)
+ {
+ INFO_PRINTF1(_L("TestForceRegistrationWhenInstallationFailed test started..........."));
+ TApaAppInfo appInfo;
+ TInt err;
+
+ //Check whether the application is already in the applist.
+ err=aLs.GetAppInfo(appInfo, KUidForceRegApp2);
+ INFO_PRINTF2(_L("Error Code returned: %d"), err);
+ TEST(err==KErrNotFound);
+
+ CSisFileInstaller sisFileInstaller;
+ RProperty forceRegStatus;
+ User::LeaveIfError(forceRegStatus.Attach(KPropertyCategory, KForceRegTestPropertyKey, EOwnerThread));
+ TRequestStatus propertyStatus;
+ forceRegStatus.Subscribe(propertyStatus);
+
+ //Install ForceRegApp2 asynchronously
+ TRequestStatus installStatus;
+ INFO_PRINTF1(_L("Install the sis file which eventually cancelled by test"));
+ err=KErrNone;
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KForceRegApp2SisFile);
+ TRAP(err, sisFileInstaller.InstallSisAsynchronouslyL(KForceRegApp2SisFile, installStatus));
+ TEST(err == KErrNone);
+
+ //ForceRegApp2 is run on install application. The property is changed when the application executed.
+ User::WaitForRequest(propertyStatus);
+
+ //Make ForceRegApp2 to exit by adding KStopForceRegApp2 to property.
+ TInt value;
+ forceRegStatus.Get(value);
+ value |= KStopForceRegApp2;
+ forceRegStatus.Set(value);
+ forceRegStatus.Close();
+
+ //Cancel the installation.
+ sisFileInstaller.CancelInstallation();
+ User::WaitForRequest(installStatus);
+ sisFileInstaller.Close();
+
+ User::After(2000000);
+ INFO_PRINTF2(_L("Installation ended with error code: %d"), installStatus.Int());
+ TEST(installStatus.Int() != KErrNone);
+
+ //Check the force registered application is no longer exists in the applist.
+ err=aLs.GetAppInfo(appInfo, KUidForceRegApp2);
+ INFO_PRINTF2(_L("Error Code returned: %d"), err);
+ TEST(err==KErrNotFound);
+ INFO_PRINTF1(_L("TestForceRegistrationWhenInstallationFailed test ended..........."));
+ }
+
+TInt TestClientNotificationThread(TAny* aPtr);
+
+/**
+ @SYMTestCaseID APPFWK-APPARC-0106
+
+
+ @SYMTestCaseDesc Tests if applist is changed due to force registration, apparc will not notify the
+ clients.
+
+ @SYMTestPriority High
+
+ @SYMTestStatus Implemented
+
+ @SYMTestActions 1. Start TestClientNotificationThread which registers with apparc for applist change
+ notification and waits till applist change notification occurs or a timer expires.
+ Once any of the event occurs, then changes the property to make the forceregapp2 to
+ exit and makes the status of applist change reflects in property.
+ 2. Installs a sis file which has run on install forcereg1 and forcereg2 applications
+ 3. Waits till the TestClientNotificationThread exits.
+ 4. Checks whether applist change notification recieved or not.
+
+ @SYMTestExpectedResults Apparc does not notify clients about applist change which occur due to force registration.
+ */
+
+void CT_ForceRegStep::TestForceRegistrationAndNoClientNotification(RTestableApaLsSession &aLs)
+ {
+ INFO_PRINTF1(_L("TestForceRegistrationAndNoClientNotification test started..........."));
+ RProperty forceRegStatus;
+ User::LeaveIfError(forceRegStatus.Attach(KPropertyCategory, KForceRegTestPropertyKey, EOwnerThread));
+ forceRegStatus.Set(0);
+
+ TBuf<0x100> threadName(KTestClientNotificationThreadName);
+ RThread thread;
+
+ INFO_PRINTF1(_L("Start TestClientNotificationThread thread"));
+ User::LeaveIfError(thread.Create(threadName, TestClientNotificationThread, 0x1000, NULL, (TAny*) this));
+ CleanupClosePushL(thread);
+ TRequestStatus status;
+ thread.Logon(status);
+ thread.Resume();
+
+ INFO_PRINTF1(_L("Install sis file"));
+ //Install the forceregapp1
+ CSisFileInstaller sisFileInstaller;
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KForceRegMultipleAppsSisFile);
+ sisFileInstaller.InstallSisL(KForceRegMultipleAppsSisFile);
+
+ INFO_PRINTF1(_L("Waiting till TestClientNotificationThread thread exits"));
+ User::WaitForRequest(status);
+
+ TInt value;
+ forceRegStatus.Get(value);
+ INFO_PRINTF2(_L("Property value: %d"), value);
+ TEST(!(value & KApplistChanged));
+ INFO_PRINTF1(_L("Uninstall sis file"));
+ sisFileInstaller.UninstallSisL(KForceRegMultipleAppsComponent);
+ CleanupStack::PopAndDestroy();
+ forceRegStatus.Close();
+ INFO_PRINTF1(_L("TestForceRegistrationAndNoClientNotification test ended..........."));
+ }
+
+/*
+ * TestClientNotificationThread registers with apparc for applist change notification and waits till applist
+ * change notification occurs or a timer expires. Once any of the event occurs, then changes the property to
+ * make the forceregapp2 to exit and makes the status of applist change reflects in property.
+ */
+
+TInt TestClientNotificationThread(TAny* aPtr)
+ {
+ RApaLsSession ls;
+ User::LeaveIfError(ls.Connect());
+ TRequestStatus applistChangeStatus, timeOutStatus;
+ ls.SetNotify(EFalse, applistChangeStatus);
+
+ //Timer to wait for definite time.
+ RTimer timeToWait;
+ User::LeaveIfError(timeToWait.CreateLocal());
+ timeToWait.After(timeOutStatus, KForceRegistratioWaitTime);
+ User::WaitForRequest(applistChangeStatus, timeOutStatus);
+
+ RProperty forceRegStatus;
+ User::LeaveIfError(forceRegStatus.Attach(KPropertyCategory, KForceRegTestPropertyKey, EOwnerThread));
+ TInt status;
+ forceRegStatus.Get(status);
+
+ if(applistChangeStatus.Int() == MApaAppListServObserver::EAppListChanged)
+ status |= KApplistChanged;
+
+ status |= KStopForceRegApp2;
+ forceRegStatus.Set(status);
+ forceRegStatus.Close();
+
+ return(KErrNone);
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/t_forceregstep.h Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,60 @@
+// 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:
+//
+
+/**
+ @file
+ @internalComponent - Internal Symbian test code
+*/
+
+#if (!defined __T_FORCEREG_H__)
+#define __T_FORCEREG_H__
+
+
+#include <test/testexecutestepbase.h>
+
+class RTestableApaLsSession;
+
+const TUid KPropertyCategory = {0x101F289C};
+const TUint KForceRegTestPropertyKey = 1;
+
+const TUint KForceRegApp1Executed = 0x1;
+const TUint KForceRegApp2Executed = 0x2;
+const TUint KStopForceRegApp2 = 0x10;
+const TUint KApplistChanged = 0x0100;
+
+
+/*Tests force registration functionality */
+
+class CT_ForceRegStep : public CTestStep
+ {
+public:
+ CT_ForceRegStep();
+ ~CT_ForceRegStep();
+ virtual TVerdict doTestStepPreambleL();
+ virtual TVerdict doTestStepPostambleL();
+ virtual TVerdict doTestStepL();
+
+private:
+ void RunTestCases();
+ void TestSingleForceRegistration(RTestableApaLsSession &aLs);
+ void TestMultipleForceRegistration(RTestableApaLsSession &aLs);
+ void TestForceRegistrationSecurity(RTestableApaLsSession &aLs);
+ void TestForceRegistrationWhenInstallationFailed(RTestableApaLsSession &aLs);
+ void TestForceRegistrationAndNoClientNotification(RTestableApaLsSession &aLs);
+ };
+
+_LIT(KT_ForceRegStep,"T_ForceReg");
+
+#endif
--- a/appfw/apparchitecture/tef/t_largestackstep.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/t_largestackstep.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -29,6 +29,10 @@
#endif //SYMBIAN_ENABLE_SPLIT_HEADERS
#include "../apserv/apsclsv.h"
#include "t_largestackstep.h"
+#include "T_SisFileInstaller.h"
+
+_LIT(KLargeStackAppSisFile, "z:\\apparctest\\apparctestsisfiles\\tlargestackapp.sis");
+_LIT(KLargeStackAppComponent, "tlargestackapp");
const TUid KLargeStackAppUid = {0x10282B27};
@@ -94,6 +98,33 @@
CleanupStack::PopAndDestroy(commandline);
}
+TVerdict CT_LargeStackStep::doTestStepPreambleL()
+/**
+ @return - TVerdict code
+ Override of base class virtual
+ */
+ {
+ CSisFileInstaller sisFileInstaller;
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KLargeStackAppSisFile);
+ sisFileInstaller.InstallSisAndWaitForAppListUpdateL(KLargeStackAppSisFile);
+
+ SetTestStepResult(EPass);
+ return TestStepResult();
+ }
+
+TVerdict CT_LargeStackStep::doTestStepPostambleL()
+/**
+ @return - TVerdict code
+ Override of base class virtual
+ */
+ {
+ CSisFileInstaller sisFileInstaller;
+ sisFileInstaller.UninstallSisL(KLargeStackAppComponent);
+
+ return TestStepResult();
+ }
+
+
TVerdict CT_LargeStackStep::doTestStepL()
{
INFO_PRINTF1(_L("Test T_LargeStack Started"));
--- a/appfw/apparchitecture/tef/t_largestackstep.h Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/t_largestackstep.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -39,6 +39,8 @@
~CT_LargeStackStep();
//from CTestStep
+ virtual TVerdict doTestStepPreambleL();
+ virtual TVerdict doTestStepPostambleL();
TVerdict doTestStepL();
private:
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/t_nonnativetest.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,307 @@
+// 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:
+//
+
+/**
+ @file
+ @internalComponent - Internal Symbian test code
+*/
+
+#include "t_nonnativetest.h"
+#include <e32base.h>
+#include <e32cmn.h>
+#include "T_SisFileInstaller.h"
+#include <apgtask.h>
+#include <apgnotif.h>
+#include <e32property.h>
+#include<usif/scr/appregentries.h>
+#include "testableapalssession.h"
+#include "appfwk_test_utils.h"
+#include "apacmdln.h"
+#include "apgicnflpartner.h"
+
+_LIT(KTNonNativeRuntimeSisFile, "z:\\apparctest\\apparctestsisfiles\\tnonnativeruntime.sis");
+_LIT(KTNonNativeRuntimeComponent, "TNonNativeRunTime");
+
+_LIT(KTestScrDBSource, "z:\\apparctest\\scr_test.db");
+_LIT(KScrDBSource, "z:\\apparctest\\scr.db");
+_LIT(KScrDBTarget, "c:\\sys\\install\\scr\\scr.db");
+_LIT(KScrDBTempTarget, "c:\\sys\\install\\scr\\scr_temp.db");
+
+
+_LIT(KNonNotiveAppName, "\\268454131.fakeapp");
+
+const TUid KMidletUid={0x10210E26};
+const TUid KWidgetUid={0x10282821};
+const TUid KTestNonNativeUid={0xFF51233};
+
+const TUid KUidNonNativeRuntime={0xA0001002};
+
+const TUid KPropertyCategory = {0x101F289C};
+const TUint KNonNativeTestPropertyKey = 2;
+
+CT_NonNativeTestStep::~CT_NonNativeTestStep()
+/**
+ Destructor
+ */
+ {
+ }
+
+CT_NonNativeTestStep::CT_NonNativeTestStep()
+/**
+ Constructor
+ */
+ {
+ // Call base class method to set up the human readable name for logging
+ SetTestStepName(KT_NonNativeTestStep);
+ }
+
+TVerdict CT_NonNativeTestStep::doTestStepPreambleL()
+/**
+ @return - TVerdict code
+ Override of base class virtual
+ */
+ {
+
+ //Create property which is used for communication between test and non-native runtime.
+ TInt error;
+ error=RProperty::Define(KPropertyCategory, KNonNativeTestPropertyKey, RProperty::EInt);
+ if((error != KErrNone) && (error != KErrAlreadyExists))
+ User::Leave(error);
+
+ SetTestStepResult(EPass);
+ return TestStepResult();
+ }
+
+TVerdict CT_NonNativeTestStep::doTestStepPostambleL()
+/**
+ @return - TVerdict code
+ Override of base class virtual
+ */
+ {
+ RProperty::Delete(KPropertyCategory, KNonNativeTestPropertyKey);
+
+ return TestStepResult();
+ }
+
+
+TVerdict CT_NonNativeTestStep::doTestStepL()
+{
+ RunTestCases();
+ return TestStepResult();
+}
+
+
+void CT_NonNativeTestStep::RunTestCases()
+ {
+ RTestableApaLsSession ls;
+ User::LeaveIfError(ls.Connect());
+
+ //Wait if apparc updating the applist
+ TRequestStatus applistChangeStatus;
+ ls.SetNotify(ETrue, applistChangeStatus);
+ User::WaitForRequest(applistChangeStatus);
+
+ //DONT_CHECK is used because when an application is installed the updated application
+ //information is added in the session objects. This causes increase of memory at server side.
+ //As there can be multiple applications registered with apparc for applist change notifications,
+ //its not possible to clear the information in all the session objects.
+ HEAP_TEST_LS_SESSION(ls, 0, DONT_CHECK, TestNonNativeAppLaunchWithUnavailableMappingL(ls), NO_CLEANUP);
+ HEAP_TEST_LS_SESSION(ls, 0, 0, TestNonNativeUnsupportedAPIs(ls), NO_CLEANUP);
+ HEAP_TEST_LS_SESSION(ls, 0, DONT_CHECK, TestGetAppTypeL(ls), NO_CLEANUP);
+ ls.Close();
+ }
+
+
+/**
+ @SYMTestCaseID APPFWK-APPARC-0106
+
+
+ @SYMTestCaseDesc Tests whether apparc able to launch a non-native application for which the mapping is
+ not avaialable in apparc mapping table but its available in SCR.
+
+ @SYMTestPriority High
+
+ @SYMTestStatus Implemented
+
+
+ @SYMTestExpectedResults Apparc will launch the non-native applciation.
+ */
+
+void CT_NonNativeTestStep::TestNonNativeAppLaunchWithUnavailableMappingL(RTestableApaLsSession &aLs)
+ {
+ INFO_PRINTF1(_L("TestNonNativeAppLaunchWithUnavailableMapping test started..........."));
+
+ RProperty property;
+ User::LeaveIfError(property.Attach(KPropertyCategory, KNonNativeTestPropertyKey, EOwnerThread));
+ CleanupClosePushL(property);
+ User::After(2000000); //Wait for 2 secconds till SCR server closed.
+
+ RSmlTestUtils fs;
+ User::LeaveIfError(fs.Connect());
+ CleanupClosePushL(fs);
+
+ INFO_PRINTF1(_L("Delete existing scr.db"));
+ //Copy the existing SCR db to temp file and delete it
+ fs.CopyFileL(KScrDBTarget, KScrDBTempTarget);
+ fs.DeleteFileL(KScrDBTarget);
+
+ INFO_PRINTF1(_L("Copying scr_test.db"));
+ //Copy the scr_test.db which has non-native application information and
+ //non-native type to its runtime.
+ fs.CopyFileL(KTestScrDBSource, KScrDBTarget);
+ fs.ChangeFilePermissionL(KScrDBTarget);
+
+ INFO_PRINTF1(_L("Updating applist with a non-native application exists in scr_test.db"));
+ TApaAppUpdateInfo appUpdateInfo;
+ RArray<TApaAppUpdateInfo> updateAppArray;
+ CleanupClosePushL(updateAppArray);
+
+ appUpdateInfo.iAppUid=TUid::Uid(0x100048F3); //Test non-native app
+ appUpdateInfo.iAction= TApaAppUpdateInfo::EAppPresent;
+ updateAppArray.AppendL(appUpdateInfo);
+
+ TRequestStatus status;
+ aLs.SetNotify(EFalse, status);
+ aLs.UpdateAppListL(updateAppArray);
+ CleanupStack::PopAndDestroy(&updateAppArray);
+ User::WaitForRequest(status);
+
+ INFO_PRINTF1(_L("Starting non-native application"));
+ CApaCommandLine* cmd=CApaCommandLine::NewLC();
+ cmd->SetExecutableNameL(KNonNotiveAppName);
+ aLs.StartApp(*cmd);
+ CleanupStack::PopAndDestroy(cmd);
+ User::After(2000000);
+
+ //Once the non-native runtime executes, the property value is set to 1.
+ TInt value;
+ property.Get(value);
+ INFO_PRINTF2(_L("Property value: %d"), value);
+ TEST(value == 1);
+
+ INFO_PRINTF1(_L("Restoring the scr.db"));
+ User::After(2000000);
+ fs.DeleteFileL(KScrDBTarget);
+ fs.CopyFileL(KScrDBTempTarget, KScrDBTarget);
+ fs.DeleteFileL(KScrDBTempTarget);
+
+ CleanupStack::PopAndDestroy(2, &property);
+ INFO_PRINTF1(_L("TestNonNativeAppLaunchWithUnavailableMapping test ended..........."));
+ }
+
+
+
+void CT_NonNativeTestStep::TestNonNativeUnsupportedAPIs(RTestableApaLsSession &aLs)
+{
+ INFO_PRINTF1(_L("TestNonNativeUnsupportedAPIs test started..........."));
+ TUid uid=KNullUid;
+ TDriveUnit drive;
+ CApaRegistrationResourceFileWriter* regFileWriter=NULL;
+ CApaLocalisableResourceFileWriter* locFileWriter=NULL;
+ RFile *file=NULL;
+ TPtrC fileName;
+
+ TRAPD(err, aLs.RegisterNonNativeApplicationTypeL(uid, fileName));
+ TEST(err == KErrNotSupported);
+
+ TRAP(err, aLs.DeregisterNonNativeApplicationTypeL(uid));
+ TEST(err == KErrNotSupported);
+
+ TRAP(err, aLs.PrepareNonNativeApplicationsUpdatesL());
+ TEST(err == KErrNotSupported);
+
+ TRAP(err, aLs.RegisterNonNativeApplicationL(uid, drive, *regFileWriter, locFileWriter, file));
+ TEST(err == KErrNotSupported);
+
+ TRAP(err, aLs.DeregisterNonNativeApplicationL(uid));
+ TEST(err == KErrNotSupported);
+
+ TRAP(err, aLs.CommitNonNativeApplicationsUpdatesL());
+ TEST(err == KErrNotSupported);
+
+ TRAP(err, aLs.ForceCommitNonNativeApplicationsUpdatesL());
+ TEST(err == KErrNotSupported);
+
+ TEST(aLs.RollbackNonNativeApplicationsUpdates() == KErrNotSupported);
+
+ INFO_PRINTF1(_L("TestNonNativeUnsupportedAPIs test ended..........."));
+}
+
+
+void CT_NonNativeTestStep::TestGetAppTypeL(RTestableApaLsSession &aLs)
+ {
+ INFO_PRINTF1(_L("TestGetAppTypeL test started..........."));
+
+ RSmlTestUtils fs;
+ User::LeaveIfError(fs.Connect());
+ CleanupClosePushL(fs);
+ User::After(2000000); //Wait for 2 secconds till SCR server closed.
+
+ INFO_PRINTF1(_L("Delete existing scr.db"));
+ //Copy the existing SCR db to temp file and delete it
+ fs.CopyFileL(KScrDBTarget, KScrDBTempTarget);
+ fs.DeleteFileL(KScrDBTarget);
+
+ INFO_PRINTF1(_L("Copying scr_test.db"));
+ //Copy the scr_test.db which has non-native application information and
+ //non-native type to its runtime.
+ fs.CopyFileL(KTestScrDBSource, KScrDBTarget);
+ fs.ChangeFilePermissionL(KScrDBTarget);
+
+ INFO_PRINTF1(_L("Updating applist with a non-native application exists in scr_test.db"));
+ TApaAppUpdateInfo appUpdateInfo;
+ RArray<TApaAppUpdateInfo> updateAppArray;
+ CleanupClosePushL(updateAppArray);
+
+ appUpdateInfo.iAppUid=TUid::Uid(0x100048F3); //Test non-native app
+ appUpdateInfo.iAction= TApaAppUpdateInfo::EAppPresent;
+ updateAppArray.AppendL(appUpdateInfo);
+
+ appUpdateInfo.iAppUid=TUid::Uid(0x10201D0E); //Test java app
+ appUpdateInfo.iAction= TApaAppUpdateInfo::EAppPresent;
+ updateAppArray.AppendL(appUpdateInfo);
+
+ appUpdateInfo.iAppUid=TUid::Uid(0x10286B0D); //Test widget app
+ appUpdateInfo.iAction= TApaAppUpdateInfo::EAppPresent;
+ updateAppArray.AppendL(appUpdateInfo);
+
+ TRequestStatus status;
+ aLs.SetNotify(EFalse, status);
+ aLs.UpdateAppListL(updateAppArray);
+ CleanupStack::PopAndDestroy(&updateAppArray);
+ User::WaitForRequest(status);
+
+ INFO_PRINTF1(_L("Test GetAppType returns valid uids"));
+ TUid appTypeID;
+ User::LeaveIfError(aLs.GetAppType(appTypeID, TUid::Uid(0x10201D0E))); //Java app
+ TEST(appTypeID == KMidletUid);
+
+ User::LeaveIfError(aLs.GetAppType(appTypeID, TUid::Uid(0x100048F3))); //Test non-native app
+ TEST(appTypeID == KTestNonNativeUid);
+
+ User::LeaveIfError(aLs.GetAppType(appTypeID, TUid::Uid(0x10286B0D))); //widget app
+ TEST(appTypeID == KWidgetUid);
+
+
+ INFO_PRINTF1(_L("Restoring the scr.db"));
+ User::After(2000000);
+ fs.DeleteFileL(KScrDBTarget);
+ fs.CopyFileL(KScrDBTempTarget, KScrDBTarget);
+ fs.DeleteFileL(KScrDBTempTarget);
+
+ CleanupStack::PopAndDestroy(&fs);
+ INFO_PRINTF1(_L("TestGetAppTypeL test ended..........."));
+ }
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/t_nonnativetest.h Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,50 @@
+// 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:
+//
+
+/**
+ @file
+ @internalComponent - Internal Symbian test code
+*/
+
+#if (!defined __T_NONNATIVETEST_H__)
+#define __T_NONNATIVETEST_H__
+
+
+#include <test/testexecutestepbase.h>
+
+class RTestableApaLsSession;
+
+
+/*Tests non-native application launching functionality */
+
+class CT_NonNativeTestStep : public CTestStep
+ {
+public:
+ CT_NonNativeTestStep();
+ ~CT_NonNativeTestStep();
+ virtual TVerdict doTestStepPreambleL();
+ virtual TVerdict doTestStepPostambleL();
+ virtual TVerdict doTestStepL();
+
+private:
+ void RunTestCases();
+ void TestNonNativeAppLaunchWithUnavailableMappingL(RTestableApaLsSession &aLs);
+ void TestNonNativeUnsupportedAPIs(RTestableApaLsSession &aLs);
+ void TestGetAppTypeL(RTestableApaLsSession &aLs);
+ };
+
+_LIT(KT_NonNativeTestStep,"T_NonNativeTest");
+
+#endif
--- a/appfw/apparchitecture/tef/t_servicebasestep.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/t_servicebasestep.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -25,6 +25,10 @@
#include "appfwk_test.h"
#include "testableapalssession.h"
#include "../tef/TNonNative/TNNApp1.h"
+#include "T_SisFileInstaller.h"
+
+_LIT(KTNNA1AppSisFile, "z:\\apparctest\\apparctestsisfiles\\TNNApp1.sis");
+_LIT(KTNNA1AppComponent, "TNNApp1");
TInt PanicTest(TAny* aOption);
@@ -463,12 +467,19 @@
TVerdict CT_ServiceBaseStep::doTestStepPreambleL()
{
+ CSisFileInstaller sisFileInstaller;
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KTNNA1AppSisFile);
+ sisFileInstaller.InstallSisAndWaitForAppListUpdateL(KTNNA1AppSisFile);
+
SetTestStepResult(EPass);
return TestStepResult();
}
TVerdict CT_ServiceBaseStep::doTestStepPostambleL()
{
+ CSisFileInstaller sisFileInstaller;
+ sisFileInstaller.UninstallSisL(KTNNA1AppComponent);
+
return TestStepResult();
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/t_sisfileinstaller.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,199 @@
+// 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:
+// The following test case is used to test if apparctestserver
+// can return app data for a specific app by caching that data when requested.
+//
+//
+
+/**
+ @file
+ @internalComponent - Internal Symbian test code
+*/
+
+#include <apgcli.h>
+#include "T_SisFileInstaller.h"
+#include <usif/scr/screntries.h>
+#include <usif/usiferror.h>
+
+using namespace Usif;
+
+CSisFileInstaller::CSisFileInstaller()
+ {
+ }
+
+CSisFileInstaller::~CSisFileInstaller()
+ {
+ iSif.Close();
+ }
+
+TInt CSisFileInstaller::InstallSisAndWaitForAppListUpdateL(const TDesC& aFileName)
+{
+ RApaLsSession ls;
+ User::LeaveIfError(ls.Connect());
+ CleanupClosePushL(ls);
+ TRequestStatus status;
+ ls.SetNotify(EFalse, status);
+ InstallSisL(aFileName);
+ User::WaitForRequest(status);
+ CleanupStack::PopAndDestroy();
+ return KErrNone;
+}
+
+TInt CSisFileInstaller::UninstallSisAndWaitForAppListUpdateL(const TDesC& aComponentName)
+{
+ RApaLsSession ls;
+ User::LeaveIfError(ls.Connect());
+ CleanupClosePushL(ls);
+ TRequestStatus status;
+ ls.SetNotify(EFalse, status);
+ UninstallSisL(aComponentName);
+ User::WaitForRequest(status);
+ CleanupStack::PopAndDestroy();
+ return KErrNone;
+}
+
+TInt CSisFileInstaller::InstallSisL(const TDesC& aFileName)
+ {
+ TBuf<256> buf;
+ buf.Copy(aFileName);
+ HBufC* as = buf.AllocL();
+ TPtr16 sisFileName = as->Des();
+ CleanupStack::PushL(as);
+
+ RFs fs;
+ RFile file;
+ User::LeaveIfError(fs.Connect());
+ fs.ShareProtected();
+ CleanupClosePushL(fs);
+ User::LeaveIfError(file.Open(fs, sisFileName, EFileRead | EFileShareReadersOnly));
+ CleanupClosePushL(file);
+ User::LeaveIfError(iSif.Connect());
+ CleanupClosePushL(iSif);
+ TInt err=KErrNone;
+ do
+ {
+ iSif.Install(aFileName, iStatus, ETrue);
+ User::WaitForRequest(iStatus);
+ err=iStatus.Int();
+ }
+ while( err == KErrScrReadOperationInProgress);
+
+ User::LeaveIfError(err);
+
+ CleanupStack::PopAndDestroy(4, as);
+ return KErrNone;
+ }
+
+
+TInt CSisFileInstaller::UninstallSisL(const TDesC& aComponentName)
+ {
+ _LIT(KSisComponentVendor, "Nokia India Pvt Ltd");
+
+ RFs fs;
+ RFile file;
+ User::LeaveIfError(fs.Connect());
+ fs.ShareProtected();
+ CleanupClosePushL(fs);
+
+ User::LeaveIfError(iSif.Connect());
+ CleanupClosePushL(iSif);
+
+ TBuf<256> buf;
+ buf.Copy(aComponentName);
+ HBufC* as1 = buf.AllocL();
+ TPtr16 componentName = as1->Des();
+ HBufC* as2 = KSisComponentVendor().AllocL();
+ TPtr16 componentVendor = as2->Des();
+ iComponentId = FindComponentInScrL(componentName, componentVendor);
+
+ TInt err=KErrNone;
+ do
+ {
+ iSif.Uninstall(iComponentId, iStatus, ETrue);
+ User::WaitForRequest(iStatus);
+ err=iStatus.Int();
+ }
+ while( err == KErrScrReadOperationInProgress);
+
+ //Leave if sis file uninstllation failed.
+ User::LeaveIfError(err);
+
+ delete as1;
+ delete as2;
+ as1 = NULL;
+ as2 = NULL;
+ CleanupStack::PopAndDestroy(2, &fs);
+ return KErrNone;
+ }
+
+
+void CSisFileInstaller::CancelInstallation()
+ {
+ iSif.CancelOperation();
+ }
+
+void CSisFileInstaller::Close()
+ {
+ iSif.Close();
+ }
+
+TInt CSisFileInstaller::InstallSisAsynchronouslyL(const TDesC& aFileName, TRequestStatus& status)
+{
+ TBuf<256> buf;
+ buf.Copy(aFileName);
+ HBufC* as = buf.AllocL();
+ TPtr16 sisFileName = as->Des();
+ CleanupStack::PushL(as);
+
+ RFs fs;
+ RFile file;
+ User::LeaveIfError(fs.Connect());
+ fs.ShareProtected();
+ CleanupClosePushL(fs);
+ User::LeaveIfError(file.Open(fs, sisFileName, EFileRead | EFileShareReadersOnly));
+ CleanupClosePushL(file);
+ CleanupStack::PopAndDestroy(3, as);
+
+ User::LeaveIfError(iSif.Connect());
+
+ iSif.Install(aFileName, status, ETrue);
+ return KErrNone;
+}
+
+TInt CSisFileInstaller::FindComponentInScrL(const TDesC& aComponentName, const TDesC& aVendor)
+ {
+ RSoftwareComponentRegistry scr;
+ User::LeaveIfError(scr.Connect());
+ CleanupClosePushL(scr);
+
+ RSoftwareComponentRegistryView scrView;
+ CComponentFilter* filter = CComponentFilter::NewLC();
+ filter->SetNameL(aComponentName);
+ filter->SetVendorL(aVendor);
+
+ scrView.OpenViewL(scr, filter);
+ CleanupClosePushL(scrView);
+
+ CComponentEntry* component = scrView.NextComponentL();
+ TInt componentId = 0;
+ if (component != NULL)
+ {
+ componentId = component->ComponentId();
+ delete component;
+ }
+
+ CleanupStack::PopAndDestroy(3, &scr);
+ return componentId;
+ }
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/t_sisfileinstaller.h Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,65 @@
+// 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:
+//
+
+/**
+ @file
+ @internalComponent - Internal Symbian test code
+*/
+
+#ifndef __T_SISFILEINSTALLER_H
+#define __T_SISFILEINSTALLER_H
+
+#include "appfwk_test_appui.h"
+#include "apparctestserver.h"
+#include "testableapalssession.h"
+
+#include <usif/sif/sif.h>
+#include <usif/scr/screntries.h>
+#include <usif/sif/siftransportclient.h>
+#include <usif/sif/sifcommon.h>
+#include <scs/scsclient.h>
+#include <usif/usifcommon.h>
+#include <usif/scr/scr.h>
+#include <e32std.h>
+#include <scs/scscommon.h>
+#include <scs/scsserver.h>
+#include <e32const.h>
+
+//! CTestAppSisFile
+/*!
+ This class is used for install and uninstall of sis files
+*/
+class CSisFileInstaller: public CBase
+ {
+public:
+ CSisFileInstaller();
+ ~CSisFileInstaller();
+
+ TInt InstallSisL(const TDesC& aFileName);
+ TInt InstallSisAndWaitForAppListUpdateL(const TDesC& aFileName);
+ TInt UninstallSisL(const TDesC& aComponentName);
+ TInt UninstallSisAndWaitForAppListUpdateL(const TDesC& aComponentName);
+ TInt FindComponentInScrL(const TDesC& aComponentName, const TDesC& aVendor);
+ void CancelInstallation();
+ TInt InstallSisAsynchronouslyL(const TDesC& aFileName, TRequestStatus& status);
+ void Close();
+private:
+ friend class CSifOperationStep;
+ Usif::RSoftwareInstall iSif;
+ Usif::TComponentId iComponentId;
+ TRequestStatus iStatus;
+ };
+
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/t_updateapplist.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,159 @@
+// Copyright (c) 2005-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:
+// Tests UpdateAppList API of RApaLsSession class.
+//
+
+/**
+ @file
+ @internalComponent - Internal Symbian test code
+*/
+
+#include <apgcli.h>
+#include "T_UpdateAppList.h"
+#include "T_SisFileInstaller.h"
+
+_LIT(KApparcTestAppSisFile, "z:\\apparctest\\apparctestsisfiles\\TApparcTestApp.sis");
+_LIT(KApparcTestAppComponent, "TApparcTestApp");
+
+_LIT(KTestMultipleAppsSisFile, "z:\\apparctest\\apparctestsisfiles\\TestMultipleApps.sis");
+_LIT(KTestMultipleAppsComponent, "TestMultipleApps");
+
+
+CT_TestUpdateAppListStep::CT_TestUpdateAppListStep()
+ {
+ }
+
+CT_TestUpdateAppListStep::~CT_TestUpdateAppListStep()
+ {
+ iApaLsSession.Close();
+ delete iScheduler;
+ }
+
+
+void CT_TestUpdateAppListStep::TestUpdateAppListWithInvalidArgumentsL()
+ {
+ TApaAppInfo appInfo;
+ TUid uid = {0x10003A3F};
+ TInt ret = iApaLsSession.GetAppInfo(appInfo,uid);
+ TEST(ret==KErrNotFound);
+
+ RArray<TApaAppUpdateInfo> updateAppInfo;
+ CleanupClosePushL(updateAppInfo);
+ updateAppInfo.AppendL(TApaAppUpdateInfo(uid, TApaAppUpdateInfo::EAppPresent));
+ iApaLsSession.UpdateAppListL(updateAppInfo);
+ User::After(1000000);
+ ret = iApaLsSession.GetAppInfo(appInfo,uid);
+ TEST(ret==KErrNotFound);
+
+ updateAppInfo.Reset();
+ updateAppInfo.AppendL(TApaAppUpdateInfo(uid, TApaAppUpdateInfo::EAppNotPresent));
+ iApaLsSession.UpdateAppListL(updateAppInfo);
+ User::After(1000000);
+ ret = iApaLsSession.GetAppInfo(appInfo,uid);
+ TEST(ret==KErrNotFound);
+
+ updateAppInfo.Reset();
+ updateAppInfo.AppendL(TApaAppUpdateInfo(uid, TApaAppUpdateInfo::EAppInfoChanged));
+ iApaLsSession.UpdateAppListL(updateAppInfo);
+ User::After(3000000);
+ ret = iApaLsSession.GetAppInfo(appInfo,uid);
+ TEST(ret==KErrNotFound);
+ CleanupStack::PopAndDestroy(&updateAppInfo);
+ }
+
+
+void CT_TestUpdateAppListStep::TestAppInstallAndUninstallationL()
+ {
+ TApaAppInfo appInfo;
+ TUid uid = {0x100048F3};
+ TInt ret = iApaLsSession.GetAppInfo(appInfo,uid);
+ TEST(ret==KErrNotFound);
+
+ //Install app
+ CSisFileInstaller sisFileInstaller;
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KApparcTestAppSisFile);
+ TRAPD(err, sisFileInstaller.InstallSisAndWaitForAppListUpdateL(KApparcTestAppSisFile));
+
+ ret = iApaLsSession.GetAppInfo(appInfo,uid);
+ TEST(ret==KErrNone);
+
+ //Uninstall app
+ TRAP(err, sisFileInstaller.UninstallSisAndWaitForAppListUpdateL(KApparcTestAppComponent));
+
+ ret = iApaLsSession.GetAppInfo(appInfo,uid);
+ TEST(ret==KErrNotFound);
+
+ }
+
+
+void CT_TestUpdateAppListStep::TestMultipleAppInstallAndUninstallationL()
+ {
+ TApaAppInfo appInfo;
+ TUid uid1 = {0x102032AB};
+ TUid uid2 = {0x10208183};
+ TUid uid3 = {0x10208184};
+
+ TInt ret = iApaLsSession.GetAppInfo(appInfo,uid1);
+ TEST(ret==KErrNotFound);
+
+ ret = iApaLsSession.GetAppInfo(appInfo,uid2);
+ TEST(ret==KErrNotFound);
+
+ ret = iApaLsSession.GetAppInfo(appInfo,uid3);
+ TEST(ret==KErrNotFound);
+
+ //Install applications
+ CSisFileInstaller sisFileInstaller;
+ INFO_PRINTF2(_L("Installing sis file from -> %S"), &KTestMultipleAppsSisFile);
+ sisFileInstaller.InstallSisAndWaitForAppListUpdateL(KTestMultipleAppsSisFile);
+
+ ret = iApaLsSession.GetAppInfo(appInfo,uid1);
+ TEST(ret==KErrNone);
+
+ ret = iApaLsSession.GetAppInfo(appInfo,uid2);
+ TEST(ret==KErrNone);
+
+ //uninstall applications
+ sisFileInstaller.UninstallSisAndWaitForAppListUpdateL(KTestMultipleAppsComponent);
+
+
+ ret = iApaLsSession.GetAppInfo(appInfo,uid1);
+ TEST(ret==KErrNotFound);
+
+ ret = iApaLsSession.GetAppInfo(appInfo,uid2);
+ TEST(ret==KErrNotFound);
+
+ ret = iApaLsSession.GetAppInfo(appInfo,uid3);
+ TEST(ret==KErrNotFound);
+ }
+
+
+TVerdict CT_TestUpdateAppListStep::doTestStepL()
+ {
+ INFO_PRINTF1(_L("Test T_UpdateAppList Started"));
+
+ // start an active scheduler
+ iScheduler=new(ELeave) CActiveScheduler();
+ CActiveScheduler::Install(iScheduler);
+
+ // Connect to RApaLsSession
+ User::LeaveIfError(iApaLsSession.Connect());
+
+ HEAP_TEST_LS_SESSION(iApaLsSession, 0, DONT_CHECK, TestUpdateAppListWithInvalidArgumentsL(), NO_CLEANUP);
+ HEAP_TEST_LS_SESSION(iApaLsSession, 0, DONT_CHECK, TestAppInstallAndUninstallationL(), NO_CLEANUP);
+ HEAP_TEST_LS_SESSION(iApaLsSession, 0, DONT_CHECK, TestMultipleAppInstallAndUninstallationL(), NO_CLEANUP);
+
+ INFO_PRINTF1(_L("Test Finished"));
+ return TestStepResult();
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/t_updateapplist.h Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,51 @@
+// Copyright (c) 2005-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:
+//
+
+/**
+ @file
+ @internalComponent - Internal Symbian test code
+*/
+
+#ifndef __T_UPDATEAPPLIST_H
+#define __T_UPDATEAPPLIST_H
+
+#include "appfwk_test_appui.h"
+#include "testableapalssession.h"
+#include <apgnotif.h>
+
+_LIT(KT_TestUpdateAppListStep, "T_UpdateAppList");
+
+//! CTestUpdateAppListStep
+/*!
+ This class is used to test UpdateAppList api in RApaLsSession
+*/
+class CT_TestUpdateAppListStep : public CTestStep
+ {
+public:
+ CT_TestUpdateAppListStep();
+ ~CT_TestUpdateAppListStep();
+ void TestUpdateAppListWithInvalidArgumentsL();
+ void TestAppInstallAndUninstallationL();
+ void TestAppUpgradeL();
+ void TestMultipleAppInstallAndUninstallationL();
+ void TestPackageUpgradeL();
+ void TestInstallInvalidAppL();
+ virtual TVerdict doTestStepL();
+private:
+ RTestableApaLsSession iApaLsSession;
+ CActiveScheduler* iScheduler;
+ };
+
+#endif
--- a/appfw/apparchitecture/tef/t_winchainChild.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/t_winchainChild.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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"
@@ -40,7 +40,7 @@
LIBRARY euser.lib apparc.lib cone.lib eikcore.lib ws32.lib appfwk_test_appui.lib
START RESOURCE t_winchainChild_reg.rss
-TARGETPATH /private/10003a3f/apps
+TARGETPATH /apparctestregfiles
END
SMPSAFE
--- a/appfw/apparchitecture/tef/t_winchainLaunch.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/t_winchainLaunch.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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"
@@ -40,7 +40,7 @@
LIBRARY euser.lib apparc.lib cone.lib eikcore.lib ws32.lib appfwk_test_appui.lib
START RESOURCE t_winchainLaunch_reg.rss
-TARGETPATH /private/10003a3f/apps
+TARGETPATH /apparctestregfiles
END
SMPSAFE
--- a/appfw/apparchitecture/tef/tapparctestapp_loc.rss Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/tapparctestapp_loc.rss Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-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"
@@ -30,7 +30,7 @@
{
caption = "tapparctestapp";
number_of_icons = 1;
- icon_file = "z:\\resource\\apps\\svg_icon.svg";
+ icon_file = "C:\\resource\\apps\\svg_icon.svg";
}
};
}
--- a/appfw/apparchitecture/tef/testapp/testforceregistrationapp1/testforceregistrationapp1.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/testapp/testforceregistrationapp1/testforceregistrationapp1.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2009-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"
@@ -14,22 +14,24 @@
// testforceregistrationapp1.mmp
//
+#include <platform_paths.hrh>
+
target testforceregistrationapp1.exe
targettype EXE
UID 0x1000007a 0x102826E0
-systeminclude /epoc32/include
+MW_LAYER_SYSTEMINCLUDE
source ./testforceregistrationapp1.cpp
START RESOURCE testforceregistrationapp1_reg.rss
- TARGETPATH \apparctest
+ TARGETPATH /apparctest
END
START RESOURCE testforceregistrationapp1_loc.rss
- TARGETPATH \apparctest
+ TARGETPATH /apparctest
END
library euser.lib
Binary file appfw/apparchitecture/tef/testpkg/Nokia_RnDCert_02.der has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/Nokia_RnDCert_02.key Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQC/TDP7KKIaf5+uW4OD2iVZuUMC2a+SeQTjf6srlKcOm+CpPNXn
+uLNm/8fdEnyOIuRXPRKmqhs1n0JkxEGHynELWMTuKXbQx9SRAGUXzyneGn+IJNnO
+vOKHWgKCouX2hfI8rtkdqJpqmO460gGsMgw+lsbeyWyW9lnfLxq+ZC7sqQIDAQAB
+AoGBALmUWZE8GBaQ3P4u9WUCSd3DJkkrmXIFSULSZeH/chlwCwDjbbhArHothVzo
+REE3hEFFlERvHbplZ+mNouzy7boduvgUzbksGrbGMLJ2qO1GzWWVwV+GzOWKd3ss
+/98Gwoy5R8pjnkqUE2wP1iJFw0FjvUTKcYv/z6t3LLJ0CsoBAkEA+c7ixvsviQ3J
+s0INytCKU2bf8fqFQJi1VI82ukxNsujGTQ9upVSjuvqPvWyDvvTdrUBHqO+3qPut
+sEh01Q8aiQJBAMQKDJPVRu4ud3mwUfEavzL5EjqwG1k9VCNGYsT4FwtrHcxu1oP/
+pk6M3rIZukqomoEEnHWPMwhrK3fhBqi0OSECQQDr40VXege4FnH5OI2Hj4afHMyp
+VdQQXGMWFyopnzXblFz0lXb43cTCIiorR9XcMqNFHybLypkWE5o+lRzlt55pAkBQ
+P/zeF5Sts//cpL0mgdh7OVKpC6ZmZaCnwAx2rUhhuDu+kDDoYCLoTOps5fNI1LRK
+1GRoC3LMo3Jr5IYhUYWBAkBpCpN6k4JU/mszq98EojHerQNxk8sPqvQKUzTutohT
+1gLX9yepGayB/TtT2EEJDkWOlnTy/dvN6W3vzbJYz97x
+-----END RSA PRIVATE KEY-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/Corrupted.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,29 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"Corrupted"}, (0x10004c5f), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\data\z\apparctest\Corrupted_reg.rsc"-"!:\private\10003a3f\import\apps\Corrupted_reg.rsc"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/CustomiseDefaultIconApp.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,32 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"CustomiseDefaultIconApp"}, (0x10208181), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\CustomiseDefaultIconApp.exe"-"!:\sys\bin\CustomiseDefaultIconApp.exe"
+"\epoc32\data\z\apparctestregfiles\CustomiseDefaultIconApp_reg.rsc"-"!:\private\10003a3f\import\apps\CustomiseDefaultIconApp_reg.rsc"
+"\epoc32\data\z\apparctestregfiles\CustomiseDefaultIconApp_loc.rsc"-"!:\resource\apps\CustomiseDefaultIconApp_loc.rsc"
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/EndTaskTestApp.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,31 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"EndTaskTestApp"}, (0x10282B33), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\endtasktestapp.exe"-"!:\sys\bin\endtasktestapp.exe"
+"\epoc32\data\z\apparctestregfiles\EndTask_reg.rsc"-"!:\private\10003a3f\import\apps\EndTask_reg.rsc"
+"\epoc32\data\z\apparctestregfiles\EndTaskTestApp.rsc"-"!:\resource\apps\EndTaskTestApp.rsc"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/ForceRegApp1.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,32 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"ForceRegApp1"}, (0xA0001000), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\forceregapp1.exe"-"!:\sys\bin\forceregapp1.exe"
+"\epoc32\data\z\apparctestregfiles\forceregapp1_reg.rsc"-"!:\private\10003a3f\import\apps\forceregapp1_reg.rsc"
+"\epoc32\data\z\apparctest\forcegtestapp1.frg1"-"!:\apparctest\forcegtestapp1.frg1", RI
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/ForceRegApp2.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,31 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"ForceRegApp2"}, (0xA0001001), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\forceregapp2.exe"-"!:\sys\bin\forceregapp2.exe"
+"\epoc32\data\z\apparctestregfiles\forceregapp2_reg.rsc"-"!:\private\10003a3f\import\apps\forceregapp2_reg.rsc"
+"\epoc32\data\z\apparctest\forcegtestapp2.frg2"-"!:\apparctest\forcegtestapp2.frg2", RI, RW
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/ForceRegMultipleApps.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,35 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"ForceRegMultipleApps"}, (0xA0001001), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\forceregapp1.exe"-"!:\sys\bin\forceregapp1.exe"
+"\epoc32\data\z\apparctestregfiles\forceregapp1_reg.rsc"-"!:\private\10003a3f\import\apps\forceregapp1_reg.rsc"
+"\epoc32\data\z\apparctest\forcegtestapp1.frg1"-"!:\apparctest\forcegtestapp1.frg1", RI
+
+"\epoc32\release\armv5\udeb\forceregapp2.exe"-"!:\sys\bin\forceregapp2.exe"
+"\epoc32\data\z\apparctestregfiles\forceregapp2_reg.rsc"-"!:\private\10003a3f\import\apps\forceregapp2_reg.rsc"
+"\epoc32\data\z\apparctest\forcegtestapp2.frg2"-"!:\apparctest\forcegtestapp2.frg2", RI, RW
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/SimpleApparcTestApp.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,32 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"SimpleApparcTestApp"}, (0x12008ACE), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\simpleapparctestapp.exe"-"!:\sys\bin\simpleapparctestapp.exe"
+"\epoc32\data\z\apparctestregfiles\SimpleApparcTestApp_Reg.rsc"-"!:\private\10003a3f\import\apps\SimpleApparcTestApp_Reg.rsc"
+"\epoc32\data\z\apparctestregfiles\SimpleApparcTestApp.rsc"-"!:\resource\apps\SimpleApparcTestApp.rsc"
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/TAppEmbeddableOnly_v2.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,32 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TAppEmbeddableOnly_v2"}, (0x10004c5C), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\tappembeddableonly.dll"-"!:\sys\bin\tappembeddableonly.dll"
+"\epoc32\data\z\apparctestregfiles\TAppEmbeddableOnly_reg.rsc"-"!:\private\10003a3f\import\apps\TAppEmbeddableOnly_reg.rsc"
+"\epoc32\data\z\apparctestregfiles\tappembeddableonly.rsc"-"!:\resource\plugins\tappembeddableonly.rsc"
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/TAppEmbeddableUiNotStandAlone_v2.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,32 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TAppEmbeddableUiNotStandAlone_v2"}, (0x10004c5E), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\tappembeddableuinotstandalone.dll"-"!:\sys\bin\tappembeddableuinotstandalone.dll"
+"\epoc32\data\z\apparctestregfiles\TAppEmbeddableUiNotStandAlone_reg.rsc"-"!:\private\10003a3f\import\apps\TAppEmbeddableUiNotStandAlone_reg.rsc"
+"\epoc32\data\z\apparctestregfiles\tappembeddableuinotstandalone.rsc"-"!:\resource\plugins\tappembeddableuinotstandalone.rsc"
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/TAppEmbeddableUiOrStandAlone_embedded.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,31 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TAppEmbeddableUiOrStandAlone_embedded"}, (0x10004c5D), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\tappembeddableuiorstandalone_embedded.dll"-"!:\sys\bin\tappembeddableuiorstandalone_embedded.dll"
+"\epoc32\data\z\apparctestregfiles\tappembeddableuiorstandalone_embedded.rsc"-"!:\resource\plugins\tappembeddableuiorstandalone_embedded.rsc"
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/TAppEmbeddableUiOrStandalone_standalone.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,30 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TAppEmbeddableUiOrStandalone_standalone"}, (0x10004c4A), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\tappembeddableuiorstandalone.exe"-"!:\sys\bin\tappembeddableuiorstandalone.exe"
+"\epoc32\data\z\apparctestregfiles\TAppEmbeddableUiOrStandAlone_reg.rsc"-"!:\private\10003a3f\import\apps\TAppEmbeddableUiOrStandAlone_reg.rsc"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/TAppEmbeddable_embedded.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,31 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TAppEmbeddable_embedded"}, (0x10004c5B), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\tappembeddable_embedded.dll"-"!:\sys\bin\tappembeddable_embedded.dll"
+"\epoc32\data\z\apparctestregfiles\tappembeddable_embedded.rsc"-"!:\resource\plugins\tappembeddable_embedded.rsc"
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/TAppEmbeddable_standalone.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,32 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TAppEmbeddable_standalone"}, (0x10004c48), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\tappembeddable.exe"-"!:\sys\bin\tappembeddable.exe"
+"\epoc32\data\z\apparctestregfiles\TAppEmbeddable_reg.rsc"-"!:\private\10003a3f\import\apps\TAppEmbeddable_reg.rsc"
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/TAppInstall.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,30 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TAppInstall"}, (0x10207f7d), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\testappinstall.exe"-"!:\sys\bin\testappinstall.exe"
+"\epoc32\data\z\apparctestregfiles\TestAppInstall_reg.rsc"-"!:\apparctest\TestAppInstall_reg.rsc"
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/TAppNotEmbeddable_v2.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,31 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TAppNotEmbeddable_v2"}, (0x10004c47), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\tappnotembeddable.exe"-"!:\sys\bin\tappnotembeddable.exe"
+"\epoc32\data\z\apparctestregfiles\TAppNotEmbeddable_reg.rsc"-"!:\private\10003a3f\import\apps\TAppNotEmbeddable_reg.rsc"
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/TApparcTestApp.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,34 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TApparcTestApp"}, (0x100048F3), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\tapparctestapp.exe"-"!:\sys\bin\tapparctestapp.exe"
+"\epoc32\data\z\apparctestregfiles\tapparctestapp_reg.rsc"-"!:\private\10003a3f\import\apps\tapparctestapp_reg.rsc"
+"\epoc32\data\z\apparctestregfiles\tapparctestapp.rsc"-"!:\resource\apps\tapparctestapp.rsc"
+"\epoc32\data\z\apparctestregfiles\tapparctestapp_loc.rsc"-"!:\resource\apps\tapparctestapp_loc.rsc"
+"\epoc32\data\z\apparctestregfiles\svg_icon.svg"-"!:\resource\apps\svg_icon.svg"
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/TCtrlPnlApp.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,30 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TCtrlPnlApp"}, (0x10207f79), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\TCtrlPnlApp.exe"-"!:\sys\bin\TCtrlPnlApp.exe"
+"\epoc32\data\z\apparctestregfiles\TCtrlPnlApp_reg.rsc"-"!:\private\10003a3f\import\apps\TCtrlPnlApp_reg.rsc"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/TNNApp1.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,31 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TNNApp1"}, (0x10207f92), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\tnnapp1.exe"-"!:\sys\bin\tnnapp1.exe"
+"\epoc32\data\z\apparctestregfiles\TNNApp1_reg.rsc"-"!:\private\10003a3f\import\apps\TNNApp1_reg.rsc"
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/TNNApp2.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,31 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TNNApp2"}, (0x10207f94), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\tnnapp2.exe"-"!:\sys\bin\tnnapp2.exe"
+"\epoc32\data\z\apparctestregfiles\TNNApp2_reg.rsc"-"!:\private\10003a3f\import\apps\TNNApp2_reg.rsc"
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/TRApaLsSessionStartAppTestApp_v2.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,31 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TRApaLsSessionStartAppTestApp_v2"}, (0x10004c4f), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\trapalssessionstartapptestapp.exe"-"!:\sys\bin\trapalssessionstartapptestapp.exe"
+"\epoc32\data\z\apparctestregfiles\TRApaLsSessionStartAppTestApp_reg.rsc"-"!:\private\10003a3f\import\apps\TRApaLsSessionStartAppTestApp_reg.rsc"
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/TSTAPP_standalone.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,47 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TSTAPP_standalone"}, (10), 1, 0, 0, TYPE=SA, RU
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\tstapp.exe"-"!:\sys\bin\tstapp.exe"
+"\epoc32\data\z\apparctestregfiles\tstapp_reg.rsc"-"!:\private\10003a3f\import\apps\tstapp_reg.rsc"
+"\epoc32\data\z\apparctestregfiles\tstapp_loc.rsc"-"!:\resource\apps\tstapp_loc.rsc"
+"\epoc32\data\z\apparctestregfiles\tstapp_loc.r01"-"!:\resource\apps\tstapp_loc.r01"
+"\epoc32\data\z\apparctestregfiles\tstapp_loc.r02"-"!:\resource\apps\tstapp_loc.r02"
+"\epoc32\data\z\apparctestregfiles\tstapp_loc.r03"-"!:\resource\apps\tstapp_loc.r03"
+"\epoc32\data\z\apparctestregfiles\tstapp_loc.r04"-"!:\resource\apps\tstapp_loc.r04"
+"\epoc32\data\z\apparctestregfiles\tstapp_loc.r05"-"!:\resource\apps\tstapp_loc.r05"
+"\epoc32\data\z\apparctestregfiles\TSTAPP.rsc"-"!:\resource\apps\TSTAPP.rsc"
+"\epoc32\data\z\apparctestregfiles\tstapp.mbm"-"!:\resource\apps\tstapp.mbm"
+"\epoc32\data\z\apparctestregfiles\tstappview01.m01"-"!:\resource\apps\tstappview01.m01"
+"\epoc32\data\z\apparctestregfiles\tstappview02.k"-"!:\resource\apps\tstappview02.k"
+"\epoc32\data\z\apparctestregfiles\tstappviewneg.xyz"-"!:\resource\apps\tstappviewneg.xyz"
+"\epoc32\data\z\apparctestregfiles\tstappviewneg.mbm"-"!:\resource\apps\tstappviewneg.mbm"
+"\epoc32\data\z\apparctestregfiles\tstappview"-"!:\resource\apps\tstappview"
+"\epoc32\data\z\apparctestregfiles\tstapp02.m02"-"!:\resource\apps\tstapp02.m02"
+"\epoc32\data\z\apparctestregfiles\tstappview01.m02"-"!:\resource\apps\tstappview01.m02"
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/TStartDocApp_v2.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,30 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TStartDocApp_v2"}, (0x10004c4d), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\tstartdocapp.exe"-"!:\sys\bin\tstartdocapp.exe"
+"\epoc32\data\z\apparctestregfiles\TStartDocApp_reg.rsc"-"!:\private\10003a3f\import\apps\TStartDocApp_reg.rsc"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/T_DataPrioritySystem1.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,32 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"T_DataPrioritySystem1"}, (0x10207f7b), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\t_dataprioritysystem1.exe"-"!:\sys\bin\t_dataprioritysystem1.exe"
+"\epoc32\data\z\apparctestregfiles\T_DataPrioritySystem1_reg.rsc"-"!:\private\10003a3f\import\apps\T_DataPrioritySystem1_reg.rsc"
+"\epoc32\data\z\apparctestregfiles\T_DataPrioritySystem1_loc.rsc"-"!:\resource\apps\T_DataPrioritySystem1_loc.rsc"
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/T_DataPrioritySystem2.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,32 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"T_DataPrioritySystem2"}, (0x10207f7c), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\t_dataprioritysystem2.exe"-"!:\sys\bin\t_dataprioritysystem2.exe"
+"\epoc32\data\z\apparctestregfiles\T_DataPrioritySystem2_reg.rsc"-"!:\private\10003a3f\import\apps\T_DataPrioritySystem2_reg.rsc"
+"\epoc32\data\z\apparctestregfiles\T_DataPrioritySystem2_loc.rsc"-"!:\resource\apps\T_DataPrioritySystem2_loc.rsc"
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/T_DataPrioritySystem3.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,30 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"T_DataPrioritySystem3"}, (0x10207f7f), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\T_DataPrioritySystem3.exe"-"!:\sys\bin\T_DataPrioritySystem3.exe"
+"\epoc32\data\z\apparctestregfiles\T_DataPrioritySystem3_reg.rsc"-"!:\private\10003a3f\import\apps\T_DataPrioritySystem3_reg.rsc"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/T_EnvSlots.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,32 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"T_EnvSlots"}, (0x102032AB), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\t_envslots.exe"-"!:\sys\bin\t_envslots.exe"
+"\epoc32\data\z\apparctestregfiles\T_EnvSlots_reg.rsc"-"!:\private\10003a3f\import\apps\T_EnvSlots_reg.rsc"
+"\epoc32\data\z\apparctestregfiles\T_EnvSlots_loc.rsc"-"!:\resource\apps\T_EnvSlots_loc.rsc"
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/T_groupname.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,32 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"T_groupname"}, (0x10208185), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\T_groupname.exe"-"!:\sys\bin\T_groupname.exe"
+"\epoc32\data\z\apparctestregfiles\T_groupname_reg.rsc"-"!:\private\10003a3f\import\apps\T_groupname_reg.rsc"
+"\epoc32\data\z\apparctestregfiles\T_groupname_loc.rsc"-"!:\resource\apps\T_groupname_loc.rsc"
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/T_groupname_ver1.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,32 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"T_groupname_ver1"}, (0x10208183), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\T_groupname_ver1.exe"-"!:\sys\bin\T_groupname_ver1.exe"
+"\epoc32\data\z\apparctestregfiles\T_groupnamever1_reg.rsc"-"!:\private\10003a3f\import\apps\T_groupnamever1_reg.rsc"
+"\epoc32\data\z\apparctestregfiles\T_groupnamever1_loc.rsc"-"!:\resource\apps\T_groupnamever1_loc.rsc"
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/T_groupname_ver2.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,32 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"T_groupname_ver2"}, (0x10208184), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\T_groupname_ver2.exe"-"!:\sys\bin\T_groupname_ver2.exe"
+"\epoc32\data\z\apparctestregfiles\T_groupnamever2_reg.rsc"-"!:\private\10003a3f\import\apps\T_groupnamever2_reg.rsc"
+"\epoc32\data\z\apparctestregfiles\T_groupnamever2_loc.rsc"-"!:\resource\apps\T_groupnamever2_loc.rsc"
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/TestTrustedPriorityApp1.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,32 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TestTrustedPriorityApp1"}, (0x10207f8D), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\TestTrustedPriorityApp1.exe"-"!:\sys\bin\TestTrustedPriorityApp1.exe"
+"\epoc32\data\z\apparctestregfiles\TestTrustedPriorityApp1_reg.rsc"-"!:\private\10003a3f\import\apps\TestTrustedPriorityApp1_reg.rsc"
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/TestTrustedPriorityApp2.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,30 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TestTrustedPriorityApp2"}, (0x10207f8F), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\TestTrustedPriorityApp2.exe"-"!:\sys\bin\TestTrustedPriorityApp2.exe"
+"\epoc32\data\z\apparctestregfiles\TestTrustedPriorityApp2_reg.rsc"-"!:\private\10003a3f\import\apps\TestTrustedPriorityApp2_reg.rsc"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/TestUnTrustedPriorityApp1.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,30 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TestUnTrustedPriorityApp1"}, (0x10207f8C), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\TestUnTrustedPriorityApp1.exe"-"!:\sys\bin\TestUnTrustedPriorityApp1.exe"
+"\epoc32\data\z\apparctestregfiles\TestUnTrustedPriorityApp1_reg.rsc"-"!:\private\10003a3f\import\apps\TestUnTrustedPriorityApp1_reg.rsc"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/TestUnTrustedPriorityApp2.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,30 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TestUnTrustedPriorityApp2"}, (0xA3010010), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\TestUnTrustedPriorityApp2.exe"-"!:\sys\bin\TestUnTrustedPriorityApp2.exe"
+"\epoc32\data\z\apparctestregfiles\TestUnTrustedPriorityApp2_reg.rsc"-"!:\private\10003a3f\import\apps\TestUnTrustedPriorityApp2_reg.rsc"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/UnProctectedUidApp.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,32 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"UnProctectedUidApp"}, (0xA0001C5E), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\unproctecteduidapp.exe"-"!:\sys\bin\unproctecteduidapp.exe"
+"\epoc32\data\z\apparctestregfiles\UnProctectedUidApp_reg.rsc"-"!:\private\10003a3f\import\apps\UnProctectedUidApp_reg.rsc"
+"\epoc32\data\z\apparctestregfiles\UnProctectedUidApp.rsc"-"!:\resource\apps\UnProctectedUidApp.rsc"
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/app_CTRL.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,34 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"app_CTRL"}, (0x13008ACE), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\app_ctrl.exe"-"!:\sys\bin\app_ctrl.exe"
+"\epoc32\data\z\apparctestregfiles\App_CTRL_reg.rsc"-"!:\private\10003a3f\import\apps\App_CTRL_reg.rsc"
+"\epoc32\data\z\apparctestregfiles\App_CTRL.rsc"-"!:\resource\apps\App_CTRL.rsc"
+"\epoc32\data\z\apparctestregfiles\App_ctrl_loc.rsc"-"!:\resource\apps\App_ctrl_loc.rsc"
+"\epoc32\data\z\apparctestregfiles\APP_CTRL.MBM"-"!:\resource\apps\APP_CTRL.MBM"
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/app_CTRL2.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,30 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"app_CTRL2"}, (0x13008ADE), 1, 0, 0, TYPE=SA, RU
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\app_ctrl2.exe"-"!:\sys\bin\app_ctrl2.exe"
+"\epoc32\data\z\apparctestregfiles\App_CTRL2_reg.rsc"-"!:\private\10003a3f\import\apps\App_CTRL2_reg.rsc"
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/m_ctrl_v2.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,33 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"m_ctrl_v2"}, (0x13008AEE), 1, 0, 0, TYPE=SA, RU
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\m_ctrl.exe"-"!:\sys\bin\m_ctrl.exe"
+"\epoc32\data\z\apparctestregfiles\M_CTRL_reg.rsc"-"!:\private\10003a3f\import\apps\M_CTRL_reg.rsc"
+"\epoc32\data\z\apparctestregfiles\M_CTRL.rsc"-"!:\resource\apps\M_CTRL.rsc"
+"\epoc32\data\z\apparctestregfiles\M_CTRL_loc.rsc"-"!:\resource\apps\M_CTRL_loc.rsc"
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/openservice1app.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,30 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"openservice1app"}, (0x10208200), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\openservice1app.exe"-"!:\sys\bin\openservice1app.exe"
+"\epoc32\data\z\apparctestregfiles\openservice1a.rsc"-"!:\private\10003a3f\import\apps\openservice1a.rsc"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/openservice2app.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,30 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"openservice2app"}, (0x10208201), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\openservice2app.exe"-"!:\sys\bin\openservice2app.exe"
+"\epoc32\data\z\apparctestregfiles\openservice1b.rsc"-"!:\private\10003a3f\import\apps\openservice1b.rsc"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/serverapp.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,30 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"serverapp"}, (0x10004c56), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\serverapp.exe"-"!:\sys\bin\serverapp.exe"
+"\epoc32\data\z\apparctestregfiles\serverapp_reg.rsc"-"!:\private\10003a3f\import\apps\serverapp_reg.rsc"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/serverapp2.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,31 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"serverapp2"}, (0x10004c58), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\serverapp2.exe"-"!:\sys\bin\serverapp2.exe"
+"\epoc32\data\z\apparctestregfiles\serverapp2_reg.rsc"-"!:\private\10003a3f\import\apps\serverapp2_reg.rsc"
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/serverapp3.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,30 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"serverapp3"}, (0x10004c57), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\serverapp3.exe"-"!:\sys\bin\serverapp3.exe"
+"\epoc32\data\z\apparctestregfiles\serverapp3_reg.rsc"-"!:\private\10003a3f\import\apps\serverapp3_reg.rsc"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/serverapp4.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,31 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"serverapp4"}, (0x10004c76), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\serverapp4.exe"-"!:\sys\bin\serverapp4.exe"
+"\epoc32\data\z\apparctestregfiles\serverapp4_reg.rsc"-"!:\private\10003a3f\import\apps\serverapp4_reg.rsc"
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/serverapp6.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,32 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"serverapp6"}, (0x10004c55), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\serverapp6.exe"-"!:\sys\bin\serverapp6.exe"
+"\epoc32\data\z\apparctestregfiles\serverapp6_reg.rsc"-"!:\private\10003a3f\import\apps\serverapp6_reg.rsc"
+"\epoc32\data\z\apparctestregfiles\serverapp_loc.rsc"-"!:\resource\apps\serverapp_loc.rsc"
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/serverapp7.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,32 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"serverapp7"}, (0x10004c54), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\serverapp7.exe"-"!:\sys\bin\serverapp7.exe"
+"\epoc32\data\z\apparctestregfiles\serverapp7_reg.rsc"-"!:\private\10003a3f\import\apps\serverapp7_reg.rsc"
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/tRuleBasedApp1.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,32 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"tRuleBasedApp1"}, (0X1020D6FC), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\trulebasedapp1.exe"-"!:\sys\bin\trulebasedapp1.exe"
+"\epoc32\data\z\apparctestregfiles\tRuleBasedApp1_reg.rsc"-"!:\private\10003a3f\import\apps\tRuleBasedApp1_reg.rsc"
+"\epoc32\data\z\apparctestregfiles\tRuleBasedApp1.rsc"-"!:\resource\apps\tRuleBasedApp1.rsc"
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/tRuleBasedApp2.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,32 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"tRuleBasedApp2"}, (0X1020D6FD), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\trulebasedapp2.exe"-"!:\sys\bin\trulebasedapp2.exe"
+"\epoc32\data\z\apparctestregfiles\tRuleBasedApp2_reg.rsc"-"!:\private\10003a3f\import\apps\tRuleBasedApp2_reg.rsc"
+"\epoc32\data\z\apparctestregfiles\tRuleBasedApp2.rsc"-"!:\resource\apps\tRuleBasedApp2.rsc"
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/tRuleBasedApp3.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,32 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"tRuleBasedApp3"}, (0X1020D6FE), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\trulebasedapp3.exe"-"!:\sys\bin\trulebasedapp3.exe"
+"\epoc32\data\z\apparctestregfiles\tRuleBasedApp3_reg.rsc"-"!:\private\10003a3f\import\apps\tRuleBasedApp3_reg.rsc"
+"\epoc32\data\z\apparctestregfiles\tRuleBasedApp3.rsc"-"!:\resource\apps\tRuleBasedApp3.rsc"
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/tRuleBasedApp4.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,32 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"tRuleBasedApp4"}, (0x10210F77), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\trulebasedapp4.exe"-"!:\sys\bin\trulebasedapp4.exe"
+"\epoc32\data\z\apparctestregfiles\tRuleBasedApp4_reg.rsc"-"!:\private\10003a3f\import\apps\tRuleBasedApp4_reg.rsc"
+"\epoc32\data\z\apparctestregfiles\tRuleBasedApp4.rsc"-"!:\resource\apps\tRuleBasedApp4.rsc"
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/t_winchainChild.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,31 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"t_winchainChild"}, (0X10009e9f), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\t_winchainchild.exe"-"!:\sys\bin\t_winchainchild.exe"
+"\epoc32\data\z\apparctestregfiles\t_winchainChild_reg.rsc"-"!:\private\10003a3f\import\apps\t_winchainChild_reg.rsc"
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/t_winchainLaunch.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,31 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"t_winchainLaunch"}, (0X10009f9a), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\t_winchainlaunch.exe"-"!:\sys\bin\t_winchainlaunch.exe"
+"\epoc32\data\z\apparctestregfiles\t_winchainLaunch_reg.rsc"-"!:\private\10003a3f\import\apps\t_winchainLaunch_reg.rsc"
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/testmultipleapps.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,40 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TestMultipleApps"}, (0x102032ab), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\t_envslots.exe"-"!:\sys\bin\t_envslots.exe"
+"\epoc32\data\z\apparctestregfiles\T_EnvSlots_reg.rsc"-"!:\private\10003a3f\import\apps\T_EnvSlots_reg.rsc"
+"\epoc32\data\z\apparctestregfiles\T_EnvSlots_loc.rsc"-"!:\resource\apps\T_EnvSlots_loc.rsc"
+
+"\epoc32\release\armv5\udeb\T_groupname_ver1.exe"-"!:\sys\bin\T_groupname_ver1.exe"
+"\epoc32\data\z\apparctestregfiles\T_groupnamever1_reg.rsc"-"!:\private\10003a3f\import\apps\T_groupnamever1_reg.rsc"
+"\epoc32\data\z\apparctestregfiles\T_groupnamever1_loc.rsc"-"!:\resource\apps\T_groupnamever1_loc.rsc"
+
+"\epoc32\release\armv5\udeb\T_groupname_ver2.exe"-"!:\sys\bin\T_groupname_ver2.exe"
+"\epoc32\data\z\apparctestregfiles\T_groupnamever2_reg.rsc"-"!:\private\10003a3f\import\apps\T_groupnamever2_reg.rsc"
+"\epoc32\data\z\apparctestregfiles\T_groupnamever2_loc.rsc"-"!:\resource\apps\T_groupnamever2_loc.rsc"
+
Binary file appfw/apparchitecture/tef/testpkg/armv5/testmultipleappsdowngrade.pkg has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/ticoncaptionoverride.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,40 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"ticoncaptionoverride"}, (0x2001B674), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\ticoncaptionoverride.exe"-"!:\sys\bin\ticoncaptionoverride.exe"
+"\epoc32\data\z\apparctestregfiles\ticoncaptionoverride_reg.rsc"-"!:\private\10003a3f\import\apps\ticoncaptionoverride_reg.rsc"
+"\epoc32\data\z\apparctestregfiles\ticoncaptionoverride.rsc"-"!:\resource\apps\ticoncaptionoverride.rsc"
+"\epoc32\data\z\apparctestregfiles\ticoncaptionoverride_loc.rsc"-"!:\resource\apps\ticoncaptionoverride_loc.rsc"
+"\epoc32\data\z\apparctestregfiles\ticoncaptionoverride_loc.r01"-"!:\resource\apps\ticoncaptionoverride_loc.r01"
+"\epoc32\data\z\apparctestregfiles\ticoncaptionoverride_loc.r02"-"!:\resource\apps\ticoncaptionoverride_loc.r02"
+"\epoc32\data\z\apparctestregfiles\ticoncaptionoverride_loc.r03"-"!:\resource\apps\ticoncaptionoverride_loc.r03"
+"\epoc32\data\z\apparctestregfiles\ticoncapoverride.mbm"-"!:\resource\apps\ticoncapoverride.mbm"
+"\epoc32\data\z\apparctestregfiles\ticoncapoverride02.m02"-"!:\resource\apps\ticoncapoverride02.m02"
+"\epoc32\data\z\apparctestregfiles\svg_icon.svg"-"!:\resource\apps\svg_icon.svg"
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/tlargestackapp.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,32 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"tlargestackapp"}, (0x10282B28), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\tlargestackapp.exe"-"!:\sys\bin\tlargestackapp.exe"
+"\epoc32\data\z\apparctestregfiles\tlargestackapp_reg.rsc"-"!:\private\10003a3f\import\apps\tlargestackapp_reg.rsc"
+"\epoc32\data\z\apparctestregfiles\tlargestackapp.rsc"-"!:\resource\apps\tlargestackapp.rsc"
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/tnotifydrivesapp.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,33 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"tnotifydrivesapp"}, (0xA0003376), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\tnotifydrivesapp.exe"-"!:\sys\bin\tnotifydrivesapp.exe"
+"\epoc32\data\z\apparctestregfiles\tnotifydrivesapp_reg.rsc"-"!:\system\data\tnotifydrivesapp_reg.rsc"
+"\epoc32\data\z\apparctestregfiles\tnotifydrivesapp.rsc"-"!:\system\data\tnotifydrivesapp.rsc"
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/tupgradeiconapp.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,33 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"tupgradeiconapp"}, (0xA0003195), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\tupgradeiconapp.exe"-"!:\sys\bin\tupgradeiconapp.exe"
+"\epoc32\data\z\apparctestregfiles\tupgradeiconapp_reg.rsc"-"!:\private\10003a3f\import\apps\tupgradeiconapp_reg.rsc"
+"\epoc32\data\z\apparctestregfiles\tupgradeiconapp.rsc"-"!:\resource\apps\tupgradeiconapp.rsc"
+"\epoc32\data\z\apparctestregfiles\tupgradeiconapp.mbm"-"!:\resource\apps\tupgradeiconapp.mbm"
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/armv5/zerosizedicontestapp.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,34 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"zerosizedicontestapp"}, (0xABCD0000), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\armv5\udeb\zerosizedicontestapp.exe"-"!:\sys\bin\zerosizedicontestapp.exe"
+"\epoc32\data\z\apparctest\zerosizedicon_reg.rsc"-"!:\private\10003a3f\import\apps\zerosizedicon_reg.rsc"
+"\epoc32\data\z\apparctest\zerosizedicon_loc.rsc"-"!:\resource\apps\zerosizedicon_loc.rsc"
+"\epoc32\data\z\apparctestregfiles\zerosizedicon.mbm"-"!:\resource\apps\zerosizedicon.mbm"
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/preparesis.fil Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,54 @@
+# Build WLDCOMP, a strange WINC/Win32 hybrid
+#
+
+!IF "$(PLATFORM)" == "WINSCW"
+TOOLNAME=genbackupmeta
+SRCDIR=..\genbackupmeta
+
+!if "$(CFG)" == "REL"
+VC_CFG="$(TOOLNAME) - Win32 Release"
+CFG=UREL
+!else
+VC_CFG="$(TOOLNAME) - Win32 Debug"
+CFG=UDEB
+!endif
+
+!ENDIF
+
+FINAL :
+!IF "$(PLATFORM)" == "GCCXML" || "$(PLATFORM)" == "TOOLS"
+ cd
+ echo ----------------
+ echo Do nothing ...
+ echo ----------------
+!ELSE
+ cd
+ echo ---------------------------
+ echo Building test exes sis files...
+ echo ---------------------------
+
+ perl preparesis.pl $(PLATFORM) $(CFG)
+!ENDIF
+
+DO_NOTHING:
+ rem do nothing
+
+#
+# The targets invoked by abld...
+#
+
+MAKMAKE : DO_NOTHING
+FREEZE : DO_NOTHING
+LIB : DO_NOTHING
+RESOURCE : DO_NOTHING
+CLEANLIB : DO_NOTHING
+MAKEDATA : DO_NOTHING
+
+RELEASABLES :
+ echo $(TOOL)
+
+SAVESPACE : BLD
+
+BLD : MAKEDATA
+
+CLEAN :
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/preparesis.pl Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,109 @@
+#
+# Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of the License "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:
+#
+# -----------------------------------------------------------------------
+
+# sis files for
+my $platform = lc($ARGV[0]);
+
+die "EPOCROOT not defined" if !defined ($ENV{EPOCROOT});
+my $makesis = "$ENV{EPOCROOT}epoc32\\tools\\makesis.exe";
+my $signsis = "$ENV{EPOCROOT}epoc32\\tools\\signsis.exe";
+if ( ! -x $makesis || ! -x $signsis ) {
+ die "$makesis and $signsis are not executable";
+}
+
+my $sign_cert = "$ENV{EPOCROOT}epoc32\\tools\\Nokia_RnDCert_02.der";
+my $sign_key = "$ENV{EPOCROOT}epoc32\\tools\\Nokia_RnDCert_02.key";
+
+if ($platform =~/winscw/i)
+{
+ my $winscwpkgdir = "winscw";
+ my $winscwdir = "winscwsis";
+
+ # export path for winscw sis files
+ system("mkdir $winscwdir\\");
+ my $target_dir = "$ENV{EPOCROOT}epoc32\\release\\winscw\\udeb\\z\\apparctest\\apparctestsisfiles\\";
+ system("mkdir $target_dir\\");
+
+ # get list of package files for winscw
+ opendir DIR, $winscwpkgdir;
+ my @pkgfiles = grep (/\.pkg/, readdir(DIR));
+ closedir DIR;
+
+ # create and sign each sis file for winscw
+ my $target; # needs to be seen by continue
+ foreach my $entry (@pkgfiles)
+ {
+ print "\n";
+ $entry =~ s/\.pkg//; # remove .pkg suffix
+ my $pkg_file = "$winscwpkgdir\\$entry.pkg";
+
+ $target = "$target_dir\\$entry.sis";
+
+ my $make_cmd = "$makesis $pkg_file $winscwdir\\$entry-tmp.sis";
+ print "$make_cmd\n";
+ system($make_cmd);
+
+ my $sign_cmd = "$signsis $winscwdir\\$entry-tmp.sis $winscwdir\\$entry.sis $sign_cert $sign_key";
+ print "\n$sign_cmd\n";
+ system($sign_cmd);
+
+ my $copy_cmd = "copy /y $winscwdir\\$entry.sis $target";
+ print "\n$copy_cmd\n";
+ system($copy_cmd);
+ }
+}
+
+if ($platform =~ /armv5/i)
+{
+ my $armv5pkgdir = "armv5";
+ my $armv5dir = "armv5sis";
+
+ # export path for armv5 sis files
+ system("mkdir $armv5dir\\");
+ my $target_dir_armv5 = "$ENV{EPOCROOT}epoc32\\data\\Z\\System\\apparctestsisfiles\\";
+ system("mkdir $target_dir_armv5\\");
+
+ # get list of package files for armv5
+ opendir DIR, $armv5pkgdir;
+ my @armv5pkgfiles = grep (/\.pkg/, readdir(DIR));
+ closedir DIR;
+
+ # create and sign each sis file for armv5
+ my $targetarmv5; # needs to be seen by continue
+ foreach my $entry1 (@armv5pkgfiles)
+ {
+ $entry1 =~ s/\.pkg//; # remove .pkg suffix
+ my $pkg_file = "$armv5pkgdir\\$entry1.pkg";
+
+ $targetarmv5 = "$target_dir_armv5\\$entry1.sis";
+
+ my $make_cmd = "$makesis $pkg_file $armv5dir\\$entry1-tmp.sis";
+ print "$make_cmd\n";
+ system($make_cmd);
+
+ my $sign_cmd = "$signsis $armv5dir\\$entry1-tmp.sis $armv5dir\\$entry1.sis $sign_cert $sign_key";
+ print "\n$sign_cmd\n";
+ system($sign_cmd);
+
+ my $copy_cmd = "copy /y $armv5dir\\$entry1.sis $targetarmv5";
+ print "\n$copy_cmd\n";
+ system($copy_cmd);
+ }
+}
+
+# -----------------------------------------------------------------------
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/preparesis_stub.fil Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,40 @@
+# Build WLDCOMP, a strange WINC/Win32 hybrid
+#
+
+FINAL :
+!IF "$(PLATFORM)" == "GCCXML" || "$(PLATFORM)" == "TOOLS"
+ cd
+ echo ----------------
+ echo Do nothing ...
+ echo ----------------
+!ELSE
+ cd
+ echo ---------------------------
+ echo Building test exes sis files...
+ echo ---------------------------
+
+ perl preparesis_stub.pl
+!ENDIF
+
+DO_NOTHING:
+ rem do nothing
+
+#
+# The targets invoked by abld...
+#
+
+MAKMAKE : DO_NOTHING
+FREEZE : DO_NOTHING
+LIB : DO_NOTHING
+RESOURCE : DO_NOTHING
+CLEANLIB : DO_NOTHING
+MAKEDATA : DO_NOTHING
+
+RELEASABLES :
+ echo $(TOOL)
+
+SAVESPACE : BLD
+
+BLD : MAKEDATA
+
+CLEAN :
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/preparesis_stub.pl Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,74 @@
+#
+# Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of the License "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:
+#
+# -----------------------------------------------------------------------
+
+# sis files for
+my $stubpkgdir = "stub_sis";
+
+my $stubdir = "stubsis";
+
+die "EPOCROOT not defined" if !defined ($ENV{EPOCROOT});
+my $makesis = "$ENV{EPOCROOT}epoc32\\tools\\makesis.exe";
+my $option = "-s";
+my $signsis = "$ENV{EPOCROOT}epoc32\\tools\\signsis.exe";
+if ( ! -x $makesis || ! -x $signsis ) {
+ die "$makesis and $signsis are not executable";
+}
+
+my $sign_cert = "$ENV{EPOCROOT}epoc32\\tools\\Nokia_RnDCert_02.der";
+my $sign_key = "$ENV{EPOCROOT}epoc32\\tools\\Nokia_RnDCert_02.key";
+
+# export path for stub sis files
+system("mkdir $stubdir\\");
+my $target_winscw = "$ENV{EPOCROOT}epoc32\\release\\winscw\\udeb\\z\\system\\install\\";
+my $target_armv5 = "$ENV{EPOCROOT}epoc32\\data\\z\\system\\install\\";
+system("mkdir $target_winscw\\");
+system("mkdir $target_armv5\\");
+
+# get list of package files for stub
+opendir DIR, $stubpkgdir;
+my @pkgfiles = grep (/\.pkg/, readdir(DIR));
+closedir DIR;
+
+# create each stub sis file
+my $target; # needs to be seen by continue
+my $target2;
+foreach my $entry (@pkgfiles)
+ {
+ print "\n";
+ $entry =~ s/\.pkg//; # remove .pkg suffix
+ my $pkg_file = "$stubpkgdir\\$entry.pkg";
+
+ $target = "$target_winscw\\$entry.sis";
+ $target2 = "$target_armv5\\$entry.sis";
+
+ my $make_cmd = "$makesis $option $pkg_file $stubdir\\$entry.sis";
+ print "$make_cmd\n";
+ system($make_cmd);
+
+ my $copy_cmd = "copy /y $stubdir\\$entry.sis $target";
+ print "\n$copy_cmd\n";
+ system($copy_cmd);
+
+ my $copy_cmd = "copy /y $stubdir\\$entry.sis $target2";
+ print "\n$copy_cmd\n";
+ system($copy_cmd);
+ }
+
+
+
+# -----------------------------------------------------------------------
+
Binary file appfw/apparchitecture/tef/testpkg/scr.db has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/stub_sis/TSTAPP_standalone_Stub.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,47 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TSTAPP_standalone"}, (10), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+""-"!:\sys\bin\tstapp.exe"
+""-"!:\private\10003a3f\import\apps\tstapp_reg.rsc"
+""-"!:\resource\apps\tstapp_loc.rsc"
+""-"!:\resource\apps\tstapp_loc.r01"
+""-"!:\resource\apps\tstapp_loc.r02"
+""-"!:\resource\apps\tstapp_loc.r03"
+""-"!:\resource\apps\tstapp_loc.r04"
+""-"!:\resource\apps\tstapp_loc.r05"
+""-"!:\resource\apps\TSTAPP.rsc"
+""-"!:\resource\apps\tstapp.mbm"
+""-"!:\resource\apps\tstappview01.m01"
+""-"!:\resource\apps\tstappview02.k"
+""-"!:\resource\apps\tstappviewneg.xyz"
+""-"!:\resource\apps\tstappviewneg.mbm"
+""-"!:\resource\apps\tstappview"
+""-"!:\resource\apps\tstapp02.m02"
+""-"!:\resource\apps\tstappview01.m02"
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/stub_sis/app_CTRL2_stub.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,30 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"app_CTRL2"}, (0x13008ADE), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+""-"!:\sys\bin\app_ctrl2.exe"
+""-"!:\private\10003a3f\import\apps\App_CTRL2_reg.rsc"
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/stub_sis/m_ctrl_v2_Stub.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,33 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"m_ctrl_v2"}, (0x13008AEE), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+""-"!:\sys\bin\m_ctrl.exe"
+""-"!:\private\10003a3f\import\apps\M_CTRL_reg.rsc"
+""-"!:\resource\apps\M_CTRL.rsc"
+""-"!:\resource\apps\M_CTRL_loc.rsc"
+
Binary file appfw/apparchitecture/tef/testpkg/swicertstore.dat has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/Corrupted.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,29 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"Corrupted"}, (0x10004c5f), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\z\apparctest\Corrupted_reg.rsc"-"!:\private\10003a3f\import\apps\Corrupted_reg.rsc"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/CustomiseDefaultIconApp.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,32 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"CustomiseDefaultIconApp"}, (0x10208181), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\CustomiseDefaultIconApp.exe"-"!:\sys\bin\CustomiseDefaultIconApp.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\CustomiseDefaultIconApp_reg.rsc"-"!:\private\10003a3f\import\apps\CustomiseDefaultIconApp_reg.rsc"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\CustomiseDefaultIconApp_loc.rsc"-"!:\resource\apps\CustomiseDefaultIconApp_loc.rsc"
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/EndTaskTestApp.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,31 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"EndTaskTestApp"}, (0x10282B33), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\endtasktestapp.exe"-"!:\sys\bin\endtasktestapp.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\EndTask_reg.rsc"-"!:\private\10003a3f\import\apps\EndTask_reg.rsc"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\EndTaskTestApp.rsc"-"!:\resource\apps\EndTaskTestApp.rsc"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/ForceRegApp1.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,32 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"ForceRegApp1"}, (0xA0001000), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\forceregapp1.exe"-"!:\sys\bin\forceregapp1.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\forceregapp1_reg.rsc"-"!:\private\10003a3f\import\apps\forceregapp1_reg.rsc"
+"\epoc32\data\z\apparctest\forcegtestapp1.frg1"-"!:\apparctest\forcegtestapp1.frg1", RI
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/ForceRegApp2.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,31 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"ForceRegApp2"}, (0xA0001001), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\forceregapp2.exe"-"!:\sys\bin\forceregapp2.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\forceregapp2_reg.rsc"-"!:\private\10003a3f\import\apps\forceregapp2_reg.rsc"
+"\epoc32\data\z\apparctest\forcegtestapp2.frg2"-"!:\apparctest\forcegtestapp2.frg2", RI, RW
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/ForceRegMultipleApps.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,35 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"ForceRegMultipleApps"}, (0xA0001001), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\forceregapp1.exe"-"!:\sys\bin\forceregapp1.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\forceregapp1_reg.rsc"-"!:\private\10003a3f\import\apps\forceregapp1_reg.rsc"
+"\epoc32\data\z\apparctest\forcegtestapp1.frg1"-"!:\apparctest\forcegtestapp1.frg1", RI
+
+"\epoc32\release\winscw\udeb\forceregapp2.exe"-"!:\sys\bin\forceregapp2.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\forceregapp2_reg.rsc"-"!:\private\10003a3f\import\apps\forceregapp2_reg.rsc"
+"\epoc32\data\z\apparctest\forcegtestapp2.frg2"-"!:\apparctest\forcegtestapp2.frg2", RI, RW
Binary file appfw/apparchitecture/tef/testpkg/winscw/ParentProcess.sis has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/SimpleApparcTestApp.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,32 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"SimpleApparcTestApp"}, (0x12008ACE), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\simpleapparctestapp.exe"-"!:\sys\bin\simpleapparctestapp.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\SimpleApparcTestApp_Reg.rsc"-"!:\private\10003a3f\import\apps\SimpleApparcTestApp_Reg.rsc"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\SimpleApparcTestApp.rsc"-"!:\resource\apps\SimpleApparcTestApp.rsc"
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/TAppEmbeddableOnly_v2.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,32 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TAppEmbeddableOnly_v2"}, (0x10004c5C), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\tappembeddableonly.dll"-"!:\sys\bin\tappembeddableonly.dll"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\TAppEmbeddableOnly_reg.rsc"-"!:\private\10003a3f\import\apps\TAppEmbeddableOnly_reg.rsc"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\tappembeddableonly.rsc"-"!:\resource\plugins\tappembeddableonly.rsc"
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/TAppEmbeddableUiNotStandAlone_v2.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,32 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TAppEmbeddableUiNotStandAlone_v2"}, (0x10004c5E), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\tappembeddableuinotstandalone.dll"-"!:\sys\bin\tappembeddableuinotstandalone.dll"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\TAppEmbeddableUiNotStandAlone_reg.rsc"-"!:\private\10003a3f\import\apps\TAppEmbeddableUiNotStandAlone_reg.rsc"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\tappembeddableuinotstandalone.rsc"-"!:\resource\plugins\tappembeddableuinotstandalone.rsc"
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/TAppEmbeddableUiOrStandAlone_embedded.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,31 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TAppEmbeddableUiOrStandAlone_embedded"}, (0x10004c5D), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\tappembeddableuiorstandalone_embedded.dll"-"!:\sys\bin\tappembeddableuiorstandalone_embedded.dll"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\tappembeddableuiorstandalone_embedded.rsc"-"!:\resource\plugins\tappembeddableuiorstandalone_embedded.rsc"
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/TAppEmbeddableUiOrStandalone_standalone.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,30 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TAppEmbeddableUiOrStandalone_standalone"}, (0x10004c4A), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\tappembeddableuiorstandalone.exe"-"!:\sys\bin\tappembeddableuiorstandalone.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\TAppEmbeddableUiOrStandAlone_reg.rsc"-"!:\private\10003a3f\import\apps\TAppEmbeddableUiOrStandAlone_reg.rsc"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/TAppEmbeddable_embedded.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,31 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TAppEmbeddable_embedded"}, (0x10004c5B), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\tappembeddable_embedded.dll"-"!:\sys\bin\tappembeddable_embedded.dll"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\tappembeddable_embedded.rsc"-"!:\resource\plugins\tappembeddable_embedded.rsc"
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/TAppEmbeddable_standalone.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,32 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TAppEmbeddable_standalone"}, (0x10004c48), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\tappembeddable.exe"-"!:\sys\bin\tappembeddable.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\TAppEmbeddable_reg.rsc"-"!:\private\10003a3f\import\apps\TAppEmbeddable_reg.rsc"
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/TAppInstall.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,30 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TAppInstall"}, (0x10207f7d), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\testappinstall.exe"-"!:\sys\bin\testappinstall.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\TestAppInstall_reg.rsc"-"!:\apparctest\TestAppInstall_reg.rsc"
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/TAppNotEmbeddable_v2.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,31 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TAppNotEmbeddable_v2"}, (0x10004c47), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\tappnotembeddable.exe"-"!:\sys\bin\tappnotembeddable.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\TAppNotEmbeddable_reg.rsc"-"!:\private\10003a3f\import\apps\TAppNotEmbeddable_reg.rsc"
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/TApparcTestApp.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,34 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TApparcTestApp"}, (0x100048F3), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\tapparctestapp.exe"-"!:\sys\bin\tapparctestapp.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\tapparctestapp_reg.rsc"-"!:\private\10003a3f\import\apps\tapparctestapp_reg.rsc"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\tapparctestapp.rsc"-"!:\resource\apps\tapparctestapp.rsc"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\tapparctestapp_loc.rsc"-"!:\resource\apps\tapparctestapp_loc.rsc"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\svg_icon.svg"-"!:\resource\apps\svg_icon.svg"
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/TCtrlPnlApp.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,30 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TCtrlPnlApp"}, (0x10207f79), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\TCtrlPnlApp.exe"-"!:\sys\bin\TCtrlPnlApp.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\TCtrlPnlApp_reg.rsc"-"!:\private\10003a3f\import\apps\TCtrlPnlApp_reg.rsc"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/TNNApp1.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,31 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TNNApp1"}, (0x10207f92), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\tnnapp1.exe"-"!:\sys\bin\tnnapp1.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\TNNApp1_reg.rsc"-"!:\private\10003a3f\import\apps\TNNApp1_reg.rsc"
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/TNNApp2.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,31 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TNNApp2"}, (0x10207f94), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\tnnapp2.exe"-"!:\sys\bin\tnnapp2.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\TNNApp2_reg.rsc"-"!:\private\10003a3f\import\apps\TNNApp2_reg.rsc"
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/TRApaLsSessionStartAppTestApp_v2.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,31 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TRApaLsSessionStartAppTestApp_v2"}, (0x10004c4f), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\trapalssessionstartapptestapp.exe"-"!:\sys\bin\trapalssessionstartapptestapp.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\TRApaLsSessionStartAppTestApp_reg.rsc"-"!:\private\10003a3f\import\apps\TRApaLsSessionStartAppTestApp_reg.rsc"
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/TSTAPP_standalone.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,47 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TSTAPP_standalone"}, (10), 1, 0, 0, TYPE=SA, RU
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\tstapp.exe"-"!:\sys\bin\tstapp.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\tstapp_reg.rsc"-"!:\private\10003a3f\import\apps\tstapp_reg.rsc"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\tstapp_loc.rsc"-"!:\resource\apps\tstapp_loc.rsc"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\tstapp_loc.r01"-"!:\resource\apps\tstapp_loc.r01"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\tstapp_loc.r02"-"!:\resource\apps\tstapp_loc.r02"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\tstapp_loc.r03"-"!:\resource\apps\tstapp_loc.r03"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\tstapp_loc.r04"-"!:\resource\apps\tstapp_loc.r04"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\tstapp_loc.r05"-"!:\resource\apps\tstapp_loc.r05"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\TSTAPP.rsc"-"!:\resource\apps\TSTAPP.rsc"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\tstapp.mbm"-"!:\resource\apps\tstapp.mbm"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\tstappview01.m01"-"!:\resource\apps\tstappview01.m01"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\tstappview02.k"-"!:\resource\apps\tstappview02.k"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\tstappviewneg.xyz"-"!:\resource\apps\tstappviewneg.xyz"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\tstappviewneg.mbm"-"!:\resource\apps\tstappviewneg.mbm"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\tstappview"-"!:\resource\apps\tstappview"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\tstapp02.m02"-"!:\resource\apps\tstapp02.m02"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\tstappview01.m02"-"!:\resource\apps\tstappview01.m02"
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/TStartDocApp_v2.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,30 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TStartDocApp_v2"}, (0x10004c4d), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\tstartdocapp.exe"-"!:\sys\bin\tstartdocapp.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\TStartDocApp_reg.rsc"-"!:\private\10003a3f\import\apps\TStartDocApp_reg.rsc"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/T_DataPrioritySystem1.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,32 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"T_DataPrioritySystem1"}, (0x10207f7b), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\t_dataprioritysystem1.exe"-"!:\sys\bin\t_dataprioritysystem1.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\T_DataPrioritySystem1_reg.rsc"-"!:\private\10003a3f\import\apps\T_DataPrioritySystem1_reg.rsc"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\T_DataPrioritySystem1_loc.rsc"-"!:\resource\apps\T_DataPrioritySystem1_loc.rsc"
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/T_DataPrioritySystem2.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,32 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"T_DataPrioritySystem2"}, (0x10207f7c), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\t_dataprioritysystem2.exe"-"!:\sys\bin\t_dataprioritysystem2.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\T_DataPrioritySystem2_reg.rsc"-"!:\private\10003a3f\import\apps\T_DataPrioritySystem2_reg.rsc"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\T_DataPrioritySystem2_loc.rsc"-"!:\resource\apps\T_DataPrioritySystem2_loc.rsc"
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/T_DataPrioritySystem3.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,30 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"T_DataPrioritySystem3"}, (0x10207f7f), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\T_DataPrioritySystem3.exe"-"!:\sys\bin\T_DataPrioritySystem3.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\T_DataPrioritySystem3_reg.rsc"-"!:\private\10003a3f\import\apps\T_DataPrioritySystem3_reg.rsc"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/T_EnvSlots.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,32 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"T_EnvSlots"}, (0x102032AB), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\t_envslots.exe"-"!:\sys\bin\t_envslots.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\T_EnvSlots_reg.rsc"-"!:\private\10003a3f\import\apps\T_EnvSlots_reg.rsc"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\T_EnvSlots_loc.rsc"-"!:\resource\apps\T_EnvSlots_loc.rsc"
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/T_groupname.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,32 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"T_groupname"}, (0x10208185), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\T_groupname.exe"-"!:\sys\bin\T_groupname.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\T_groupname_reg.rsc"-"!:\private\10003a3f\import\apps\T_groupname_reg.rsc"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\T_groupname_loc.rsc"-"!:\resource\apps\T_groupname_loc.rsc"
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/T_groupname_ver1.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,32 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"T_groupname_ver1"}, (0x10208183), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\T_groupname_ver1.exe"-"!:\sys\bin\T_groupname_ver1.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\T_groupnamever1_reg.rsc"-"!:\private\10003a3f\import\apps\T_groupnamever1_reg.rsc"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\T_groupnamever1_loc.rsc"-"!:\resource\apps\T_groupnamever1_loc.rsc"
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/T_groupname_ver2.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,32 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"T_groupname_ver2"}, (0x10208184), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\T_groupname_ver2.exe"-"!:\sys\bin\T_groupname_ver2.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\T_groupnamever2_reg.rsc"-"!:\private\10003a3f\import\apps\T_groupnamever2_reg.rsc"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\T_groupnamever2_loc.rsc"-"!:\resource\apps\T_groupnamever2_loc.rsc"
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/TestTrustedPriorityApp1.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,32 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TestTrustedPriorityApp1"}, (0x10207f8D), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\TestTrustedPriorityApp1.exe"-"!:\sys\bin\TestTrustedPriorityApp1.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\TestTrustedPriorityApp1_reg.rsc"-"!:\private\10003a3f\import\apps\TestTrustedPriorityApp1_reg.rsc"
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/TestTrustedPriorityApp2.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,30 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TestTrustedPriorityApp2"}, (0x10207f8F), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\TestTrustedPriorityApp2.exe"-"!:\sys\bin\TestTrustedPriorityApp2.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\TestTrustedPriorityApp2_reg.rsc"-"!:\private\10003a3f\import\apps\TestTrustedPriorityApp2_reg.rsc"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/TestUnTrustedPriorityApp1.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,30 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TestUnTrustedPriorityApp1"}, (0x10207f8C), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\TestUnTrustedPriorityApp1.exe"-"!:\sys\bin\TestUnTrustedPriorityApp1.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\TestUnTrustedPriorityApp1_reg.rsc"-"!:\private\10003a3f\import\apps\TestUnTrustedPriorityApp1_reg.rsc"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/TestUnTrustedPriorityApp2.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,30 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TestUnTrustedPriorityApp2"}, (0xA3010010), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\TestUnTrustedPriorityApp2.exe"-"!:\sys\bin\TestUnTrustedPriorityApp2.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\TestUnTrustedPriorityApp2_reg.rsc"-"!:\private\10003a3f\import\apps\TestUnTrustedPriorityApp2_reg.rsc"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/UnProctectedUidApp.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,32 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"UnProctectedUidApp"}, (0xA0001C5E), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\unproctecteduidapp.exe"-"!:\sys\bin\unproctecteduidapp.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\UnProctectedUidApp_reg.rsc"-"!:\private\10003a3f\import\apps\UnProctectedUidApp_reg.rsc"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\UnProctectedUidApp.rsc"-"!:\resource\apps\UnProctectedUidApp.rsc"
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/app_CTRL.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,34 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"app_CTRL"}, (0x13008ACE), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\app_ctrl.exe"-"!:\sys\bin\app_ctrl.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\App_CTRL_reg.rsc"-"!:\private\10003a3f\import\apps\App_CTRL_reg.rsc"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\App_CTRL.rsc"-"!:\resource\apps\App_CTRL.rsc"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\App_ctrl_loc.rsc"-"!:\resource\apps\App_ctrl_loc.rsc"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\APP_CTRL.MBM"-"!:\resource\apps\APP_CTRL.MBM"
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/app_CTRL2.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,30 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"app_CTRL2"}, (0x13008ADE), 1, 0, 0, TYPE=SA, RU
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\app_ctrl2.exe"-"!:\sys\bin\app_ctrl2.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\App_CTRL2_reg.rsc"-"!:\private\10003a3f\import\apps\App_CTRL2_reg.rsc"
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/m_ctrl_v2.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,33 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"m_ctrl_v2"}, (0x13008AEE), 1, 0, 0, TYPE=SA, RU
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\m_ctrl.exe"-"!:\sys\bin\m_ctrl.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\M_CTRL_reg.rsc"-"!:\private\10003a3f\import\apps\M_CTRL_reg.rsc"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\M_CTRL.rsc"-"!:\resource\apps\M_CTRL.rsc"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\M_CTRL_loc.rsc"-"!:\resource\apps\M_CTRL_loc.rsc"
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/openservice1app.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,30 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"openservice1app"}, (0x10208200), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\openservice1app.exe"-"!:\sys\bin\openservice1app.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\openservice1a.rsc"-"!:\private\10003a3f\import\apps\openservice1a.rsc"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/openservice2app.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,30 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"openservice2app"}, (0x10208201), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\openservice2app.exe"-"!:\sys\bin\openservice2app.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\openservice1b.rsc"-"!:\private\10003a3f\import\apps\openservice1b.rsc"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/serverapp.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,30 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"serverapp"}, (0x10004c56), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\serverapp.exe"-"!:\sys\bin\serverapp.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\serverapp_reg.rsc"-"!:\private\10003a3f\import\apps\serverapp_reg.rsc"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/serverapp2.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,31 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"serverapp2"}, (0x10004c58), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\serverapp2.exe"-"!:\sys\bin\serverapp2.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\serverapp2_reg.rsc"-"!:\private\10003a3f\import\apps\serverapp2_reg.rsc"
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/serverapp3.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,30 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"serverapp3"}, (0x10004c57), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\serverapp3.exe"-"!:\sys\bin\serverapp3.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\serverapp3_reg.rsc"-"!:\private\10003a3f\import\apps\serverapp3_reg.rsc"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/serverapp4.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,31 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"serverapp4"}, (0x10004c76), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\serverapp4.exe"-"!:\sys\bin\serverapp4.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\serverapp4_reg.rsc"-"!:\private\10003a3f\import\apps\serverapp4_reg.rsc"
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/serverapp6.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,32 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"serverapp6"}, (0x10004c55), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\serverapp6.exe"-"!:\sys\bin\serverapp6.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\serverapp6_reg.rsc"-"!:\private\10003a3f\import\apps\serverapp6_reg.rsc"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\serverapp_loc.rsc"-"!:\resource\apps\serverapp_loc.rsc"
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/serverapp7.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,32 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"serverapp7"}, (0x10004c54), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\serverapp7.exe"-"!:\sys\bin\serverapp7.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\serverapp7_reg.rsc"-"!:\private\10003a3f\import\apps\serverapp7_reg.rsc"
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/tRuleBasedApp1.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,32 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"tRuleBasedApp1"}, (0X1020D6FC), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\trulebasedapp1.exe"-"!:\sys\bin\trulebasedapp1.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\tRuleBasedApp1_reg.rsc"-"!:\private\10003a3f\import\apps\tRuleBasedApp1_reg.rsc"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\tRuleBasedApp1.rsc"-"!:\resource\apps\tRuleBasedApp1.rsc"
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/tRuleBasedApp2.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,32 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"tRuleBasedApp2"}, (0X1020D6FD), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\trulebasedapp2.exe"-"!:\sys\bin\trulebasedapp2.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\tRuleBasedApp2_reg.rsc"-"!:\private\10003a3f\import\apps\tRuleBasedApp2_reg.rsc"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\tRuleBasedApp2.rsc"-"!:\resource\apps\tRuleBasedApp2.rsc"
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/tRuleBasedApp3.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,32 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"tRuleBasedApp3"}, (0X1020D6FE), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\trulebasedapp3.exe"-"!:\sys\bin\trulebasedapp3.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\tRuleBasedApp3_reg.rsc"-"!:\private\10003a3f\import\apps\tRuleBasedApp3_reg.rsc"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\tRuleBasedApp3.rsc"-"!:\resource\apps\tRuleBasedApp3.rsc"
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/tRuleBasedApp4.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,32 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"tRuleBasedApp4"}, (0x10210F77), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\trulebasedapp4.exe"-"!:\sys\bin\trulebasedapp4.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\tRuleBasedApp4_reg.rsc"-"!:\private\10003a3f\import\apps\tRuleBasedApp4_reg.rsc"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\tRuleBasedApp4.rsc"-"!:\resource\apps\tRuleBasedApp4.rsc"
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/t_winchainChild.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,31 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"t_winchainChild"}, (0X10009e9f), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\t_winchainchild.exe"-"!:\sys\bin\t_winchainchild.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\t_winchainChild_reg.rsc"-"!:\private\10003a3f\import\apps\t_winchainChild_reg.rsc"
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/t_winchainLaunch.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,31 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"t_winchainLaunch"}, (0X10009f9a), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\t_winchainlaunch.exe"-"!:\sys\bin\t_winchainlaunch.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\t_winchainLaunch_reg.rsc"-"!:\private\10003a3f\import\apps\t_winchainLaunch_reg.rsc"
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/testmultipleapps.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,40 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"TestMultipleApps"}, (0x102032ab), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\t_envslots.exe"-"!:\sys\bin\t_envslots.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\T_EnvSlots_reg.rsc"-"!:\private\10003a3f\import\apps\T_EnvSlots_reg.rsc"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\T_EnvSlots_loc.rsc"-"!:\resource\apps\T_EnvSlots_loc.rsc"
+
+"\epoc32\release\winscw\udeb\T_groupname_ver1.exe"-"!:\sys\bin\T_groupname_ver1.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\T_groupnamever1_reg.rsc"-"!:\private\10003a3f\import\apps\T_groupnamever1_reg.rsc"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\T_groupnamever1_loc.rsc"-"!:\resource\apps\T_groupnamever1_loc.rsc"
+
+"\epoc32\release\winscw\udeb\T_groupname_ver2.exe"-"!:\sys\bin\T_groupname_ver2.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\T_groupnamever2_reg.rsc"-"!:\private\10003a3f\import\apps\T_groupnamever2_reg.rsc"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\T_groupnamever2_loc.rsc"-"!:\resource\apps\T_groupnamever2_loc.rsc"
+
Binary file appfw/apparchitecture/tef/testpkg/winscw/testmultipleappsdowngrade.pkg has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/ticoncaptionoverride.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,40 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"ticoncaptionoverride"}, (0x2001B674), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\ticoncaptionoverride.exe"-"!:\sys\bin\ticoncaptionoverride.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\ticoncaptionoverride_reg.rsc"-"!:\private\10003a3f\import\apps\ticoncaptionoverride_reg.rsc"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\ticoncaptionoverride.rsc"-"!:\resource\apps\ticoncaptionoverride.rsc"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\ticoncaptionoverride_loc.rsc"-"!:\resource\apps\ticoncaptionoverride_loc.rsc"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\ticoncaptionoverride_loc.r01"-"!:\resource\apps\ticoncaptionoverride_loc.r01"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\ticoncaptionoverride_loc.r02"-"!:\resource\apps\ticoncaptionoverride_loc.r02"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\ticoncaptionoverride_loc.r03"-"!:\resource\apps\ticoncaptionoverride_loc.r03"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\ticoncapoverride.mbm"-"!:\resource\apps\ticoncapoverride.mbm"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\ticoncapoverride02.m02"-"!:\resource\apps\ticoncapoverride02.m02"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\svg_icon.svg"-"!:\resource\apps\svg_icon.svg"
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/tlargestackapp.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,32 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"tlargestackapp"}, (0x10282B28), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\tlargestackapp.exe"-"!:\sys\bin\tlargestackapp.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\tlargestackapp_reg.rsc"-"!:\private\10003a3f\import\apps\tlargestackapp_reg.rsc"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\tlargestackapp.rsc"-"!:\resource\apps\tlargestackapp.rsc"
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/tnotifydrivesapp.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,33 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"tnotifydrivesapp"}, (0xA0003376), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\tnotifydrivesapp.exe"-"!:\sys\bin\tnotifydrivesapp.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\tnotifydrivesapp_reg.rsc"-"!:\system\data\tnotifydrivesapp_reg.rsc"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\tnotifydrivesapp.rsc"-"!:\system\data\tnotifydrivesapp.rsc"
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/tupgradeiconapp.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,33 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"tupgradeiconapp"}, (0xA0003195), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\tupgradeiconapp.exe"-"!:\sys\bin\tupgradeiconapp.exe"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\tupgradeiconapp_reg.rsc"-"!:\private\10003a3f\import\apps\tupgradeiconapp_reg.rsc"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\tupgradeiconapp.rsc"-"!:\resource\apps\tupgradeiconapp.rsc"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\tupgradeiconapp.mbm"-"!:\resource\apps\tupgradeiconapp.mbm"
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/testpkg/winscw/zerosizedicontestapp.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,34 @@
+;
+; 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 the License "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:
+;
+
+
+;Languages
+&EN
+
+;Header
+; SA = Symbian Application
+; RU = Rom Upgrade
+#{"zerosizedicontestapp"}, (0xABCD0000), 1, 0, 0, TYPE=SA
+
+%{"Nokia India Pvt Ltd"}
+:"Nokia India Pvt Ltd"
+
+"\epoc32\release\winscw\udeb\zerosizedicontestapp.exe"-"!:\sys\bin\zerosizedicontestapp.exe"
+"\epoc32\release\winscw\udeb\z\apparctest\zerosizedicon_reg.rsc"-"!:\private\10003a3f\import\apps\zerosizedicon_reg.rsc"
+"\epoc32\release\winscw\udeb\z\apparctest\zerosizedicon_loc.rsc"-"!:\resource\apps\zerosizedicon_loc.rsc"
+"\epoc32\release\winscw\udeb\z\apparctestregfiles\zerosizedicon.mbm"-"!:\resource\apps\zerosizedicon.mbm"
+
+
--- a/appfw/apparchitecture/tef/ticoncaptionoverride.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/ticoncaptionoverride.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -38,27 +38,27 @@
//reg added for Datacaging
START RESOURCE ticoncaptionoverride_reg.rss
-TARGETPATH /private/10003a3f/import/apps
+TARGETPATH /apparctestregfiles
END
START RESOURCE ticoncaptionoverride.rss
-TARGETPATH /resource/apps
+TARGETPATH /apparctestregfiles
END
START RESOURCE ticoncaptionoverride_loc.rss
-TARGETPATH /resource/apps
+TARGETPATH /apparctestregfiles
LANG SC 01 02 03
END
START BITMAP ticoncapoverride.mbm
-TARGETPATH /resource/apps
+TARGETPATH /apparctestregfiles
SOURCEPATH ../tdatasrc
SOURCE c8,1 tstappicon24x20.bmp tstappicon24x20m.bmp
SOURCE c8,1 tstappicon40x55.bmp tstappicon40x55m.bmp
END
START BITMAP ticoncapoverride02.m02
-TARGETPATH /resource/apps
+TARGETPATH /apparctestregfiles
SOURCEPATH ../tdatasrc
SOURCE c8,1 def25.bmp def25m.bmp def25.bmp def25m.bmp def50.bmp def50m.bmp
END
--- a/appfw/apparchitecture/tef/ticoncaptionoverride01.rls Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/ticoncaptionoverride01.rls Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -22,4 +22,4 @@
rls_string STRING_r_ticoncapoverride_caption_string "TstCap UK"
rls_string STRING_r_ticoncapoverride_short_caption_string "TC UK"
-rls_string STRING_r_ticoncapoverride_icon_file "z:\\resource\\apps\\ticoncapoverride.mbm"
+rls_string STRING_r_ticoncapoverride_icon_file "\\resource\\apps\\ticoncapoverride.mbm"
--- a/appfw/apparchitecture/tef/ticoncaptionoverride02.rls Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/ticoncaptionoverride02.rls Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -22,4 +22,4 @@
rls_string STRING_r_ticoncapoverride_caption_string "TstCap FR"
rls_string STRING_r_ticoncapoverride_short_caption_string "TC FR"
-rls_string STRING_r_ticoncapoverride_icon_file "z:\\resource\\apps\\ticoncapoverride02.m02"
+rls_string STRING_r_ticoncapoverride_icon_file "\\resource\\apps\\ticoncapoverride02.m02"
--- a/appfw/apparchitecture/tef/ticoncaptionoverride03.rls Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/ticoncaptionoverride03.rls Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -22,4 +22,4 @@
rls_string STRING_r_ticoncapoverride_caption_string "TstCap GE"
rls_string STRING_r_ticoncapoverride_short_caption_string "TC GE"
-rls_string STRING_r_ticoncapoverride_icon_file "z:\\resource\\apps\\ticoncapoverride.mbm"
+rls_string STRING_r_ticoncapoverride_icon_file "\\resource\\apps\\ticoncapoverride.mbm"
--- a/appfw/apparchitecture/tef/ticoncaptionoverridesc.rls Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/ticoncaptionoverridesc.rls Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -23,4 +23,4 @@
rls_string STRING_r_ticoncapoverride_caption_string "TstCap UK"
rls_string STRING_r_ticoncapoverride_short_caption_string "TC UK"
-rls_string STRING_r_ticoncapoverride_icon_file "z:\\resource\\apps\\ticoncapoverride.mbm"
+rls_string STRING_r_ticoncapoverride_icon_file "\\resource\\apps\\ticoncapoverride.mbm"
--- a/appfw/apparchitecture/tef/tlargestack/tlargestackapp.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/tlargestack/tlargestackapp.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -37,11 +37,11 @@
START RESOURCE tlargestackapp.rss
HEADER
-TARGETPATH /resource/apps
+TARGETPATH /apparctestregfiles
end
START RESOURCE tlargestackapp_reg.rss
-TARGETPATH /private/10003a3f/apps
+TARGETPATH /apparctestregfiles
END
LIBRARY euser.lib apparc.lib cone.lib eikcore.lib gdi.lib
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/tnonnativeruntime/tnonnativeruntime.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,37 @@
+// 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:
+//
+
+/**
+ @file
+ @internalComponent - Internal Symbian test code
+*/
+
+#include <e32base.h>
+#include "../t_nonnativetest.h"
+#include <e32property.h>
+#include <apacmdln.h>
+
+const TUid KPropertyCategory = {0x101F289C};
+const TUint KNonNativeTestPropertyKey = 2;
+
+TInt E32Main()
+ {
+ RProperty forceRegStatus;
+ User::LeaveIfError(forceRegStatus.Attach(KPropertyCategory, KNonNativeTestPropertyKey, EOwnerThread));
+
+ forceRegStatus.Set(1);
+ forceRegStatus.Close();
+ return(KErrNone);
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/tnonnativeruntime/tnonnativeruntime.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,44 @@
+// 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:
+// using relative paths for sourcepath and user includes
+//
+//
+
+/**
+ @file
+ @test
+ @internalComponent - Internal Symbian test code
+*/
+
+TARGET tnonnativeruntime.exe
+TARGETTYPE exe
+UID 0x100039CE 0xA0001002
+VENDORID 0x70000001
+
+SOURCEPATH .
+SOURCE tnonnativeruntime.cpp
+
+USERINCLUDE .
+
+MW_LAYER_SYSTEMINCLUDE_SYMBIAN
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN
+
+
+START RESOURCE tnonnativeruntime_reg.rss
+TARGETPATH /private/10003a3f/import/apps
+END
+
+LIBRARY euser.lib apparc.lib cone.lib eikcore.lib gdi.lib
+
+SMPSAFE
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/apparchitecture/tef/tnonnativeruntime/tnonnativeruntime_reg.rss Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,31 @@
+// 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:
+//
+
+/**
+ @file
+ @test
+ @internalComponent - Internal Symbian test code
+*/
+
+#include <appinfo.rh>
+
+UID2 KUidAppRegistrationResourceFile
+UID3 0xA0001002 // application UID
+
+RESOURCE APP_REGISTRATION_INFO
+ {
+ app_file = "tnonnativeruntime";
+ }
+
--- a/appfw/apparchitecture/tef/tnotifydrivesapp/tnotifydrivesapp.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/tnotifydrivesapp/tnotifydrivesapp.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-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"
@@ -38,13 +38,13 @@
SOURCEPATH .
RESOURCE tnotifydrivesapp.rss
START RESOURCE tnotifydrivesapp.rss
-TARGETPATH /system/data
+TARGETPATH /apparctestregfiles
LANG SC
END
SOURCEPATH .
START RESOURCE tnotifydrivesapp_reg.rss
-TARGETPATH /system/data
+TARGETPATH /apparctestregfiles
END
LIBRARY euser.lib apparc.lib cone.lib eikcore.lib gdi.lib
--- a/appfw/apparchitecture/tef/tssaac/tssaac.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/tssaac/tssaac.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-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"
@@ -41,7 +41,7 @@
#else
// startup with tssaac application for hardware
START RESOURCE tssaac_hardware.rss
-TARGETPATH \private\10205C44
+TARGETPATH /private/10205C44
END
#endif
--- a/appfw/apparchitecture/tef/tstapp01.rls Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/tstapp01.rls Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-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"
@@ -26,9 +26,9 @@
rls_string STRING_r_tstapp_view1_caption "V1 UK"
rls_string STRING_r_tstapp_view2_caption "V2 UK"
-rls_string STRING_r_tstapp_icon_file "z:\\resource\\apps\\tstapp.mbm"
-rls_string STRING_r_tstapp_view1_icon_file "z:\\resource\\apps\\tstappview01.m01"
-rls_string STRING_r_tstapp_view2_icon_file "z:\\resource\\apps\\tstappview02.k"
-rls_string STRING_r_tstapp_view3_icon_file "z:\\resource\\apps\\tstappviewneg.xyz"
+rls_string STRING_r_tstapp_icon_file "\\resource\\apps\\tstapp.mbm"
+rls_string STRING_r_tstapp_view1_icon_file "\\resource\\apps\\tstappview01.m01"
+rls_string STRING_r_tstapp_view2_icon_file "\\resource\\apps\\tstappview02.k"
+rls_string STRING_r_tstapp_view3_icon_file "\\resource\\apps\\tstappviewneg.xyz"
--- a/appfw/apparchitecture/tef/tstapp02.rls Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/tstapp02.rls Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-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"
@@ -26,9 +26,9 @@
rls_string STRING_r_tstapp_view1_caption "V1 FR"
rls_string STRING_r_tstapp_view2_caption "V2 FR"
-rls_string STRING_r_tstapp_icon_file "z:\\resource\\apps\\tstapp02.m02"
-rls_string STRING_r_tstapp_view1_icon_file "z:\\resource\\apps\\tstappview01.m02"
-rls_string STRING_r_tstapp_view2_icon_file "z:\\resource\\apps\\tstappview"
-rls_string STRING_r_tstapp_view3_icon_file "z:\\resource\\apps\\tstappviewneg.mbm"
+rls_string STRING_r_tstapp_icon_file "\\resource\\apps\\tstapp02.m02"
+rls_string STRING_r_tstapp_view1_icon_file "\\resource\\apps\\tstappview01.m02"
+rls_string STRING_r_tstapp_view2_icon_file "\\resource\\apps\\tstappview"
+rls_string STRING_r_tstapp_view3_icon_file "\\resource\\apps\\tstappviewneg.mbm"
--- a/appfw/apparchitecture/tef/tstapp03.rls Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/tstapp03.rls Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-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"
@@ -26,9 +26,9 @@
rls_string STRING_r_tstapp_view1_caption "V1 GE"
rls_string STRING_r_tstapp_view2_caption "V2 GE"
-rls_string STRING_r_tstapp_icon_file "z:\\resource\\apps\\tstapp.mbm"
-rls_string STRING_r_tstapp_view1_icon_file "z:\\resource\\apps\\tstapp.mbm"
-rls_string STRING_r_tstapp_view2_icon_file "z:\\resource\\apps\\tstapp.mbm"
-rls_string STRING_r_tstapp_view3_icon_file "z:\\resource\\apps\\tstappviewneg.xyz"
+rls_string STRING_r_tstapp_icon_file "\\resource\\apps\\tstapp.mbm"
+rls_string STRING_r_tstapp_view1_icon_file "\\resource\\apps\\tstapp.mbm"
+rls_string STRING_r_tstapp_view2_icon_file "\\resource\\apps\\tstapp.mbm"
+rls_string STRING_r_tstapp_view3_icon_file "\\resource\\apps\\tstappviewneg.xyz"
--- a/appfw/apparchitecture/tef/tstapp04.rls Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/tstapp04.rls Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-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"
@@ -26,9 +26,9 @@
rls_string STRING_r_tstapp_view1_caption "V1 SP"
rls_string STRING_r_tstapp_view2_caption "V2 SP"
-rls_string STRING_r_tstapp_icon_file "z:\\resource\\apps\\tstapp.mbm"
-rls_string STRING_r_tstapp_view1_icon_file "z:\\resource\\apps\\tstapp.mbm"
-rls_string STRING_r_tstapp_view2_icon_file "z:\\resource\\apps\\tstapp.mbm"
-rls_string STRING_r_tstapp_view3_icon_file "z:\\resource\\apps\\tstappviewneg.xyz"
+rls_string STRING_r_tstapp_icon_file "\\resource\\apps\\tstapp.mbm"
+rls_string STRING_r_tstapp_view1_icon_file "\\resource\\apps\\tstapp.mbm"
+rls_string STRING_r_tstapp_view2_icon_file "\\resource\\apps\\tstapp.mbm"
+rls_string STRING_r_tstapp_view3_icon_file "\\resource\\apps\\tstappviewneg.xyz"
--- a/appfw/apparchitecture/tef/tstapp05.rls Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/tstapp05.rls Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-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"
@@ -26,9 +26,9 @@
rls_string STRING_r_tstapp_view1_caption "V1 IT"
rls_string STRING_r_tstapp_view2_caption "V2 IT"
-rls_string STRING_r_tstapp_icon_file "z:\\resource\\apps\\tstapp.mbm"
-rls_string STRING_r_tstapp_view1_icon_file "z:\\resource\\apps\\tstapp.mbm"
-rls_string STRING_r_tstapp_view2_icon_file "z:\\resource\\apps\\tstapp.mbm"
-rls_string STRING_r_tstapp_view3_icon_file "z:\\resource\\apps\\tstappviewneg.xyz"
+rls_string STRING_r_tstapp_icon_file "\\resource\\apps\\tstapp.mbm"
+rls_string STRING_r_tstapp_view1_icon_file "\\resource\\apps\\tstapp.mbm"
+rls_string STRING_r_tstapp_view2_icon_file "\\resource\\apps\\tstapp.mbm"
+rls_string STRING_r_tstapp_view3_icon_file "\\resource\\apps\\tstappviewneg.xyz"
--- a/appfw/apparchitecture/tef/tstappsc.rls Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/tstappsc.rls Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-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"
@@ -26,6 +26,6 @@
rls_string STRING_r_tstapp_view1_caption "V1 SC"
rls_string STRING_r_tstapp_view2_caption "V2 SC"
-rls_string STRING_r_tstapp_icon_file "z:\\resource\\apps\\tstapp.mbm"
-rls_string STRING_r_tstapp_view_icon_file "z:\\resource\\apps\\tstapp.mbm"
+rls_string STRING_r_tstapp_icon_file "\\resource\\apps\\tstapp.mbm"
+rls_string STRING_r_tstapp_view_icon_file "\\resource\\apps\\tstapp.mbm"
--- a/appfw/apparchitecture/tef/tupgradeiconapp/tupgradeiconapp.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/tupgradeiconapp/tupgradeiconapp.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-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"
@@ -39,13 +39,13 @@
SOURCEPATH .
RESOURCE tupgradeiconapp.rss
START RESOURCE tupgradeiconapp.rss
-TARGETPATH /resource/apps
+TARGETPATH /apparctestregfiles
LANG SC
END
SOURCEPATH .
START RESOURCE tupgradeiconapp_reg.rss
-TARGETPATH /private/10003a3f/apps
+TARGETPATH /apparctestregfiles
END
--- a/appfw/apparchitecture/tef/zerosizedicontestapp.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/tef/zerosizedicontestapp.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 1999-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1999-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"
@@ -14,6 +14,8 @@
// zerosizedicontestapp.mmp
//
+#include <platform_paths.hrh>
+
target zerosizedicontestapp.exe
TARGETTYPE exe
@@ -24,8 +26,11 @@
SOURCEPATH .
SOURCE zerosizedicontestapp.cpp
+MW_LAYER_SYSTEMINCLUDE_SYMBIAN
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN
USERINCLUDE .
-MW_LAYER_SYSTEMINCLUDE_SYMBIAN
+MW_LAYER_SYSTEMINCLUDE
+SYSTEMINCLUDE /epoc32/include/techview
// Application exe specific resource which is localised to the application
RESOURCE zerosizedicon_loc.rss
--- a/applaunchservices/applaunchplugins/test/tapstart/group/apstarttest_apstart.iby Thu Aug 19 10:05:08 2010 +0300
+++ b/applaunchservices/applaunchplugins/test/tapstart/group/apstarttest_apstart.iby Tue Aug 31 15:24:25 2010 +0300
@@ -21,9 +21,9 @@
data=ABI_DIR\BUILD_DIR\tapstart_server.exe sys\bin\tapstart_server.exe
-data=DATAZ_\apstarttest\apstarttest_apstart_run.bat \apstarttest_apstart_run.bat
+//data=DATAZ_\apstarttest\apstarttest_apstart_run.bat \apstarttest_apstart_run.bat
-data=DATAZ_\apstarttest\apstarttest_apstart.script \apstarttest\apstarttest_apstart.script
+//data=DATAZ_\apstarttest\apstarttest_apstart.script \apstarttest\apstarttest_apstart.script
#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/applaunchservices/applaunchplugins/test/tapstart/group/apstarttest_apstart.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,29 @@
+;
+; 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:
+;
+
+;Languages
+&EN
+
+
+;Localised Vendor name
+%{"apstarttest_apstart.pkg EN"}
+
+; Vendor name
+: "apstarttest_apstart"
+
+
+"\epoc32\data\z\apstarttest\apstarttest_apstart_run.bat"-"c:\apstarttest_apstart_run.bat"
+"\epoc32\data\z\apstarttest\apstarttest_apstart.script"-"c:\apstarttest\apstarttest_apstart.script"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appsupport.pro Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,29 @@
+#
+# 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: Project file for building phonesrv components
+#
+#
+
+TEMPLATE = subdirs
+CONFIG += ordered
+
+symbian: {
+:BLD_INF_RULES.prj_mmpfiles += $$LITERAL_HASH"include \"group/bld.inf\""
+SUBDIRS += coreapplicationuis\devicepowermenuplugin
+SUBDIRS += systemsettings\accindicatorplugin
+SUBDIRS += systemsettings\accindicatorplugin\accindicatorsettings
+SUBDIRS += coreapplicationuis\powersaveutilities
+SUBDIRS += coreapplicationuis\Rfs\Plugins\cprfsplugin
+SUBDIRS += coreapplicationuis\hbdeviceinputdialogplugin
+}
--- a/appsupport_plat/action_plugin_api/inc/CFActionPlugin.h Thu Aug 19 10:05:08 2010 +0300
+++ b/appsupport_plat/action_plugin_api/inc/CFActionPlugin.h Tue Aug 31 15:24:25 2010 +0300
@@ -23,7 +23,7 @@
#include <e32base.h>
#include <badesca.h>
-#include <CFActionPlugInConst.hrh>
+#include <cfactionpluginconst.hrh>
class CCFActionPlugInImpl;
class CCFActionIndication;
--- a/appsupport_plat/context_framework_services_api/inc/CFActionIndication.h Thu Aug 19 10:05:08 2010 +0300
+++ b/appsupport_plat/context_framework_services_api/inc/CFActionIndication.h Tue Aug 31 15:24:25 2010 +0300
@@ -20,7 +20,7 @@
#define C_CFACTIONINDICATION_H
#include <e32base.h>
-#include <CFKeyValuePair.h>
+#include <cfkeyvaluepair.h>
/**
* Encapsulates inside an action indication. Action indication consists of
--- a/appsupport_plat/context_source_plugin_api/inc/CFContextSourcePlugIn.h Thu Aug 19 10:05:08 2010 +0300
+++ b/appsupport_plat/context_source_plugin_api/inc/CFContextSourcePlugIn.h Tue Aug 31 15:24:25 2010 +0300
@@ -22,7 +22,7 @@
#include <e32base.h>
-#include <CFContextSourcePlugInConst.hrh>
+#include <cfcontextsourcepluginconst.hrh>
class MCFContextInterface;
class MCFContextSourceSetting;
--- a/appsupport_plat/oom_monitor_api/inc/oommonitor.h Thu Aug 19 10:05:08 2010 +0300
+++ b/appsupport_plat/oom_monitor_api/inc/oommonitor.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
@@ -27,4 +27,4 @@
*/
IMPORT_C void CreateOOMWatcherThreadL();
-#endif // OOMMONITOR_H
\ No newline at end of file
+#endif // OOMMONITOR_H
--- a/appsupport_plat/oom_monitor_api/inc/oommonitorsession.h Thu Aug 19 10:05:08 2010 +0300
+++ b/appsupport_plat/oom_monitor_api/inc/oommonitorsession.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
@@ -68,7 +68,7 @@
IMPORT_C TInt Connect();
/**
- * Request that the OOM monitor attempts to free some memory.
+ * Request that the OOM monitor attempts to free some paged memory.
* This function may take several seconds to execute, depending on
* the memory state. It will not return until the attempt to recover
* memory has completed.
@@ -80,8 +80,8 @@
IMPORT_C TInt RequestFreeMemory(TInt aBytesRequested);
/**
- * Request that the OOM monitor attempts to free some memory.
- * This is an asynchronous version of the request for free memory.
+ * Request that the OOM monitor attempts to free some paged memory.
+ * This is an asynchronous version of the request for free paged memory.
* @param aBytesRequested The number of bytes of free memory that the client requests.
* @param aStatus will be completed when the attempt to recover memory
* has finished. This may take several seconds, depending on
--- a/appsupport_plat/oom_monitor_plugin_api/inc/oommonitorplugin.h Thu Aug 19 10:05:08 2010 +0300
+++ b/appsupport_plat/oom_monitor_plugin_api/inc/oommonitorplugin.h Tue Aug 31 15:24:25 2010 +0300
@@ -78,16 +78,6 @@
* between low and good memory states.
*/
virtual void MemoryGood() = 0;
-
- /**
- * Function: AppId
- * The function return the UID3 of the process which implements the plugin
- * By default, the Null UID [KNullUid] is returned.
- * The plugin can override this API with their own implementation.
- * COomMonitorPlugin monitor plugins
- * @return the UID3 the application which implements the plugin
- */
- virtual const TUid AppId() const;
public:
/**
@@ -184,16 +174,6 @@
public:
IMPORT_C static CAppOomMonitorPlugin* NewL(TUid aAppUid);
- /**
- * Function: AppId
- * The function return the UID3 of the process which implements the plugin
- * By default, the Null UID [KNullUid] is returned.
- * The plugin can override this API with their own implementation.
- * COomMonitorPlugin monitor plugins
- * @return the UID3 the application which implements the plugin
- */
- const TUid AppId() const;
-
private:
CAppOomMonitorPlugin(TUid aAppUid);
--- a/appsupport_plat/oom_monitor_plugin_api/inc/oommonitorplugin.hrh Thu Aug 19 10:05:08 2010 +0300
+++ b/appsupport_plat/oom_monitor_plugin_api/inc/oommonitorplugin.hrh Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/appsupport_plat/restore_factory_settings_api/inc/rfsHandler.h Thu Aug 19 10:05:08 2010 +0300
+++ b/appsupport_plat/restore_factory_settings_api/inc/rfsHandler.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-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"
@@ -41,12 +41,11 @@
// FORWARD DECLARATIONS
-class CAknQueryDialog;
-class CAknInformationNote;
class CEikonEnv;
class CSecurityHandler;
class CRfsSecurityHandler;
class CRfsPdpObserver;
+class CHbDeviceMessageBoxSymbian;
// CLASS DECLARATION
@@ -164,7 +163,7 @@
TInt iFlags;
// confirmation query
- CAknQueryDialog* iQuery;
+ CHbDeviceMessageBoxSymbian* iQuery;
// for security code query when using SecUI
CSecurityHandler* iSecurityHandler;
--- a/appsupport_plat/secondary_display_accfw_api/group/bld.inf Thu Aug 19 10:05:08 2010 +0300
+++ b/appsupport_plat/secondary_display_accfw_api/group/bld.inf Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
@@ -24,4 +24,4 @@
PRJ_EXPORTS
-../inc/secondarydisplay/SecondaryDisplayAccFwAPI.h MW_LAYER_PLATFORM_EXPORT_PATH(secondarydisplay/SecondaryDisplayAccFwAPI.h)
+../inc/secondarydisplay/SecondaryDisplayAccFwAPI.h MW_LAYER_PLATFORM_EXPORT_PATH(SecondaryDisplay/SecondaryDisplayAccFwAPI.h)
--- a/appsupport_plat/secondary_display_sysap_api/group/bld.inf Thu Aug 19 10:05:08 2010 +0300
+++ b/appsupport_plat/secondary_display_sysap_api/group/bld.inf Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
@@ -24,4 +24,4 @@
PRJ_EXPORTS
-../inc/secondarydisplay/SecondaryDisplaySysApAPI.h MW_LAYER_PLATFORM_EXPORT_PATH(secondarydisplay/SecondaryDisplaySysApAPI.h)
+../inc/secondarydisplay/SecondaryDisplaySysApAPI.h MW_LAYER_PLATFORM_EXPORT_PATH(SecondaryDisplay/SecondaryDisplaySysApAPI.h)
--- a/appsupport_plat/startup_configuration_api/inc/startupdomaincrkeys.h Thu Aug 19 10:05:08 2010 +0300
+++ b/appsupport_plat/startup_configuration_api/inc/startupdomaincrkeys.h Tue Aug 31 15:24:25 2010 +0300
@@ -263,6 +263,13 @@
*/
const TUint32 KStartupDefaultTime = 0x00000016;
+/**
+ * Enables or disables the FTU StartupSequence. This key is modified by ftu when user accepts the eterms
+ * Possible values true or false
+ */
+const TUint32 KFtuStartupEnabled = 0x0000001A;
+
+
#endif // STARTUPDOMAINCRKEYS_H
// End of File
--- a/appsupport_plat/system_application_notification_api/inc/coreapplicationuisdomainpskeys.h Thu Aug 19 10:05:08 2010 +0300
+++ b/appsupport_plat/system_application_notification_api/inc/coreapplicationuisdomainpskeys.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2007 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"
@@ -215,6 +215,19 @@
ECoreAppUIsVideoSharingIndicatorOff,
ECoreAppUIsVideoSharingIndicatorOn
};
+
+/**
+* Used for notifying SysAp for releasing memory of power menu custom dialog
+*/
+const TUint32 KCoreAppUIsPowerMenuCustomDialogStatus= 0x00000207;
+enum TCoreAppUIsPowerMenuCustomDialog
+ {
+ ECoreAppUIsPowerMenuCustomDialogUninitialized = 0,
+ ECoreAppUIsPowerMenuCustomDialogOff,
+ ECoreAppUIsPowerMenuCustomDialogOn,
+ ECoreAppUIsMemoryCardCustomDialogOk,
+ ECoreAppUIsMemoryCardCustomDialogCancel
+ };
// =============================================================================
// Contacts Database Recovery Status API
@@ -332,31 +345,4 @@
ECoreAppUIsProfileActivatedNoteShown = 1
};
-
-
-// =============================================================================
-// GAN Mode API
-// =============================================================================
-
-// Use TUid KPSUidCoreApplicationUIs = { 0x101F8767 }
-
-const TUint32 KCoreAppUIsGanPropertyGanMode = 0x00000601;
-
-/** GANmode (actual network mode) */
-enum TCoreAppUIsGanMode
- {
- EGanModeUnspecified = 0, // We are not aware of MS GAN/GERAN state
- EGanModeGAN = 1, // MS is in GAN
- EGanModeGeran = 2 // MS is in GERAN
- };
-
-
-// =============================================================================
-// GAN Signal strength
-// =============================================================================
-
-// Use TUid KPSUidCoreApplicationUIs = { 0x101F8767 }
-
-const TUint32 KCoreAppUIsGanPropertySignalLevel = 0x00000602;
-
#endif // COREAPPLICATIONUISDOMAINPSKEYS_H
--- a/commonappservices/alarmserver/Client/Source/ASCliSession.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/commonappservices/alarmserver/Client/Source/ASCliSession.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -65,7 +65,7 @@
TInt startupAttempts = KNumberOfServerStartupAttempts;
for(;;)
{
- TInt ret = CreateSession(ASCliDefinitions::ServerAndThreadName(), ASCliDefinitions::Version());
+ TInt ret = CreateSession(ASCliDefinitions::ServerAndThreadName(), ASCliDefinitions::Version(), KAlarmServerAsynchronousSlotCount);
if (ret != KErrNotFound && ret != KErrServerTerminated)
{
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/commonappservices/alarmserver/Group/TEF_AlarmServerCIT.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,28 @@
+;
+; 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:
+;
+
+;Languages
+&EN
+
+
+;Localised Vendor name
+%{"TEF_AlarmServerCIT.pkg EN"}
+
+; Vendor name
+: "TEF_AlarmServerCIT"
+
+
+"\epoc32\data\C\CITAlarmServer\scripts\TestCITAlarmServer.script"-"c:\CITAlarmServer\scripts\TestCITAlarmServer.script"
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/commonappservices/alarmserver/Group/alarmserverunittestserver.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,39 @@
+;
+; 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:
+;
+
+;Languages
+&EN
+
+
+;Localised Vendor name
+%{"alarmserverunittestserver.pkg EN"}
+
+; Vendor name
+: "alarmserverunittestserver"
+
+"\epoc32\data\z\testdata\scripts\TEAlarmServer.script"-"c:\testdata\scripts\TEAlarmServer.script"
+"\epoc32\data\z\testdata\scripts\TEAlarmServer_apc_loop.script"-"c:\testdata\scripts\TEAlarmServer_apc.script"
+"\epoc32\data\z\testdata\scripts\TEAlarmServer_man.script"-"c:\testdata\scripts\TEAlarmServer_man.script"
+"\epoc32\data\z\testdata\scripts\TEAlarmServer_man_TC3.script"-"c:\testdata\scripts\TEAlarmServer_man_TC3.script"
+"\epoc32\data\z\testdata\scripts\TEAlarmServer_man_exceptTC3.script"-"c:\testdata\scripts\TEAlarmServer_man_exceptTC3.script"
+"\epoc32\data\z\testdata\scripts\TEAlarmServer_apc_repeat.script"-"c:\testdata\scripts\TEAlarmServer_apc.script"
+"\epoc32\data\z\testdata\scripts\TEAlarmServer_apc_stop.script"-"c:\testdata\scripts\TEAlarmServer_apc.script"
+"\epoc32\data\z\testdata\scripts\TEAlarmServer_apc_disabled.script"-"c:\testdata\scripts\TEAlarmServer_apc.script"
+"\epoc32\data\z\testdata\scripts\TEAlarmServer_apc_disordered.script"-"c:\testdata\scripts\TEAlarmServer_apc.script"
+"\epoc32\data\z\testdata\scripts\TEAlarmServer_apc_ini.script"-"c:\testdata\scripts\TEAlarmServer_apc.script"
+"\epoc32\data\z\testdata\scripts\TEAlarmServer_apc_invalid.script"-"c:\testdata\scripts\TEAlarmServer_apc.script"
+"\epoc32\data\z\testdata\scripts\TEAlarmServer_apc_norsc.script"-"c:\testdata\scripts\TEAlarmServer_apc.script"
+"\epoc32\data\z\testdata\scripts\TEAlarmServer_man_exceptTC3.script"-"c:\testdata\scripts\TEAlarmServer_man.script"
\ No newline at end of file
--- a/commonappservices/alarmserver/Server/Source/ASSrvAlarmQueue.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/commonappservices/alarmserver/Server/Source/ASSrvAlarmQueue.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -96,7 +96,7 @@
iASSrvDSTChange = CASSrvDSTChange::NewL(*this);
#ifdef SYMBIAN_SYSTEM_STATE_MANAGEMENT
- iSsmRtcAdaptation.Connect();
+ User::LeaveIfError(iSsmRtcAdaptation.Connect());
// Notify the listeners of 'KWakeupAlarmPubSubKey' key that the alarm queue is yet to be internalized
// by Alarm Server on its start-up at the device boot time.
RProperty::Define(KAlarmServerPubSubCategory, KWakeupAlarmPubSubKey, RProperty::EInt, KReadPolicy, KWritePolicy);
--- a/commonappservices/alarmserver/Server/Source/assrvsystemstate.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/commonappservices/alarmserver/Server/Source/assrvsystemstate.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-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"
@@ -142,7 +142,7 @@
aState = MASSrvSystemStateObserver::EShutdown;
interestedInChange = ETrue;
}
- else if (ssmState.MainState() == ESsmNormal)
+ else if (ssmState.MainState() == ESsmNormal && ssmState.SubState() == ESsmNormalSubState)
{
aState = MASSrvSystemStateObserver::ENormal;
interestedInChange = ETrue;
Binary file commonappservices/alarmserver/Test/Integration/AlarmTestServer/doc_pub/SGL.GT0257.603_AlarmServer updatesTest Specification.doc has changed
Binary file commonappservices/alarmserver/Test/Integration/TestCITAlarmServer/doc_pub/SGL.GT0257.612.Bravo_SystemSupportForUTC_Test_Case_PREQ234 Rev1.0.doc has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/commonappservices/alarmserver/Test/Integration/TestCITAlarmServer/group/TEF_AlarmServerCIT.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,28 @@
+;
+; 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:
+;
+
+;Languages
+&EN
+
+
+;Localised Vendor name
+%{"TEF_AlarmServerCIT.pkg EN"}
+
+; Vendor name
+: "TEF_AlarmServerCIT"
+
+
+"\epoc32\data\C\CITAlarmServer\scripts\TestCITAlarmServer.script"-"c:\CITAlarmServer\scripts\TestCITAlarmServer.script"
\ No newline at end of file
Binary file commonappservices/alarmserver/doc_pub/alarm server test code.doc has changed
--- a/commonappservices/coreappstest/Group/BLD.INF Thu Aug 19 10:05:08 2010 +0300
+++ b/commonappservices/coreappstest/Group/BLD.INF Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-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"
@@ -25,7 +25,11 @@
PRJ_TESTEXPORTS
CoreAppsTestTest.iby /epoc32/rom/include/coreappstesttest.iby
-../Inc/testserver.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(coreappstest/testserver.h)
-../Inc/utilities.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(coreappstest/utilities.h)
+#ifdef SYMBIAN_OLD_EXPORT_LOCATION
+../Inc/TestServer.h /epoc32/include/coreappstest/testserver.h
+#endif
+#ifdef SYMBIAN_OLD_EXPORT_LOCATION
+../Inc/utilities.h /epoc32/include/coreappstest/utilities.h
+#endif
CoreAppsTest.iby /epoc32/rom/include/coreappstest.iby
runeshell.iby /epoc32/rom/include/runeshell.iby
Binary file commonappservices/doc_pub/SGL.GT228.017_Migration Guide for v9.1 Time Handling APIs.doc has changed
--- a/contenthandling/webrecognisers/Test/Group/t_ebookmark.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/contenthandling/webrecognisers/Test/Group/t_ebookmark.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-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"
@@ -13,6 +13,8 @@
// Description:
//
+#include <platform_paths.hrh>
+
TARGET t_ebookmark.dll
TARGETTYPE plugin
CAPABILITY protserv
@@ -27,14 +29,13 @@
USERINCLUDE . ../t_recogtest
#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-SYSTEMINCLUDE /epoc32/include
+MW_LAYER_SYSTEMINCLUDE
SYSTEMINCLUDE /epoc32/include/ecom
#else
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
SYSTEMINCLUDE /epoc32/include/ecom
SYSTEMINCLUDE /epoc32/include/platform/ecom
-SYSTEMINCLUDE /epoc32/include/mw
-SYSTEMINCLUDE /epoc32/include/platform/mw
+MW_LAYER_SYSTEMINCLUDE
#endif
--- a/contenthandling/webrecognisers/Test/Group/t_recogtest.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/contenthandling/webrecognisers/Test/Group/t_recogtest.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-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"
@@ -13,6 +13,8 @@
// Description:
//
+#include <platform_paths.hrh>
+
TARGET t_recogtest.exe
TARGETTYPE exe
CAPABILITY ProtServ
@@ -23,14 +25,13 @@
USERINCLUDE .
#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-SYSTEMINCLUDE /epoc32/include
+MW_LAYER_SYSTEMINCLUDE
SYSTEMINCLUDE /epoc32/include/ecom
#else
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
SYSTEMINCLUDE /epoc32/include/ecom
SYSTEMINCLUDE /epoc32/include/platform/ecom
-SYSTEMINCLUDE /epoc32/include/mw
-SYSTEMINCLUDE /epoc32/include/platform/mw
+MW_LAYER_SYSTEMINCLUDE
#endif
LIBRARY euser.lib ecom.lib
--- a/contenthandling/webrecognisers/Test/Group/t_recwap.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/contenthandling/webrecognisers/Test/Group/t_recwap.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-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"
@@ -13,6 +13,8 @@
// Description:
//
+#include <platform_paths.hrh>
+
TARGET t_recwap.dll
TARGETTYPE plugin
CAPABILITY protserv
@@ -27,14 +29,13 @@
USERINCLUDE . ../t_recogtest
#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-SYSTEMINCLUDE /epoc32/include
+MW_LAYER_SYSTEMINCLUDE
SYSTEMINCLUDE /epoc32/include/ecom
#else
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
SYSTEMINCLUDE /epoc32/include/ecom
SYSTEMINCLUDE /epoc32/include/platform/ecom
-SYSTEMINCLUDE /epoc32/include/mw
-SYSTEMINCLUDE /epoc32/include/platform/mw
+MW_LAYER_SYSTEMINCLUDE
#endif
--- a/contenthandling/webrecognisers/Test/Group/t_recweb.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/contenthandling/webrecognisers/Test/Group/t_recweb.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-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"
@@ -13,6 +13,8 @@
// Description:
//
+#include <platform_paths.hrh>
+
TARGET t_recweb.dll
TARGETTYPE plugin
CAPABILITY protserv
@@ -27,14 +29,13 @@
USERINCLUDE . ../t_recogtest
#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-SYSTEMINCLUDE /epoc32/include
+MW_LAYER_SYSTEMINCLUDE
SYSTEMINCLUDE /epoc32/include/ecom
#else
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
SYSTEMINCLUDE /epoc32/include/ecom
SYSTEMINCLUDE /epoc32/include/platform/ecom
-SYSTEMINCLUDE /epoc32/include/mw
-SYSTEMINCLUDE /epoc32/include/platform/mw
+MW_LAYER_SYSTEMINCLUDE
#endif
--- a/contenthandling/webrecognisers/Test/Group/t_weburlrec.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/contenthandling/webrecognisers/Test/Group/t_weburlrec.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-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"
@@ -13,6 +13,8 @@
// Description:
//
+#include <platform_paths.hrh>
+
TARGET t_weburlrec.dll
TARGETTYPE plugin
CAPABILITY protserv
@@ -27,14 +29,13 @@
USERINCLUDE . ../t_recogtest
#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-SYSTEMINCLUDE /epoc32/include
+MW_LAYER_SYSTEMINCLUDE
SYSTEMINCLUDE /epoc32/include/ecom
#else
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
SYSTEMINCLUDE /epoc32/include/ecom
SYSTEMINCLUDE /epoc32/include/platform/ecom
-SYSTEMINCLUDE /epoc32/include/mw
-SYSTEMINCLUDE /epoc32/include/platform/mw
+MW_LAYER_SYSTEMINCLUDE
#endif
Binary file contenthandling/webrecognisers/doc_pub/Recogniser Test Specifications.doc has changed
--- a/contextframework/cfw/group/bld.inf Thu Aug 19 10:05:08 2010 +0300
+++ b/contextframework/cfw/group/bld.inf Tue Aug 31 15:24:25 2010 +0300
@@ -32,9 +32,9 @@
../conf/contextframework_10282BCE.crml MW_LAYER_CRML(contextframework_10282BCE.crml)
../conf/contextframework_200159ED.crml MW_LAYER_CRML(contextframework_200159ED.crml)
-../data/backup_registration.xml /epoc32/data/Z/private/10282BC4/backup_registration.xml
-../data/backup_registration.xml /epoc32/release/winscw/UDEB/Z/private/10282BC4/backup_registration.xml
-../data/backup_registration.xml /epoc32/release/winscw/UREL/Z/private/10282BC4/backup_registration.xml
+../data/backup_registration.xml /epoc32/data/z/private/10282bc4/backup_registration.xml
+../data/backup_registration.xml /epoc32/release/winscw/udeb/z/private/10282bc4/backup_registration.xml
+../data/backup_registration.xml /epoc32/release/winscw/urel/z/private/10282bc4/backup_registration.xml
#ifdef RD_CONTEXT_FRAMEWORK
../rom/ContextFramework.iby CORE_MW_LAYER_IBY_EXPORT_PATH(ContextFramework.iby)
--- a/contextframework/cfw/group/cfactivatorengine.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/contextframework/cfw/group/cfactivatorengine.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -19,7 +19,7 @@
#include <platform_paths.hrh>
#include "../inc/common/cftraceconfiguration.hrh"
-TARGET CFActivatorEngine.dll
+TARGET cfactivatorengine.dll
TARGETTYPE dll
UID 0x1000008d 0x10282BC6
--- a/contextframework/cfw/group/cfclient.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/contextframework/cfw/group/cfclient.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -19,7 +19,7 @@
#include <platform_paths.hrh>
#include "../inc/common/cftraceconfiguration.hrh"
-TARGET CFClient.dll
+TARGET cfclient.dll
TARGETTYPE dll
UID 0x1000008d 0x10282BC3
--- a/contextframework/cfw/group/cfcontextsourcemanager.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/contextframework/cfw/group/cfcontextsourcemanager.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -19,7 +19,7 @@
#include <platform_paths.hrh>
#include "../inc/common/cftraceconfiguration.hrh"
-TARGET CFContextSourceManager.dll
+TARGET cfcontextsourcemanager.dll
TARGETTYPE dll
UID 0x1000008d 0x10282BCB
--- a/contextframework/cfw/group/cfcontextsourcesettingsmanager.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/contextframework/cfw/group/cfcontextsourcesettingsmanager.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -19,7 +19,7 @@
#include <platform_paths.hrh>
#include "../inc/common/cftraceconfiguration.hrh"
-TARGET CFContextSourceSettingsManager.dll
+TARGET cfcontextsourcesettingsmanager.dll
TARGETTYPE dll
UID 0x1000008d 0x10282ED9
--- a/contextframework/cfw/group/cfscriptengine.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/contextframework/cfw/group/cfscriptengine.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -19,7 +19,7 @@
#include <platform_paths.hrh>
#include "../inc/common/cftraceconfiguration.hrh"
-TARGET CFScriptEngine.dll
+TARGET cfscriptengine.dll
TARGETTYPE dll
UID 0x1000008d 0x10282BC7
EPOCSTACKSIZE 20480
@@ -54,7 +54,7 @@
LIBRARY cfservices.lib
LIBRARY cfoperationpluginservices.lib
LIBRARY ecom.lib
-LIBRARY PlatformEnv.lib
+LIBRARY platformenv.lib
#ifdef TRACE_INTO_FILE
LIBRARY flogger.lib
#endif
--- a/contextframework/cfw/group/cfserver.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/contextframework/cfw/group/cfserver.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -19,7 +19,7 @@
#include <platform_paths.hrh>
#include "../inc/common/cftraceconfiguration.hrh"
-TARGET CFServer.exe
+TARGET cfserver.exe
TARGETTYPE exe
UID 0 0x10282BC4
--- a/contextframework/cfw/group/cfservices.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/contextframework/cfw/group/cfservices.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -19,7 +19,7 @@
#include <platform_paths.hrh>
#include "../inc/common/cftraceconfiguration.hrh"
-TARGET CFServices.dll
+TARGET cfservices.dll
TARGETTYPE dll
UID 0x1000008d 0x10282BC5
--- a/contextframework/cfw/src/cfclient/cfcontextservice.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/contextframework/cfw/src/cfclient/cfcontextservice.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-2008 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"
@@ -291,7 +291,7 @@
TInt err = KErrNone;
// Stream context query set into buffer
- HBufC8* buffer = WriteStreamContextQueryLC( aContextQuery );
+ HBufC8* buffer = buffer = WriteStreamContextQueryLC( aContextQuery );
HBufC8* resultBuffer = HBufC8::NewLC( iRequestBufferSize );
TPtr8 resultBufferPtr = resultBuffer->Des();
TPckg<TInt> bufferSizePtr( iRequestBufferSize );
--- a/contextframework/cfw/src/cfscriptengine/cfpersistentdata.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/contextframework/cfw/src/cfscriptengine/cfpersistentdata.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -183,7 +183,7 @@
{
FUNC_LOG;
- for (TInt i = iPendingTasks.Count()-1; i >= 0; i--)
+ for (TInt i = iPendingTasks.Count(); i > 0; i--)
{
CCFPendingPersistencyTask* iTask = iPendingTasks[i];
if ( iTask->Mode() == CCFPendingPersistencyTask::EStore )
--- a/contextframework/cfw/src/cfserver/cfphasebase.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/contextframework/cfw/src/cfserver/cfphasebase.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -95,10 +95,8 @@
FUNC_LOG;
__ASSERT_DEBUG( iStarterRequest, Panic( ENoRequestToComplete ) );
- if ( iStarterRequest )
- {
- User::RequestComplete( iStarterRequest, KErrCancel );
- }
+
+ User::RequestComplete( iStarterRequest, KErrCancel );
}
//-----------------------------------------------------------------------------
--- a/contextframework/cfw/tsrc/public/basic/MT_BasicOperationsPlugIn/mt_basicoperationsplugin.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/contextframework/cfw/tsrc/public/basic/MT_BasicOperationsPlugIn/mt_basicoperationsplugin.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-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"
@@ -35,7 +35,6 @@
#include "CFTestDelay.h"
#include "cffakeenv.h"
#include "ScriptEventNotifierSession.h"
-#include "cfenvutils.h"
// CONSTANTS
@@ -66,8 +65,6 @@
// Destructor (virtual by CBase)
mt_basicoperationsplugin::~mt_basicoperationsplugin()
{
- // Enable screen saver
- CFEnvUtils::EnableScreenSaver( ETrue );
}
// Default constructor
@@ -81,9 +78,6 @@
// The ConstructL from the base class CEUnitTestSuiteClass must be called.
// It generates the test case table.
CEUnitTestSuiteClass::ConstructL();
-
- // Disable screen saver
- CFEnvUtils::EnableScreenSaver( EFalse );
}
// METHODS
--- a/contextframework/cfw/tsrc/public/basic/MT_CFClient/MT_CFClient.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/contextframework/cfw/tsrc/public/basic/MT_CFClient/MT_CFClient.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-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"
@@ -37,7 +37,6 @@
#include "testcontextsourceplugin.h"
#include "testcontextsourcepluginconst.hrh"
#include "CFTestDelay.h"
-#include "cfenvutils.h"
// CONSTANTS
@@ -306,9 +305,6 @@
MT_CFClient::~MT_CFClient( )
{
Teardown();
-
- // Enable screen saver
- CFEnvUtils::EnableScreenSaver( ETrue );
}
// Default constructor
@@ -322,9 +318,6 @@
// The ConstructL from the base class CEUnitTestSuiteClass must be called.
// It generates the test case table.
CEUnitTestSuiteClass::ConstructL ( );
-
- // Disable screen saver
- CFEnvUtils::EnableScreenSaver( EFalse );
}
// METHODS
--- a/contextframework/cfw/tsrc/public/basic/MT_CFContextSourceManager/MT_CFContextSourceManager.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/contextframework/cfw/tsrc/public/basic/MT_CFContextSourceManager/MT_CFContextSourceManager.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-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"
@@ -30,7 +30,6 @@
#include "cfcontextsourcesettingarray.h"
#include "testcontextsourceplugin.h"
-#include "cfenvutils.h"
// CONSTANTS
@@ -103,9 +102,6 @@
MT_CFContextSourceManager::~MT_CFContextSourceManager()
{
Teardown();
-
- // Enable screen saver
- CFEnvUtils::EnableScreenSaver( ETrue );
}
// Default constructor
@@ -119,9 +115,6 @@
// The ConstructL from the base class CEUnitTestSuiteClass must be called.
// It generates the test case table.
CEUnitTestSuiteClass::ConstructL();
-
- // Disable screen saver
- CFEnvUtils::EnableScreenSaver( EFalse );
}
// METHODS
--- a/contextframework/cfw/tsrc/public/basic/MT_CFContextSourceSettingsManager/MT_CFContextSourceSettingsManager.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/contextframework/cfw/tsrc/public/basic/MT_CFContextSourceSettingsManager/MT_CFContextSourceSettingsManager.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
@@ -27,7 +27,6 @@
#include <cfcontextsourcesettingparameter.h>
#include <cfkeyvaluepair.h>
-#include "cfenvutils.h"
// INTERNAL INCLUDES
@@ -67,9 +66,6 @@
MT_CFContextSourceSettingsManager::~MT_CFContextSourceSettingsManager()
{
Teardown();
-
- // Enable screen saver
- CFEnvUtils::EnableScreenSaver( ETrue );
}
// Default constructor
@@ -83,9 +79,6 @@
// The ConstructL from the base class CEUnitTestSuiteClass must be called.
// It generates the test case table.
CEUnitTestSuiteClass::ConstructL();
-
- // Disable screen saver
- CFEnvUtils::EnableScreenSaver( EFalse );
}
// METHODS
--- a/contextframework/cfw/tsrc/public/basic/MT_CFOperationPluginManager/MT_CFOperationPluginManager.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/contextframework/cfw/tsrc/public/basic/MT_CFOperationPluginManager/MT_CFOperationPluginManager.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
@@ -27,7 +27,6 @@
// INTERNAL INCLUDES
#include "cfscripthandler.h"
-#include "cfenvutils.h"
// CONSTRUCTION
MT_CFOperationPluginManager* MT_CFOperationPluginManager::NewL()
@@ -51,8 +50,6 @@
// Destructor (virtual by CBase)
MT_CFOperationPluginManager::~MT_CFOperationPluginManager()
{
- // Enable screen saver
- CFEnvUtils::EnableScreenSaver( ETrue );
}
// Default constructor
@@ -66,9 +63,6 @@
// The ConstructL from the base class CEUnitTestSuiteClass must be called.
// It generates the test case table.
CEUnitTestSuiteClass::ConstructL();
-
- // Disable screen saver
- CFEnvUtils::EnableScreenSaver( EFalse );
}
// METHODS
--- a/contextframework/cfw/tsrc/public/basic/MT_CFScriptEngine/MT_CFScriptEngine.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/contextframework/cfw/tsrc/public/basic/MT_CFScriptEngine/MT_CFScriptEngine.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-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"
@@ -36,7 +36,6 @@
#include "ScriptEventNotifierSession.h"
#include "basicoperationspluginconst.hrh"
#include "cfcommon.h"
-#include "cfenvutils.h"
// CONSTANTS
@@ -68,8 +67,6 @@
// Destructor (virtual by CBase)
MT_CFScriptEngine::~MT_CFScriptEngine()
{
- // Enable screen saver
- CFEnvUtils::EnableScreenSaver( ETrue );
}
// Default constructor
@@ -83,9 +80,6 @@
// The ConstructL from the base class CEUnitTestSuiteClass must be called.
// It generates the test case table.
CEUnitTestSuiteClass::ConstructL();
-
- // Disable screen saver
- CFEnvUtils::EnableScreenSaver( EFalse );
}
--- a/contextframework/cfw/tsrc/public/basic/UT_CCFContextManager/UT_CCFContextManager.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/contextframework/cfw/tsrc/public/basic/UT_CCFContextManager/UT_CCFContextManager.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-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"
@@ -28,7 +28,6 @@
#include "CFContextIndication.h"
#include "CFContextSubscription.h"
#include "cfcontextobjectimpl.h"
-#include "cfenvutils.h"
// CONSTRUCTION
@@ -53,8 +52,6 @@
// Destructor (virtual by CBase)
UT_CCFContextManager::~UT_CCFContextManager()
{
- // ETrue screen saver
- CFEnvUtils::EnableScreenSaver( ETrue );
}
// Default constructor
@@ -68,9 +65,6 @@
// The ConstructL from the base class CEUnitTestSuiteClass must be called.
// It generates the test case table.
CEUnitTestSuiteClass::ConstructL();
-
- // Disable screen saver
- CFEnvUtils::EnableScreenSaver( EFalse );
}
--- a/contextframework/cfw/tsrc/public/basic/UT_CCFEngine/UT_CCFEngine.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/contextframework/cfw/tsrc/public/basic/UT_CCFEngine/UT_CCFEngine.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-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"
@@ -30,7 +30,6 @@
#include "CFContextInterface.h"
#include "CFContextSubscription.h"
#include "CFContextIndication.h"
-#include "cfenvutils.h"
// CONSTANTS
const TInt KSecond = 1000000;
@@ -57,8 +56,6 @@
// Destructor (virtual by CBase)
UT_CCFEngine::~UT_CCFEngine()
{
- // Enable screen saver
- CFEnvUtils::EnableScreenSaver( ETrue );
}
// Default constructor
@@ -72,9 +69,6 @@
// The ConstructL from the base class CEUnitTestSuiteClass must be called.
// It generates the test case table.
CEUnitTestSuiteClass::ConstructL();
-
- // Disable screen saver
- CFEnvUtils::EnableScreenSaver( EFalse );
}
--- a/contextframework/cfw/tsrc/public/basic/UT_CFActivatorEngine/UT_CFActivatorEngine.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/contextframework/cfw/tsrc/public/basic/UT_CFActivatorEngine/UT_CFActivatorEngine.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
@@ -35,7 +35,6 @@
#include "cfactionindicationimpl.h"
#include "cfactionsubscriptionimpl.h"
#include "cfscriptevent.h"
-#include "cfenvutils.h"
#include "TestActionPluginConst.hrh"
#include "cfactionpluginthread.h"
@@ -97,9 +96,6 @@
UT_CFActivatorEngine::~UT_CFActivatorEngine()
{
Teardown();
-
- // Enable screen saver again
- CFEnvUtils::EnableScreenSaver( ETrue );
}
// Default constructor
@@ -112,10 +108,7 @@
{
// The ConstructL from the base class CEUnitTestSuiteClass must be called.
// It generates the test case table.
- CEUnitTestSuiteClass::ConstructL();
-
- // Disable screen saver since it is causing false memory leaks
- CFEnvUtils::EnableScreenSaver( EFalse );
+ CEUnitTestSuiteClass::ConstructL();
}
// METHODS
--- a/contextframework/cfw/tsrc/public/basic/UT_CFContextSourceManager/UT_CFContextSourceManager.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/contextframework/cfw/tsrc/public/basic/UT_CFContextSourceManager/UT_CFContextSourceManager.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-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"
@@ -28,7 +28,6 @@
// INTERNAL INCLUDES
#include "CFContextSourcePlugIn.h"
#include "CFContextSourceManager.h"
-#include "cfenvutils.h"
_LIT_SECURITY_POLICY_PASS( KPassSec );
@@ -54,8 +53,6 @@
// Destructor (virtual by CBase)
UT_CFContextSourceManager::~UT_CFContextSourceManager()
{
- // Enable screen saver
- CFEnvUtils::EnableScreenSaver( ETrue );
}
// Default constructor
@@ -69,9 +66,6 @@
// The ConstructL from the base class CEUnitTestSuiteClass must be called.
// It generates the test case table.
CEUnitTestSuiteClass::ConstructL();
-
- // Disable screen saver
- CFEnvUtils::EnableScreenSaver( EFalse );
}
// METHODS
--- a/contextframework/cfw/tsrc/public/basic/UT_CFContextSourceSettingsManager/UT_CFContextSourceSettingsManager.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/contextframework/cfw/tsrc/public/basic/UT_CFContextSourceSettingsManager/UT_CFContextSourceSettingsManager.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
@@ -29,7 +29,6 @@
#include "cfcontextsourcesettingparameterimpl.h"
#include "cfcontextsourcesettingsmanagerimpl.h"
#include "cfcontextsourcesettingarrayimpl.h"
-#include "cfenvutils.h"
// Cleans up RKeyValueArray instance
LOCAL_C void CleanupKeyValueArray( TAny* aArray )
@@ -67,9 +66,6 @@
UT_CFContextSourceSettingsManager::~UT_CFContextSourceSettingsManager()
{
Teardown();
-
- // Enable screen saver
- CFEnvUtils::EnableScreenSaver( ETrue );
}
// Default constructor
@@ -83,9 +79,6 @@
// The ConstructL from the base class CEUnitTestSuiteClass must be called.
// It generates the test case table.
CEUnitTestSuiteClass::ConstructL();
-
- // Disable screen saver
- CFEnvUtils::EnableScreenSaver( EFalse );
}
// METHODS
--- a/contextframework/cfw/tsrc/public/basic/UT_CFOperationPluginManager/UT_CFOperationPluginManager.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/contextframework/cfw/tsrc/public/basic/UT_CFOperationPluginManager/UT_CFOperationPluginManager.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
@@ -26,7 +26,6 @@
// INTERNAL INCLUDES
#include "cfoperationpluginmanager.h"
-#include "cfenvutils.h"
// CONSTRUCTION
UT_CFOperationPluginManager* UT_CFOperationPluginManager::NewL()
@@ -50,8 +49,6 @@
// Destructor (virtual by CBase)
UT_CFOperationPluginManager::~UT_CFOperationPluginManager()
{
- // Enable screen saver
- CFEnvUtils::EnableScreenSaver( ETrue );
}
// Default constructor
@@ -65,9 +62,6 @@
// The ConstructL from the base class CEUnitTestSuiteClass must be called.
// It generates the test case table.
CEUnitTestSuiteClass::ConstructL();
-
- // Disable screen saver
- CFEnvUtils::EnableScreenSaver( EFalse );
}
// METHODS
--- a/contextframework/cfw/tsrc/public/basic/common/cfenvutils.cpp Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,86 +0,0 @@
-/*
-* Copyright (c) 2008-2008 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: CFEnvUtils class implamentation.
-*
-*/
-
-
-// SYSTEM INCLUDES
-#include <eunitmacros.h>
-#include <e32property.h>
-#include <ScreenSaverInternalPSKeys.h>
-
-// USER INCLUDES
-#include "cfenvutils.h"
-
-const TInt KScreenSaverNotAllowed = 666;
-const TInt KScreenSaverAllowed = 0;
-
-// ======== MEMBER FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-// C++ constructor.
-// ---------------------------------------------------------------------------
-//
-CFEnvUtils::CFEnvUtils ( )
- {
-
- }
-
-//------------------------------------------------------------------------------
-// CFEnvUtils::EnableScreenSaver
-//------------------------------------------------------------------------------
-//
-TInt CFEnvUtils::EnableScreenSaver( TBool& aWasEnabled, const TBool aEnable )
- {
- TInt err( KErrNone );
- TInt val( KScreenSaverNotAllowed );
-
- err = RProperty::Get( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, val );
- EUNIT_PRINT( _L("Get screen saver mode: %d"), err );
- if( err == KErrNone )
- {
- aWasEnabled = ( val != KScreenSaverAllowed );
- err = EnableScreenSaver( aEnable );
- }
-
- return err;
- }
-
-//------------------------------------------------------------------------------
-// CFEnvUtils::EnableScreenSaver
-//------------------------------------------------------------------------------
-//
-TInt CFEnvUtils::EnableScreenSaver( const TBool aEnable )
- {
- TInt err( KErrNone );
-
- TInt val = 0;
- if( aEnable )
- {
- val = KScreenSaverAllowed;
- }
- else
- {
- val = KScreenSaverNotAllowed;
- }
- err = RProperty::Set( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, val );
- EUNIT_PRINT( _L("Set screen saver mode: %d"), err );
-
- User::ResetInactivityTime();
-
- return err;
- }
-
-// End of file
--- a/contextframework/cfw/tsrc/public/basic/common/cfenvutils.h Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-/*
-* Copyright (c) 2008-2008 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: Environment utils.
-*
-*/
-
-
-#ifndef CFENVUTILS_H
-#define CFENVUTILS_H
-
-// SYSTEM INCLUDE FILES
-#include <e32std.h>
-
-// USER INCLUDE FILES
-
-// FORWARD DECLARATIONS
-
-// DATA TYPES
-
-// CLASS DECLARATION
-
-/**
- * Context FW environment utils.
- *
- * @lib None.
- * @since S60 5.1
- */
-class CFEnvUtils
- {
-public:
-
- /**
- * Enables / disbales screen saver.
- * @param aWasEnabled Returns the current value of screen saver.
- * @param aEnable Enable screen saver.
- * @return TInt KErrNone if no errors.
- */
- static TInt EnableScreenSaver( TBool& aWasEnabled, const TBool aEnable );
-
- /**
- * Enables / disbales screen saver.
- * @param aEnable Enable screen saver.
- * @return TInt KErrNone if no errors.
- */
- static TInt EnableScreenSaver( const TBool aEnable );
-
-private:
-
- /**
- * C++ constructor.
- */
- CFEnvUtils();
-
-private:
- // data
- };
-
-#endif // CFENVUTILS_H
--- a/contextframework/cfw/tsrc/public/basic/group/MT_CFClient.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/contextframework/cfw/tsrc/public/basic/group/MT_CFClient.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* 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"
@@ -33,7 +33,6 @@
SOURCEPATH ../common
SOURCE cftestdelay.cpp
-SOURCE cfenvutils.cpp
USERINCLUDE ../MT_CFClient
USERINCLUDE ../common
--- a/contextframework/cfw/tsrc/public/basic/group/MT_CFContextSourceManager.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/contextframework/cfw/tsrc/public/basic/group/MT_CFContextSourceManager.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* 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"
@@ -30,8 +30,6 @@
SOURCE MT_CFContextSourceManagerDllMain.cpp
SOURCE MT_CFContextSourceManager.cpp
-SOURCEPATH ../common
-SOURCE cfenvutils.cpp
USERINCLUDE ../common
USERINCLUDE ../MT_CFContextSourceManager
--- a/contextframework/cfw/tsrc/public/basic/group/MT_CFContextSourceSettingsManager.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/contextframework/cfw/tsrc/public/basic/group/MT_CFContextSourceSettingsManager.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* 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"
@@ -30,9 +30,6 @@
SOURCE MT_CFContextSourceSettingsManagerDllMain.cpp
SOURCE MT_CFContextSourceSettingsManager.cpp
-SOURCEPATH ../common
-SOURCE cfenvutils.cpp
-
USERINCLUDE ../common
USERINCLUDE ../MT_CFContextSourceSettingsManager
USERINCLUDE ../../../../inc/CFContextSourceSettingsManager
--- a/contextframework/cfw/tsrc/public/basic/group/MT_CFOperationPluginManager.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/contextframework/cfw/tsrc/public/basic/group/MT_CFOperationPluginManager.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* 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"
@@ -29,9 +29,6 @@
SOURCE MT_CFOperationPluginManager.cpp
SOURCE MT_CFOperationPluginManager_DllMain.cpp
-SOURCEPATH ../common
-SOURCE cfenvutils.cpp
-
USERINCLUDE ../MT_CFOperationPluginManager
USERINCLUDE ../common
USERINCLUDE ../../../../inc/common
--- a/contextframework/cfw/tsrc/public/basic/group/MT_CFScriptEngine.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/contextframework/cfw/tsrc/public/basic/group/MT_CFScriptEngine.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* 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"
@@ -34,7 +34,6 @@
SOURCE cffakeenv.cpp
SOURCE CFTestDelay.cpp
SOURCE ScriptEventNotifierSession.cpp
-SOURCE cfenvutils.cpp
// Sources needed by the test
SOURCEPATH ../../../../src/cfserver
--- a/contextframework/cfw/tsrc/public/basic/group/UT_CCFContextManager.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/contextframework/cfw/tsrc/public/basic/group/UT_CCFContextManager.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* 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"
@@ -36,9 +36,6 @@
SOURCE CFUtils.cpp
SOURCE CFCacheElement.cpp
-SOURCEPATH ../common
-SOURCE cfenvutils.cpp
-
USERINCLUDE ../../../../inc/cfserver
USERINCLUDE ../../../../inc/cfservices
USERINCLUDE ../../../../inc/common
--- a/contextframework/cfw/tsrc/public/basic/group/UT_CCFEngine.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/contextframework/cfw/tsrc/public/basic/group/UT_CCFEngine.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* 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"
@@ -31,7 +31,6 @@
SOURCE cftestcontextlistener.cpp
SOURCEPATH ../common
-SOURCE cfenvutils.cpp
SOURCE cftestdelay.cpp
// Sources needed by the test
--- a/contextframework/cfw/tsrc/public/basic/group/UT_CFActivatorEngine.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/contextframework/cfw/tsrc/public/basic/group/UT_CFActivatorEngine.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* 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"
@@ -30,9 +30,6 @@
SOURCE UT_CFActivatorEngineDllMain.cpp
SOURCE UT_CFActivatorEngine.cpp
-SOURCEPATH ../common
-SOURCE cfenvutils.cpp
-
// Sources needed by the test
SOURCEPATH ../../../../src/cfactivatorengine
SOURCE CFActivatorEngineActionPluginManager.cpp
--- a/contextframework/cfw/tsrc/public/basic/group/UT_CFContextSourceManager.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/contextframework/cfw/tsrc/public/basic/group/UT_CFContextSourceManager.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* 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"
@@ -30,9 +30,6 @@
SOURCE UT_CFContextSourceManagerDllMain.cpp
SOURCE UT_CFContextSourceManager.cpp
-SOURCEPATH ../common
-SOURCE cfenvutils.cpp
-
// Sources needed by the test
SOURCEPATH ../../../../src/cfcontextsourcemanager
SOURCE CFContextSourceManager.cpp
--- a/contextframework/cfw/tsrc/public/basic/group/UT_CFContextSourceSettingsManager.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/contextframework/cfw/tsrc/public/basic/group/UT_CFContextSourceSettingsManager.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* 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"
@@ -29,9 +29,6 @@
SOURCEPATH ../UT_CFContextSourceSettingsManager
SOURCE UT_CFContextSourceSettingsManagerDllMain.cpp
SOURCE UT_CFContextSourceSettingsManager.cpp
-
-SOURCEPATH ../common
-SOURCE cfenvutils.cpp
// Sources needed by the test
SOURCEPATH ../../../../src/CFContextSourceSettingsManager
--- a/contextframework/cfw/tsrc/public/basic/group/UT_CFOperationPluginManager.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/contextframework/cfw/tsrc/public/basic/group/UT_CFOperationPluginManager.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* 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"
@@ -29,9 +29,6 @@
SOURCE UT_CFOperationPluginManager.cpp
SOURCE UT_CFOperationPluginManager_DllMain.cpp
-SOURCEPATH ../common
-SOURCE cfenvutils.cpp
-
// Sources required by the test suite
SOURCEPATH ../../../../src/cfoperationpluginservices
SOURCE cfoperationpluginmanager.cpp
--- a/contextframework/cfw/tsrc/public/basic/group/mt_basicoperationsplugin.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/contextframework/cfw/tsrc/public/basic/group/mt_basicoperationsplugin.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-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"
@@ -33,7 +33,6 @@
SOURCE cffakeenv.cpp
SOURCE CFTestDelay.cpp
SOURCE ScriptEventNotifierSession.cpp
-SOURCE cfenvutils.cpp
// Sources needed by the test
SOURCEPATH ../../../../../cfw/src/cfserver
--- a/contextframework/cfw/tsrc/public/basic/group/mt_cfactionplugin.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/contextframework/cfw/tsrc/public/basic/group/mt_cfactionplugin.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-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"
@@ -29,9 +29,6 @@
SOURCE MT_CFActionPlugIn.cpp
SOURCE MT_CFActionPlugIn_DllMain.cpp
-SOURCEPATH ../common
-SOURCE cfenvutils.cpp
-
USERINCLUDE ../mt_cfactionplugin
USERINCLUDE ../common
--- a/contextframework/cfw/tsrc/public/basic/group/mt_cfservices.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/contextframework/cfw/tsrc/public/basic/group/mt_cfservices.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* 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"
@@ -29,9 +29,6 @@
SOURCEPATH ../mt_cfservices
SOURCE mt_cfservicesdllmain.cpp
SOURCE mt_cfservices.cpp
-
-SOURCEPATH ../common
-SOURCE cfenvutils.cpp
USERINCLUDE ../../../../inc/cfservices
USERINCLUDE ../../../../inc/cfserver
--- a/contextframework/cfw/tsrc/public/basic/group/mt_cfsisupgrade.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/contextframework/cfw/tsrc/public/basic/group/mt_cfsisupgrade.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-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"
@@ -30,7 +30,6 @@
SOURCEPATH ../common
SOURCE cftestdelay.cpp
-SOURCE cfenvutils.cpp
// Sources required by the test suite
SOURCEPATH ../mt_cfsisupgrade
--- a/contextframework/cfw/tsrc/public/basic/mt_cfactionplugin/MT_CFActionPlugIn.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/contextframework/cfw/tsrc/public/basic/mt_cfactionplugin/MT_CFActionPlugIn.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-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"
@@ -27,7 +27,6 @@
// INTERNAL INCLUDES
#include <CFActionPlugin.h>
#include <cfactionindication.h>
-#include "cfenvutils.h"
// CONSTANTS
const TUid KTestActionPluginImplementationUid = {0x10002003};
@@ -121,8 +120,6 @@
// Destructor (virtual by CBase)
MT_CCFActionPlugIn::~MT_CCFActionPlugIn()
{
- // Enable screen saver
- CFEnvUtils::EnableScreenSaver( ETrue );
}
// Default constructor
@@ -136,9 +133,6 @@
// The ConstructL from the base class CEUnitTestSuiteClass must be called.
// It generates the test case table.
CEUnitTestSuiteClass::ConstructL();
-
- // Disable screen saver
- CFEnvUtils::EnableScreenSaver( EFalse );
}
// METHODS
--- a/contextframework/cfw/tsrc/public/basic/mt_cfservices/mt_cfservices.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/contextframework/cfw/tsrc/public/basic/mt_cfservices/mt_cfservices.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2004 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2004-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"
@@ -33,7 +33,6 @@
#include "CFKeyValuePair.h"
#include "cfserviceutils.h"
#include "cfcontextdataproxy.h"
-#include "cfenvutils.h"
// CONSTANTS
_LIT( KKey, "Key_%d" );
@@ -73,9 +72,6 @@
MT_CFServices::~MT_CFServices()
{
Teardown();
-
- // Enable screen saver
- CFEnvUtils::EnableScreenSaver( ETrue );
}
// Default constructor
@@ -89,9 +85,6 @@
// The ConstructL from the base class CEUnitTestSuiteClass must be called.
// It generates the test case table.
CEUnitTestSuiteClass::ConstructL();
-
- // Disable screen saver
- CFEnvUtils::EnableScreenSaver( EFalse );
}
// METHODS
--- a/contextframework/cfw/tsrc/public/basic/mt_cfsisupgrade/MT_CFSisUpgrade.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/contextframework/cfw/tsrc/public/basic/mt_cfsisupgrade/MT_CFSisUpgrade.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-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"
@@ -42,7 +42,6 @@
#include "actiondef_v1.h"
#include "actiondef_v2.h"
#include "operation_v1.hrh"
-#include "cfenvutils.h"
// CONSTANTS
const TInt KSecond = 1000000;
@@ -69,8 +68,6 @@
// Destructor (virtual by CBase)
MT_CFSisUpgrade::~MT_CFSisUpgrade()
{
- // Disable screen saver
- CFEnvUtils::EnableScreenSaver( ETrue );
}
// Default constructor
@@ -84,9 +81,6 @@
// The ConstructL from the base class CEUnitTestSuiteClass must be called.
// It generates the test case table.
CEUnitTestSuiteClass::ConstructL();
-
- // Disable screen saver
- CFEnvUtils::EnableScreenSaver( EFalse );
}
// METHODS
--- a/contextframework/cfwplugins/ApplicationStateSourcePlugIn/group/ApplicationStateSourcePlugIn.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/contextframework/cfwplugins/ApplicationStateSourcePlugIn/group/ApplicationStateSourcePlugIn.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -19,7 +19,7 @@
#include <platform_paths.hrh>
#include "../inc/ApplicationStateSourcePluginConst.hrh"
-TARGET ApplicationStateSourcePlugIn.dll
+TARGET applicationstatesourceplugin.dll
TARGETTYPE PLUGIN
UID 0x10009D8D KApplicationStateSourcePluginDllUid
CAPABILITY CAP_ECOM_PLUGIN
@@ -39,7 +39,7 @@
SOURCEPATH ../data
START RESOURCE ApplicationStateSourcePlugIn.rss
-TARGET ApplicationStateSourcePlugIn.rsc
+TARGET applicationstatesourceplugin.rsc
TARGETPATH /resource/plugins
END
--- a/contextframework/cfwplugins/ApplicationStateSourcePlugIn/inc/ApplicationStateSourcePlugin.h Thu Aug 19 10:05:08 2010 +0300
+++ b/contextframework/cfwplugins/ApplicationStateSourcePlugIn/inc/ApplicationStateSourcePlugin.h Tue Aug 31 15:24:25 2010 +0300
@@ -29,7 +29,7 @@
#include <cfcontextsourceplugin.h>
#include <cfcontextobject.h>
#include <cenrepnotifyhandler.h>
-
+#include <w32std.h>
#include <apgwgnam.h>
#include "cfapplicationstatesettings.h"
#include "uidorientationpair.h"
@@ -37,7 +37,22 @@
// FORWARD DECLARATIONS
class CRepository;
class CCenRepNotifyHandler;
+// FORWARD DECLARATIONS
+class CWsEventHandler;
+NONSHARABLE_CLASS( MWsEventObserver )
+ {
+public:
+
+ /**
+ * Handles window server event.
+ *
+ * @since S60 5.0
+ * @param aEvent New window server event.
+ * @return None.
+ */
+ virtual void HandleWsEventL( RWsSession& aWsSession ) = 0;
+ };
// CLASS DECLARATION
/**
@@ -51,7 +66,7 @@
*/
NONSHARABLE_CLASS( CApplicationStateSourcePlugIn ):
public CCFContextSourcePlugIn,
- public MVwsSessionWrapperObserver,
+ public MWsEventObserver,
public MCenRepNotifyHandlerCallback
{
public: // Constructors and destructor
@@ -76,10 +91,7 @@
// @see CCFContextSourcePlugIn
void InitializeL();
-public: // From MVwsSessionWrapperObserver
- // @see MVwsSessionWrapperObserver
- void HandleViewEventL( const TVwsViewEvent& aEvent );
public: // From MCenRepNotifyHandlerCallback
@@ -111,7 +123,7 @@
// Initialize the fg application context
void InitializeFgApplicationL();
-
+ void HandleWsEventL( RWsSession& aWsSession );
// Handles the view server event
void DoHandleViewEventL( const TVwsViewEvent& aEvent );
@@ -149,7 +161,7 @@
// Foreground application setting list
RApplicationStateSettingsPointerArray iApplicationSettings;
-
+ CWsEventHandler* iWsEventHandler;
// Previous foreground application orientation
TPtrC iPreviousOrientation;
@@ -166,5 +178,67 @@
// KCRUidDefaultAppOrientation listener
CCenRepNotifyHandler* iCRAppOrientationListener;
};
+/**
+ * Listens events from window server and forwards them to observer.
+ */
+NONSHARABLE_CLASS( CWsEventHandler ): public CActive
+ {
+public:
+ /**
+ * Symbian two phased constructors.
+ *
+ * @since S60 5.0
+ * @param None.
+ * @return CDisplayServiceUILayout
+ */
+ static CWsEventHandler* NewL( MWsEventObserver& aObserver );
+ static CWsEventHandler* NewLC( MWsEventObserver& aObserver );
+
+ /**
+ * C++ destructor.
+ */
+ virtual ~CWsEventHandler();
+
+public:
+
+ /**
+ * Start event listening.
+ *
+ * @since S60 5.0
+ * @param None.
+ * @return None.
+ */
+ void IssueRequest();
+
+protected:
+
+ // @see CActive
+ virtual void RunL();
+
+ // @see CActive
+ virtual void DoCancel();
+
+ // @see CActive
+ virtual TInt RunError( TInt aError );
+
+private:
+
+ CWsEventHandler( MWsEventObserver& aObserver );
+ void ConstructL();
+
+private: // Data
+
+ /** Observer */
+ MWsEventObserver& iObserver;
+
+ /** Window server session */
+ RWsSession iWsSession;
+
+ /** Window group for receiving window server events */
+ RWindowGroup* iWindowGroup;
+
+ /** Window group name to hide it from the task manager */
+ CApaWindowGroupName* iWindowGroupName;
+ };
#endif // C_APPLICATIONSTATESOURCEPLUGIN_H
--- a/contextframework/cfwplugins/ApplicationStateSourcePlugIn/inc/cfapplicationstatesettings.h Thu Aug 19 10:05:08 2010 +0300
+++ b/contextframework/cfwplugins/ApplicationStateSourcePlugIn/inc/cfapplicationstatesettings.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2007 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"
@@ -95,7 +95,7 @@
* is found.
* @return None
*/
- TBool GetViewName( const TUid& aUid, TPtrC& aName ) const;
+ void GetViewName( const TUid& aUid, TPtrC& aName ) const;
private:
--- a/contextframework/cfwplugins/ApplicationStateSourcePlugIn/src/ApplicationStateSourcePlugin.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/contextframework/cfwplugins/ApplicationStateSourcePlugIn/src/ApplicationStateSourcePlugin.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-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"
@@ -26,6 +26,7 @@
#include <apgwgnam.h>
#include <applicationorientation.h>
#include <aknappui.h>
+#include <coedef.h>
#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
#include <vwsdefpartner.h>
#endif
@@ -81,7 +82,8 @@
iDefaultAppName = KApplicationStateDefaultValue().AllocL();
iDefaultViewName = KApplicationStateDefaultValue().AllocL();
iContext = CCFContextObject::NewL();
-
+ iWsEventHandler = CWsEventHandler::NewL( *this );
+ iWsEventHandler->IssueRequest();
}
// -----------------------------------------------------------------------------
@@ -131,7 +133,7 @@
delete iCRAppOrientation;
iApplicationSettings.ResetAndDestroy();
delete iSettings;
- delete iVws;
+
delete iDefaultViewName;
delete iDefaultAppName;
delete iApplDefaultState;
@@ -223,8 +225,7 @@
iSettings = NULL;
}
- iVws = CVwsSessionWrapper::NewL( *this );
- iVws->NotifyNextActivation();
+
}
// -----------------------------------------------------------------------------
@@ -351,33 +352,7 @@
}
}
-// -----------------------------------------------------------------------------
-// CApplicationStateSourcePlugIn::HandleViewEventL
-// Maps view activations to contexts.
-// -----------------------------------------------------------------------------
-//
-void CApplicationStateSourcePlugIn::HandleViewEventL(
- const TVwsViewEvent& aEvent )
- {
- FUNC_LOG;
- // Renew listening
- iVws->NotifyNextActivation();
-
- // Handle the view server event
- DoHandleViewEventL( aEvent );
-
- // Log event members!
- INFO_1( "HandleViewEventL: eventType: [%d]", aEvent.iEventType );
-
- INFO_2( "HandleViewEventL: viewOne [appUid:%S] [viewUid%S]",
- &(const TDesC&)aEvent.iViewOneId.iAppUid.Name(),
- &(const TDesC&)aEvent.iViewOneId.iViewUid.Name() );
-
- INFO_2( "HandleViewEventL: viewTwo [appUid:%S] [viewUid%S]",
- &(const TDesC&)aEvent.iViewTwoId.iAppUid.Name(),
- &(const TDesC&)aEvent.iViewTwoId.iViewUid.Name() );
- }
//------------------------------------------------------------------------------
// CApplicationStateSourcePlugIn::HandleNotifyGeneric
@@ -452,8 +427,8 @@
if ( !fgFound && aEvent.iViewOneId.iAppUid == appSettings->Uid() )
{
fgApp.Set( appSettings->Name() );
- //Check for flag returned by GetViewName, don't directly set the Flag to ETrue
- fgFound = appSettings->GetViewName( aEvent.iViewOneId.iViewUid, fgView );
+ appSettings->GetViewName( aEvent.iViewOneId.iViewUid, fgView );
+ fgFound = ETrue;
}
if ( !bgFound && aEvent.iViewTwoId.iAppUid == appSettings->Uid() )
{
@@ -745,6 +720,223 @@
}
return index;
}
+void CApplicationStateSourcePlugIn::HandleWsEventL( RWsSession& aWsSession )
+ {
+ TUid appUid( TUid::Null() );
+ TPtrC bgApp( *iDefaultAppName );
+ TPtrC fgApp( *iDefaultAppName );
+ TPtrC fgView( *iDefaultViewName );
+
+ TInt focWndGrp( aWsSession.GetFocusWindowGroup() );
+ CApaWindowGroupName* wndGrpName = CApaWindowGroupName::NewL( aWsSession );
+ CleanupStack::PushL( wndGrpName );
+ wndGrpName->ConstructFromWgIdL( focWndGrp );
+ appUid = wndGrpName->AppUid();
+
+ for ( TInt i = 0; i < iApplicationSettings.Count(); ++i )
+ {
+ CCFApplicationStateSettings* appSettings = iApplicationSettings[ i ];
+ if ( appUid == appSettings->Uid() )
+ {
+ fgApp.Set( appSettings->Name() );
+ appSettings->GetViewName( appUid, fgView );
+ bgApp.Set( iPreviousForegroundApplication );
+ break;
+ }
+ }
+ TBool publishFgApp( EFalse );
+ TBool publishFgView( EFalse );
+ TBool publishBgApp( EFalse );
+
+ if ( iPreviousForegroundApplication.Compare( fgApp ) != 0 )
+ {
+ publishFgApp = ETrue;
+ }
+ else if ( iPreviousForegroundView.Compare( fgView ) != 0 )
+ {
+ publishFgView = ETrue;
+ }
+
+ if ( bgApp != fgApp )
+ {
+ publishBgApp = ETrue;
+ }
+
+ iPreviousForegroundApplication.Set( fgApp ); // Store for next round
+ iPreviousForegroundView.Set( fgView );
+
+ RThread thread;
+
+ if ( publishFgApp )
+ {
+ iContext->SetTypeL( KApplicationStateForegroundApplicationType );
+ iContext->SetValueL( fgApp );
+ iCF.PublishContext( *iContext, thread );
+ }
+
+ if ( publishFgApp || publishFgView )
+ {
+ iContext->SetTypeL( KApplicationStateForegroundApplicationViewType );
+ iContext->SetValueL( fgView );
+ iCF.PublishContext( *iContext, thread );
+ }
+
+ if ( publishBgApp )
+ {
+ iContext->SetTypeL( KApplicationStateBackgroundApplicationType );
+ iContext->SetValueL( bgApp );
+ iCF.PublishContext( *iContext, thread );
+ }
+
+ thread.Close();
+ CleanupStack::PopAndDestroy( wndGrpName );
+
+ }
+
+// ======================== CWsEventHandler ========================
+
+// ---------------------------------------------------------------------------
+// C++ constructor.
+// ---------------------------------------------------------------------------
+//
+CWsEventHandler::CWsEventHandler( MWsEventObserver& aObserver ):
+ CActive( CActive::EPriorityStandard ),
+ iObserver( aObserver )
+ {
+ CActiveScheduler::Add( this );
+ }
+
+// ---------------------------------------------------------------------------
+// Symbian 2nd phase constructor.
+// ---------------------------------------------------------------------------
+//
+void CWsEventHandler::ConstructL()
+ {
+ // Connect to window server server
+ User::LeaveIfError( iWsSession.Connect() );
+
+ // Construct window group
+ iWindowGroup = new( ELeave ) RWindowGroup( iWsSession );
+ User::LeaveIfError( iWindowGroup->Construct( (TUint32)this, EFalse ) );
+ User::LeaveIfError( iWindowGroup->EnableGroupChangeEvents() );
+ iWindowGroup->SetOrdinalPosition( 0, ECoeWinPriorityNeverAtFront );
+ iWindowGroup->EnableReceiptOfFocus( EFalse );
+
+ // Hide the invisible window from the task manager
+ iWindowGroupName = CApaWindowGroupName::NewL( iWsSession );
+ iWindowGroupName->SetHidden( ETrue );
+ iWindowGroupName->SetWindowGroupName( *iWindowGroup );
+
+ }
+// ---------------------------------------------------------------------------
+// Symbian two phased constructor.
+// ---------------------------------------------------------------------------
+//
+CWsEventHandler* CWsEventHandler::NewL( MWsEventObserver& aObserver )
+ {
+ CWsEventHandler* self = CWsEventHandler::NewLC( aObserver );
+ CleanupStack::Pop( self );
+
+ return self;
+ }
+
+// ---------------------------------------------------------------------------
+// Symbian two phased constructor.
+// Leaves pointer in the cleanup stack.
+// ---------------------------------------------------------------------------
+//
+CWsEventHandler* CWsEventHandler::NewLC( MWsEventObserver& aObserver )
+ {
+ CWsEventHandler* self = new ( ELeave ) CWsEventHandler( aObserver );
+ CleanupStack::PushL( self );
+ self->ConstructL();
+
+ return self;
+ }
+
+// ---------------------------------------------------------------------------
+// C++ destructor.
+// ---------------------------------------------------------------------------
+//
+CWsEventHandler::~CWsEventHandler()
+ {
+ Cancel();
+
+ // Cleanup window group name
+ delete iWindowGroupName;
+
+ // Cleanup window group
+ if( iWindowGroup )
+ {
+ iWindowGroup->DisableGroupChangeEvents();
+ iWindowGroup->Close();
+ delete iWindowGroup;
+ }
+
+ // Cleanup window server session
+ iWsSession.Close();
+ }
+
+//------------------------------------------------------------------------------
+// CWsEventHandler::IssueRequest
+//------------------------------------------------------------------------------
+//
+void CWsEventHandler::IssueRequest()
+ {
+ // Request events from window server
+ iWsSession.EventReady( &iStatus );
+ SetActive();
+ }
+//------------------------------------------------------------------------------
+// CWsEventHandler::RunL
+//------------------------------------------------------------------------------
+//
+void CWsEventHandler::RunL()
+ {
+ TInt err = iStatus.Int();
+ if( err == KErrNone )
+ {
+ // No errors occured, fetch event
+ TWsEvent wsEvent;
+ iWsSession.GetEvent( wsEvent );
+
+ // Continue listening
+ IssueRequest();
+ switch (wsEvent.Type())
+ {
+ case EEventWindowGroupsChanged :
+ // Forward event to observer
+ iObserver.HandleWsEventL( iWsSession );
+ break;
+ default:
+ break;
+ }
+ }
+ }
+
+//------------------------------------------------------------------------------
+// CWsEventHandler::DoCancel
+//------------------------------------------------------------------------------
+//
+void CWsEventHandler::DoCancel()
+ {
+ // Cancel event ready from window server
+ iWsSession.EventReadyCancel();
+ }
+
+//------------------------------------------------------------------------------
+// CWsEventHandler::RunError
+//------------------------------------------------------------------------------
+//
+TInt CWsEventHandler::RunError( TInt /*aError*/ )
+ {
+ // Issue a new request, other error handling is not performed since the
+ // problem has occured in the observer code
+ IssueRequest();
+
+ return KErrNone;
+ }
+
--- a/contextframework/cfwplugins/ApplicationStateSourcePlugIn/src/cfapplicationstatesettings.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/contextframework/cfwplugins/ApplicationStateSourcePlugIn/src/cfapplicationstatesettings.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2007 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"
@@ -99,18 +99,15 @@
// CCFApplicationStateSettings::AddViewSettingsL
//-----------------------------------------------------------------------------
//
-TBool CCFApplicationStateSettings::GetViewName( const TUid& aUid,
+void CCFApplicationStateSettings::GetViewName( const TUid& aUid,
TPtrC& aName ) const
{
- TBool matchFound = EFalse;
for ( TInt i = 0; i < iViewInfo.Count(); ++i )
{
if ( aUid == iViewInfo[ i ]->Uid() )
{
aName.Set( iViewInfo[ i ]->Name() );
- matchFound = ETrue;
break;
}
}
- return matchFound;
}
--- a/contextframework/cfwplugins/CallStateSourcePlugIn/group/CallStateSourcePlugIn.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/contextframework/cfwplugins/CallStateSourcePlugIn/group/CallStateSourcePlugIn.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -19,7 +19,7 @@
#include <platform_paths.hrh>
#include "../inc/CallStateSourcePlugInConst.hrh"
-TARGET CallStateSourcePlugIn.dll
+TARGET callstatesourceplugin.dll
TARGETTYPE PLUGIN
UID 0x10009D8D KCallStateSourcePluginDllUid
CAPABILITY ALL -TCB
@@ -36,7 +36,7 @@
SOURCEPATH ../data
START RESOURCE CallStateSourcePlugIn.rss
-TARGET CallStateSourcePlugIn.rsc
+TARGET callstatesourceplugin.rsc
TARGETPATH /resource/plugins
END
--- a/contextframework/cfwplugins/PSStateSourcePlugIn/group/psstatesourceplugin.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/contextframework/cfwplugins/PSStateSourcePlugIn/group/psstatesourceplugin.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -19,7 +19,7 @@
#include <platform_paths.hrh>
#include "../inc/psstatesourcepluginconst.hrh"
-TARGET PSStateSourcePlugIn.dll
+TARGET psstatesourceplugin.dll
TARGETTYPE PLUGIN
UID 0x10009D8D KPSStateSourcePluginDllUid
CAPABILITY ALL -TCB
--- a/contextframework/cfwplugins/PSStateSourcePlugIn/src/psstatesourceplugin.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/contextframework/cfwplugins/PSStateSourcePlugIn/src/psstatesourceplugin.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2006 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"
@@ -247,7 +247,7 @@
TInt psValue;
TLex lex( psValueDesc );
- User::LeaveIfError( lex.Val(psValue) );
+ lex.Val(psValue);
intmapper->AddMappingL(psValue, contextValue);
}
--- a/contextframework/cfwplugins/group/bld.inf Thu Aug 19 10:05:08 2010 +0300
+++ b/contextframework/cfwplugins/group/bld.inf Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
@@ -23,7 +23,7 @@
#include "../ApplicationStateSourcePlugIn/group/bld.inf"
#include "../sensorsourceplugin/group/bld.inf"
#include "../vibraactionplugin/group/bld.inf"
-#include "../orientationactionplugin/group/bld.inf"
+//#include "../orientationactionplugin/group/bld.inf"
#include "../cenrepsourceplugin/group/bld.inf"
// moved from pcfw
#include "../PSStateSourcePlugIn/group/bld.inf"
--- a/contextframework/cfwplugins/orientationactionplugin/group/orientationactionplugin.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/contextframework/cfwplugins/orientationactionplugin/group/orientationactionplugin.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -20,7 +20,7 @@
#include "../inc/traceconfiguration.hrh"
#include "../inc/orientationactionpluginconst.hrh"
-TARGET OrientationActionPlugin.dll
+TARGET orientationactionplugin.dll
TARGETTYPE PLUGIN
UID 0x10009D8D KOrientationActionPlugInDllUid
CAPABILITY CAP_ECOM_PLUGIN
@@ -50,7 +50,7 @@
LIBRARY cfactivatorengine.lib
LIBRARY cfservices.lib
LIBRARY centralrepository.lib
-LIBRARY Avkon.lib
+LIBRARY avkon.lib
LIBRARY apgrfx.lib
#ifdef TRACE_INTO_FILE
LIBRARY flogger.lib
--- a/contextframework/cfwplugins/orientationactionplugin/src/orientationactionplugin.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/contextframework/cfwplugins/orientationactionplugin/src/orientationactionplugin.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2006 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"
@@ -84,6 +84,7 @@
CCFActionPlugIn::TExecutionTime time = CCFActionPlugIn::ENone;
+ const RKeyValueArray& params = aActionIndication->Parameters();
// Check for action ID: Orientation
if( aActionIndication->Identifier().CompareF(
KOrientationAction ) == KErrNone )
--- a/contextframework/cfwplugins/sensorsourceplugin/src/sensorchannelbase.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/contextframework/cfwplugins/sensorsourceplugin/src/sensorchannelbase.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -13,7 +13,6 @@
*
* Description: CSensorChannelBase class implementation.
*
-*
*/
@@ -236,8 +235,9 @@
TInt aDataLost )
{
FUNC_LOG;
-
-
+
+ TRAP_IGNORE( HandleDataReceivedL( aChannel, aCount, aDataLost ) );
+
// If we are fetching initial value, make sure that the channel is closed
// properly if there are no active connections
if( !SensorActive() && iState == EChannelStateInitializing )
@@ -247,7 +247,6 @@
}
else
{
- TRAP_IGNORE( HandleDataReceivedL( aChannel, aCount, aDataLost ) );
// Active connections received, change state
ChangeState( EChannelStateActive );
}
@@ -632,4 +631,3 @@
}
// End of file
-
--- a/coreapplicationuis/ATCmdPlugin/data/atcmdpluginresource.rss Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/ATCmdPlugin/data/atcmdpluginresource.rss Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
- // Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+ // 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"
@@ -15,7 +15,6 @@
#include <eikon.rh>
#include <e32keys.h>
-#include <ncp_consts.hrh>
#include "atcmdplugin.rh"
--- a/coreapplicationuis/ATCmdPlugin/group/atcmdplugin.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/ATCmdPlugin/group/atcmdplugin.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -56,7 +56,7 @@
LIBRARY efsrv.lib
LIBRARY ws32.lib
LIBRARY hwrmlightclient.lib
-LIBRARY HAL.lib
+LIBRARY hal.lib
DEBUGLIBRARY flogger.lib
--- a/coreapplicationuis/DbRecovery/Group/DbRecovery.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/DbRecovery/Group/DbRecovery.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -21,7 +21,7 @@
#include <platform_paths.hrh>
-TARGET DbRecovery.exe
+TARGET dbrecovery.exe
TARGETTYPE exexp
UID 0x100039CE 0x10005A17
@@ -42,8 +42,8 @@
LIBRARY euser.lib
LIBRARY edbms.lib
LIBRARY diskspacereserver.lib
-LIBRARY EFSRV.LIB
-LIBRARY CHARCONV.LIB
-LIBRARY ESTOR.LIB
+LIBRARY efsrv.lib
+LIBRARY charconv.lib
+LIBRARY estor.lib
LIBRARY cntmodel.lib
// End of File
--- a/coreapplicationuis/GSServerEngine/group/GSServerEngine.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/GSServerEngine/group/GSServerEngine.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -19,7 +19,7 @@
// To get the MW_LAYER_SYSTEMINCLUDE-definition
#include <platform_paths.hrh>
-TARGET GSServerEngine.dll
+TARGET gsserverengine.dll
TARGETTYPE dll
UID 0x10281F16
--- a/coreapplicationuis/NspsWsPlugin/group/NspsWsPlugin.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/NspsWsPlugin/group/NspsWsPlugin.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -18,7 +18,7 @@
#include <platform_paths.hrh>
-TARGET NspsWsPlugin.DLL
+TARGET nspswsplugin.dll
TARGETTYPE ANI
UID 0x10003B22 0x10005A15
VENDORID VID_DEFAULT
@@ -34,7 +34,7 @@
SOURCE NspsWsPlugin.cpp
SOURCE NspsWsPluginDll.cpp
-LIBRARY EUSER.LIB
+LIBRARY euser.lib
EXPORTUNFROZEN
--- a/coreapplicationuis/NspsWsPlugin/group/bld.inf Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/NspsWsPlugin/group/bld.inf Tue Aug 31 15:24:25 2010 +0300
@@ -20,7 +20,7 @@
DEFAULT
PRJ_EXPORTS
-../inc/NspsWsPluginDllStd.h |../../inc/NspsWsPluginDllStd.h
+../inc/NspsWsPluginDllStd.h |../../inc/nspswsplugindllstd.h
PRJ_MMPFILES
../group/NspsWsPlugin.mmp
--- a/coreapplicationuis/NspsWsPlugin/src/NspsWsPlugin.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/NspsWsPlugin/src/NspsWsPlugin.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -18,7 +18,7 @@
// INCLUDE FILES
#include <e32property.h>
-#include "CoreApplicationUIsInternalPSKeys.h"
+#include "coreapplicationuisinternalpskeys.h"
#include "NspsWsPluginDllStd.h"
#include "NspsWsPlugin.h" // this
--- a/coreapplicationuis/Rfs/Plugins/GSRFSPlugin/data/10275117.rss Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-/*
-* 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: ECOM plugin resource file for GS RFS plugin.
-*
-*/
-
-
-#include <ecom/registryinfo.rh>
-
-RESOURCE REGISTRY_INFO theInfo
- {
- dll_uid = 0x10275117; // Plugin dll UID
- interfaces =
- {
- INTERFACE_INFO
- {
- interface_uid = 0x10207236; // UID for CGSPluginInterface - do not change.
- implementations =
- {
- IMPLEMENTATION_INFO
- {
- implementation_uid = 0x10275118; // Plugin UID
- version_no = 1;
- display_name = "GS RFS Plugin"; // Plugin debug name
- default_data = "0x10283317"; // Parent UID
- opaque_data = "40"; // Order number
- }
- };
- }
- };
- }
-
--- a/coreapplicationuis/Rfs/Plugins/GSRFSPlugin/data/GSRFSPluginRsc.rss Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,154 +0,0 @@
-/*
-* Copyright (c) 2005-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:
-* Resource file for GSRFSPlugin
-*
-*/
-
-
-// RESOURCE IDENTIFIER
-NAME GRFS // 4 letter ID
-
-// INCLUDES
-
-#include <avkon.rsg>
-#include <avkon.mbg>
-#include <EIKCORE.rsg>
-#include <eikon.rsg>
-#include <avkon.loc>
-#include "gsrfsplugin.hrh"
-#include "gsrfsplugin.loc"
-#include <uikon.rh>
-
-
-// CONSTANTS
-
-// RESOURCE DEFINITIONS
-
-//----------------------------------------------------
-//
-//
-// Needed or loading the resource fails!
-//
-//----------------------------------------------------
-//
-RESOURCE RSS_SIGNATURE
- {
- }
-
-#include "gscommonresources.rss"
-RESOURCE TBUF
- {
- buf="GRFS";
- }
-
-//----------------------------------------------------
-//
-// EIK_APP_INFO
-// It contains application information.
-//
-//----------------------------------------------------
-//
-RESOURCE EIK_APP_INFO
- {
- }
-
-//----------------------------------------------------
-// r_rfs_factory_settings
-//
-// Orig. factory settings caption for plugin
-//----------------------------------------------------
-//
-RESOURCE TBUF r_rfs_factory_settings
- {
- buf = qtn_set_folder_original_settings;
- }
-
-//----------------------------------------------------
-// r_rfs_factory_settings_title
-//
-// Factory settings view title.
-//----------------------------------------------------
-//
-RESOURCE TITLE_PANE r_rfs_factory_settings_title
- {
- txt = qtn_set_folder_original_settings;
- }
-
-
-//----------------------------------------------------
-// r_rfs_factory_settings_view
-//
-// Factory settings view.
-//----------------------------------------------------
-//
-RESOURCE MENU_BAR r_gs_menubar_exit_help
- {
- titles =
- {
- MENU_TITLE
- {
- menu_pane = r_gs_menu_item_exit;
- },
- MENU_TITLE
- {
- menu_pane = r_gs_menu_item_help;
- }
- };
- }
-
-
-RESOURCE CBA r_gs_rfs_softkeys_options_back__exit
- {
- buttons =
- {
- CBA_BUTTON {id=EAknSoftkeyOptions; txt = text_softkey_option;},
- CBA_BUTTON {id=EAknSoftkeyBack; txt = text_softkey_back; }
- };
- }
-
-RESOURCE AVKON_VIEW r_rfs_factory_settings_view
- {
- menubar = r_gs_menubar_exit_help;
- cba = r_gs_rfs_softkeys_options_back__exit;
- }
-
-
-
-//----------------------------------------------------
-// r_rfs_factory_settings_lbx
-//
-// Factory settings view's listbox.
-//----------------------------------------------------
-
-//
-RESOURCE GS_FEATURE_ARRAY r_rfs_factory_settings_lbx
- {
- items =
- {
- GS_FEATURE
- {
- txt = " \t"qtn_rfs_orig_settings"\t\t";
- item = EGSSettIdOptNormalRfs;
-
- },
- GS_FEATURE
- {
- txt = " \t"qtn_rfs_erase_all_data"\t\t";
- item = EGSSettIdOptDeepRfs;
- }
- };
- }
-
-//End of File
--- a/coreapplicationuis/Rfs/Plugins/GSRFSPlugin/group/GSRFSPlugin.mmp Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,83 +0,0 @@
-/*
-* Copyright (c) 2005-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: Project specification file.
-*
-*/
-
-
-#include <data_caging_paths.hrh> // For RESOURCE_FILES_DIR
-#include <platform_paths.hrh>
-
-CAPABILITY CAP_ECOM_PLUGIN
-TARGET GSRFSPlugin.dll
-TARGETTYPE PLUGIN
-UID 0x10009D8D 0x10275117
-VENDORID VID_DEFAULT
-
-
-SOURCEPATH ../src
-SOURCE GSRFSPluginImplementationTable.cpp
-SOURCE GSRFSPlugin.cpp
-SOURCE GSRFSPluginContainer.cpp
-
-//User include paths
-USERINCLUDE ../inc
-USERINCLUDE ../data // For *.rh
-USERINCLUDE ../../../inc // for gsrfsplugin.loc
-
-
-//System include paths
-APP_LAYER_SYSTEMINCLUDE /epoc32/include/ecom
-APP_LAYER_SYSTEMINCLUDE /epoc32/include/cshelp
-
-//System include paths
-MW_LAYER_SYSTEMINCLUDE
-
-SOURCEPATH ../data
-
-START RESOURCE 10275117.rss
-TARGET GSRFSPlugin.rsc
-END
-
-START RESOURCE GSRFSPluginRsc.rss
-TARGETPATH RESOURCE_FILES_DIR
-HEADER
-LANGUAGE_IDS
-END
-
-LIBRARY euser.lib
-LIBRARY ecom.lib
-LIBRARY efsrv.lib
-LIBRARY avkon.lib
-LIBRARY bafl.lib
-LIBRARY cone.lib
-LIBRARY eikcoctl.lib
-LIBRARY eikcore.lib
-LIBRARY egul.lib
-LIBRARY ws32.lib
-LIBRARY rfs.lib
-LIBRARY gsecomplugin.lib
-LIBRARY CommonEngine.lib
-LIBRARY fbscli.lib
-LIBRARY AknIcon.lib
-LIBRARY aknskins.lib
-
-LIBRARY hlplch.lib
-LIBRARY GSFramework.lib
-LIBRARY GSListBox.lib
-
-
-DOCUMENT 10275117.rss
-
-// End of File
\ No newline at end of file
--- a/coreapplicationuis/Rfs/Plugins/GSRFSPlugin/group/GSRFSPluginIcons.mk Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,71 +0,0 @@
-#
-# Copyright (c) 2007 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:
-#
-
-
-ifeq (WINS,$(findstring WINS, $(PLATFORM)))
-ZDIR=\epoc32\release\$(PLATFORM)\$(CFG)\Z
-else
-ZDIR=\epoc32\data\z
-endif
-
-# ----------------------------------------------------------------------------
-# Configure these
-# ----------------------------------------------------------------------------
-
-TARGETDIR=$(ZDIR)\resource\apps
-HEADERDIR=\epoc32\include
-ICONTARGETFILENAME=$(TARGETDIR)\GSRFSPlugin.mif
-HEADERFILENAME=$(HEADERDIR)\GSRFSPlugin.mbg
-
-do_nothing :
- @rem do_nothing
-
-MAKMAKE : do_nothing
-
-BLD : do_nothing
-
-CLEAN : do_nothing
-
-LIB : do_nothing
-
-CLEANLIB : do_nothing
-
-# ----------------------------------------------------------------------------
-# Configure these.
-#
-# NOTE 1: DO NOT DEFINE MASK FILE NAMES! They are included automatiNetworky by
-# MifConv if the mask detph is defined.
-#
-# NOTE 2: Usually, source paths should not be included in the bitmap
-# definitions. MifConv searches for the icons in all icon directories in a
-# predefined order, which is currently \s60\icons, \s60\bitmaps2, \s60\bitmaps.
-# The directory \s60\icons is included in the search only if the feature flag
-# __SCALABLE_ICONS is defined.
-# ----------------------------------------------------------------------------
-
-RESOURCE :
- mifconv $(ICONTARGETFILENAME) /h$(HEADERFILENAME) \
- /c8,8 qgn_prop_set_gene_phone.bmp
-
-FREEZE : do_nothing
-
-SAVESPACE : do_nothing
-
-RELEASABLES :
- @echo $(HEADERFILENAME)&& \
- @echo $(ICONTARGETFILENAME)
-
-FINAL : do_nothing
--- a/coreapplicationuis/Rfs/Plugins/GSRFSPlugin/group/bld.inf Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-/*
-* Copyright (c) 2005 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: This file provides the information required for building
-* GS RFS Plugin.
-*
-*/
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-../loc/gsrfsplugin.loc MW_LAYER_LOC_EXPORT_PATH(gsrfsplugin.loc)
-
-PRJ_EXTENSIONS
-START EXTENSION s60/mifconv
- OPTION TARGETFILE GSRFSPlugin.mif
- OPTION HEADERFILE GSRFSPlugin.mbg
- OPTION SOURCES -c8,8 qgn_prop_set_gene_phone
-END
-
-
-PRJ_MMPFILES
-//gnumakefile GSRFSPluginIcons.mk
-GSRFSPlugin.mmp
-
-// End of File
--- a/coreapplicationuis/Rfs/Plugins/GSRFSPlugin/inc/GSRFSPlugin.h Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,133 +0,0 @@
-/*
-* Copyright (c) 2005-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: GS Restore Factory Settings plugin
-*
-*/
-
-
-#ifndef GSRFSPLUGIN_H
-#define GSRFSPLUGIN_H
-
-// Includes
-#include <aknsettingpage.h>
-#include <gsbaseview.h>
-#include <ConeResLoader.h>
-#include <gsplugininterface.h>
-
-// Classes referenced
-class CRfsHandler;
-class CGSRFSPluginContainer;
-class CAknViewAppUi;
-
-// Constants
-const TUid KGSRFSPluginUid = { 0x10275117 };
-
-
-// Class Declaration
-/**
- *
- * @since Series60_3.1
- */
-class CGSRFSPlugin : public CGSBaseView
- {
-public: // Constructors and destructor
-
- /**
- * Symbian OS two-phased constructor
- * @return
- */
- static CGSRFSPlugin* NewL( TAny* aInitParams );
-
- /**
- * Destructor.
- */
- ~CGSRFSPlugin();
-
-public: // From CAknView
-
- /**
- * See base class.
- *
- * This function is used also for identifying the plugin so be sure to
- * return correct UID.
- */
- TUid Id() const;
-
- /**
- * See base class.
- */
- void HandleClientRectChange();
-
- /**
- * See base class.
- */
- void DoActivateL( const TVwsViewId& aPrevViewId, TUid aCustomMessageId, const TDesC8& aCustomMessage );
-
- /**
- * See base class.
- */
- void DoDeactivate();
-
- /**
- * See base class.
- */
- void HandleCommandL( TInt aCommand );
-
-
-public: // From CGSPluginInterface
-
- /**
- * See base class.
- */
- void GetCaptionL( TDes& aCaption ) const;
-
- /**
- * See base class.
- */
- TInt PluginProviderCategory() const;
-
- /**
- * See base class.
- */
- CGulIcon* CreateIconL( const TUid aIconType );
-
-protected: // New
-
- /**
- * C++ default constructor.
- */
- CGSRFSPlugin();
-
- /**
- * Symbian OS default constructor.
- */
- void ConstructL();
-
- void DynInitMenuPaneL( TInt aResourceId, CEikMenuPane* aMenuPane );
-
-private: // from CGSBaseView
-
- void NewContainerL();
-
- void HandleListBoxSelectionL();
-
-private: // Data
-
- // Resource loader
- RConeResourceLoader iResourceLoader;
- };
-
-#endif // GSRFSPLUGIN_H
-
-// End of File
--- a/coreapplicationuis/Rfs/Plugins/GSRFSPlugin/inc/GSRFSPluginContainer.h Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
-/*
-* Copyright (c) 2007-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:
-*
-*/
-
-#ifndef GSRFSPLUGINCONTAINER_H
-#define GSRFSPLUGINCONTAINER_H
-
-// INCLUDES
-#include <gsbasecontainer.h>
-#include "gssettingid.h"
-
-// CLASS DECLARATION
-class CGSRFSPlugin;
-class CGSListBoxItemTextArray;
-
-
-class CGSRFSPluginContainer : public CGSBaseContainer
- {
-public:
-
- /**
- * C++ default constructor.
- */
- CGSRFSPluginContainer( CGSRFSPlugin* aGSRFSPlugin );
-
- /**
- * By default Symbian OS constructor is private.
- */
- void ConstructL(const TRect& aRect);
-
- /**
- * Destructor.
- */
- ~CGSRFSPluginContainer();
-
-public: // new methods
-
- TInt CurrentFeatureId() const;
-
-protected: // from CGSBaseContainer
-
- void ConstructListBoxL( TInt aResLbxId );
-
-private: // from CCoeControl
-
- void GetHelpContext( TCoeHelpContext& aContext ) const;
-
-private: // data
-
- CGSRFSPlugin* iGSRFSPlugin; // not own
- CGSListBoxItemTextArray* iListboxItemArray;
- };
-
-
-#endif // GSRFSPLUGINCONTAINER_H
-
-// End of File
--- a/coreapplicationuis/Rfs/Plugins/GSRFSPlugin/inc/GSRFSPluginTraces.h Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-/*
-* Copyright (c) 2002 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: Includes some common defines used in the startup application
-*
-*/
-
-
-#ifndef STARTUPDEFINES_H
-#define STARTUPDEFINES_H
-
-//CONSTANTS
-_LIT( KAppName, "GSRFSPlugin" ); // The application name
-
-// MACROS
-
-#define PANIC(aPanic) User::Panic( KAppName, aPanic )
-
-#define TRACE_ADDPREFIX(aText) (TPtrC((const TText *)L"GSRFSPlugin: \"" L##aText L"\""))
-
-#ifdef _DEBUG
-#define TRACES(aMsg) RDebug::Print( TRACE_ADDPREFIX(aMsg) )
-#define TRACES1(aFormat,aP1) RDebug::Print( TRACE_ADDPREFIX(aFormat),(aP1) )
-#define TRACES2(aFormat,aP1,aP2) RDebug::Print( TRACE_ADDPREFIX(aFormat),(aP1),(aP2) )
-#define TRACES3(aFormat,aP1,aP2,aP3) RDebug::Print( TRACE_ADDPREFIX(aFormat),(aP1),(aP2),(aP3) )
-#else
-#define TRACES(aMsg)
-#define TRACES1(aFormat,aP1)
-#define TRACES2(aFormat,aP1,aP2)
-#define TRACES3(aFormat,aP1,aP2,aP3)
-#endif
-#endif // STARTUPDEFINES_H
-
-// End of File
--- a/coreapplicationuis/Rfs/Plugins/GSRFSPlugin/inc/gscommonresources.rss Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,187 +0,0 @@
-/*
-* Copyright (c) 2005-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: Common resources for internal GS plugins. This .rss is
-* included by other .rss files. This should not be compiled
- alone.
-*
-*/
-
-// RESOURCE IDENTIFIER
-//NAME GSCR // 4 letter ID
-
-// INCLUDES
-#include <gs.loc> // Common localized GS strings
-#include <gscommon.rh> // Common GS resource structures
-
-#include <bldvariant.hrh>
-#include <eikon.rh>
-#include <eikon.rsg>
-#include <avkon.rh>
-#include <avkon.loc>
-
-// CONSTANTS
-
-// -----------------------------------------------------------------------------
-//
-// r_gs_menubar_change_exit
-// GS menu with 'change' and 'exit' items.
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE MENU_BAR r_gs_menubar_change_exit
- {
- titles =
- {
- MENU_TITLE
- {
- menu_pane = r_gs_menu_item_exit;
- },
- MENU_TITLE
- {
- menu_pane = r_gs_menu_item_help;
- },
- MENU_TITLE
- {
- menu_pane = r_gs_menu_item_change;
- }
- };
- }
-
-// -----------------------------------------------------------------------------
-//
-// r_gs_menubar_open_exit
-// GS menu with 'Open' and 'Exit' items.
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE MENU_BAR r_gs_menubar_open_exit
- {
- titles =
- {
- MENU_TITLE
- {
- menu_pane = r_gs_menu_item_exit;
- },
- MENU_TITLE
- {
- menu_pane = r_gs_menu_item_help;
- },
- MENU_TITLE
- {
- menu_pane = r_gs_menu_item_open;
- }
- };
- }
-
-//----------------------------------------------------
-//
-// r_gs_menu_item_open
-// Open item.
-//
-//----------------------------------------------------
-
-RESOURCE MENU_PANE r_gs_menu_item_open
- {
- items =
- {
- MENU_ITEM
- {
- command = EAknSoftkeyOpen;
- txt = qtn_set_options_open;
- }
- };
- }
-
-
-// -----------------------------------------------------------------------------
-//
-// r_gs_menu_item_exit
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE MENU_PANE r_gs_menu_item_exit
- {
- items =
- {
- MENU_ITEM
- {
- command = EAknCmdExit;
- txt = qtn_options_exit;
- }
- };
- }
-
-
-// -----------------------------------------------------------------------------
-//
-// r_gs_menu_item_change
-// Change item.
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE MENU_PANE r_gs_menu_item_change
- {
- items =
- {
- MENU_ITEM
- {
- command = EGSCmdAppChange;
- txt = qtn_set_options_change;
- }
- };
- }
-
-// -----------------------------------------------------------------------------
-//
-// r_gs_menu_item_help
-// Change item.
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE MENU_PANE r_gs_menu_item_help
- {
- items =
- {
- MENU_ITEM
- {
- command = EAknCmdHelp;
- txt = qtn_options_help;
- }
- };
- }
-
-
-// -----------------------------------------------------------------------------
-//
-// r_setting_listbox
-// Common listbox editor resource for setting pages.
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE LISTBOX r_setting_listbox
- {
- flags = EEikListBoxMultipleSelection;
- }
-
-
-// -----------------------------------------------------------------------------
-//
-// r_gs_cba_exit
-// Exit text for RSK
-//
-// -----------------------------------------------------------------------------
-//
-RESOURCE TBUF r_gs_cba_exit { buf = text_softkey_exit; }
-
-//End of File
--- a/coreapplicationuis/Rfs/Plugins/GSRFSPlugin/inc/gsrfsplugin.hrh Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-/*
-* 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: GS Restore Factory Settings plugin
-*
-*/
-
-
-#ifndef GSRFSPLUGIN_HRH
-#define GSRFSPLUGIN_HRH
-
-enum TSettingId
- {
- EGSSettIdOptNormalRfs,
- EGSSettIdOptDeepRfs
- };
-
-#endif // GSRFSPLUGIN_HRH
-
-//End of File
--- a/coreapplicationuis/Rfs/Plugins/GSRFSPlugin/loc/gsrfsplugin.loc Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-/*
-* 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:
-* Localization strings for Plugin
-*
-*/
-
-
-// LOCALISATION STRINGS
-
-
-//d:Text of a list item in general setting list view's list
-//d:Item restores factory settings
-//l:list_setting_pane_t1
-#define qtn_set_folder_original_settings "Factory settings"
-
-
-//d:displays menu options for reset (full / partial)
-//l:title_pane_t2/opt9
-#define qtn_rfs_title_factory_conf "Factory settings"
-
-
-//d:restores factory settings (normal rfs)
-//l:list_setting_pane_t1
-#define qtn_rfs_orig_settings "Restore"
-
-
-//d:erases all data (deep rfs)
-//l:list_setting_pane_t1
-#define qtn_rfs_erase_all_data "Delete data and restore"
-
-
-// End of File
--- a/coreapplicationuis/Rfs/Plugins/GSRFSPlugin/src/GSRFSPlugin.cpp Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,244 +0,0 @@
-/*
-* Copyright (c) 2005-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:
-* GS RFS Plugin
-*
-*/
-
-
-// SYSTEM INCLUDES
-#include <aknViewAppUi.h>
-#include <bautils.h>
-#include <rfsHandler.h>
-#include <gsprivatepluginproviderids.h>
-#include <StringLoader.h>
-#include <GSRFSPluginRsc.rsg>
-#include <GSRFSPlugin.mbg>
-
-#include <hlplch.h>
-#include <gscommon.hrh>
-#include <gsfwviewuids.h>
-#include "GSRFSPlugin.h"
-#include "GSRFSPluginTraces.h"
-#include "GSRFSPluginContainer.h"
-#include "gsrfsplugin.hrh"
-
-// Constants
-_LIT( KGSRFSPluginResourceFileName, "z:GSRFSPluginRsc.rsc" );
-
-
-// ---------------------------------------------------------------------------
-// CGSRFSPlugin::CGSRFSPlugin()
-// Constructor
-// ---------------------------------------------------------------------------
-CGSRFSPlugin::CGSRFSPlugin()
- :iResourceLoader( *iCoeEnv )
- {
- TRACES("CGSRFSPlugin::CGSRFSPlugin()");
- }
-
-// ---------------------------------------------------------------------------
-// CGSRFSPlugin::~CGSRFSPlugin()
-// Destructor
-// ---------------------------------------------------------------------------
-CGSRFSPlugin::~CGSRFSPlugin()
- {
- TRACES("CGSRFSPlugin::~CGSRFSPlugin()");
- iResourceLoader.Close();
- TRACES("CGSRFSPlugin::~CGSRFSPlugin(): End");
- }
-
-// ---------------------------------------------------------------------------
-// CGSRFSPlugin::ConstructL(const TRect& aRect)
-// Symbian OS two-phased constructor
-// ---------------------------------------------------------------------------
-void CGSRFSPlugin::ConstructL()
- {
- TRACES("CGSRFSPlugin::ConstructL()");
-
- // Find the resource file
- TParse parse;
- parse.Set( KGSRFSPluginResourceFileName, &KDC_RESOURCE_FILES_DIR, NULL );
- TFileName fileName( parse.FullName() );
-
- // Get language of resource file
- BaflUtils::NearestLanguageFile( iCoeEnv->FsSession(), fileName );
-
- // Open resource file
- iResourceLoader.OpenL( fileName );
-
- BaseConstructL( R_RFS_FACTORY_SETTINGS_VIEW );
-
- TRACES("CGSRFSPlugin::ConstructL(): End");
- }
-
-// ---------------------------------------------------------------------------
-// CGSRFSPlugin::NewL()
-// Static constructor
-// ---------------------------------------------------------------------------
-CGSRFSPlugin* CGSRFSPlugin::NewL( TAny* /*aInitParams*/ )
- {
- TRACES("CGSRFSPlugin::NewL()");
- CGSRFSPlugin* self = new( ELeave ) CGSRFSPlugin();
- CleanupStack::PushL( self );
- self->ConstructL();
- CleanupStack::Pop( self );
- TRACES("CGSRFSPlugin::NewL(): End");
- return self;
- }
-
-// ---------------------------------------------------------------------------
-// CGSRFSPlugin::Id()
-// ---------------------------------------------------------------------------
-TUid CGSRFSPlugin::Id() const
- {
- return KGSRFSPluginUid;
- }
-
-// ---------------------------------------------------------------------------
-// CGSRFSPlugin::DoActivateL()
-// ---------------------------------------------------------------------------
-void CGSRFSPlugin::DoActivateL( const TVwsViewId& aPrevViewId, TUid aCustomMessageId, const TDesC8& aCustomMessage )
- {
- TRACES("CGSRFSPlugin::DoActivateL()");
- CGSBaseView::DoActivateL( aPrevViewId, aCustomMessageId, aCustomMessage );
- }
-
-// ---------------------------------------------------------------------------
-// CGSRFSPlugin::DoDeactivate()
-// ---------------------------------------------------------------------------
-void CGSRFSPlugin::DoDeactivate()
- {
- TRACES("CGSRFSPlugin::DoDeactivate()");
- CGSBaseView::DoDeactivate();
- }
-
-// ---------------------------------------------------------------------------
-// CGSRFSPlugin::HandleCommandL()
-// ---------------------------------------------------------------------------
-void CGSRFSPlugin::HandleCommandL( TInt aCommand )
- {
- TRACES("CGSRFSPlugin::HandleCommandL()");
- switch ( aCommand )
- {
- case EAknSoftkeyBack:
- {
- iAppUi->ActivateLocalViewL( KGSDeviceManagementPluginUid );
- break;
- }
- case EAknCmdHelp:
- {
- HlpLauncher::LaunchHelpApplicationL(iEikonEnv->WsSession(), iAppUi->AppHelpContextL() );
- break;
- }
- default:
- {
- iAppUi->HandleCommandL( aCommand );
- break;
- }
- }
- }
-
-// ---------------------------------------------------------------------------
-// CGSRFSPlugin::GetCaptionL()
-// ---------------------------------------------------------------------------
-void CGSRFSPlugin::GetCaptionL( TDes& aCaption ) const
- {
- // the resource file is already opened
- HBufC* result = StringLoader::LoadL( R_RFS_FACTORY_SETTINGS );
- aCaption.Copy( *result );
- delete result;
- }
-
-// ---------------------------------------------------------------------------
-// CGSRFSPlugin::PluginProviderCategory()
-// ---------------------------------------------------------------------------
-TInt CGSRFSPlugin::PluginProviderCategory() const
- {
- return KGSPluginProviderInternal;
- }
-
-// -----------------------------------------------------------------------------
-// CGSNetworkPlugin::CreateIconL()
-// -----------------------------------------------------------------------------
-CGulIcon* CGSRFSPlugin::CreateIconL( const TUid aIconType )
- {
- CGulIcon* icon;
- TParse* fp = new( ELeave ) TParse();
- CleanupStack::PushL( fp );
- _LIT( KGSRFSPluginIconDirAndName, "z:gsrfsplugin.mbm");
- fp->Set( KGSRFSPluginIconDirAndName, &KDC_BITMAP_DIR, NULL );
-
- if( aIconType == KGSIconTypeLbxItem )
- {
- icon = AknsUtils::CreateGulIconL( AknsUtils::SkinInstance(), KAknsIIDQgnPropSetGenePhone,
- fp->FullName(),EMbmGsrfspluginQgn_prop_set_gene_phone,
- EMbmGsrfspluginQgn_prop_set_gene_phone_mask );
- }
- else
- {
- icon = CGSPluginInterface::CreateIconL( aIconType );
- }
-
- CleanupStack::PopAndDestroy( fp );
-
- return icon;
- }
-
-// -----------------------------------------------------------------------------
-// CGSRFSPlugin::DynInitMenuPaneL()
-//
-// Dynamically handle help item if not supported
-// -----------------------------------------------------------------------------
-void CGSRFSPlugin::DynInitMenuPaneL( TInt aResourceId, CEikMenuPane* aMenuPane )
- {
- if( aResourceId == R_GS_MENU_ITEM_HELP )
- {
- User::LeaveIfNull( aMenuPane );
- aMenuPane->SetItemDimmed( EAknCmdHelp, EFalse );
- }
- }
-
-// ---------------------------------------------------------------------------
-// CGSRFSPlugin::NewContainerL()
-//
-// Creates new iContainer.
-// ---------------------------------------------------------------------------
-void CGSRFSPlugin::NewContainerL()
- {
- iContainer = new( ELeave ) CGSRFSPluginContainer( this );
- }
-
-// ---------------------------------------------------------------------------
-// CGSRFSPlugin::HandleListBoxSelectionL()
-// ---------------------------------------------------------------------------
-void CGSRFSPlugin::HandleListBoxSelectionL()
- {
- CGSRFSPluginContainer *pluginContainer = static_cast<CGSRFSPluginContainer*>( iContainer );
- const TInt currentFeatureId = pluginContainer->CurrentFeatureId();
-
- CRfsHandler* iRfsHandler = new ( ELeave ) CRfsHandler;
- CleanupStack :: PushL(iRfsHandler);
-
- TRfsType rfsType = ERfsNormal;
- if ( currentFeatureId == EGSSettIdOptDeepRfs )
- {
- rfsType = ERfsDeep;
- }
- iRfsHandler->ActivateRfsL( rfsType );
-
- CleanupStack :: PopAndDestroy(iRfsHandler);
- }
-
-// End of file
--- a/coreapplicationuis/Rfs/Plugins/GSRFSPlugin/src/GSRFSPluginContainer.cpp Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,106 +0,0 @@
-/*
-* Copyright (c) 2007-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:
-*
-*/
-
-
-// INCLUDES
-#include <AknUtils.h>
-#include <AknsDrawUtils.h>
-#include <AknsFrameBackgroundControlContext.h>
-#include <bldvariant.hrh>
-#include <GSRFSPluginRsc.rsg>
-#include <aknlists.h>
-#include <StringLoader.h>
-#include <csxhelp/cp.hlp.hrh>
-#include <gsfwviewuids.h>
-#include <gslistbox.h>
-#include <settingsinternalcrkeys.h>
-#include "GSRFSPluginContainer.h"
-#include "GSRFSPluginTraces.h"
-#include "GSRFSPlugin.h"
-#include "gsrfsplugin.hrh"
-
-
-// ---------------------------------------------------------
-// CGSRFSPluginContainer::CGSRFSPluginContainer()
-// ---------------------------------------------------------
-CGSRFSPluginContainer::CGSRFSPluginContainer( CGSRFSPlugin* aGSRFSPlugin )
- :iGSRFSPlugin( aGSRFSPlugin )
- {
- TRACES("CGSRFSPluginContainer::CGSRFSPluginContainer()");
- }
-
-// -----------------------------------------------------------------------------
-// CGSRFSPluginContainer::ConstructL
-//
-// -----------------------------------------------------------------------------
-void CGSRFSPluginContainer::ConstructL(const TRect& aRect)
- {
- TRACES("CGSRFSPluginContainer::ConstructL()");
-
- iListBox = new( ELeave ) CAknSettingStyleListBox;
- BaseConstructL( aRect, R_RFS_FACTORY_SETTINGS_TITLE, R_RFS_FACTORY_SETTINGS_LBX );
- }
-
-// -----------------------------------------------------------------------------
-// CGSRFSPluginContainer::~CGSRFSPluginContainer
-//
-// -----------------------------------------------------------------------------
-CGSRFSPluginContainer::~CGSRFSPluginContainer()
- {
- TRACES("CGSRFSPluginContainer::~CGSRFSPluginContainer()");
- delete iListboxItemArray;
- TRACES("CGSRFSPluginContainer::~CGSRFSPluginContainer(): End");
- }
-
-// ---------------------------------------------------------------------------
-// CGSRFSPluginContainer::CurrentFeatureId()
-//
-// Return the feature id of selected listitem
-// ---------------------------------------------------------------------------
-TInt CGSRFSPluginContainer::CurrentFeatureId( ) const
- {
- return iListboxItemArray->CurrentFeature( );
- }
-
-// ---------------------------------------------------------------------------
-// CGSRFSPluginContainer::ConstructListBoxL()
-//
-// Construct the listbox from resource array.
-// ---------------------------------------------------------------------------
-void CGSRFSPluginContainer::ConstructListBoxL( TInt aResLbxId )
- {
- iListBox->ConstructL( this, EAknListBoxSelectionList );
-
- iListboxItemArray = CGSListBoxItemTextArray::NewL( aResLbxId, *iListBox, *iCoeEnv );
-
- iListBox->Model()->SetItemTextArray( iListboxItemArray );
- iListBox->Model()->SetOwnershipType( ELbmDoesNotOwnItemArray );
- }
-
-// ---------------------------------------------------------------------------
-// CGSRFSPluginContainer::GetHelpContext() const
-//
-// Gets help context
-// ---------------------------------------------------------------------------
-void CGSRFSPluginContainer::GetHelpContext( TCoeHelpContext& aContext ) const
- {
- aContext.iMajor = KUidGS;
- aContext.iContext = KSET_HLP_GENERAL_ORIG_SET;
- }
-
-// End of File
-
--- a/coreapplicationuis/Rfs/Plugins/GSRFSPlugin/src/GSRFSPluginImplementationTable.cpp Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-/*
-* Copyright (c) 2005 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:
-* ECOM proxy table for this plugin
-*
-*/
-
-
-// System includes
-#include <e32std.h>
-#include <ecom/implementationproxy.h>
-#include "GSRFSPluginTraces.h"
-
-// User includes
-#include "GSRFSPlugin.h"
-
-// Constants
-const TImplementationProxy KGSRFSPluginImplementationTable[] =
- {
- IMPLEMENTATION_PROXY_ENTRY( 0x10275118, CGSRFSPlugin::NewL )
- };
-
-
-// ---------------------------------------------------------------------------
-// ImplementationGroupProxy
-// Gate/factory function
-//
-// ---------------------------------------------------------------------------
-//
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy(
- TInt& aTableCount )
- {
- TRACES("ImplementationGroupProxy()");
- aTableCount = sizeof( KGSRFSPluginImplementationTable )
- / sizeof( TImplementationProxy );
- TRACES("ImplementationGroupProxy(): End");
- return KGSRFSPluginImplementationTable;
- }
-
-// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/Rfs/Plugins/cprfsplugin/cprfsplugin.pro Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,67 @@
+#
+# 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: Project file for the RFS Plugin. It creates the bld.inf and .mmp file on executing
+# qmake command.
+#
+#
+
+TEMPLATE = lib
+TARGET = cprfsplugin
+DEPENDPATH += . inc src
+INCLUDEPATH += .
+INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE
+
+CONFIG += hb\
+ plugin
+
+MOC_DIR = moc
+OBJECTS_DIR = obj
+RCC_DIR = rcc
+
+# Platforms
+SYMBIAN_PLATFORMS = WINSCW \
+ ARMV5
+
+LIBS += -lcpframework \
+ -lRfs
+# Input
+HEADERS += inc/cprfsplugin.h \
+ inc/cprfssettingsdataformcustomitem.h \
+ inc/cprfssettingsform.h \
+ inc/cprfsview.h
+SOURCES += src/cprfsplugin.cpp \
+ src/cprfssettingsdataformcustomitem.cpp \
+ src/cprfssettingsform.cpp \
+ src/cprfsview.cpp
+
+symbian: {
+ TARGET.EPOCALLOWDLLDATA = 1
+ DEFINES += PLUGINUID3=0x10275117
+ TARGET.UID3 = 0x10275117
+}
+symbian {
+ deploy.path = C:
+ qtplugins.path = /resource/qt/plugins/controlpanel
+ qtplugins.sources += qmakepluginstubs/cprfsplugin.qtplugin
+ # This is for new exporting system coming in garden
+ for(qtplugin, qtplugins.sources):BLD_INF_RULES.prj_exports += "./$$qtplugin $$deploy.path$$qtplugins.path/$$basename(qtplugin)"
+}
+# Build.inf rules
+BLD_INF_RULES.prj_exports += "$${LITERAL_HASH}include <platform_paths.hrh>" \
+ "rom/cprfssettingsplugin.iby CORE_MW_LAYER_IBY_EXPORT_PATH(cprfssettingsplugin.iby)"
+
+TARGET.CAPABILITY = All -TCB
+plugin.sources = cprfsplugin.dll
+plugin.path = \resource\qt\plugins\controlpanel
+DEPLOYMENT += plugin
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/Rfs/Plugins/cprfsplugin/inc/cprfsplugin.h Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,33 @@
+/*
+ * 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:
+ *
+ */
+#ifndef CPRFSPLUGIN_H
+#define CPRFSPLUGIN_H
+
+#include <qobject.h>
+#include <cpplugininterface.h>
+
+class CpRfsPlugin : public QObject, public CpPluginInterface
+{
+Q_OBJECT
+ Q_INTERFACES(CpPluginInterface)
+public:
+ CpRfsPlugin();
+ ~CpRfsPlugin();
+ virtual QList<CpSettingFormItemData*> createSettingFormItemData(CpItemDataHelper &itemDataHelper) const;
+};
+
+#endif //CPRFSPLUGIN_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/Rfs/Plugins/cprfsplugin/inc/cprfssettingsdataformcustomitem.h Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,43 @@
+/*
+ * 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:
+ *
+ */
+
+#ifndef CP_RFS_SETTINGS_DATAFORM_CUSTOMITEM_H
+#define CP_RFS_SETTINGS_DATAFORM_CUSTOMITEM_H
+
+#include <hbdataformviewitem.h>
+
+
+class HbPushButton;
+
+class CpRfsSettingsDataFormCustomItem : public HbDataFormViewItem
+{
+Q_OBJECT
+
+public:
+ CpRfsSettingsDataFormCustomItem(QGraphicsItem *parent);
+ ~CpRfsSettingsDataFormCustomItem();
+ virtual bool canSetModelIndex(const QModelIndex &index) const;
+ virtual HbAbstractViewItem* createItem();
+protected:
+ //Override createCustomWidget API
+ virtual HbWidget* createCustomWidget();
+public:
+ HbPushButton *mButton;
+
+};
+
+#endif // CP_RFS_SETTINGS_DATAFORM_CUSTOMITEM_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/Rfs/Plugins/cprfsplugin/inc/cprfssettingsform.h Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,51 @@
+/*
+ * 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:
+ *
+ */
+
+#ifndef CP_RFS_SETTINGSFORM_H
+#define CP_RFS_SETTINGSFORM_H
+
+#include <hbdataform.h>
+#include <hbtranslator.h>
+
+class HbDataFormModelItem;
+
+class CpRfsSettingsForm : public HbDataForm
+{
+Q_OBJECT
+public:
+ explicit CpRfsSettingsForm(QGraphicsItem *parent = 0);
+ ~CpRfsSettingsForm();
+private:
+ void initRfsSettingModel();
+ // call these function when activated signal is emitted
+ void activateNormalRfs(HbWidget *widget);
+ void activateDeepRfs(HbWidget *widget);
+
+private slots:
+ void onItemActivated(const QModelIndex &index);
+ void onPressedNormalRfs();
+ void onPressedDeepRfs();
+
+private:
+
+ //DataForm List Items
+ HbDataFormModelItem *mNormalRfs;
+ HbDataFormModelItem *mDeepRfs;
+ HbTranslator mTrans;
+
+};
+#endif // CP_RFS_SETTINGSFORM_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/Rfs/Plugins/cprfsplugin/inc/cprfsview.h Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,30 @@
+/*
+ * 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:
+ *
+ */
+#ifndef CPRFSVIEW_H
+#define CPRFSVIEW_H
+
+#include <cpbasesettingview.h>
+
+class CpRfsView : public CpBaseSettingView
+{
+ Q_OBJECT
+public:
+ explicit CpRfsView(QGraphicsItem *parent = 0);
+ ~CpRfsView();
+};
+
+#endif// CPRFSVIEW_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/Rfs/Plugins/cprfsplugin/rom/cprfssettingsplugin.iby Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,26 @@
+/*
+ * 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:
+ *
+ */
+
+#ifndef __CPRFSSETTINGSPLUGIN_IBY__
+#define __CPRFSSETTINGSPLUGIN_IBY__
+
+#include <bldvariant.hrh>
+file=ABI_DIR\BUILD_DIR\cprfsplugin.dll SHARED_LIB_DIR\cprfsplugin.dll
+
+data=\epoc32\data\c\resource\qt\plugins\controlpanel\cprfsplugin.qtplugin resource\qt\plugins\controlpanel\cprfsplugin.qtplugin
+
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/Rfs/Plugins/cprfsplugin/src/cprfsplugin.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,38 @@
+/*
+ * 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: Creates the plug-in to the control panel.Creates a setting form
+ * item data, by which the control panel framework can build a setting form model
+ *
+ */
+#include "cprfsplugin.h"
+#include "cprfsview.h"
+#include <cpsettingformentryitemdataimpl.h>
+#include <cpitemdatahelper.h>
+#include <hbtranslator.h>
+
+CpRfsPlugin::CpRfsPlugin()
+ {
+ }
+
+CpRfsPlugin::~CpRfsPlugin()
+ {
+ }
+QList<CpSettingFormItemData*> CpRfsPlugin::createSettingFormItemData(CpItemDataHelper &itemDataHelper) const
+ {
+ HbTranslator trans("control_panel");
+ return QList<CpSettingFormItemData*>()
+ << new CpSettingFormEntryItemDataImpl<CpRfsView>(itemDataHelper,hbTrId("txt_cp_dblist_reset"),hbTrId("txt_cp_dblist_reset_val_reset_your_device"),QString("qtg_large_reset"));
+ }
+
+Q_EXPORT_PLUGIN2(cprfsplugin, CpRfsPlugin);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/Rfs/Plugins/cprfsplugin/src/cprfssettingsdataformcustomitem.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,77 @@
+/*
+ * 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: Creates the custom items required for HbDataFormModelItem.
+ *
+ */
+
+#include <cprfssettingsdataformcustomitem.h>
+#include <hbdataformmodelitem.h>
+#include <hbpushbutton.h>
+#include <hbtranslator.h>
+
+CpRfsSettingsDataFormCustomItem::CpRfsSettingsDataFormCustomItem(QGraphicsItem *parent) :
+HbDataFormViewItem(parent)
+ {
+ }
+
+CpRfsSettingsDataFormCustomItem::~CpRfsSettingsDataFormCustomItem()
+ {
+ }
+
+//overridden method which is required in case of customwidget
+bool CpRfsSettingsDataFormCustomItem::canSetModelIndex(const QModelIndex &index) const
+ {
+ HbDataFormModelItem::DataItemType itemType =
+ static_cast<HbDataFormModelItem::DataItemType>(
+ index.data(HbDataFormModelItem::ItemTypeRole).toInt());
+ //each custom item can be represented by customitembase+number and 10 is just in future if u have to add extra custom items
+ if(itemType >= HbDataFormModelItem::CustomItemBase &&
+ itemType <= HbDataFormModelItem::CustomItemBase + 10 ) {
+ return true;
+ }
+ return false;
+
+ }
+//overridden method which is required in case of customwidget
+HbAbstractViewItem* CpRfsSettingsDataFormCustomItem::createItem()
+ {
+ return new CpRfsSettingsDataFormCustomItem(*this);
+ }
+//overridden method which is required in case of customwidget
+HbWidget* CpRfsSettingsDataFormCustomItem::createCustomWidget()
+ {
+ HbDataFormModelItem::DataItemType itemType = static_cast<HbDataFormModelItem::DataItemType>(
+ modelIndex().data(HbDataFormModelItem::ItemTypeRole).toInt());
+ HbTranslator trans("control_panel");
+ switch(itemType)
+ {
+ case HbDataFormModelItem::CustomItemBase + 1:
+ {
+ //Create 1st button
+ mButton = new HbPushButton();
+ mButton->setText(hbTrId("txt_cp_setlabel_settings_reset_val_reset_settings"));
+ return mButton;
+ }
+ case HbDataFormModelItem::CustomItemBase + 2:
+ {
+ //Create 2nd button
+ mButton = new HbPushButton();
+ mButton->setText(hbTrId("txt_cp_setlabel_device_reset_val_reset_device"));
+ return mButton;
+ }
+ //Some other cases can also be added if there are more than 2 custom data item
+ default:
+ return 0;
+ }
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/Rfs/Plugins/cprfsplugin/src/cprfssettingsform.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,129 @@
+/*
+ * 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: Creates the view for "Reset" and "Delete Data and Resore" and activates the RFS operation based on the user selection.
+ *
+ */
+
+#include "cprfssettingsform.h"
+#include "cprfssettingsdataformcustomitem.h"
+
+
+#include <hbdataformmodelitem.h>
+#include <hbdataformmodel.h>
+#include <hbpushbutton.h>
+#include <rfsHandler.h>
+
+CpRfsSettingsForm::CpRfsSettingsForm(QGraphicsItem *parent) :
+ HbDataForm(parent),mTrans("control_panel")
+ {
+ this->setHeading(hbTrId("txt_cp_subhead_reset"));
+
+ //initialize the form model
+ initRfsSettingModel();
+
+ connect(this, SIGNAL(itemShown(QModelIndex)),this, SLOT(onItemActivated(QModelIndex)));
+ }
+
+CpRfsSettingsForm::~CpRfsSettingsForm()
+ {
+
+ }
+
+void CpRfsSettingsForm::initRfsSettingModel()
+ {
+ HbDataFormModel *model = new HbDataFormModel(0);
+
+ // Create the custom items because HbPushButton cannot be added to the HbDataFormModelItem
+ HbDataFormModelItem::DataItemType customItem1 = static_cast<HbDataFormModelItem::DataItemType>(HbDataFormModelItem::CustomItemBase + 1);
+
+ mNormalRfs = model->appendDataFormItem(customItem1, QString(), model->invisibleRootItem());
+ mNormalRfs->setLabel(hbTrId("txt_cp_setlabel_settings_reset"));
+ mNormalRfs->setDescription(hbTrId("txt_cp_info_original_settings_will_be_restored_no"));
+ HbDataFormModelItem::DataItemType customItem2 = static_cast<HbDataFormModelItem::DataItemType>(HbDataFormModelItem::CustomItemBase + 2);
+
+ mDeepRfs = model->appendDataFormItem(customItem2, QString(), model->invisibleRootItem());
+ mDeepRfs->setLabel(hbTrId("txt_cp_setlabel_device_reset"));
+ mDeepRfs->setDescription(hbTrId("txt_cp_info_all_data_will_be_deleted_and_factory_s"));
+ this->setModel(model);
+ }
+
+// On Item activated
+void CpRfsSettingsForm::onItemActivated(const QModelIndex &index)
+ {
+ HbDataFormModelItem *itemData = static_cast<HbDataFormModelItem *> (index.internalPointer());
+ // to deal with orbit change temparialy
+ if (itemData->type() > HbDataFormModelItem::GroupPageItem)
+ {
+ //get the widget of setting item
+ HbAbstractViewItem* viewitem = static_cast<HbAbstractItemView*>(this)->itemByIndex(index);
+ HbWidget* widget =static_cast<HbDataFormViewItem*>(viewitem)->dataItemContentWidget();
+ if (itemData == mNormalRfs)
+ {
+ activateNormalRfs(widget);
+ }
+ if (itemData == mDeepRfs)
+ {
+ activateDeepRfs(widget);
+ }
+ }
+ }
+
+void CpRfsSettingsForm::activateNormalRfs(HbWidget* widget)
+ {
+ HbPushButton *advanced = qobject_cast<HbPushButton *> (widget);
+
+ if(advanced)
+ {
+ //TODO Issue in DataForm Calling the itemActivated twice
+ disconnect( advanced, SIGNAL(clicked()), this, SLOT(onPressedNormalRfs()) );
+
+ connect( advanced, SIGNAL(clicked()), this, SLOT(onPressedNormalRfs()) );
+ }
+ }
+
+void CpRfsSettingsForm::activateDeepRfs(HbWidget* widget)
+ {
+ HbPushButton *advanced = qobject_cast<HbPushButton *> (widget);
+
+ if(advanced)
+ {
+ //TODO Issue in DataForm Calling the itemActivated twice
+ disconnect( advanced, SIGNAL(clicked()), this, SLOT(onPressedDeepRfs()) );
+
+ connect( advanced, SIGNAL(clicked()), this, SLOT(onPressedDeepRfs()) );
+ }
+ }
+
+void CpRfsSettingsForm::onPressedNormalRfs()
+ {
+ CRfsHandler* rfsHandler = new ( ELeave ) CRfsHandler;
+ CleanupStack :: PushL(rfsHandler);
+
+ //activate the Normal RFS
+ rfsHandler->ActivateRfsL( ERfsNormal );
+
+ CleanupStack :: PopAndDestroy(rfsHandler);
+
+ }
+
+void CpRfsSettingsForm::onPressedDeepRfs()
+ {
+ CRfsHandler* rfsHandler = new ( ELeave ) CRfsHandler;
+ CleanupStack :: PushL(rfsHandler);
+
+ //activate the Deep RFS
+ rfsHandler->ActivateRfsL( ERfsDeep );
+
+ CleanupStack :: PopAndDestroy(rfsHandler);
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/Rfs/Plugins/cprfsplugin/src/cprfsview.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,41 @@
+/*
+ * 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: Creates the settingForm for RFS plug-in where we can add setting item to the form later.
+ *
+ */
+
+#include "cprfsview.h"
+#include "cprfssettingsform.h"
+
+#include <cpbasesettingview.h>
+#include "cprfssettingsdataformcustomitem.h"
+
+CpRfsView::CpRfsView(QGraphicsItem *parent):
+CpBaseSettingView(0,parent)
+ {
+ CpRfsSettingsForm* settingForm = new CpRfsSettingsForm(this);
+
+ //custom prototype
+ CpRfsSettingsDataFormCustomItem* customPrototype = new CpRfsSettingsDataFormCustomItem(settingForm);
+
+ QList <HbAbstractViewItem*> protos = settingForm->itemPrototypes();
+ protos.append(customPrototype);
+ settingForm->setItemPrototypes(protos);
+ //function from hbview
+ setWidget(settingForm);
+
+ }
+CpRfsView::~CpRfsView()
+ {
+ }
--- a/coreapplicationuis/Rfs/group/bld.inf Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/Rfs/group/bld.inf Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-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"
@@ -23,7 +23,6 @@
PRJ_EXPORTS
../loc/rfs.loc MW_LAYER_LOC_EXPORT_PATH(rfs.loc)
-../Plugins/GSRFSPlugin/loc/gsrfsplugin.loc MW_LAYER_LOC_EXPORT_PATH(gsrfsplugin.loc)
../rom/rfs.iby CORE_MW_LAYER_IBY_EXPORT_PATH(rfs.iby)
../rom/rfsResources.iby LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(rfsResources.iby)
../rom/rfs_variant.iby CUSTOMER_MW_LAYER_IBY_EXPORT_PATH(rfs_variant.iby)
@@ -32,12 +31,5 @@
PRJ_MMPFILES
rfs.mmp
rfsMain.mmp
-../Plugins/GSRFSPlugin/group/GSRFSPlugin.mmp
../Plugins/rfscustcmd/group/rfscustcmd.mmp
-PRJ_EXTENSIONS
-START EXTENSION s60/mifconv
- OPTION TARGETFILE GSRFSPlugin.mif
- OPTION HEADERFILE GSRFSPlugin.mbg
- OPTION SOURCES -c8,8 qgn_prop_set_gene_phone
-END
--- a/coreapplicationuis/Rfs/group/rfs.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/Rfs/group/rfs.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -29,6 +29,14 @@
USERINCLUDE ../inc
+
+SYSTEMINCLUDE /epoc32/include/mw/hb/hbwidgets
+
+
+LIBRARY HbWidgets.lib
+
+
+
MW_LAYER_SYSTEMINCLUDE
SOURCEPATH ../src
@@ -52,18 +60,17 @@
LIBRARY euser.lib
LIBRARY efsrv.lib
LIBRARY bafl.lib
-LIBRARY avkon.lib
LIBRARY cone.lib
LIBRARY etel.lib
LIBRARY etelmm.lib
-LIBRARY CommonEngine.lib
+LIBRARY commonengine.lib
LIBRARY sysutil.lib
LIBRARY hal.lib
LIBRARY secui.lib
LIBRARY eikcore.lib
-LIBRARY SysLangUtil.lib
-LIBRARY PlatformEnv.lib // PathInfo
+LIBRARY syslangutil.lib
+LIBRARY platformenv.lib // PathInfo
LIBRARY centralrepository.lib // Central Repository
LIBRARY starterclient.lib
LIBRARY ecom.lib
-LIBRARY FeatMgr.lib
+LIBRARY featmgr.lib
--- a/coreapplicationuis/Rfs/group/rfsMain.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/Rfs/group/rfsMain.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -19,7 +19,7 @@
#include <platform_paths.hrh>
-TARGET RfsServer.exe
+TARGET rfsserver.exe
TARGETTYPE exe
SOURCEPATH ../src
VENDORID VID_DEFAULT
--- a/coreapplicationuis/Rfs/inc/rfsConnectionObserver.h Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/Rfs/inc/rfsConnectionObserver.h Tue Aug 31 15:24:25 2010 +0300
@@ -19,14 +19,14 @@
#ifndef __RFSPDPOBSERVER_H
#define __RFSPDPOBSERVER_H
-#include <AknWaitDialog.h>
+#include <hbdeviceprogressdialogsymbian.h>
// P&S KEYS FROM SIP & PDP CONNECTION
#include <e32property.h>
#include <pdpcontextmanagerpskeys.h>
#include <sipsystemstatemonitorpskeys.h>
-#include "rfsConTimer.h"
+#include "rfscontimer.h"
class CRfsConTimer;
@@ -36,7 +36,7 @@
EPdpConnectionClose // this should be the last enum
};
-NONSHARABLE_CLASS( CRfsConnectionObserver ): public CActive
+NONSHARABLE_CLASS( CRfsConnectionObserver ): public CActive,public MHbDeviceProgressDialogObserver
{
public:
@@ -49,6 +49,11 @@
* Destructor
*/
virtual ~CRfsConnectionObserver();
+
+ void ProgressDialogCancelled(const CHbDeviceProgressDialogSymbian* iDialog);
+
+ void ProgressDialogClosed(const CHbDeviceProgressDialogSymbian * iDialog) ;
+
public:
/**
@@ -135,9 +140,8 @@
/**
* Own: Wait dialog
*/
- CAknWaitDialog* iWaitDialog;
-
- /**
+ CHbDeviceProgressDialogSymbian* iDialog ;
+ /**
* Own: PDP property
*/
RProperty iPDPProperty;
@@ -173,6 +177,8 @@
TBool iIsSipInformedForClosingAllConnection;
TBool iIsPDPInformedforClosingAllConnection;
TBool iIsClosingConnectionsApplicable;
+ //for synchronous dialog handling
+ CActiveSchedulerWait *iWait;
public:
--- a/coreapplicationuis/Rfs/rom/rfs.iby Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/Rfs/rom/rfs.iby Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009-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"
@@ -21,9 +21,6 @@
file=ABI_DIR\BUILD_DIR\RFS.DLL SHARED_LIB_DIR\RFS.DLL
file=ABI_DIR\BUILD_DIR\RfsServer.exe PROGRAMS_DIR\RfsServer.exe
-ECOM_PLUGIN(GSRFSPlugin.dll,10275117.rsc)
-SCALABLE_IMAGE(APP_BITMAP_DIR,APP_BITMAP_DIR,GSRFSPlugin)
-
file=ABI_DIR\BUILD_DIR\rfscustcmd.dll SHARED_LIB_DIR\rfscustcmd.dll
#endif
--- a/coreapplicationuis/Rfs/rom/rfsResources.iby Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/Rfs/rom/rfsResources.iby Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009-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"
@@ -21,5 +21,4 @@
//Resource file(s) for RFS
data=DATAZ_\RESOURCE_FILES_DIR\Rfs.rsc RESOURCE_FILES_DIR\Rfs.rsc
-data=DATAZ_\RESOURCE_FILES_DIR\GSRFSPluginRsc.RSC RESOURCE_FILES_DIR\GSRFSPluginRsc.RSC
#endif
\ No newline at end of file
--- a/coreapplicationuis/Rfs/src/rfs.rss Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/Rfs/src/rfs.rss Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-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"
@@ -27,10 +27,7 @@
#include "rfs.loc"
#include <eikon.rsg>
#include <eikon.rh>
-#include <avkon.rsg>
-#include <avkon.rh>
-#include <avkon.hrh>
-#include <avkon.mbg>
+
// RESOURCE DEFINITIONS
@@ -42,76 +39,12 @@
RESOURCE TBUF r_device_restart { buf = qtn_rfs_note_device_restart; }
-// -----------------------------------------------------------------------------
-// R_CONFIRM_RFS
-// -----------------------------------------------------------------------------
-RESOURCE DIALOG r_confirm_rfs
- {
- flags = EGeneralQueryFlags;
-
- buttons = R_AVKON_SOFTKEYS_YES_NO__YES;
- items =
- {
- DLG_LINE
- {
- type = EAknCtQuery;
- id = EGeneralQuery;
- control = AVKON_CONFIRMATION_QUERY
- {
- layout = EConfirmationLayout;
- label = qtn_rfs_restore_query;
- };
- }
- };
- }
-
-// -----------------------------------------------------------------------------
-// R_CONFIRM_DEEP_RFS
-// -----------------------------------------------------------------------------
-//
-RESOURCE DIALOG r_confirm_deep_rfs
- {
- flags = EGeneralQueryFlags;
+RESOURCE TBUF r_confirm_rfs { buf = qtn_rfs_restore_query; }
- buttons = R_AVKON_SOFTKEYS_YES_NO__YES;
- items =
- {
- DLG_LINE
- {
- type = EAknCtQuery;
- id = EGeneralQuery;
- control = AVKON_CONFIRMATION_QUERY
- {
- layout = EConfirmationLayout;
- label = qtn_rfs_reset_phone_settings;
- };
- }
- };
- }
+RESOURCE TBUF r_confirm_deep_rfs { buf = qtn_rfs_reset_phone_settings; }
-// -----------------------------------------------------------------------------
-// R_CLOSING_CONNECTIONS
-// -----------------------------------------------------------------------------
-//
-RESOURCE DIALOG r_closing_connections
- {
- flags = EAknWaitNoteFlags | EEikDialogFlagWait;
- buttons = R_AVKON_SOFTKEYS_CANCEL;
- items =
- {
- DLG_LINE
- {
- type = EAknCtNote;
- id = EGeneralNote;
- control = AVKON_NOTE
- {
- layout = EWaitLayout;
- singular_label = qtn_rfs_note_closing_connections;
- animation = R_QGN_GRAF_WAIT_BAR_ANIM;
- };
- }
- };
- }
+RESOURCE TBUF r_closing_connections { buf = qtn_rfs_note_closing_connections; }
+
// End of File
--- a/coreapplicationuis/Rfs/src/rfsConnectionObserver.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/Rfs/src/rfsConnectionObserver.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -20,11 +20,12 @@
// SYSTEM INCLUDES
#include <rfs.rsg>
#include <PSVariables.h>
-
#include <featmgr.h>
+#include <eikenv.h>
#include <centralrepository.h>
-#include <pdpcontextmanagerpskeys.h>
#include <pdpcontextmanagerinternalcrkeys.h>
+#include <StringLoader.h>
+
// USER INCLUDES
@@ -106,12 +107,12 @@
// proceed further to create a common dialog. This will be a wait for dialog which will be
// of synchrnous type and can only be closed inside the RunL() of this active class.
// Provisions needed to be added to know whether this dialog needs resetting the pointer,
- // this will be the case when dialog is actually started using 'ExecuteLD()',
+ // this will be the case when dialog is actually started using 'showl()',
// Otherwise we need to delete this dialog and reset the pointer to NULL.
- if (iIsDialogNeedToBeDisplayed)
- {
- iWaitDialog = new( ELeave ) CAknWaitDialog(reinterpret_cast<CEikDialog**>( &iWaitDialog ) );
- }
+ if (iIsDialogNeedToBeDisplayed)
+ {
+ iDialog = CHbDeviceProgressDialogSymbian::NewL(CHbDeviceProgressDialogSymbian::EWaitDialog);
+ }
// Now we proceed further to setting of the next state i,e, enter the state machine of this active object
// which will start from closing of the active connections and proceed to close the other connections
@@ -174,6 +175,7 @@
delete iRfsConTimer;
}
Cancel();
+ delete iWait;
TRACES("CRfsConnectionObserver::~CRfsConnectionObserver(): End");
}
@@ -216,36 +218,61 @@
// This means that RFS has failed as there was some problem setting the P&S keys
User::LeaveIfError(err);
- // we set the flag to indicate ExecuteLD is called and the dialog needs to be
+ // we set the flag to indicate showl is called and the dialog needs to be
// dismissed from within the RunL()
iIsWaitForDialogExecuted = ETrue;
// Start displaying the dialog which will then be closed form the RunL()
// Here the code execution blocks and we will proceed further only when
// this dialog is canceled
- err = iWaitDialog->ExecuteLD( R_CLOSING_CONNECTIONS );
+
+ HBufC* prompt = StringLoader::LoadLC( R_CLOSING_CONNECTIONS );
-
+ iDialog->SetTextL(*prompt);
+
+ //observer interface is used since showl is aynchronous and we have to have callbacks
+ //if cancel is pressed or dialog is closed
+ iDialog->SetObserver(this);
+ iDialog->ShowL();
+ //activeschedulerwait is used since we want synchronous execution and control goes into
+ //a loop here and returns to start when dialog is cancelled or closed.
+ iWait = new (ELeave) CActiveSchedulerWait;
+ iWait->Start();
+ delete iWait;
+ iWait=NULL;
+ CleanupStack::PopAndDestroy( prompt );
+
+ return iAllConnectionClosed;
+ }
+
+void CRfsConnectionObserver::ProgressDialogCancelled(const CHbDeviceProgressDialogSymbian* iDialog)
+{
// following is the case when the user presses the Cancel button from the wait
// for dialog and in that case we need to resend the notificaiton of RFS failed
- // to whom all we have told previous of this to close the RFS connection
- if (err == EEikBidCancel)
- {
- if (iIsSipInformedForClosingAllConnection)
- {
- err = iSIPProperty.Set(KPSSipRfsUid, KSipRfsState, ESipRfsFailed );
- }
- if (iIsPDPInformedforClosingAllConnection)
- {
- iPDPProperty.Set(KPDPContextManager2,KPDPContextManagerFactorySettingsReset,EPDPContextManagerFactorySettingsResetStop);
- }
- if(iRfsConTimer)
+ // to whom all we have told previous of this to close the RFS connection
+
+ if (iIsSipInformedForClosingAllConnection)
+ {
+ TInt err = iSIPProperty.Set(KPSSipRfsUid, KSipRfsState, ESipRfsFailed );
+ }
+ if (iIsPDPInformedforClosingAllConnection)
+ {
+ iPDPProperty.Set(KPDPContextManager2,KPDPContextManagerFactorySettingsReset,EPDPContextManagerFactorySettingsResetStop);
+ }
+ if(iRfsConTimer)
{
// Cancel the Active timer if the user cancel the Rfs operation
iRfsConTimer->Cancel();
- }
- }
- return iAllConnectionClosed;
- }
+ }
+}
+
+
+void CRfsConnectionObserver::ProgressDialogClosed(const CHbDeviceProgressDialogSymbian * iDialog)
+{
+ //this function is called when the dialog is closed ,note that the control from progressdialogcancelled
+ //comes to ProgressDialogClosed once dialog is closed
+ iWait->AsyncStop(); //from here the control goes to iWait->start();
+}
+
void CRfsConnectionObserver::ReportRfsCompletionToSip()
{
@@ -384,7 +411,7 @@
iAllConnectionClosed = ETrue;
iRfsConTimer->Cancel();
DismissWaitDialog();
- }
+ }
}
} // end switch-case block
}
@@ -462,22 +489,21 @@
{
TRACES("CRfsConnectionObserver::DismissWaitDialog()");
- if ( iWaitDialog && iIsWaitForDialogExecuted)
+ if ( iDialog && iIsWaitForDialogExecuted)
{
- TRAP_IGNORE( iWaitDialog->ProcessFinishedL() );
+ iDialog->Close();
}
// Sanity Check:
// It can be a case when dialog was need to be displayed but was not due to some error
- // this means that the 'iWaitDialog' was constructed but never used and destroyed
- // i.e. the ExecuteLD() was never called
- else if(iIsDialogNeedToBeDisplayed && !iIsWaitForDialogExecuted)
+ // this means that the 'iDialog' was constructed but never used and destroyed
+ // i.e. the showl() was never called
+ else if(iIsDialogNeedToBeDisplayed && !iIsWaitForDialogExecuted)
{
- delete iWaitDialog;
+ delete iDialog;
}
-
- // Reset the pointer to NULL
- iWaitDialog = NULL;
+ // Reset the pointer to NULL
+ iDialog = NULL;
TRACES("CRfsConnectionObserver::DismissWaitDialog(): End");
}
--- a/coreapplicationuis/Rfs/src/rfsHandler.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/Rfs/src/rfsHandler.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* 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"
@@ -39,10 +39,7 @@
#include <secui.h> // security UI
#include <secuisecurityhandler.h>
-
-#include <aknnotewrappers.h>
-#include <AknQueryDialog.h>
-
+#include <StringLoader.h>
#include <hal.h>
#include <centralrepository.h>
#include <CommonEngineDomainCRKeys.h>
@@ -50,16 +47,18 @@
#include <data_caging_path_literals.hrh>
#include "CleanupResetPointer.h"
-#include <AknWaitDialog.h>
#include <pdpcontextmanagerpskeys.h>
#include <pdpcontextmanagerinternalcrkeys.h>
#include "rfsConnectionObserver.h"
#include "rfsHandler.h"
#include "rfsClient.h"
#include "RfsTraces.h"
+#include <hbdevicemessageboxsymbian.h>
_LIT( KRfsResourceFileName, "Z:rfs.rsc");
+_LIT(KYes,"yes");
+_LIT(KNo,"No");
// CONSTANTS
const TInt KPhoneIndex = 0;
@@ -187,11 +186,19 @@
if( startersession.Connect() == KErrNone )
{
// Displays information note to the user telling that the device will restart
- HBufC* prompt = iEnv->AllocReadResourceLC( R_DEVICE_RESTART );
- CAknInformationNote* note = new ( ELeave ) CAknInformationNote( ETrue );
- note->ExecuteLD( *prompt );
- CleanupStack::PopAndDestroy( prompt );
-
+ HBufC* prompt = StringLoader::LoadLC( R_DEVICE_RESTART );
+
+ CHbDeviceMessageBoxSymbian* note = CHbDeviceMessageBoxSymbian::NewL(CHbDeviceMessageBoxSymbian::EInformation);
+ CleanupStack::PushL(note);
+ note->SetTextL(*prompt);
+ //could have used show() but it is aynchronous and execution proceeds before note is seen so have used synchronous API exec()
+ note->ExecL();
+ CleanupStack::PopAndDestroy(note);
+ CleanupStack::PopAndDestroy( prompt );
+
+
+
+
if (aType == ERfsNormal ) startersession.Reset( RStarterSession::ENormalRFSReset );
else if (aType == ERfsDeep ) startersession.Reset( RStarterSession::EDeepRFSReset );
else startersession.Reset( RStarterSession::EUnknownReset );
@@ -238,12 +245,9 @@
EXPORT_C void CRfsHandler::Cancel()
{
TRACES("CRfsHandler::Cancel()");
-
- // delete confirmation query
- delete iQuery;
- iQuery = NULL;
-
- // delete security handler
+
+
+ // delete security handler
if ( iSecurityHandler )
{
iSecurityHandler->CancelSecCodeQuery();
@@ -326,32 +330,26 @@
TBool CRfsHandler::AskConfirmationL( const TBool& aThisDestroyed, TRfsType aType )
{
TRACES("CRfsHandler::AskConfirmationL()");
- CleanupResetPointerPushL( iQuery );
-
- // Show the confirmation query.
-
- iQuery = CAknQueryDialog::NewL(); // no tone as default
-
+
+
TInt resourceId = ( aType == ERfsNormal ) ? R_CONFIRM_RFS : R_CONFIRM_DEEP_RFS;
- //iQuery->SetSize();
- //iQuery->pref
-
- TBool ret = iQuery->ExecuteLD( resourceId );
-
- if ( aThisDestroyed )
+ HBufC* query = iEnv->AllocReadResourceLC( resourceId );
+
+ // Show the confirmation query.
+
+ CHbDeviceMessageBoxSymbian::TButtonId selection = CHbDeviceMessageBoxSymbian::QuestionL(*query, KYes, KNo);
+ TBool ret;
+ if (selection == CHbDeviceMessageBoxSymbian::EAcceptButton) // user pressed yes
{
- // this object was destroyed
- ret = EFalse;
- // remove cleanup item
- CleanupStack::Pop();
+ ret=ETrue;
}
else
{
- // NULLs iQuery
- CleanupStack::PopAndDestroy();
- }
-
- return ret;
+ ret=EFalse;
+ }
+ CleanupStack::PopAndDestroy(query);
+ return ret;
+
}
// -----------------------------------------------------------------------------
@@ -441,11 +439,13 @@
{
HBufC* prompt = iEnv->AllocReadResourceLC( R_ACTIVE_CALLS );
- CAknInformationNote* note = new ( ELeave ) CAknInformationNote( ETrue );
-
- note->ExecuteLD( *prompt );
-
- CleanupStack::PopAndDestroy( prompt );
+ CHbDeviceMessageBoxSymbian* note = CHbDeviceMessageBoxSymbian::NewL(CHbDeviceMessageBoxSymbian::EInformation);
+ CleanupStack::PushL(note);
+ note->SetTextL(*prompt);
+ note->ShowL();
+ CleanupStack::PopAndDestroy( note );
+ CleanupStack::PopAndDestroy( prompt );
+
return ETrue;
}
--- a/coreapplicationuis/Rfs/src/rfscontimer.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/Rfs/src/rfscontimer.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -16,8 +16,9 @@
*
*/
+#include <e32debug.h>
-#include "rfsConTimer.h"
+#include "rfscontimer.h"
#include "RfsTraces.h"
const TInt KRfsConnectionTimeOut = 60000000;
--- a/coreapplicationuis/SysAp/Data/SysAp.rss Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/SysAp/Data/SysAp.rss Tue Aug 31 15:24:25 2010 +0300
@@ -21,7 +21,7 @@
// INCLUDES
#include <eikon.rh>
-#include <sysap.loc>
+#include <SysAp.loc>
#include <avkon.loc>
#include <avkon.rsg>
#include <AiwCommon.rh>
@@ -31,12 +31,18 @@
RESOURCE RSS_SIGNATURE { }
-RESOURCE TBUF { buf=""; }
+RESOURCE TBUF { buf="sysap"; }
RESOURCE EIK_APP_INFO
-{
- status_pane=R_AVKON_STATUS_PANE_LAYOUT_EMPTY;
-}
+ {
+ status_pane = r_status_pane;
+ }
+
+RESOURCE STATUS_PANE_APP_MODEL r_status_pane
+ {
+ layout= R_AVKON_STATUS_PANE_LAYOUT_EMPTY;
+ }
+
// LOCALIZED STRINGS
--- a/coreapplicationuis/SysAp/Group/SysAp.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/SysAp/Group/SysAp.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -18,7 +18,7 @@
#include <data_caging_paths.hrh>
#include <platform_paths.hrh>
-TARGET SysAp.exe
+TARGET sysap.exe
TARGETTYPE exe
UID 0x0 0x100058F3
@@ -35,123 +35,49 @@
MACRO SYSAP_USE_STARTUP_UI_PHASE
#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
+
SOURCEPATH ../Src
SOURCE SysApApp.cpp
+SOURCE SysApDocument.cpp
+//SOURCE main.cpp
SOURCE SysApAppUi.cpp
-SOURCE SysApDocument.cpp
-SOURCE sysapkeymanagement.cpp
+//SOURCE SysApWsClient.cpp
+SOURCE SysApFeatureManager.cpp
SOURCE SysApLightsController.cpp
SOURCE SysApTimer.cpp
-
-SOURCE SysApPubSubObserver.cpp
-SOURCE SysApProfileObserver.cpp
-SOURCE SysApEtelNetworkBarObserver.cpp
-SOURCE sysapetelnetworkbargetter.cpp
-
-SOURCE CenRepObservers/sysapcenrepfmtxobserver.cpp
-SOURCE CenRepObservers/SysApCenRepLogsObserver.cpp
-SOURCE CenRepObservers/SysApCenRepBTObserver.cpp
-SOURCE CenRepObservers/SysApCenRepHacSettingObserver.cpp
-SOURCE CenRepObservers/sysapcenreplightsettingsobserver.cpp
-SOURCE CenRepObservers/sysapcenrepcallforwardingobserver.cpp
-SOURCE CenRepObservers/sysapcenrepmsgwaitingobserver.cpp
-SOURCE SysApCenRepController.cpp
-
-SOURCE SysApStartupController.cpp
-SOURCE SysApConnectionMonitorObserver.cpp
-SOURCE SysApPowerKeyMenuObserver.cpp
-SOURCE SysApSsSettingsObserver.cpp
+SOURCE sysaplightpluginhandler.cpp
+SOURCE SysApNspsHandler.cpp
+SOURCE SysApNspsAnim.cpp
+SOURCE SysApPubSubObserver.cpp SysApSubscriber.cpp sysapremconobserver.cpp
+SOURCE sysapdefaultkeyhandler.cpp SysApStartupController.cpp
SOURCE SysApShutdownImage.cpp
-SOURCE SysApShutdownAnimation.cpp
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
-SOURCE SysApShutdownTone.cpp
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-SOURCE SysApMsgSimMemLowQuery.cpp
-SOURCE SysApNspsAnim.cpp
-SOURCE SysApNspsHandler.cpp
-SOURCE SysApEtelNetworkStatusNspsObserver.cpp
-SOURCE SysApEtelSmsStoreObserver.cpp
-SOURCE SysApWaitNote.cpp
-SOURCE SysApConfirmationQuery.cpp
-SOURCE SysApFeatureManager.cpp
-SOURCE SysApSubscriber.cpp
-
-SOURCE SysApAnimKeySndControl.cpp
-SOURCE SysApKeySndAnim.cpp
-SOURCE SysApKeySndHandler.cpp
-
-SOURCE SysApSimChanged.cpp
-LIBRARY logcli.lib
-
-LIBRARY hal.lib
-SOURCE SysApAccessoryObserver.cpp
-LIBRARY AccClient.lib
-
-SOURCE SysApEtelConnector.cpp
+SOURCE hbdevicepowermenusymbian.cpp
+SOURCE hbdeviceinputdialogsymbian.cpp
#ifdef __OFFLINE_MODE
SOURCE OfflineModeController/SysApOfflineModeControllerImpl.cpp
-#else
-SOURCE OfflineModeController/SysApOfflineModeControllerStub.cpp
-#endif
-
-//Always use stub implementation of privacy framework, as it is no longer supported
-// Find out if/how a replacement must be done
-SOURCE PrivacyFramework/SysApLocationPrivacyIndicatorStub.cpp
-
-#ifdef __USB
-SOURCE Usb/SysApUsbIndicatorImpl.cpp
-LIBRARY usbman.lib // USB Manager
-#else
-SOURCE Usb/SysApUsbIndicatorStub.cpp
-#endif
-SOURCE Usb/sysapusbchargerdetector.cpp
-
-#ifdef __BT
-SOURCE Bt/SysApBtControllerImpl.cpp
-LIBRARY btengdevman.lib
-LIBRARY btengsettings.lib
-LIBRARY btmanclient.lib
-#else
-SOURCE Bt/SysApBtControllerStub.cpp
#endif
-#ifdef __BT_SAP
-SOURCE BtSap/SysApBtSapControllerImpl.cpp
-LIBRARY btengconnman.lib
-LIBRARY btdevice.lib
-LIBRARY bluetooth.lib
-#else
-SOURCE BtSap/SysApBtSapControllerStub.cpp
-#endif
-SOURCE SysApMediatorObserver.cpp
+SYSTEMINCLUDE /epoc32/include/mw/hb/hbwidgets
+SYSTEMINCLUDE /epoc32/include/mw/hb/hbcore
-SOURCE sysapdefaultkeyhandler.cpp
-#ifdef RD_LIGHT_CONTROL_CHANGE
-SOURCE sysaplightpluginhandler.cpp
-#endif
+SYSTEMINCLUDE /epoc32/include/mw
+
-SOURCE sysapaudioroutingobserver.cpp
-SOURCE sysapeteldatabearerobserver.cpp
-
-SOURCE memorycard/SysApMMCObserver.cpp
-#ifdef RD_MULTIPLE_DRIVE
-SOURCE memorycard/sysapdrivelist.cpp
-SOURCE memorycard/sysapdriveunlockhandler.cpp
-SOURCE memorycard/sysapdriveejecthandler.cpp
-#endif // RD_MULTIPLE_DRIVE
+USERINCLUDE .
+USERINCLUDE ../Inc
+USERINCLUDE ../Src/CenRepObservers
+USERINCLUDE ../Src/Usb
+USERINCLUDE ../Src/powersavemode
+USERINCLUDE ../../inc // subsystem headers
+USERINCLUDE ../../../inc // ado headers
+USERINCLUDE ../CenRep
+USERINCLUDE ../PubSub
+USERINCLUDE ../Src/memorycard
-SOURCE sysapetelnetworkinfoobserver.cpp
-SOURCE sysapremconobserver.cpp
-SOURCE powersavemode/sysappsmcontroller.cpp
-SOURCE sysapbatteryinfocontroller.cpp
-
-SOURCE gan\sysapganpropertylistener.cpp
-SOURCE gan\sysapganhandler.cpp
-
-SOURCE SysApSatObserver.cpp
-LIBRARY satclient.lib // for sat refresh
+MW_LAYER_SYSTEMINCLUDE
+APP_LAYER_SYSTEMINCLUDE
START RESOURCE ../Data/SysAp.rss
HEADER
@@ -171,22 +97,6 @@
TARGETPATH /private/10003a3f/apps
END
-SOURCEPATH ../Data
-
-USERINCLUDE .
-USERINCLUDE ../Inc
-USERINCLUDE ../Src/CenRepObservers
-USERINCLUDE ../Src/memorycard
-USERINCLUDE ../Src/Usb
-USERINCLUDE ../Src/powersavemode
-USERINCLUDE ../../inc // subsystem headers
-USERINCLUDE ../../../inc // ado headers
-USERINCLUDE ../CenRep
-USERINCLUDE ../PubSub
-
-USERINCLUDE ../src/gan
-
-APP_LAYER_SYSTEMINCLUDE // used instead of MW_LAYER_SYSTEMINCLUDE due to dependencies to APP layer
LIBRARY euser.lib
LIBRARY apparc.lib
@@ -194,67 +104,131 @@
LIBRARY eikcore.lib
LIBRARY apgrfx.lib
LIBRARY ws32.lib
-LIBRARY avkon.lib
+
LIBRARY bafl.lib
-LIBRARY aknnotify.lib
+
LIBRARY eiksrvc.lib
LIBRARY connmon.lib
-LIBRARY DSClient.lib
-LIBRARY ProfileEng.lib
-LIBRARY StarterClient.lib
-LIBRARY centralrepository.lib
-LIBRARY CenRepNotifHandler.lib
-LIBRARY CommonEngine.lib
-LIBRARY ActivityManager.lib
-LIBRARY AknCapServerClient.lib
-LIBRARY secui.lib
-LIBRARY sssettings.lib
+LIBRARY dsclient.lib
+LIBRARY profileeng.lib
+LIBRARY starterclient.lib
+
+
LIBRARY fbscli.lib
LIBRARY etel.lib
LIBRARY etelmm.lib
-LIBRARY customapi.lib
+LIBRARY efsrv.lib
+
+LIBRARY esock.lib
+
+LIBRARY ecom.lib
+
+LIBRARY hbwidgets.lib
+//LIBRARY qtcore.lib
+
+
+//For CHbIndicatorSymbian and for CHbPowereMenusymbian
+LIBRARY hbcore.lib
+LIBRARY hwrmlightclient.lib
LIBRARY featmgr.lib
-LIBRARY efsrv.lib
-LIBRARY aknmemorycardui.lib
-LIBRARY esock.lib
+LIBRARY activitymanager.lib
+LIBRARY remconcoreapi.lib
+LIBRARY remconinterfacebase.lib
+//LIBRARY hbpowermenuwidget.lib
+
+// End of File
+
+
+#ifdef __USB
+SOURCEPATH ../Src/Usb
+SOURCE SysApUsbIndicatorImpl.cpp
+LIBRARY usbman.lib // USB Manager
+#endif
+SOURCE sysapusbchargerdetector.cpp
+
+SOURCEPATH ../Src
+SOURCE SysApAccessoryObserver.cpp SysApCenRepController.cpp
+LIBRARY accclient.lib
+LIBRARY accpolicy.lib
+
+SOURCE CenRepObservers/SysApCenRepBTObserver.cpp
+SOURCE CenRepObservers/SysApCenRepHacSettingObserver.cpp
+SOURCE CenRepObservers/sysapcenreplightsettingsobserver.cpp
+SOURCE CenRepObservers/SysApCenRepLogsObserver.cpp
+SOURCE CenRepObservers/sysapcenrepofflinemodeobserver.cpp
+
+LIBRARY centralrepository.lib
+LIBRARY cenrepnotifhandler.lib
+
+SOURCE sysapaudioroutingobserver.cpp
+LIBRARY telephonyaudiorouting.lib
+
#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION
LIBRARY sanimctrl.lib
#else // RD_STARTUP_ANIMATION_CUSTOMIZATION
LIBRARY MediaClientAudio.lib
#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-LIBRARY hwrmlightclient.lib
-LIBRARY hwrmfmtxclient.lib
-LIBRARY remconcoreapi.lib
-LIBRARY remconinterfacebase.lib
-LIBRARY AknIcon.lib
-LIBRARY CdlEngine.lib
+
+LIBRARY bmpanim.lib
+
+SOURCEPATH ../Src/powersavemode
+SOURCE sysappsmcontroller.cpp
+LIBRARY psmclient.lib
+
+SOURCEPATH ../Src
+SOURCE sysapbatteryinfocontroller.cpp SysApSimChanged.cpp
-// POC launching
-LIBRARY ServiceHandler.lib
+LIBRARY secui.lib
+LIBRARY bsutil.lib
+LIBRARY CommonEngine.lib
+SOURCEPATH ../Src/Bt
+SOURCE SysApBtControllerImpl.cpp
+SOURCEPATH ../Src/BtSap
+SOURCE SysApBtSapControllerImpl.cpp
-LIBRARY ecom.lib
+//LIBRARY eikcoctl.lib
+//LIBRARY etelpckt.lib
-LIBRARY mediatorclient.lib
-LIBRARY bmpanim.lib
+LIBRARY btengconnman.lib
+LIBRARY btdevice.lib
+LIBRARY bluetooth.lib
+
+LIBRARY btengdevman.lib
+LIBRARY btengsettings.lib
+LIBRARY btmanclient.lib
+
+LIBRARY lockclient.lib
-LIBRARY TelephonyAudioRouting.lib
-LIBRARY etelpckt.lib
+SOURCEPATH ../Src
+SOURCE sysapkeymanagement.cpp SysApTaskList.cpp
+SOURCE SysApKeySndHandler.cpp SysApKeySndAnim.cpp SysApAnimKeySndControl.cpp SysApShutdownAnimation.cpp
+
+//For Shutdown
+LIBRARY SVGEngine.lib
+LIBRARY gdi.lib
+
+SOURCEPATH ../Src
+
+SOURCE memorycard/SysApMMCObserver.cpp
+#ifdef RD_MULTIPLE_DRIVE
+SOURCE memorycard/sysapdrivelist.cpp
+SOURCE memorycard/sysapdriveunlockhandler.cpp
+SOURCE memorycard/sysapdriveejecthandler.cpp
+#endif // RD_MULTIPLE_DRIVE
#ifdef RD_MULTIPLE_DRIVE
LIBRARY platformenv.lib
LIBRARY disknotifyhandler.lib
#endif // RD_MULTIPLE_DRIVE
-LIBRARY psmclient.lib
-LIBRARY keylockpolicyapi.lib
+LIBRARY avkon.lib
-LIBRARY bsutil.lib
-LIBRARY batterypopupcontrol.lib
+LIBRARY customapi.lib
-LIBRARY eikcoctl.lib
-// End of File
+SOURCE SysApEtelNetworkStatusNspsObserver.cpp SysApEtelConnector.cpp SysApEtelNetworkBarObserver.cpp SysApEtelSmsStoreObserver.cpp sysapeteldatabearerobserver.cpp sysapetelnetworkbargetter.cpp sysapetelnetworkinfoobserver.cpp
+
+LIBRARY etelpckt.lib
-
--- a/coreapplicationuis/SysAp/Group/bld.inf Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/SysAp/Group/bld.inf Tue Aug 31 15:24:25 2010 +0300
@@ -22,11 +22,6 @@
DEFAULT
PRJ_EXTENSIONS
-START EXTENSION s60/mifconv
- OPTION TARGETFILE sysap.mif
- OPTION HEADERFILE sysap.mbg
- OPTION SOURCES -c8 qgn_startup_screen
-END
PRJ_EXPORTS
@@ -41,12 +36,15 @@
../rom/SysAp_variant.iby CUSTOMER_MW_LAYER_IBY_EXPORT_PATH(SysAp_variant.iby)
../loc/SysAp.loc MW_LAYER_LOC_EXPORT_PATH(SysAp.loc)
-../PubSub/CoreApplicationUIsInternalPSKeys.h |../../../inc/CoreApplicationUIsInternalPSKeys.h
-../PubSub/CoreApplicationUIsPrivatePSKeys.h |../../inc/CoreApplicationUIsPrivatePSKeys.h
-../CenRep/CoreApplicationUIsPrivateCRKeys.h |../../inc/CoreApplicationUIsPrivateCRKeys.h
+../PubSub/CoreApplicationUIsInternalPSKeys.h |../../../inc/coreapplicationuisinternalpskeys.h
+../PubSub/CoreApplicationUIsPrivatePSKeys.h |../../inc/coreapplicationuisprivatepskeys.h
+../CenRep/CoreApplicationUIsPrivateCRKeys.h |../../inc/coreapplicationuisprivatecrkeys.h
-../PubSub/CoreApplicationUIsPrivatePSKeys.h |../../../inc/CoreApplicationUIsPrivatePSKeys.h // Illegal export for avoiding breaks
+../PubSub/CoreApplicationUIsPrivatePSKeys.h |../../../inc/coreapplicationuisprivatepskeys.h // Illegal export for avoiding breaks
+/epoc32/s60/icons/qgn_startup_screen.svg /epoc32/data/z/resource/apps/qgn_sysap_screen.svg
+/epoc32/s60/icons/qgn_startup_screen.svg /epoc32/release/winscw/udeb/z/resource/apps/qgn_sysap_screen.svg
+/epoc32/s60/icons/qgn_startup_screen.svg /epoc32/release/winscw/urel/z/resource/apps/qgn_sysap_screen.svg
PRJ_MMPFILES
//gnumakefile sysap_icons.mk
--- a/coreapplicationuis/SysAp/Inc/SysApAccessoryObserver.h Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/SysAp/Inc/SysApAccessoryObserver.h Tue Aug 31 15:24:25 2010 +0300
@@ -25,6 +25,7 @@
#include <e32base.h>
#include <AccessoryMode.h>
#include <AccessoryServer.h>
+#include <AccessoryConnection.h>
// FORWARD DECLARATIONS
class CSysApAppUi;
@@ -56,6 +57,7 @@
* @return Current accessory mode
*/
TAccMode GetAccessoryMode() const;
+ TInt GetAccessoryConnectionType() const;
private:
/**
@@ -118,6 +120,8 @@
* notifications due change in audio output status.
*/
TAccMode iPreviousMode;
+ RAccessoryConnection iAccessoryConnection;
+ TInt iPhysicalConnectionType;
};
--- a/coreapplicationuis/SysAp/Inc/SysApApp.h Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/SysAp/Inc/SysApApp.h Tue Aug 31 15:24:25 2010 +0300
@@ -20,7 +20,8 @@
#define SYSAPAPP_H
// INCLUDES
-#include <aknapp.h>
+//#include <aknapp.h>
+#include <eikapp.h>
// CONSTANTS
const TUid KUidSysAp={0x100058F3};
@@ -33,7 +34,7 @@
* @since 1.0
*/
-class CSysApApp : public CAknApplication
+class CSysApApp : public CEikApplication
{
private: // from CApaApplication
/**
--- a/coreapplicationuis/SysAp/Inc/SysApAppUi.h Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/SysAp/Inc/SysApAppUi.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,117 +1,89 @@
/*
-* Copyright (c) 2005-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: CSysApAppUi class definition. This class handles all user
-* actions and also System Agent events.
-*
-*/
-
+ * Copyright (c) 2005-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:
+ *
+ */
#ifndef SYSAPAPPUI_H
#define SYSAPAPPUI_H
-// INCLUDES
#include <aknappui.h>
-#include <aknkeylock.h>
-#ifndef RD_MULTIPLE_DRIVE
- #include <aknmemorycarddialog.h>
-#endif // RD_MULTIPLE_DRIVE
+#include "SysAp.hrh"
+#include <f32file.h>
+#include <W32STD.H>
+#include <coedef.h>
+#include <e32property.h>
+#include <sysapcallback.h>
#include <starterclient.h>
-#include <starter.hrh>
-#include <babackup.h>
#include <rmmcustomapi.h>
-#include <DosSvrServices.h>
-#include "SysAp.hrh"
-#include "SysApMMCObserver.h"
-#include "MSysApPropertyResponder.h"
+
#include "SysApTimer.h"
-#include <e32property.h>
-#include "CoreApplicationUIsPrivateCRKeys.h"
-#include <sysapcallback.h>
+#include "SysApLightsController.h"
+#include "coreapplicationuisprivatecrkeys.h"
+#include "sysapusbchargerdetector.h"
+#include "SysApAccessoryObserver.h"
+#include <hbsymbianvariant.h>
+#include <hbindicatorsymbian.h>
+//For Powermenu--CHbDevicePowerMenuSymbian
+#include "hbdevicepowermenusymbian.h"
-#include "SysApAccessoryObserver.h"
+#include "sysappsmcontroller.h"
+#include "SysApMMCObserver.h"
+
#ifdef RD_MULTIPLE_DRIVE
- #include "sysapdrivelist.h"
+#include "sysapdrivelist.h"
#endif // RD_MULTIPLE_DRIVE
-#include "sysapusbchargerdetector.h"
-#include "sysappsmcontroller.h"
+#include <eikappui.h>
+
-// FORWARD DECLARATIONS
-class CAknSmallIndicator;
-class CAknSignalNotify;
-class CAknBatteryNotify;
-class CAknGlobalListQuery;
-class CAknGlobalNote;
-class CSystemLock;
-class CSysApLightsController;
+class CSysApFeatureManager;
+class CSysApNspsHandler;
class CSysApPubSubObserver;
-class CSysApProfileObserver;
-class CSysApConnectionMonitorObserver;
-class CSysApCenRepLightSettingsObserver;
-class CSysApCenRepLogsObserver;
-class CSysApCenRepBtObserver;
-class CSysApCenRepFmTxObserver;
-class CSysApCenRepController;
class CSysApStartupController;
-class CSysApPowerKeyMenuObserver;
-class CSysApWaitNote;
-class CSysApSsSettingsObserver;
-class CSysApShutdownImage;
-class CSysApShutdownAnimation;
-class CSysApEtelConnector;
-class CSysApMsgSimMemLowQuery;
-class CSysApNspsHandler;
-class CSysApConfirmationQuery;
-class CSysApFeatureManager;
+class CSysApDefaultKeyHandler;
+class CSysApKeyManagement;
class MSysApOfflineModeController;
-class MSysApBtController;
-class MSysApBtSapController;
-class MSysApUsbIndicator;
-class MSysApLocationPrivacyIndicator;
-class MProfileEngine;
-class MProfilesNamesArray;
+class CHbDevicePowerMenuSymbian;
+class CSysApShutdownImage;
class CSysApKeySndHandler;
-class CSysApKeyManagement; // KEF
-class CSysApMediatorObserver;
-class CAknAppUiBase;
+class CSysApCenRepController;
+class CSysApCenRepLightSettingsObserver;
+class CSysApCenRepBtObserver;
class CSysApCenRepHacSettingObserver;
class CSysApAudioRoutingObserver;
+class CSysApSsSettingsObserver;
+class CSystemLock;
class CSysApCenRepCallForwardingObserver;
-class CSysApCenRepMsgWaitingObserver;
-
-// POC launching
-class CAiwServiceHandler;
+class CSysApBatteryInfoController;
+class MSysApBtSapController;
+class MSysApBtController;
+class CSysApCenRepLogsObserver;
+class MSysApUsbIndicator;
+class CKeyguardAccessApi;
+class CHbIndicatorSymbian;
+class CSysApShutdownAnimation;
class CSysApDefaultKeyHandler;
class CSysApDriveUnlockHandler;
class CSysApDriveEjectHandler;
-
-class CSysApGanHandler;
+class CHbDeviceInputDialogSymbian;
+class CSysApEtelConnector;
-class CSysApBatteryInfoController;
-
-//CONSTANTS
-const TInt KDummyReason( -1 );
const TInt KBluetoothModulePowerModeOn ( 1 );
-const TInt KBluetoothModulePowerModeOff ( 0 );
-const TInt KGeneralProfileId ( 0 );
-const TInt KOfflineModeProfileId ( 5 );
-const TInt KApplicationScanningInterval( 1 ); // 1 second
-_LIT( KFSName, "Fat" ); // MMC file system name
-const TDriveNumber KMMCDrive = EDriveE; // MMC drive number
-
+const TInt KDummyReason( -1 );
//CLASS DECLARATION
@@ -124,17 +96,13 @@
* @since 1.0
*/
-class CSysApAppUi :
- public CAknAppUi,
-#ifndef RD_MULTIPLE_DRIVE
- public MAknMemoryCardDialogObserver,
-#endif // RD_MULTIPLE_DRIVE
+class CSysApAppUi : public CAknAppUi,
public MSysApMemoryCardObserver,
public MSysApTimerResponder,
public MSysapCallback,
public MSysApPsmControllerNotifyCallback
-{
- public:
+ {
+ public:
/**
* C++ default constructor.
* @param None
@@ -148,7 +116,10 @@
* @return void
*/
virtual ~CSysApAppUi();
-
+
+ // from CCoeAppUiBase
+ void PrepareToExit();
+
protected: // From MSysApTimerResponder
/**
@@ -157,150 +128,110 @@
* @return void
*/
void TimerExpiredL();
-
- public:
+
+ private: // from MSysapCallback
+ /**
+ * Executes a command in SysAp.
+ *
+ * @since S60 3.1
+ * @param[in] aCommand command identifier
+ * @return None
+ * @leave an error code, system wide/command specific
+ *
+ * @see MSysapCallback::TSysapCommand
+ */
+ void ExecCommandL( TSysapCommand aCommand );
/**
- * Gets called when shutdown continues after shutdown animation
- * @param None
- * @return void
+ * Executes a command in SysAp.
+ *
+ * @since S60 3.1
+ * @param aCommand command identifier
+ * @param aParam command specific parameter data
+ * @return None
+ * @leave an error code, system wide/command specific
+ *
+ * @see MSysapCallback::TSysapCommand
*/
- void ContinueShutdown();
+ void ExecCommandL( TSysapCommand aCommand, const TDesC8& aParam );
/**
- * Gets called when there is need to shutdown the device initiated by Symbian side
- * @param None
- * @return void
+ * Queries information from SysAp.
+ *
+ * @since S60 3.1
+ * @param[in] aQuery query identifier
+ * @param[out] aReturn query specific return data
+ * @return None
+ * @leave an error code, system wide/command specific
+ *
+ * @see MSysapCallback::TSysapQuery
*/
- void DoShutdownL( const TBool aReset, const TInt aResetReason );
+ void ExecQueryL( TSysapQuery aQuery, TDes8& aReturn );
/**
- * Gets called by CSysApSharedDataObserver if user has selected "No" in
- * "Do you want to use the phone in Off-line mode?" query in startup.
- * @param aDoProfileChange if ETrue, the last active profile is restored
- * @return void
+ * Queries information from SysAp.
+ *
+ * @since S60 3.1
+ * @param[in] aQuery query identifier
+ * @param[out] aReturn query specific return data
+ * @param[in] aParam query specific parameter data
+ * @return None
+ * @leave an error code, system wide/command specific
+ *
+ * @see MSysapCallback::TSysapQuery
*/
- void GoOnlineL( TBool aDoProfileChange = ETrue );
-
+ void ExecQueryL( TSysapQuery aQuery, TDes8& aReturn, const TDesC8& aParam );
+
+// private:
/**
- * Gets called by CSysApSharedDataObserver in Simless Offline Mode startup.
- * @param None
- * @return void
- */
- void GoOfflineL();
-
- /**
- * Calls CSysApOfflineModeController::SwitchFromOnlineToOfflineModeL()
+ * EPOC default constructor.
* @param None
* @return void
*/
- void SwitchFromOnlineToOfflineModeL();
-
+
+#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION
+ void
+#else // RD_STARTUP_ANIMATION_CUSTOMIZATION
+ TBool
+#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
+ ShowAnimationL();
+
+ void PrepareForShutdownAnimation();
+
+ public:
+ void ConstructL();
+
+ private: // from CEikAppUi
/**
- * Called when offline mode change has been finished.
+ * Handles a change to the application's resources which are shared across the environment.
+ *
+ * @since S60 3.1
+ * @param aType The type of resources that have changed.
+ * @return None.
*/
- void OfflineModeChangedL();
-
+// void HandleResourceChangeL(TInt aType);
+
+ private:
/**
- * Gets called after changing the SW state.
- * @param aSwState The new state
+ * Takes care of command handling.
+ * @param aCommand command to be handled
* @return void
*/
- void DoStateChangedL( const RStarterSession::TGlobalState aSwState );
-
-#ifdef SYSAP_USE_STARTUP_UI_PHASE
- /**
- * Called when UI is ready after boot.
- */
- void HandleUiReadyAfterBootL();
-
-#endif // SYSAP_USE_STARTUP_UI_PHASE
-
- /**
- * Returns whether UI is ready after boot.
- */
- TBool UiReady() const;
-
- /**
- * Gets called when any case selection on powerkey menu is done.
- * Does what is needed per selection.
- * @param TInt aSelection
- * @return void
- */
- void PowerKeyPopUpMenuSelectionDoneL( TInt aSelection );
-
- /**
- * Gets called when Alarm is being shown to user and lights need to be blinked.
- * @param TBool aAlerting
- * @return void
- */
- void AlertUiAlertingL( const TBool aAlerting );
-
- /**
- * Gets called when Alarm is being shown to user and keylock need to be turned off.
- * @param TBool aKeyLockOff
- * @return void
- */
- void AlertUiKeyLockOff( const TBool aKeyLockOff );
+ void HandleCommandL( TInt aCommand);
/**
- * Notifies changes in KPSUidCoreApplicationUIs::KLightControl to light controller.
- */
- void HandleLightsRequireL() const;
-
- /**
- * Notifies changes in KPSUidCoreApplicationUIs::KCoreAppUIsLightsRawKeyEvent to light controller.
- *
- * @since S60 3.2
- */
- void HandleRawKeyEventLightsRequireL() const;
-
- /**
- * Gets called when Video Telephony requests to force/cancel lights on/
- * @param const TInt aLightsParameter
- * @return void
- */
- void HandleForcedLightsVTRequireL( const TInt aLightsParameter ) const;
-
- /**
- * Gets called when Screen Saver requests to force lights on/off
- * @param const TInt aLightsParameter
- * @return void
+ * handles key events
+ * @param TKeyEvent& aKeyEvent
+ * @param TEventCode aType
+ * @return TKeyResponse
*/
- void HandleForcedLightsSSRequireL( const TInt aLightsParameter ) const;
-
- /**
- * Gets called when AT Command requests to force lights on/off
- * @param const TInt aLightsParameter
- * @return void
- */
- void HandleForcedLightsATCRequireL( const TInt aLightsParameter ) const;
- /**
- * Calls SysApLightsController::SwitchLightsOnSoftRejectL
- *
- * @since S60 3.1
- * @param None.
- * @return None.
- */
- void SwitchLightsOnSoftRejectL();
-
- /**
- * Asks state of one property from PubSub
- * @param const TUid&
- * @param const TUint
- * @return const TInt ( value of property or error code )
- */
- TInt StateOfProperty( const TUid& aCategory, const TUint aKey ) const;
-
- /**
- * Sets the indicator's aIndicator state to state aState.
- * @param TInt aIndicator
- * @param TInt aState
- * @return void
- */
- void SetIndicatorStateL( const TInt aIndicator, const TInt aState ) const;
-
- /**
+ TKeyResponse HandleKeyEventL( const TKeyEvent& aKeyEvent, TEventCode aType );
+ void HandleApplicationSpecificEventL(TInt aType,const TWsEvent& aEvent);
+
+ public:
+ // void CallFromMain();
+
+ /**
* Returns the state of keylock
* @param none
* @return TBool the state of keylock
@@ -313,89 +244,102 @@
* @return TBool the state of devicelock
*/
TBool DeviceLockState() const;
-
- /*
- * @param None
- * @return void
+
+ /**
+ * Returns reference to SysAp's internal feature manager.
+ *
+ * @since S60 3.1
+ * @return CSysApFeatureManager&
*/
- void SetIhfIndicatorL();
-
- /*
- * Handles actions needed when either SIM memory gets too full to receive any more SMS's.
- * @param aSimStoreFull If true, SIM memory is full.
- * @return void
- */
- void HandleSmsStorageNotificationL( TBool aSimStoreFull );
-
- void HandleNspsRawKeyEventL();
-
- void HandleNetworkNspsNotification( RMmCustomAPI::TNspsStatus aNspsStatus );
-
- void HandleMessageTonePlayingQuitability( TInt aTonePlayingStatus );
-
- /*
+ CSysApFeatureManager& SysApFeatureManager();
+
+ /*
* Called by SysApLightsController when the lights are switced on/off
* @param aActivate If ETrue forwarding is activated, otherwise deactivated
* @return void
*/
void ActivateKeyeventForwardingForLights(TBool aActivate);
-
- /**
- * Gets called when shutdown requested when sw state == ESWStateAlarm
- * context active.
- * @param None
- * @return void
- */
- void StartShutDownTimerOnAlarmAndChargingStates();
- static TInt DoShutdownOnAlarmStateAfterCallBack( TAny* aObject );
-
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
- /**
- * Starts shutdown animation timing after shutdown tone sync is done
- */
- void StartAnimTiming();
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-
- /**
- * Stops shutdown animation timing and continues shutdown.
- */
- static TInt DoStopAnimTiming( TAny* aObject );
+
+ TBool IsEncryptionOperationOngoingL() const;
+// void ConnectToFileServerL();
+// void ConnectToWindowServerL();
+ void ShowExampleUiNoteL ( const TDesC& noteText )const;
+ void ShowNotificationDialog(const TDesC& noteText)const;
+ void PopupNote();
+// void CreateWindowGroup();
+ TBool ResourcesFreed() const;
+ void ShowUiNoteL( const TSysApNoteIds aNote ) const;
+ TInt StateOfProperty( const TUid& aCategory, const TUint aKey ) const;
+ TBool OfflineModeActive();
+ void GoOnlineL( TBool aDoProfileChange = ETrue );
+ void GoOfflineL();
+ void SwitchFromOnlineToOfflineModeL();
+
+ void DoStateChangedL( const RStarterSession::TGlobalState aSwState );
+ TInt SetStarterState( const RStarterSession::TGlobalState aState );
+ TInt BluetoothPowerMode() const;
+ void SetNetworkConnectionAllowed( TCoreAppUIsNetworkConnectionAllowed aNetworkConnectionAllowed );
+ RStarterSession& StarterSession();
+ TInt SetBtPowerState( TBool aBtState );
+ TBool SimSupported();
+ TBool BtSapEnabled();
+ void OfflineModeChangedL();
+ TBool UiReady() const;
+ void DoShutdownL( const TBool aReset, const TInt aResetReason );
+ TBool IsDeviceModeKey( const TKeyEvent& aKeyEvent ) const;
+ void SetUsbAttachStatus( const TBool aUsbAttached );
+ TSysApUsbChargerDetector& UsbChargerDetector();
+
+ void HandleAccessoryConnectedL( TAccMode aAccessoryState, TInt aPhysicalConnectionType );
- /**
- * Gets called when GPRS is suspended because of a phone call established while
- * context active. Delay (KDelayBeforeShowingGprsSuspendedNote) required to ensure
- * that the phone call was really established.
- * @param None
- * @return void
- */
- void StartGprsSuspendedTimer();
- static TInt ShowGprsSuspendedNoteAfterCallBack( TAny* aObject );
-
- /**
- * Gets called when an accessory was connected to device. The indicator
- * is shown and profile gets changed if needed.
- * @param aAccessoryState Indicates the new accessory state
- * @return void
- */
- void HandleAccessoryConnectedL( TAccMode aAccessoryState );
+ void HandleAccessoryDisconnectedL();
+ void DoLightsTimeoutChangedL( const TInt aTimeout );
+ void SetHacIndicatorL();
+ void DoNotActivateBt();
+ void SetIhfIndicatorL();
+ void HandleLongPowerKeyPressedL();
+ void IgnoreZeroNetworkBarNotifications(TBool aIgnore);
+ void InitCloseSimApplicationsL();
+ void CloseSimApplicationsL();
+ void DoSimChangedFromPreviousBootL();
+ void ShowAlarmIndicatorL( TBool aShowIndicator );
+ void AlertUiAlertingL( const TBool aAlerting );
+ void HandleForcedLightsVTRequireL( const TInt aLightsParameter ) const;
+ void HandleForcedLightsSSRequireL( const TInt aLightsParameter ) const;
+ void HandleForcedLightsATCRequireL( const TInt aLightsParameter ) const;
+ void HandleLightsRequireL() const;
+ void AlertUiKeyLockOff( const TBool aKeyLockOff );
+ void DoNotEnableKeylock();
+ void SwitchLightsOnSoftRejectL();
+ void SetDeviceLockEnabledL( const TBool aLockEnabled );
+ void HandleBatteryStatusL( const TInt aValue );
+ void BatteryEmptyL();
+ void ShowQueryL( const TSysApConfirmationQueryIds aQueryId,
+ const TDesC& aValue = KNullDesC );
+ void HandleChargingStatusL( const TInt aValue );
+ void HandleChargerNotesL( const TInt aValue );
+ void UpdateBatteryBarsL( const TInt aState );
+ void ShowChargingNoteL();
+ void HandleCurrentCallStateChangeL( TInt aCurrentCallState );
+ TBool IsEmergencyCall();
+ CSysApCenRepController& CenRepController();
+ void HandleWlanIndicatorL( TInt aValue );
- /**
- * Gets called when headset/loopset was disconnected from device. The indicator
- * is hidden and the original profile gets restored if needed.
- * @param None
- * @return void
- */
- void HandleAccessoryDisconnectedL();
-
- /**
- * Gets called when SysAp receives KSysApSatRefreshStart. All
- * non-system UI applications are closed
- * and an information note is shown to the user.
- * @param None
- * @return void
- */
- void HandleSatRefreshL();
-
+ void SetKeyLockEnabledL();
+ void SetKeyLockDisabledL();
+ void SetLightsOnUnlockNoteL();
+ void SetLightsOnEcsQueryL();
+ void SetLightsOnSecurityQueryL();
+ TBool CheckLongPowerKeyPressed();
+ TBool ReleasePowerMenuCustomDialogMemory();
+ TBool NotifiedDialogIfRequiredAndReleaseMemory();
+ static TInt DoStopAnimTiming( TAny* aObject );
+ CEikStatusPane* StatusPane();
+
+ void EjectUsed( TInt aDrive );
+
+ void EjectMMCL();
+
#ifndef RD_MULTIPLE_DRIVE
/**
* Mounts MMC drive
@@ -411,46 +355,7 @@
*/
TInt DismountMMC();
#endif // RD_MULTIPLE_DRIVE
-
- /**
- * MMC Hot Swap Ejection from powerkey menu
- * @param None
- * @return void
- */
- void EjectMMCL();
-
- /**
- * Disconnect BtSap from powerkey meny
- * @param None
- * @return void
- */
- void DisconnectBtSap();
-
- /**
- * Enable or disable FM transmission
- */
- void ChangeFmTxStateL( TBool aEnable );
-
-#ifndef RD_MULTIPLE_DRIVE
- public: // from MAknMemoryCardDialogObserver
-
- /**
- * To be notified when unlock completed
- * @param TInt aResult
- * @return void
- */
- void UnlockComplete( TInt aResult );
-#endif // RD_MULTIPLE_DRIVE
-
- public:
-
- /**
- * Plays the sound EAvkonSIDInformationTone
- * @param None
- * @return void
- */
- void Beep();
-
+
#ifndef RD_MULTIPLE_DRIVE
/**
* Unlocks MMC
@@ -504,304 +409,7 @@
TBool ShowMMCDismountedDialogL(
TInt aDrive, CSysApDriveList::TDriveEjectType aEjectType );
#endif // RD_MULTIPLE_DRIVE
-
- /**
- * Called after confirming dialog "MMC removed..."
- * @param None
- * @return void
- */
- void MMCDismountedDialogConfirmed();
-
- /**
- * Gets called by CSysApSharedDataObserver when "Eject" is started
- * or finished in File Manager application.
- * @param None
- * @return void
- */
- void EjectStarted( TBool ejectStarted );
-
- private:
- /**
- * EPOC default constructor.
- * @param None
- * @return void
- */
- void ConstructL();
-
- /**
- * Deactivate PSM on reboot if battery level is above threshold value.
- * @param None
- * @return void
- */
- void DeactivatePSMifBatteryNotLowL();
-
- private:
-
-#ifndef RD_MULTIPLE_DRIVE
-
- /**
- * Resolves process UID based on its thread id
- *
- * @since S60 3.1
- * @param aThreadId id of the thread
- * @return TInt32 process UID
- */
- TInt32 ResolveUidFromThread( TUint aThreadId ) const;
-
- /**
- * Called recursively when shutting down apps in Hot Swap
- * @param None
- * @return void
- */
- void CloseUIAppsInHotSwapL();
-
- /**
- * Called by CloseUIApplicationsHotSwapL when completing
- * shutting apps
- * @param None
- * @return void
- */
- void CompleteAppsShuttingInHotSwapL();
-#endif // RD_MULTIPLE_DRIVE
-
- public:
-
- /**
- * Initializes parameters used in shutting down apps in BT SAP
- * @param None
- * @return void
- */
- void InitCloseSimApplicationsL();
-
- private:
-
- /**
- * Called recursively when shutting down apps in BT SAP
- * @param None
- * @return void
- */
- void CloseSimApplicationsL();
-
- /**
- * Called to re-envoke CloseSimApplicationsL()
- * @param None
- * @return void
- */
- static TInt DoCloseSimApplicationsAfterCallBack( TAny* aObject );
-
- private:
- /**
- * Takes care of command handling.
- * @param aCommand command to be handled
- * @return void
- */
- void HandleCommandL( TInt aCommand);
-
- /**
- * handles key events
- * @param TKeyEvent& aKeyEvent
- * @param TEventCode aType
- * @return TKeyResponse
- */
- TKeyResponse HandleKeyEventL( const TKeyEvent& aKeyEvent, TEventCode aType );
-
- private:
- // By default, prohibit copy constructor
- CSysApAppUi( const CSysApAppUi& );
-
- // Prohibit assigment operator
- CSysApAppUi& operator= ( const CSysApAppUi& );
-
- private:
- void HandleApplicationSpecificEventL(TInt aType,const TWsEvent& aEvent);
- /**
- * Gets called by ConstructL function to set initial states to indicators etc
- * Needed state information is got from Shared Data and status pane's components
- * are set to the correct states.
- * @param None
- * @return void
- */
- void InitializeStatusPaneAreaL();
-
- /**
- * Gets called by HandleKeyEventL after detecting a long press of powerkey.
- * According to current state of the device desides if it is time to either
- * shutdown or make startup (from charging state ) to normal state
- * @param None
- * @return void
- */
- void HandleLongPowerKeyPressedL();
-
- /**
- * Gets called by HandleKeyEventL after a short press of powerkey.
- * According to current state of the device desides if it is time to
- * either switch lights on and show mode selection dialog(normal state)
- * or to shutdown the phone (in alarm state).
- * @param None
- * @return void
- */
- void HandleShortPowerKeyPressedL();
-
- /**
- * Frees SysAp's reserved memory, closes connections to servers etc.
- * @param None
- * @return void
- */
- void FreeResources();
-
- public:
-
- /**
- * Displays a UI query.
- * @param TSysApConfirmationQueryIds
- * @param aValue query related value
- * @return void
- */
- void ShowQueryL( const TSysApConfirmationQueryIds aQueryId,
- const TDesC& aValue = KNullDesC );
-
- /**
- * Displays a UI note.
- * @param TSysApNoteIds aSysApNoteIds
- * @return void
- */
- void ShowUiNoteL( const TSysApNoteIds aNote ) const;
-
- /**
- * Displays a "Charger connected" note.
- * @param None
- * @return void
- */
- void ShowChargingNoteL();
-
- /**
- * Handles charger related notes
- * @param TInt : KPSUidChargerCStatusValue
- * @return void
- */
- void HandleChargerNotesL( const TInt aValue );
-
- /**
- * Displays a "Selected profile" note.
- * @param None
- * @return void
- */
- void ShowProfileNoteL();
-
- /**
- * Cancels a UI wait note.
- * @param None
- * @return void
- */
- void CancelWaitNote();
-
- /**
- * Cancels the global list query
- * @param None
- * @return void
- */
- void CancelGlobalListQuery();
-
- /**
- * Updates signal bars to the value cached by Etel connector.
- * @return void
- */
- void UpdateSignalBarsL();
-
- /**
- * Updates signal bars to specified state.
- * @param TInt aState Number of bars or KAknSignalOffLineMode
- * @return void
- */
- void UpdateSignalBarsL( const TInt aState );
-
- /**
- * Gets called by HandleSystemAgentEventL to singal availability indicator
- * ie. Gprs state icon or common signal icon.
- * @param None
- * @return void
- */
- void SetSignalIndicatorL();
-
- /**
- * Gets called by SetSignalIndicatorL() when in GSM network
- * @param None
- * @return void
- */
- void SetSignalIndicatorGsmL();
-
- /**
- * Gets called by SetSignalIndicatorL() when in Wcdma network
- * @param None
- * @return void
- */
- void SetSignalIndicatorWcdmaL();
-
- /**
- * Gets called by SetSignalIndicatorL() when in Gan network
- * @param None
- * @return void
- */
- void SetSignalIndicatorGanL();
-
- /**
- * Handles GPRS suspend/resume notes if feature supported.
- * ie. Gprs state icon or common signal icon.
- * @param None
- * @return void
- */
- void HandleGprsNotesL();
-
- /**
- * Returns the current bluetooth power mode setting using CSysApSharedDataObserver
- * @param None
- * @return TInt
- */
- TInt BluetoothPowerMode() const;
-
- /**
- * Activates the profile given as a parameter
- * @param TInt aProfileId
- * @return void
- */
- void ActivateProfileL( const TInt aProfileId ) const;
-
- /**
- * Activates the profile saved in iProfileToBeActivated.
- * @param None
- * @return void
- */
- void ActivateOnlineProfileL() const;
-
- /**
- * Checks whether Offline Mode is activated
- * @param TBool
- * @return void
- */
- TBool OfflineModeActive();
-
- /**
- * Tolds Offline Mode controller not to activate BT
- * when next going online.
- * @param None
- * @return void
- */
- void DoNotActivateBt();
-
- /**
- * Switches BT module on/off using BT Engine
- * @param TBool: ETrue = on, EFalse = off
- * @return void
- */
- TInt SetBtPowerState( TBool aBtState );
-
- /**
- * Sets iKeyLockOnBeforeCall = EFalse.
- * @param None
- * @return void
- */
- void DoNotEnableKeylock();
-
+
#ifdef RD_MULTIPLE_DRIVE
/*
* Starts wait note for eject
@@ -813,828 +421,175 @@
*/
TBool IsEjectQueryVisible();
#endif // RD_MULTIPLE_DRIVE
-
- /**
- * Gets called by CSysApSharedDataObserver when "Eject" is selected
- * in File Manager application.
- * @param aDrive Drive to eject
- * @return void
- */
- void EjectUsed( TInt aDrive );
-
- /**
- * MMC Hot Swap Ejection from powerkey menu was canceled
- * @param None
- * @return void
- */
- void EjectMMCCanceled();
-
- private:
-
- /**
- * Gets currently active profile's name.
- * @param TPtr aProfileName
- * @return void
- */
- void ActiveProfileNameL( TPtr aProfileName );
-
- public:
-
- /**
- * Gets called by HandleSystemAgentEventL to update battery bars.
- * @param TInt aState
- * @return void
- */
- void UpdateBatteryBarsL( const TInt aState );
-
- /**
- * Gets called by HandleSystemAgentEventL when profile was changed.
- * Profile selected Global Note is shown.
- * @param TInt aValue
- * @return void
- */
- void HandleProfileChangedL( const TInt aValue );
-
- /**
- * Checks if the active profile is silent and updates CSysApLightsController
- * if needed.
- * @param None
- * @return void
- */
- void CheckSilentModeL();
-
- /**
- * Gets called by CSysApOfflineModeController when activation/deactivation
- * of Offline Mode fails
- * @param TBool aOffline
- * @return void
- */
- void RestoreProfileL( const TBool aOffline );
-
- /**
- * Returns the id of the active profile.
- * @param None
- * @return Int
- */
- TInt ActiveProfileId();
-
- /**
- * Gets called when the value of the SD key KGSDisplayLightsTimeout
- * changes
- * @param TInt : lights timeout in seconds
- * @return void
- */
- void DoLightsTimeoutChangedL( const TInt aTimeout );
-
- private:
-
- /**
- * Checks whether it is necessary to change profiles in case an accessory
- * was connected/disconnected while the device was powered down.
- *
- * @param TInt aValue
- * @return void
- */
- void HandleAccessoryProfileInStartupL( );
-
- public:
+
+
+#ifdef SYSAP_USE_STARTUP_UI_PHASE
/**
- * Gets called by HandleSystemAgentEventL to Disable keylock when devicelock is activated.
- * This is done already when device lock is activated because this
- * @param None
- * @return void
- */
- void SetDeviceLockEnabledL( const TBool aLockEnabled );
-
- private:
-
- /**
- * Gets called by HandleShortPowerKeyPressedL to display the power key popup menu
- * @param None
- * @return void
- */
- void ShowPowerKeyPopUpMenuL();
-
- /**
- * Does what is needed to do inside SysAp before actually doing
- * other shutdown related things. This is used when shutdown image is enabled.
- * @param None
- * @return void
+ * Called when UI is ready after boot.
*/
- void PrepareForShutdownImage();
-
- /**
- * Does what is needed to do inside SysAp before actually doing
- * other shutdown related things. This is used when shutdown animation is enabled.
- * @param None
- * @return void
- */
- void PrepareForShutdownAnimation();
+ void HandleUiReadyAfterBootL();
- /**
- * Show shutdown animation
- *
- * @param
- * @return ETrue if animation is enabled
- */
- #ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION
- void
- #else // RD_STARTUP_ANIMATION_CUSTOMIZATION
- TBool
- #endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
- ShowAnimationL();
+#endif // SYSAP_USE_STARTUP_UI_PHASE
- /**
- * Makes Status pane visible/invisible when needed and changes it's layout between Charging/Alarm
- * @param None
- * @return void
- */
- void SetStatusPaneLayoutL( const TSysApPhoneState aState );
-
- /**
- * Checks from current Symbian swstate if it is ok to initiate shutdown
- * @param None
- * @return const TBool
- */
- TBool OkToInitiateShutdown();
-
- /**
- * Shows shutdown animation or shutdown image
- * @param None
- * @return void
- */
- void PrepareForCompleteShutdown();
-
- /**
- * Makes the end part of shutdown sequence.
- * @param None
- * @return void
- */
- void CompleteShutdown( const TBool aReset = EFalse, const TInt aResetReason = KDummyReason );
-
- /**
- * Sets calls forwarding indicators on/off accrding to aCallsForwardingState
- * @param TInt aCallsForwardingState
- * @return void
- */
- void DoSwStateNormalConstructionL();
-
- public:
-
- /**
- * Starts an application or brings an already running application
- * to foreground.
- * @param TUid: UID of the application that is activated
- * @return void
- */
- void ActivateApplicationL( const TUid aUid );
+
+ void MMCDismountedDialogConfirmed();
+
+ void EjectStarted( TBool ejectStarted );
+
+ void EjectMMCCanceled();
+
+ void HandleNspsRawKeyEventL();
- void HandleCurrentCallStateChangeL( TInt aCurrentCallState );
-
- void DoSimChangedFromPreviousBootL();
-
- /**
- * Gets called in SysAp construction or when SysAp gets a SA/P&S notification
- * @param const TInt: indicator status
- * @return void
- */
- void HandleLocationPrivacyIndicatorL( const TInt aState );
-
- /**
- * Return value of the__SIMCARD feature
- * @param None
- * @return TBool
- */
- TBool SimSupported();
-
- /**
- * Notify CSysApLightController of the empty battery.
- * @param None
- * @return void
- */
- void BatteryEmptyL();
-
- /**
- * Prompt starter to change mode
- * @param aState The new state
- * @return KErrArgument if the state change is illegal (from current state
- * it is not possible to change to the requested state), KErrNone if the
- * global state change has been successfully initiated.
- */
- TInt SetStarterState( const RStarterSession::TGlobalState aState );
-
- /**
- * Creates the device name string for BT Sap disconnect prompt.
- * @return device name string.
- */
- HBufC* GetBtSapDeviceNameL();
-
- /**
- * Handle alarm indicator
- * @param aShowIndicator If ETrue, indicator is show, otherwise it is hidden.
- */
- void ShowAlarmIndicatorL( TBool aShowIndicator );
-
- /**
- * Informs lights controller that flip has been opened/close
- * @param aFlipOpen ETrue if flip is open, EFalse otherwise
- */
- void SetFlipOpenL( TBool aFlipOpen );
-
- /**
- * Creates a virtual flip key event that is passed to the key management
- * of SysAp.
- *
- * @since S60 3.2
- * @param aFlipOpen ETrue if flip is open, EFalse otherwise
- * @return None
- */
- void SimulateFlipKeyEventL( TBool aFlipOpen );
-
- /**
- * Informs lights controller that grip has been opened/close
- * @param aGripOpen ETrue if grip is open, EFalse otherwise
- */
- void SetGripOpenL( TBool aGripOpen );
-
- /**
- * Sets the status of the Central Repository key
- * KCRUidCoreApplicationUIs / KCoreAppUIsNetworkConnectionAllowed
- * @param TInt
- * @return void
- */
- void SetNetworkConnectionAllowed( TCoreAppUIsNetworkConnectionAllowed aNetworkConnectionAllowed );
-
- /**
- * Get pointer to RTelServer
- *
- * @return pointer to RTelServer if iSysApEtelConnector is initialized. Otherwise return NULL.
- */
- RTelServer* GetTelServer();
-
- /**
- * Show WLan indicator
- *
- * @param aValue The value of KPSWlanIndicator PS key.
- */
- void HandleWlanIndicatorL( TInt aValue );
-
- /**
- * Show TARM indicator
- *
- * @param aValue The value of KCoreAppUIsTarmIndicator PS key
- */
- void HandleTarmIndicatorL( TInt aValue );
-
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
- /**
- * Continue shutdown animation showing after sync request
- */
- void ShutdownAnimationSyncOK();
-#endif RD_STARTUP_ANIMATION_CUSTOMIZATION
-
- /**
- * Skip shutdown animation (i.e. stop showing it). Initiated by CoverUI.
- */
- void SkipShutdownAnimation();
-
- /**
- * Notifies CoverUI about skipping shutdown animation.
- */
- void NotifyShutdownAnimationSkip();
-
- /**
- * Check cover display support
- *
- * @return ETrue if cover display is supported, EFalse otherwise
- */
- TBool CoverDisplaySupported();
-
- /**
- * Returns reference to RStarterSession
- * RStarterSession is connected when this method is called
- * for the first time.
- *
- * Always (except when freeing resources) access the starter session via this method,
- * don't use the member variable directly.
- *
- * @return reference to RStarterSession
- */
- RStarterSession& StarterSession();
-
- /**
- * Returns reference to SysAp's CenRep controller
- *
- * @since S60 3.1
- * @param None
- * @return reference to CSysApCenRepController
- */
- CSysApCenRepController& CenRepController();
-
- /**
- * Ignore zero network bars signal notifies.
- * This is needed in BT SAP mode.
- *
- * @param aIgnore If ETrue, ignore any future zero network bars notifications.
- */
- void IgnoreZeroNetworkBarNotifications(TBool aIgnore);
-
- /**
- * Check if BT SAP is enabled
- *
- * @return ETrue if BT SAP is enabled, EFalse otherwise
- */
- TBool BtSapEnabled();
-
- /**
- * Deactivate BT when changing to normal mode.
- * Can only be used during startup, has no effect after that.
- */
- void DeactivateBT();
-
- private:
- /**
- * Returns reference to SysAp's keylock session
- * RAknKeylock2 session is connected when this method is called
- * for the first time.
- *
- * Always (except when freeing resources) access the keylock session via this method,
- * don't use the member variable directly.
- *
- * @since S60 3.1
- * @param None
- * @return reference to RAknKeylock2
- */
- RAknKeylock2& KeyLock();
+ void HandleNetworkNspsNotification( RMmCustomAPI::TNspsStatus aNspsStatus );
+
+ void HandleRawKeyEventLightsRequireL() const;
+
+ void HandleSmsStorageNotificationL( TBool aSimStoreFull );
+
+ void UpdateSignalBarsL();
+
+ void ReleaseMemoryForMemoryCardDialog();
+
+ private:
+ /**
+ * Frees SysAp's reserved memory, closes connections to servers etc.
+ * @param None
+ * @return void
+ */
+ void FreeResources();
+ TBool OkToInitiateShutdown();
-
-#ifdef __SYSAP_MODULE_TEST
-
- /**
- * Can be used for showing a CAknGlobalNote in module tests
- * @param noteText : text to be shown in the note
- * @return void
- */
- void ModuleTestShowUiNoteL( const TDesC& noteText ) const;
-#endif
-
- /**
- * shows power down note before displaying shutdown image
- * @param: none
- * @return void
- */
- void ShowShutdownNoteL();
-
- /** Return ETrue if the global system state is one of the 'normal'
- * states: ESwStateNormalRfOn, ESwStateNormalRfOff or
- * ESwStateNormalBTSap.
- */
- TBool IsStateNormal() const;
-
- /**
- * Returns max of three integers
- * @param: TInt
- * @return void
- */
- TInt Max( const TInt aA, const TInt aB, const TInt aC );
-
- /**
- * Displays shutdown image.
- * This method is just a nonleaving implementation,
- * calls ShowShutdownImageL for performing the task.
- *
- * @since S60 3.1
- * @param aBitmapId bitmap identifier
- * @return TInt an error value
- * @see CSysApAppUi::ShowShutdownImageL
- */
- TInt ShowShutdownImage( TInt aBitmapId );
-
- /**
- * Displays shutdown image. If a CSysApShutdownImage instance
- * does not exist, it will be created.
- *
- * @since S60 3.1
- * @param aBitmapId bitmap identifier
- * @return None
- * @leave Symbian error code
- */
- void ShowShutdownImageL( TInt aBitmapId );
-
- private: // from MSysapCallback
- /**
- * Executes a command in SysAp.
- *
- * @since S60 3.1
- * @param[in] aCommand command identifier
- * @return None
- * @leave an error code, system wide/command specific
- *
- * @see MSysapCallback::TSysapCommand
- */
- void ExecCommandL( TSysapCommand aCommand );
-
- /**
- * Executes a command in SysAp.
- *
- * @since S60 3.1
- * @param aCommand command identifier
- * @param aParam command specific parameter data
- * @return None
- * @leave an error code, system wide/command specific
- *
- * @see MSysapCallback::TSysapCommand
- */
- void ExecCommandL( TSysapCommand aCommand, const TDesC8& aParam );
-
- /**
- * Queries information from SysAp.
- *
- * @since S60 3.1
- * @param[in] aQuery query identifier
- * @param[out] aReturn query specific return data
- * @return None
- * @leave an error code, system wide/command specific
- *
- * @see MSysapCallback::TSysapQuery
- */
- void ExecQueryL( TSysapQuery aQuery, TDes8& aReturn );
-
- /**
- * Queries information from SysAp.
- *
- * @since S60 3.1
- * @param[in] aQuery query identifier
- * @param[out] aReturn query specific return data
- * @param[in] aParam query specific parameter data
- * @return None
- * @leave an error code, system wide/command specific
- *
- * @see MSysapCallback::TSysapQuery
- */
- void ExecQueryL( TSysapQuery aQuery, TDes8& aReturn, const TDesC8& aParam );
-
- public:
- /**
- * Sets HAC (Hearing Aid Compatibility) indicator according to its CenRep-setting
- * state.
- * HAC indicator is not displayed if an accessory is connected.
- *
- * @param None
- * @return None
- */
- void SetHacIndicatorL();
-
- /**
- * Returns reference to SysAp's internal feature manager.
- *
- * @since S60 3.1
- * @return CSysApFeatureManager&
- */
- CSysApFeatureManager& SysApFeatureManager();
-
- /**
- * Handles response to power save activation query.
- *
- * @param aEnable If ETrue, the user has accepted the query.
- */
- void HandleActivatePsmQueryResponse( TBool aEnable );
-
- /**
- * Handles response to power save deactivation query.
- *
- * @param aDisable If ETrue, the user has accepted the query.
- */
- void HandleDeactivatePsmQueryResponse( TBool aDisable );
-
- private: // from CAknAppUi
- /**
- * Handles a change to the application's resources which are shared across the environment.
- *
- * @since S60 3.1
- * @param aType The type of resources that have changed.
- * @return None.
- */
- void HandleResourceChangeL(TInt aType);
-
- private:
- /**
- * Shows and hides the memory card indicator depending on whether the memory card is inserted or not.
- *
- * @since S60 3.1
- * @param None.
- * @return None.
- */
- void SetMemoryCardIndicatorL();
-
- /**
- * Returns whether IHF has been enabled.
- * Creates audio routing observer if it does not exist..
- *
- * @since S60 3.2
- * @return TBool ETrue if IHF is enabled
- */
- TBool IhfEnabledL();
-
+ void CompleteShutdown( const TBool aReset = EFalse, const TInt aResetReason = KDummyReason );
+ void PrepareForShutdownImage();
+ TInt ShowShutdownImage( TInt aBitmapId );
+ void ShowShutdownImageL( TInt aBitmapId );
+ TBool IhfEnabledL();
+ void DoSwStateNormalConstructionL();
+ static TInt DoCloseSimApplicationsAfterCallBack( TAny* aObject );
+
+ // from MSysApPsmControllerNotifyCallback
+ void NotifyPowerSaveModeL( TSysApPsmStatus aStatus );
+
+ void HandleUsbCharger( const TInt aValue );
+ TBool IsStateNormal() const;
+ void HandleAccessoryProfileInStartupL( );
+
+ CSysApCenRepLogsObserver& CSysApAppUi::LogsObserverL();
+ void ContinueShutdown();
+
#ifdef RD_MULTIPLE_DRIVE
void UpdateInsertedMemoryCardsL();
#endif // RD_MULTIPLE_DRIVE
-
- /**
- * Handles setup of USB charger from given charging status.
- *
- * @since S60 3.2
- * @param aValue Given charging status
- */
- void HandleUsbCharger( const TInt aValue );
-
- public:
- /**
- * Sets USB connection attach status.
- * This prevents double beep when USB file transfer gets activated.
- *
- * @since S60 3.2
- * @param aUsbConnected ETrue if USB cable has just been attached, otherwise EFalse
- */
- void SetUsbAttachStatus( const TBool aUsbAttached );
-
- /**
- * Returns whether the key event is considered to be a device mode key event,
- * which usually causes a transition in the device mode (e.g. grip, flip or twist).
- *
- * @since S60 3.2
- * @param aKeyEvent key event
- * @return TBool ETrue key event is considered to be a device mode key
- * EFalse not a device moed key
- */
- TBool IsDeviceModeKey( const TKeyEvent& aKeyEvent ) const;
-
- /**
- * Returns whether resources (objects, server connections) owned by this
- * class has been freed.
- *
- * @since S60 3.2
- * @return TBool ETrue if resource deallocation has been performed.
- */
- TBool ResourcesFreed() const;
-
- /**
- * Returns pointer to CSysApEtelConnector.
- *
- * @since S60 3.2
- * @return pointer to CSysApEtelConnector instance owned by this class.
- * NULL if the object creation has failed.
- */
- CSysApEtelConnector* EtelConnector() const;
-
- /**
- * Returns reference to USB charger detector, TSysApUsbChargerDetector.
- *
- * @since S60 3.2
- * @return Reference to USB charger detector.
- */
- TSysApUsbChargerDetector& UsbChargerDetector();
-
- /**
- * Sets envelope indicator according to current messaging status.
- *
- * @since S60 3.2
- */
- void SetEnvelopeIndicatorL();
-
- /**
- * Handles value changes of the key KHWRMBatteryStatus.
- *
- * @since S60 3.2
- * @param aValue the updated key value
- */
- void HandleBatteryStatusL( const TInt aValue );
- /**
- * Handles value changes of the key KHWRMChargingStatus.
- *
- * @since S60 3.2
- * @param aValue the updated key value
- */
- void HandleChargingStatusL( const TInt aValue );
-
- /**
- * Cancel the specified query if it is active.
- *
- * @param aQueryId ID of the query that must be cancelled.
- * If ESysApNoQuery is given, the active query is cancelled.
- * without checking its ID.
- */
- void CancelQuery( TSysApConfirmationQueryIds aQueryId );
+ private:
+// CSysApWsClient* iSysApWsClient;
+ CSysApLightsController* iSysApLightsController;
+ CSysApFeatureManager* iSysApFeatureManager;
+ CSysApNspsHandler* iSysApNspsHandler;
+ CSysApPubSubObserver* iSysApPubSubObserver;
- private:
- // from MSysApPsmControllerNotifyCallback
- void NotifyPowerSaveModeL( TSysApPsmStatus aStatus );
-
- private:
- /**
- * Get the logs observer. Created if does not exist.
- *
- * @since S60 3.2
- * @return reference to CSysApCenRepLogsObserver object
- */
- CSysApCenRepLogsObserver& LogsObserverL();
+ CSysApDefaultKeyHandler* iSysApDefaultKeyHandler;
+// RWindowGroup groupWin;
+ CSysApStartupController* iSysApStartupController;
+ MSysApOfflineModeController* iSysApOfflineModeController;
+ RStarterSession iStarterSession;
+ TSysApUsbChargerDetector iSysApUsbChargerDetector;
+ CSysApAccessoryObserver* iSysApAccessoryObserver;
+ CSysApShutdownImage* iSysApShutdownImage;
+ CSysApShutdownAnimation* iSysApShutdownAnimation;
+ CSysApKeySndHandler* iSysApKeySndHandler;
+ CSysApCenRepController* iSysApCenRepController;
+ CSysApCenRepLightSettingsObserver* iSysApCenRepLightSettingsObserver;
+ CSysApCenRepBtObserver* iSysApCenRepBtObserver;
+ CSysApCenRepHacSettingObserver* iSysApCenRepHacSettingObserver;
+
+ CSysApAudioRoutingObserver* iSysApAudioRoutingObserver;
+ CSysApPsmController* iSysApPsmController;
+ CHbSymbianVariant* iVariantAccState ;
+ CSysApSsSettingsObserver* iSysApSsSettingsObserver;
+ CSystemLock* iSysApSystemLock;
+ CSysApCenRepCallForwardingObserver* iSysApCenRepCallForwardingObserver;
+ CSysApBatteryInfoController* iSysApBatteryInfoController;
+ MSysApBtSapController* iSysApBtSapController;
+ CPeriodic* iSapTimer;
+ MSysApBtController* iSysApBtController;
+ CSysApCenRepLogsObserver* iSysApCenRepLogsObserver;
+ MSysApUsbIndicator* iSysApUsbIndicatorController;
+ CKeyguardAccessApi* iKeyguardController;
+ CHbDevicePowerMenuSymbian* iPowerMenuDialog;
+ CSysApKeyManagement* iSysApKeyManagement;
+ CSysApMMCObserver* iSysApMMCObserver;
+ CSysApEtelConnector* iSysApEtelConnector;
+
+ public:
+ CHbIndicatorSymbian* iHbIndicatorSymbian;
+
- /**
- * Adds MMC removal item(s) to power menu.
- *
- * @since S60 5.2
- *
- * @param aProfileNameCDesCArray Array holding menu item labels
- * @param aItemIdArray Item labels for cover ui
- * @param aPowerMenuItemIndex last used index in power menue
- */
- void AddMmcMenuItemsL( CDesCArray*& aProfileNameCDesCArray,
- RArray<TInt>& aItemIdArray,
- TInt& aPowerMenuItemIndex );
-
- public:
- /**
- * Starts the charging animation in the battery pane.
- */
- void StartChargingBatteryL();
-
- /**
- * Stops the charging animation in the battery pane.
- */
- void StopChargingBatteryL();
-
-private:
- //Data members
-
- /*****************************************************
- * Series 60 Customer / DOS
- * Series 60 Domestic OS API
- *****************************************************/
-
- CSysApLightsController* iSysApLightsController;
-
- CSysApPubSubObserver* iSysApPubSubObserver;
- CSysApProfileObserver* iSysApProfileObserver;
-
- CSysApCenRepLightSettingsObserver* iSysApCenRepLightSettingsObserver;
- CSysApCenRepLogsObserver* iSysApCenRepLogsObserver;
- CSysApCenRepBtObserver* iSysApCenRepBtObserver;
- CSysApCenRepHacSettingObserver* iSysApCenRepHacSettingObserver;
- CSysApCenRepFmTxObserver* iSysApCenRepFmTxObserver;
- CSysApCenRepController* iSysApCenRepController;
- CSysApStartupController* iSysApStartupController;
- CSysApConnectionMonitorObserver* iSysApConnectionMonitorObserver;
- CSysApPowerKeyMenuObserver* iSysApPowerKeyMenuObserver;
- CSysApSsSettingsObserver* iSysApSsSettingsObserver;
- CSysApShutdownImage* iSysApShutdownImage;
- CSysApShutdownAnimation* iSysApShutdownAnimation;
- CSysApEtelConnector* iSysApEtelConnector;
- CSysApAccessoryObserver* iSysApAccessoryObserver;
- CSysApMsgSimMemLowQuery* iSysApMsgSimMemLowQuery;
- CSysApWaitNote* iSysApWaitNote;
- CSysApConfirmationQuery* iSysApConfirmationQuery;
- CSysApConfirmationQuery* iSysApConfirmationQueryForRestart;
- CSysApFeatureManager* iSysApFeatureManager;
- MSysApOfflineModeController* iSysApOfflineModeController;
- CSysApMMCObserver* iSysApMMCObserver;
- CSysApNspsHandler* iSysApNspsHandler;
- MSysApUsbIndicator* iSysApUsbIndicatorController;
- MSysApBtController* iSysApBtController;
- MSysApBtSapController* iSysApBtSapController;
- MSysApLocationPrivacyIndicator* iSysApLocationPrivacyIndicator;
- CAknBatteryNotify* iBatteryNotify;
- CAknSignalNotify* iSignalNotify;
- CAknGlobalListQuery* iGlobalListQuery;
-
- CSystemLock* iSysApSystemLock;
- MProfileEngine* iProfileEngine;
- MProfilesNamesArray* iProfileNamesArray;
- RStarterSession iStarterSession;
- RAknKeylock2 iKeyLock;
-#ifndef RD_MULTIPLE_DRIVE
- CAknMemoryCardDialog* iMemoryCardDialog;
-#endif // RD_MULTIPLE_DRIVE
- TInt iCapturedEKeyPowerOff;
- TInt iCapturedEKeyPowerOffUpAndDowns;
- TInt iCapturedAppskey;
- TInt iCapturedAppskeyUpAndDowns;
-
-
- TInt iNumberOfProfileNamesInPowerKeyMenu;
-
- TBool iPowerkeyMenuLockKeypadShown;
- TBool iPowerkeyMenuExitSapShown;
- TBool iPowerkeyMenuLockSystemShown;
- TBool iPowerkeyMenuEjectShown;
-
- TInt iPowerkeyMenuLockKeypadSelection;
- TInt iPowerkeyMenuExitSapSelection;
- TInt iPowerkeyMenuLockSystemSelection;
-#ifndef RD_MULTIPLE_DRIVE
- TInt iPowerkeyMenuEjectSelection;
-#endif // RD_MULTIPLE_DRIVE
-
- TInt iProfileToBeActivated;
- TInt iActiveProfileBeforeOfflineMode;
-
- TInt iApplicationScanningRoundNumberInBtSap;
- TBool iTimeToKillInBtSap;
-
- TBool iLastPowerKeyWasShort;
- TBool iIgnoreNextPowerKeyUpEvent;
- TBool iIgnoreNextPowerKeyRepeats;
- TBool iPowerKeyPopupMenuActive;
- TBool iDisablePowerkeyMenu;
- TBool iPowerkeyMenuPowerOffShown;
-
+ private:
+ TBool iPowerKeyPopupMenuActive;
TBool iDeviceLockEnabled;
TBool iKeyLockEnabled;
TBool iKeyLockOnBeforeCall;
TBool iKeyLockOnBeforeAlarm;
TBool iKeyLockOnBeforeCradle;
+ TBool iResourcesFreed;
+ TInt iCapturedEKeyPowerOff;
+ TInt iCapturedEKeyPowerOffUpAndDowns;
+ TBool iOfflineModeActive;
+ TBool iShutdownStarted;
+
+ TBool iIgnoreNextPowerKeyUpEvent; // need to be added this flag in maliks client side apis.
+ TBool iLastPowerKeyWasShort;
+ TBool iPowerKeyPopupMenuDismissed; // need to be added this flag in malik implementation.
+ TInt iKeyBoardRepeatCount;
+ TBool iIgnoreNextPowerKeyRepeats;
+ TInt iActiveProfileBeforeOfflineMode;
+
+ TBool iSimChangedDone;
+ TBool iIgnoreZeroNetworkBarNotifications;
+ TInt iApplicationScanningRoundNumberInBtSap;
+ TBool iTimeToKillInBtSap;
TBool iShowkeypadActivatedNoteAfterSoftReject;
-
+ TBool iCharging; // Indicates if charging is currently on
TBool iEmergencyCallActive;
- TBool iSimChangedDone;
- TBool iResourcesFreed;
+ TBool iCallActivated; // used in defining whether to show GPRS suspended note
+
+ TBool iActivateBt;
+ TBool iDeactivateBt;
+
+ TBool iIgnoreAccessorySpecificProfileChanges;
+ TBool iCheckLongPowerKeyEvent;
+ TInt iCapturedAppskey;
+ TInt iCapturedAppskeyUpAndDowns;
+ TBool iShutdownContinued;
TBool iNsps;
+
+
+ //CPeriodic* iTimer;
+#ifndef RD_MULTIPLE_DRIVE
+ TInt iPowerkeyMenuEjectSelection;
+#endif // RD_MULTIPLE_DRIVE
+
#ifndef RD_MULTIPLE_DRIVE
TBool iHideFirstBeep;
#endif // RD_MULTIPLE_DRIVE
- TBool iShutdownStarted;
- TBool iAlarmOrChargingStateShutdownStarted;
-
- TBool iIgnoreAccessorySpecificProfileChanges;
- TBool iAccessoryJustConnected;
-
- TBool iHandleNextProfileEvent;
- TBool iActivateBt;
- TBool iDeactivateBt;
+
#ifndef RD_MULTIPLE_DRIVE
TBool iTimeToKill; // MMC Hot Swap
TInt iApplicationScanningRoundNumber; // MMC Hot Swap
#endif // RD_MULTIPLE_DRIVE
- TBool iGprsActivated; // used in defining whether to show GPRS suspended note
- TBool iGprsSuspended; // used in defining whether to show GPRS suspended note
- TBool iCallActivated; // used in defining whether to show GPRS suspended note
- TBool iGprsSuspendedNoteShown;
-
- TBool iMMCEjectUsed;
+
#ifndef RD_MULTIPLE_DRIVE
TBool iMMCPowerMenuEjectUsed;
TBool iMMCInserted;
#endif // RD_MULTIPLE_DRIVE
-
- CPeriodic* iTimer;
- CPeriodic* iSapTimer;
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
- CPeriodic* iAnimTimer;
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
- CSysApTimer* iSysApTimer;
-
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
- TInt iAnimationShowingTime;
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-
- CSysApKeySndHandler* iSysApKeySndHandler;
-
- TBool iIgnoreZeroNetworkBarNotifications;
-
- TBool iCharging; // Indicates if charging is currently on
- CSysApKeyManagement* iSysApKeyManagement;
-
- CSysApMediatorObserver* iSysApMediatorObserver;
- TBool iShutdownContinued;
-
- /**
- * The default key handler.
- * Own.
- */
- CSysApDefaultKeyHandler* iSysApDefaultKeyHandler;
-
- TBool iPowerKeyPopupMenuDismissed; // Indicates if the popup menu has been dismissed
-
+
#ifndef RD_MULTIPLE_DRIVE
TBool iHideNextBeep; // Prevents double beep when USB file transfer gets activated
TBool iFileManagerCloseDisabled; // Prevents File Manager to close on hotswap
#endif // RD_MULTIPLE_DRIVE
-
- CSysApAudioRoutingObserver* iSysApAudioRoutingObserver;
-
- /**
- * Call forwarding status CenRep key observer.
- * Own.
- */
- CSysApCenRepCallForwardingObserver* iSysApCenRepCallForwardingObserver;
-
- /**
- * Message waiting status CenRep key observer.
- * Own.
- */
- CSysApCenRepMsgWaitingObserver* iSysApCenRepMsgWaitingObserver;
-
+
#ifdef RD_MULTIPLE_DRIVE
// First power menu index used for eject
TInt iPowerkeyMenuEjectSelectionBase;
@@ -1669,47 +624,10 @@
// Stores drive for eject query
TInt iDriveToEject;
#endif // RD_MULTIPLE_DRIVE
-
- /**
- * For USB charger detection.
- */
- TSysApUsbChargerDetector iSysApUsbChargerDetector;
-
- /**
- * SysAp power save mode controller.
- * Own.
- */
- CSysApPsmController* iSysApPsmController;
+
+ TBool iMMCEjectUsed;
+ CHbDeviceInputDialogSymbian* iMemCardPwdDialog;
- /**
- * SysAp battery info controller.
- * Own.
- */
- CSysApBatteryInfoController* iSysApBatteryInfoController;
-
- /**
- * Returns whether a de/encrypting operation is ongoing
- *
- * @since S60 3.1
- * @return TBool ETrue if a de/encrypting operation is in progress
- */
- TBool IsEncryptionOperationOngoingL() const;
- TInt iKeyBoardRepeatCount;
-
- //Offset of profile-related menu items in power key menu
- TInt iProfileItemsOffset;
- //Flag to record if the TD network is enalbed.
- TBool iTDEnable;
- TBool IsDefaultPowerKeyBehavior();
-
- // Are we in GAN mode
- TBool iGanEnabled;
-
- // Handler for GAN events
- CSysApGanHandler* iSysApGanHandler;
-
- };
-
-#endif // SYSAPAPPUI_H
-
-// End of File
+ };
+
+#endif
--- a/coreapplicationuis/SysAp/Inc/SysApDocument.h Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/SysAp/Inc/SysApDocument.h Tue Aug 31 15:24:25 2010 +0300
@@ -20,7 +20,8 @@
#define SYSAPDOCUMENT_H
// INCLUDES
-#include <AknDoc.h>
+//#include <AknDoc.h>
+#include <eikdoc.h>
// FORWARD DECLARATIONS
class CEikAppUi;
@@ -32,7 +33,7 @@
* @since 1.0
*/
-class CSysApDocument : public CAknDocument
+class CSysApDocument : public CEikDocument
{
public:
/**
@@ -40,7 +41,12 @@
* @param CEikApplication& aApp
* @return void
*/
- CSysApDocument(CEikApplication& aApp): CAknDocument(aApp) { }
+ CSysApDocument(CEikApplication& aApp): CEikDocument(aApp) { }
+
+ /**
+ * Two-phased constructor.
+ */
+// static CSysApDocument* NewL(CEikApplication& aApp);
/**
* Destructor.
@@ -50,6 +56,12 @@
virtual ~CSysApDocument();
private:
+
+ /**
+ * EPOC default constructor.
+ */
+// void ConstructL();
+
/**
* C++ default constructor.
* @param None
--- a/coreapplicationuis/SysAp/Inc/SysApFeatureManager.h Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/SysAp/Inc/SysApFeatureManager.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2003-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"
@@ -180,14 +180,6 @@
TBool GripNotSupported() const;
/**
- * Returns whether SlideSupported is set.
- *
- * @since S60 9.2
- * @return ETrue if feature is set
- */
- TBool SlideSupported() const;
-
- /**
* Returns whether Cover Display is supported.
*
* @since S60 3.2
@@ -217,7 +209,7 @@
* @since S60 3.2
* @return ETrue if feature is supported
*/
- TBool FmTxSupported() const;
+ // TBool FmTxSupported() const;
/**
* Returns whether pen is enabled.
@@ -252,25 +244,7 @@
* @since S60 5.1
* @return ETrue if feature is supported
*/
- TBool FmTxRdsTextSupported() const;
-
-
- /**
- * Returns whether a short press of the power key
- * triggers the keylock
- *
- * @since S60 5.2
- * @return ETrue if feature is supported
- */
- TBool PowerKeyIsLockKey() const;
-
- /**
- * Returns whether GAN is supported.
- *
- * @since S60 3.2
- * @return ETrue if feature is supported
- */
- TBool GanSupported() const;
+ // TBool FmTxRdsTextSupported() const;
private:
@@ -348,11 +322,6 @@
TBool iGripNotSupported;
/**
- * Slide supported status.
- */
- TBool iSlideSupported;
-
- /**
* Cover display support status.
*/
TBool iCoverDisplaySupported;
@@ -370,7 +339,7 @@
/**
* FM TX supported status
*/
- TBool iFmTxSupported;
+ // TBool iFmTxSupported;
/**
* Pen enabled status.
@@ -390,19 +359,7 @@
/**
* FM TX RDS Text support status.
*/
- TBool iFmTxRdsTextSupported;
-
-
- /**
- * Short press of power key invokes keylock
- */
- TBool iPowerKeyIsLockKey;
-
- /**
- * Generic Access Network (GAN) supported status.
- */
- TBool iGanSupported;
-
+ // TBool iFmTxRdsTextSupported;
};
#endif // SYSAPFEATUREMANAGER_H
--- a/coreapplicationuis/SysAp/Inc/SysApMediatorObserver.h Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/SysAp/Inc/SysApMediatorObserver.h Tue Aug 31 15:24:25 2010 +0300
@@ -28,7 +28,7 @@
#include <MediatorCommandResponder.h>
#include <MediatorEventProvider.h>
#include <w32std.h> // Remove this when SecondaryDisplayStartupAPI.h includes it properly.
-#include <secondarydisplay/SecondaryDisplayStartupAPI.h>
+#include <SecondaryDisplay/SecondaryDisplayStartupAPI.h>
#include "SysApAppUi.h"
--- a/coreapplicationuis/SysAp/Inc/SysApPubSubObserver.h Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/SysAp/Inc/SysApPubSubObserver.h Tue Aug 31 15:24:25 2010 +0300
@@ -38,6 +38,15 @@
* @since 2.X
*/
+enum TSecurityUIsLights
+ {
+ ESecurityUIsLightsUninitialized = 0,
+ ESecurityUIsLightsLockOnRequest,
+ ESecurityUIsLightsQueryOnRequest,
+ ESecurityUIsLightsLockOffRequest,
+ ESecurityUIsLightsLastValue
+ };
+
class CSysApPubSubObserver :
public CBase,
public MSysApPropertyResponder
@@ -99,7 +108,7 @@
/**
* Handle keys under category KPSUidHWRMFmTx
*/
- void HandleHwrmFmTxCategoryL( const TUint aKey, const TInt aValue );
+ // void HandleHwrmFmTxCategoryL( const TUint aKey, const TInt aValue );
/**
* Handle keys under category KPSUidDataSynchronizationInternalKeys
@@ -134,6 +143,9 @@
*/
CSysApPubSubObserver( CSysApAppUi& aSysApAppUi );
void ConstructL();
+
+ void HandleLKeylockEventL( const TUint aKey, const TInt aValue );
+ void HandleLightsOnRequestL( const TUint aKey, const TInt aValue );
protected: // From MSysApPropertyResponder
@@ -151,8 +163,8 @@
CSysApSubscriber* iInboxStatusSubscriber; // KUidInboxStatusValue
CSysApSubscriber* iOutboxStatusSubscriber; // KUidOutboxStatus
CSysApSubscriber* iIrdaStatusSubscriber; // KPSUidIrdaStatus
- CSysApSubscriber* iGprsStatusSubscriber; // KPSUidGprsStatus
- CSysApSubscriber* iWcdmaStatusSubscriber; // KPSUidWcdmaStatus
+// CSysApSubscriber* iGprsStatusSubscriber; // KPSUidGprsStatus
+// CSysApSubscriber* iWcdmaStatusSubscriber; // KPSUidWcdmaStatus
CSysApSubscriber* iLocationGlobalPrivacySubscriber; // KPSUidLocationGlobalPrivacy
CSysApSubscriber* iRestoreBackupSubscriber; // KUidBackupRestoreKey
@@ -160,11 +172,11 @@
CSysApSubscriber* iSimChangedSubscriber; // KPSSimChanged
// Category KHWRMFmTxStatus
- CSysApSubscriber* iFmTxStatusSubscriber; // KPSUidHWRMFmTx
+ // CSysApSubscriber* iFmTxStatusSubscriber; // KPSUidHWRMFmTx
- TInt iPreviousFmTxPSValue;
+ // TInt iPreviousFmTxPSValue;
- CSysApRemConObserver* iFmTxRemConObserver;
+ // CSysApRemConObserver* iFmTxRemConObserver;
// Category KPSUidCoreApplicationUIs
@@ -238,6 +250,13 @@
* Own.
*/
CSysApSubscriber* iSmsPhoneStoreSubscriber;
+
+ CSysApSubscriber* iKeylockEventSubscriber;
+
+ CSysApSubscriber* iLightsOnRequestSubscriber;
+
+ CSysApSubscriber* iPowerMenuCustomDialogSubscriber;
+
};
#endif // SYSAPPUBSUBOBSERVER_H
--- a/coreapplicationuis/SysAp/Inc/SysApShutdownImage.h Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/SysAp/Inc/SysApShutdownImage.h Tue Aug 31 15:24:25 2010 +0300
@@ -56,6 +56,8 @@
void ShowShutdownImageL(TInt aBitmapId);
RWindow& ShutdownCoeControlWindow();
+
+ void SetRectForAnimation();
#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION
/**
@@ -131,6 +133,7 @@
*/
TKeyResponse OfferKeyEventL(const TKeyEvent& aKeyEvent, TEventCode aType);
+ CFbsBitmap* ReadSVGL (TFileName aFileName);
private: // Data
//Used for showing user selected image
--- a/coreapplicationuis/SysAp/Inc/SysApSsSettingsObserver.h Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/SysAp/Inc/SysApSsSettingsObserver.h Tue Aug 31 15:24:25 2010 +0300
@@ -24,7 +24,7 @@
// INCLUDES
#include <e32base.h>
-#include <MSSSettingsObserver.h>
+#include <msssettingsobserver.h>
// FORWARD DECLARATIONS
class CSysApAppUi;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/SysAp/Inc/SysApTaskList.h Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,104 @@
+/*
+* Copyright (c) 2005 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:
+*
+*
+*/
+
+
+#ifndef SYSAPTASKLIST_H
+#define SYSAPTASKLIST_H
+
+// INCLUDES
+
+#include <w32std.h>
+#include <apgtask.h>
+
+// CLASS DECLARATION
+
+/**
+* Class for finding out about running applications.
+* This class specialises in locating and identifying root applications,
+* those applications who do not have any parent window group.
+* It can be used along-side TApaTaskList.
+*
+* @since Series 60 3.0
+*/
+class CSysApTaskList : public CBase
+ {
+public:
+ /**
+ * Factory function
+ * @param aWsSession an open session to the window server, often from CEikonEnv::WsSession()
+ * @return a new fully constructed instance of CSysApTaskList
+ */
+ static CSysApTaskList* NewL(RWsSession& aWsSession);
+ /**
+ * Factory function
+ * @param aWsSession an open session to the window server, often from CEikonEnv::WsSession()
+ * @return a new fully constructed instance of CSysApTaskList, which is on the cleanup stack
+ */
+ static CSysApTaskList* NewLC(RWsSession& aWsSession);
+ /**
+ * Destructor.
+ */
+ ~CSysApTaskList();
+
+ /**
+ * Refresh the window group array
+ */
+ void UpdateListL();
+ /**
+ * Accessor for the window group array
+ * @return an array containing the window groups of running applications.
+ */
+ const RArray<RWsSession::TWindowGroupChainInfo>& WgArray() const;
+
+ /**
+ * Find an application with the requested UID 3, which is running as a root application
+ * @param aAppUid the UID 3 of the target application.
+ * @return a TApaTask which refers to the running instance of the application.
+ * if the application is not running, the TApaTask's Exists() function will return EFalse.
+ */
+ TApaTask FindRootApp(TUid aAppUid) const;
+ /**
+ * Query whether an application's window group is running as a root application.
+ * @param aWgId the window group identifier of the target application.
+ * @return ETrue if this window group is running as a root window group.
+ */
+ TBool IsRootWindowGroup(TInt aWgId) const;
+
+ /**
+ * Find the parent window group. If there is no parent, 0 is returned.
+ * @param aWgId the window group id that you want to find the parent of.
+ * @return The window group id of the parent, or 0 if there is no parent.
+ */
+ TInt FindParentWgId(TInt aWgId) const;
+ /**
+ * Find the child window group. If there is no child, 0 is returned.
+ * @param aWgId the window group id that you want to find the child of.
+ * @return The window group id of the child, or 0 if there is no child.
+ */
+ TInt FindChildWgId(TInt aWgId) const;
+
+private:
+ CSysApTaskList(RWsSession& aWsSession);
+ void ConstructL();
+
+private:
+ RWsSession& iWs;
+ RArray<RWsSession::TWindowGroupChainInfo> iWgs;
+ };
+
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/SysAp/Inc/hbdeviceinputdialogsymbian.h Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,92 @@
+/****************************************************************************
+**
+** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (developer.feedback@nokia.com)
+**
+** This file is part of the HbWidgets module of the UI Extensions for Mobile.
+**
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at developer.feedback@nokia.com.
+**
+****************************************************************************/
+
+#ifndef HBDEVICEINPUTDIALOGSYMBIAN_H
+#define HBDEVICEINPUTDIALOGSYMBIAN_H
+
+#if defined(__SYMBIAN32__) || defined(SYMBIAN) || defined(HB_DOXYGEN)
+
+#include <e32base.h>
+#include <hbsymbianvariant.h>
+#include <e32debug.h>
+#ifdef _DEBUG
+
+ #define TRACES( x ) x
+
+#else
+
+ #define TRACES( x )
+
+#endif
+
+class CHbDeviceInputDialogPrivate;
+class MHbDeviceInputDialogObserver;
+
+class CHbDeviceInputDialogSymbian : public CBase
+{
+public:
+ enum InputMode {
+ TextInput,
+ IntInput,
+ RealInput,
+ IpInput
+ };
+
+ enum TButtonId {
+ EAcceptButton,
+ ERejectButton
+ };
+
+public:
+
+ static CHbDeviceInputDialogSymbian* NewL(MHbDeviceInputDialogObserver *aObserver = 0);
+ ~CHbDeviceInputDialogSymbian();
+
+ TPtrC getTextL();
+
+ void ShowL();
+ void Close();
+
+ void SetObserver(MHbDeviceInputDialogObserver *aObserver);
+
+private:
+ friend class CHbDeviceInputDialogPrivate;
+ CHbDeviceInputDialogSymbian();
+ CHbDeviceInputDialogPrivate* d;
+ TBuf<16> iPassword;
+ TBuf8<16> iTemp;
+
+};
+
+class MHbDeviceInputDialogObserver
+{
+public:
+ virtual void InputDialogClosed(const CHbDeviceInputDialogSymbian* aInputDialog,
+ CHbDeviceInputDialogSymbian::TButtonId aButton) = 0;
+ virtual void DataReceived(CHbSymbianVariantMap data) = 0;
+};
+
+#endif // defined(__SYMBIAN32__) || defined(SYMBIAN) || defined(HB_DOXYGEN)
+#endif // HBDEVICEINPUTDIALOGSYMBIAN_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/SysAp/Inc/hbdevicepowermenusymbian.h Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,71 @@
+/*
+ * 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:
+ *
+ */
+
+#ifndef HBDEVICEPOWERMENUSYMBIAN_H
+#define HBDEVICEPOWERMENUSYMBIAN_H
+
+#if defined(__SYMBIAN32__) || defined(SYMBIAN) || defined(HB_DOXYGEN)
+
+#include <e32base.h>
+#include <centralrepository.h>
+#include <settingsinternalcrkeys.h>
+#include <ProfileEngineInternalCRKeys.h>
+#include <ProfileEngineSDKCRKeys.h>
+#include <MProfileEngineExtended2.h>
+#include "SysApAppUi.h"
+
+class CHbDevicePowerMenuPrivate;
+
+class CHbDevicePowerMenuSymbian : public CBase
+{
+public:
+
+ static CHbDevicePowerMenuSymbian* NewL(CSysApAppUi& aSysApServer );
+ virtual ~CHbDevicePowerMenuSymbian();
+
+ //Displays Dialog
+ void ShowL();
+ //Getters and Setters
+ void SetVolume(TInt aVolume);
+ void SetSilenceMode(TBool aEnable);
+ void SetOfflineMode(TBool aChecked);
+ void SetVibrationEnabled(TBool aEnable);
+ void SetPowerOffEnabled(TBool aEnable);
+
+private:
+
+ CHbDevicePowerMenuSymbian(CSysApAppUi& aSysApServer);
+ void ConstructL();
+
+private:
+ friend class CHbDevicePowerMenuPrivate;
+ //Used to set master Volume/Vibrate/Silence Mode in Control Panel
+ MProfileEngineExtended2* iProfileEngine;
+ //Used to Set and Get OfflineMode to and from Control Panel
+ CRepository* iCenrepOffline;
+ //Used to Get Master Volume/Vibrate/Silence Mode in Control Panel
+ CRepository* iCenrepProfile;
+ //Used to handle ShutDown
+ CSysApAppUi& iSysApServer;
+ CHbDevicePowerMenuPrivate* iPowerMenuPrivate;
+};
+
+#endif // defined(__SYMBIAN32__) || defined(SYMBIAN) || defined(HB_DOXYGEN)
+
+#endif // HBDEVICEPOWERMENUSYMBIAN_H
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/SysAp/Inc/sysapaudioroutingobserver.h Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,127 @@
+/*
+* Copyright (c) 2007 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: Observes audio output routing changes
+*
+*/
+
+
+#ifndef SYSAPAUDIOROUTINGONBSERVER_H
+#define SYSAPAUDIOROUTINGONBSERVER_H
+
+#include <MTelephonyAudioRoutingObserver.h>
+class CSysApAppUi;
+
+/**
+ * ?one_line_short_description
+ *
+ * ?more_complete_description
+ *
+ * @lib ?library
+ * @since S60 ?S60_version *** for example, S60 v3.0
+ */
+class CSysApAudioRoutingObserver : public CBase,
+ public MTelephonyAudioRoutingObserver
+ {
+
+public:
+
+ /**
+ * Symbian two-phased constructor.
+ *
+ * @param aSysApAppUi reference to System Application's application UI class
+ */
+ static CSysApAudioRoutingObserver* NewL( CSysApAppUi& aSysApAppUi );
+
+ /**
+ * Destructor.
+ */
+ virtual ~CSysApAudioRoutingObserver();
+
+ /**
+ * Returns whether audio output is routed to IHF.
+ *
+ * @since S60 3.2
+ * @return TBool ETrue audios routed to IHF
+ * EFalse audios not routed to IHF.
+ */
+ TBool IhfEnabled() const;
+
+private: // from MTelephonyAudioRoutingObserver
+ /**
+ * Signals that available audio outputs have changed.
+ *
+ * @since S60 3.2
+ * @param CTelephonyAudioRouting& aTelephonyAudioRouting reference.
+ * @see MTelephonyAudioRoutingObserver::AvailableOutputsChanged
+ */
+ virtual void AvailableOutputsChanged( CTelephonyAudioRouting& aTelephonyAudioRouting);
+
+ /**
+ * Signals that current output has changed.
+ *
+ * @since 60 3.2
+ * @param CTelephonyAudioRouting& aTelephonyAudioRouting reference.
+ * @see MTelephonyAudioRoutingObserver::OutputChanged
+ */
+ virtual void OutputChanged( CTelephonyAudioRouting& aTelephonyAudioRouting);
+
+ /**
+ * Signals that CTelephonyAudioRouting::SetOutputL request issued by this
+ * application (on CTelephonyAudioRouting instance) was serviced by the
+ * Adaptation.
+ *
+ * @since S60 3.2
+ * @param CTelephonyAudioRouting& aTelephonyAudioRouting reference.
+ * @param aError KErrNone if output requested by application is set, else
+ * system-wide error code.
+ * @see MTelephonyAudioRoutingObserver::SetOutputComplete
+ */
+ virtual void SetOutputComplete( CTelephonyAudioRouting& aTelephonyAudioRouting, TInt aError);
+
+private:
+
+ /**
+ * C++ default constructor.
+ */
+ CSysApAudioRoutingObserver();
+
+ /**
+ * Constructor.
+ *
+ * @param aSysApAppUi reference to System Application's application UI class
+ */
+ CSysApAudioRoutingObserver( CSysApAppUi& aSysApAppUi );
+
+ /**
+ * Symbian 2nd-phase constructor.
+ */
+ void ConstructL();
+
+private: // data
+
+ /**
+ * Telephony audio routing instance.
+ * Own.
+ */
+ CTelephonyAudioRouting* iTelephonyAudioRouting;
+
+ /**
+ * System Application application UI class.
+ */
+ CSysApAppUi& iSysApAppUi;
+
+ };
+
+
+#endif // SYSAPAUDIOROUTINGONBSERVER_H
--- a/coreapplicationuis/SysAp/Inc/sysapbatteryinfocontroller.h Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/SysAp/Inc/sysapbatteryinfocontroller.h Tue Aug 31 15:24:25 2010 +0300
@@ -22,7 +22,7 @@
#include <e32base.h>
class CBSUtil;
-class CBatteryPopupControl;
+// class CBatteryPopupControl;
/**
* Controller for enhanced battery information.
@@ -101,12 +101,6 @@
*/
void BatteryStatusUpdated( const TInt aValue );
- /**
- * Check if battery status is above the threshold level
- *
- */
- TBool IsBatteryInfoAboveThreshold() const;
-
private:
/**
@@ -157,7 +151,7 @@
* Battery popup control.
* Own.
*/
- CBatteryPopupControl* iBatteryPopup;
+ // CBatteryPopupControl* iBatteryPopup;
};
--- a/coreapplicationuis/SysAp/Inc/sysapdefaultkeyhandler.h Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/SysAp/Inc/sysapdefaultkeyhandler.h Tue Aug 31 15:24:25 2010 +0300
@@ -21,13 +21,13 @@
#include <e32base.h>
#include <coedef.h>
-#include <AknCapServerClient.h>
-#include <e32property.h>
+//#include <AknCapServerClient.h>
+class RWindowGroup;
class MSysapCallback;
-class RAknKeylock2;
-class CRepository;
-class CKeyLockPolicyApi;
+
+//class RAknKeylock2;
+//class CSysApAppUi;
/**
@@ -52,7 +52,7 @@
* @param aCallback reference to System Application callback interface.
* @return pointer to a new instance of CSysApDefaultKeyHandler.
*/
- static CSysApDefaultKeyHandler* NewL( MSysapCallback& callback );
+ static CSysApDefaultKeyHandler* NewL(MSysapCallback& callback);
/**
* Destructor.
@@ -88,7 +88,7 @@
*
* @param aCallback reference to System Application callback interface.
*/
- CSysApDefaultKeyHandler( MSysapCallback& callback );
+ CSysApDefaultKeyHandler(MSysapCallback& callback );
private:
@@ -165,7 +165,10 @@
TBool DoShowKeysLockedNote();
private: // data
-
+
+ // Our window group from SysappUi
+ // RWindowGroup& iRootWindowGroup;
+
/**
* Reference to callback object.
*/
@@ -185,12 +188,7 @@
* Pointer to sysap-owned RAknKeylock2*
* Not own.
*/
- RAknKeylock2* iKeylock;
-
- /**
- * Owned. Used to enable/disable keylock activation when slide is close/open
- */
- CKeyLockPolicyApi* iKeylockPolicy;
+// RAknKeylock2* iKeylock;
/**
* Handle of the captured camera key event.
@@ -230,18 +228,8 @@
/**
* Avkon UI Server
*/
- RAknUiServer iAknUiServer;
+// RAknUiServer iAknUiServer;
- /**
- * Keypad slide handling CR
- */
- CRepository* iSlideRepository;
- TBool iKeypadWasLocked;
-
- /**
- * Call status P&S for slide handling
- */
- RProperty iCallStateProperty;
};
#endif // SYSAPDEFAULTKEYHANDLER_H
--- a/coreapplicationuis/SysAp/Inc/sysapkeymanagement.h Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/SysAp/Inc/sysapkeymanagement.h Tue Aug 31 15:24:25 2010 +0300
@@ -88,6 +88,7 @@
*/
RArray<TInt32> iUpAndDownKeyHandles; //Handles of keys when capturing them
+ RArray<TInt32> iLongKeyPressHandle ; //Handles long key when capturing them
/**
* Tells if the plugin is a key provider plugin (plugin version 2)
*/
--- a/coreapplicationuis/SysAp/Inc/sysapremconobserver.h Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/SysAp/Inc/sysapremconobserver.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007 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"
@@ -54,16 +54,7 @@
* Destructor.
*/
virtual ~CSysApRemConObserver();
-
- /**
- * Open remcon interface and reserve the volume keys
- */
- void StartRemconInterfaceL();
-
- /**
- * close the remcon interface and release the volume keys
- */
- void StopRemconInterface();
+
protected: // Functions from base classes
/**
--- a/coreapplicationuis/SysAp/PubSub/CoreApplicationUIsPrivatePSKeys.h Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/SysAp/PubSub/CoreApplicationUIsPrivatePSKeys.h Tue Aug 31 15:24:25 2010 +0300
@@ -21,7 +21,7 @@
#define COREAPPLICATIONUISPRIVATEPSKEYS_H
// INCLUDES
-#include "CoreApplicationUIsInternalPSKeys.h"
+#include "coreapplicationuisinternalpskeys.h"
#endif // COREAPPLICATIONUISPRIVATEPSKEYS_H
--- a/coreapplicationuis/SysAp/Src/BtSap/SysApBtSapControllerImpl.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/BtSap/SysApBtSapControllerImpl.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-2007 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"
@@ -26,8 +26,7 @@
#include <btengconnman.h>
#include <StringLoader.h>
#include <coemain.h>
-#include <SysAp.rsg>
-#include <startupdomainpskeys.h>
+//#include <SysAp.rsg>
MSysApBtSapController* CreateSysApBtSapControllerL( CSysApAppUi& aSysApAppUi )
@@ -163,7 +162,7 @@
// No RF available so signal bars should be same as in offline mode.
iSysApAppUi.IgnoreZeroNetworkBarNotifications(ETrue);
- TRAP( err, iSysApAppUi.UpdateSignalBarsL( KAknSignalOffLineMode ) );
+// TRAP( err, iSysApAppUi.UpdateSignalBarsL( KAknSignalOffLineMode ) );
iSysApAppUi.SetNetworkConnectionAllowed( ECoreAppUIsNetworkConnectionNotAllowed );
@@ -184,7 +183,8 @@
iFinalizeDisconnectNeeded = EFalse;
iSysApAppUi.IgnoreZeroNetworkBarNotifications(EFalse);
- if ( iSysApAppUi.ActiveProfileId() == KOfflineModeProfileId )
+// if ( iSysApAppUi.ActiveProfileId() == KOfflineModeProfileId )
+ if(0)
{
if ( iSwitchingToOffline )
{
@@ -216,7 +216,6 @@
// ----------------------------------------------------------------------------
void CSysApBtSapController::HandlePropertyChangedL( const TUid& aCategory, const TUint aKey )
{
- TInt simStatus = ESimStatusUninitialized;
if ( aCategory == KPSUidBluetoothSapConnectionState && aKey == KBTSapConnectionState )
{
TInt value( 0 );
@@ -233,9 +232,7 @@
break;
case EBTSapConnecting:
TRACES( RDebug::Print( _L("CSysApBtSapController::HandlePropertyChangedL: EBTSapConnecting, iBtSapEnabled=%d"), iBtSapEnabled ) );
- //Ensure SIM is present
- simStatus = iSysApAppUi.StateOfProperty( KPSUidStartup, KPSSimStatus );
- if ( !iBtSapEnabled && !(simStatus == ESimNotPresent || simStatus == ESimNotSupported))
+ if ( !iBtSapEnabled )
{
iSysApAppUi.InitCloseSimApplicationsL();
}
--- a/coreapplicationuis/SysAp/Src/CenRepObservers/SysApCenRepLogsObserver.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/CenRepObservers/SysApCenRepLogsObserver.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005 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"
@@ -69,6 +69,12 @@
void CSysApCenRepLogsObserver::ConstructL()
{
+ const TUid KCRUidLogs = {0x101F874E};
+ /**
+ * Informs the Logs application about the amount of new missed calls.
+ * Integer type
+ **/
+ const TUint32 KLogsNewMissedCalls = 0x00000006;
TRAPD( err, iSession = CRepository::NewL( KCRUidLogs ) );
TRACES( RDebug::Print( _L("CSysApCenRepLogsObserver::ConstructL: err=%d (KCRUidLogs)"), err ) );
User::LeaveIfError( err );
@@ -79,7 +85,7 @@
KLogsNewMissedCalls );
iNewMissedCallsHandler->StartListeningL();
- User::LeaveIfError(iSession->Get(KLogsNewMissedCalls, iMissedCallsValue));
+ iSession->Get(KLogsNewMissedCalls, iMissedCallsValue);
}
// ----------------------------------------------------------------------------
@@ -148,9 +154,9 @@
if ( iSimChangedCheckDone && iUiReady )
{
- TInt newState( iMissedCallsValue > 0 ? EAknIndicatorStateOn : EAknIndicatorStateOff );
+// TInt newState( iMissedCallsValue > 0 ? EAknIndicatorStateOn : EAknIndicatorStateOff );
- iSysApAppUi.SetIndicatorStateL( EAknIndicatorMissedCalls, newState );
+// iSysApAppUi.SetIndicatorStateL( EAknIndicatorMissedCalls, newState );
}
}
--- a/coreapplicationuis/SysAp/Src/CenRepObservers/SysApCenRepLogsObserver.h Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/CenRepObservers/SysApCenRepLogsObserver.h Tue Aug 31 15:24:25 2010 +0300
@@ -23,7 +23,7 @@
#include <e32base.h>
#include <centralrepository.h>
#include <cenrepnotifyhandler.h>
-#include <LogsDomainCRKeys.h>
+//#include <LogsDomainCRKeys.h>
// FORWARD DECLARATIONS
class CSysApAppUi;
--- a/coreapplicationuis/SysAp/Src/CenRepObservers/sysapcenrepfmtxobserver.cpp Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,140 +0,0 @@
-/*
-* Copyright (c) 2007 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: CSysApCenRepFmTxObserver implementation.
- *
-*/
-
-
-// INCLUDE FILES
-#include <centralrepository.h>
-#include <hwrmfmtx.h>
-#include <hwrmfmtxdomaincrkeys.h>
-#include <hwrmfmtxdomainpskeys.h>
-#include "sysapcenrepfmtxobserver.h"
-#include "SysApAppUi.h"
-#include "SysAp.hrh"
-
-// ========================== MEMBER FUNCTIONS ================================
-
-// ----------------------------------------------------------------------------
-// CSysApCenRepFmTxObserver* CSysApCenRepFmTxObserver::NewL()
-// ----------------------------------------------------------------------------
-
-CSysApCenRepFmTxObserver* CSysApCenRepFmTxObserver::NewL( CSysApAppUi& aSysApAppUi )
- {
- TRACES( RDebug::Print( _L("CSysApCenRepFmTxObserver::NewL" ) ) );
- CSysApCenRepFmTxObserver* self = new ( ELeave ) CSysApCenRepFmTxObserver( aSysApAppUi );
- CleanupStack::PushL( self );
- self->ConstructL();
- CleanupStack::Pop( self );
- return self;
- }
-
-// ----------------------------------------------------------------------------
-// CSysApCenRepFmTxObserver::CSysApCenRepFmTxObserver( CSysApAppUi& aSysApAppUi )
-// ----------------------------------------------------------------------------
-
-CSysApCenRepFmTxObserver::CSysApCenRepFmTxObserver( CSysApAppUi& aSysApAppUi )
- : iSysApAppUi( aSysApAppUi ),
- iSession( NULL ),
- iFmTxPowerStateHandler( NULL ),
- iFrequency( 0 )
- {
- TRACES( RDebug::Print( _L("CSysApCenRepFmTxObserver::CSysApCenRepFmTxObserver" ) ) );
- }
-
-// ----------------------------------------------------------------------------
-// CSysApCenRepFmTxObserver::~CSysApCenRepFmTxObserver()
-// ----------------------------------------------------------------------------
-
-CSysApCenRepFmTxObserver::~CSysApCenRepFmTxObserver()
- {
- TRACES( RDebug::Print( _L("~CSysApCenRepFmTxObserver") ) );
- delete iFmTxPowerStateHandler;
- delete iSession;
- }
-
-// ----------------------------------------------------------------------------
-// CSysApCenRepFmTxObserver::ConstructL()
-// ----------------------------------------------------------------------------
-
-void CSysApCenRepFmTxObserver::ConstructL()
- {
- TRACES( RDebug::Print( _L("CSysApCenRepFmTxObserver::ConstructL: trying CRepository::NewL( KCRUidBluetoothPowerState )") ) );
- iSession = CRepository::NewL( KCRUidFmTxCenRes );
- iFmTxPowerStateHandler =
- CCenRepNotifyHandler::NewL( *this,
- *iSession,
- CCenRepNotifyHandler::EIntKey,
- KFmTxCenResKeyFrequency );
- iFmTxPowerStateHandler->StartListeningL();
- TInt err = iSession->Get( KFmTxCenResKeyFrequency, iFrequency );
- TRACES( RDebug::Print( _L("CSysApCenRepFmTxObserver::ConstructL: err=%d, iFrequency=%d"), err, iFrequency ) );
- User::LeaveIfError( err );
- }
-
-// ----------------------------------------------------------------------------
-// CSysApCenRepFmTxObserver::HandleNotifyInt()
-// ----------------------------------------------------------------------------
-
-void CSysApCenRepFmTxObserver::HandleNotifyInt( TUint32 aId, TInt aNewValue )
- {
- TRACES( RDebug::Print( _L("CSysApCenRepFmTxObserver::HandleNotifyInt(): aId=%d, aNewValue=%d" ), aId, aNewValue ) );
- if ( aId == KFmTxCenResKeyFrequency )
- {
- iFrequency = aNewValue;
- TFmTxState state = static_cast<TFmTxState>(iSysApAppUi.StateOfProperty( KPSUidHWRMFmTx, KHWRMFmTxStatus ));
- switch ( state )
- {
- case EFmTxStateActive:
- case EFmTxStateInactive:
- case EFmTxStatePowerSaveInactivity:
- case EFmTxStatePowerSaveAccessory:
- case EFmTxStateScanning:
- // show "Tune radio to xx.xx MHz" if FM TX is on
- TRAPD( err, iSysApAppUi.ShowUiNoteL( EFmTxOnNote ) );
- if ( err != KErrNone )
- {
- TRACES( RDebug::Print( _L("CSysApCenRepFmTxObserver::HandleNotifyInt(): err=%d" ), err ) );
- }
- break;
-
- default:
- // do nothing
- break;
- }
- }
- }
-
-// ----------------------------------------------------------------------------
-// CSysApCenRepFmTxObserver::HandleNotifyError()
-// ----------------------------------------------------------------------------
-
-void CSysApCenRepFmTxObserver::HandleNotifyError( TUint32 /* aId */, TInt /* error */, CCenRepNotifyHandler* /* aHandler */ )
- {
- TRACES( RDebug::Print( _L("CSysApCenRepFmTxObserver::HandleNotifyError()" ) ) );
- }
-
-// ----------------------------------------------------------------------------
-// CSysApCenRepFmTxObserver::Frequency()
-// ----------------------------------------------------------------------------
-
-TInt CSysApCenRepFmTxObserver::Frequency() const
- {
- return iFrequency;
- }
-
-
-// End of File
-
--- a/coreapplicationuis/SysAp/Src/CenRepObservers/sysapcenrepfmtxobserver.h Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,124 +0,0 @@
-/*
-* Copyright (c) 2007 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: CSysApCenRepFmTxObserver class definition.
-*
-*/
-
-
-#ifndef SYSAPCENREPFMTXOBSERVER_H
-#define SYSAPCENREPFMTXOBSERVER_H
-
-// INCLUDES
-#include <e32base.h>
-#include <cenrepnotifyhandler.h>
-
-
-// FORWARD DECLARATIONS
-class CRepository;
-class CSysApAppUi;
-
-// CLASS DECLARATION
-
-/**
-* CSysApCenRepFmTxObserver
-*
-* Observer class for FM TX related Central Repository keys.
-*
-* @lib None.
-* @since 3.2
-*/
-
-class CSysApCenRepFmTxObserver : public CBase, public MCenRepNotifyHandlerCallback
- {
- public: // Constructors and destructor
- /**
- * Symbian two-phased constructor.
- */
- static CSysApCenRepFmTxObserver* NewL( CSysApAppUi& aSysApAppUi );
-
- /**
- * Destructor.
- */
- virtual ~CSysApCenRepFmTxObserver();
-
- private:
-
- /**
- * Symbian 2nd-phase constructor.
- * @param None
- * @return void
- */
- void ConstructL( );
-
- /**
- * Constructor
- * @param CSysApAppUi& aSysApAppUi
- * @return void
- */
- CSysApCenRepFmTxObserver( CSysApAppUi& aSysApAppUi );
-
- /**
- * C++ default constructor.
- * @param None
- * @return void
- */
- CSysApCenRepFmTxObserver();
-
- public: // From MCenRepNotifyHandlerCallback
- void HandleNotifyInt( TUint32 aId, TInt aNewValue );
- void HandleNotifyError( TUint32 aId, TInt error, CCenRepNotifyHandler* aHandler );
-
- public: // Other functions
-
- /**
- * Returns the current frequency
- *
- * @return TInt
- */
- TInt Frequency() const;
-
- private:
- // By default, prohibit copy constructor
- CSysApCenRepFmTxObserver( const CSysApCenRepFmTxObserver& );
-
- // Prohibit assigment operator
- CSysApCenRepFmTxObserver& operator= ( const CSysApCenRepFmTxObserver& );
-
- private:
- /**
- * SysAp application class.
- */
- CSysApAppUi& iSysApAppUi;
-
- /**
- * CenRep session for FM TX keys.
- * Own.
- */
- CRepository* iSession;
-
- /**
- * Notify handler for FM TX CenRep key.
- * Own.
- */
- CCenRepNotifyHandler* iFmTxPowerStateHandler;
-
- /**
- * Tuned FM TX frequency.
- */
- TInt iFrequency;
- };
-
-#endif // SYSAPCENREPFMTXOBSERVER_H
-
-// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/SysAp/Src/CenRepObservers/sysapcenrepofflinemodeobserver.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,149 @@
+/*
+ * Copyright (c) 2005-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:
+ * CSysApCenRepOfflineModeObserver is a an observer for the Offline Mode central Repository key.
+ * This class handles the changes to the offline mode changes done from Power Menu or Control Panel
+ *
+ */
+
+#include "sysapcenrepofflinemodeobserver.h"
+#include "CoreApplicationUIsSDKCRKeys.h"
+#include "SysAp.hrh"
+
+#ifdef _DEBUG
+#include <e32debug.h>
+#endif
+
+// ----------------------------------------------------------------------------
+// CSysApCenRepOfflineModeObserver::NewL( MSysApOfflineModeController& )
+// Creates an instance of CSysApCenRepOfflineModeObserver and returns
+// ----------------------------------------------------------------------------
+
+CSysApCenRepOfflineModeObserver* CSysApCenRepOfflineModeObserver::NewL(
+ MSysApOfflineModeController& aSysApOfflineModeController )
+ {
+ TRACES( RDebug::Printf("CSysApCenRepOfflineModeObserver::NewL") );
+ CSysApCenRepOfflineModeObserver* self =
+ new (ELeave) CSysApCenRepOfflineModeObserver(aSysApOfflineModeController);
+ CleanupStack::PushL( self );
+ self->ConstructL();
+ CleanupStack::Pop(); //self
+ return self;
+ }
+
+
+// ----------------------------------------------------------------------------
+// CSysApCenRepOfflineModeObserver::CSysApCenRepOfflineModeObserver( MSysApOfflineModeController& )
+// ----------------------------------------------------------------------------
+
+CSysApCenRepOfflineModeObserver::CSysApCenRepOfflineModeObserver(
+ MSysApOfflineModeController& aSysApOfflineModeController )
+ : iSysApOfflineModeController( aSysApOfflineModeController )
+ {
+ TRACES( RDebug::Printf("CSysApCenRepOfflineModeObserver::CSysApCenRepOfflineModeObserver" ) );
+ }
+
+// ----------------------------------------------------------------------------
+// CSysApCenRepOfflineModeObserver::~CSysApCenRepOfflineModeObserver()
+// ----------------------------------------------------------------------------
+
+CSysApCenRepOfflineModeObserver::~CSysApCenRepOfflineModeObserver()
+ {
+ TRACES( RDebug::Printf("~CSysApCenRepOfflineModeObserver" ) );
+ if( iOfflineModeHandler )
+ {
+ iOfflineModeHandler->StopListening();
+ }
+ delete iOfflineModeHandler;
+ delete iOfflineCenRep;
+ }
+
+// ----------------------------------------------------------------------------
+// CSysApCenRepOfflineModeObserver::ConstructL()
+// ----------------------------------------------------------------------------
+
+void CSysApCenRepOfflineModeObserver::ConstructL()
+ {
+ TRACES(RDebug::Printf("CSysApCenRepOfflineModeObserver::ConstructL: trying CRepository::NewL(KCRUidCoreApplicationUIs)"));
+
+ iOfflineCenRep = CRepository::NewL( KCRUidCoreApplicationUIs );
+
+ iOfflineModeHandler =
+ CCenRepNotifyHandler::NewL( *this,
+ *iOfflineCenRep,
+ CCenRepNotifyHandler::EIntKey,
+ KCoreAppUIsNetworkConnectionAllowed );
+ iOfflineModeHandler->StartListeningL();
+ }
+
+// ----------------------------------------------------------------------------
+// CSysApCenRepOfflineModeObserver::HandleNotifyInt()
+// Handles the changes to offline mode state
+// ----------------------------------------------------------------------------
+
+void CSysApCenRepOfflineModeObserver::HandleNotifyInt( TUint32 aId, TInt aNewValue )
+ {
+ TRACES(RDebug::Printf("CSysApCenRepOfflineModeObserver::HandleNotifyInt(), aId=0x%x, aNewValue=%d", aId, aNewValue));
+ if ( aId == KCoreAppUIsNetworkConnectionAllowed )
+ {
+ if( aNewValue == ECoreAppUIsNetworkConnectionNotAllowed )
+ {
+ // Offline mode enabled. Go Offline
+ TRACES( RDebug::Printf("CSysApCenRepOfflineModeObserver::HandleNotifyInt() Offline mode Enabled"));
+ // Ignore any leave because it will have already been handled by showing an
+ // error notification to the user
+ TRAP_IGNORE(iSysApOfflineModeController.SwitchFromOnlineToOfflineModeL());
+ }
+ else if( aNewValue == ECoreAppUIsNetworkConnectionAllowed )
+ {
+ // Offline mode disabled. Go Online
+ TRACES( RDebug::Printf("CSysApCenRepOfflineModeObserver::HandleNotifyInt() Offline mode Disabled"));
+ // Ignore any leave because it will have already been handled by showing an
+ // error notification to the user
+ TRAP_IGNORE(iSysApOfflineModeController.GoOnlineIfOkL());
+ }
+ else
+ {
+ // Any other value is invalid
+ TRACES(RDebug::Printf("CSysApCenRepOfflineModeObserver::HandleNotifyInt() Invalid Value %d", aNewValue));
+ }
+ }
+ }
+
+// ----------------------------------------------------------------------------
+// CSysApCenRepOfflineModeObserver::HandleNotifyError()
+// ----------------------------------------------------------------------------
+
+void CSysApCenRepOfflineModeObserver::HandleNotifyError( TUint32, TInt, CCenRepNotifyHandler* )
+ {
+ TRACES(RDebug::Printf("CSysApCenRepOfflineModeObserver::HandleNotifyError()"));
+ // Nothing to do if start listening leaves
+ TRAP_IGNORE(iOfflineModeHandler->StartListeningL());
+ }
+
+
+
+// ----------------------------------------------------------------------------
+// CSysApCenRepOfflineModeObserver::IsOffline()
+// Fetches the Cen Rep for Offline mode and
+// Return true if Offline mode is enabled, false otherwise
+// ----------------------------------------------------------------------------
+TBool CSysApCenRepOfflineModeObserver::IsOffline() const
+ {
+ TRACES(RDebug::Printf("CSysApCenRepOfflineModeObserver::IsOffline"));
+ TBool nwConnAllowed = ETrue;
+ iOfflineCenRep->Get(KCoreAppUIsNetworkConnectionAllowed, nwConnAllowed);
+ TRACES(RDebug::Printf("CSysApCenRepOfflineModeObserver::IsOffline returns %d",!nwConnAllowed));
+ return !nwConnAllowed;
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/SysAp/Src/CenRepObservers/sysapcenrepofflinemodeobserver.h Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,102 @@
+/*
+ * 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:
+ * CSysApCenRepOfflineModeObserver is a an observer for the Offline Mode central Repository key.
+ * This class handles the changes to the offline mode changes done from Power Menu or Control Panel
+ *
+ */
+
+
+#ifndef SYSAPCENREPOFFLINEMODEOBSERVER_H
+#define SYSAPCENREPOFFLINEMODEOBSERVER_H
+
+// INCLUDES
+#include <e32base.h>
+#include <centralrepository.h>
+#include <cenrepnotifyhandler.h>
+
+#include "MSysApOfflineModeController.h"
+
+NONSHARABLE_CLASS(CSysApCenRepOfflineModeObserver) : public CBase,
+ public MCenRepNotifyHandlerCallback
+ {
+public: // Constructors and destructor
+ /**
+ * Default constructor
+ */
+ static CSysApCenRepOfflineModeObserver* NewL(
+ MSysApOfflineModeController& aSysApOfflineModeController );
+
+ /**
+ * Destructor.
+ */
+ ~CSysApCenRepOfflineModeObserver();
+
+private:
+ /**
+ * Two phase ConstructL
+ */
+ void ConstructL( );
+
+ /**
+ * Constructor
+ * @param aSysApOfflineModeController is the instance of Offline mode controller
+ */
+ CSysApCenRepOfflineModeObserver( MSysApOfflineModeController& aSysApOfflineModeController );
+
+ /**
+ * default constructor.
+ */
+ CSysApCenRepOfflineModeObserver();
+
+public: // From MCenRepNotifyHandlerCallback
+ /**
+ * Handles the changes to offline mode state
+ * @param aId is the cen rep key which was changed
+ * @param aNewValue is the new value
+ */
+ void HandleNotifyInt( TUint32 aId, TInt aNewValue );
+
+ /**
+ * Handles the error in changing offline mode state
+ * @param aId is the cen rep key which was changed
+ * @param aError is the error id
+ * @param aHandler is Offline cep rep handler same as iOfflineModeHandler
+ */
+ void HandleNotifyError( TUint32 aId, TInt aError, CCenRepNotifyHandler* aHandler );
+
+ /**
+ * Returns whether Offline mode is currently active or not
+ * @return ETrue if Offline mode is active, else EFalse
+ */
+ TBool IsOffline() const;
+
+private:
+ /**
+ * Instance of Offline mode controller. Used for enabling or disabling offline mode
+ */
+ MSysApOfflineModeController& iSysApOfflineModeController;
+
+ /**
+ * Central Repository for gettting the Offline Mode
+ */
+ CRepository* iOfflineCenRep;
+
+ /**
+ * Handler to the cen rep for listening to the offline changes
+ */
+ CCenRepNotifyHandler* iOfflineModeHandler;
+ };
+
+#endif // SYSAPCENREPBTOBSERVER_H
--- a/coreapplicationuis/SysAp/Src/OfflineModeController/SysApOfflineModeControllerImpl.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/OfflineModeController/SysApOfflineModeControllerImpl.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,19 +1,22 @@
/*
-* Copyright (c) 2005-2008 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: CSysApOfflineModeController implementation
+ * Copyright (c) 2005-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:
+ * CSysApOfflineModeController controls the offline mode.
+ * It turns OFF RF, BT and WLAN when offline mode is enabled and turns them ON when
+ * Offline mode is disabled
+ *
+ */
// INCLUDES
@@ -23,8 +26,10 @@
#include "SysAp.hrh"
#include "DosSvrServices.h"
#include "SysApCenRepController.h"
+#include "sysapcenrepofflinemodeobserver.h"
#include <startupdomainpskeys.h>
#include <PSVariables.h>
+#include <wlandevicesettingsinternalcrkeys.h> // For Turning ON/OFF WLAN
MSysApOfflineModeController* CreateSysApOfflineModeControllerL( CSysApAppUi& aSysApAppUi )
@@ -53,22 +58,18 @@
void CSysApOfflineModeController::ConstructL()
{
TRACES( RDebug::Print( _L("CSysApOfflineModeController::ConstructL") ) );
- // Check the active profile
- TInt activeProfile( iSysApAppUi.ActiveProfileId() );
- activeProfile = iSysApAppUi.ActiveProfileId();
- if ( activeProfile == KOfflineModeProfileId )
- {
- iOfflineModeActive = ETrue;
- }
+
+ // create an observer for Offline Mode
+ TRACES( RDebug::Print( _L("CSysApOfflineModeController::ConstructL: trying CSysApCenRepOfflineModeObserver::NewL") ) );
+ iSysApCenRepOfflineModeObserver = CSysApCenRepOfflineModeObserver::NewL(*this );
+ iOfflineModeActive = iSysApCenRepOfflineModeObserver->IsOffline();
}
// ----------------------------------------------------------------------------
// CSysApOfflineModeController::CSysApOfflineModeController()
// ----------------------------------------------------------------------------
CSysApOfflineModeController::CSysApOfflineModeController( CSysApAppUi& aSysApAppUi ) :
- iSysApAppUi( aSysApAppUi ),
- iOfflineModeActive( EFalse ),
- iDoNotActivateRF( EFalse )
+ iSysApAppUi( aSysApAppUi )
{
}
@@ -79,6 +80,7 @@
CSysApOfflineModeController::~CSysApOfflineModeController()
{
+ delete iSysApCenRepOfflineModeObserver;
}
// ----------------------------------------------------------------------------
@@ -87,6 +89,7 @@
TBool CSysApOfflineModeController::OfflineModeActive()
{
+ TRACES( RDebug::Print( _L("CSysApOfflineModeController::OfflineModeActive returns %d"), iOfflineModeActive ) );
return iOfflineModeActive;
}
@@ -97,6 +100,7 @@
void CSysApOfflineModeController::SwitchFromOnlineToOfflineModeL()
{
TRACES( RDebug::Print( _L("CSysApOfflineModeController::SwitchFromOnlineToOfflineModeL") ) );
+
TInt err ( 0 );
// Set state to starter. Note that if state is same as the current state, then nothing happens.
@@ -104,7 +108,6 @@
if ( err )
{
- iSysApAppUi.RestoreProfileL( EFalse );
iSysApAppUi.ShowUiNoteL( ECannotActivateOfflineModeNote );
}
else
@@ -119,8 +122,22 @@
SetBtActiveBeforeOfflineMode( ETrue ); // Update "BT active" setting
TRACES( RDebug::Print( _L("CSysApOfflineModeController SetBtPowerStateL returned %d"), err ) );
}
-
- iSysApAppUi.OfflineModeChangedL();
+ /* Turn OFF WLAN */
+ TInt err( KErrNone );
+ CRepository* repository = CRepository::NewL( KCRUidWlanDeviceSettingsRegistryId );
+ err = repository->Set(KWlanOnOff, 0);
+ delete repository;
+ if(err)
+ {
+ TRACES( RDebug::Printf("CSysApOfflineModeController::SwitchFromOnlineToOfflineModeL Could not disable WLAN") );
+ User::Leave(err);
+ }
+ else
+ {
+ TRACES( RDebug::Printf("CSysApOfflineModeController::SwitchFromOnlineToOfflineModeL WLAN Disabled" ) );
+ }
+
+ iSysApAppUi.OfflineModeChangedL();
}
}
@@ -144,7 +161,6 @@
if ( err )
{
- iSysApAppUi.RestoreProfileL( ETrue );
iSysApAppUi.ShowUiNoteL( ECannotDeactivateOfflineModeNote );
}
else
@@ -159,11 +175,25 @@
TRACES( RDebug::Print( _L("CSysApOfflineModeController SetBtPowerStateL returned %d"), err ) );
}
- iSysApAppUi.OfflineModeChangedL();
+ /* Turn ON WLAN */
+ TInt err( KErrNone );
+ CRepository* repository = CRepository::NewL( KCRUidWlanDeviceSettingsRegistryId );
+ err = repository->Set(KWlanOnOff, 1);
+ delete repository;
+ if(err)
+ {
+ TRACES( RDebug::Printf("CSysApOfflineModeController::SwitchFromOfflineToOnlineModeL Could not enable WLAN") );
+ User::Leave(err);
+ }
+ else
+ {
+ TRACES( RDebug::Printf("CSysApOfflineModeController::SwitchFromOfflineToOnlineModeL WLAN Enabled") );
+ }
- iSysApAppUi.SetNetworkConnectionAllowed( ECoreAppUIsNetworkConnectionAllowed );
- }
- }
+ iSysApAppUi.OfflineModeChangedL();
+ iSysApAppUi.SetNetworkConnectionAllowed( ECoreAppUIsNetworkConnectionAllowed );
+ }
+ }
// ----------------------------------------------------------------------------
// CSysApOfflineModeController::CheckOfflineModeInitialStatusesL()
@@ -204,10 +234,12 @@
( iSysApAppUi.BtSapEnabled() && simStatus != ESimNotPresent ) ||
simStatus == ESimUsable )
{
- iSysApAppUi.ShowQueryL( ESysApLeaveOfflineModeQuery );
+ TRACES( RDebug::Printf("CSysApOfflineModeController::GoOnlineIfOkL SIM check PASSED") );
+ SwitchFromOfflineToOnlineModeL();
}
else
{
+ TRACES( RDebug::Printf("CSysApOfflineModeController::GoOnlineIfOkL SIM check FALIED" ) );
iSysApAppUi.ShowUiNoteL( EInsertSimNote );
}
}
@@ -233,6 +265,7 @@
TInt btToBeActivated = iSysApAppUi.CenRepController().GetInt( KCRUidCoreApplicationUIsSysAp,
KSysApBtStatusBeforeOfflineMode,
&err );
+
if ( err )
{
TRACES( RDebug::Print( _L("CSysApOfflineModeController::BtActiveBeforeOfflineMode: ERROR: %d" ), err ) );
@@ -241,6 +274,7 @@
else
{
return ( TBool ) btToBeActivated;
+ //return ETrue;
}
}
@@ -253,6 +287,7 @@
return BtActiveBeforeOfflineMode();
}
+
// End of File
--- a/coreapplicationuis/SysAp/Src/OfflineModeController/SysApOfflineModeControllerImpl.h Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/OfflineModeController/SysApOfflineModeControllerImpl.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,19 +1,22 @@
/*
-* Copyright (c) 2005 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: The stub implementation of MSysApOfflineModeController.
-*
-*/
+ * Copyright (c) 2005-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:
+ * CSysApOfflineModeController controls the offline mode.
+ * It turns OFF RF, BT and WLAN when offline mode is enabled and turns them ON when
+ * Offline mode is disabled
+ *
+ */
#ifndef SYSAPOFFLINEMODECONTROLLERIMPL_H
@@ -27,6 +30,7 @@
// FORWARD DECLARATIONS
class CSysApAppUi;
+class CSysApCenRepOfflineModeObserver;
// CLASS DECLARATION
/**
@@ -160,6 +164,11 @@
private:
CSysApAppUi& iSysApAppUi;
+
+ /**
+ * Instance of the Offline mode observer. Listens to offline mode changes
+ */
+ CSysApCenRepOfflineModeObserver* iSysApCenRepOfflineModeObserver;
TBool iOfflineModeActive;
TBool iDoNotActivateRF;
--- a/coreapplicationuis/SysAp/Src/SysApAccessoryObserver.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/SysApAccessoryObserver.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -20,6 +20,8 @@
#include "SysApAccessoryObserver.h"
#include "SysAp.hrh"
#include "SysApAppUi.h"
+#include <Accpolgenericidarray.h>
+#include <Accpolgenericid.h>
#include <e32svr.h> // RDebug
@@ -59,6 +61,7 @@
TRACES( RDebug::Print( _L("CSysApAccessoryObserver::~CSysApAccessoryObserver") ) );
Cancel();
iAccessoryMode.CloseSubSession();
+ iAccessoryConnection.CloseSubSession();
iAccessoryServer.Close();
}
@@ -92,9 +95,51 @@
TRACES( RDebug::Print( _L("CSysApAccessoryObserver::ConstructL(): iAccMode.iAccessoryMode=%d" ), iAccMode.iAccessoryMode ) );
iPreviousMode = iAccMode.iAccessoryMode;
}
+ TRACES( RDebug::Print( _L("CSysApAccessoryObserver::ConstructL(): trying RAccessoryConnection::CreateSubSession" ) ) );
+ err = iAccessoryConnection.CreateSubSession( iAccessoryServer );
+ if ( err == KErrNone )
+ {
+ TRACES( RDebug::Print( _L("CSysApAccessoryObserver::ConstructL(): connection to RAccessoryConnection established" ) ) );
+ TAccPolGenericIDArray iAccGenericIDArray;
+ err = iAccessoryConnection.GetAccessoryConnectionStatus( iAccGenericIDArray );
+ if ( err == KErrNone )
+ {
+ TInt iIndex = 0;
+ TAccPolGenericID iAccGenericID = iAccGenericIDArray.GetGenericIDL( iIndex );
+ TUint iPhysicalConnection = iAccGenericID.PhysicalConnectionCaps();
+ if (iPhysicalConnection & KPCWired)
+ {
+ iPhysicalConnectionType = KPCWired;
+ }
+ else if (iPhysicalConnection & KPCBluetooth)
+ {
+ iPhysicalConnectionType = KPCBluetooth;
+ }
+ else if (iPhysicalConnection & KPCInfraRed)
+ {
+ iPhysicalConnectionType = KPCInfraRed;
+ }
+ else if (iPhysicalConnection & KPCUSB)
+ {
+ iPhysicalConnectionType = KPCUSB;
+ }
+ else if (iPhysicalConnection & KPCHDMI)
+ {
+ iPhysicalConnectionType = KPCHDMI;
+ }
iAccessoryMode.NotifyAccessoryModeChanged( iStatus, iAccMode );
SetActive();
+ }
+ else
+ {
+ TRACES( RDebug::Print( _L("CSysApAccessoryObserver::ConstructL(): Error in Getting AccessoryConnectionStatus Error: %d " ),err ) );
+ }
+ }
+ else
+ {
+ TRACES( RDebug::Print( _L("CSysApAccessoryObserver::ConstructL(): RAccessoryConnection::CreateSubSession - Error: %d" ), err ) );
+ }
}
else
{
@@ -115,6 +160,7 @@
{
TRACES( RDebug::Print( _L("CSysApAccessoryObserver::DoCancel()" ) ) );
iAccessoryMode.CancelNotifyAccessoryModeChanged();
+ iAccessoryConnection.CancelGetAccessoryConnectionStatus();
}
// ----------------------------------------------------------------------------
@@ -133,7 +179,37 @@
}
else if ( iAccMode.iAccessoryMode != iPreviousMode ) // for filtering audio output change notifications
{
- iSysApAppUi.HandleAccessoryConnectedL( iAccMode.iAccessoryMode );
+ TInt err( KErrNone );
+ TAccPolGenericIDArray iAccGenericIDArray;
+ err = iAccessoryConnection.GetAccessoryConnectionStatus( iAccGenericIDArray );
+ if ( err == KErrNone )
+ {
+ TInt iIndex = 0;
+ TAccPolGenericID iAccGenericID = iAccGenericIDArray.GetGenericIDL( iIndex );
+ TUint iPhysicalConnection = iAccGenericID.PhysicalConnectionCaps();
+ if ( iPhysicalConnection & KPCWired )
+ {
+ iPhysicalConnectionType = KPCWired;
+ }
+ else if ( iPhysicalConnection & KPCBluetooth )
+ {
+ iPhysicalConnectionType = KPCBluetooth;
+ }
+ else if ( iPhysicalConnection & KPCInfraRed )
+ {
+ iPhysicalConnectionType = KPCInfraRed;
+ }
+ else if ( iPhysicalConnection & KPCUSB )
+ {
+ iPhysicalConnectionType = KPCUSB;
+ }
+ else if ( iPhysicalConnection & KPCHDMI )
+ {
+ iPhysicalConnectionType = KPCHDMI;
+ }
+ }
+ TRACES( RDebug::Print( _L("CSysApAccessoryObserver::RunL: iAccessoryMode: %d, iPhysicalConnectionType: %d" ), iAccMode.iAccessoryMode,iPhysicalConnectionType ) );
+ iSysApAppUi.HandleAccessoryConnectedL( iAccMode.iAccessoryMode,iPhysicalConnectionType );
}
iPreviousMode = iAccMode.iAccessoryMode;
@@ -168,6 +244,14 @@
return iAccMode.iAccessoryMode;
}
+
+// ----------------------------------------------------------------------------
+// CSysApAccessoryObserver::GetAccessoryConnectionType() const
+// ----------------------------------------------------------------------------
+TInt CSysApAccessoryObserver::GetAccessoryConnectionType() const
+ {
+ return iPhysicalConnectionType;
+ }
// End of File
--- a/coreapplicationuis/SysAp/Src/SysApApp.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/SysApApp.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -40,6 +40,8 @@
CApaDocument* CSysApApp::CreateDocumentL()
{
return new( ELeave ) CSysApDocument( *this );
+
+ // return CSysApDocument::NewL(*this);
}
// ===================== OTHER EXPORTED FUNCTIONS ============================
--- a/coreapplicationuis/SysAp/Src/SysApAppUi.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/SysApAppUi.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -14,183 +14,92 @@
* Description: CSysApAppUi implementation.
*
*/
-
-
// INCLUDES
-#include<akndiscreetpopup.h>
-#include <avkon.hrh>
-#include <avkon.rsg>
-#include <eikon.hrh>
-#include <apgwgnam.h>
-#include <eiksrv.h>
-#include <eikdll.h>
-#include <AknSmallIndicator.h>
-#include <AknBatteryNotify.h>
-#include <AknSignalNotify.h>
-#include <AknGlobalNote.h>
-#include <AknGlobalListQuery.h>
-#include <aknsoundsystem.h>
-#include <apgcli.h>
-
-#include <hwrmpowerstatesdkpskeys.h>
-#include <hwrmdomainpskeys.h>
-
-#include <PSVariables.h>
-#include "CoreApplicationUIsPrivatePSKeys.h"
-#include <ctsydomainpskeys.h>
#include <startupdomainpskeys.h>
-#include <startupdomaincrkeys.h>
-
-#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
- #include <ASShdAlarm.h>
-#else
- #include <asshddefs.h>
- #include <ASShdAlarmCal.h>
- #include <asshdalarm.h>
-#endif //SYMBIAN_ENABLE_SPLIT_HEADERS
-
-#include <MProfileEngine.h>
-#include <MProfileName.h>
-#include <MProfilesNamesArray.h>
-#include <MProfile.h>
-#include <StringLoader.h>
+#include "sysapappui.h"
+#include "coreapplicationuisprivatepskeys.h"
+#include <HbDeviceMessageBoxSymbian.h>
+//#include <hbdevicepowermenusymbian.h>
+#include <sacls.h>
+#include <featmgr.h>
+#include <DevEncProtectedPSKey.h>
+#include <ctsydomainpskeys.h>
#include <secuisystemlock.h>
-#include <secui.h>
-#include <settingsinternalcrkeys.h>
-
-#include "sysapganhandler.h"
-#include <AknNotifierController.h>
-#include <eikappui.h>
-#include <es_enum.h>
-#include <data_caging_path_literals.hrh>
-#include <eikon.hrh>
-
-#include "SysApSimChanged.h"
-
-#include <SysAp.rsg>
-#include "SysApLightsController.h"
-
+#include <apgtask.h>
+#include <hwrmpowerstatesdkpskeys.h>
+#include <wlaninternalpskeys.h>
+#include <HbDeviceNotificationDialogSymbian.h>
+#include <hbsymbianvariant.h>
+#include <hbtextresolversymbian.h>
+#include <UikonInternalPSKeys.h>
+
+//#include "SysApWsClient.h"
+#include "SysApFeatureManager.h"
+#include "SysApNspsHandler.h"
#include "SysApPubSubObserver.h"
-#include "SysApProfileObserver.h"
-
+#include "sysapdefaultkeyhandler.h"
+#include "SysApStartupController.h"
+#include "MSysApOfflineModeController.h"
+#include "SysApCenRepController.h"
#include "sysapcenreplightsettingsobserver.h"
#include "SysApCenRepLogsObserver.h"
#include "SysApCenRepBTObserver.h"
#include "SysApCenRepHacSettingObserver.h"
-#include "SysApCenRepController.h"
-#include "CoreApplicationUIsPrivateCRKeys.h"
-#include "CoreApplicationUIsPrivatePSKeys.h"
-#include <UikonInternalPSKeys.h>
-
-#include "SysApStartupController.h"
-#include "SysApConnectionMonitorObserver.h"
-#include "SysApPowerKeyMenuObserver.h"
-#include "SysApSsSettingsObserver.h"
-#include "SysApAppUi.h"
+#include "sysapaudioroutingobserver.h"
+#include "sysapbatteryinfocontroller.h"
+#include "SysApSimChanged.h"
+#include "MSysApBtSapController.h"
+#include "MSysApBtController.h"
+#include "MSysApUsbIndicator.h"
+#include "sysapkeymanagement.h"
#include "SysApShutdownImage.h"
-#include "SysApEtelConnector.h"
-
-#include "SysApApp.h"
-#include "SysApMsgSimMemLowQuery.h"
-#include "SysApNspsHandler.h"
-#include "SysApWaitNote.h"
-#include "SysApConfirmationQuery.h"
-#include "SysApFeatureManager.h"
-#include "SysApSubscriber.h"
-#include "MSysApOfflineModeController.h"
-#include "MSysApBtController.h"
-#include "MSysApBtSapController.h"
-#include "MSysApLocationPrivacyIndicator.h"
-#include "MSysApUsbIndicator.h"
-
-#include <sysap.mbg>
+#include "SysApKeySndHandler.h"
#include "SysApShutdownAnimation.h"
-
-#include <hwrmfmtx.h>
-#include <hwrmfmtxdomainpskeys.h>
-#include <hwrmfmtxdomaincrkeys.h>
-#include "sysapcenrepfmtxobserver.h"
-
-#include "SysApKeySndHandler.h"
-
-#include <ir_sock.h> // KIrdaPropertyCategory // KIrdaStatus
-
-#include <NetworkHandlingDomainPSKeys.h>
-
-// POC launching
-#include <AiwServiceHandler.h>
-#include <AiwPoCParameters.h>
-
-#include <sacls.h> // KUidPhonePwr
-
-#include <wlaninternalpskeys.h> // WLan indicator
-
-#include <ecom/ecom.h>
-#include "sysapkeymanagement.h"
-
-#include "SysApMediatorObserver.h"
-
-#include <secondarydisplay/SecondaryDisplaySysApAPI.h>
-#include "aknSDData.h"
-
-#include <AknTaskList.h>
-#include <layoutmetadata.cdl.h>
-
-#include "sysapdefaultkeyhandler.h"
-#include "sysapaudioroutingobserver.h"
-#include "sysapcenrepcallforwardingobserver.h"
-#include "sysapcenrepmsgwaitingobserver.h"
+#include "SysApEtelConnector.h"
#ifdef RD_MULTIPLE_DRIVE
- #include "sysapdrivelist.h"
- #include "sysapdriveunlockhandler.h"
- #include "sysapdriveejecthandler.h"
+#include "sysapdrivelist.h"
+#include "sysapdriveunlockhandler.h"
+#include "sysapdriveejecthandler.h"
+#include "hbdeviceinputdialogsymbian.h"
#endif // RD_MULTIPLE_DRIVE
-#include "sysappsmcontroller.h"
-#include "sysapbatteryinfocontroller.h"
-
-#include <keylockpolicyapi.h>
-
+#include <settingsinternalcrkeys.h>
+#include <keyguardaccessapi.h>
+#include <eikdef.h>
+#include <eikenv.h>
#include <UsbWatcherInternalPSKeys.h> // USB transfer modes
#include <usbpersonalityids.h>
-#include <smsuaddr.h>
-#include <featmgr.h>
-#include <DevEncProtectedPSKey.h>
-
-// CONSTANTS
-const TInt KPowerKeyMenuSelectionCancelled( -1 );
-const TInt KPowerKeyMenuSelectionSwitchOff( 0 );
+#include "sysap.rsg"
+#include <hbindicatorsymbian.h>
+
+class CHbSymbianVariant;
const TInt KModifierMask( 0 );
-const TInt KDelayBeforeShuttingDownInAlarmAndChargingStates( 500000 );
-const TInt KDelayBeforeShowingGprsSuspendedNote( 500000 );
+_LIT_SECURITY_POLICY_PASS(KAlwaysPassPolicy);
+_LIT_SECURITY_POLICY_C1(KWriteDeviceDataPolicy, ECapabilityWriteDeviceData);
const TInt KDelayBeforeNextScanningRound( 1000000 );
-const TInt KActiveProfile( 0 ); //The value of ActiveProfile for accessory default profile selection in GS/SD.
-const TInt KProfileListInitialIndex( 0 );
-const TInt KMaxProfileNameLength( 64 );
-const TInt KTimeToShowShutdownNote( 2000000 ); //2 seconds time for Goodbye note to show before being shutdown
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
-const TInt KCoefficientToMakeMicroToMilliSeconds = 1000;
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
/* ENABLE ANIMATION: Add id of background image.
Example: const TInt KBackgroundImageID = EMbmSysapQgn_graf_startup_bg;
If there is no image defined, clear screen is used.*/
const TInt KBackgroundImageID = 0;
-#ifndef RD_MULTIPLE_DRIVE
-const TInt32 KAutolockAppUid = 0x100059B5;
-const TInt KFileManagerAppUid = 0x101F84EB;
-#endif // RD_MULTIPLE_DRIVE
-const TInt KCoefficientKhzToMhz = 1000;
-const TInt KDecimalsInMhzFrequency = 2;
-
-const TInt KHWSwitchGroup( 29 );
-const TInt KHWSwitchGrip( 2 );
-
-_LIT_SECURITY_POLICY_PASS(KAlwaysPassPolicy);
-_LIT_SECURITY_POLICY_C1(KWriteDeviceDataPolicy, ECapabilityWriteDeviceData);
+
+
+_LIT(KAccesoryPlugin,"com.nokia.accessory.indicatorplugin/1.0");
+_LIT(KAccMode, "AccMode");
+_LIT(KAccPhyConType, "AccType");
+
+_LIT(KPsmPlugin,"com.nokia.hb.powersavemodeplugin/1.0");
+_LIT(KPsm,"PSM");
+_LIT(KCharging,"Charging");
+_LIT(KPsmlocalisationfile, "powermanagement_");
+_LIT(KtsfilePath, "z:/resource/qt/translations/");
+_LIT(KlowbatteryIcon,"qtg_small_bt_low_battery.svg");
+_LIT(KbatteryFullIcon,"qtg_status_battery.svg");
+
+
// ============================ MEMBER FUNCTIONS ==============================
@@ -198,60 +107,27 @@
// CSysApAppUi::CSysApAppUi()
// ----------------------------------------------------------------------------
-CSysApAppUi::CSysApAppUi() :
- iSysApCenRepLogsObserver( NULL ),
- iSysApCenRepHacSettingObserver( NULL ),
- iSysApPowerKeyMenuObserver( NULL ),
- iSysApShutdownImage( NULL ),
- iSysApConfirmationQuery( NULL ),
- iSysApConfirmationQueryForRestart( NULL ),
- iSignalNotify( NULL ),
-#ifndef RD_MULTIPLE_DRIVE
- iMemoryCardDialog( 0 ),
-#endif // RD_MULTIPLE_DRIVE
- iPowerKeyPopupMenuActive( EFalse ),
- iDisablePowerkeyMenu( EFalse ),
- iDeviceLockEnabled( EFalse ),
- iKeyLockEnabled( EFalse ),
- iShowkeypadActivatedNoteAfterSoftReject( EFalse ),
- iEmergencyCallActive( EFalse ),
- iSimChangedDone( EFalse ),
- iResourcesFreed( EFalse ),
-#ifndef RD_MULTIPLE_DRIVE
- iHideFirstBeep( ETrue ),
-#endif // RD_MULTIPLE_DRIVE
- iShutdownStarted( EFalse ),
- iIgnoreAccessorySpecificProfileChanges( ETrue ),
- iAccessoryJustConnected( EFalse ),
- iHandleNextProfileEvent( ETrue ),
- iActivateBt( EFalse ),
- iDeactivateBt( EFalse ),
- iGprsActivated( EFalse ),
- iGprsSuspended( EFalse ),
- iCallActivated( EFalse ),
- iGprsSuspendedNoteShown( EFalse ),
- iMMCEjectUsed( EFalse ),
-#ifndef RD_MULTIPLE_DRIVE
- iMMCPowerMenuEjectUsed( EFalse ),
- iMMCInserted( EFalse ),
-#endif // RD_MULTIPLE_DRIVE
- iTimer( NULL ),
- iSapTimer( NULL ),
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
- iAnimTimer( NULL ),
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
- iSysApTimer( NULL ),
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
- iAnimationShowingTime( 0 ),
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
- iShutdownContinued( EFalse ),
- iSysApAudioRoutingObserver( NULL ),
- iSysApCenRepCallForwardingObserver( NULL ),
- iSysApCenRepMsgWaitingObserver( NULL ),
- iSysApGanHandler( NULL ),
- iKeyBoardRepeatCount(-1)
- {
- TRACES( RDebug::Print( _L("CSysApAppUi::CSysApAppUi()") ) );
+CSysApAppUi::CSysApAppUi()
+ :iSysApShutdownImage(NULL),
+ iPowerMenuDialog(NULL),
+ iDeviceLockEnabled(EFalse),
+ iKeyLockEnabled(EFalse),
+ iPowerKeyPopupMenuActive(EFalse),
+ iResourcesFreed (EFalse),
+ iShutdownStarted (EFalse),
+ iSysApAudioRoutingObserver (NULL),
+ iSysApBatteryInfoController (NULL),
+ iSysApPsmController(NULL),
+ iSapTimer (NULL),
+ iSysApCenRepLogsObserver (NULL),
+ iSysApUsbIndicatorController(NULL),
+ iKeyguardController (NULL),
+ iKeyLockOnBeforeCall (EFalse),
+ iCheckLongPowerKeyEvent (EFalse),
+ iMMCEjectUsed( EFalse ),
+ iMemCardPwdDialog(NULL)
+ {
+ TRACES( RDebug::Print( _L("CSysApAppUi::CSysApAppUi()") ) );
}
// ----------------------------------------------------------------------------
@@ -261,63 +137,59 @@
void CSysApAppUi::ConstructL()
{
TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: START") ) );
- TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: trying BaseConstructL( EAknEnableSkin )") ) );
- BaseConstructL( EAknEnableSkin );
+ TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: trying BaseConstructL()") ) );
+ BaseConstructL();
TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: BaseConstructL() OK") ) );
-
-
- /*SysAp is set as system application (Symbian terminology). This means some special privilege compared
- to other applications. For example it does not get closed when system is asked to close applications
- */
+
iEikonEnv->SetSystem( ETrue );
- // For cdma
-
- iTDEnable = FeatureManager::FeatureSupported( KFeatureIdFfTdScdma );
iEikonEnv->WsSession().ComputeMode( RWsSession::EPriorityControlDisabled );
-
- static_cast<CAknAppUi*>(iEikonEnv->EikAppUi())->KeySounds()->PushContextL( R_AVKON_SILENT_SKEY_LIST );
-
+
RThread().SetProcessPriority( EPriorityForeground );
-
- /*SysAp does not have any visible Status pane. An exception will be Charging state
- where SysAp shows Status Pane as it is the only running application.
- */
+
TInt mode;
User::LeaveIfError( RProperty::Get( KPSUidStartup, KPSGlobalStartupMode, mode ) );
-
- if( mode == EStartupModeCharging || mode == EStartupModeAlarm )
- {
- SetStatusPaneLayoutL(
- mode == EStartupModeCharging ? ESysApCharging : ESysApAlarm );
-
- SetKeyEventFlags(
- CAknAppUiBase::EDisableSendKeyShort |
- CAknAppUiBase::EDisableSendKeyLong );
- }
- else
- {
- SetStatusPaneLayoutL( ESysApNormal );
- }
-
+ TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: KPSGlobalStartupMode = %d"), mode ) );
+
+ //SysAp needs to capture PowerKey events because it handles all functionality related to that
+ TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: trying CEikApplication::RootWin()") ) );
+ RWindowGroup groupWin = iCoeEnv->RootWin();
+ User::LeaveIfError ( iCapturedEKeyPowerOff = groupWin.CaptureKey( EKeyPowerOff, KModifierMask, KModifierMask ) );
+ User::LeaveIfError ( iCapturedEKeyPowerOffUpAndDowns = groupWin.CaptureKeyUpAndDowns( EStdKeyDevice2, KModifierMask, KModifierMask ) );
+
+ TRACES ( RDebug::Print( _L("CSysApAppUi::ConstructL: trying CSysApDefaultKeyHandler::NewL()") ) );
+ iSysApDefaultKeyHandler = CSysApDefaultKeyHandler::NewL(*this);
+
+ // Define P&S keys "owned" by SysAp
+ RProperty::Define( KPSUidUikon, KUikMMCInserted, RProperty::EInt, KAlwaysPassPolicy, KWriteDeviceDataPolicy );
+ //initially assuming that the memory card is not inserted
+ RProperty::Set( KPSUidUikon, KUikMMCInserted, 0 );
+ TDriveInfo driveInfo;
+ TInt driveNumber;
+ TInt err;
+ RFs& fileServer = iEikonEnv->FsSession();
+ for ( driveNumber = EDriveD; driveNumber < EDriveZ; driveNumber++ )
+ {
+ err = fileServer.Drive(driveInfo,driveNumber);
+ if(driveNumber == EDriveF && err == KErrNone && driveInfo.iType == EMediaHardDisk && driveInfo.iDriveAtt & KDriveAttRemovable)
+ {
+ TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: err = %d, driveInfo.iType = %d, driveInfo.iDriveAtt %d, KDriveAttRemovable = %d "),err,driveInfo.iType,driveInfo.iDriveAtt,KDriveAttRemovable) );
+ RProperty::Set( KPSUidUikon, KUikMMCInserted, 1 );
+ break; // Memory card drive found...
+ }
+ }
+
TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: trying CSysApFeatureManager::NewL()") ) );
iSysApFeatureManager = CSysApFeatureManager::NewL();
-
+
// Setup USB charging detector
- iSysApUsbChargerDetector.EnableUsbCharging(
- iSysApFeatureManager->Supported( KSysApFeatureIdChargerReminderNotes ) &&
- iSysApFeatureManager->Supported( KSysApFeatureIdUsbChargingWithoutReminderNotes ) );
-
- // Construct notifiers that are used frequently or in OOM situations.
- TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: trying CAknBatteryNotify::NewL()") ) );
- iBatteryNotify = CAknBatteryNotify::NewL();
- TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: trying CAknSignalNotify::NewL()") ) );
- iSignalNotify = CAknSignalNotify::NewL();
- TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: trying new ( ELeave ) CSysApMsgSimMemLowQuery") ) );
- iSysApMsgSimMemLowQuery = new( ELeave ) CSysApMsgSimMemLowQuery( iSysApFeatureManager->CoverDisplaySupported() );
-
+ iSysApUsbChargerDetector.EnableUsbCharging(
+ iSysApFeatureManager->Supported( KSysApFeatureIdChargerReminderNotes ) &&
+ iSysApFeatureManager->Supported( KSysApFeatureIdUsbChargingWithoutReminderNotes ) );
+
TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: trying CSysApPubSubObserver::NewL()") ) );
iSysApPubSubObserver = CSysApPubSubObserver::NewL( *this );
+
RProperty::Define( KPSUidCoreApplicationUIs, KCoreAppUIsPoCIndicator, RProperty::EInt, KAlwaysPassPolicy, KWriteDeviceDataPolicy );
RProperty::Set( KPSUidCoreApplicationUIs, KCoreAppUIsPoCIndicator, ECoreAppUIsPocIndicatorUninitialized );
RProperty::Define( KPSUidCoreApplicationUIs, KCoreAppUIsPoCMissedIndicator, RProperty::EInt, KAlwaysPassPolicy, KWriteDeviceDataPolicy );
@@ -330,43 +202,6 @@
RProperty::Define( KPSUidCoreApplicationUIs, KCoreAppUIsVideoSharingIndicator, RProperty::EInt, KAlwaysPassPolicy, KWriteDeviceDataPolicy );
RProperty::Set( KPSUidCoreApplicationUIs, KCoreAppUIsVideoSharingIndicator, ECoreAppUIsVideoSharingIndicatorUninitialized );
- TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: trying CSysApAccessoryObserver::NewL()") ) );
- iSysApAccessoryObserver = CSysApAccessoryObserver::NewL( *this );
-
- TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: trying CSysApCenRepController::NewL()") ) );
- iSysApCenRepController = CSysApCenRepController::NewL();
-
- TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: trying CSysApCenRepLightSettingsObserver::NewL") ) );
- iSysApCenRepLightSettingsObserver = CSysApCenRepLightSettingsObserver::NewL( *this );
-
- TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: trying CSysApCenRepBtObserver::NewL") ) );
- iSysApCenRepBtObserver = CSysApCenRepBtObserver::NewL( *this );
-
- if ( iSysApFeatureManager->FmTxSupported() )
- {
- TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: trying CSysApCenRepFmTxObserver::NewL") ) );
- iSysApCenRepFmTxObserver = CSysApCenRepFmTxObserver::NewL( *this );
- }
-
- // Define P&S keys "owned" by SysAp
- RProperty::Define( KPSUidUikon, KUikMMCInserted, RProperty::EInt, KAlwaysPassPolicy, KWriteDeviceDataPolicy );
- //initially set the value as 0 assuming mmc is not inserted
- RProperty::Set( KPSUidUikon, KUikMMCInserted, 0 );
- TDriveInfo driveInfo;
- TInt driveNumber;
- TInt err;
- RFs& fileServer = iEikonEnv->FsSession();
- for ( driveNumber = EDriveD; driveNumber < EDriveZ; driveNumber++ )
- {
- err = fileServer.Drive(driveInfo,driveNumber);
- if(driveNumber==EDriveF && err == KErrNone && driveInfo.iType == EMediaHardDisk && driveInfo.iDriveAtt & KDriveAttRemovable)
- {
- TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: err = %d, driveInfo.iType = %d, driveInfo.iDriveAtt %d, KDriveAttRemovable = %d "),err,driveInfo.iType,driveInfo.iDriveAtt,KDriveAttRemovable) );
- RProperty::Set( KPSUidUikon, KUikMMCInserted, 1 );
- break; // Memory card drive found...
- }
- }
-
RProperty::Define( KPSUidCoreApplicationUIs, KCoreAppUIsHideAlarm, RProperty::EInt, KAlwaysPassPolicy, KWriteDeviceDataPolicy );
RProperty::Define( KPSUidCoreApplicationUIs, KCoreAppUIsDisableKeyguard, RProperty::EInt, KAlwaysPassPolicy, KWriteDeviceDataPolicy );
RProperty::Define( KPSUidCoreApplicationUIs, KCoreAppUIsSoftReject, RProperty::EInt, KAlwaysPassPolicy, KWriteDeviceDataPolicy );
@@ -387,45 +222,40 @@
// Initialize P&S keys "owned" by SysAp
RProperty::Set( KPSUidCoreApplicationUIs, KCoreAppUIsHideAlarm, ECoreAppUIsHideAlarmUninitialized );
-
+
+ TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: trying CSysApAccessoryObserver::NewL()") ) );
+ iSysApAccessoryObserver = CSysApAccessoryObserver::NewL( *this );
+
+ TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: trying CSysApCenRepController::NewL()") ) );
+ iSysApCenRepController = CSysApCenRepController::NewL();
+
+ TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: trying CSysApCenRepLightSettingsObserver::NewL") ) );
+ iSysApCenRepLightSettingsObserver = CSysApCenRepLightSettingsObserver::NewL( *this );
+
+ TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: trying CSysApCenRepBtObserver::NewL") ) );
+ iSysApCenRepBtObserver = CSysApCenRepBtObserver::NewL( *this );
+
TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: trying CSysApStartupController::NewL()") ) );
iSysApStartupController = CSysApStartupController::NewL( *this, iSysApFeatureManager->OfflineModeSupported() );
+ iActiveProfileBeforeOfflineMode = iSysApCenRepController->GetInt( KCRUidCoreApplicationUIsSysAp, KSysApProfileBeforeOfflineMode );
+
+ iSysApFeatureManager->FeatureVariationCheckDone();
+
TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: trying CSysApLightsController::NewL()") ) );
iSysApLightsController = CSysApLightsController::NewL( *this,
iSysApCenRepLightSettingsObserver->GetLightsTimeout(),
iSysApFeatureManager->CoverDisplaySupported() );
-
- TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: trying CSysApEtelConnector::NewL()") ) );
- iSysApEtelConnector = CSysApEtelConnector::NewL( *this );
-
- //SysAp needs to capture PowerKey events because it handles all functionality related to that
- TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: trying CEikApplication::RootWin()") ) );
- RWindowGroup groupWin = iCoeEnv->RootWin();
- User::LeaveIfError ( iCapturedEKeyPowerOff = groupWin.CaptureKey( EKeyPowerOff, KModifierMask, KModifierMask ) );
- User::LeaveIfError ( iCapturedEKeyPowerOffUpAndDowns = groupWin.CaptureKeyUpAndDowns( EStdKeyDevice2, KModifierMask, KModifierMask ) );
-
- TRACES ( RDebug::Print( _L("CSysApAppUi::ConstructL: trying CSysApDefaultKeyHandler::NewL()") ) );
- iSysApDefaultKeyHandler = CSysApDefaultKeyHandler::NewL( *this );
-
- TInt status(0);
- err = UserSvr::HalFunction( KHWSwitchGroup, KHWSwitchGrip, &status, 0 );
- if( err == KErrNone )
- {
- if( status == 0 )
- {
- RProperty::Set( KPSUidHWRM, KHWRMGripStatus, EPSHWRMGripOpen );
- }
- else
- {
- RProperty::Set( KPSUidHWRM, KHWRMGripStatus, EPSHWRMGripClosed );
- }
- }
- else
- {
- TRACES ( RDebug::Print( _L("CSysApAppUi::ConstructL: error in getting slide status: err = %d"), err ) );
- }
-
+
+ TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL : trying CreateSysApOfflineModeControllerL()") ) );
+ iSysApOfflineModeController = CreateSysApOfflineModeControllerL( *this );
+
+ TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL : trying DoInitialSwStateCheckL()") ) );
+ iSysApStartupController->DoInitialSwStateCheckL();
+
+ TRACES( RDebug::Print( _L("CCSysApAppUi::ConstructL trying CSysApCenRepHacSettingObserver::NewL") ) );
+ iSysApCenRepHacSettingObserver = CSysApCenRepHacSettingObserver::NewL( *this );
+
#ifndef RD_MULTIPLE_DRIVE
if ( iSysApFeatureManager->MmcSupported() )
{
@@ -443,102 +273,350 @@
*iSysApDriveList, *this, iEikonEnv->FsSession() );
}
#endif // RD_MULTIPLE_DRIVE
-
+
//Instantiate the KEF plugin manager
- //Trap constuction, since Sysap may live without iSysApKeyManagement
+ //Trap constuction, since Sysap may live without iSysApKeyManagement
TRAPD(keyManagementErr, iSysApKeyManagement=CSysApKeyManagement::NewL(CCoeEnv::Static()->RootWin(), *this));
if (keyManagementErr)
- {
- TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL : CSysApKeyManagement::NewL returns error=%d"), keyManagementErr ) );
- }
-
- iSysApFeatureManager->FeatureVariationCheckDone();
-
- TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: trying CSysApProfileObserver::NewL()") ) );
- iSysApProfileObserver = CSysApProfileObserver::NewL( *this );
-
- TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL : trying MProfileEngine* CreateProfileEngineL()") ) );
- iProfileEngine = CreateProfileEngineL( &( iEikonEnv->FsSession() ) );
-
- TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL : trying CreateSysApOfflineModeControllerL()") ) );
- iSysApOfflineModeController = CreateSysApOfflineModeControllerL( *this );
-
- TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL : trying DoInitialSwStateCheckL()") ) );
- iSysApStartupController->DoInitialSwStateCheckL();
-
- iActiveProfileBeforeOfflineMode = iSysApCenRepController->GetInt( KCRUidCoreApplicationUIsSysAp, KSysApProfileBeforeOfflineMode );
-
+ {
+ TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL : CSysApKeyManagement::NewL returns error=%d"), keyManagementErr ) );
+ }
+
+ TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: trying CSysApEtelConnector::NewL()") ) );
+ iSysApEtelConnector = CSysApEtelConnector::NewL( *this );
+
// Initialize animdll for handling side volume keys
// (needed before normal mode in case emergency number is dialed from PIN query)
iSysApKeySndHandler = CSysApKeySndHandler::NewL(iEikonEnv->WsSession());
-
- // Initialize shutdown image (needed by nspshandler)
+ iKeyguardController = CKeyguardAccessApi::NewL();
TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: trying CSysApShutdownImage::NewL()") ) );
- iSysApShutdownImage = CSysApShutdownImage::NewL();
-
+ iSysApShutdownImage = CSysApShutdownImage::NewL();//NULL; //
+
// Initialize nsps handler. Needed for proper lights control during PIN query.
TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: trying CSysApNspsHandler::NewL") ) );
iSysApNspsHandler = CSysApNspsHandler::NewL( iEikonEnv->WsSession(), iSysApShutdownImage->ShutdownCoeControlWindow() );
-#ifdef RD_LIGHT_CONTROL_CHANGE
- // NSPS Plugin has been loaded, inform lights controller that in can activate key event forwarding
- iSysApLightsController->KeyEventForwardingReady();
-#endif // RD_LIGHT_CONTROL_CHANGE
-
- // Create HAC setting observer now because telephony state may change before entering to normal state
- TRACES( RDebug::Print( _L("CCSysApAppUi::ConstructL trying CSysApCenRepHacSettingObserver::NewL") ) );
- iSysApCenRepHacSettingObserver = CSysApCenRepHacSettingObserver::NewL( *this );
+ RProperty::Define( KPSUidCoreApplicationUIs,KCoreAppUIsPowerMenuCustomDialogStatus, RProperty::EInt, KAlwaysPassPolicy, KWriteDeviceDataPolicy );
+ RProperty::Set( KPSUidCoreApplicationUIs, KCoreAppUIsPowerMenuCustomDialogStatus, ECoreAppUIsPowerMenuCustomDialogUninitialized );
- DeactivatePSMifBatteryNotLowL ();
+ TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: trying CHbIndicatorSymbian::NewL()") ) );
+ iHbIndicatorSymbian = CHbIndicatorSymbian::NewL();
+
+ TBool result = HbTextResolverSymbian::Init(KPsmlocalisationfile, KtsfilePath);
+
+ TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: END") ) );
+ }
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::FreeResources()
+// ----------------------------------------------------------------------------
+
+void CSysApAppUi::FreeResources()
+ {
+ TRACES( RDebug::Print( _L("CSysApAppUi::FreeResources") ) );
+ delete iSysApBatteryInfoController;
+ delete iSysApPsmController;
+ delete iVariantAccState;
+
+ delete iSysApAudioRoutingObserver;
+
+ if (iMemCardPwdDialog!=NULL)
+ {
+ //PowerMenu already exist
+ delete iMemCardPwdDialog;
+ iMemCardPwdDialog = NULL;
+ }
- if( iSysApFeatureManager->GanSupported() )
+ if ( iSapTimer )
+ {
+ iSapTimer->Cancel();
+ delete iSapTimer;
+ }
+ //Powermenu
+ if (iPowerMenuDialog!=NULL)
{
-
-
- RProperty::Define( KPSUidCoreApplicationUIs, KCoreAppUIsGanPropertyGanMode, RProperty::EInt, KAlwaysPassPolicy, KWriteDeviceDataPolicy );
- RProperty::Define( KPSUidCoreApplicationUIs, KCoreAppUIsGanPropertySignalLevel, RProperty::EInt, KAlwaysPassPolicy, KWriteDeviceDataPolicy );
- iSysApGanHandler = CSysApGanHandler::NewL( *this );
+ //PowerMenu already exist
+ delete iPowerMenuDialog;
+ iPowerMenuDialog = NULL;
}
-
- TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: END") ) );
+
+ RWindowGroup groupWin = iCoeEnv->RootWin();
+ groupWin.CancelCaptureKey( iCapturedEKeyPowerOff );
+ groupWin.CancelCaptureKeyUpAndDowns( iCapturedEKeyPowerOffUpAndDowns );
+
+ delete iSysApDefaultKeyHandler;
+ delete iSysApCenRepLightSettingsObserver;
+ delete iSysApCenRepBtObserver;
+ delete iSysApCenRepHacSettingObserver;
+ delete iSysApCenRepController;
+
+ delete iSysApPubSubObserver;
+
+ delete iSysApLightsController;
+ delete iSysApFeatureManager;
+
+ delete iSysApCenRepLogsObserver;
+ delete iSysApOfflineModeController;
+
+ delete iSysApUsbIndicatorController;
+ delete iKeyguardController;
+ delete iHbIndicatorSymbian;
+ delete iSysApKeyManagement;
+ iSysApKeyManagement = NULL;
+
+ REComSession::FinalClose();
+ iResourcesFreed = ETrue;
+ TRACES( RDebug::Print( _L("CSysApAppUi::FreeResources:END") ) );
+ }
+
+// ---------------------------------------------------------------------------
+// CStartupAppUi::PrepareToExit()
+// ---------------------------------------------------------------------------
+void CSysApAppUi::PrepareToExit()
+ {
+ TRACES(RDebug::Print( _L("CSysApAppUi::PrepareToExit()")));
+ CEikAppUi::PrepareToExit();
}
// ----------------------------------------------------------------------------
-// CSysApAppUi::DeactivatePSMifBatteryNotLow()
+// CSysApAppUi::StateOfProperty()
+// ----------------------------------------------------------------------------
+TInt CSysApAppUi::StateOfProperty( const TUid& aCategory, const TUint aKey ) const
+ {
+ TInt err( KErrNone );
+ TInt value( 0 );
+ err = RProperty::Get( aCategory, aKey, value );
+ if ( err )
+ {
+ TRACES( RDebug::Print( _L("CSysApAppUi::StateOfProperty. RProperty::Get: err=%d"), err ) );
+ return err;
+ }
+ return value;
+ }
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::OfflineModeActive()
// ----------------------------------------------------------------------------
- void CSysApAppUi::DeactivatePSMifBatteryNotLowL ()
+TBool CSysApAppUi::OfflineModeActive()
{
- TRACES( RDebug::Print( _L("CSysApAppUi::DeactivatePSMifBatteryNotLow: Start") ) );
- if ( iSysApFeatureManager->PowerSaveSupported()) //&& iSysApFeatureManager->Supported( KSysApFeatureIdBatteryInfoPopup ))
+ if(iSysApOfflineModeController)
+ {
+ return iSysApOfflineModeController->OfflineModeActive();
+ }
+ else
+ {
+ return EFalse;
+ }
+ }
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::GoOnlineL()
+// ----------------------------------------------------------------------------
+
+void CSysApAppUi::GoOnlineL( TBool /* aDoProfileChange */ )
+ {
+ if ( iSysApFeatureManager->OfflineModeSupported() )
+ {
+// TRACES( RDebug::Print( _L("CSysApAppUi::GoOnlineL: going from off-line into on-line: aDoProfileChange=%d" ), aDoProfileChange ) );
+ iActivateBt = iSysApOfflineModeController->MustBtBeActivated();
+ iSysApOfflineModeController->SwitchFromOfflineToOnlineModeL();
+ TRACES( RDebug::Print( _L("CSysApAppUi::GoOnlineL: iActivateBt = %d" ), iActivateBt ) );
+ }
+ }
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::GoOfflineL()
+// ----------------------------------------------------------------------------
+
+void CSysApAppUi::GoOfflineL()
+ {
+ if ( iSysApFeatureManager->OfflineModeSupported() )
{
- // Create batteruInfoController to get current battery status;
- if(iSysApBatteryInfoController == NULL)
- {
- iSysApBatteryInfoController = CSysApBatteryInfoController::NewL(
- iSysApCenRepController->GetInt(
- KCRUidCoreApplicationUIsConf,
- KCoreAppUIsBatteryInformationLowThreshold ) );
- }
- //Querry the battery level
- TBool status = iSysApBatteryInfoController->IsBatteryInfoAboveThreshold();
- TRACES( RDebug::Print( _L("CCSysApAppUi::DeactivatePSMifBatteryNotLow IsBatteryInfoAboveThreshold=%d"), status ) );
- // Querry to deactivate PSM if PSM is activated and battery status is above threshold
- if (status)
+ TRACES( RDebug::Print( _L("CSysApAppUi::GoOfflineL" ) ) );
+ iDeactivateBt = ETrue;
+ iSysApOfflineModeController->SwitchFromOnlineToOfflineModeL();
+ }
+ }
+
+#ifndef SYSAP_USE_STARTUP_UI_PHASE
+// need to configure the above macro.
+#else // SYSAP_USE_STARTUP_UI_PHASE
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::HandleUiReadyAfterBootL()
+// Called when startup UI activities has been finished
+// ----------------------------------------------------------------------------
+
+void CSysApAppUi::HandleUiReadyAfterBootL()
+ {
+ TRACES( RDebug::Print(_L("CSysApAppUi::HandleUiReadyAfterBootL" ) ) );
+ TInt state( StateOfProperty( KPSUidHWRMPowerState, KHWRMBatteryLevel ) );
+
+ UpdateBatteryBarsL( state );
+ DoSwStateNormalConstructionL();
+ HandleAccessoryProfileInStartupL();
+
+ if ( iSysApFeatureManager->MmcSupported() )
+ {
+#ifndef RD_MULTIPLE_DRIVE
+ MountMMC();
+ MMCStatusChangedL();
+ iHideFirstBeep = EFalse;
+#else // RD_MULTIPLE_DRIVE
+ iSysApDriveList->MountDrive( iSysApDriveList->DefaultMemoryCard() );
+ UpdateInsertedMemoryCardsL();
+#endif // RD_MULTIPLE_DRIVE
+ }
+
+ if ( iSysApFeatureManager->MmcHotSwapSupported() )
+ {
+ iSysApMMCObserver->StartMountObserver();
+ }
+
+ if ( !iSysApPsmController ) // created here if first state change has not occurred yet
+ {
+ iSysApPsmController = CSysApPsmController::NewL( *this );
+ }
+
+ if ( iSysApPsmController )
+ {
+ if ( iCharging ) // if charger is connected on boot PSM queries may need to be shown
+ {
+ HandleChargingStatusL( StateOfProperty( KPSUidHWRMPowerState, KHWRMChargingStatus ) );
+ }
+
+ if ( iSysApPsmController->FullPsmEnabled() )
+ {
+ // activate psm indicator
+ iVariantAccState = CHbSymbianVariant::NewL(&KPsm, CHbSymbianVariant::EDes);
+ if (!iHbIndicatorSymbian->Activate(KPsmPlugin,iVariantAccState))
+ {
+ int error = iHbIndicatorSymbian->Error();
+ //use the errorcode...
+ }
+ }
+
+ }
+
+ TInt batteryStatus = StateOfProperty( KPSUidHWRMPowerState, KHWRMBatteryStatus );
+ TRACES( RDebug::Print(_L("CSysApAppUi::HandleUiReadyAfterBootL: batteryStatus %d" ), batteryStatus ) );
+ if( batteryStatus == EBatteryStatusLow || batteryStatus == EBatteryStatusEmpty )
+ {
+ // low and empty battery states are informed to the user in device startup
+ HandleBatteryStatusL( batteryStatus );
+ }
+ else if ( iSysApPsmController && !iCharging )
+ {
+ TRACES( RDebug::Print(_L("CSysApAppUi::HandleUiReadyAfterBootL: batteryStatus %d, iCharging %d -> disable partial psm" ), batteryStatus, iCharging ) );
+
+ iSysApPsmController->BatteryLow( EFalse );
+ iSysApPsmController->DoEnablePartialPsm( EFalse );
+ }
+
+ if ( ! iSysApUsbIndicatorController )
+ {
+ TRAPD ( usbErr, iSysApUsbIndicatorController = CreateSysApUsbIndicatorL( *this ) );
+ if ( usbErr )
{
- if(iSysApPsmController == NULL)
- {
- iSysApPsmController = CSysApPsmController::NewL( *this );
- }
- if ( iSysApPsmController->ShowDeactivateQuery())
- ShowQueryL( ESysApBattChargingPowerSavingQuery );
- else
- iSysApPsmController->DoEnablePartialPsm( EFalse );
+ TRACES( RDebug::Print(_L("CSysApAppUi::HandleUiReadyAfterBootL: error in constructing USB ind. controller %d" ), usbErr ) );
}
}
- TRACES( RDebug::Print( _L("CSysApAppUi::DeactivatePSMifBatteryNotLow: End") ) );
- }
+ }
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::DoStateChangedL(const RStarterSession::TGlobalState aSwState)
+// This method is not called after boot has finished.
+// ----------------------------------------------------------------------------
+
+void CSysApAppUi::DoStateChangedL(const RStarterSession::TGlobalState aSwState)
+ {
+ TRACES( RDebug::Print(_L("CSysApAppUi::DoStateChangedL: %d" ), aSwState ) );
+
+ TRAPD( simChangedErr, DoSimChangedFromPreviousBootL() );
+ TRACES( RDebug::Print( _L("CSysApAppUi::DoStateChangedL: simChangedErr = %d" ), simChangedErr ) );
+ simChangedErr = simChangedErr; // suppress 'variable not used' warning
+ LogsObserverL().HandleSimChangedCheckDoneL();
+
+ if ( iSysApFeatureManager->PowerSaveSupported() )
+ {
+ // create controller before checking battery state, so that power saving can be enabled during boot if needed
+ if ( !iSysApPsmController ) // created only in first state change
+ {
+ iSysApPsmController = CSysApPsmController::NewL( *this );
+ }
+
+ // in charger boot explicitly disable power save mode
+ if ( aSwState == RStarterSession::ECharging )
+ {
+ iSysApPsmController->ChargerConnected();
+ iSysApPsmController->DoEnableFullPsm(EFalse); // disable power save now
+ }
+ }
+
+ if ( aSwState == RStarterSession::ECharging || aSwState == RStarterSession::EAlarm )
+ {
+ TInt state( StateOfProperty( KPSUidHWRMPowerState, KHWRMBatteryLevel ) );
+ //Also Charging status will be updated with the following function.
+ UpdateBatteryBarsL( state );
+ }
+
+ if( IsStateNormal() )
+ {
+ TRACES( RDebug::Print(_L("CSysApAppUi::DoStateChangedL to normal state.") ) );
+
+ if ( iSysApFeatureManager->MmcSupported() )
+ {
+#ifndef RD_MULTIPLE_DRIVE
+ MountMMC();
+ MMCStatusChangedL();
+ iHideFirstBeep = EFalse;
+#else // RD_MULTIPLE_DRIVE
+ iSysApDriveList->MountDrive( iSysApDriveList->DefaultMemoryCard() );
+ UpdateInsertedMemoryCardsL();
+#endif // RD_MULTIPLE_DRIVE
+ }
+ if ( iSysApFeatureManager->MmcHotSwapSupported() )
+ {
+ iSysApMMCObserver->StartMountObserver();
+ }
+
+ iSysApBtController = CreateSysApBtControllerL( *this );
+ iSysApBtSapController = CreateSysApBtSapControllerL( *this );
+
+ if ( iActivateBt )
+ {
+ TRACES( RDebug::Print(_L("CSysApAppUi::DoStateChangedL Activating BT" ) ) );
+ SetBtPowerState( ETrue );
+ }
+
+ if ( iDeactivateBt )
+ {
+ TRACES( RDebug::Print(_L("CSysApAppUi::DoStateChangedL Deactivating BT" ) ) );
+ SetBtPowerState( EFalse );
+ }
+
+ if ( !StarterSession().Handle() )
+ {
+ User::Leave( KErrBadHandle );
+ }
+
+/* if ( !KeyLock().Handle() )
+ {
+ User::Leave( KErrBadHandle );
+ }
+*/
+#ifdef __SYSAP_MODULE_TEST
+ ModuleTestShowUiNoteL( _L("SysAp: SW state normal!") );
+#endif
+ }
+
+ // Allow lights
+ iSysApLightsController->AllowLightsOn();
+ }
+
+#endif // SYSAP_USE_STARTUP_UI_PHASE
// ----------------------------------------------------------------------------
// CSysApAppUi::~CSysApAppUi()
@@ -548,7 +626,7 @@
{
TRACES( RDebug::Print( _L("~CSysApAppUi() started") ) );
if( !iResourcesFreed )
- {
+ {
FreeResources();
iStarterSession.Close();
@@ -567,7 +645,7 @@
}
#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-
+// delete iProfileNote;
#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
if( iAnimTimer )
@@ -577,12 +655,8 @@
delete iAnimTimer;
#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
- delete iSysApPowerKeyMenuObserver;
-
delete iSysApStartupController;
- delete iSysApGanHandler;
-
#ifdef RD_MULTIPLE_DRIVE
iInsertedMemoryCards.Close();
delete iSysApDriveEjectHandler;
@@ -592,624 +666,428 @@
TRACES( RDebug::Print( _L("~CSysApAppUi() completed") ) );
}
-
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::HandleLocationPrivacyIndicatorL()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::HandleLocationPrivacyIndicatorL( const TInt aState )
- {
- TRACES( RDebug::Print( _L("CSysApAppUi::HandleLocationPrivacyIndicatorL() state=%d"), aState ) );
- if ( iSysApFeatureManager->LocationPrivacySupported() )
- {
- // Phase 1. Set all Location Privacy indicators off
- if ( iSysApLocationPrivacyIndicator->iIndicatorIdAcceptAll != KSysApNoIndicator )
- {
- SetIndicatorStateL( iSysApLocationPrivacyIndicator->iIndicatorIdRejectAll, EAknIndicatorStateOff );
- }
- if ( iSysApLocationPrivacyIndicator->iIndicatorIdRejectAll != KSysApNoIndicator )
- {
- SetIndicatorStateL( iSysApLocationPrivacyIndicator->iIndicatorIdRejectAll, EAknIndicatorStateOff );
- }
- if ( iSysApLocationPrivacyIndicator->iIndicatorIdAlwaysAsk != KSysApNoIndicator )
- {
- SetIndicatorStateL( iSysApLocationPrivacyIndicator->iIndicatorIdAlwaysAsk, EAknIndicatorStateOff );
- }
- if ( iSysApLocationPrivacyIndicator->iIndicatorIdIndividualPrivacy != KSysApNoIndicator )
- {
- SetIndicatorStateL( iSysApLocationPrivacyIndicator->iIndicatorIdIndividualPrivacy, EAknIndicatorStateOff );
- }
- // Phase 2. Set the required Location Privacy indicator on
- switch ( aState )
- {
- case EPSLocPrivAcceptAll:
- if ( iSysApLocationPrivacyIndicator->iIndicatorIdAcceptAll != KSysApNoIndicator )
- {
- SetIndicatorStateL( iSysApLocationPrivacyIndicator->iIndicatorIdAcceptAll, EAknIndicatorStateOn );
- }
- break;
- case EPSLocPrivRejectAll:
- if ( iSysApLocationPrivacyIndicator->iIndicatorIdRejectAll != KSysApNoIndicator )
- {
- SetIndicatorStateL( iSysApLocationPrivacyIndicator->iIndicatorIdRejectAll, EAknIndicatorStateOn );
- }
- break;
- case EPSLocPrivAlwaysAsk:
- if ( iSysApLocationPrivacyIndicator->iIndicatorIdAlwaysAsk != KSysApNoIndicator )
- {
- SetIndicatorStateL( iSysApLocationPrivacyIndicator->iIndicatorIdAlwaysAsk, EAknIndicatorStateOn );
- }
- break;
- case EPSLocPrivIndividualPrivacy:
- if ( iSysApLocationPrivacyIndicator->iIndicatorIdIndividualPrivacy != KSysApNoIndicator )
- {
- SetIndicatorStateL( iSysApLocationPrivacyIndicator->iIndicatorIdIndividualPrivacy, EAknIndicatorStateOn );
- }
- break;
- default:
- break;
- }
- }
- }
-
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::HandleKeyEventL(const TKeyEvent& aKeyEvent, TEventCode aType )
-// ----------------------------------------------------------------------------
-
-TKeyResponse CSysApAppUi::HandleKeyEventL(const TKeyEvent& aKeyEvent, TEventCode aType )
+
+TBool CSysApAppUi::ResourcesFreed() const
{
- if ( ! iShutdownStarted )
- {
- TRACES( RDebug::Print( _L("CSysApAppUi::HandleKeyEventL: aKeyEvent.iCode:%d, aKeyEvent.iScanCode:%d, aType:%d, iIgnoreNextPowerKeyUpEvent:%d, iPowerKeyPopupMenuActive:%d, iLastPowerKeyWasShort:%d, iPowerKeyPopupMenuDismissed:%d"),
- aKeyEvent.iCode, aKeyEvent.iScanCode, aType, iIgnoreNextPowerKeyUpEvent, iPowerKeyPopupMenuActive, iLastPowerKeyWasShort, iPowerKeyPopupMenuDismissed ) );
-
-#ifdef _DEBUG
- // camery latency measurement environment instrumentation, don't remove
- if ( aType == EEventKey && aKeyEvent.iCode == EKeyCamera )
- {
- TRACES( RDebug::Print( _L("e_KEY_EVENT_SENDING 0") ) );
- }
-#endif // _DEBUG
-
- TBool haveStatusPane = ( StatusPane()== NULL ) ? EFalse : StatusPane()->IsVisible();
- TRACES( RDebug::Print( _L("CSysApAppUi::HandleKeyEventL: haveStatusPane = %d" ) ) );
-
- TKeyResponse response( EKeyWasNotConsumed );
- if (iSysApKeyManagement && aKeyEvent.iCode != EKeyPowerOff && aKeyEvent.iCode != 'E')
- {
- response = iSysApKeyManagement->HandleKeyEventL(aKeyEvent, aType );
- }
-
- if( aType == EEventKey )
- {
- switch ( aKeyEvent.iCode )
- {
-#ifdef _DEBUG
- case 'E': //For testing
- Exit();
- break;
-#endif
- case EKeyPowerOff:
- //Short power key press
- iKeyBoardRepeatCount++;
- if( aKeyEvent.iRepeats == 0 )
- {
- TRACES( RDebug::Print(_L("CSysApAppUi::HandleKeyEventL, Short powerkey") ) );
- iLastPowerKeyWasShort = ETrue;
- if ( IsDefaultPowerKeyBehavior() )
- {
- //do this only if the power key menu is active (handles item navigation)
- //or if the power key is not the lock key (default)
- HandleShortPowerKeyPressedL();
- }
-
-
- iIgnoreNextPowerKeyRepeats = EFalse;
- }
- //Long power key press
- else if( aKeyEvent.iRepeats > 0 && iKeyBoardRepeatCount >= iSysApCenRepController->GetInt( KCRUidCoreApplicationUIsSysAp, KSysApPowerkeyRepeatcount ))
- {
- iKeyBoardRepeatCount = -1;
- TRACES( RDebug::Print(_L("CSysApAppUi::HandleKeyEventL, Long powerkey") ) );
- iLastPowerKeyWasShort = EFalse;
- if (! IsDefaultPowerKeyBehavior() && !iIgnoreNextPowerKeyRepeats )
- {
- if ( !iGlobalListQuery )
- {
- HandleShortPowerKeyPressedL();
- }
- }
- else
- {
- HandleLongPowerKeyPressedL();
- }
-
- }
- break;
-
- default:
- {
- TKeyResponse response = EKeyWasNotConsumed;
- if (iSysApKeyManagement)
- {
- response = iSysApKeyManagement->HandleKeyEventL(aKeyEvent, aType );
- }
-
- if ( response == EKeyWasNotConsumed ) // none of the plugins consumed the key, offer it to default handling
- {
- iSysApDefaultKeyHandler->HandleKeyEventL( aKeyEvent, aType );
- }
- }
- break;
- }
- }
- else if ( aType == EEventKeyUp )
- {
- TRACES( RDebug::Print( _L( "CSysApAppUi::HandleKeyEventL(): aType == EEventKeyUp, PowerKeyIsLockKey = %d, iLastPowerKeyWasShort = %d, iPowerKeyPopupMenuActive = %d, iCharging = %d" ), iSysApFeatureManager->PowerKeyIsLockKey(), iLastPowerKeyWasShort, iPowerKeyPopupMenuActive, iCharging ) );
- if ( !IsDefaultPowerKeyBehavior() &&
- iLastPowerKeyWasShort &&
- ( aKeyEvent.iScanCode == EStdKeyDevice2 ))
- {
- // if the power key is the lock key && the last keypress was
- // short && the power menu is not active && an alarm is not
- // currently being shown, then lock the phone
- TInt alarmState=0, securityQueryState=0;
- TInt errorCode = RProperty::Get( KPSUidCoreApplicationUIs, KCoreAppUIsDisableKeyguard, alarmState );
- TInt errorCode2 = RProperty::Get( KPSUidStartup, KStartupSecurityCodeQueryStatus, securityQueryState);
- TRACES( RDebug::Print( _L( "CSysApAppUi::HandleKeyEventL(): Reading value of KCoreAppUIsDisableKeyguard - State Value: %d"),alarmState));
- TRACES( RDebug::Print( _L( "CSysApAppUi::HandleKeyEventL(): Reading value of KStartupSecurityCodeQueryStatus - State Value: %d"),securityQueryState));
- TInt callState( StateOfProperty( KPSUidCtsyCallInformation, KCTsyCallState ) );
- //Disable keylock if Alarm is active or if a Security code query is active on the display
- if ( alarmState == ECoreAppUIsDisableKeyguard || securityQueryState == ESecurityQueryActive )
- {
- KeyLock().DisableWithoutNote();
- }
- else
- {
- if( callState != EPSCTsyCallStateConnected && !iDeviceLockEnabled)
- {
- KeyLock().EnableWithoutNote();
- }
- }
- }
- else
- {
- if ( aKeyEvent.iScanCode == EStdKeyDevice2 )
- {
- if ( iIgnoreNextPowerKeyUpEvent )
- {
- if ( !iPowerKeyPopupMenuDismissed ) // If the popup menu has been dismissed, do nothing
- {
- iPowerKeyPopupMenuActive = ETrue;
- iIgnoreNextPowerKeyUpEvent = EFalse;
- }
- }
- else if ( iLastPowerKeyWasShort )
- {
- if ( iPowerKeyPopupMenuActive )
- {
- if ( iGlobalListQuery )
- {
- if ( iSysApFeatureManager->NoPowerKeySupported() )
- {
- CancelGlobalListQuery();
- }
- else
- {
- iGlobalListQuery->MoveSelectionDown();
- }
- }
- }
- }
- }
- }
- }
-
- TRACES( RDebug::Print( _L("CSysApAppUi::HandleKeyEventL:ended, aKeyEvent.iCode:%d, aKeyEvent.iScanCode:%d, aType:%d, iIgnoreNextPowerKeyUpEvent:%d, iPowerKeyPopupMenuActive:%d, iLastPowerKeyWasShort:%d, iPowerKeyPopupMenuDismissed:%d"),
- aKeyEvent.iCode, aKeyEvent.iScanCode, aType, iIgnoreNextPowerKeyUpEvent, iPowerKeyPopupMenuActive, iLastPowerKeyWasShort, iPowerKeyPopupMenuDismissed ) );
- }
- else // shutdown started
- {
- TRACES( RDebug::Print( _L("CSysApAppUi::HandleKeyEventL: aKeyEvent.iCode:%d, aKeyEvent.iScanCode:%d, aType:%d"),
- aKeyEvent.iCode, aKeyEvent.iScanCode, aType ) );
-
- // When shutdown has been started, only device mode key events are passed to plug-in framework
- // This for enabling plug-in activities during shutdown animation
- if ( IsDeviceModeKey( aKeyEvent ) ) // Other key events are not passed, because they must cancel the shutdown animation as stated in UI spefication
- {
- if ( aType == EEventKey && iSysApKeyManagement )
- {
- iSysApKeyManagement->HandleKeyEventL( aKeyEvent, aType );
- }
- }
- #ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION
- else if ( aType == EEventKey && iSysApShutdownAnimation && !iShutdownContinued )
- {
- if ( aKeyEvent.iCode != EKeyPowerOff || iLastPowerKeyWasShort )
- {
- iSysApShutdownAnimation->Cancel();
- NotifyShutdownAnimationSkip();
- }
- }
-
- #endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-
- TRACES( RDebug::Print( _L("CSysApAppUi::HandleKeyEventL: ended") ) );
- }
- return EKeyWasConsumed;
+ return iResourcesFreed;
+ }
+
+void CSysApAppUi::ShowExampleUiNoteL( const TDesC& noteText )const
+ {
+ TRACES( RDebug::Print( _L("CSysApAppUi::ShowExampleUiNoteL:: constructing CHbDeviceMessageBoxSymbian:BeGIN") ) );
+ CHbDeviceMessageBoxSymbian *note = CHbDeviceMessageBoxSymbian::NewL(CHbDeviceMessageBoxSymbian::EInformation);
+ CleanupStack::PushL(note);
+ TRACES( RDebug::Print( _L("CSysApAppUi::ShowExampleUiNoteL:: construction of CHbDeviceMessageBoxSymbian:END") ) );
+ note->SetTextL(noteText);
+ note->SetTimeout(300);
+ TRACES( RDebug::Print( _L("CSysApAppUi:: Display of CHbDeviceMessageBoxSymbian::Begin") ) );
+ note->ShowL();
+ TRACES( RDebug::Print( _L("CSysApAppUi:: Display of CHbDeviceMessageBoxSymbian::End") ) );
+ CleanupStack::PopAndDestroy(note);
+ }
+
+
+void CSysApAppUi::ExecQueryL( TSysapQuery aQuery, TDes8& aReturn )
+ {
+ ExecQueryL( aQuery, aReturn, KNullDesC8 );
}
// ----------------------------------------------------------------------------
-// CSysApAppUi::HandleCommandL( TInt aCommand)
+// CSysApAppUi::ExecQueryL
// ----------------------------------------------------------------------------
-
-void CSysApAppUi::HandleCommandL( TInt aCommand )
+//
+void CSysApAppUi::ExecQueryL( TSysapQuery aQuery, TDes8& aReturn, const TDesC8& /*aParam*/ )
{
- TRACES( RDebug::Print( _L("CSysApAppUi::HandleCommandL aCommend: %d"), aCommand ) );
- switch ( aCommand )
+ TRACES( RDebug::Print(_L("CSysApAppUi::ExecQueryL: aQuery=%d"), aQuery ) );
+
+ switch ( aQuery )
{
- case EEikCmdExit: // EAknCmdExit
- // Quick fix for Defect: UTUL-7ZQLJU
- Exit();
+ case EGetHwrmLight: // get handle to HWRM client session. Returns CHWRMLight*.
+ {
+ THwrmLightBuf retBuf( iSysApLightsController->GetHwrmLight() );
+ aReturn.Copy( retBuf );
+ }
break;
+
+ case EGetKeylock: // get handle to keylock client session. Returns RAknKeylock2*.
+ {
+ // do nothing
+ }
+ break;
+
+
default:
+ __ASSERT_DEBUG( EFalse, User::Panic( _L("CSysApAppUi::ExecQueryL: Invalid query"), KErrArgument ) );
+ User::Leave( KErrArgument );
break;
}
}
// ----------------------------------------------------------------------------
-// CSysApAppUi::HandleApplicationSpecificEventL(TInt aType,const TWsEvent& aEvent)
+// CSysApAppUi::ExecCommandL
// ----------------------------------------------------------------------------
-
-void CSysApAppUi::HandleApplicationSpecificEventL(TInt aType,const TWsEvent& aEvent)
+//
+void CSysApAppUi::ExecCommandL( TSysapCommand aCommand )
{
- TRACES( RDebug::Print( _L("CSysApAppUi::HandleApplicationSpecificEventL: aType:%d"), aType ) );
-
- CAknAppUi::HandleApplicationSpecificEventL(aType, aEvent);
-
- if ( ResourcesFreed() )
- {
- TRACES( RDebug::Print( _L("CSysApAppUi::HandleApplicationSpecificEventL: discarded, shutting down") ) );
- return;
- }
-
- switch( aType )
+ ExecCommandL( aCommand, KNullDesC8 );
+ }
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::ExecCommandL
+// ----------------------------------------------------------------------------
+//
+void CSysApAppUi::ExecCommandL( TSysapCommand aCommand, const TDesC8& /* aParam */ )
+ {
+ TRACES( RDebug::Print(_L("CSysApAppUi::ExecCommandL: aCommand=%d"), aCommand ) );
+
+ switch ( aCommand )
{
- case EEikKeyLockEnabled:
- iKeyLockEnabled = ETrue;
- iSysApCenRepController->SetInt( KCRUidCoreApplicationUIsSysAp, KSysApKeyguardActive, 1 );
- SetIndicatorStateL( EAknIndicatorKeyguard, EAknIndicatorStateOn );
- iSysApLightsController->KeylockStateChangedL( ETrue );
- break;
- case EEikKeyLockDisabled:
- iKeyLockEnabled = EFalse;
- iSysApCenRepController->SetInt( KCRUidCoreApplicationUIsSysAp, KSysApKeyguardActive, 0 );
- SetIndicatorStateL( EAknIndicatorKeyguard, EAknIndicatorStateOff );
- if (! iDeviceLockEnabled )
- {
- iSysApLightsController->KeylockStateChangedL( EFalse );
- if ( iSysApFeatureManager->MmcHotSwapSupported() )
- {
- if ( StateOfProperty( KPSUidCtsyCallInformation, KCTsyCallState ) != EPSCTsyCallStateRinging && StateOfProperty( KPSUidCtsyCallInformation, KCTsyCallState ) != EPSCTsyCallStateAlerting )
- {
- RunUnlockNotifierL();
- }
- }
- }
- break;
- case EEikKeyLockPowerKeyPressed: //sent when power key is captured by keylockserver
- HandleShortPowerKeyPressedL();
- break;
-
- case EEikKeyLockLightsOnRequest:
- iSysApLightsController->SetLightsOnUnlockNoteL();
- break;
-
- case EEikEcsQueryLights: // emergency note is shown
- iSysApLightsController->SetLightsOnEcsQueryL();
- break;
-
- case EEikSecurityQueryLights: // for device lock security query
- iSysApLightsController->SetLightsOnSecurityQueryL();
+ case EResetKeyguardState: // reset the internal keyguard flags of the SysAp, except for iKeyLockOnBeforeCradle
+ iKeyLockOnBeforeCall = EFalse;
+ iKeyLockOnBeforeAlarm = EFalse;
break;
default:
+ // do nothing in release builds since no harm is done
+ __ASSERT_DEBUG( EFalse, User::Panic( _L("CSysApAppUi::ExecCommandL: Invalid command"), KErrArgument ) );
break;
+ }
+ }
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::TimerExpiredL()
+// ----------------------------------------------------------------------------
+void CSysApAppUi::TimerExpiredL()
+ {
+/*
+ * Not suppported , will take care in wk25
+ * #ifndef RD_MULTIPLE_DRIVE
+ * CloseUIAppsInHotSwapL();
+ * #endif // RD_MULTIPLE_DRIVE
+*/
+ }
+
+
+ // ----------------------------------------------------------------------------
+// CSysApAppUi::KeyLockState() const
+// ----------------------------------------------------------------------------
+
+TBool CSysApAppUi::KeyLockState() const
+ {
+ return iKeyLockEnabled;
+ }
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::DeviceLockState() const
+// ----------------------------------------------------------------------------
+
+TBool CSysApAppUi::DeviceLockState() const
+ {
+ return iDeviceLockEnabled;
+ }
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::SysApFeatureManager
+// ----------------------------------------------------------------------------
+
+CSysApFeatureManager& CSysApAppUi::SysApFeatureManager()
+ {
+ __ASSERT_DEBUG( iSysApFeatureManager, User::Panic( _L("iSysApFeatureManager == NULL"), KErrBadHandle ) );
+
+ return *iSysApFeatureManager;
+ }
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::ActivateKeyeventForwardingForLights()
+// ----------------------------------------------------------------------------
+
+void CSysApAppUi::ActivateKeyeventForwardingForLights(TBool aActivate)
+ {
+ if( iSysApNspsHandler )
+ {
+ if ( aActivate )
+ {
+ iSysApNspsHandler->ActivateKeyeventForwardingForLights();
}
+ else
+ {
+ iSysApNspsHandler->DeActivateKeyeventForwardingForLights();
+ }
+ }
+ }
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::StarterSession()
+// ----------------------------------------------------------------------------
+
+RStarterSession& CSysApAppUi::StarterSession()
+ {
+ if ( !iStarterSession.Handle() )
+ {
+ // All server connections are tried to be made KTriesToConnectServer times because occasional
+ // fails on connections are possible at least on some servers
+ TRACES( RDebug::Print( _L("CSysApAppUi::StarterSession: trying RStarterSession::Connect()") ) );
+ TInt thisTry = 0;
+ TInt err;
+ while ( ( err = iStarterSession.Connect() ) != KErrNone && ( thisTry++ ) <= KTriesToConnectServer )
+ {
+ User::After( KTimeBeforeRetryingServerConnection );
+ }
+
+ if ( err != KErrNone )
+ {
+ // What do in error case?
+ TRACES( RDebug::Print( _L("CSysApAppUi::StarterSession: RStarterSession::Connect() failed with %d"), err ) );
+ }
+ }
+
+ return iStarterSession;
+ }
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::SetBtPowerState()
+// ----------------------------------------------------------------------------
+TInt CSysApAppUi::SetBtPowerState( TBool aBtState )
+ {
+ if ( iSysApBtController )
+ {
+ return iSysApBtController->SetPowerState( aBtState );
+ }
+ else
+ {
+ return KErrNotReady;
+ }
+ }
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::SetStarterState()
+// ----------------------------------------------------------------------------
+
+TInt CSysApAppUi::SetStarterState( const RStarterSession::TGlobalState aState )
+ {
+ if ( iSysApStartupController->GlobalStateChangeAllowed( aState ) )
+ {
+ TRACES( RDebug::Print( _L("CSysApAppUi::SetStarterState: aState=%d" ), aState ) );
+ return StarterSession().SetState( aState );
+ }
+ else
+ {
+ TRACES( RDebug::Print( _L("CSysApAppUi::SetStarterState: aState=%d - not allowed" ), aState ) );
+ return KErrNone;
+ }
+ }
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::SetNetworkConnectionAllowed()
+// ----------------------------------------------------------------------------
+
+void CSysApAppUi::SetNetworkConnectionAllowed( TCoreAppUIsNetworkConnectionAllowed aNetworkConnectionAllowed )
+ {
+ TRACES( RDebug::Print( _L("CSysApAppUi::SetNetworkConnectionAllowed: status: %d" ), aNetworkConnectionAllowed ) );
+
+ iSysApCenRepController->SetInt( KCRUidCoreApplicationUIs, KCoreAppUIsNetworkConnectionAllowed, (TInt) aNetworkConnectionAllowed );
+
+ // Also set the Symbian PS key used for the same purpose:
+ RProperty::Set(KUidSystemCategory, KUidPhonePwr.iUid, aNetworkConnectionAllowed ? ESAPhoneOn : ESAPhoneOff);
+ }
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::BluetoothPowerMode()
+// ----------------------------------------------------------------------------
+TInt CSysApAppUi::BluetoothPowerMode() const
+ {
+ return iSysApCenRepBtObserver->BluetoothPowerMode();
+ }
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::SimSupported()
+// ----------------------------------------------------------------------------
+TBool CSysApAppUi::SimSupported()
+ {
+ return iSysApFeatureManager->SimSupported();
+ }
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::BtSapEnabled()
+// ----------------------------------------------------------------------------
+
+TBool CSysApAppUi::BtSapEnabled()
+ {
+ if ( iSysApBtSapController )
+ {
+ return iSysApBtSapController->BtSapEnabled();
+ }
+ return EFalse;
}
// ----------------------------------------------------------------------------
-// CSysApAppUi::InitializeStatusPaneAreaL()
+// CSysApAppUi::OfflineModeChangedL()
// ----------------------------------------------------------------------------
-
-void CSysApAppUi::InitializeStatusPaneAreaL()
+void CSysApAppUi::OfflineModeChangedL()
{
- TRACES( RDebug::Print( _L("CSysApAppUi::InitializeStatusPaneAreaL(): START") ) );
- TInt state( StateOfProperty( KPSUidHWRMPowerState, KHWRMBatteryLevel ) );
-
- //Also Charging status will be updated with the following function.
- UpdateBatteryBarsL( state );
-
-#ifdef SYSAP_USE_STARTUP_UI_PHASE
- if ( OfflineModeActive() )
- {
- UpdateSignalBarsL( KAknSignalOffLineMode );
- }
- else
- {
- UpdateSignalBarsL();
- }
-#else
- UpdateSignalBarsL();
-#endif // SYSAP_USE_STARTUP_UI_PHASE
-
- SetSignalIndicatorL();
- SetIhfIndicatorL();
- SetHacIndicatorL();
- LogsObserverL().HandleUiReadyL();
-
- if ( iSysApEtelConnector )
+#ifdef SYSAP_USE_STARTUP_UI_PHASE
+ // if UI is not ready, don't update indicators
+ if ( !UiReady() )
{
- iSysApEtelConnector->ReadSimSmsStoreStatusInStartup();
- }
-
- SetEnvelopeIndicatorL();
-
- TRACES( RDebug::Print( _L("CSysApAppUi::InitializeStatusPaneAreaL(): accessories") ) );
-
- TAccMode accessoryState(EAccModeHandPortable);
- if ( iSysApAccessoryObserver )
- {
- accessoryState = iSysApAccessoryObserver->GetAccessoryMode();
- }
-
- if( accessoryState == EAccModeWiredHeadset ||
- accessoryState == EAccModeWirelessHeadset ||
- accessoryState == EAccModeHeadphones )
- {
- SetIndicatorStateL( EAknIndicatorLoopset, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorTTY, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorHeadset, EAknIndicatorStateOn );
- SetIndicatorStateL( EAknIndicatorHeadsetUnavailable, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorCarkit, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorTvOut, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorHDMI, EAknIndicatorStateOff );
- }
- else if( accessoryState == EAccModeLoopset )
- {
- SetIndicatorStateL( EAknIndicatorHeadset, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorTTY, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorLoopset, EAknIndicatorStateOn );
- SetIndicatorStateL( EAknIndicatorHeadsetUnavailable, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorCarkit, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorTvOut, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorHDMI, EAknIndicatorStateOff );
+ return;
}
- else if( accessoryState == EAccModeTextDevice )
- {
- SetIndicatorStateL( EAknIndicatorHeadset, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorLoopset, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorTTY, EAknIndicatorStateOn );
- SetIndicatorStateL( EAknIndicatorHeadsetUnavailable, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorCarkit, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorTvOut, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorHDMI, EAknIndicatorStateOff );
- }
- else if( accessoryState == EAccModeWiredCarKit || accessoryState == EAccModeWirelessCarKit )
- {
- SetIndicatorStateL( EAknIndicatorHeadset, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorLoopset, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorTTY, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorHeadsetUnavailable, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorCarkit, EAknIndicatorStateOn );
- SetIndicatorStateL( EAknIndicatorTvOut, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorHDMI, EAknIndicatorStateOff );
- }
- else if( accessoryState == EAccModeTVOut )
- {
- SetIndicatorStateL( EAknIndicatorHeadset, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorLoopset, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorTTY, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorHeadsetUnavailable, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorCarkit, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorTvOut, EAknIndicatorStateOn );
- SetIndicatorStateL( EAknIndicatorHDMI, EAknIndicatorStateOff );
- }
- else if (accessoryState == EAccModeHDMI )
+#endif // SYSAP_USE_STARTUP_UI_PHASE
+
+#if 0 // Not used as of now
+ SetHacIndicatorL();
+#endif //0
+ }
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::UiReady()
+//
+// ----------------------------------------------------------------------------
+
+TBool CSysApAppUi::UiReady() const
+ {
+#ifdef SYSAP_USE_STARTUP_UI_PHASE
+ return iSysApStartupController->UiReady();
+#else // SYSAP_USE_STARTUP_UI_PHASE
+ // if startup UI phase information is not used, global system state normal is handled as UI idle state
+ return IsStateNormal();
+#endif // SYSAP_USE_STARTUP_UI_PHASE
+ }
+
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::CompleteShutdown()
+// ----------------------------------------------------------------------------
+
+void CSysApAppUi::CompleteShutdown( const TBool aReset, const TInt aResetReason )
+ {
+ TRACES( RDebug::Print(_L("CSysApAppUi::CompleteShutdown(): START" ) ) );
+
+ iCheckLongPowerKeyEvent = ETrue;
+
+ PrepareForShutdownImage();//SysAp's internal preparation for ShutDown with image
+
+ FreeResources();
+
+ if ( aReset )
{
- SetIndicatorStateL( EAknIndicatorHeadset, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorLoopset, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorTTY, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorHeadsetUnavailable, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorCarkit, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorTvOut, EAknIndicatorStateOff);
- SetIndicatorStateL( EAknIndicatorHDMI, EAknIndicatorStateOn );
- }
- else // all indicators off
- {
- SetIndicatorStateL( EAknIndicatorHeadset, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorLoopset, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorTTY, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorHeadsetUnavailable, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorCarkit, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorTvOut, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorHDMI, EAknIndicatorStateOff );
- }
-
- TRACES( RDebug::Print( _L("CSysApAppUi::InitializeStatusPaneAreaL(): msg") ) );
- state = StateOfProperty( KUidSystemCategory, KUidOutboxStatusValue );
- if( state == ESADocumentsInOutbox )
- {
- SetIndicatorStateL( EAknIndicatorOutbox, EAknIndicatorStateOn );
- }
- else
- {
- SetIndicatorStateL( EAknIndicatorOutbox, EAknIndicatorStateOff );
- }
-
- state = StateOfProperty( KAlarmServerPubSubCategory, KWakeupAlarmPubSubKey );
-
- if( state == EActiveWakeupAlarmSet )
- {
- TRACES( RDebug::Print(_L("CSysApAppUi::InitializeStatusPaneAreaL called the SetIndicatorStateL with EActiveWakeupAlarmSet ")));
- SetIndicatorStateL( EAknIndicatorAlarmClock, EAknIndicatorStateOn );
+ __ASSERT_DEBUG( aResetReason >= RStarterSession::ELanguageSwitchReset &&
+ aResetReason <= RStarterSession::EDataRestoreReset,
+ User::Invariant() );
+ StarterSession().Reset( static_cast<RStarterSession::TResetReason>( aResetReason ) );
}
else
{
- TRACES( RDebug::Print(_L("CSysApAppUi::InitializeStatusPaneAreaL called the SetIndicatorStateL with EActiveNoWakeupAlarmsSet ")));
- SetIndicatorStateL( EAknIndicatorAlarmClock, EAknIndicatorStateOff );
+ StarterSession().Shutdown();
}
- state = StateOfProperty( KIrdaPropertyCategory, KIrdaStatus );
- if( state == TIrdaStatusCodes::EIrLoaded || state == TIrdaStatusCodes::EIrDisconnected || state == TIrdaStatusCodes::EIrBlocked )
+ StarterSession().Close();
+
+ TRACES( RDebug::Print(_L("CSysApAppUi::CompleteShutdown(): END" ) ) );
+ }
+
+
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::DoShutdownL( const TBool aReset, const TSWStartupReason aSWStartupReason )
+// ----------------------------------------------------------------------------
+
+void CSysApAppUi::DoShutdownL( const TBool aReset, const TInt aResetReason )
+ {
+ TRACES( RDebug::Print(_L("CSysApAppUi::DoShutdownL: aResetReason:%d, aReset:%d" ),
+ aResetReason, aReset ) );
+#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
+ TBool animationenabled( EFalse );
+#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
+
+ if( OkToInitiateShutdown() )
{
- SetIndicatorStateL( EAknIndicatorIrActive, EAknIndicatorStateAnimate );
- }
- else if( state == TIrdaStatusCodes::EIrConnected )
- {
- SetIndicatorStateL( EAknIndicatorIrActive, EAknIndicatorStateOn );
+ TRACES( RDebug::Print(_L("CSysApAppUi::DoShutdownL: Was OkToToInitiateShutdown" ) ) );
+
+
+ if ( !aReset && iSysApFeatureManager->Supported(KSysApFeatureIdGoodbyeNote) )
+ {
+ // show shutdown note
+ }
+
+ if( !aReset )
+ {
+ #ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION
+ TRAPD( err, ShowAnimationL() );
+ if ( err )
+ {
+ TRACES( RDebug::Print(_L("CSysApAppUi::DoShutdownL ShowAnimationL() leaved: %d" ), err ) );
+ CompleteShutdown(aReset, aResetReason);
+ }
+ }
+ else // aReset
+ {
+ CompleteShutdown(aReset, aResetReason);
+ }
+ #else // RD_STARTUP_ANIMATION_CUSTOMIZATION
+ TRAPD( err, animationenabled = ShowAnimationL() );
+ if ( err )
+ {
+ TRACES( RDebug::Print(_L("CSysApAppUi::DoShutdownL ShowAnimationL() leaved: %d" ), err ) );
+ }
+ }
+
+ if ( !animationenabled )
+ {
+ CompleteShutdown(aReset, aResetReason);
+ }
+ #endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
}
else
{
- SetIndicatorStateL( EAknIndicatorIrActive, EAknIndicatorStateOff );
- }
-
- iSysApCenRepCallForwardingObserver->UpdateCallForwardingIndicatorsL();
-
- iSysApCenRepMsgWaitingObserver->UpdateMessageWaitingIndicatorsL();
-
- state = StateOfProperty( KPSUidNetworkInfo, KNWHomeZoneStatus );
- if( state == ENWNone || state == ENWCityZone )
- {
- SetIndicatorStateL( EAknIndicatorHomeZone, EAknIndicatorStateOff );
- }
- else if( state == ENWHomeZone )
- {
- SetIndicatorStateL( EAknIndicatorHomeZone, EAknIndicatorStateOn );
+ TRACES( RDebug::Print(_L("CSysApAppUi::DoShutdownL: Was not OkToToInitiateShutdown" ) ) );
}
-
- // Initialize WLan state
- state = StateOfProperty( KPSUidWlan, KPSWlanIndicator );
- HandleWlanIndicatorL(state);
-
- // Initialize Tarm state
- state = StateOfProperty( KPSUidCoreApplicationUIs, KCoreAppUIsTarmIndicator );
- HandleTarmIndicatorL(state);
-
- TRACES( RDebug::Print( _L("CSysApAppUi::InitializeStatusPaneAreaL(): END") ) );
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::HandleWlanIndicator()
-// ----------------------------------------------------------------------------
-void CSysApAppUi::HandleWlanIndicatorL( TInt aValue )
- {
- if ( aValue == EPSWlanIndicatorAvailable )
- {
- SetIndicatorStateL( EAknIndicatorWlanActive, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorWlanActiveSecure, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorWlanAvailable, EAknIndicatorStateOn );
- }
- else if ( aValue == EPSWlanIndicatorActive )
- {
- SetIndicatorStateL( EAknIndicatorWlanAvailable, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorWlanActiveSecure, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorWlanActive, EAknIndicatorStateOn );
- }
- else if ( aValue == EPSWlanIndicatorActiveSecure )
- {
- SetIndicatorStateL( EAknIndicatorWlanAvailable, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorWlanActive, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorWlanActiveSecure, EAknIndicatorStateOn );
- }
- else // No indication required
- {
- SetIndicatorStateL( EAknIndicatorWlanAvailable, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorWlanActive, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorWlanActiveSecure, EAknIndicatorStateOff );
- }
+ TRACES( RDebug::Print(_L("CSysApAppUi::DoShutdownL: END" ) ) );
}
-// ----------------------------------------------------------------------------
-// CSysApAppUi::HandleTarmIndicatorL()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::HandleTarmIndicatorL( TInt aValue )
- {
- if ( aValue == ECoreAppUIsTarmTerminalSecurityOnIndicatorOn )
- {
- SetIndicatorStateL( EAknIndicatorTARM, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorTARMModuleOn, EAknIndicatorStateOn );
- }
- else if ( aValue == ECoreAppUIsTarmMngActiveIndicatorOn )
- {
- SetIndicatorStateL( EAknIndicatorTARMModuleOn, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorTARM, EAknIndicatorStateOn );
- }
- else
- {
- SetIndicatorStateL( EAknIndicatorTARM, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorTARMModuleOn, EAknIndicatorStateOff );
- }
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::HandleShortPowerKeyPressedL()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::HandleShortPowerKeyPressedL()
+
+
+/*
+----------------------------------------------------------------------------
+CSysApAppUi::IsEncryptionOperationOngoingL()
+Introduced the code as a part of Sub : 405-3362 - Power Management SUB for ES
+recapture functionalities in platform which support multidrive as well.
+-------------------------------------------------------------------------------
+*/
+TBool CSysApAppUi::IsEncryptionOperationOngoingL() const
{
- TInt callState( StateOfProperty( KPSUidCtsyCallInformation, KCTsyCallState ) );
-
- TRACES (
- RDebug::Print(
- _L("CSysApAppUi::HandleShortPowerKeyPressedL() callState:%d, iDeviceLockEnabled:%d" ),
- callState,
- iDeviceLockEnabled );
- );
- iSysApLightsController->PowerKeyPressedL();
-
- RProperty::Set( KPSUidCoreApplicationUIs, KCoreAppUIsHideAlarm, ECoreAppUIsHideAlarm );
-
-
- if( UiReady() && !iDeviceLockEnabled )
- {
- if ( iPowerKeyPopupMenuActive )
- {
- //Do nothing here. EEventKeyUp moves selection in the list!
- }
- else if ( !iKeyLockEnabled
- && callState != EPSCTsyCallStateAlerting
- && callState != EPSCTsyCallStateRinging
- && callState != EPSCTsyCallStateDialling )
- //Show power key menu
- {
- ShowPowerKeyPopUpMenuL();
- }
- }
- else
- {
- TInt swState( StateOfProperty( KPSUidStartup, KPSGlobalSystemState ) );
-
- if( swState == ESwStateAlarm )
- //From Alarm state even a short press causes shutdown but charger state need to be checked
- {
- TInt chargerState( StateOfProperty( KPSUidHWRMPowerState, KHWRMChargingStatus ) );
- if( chargerState == EChargingStatusNotConnected )
- //shutdown
+ TBool deFeatureSupported(EFalse);
+ FeatureManager::InitializeLibL();
+ deFeatureSupported = FeatureManager::FeatureSupported( KFeatureIdFfDeviceEncryptionFeature);
+ FeatureManager::UnInitializeLib();
+
+ if(deFeatureSupported)
+ {
+ /**
+ * Store the last memory status changed
+ * 0: Idle. It can be Encrypted or Decrypted
+ * 1: Encrypting
+ * 2: Decrypting
+ **/
+
+ RProperty deProperty;
+ User::LeaveIfError(deProperty.Attach(KDevEncProtectedUid, KDevEncOperationKey,EOwnerThread));
+ TInt deValue = 0;
+ if((deProperty.Get(deValue)== KErrNone)&&( deValue == EOpEncrypting || deValue == EOpDecrypting))
{
- StartShutDownTimerOnAlarmAndChargingStates();
+ deProperty.Close();
+ return ETrue;
}
else
- //to charging state
{
- SetStarterState( RStarterSession::ECharging );
+ deProperty.Close();
+ return EFalse;
}
}
- }
+ else
+ {
+ return EFalse;
+ }
}
// ----------------------------------------------------------------------------
@@ -1222,8 +1100,8 @@
TInt swState;
RProperty::Get( KPSUidStartup, KPSGlobalSystemState, swState );
-
- iSysApLightsController->PowerKeyPressedL();
+
+ iSysApLightsController->PowerKeyPressedL(); //need to handle later.
if( swState == ESwStateStartingCriticalApps ||
swState == ESwStateSelfTestOK ||
@@ -1239,10 +1117,7 @@
{
if( iPowerKeyPopupMenuActive )
{
- if ( iGlobalListQuery )
- {
- iGlobalListQuery->SelectItem();
- }
+ // do nothing
}
else if( !iIgnoreNextPowerKeyRepeats )
{
@@ -1272,1166 +1147,351 @@
}
// ----------------------------------------------------------------------------
-// CSysApAppUi::FreeResources()
+// CSysApAppUi::IsDeviceModeKey
// ----------------------------------------------------------------------------
-void CSysApAppUi::FreeResources()
+TBool CSysApAppUi::IsDeviceModeKey( const TKeyEvent& aKeyEvent ) const
{
- TRACES( RDebug::Print( _L("CSysApAppUi::FreeResources") ) );
-
- delete iSysApBatteryInfoController;
- delete iSysApPsmController;
-
- delete iSysApAudioRoutingObserver;
-
- delete iProfileNamesArray;
- iProfileNamesArray = NULL;
-
- if ( iTimer )
+ return CSysApDefaultKeyHandler::IsDeviceModeKey( aKeyEvent );
+ }
+
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::ShowShutdownImage
+// ----------------------------------------------------------------------------
+//
+TInt CSysApAppUi::ShowShutdownImage( TInt aBitmapId )
+ {
+ TRACES( RDebug::Print(_L("CSysApAppUi::ShowShutdownImage") ) );
+
+ TRAPD( err, ShowShutdownImageL( aBitmapId ) );
+
+ if ( err != KErrNone )
{
- iTimer->Cancel();
- delete iTimer;
- }
-
- if ( iSapTimer )
- {
- iSapTimer->Cancel();
- delete iSapTimer;
- }
-
- if ( iSysApTimer )
- {
- iSysApTimer->Cancel();
- delete iSysApTimer;
- }
-
- delete iGlobalListQuery;
-
- RWindowGroup groupWin = iCoeEnv->RootWin();
- groupWin.CancelCaptureKey( iCapturedEKeyPowerOff );
- groupWin.CancelCaptureKeyUpAndDowns( iCapturedEKeyPowerOffUpAndDowns );
-
- delete iSysApDefaultKeyHandler;
-
- if ( iProfileEngine )
- {
- iProfileEngine->Release();
+ TRACES( RDebug::Print(_L("CSysApAppUi::ShowShutdownImageL failed, err=%d"), err ) );
}
- delete iSysApSsSettingsObserver;
- delete iSysApEtelConnector;
-
- delete iSysApProfileObserver;
- delete iSysApNspsHandler;
- delete iSysApKeySndHandler;
- delete iSysApCenRepMsgWaitingObserver;
- delete iSysApCenRepCallForwardingObserver;
- delete iSysApConnectionMonitorObserver;
- delete iSysApCenRepLightSettingsObserver;
- delete iSysApCenRepLogsObserver;
- delete iSysApCenRepBtObserver;
- delete iSysApCenRepFmTxObserver;
- delete iSysApCenRepHacSettingObserver;
- delete iSysApCenRepController;
-
- delete iSysApPubSubObserver;
-
- delete iSysApMMCObserver;
- delete iSysApMsgSimMemLowQuery;
- delete iSysApWaitNote;
- delete iSysApConfirmationQuery;
- delete iSysApConfirmationQueryForRestart;
- delete iSysApOfflineModeController;
- delete iSysApUsbIndicatorController;
- delete iSysApBtController;
- delete iSysApBtSapController;
- delete iSignalNotify;
- delete iBatteryNotify;
- delete iSysApSystemLock;
- delete iSysApLocationPrivacyIndicator;
- delete iSysApAccessoryObserver;
- delete iSysApMediatorObserver;
-
- delete iSysApKeyManagement;
- iSysApKeyManagement = NULL;
- delete iSysApLightsController;
- iKeyLock.Close();
- delete iSysApFeatureManager;
-
- // Cleanup ECom, used by key management and light control
- REComSession::FinalClose();
-
- iResourcesFreed = ETrue;
- TRACES( RDebug::Print( _L("CSysApAppUi::FreeResources:END") ) );
+ return err;
+ }
+
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::ShowShutdownImageL
+// ----------------------------------------------------------------------------
+//
+void CSysApAppUi::ShowShutdownImageL( TInt aBitmapId )
+ {
+ TRACES( RDebug::Print(_L("CSysApAppUi::ShowShutdownImageL") ) );
+ // do nothing
+ if ( !iSysApShutdownImage ) // Shutdown image may be shown without entering normal state (e.g. charging), so construct here
+ {
+ TRACES( RDebug::Print( _L("CSysApAppUi::ShowShutdownImageL: trying CSysApShutdownImage::NewL()") ) );
+ iSysApShutdownImage = CSysApShutdownImage::NewL();
+ }
+ TRACES( RDebug::Print( _L("CSysApAppUi::ShowShutdownImageL: trying CSysApShutdownImage::ShowShutdownImageL()") ) );
+ iSysApShutdownImage->ShowShutdownImageL( aBitmapId );
+ }
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::PrepareForShutdownImage()
+// ----------------------------------------------------------------------------
+
+void CSysApAppUi::PrepareForShutdownImage()
+ {
+ TRACES( RDebug::Print( _L("CSysApAppUi::PrepareForShutdownImage() START" ) ) );
+
+ // If RD_STARTUP_ANIMATION_CUSTOMIZATION is enabled, the following actions are always taken in PrepareForShutdownAnimation
+#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
+ if ( !iAnimationShowingTime ) // actions already taken in PrepareForShutdownAnimation
+ {
+ static_cast<CAknAppUi*>(iEikonEnv->EikAppUi())->KeySounds()->PlaySound( EAvkonSIDPowerOffTone );
+ CancelGlobalListQuery();
+
+ if ( iSysApPowerKeyMenuObserver )
+ {
+ iSysApPowerKeyMenuObserver->Cancel();
+ }
+
+ // deactivate notifiers before showing the shutdown image
+ AknNotifierController::CancelAllNotifications();
+ AknNotifierController::HideAllNotifications(ETrue);
+ RWindowGroup groupWin = iCoeEnv->RootWin();
+ iCapturedAppskey = groupWin.CaptureKey( EKeyApplication, KModifierMask, KModifierMask );
+ iCapturedAppskeyUpAndDowns = groupWin.CaptureKeyUpAndDowns( EStdKeyApplication0, KModifierMask, KModifierMask );
+ }
+#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
+
+#ifndef __SYSAP_MODULE_TEST //to make errors during shutdown sequence being seen more easily
+ iEikonEnv->RootWin().SetOrdinalPosition(0, ECoeWinPriorityAlwaysAtFront );
+ TRACES( RDebug::Print( _L("CSysApAppUi::PrepareForShutdownImage() Show Shutdown image" ) ) );
+ ShowShutdownImage( 1 );//EMbmSysapQgn_startup_screen
+#endif
+ TRACES( RDebug::Print( _L("CSysApAppUi::PrepareForShutdownImage() END" ) ) );
}
// ----------------------------------------------------------------------------
-// CSysApAppUi::ShowUiNoteL( const TSysApNoteIds aNote ) const
+// CSysApAppUi::OkToInitiateShutdown()
// ----------------------------------------------------------------------------
-void CSysApAppUi::ShowUiNoteL( const TSysApNoteIds aNote ) const
+TBool CSysApAppUi::OkToInitiateShutdown()
{
- TRACES( RDebug::Print( _L("CSysApAppUi::ShowUiNoteL aNote: %d"), aNote ) );
- TInt tone( EAvkonSIDNoSound );
- TAknGlobalNoteType noteType( EAknGlobalBatteryLowNote );
- CAknGlobalNote* note = CAknGlobalNote::NewLC();
- TInt secondaryDisplayId(SecondaryDisplay::ECmdNoNote);
-
- switch ( aNote )
+ TInt swState;
+ RProperty::Get( KPSUidStartup, KPSGlobalSystemState, swState );
+
+ if( !iShutdownStarted &&
+ swState == ESwStateStartingCriticalApps ||
+ swState == ESwStateSelfTestOK ||
+ swState == ESwStateSecurityCheck ||
+ swState == ESwStateCriticalPhaseOK ||
+ swState == ESwStateEmergencyCallsOnly ||
+ swState == ESwStateCharging ||
+ swState == ESwStateAlarm ||
+ swState == ESwStateNormalRfOn ||
+ swState == ESwStateNormalRfOff ||
+ swState == ESwStateNormalBTSap ||
+ swState == ESwStateFatalStartupError )
+ {
+ iShutdownStarted = ETrue;
+ return ETrue;
+ }
+ else
{
- case EBatteryLowNote:
- noteType = EAknGlobalBatteryLowNote;
- tone = EAvkonSIDBatteryLowTone;
- break;
- case EBatteryFullNote:
- noteType = EAknGlobalBatteryFullNote;
- tone = EAvkonSIDInformationTone;
- break;
- case ERechargeBatteryNote:
- iSysApLightsController->BatteryEmptyL( ETrue );
- noteType = EAknGlobalRechargeBatteryNote;
- tone = EAvkonSIDRechargeBatteryTone;
- break;
- case ENotChargingNote:
- noteType = EAknGlobalNotChargingNote;
- tone = EAvkonSIDWrongCharger;
- break;
- case EInsertSimNote:
- noteType = EAknGlobalInformationNote;
- tone = EAvkonSIDInformationTone;
- secondaryDisplayId = SecondaryDisplay::ECmdShowInsertSimNote;
- break;
- case EMemoryCardRemovedWithoutEjectNote:
- noteType = EAknGlobalInformationNote;
- tone = EAvkonSIDInformationTone;
- secondaryDisplayId = SecondaryDisplay::ECmdShowMemoryCardRemovedWithoutEjectNote;
- break;
- case EGprsSuspendedNote:
- noteType = EAknGlobalInformationNote;
- tone = EAvkonSIDInformationTone;
- secondaryDisplayId = SecondaryDisplay::ECmdShowGprsSuspendedNote;
- break;
- case EGprsResumedNote:
- noteType = EAknGlobalInformationNote;
- tone = EAvkonSIDInformationTone;
- secondaryDisplayId = SecondaryDisplay::ECmdShowGprsResumedNote;
- break;
- case EShutdownNote:
- noteType = EAknGlobalInformationNote;
- tone = EAvkonSIDInformationTone;
- secondaryDisplayId = SecondaryDisplay::ECmdShowShutdownNote;
- break;
- case ECannotActivateOfflineModeNote:
- noteType = EAknGlobalErrorNote;
- tone = EAvkonSIDErrorTone;
- secondaryDisplayId = SecondaryDisplay::ECmdShowCannotActivateOfflineModeNote;
- break;
- case ECannotDeactivateOfflineModeNote:
- noteType = EAknGlobalErrorNote;
- tone = EAvkonSIDErrorTone;
- secondaryDisplayId = SecondaryDisplay::ECmdShowCannotDeactivateOfflineModeNote;
- break;
- case EKeypadActiveNote:
- noteType = EAknGlobalInformationNote;
- tone = EAvkonSIDInformationTone;
- secondaryDisplayId = SecondaryDisplay::ECmdShowKeypadActiveNote;
- break;
- case EFmTxAccessoryStandbyNote:
- noteType = EAknGlobalInformationNote;
- tone = EAvkonSIDInformationTone;
- secondaryDisplayId = SecondaryDisplay::ECmdShowFmTxStandbyInAccessoryConnectionNote;
- break;
- case EFmTxAccessoryForbidsNote:
- noteType = EAknGlobalInformationNote;
- tone = EAvkonSIDInformationTone;
- secondaryDisplayId = SecondaryDisplay::ECmdShowFmTxCannotEnableWhileAccessoryConnectedNote;
- break;
- case EFmTxVolumeDisabledNote:
- noteType = EAknGlobalInformationNote;
- tone = EAvkonSIDInformationTone;
- secondaryDisplayId = SecondaryDisplay::ECmdShowFmTxVolumeDisabledNote;
- break;
- case EFmTxOnNote:
- noteType = EAknGlobalInformationNote;
- tone = EAvkonSIDInformationTone;
- secondaryDisplayId = SecondaryDisplay::ECmdShowFmTxTuneRadioToFrequencyNote;
- break;
- case EFmTxOffNote:
- noteType = EAknGlobalInformationNote;
- tone = EAvkonSIDInformationTone;
- secondaryDisplayId = SecondaryDisplay::ECmdShowFmTxDisabledNote;
- break;
- case EBatteryFullUnplugChargerNote:
- noteType = EAknGlobalBatteryFullUnplugNote;
- tone = EAvkonSIDInformationTone;
- break;
- case EUnplugChargerNote:
- noteType = EAknGlobalUnplugChargerNote;
- tone = EAvkonSIDInformationTone;
- break;
- case EPowerSaveModeActivated:
- noteType = EAknGlobalConfirmationNote;
- tone = EAvkonSIDConfirmationTone;
- secondaryDisplayId = SecondaryDisplay::ECmdShowPowerSavingActivatedNote;
- break;
- case EPowerSaveModeDeactivated:
- noteType = EAknGlobalConfirmationNote;
- tone = EAvkonSIDConfirmationTone;
- secondaryDisplayId = SecondaryDisplay::ECmdShowPowerSavingDeactivatedNote;
- break;
- case ECannotActivatePowerSaveMode:
- noteType = EAknGlobalWarningNote;
- tone = EAvkonSIDWarningTone;
- secondaryDisplayId = SecondaryDisplay::ECmdShowCannotActivatePowerSavingNote;
- break;
- case ECannotDeactivatePowerSaveMode:
- noteType = EAknGlobalWarningNote;
- tone = EAvkonSIDWarningTone;
- secondaryDisplayId = SecondaryDisplay::ECmdShowCannotDeactivatePowerSavingNote;
- break;
- default:
- break;
-
+ return EFalse;
+ }
+ }
+
+
+void CSysApAppUi::PopupNote()
+ {
+ iIgnoreNextPowerKeyUpEvent = ETrue;
+ // TRACES( RDebug::Print( _L("CSysApAppUi::Key was consumed") ) );
+ _LIT(KPowerPressKey,"Short power key");
+ HBufC* aString = HBufC16::NewLC(50);
+ TPtrC aStringPointer = aString->Des();
+ aStringPointer.Set(KPowerPressKey);
+ TRACES( RDebug::Print( _L("CSysApWsClient::RunL(): Key EEventKeyUp 01") ) );
+ ShowExampleUiNoteL( aStringPointer );
+ CleanupStack::PopAndDestroy(); // aString
+ }
+
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::SetUsbAttachStatus
+// ----------------------------------------------------------------------------
+#ifndef RD_MULTIPLE_DRIVE
+void CSysApAppUi::SetUsbAttachStatus( const TBool aUsbAttached )
+ {
+ // Prevent double beep when USB file transfer gets activated but
+ // allow MMC inserted beep when:
+ // a) USB file transfer is active
+ // b) MMC is not inserted when USB cable is attached
+ iHideNextBeep = ( iMMCInserted && aUsbAttached );
+ }
+#else // RD_MULTIPLE_DRIVE
+void CSysApAppUi::SetUsbAttachStatus( const TBool aUsbAttached )
+ {
+ TRACES( RDebug::Print(
+ _L( "CSysApAppUi::SetUsbAttachStatus: aUsbAttached: %d" ),
+ aUsbAttached ) );
+
+ if ( aUsbAttached )
+ {
+ // For ignoring extra beeps caused by USB file transfer
+ iSysApDriveList->ResetDrivesInsertBeepIgnored();
+ iSysApDriveList->MarkDrivesInsertBeepIgnored( iInsertedMemoryCards );
}
-
- TInt swState( StateOfProperty( KPSUidStartup, KPSGlobalSystemState ) );
-
- if( UiReady() || swState == ESwStateSecurityCheck)
+ }
+#endif // RD_MULTIPLE_DRIVE
+
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::UsbChargerDetector
+// ----------------------------------------------------------------------------
+//
+TSysApUsbChargerDetector& CSysApAppUi::UsbChargerDetector()
+ {
+ return iSysApUsbChargerDetector;
+ }
+
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::HandleAccessoryDisconnectedL()
+// ----------------------------------------------------------------------------
+
+void CSysApAppUi::HandleAccessoryDisconnectedL()
+ {
+ TRACES( RDebug::Print( _L("CSysApAppUi::HandleAccessoryDisconnectedL()" ) ) );
+
+
+ TAccMode accessoryState(EAccModeHandPortable);
+ if ( iSysApAccessoryObserver )
{
- HBufC* noteStringBuf = NULL;
-
- switch ( aNote )
+ accessoryState = iSysApAccessoryObserver->GetAccessoryMode();
+ }
+
+ if ( accessoryState == EAccModeHandPortable )
+ {
+ TRACES( RDebug::Print( _L("CSysApAppUi::HandleAccessoryDisconnectedL:Before Deactivating accessory Plugin")));
+ iHbIndicatorSymbian->Deactivate(KAccesoryPlugin);
+ TRACES( RDebug::Print( _L("CSysApAppUi::HandleAccessoryDisconnectedL:After Deactivating accessory Plugin")));
+ iSysApLightsController->AccessoryConnectedL( EFalse );
+ iSysApCenRepController->SetInt( KCRUidCoreApplicationUIsSysAp, KSysApAccessoryConnected, 0 );
+ }
+
+ SetIhfIndicatorL();
+ SetHacIndicatorL();
+
+ // If lock disabled because of accessory, reactivate it, unless phone call or alarm is ongoing
+ if ( iKeyLockOnBeforeCradle )
+ {
+ iKeyLockOnBeforeCradle = EFalse;
+ if ( !iKeyLockOnBeforeCall && !iKeyLockOnBeforeAlarm )
{
- case EInsertSimNote:
- noteStringBuf = StringLoader::LoadLC( R_QTN_SU_NOTE_INSERT_SIM, iEikonEnv );
- break;
- case EMemoryCardRemovedWithoutEjectNote:
- noteStringBuf = StringLoader::LoadLC( R_QTN_MEMS_EJECT_ERROR, iEikonEnv );
- note->SetSoftkeys( R_AVKON_SOFTKEYS_OK_EMPTY );
- break;
- case EGprsSuspendedNote:
- noteStringBuf = StringLoader::LoadLC( R_QTN_GPRS_CONF_GPRS_SUSPENDED, iEikonEnv );
- break;
- case EGprsResumedNote:
- noteStringBuf = StringLoader::LoadLC( R_QTN_GPRS_CONF_GPRS_RESUMED, iEikonEnv );
- break;
- case EShutdownNote:
- noteStringBuf = StringLoader::LoadLC( R_QTN_PWRC_INFO_GOODBYE, iEikonEnv);
- break;
- case ECannotActivateOfflineModeNote:
- noteStringBuf = StringLoader::LoadLC( R_QTN_ERR_OFFLINE_UNABLE, iEikonEnv );
- break;
- case ECannotDeactivateOfflineModeNote:
- noteStringBuf = StringLoader::LoadLC( R_QTN_ERR_OFFLINE_UNABLE_PROFILE, iEikonEnv );
- break;
- case EKeypadActiveNote:
- if ( iSysApFeatureManager->PenEnabled() )
- {
- noteStringBuf = StringLoader::LoadLC( R_QTN_KEYG_CONF_DISPLAY_KEYS_ACTIVE,
- iEikonEnv );
- }
- else
- {
- noteStringBuf = StringLoader::LoadLC( R_QTN_KEYG_CONF_KEYPAD_ACTIVE,
- iEikonEnv );
- }
- note->SetAnimation( R_QGN_NOTE_KEYGUARD_OPEN_ANIM );
- break;
- case EFmTxOnNote:
+ if ( !iDeviceLockEnabled )
{
- const TInt KFrequencyMaxLength(7);
- // read frequency
- TInt frequencykHz = iSysApCenRepFmTxObserver->Frequency();
- TReal frequencyMHz = static_cast<TReal>( frequencykHz ) / KCoefficientKhzToMhz; // kHz to Mhz
- TBuf<KFrequencyMaxLength> frequencyAsString;
- frequencyAsString.AppendNum( frequencyMHz, TRealFormat( KFrequencyMaxLength, KDecimalsInMhzFrequency ) );
- AknTextUtils::LanguageSpecificNumberConversion( frequencyAsString );
- noteStringBuf
- = StringLoader::LoadLC( R_QTN_FMTX_SYSAP_INFO_NOTE_CHANGE_FREQ,
- frequencyAsString,
- iEikonEnv );
- break;
- }
- case EFmTxAccessoryForbidsNote:
- {
- noteStringBuf = StringLoader::LoadLC( R_QTN_FMTX_SYSAP_INFO_NOTE_ACCESSORY_FORBIDS,
- iEikonEnv );
- break;
- }
- case EFmTxAccessoryStandbyNote:
- {
- noteStringBuf = StringLoader::LoadLC( R_QTN_FMTX_SYSAP_INFO_NOTE_ACCESSORY_STANDBY,
- iEikonEnv );
- break;
- }
- case EFmTxVolumeDisabledNote:
- {
- noteStringBuf = StringLoader::LoadLC( R_QTN_FMTX_SYSAP_INFO_NOTE_VOLUME_DISABLED,
- iEikonEnv );
- break;
- }
- case EFmTxOffNote:
- {
- noteStringBuf = StringLoader::LoadLC( R_QTN_FMTX_SYSAP_INFO_NOTE_DISABLED,
- iEikonEnv );
- break;
- }
- case EPowerSaveModeActivated:
- noteStringBuf = StringLoader::LoadLC( R_QTN_POWER_SAVING_ACTIVATED_CONF_NOTE, iEikonEnv );
- break;
- case EPowerSaveModeDeactivated:
- noteStringBuf = StringLoader::LoadLC( R_QTN_POWER_SAVING_DEACTIVATED_CONF_NOTE, iEikonEnv );
- break;
- case ECannotActivatePowerSaveMode:
- noteStringBuf = StringLoader::LoadLC( R_QTN_POWER_SAVING_FAILED_WARNING_NOTE, iEikonEnv );
- break;
- case ECannotDeactivatePowerSaveMode:
- noteStringBuf = StringLoader::LoadLC( R_QTN_POWER_SAVING_DEACTIVATION_FAILED_WARNING_NOTE, iEikonEnv );
- break;
- default:
- break;
- }
-
- note->SetTone( tone );
-
- // Set secondary display data if necessary
- if ( iSysApFeatureManager->CoverDisplaySupported() && secondaryDisplayId != SecondaryDisplay::ECmdNoNote)
- {
- TRACES( RDebug::Print( _L("CSysApAppUi::ShowUiNoteL - Notifying secondary display") ) );
- CAknSDData* sd;
-
- if ( aNote == EFmTxOnNote ) // frequency information is passed to secondary display
- {
- SecondaryDisplay::TFmTxFrequencyInKhzPckg pckg( iSysApCenRepFmTxObserver->Frequency() );
- sd = CAknSDData::NewL( SecondaryDisplay::KCatSysAp, secondaryDisplayId, pckg );
+ iKeyguardController->EnableKeyguard(ETrue);
}
else
{
- sd = CAknSDData::NewL(SecondaryDisplay::KCatSysAp, secondaryDisplayId, KNullDesC8);
- }
-
- note->SetSecondaryDisplayData(sd); // ownership to notifier client
- }
-
- if ( noteStringBuf )
- {
- TPtr textBuffer = noteStringBuf->Des();
- TRACES( RDebug::Print( _L("CSysApAppUi::ShowUiNoteL Next:note->ShowNoteL" ) ) );
- note->ShowNoteL( noteType, textBuffer );
- CleanupStack::PopAndDestroy( ); // noteStringbuf
- }
- else
- {
- TRACES( RDebug::Print( _L("CSysApAppUi::ShowUiNoteL Next:note->ShowNoteL" ) ) );
- note->ShowNoteL( noteType, KNullDesC );
- }
- }
- else if( swState == ESwStateAlarm || swState == ESwStateCharging )
- {
- if ( aNote != EUnplugChargerNote ) // don't play tone when charger is disconnected in charging state
- {
- static_cast<CAknAppUi*>(iEikonEnv->EikAppUi())->KeySounds()->PlaySound( tone );
- }
- }
-
- CleanupStack::PopAndDestroy(); // note
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::ShowChargingNoteL()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::ShowChargingNoteL()
- {
- TRACES( RDebug::Print( _L("CSysApAppUi::ShowChargingNoteL") ) );
- TBool showNote( ETrue );
-
- TInt swState( StateOfProperty( KPSUidStartup, KPSGlobalSystemState ) );
- TRACES( RDebug::Print( _L("CSysApAppUi::ShowChargingNoteL: swState: %d"), swState ) );
-
- if( UiReady() || swState == ESwStateSecurityCheck )
- {
- if ( StateOfProperty( KPSUidCtsyCallInformation, KCTsyCallState ) == EPSCTsyCallStateRinging )
- {
- showNote = EFalse;
- }
- TRACES( RDebug::Print( _L("CSysApAppUi::ShowChargingNoteL KCTsyCallState=%d"), StateOfProperty( KPSUidCtsyCallInformation, KCTsyCallState ) ) );
- if ( showNote ) // Power Mgmt UI spec defines that no Charging note is shown while the phone is ringing/alerting
- {
- CAknGlobalNote* chargingNote = CAknGlobalNote::NewLC();
- chargingNote->SetTone( EAvkonSIDChargingBatteryTone );
- chargingNote->ShowNoteL( EAknGlobalChargingNote, KNullDesC );
- CleanupStack::PopAndDestroy( chargingNote );
- }
- }
- else if( swState == ESwStateAlarm || swState == ESwStateCharging )
- {
- TRACES( RDebug::Print( _L("CSysApAppUi::ShowChargingNoteL - Just play tone") ) );
- static_cast<CAknAppUi*>(iEikonEnv->EikAppUi())->KeySounds()->PlaySound( EAvkonSIDChargingBatteryTone );
- }
- else
- {
- TRACES( RDebug::Print( _L("CSysApAppUi::ShowChargingNoteL - No note shown") ) );
- }
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::HandleChargerNotesL()
-// ----------------------------------------------------------------------------
-void CSysApAppUi::HandleChargerNotesL( const TInt aValue )
- {
- TBool showNote(StateOfProperty( KPSUidCtsyCallInformation, KCTsyCallState ) != EPSCTsyCallStateRinging);
- if ( aValue == EChargingStatusCharging )
- {
- iSysApLightsController->BatteryEmptyL( EFalse );
- TRACES( RDebug::Print( _L("SysAp: charger connected") ) );
- iSysApLightsController->ChargerConnectedL( ETrue );
- ShowChargingNoteL();
- }
- //Display Not Charging note
- else if ( aValue == EChargingStatusError )
- {
- if(showNote)
- {
- ShowUiNoteL( ENotChargingNote );
- }
- }
- else if ( aValue == EChargingStatusChargingComplete )
- {
- iSysApLightsController->ChargingCompleteL();
-
- TSysApNoteIds note( EBatteryFullNote );
-
- if ( !iSysApUsbChargerDetector.HostOnlyUsbChargingUsed() &&
- iSysApFeatureManager->Supported( KSysApFeatureIdChargerReminderNotes ) )
- {
- note = EBatteryFullUnplugChargerNote;
- }
- iSysApUsbChargerDetector.Reset();
- if(showNote)
- {
- ShowUiNoteL( note );
- }
- }
- else if ( aValue == EChargingStatusNotConnected )
- {
- TRACES( RDebug::Print( _L("SysAp: charger removed") ) );
- iSysApLightsController->ChargerConnectedL( EFalse );
-
- if ( !iSysApUsbChargerDetector.HostOnlyUsbChargingUsed() &&
- iSysApFeatureManager->Supported( KSysApFeatureIdChargerReminderNotes ) )
- {
- if(showNote)
- {
- ShowUiNoteL( EUnplugChargerNote );
- }
- }
- iSysApUsbChargerDetector.Reset();
- }
- else if ( aValue == EChargingStatusNotCharging )
- {
- TRACES( RDebug::Print( _L("SysAp: Not charging") ) );
- }
- else if ( aValue == EChargingStatusAlmostComplete )
- {
- TRACES( RDebug::Print( _L("SysAp: Charging almost complete") ) );
- }
- else if ( aValue == EChargingStatusChargingContinued )
- {
- //in this case we simply want to scroll the battery bars and not turn light on or show ui note
- // set lights controller iBatteryEmpty to EFalse
- iSysApLightsController->BatteryEmptyL( EFalse );
- TRACES( RDebug::Print( _L("SysAp: charging continues") ) );
- }
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::ShowProfileNoteL()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::ShowProfileNoteL()
- {
- TRACES( RDebug::Print( _L("CSysApAppUi::ShowProfileNoteL") ) );
-
- if ( UiReady() )
- {
-
- TBufC<KMaxProfileNameLength> profileName;
- HBufC* noteStringBuf = NULL;
- ActiveProfileNameL( profileName.Des() );
- noteStringBuf = StringLoader::LoadLC( R_TEXT_MODE_SELECTED, profileName, iEikonEnv );
- TPtr textBuffer = noteStringBuf->Des();
- AknTextUtils::DisplayTextLanguageSpecificNumberConversion( textBuffer );
-
-
- // Set secondary display data if necessary
- if ( iSysApFeatureManager->CoverDisplaySupported() )
- {
- TRACES( RDebug::Print( _L("CSysApAppUi::ShowProfileNoteL - Notifying secondary display") ) );
- SecondaryDisplay::TProfileName sdProfileName;
- sdProfileName.Append(profileName.Left(SecondaryDisplay::KProfileNameMaxLen));
- SecondaryDisplay::TProfileNotePckg pckg(sdProfileName);
- CAknSDData* sd = CAknSDData::NewL(SecondaryDisplay::KCatSysAp, SecondaryDisplay::ECmdShowProfileNote, pckg);
-
- }
-
-
- CAknDiscreetPopup::ShowGlobalPopupL(textBuffer,KNullDesC, KAknsIIDNone, KNullDesC);
-
- CleanupStack::PopAndDestroy(); // noteStringbuf
-
- iSysApLightsController->ProfileChangedL(); // All notes should always turn lights on.
- }
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::ShowQueryL()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::ShowQueryL( const TSysApConfirmationQueryIds aQueryId, const TDesC& aValue )
- {
- CancelGlobalListQuery();
-
- if ( aQueryId == ESysApRestartPhoneQuery )
- {
- iDisablePowerkeyMenu = ETrue;
- // Cancel any other query that might be outstanding (i.e. ESysApRemoveMmcNote),
- // to avoid multiple overlapping queries causing problems
- if ( iSysApConfirmationQuery )
- {
- iSysApConfirmationQuery->Cancel();
- }
-
- if ( !iSysApConfirmationQueryForRestart )
- {
- TRACES( RDebug::Print( _L("CSysApAppUi::ShowQueryL: trying CSysApConfirmationQuery::NewL() for restart") ) );
- iSysApConfirmationQueryForRestart = CSysApConfirmationQuery::NewL( *this );
- }
-
- iSysApConfirmationQueryForRestart->ShowQueryL( aQueryId, iEikonEnv );
- }
- else
- {
- if ( !iSysApConfirmationQuery )
- {
- TRACES( RDebug::Print( _L("CSysApAppUi::ShowQueryL: trying CSysApConfirmationQuery::NewL()") ) );
- iSysApConfirmationQuery = CSysApConfirmationQuery::NewL( *this );
- }
-
- iSysApConfirmationQuery->ShowQueryL( aQueryId, aValue, iEikonEnv );
- }
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::UpdateBatteryBarsL( const TInt aState )
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::UpdateBatteryBarsL( const TInt aState )
- {
- TInt state( StateOfProperty( KPSUidHWRMPowerState, KHWRMChargingStatus ) );
- TRACES( RDebug::Print( _L("CSysApAppUi::UpdateBatteryBarsL aState: %d, chargerState:%d"), aState, state ) );
- HandleUsbCharger( state );
- if( state == EChargingStatusCharging ||
- state == EChargingStatusChargingContinued ||
- state == EChargingStatusAlmostComplete )
- {
- if ( !iCharging )
- {
- TRACES( RDebug::Print( _L("CSysApAppUi::UpdateBatteryBarsL: Starting Charging") ) );
- iBatteryNotify->StartChargingL();
- iCharging = ETrue;
- }
-
- // When Avkon supports battery state sending while charging,
- // add setting battery level here also.
- }
- else
- {
- if ( iCharging )
- {
- TRACES( RDebug::Print( _L("CSysApAppUi::UpdateBatteryBarsL: Stopping Charging") ) );
- iBatteryNotify->StopChargingL();
- iCharging = EFalse;
- }
-
- if( state == KErrUnknown || aState == KErrUnknown )
- {
- TRACES( RDebug::Print( _L("CSysApAppUi::UpdateBatteryBarsL: CAknBatteryNotify::SetBatteryLevelL(0)") ) );
- iBatteryNotify->SetBatteryLevelL( 0 );
- }
- else
- {
- TRACES( RDebug::Print( _L("CSysApAppUi::UpdateBatteryBarsL: CAknBatteryNotify::SetBatteryLevelL(%d)"), aState - EBatteryLevelLevel0 ) );
- iBatteryNotify->SetBatteryLevelL( aState - EBatteryLevelLevel0 );
- }
- }
-
- if ( !iSysApPsmController ) // created here if first state change has not occurred yet
- {
- iSysApPsmController = CSysApPsmController::NewL( *this );
- }
-
- if ( iSysApPsmController )
- {
- if ( iSysApPsmController->FullPsmEnabled() )
- {
- iBatteryNotify->SetBatteryStateL( EAknBatteryIndicatorPowerSave );
- }
- else
- {
- iBatteryNotify->SetBatteryStateL( EAknBatteryIndicatorNormal );
- }
- }
-
- if ( iSysApBatteryInfoController )
- {
- iSysApBatteryInfoController->BatteryLevelUpdatedL();
- }
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::UpdateSignalBarsL()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::UpdateSignalBarsL()
- {
- UpdateSignalBarsL(iSysApEtelConnector->GetSignalBars());
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::UpdateSignalBarsL( const TInt aState )
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::UpdateSignalBarsL( const TInt aState )
- {
- TRACES( RDebug::Print( _L("CSysApAppUi::UpdateSignalBarsL aState: %d"), aState ) );
- if( iSysApGanHandler && iSysApGanHandler->IsInGanMode() )
- {
- iSignalNotify->SetSignalLevelL( iSysApGanHandler->GanSignalLevel() );
- }
- else if( aState == KAknSignalOffLineMode || (iSysApOfflineModeController->OfflineModeActive() && !iEmergencyCallActive) )
- {
- iSignalNotify->SetSignalLevelL( KAknSignalOffLineMode );
- }
- else if( aState <= 0 )
- {
- // Do not update indicator show zero bars if we should be showing X over bars
- // This is required for indicator to work correctly in BT SAP mode.
- // Cannot use check for BT SAP enabled status, as zero bars notify comes before enabled status changes.
- if ( !iIgnoreZeroNetworkBarNotifications )
- {
- iSignalNotify->SetSignalLevelL( 0 );
- }
- }
- else
- {
- iSignalNotify->SetSignalLevelL( aState );
- }
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::SetSignalIndicatorL()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::SetSignalIndicatorL()
- {
- TSysApNetworkMode networkMode( ESysApGSM );
-
- TInt networkModeFromNetworkInfo( StateOfProperty( KPSUidNetworkInfo, KNWTelephonyNetworkMode ) );
- if ( networkModeFromNetworkInfo == ENWNetworkModeWcdma )
- {
- networkMode = ESysApWCDMA;
- }
- else
- {
- networkMode = ESysApGSM;
- }
-
- TRACES( RDebug::Print( _L("CSysApAppUi::SetSignalIndicatorL: networkMode = %d" ), networkMode ) );
-
- if( iSysApOfflineModeController->OfflineModeActive() && !iEmergencyCallActive )
- {
- // The device is in Offline Mode
- if ( iSysApFeatureManager->Supported( KSysApFeatureIdGprs_G_Icon ) )
- {
- iSignalNotify->SetGprsStateL( EAknSignalGprsIndicatorOff );
- }
- else
- {
- iSignalNotify->SetCommonPacketDataStateL( EAknSignalCommonPacketDataIndicatorOff );
- }
- iSignalNotify->SetWcdmaStateL( EAknSignalWcdmaIndicatorOff );
- iSignalNotify->SetHsdpaStateL( EAknSignalHsdpaIndicatorOff);
- TRACES( RDebug::Print(_L("CSysApAppUi::SetSignalIndicatorL: gan off" ) ) );
- iSignalNotify->SetUmaStateL( EAknSignalUmaIndicatorOff );
- }
- else
- {
- if( iSysApGanHandler && iSysApGanHandler->IsInGanMode() )
- {
- // Enter GAN: set GAN signal bar
- SetSignalIndicatorGanL();
- iGanEnabled = ETrue;
- }
- else
- {
- if( iGanEnabled )
- {
- UpdateSignalBarsL();
- iGanEnabled = EFalse;
- }
-
- // The device is in Online Mode
- switch ( networkMode )
- {
- case ESysApGSM:
- SetSignalIndicatorGsmL();
- break;
-
- case ESysApWCDMA:
- SetSignalIndicatorWcdmaL();
- break;
-
- default:
- break;
+ iKeyguardController->EnableKeyguard(EFalse);
}
}
}
}
+
// ----------------------------------------------------------------------------
-// CSysApAppUi::SetSignalIndicatorGsmL()
+// CSysApAppUi::HandleAccessoryConnectedL()
// ----------------------------------------------------------------------------
-void CSysApAppUi::SetSignalIndicatorGsmL()
+
+void CSysApAppUi::HandleAccessoryConnectedL( TAccMode aAccessoryState, TInt aPhysicalConnectionType )
{
- TInt signalGprsIndicatorState( 0 );
- TInt signalIndicatorState( 0 );
- TInt bearerValue = EBearerUnknown;
-
- if(iSysApConnectionMonitorObserver)
- {
- bearerValue = iSysApConnectionMonitorObserver->GetBearerValue();
- }
-
- if(bearerValue == EBearerEdgeGPRS)
- {
- TInt egprsStatus = StateOfProperty( KUidSystemCategory, KPSUidGprsStatusValue );
- TRACES( RDebug::Print( _L("CSysApAppUi::SetSignalIndicatorGsmL gprsStatus: %d" ), egprsStatus ) );
- iSignalNotify->SetWcdmaStateL( EAknSignalWcdmaIndicatorOff );
- iSignalNotify->SetHsdpaStateL( EAknSignalHsdpaIndicatorOff );
- switch ( egprsStatus )
- {
- case EPSGprsContextActive:
- signalGprsIndicatorState = EAknSignalEdgeIndicatorContext;
- signalIndicatorState = EAknSignalCommonPacketDataIndicatorContext;
- iGprsActivated = ETrue;
- iGprsSuspended = EFalse;
- HandleGprsNotesL();
- break;
-
- case EPSGprsContextActivating:
- signalGprsIndicatorState = EAknSignalEdgeIndicatorEstablishingContext;
- signalIndicatorState = EAknSignalCommonPacketDataIndicatorEstablishingContext;
- iGprsActivated = EFalse;
- iGprsSuspended = EFalse;
- break;
-
- case EPSGprsSuspend:
- signalGprsIndicatorState = EAknSignalEdgeIndicatorSuspended;
- signalIndicatorState = EAknSignalCommonPacketDataIndicatorSuspended;
- iGprsSuspended = ETrue;
- HandleGprsNotesL();
- break;
-
- case EPSGprsAttach:
- signalGprsIndicatorState = EAknSignalEdgeIndicatorAttached;
- signalIndicatorState = EAknSignalCommonPacketDataIndicatorAttached;
- iGprsActivated = EFalse;
- iGprsSuspended = EFalse;
- break;
-
- case EPSGprsMultibleContextActive:
- signalGprsIndicatorState = EAknSignalEdgeIndicatorMultipdp;
- signalIndicatorState = EAknSignalCommonPacketDataIndicatorMultipdp;
- iGprsActivated = ETrue;
- iGprsSuspended = EFalse;
- HandleGprsNotesL();
- break;
-
- case EPSGprsUnattached:
- default:
- if ( iTDEnable )
- {
- signalGprsIndicatorState = EAknSignalEdgeIndicatorAvailable;
- signalIndicatorState = EAknSignalCommonPacketDataIndicatorAvailable;
- }
- else
- {
- signalGprsIndicatorState = EAknSignalEdgeIndicatorOff;
- signalIndicatorState = EAknSignalCommonPacketDataIndicatorOff;
- }
- iGprsSuspendedNoteShown = EFalse;
- iGprsActivated = EFalse;
- iGprsSuspended = EFalse;
- iCallActivated = EFalse;
- break;
- }
+ TRACES( RDebug::Print( _L("CSysApAppUi::HandleAccessoryConnectedL( aAccessoryState: %d )(aPhysicalConnectionType: %d "), aAccessoryState, aPhysicalConnectionType ) );
+
+ CHbSymbianVariantMap* iAccVariantMap = CHbSymbianVariantMap::NewL();
+ CleanupStack::PushL(iAccVariantMap);
+ CHbSymbianVariant* variantAccState = CHbSymbianVariant::NewL(&aAccessoryState, CHbSymbianVariant::EInt);
+ iAccVariantMap->Add(KAccMode,variantAccState);
+ CHbSymbianVariant* variantAccType = CHbSymbianVariant::NewL(&aPhysicalConnectionType, CHbSymbianVariant::EInt);
+ iAccVariantMap->Add(KAccPhyConType,variantAccType);
+
+
+ CHbSymbianVariant* iAccVariant = CHbSymbianVariant::NewL(iAccVariantMap, CHbSymbianVariant::EVariantMap );
+ CleanupStack::PushL(iAccVariant);
+ iHbIndicatorSymbian->Activate(KAccesoryPlugin, iAccVariant);
+
+
+ TInt swState( StateOfProperty( KPSUidStartup, KPSGlobalSystemState ) );
+ TRACES( RDebug::Print( _L("CSysApAppUi::HandleAccessoryConnectedL: swState: %d"), swState ) );
+
+ if( UiReady() || swState == ESwStateSecurityCheck )
+ {
+ iSysApLightsController->AccessoryConnectedL( ETrue );
}
- else
- {
-
- TInt gprsStatus = StateOfProperty( KUidSystemCategory, KPSUidGprsStatusValue );
- TRACES( RDebug::Print( _L("CSysApAppUi::SetSignalIndicatorGsmL gprsStatus: %d" ), gprsStatus ) );
- iSignalNotify->SetWcdmaStateL( EAknSignalWcdmaIndicatorOff );
- iSignalNotify->SetHsdpaStateL( EAknSignalHsdpaIndicatorOff );
- switch ( gprsStatus )
+
+ if ( ( ! iSysApOfflineModeController->OfflineModeActive() ))
+ {
+ if ( iSysApCenRepController->GetInt( KCRUidCoreApplicationUIsSysAp, KSysApAccessoryConnected ) < 1 )
+ // accessory not connected already
+ {
+ iSysApCenRepController->SetInt( KCRUidCoreApplicationUIsSysAp, KSysApAccessoryConnected, 1 );
+ }
+ }
+
+ // Carkit and music stand have also light on permanently option that needs to be checked
+ if( aAccessoryState == EAccModeWiredCarKit || aAccessoryState == EAccModeMusicStand )
+ {
+ // When device is placed on a handsfree cradle, keyguard must be disabled (unless device is locked)
+ // Note: It is assumed that if carkit/music stand is connected, the phone is in the cradle.
+ if ( iKeyLockEnabled || iDeviceLockEnabled || iKeyLockOnBeforeCall || iKeyLockOnBeforeAlarm )
{
- case EPSGprsContextActive:
- signalGprsIndicatorState = EAknSignalGprsIndicatorContext;
- signalIndicatorState = EAknSignalCommonPacketDataIndicatorContext;
- iGprsActivated = ETrue;
- iGprsSuspended = EFalse;
- HandleGprsNotesL();
- break;
-
- case EPSGprsContextActivating:
- signalGprsIndicatorState = EAknSignalGprsIndicatorEstablishingContext;
- signalIndicatorState = EAknSignalCommonPacketDataIndicatorEstablishingContext;
- iGprsActivated = EFalse;
- iGprsSuspended = EFalse;
- break;
-
- case EPSGprsSuspend:
- signalGprsIndicatorState = EAknSignalGprsIndicatorSuspended;
- signalIndicatorState = EAknSignalCommonPacketDataIndicatorSuspended;
- iGprsSuspended = ETrue;
- HandleGprsNotesL();
- break;
-
- case EPSGprsAttach:
- signalGprsIndicatorState = EAknSignalGprsIndicatorAttached;
- signalIndicatorState = EAknSignalCommonPacketDataIndicatorAttached;
- iGprsActivated = EFalse;
- iGprsSuspended = EFalse;
- break;
-
- case EPSGprsMultibleContextActive:
- signalGprsIndicatorState = EAknSignalGprsIndicatorMultipdp;
- signalIndicatorState = EAknSignalCommonPacketDataIndicatorMultipdp;
- iGprsActivated = ETrue;
- iGprsSuspended = EFalse;
- HandleGprsNotesL();
- break;
-
- case EPSGprsUnattached:
- default:
- if ( iTDEnable )
- {
- signalGprsIndicatorState = EAknSignalGprsIndicatorAvailable;
- signalIndicatorState = EAknSignalCommonPacketDataIndicatorAvailable;
- }
- else
- {
- signalGprsIndicatorState = EAknSignalGprsIndicatorOff;
- signalIndicatorState = EAknSignalCommonPacketDataIndicatorOff;
+ iKeyLockOnBeforeCradle = ETrue;
+
+ if ( iKeyLockEnabled && !iDeviceLockEnabled )
+ {
+ iKeyguardController->DisableKeyguard(EFalse);
}
-
- iGprsSuspendedNoteShown = EFalse;
- iGprsActivated = EFalse;
- iGprsSuspended = EFalse;
- iCallActivated = EFalse;
- break;
}
- }
-
- if(bearerValue == EBearerEdgeGPRS) //EdgeGPRS connection
- {
- if( iSysApFeatureManager->Supported( KSysApFeatureIdUseEdgeGPRSIcon ) )
- {
- iSignalNotify->SetEdgeStateL( signalGprsIndicatorState );
- }
- else
- {
- iSignalNotify->SetCommonPacketDataStateL( signalIndicatorState );
- }
- }
- else
- {
-
- if ( iSysApFeatureManager->Supported( KSysApFeatureIdGprs_G_Icon ) )
- {
- iSignalNotify->SetGprsStateL( signalGprsIndicatorState );
- }
- else
- {
- TRACES( RDebug::Print( _L("CSysApAppUi::SetSignalIndicatorGsmL SetCommonPacketDataStateL( %d )" ), signalIndicatorState ) );
- iSignalNotify->SetCommonPacketDataStateL( signalIndicatorState );
- }
- }
+ }
+ SetIhfIndicatorL();
+ SetHacIndicatorL();
+ CleanupStack::PopAndDestroy(2);
}
+
// ----------------------------------------------------------------------------
-// CSysApAppUi::SetSignalIndicatorWcdmaL()
+// CSysApAppUi::SetHacIndicatorL()
// ----------------------------------------------------------------------------
-void CSysApAppUi::SetSignalIndicatorWcdmaL()
+void CSysApAppUi::SetHacIndicatorL()
{
- TInt wcdmaStatus;
- wcdmaStatus = StateOfProperty( KUidSystemCategory, KPSUidWcdmaStatusValue );
- TRACES( RDebug::Print( _L("CSysApAppUi::SetSignalIndicatorWcdmaL: wcdmaStatus: %d" ), wcdmaStatus ) );
-
- if ( iSysApFeatureManager->Supported( KSysApFeatureIdGprs_G_Icon ) )
+
+ if ( !iSysApCenRepHacSettingObserver )
+ {
+ // Do nothing if HAC setting observer has not been created yet
+ // This occurs in case some party is trying to set HAC indicator during
+ // ConstructL(), e.g. when switching from offline to online during startup
+ TRACES( RDebug::Print( _L("CSysApAppUi::SetHacIndicatorL: do nothing, HAC observer does not exist yet") ) );
+ return;
+ }
+
+ if ( iSysApCenRepHacSettingObserver->HacMode() )
{
- iSignalNotify->SetGprsStateL( EAknSignalGprsIndicatorOff );
+ TBool accessoryConnected ( EFalse );
+
+ TAccMode accMode(EAccModeHandPortable);
+
+ if ( iSysApAccessoryObserver )
+ {
+ accMode = iSysApAccessoryObserver->GetAccessoryMode();
+
+ if ( accMode != EAccModeHandPortable )
+ {
+ accessoryConnected = ETrue;
+ }
+ }
+
+// TInt indicatorState = EAknIndicatorStateOn;
+
+ if ( !accessoryConnected ) // When accessory is not connected, check offline and call state
+ {
+ if ( OfflineModeActive() ) // HAC indicator is not shown in offline mode
+ {
+ // indicatorState = EAknIndicatorStateOff;
+ }
+ else
+ {
+ // during active call with IHF activated HAC indicator is not shown
+ TInt callState( StateOfProperty( KPSUidCtsyCallInformation, KCTsyCallState ) );
+ if ( callState < KErrNone )
+ {
+ callState = EPSCTsyCallStateNone;
+ }
+
+ if ( callState != EPSCTsyCallStateNone && IhfEnabledL() )
+ {
+ // indicatorState = EAknIndicatorStateOff;
+ }
+ }
+
+ }
+ else
+ {
+ // If an accessory is connected, HAC indicator should not be shown
+// indicatorState = EAknIndicatorStateOff;
+ }
+
+ // SetIndicatorStateL( EAknIndicatorHAC, indicatorState );
+
}
else
{
- iSignalNotify->SetCommonPacketDataStateL( EAknSignalCommonPacketDataIndicatorOff );
- }
-
- TInt signalWcdmaIndicatorState;
- TInt signalHsdpaIndicatorState;
-
- switch ( wcdmaStatus )
- {
- case EPSWcdmaContextActive:
- signalWcdmaIndicatorState = EAknSignalWcdmaIndicatorContext;
- signalHsdpaIndicatorState = EAknSignalHsdpaIndicatorContext;
- break;
- case EPSWcdmaContextActivating:
- signalWcdmaIndicatorState = EAknSignalWcdmaIndicatorEstablishingContext;
- signalHsdpaIndicatorState = EAknSignalHsdpaIndicatorEstablishingContext;
- break;
- case EPSWcdmaSuspend:
- signalWcdmaIndicatorState = EAknSignalWcdmaIndicatorSuspended;
- signalHsdpaIndicatorState = EAknSignalHsdpaIndicatorSuspended;
- break;
- case EPSWcdmaAttach:
- signalWcdmaIndicatorState = EAknSignalWcdmaIndicatorAttached;
- signalHsdpaIndicatorState = EAknSignalHsdpaIndicatorAttached;
- break;
- case EPSWcdmaMultipleContextActive:
- signalWcdmaIndicatorState = EAknSignalWcdmaIndicatorMultipdp;
- signalHsdpaIndicatorState = EAknSignalHsdpaIndicatorMultipdp;
- break;
- case EPSWcdmaUnattached:
- default:
- signalWcdmaIndicatorState = EAknSignalWcdmaIndicatorAvailable;
- signalHsdpaIndicatorState = EAknSignalHsdpaIndicatorAvailable;
- break;
- }
-
- TBool showHsdpaAvailable = EFalse;
-
- if ( iSysApFeatureManager->Supported( KSysApFeatureIdUseHsdpaAvailableIcon ) )
- {
- // HSDPA Resource Availability information is a configurable feature.
- showHsdpaAvailable = iSysApEtelConnector->HsdpaAvailable();
+ // If HAC is not active, always disable indicator regardless of accessory state
+ // SetIndicatorStateL( EAknIndicatorHAC, EAknIndicatorStateOff );
}
-
- TBool isHsdpaBearer = iSysApEtelConnector->IsBearerHsdpa();
-
- TRACES( RDebug::Print( _L("CSysApAppUi::SetSignalIndicatorWcdmaL: isHdpaBearer=%d, showHsdpaAvailable=%d" ),
- isHsdpaBearer, showHsdpaAvailable ) );
-
- if ( isHsdpaBearer || showHsdpaAvailable )
- {
- iSignalNotify->SetWcdmaStateL( EAknSignalWcdmaIndicatorOff );
- iSignalNotify->SetHsdpaStateL( signalHsdpaIndicatorState );
- }
- else
- {
- iSignalNotify->SetHsdpaStateL( EAknSignalHsdpaIndicatorOff );
- iSignalNotify->SetWcdmaStateL( signalWcdmaIndicatorState );
- }
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::SetSignalIndicatorGanL()
-// ----------------------------------------------------------------------------
-void CSysApAppUi::SetSignalIndicatorGanL()
- {
- TRACES( RDebug::Print(_L("CSysApAppUi::SetSignalIndicatorGanL: available" ) ) );
-
- TInt gprsStatus( 0 );
- gprsStatus = StateOfProperty( KUidSystemCategory, KPSUidGprsStatusValue );
-
- TRACES( RDebug::Print( _L("CSysApAppUi::SetSignalIndicatorGanL gprsStatus: %d" ), gprsStatus ) );
-
- switch ( gprsStatus )
- {
- case EPSGprsContextActive:
- iSignalNotify->SetUmaStateL( EAknSignalUmaIndicatorContext );
- break;
-
- case EPSGprsContextActivating:
- iSignalNotify->SetUmaStateL( EAknSignalUmaIndicatorEstablishingContext );
- break;
-
- case EPSGprsSuspend:
- iSignalNotify->SetUmaStateL( EAknSignalUmaIndicatorSuspended );
- break;
-
- case EPSGprsAttach:
- iSignalNotify->SetUmaStateL( EAknSignalUmaIndicatorAttached );
- break;
-
- case EPSGprsMultibleContextActive:
- iSignalNotify->SetUmaStateL( EAknSignalUmaIndicatorMultipdp );
- break;
-
- case EPSGprsUnattached:
- default:
- iSignalNotify->SetUmaStateL( EAknSignalUmaIndicatorAvailable );
- break;
- }
+
+
}
-// ----------------------------------------------------------------------------
-// CSysApAppUi::HandleGprsNotesL()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::HandleGprsNotesL()
- {
- TRACES( RDebug::Print( _L("CSysApAppUi::HandleGprsNotesL" ) ) );
- if ( iSysApFeatureManager->Supported( KSysApFeatureIdGPRSNotes ) )
- {
- // In WCDMA system, receiving or making calls has no effect to the possibly
- // existing PDP contexts i.e. GPRS notes are not needed.
- TInt networkMode = StateOfProperty( KPSUidNetworkInfo, KNWTelephonyNetworkMode );
- TRACES( RDebug::Print( _L("CSysApAppUi::HandleGprsNotesL: networkMode %d" ), networkMode ) );
- if ( networkMode != ENWNetworkModeWcdma )
- {
- if ( iGprsActivated && iGprsSuspended && iCallActivated && !iGprsSuspendedNoteShown )
- {
- StartGprsSuspendedTimer();
- }
- else if ( iGprsSuspendedNoteShown && !iGprsSuspended )
- {
- iGprsSuspendedNoteShown = EFalse;
- iGprsSuspended = EFalse;
- iCallActivated = EFalse;
- }
- }
- }
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::SetIndicatorStateL( TInt aIndicator, TInt aState )
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::SetIndicatorStateL( const TInt aIndicator, const TInt aState ) const
- {
- CAknSmallIndicator* theIndicator = CAknSmallIndicator::NewLC( TUid::Uid( aIndicator ) );
- theIndicator->SetIndicatorStateL( aState );
- CleanupStack::PopAndDestroy(); //theIndicator
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::GoOnlineL()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::GoOnlineL( TBool aDoProfileChange )
- {
- if ( iSysApFeatureManager->OfflineModeSupported() )
- {
- TRACES( RDebug::Print( _L("CSysApAppUi::GoOnlineL: going from off-line into on-line: aDoProfileChange=%d" ), aDoProfileChange ) );
- // in case profile change is not needed, event handling for subsequent profile changes are must be allowed
- iHandleNextProfileEvent = !aDoProfileChange;
- iActivateBt = iSysApOfflineModeController->MustBtBeActivated();
-
- if ( aDoProfileChange )
- {
- TRAPD( err, ActivateProfileL( iSysApCenRepController->GetInt( KCRUidCoreApplicationUIsSysAp, KSysApProfileBeforeOfflineMode ) ) );
- if ( err == KErrNotFound )
- {
- // Activate general profile instead, if previously used profile was not found
- TRACES( RDebug::Print( _L("CSysApAppUi::GoOnlineL: Previously used profile was not found, restoring to general profile" ) ) );
- ActivateProfileL(KGeneralProfileId);
- }
- }
-
- iSysApOfflineModeController->SwitchFromOfflineToOnlineModeL();
- TRACES( RDebug::Print( _L("CSysApAppUi::GoOnlineL: iActivateBt = %d" ), iActivateBt ) );
- }
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::GoOfflineL()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::GoOfflineL()
- {
- if ( iSysApFeatureManager->OfflineModeSupported() )
- {
- TRACES( RDebug::Print( _L("CSysApAppUi::GoOfflineL" ) ) );
- iHandleNextProfileEvent = EFalse;
- iDeactivateBt = ETrue;
- ActivateProfileL( KOfflineModeProfileId );
- iSysApOfflineModeController->SwitchFromOnlineToOfflineModeL();
- }
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::SwitchFromOnlineToOfflineModeL()
-// ----------------------------------------------------------------------------
-void CSysApAppUi::SwitchFromOnlineToOfflineModeL()
- {
- if ( iSysApFeatureManager->FmTxSupported() )
- {
- TFmTxState state = static_cast<TFmTxState>(StateOfProperty( KPSUidHWRMFmTx, KHWRMFmTxStatus ));
- switch ( state )
- {
- case EFmTxStateActive:
- case EFmTxStateInactive:
- case EFmTxStateScanning:
- ShowQueryL( ESysApUseFmTxInOfflineQuery ); // show "use fm tx in offline?" if FM TX is on
- break;
-
- default:
- // do nothing
- break;
- }
- }
- iSysApOfflineModeController->SwitchFromOnlineToOfflineModeL();
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::OfflineModeChangedL()
-// ----------------------------------------------------------------------------
-void CSysApAppUi::OfflineModeChangedL()
- {
-#ifdef SYSAP_USE_STARTUP_UI_PHASE
- // if UI is not ready, don't update indicators
- if ( !UiReady() )
- {
- return;
- }
-#endif // SYSAP_USE_STARTUP_UI_PHASE
-
- // Update network bar indicator
- if ( OfflineModeActive() )
- {
- UpdateSignalBarsL( KAknSignalOffLineMode );
- }
- else
- {
- UpdateSignalBarsL();
- }
-
- // Update network mode indicator
- SetSignalIndicatorL();
-
- // Update HAC indicator
- SetHacIndicatorL();
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::OfflineModeActive()
-// ----------------------------------------------------------------------------
-TBool CSysApAppUi::OfflineModeActive()
- {
- return iSysApOfflineModeController->OfflineModeActive();
- }
// ----------------------------------------------------------------------------
// CSysApAppUi::DoNotActivateBt()
@@ -2441,56 +1501,23 @@
iSysApOfflineModeController->DoNotActivateBt();
}
-// ----------------------------------------------------------------------------
-// CSysApAppUi::SetBtPowerState()
-// ----------------------------------------------------------------------------
-TInt CSysApAppUi::SetBtPowerState( TBool aBtState )
- {
- if ( iSysApBtController )
- {
- return iSysApBtController->SetPowerState( aBtState );
- }
- else
- {
- return KErrNotReady;
- }
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::KeyLockState() const
-// ----------------------------------------------------------------------------
-
-TBool CSysApAppUi::KeyLockState() const
- {
- return iKeyLockEnabled;
- }
// ----------------------------------------------------------------------------
-// CSysApAppUi::DeviceLockState() const
+// CSysApAppUi::IhfEnabledL
// ----------------------------------------------------------------------------
-TBool CSysApAppUi::DeviceLockState() const
- {
- return iDeviceLockEnabled;
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::ChangeFmTxStateL()
-// ----------------------------------------------------------------------------
-void CSysApAppUi::ChangeFmTxStateL( TBool aEnable )
+TBool CSysApAppUi::IhfEnabledL()
{
- // disable fm transmission
- CHWRMFmTx* fmtx = CHWRMFmTx::NewLC();
- if ( aEnable )
- {
- fmtx->EnableL();
- }
- else
- {
- fmtx->DisableL();
- }
- CleanupStack::PopAndDestroy( fmtx );
- }
+ TRACES( RDebug::Print( _L("CSysApAppUi::IhfEnabledL(): iSysApAudioRoutingObserver=0x%x"), iSysApAudioRoutingObserver ) );
+
+ if ( !iSysApAudioRoutingObserver ) // create observer if needed
+ {
+ iSysApAudioRoutingObserver = CSysApAudioRoutingObserver::NewL( *this );
+ }
+
+ return iSysApAudioRoutingObserver->IhfEnabled();
+ }
+
// ----------------------------------------------------------------------------
// CSysApAppUi::SetIhfIndicatorL()
@@ -2516,785 +1543,114 @@
if( (callState != EPSCTsyCallStateNone && IhfEnabledL() && !accessoryConnected)
|| accMode == EAccModeMusicStand ) // Music stand always shows IHF indicator
{
- SetIndicatorStateL( EAknIndicatorIHFActive, EAknIndicatorStateOn );
-
if ( accMode == EAccModeMusicStand )
{
- // hide other accessory indicators to prevent displaying of duplicate icons in some cases
- // e.g. when wireless hf is connected
- SetIndicatorStateL( EAknIndicatorLoopset, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorTTY, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorHeadset, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorHeadsetUnavailable, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorCarkit, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorTvOut, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorHDMI, EAknIndicatorStateOff );
+ // do nothing
}
}
else
{
- SetIndicatorStateL( EAknIndicatorIHFActive, EAknIndicatorStateOff );
- }
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::HandleSmsStorageNotificationL( TBool aSimStoreFull )
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::HandleSmsStorageNotificationL( TBool aSimStoreFull )
- {
- TRACES( RDebug::Print( _L("CSysApAppUi::HandleSmsStorageNotificationL: aSimStoreFull: %d "), aSimStoreFull ) );
-
- if ( aSimStoreFull )
- {
- HBufC* noteStringBuf;
- noteStringBuf = StringLoader::LoadLC( R_QTN_MEMLO_MEMORY_LOW_SIM_MES, iEikonEnv );
- TPtr textBuffer = noteStringBuf->Des();
- iSysApMsgSimMemLowQuery->StartL( textBuffer );
- CleanupStack::PopAndDestroy();
- }
-
- SetEnvelopeIndicatorL();
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::HandleNspsRawKeyEventL()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::HandleNspsRawKeyEventL()
- {
-#ifdef __SYSAP_MODULE_TEST
- ModuleTestShowUiNoteL( _L("Network wakeup from NSPS") );
-#endif
-
- if ( iSysApEtelConnector )
- {
- iSysApEtelConnector->CommandNetCsWakeupOnNsps();
- }
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::HandleNetworkNspsNotification( RMmCustomAPI::TNspsStatus aNspsStatus )
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::HandleNetworkNspsNotification( RMmCustomAPI::TNspsStatus aNspsStatus )
- {
- TRACES( RDebug::Print( _L("CSysApAppUi::HandleNetworkNspsNotification aNspsStatus:%d, iNsps:%d )" ), aNspsStatus, iNsps ) );
- if( iSysApNspsHandler )
- {
- if( aNspsStatus == RMmCustomAPI::ENspsOn )
- {
- if( !iNsps )
- {
-#ifdef __SYSAP_MODULE_TEST
- TRAPD( err, ModuleTestShowUiNoteL( _L("Setting NSPS on") ) );
-#endif
- iSysApNspsHandler->SetNspsOn();
- iNsps = ETrue;
- }
- }
- else if( aNspsStatus == RMmCustomAPI::ENspsOff )
- {
- if( iNsps )
- {
-#ifdef __SYSAP_MODULE_TEST
- TRAPD( err, ModuleTestShowUiNoteL( _L("Setting NSPS off") ) );
-#endif
- iSysApNspsHandler->SetNspsOff();
- iNsps = EFalse;
- }
- }
- }
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::HandleMessageTonePlayingQuitability( TInt aTonePlayingStatus )
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::HandleMessageTonePlayingQuitability( TInt aTonePlayingStatus )
- {
- if( iSysApNspsHandler )
- {
- if( aTonePlayingStatus == ECoreAppUIsStopTonePlaying )
- {
- iSysApNspsHandler->SetMessageToneNotPlaying();
- }
- else if( aTonePlayingStatus == ECoreAppUIsTonePlaying )
- {
- iSysApNspsHandler->SetMessageTonePlaying();
- }
- }
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::ActivateKeyeventForwardingForLights()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::ActivateKeyeventForwardingForLights(TBool aActivate)
- {
- if( iSysApNspsHandler )
- {
- if ( aActivate )
- {
- iSysApNspsHandler->ActivateKeyeventForwardingForLights();
- }
- else
- {
- iSysApNspsHandler->DeActivateKeyeventForwardingForLights();
- }
- }
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::StartShutDownTimerOnAlarmAndChargingStates()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::StartShutDownTimerOnAlarmAndChargingStates()
- {
- if( !iAlarmOrChargingStateShutdownStarted )
- {
- if ( !iTimer )
- {
- TRAPD( err, iTimer = CPeriodic::NewL( EPriorityNormal ) );
-
- if ( err != KErrNone )
- {
- TRACES( RDebug::Print( _L("CSysApAppUi::StartShutDownTimerOnAlarmAndChargingStates: CPeriodic::NewL failed: %d"), err ) );
- return;
- }
- }
- iTimer->Cancel();
- iTimer->Start( KDelayBeforeShuttingDownInAlarmAndChargingStates,
- KDelayBeforeShuttingDownInAlarmAndChargingStates,
- TCallBack( DoShutdownOnAlarmStateAfterCallBack, this ) );
- iAlarmOrChargingStateShutdownStarted = ETrue;
- }
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::DoShutdownOnAlarmStateAfterCallBack( TAny* aObject )
-// ----------------------------------------------------------------------------
-
-TInt CSysApAppUi::DoShutdownOnAlarmStateAfterCallBack( TAny* aObject )
- {
- CSysApAppUi* appUi = STATIC_CAST( CSysApAppUi*, aObject );
-
- if ( appUi->iTimer )
- {
- appUi->iTimer->Cancel();
- }
-
- TRAP_IGNORE( appUi->DoShutdownL( EFalse, KDummyReason ) );
-
- return KErrNone;
- }
-
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
-// ----------------------------------------------------------------------------
-// CSysApAppUi::StartAnimTiming()
-// ----------------------------------------------------------------------------
-void CSysApAppUi::StartAnimTiming()
- {
- TRACES( RDebug::Print( _L("CSysApAppUi::StartAnimTiming() Start animation timer, time %d ms" ), iAnimationShowingTime ) );
-
- if ( !iAnimTimer )
- {
- TRAPD( err, iAnimTimer = CPeriodic::NewL( EPriorityNormal ) );
-
- if ( err != KErrNone )
- {
- TRACES( RDebug::Print( _L("CSysApAppUi::StartAnimTiming() CPeriodic::NewL failed %d " ), err ) );
- return;
- }
- }
-
- iAnimTimer->Start(
- iAnimationShowingTime*KCoefficientToMakeMicroToMilliSeconds,
- iAnimationShowingTime*KCoefficientToMakeMicroToMilliSeconds,
- TCallBack( DoStopAnimTiming, this ) );
- }
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::DoStopAnimTiming( TAny* aObject )
-// ----------------------------------------------------------------------------
-
-TInt CSysApAppUi::DoStopAnimTiming( TAny* aObject )
- {
- TInt err(KErrNone);
- CSysApAppUi* appUi = STATIC_CAST( CSysApAppUi*, aObject );
-
- // This method could theoretically be called by two timers (iAnimTimer and one in CSysApShutdownAnimation),
- // so a check is needed to prevent multiple executions.
- if ( !(appUi->iShutdownContinued) )
- {
- appUi->iShutdownContinued = ETrue;
-
- TRACES( RDebug::Print( _L("CSysApAppUi::DoStopAnimTiming() Animation timer completed or animation skipped" ) ) );
-
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
- if ( appUi->iAnimTimer )
- {
- appUi->iAnimTimer->Cancel();
- }
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-
- if ( appUi->iTimer )
- {
- appUi->iTimer->Cancel();
- }
-
- TRACES( RDebug::Print( _L("CSysApAppUi::DoStopAnimTiming() Call ContinueShutdown(...)" ) ) );
- appUi->ContinueShutdown();
- TRACES( RDebug::Print( _L("CSysApAppUi::DoStopAnimTiming() end") ) );
- }
-
- return err;
- }
-
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::StartGprsSuspendedTimer()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::StartGprsSuspendedTimer()
- {
- TRACES( RDebug::Print( _L("CSysApAppUi::StartGprsSuspendedTimer()") ) );
- if( !iAlarmOrChargingStateShutdownStarted ) // not relevant if shutting down
- {
- if ( !iTimer )
- {
- TRAPD( err, iTimer = CPeriodic::NewL( EPriorityNormal ) );
-
- if ( err != KErrNone )
- {
- TRACES( RDebug::Print( _L("CSysApAppUi::StartGprsSuspendedTimer: CPeriodic::NewL failed: %d"), err ) );
- return;
- }
- }
-
- iTimer->Cancel();
- iTimer->Start( KDelayBeforeShowingGprsSuspendedNote,
- KDelayBeforeShowingGprsSuspendedNote,
- TCallBack( ShowGprsSuspendedNoteAfterCallBack, this ) );
+ // do nothing
}
}
// ----------------------------------------------------------------------------
-// CSysApAppUi::ShowGprsSuspendedNoteAfterCallBack( TAny* aObject )
+// CSysApAppUi::EjectStarted()
// ----------------------------------------------------------------------------
-TInt CSysApAppUi::ShowGprsSuspendedNoteAfterCallBack( TAny* aObject )
+void CSysApAppUi::EjectStarted( TBool ejectStarted )
{
- TRACES( RDebug::Print( _L("CSysApAppUi::ShowGprsSuspendedNoteAfterCallBack") ) );
-
- CSysApAppUi* appUi = STATIC_CAST( CSysApAppUi*, aObject );
-
- if ( appUi->iTimer )
- {
- appUi->iTimer->Cancel();
- }
-
- // Note is needed if call is still active and used network is not WCDMA
- TInt callType = appUi->StateOfProperty( KPSUidCtsyCallInformation, KCTsyCallType );
- TInt networkMode = appUi->StateOfProperty( KPSUidNetworkInfo, KNWTelephonyNetworkMode );
- TRACES( RDebug::Print(
- _L("CSysApAppUi::ShowGprsSuspendedNoteAfterCallBack: callType %d networkMode %d"),
- callType, networkMode ) );
- if ( EPSCTsyCallTypeCSVoice == callType && ENWNetworkModeWcdma != networkMode )
- {
- appUi->iGprsSuspendedNoteShown = ETrue;
- }
- return KErrNone;
- }
+ TRACES( RDebug::Print( _L( "CSysApAppUi::EjectStarted" ) ) );
+ iMMCEjectUsed = ejectStarted;
+
+#ifndef RD_MULTIPLE_DRIVE
+ iFileManagerCloseDisabled = ejectStarted;
+#endif // RD_MULTIPLE_DRIVE
+}
// ----------------------------------------------------------------------------
-// CSysApAppUi::HandleAccessoryConnectedL()
+// CSysApAppUi::DoLightsTimeoutChangedL
// ----------------------------------------------------------------------------
-
-void CSysApAppUi::HandleAccessoryConnectedL( TAccMode aAccessoryState )
+void CSysApAppUi::DoLightsTimeoutChangedL( const TInt aTimeout )
{
- TRACES( RDebug::Print( _L("CSysApAppUi::HandleAccessoryConnectedL( aAccessoryState: %d ) "), aAccessoryState ) );
-
- if ( aAccessoryState == EAccModeWirelessHeadset ||
- aAccessoryState == EAccModeWiredHeadset ||
- aAccessoryState == EAccModeHeadphones )
- {
- SetIndicatorStateL( EAknIndicatorLoopset, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorTTY, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorHeadset, EAknIndicatorStateOn );
- SetIndicatorStateL( EAknIndicatorHeadsetUnavailable, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorCarkit, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorTvOut, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorHDMI, EAknIndicatorStateOff );
- }
- else if ( aAccessoryState == EAccModeLoopset )
- {
- SetIndicatorStateL( EAknIndicatorHeadset, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorTTY, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorLoopset, EAknIndicatorStateOn );
- SetIndicatorStateL( EAknIndicatorHeadsetUnavailable, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorCarkit, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorTvOut, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorHDMI, EAknIndicatorStateOff );
- }
- else if ( aAccessoryState == EAccModeTextDevice )
- {
- SetIndicatorStateL( EAknIndicatorHeadset, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorLoopset, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorTTY, EAknIndicatorStateOn );
- SetIndicatorStateL( EAknIndicatorHeadsetUnavailable, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorCarkit, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorTvOut, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorHDMI, EAknIndicatorStateOff );
- }
- else if ( aAccessoryState == EAccModeWirelessCarKit || aAccessoryState == EAccModeWiredCarKit )
- {
- SetIndicatorStateL( EAknIndicatorHeadset, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorLoopset, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorTTY, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorHeadsetUnavailable, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorCarkit, EAknIndicatorStateOn );
- SetIndicatorStateL( EAknIndicatorTvOut, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorHDMI, EAknIndicatorStateOff );
- }
- else if ( aAccessoryState == EAccModeTVOut )
- {
- SetIndicatorStateL( EAknIndicatorHeadset, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorLoopset, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorTTY, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorHeadsetUnavailable, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorCarkit, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorTvOut, EAknIndicatorStateOn );
- SetIndicatorStateL( EAknIndicatorHDMI, EAknIndicatorStateOff );
- }
- else if (aAccessoryState == EAccModeHDMI )
- {
- SetIndicatorStateL( EAknIndicatorHeadset, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorLoopset, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorTTY, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorHeadsetUnavailable, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorCarkit, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorTvOut, EAknIndicatorStateOff);
- SetIndicatorStateL( EAknIndicatorHDMI, EAknIndicatorStateOn );
- }
-
- TInt swState( StateOfProperty( KPSUidStartup, KPSGlobalSystemState ) );
- TRACES( RDebug::Print( _L("CSysApAppUi::HandleAccessoryConnectedL: swState: %d"), swState ) );
-
- if( UiReady() || swState == ESwStateSecurityCheck )
- {
- iSysApLightsController->AccessoryConnectedL( ETrue );
- }
-
- if ( ( ! iIgnoreAccessorySpecificProfileChanges ) && ( ! iSysApOfflineModeController->OfflineModeActive() ) )
- {
- TInt profileId( 0 );
- TInt currentProfile( 0 );
- currentProfile = ActiveProfileId();
-
- if ( iSysApCenRepController->GetInt( KCRUidCoreApplicationUIsSysAp, KSysApAccessoryConnected ) < 1 )
- // accessory not connected already
- {
- iSysApCenRepController->SetInt( KCRUidCoreApplicationUIsSysAp, KSysApAccessoryConnected, 1 );
- iSysApCenRepController->SetInt( KCRUidCoreApplicationUIsSysAp, KSysApActiveProfileBeforeAccessoryConnected, currentProfile );
- }
-
- if ( aAccessoryState == EAccModeWirelessCarKit )
- {
- profileId = iSysApCenRepController->ProfileIdForSelectedAccessory( ESysApWirelessCarkit );
- }
- else if( aAccessoryState == EAccModeWiredHeadset ||
- aAccessoryState == EAccModeWirelessHeadset )
- {
- profileId = iSysApCenRepController->ProfileIdForSelectedAccessory( ESysApHeadset );
- }
- else if( aAccessoryState == EAccModeLoopset )
- {
- profileId = iSysApCenRepController->ProfileIdForSelectedAccessory( ESysApLoopset );
- }
- else if( aAccessoryState == EAccModeTextDevice )
- {
- profileId = iSysApCenRepController->ProfileIdForSelectedAccessory( ESysApTty );
- }
- else if( aAccessoryState == EAccModeTVOut || aAccessoryState == EAccModeHDMI )
- {
- profileId = iSysApCenRepController->ProfileIdForSelectedAccessory( ESysApTvOut );
- }
- else if( aAccessoryState == EAccModeHeadphones )
- {
- profileId = iSysApCenRepController->ProfileIdForSelectedAccessory( ESysApHeadphones );
- }
- else if ( aAccessoryState == EAccModeWiredCarKit )
- {
- profileId = iSysApCenRepController->ProfileIdForSelectedAccessory( ESysApCarkit );
- }
- else if ( aAccessoryState == EAccModeMusicStand )
- {
- profileId = iSysApCenRepController->ProfileIdForSelectedAccessory( ESysApMusicStand );
- }
-
- // Carkit and music stand have also light on permanently option that needs to be checked
- if( aAccessoryState == EAccModeWiredCarKit || aAccessoryState == EAccModeMusicStand )
- {
- // When device is placed on a handsfree cradle, keyguard must be disabled (unless device is locked)
- // Note: It is assumed that if carkit/music stand is connected, the phone is in the cradle.
- if ( iKeyLockEnabled || iDeviceLockEnabled || iKeyLockOnBeforeCall || iKeyLockOnBeforeAlarm )
- {
- iKeyLockOnBeforeCradle = ETrue;
-
- if ( iKeyLockEnabled && !iDeviceLockEnabled )
- {
- KeyLock().DisableWithoutNote();
- }
- }
- }
-
- if( profileId != KActiveProfile )
- {
- /*-1 because the first item in Accessory default profiles shared data values
- is KActiveProfile and that must be subtracted from the index of profile to be activated*/
-
- profileId -= 1;
-
- TRACES( RDebug::Print( _L("CSysApAppUi::HandleAccessoryConnectedL: current profile: %d, accessory profile: %d" ),
- currentProfile, profileId ) );
-
- if ( profileId != currentProfile )
- {
- iAccessoryJustConnected = ETrue;
- iSysApCenRepController->SetInt( KCRUidCoreApplicationUIsSysAp, KSysApProfileUpdateRequired, 1 );
- ActivateProfileL( profileId );
- }
- }
- }
- SetIhfIndicatorL();
- SetHacIndicatorL();
+ iSysApLightsController->DoLightsTimeoutChangedL( aTimeout );
}
+
// ----------------------------------------------------------------------------
-// CSysApAppUi::HandleAccessoryDisconnectedL()
+// CSysApAppUi::DoSwStateNormalConstructionL()
// ----------------------------------------------------------------------------
-void CSysApAppUi::HandleAccessoryDisconnectedL()
+void CSysApAppUi::DoSwStateNormalConstructionL()
{
- TRACES( RDebug::Print( _L("CSysApAppUi::HandleAccessoryDisconnectedL()" ) ) );
-
-
- TAccMode accessoryState(EAccModeHandPortable);
- if ( iSysApAccessoryObserver )
- {
- accessoryState = iSysApAccessoryObserver->GetAccessoryMode();
- }
-
- if ( accessoryState == EAccModeHandPortable )
+ // Let's ensure that the lights will remain on for 15 secs after sw state normal
+ User::ResetInactivityTime();
+
+ TRACES( RDebug::Print( _L("CSysApAppUi::DoSwStateNormalConstructionL : START" ) ) );
+
+ // In case of unexpected reset (e.g. hidden boot) the keylock must be enabled silently. Locking is done
+ // prior to time-consuming initializations, because otherwise UI is in unlocked state for a few seconds.
+ if ( iSysApCenRepController->GetInt( KCRUidCoreApplicationUIsSysAp, KSysApKeyguardActive ) == 1 )
{
- SetIndicatorStateL( EAknIndicatorTvOut, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorLoopset, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorHeadset, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorTTY, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorHeadsetUnavailable, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorCarkit, EAknIndicatorStateOff );
- SetIndicatorStateL( EAknIndicatorHDMI, EAknIndicatorStateOff );
-
- iSysApLightsController->AccessoryConnectedL( EFalse );
-
- if ( ! iIgnoreAccessorySpecificProfileChanges )
- {
- TInt activeProfile ( ActiveProfileId() );
-
- TInt activeProfileBeforeConnectingAccessory(
- iSysApCenRepController->GetInt( KCRUidCoreApplicationUIsSysAp, KSysApActiveProfileBeforeAccessoryConnected )
- );
- if ( activeProfileBeforeConnectingAccessory < 0 ) // error
- {
- activeProfileBeforeConnectingAccessory = 0; // General Profile
- }
- TRACES( RDebug::Print( _L("CSysApAppUi::HandleAccessoryDisconnectedL: active profile now: %d, active profile before: %d," ),
- activeProfile, activeProfileBeforeConnectingAccessory ) );
-
- if ( iSysApCenRepController->GetInt( KCRUidCoreApplicationUIsSysAp, KSysApProfileUpdateRequired ) == 1 )
- {
- iSysApCenRepController->SetInt( KCRUidCoreApplicationUIsSysAp, KSysApProfileUpdateRequired, 0 );
- if ( activeProfile != activeProfileBeforeConnectingAccessory && ! iSysApOfflineModeController->OfflineModeActive() )
- {
- ActivateProfileL( activeProfileBeforeConnectingAccessory );
- }
- }
- iSysApCenRepController->SetInt( KCRUidCoreApplicationUIsSysAp, KSysApAccessoryConnected, 0 );
- }
+ TRACES( RDebug::Print( _L("CSysApAppUi::DoSwStateNormalConstructionL: enabling keylock") ) );
+ iKeyguardController->EnableKeyguard(ETrue);
}
- SetIhfIndicatorL();
- SetHacIndicatorL();
-
- // If lock disabled because of accessory, reactivate it, unless phone call or alarm is ongoing
- if ( iKeyLockOnBeforeCradle )
+ // Initiate bearer change observation
+// iSysApConnectionMonitorObserver = CSysApConnectionMonitorObserver::NewL( *this );
+
+ TRACES( RDebug::Print( _L("SysAp: trying CSystemLock::NewL" ) ) );
+ iSysApSystemLock = CSystemLock::NewL();
+
+
+ if ( iSysApFeatureManager->Supported( KSysApFeatureIdBatteryInfoPopup ) )
{
- iKeyLockOnBeforeCradle = EFalse;
- if ( !iKeyLockOnBeforeCall && !iKeyLockOnBeforeAlarm )
- {
- if ( !iDeviceLockEnabled )
- {
- KeyLock().EnableKeyLock();
- }
- else
- {
- KeyLock().EnableAutoLockEmulation();
- }
- }
+ iSysApBatteryInfoController = CSysApBatteryInfoController::NewL( iSysApCenRepController->GetInt( KCRUidCoreApplicationUIsConf,
+ KCoreAppUIsBatteryInformationLowThreshold ) );
}
+ TRACES( RDebug::Print( _L("CSysApAppUi::DoSwStateNormalConstructionL : END" ) ) );
}
-// ----------------------------------------------------------------------------
-// CSysApAppUi::HandleAccessoryProfileInStartupL()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::HandleAccessoryProfileInStartupL()
- {
- TRACES( RDebug::Print( _L( "CSysApAppUi::HandleAccessoryProfileInStartupL" ) ) );
-
- if ( !iSysApOfflineModeController->OfflineModeActive() )
- {
- iIgnoreAccessorySpecificProfileChanges = EFalse;
- TBool accessoryConnectedInShutdown( EFalse );
- TInt accessoryTemp( iSysApCenRepController->GetInt( KCRUidCoreApplicationUIsSysAp, KSysApAccessoryConnected ) );
- if ( accessoryTemp == 1 )
- {
- accessoryConnectedInShutdown = ETrue;
- }
-
- TBool accessoryConnectedNow ( EFalse );
-
- TAccMode accessoryState(EAccModeHandPortable);
- if ( iSysApAccessoryObserver )
- {
- accessoryState = iSysApAccessoryObserver->GetAccessoryMode();
- }
-
- if ( accessoryState != EAccModeHandPortable )
- {
- accessoryConnectedNow = ETrue;
- }
- TRACES( RDebug::Print( _L( "CSysApAppUi::HandleAccessoryProfileInStartupL: accessoryConnectedInShutdown: %d, accessoryConnectedNow: %d" ),
- accessoryConnectedInShutdown, accessoryConnectedNow ) );
-
- if ( accessoryConnectedInShutdown && !accessoryConnectedNow )
- {
- HandleAccessoryDisconnectedL();
- }
- else if ( !accessoryConnectedInShutdown && accessoryConnectedNow )
- {
- HandleAccessoryConnectedL( accessoryState );
- }
- else if ( !accessoryConnectedNow )
- {
- TInt activeProfile ( ActiveProfileId() );
- iSysApCenRepController->SetInt( KCRUidCoreApplicationUIsSysAp, KSysApActiveProfileBeforeAccessoryConnected, activeProfile );
- }
- }
- }
-
-#ifndef RD_MULTIPLE_DRIVE
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::ResolveUidFromThread()
-// ----------------------------------------------------------------------------
-TInt32 CSysApAppUi::ResolveUidFromThread( TUint aThreadId ) const
- {
- TInt resolvedUid = 0;
-
- RThread appThread;
- TInt err = appThread.Open( aThreadId );
-
- if ( err == KErrNone )
- {
- resolvedUid = appThread.SecureId().iId;
- }
-
- appThread.Close();
-
- TRACES( RDebug::Print( _L("CSysApAppUi::ResolveUidFromThread: err=%d, aThreadId=%d, resolvedUid=0x%x"),
- err, aThreadId, resolvedUid ) );
-
- return resolvedUid;
- }
+
// ----------------------------------------------------------------------------
-// CSysApAppUi::CloseUIAppsInHotSwapL()
+// CSysApAppUi::DoSimChangedFromPreviousBootL()
// ----------------------------------------------------------------------------
-void CSysApAppUi::CloseUIAppsInHotSwapL()
+
+void CSysApAppUi::DoSimChangedFromPreviousBootL()
{
- TRACES( RDebug::Print( _L("CSysApAppUi::CloseUIAppsInHotSwapL") ) );
-
- CArrayFixFlat<TInt>* wgIds=new(ELeave) CArrayFixFlat<TInt>(4);
- CleanupStack::PushL(wgIds);
- User::LeaveIfError(iCoeEnv->WsSession().WindowGroupList(0, wgIds));
- TInt lastEntry=wgIds->Count()-1;
- TRACES( RDebug::Print( _L( "CSysApAppUi::CloseUIAppsInHotSwapL: Found %d UI applications running." ), lastEntry + 1 ) );
- TInt numberOfApplicationsToShutDown( 0 );
- iApplicationScanningRoundNumber++;
-
- for ( TInt i=lastEntry; i>=0; i--)
+ TRACES( RDebug::Print( _L("CSysApAppUi::DoSimChangedFromPreviousBootL: iSimChangedDone=%d" ), iSimChangedDone ) );
+
+ if ( !iSimChangedDone )
{
- CApaWindowGroupName* doomedApp = CApaWindowGroupName::NewLC(iCoeEnv->WsSession(),wgIds->At(i));
-
- TBool systemApp = doomedApp->IsSystem();
- TBool hiddenApp = doomedApp->Hidden();
-
- if ( systemApp || hiddenApp )
- {
- TRACES (
- TPtrC caption=doomedApp->Caption();
- RDebug::Print( _L("CSysApAppUi::CloseUIAppsInHotSwapL: Privileged app \"%S\" UID 0x%x will not be closed, system: %d, hidden: %d" ),
- &caption,
- doomedApp->AppUid().iUid,
- systemApp,
- hiddenApp);
- );
- }
- else if ( ( iFileManagerCloseDisabled && doomedApp->AppUid().iUid == KFileManagerAppUid ) ||
- doomedApp->AppUid().iUid == KAutolockAppUid )
- {
- // An additional failure protection: Autolock must not be closed in any circumstances
- TRACES (
- TPtrC caption=doomedApp->Caption();
- RDebug::Print( _L("CSysApAppUi::CloseUIAppsInHotSwapL: Privileged app \"%S\" will not be closed, UID 0x%x"),
- &caption,
- doomedApp->AppUid().iUid );
- );
- }
- else if ( doomedApp->AppUid().iUid == 0 && !iTimeToKill )
- {
-#ifdef _DEBUG
- TApaTask task(iCoeEnv->WsSession());
- task.SetWgId(wgIds->At(i));
- TUint threadId = (TUint)(task.ThreadId());
- TInt32 uid = ResolveUidFromThread( threadId );
- // CApaWindowGroupName stores the application UID, and in early application startup state AppUid()-method returns 0
- // In order not to accidentally close application that hasn't yet its window group properly set up, decicision whether
- // to close the application is postponed, in maximum to the end of the waiting period.
- TRACES ( RDebug::Print( _L("CSysApAppUi::CloseUIAppsInHotSwapL: Unknown app will not be closed yet, threadId=%d, UID 0x%x, size=%d"),
- threadId, uid, sizeof(TApaTask) ) );
-#endif // _DEBUG
- numberOfApplicationsToShutDown++; // wait note must be displayed
- }
- else
- {
- numberOfApplicationsToShutDown++;
- TApaTask* task = new (ELeave) TApaTask(iCoeEnv->WsSession());
- CleanupDeletePushL(task);
- task->SetWgId(wgIds->At(i));
-
- TRACES (
- const TDesC& caption = doomedApp->Caption();
- const TDesC& docname = doomedApp->DocName();
- const TDesC& wgname = doomedApp->WindowGroupName();
- TUid uid = doomedApp->AppUid();
- RDebug::Print( _L("CSysApAppUi::CloseUIAppsInHotSwapL: Closing app \"%S\" (ThreadId %d, WgId %d, UID 0x%X); Docname: %S, WGName : %S"),
- &caption,
- (TUint)(task->ThreadId()),
- wgIds->At(i),
- uid.iUid,
- &docname,
- &wgname);
- );
-
- ResolveUidFromThread( (TUint)(task->ThreadId()) );
-
- if ( iApplicationScanningRoundNumber == 1 )
- {
- task->EndTask(); // applications are kindly requested to close themselves on the first round
- }
- else if ( iTimeToKill )
- {
- TBool doKill = ETrue;
-
- // final check, window group may still be uninitialized so use thread id for checking UID
- if ( doomedApp->AppUid().iUid == 0 )
- {
- if ( ResolveUidFromThread( (TUint)(task->ThreadId()) ) == KAutolockAppUid )
- {
- doKill = EFalse;
- }
- }
-
- if ( doKill )
- {
- TRACES( RDebug::Print( _L("CSysApAppUi::CloseUIAppsInHotSwapL: Killing app \"%S\""), &caption ) );
- task->KillTask(); // used after timeout on the last round
- }
- }
-
- CleanupStack::PopAndDestroy(); // task
- }
- CleanupStack::PopAndDestroy(); // doomedApp
- }
- CleanupStack::PopAndDestroy(); // wgIds
-
- if ( numberOfApplicationsToShutDown > 0 && iApplicationScanningRoundNumber <= KMaxExitTimeInHotSwap )
- {
- TRACES( RDebug::Print( _L("CSysApAppUi::CloseUIAppsInHotSwapL: Show wait note, unless already showing") ) );
- if ( !iSysApWaitNote )
- {
- HBufC* noteStringBuf = StringLoader::LoadLC( R_QTN_MEMC_WAIT_EJECT, iEikonEnv );
- iSysApWaitNote = CSysApWaitNote::NewL( iSysApFeatureManager->CoverDisplaySupported() );
- iSysApWaitNote->ShowNoteL( EClosingApplicationsNote, noteStringBuf );
- CleanupStack::PopAndDestroy();
- }
-
- if ( iApplicationScanningRoundNumber >= KMaxExitTimeInHotSwap )
- {
- iTimeToKill = ETrue;
- }
-
- if ( !iSysApTimer )
- {
- iSysApTimer = new ( ELeave ) CSysApTimer( *this );
- }
-
- iSysApTimer->ActivateTimerL( KApplicationScanningInterval );
- }
- else
- {
- iFileManagerCloseDisabled = EFalse;
- CompleteAppsShuttingInHotSwapL();
+ iSimChangedDone = ETrue;
+ CSysApSimChanged* simChanged = CSysApSimChanged::NewL( *this, iEikonEnv->FsSession() );
+ CleanupStack::PushL( simChanged );
+ simChanged->HandleSimChangedL();
+ CleanupStack::PopAndDestroy( simChanged );
}
}
-#endif // RD_MULTIPLE_DRIVE
// ----------------------------------------------------------------------------
-// CSysApAppUi::TimerExpiredL()
+// CSysApAppUi::IgnoreZeroNetworkBarNotifications
// ----------------------------------------------------------------------------
-void CSysApAppUi::TimerExpiredL()
- {
-#ifndef RD_MULTIPLE_DRIVE
- CloseUIAppsInHotSwapL();
-#endif // RD_MULTIPLE_DRIVE
- }
-
-#ifndef RD_MULTIPLE_DRIVE
-// ----------------------------------------------------------------------------
-// CSysApAppUi::CompleteAppsShuttingInHotSwapL()
-// ----------------------------------------------------------------------------
-void CSysApAppUi::CompleteAppsShuttingInHotSwapL()
+//
+void CSysApAppUi::IgnoreZeroNetworkBarNotifications(TBool aIgnore)
{
- TRACES( RDebug::Print( _L("CSysApAppUi::CompleteAppsShuttingInHotSwapL iMMCEjectUsed=%d, iMMCInserted=%d"), iMMCEjectUsed, iMMCInserted ) );
- CancelWaitNote();
-
- if ( iMMCEjectUsed ) // From Powerkey Menu
- {
- DismountMMC();
- TRACES( RDebug::Print( _L( "CSysApAppUi::CompleteAppsShuttingInHotSwapL: Show note: Remove MMC and press OK...." ) ) );
- ShowQueryL( ESysApRemoveMmcNote );
- }
- else if ( !iMMCInserted ) // The MMC might have been already re-mounted, that's why !iMMCInserted
- {
- ShowMMCDismountedDialogL();
- }
+ iIgnoreZeroNetworkBarNotifications = aIgnore;
}
-#endif // RD_MULTIPLE_DRIVE
+
+
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::SwitchFromOnlineToOfflineModeL()
+// ----------------------------------------------------------------------------
+void CSysApAppUi::SwitchFromOnlineToOfflineModeL()
+ {
+ iSysApOfflineModeController->SwitchFromOnlineToOfflineModeL();
+ }
+
// ----------------------------------------------------------------------------
// CSysApAppUi::InitCloseSimApplicationsL()
@@ -3306,6 +1662,7 @@
CloseSimApplicationsL();
}
+
// ----------------------------------------------------------------------------
// CSysApAppUi::CloseSimApplicationsL()
// ----------------------------------------------------------------------------
@@ -3367,6 +1724,7 @@
}
}
+
// ----------------------------------------------------------------------------
// CSysApAppUi::DoCloseSimApplicationsAfterCallBack
// ----------------------------------------------------------------------------
@@ -3384,6 +1742,72 @@
return KErrNone;
}
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::NotifyPowerSaveModeL
+// ----------------------------------------------------------------------------
+//
+void CSysApAppUi::NotifyPowerSaveModeL( TSysApPsmStatus aStatus )
+ {
+ TRACES( RDebug::Print( _L("CSysApAppUi::NotifyPowerSaveModeL aStatus: %d"), aStatus ) );
+
+ // cancel any active power saving query because user has changed the state manually
+ // CancelQuery( ESysApBattChargingPowerSavingQuery );
+ // CancelQuery( ESysApBattLowPowerSavingQuery );
+ // will take care in next sub
+
+ switch ( aStatus )
+ {
+ case MSysApPsmControllerNotifyCallback::EPsmActivationComplete:
+ UpdateBatteryBarsL( StateOfProperty( KPSUidHWRMPowerState, KHWRMBatteryLevel ) );
+ iVariantAccState = CHbSymbianVariant::NewL(&KPsm, CHbSymbianVariant::EDes);
+ if (!iHbIndicatorSymbian->Activate(KPsmPlugin,iVariantAccState))
+ {
+ int error = iHbIndicatorSymbian->Error();
+ //use the errorcode...
+ }
+ break;
+
+ case MSysApPsmControllerNotifyCallback::EPsmDeactivationComplete:
+ UpdateBatteryBarsL( StateOfProperty( KPSUidHWRMPowerState, KHWRMBatteryLevel ) );
+ if (!iHbIndicatorSymbian->Deactivate(KPsmPlugin))
+ {
+ int error = iHbIndicatorSymbian->Error();
+ //use the errorcode...
+ }
+ break;
+
+ case MSysApPsmControllerNotifyCallback::EPsmActivationFailed:
+ ShowUiNoteL( ECannotActivatePowerSaveMode );
+ break;
+
+ case MSysApPsmControllerNotifyCallback::EPsmDeactivationFailed:
+ ShowUiNoteL( ECannotDeactivatePowerSaveMode );
+ break;
+
+ default:
+ break;
+ }
+ }
+
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::ShowAlarmIndicatorL()
+// ----------------------------------------------------------------------------
+
+void CSysApAppUi::ShowAlarmIndicatorL( TBool aShowIndicator )
+ {
+ if ( aShowIndicator)
+ {
+ // do nothing
+ }
+ else
+ {
+ // do nothing
+ }
+ }
+
+
// ----------------------------------------------------------------------------
// CSysApAppUi::AlertUiAlertingL( const TBool aAlerting )
// ----------------------------------------------------------------------------
@@ -3405,6 +1829,55 @@
iSysApLightsController->AlarmOccuredL( aAlerting );
}
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::HandleForcedLightsVTRequireL( const TInt aLightParameter )
+// ----------------------------------------------------------------------------
+
+void CSysApAppUi::HandleForcedLightsVTRequireL( const TInt aLightsParameter ) const
+ {
+ iSysApLightsController->HandleForcedLightsVTRequireL( aLightsParameter );
+ }
+
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::HandleForcedLightsSSRequireL( const TInt aLightParameter )
+// ----------------------------------------------------------------------------
+
+void CSysApAppUi::HandleForcedLightsSSRequireL( const TInt aLightsParameter ) const
+ {
+ iSysApLightsController->HandleForcedLightsSSRequireL( aLightsParameter );
+ }
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::HandleForcedLightsATCRequireL( const TInt aLightParameter )
+// ----------------------------------------------------------------------------
+void CSysApAppUi::HandleForcedLightsATCRequireL( const TInt aLightsParameter ) const
+ {
+ iSysApLightsController->HandleForcedLightsATCRequireL( aLightsParameter );
+ }
+
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::HandleLightsRequireL()
+// ----------------------------------------------------------------------------
+
+void CSysApAppUi::HandleLightsRequireL() const
+ {
+ iSysApLightsController->HandleLightsRequireL();
+ }
+
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::HandleRawKeyEventLightsRequireL()
+// ----------------------------------------------------------------------------
+
+void CSysApAppUi::HandleRawKeyEventLightsRequireL() const
+ {
+ iSysApLightsController->HandleRawKeyEventLightsRequireL();
+ }
+
+
// ----------------------------------------------------------------------------
// CSysApAppUi::AlertUiKeyLockOff( const TBool aKeyLockOff )
// ----------------------------------------------------------------------------
@@ -3424,7 +1897,7 @@
iKeyLockOnBeforeAlarm = ETrue;
}
}
- KeyLock().DisableWithoutNote();
+ iKeyguardController->DisableKeyguard(EFalse);
}
else
{
@@ -3435,61 +1908,33 @@
TInt callState( StateOfProperty( KPSUidCtsyCallInformation, KCTsyCallState ) );
if ( callState == EPSCTsyCallStateNone || callState == EPSCTsyCallStateConnected )
{
- KeyLock().EnableAutoLockEmulation();
+ iKeyguardController->EnableKeyguard(EFalse);
}
}
else if ( iKeyLockOnBeforeAlarm && !iKeyLockOnBeforeCradle && !iKeyLockOnBeforeCall )
{
- KeyLock().EnableKeyLock();
+ iKeyguardController->EnableKeyguard(ETrue);
}
iKeyLockOnBeforeAlarm = EFalse;
}
}
-// ----------------------------------------------------------------------------
-// CSysApAppUi::HandleLightsRequireL()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::HandleLightsRequireL() const
- {
- iSysApLightsController->HandleLightsRequireL();
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::HandleRawKeyEventLightsRequireL()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::HandleRawKeyEventLightsRequireL() const
- {
- iSysApLightsController->HandleRawKeyEventLightsRequireL();
- }
// ----------------------------------------------------------------------------
-// CSysApAppUi::HandleForcedLightsVTRequireL( const TInt aLightParameter )
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::HandleForcedLightsVTRequireL( const TInt aLightsParameter ) const
- {
- iSysApLightsController->HandleForcedLightsVTRequireL( aLightsParameter );
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::HandleForcedLightsSSRequireL( const TInt aLightParameter )
+// CSysApAppUi::DoNotEnableKeylock()
// ----------------------------------------------------------------------------
-void CSysApAppUi::HandleForcedLightsSSRequireL( const TInt aLightsParameter ) const
+void CSysApAppUi::DoNotEnableKeylock()
{
- iSysApLightsController->HandleForcedLightsSSRequireL( aLightsParameter );
+ if ( !iKeyLockOnBeforeCradle )
+ {
+ iShowkeypadActivatedNoteAfterSoftReject = iKeyLockOnBeforeCall;
+ }
+
+ iKeyLockOnBeforeCall = EFalse;
}
-// ----------------------------------------------------------------------------
-// CSysApAppUi::HandleForcedLightsATCRequireL( const TInt aLightParameter )
-// ----------------------------------------------------------------------------
-void CSysApAppUi::HandleForcedLightsATCRequireL( const TInt aLightsParameter ) const
- {
- iSysApLightsController->HandleForcedLightsATCRequireL( aLightsParameter );
- }
-
+
// ----------------------------------------------------------------------------
// CSysApAppUi::SwitchLightsOnSoftRejectL()
// ----------------------------------------------------------------------------
@@ -3498,638 +1943,6 @@
iSysApLightsController->SwitchLightsOnSoftRejectL();
}
-// ----------------------------------------------------------------------------
-// CSysApAppUi::StateOfProperty()
-// ----------------------------------------------------------------------------
-TInt CSysApAppUi::StateOfProperty( const TUid& aCategory, const TUint aKey ) const
- {
- TInt err( KErrNone );
- TInt value( 0 );
- err = RProperty::Get( aCategory, aKey, value );
- if ( err )
- {
- TRACES( RDebug::Print( _L("CSysApAppUi::StateOfProperty. RProperty::Get: err=%d"), err ) );
- return err;
- }
- return value;
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::BluetoothPowerMode()
-// ----------------------------------------------------------------------------
-TInt CSysApAppUi::BluetoothPowerMode() const
- {
- return iSysApCenRepBtObserver->BluetoothPowerMode();
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::ActivateProfileL( const TInt aProfileId ) const
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::ActivateProfileL( const TInt aProfileId ) const
- {
- TRACES( RDebug::Print( _L("CSysApAppUi::ActivateProfile aProfileId: %d"), aProfileId ) );
- //No use of returning the Profile error code since it only tells if the activation was succesfull or not.
- iProfileEngine->SetActiveProfileL( aProfileId );
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::ActivateOnlineProfileL() const
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::ActivateOnlineProfileL() const
- {
- ActivateProfileL( iProfileToBeActivated );
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::ActiveProfileNameL( TPtr aProfileName ) const
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::ActiveProfileNameL( TPtr aProfileName )
- {
- TRACES( RDebug::Print( _L("CSysApAppUi::ActiveProfileNameL START") ) );
- MProfile* profile = iProfileEngine->ActiveProfileL();
- const MProfileName& mProfileName = profile->ProfileName();
- aProfileName = mProfileName.Name();
- profile->Release();
- TRACES( RDebug::Print( _L("CSysApAppUi::ActiveProfileNameL END") ) );
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::CheckSilentModeL()
-// ----------------------------------------------------------------------------
-void CSysApAppUi::CheckSilentModeL()
- {
- TBool isSilent( EFalse );
- MProfile* profile = iProfileEngine->ActiveProfileL();
- isSilent = profile->IsSilent();
- profile->Release();
- if ( isSilent )
- {
- TRACES( RDebug::Print( _L("CSysApAppUi::CheckSilentModeL: active profile is SILENT") ) );
- iSysApLightsController->SetSilentModeOn( ETrue );
- }
- else
- {
- TRACES( RDebug::Print( _L("CSysApAppUi::CheckSilentModeL: active profile is NOT SILENT") ) );
- iSysApLightsController->SetSilentModeOn( EFalse );
- }
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::HandleProfileChangedL( const TInt aValue )
-// ----------------------------------------------------------------------------
-void CSysApAppUi::HandleProfileChangedL( const TInt aNewProfileId )
- {
- TRACES( RDebug::Print( _L("CSysApAppUi::HandleProfileChangedL: aNewProfileId=%d"), aNewProfileId ) );
- CheckSilentModeL();
- if ( iHandleNextProfileEvent )
- {
- if ( iAccessoryJustConnected )
- {
- iAccessoryJustConnected = EFalse;
- }
- else
- {
- // if the user delibarately changes profiles, the selected profile will
- // remain active after disconnecting an accessory.
- iSysApCenRepController->SetInt( KCRUidCoreApplicationUIsSysAp, KSysApProfileUpdateRequired, 0 );
- }
-
- // Added as a part of REQ 415-6750 : Conditional UI-note for "Activated profile"
- TInt noNeedToShowTheNote = 0; // if True, then note should not be shown
- TInt err = KErrNone;
-
- err = RProperty::Get( KPSUidCoreApplicationUIs, KCoreAppUIsProfileActivatedNote,
- noNeedToShowTheNote );
- /*
- If there occured an error, it is likely caused by the non-existing property.
- So trying to set it only if no error occured for maintaining the default behavior.
- */
- if( KErrNone == err )
- {
- TInt error = RProperty::Set( KPSUidCoreApplicationUIs, KCoreAppUIsProfileActivatedNote,
- ECoreAppUIsProfileActivatedNoteNotShown );
- }
-
- if(!noNeedToShowTheNote) // The value doesn't deny the showing, then...
- {
- ShowProfileNoteL();
- }
- }
-
- if ( aNewProfileId != KOfflineModeProfileId )
- {
- iActiveProfileBeforeOfflineMode = aNewProfileId;
- iSysApCenRepController->SetInt( KCRUidCoreApplicationUIsSysAp, KSysApProfileBeforeOfflineMode, aNewProfileId );
- }
-
- if ( aNewProfileId == KOfflineModeProfileId && ! iSysApOfflineModeController->OfflineModeActive() )
- {
- if ( BtSapEnabled() )
- {
- // Choosing "Offline Mode" will disconnect BT SAP
- // SwitchFromOnlineToOfflineModeL() will be called from CSysApBtSapController
- iSysApBtSapController->SwitchingToOffline();
- iSysApBtSapController->Disconnect();
- }
- else
- {
- SwitchFromOnlineToOfflineModeL();
- }
- }
- else if ( aNewProfileId != KOfflineModeProfileId && iSysApOfflineModeController->OfflineModeActive() )
- {
- if ( BtSapEnabled() )
- {
- iSysApOfflineModeController->DoNotActivateRF(); // Will be activated after BT SAP disconnection
- }
- iSysApOfflineModeController->SwitchFromOfflineToOnlineModeL();
- }
- iHandleNextProfileEvent = ETrue;
- }
-
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::RestoreProfileL()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::RestoreProfileL( const TBool aOffline )
- {
- iHandleNextProfileEvent = EFalse;
- if ( aOffline )
- {
- ActivateProfileL( KOfflineModeProfileId );
- }
- else
- {
- ActivateProfileL( iActiveProfileBeforeOfflineMode );
- }
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::ActiveProfileId()
-// ----------------------------------------------------------------------------
-
-TInt CSysApAppUi::ActiveProfileId()
- {
- return iProfileEngine->ActiveProfileId();
- }
-
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::AddMmcMenuItemsL()
-// ----------------------------------------------------------------------------
-//
-void CSysApAppUi::AddMmcMenuItemsL( CDesCArray*& aProfileNameCDesCArray, RArray<TInt>& aItemIdArray,
- TInt& aPowerMenuItemIndex )
- {
- TInt propertyValue( StateOfProperty( KPSUidUsbWatcher,
- KUsbWatcherSelectedPersonality ) );
-
- HBufC* itemStringBuf;
-#ifndef RD_MULTIPLE_DRIVE
- iPowerkeyMenuEjectSelection = KErrAccessDenied;
- if ( !IsEncryptionOperationOngoingL() )
- {
- if ( iSysApFeatureManager->MmcHotSwapSupported() &&
- iMMCInserted &&
- iSysApFeatureManager->EjectRequiredInPowerMenu() &&
- propertyValue != KUsbPersonalityIdMS )
- {
- iPowerkeyMenuEjectShown = ETrue;
- TRACES( RDebug::Print(_L("CSysApAppUi::AddMmcMenuItemsL: adding \"Eject\"" ) ) );
- itemStringBuf = StringLoader::LoadLC( R_QTN_PWRC_EJECT_MMC, iEikonEnv );
- aProfileNameCDesCArray->AppendL( itemStringBuf->Des() );
- CleanupStack::PopAndDestroy(); // itemStringBuf
- if ( iSysApFeatureManager->CoverDisplaySupported() )
- {
- aItemIdArray.AppendL(SecondaryDisplay::EPwrMenuItemEjectMMC);
- }
- iPowerkeyMenuEjectShown = ETrue;
- iPowerkeyMenuEjectSelection = aPowerMenuItemIndex;
- aPowerMenuItemIndex++;
- }
- }
-
-#else // RD_MULTIPLE_DRIVE
- iPowerkeyMenuEjectSelectionBase = KErrAccessDenied;
- if ( !IsEncryptionOperationOngoingL() )
- {
- if ( iSysApFeatureManager->MmcHotSwapSupported()
- && iSysApFeatureManager->EjectRequiredInPowerMenu()
- && propertyValue != KUsbPersonalityIdMS )
- {
- // Reset old eject status and dialog
- iSysApDriveList->ResetDrivesToEject();
- if ( iSysApConfirmationQuery )
- {
- if ( iSysApConfirmationQuery->CurrentQuery() == ESysApEjectMmcQuery )
- {
- iSysApConfirmationQuery->Cancel();
- }
- }
-
- // Append memory cards for eject selection
- TInt count( iInsertedMemoryCards.Count() );
- TInt corruptedMedia = 0;
- for ( TInt i( 0 ); i < count; ++i )
- {
- TVolumeInfo info;
- TInt err = iEikonEnv->FsSession().Volume(info, iInsertedMemoryCards[ i ].iDrive);
- TRACES( RDebug::Print(_L("CSysApAppUi::AddMmcMenuItemsL: corrupted media, iDrive (%d) Error: %d" ),iInsertedMemoryCards[ i ].iDrive, err ) );
- if(err != KErrNone)
- {
- corruptedMedia++;
- continue;
- }
- itemStringBuf = iSysApDriveList->GetFormattedDriveNameLC(
- iInsertedMemoryCards[ i ].iDrive,
- R_QTN_PWRC_EJECT_MEMORY_STORAGE );
- aProfileNameCDesCArray->AppendL( *itemStringBuf );
- CleanupStack::PopAndDestroy( itemStringBuf );
-
- if ( iSysApFeatureManager->CoverDisplaySupported() )
- {
- aItemIdArray.AppendL(
- SecondaryDisplay::EPwrMenuItemEjectItemBase + i );
- }
- }
- if ( (count-corruptedMedia) > 0 )
- {
- TRACES( RDebug::Print(_L("CSysApAppUi::AddMmcMenuItemsL: added \"Eject\"" ) ) );
- iPowerkeyMenuEjectShown = ETrue;
- iPowerkeyMenuEjectSelectionBase = aPowerMenuItemIndex;
- aPowerMenuItemIndex += (count-corruptedMedia);
- }
- }
- }
-#endif // RD_MULTIPLE_DRIVE
- }
-
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::ShowPowerKeyPopUpMenuL()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::ShowPowerKeyPopUpMenuL()
- {
- TRACES( RDebug::Print(_L("CSysApAppUi::ShowPowerKeyPopUpMenuL iPowerKeyPopupMenuActive: %d" ),
- iPowerKeyPopupMenuActive ) );
-
- if ( !iPowerKeyPopupMenuActive && !iDisablePowerkeyMenu
- && iSysApPowerKeyMenuObserver ) // normal state construction has been executed
- {
- iPowerKeyPopupMenuDismissed = EFalse;
- iPowerkeyMenuPowerOffShown = EFalse;
- CancelGlobalListQuery();
-
- iGlobalListQuery = CAknGlobalListQuery::NewL();
-
- iSysApPowerKeyMenuObserver->Cancel();
-
- CDesCArray* profileNameCDesCArray; // Array for Powerkey Menu items
-
- RArray<TInt> itemIdArray; // needed for cover UI
- CleanupClosePushL(itemIdArray);
-
- // make sure old profile names array is clean
- delete iProfileNamesArray;
- iProfileNamesArray = NULL;
-
- // Must pop iProfileNamesArray here as cannot leave trap harness with uneven push/pop count.
- // This is because profileEngine doesn't provide non-LC version of ProfilesNamesArrayLC
- TRAPD( err,
- iProfileNamesArray = iProfileEngine->ProfilesNamesArrayLC();
- CleanupStack::Pop();
- );
-
- if ( err != KErrNone )
- {
- // creating menu failed, return (i.e. just don't show the menu)
- TRACES( RDebug::Print(_L("CSysApAppUi::ShowPowerKeyPopUpMenuL iProfileEngine->ProfilesNamesArrayLC() ERROR: %d" ), err ) );
- iNumberOfProfileNamesInPowerKeyMenu = 0;
- }
- else
- {
- iNumberOfProfileNamesInPowerKeyMenu = iProfileNamesArray->MdcaCount();
- TRACES( RDebug::Print(_L("CSysApAppUi::ShowPowerKeyPopUpMenuL iNumberOfProfileNamesInPowerKeyMenu: %d" ),
- iNumberOfProfileNamesInPowerKeyMenu ) );
- }
-
- if ( BtSapEnabled() )
- {
- profileNameCDesCArray = new( ELeave ) CDesCArrayFlat( iNumberOfProfileNamesInPowerKeyMenu + 4 );
- }
- else
- {
- profileNameCDesCArray = new( ELeave ) CDesCArrayFlat( iNumberOfProfileNamesInPowerKeyMenu + 3 );
- }
-
- CleanupStack::PushL( profileNameCDesCArray );
- profileNameCDesCArray->Reset();
- HBufC* itemStringBuf;
-
- TInt powerMenuItemIndex = 0;
-
- // "Switch off" menu item
- if ( !IsEncryptionOperationOngoingL() )
- {
- itemStringBuf = StringLoader::LoadLC( R_QTN_PWRC_SWITCH_OFF, iEikonEnv );
- profileNameCDesCArray->InsertL( 0, itemStringBuf->Des() );
- CleanupStack::PopAndDestroy(); // itemStringBuf
- if ( iSysApFeatureManager->CoverDisplaySupported() )
- {
- itemIdArray.AppendL(SecondaryDisplay::EPwrMenuItemSwitchOff);
- }
- iPowerkeyMenuPowerOffShown = ETrue;
- powerMenuItemIndex++;
- }
-
- iPowerkeyMenuLockKeypadShown = EFalse;
- iPowerkeyMenuExitSapShown = EFalse;
- iPowerkeyMenuLockSystemShown = EFalse;
- iPowerkeyMenuEjectShown = EFalse;
-
- iPowerkeyMenuLockKeypadSelection = KErrAccessDenied;
- iPowerkeyMenuExitSapSelection = KErrAccessDenied;
- iPowerkeyMenuLockSystemSelection = KErrAccessDenied;
-
-#ifndef RD_MULTIPLE_DRIVE
- iPowerkeyMenuEjectSelection = KErrAccessDenied;
-#else // RD_MULTIPLE_DRIVE
- iPowerkeyMenuEjectSelectionBase = KErrAccessDenied;
-#endif // RD_MULTIPLE_DRIVE
-
- // "Lock keypad" menu item
-
- TInt callState ( StateOfProperty( KPSUidCtsyCallInformation, KCTsyCallState ) );
- TInt callType ( StateOfProperty( KPSUidCtsyCallInformation, KCTsyCallType ) );
- if ( !( callState == EPSCTsyCallStateConnected && callType == EPSCTsyCallTypeH324Multimedia ) )
- {
- if ( ( iSysApFeatureManager->GripNotSupported() && !iSysApFeatureManager->SlideSupported() ) ||
- ( (!iSysApFeatureManager->GripNotSupported() || iSysApFeatureManager->SlideSupported() ) &&
- ( StateOfProperty( KPSUidHWRM, KHWRMGripStatus ) == EPSHWRMGripClosed ) ) )
- // "Lock keypad" command is shown always when there is no grip, and if there
- // there is no grip, only when the grip is closed.
- {
- if ( CKeyLockPolicyApi::KeyguardAllowed() )
- {
- if ( iSysApFeatureManager->PenEnabled() )
- {
- itemStringBuf = StringLoader::LoadLC( R_QTN_PWRC_LOCK_DISPLAY, iEikonEnv );
- }
- else
- {
- itemStringBuf = StringLoader::LoadLC( R_QTN_PWRC_LOCK_KEYS, iEikonEnv );
- }
- profileNameCDesCArray->AppendL( itemStringBuf->Des() );
- CleanupStack::PopAndDestroy(); // itemStringBuf
- if ( iSysApFeatureManager->CoverDisplaySupported() )
- {
- itemIdArray.AppendL(SecondaryDisplay::EPwrMenuItemLockKeypad);
- }
- iPowerkeyMenuLockKeypadShown = ETrue;
- iPowerkeyMenuLockKeypadSelection = powerMenuItemIndex;
- powerMenuItemIndex++;
- }
- }
- }
- if ( iSysApFeatureManager->PowerKeyIsLockKey() )
- {
- AddMmcMenuItemsL( profileNameCDesCArray,
- itemIdArray, powerMenuItemIndex );
- }
- // "Exit SIM access profile" menu item
- if ( BtSapEnabled() )
- {
- TRACES( RDebug::Print(_L( "CSysApAppUi::ShowPowerKeyPopUpMenuL: show \"Exit SIM access profile\" item" ) ) );
- itemStringBuf = StringLoader::LoadLC( R_QTN_PWRC_EXIT_SIM_ACCESS, iEikonEnv );
- profileNameCDesCArray->AppendL( itemStringBuf->Des() );
- CleanupStack::PopAndDestroy(); // itemStringBuf
- if ( iSysApFeatureManager->CoverDisplaySupported() )
- {
- itemIdArray.AppendL(SecondaryDisplay::EPwrMenuItemExitBtSap);
- }
- iPowerkeyMenuExitSapShown = ETrue;
- iPowerkeyMenuExitSapSelection = powerMenuItemIndex;
- powerMenuItemIndex++;
- }
-
- // Profile menu items
- iProfileItemsOffset = powerMenuItemIndex;
- TInt arrayIndex( 0 );
- TBufC<KMaxProfileNameLength> profileName;
-
- for ( arrayIndex = 0; arrayIndex < iNumberOfProfileNamesInPowerKeyMenu; arrayIndex++ )
- {
- profileName = iProfileNamesArray->MdcaPoint( arrayIndex );
- TPtr profileNamePtr = profileName.Des();
- AknTextUtils::DisplayTextLanguageSpecificNumberConversion( profileNamePtr );
- profileNameCDesCArray->AppendL( profileNamePtr );
-
- if ( iSysApFeatureManager->CoverDisplaySupported() )
- {
- TInt profileId = ( iProfileNamesArray->ProfileName( arrayIndex ) )->Id();
- itemIdArray.AppendL(SecondaryDisplay::EPwrMenuItemProfileItemBase+profileId);
- }
- powerMenuItemIndex++;
- }
-
- // "Lock device" menu item
-
- callState = StateOfProperty( KPSUidCtsyCallInformation, KCTsyCallState );
-
- TInt devLockStatus( EAutolockStatusUninitialized );
- devLockStatus = StateOfProperty( KPSUidCoreApplicationUIs, KCoreAppUIsAutolockStatus ); // check whether Autolock has been started
-
-
- if ( callState == EPSCTsyCallStateNone && devLockStatus != EAutolockStatusUninitialized )
- {
- TRACES( RDebug::Print(_L("CSysApAppUi::ShowPowerKeyPopUpMenuL: adding \"Lock device\", devLockStatus=%d" ), devLockStatus ) );
- iPowerkeyMenuLockSystemShown = ETrue;
- itemStringBuf = StringLoader::LoadLC( R_QTN_SET_SEC_LOCK_SYSTEM, iEikonEnv );
- profileNameCDesCArray->AppendL( itemStringBuf->Des() );
- CleanupStack::PopAndDestroy(); // itemStringBuf
- if ( iSysApFeatureManager->CoverDisplaySupported() )
- {
- itemIdArray.AppendL(SecondaryDisplay::EPwrMenuItemLockDevice);
- }
- iPowerkeyMenuLockSystemShown = ETrue;
- iPowerkeyMenuLockSystemSelection = powerMenuItemIndex;
- powerMenuItemIndex++;
- }
- if ( !iSysApFeatureManager->PowerKeyIsLockKey() )
- {
- AddMmcMenuItemsL( profileNameCDesCArray, itemIdArray, powerMenuItemIndex );
- }
-
- // Activate/deactive power save mode
- if ( iSysApPsmController ) // variable feature, not create if power save is not used
- {
- TBool showActivate = !(iSysApPsmController->FullPsmEnabled());
-
- TInt textId = ( showActivate ? R_QTN_PWRC_ACTIVATE_POWER_SAVING : R_QTN_PWRC_DEACTIVATE_POWER_SAVING );
-
- itemStringBuf = StringLoader::LoadLC( textId, iEikonEnv );
- iSysApPsmController->SetNextUiOperation( showActivate );
-
- if ( iSysApFeatureManager->CoverDisplaySupported() )
- {
- itemIdArray.AppendL( showActivate ?
- SecondaryDisplay::EPwrMenuItemActivatePowerSaving :
- SecondaryDisplay::EPwrMenuItemDeactivatePowerSaving );
- }
-
- profileNameCDesCArray->AppendL( itemStringBuf->Des() );
- CleanupStack::PopAndDestroy( itemStringBuf );
-
- iSysApPsmController->SetUiItemId( powerMenuItemIndex );
- powerMenuItemIndex++;
- }
-
- TRACES( RDebug::Print(_L("CSysApAppUi::ShowPowerKeyPopUpMenuL NumberOfAllItemsInPowerKeyMenu: %d" ),
- profileNameCDesCArray->Count() ) );
-
- iSysApPowerKeyMenuObserver->Start();
-
- // Set secondary display data if necessary
- if ( iSysApFeatureManager->CoverDisplaySupported() )
- {
- CAknSDData* sd = CAknSDData::NewL(SecondaryDisplay::KCatSysAp, SecondaryDisplay::ECmdShowPowerKeyListQuery, KNullDesC8);
- sd->InsertGlobalListQueryItemIdsL(itemIdArray);
- iGlobalListQuery->SetSecondaryDisplayData(sd); // ownership to notifier client
- }
-
- iGlobalListQuery->ShowListQueryL( (MDesCArray*) profileNameCDesCArray,
- iSysApPowerKeyMenuObserver->iStatus,
- KProfileListInitialIndex );
-
- TRACES( RDebug::Print(_L("CSysApAppUi::ShowPowerKeyPopUpMenuL: list query shown" ) ) );
-
- CleanupStack::PopAndDestroy( profileNameCDesCArray ); // profileNameCDesCArray
- TRACES( RDebug::Print(_L("CSysApAppUi::ShowPowerKeyPopUpMenuL: profileNameCDesCArray popped" ) ) );
-
- CleanupStack::Pop(&itemIdArray);
- itemIdArray.Close();
-
- // Without following variable set ETrue powerkey up event would change the hightlighted item to be
- // the second one instead of the wanted first one.
- iIgnoreNextPowerKeyUpEvent = ETrue;
-
- if ( iSysApBatteryInfoController )
- {
- iSysApBatteryInfoController->PowerMenuShownL();
- }
-
- TRACES( RDebug::Print(_L("CSysApAppUi::ShowPowerKeyPopUpMenuL:end" ) ) );
- }
-}
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::PowerKeyPopUpMenuSelectionDoneL( TInt aSelection )
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::PowerKeyPopUpMenuSelectionDoneL( TInt aSelection )
- {
- iPowerKeyPopupMenuDismissed = ETrue;
- iPowerKeyPopupMenuActive = EFalse;
- TRACES( RDebug::Print(_L("CSysApAppUi::PowerKeyPopUpMenuSelectionDoneL: START aSelection:%d" ), aSelection ) );
- if ( aSelection == KPowerKeyMenuSelectionCancelled )
- {
- TRACES( RDebug::Print(_L("CSysApAppUi::PowerKeyPopUpMenuSelectionDoneL: Powerkey menu cancelled" ) ) );
- }
- else if( aSelection < KPowerKeyMenuSelectionCancelled )
- {
- iIgnoreNextPowerKeyUpEvent = EFalse;
- }
- else
- {
- // first menu item <=> Switch off
- if ( aSelection == KPowerKeyMenuSelectionSwitchOff )
- {
- TRACES( RDebug::Print(_L("CSysApAppUi::PowerKeyPopUpMenuSelectionDoneL: \"Switch off\" selected" ) ) );
- DoShutdownL( EFalse, KDummyReason );
- }
- // 2nd menu item: lock display & keys
- else if ( iPowerkeyMenuLockKeypadShown && aSelection == iPowerkeyMenuLockKeypadSelection )
- {
- TRACES( RDebug::Print(_L("CSysApAppUi::PowerKeyPopUpMenuSelectionDoneL: \"Lock keypad\" selected" ) ) );
- KeyLock().EnableKeyLock();
- }
- // BT
- else if ( iPowerkeyMenuExitSapShown && aSelection == iPowerkeyMenuExitSapSelection )
- {
- TRACES( RDebug::Print(_L("CSysApAppUi::PowerKeyPopUpMenuSelectionDoneL: \"Exit SAP\" selected" ) ) );
- ShowQueryL( ESysApBtSapDisconnectQuery );
- }
- // Profile Items
- else if ( ( aSelection >= iProfileItemsOffset ) && ( aSelection < iProfileItemsOffset + iNumberOfProfileNamesInPowerKeyMenu ) )
- {
- __ASSERT_DEBUG( iProfileNamesArray, User::Invariant() );
-
- if ( iProfileNamesArray )
- {
- iProfileToBeActivated = ( iProfileNamesArray->ProfileName( aSelection - iProfileItemsOffset ) )->Id();
-
- TRACES( RDebug::Print(_L("CSysApAppUi::PowerKeyPopUpMenuSelectionDoneL: profile id: %d selected" ), iProfileToBeActivated ) );
- if ( ! iSysApOfflineModeController->OfflineModeActive() ||
- ( iProfileToBeActivated ) == KOfflineModeProfileId )
- {
- ActivateProfileL( iProfileToBeActivated );
- }
- else
- {
- // iProfileToBeActivated profile will be activated from iSysApOfflineModeController if ok
- iSysApOfflineModeController->GoOnlineIfOkL();
- }
- }
- }
- // device lock
- else if ( iPowerkeyMenuLockSystemShown && aSelection == iPowerkeyMenuLockSystemSelection )
- {
- TRACES( RDebug::Print(_L("CSysApAppUi::PowerKeyPopUpMenuSelectionDoneL: \"Lock system\" selected" ) ) );
- iSysApSystemLock->SetLockedL();
- }
-#ifndef RD_MULTIPLE_DRIVE
- //eject single MMC
- else if ( iPowerkeyMenuEjectShown && aSelection == iPowerkeyMenuEjectSelection )
- {
- TRACES( RDebug::Print(_L("CSysApAppUi::PowerKeyPopUpMenuSelectionDoneL: \"Eject\" selected" ) ) );
- ShowQueryL( ESysApEjectMmcQuery );
- }
-#else // RD_MULTIPLE_DRIVE
- //eject nth MMC
- else if ( iPowerkeyMenuEjectShown &&
- aSelection >= iPowerkeyMenuEjectSelectionBase &&
- aSelection < iPowerkeyMenuEjectSelectionBase + iInsertedMemoryCards.Count() )
- {
- iDriveToEject =
- iInsertedMemoryCards[ aSelection - iPowerkeyMenuEjectSelectionBase ].iDrive;
- TRACES( RDebug::Print(
- _L( "CSysApAppUi::PowerKeyPopUpMenuSelectionDoneL: \"Eject\" selected, drive=%d" ),
- iDriveToEject ) );
- iSysApDriveList->ResetDrivesToEject();
- RProperty::Set( KPSUidUikon, KUikMMCInserted, 0 );
- EjectMMCL();
- }
-#endif // RD_MULTIPLE_DRIVE
- else if ( iSysApPsmController && aSelection == iSysApPsmController->UiItemId() )
- {
- TRACES( RDebug::Print(_L("CSysApAppUi::PowerKeyPopUpMenuSelectionDoneL: \"Activate|Deactivate power save\" selected" ) ) );
- iSysApPsmController->DoEnableFullPsm( iSysApPsmController->NextUiOperation() );
- }
-
- }
-
- delete iProfileNamesArray;
- iProfileNamesArray = NULL;
- delete iGlobalListQuery;
- iGlobalListQuery = NULL;
-
- TRACES( RDebug::Print(_L("CSysApAppUi::PowerKeyPopUpMenuSelectionDoneL: END" ) ) );
- }
// ----------------------------------------------------------------------------
// CSysApAppUi::SetDeviceLockEnabledL( const TBool aLockEnabled )
@@ -4147,14 +1960,14 @@
iSysApLightsController->DeviceLockStateChangedL( iDeviceLockEnabled );
}
- /* if( iDeviceLockEnabled )
+ if( iDeviceLockEnabled )
{
if( iKeyLockEnabled )
{
- KeyLock().DisableWithoutNote();
+ iKeyguardController->DisableKeyguard(EFalse);
}
- }*/
- if(! iDeviceLockEnabled )
+ }
+ else
{
// let's not activate keylock in case device lock was disabled during call or in cradle
iKeyLockOnBeforeCall = EFalse;
@@ -4163,92 +1976,964 @@
// Memory card needs to be unlocked when device is unlocked
if ( iSysApFeatureManager->MmcHotSwapSupported() )
{
- RunUnlockNotifierL();
+ RunUnlockNotifierL();
+ // Need to handle feature for unlocking the MMC card
+ }
+ }
+ }
+
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::HandleBatteryStatusL
+// ----------------------------------------------------------------------------
+//
+void CSysApAppUi::HandleBatteryStatusL( const TInt aValue )
+ {
+ TRACES( RDebug::Print( _L("CSysApAppUi::HandleBatteryStatusL aValue: %d"), aValue ) );
+
+ TBool enableAutoPsm(EFalse);
+ CRepository* repository( NULL );
+ TRAPD( err, repository = CRepository::NewL( KCRUidDeviceManagementSettings ) );
+
+ if ( err == KErrNone )
+ {
+ TInt value( 0 );
+ err = repository->Get( KSettingsPowerSavingQuery, value );
+
+ if ( err == KErrNone )
+ {
+ enableAutoPsm = value ? EFalse: ETrue;
+ }
+ }
+
+ _LIT(Klowbattery, "txt_power_management_dpopinfo_low_battery");
+ // returns the string "low battery"
+ HBufC* lowBattery = HbTextResolverSymbian::LoadL(Klowbattery);
+
+
+ if ( aValue == EBatteryStatusEmpty )
+ {
+ //Display Recharge Battery note
+ ShowUiNoteL( ERechargeBatteryNote );
+ BatteryEmptyL();
+ }
+ else if ( aValue == EBatteryStatusLow )
+ {
+ if ( iSysApPsmController && UiReady() )
+ {
+ iSysApPsmController->BatteryLow( ETrue );
+
+
+ if ( enableAutoPsm)
+ {
+ iSysApPsmController->DoEnableFullPsm( ETrue );
+
+ _LIT(KPsmOn, "txt_power_management_dpopinfo_psm_activated_automa");
+ // returns the string "power saving mode on"
+ HBufC* psmOn = HbTextResolverSymbian::LoadL(KPsmOn);
+
+ _LIT(Kicon, "qgn_indi_battery_ps_activate");
+ // returns the power save mode icon
+ HBufC* psmIcon = HbTextResolverSymbian::LoadL(Kicon);
+
+ CHbDeviceNotificationDialogSymbian::NotificationL(*psmIcon,*psmOn,*lowBattery);
+ }
+ else // default low warning note must be shown
+ {
+ //Display Battery Low note.
+ CHbDeviceNotificationDialogSymbian::NotificationL(KlowbatteryIcon,KNullDesC,*lowBattery);
+ }
+ }
+ else
+ {
+ //Display Battery Low note.
+ CHbDeviceNotificationDialogSymbian::NotificationL(KlowbatteryIcon,KNullDesC,*lowBattery);
+ }
+ }
+
+ if ( iSysApBatteryInfoController )
+ {
+ iSysApBatteryInfoController->BatteryStatusUpdated( aValue );
+ }
+
+ delete repository;
+ }
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::ShowUiNoteL( const TSysApNoteIds aNote ) const
+// ----------------------------------------------------------------------------
+
+void CSysApAppUi::ShowUiNoteL( const TSysApNoteIds aNote ) const
+ {
+ TRACES( RDebug::Print( _L("CSysApAppUi::ShowUiNoteL aNote: %d"), aNote ) );
+
+ TInt swState( StateOfProperty( KPSUidStartup, KPSGlobalSystemState ) );
+
+ if( UiReady() || swState == ESwStateSecurityCheck)
+ {
+ switch ( aNote )
+ {
+ case EBatteryLowNote:
+ {
+ _LIT(KPowerPressKey,"Battery low");
+ HBufC* aString = HBufC16::NewLC(100);
+ TPtrC aStringPointer = aString->Des();
+ aStringPointer.Set(KPowerPressKey);
+ TRACES( RDebug::Print( _L("CSysApWsClient::RunL(): Key EEventKeyUp 01") ) );
+ ShowExampleUiNoteL( aStringPointer );
+ CleanupStack::PopAndDestroy(); // aString
+ }
+ break;
+ case EBatteryFullNote:
+ {
+ _LIT(KPowerPressKey,"Battery full");
+ HBufC* aString = HBufC16::NewLC(100);
+ TPtrC aStringPointer = aString->Des();
+ aStringPointer.Set(KPowerPressKey);
+ TRACES( RDebug::Print( _L("CSysApWsClient::RunL(): Key EEventKeyUp 01") ) );
+ ShowExampleUiNoteL( aStringPointer );
+ CleanupStack::PopAndDestroy(); // aString
+ }
+ break;
+ case ERechargeBatteryNote:
+ {
+ iSysApLightsController->BatteryEmptyL( ETrue );
+ _LIT(KPowerPressKey,"Battery empty. Recharge");
+ HBufC* aString = HBufC16::NewLC(100);
+ TPtrC aStringPointer = aString->Des();
+ aStringPointer.Set(KPowerPressKey);
+ TRACES( RDebug::Print( _L("CSysApWsClient::RunL(): Key EEventKeyUp 01") ) );
+ ShowExampleUiNoteL( aStringPointer );
+ CleanupStack::PopAndDestroy(); // aString
+ }
+ break;
+ case ENotChargingNote:
+ {
+ _LIT(KPowerPressKey,"Not charging");
+ HBufC* aString = HBufC16::NewLC(100);
+ TPtrC aStringPointer = aString->Des();
+ aStringPointer.Set(KPowerPressKey);
+ TRACES( RDebug::Print( _L("CSysApWsClient::RunL(): Key EEventKeyUp 01") ) );
+ ShowExampleUiNoteL( aStringPointer );
+ CleanupStack::PopAndDestroy(); // aString
+ }
+ break;
+ case EBatteryFullUnplugChargerNote:
+ {
+ TRACES( RDebug::Print( _L("CSysApWsClient::RunL(): Key EEventKeyUp 01") ) );
+ iSysApLightsController->BatteryEmptyL( ETrue );
+ _LIT(KunplugCharger,"txt_power_dpopinfo_unplug_charger_to_save_energy");
+ HBufC* unplugCharger = HbTextResolverSymbian::LoadL(KunplugCharger);
+ _LIT(KbatteryFull,"txt_power_management_dpophead_100_full");
+ HBufC* batteryFull = HbTextResolverSymbian::LoadL(KbatteryFull);
+ CHbDeviceNotificationDialogSymbian::NotificationL(KbatteryFullIcon,*unplugCharger,*batteryFull);
+ }
+ break;
+ case EUnplugChargerNote:
+ {
+ _LIT(KPowerPressKey,"Unplug charger from power supply to save energy");
+ HBufC* aString = HBufC16::NewLC(250);
+ TPtrC aStringPointer = aString->Des();
+ aStringPointer.Set(KPowerPressKey);
+ TRACES( RDebug::Print( _L("CSysApWsClient::RunL(): Key EEventKeyUp 01") ) );
+ ShowExampleUiNoteL( aStringPointer );
+ CleanupStack::PopAndDestroy(); // aString
+ }
+ break;
+ default:
+ break;
+ }
+ }
+ }
+
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::BatteryEmptyL()
+// ----------------------------------------------------------------------------
+
+void CSysApAppUi::BatteryEmptyL()
+ {
+ iSysApLightsController->BatteryEmptyL( ETrue );
+ // Do not reactivate keyguard in the next startup
+ iSysApCenRepController->SetInt( KCRUidCoreApplicationUIsSysAp, KSysApKeyguardActive, 0 );
+ }
+
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::ShowQueryL()
+// ----------------------------------------------------------------------------
+
+void CSysApAppUi::ShowQueryL( const TSysApConfirmationQueryIds /* aQueryId */, const TDesC& /* aValue */)
+ {
+ // do nothing
+ }
+
+
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::HandleChargingStatusL
+// ----------------------------------------------------------------------------
+//
+void CSysApAppUi::HandleChargingStatusL( const TInt aValue )
+ {
+ TRACES( RDebug::Print( _L("CSysApAppUi::HandleChargingStatusL aValue: %d"), aValue ) );
+
+ TBool showNote( ETrue );
+
+ UpdateBatteryBarsL( StateOfProperty( KPSUidHWRMPowerState, KHWRMBatteryLevel ) );
+
+ if ( iSysApPsmController && UiReady() )
+ {
+ if ( iCharging && !iSysApPsmController->ChargerConnected() ) // first time after charger connection
+ {
+ iSysApPsmController->ConnectCharger( ETrue );
+ iSysApPsmController->DoEnableFullPsm(EFalse);
+ iVariantAccState = CHbSymbianVariant::NewL(&KCharging, CHbSymbianVariant::EDes);
+
+ if (!iHbIndicatorSymbian->Activate(KPsmPlugin,iVariantAccState))
+ {
+ int error = iHbIndicatorSymbian->Error();
+ //use the errorcode...
+ }
+
+
+ }
+ else if ( aValue == EChargingStatusNotConnected )
+ {
+ iSysApPsmController->ConnectCharger( EFalse );
+ if (!iHbIndicatorSymbian->Deactivate(KPsmPlugin))
+ {
+ int error = iHbIndicatorSymbian->Error();
+ //use the errorcode...
+ }
+ }
+ }
+ if( showNote )
+ {
+ HandleChargerNotesL( aValue );
+ }
+ }
+
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::HandleChargerNotesL()
+// ----------------------------------------------------------------------------
+void CSysApAppUi::HandleChargerNotesL( const TInt aValue )
+ {
+ TBool showNote(StateOfProperty( KPSUidCtsyCallInformation, KCTsyCallState ) != EPSCTsyCallStateRinging);
+ if ( aValue == EChargingStatusCharging )
+ {
+ iSysApLightsController->BatteryEmptyL( EFalse );
+ TRACES( RDebug::Print( _L("SysAp: charger connected") ) );
+ iSysApLightsController->ChargerConnectedL( ETrue );
+ ShowChargingNoteL();
+ }
+ //Display Not Charging note
+ else if ( aValue == EChargingStatusError )
+ {
+ if(showNote)
+ {
+ ShowUiNoteL( ENotChargingNote );
+ }
+ }
+ else if ( aValue == EChargingStatusChargingComplete )
+ {
+ iSysApLightsController->ChargingCompleteL();
+
+ TSysApNoteIds note( EBatteryFullNote );
+
+ if ( !iSysApUsbChargerDetector.HostOnlyUsbChargingUsed() &&
+ iSysApFeatureManager->Supported( KSysApFeatureIdChargerReminderNotes ) )
+ {
+ note = EBatteryFullUnplugChargerNote;
+ }
+ iSysApUsbChargerDetector.Reset();
+ if(showNote)
+ {
+ ShowUiNoteL( note );
+ }
+ }
+ else if ( aValue == EChargingStatusNotConnected )
+ {
+ TRACES( RDebug::Print( _L("SysAp: charger removed") ) );
+ iSysApLightsController->ChargerConnectedL( EFalse );
+
+ if ( !iSysApUsbChargerDetector.HostOnlyUsbChargingUsed() &&
+ iSysApFeatureManager->Supported( KSysApFeatureIdChargerReminderNotes ) )
+ {
+ if(showNote)
+ {
+ ShowUiNoteL( EUnplugChargerNote );
+ }
+ }
+ iSysApUsbChargerDetector.Reset();
+ }
+ else if ( aValue == EChargingStatusNotCharging )
+ {
+ TRACES( RDebug::Print( _L("SysAp: Not charging") ) );
+ }
+ else if ( aValue == EChargingStatusAlmostComplete )
+ {
+ TRACES( RDebug::Print( _L("SysAp: Charging almost complete") ) );
+ }
+ else if ( aValue == EChargingStatusChargingContinued )
+ {
+ //in this case we simply want to scroll the battery bars and not turn light on or show ui note
+ // set lights controller iBatteryEmpty to EFalse
+ iSysApLightsController->BatteryEmptyL( EFalse );
+ TRACES( RDebug::Print( _L("SysAp: charging continues") ) );
+ }
+ }
+
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::UpdateBatteryBarsL( const TInt aState )
+// ----------------------------------------------------------------------------
+
+void CSysApAppUi::UpdateBatteryBarsL( const TInt /* aState */)
+ {
+ TInt state( StateOfProperty( KPSUidHWRMPowerState, KHWRMChargingStatus ) );
+// TRACES( RDebug::Print( _L("CSysApAppUi::UpdateBatteryBarsL aState: %d, chargerState:%d"), aState, state ) );
+ HandleUsbCharger( state );
+ if( state == EChargingStatusCharging ||
+ state == EChargingStatusChargingContinued ||
+ state == EChargingStatusAlmostComplete )
+ {
+ if ( !iCharging )
+ {
+ TRACES( RDebug::Print( _L("CSysApAppUi::UpdateBatteryBarsL: Starting Charging") ) );
+ iCharging = ETrue;
+ }
+ }
+ else
+ {
+ if ( iCharging )
+ {
+ TRACES( RDebug::Print( _L("CSysApAppUi::UpdateBatteryBarsL: Stopping Charging") ) );
+ iCharging = EFalse;
+ }
+ }
+
+ if ( !iSysApPsmController ) // created here if first state change has not occurred yet
+ {
+ iSysApPsmController = CSysApPsmController::NewL( *this );
+ }
+
+ if ( iSysApPsmController )
+ {
+ if ( iSysApPsmController->FullPsmEnabled() )
+ {
+ // activate psm indicator
+ }
+ else
+ {
+ // deactivate psm indicator
+ }
+ }
+
+ if ( iSysApBatteryInfoController )
+ {
+ iSysApBatteryInfoController->BatteryLevelUpdatedL();
+ }
+
+ }
+
+
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::ShowChargingNoteL()
+// ----------------------------------------------------------------------------
+
+void CSysApAppUi::ShowChargingNoteL()
+ {
+ TRACES( RDebug::Print( _L("CSysApAppUi::ShowChargingNoteL") ) );
+ TBool showNote( ETrue );
+
+ TInt swState( StateOfProperty( KPSUidStartup, KPSGlobalSystemState ) );
+ TRACES( RDebug::Print( _L("CSysApAppUi::ShowChargingNoteL: swState: %d"), swState ) );
+
+ if( UiReady() || swState == ESwStateSecurityCheck )
+ {
+ if ( StateOfProperty( KPSUidCtsyCallInformation, KCTsyCallState ) == EPSCTsyCallStateRinging )
+ {
+ showNote = EFalse;
+ }
+ TRACES( RDebug::Print( _L("CSysApAppUi::ShowChargingNoteL KCTsyCallState=%d"), StateOfProperty( KPSUidCtsyCallInformation, KCTsyCallState ) ) );
+ if ( showNote ) // Power Mgmt UI spec defines that no Charging note is shown while the phone is ringing/alerting
+ {
+ TRACES( RDebug::Print( _L("CSysApWsClient::RunL(): Key EEventKeyUp 01") ) );
+ _LIT(KChargingNote,"txt_power_management_dblist_charging");
+ HBufC* chargingNote = HbTextResolverSymbian::LoadL(KChargingNote);
+ CHbDeviceNotificationDialogSymbian::NotificationL(KNullDesC,*chargingNote);
+
+ }
+ }
+ }
+
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::HandleUsbCharger
+// ----------------------------------------------------------------------------
+//
+void CSysApAppUi::HandleUsbCharger( const TInt aValue )
+ {
+ if ( aValue == EChargingStatusCharging ||
+ aValue == EChargingStatusChargingContinued ||
+ aValue == EChargingStatusAlmostComplete )
+ {
+ iSysApUsbChargerDetector.SetChargingUsed( ETrue );
+ if ( !iSysApUsbIndicatorController &&
+ iSysApFeatureManager->Supported( KSysApFeatureIdChargerReminderNotes ) &&
+ iSysApFeatureManager->Supported( KSysApFeatureIdUsbChargingWithoutReminderNotes ) )
+ {
+ // Start observing USB state for the reminder note
+ TRAPD ( usbErr, iSysApUsbIndicatorController = CreateSysApUsbIndicatorL( *this ) );
+ if ( usbErr )
+ {
+ TRACES( RDebug::Print(
+ _L("CSysApAppUi::HandleUsbCharger: error in constructing USB ind. controller %d" ),
+ usbErr ) );
+ }
}
}
}
// ----------------------------------------------------------------------------
-// CSysApAppUi::DoNotEnableKeylock()
+// CSysApAppUi::HandleCurrentCallStateChangeL()
// ----------------------------------------------------------------------------
-void CSysApAppUi::DoNotEnableKeylock()
+void CSysApAppUi::HandleCurrentCallStateChangeL( TInt aCurrentCallState )
{
- if ( !iKeyLockOnBeforeCradle )
+ TRACES( RDebug::Print( _L("CSysApAppUi::HandleCurrentCallStateChangeL: KUidCurrentCall: %d" ), aCurrentCallState ) );
+
+ switch ( aCurrentCallState )
{
- iShowkeypadActivatedNoteAfterSoftReject = iKeyLockOnBeforeCall;
+ case EPSCTsyCallStateRinging:
+ {
+ iSysApLightsController->CallComingInL( ETrue );
+ // Disable keylock when a call is coming in
+ if ( iKeyLockEnabled || iDeviceLockEnabled || iKeyLockOnBeforeCradle || iKeyLockOnBeforeAlarm )
+ {
+ TRACES( RDebug::Print( _L("CSysApAppUi::HandleCurrentCallStateChangeL: EPSCTsyCallStateRinging: disable keylock") ) );
+ iKeyLockOnBeforeCall = ETrue;
+
+ if ( iKeyLockEnabled || iDeviceLockEnabled )
+ {
+ if ( !iSysApFeatureManager->TouchUnlockStrokeSupported() )
+ {
+ iKeyguardController->DisableKeyguard(EFalse);
+ }
+ }
+ }
+ break;
+ }
+
+ case EPSCTsyCallStateDialling:
+ {
+ // Disable keypad lock during an emergency call
+ // no need to disable the key lock when a call is made using the wireless car-kit
+ // but if the call is an emergency one then we will disable the keypad lock
+ if ( iKeyLockEnabled || iDeviceLockEnabled || iKeyLockOnBeforeCradle )
+ {
+ TRACES( RDebug::Print( _L("CSysApAppUi::HandleCurrentCallStateChangeL: EPSCTsyCallStateDialling: disable keylock") ) );
+ iKeyLockOnBeforeCall = ETrue;
+
+ if ( IsEmergencyCall() && (iKeyLockEnabled || iDeviceLockEnabled ))
+ {
+ iKeyguardController->DisableKeyguard(EFalse);
+ }
+ }
+
+ // Enable signal & network indicators when an emergency call is made in Offline Mode
+ if( iSysApOfflineModeController->OfflineModeActive() )
+ {
+ // Signal indicators not updated with VoIP call
+ if ( StateOfProperty(KPSUidCtsyCallInformation, KCTsyCallType) != EPSCTsyCallTypeVoIP)
+ {
+ iEmergencyCallActive = ETrue;
+ // not supporting this
+ // UpdateSignalBarsL();
+ // SetSignalIndicatorL();
+ }
+ }
+ break;
+ }
+
+ case EPSCTsyCallStateConnected:
+ {
+ if (StateOfProperty(KPSUidCtsyCallInformation, KCTsyCallType) == EPSCTsyCallTypeCSVoice)
+ {
+ // Check if GPRS suspended note is required
+ iCallActivated = ETrue;
+ // not supporting this
+ // HandleGprsNotesL();
+ }
+ if ( iDeviceLockEnabled )
+ {
+ // Enable keylock via autolock emulation if device lock enabled.
+ // Otherwise e.g. messages can be read using softkeys during ongoing call.
+ iKeyguardController->EnableKeyguard(EFalse);
+ }
+ break;
+ }
+
+ case EPSCTsyCallStateNone:
+ {
+ // Reset timers in ScreenSaver and Autolock
+ User::ResetInactivityTime();
+
+ if ( iEmergencyCallActive )
+ {
+ iEmergencyCallActive = EFalse;
+ // not supporting this
+ // UpdateSignalBarsL( 0 );
+ // SetSignalIndicatorL();
+ }
+ if ( iKeyLockOnBeforeCall )
+ {
+ TRACES( RDebug::Print( _L("CSysApAppUi::HandleCurrentCallStateChangeL: EPSCTsyCallStateNone: enable keylock") ) );
+ iKeyLockOnBeforeCall = EFalse;
+ if ( !iDeviceLockEnabled )
+ {
+ if ( !iKeyLockOnBeforeCradle && !iKeyLockOnBeforeAlarm &&
+ !iSysApFeatureManager->TouchUnlockStrokeSupported() )
+ {
+ if ( iSysApCenRepController->GetInt( KCRUidCommonTelephonySettings, KSettingsSummaryAfterCall ) == 1 )
+ {
+ // Let's not hide "Summary After Call" dialog
+ iKeyguardController->EnableKeyguard(EFalse);
+ }
+ else
+ {
+ iKeyguardController->EnableKeyguard(ETrue);
+ }
+ }
+ }
+ else
+ {
+ iKeyguardController->EnableKeyguard(EFalse);
+ }
+ }
+ if ( iShowkeypadActivatedNoteAfterSoftReject )
+ {
+ ShowUiNoteL( EKeypadActiveNote );
+ iShowkeypadActivatedNoteAfterSoftReject = EFalse;
+ }
+ iCallActivated = EFalse;
+ break;
+ }
+
+ default:
+ break;
}
- iKeyLockOnBeforeCall = EFalse;
+ if ( aCurrentCallState != EPSCTsyCallStateRinging )
+ {
+ iSysApLightsController->CallComingInL( EFalse );
+ }
+
+ SetIhfIndicatorL();
+ SetHacIndicatorL();
}
+
+
+/**
+ * To check the for an emergency call.
+ *
+ * @return ETrue if there is an emergency call active otherwise, EFalse.
+ */
+TBool CSysApAppUi::IsEmergencyCall()
+ {
+ TBool retVal( EFalse );
+ TInt err( KErrNone );
+ TInt state( 0 );
+
+ err = RProperty::Get(KPSUidCtsyEmergencyCallInfo, KCTSYEmergencyCallInfo, state );
+ if ( err == KErrNone && state )
+ {
+ retVal = ETrue;
+ }
+ return retVal;
+ }
+
+
+
// ----------------------------------------------------------------------------
-// CSysApAppUi::DoShutdownL( const TBool aReset, const TSWStartupReason aSWStartupReason )
+// CSysApAppUi::IsStateNormal()
+//
// ----------------------------------------------------------------------------
-
-void CSysApAppUi::DoShutdownL( const TBool aReset, const TInt aResetReason )
+TBool CSysApAppUi::IsStateNormal() const
{
- TRACES( RDebug::Print(_L("CSysApAppUi::DoShutdownL: aResetReason:%d, aReset:%d" ),
- aResetReason, aReset ) );
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
- TBool animationenabled( EFalse );
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-
- if( OkToInitiateShutdown() )
+ TInt state;
+ TInt errorCode =
+ RProperty::Get( KPSUidStartup, KPSGlobalSystemState, state );
+ if ( errorCode == KErrNone )
{
- TRACES( RDebug::Print(_L("CSysApAppUi::DoShutdownL: Was OkToToInitiateShutdown" ) ) );
-
-
- if ( !aReset && iSysApFeatureManager->Supported(KSysApFeatureIdGoodbyeNote) )
- {
- TRAPD( ignore, ShowShutdownNoteL() );
- if ( ignore ) ignore = 0; // hide compiler warning about not using variable
- }
-
- if( !aReset )
- {
- #ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION
- TRAPD( err, ShowAnimationL() );
- if ( err )
- {
- TRACES( RDebug::Print(_L("CSysApAppUi::DoShutdownL ShowAnimationL() leaved: %d" ), err ) );
- CompleteShutdown(aReset, aResetReason);
- }
- }
- else // aReset
- {
- CompleteShutdown(aReset, aResetReason);
- }
- #else // RD_STARTUP_ANIMATION_CUSTOMIZATION
- TRAPD( err, animationenabled = ShowAnimationL() );
- if ( err )
- {
- TRACES( RDebug::Print(_L("CSysApAppUi::DoShutdownL ShowAnimationL() leaved: %d" ), err ) );
- }
- }
-
- if ( !animationenabled )
- {
- CompleteShutdown(aReset, aResetReason);
- }
- #endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
+ return state == ESwStateNormalRfOn ||
+ state == ESwStateNormalRfOff ||
+ state == ESwStateNormalBTSap;
}
else
{
- TRACES( RDebug::Print(_L("CSysApAppUi::DoShutdownL: Was not OkToToInitiateShutdown" ) ) );
+ TRACES( RDebug::Print( _L( "CSysApAppUi::IsStateNormal: Failed to read global system state, error code %d." ), errorCode ) );
+ return EFalse;
+ }
+ }
+
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::HandleAccessoryProfileInStartupL()
+// ----------------------------------------------------------------------------
+
+void CSysApAppUi::HandleAccessoryProfileInStartupL()
+ {
+ TRACES( RDebug::Print( _L( "CSysApAppUi::HandleAccessoryProfileInStartupL" ) ) );
+
+ if ( !iSysApOfflineModeController->OfflineModeActive() )
+ {
+ iIgnoreAccessorySpecificProfileChanges = EFalse;
+ TBool accessoryConnectedInShutdown( EFalse );
+ TInt accessoryTemp( iSysApCenRepController->GetInt( KCRUidCoreApplicationUIsSysAp, KSysApAccessoryConnected ) );
+ if ( accessoryTemp == 1 )
+ {
+ accessoryConnectedInShutdown = ETrue;
+ }
+
+ TBool accessoryConnectedNow ( EFalse );
+
+ TAccMode accessoryState(EAccModeHandPortable);
+ TInt physicalConnectionType = 0;
+ if ( iSysApAccessoryObserver )
+ {
+ accessoryState = iSysApAccessoryObserver->GetAccessoryMode();
+ physicalConnectionType = iSysApAccessoryObserver->GetAccessoryConnectionType();
+ }
+
+ if ( accessoryState != EAccModeHandPortable )
+ {
+ accessoryConnectedNow = ETrue;
+ }
+ TRACES( RDebug::Print( _L( "CSysApAppUi::HandleAccessoryProfileInStartupL: accessoryConnectedInShutdown: %d, accessoryConnectedNow: %d" ),
+ accessoryConnectedInShutdown, accessoryConnectedNow ) );
+
+ if ( accessoryConnectedInShutdown && !accessoryConnectedNow )
+ {
+ HandleAccessoryDisconnectedL();
+ }
+ else if ( !accessoryConnectedInShutdown && accessoryConnectedNow )
+ {
+ HandleAccessoryConnectedL( accessoryState, physicalConnectionType );
+ }
+ else if ( !accessoryConnectedNow )
+ {
+ // not supporting this
+ // TInt activeProfile ( ActiveProfileId() );
+ // SysApCenRepController->SetInt( KCRUidCoreApplicationUIsSysAp, KSysApActiveProfileBeforeAccessoryConnected, activeProfile );
+ }
+ }
+ }
+
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::CenRepController()
+// ----------------------------------------------------------------------------
+
+CSysApCenRepController& CSysApAppUi::CenRepController()
+ {
+ __ASSERT_ALWAYS( iSysApCenRepController, User::Panic( _L("CSysApAppUi::CenRepController"), KErrBadHandle ) );
+
+ return *iSysApCenRepController;
+ }
+
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::LogsObserverL
+// ----------------------------------------------------------------------------
+//
+CSysApCenRepLogsObserver& CSysApAppUi::LogsObserverL()
+ {
+ TRACES( RDebug::Print( _L("CSysApAppUi::LogsObserverL()") ) );
+
+ // Create Logs observer when it is needed for the first time
+ if ( !iSysApCenRepLogsObserver )
+ {
+ iSysApCenRepLogsObserver = CSysApCenRepLogsObserver::NewL( *this );
}
- TRACES( RDebug::Print(_L("CSysApAppUi::DoShutdownL: END" ) ) );
+
+ return *iSysApCenRepLogsObserver;
+ }
+
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::HandleWlanIndicator()
+// ----------------------------------------------------------------------------
+void CSysApAppUi::HandleWlanIndicatorL( TInt aValue )
+ {
+ if ( aValue == EPSWlanIndicatorAvailable )
+ {
+ // do nothing
+ }
+ else if ( aValue == EPSWlanIndicatorActive )
+ {
+ // do nothing
+ }
+ else if ( aValue == EPSWlanIndicatorActiveSecure )
+ {
+ // do nothing
+ }
+ else // No indication required
+ {
+ // do nothing
+ }
}
+void CSysApAppUi::ShowNotificationDialog(const TDesC& noteText)const
+{
+ //Todo:4.Notification--Just Popup message
+ //Todo: #include <HbDeviceNotificationDialogSymbian.h>
+ CHbDeviceNotificationDialogSymbian *notificationDialog = CHbDeviceNotificationDialogSymbian::NewL();
+ CleanupStack::PushL(notificationDialog);
+ notificationDialog->SetTextL(noteText);//noteText with Qm file input
+ notificationDialog->SetTimeout(100);
+ notificationDialog->ShowL();
+ CleanupStack::PopAndDestroy(notificationDialog);
+}
+
+void CSysApAppUi::SetKeyLockEnabledL()
+ {
+ iKeyLockEnabled = ETrue;
+ iSysApCenRepController->SetInt( KCRUidCoreApplicationUIsSysAp, KSysApKeyguardActive, 1 );
+ // not supporting indicator
+// SetIndicatorStateL( EAknIndicatorKeyguard, EAknIndicatorStateOn );
+ iSysApLightsController->KeylockStateChangedL( ETrue );
+ }
+
+void CSysApAppUi::SetKeyLockDisabledL()
+ {
+ iKeyLockEnabled = EFalse;
+ iSysApCenRepController->SetInt( KCRUidCoreApplicationUIsSysAp, KSysApKeyguardActive, 0 );
+ // SetIndicatorStateL( EAknIndicatorKeyguard, EAknIndicatorStateOff );
+ if (! iDeviceLockEnabled )
+ {
+ iSysApLightsController->KeylockStateChangedL( EFalse );
+ if ( iSysApFeatureManager->MmcHotSwapSupported() )
+ {
+ if ( StateOfProperty( KPSUidCtsyCallInformation, KCTsyCallState ) != EPSCTsyCallStateRinging && StateOfProperty( KPSUidCtsyCallInformation, KCTsyCallState ) != EPSCTsyCallStateAlerting )
+ {
+ RunUnlockNotifierL();
+ // need to handle MMC unlock query in next sub
+ }
+ }
+ }
+ }
+
+void CSysApAppUi::SetLightsOnUnlockNoteL()
+ {
+ iSysApLightsController->SetLightsOnUnlockNoteL();
+ }
+
+void CSysApAppUi::SetLightsOnEcsQueryL()
+ {
+ iSysApLightsController->SetLightsOnEcsQueryL();
+ }
+
+void CSysApAppUi::SetLightsOnSecurityQueryL()
+ {
+ iSysApLightsController->SetLightsOnSecurityQueryL();
+ }
+
+TBool CSysApAppUi::CheckLongPowerKeyPressed()
+ {
+ return iCheckLongPowerKeyEvent;
+ }
+
+
// ----------------------------------------------------------------------------
-// CSysApAppUi::ContinueShutdown()
+// CSysApAppUi::HandleKeyEventL(const TKeyEvent& aKeyEvent, TEventCode aType )
// ----------------------------------------------------------------------------
-void CSysApAppUi::ContinueShutdown()
+TKeyResponse CSysApAppUi::HandleKeyEventL(const TKeyEvent& aKeyEvent, TEventCode aType )
{
- TRACES( RDebug::Print(_L("CSysApAppUi::ContinueShutdown() started" ) ) );
- CompleteShutdown();
- TRACES( RDebug::Print(_L("CSysApAppUi::ContinueShutdown() completed" ) ) );
+ if ( ! iShutdownStarted )
+ {
+ TRACES( RDebug::Print( _L("CSysApAppUi::HandleKeyEventL: aKeyEvent.iCode:%d, aKeyEvent.iScanCode:%d, aType:%d, iIgnoreNextPowerKeyUpEvent:%d, iPowerKeyPopupMenuActive:%d, iLastPowerKeyWasShort:%d, iPowerKeyPopupMenuDismissed:%d"),
+ aKeyEvent.iCode, aKeyEvent.iScanCode, aType, iIgnoreNextPowerKeyUpEvent, iPowerKeyPopupMenuActive, iLastPowerKeyWasShort, iPowerKeyPopupMenuDismissed ) );
+
+#ifdef _DEBUG
+ // camery latency measurement environment instrumentation, don't remove
+ if ( aType == EEventKey && aKeyEvent.iCode == EKeyCamera )
+ {
+ TRACES( RDebug::Print( _L("e_KEY_EVENT_SENDING 0") ) );
+ }
+#endif // _DEBUG
+
+ TKeyResponse response(EKeyWasNotConsumed);
+ if (response)
+ {
+ //Do nothing:: To supress warning
+ }
+ if (iSysApKeyManagement && aKeyEvent.iCode != EKeyPowerOff && aKeyEvent.iCode != 'E')
+ {
+ response = iSysApKeyManagement->HandleKeyEventL(aKeyEvent, aType );
+ }
+
+ if( aType == EEventKey )
+ {
+ switch ( aKeyEvent.iCode )
+ {
+#ifdef _DEBUG
+ case 'E': //For testing
+ Exit();
+ break;
+#endif
+ case EKeyPowerOff:
+ //Short power key press
+ iKeyBoardRepeatCount++;
+ if( aKeyEvent.iRepeats == 0 )
+ {
+ TRACES( RDebug::Print(_L("CSysApAppUi::HandleKeyEventL, Short powerkey") ) );
+ iLastPowerKeyWasShort = ETrue;
+ TRACES( RDebug::Print( _L("CSysApAppUi::Key was consumed by pressing short power") ) );
+ //Powermenu
+ if (iPowerMenuDialog!=NULL)
+ {
+ //PowerMenu already exist
+ delete iPowerMenuDialog;
+ iPowerMenuDialog = NULL;
+ }
+ iPowerMenuDialog = CHbDevicePowerMenuSymbian::NewL(*this);
+ iPowerMenuDialog->ShowL();
+
+ iIgnoreNextPowerKeyRepeats = EFalse;
+ }
+ //Long power key press
+ else if( aKeyEvent.iRepeats > 0 && iKeyBoardRepeatCount >= iSysApCenRepController->GetInt( KCRUidCoreApplicationUIsSysAp, KSysApPowerkeyRepeatcount ))
+ {
+ iKeyBoardRepeatCount = -1;
+ TRACES( RDebug::Print(_L("CSysApAppUi::HandleKeyEventL, Long powerkey") ) );
+ iLastPowerKeyWasShort = EFalse;
+ HandleLongPowerKeyPressedL();
+ }
+ break;
+
+ default:
+ {
+ TKeyResponse response = EKeyWasNotConsumed;
+ if (iSysApKeyManagement)
+ {
+ response = iSysApKeyManagement->HandleKeyEventL(aKeyEvent, aType );
+ }
+
+ if ( response == EKeyWasNotConsumed ) // none of the plugins consumed the key, offer it to default handling
+ {
+ iSysApDefaultKeyHandler->HandleKeyEventL( aKeyEvent, aType );
+ }
+ }
+ break;
+ }
+ }
+ else if( aType == EEventKeyUp )
+ {
+ if( aKeyEvent.iScanCode == EStdKeyDevice2 )
+ {
+ if ( iIgnoreNextPowerKeyUpEvent )
+ {
+ if ( !iPowerKeyPopupMenuDismissed ) // If the popup menu has been dismissed, do nothing
+ {
+ iPowerKeyPopupMenuActive = ETrue;
+ iIgnoreNextPowerKeyUpEvent = EFalse;
+ }
+ }
+ else if( iLastPowerKeyWasShort )
+ {
+ if ( iPowerKeyPopupMenuActive )
+ {
+ }
+ }
+
+ }
+ }
+
+ TRACES( RDebug::Print( _L("CSysApAppUi::HandleKeyEventL:ended, aKeyEvent.iCode:%d, aKeyEvent.iScanCode:%d, aType:%d, iIgnoreNextPowerKeyUpEvent:%d, iPowerKeyPopupMenuActive:%d, iLastPowerKeyWasShort:%d, iPowerKeyPopupMenuDismissed:%d"),
+ aKeyEvent.iCode, aKeyEvent.iScanCode, aType, iIgnoreNextPowerKeyUpEvent, iPowerKeyPopupMenuActive, iLastPowerKeyWasShort, iPowerKeyPopupMenuDismissed ) );
+ }
+ else // shutdown started
+ {
+ TRACES( RDebug::Print( _L("CSysApAppUi::HandleKeyEventL: aKeyEvent.iCode:%d, aKeyEvent.iScanCode:%d, aType:%d"),
+ aKeyEvent.iCode, aKeyEvent.iScanCode, aType ) );
+
+ // When shutdown has been started, only device mode key events are passed to plug-in framework
+ // This for enabling plug-in activities during shutdown animation
+ if ( IsDeviceModeKey( aKeyEvent ) ) // Other key events are not passed, because they must cancel the shutdown animation as stated in UI spefication
+ {
+ if ( aType == EEventKey && iSysApKeyManagement )
+ {
+ iSysApKeyManagement->HandleKeyEventL( aKeyEvent, aType );
+ }
+ }
+ TRACES( RDebug::Print( _L("CSysApAppUi::HandleKeyEventL: ended") ) );
+ }
+ return EKeyWasConsumed;
+ }
+
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::HandleCommandL( TInt aCommand)
+// ----------------------------------------------------------------------------
+
+void CSysApAppUi::HandleCommandL( TInt aCommand )
+ {
+ TRACES( RDebug::Print( _L("CSysApAppUi::HandleCommandL aCommend: %d"), aCommand ) );
+ switch ( aCommand )
+ {
+ case EEikCmdExit: // EAknCmdExit
+ Exit();
+ break;
+ default:
+ break;
+ }
+ }
+
+TBool CSysApAppUi::ReleasePowerMenuCustomDialogMemory()
+ {
+ if (iPowerMenuDialog!=NULL)
+ {
+ //PowerMenu already exist
+ delete iPowerMenuDialog;
+ iPowerMenuDialog = NULL;
+ TRACES( RDebug::Print(_L("CSysApAppUi::ReleasePowerMenuCustomDialogMemory True") ) );
+ return ETrue;
+ }
+ TRACES( RDebug::Print(_L("CSysApAppUi::ReleasePowerMenuCustomDialogMemory false") ) );
+ return EFalse;
+ }
+
+TBool CSysApAppUi::NotifiedDialogIfRequiredAndReleaseMemory()
+ {
+ TRACES( RDebug::Print(_L("CSysApAppUi::NotifiedDialogIfRequiredAndReleaseMemory(): Begin") ) );
+ TRACES( RDebug::Print(_L("CSysApAppUi::NotifiedDialogIfRequiredAndReleaseMemory(): Enter for popping another dialog") ) );
+ TInt popUpError = iSysApDriveUnlockHandler->CheckMemoryDialogIfNeeded();
+
+ //Deside if dialog required again !!
+ if(popUpError)
+ {
+ iSysApDriveUnlockHandler->ReleaseMemoryForInputCardDialog(); // check memory has released.
+ iSysApDriveUnlockHandler->UnlockComplete(KErrNone);
+ }
+ else
+ {
+ iSysApDriveUnlockHandler->StartUnlock();// pop up the dialog again !!
+ }
+
+ TRACES( RDebug::Print(_L("CSysApAppUi::NotifiedDialogIfRequiredAndReleaseMemory(): End")) );
+ return popUpError;
+ }
+
+void CSysApAppUi::ReleaseMemoryForMemoryCardDialog()
+ {
+ TRACES( RDebug::Print(_L("CSysApAppUi::CSysApAppUi::ReleaseMemoryForMemoryCardDialog()")) );
+ iSysApDriveUnlockHandler->ReleaseMemoryForInputCardDialog();
}
// ----------------------------------------------------------------------------
@@ -4313,417 +2998,7 @@
#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
}
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
-// ----------------------------------------------------------------------------
-// CSysApAppUi::ShutdownAnimationSyncOK()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::ShutdownAnimationSyncOK()
- {
- TRACES( RDebug::Print(_L("CSysApAppUi::ShutdownAnimationSyncOK(): Call PrepareForShutdownAnimation()" ) ) );
- PrepareForShutdownAnimation();//SysAp's internal preparation for ShutDown with animation
- TRACES( RDebug::Print(_L("CSysApAppUi::ShutdownAnimationSyncOK(): Called PrepareForShutdownAnimation()" ) ) );
- }
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::SkipShutdownAnimation()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::SkipShutdownAnimation()
- {
- TRACES( RDebug::Print(_L("CSysApAppUi::SkipShutdownAnimation() " ) ) );
-
-#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION
- if ( iSysApShutdownAnimation )
- {
- iSysApShutdownAnimation->Cancel();
- }
-#else // RD_STARTUP_ANIMATION_CUSTOMIZATION
- if ( iAnimationShowingTime )
- {
- iSysApShutdownAnimation->EndAnimation();
- }
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::NotifyShutdownAnimationSkip()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::NotifyShutdownAnimationSkip()
- {
- TRACES( RDebug::Print(_L("CSysApAppUi::NotifyShutdownAnimationSkip() " ) ) );
-
- if ( iSysApMediatorObserver )
- {
- iSysApMediatorObserver->ShutdownAnimationSkipped();
- }
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::CompleteShutdown()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::CompleteShutdown( const TBool aReset, const TInt aResetReason )
- {
- TRACES( RDebug::Print(_L("CSysApAppUi::CompleteShutdown(): START" ) ) );
-
- PrepareForShutdownImage();//SysAp's internal preparation for ShutDown with image
-
- FreeResources();
-
- if ( aReset )
- {
- __ASSERT_DEBUG( aResetReason >= RStarterSession::ELanguageSwitchReset &&
- aResetReason <= RStarterSession::EDataRestoreReset,
- User::Invariant() );
- StarterSession().Reset( static_cast<RStarterSession::TResetReason>( aResetReason ) );
- }
- else
- {
- StarterSession().Shutdown();
- }
-
- StarterSession().Close();
-
- TRACES( RDebug::Print(_L("CSysApAppUi::CompleteShutdown(): END" ) ) );
- }
-
-#ifndef SYSAP_USE_STARTUP_UI_PHASE
-// ----------------------------------------------------------------------------
-// CSysApAppUi::DoStateChangedL(const RStarterSession::TGlobalState aSwState)
-// This method is not called after boot has finished.
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::DoStateChangedL(const RStarterSession::TGlobalState aSwState)
- {
- TRACES( RDebug::Print(_L("CSysApAppUi::DoStateChangedL: %d" ), aSwState ) );
-
- switch ( aSwState )
- {
- case RStarterSession::ENormal:
- SetStatusPaneLayoutL( ESysApNormal );
- break;
- case RStarterSession::ECharging:
- SetStatusPaneLayoutL( ESysApCharging );
- break;
- case RStarterSession::EAlarm:
- SetStatusPaneLayoutL( ESysApAlarm );
- break;
- default:
- break;
- };
-
- TRAPD( simChangedErr, DoSimChangedFromPreviousBootL() );
- TRACES( RDebug::Print( _L("CSysApAppUi::DoStateChangedL: simChangedErr = %d" ), simChangedErr ) );
- simChangedErr = simChangedErr; // suppress 'variable not used' warning
- LogsObserverL().HandleSimChangedCheckDoneL();
-
- if ( iSysApFeatureManager->PowerSaveSupported() )
- {
- // create controller before checking battery state, so that power saving can be enabled during boot if needed
- if ( !iSysApPsmController ) // created only in first state change
- {
- iSysApPsmController = CSysApPsmController::NewL( *this );
- }
-
- // in charger boot explicitly disable partial power save mode
- if ( aSwState == RStarterSession::ECharging && !iCharging )
- {
- iSysApPsmController->ChargerConnected();
- iSysApPsmController->DoEnablePartialPsm( EFalse ); // disable partial power save now
- }
- }
-
- TInt state( StateOfProperty( KPSUidHWRMPowerState, KHWRMBatteryLevel ) );
- //Also Charging status will be updated with the following function.
- UpdateBatteryBarsL( state );
-
- if( IsStateNormal() )
- {
- TRACES( RDebug::Print(_L("CSysApAppUi::DoStateChangedL to normal state.") ) );
-
- DoSwStateNormalConstructionL();
-
- InitializeStatusPaneAreaL();
- CheckSilentModeL();
- HandleAccessoryProfileInStartupL();
-
- if ( iSysApFeatureManager->MmcSupported() )
- {
-#ifndef RD_MULTIPLE_DRIVE
- MountMMC();
- MMCStatusChangedL();
- iHideFirstBeep = EFalse;
-#else // RD_MULTIPLE_DRIVE
- iSysApDriveList->MountDrive( iSysApDriveList->DefaultMemoryCard() );
- UpdateInsertedMemoryCardsL();
-#endif // RD_MULTIPLE_DRIVE
- }
- if ( iSysApFeatureManager->MmcHotSwapSupported() )
- {
- iSysApMMCObserver->StartMountObserver();
- }
-
-
- if ( iSysApPsmController )
- {
- if ( iCharging ) // if charger is connected on boot PSM queries may need to be shown
- {
- HandleChargingStatusL( StateOfProperty( KPSUidHWRMPowerState, KHWRMChargingStatus ) );
- }
- }
-
- TInt batteryStatus = StateOfProperty( KPSUidHWRMPowerState, KHWRMBatteryStatus );
- TRACES( RDebug::Print(_L("CSysApAppUi::DoStateChangedL: batteryStatus %d" ), batteryStatus ) );
- if( batteryStatus == EBatteryStatusLow || batteryStatus == EBatteryStatusEmpty )
- {
- // low and empty battery states are informed to the user in device startup
- HandleBatteryStatusL( batteryStatus );
- }
- else if ( iSysApPsmController && !iCharging )
- {
- TRACES( RDebug::Print(_L("CSysApAppUi::DoStateChangedL: batteryStatus %d, iCharging %d -> disable partial psm" ), batteryStatus, iCharging ) );
-
- iSysApPsmController->BatteryLow( EFalse );
- iSysApPsmController->DoEnablePartialPsm( EFalse );
- }
-
- iSysApBtController = CreateSysApBtControllerL( *this );
- iSysApBtSapController = CreateSysApBtSapControllerL( *this );
-
- if ( iActivateBt )
- {
- TRACES( RDebug::Print(_L("CSysApAppUi::DoStateChangedL Activating BT" ) ) );
- SetBtPowerState( ETrue );
- }
-
- if ( iDeactivateBt )
- {
- TRACES( RDebug::Print(_L("CSysApAppUi::DoStateChangedL Deactivating BT" ) ) );
- SetBtPowerState( EFalse );
- }
- iSysApLocationPrivacyIndicator = CreateSysApLocationPrivacyIndicatorL( *this );
- iSysApLocationPrivacyIndicator->InitL();
-
- if ( ! iSysApUsbIndicatorController )
- {
- TRAPD ( usbErr, iSysApUsbIndicatorController = CreateSysApUsbIndicatorL( *this ) );
- if ( usbErr )
- {
- TRACES( RDebug::Print(_L("CSysApAppUi::DoStateChangedL: error in constructing USB ind. controller %d" ), usbErr ) );
- }
- }
-
- // Other late initializations.
- // In order to prevent unexpected behaviour e.g. in OOM situations, these calls are made to ensure
- // that the services are connected when they are needed for the first time.
- if ( !StarterSession().Handle() )
- {
- User::Leave( KErrBadHandle );
- }
-
- if ( !KeyLock().Handle() )
- {
- User::Leave( KErrBadHandle );
- }
-
-#ifdef __SYSAP_MODULE_TEST
- ModuleTestShowUiNoteL( _L("SysAp: SW state normal!") );
-#endif
- }
-
- // Allow lights
- iSysApLightsController->AllowLightsOn();
- }
-
-#else // SYSAP_USE_STARTUP_UI_PHASE
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::HandleUiReadyAfterBootL()
-// Called when startup UI activities has been finished
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::HandleUiReadyAfterBootL()
- {
- TRACES( RDebug::Print(_L("CSysApAppUi::HandleUiReadyAfterBootL" ) ) );
-
- SetStatusPaneLayoutL( ESysApNormal );
-
- TInt state( StateOfProperty( KPSUidHWRMPowerState, KHWRMBatteryLevel ) );
- //Also Charging status will be updated with the following function.
- UpdateBatteryBarsL( state );
-
- DoSwStateNormalConstructionL();
-
- InitializeStatusPaneAreaL();
- CheckSilentModeL();
- HandleAccessoryProfileInStartupL();
-
- if ( iSysApFeatureManager->MmcSupported() )
- {
-#ifndef RD_MULTIPLE_DRIVE
- MountMMC();
- MMCStatusChangedL();
- iHideFirstBeep = EFalse;
-#else // RD_MULTIPLE_DRIVE
- iSysApDriveList->MountDrive( iSysApDriveList->DefaultMemoryCard() );
- UpdateInsertedMemoryCardsL();
-#endif // RD_MULTIPLE_DRIVE
- }
-
- if ( iSysApFeatureManager->MmcHotSwapSupported() )
- {
- iSysApMMCObserver->StartMountObserver();
- }
-
- if ( iSysApPsmController )
- {
- if ( iCharging ) // if charger is connected on boot PSM queries may need to be shown
- {
- HandleChargingStatusL( StateOfProperty( KPSUidHWRMPowerState, KHWRMChargingStatus ) );
- }
- }
-
- TInt batteryStatus = StateOfProperty( KPSUidHWRMPowerState, KHWRMBatteryStatus );
- TRACES( RDebug::Print(_L("CSysApAppUi::HandleUiReadyAfterBootL: batteryStatus %d" ), batteryStatus ) );
- if( batteryStatus == EBatteryStatusLow || batteryStatus == EBatteryStatusEmpty )
- {
- // low and empty battery states are informed to the user in device startup
- HandleBatteryStatusL( batteryStatus );
- }
- else if ( iSysApPsmController && !iCharging )
- {
- TRACES( RDebug::Print(_L("CSysApAppUi::HandleUiReadyAfterBootL: batteryStatus %d, iCharging %d -> disable partial psm" ), batteryStatus, iCharging ) );
-
- iSysApPsmController->BatteryLow( EFalse );
- iSysApPsmController->DoEnablePartialPsm( EFalse );
- }
-
- iSysApLocationPrivacyIndicator = CreateSysApLocationPrivacyIndicatorL( *this );
- iSysApLocationPrivacyIndicator->InitL();
-
- if ( ! iSysApUsbIndicatorController )
- {
- TRAPD ( usbErr, iSysApUsbIndicatorController = CreateSysApUsbIndicatorL( *this ) );
- if ( usbErr )
- {
- TRACES( RDebug::Print(_L("CSysApAppUi::HandleUiReadyAfterBootL: error in constructing USB ind. controller %d" ), usbErr ) );
- }
- }
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::DoStateChangedL(const RStarterSession::TGlobalState aSwState)
-// This method is not called after boot has finished.
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::DoStateChangedL(const RStarterSession::TGlobalState aSwState)
- {
- TRACES( RDebug::Print(_L("CSysApAppUi::DoStateChangedL: %d" ), aSwState ) );
-
- switch ( aSwState )
- {
- case RStarterSession::ENormal:
- // status pane layout will updated when UI is ready
- break;
- case RStarterSession::ECharging:
- SetStatusPaneLayoutL( ESysApCharging );
- break;
- case RStarterSession::EAlarm:
- SetStatusPaneLayoutL( ESysApAlarm );
- break;
- default:
- break;
- };
-
- TRAPD( simChangedErr, DoSimChangedFromPreviousBootL() );
- TRACES( RDebug::Print( _L("CSysApAppUi::DoStateChangedL: simChangedErr = %d" ), simChangedErr ) );
- simChangedErr = simChangedErr; // suppress 'variable not used' warning
- LogsObserverL().HandleSimChangedCheckDoneL();
-
- if ( iSysApFeatureManager->PowerSaveSupported() )
- {
- // create controller before checking battery state, so that power saving can be enabled during boot if needed
- if ( !iSysApPsmController ) // created only in first state change
- {
- iSysApPsmController = CSysApPsmController::NewL( *this );
- }
-
- // in charger boot explicitly disable partial power save mode
- if ( aSwState == RStarterSession::ECharging )
- {
- iSysApPsmController->ChargerConnected();
- iSysApPsmController->DoEnablePartialPsm( EFalse ); // disable partial power save now
- }
- }
-
- if ( aSwState == RStarterSession::ECharging || aSwState == RStarterSession::EAlarm )
- {
- TInt state( StateOfProperty( KPSUidHWRMPowerState, KHWRMBatteryLevel ) );
- //Also Charging status will be updated with the following function.
- UpdateBatteryBarsL( state );
- }
-
- if( IsStateNormal() )
- {
- TRACES( RDebug::Print(_L("CSysApAppUi::DoStateChangedL to normal state.") ) );
-
- iSysApBtController = CreateSysApBtControllerL( *this );
- iSysApBtSapController = CreateSysApBtSapControllerL( *this );
-
- if ( iActivateBt )
- {
- TRACES( RDebug::Print(_L("CSysApAppUi::DoStateChangedL Activating BT" ) ) );
- SetBtPowerState( ETrue );
- }
-
- if ( iDeactivateBt )
- {
- TRACES( RDebug::Print(_L("CSysApAppUi::DoStateChangedL Deactivating BT" ) ) );
- SetBtPowerState( EFalse );
- }
-
- // Other late initializations.
- // In order to prevent unexpected behaviour e.g. in OOM situations, these calls are made to ensure
- // that the services are connected when they are needed for the first time.
- if ( !StarterSession().Handle() )
- {
- User::Leave( KErrBadHandle );
- }
-
- if ( !KeyLock().Handle() )
- {
- User::Leave( KErrBadHandle );
- }
-
-#ifdef __SYSAP_MODULE_TEST
- ModuleTestShowUiNoteL( _L("SysAp: SW state normal!") );
-#endif
- }
-
- // Allow lights
- iSysApLightsController->AllowLightsOn();
- }
-
-
-#endif // SYSAP_USE_STARTUP_UI_PHASE
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::UiReady()
-//
-// ----------------------------------------------------------------------------
-
-TBool CSysApAppUi::UiReady() const
- {
-#ifdef SYSAP_USE_STARTUP_UI_PHASE
- return iSysApStartupController->UiReady();
-#else // SYSAP_USE_STARTUP_UI_PHASE
- // if startup UI phase information is not used, global system state normal is handled as UI idle state
- return IsStateNormal();
-#endif // SYSAP_USE_STARTUP_UI_PHASE
- }
+
// ----------------------------------------------------------------------------
// CSysApAppUi::PrepareForShutdownAnimation()
@@ -4737,17 +3012,14 @@
if ( iAnimationShowingTime )
{
#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
- static_cast<CAknAppUi*>(iEikonEnv->EikAppUi())->KeySounds()->PlaySound( EAvkonSIDPowerOffTone );
- CancelGlobalListQuery();
-
- if ( iSysApPowerKeyMenuObserver )
+
+ if (iPowerMenuDialog!=NULL)
{
- iSysApPowerKeyMenuObserver->Cancel();
- }
-
- // deactivate notifiers before showing the shutdown image
- AknNotifierController::CancelAllNotifications();
- AknNotifierController::HideAllNotifications(ETrue);
+ //PowerMenu already exist
+ delete iPowerMenuDialog;
+ iPowerMenuDialog = NULL;
+ }
+
RWindowGroup groupWin = iCoeEnv->RootWin();
iCapturedAppskey = groupWin.CaptureKey( EKeyApplication, KModifierMask, KModifierMask );
iCapturedAppskeyUpAndDowns = groupWin.CaptureKeyUpAndDowns( EStdKeyApplication0, KModifierMask, KModifierMask );
@@ -4776,370 +3048,163 @@
// ----------------------------------------------------------------------------
-// CSysApAppUi::PrepareForShutdownImage()
+// CSysApAppUi::DoStopAnimTiming( TAny* aObject )
// ----------------------------------------------------------------------------
-void CSysApAppUi::PrepareForShutdownImage()
+TInt CSysApAppUi::DoStopAnimTiming( TAny* aObject )
{
- TRACES( RDebug::Print( _L("CSysApAppUi::PrepareForShutdownImage() START" ) ) );
-
- // If RD_STARTUP_ANIMATION_CUSTOMIZATION is enabled, the following actions are always taken in PrepareForShutdownAnimation
+ TInt err(KErrNone);
+ CSysApAppUi* appUi = STATIC_CAST( CSysApAppUi*, aObject );
+
+ // This method could theoretically be called by two timers (iAnimTimer and one in CSysApShutdownAnimation),
+ // so a check is needed to prevent multiple executions.
+ if ( !(appUi->iShutdownContinued) )
+ {
+ appUi->iShutdownContinued = ETrue;
+
+ TRACES( RDebug::Print( _L("CSysApAppUi::DoStopAnimTiming() Animation timer completed or animation skipped" ) ) );
+
#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
- if ( !iAnimationShowingTime ) // actions already taken in PrepareForShutdownAnimation
- {
- static_cast<CAknAppUi*>(iEikonEnv->EikAppUi())->KeySounds()->PlaySound( EAvkonSIDPowerOffTone );
- CancelGlobalListQuery();
-
- if ( iSysApPowerKeyMenuObserver )
+ if ( appUi->iAnimTimer )
{
- iSysApPowerKeyMenuObserver->Cancel();
+ appUi->iAnimTimer->Cancel();
}
-
- // deactivate notifiers before showing the shutdown image
- AknNotifierController::CancelAllNotifications();
- AknNotifierController::HideAllNotifications(ETrue);
- RWindowGroup groupWin = iCoeEnv->RootWin();
- iCapturedAppskey = groupWin.CaptureKey( EKeyApplication, KModifierMask, KModifierMask );
- iCapturedAppskeyUpAndDowns = groupWin.CaptureKeyUpAndDowns( EStdKeyApplication0, KModifierMask, KModifierMask );
+#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
+
+ TRACES( RDebug::Print( _L("CSysApAppUi::DoStopAnimTiming() Call ContinueShutdown(...)" ) ) );
+ appUi->ContinueShutdown();
+ TRACES( RDebug::Print( _L("CSysApAppUi::DoStopAnimTiming() end") ) );
}
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-
-#ifndef __SYSAP_MODULE_TEST //to make errors during shutdown sequence being seen more easily
- iEikonEnv->RootWin().SetOrdinalPosition(0, ECoeWinPriorityAlwaysAtFront );
- TRACES( RDebug::Print( _L("CSysApAppUi::PrepareForShutdownImage() Show Shutdown image" ) ) );
- ShowShutdownImage( EMbmSysapQgn_startup_screen );
-#endif
- TRACES( RDebug::Print( _L("CSysApAppUi::PrepareForShutdownImage() END" ) ) );
+
+ return err;
}
+
// ----------------------------------------------------------------------------
-// CSysApAppUi::SetStatusPaneLauoutL( const TSysApPhoneState aState )
+// CSysApAppUi::ContinueShutdown()
// ----------------------------------------------------------------------------
-void CSysApAppUi::SetStatusPaneLayoutL( const TSysApPhoneState aState )
+void CSysApAppUi::ContinueShutdown()
{
- TRACES( RDebug::Print( _L("CSysApAppUi::SetStatusPaneLayoutL aState: %d"), aState ) );
- if( aState == ESysApNormal )
- //Status pane cannot be even visible on Normal mode
- {
- StatusPane()->MakeVisible( EFalse );
- StatusPane()->SwitchLayoutL( R_AVKON_STATUS_PANE_LAYOUT_EMPTY );
- }
- else if( aState == ESysApCharging )
- //SysAp's statuspane is visible on Charging mode
- {
- StatusPane()->MakeVisible( ETrue );
- StatusPane()->SwitchLayoutL( R_AVKON_STATUS_PANE_LAYOUT_POWER_OFF_RECHARGE );
- }
- else if( aState == ESysApAlarm )
- {
- if ( !Layout_Meta_Data::IsLandscapeOrientation() )
- {
- // Portrait mode
- StatusPane()->MakeVisible( ETrue );
- StatusPane()->SwitchLayoutL( R_AVKON_STATUS_PANE_LAYOUT_POWER_OFF_RECHARGE );
- }
- else
- {
- // Landscape mode
- TInt layout = R_AVKON_STATUS_PANE_LAYOUT_POWER_OFF_RECHARGE;
- // For side softkey devices, use different layout
- if (AVKONENV->StatusPaneResIdForCurrentLayout(R_AVKON_STATUS_PANE_LAYOUT_USUAL) == R_AVKON_STACON_PANE_LAYOUT_USUAL_SOFTKEYS_RIGHT)
- layout = R_AVKON_STACON_PANE_LAYOUT_EMPTY_SOFTKEYS_RIGHT;
- else if (AVKONENV->StatusPaneResIdForCurrentLayout(R_AVKON_STATUS_PANE_LAYOUT_USUAL) == R_AVKON_STACON_PANE_LAYOUT_USUAL_SOFTKEYS_LEFT)
- layout = R_AVKON_STACON_PANE_LAYOUT_EMPTY_SOFTKEYS_LEFT;
-
- StatusPane()->MakeVisible( ETrue );
- StatusPane()->SwitchLayoutL( layout );
- }
- }
+ TRACES( RDebug::Print(_L("CSysApAppUi::ContinueShutdown() started" ) ) );
+ CompleteShutdown();
+ TRACES( RDebug::Print(_L("CSysApAppUi::ContinueShutdown() completed" ) ) );
}
+CEikStatusPane* CSysApAppUi::StatusPane()
+{
+return iEikonEnv->AppUiFactory()->StatusPane();
+}
+
+
+#ifndef RD_MULTIPLE_DRIVE
+
// ----------------------------------------------------------------------------
-// CSysApAppUi::OkToInitiateShutdown()
+// CSysApAppUi::EjectUsed
// ----------------------------------------------------------------------------
-TBool CSysApAppUi::OkToInitiateShutdown()
+void CSysApAppUi::EjectUsed( TInt /*aDrive*/ )
+ {
+ }
+
+#else // RD_MULTIPLE_DRIVE
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::ShowEjectWaitNoteL
+// ----------------------------------------------------------------------------
+
+void CSysApAppUi::ShowEjectWaitNoteL( TInt /* aDriveToEject */ )
{
- TInt swState;
- RProperty::Get( KPSUidStartup, KPSGlobalSystemState, swState );
-
- if( !iShutdownStarted &&
- swState == ESwStateStartingCriticalApps ||
- swState == ESwStateSelfTestOK ||
- swState == ESwStateSecurityCheck ||
- swState == ESwStateCriticalPhaseOK ||
- swState == ESwStateEmergencyCallsOnly ||
- swState == ESwStateCharging ||
- swState == ESwStateAlarm ||
- swState == ESwStateNormalRfOn ||
- swState == ESwStateNormalRfOff ||
- swState == ESwStateNormalBTSap ||
- swState == ESwStateFatalStartupError )
+ /* if ( iSysApWaitNote )
{
- iShutdownStarted = ETrue;
- return ETrue;
+ return;
}
- else
+ HBufC* text = iSysApDriveList->GetFormattedDriveNameLC(
+ aDriveToEject,
+ 0, // Not used
+ R_QTN_EJECTING_MEMORY_NAME_WAIT );
+ iSysApWaitNote = CSysApWaitNote::NewL(
+ iSysApFeatureManager->CoverDisplaySupported() );
+ iSysApWaitNote->ShowNoteL( EClosingApplicationsNote, text );
+ CleanupStack::PopAndDestroy( text );
+ */ }
+
+// ----------------------------------------------------------------------------
+// CSysApAppUi::IsEjectQueryVisible
+// ----------------------------------------------------------------------------
+
+TBool CSysApAppUi::IsEjectQueryVisible()
+ {
+// if ( !iSysApConfirmationQuery )
{
return EFalse;
}
+// TInt queryId( iSysApConfirmationQuery->CurrentQuery() );
+// return ( queryId == ESysApEjectMmcQuery || queryId == ESysApRemoveMmcNote );
}
-/**
- * To check the for an emergency call.
- *
- * @return ETrue if there is an emergency call active otherwise, EFalse.
- */
-TBool IsEmergencyCall()
- {
- TBool retVal( EFalse );
- TInt err( KErrNone );
- TInt state( 0 );
-
- err = RProperty::Get(KPSUidCtsyEmergencyCallInfo, KCTSYEmergencyCallInfo, state );
- if ( err == KErrNone && state )
- {
- retVal = ETrue;
- }
- return retVal;
- }
-
// ----------------------------------------------------------------------------
-// CSysApAppUi::HandleCurrentCallStateChangeL()
+// CSysApAppUi::UpdateInsertedMemoryCardsL
// ----------------------------------------------------------------------------
-void CSysApAppUi::HandleCurrentCallStateChangeL( TInt aCurrentCallState )
+void CSysApAppUi::UpdateInsertedMemoryCardsL()
{
- TRACES( RDebug::Print( _L("CSysApAppUi::HandleCurrentCallStateChangeL: KUidCurrentCall: %d" ), aCurrentCallState ) );
-
- if( iPowerKeyPopupMenuActive )
- {
- CancelGlobalListQuery();
- }
-
- switch ( aCurrentCallState )
- {
- case EPSCTsyCallStateRinging:
- {
- iSysApLightsController->CallComingInL( ETrue );
- // Disable keylock when a call is coming in
- if ( iKeyLockEnabled || iDeviceLockEnabled || iKeyLockOnBeforeCradle || iKeyLockOnBeforeAlarm )
- {
- TRACES( RDebug::Print( _L("CSysApAppUi::HandleCurrentCallStateChangeL: EPSCTsyCallStateRinging: disable keylock") ) );
- iKeyLockOnBeforeCall = ETrue;
-
- if ( iKeyLockEnabled || iDeviceLockEnabled )
- {
- if ( !iSysApFeatureManager->TouchUnlockStrokeSupported() )
- {
- KeyLock().DisableWithoutNote();
- }
- }
- }
- break;
- }
-
- case EPSCTsyCallStateDialling:
- {
- // Disable keypad lock during an emergency call
- // no need to disable the key lock when a call is made using the wireless car-kit
- // but if the call is an emergency one then we will disable the keypad lock
- if ( iKeyLockEnabled || iDeviceLockEnabled || iKeyLockOnBeforeCradle )
- {
- TRACES( RDebug::Print( _L("CSysApAppUi::HandleCurrentCallStateChangeL: EPSCTsyCallStateDialling: disable keylock") ) );
- iKeyLockOnBeforeCall = ETrue;
-
- if ( IsEmergencyCall() && (iKeyLockEnabled || iDeviceLockEnabled ))
- {
- KeyLock().DisableWithoutNote();
- }
- }
-
- // Enable signal & network indicators when an emergency call is made in Offline Mode
- if( iSysApOfflineModeController->OfflineModeActive() )
- {
- // Signal indicators not updated with VoIP call
- if ( StateOfProperty(KPSUidCtsyCallInformation, KCTsyCallType) != EPSCTsyCallTypeVoIP)
- {
- iEmergencyCallActive = ETrue;
- UpdateSignalBarsL();
- SetSignalIndicatorL();
- }
- }
- break;
- }
-
- case EPSCTsyCallStateConnected:
- {
- if (StateOfProperty(KPSUidCtsyCallInformation, KCTsyCallType) == EPSCTsyCallTypeCSVoice)
- {
- // Check if GPRS suspended note is required
- iCallActivated = ETrue;
- HandleGprsNotesL();
- }
- if ( iDeviceLockEnabled )
- {
- // Enable keylock via autolock emulation if device lock enabled.
- // Otherwise e.g. messages can be read using softkeys during ongoing call.
- KeyLock().EnableAutoLockEmulation();
- }
- break;
- }
-
- case EPSCTsyCallStateNone:
- {
- // reset timers in ScreenSaver and Autolock
- User::ResetInactivityTime();
-
- if ( iEmergencyCallActive )
- {
- iEmergencyCallActive = EFalse;
- UpdateSignalBarsL( 0 );
- SetSignalIndicatorL();
- }
- if ( iKeyLockOnBeforeCall )
- {
- TRACES( RDebug::Print( _L("CSysApAppUi::HandleCurrentCallStateChangeL: EPSCTsyCallStateNone: enable keylock") ) );
- iKeyLockOnBeforeCall = EFalse;
- if ( !iDeviceLockEnabled )
- {
- if ( !iKeyLockOnBeforeCradle && !iKeyLockOnBeforeAlarm &&
- !iSysApFeatureManager->TouchUnlockStrokeSupported() )
- {
- if ( iSysApCenRepController->GetInt( KCRUidCommonTelephonySettings, KSettingsSummaryAfterCall ) == 1 )
- {
- KeyLock().EnableWithoutNote(); // Let's not hide "Summary After Call" dialog
- }
- else
- {
- KeyLock().EnableKeyLock();
- }
- }
- }
- else
- {
- KeyLock().EnableAutoLockEmulation();
- }
- }
- if ( iShowkeypadActivatedNoteAfterSoftReject )
- {
- ShowUiNoteL( EKeypadActiveNote );
- iShowkeypadActivatedNoteAfterSoftReject = EFalse;
- }
- iCallActivated = EFalse;
- break;
- }
-
- default:
- break;
- }
-
- if ( aCurrentCallState != EPSCTsyCallStateRinging )
- {
- iSysApLightsController->CallComingInL( EFalse );
- }
-
- SetIhfIndicatorL();
- SetHacIndicatorL();
+ // Update inserted memory cards
+ iSysApDriveList->GetMemoryCardsL(
+ iInsertedMemoryCards, CSysApDriveList::EIncludeInserted );
+
+ // Update memory card indicator status
+// SetMemoryCardIndicatorL();
+
+ // Handle unlock
+ RunUnlockNotifierL();
}
// ----------------------------------------------------------------------------
-// CSysApAppUi::DoSwStateNormalConstructionL()
+// CSysApAppUi::EjectUsed
// ----------------------------------------------------------------------------
-void CSysApAppUi::DoSwStateNormalConstructionL()
+void CSysApAppUi::EjectUsed( TInt aDrive )
{
- // Let's ensure that the lights will remain on for 15 secs after sw state normal
- User::ResetInactivityTime();
-
- TRACES( RDebug::Print( _L("CSysApAppUi::DoSwStateNormalConstructionL : START" ) ) );
-
- // In case of unexpected reset (e.g. hidden boot) the keylock must be enabled silently. Locking is done
- // prior to time-consuming initializations, because otherwise UI is in unlocked state for a few seconds.
- if ( iSysApCenRepController->GetInt( KCRUidCoreApplicationUIsSysAp, KSysApKeyguardActive ) == 1 )
+ // Check drive inserted before starting eject confirm query
+ TInt insertedIndex( CSysApDriveList::Find( iInsertedMemoryCards, aDrive ) );
+
+ TRACES( RDebug::Print(
+ _L( "CSysApAppUi::EjectUsed: drive: %d, index: %d" ),
+ aDrive, insertedIndex ) );
+
+ if ( insertedIndex == KErrNotFound )
{
- TRACES( RDebug::Print( _L("CSysApAppUi::DoSwStateNormalConstructionL: enabling keylock") ) );
- KeyLock().EnableWithoutNote();
+ return;
}
- // Initiate bearer change observation
- iSysApConnectionMonitorObserver = CSysApConnectionMonitorObserver::NewL( *this );
-
- TRACES( RDebug::Print( _L("CSysApAppUi::DoSwStateNormalConstructionL: trying CSysApSsSettingsObserver::NewL()") ) );
- iSysApSsSettingsObserver = CSysApSsSettingsObserver::NewL( *this );
-
- TRACES( RDebug::Print( _L("CSysApAppUi::DoSwStateNormalConstructionL: trying new ( ELeave ) CSysApPowerKeyMenuObserver") ) );
- iSysApPowerKeyMenuObserver = new( ELeave ) CSysApPowerKeyMenuObserver( *this );
-
- TRACES( RDebug::Print( _L("SysAp: trying CSystemLock::NewL" ) ) );
- iSysApSystemLock = CSystemLock::NewL();
-
- iSysApCenRepCallForwardingObserver = CSysApCenRepCallForwardingObserver::NewL( *this );
-
- iSysApCenRepMsgWaitingObserver = CSysApCenRepMsgWaitingObserver::NewL( *this );
-
-
- if ( iSysApFeatureManager->Supported( KSysApFeatureIdBatteryInfoPopup ) )
+ iMMCEjectUsed = ETrue;
+ iDriveToEject = aDrive;
+ iSysApDriveList->ResetDrivesToEject();
+ TRAPD( err, EjectMMCL() );
+ if ( err != KErrNone )
{
- if( iSysApBatteryInfoController == NULL)
- {
- iSysApBatteryInfoController = CSysApBatteryInfoController::NewL( iSysApCenRepController->GetInt( KCRUidCoreApplicationUIsConf,
- KCoreAppUIsBatteryInformationLowThreshold ) );
- }
+ TRACES( RDebug::Print(
+ _L( "CSysApAppUi::EjectUsed: err: %d" ), err ) );
+ iMMCEjectUsed = EFalse;
}
-
-
- TRACES( RDebug::Print( _L("CSysApAppUi::DoSwStateNormalConstructionL : END" ) ) );
}
+#endif // RD_MULTIPLE_DRIVE
+
// ----------------------------------------------------------------------------
-// CSysApAppUi::DoSimChangedFromPreviousBootL()
+// CSysApAppUi::EjectMMCCanceled
// ----------------------------------------------------------------------------
-void CSysApAppUi::DoSimChangedFromPreviousBootL()
- {
- TRACES( RDebug::Print( _L("CSysApAppUi::DoSimChangedFromPreviousBootL: iSimChangedDone=%d" ), iSimChangedDone ) );
-
- if ( !iSimChangedDone )
- {
- iSimChangedDone = ETrue;
- CSysApSimChanged* simChanged = CSysApSimChanged::NewL( *this, iEikonEnv->FsSession() );
- CleanupStack::PushL( simChanged );
- simChanged->HandleSimChangedL();
- CleanupStack::PopAndDestroy( simChanged );
- }
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::CancelWaitNote()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::CancelWaitNote()
+void CSysApAppUi::EjectMMCCanceled()
{
- TRACES( RDebug::Print( _L("CSysApAppUi::CancelWaitNote" ) ) );
- if ( iSysApWaitNote )
- {
- iSysApWaitNote->Cancel();
- delete iSysApWaitNote;
- iSysApWaitNote = NULL;
- }
+ // Called from eject confirm query, reset eject status
+#ifdef RD_MULTIPLE_DRIVE
+ iMMCEjectUsed = EFalse;
+#endif // RD_MULTIPLE_DRIVE
}
-// ----------------------------------------------------------------------------
-// CSysApAppUi::CancelGlobalListQuery()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::CancelGlobalListQuery()
- {
- TRACES( RDebug::Print( _L("CSysApAppUi::CancelGlobalListQuery" ) ) );
- if ( iGlobalListQuery )
- {
- iGlobalListQuery->CancelListQuery();
- delete iGlobalListQuery;
- iGlobalListQuery = NULL;
- }
- }
+
#ifndef RD_MULTIPLE_DRIVE
// ----------------------------------------------------------------------------
@@ -5228,16 +3293,6 @@
#endif // RD_MULTIPLE_DRIVE
-// ----------------------------------------------------------------------------
-// CSysApAppUi::DisconnectBtSap()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::DisconnectBtSap()
- {
- TRACES( RDebug::Print( _L("CSysApAppUi::DisconnectBtSap") ) );
- iSysApBtSapController->Disconnect();
- }
-
#ifndef RD_MULTIPLE_DRIVE
// ----------------------------------------------------------------------------
// CSysApAppUi::RunUnlockNotifierL()
@@ -5492,70 +3547,70 @@
TRACES( RDebug::Print( _L( "CSysApAppUi::MMCInsertedL") ) );
if ( iSysApFeatureManager->MmcSupported() && !iShutdownStarted )
- {
- TBool normalState( UiReady() );
-
- if ( normalState )
- {
- TInt defaultMemoryCard( iSysApDriveList->DefaultMemoryCard() );
- TSysApMemoryCardStatus memoryCardStatus( iSysApDriveList->MemoryCardStatus( defaultMemoryCard ) );
-
- TRACES( RDebug::Print(
- _L( "CSysApAppUi::MMCInsertedL: drive: %d, memoryCardStatus: %d" ), defaultMemoryCard, memoryCardStatus ) );
-
- switch ( memoryCardStatus )
- {
- case ESysApMemoryCardInserted: // Fall through
- case ESysApMemoryCardLocked:
- {
- // Reset eject and unlock of inserted memory card
- iSysApDriveList->ResetDriveToEject( defaultMemoryCard );
- iSysApDriveList->ResetDriveUnlockQueryShown( defaultMemoryCard );
-
- CancelWaitNote();
-
- if ( memoryCardStatus == ESysApMemoryCardInserted )
- {
- TRACES( RDebug::Print(
- _L( "CSysApAppUi::MMCInsertedL: memoryCardStatus ESysApMemoryCardInserted: %d" ), memoryCardStatus ) );
- RProperty::Set( KPSUidUikon, KUikMMCInserted, 1 );
- }
- else
- {
- TRACES( RDebug::Print(
- _L( "CSysApAppUi::MMCInsertedL: memoryCardStatus ESysApMemoryCardLocked: %d" ), memoryCardStatus ) );
- RProperty::Set( KPSUidUikon, KUikMMCInserted, 0 );
- }
- break;
- }
- case ESysApMemoryCardNotInserted:
- {
- // Always reset eject and unlock of removed memory card
- TBool isEject( iSysApDriveList->IsDriveToEject( defaultMemoryCard ) );
-
- TRACES( RDebug::Print(
- _L( "CSysApAppUi::MMCInsertedL: isEject: %d, drive: %d" ),
- isEject, defaultMemoryCard ) );
-
- iSysApDriveList->ResetDriveToEject( defaultMemoryCard );
- iSysApDriveList->ResetDriveUnlockQueryShown( defaultMemoryCard );
-
- TRACES( RDebug::Print(
- _L( "SysApAppUi::MMCInsertedL: memoryCardStatus ESysApMemoryCardNotInserted: %d" ), memoryCardStatus ) );
-
- RProperty::Set( KPSUidUikon, KUikMMCInserted, 0 );
- break;
- }
- case ESysApMemoryCardStatusNotKnown: // Fall through
- default:
- {
- break;
- }
- }
- RunUnlockNotifierL();
- }
- }
- }
+ {
+ TBool normalState( UiReady() );
+
+ if ( normalState )
+ {
+ TInt defaultMemoryCard( iSysApDriveList->DefaultMemoryCard() );
+ TSysApMemoryCardStatus memoryCardStatus( iSysApDriveList->MemoryCardStatus( defaultMemoryCard ) );
+
+ TRACES( RDebug::Print(
+ _L( "CSysApAppUi::MMCInsertedL: drive: %d, memoryCardStatus: %d" ), defaultMemoryCard, memoryCardStatus ) );
+
+ switch ( memoryCardStatus )
+ {
+ case ESysApMemoryCardInserted: // Fall through
+ case ESysApMemoryCardLocked:
+ {
+ // Reset eject and unlock of inserted memory card
+ iSysApDriveList->ResetDriveToEject( defaultMemoryCard );
+ iSysApDriveList->ResetDriveUnlockQueryShown( defaultMemoryCard );
+
+// CancelWaitNote();
+
+ if ( memoryCardStatus == ESysApMemoryCardInserted )
+ {
+ TRACES( RDebug::Print(
+ _L( "CSysApAppUi::MMCInsertedL: memoryCardStatus ESysApMemoryCardInserted: %d" ), memoryCardStatus ) );
+ RProperty::Set( KPSUidUikon, KUikMMCInserted, 1 );
+ }
+ else
+ {
+ TRACES( RDebug::Print(
+ _L( "CSysApAppUi::MMCInsertedL: memoryCardStatus ESysApMemoryCardLocked: %d" ), memoryCardStatus ) );
+ RProperty::Set( KPSUidUikon, KUikMMCInserted, 0 );
+ }
+ break;
+ }
+ case ESysApMemoryCardNotInserted:
+ {
+ // Always reset eject and unlock of removed memory card
+ TBool isEject( iSysApDriveList->IsDriveToEject( defaultMemoryCard ) );
+
+ TRACES( RDebug::Print(
+ _L( "CSysApAppUi::MMCInsertedL: isEject: %d, drive: %d" ),
+ isEject, defaultMemoryCard ) );
+
+ iSysApDriveList->ResetDriveToEject( defaultMemoryCard );
+ iSysApDriveList->ResetDriveUnlockQueryShown( defaultMemoryCard );
+
+ TRACES( RDebug::Print(
+ _L( "SysApAppUi::MMCInsertedL: memoryCardStatus ESysApMemoryCardNotInserted: %d" ), memoryCardStatus ) );
+
+ RProperty::Set( KPSUidUikon, KUikMMCInserted, 0 );
+ break;
+ }
+ case ESysApMemoryCardStatusNotKnown: // Fall through
+ default:
+ {
+ break;
+ }
+ }
+ RunUnlockNotifierL();
+ }
+ }
+ }
// ----------------------------------------------------------------------------
@@ -5583,7 +3638,12 @@
if ( callState != EPSCTsyCallStateRinging &&
callState != EPSCTsyCallStateAlerting )
{
- iSysApDriveUnlockHandler->StartUnlock();
+ TInt defaultMemoryCard( iSysApDriveList->DefaultMemoryCard() );
+ TSysApMemoryCardStatus memoryCardStatus( iSysApDriveList->MemoryCardStatus( defaultMemoryCard ) );
+ if ( memoryCardStatus == ESysApMemoryCardLocked)
+ {
+ iSysApDriveUnlockHandler->StartUnlock();
+ }
}
TRACES( RDebug::Print(
@@ -5629,13 +3689,13 @@
iSysApDriveList->ResetDriveToEject( aDrive );
iSysApDriveList->ResetDriveUnlockQueryShown( aDrive );
- CancelWaitNote();
+// CancelWaitNote();
if ( aDrive == defaultMemoryCard )
{
if ( memoryCardStatus == ESysApMemoryCardInserted )
{
- RProperty::Set( KPSUidUikon, KUikMMCInserted, 1 );
+ RProperty::Set( KPSUidUikon, KUikMMCInserted, 1 );
}
else
{
@@ -5655,7 +3715,7 @@
if ( !ignoreBeep )
{
- Beep();
+// Beep();
iSysApLightsController->MemoryCardInsertedL();
}
@@ -5673,12 +3733,12 @@
}
}
- if ( iDriveToDismount == aDrive && iSysApConfirmationQuery )
+// if ( iDriveToDismount == aDrive && iSysApConfirmationQuery )
{
- if ( iSysApConfirmationQuery->CurrentQuery() == ESysApRemoveMmcNote )
+// if ( iSysApConfirmationQuery->CurrentQuery() == ESysApRemoveMmcNote )
{
// User put back ejected memory card or did not remove it
- iSysApConfirmationQuery->Cancel();
+// iSysApConfirmationQuery->Cancel();
}
}
RunUnlockNotifierL();
@@ -5705,19 +3765,19 @@
iSysApDriveList->ResetDriveInsertBeepIgnored( aDrive );
}
- CancelGlobalListQuery(); // Cancel power menu
+// CancelGlobalListQuery(); // Cancel power menu
if ( aDrive == defaultMemoryCard )
{
RProperty::Set( KPSUidUikon, KUikMMCInserted, 0 );
}
- if ( iSysApConfirmationQuery )
+// if ( iSysApConfirmationQuery )
{
- if ( iSysApConfirmationQuery->CurrentQuery() == ESysApEjectMmcQuery )
+// if ( iSysApConfirmationQuery->CurrentQuery() == ESysApEjectMmcQuery )
{
// User removed memory card too early
- iSysApConfirmationQuery->Cancel();
+// iSysApConfirmationQuery->Cancel();
// Allow application closing to execute.
// Also FileManager is closed in this case, regardless where the eject was initiated from.
iMMCEjectUsed = EFalse;
@@ -5766,7 +3826,7 @@
iInsertedMemoryCards, CSysApDriveList::EIncludeInserted );
// Update memory card indicator status
- SetMemoryCardIndicatorL();
+// SetMemoryCardIndicatorL();
TRACES( RDebug::Print(
_L( "CSysApAppUi::MMCStatusChangedL END: MMCCount: %d, iMMCEjectUsed: %d" ),
@@ -5856,1179 +3916,156 @@
if ( !iSysApDriveEjectHandler->CompleteDismount( iDriveToDismount ) )
{
// When ready, check for locked memory cards and update indicators
- TRAP_IGNORE( SetMemoryCardIndicatorL() );
+ // TRAP_IGNORE( SetMemoryCardIndicatorL() );
TRAP_IGNORE( RunUnlockNotifierL() );
}
}
#endif // RD_MULTIPLE_DRIVE
-// ----------------------------------------------------------------------------
-// CSysApAppUi::EjectStarted()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::EjectStarted( TBool ejectStarted )
- {
- TRACES( RDebug::Print( _L( "CSysApAppUi::EjectStarted" ) ) );
- iMMCEjectUsed = ejectStarted;
-
-#ifndef RD_MULTIPLE_DRIVE
- iFileManagerCloseDisabled = ejectStarted;
-#endif // RD_MULTIPLE_DRIVE
-}
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::DoLightsTimeoutChangedL
-// ----------------------------------------------------------------------------
-void CSysApAppUi::DoLightsTimeoutChangedL( const TInt aTimeout )
- {
- iSysApLightsController->DoLightsTimeoutChangedL( aTimeout );
- }
-
-#ifdef __SYSAP_MODULE_TEST
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::ModuleTestShowUiNoteL()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::ModuleTestShowUiNoteL( const TDesC& noteText ) const
- {
- CAknGlobalNote* note = CAknGlobalNote::NewLC();
- note->SetTone( EAvkonSIDNoSound );
- note->ShowNoteL( EAknGlobalInformationNote, noteText );
- CleanupStack::PopAndDestroy(); // note
- }
-
-#endif
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::ShowShutdownNoteL()
-// ----------------------------------------------------------------------------
-void CSysApAppUi::ShowShutdownNoteL()
- {
- TRACES( RDebug::Print( _L( "CSysApAppUi::ShowShutdownNoteL") ) );
- ShowUiNoteL( EShutdownNote );
- User::After( KTimeToShowShutdownNote );
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::Beep()
-// ----------------------------------------------------------------------------
-void CSysApAppUi::Beep()
- {
- static_cast<CAknAppUi*>(iEikonEnv->EikAppUi())->KeySounds()->PlaySound( EAvkonSIDInformationTone );
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::SimSupported()
-// ----------------------------------------------------------------------------
-TBool CSysApAppUi::SimSupported()
- {
- return iSysApFeatureManager->SimSupported();
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::IsStateNormal()
-//
-// ----------------------------------------------------------------------------
-TBool CSysApAppUi::IsStateNormal() const
- {
- TInt state;
- TInt errorCode =
- RProperty::Get( KPSUidStartup, KPSGlobalSystemState, state );
- if ( errorCode == KErrNone )
- {
- return state == ESwStateNormalRfOn ||
- state == ESwStateNormalRfOff ||
- state == ESwStateNormalBTSap;
- }
- else
- {
- TRACES( RDebug::Print( _L( "CSysApAppUi::IsStateNormal: Failed to read global system state, error code %d." ), errorCode ) );
- return EFalse;
- }
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::BatteryEmptyL()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::BatteryEmptyL()
- {
- iSysApLightsController->BatteryEmptyL( ETrue );
- // Do not reactivate keyguard in the next startup
- iSysApCenRepController->SetInt( KCRUidCoreApplicationUIsSysAp, KSysApKeyguardActive, 0 );
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::Max()
-// ----------------------------------------------------------------------------
-
-TInt CSysApAppUi::Max( const TInt aA, const TInt aB, const TInt aC )
- {
- TInt max( aA );
- if ( aB > max )
- {
- max = aB;
- }
- if ( aC > max )
- {
- max = aC;
- }
- return max;
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::SetStarterState()
-// ----------------------------------------------------------------------------
-
-TInt CSysApAppUi::SetStarterState( const RStarterSession::TGlobalState aState )
- {
- if ( iSysApStartupController->GlobalStateChangeAllowed( aState ) )
- {
- TRACES( RDebug::Print( _L("CSysApAppUi::SetStarterState: aState=%d" ), aState ) );
- return StarterSession().SetState( aState );
- }
- else
- {
- TRACES( RDebug::Print( _L("CSysApAppUi::SetStarterState: aState=%d - not allowed" ), aState ) );
- return KErrNone;
- }
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::GetBtSapDeviceNameL()
-// ----------------------------------------------------------------------------
-
-HBufC* CSysApAppUi::GetBtSapDeviceNameL()
- {
- return iSysApBtSapController->GetBtSapDeviceNameL();
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::ShowAlarmIndicatorL()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::ShowAlarmIndicatorL( TBool aShowIndicator )
- {
- if ( aShowIndicator)
- {
- SetIndicatorStateL( EAknIndicatorAlarmClock, EAknIndicatorStateOn );
- }
- else
- {
- SetIndicatorStateL( EAknIndicatorAlarmClock, EAknIndicatorStateOff );
- }
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::SimulateFlipKeyEventL()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::SimulateFlipKeyEventL( TBool aFlipOpen )
- {
- TRACES( RDebug::Print( _L("CSysApAppUi::SimulateFlipKeyEventL: aFlipOpen: %d" ), aFlipOpen ) );
-
- /*
- Flip key is constructed when a flip notification via Pub&Sub is received. The reason behind
- providing this as a key event is to enable unified handling of keys also with flip, and because
- flip is captured&consumed by Avkon it is not possible to capture flip key events directly
- from default handler/plugins.
- */
-
- TKeyEvent flipEvent;
- flipEvent.iCode = aFlipOpen ? EKeyFlipOpen : EKeyFlipClose;
- flipEvent.iScanCode = 0;
- flipEvent.iModifiers = 0;
- flipEvent.iRepeats = 0;
-
- HandleKeyEventL( flipEvent, EEventKey );
- }
// ----------------------------------------------------------------------------
-// CSysApAppUi::SetFlipOpenL()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::SetFlipOpenL( TBool aFlipOpen )
- {
- iSysApLightsController->SetFlipOpenL( aFlipOpen );
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::SetGripOpenL()
-// ----------------------------------------------------------------------------
-void CSysApAppUi::SetGripOpenL( TBool aGripOpen )
- {
- iSysApLightsController->SetGripOpenL( aGripOpen );
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::SetNetworkConnectionAllowed()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::SetNetworkConnectionAllowed( TCoreAppUIsNetworkConnectionAllowed aNetworkConnectionAllowed )
- {
- TRACES( RDebug::Print( _L("CSysApAppUi::SetNetworkConnectionAllowed: status: %d" ), aNetworkConnectionAllowed ) );
-
- iSysApCenRepController->SetInt( KCRUidCoreApplicationUIs, KCoreAppUIsNetworkConnectionAllowed, (TInt) aNetworkConnectionAllowed );
-
- // Also set the Symbian PS key used for the same purpose:
- RProperty::Set(KUidSystemCategory, KUidPhonePwr.iUid, aNetworkConnectionAllowed ? ESAPhoneOn : ESAPhoneOff);
- }
-
+// CSysApAppUi::HandleApplicationSpecificEventL(TInt aType,const TWsEvent& aEvent)
// ----------------------------------------------------------------------------
-// CSysApAppUi::GetTelServerL()
-// ----------------------------------------------------------------------------
-
-RTelServer* CSysApAppUi::GetTelServer()
+
+void CSysApAppUi::HandleApplicationSpecificEventL(TInt aType,const TWsEvent& aEvent)
{
- if ( iSysApEtelConnector )
+ TRACES( RDebug::Print( _L("CSysApAppUi::HandleApplicationSpecificEventL: aType:%d"), aType ) );
+
+ CEikAppUi::HandleApplicationSpecificEventL(aType, aEvent);
+
+ if ( ResourcesFreed() )
{
- return iSysApEtelConnector->GetTelServer();
- }
- else
- {
- return NULL;
+ TRACES( RDebug::Print( _L("CSysApAppUi::HandleApplicationSpecificEventL: discarded, shutting down") ) );
+ return;
}
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::CoverDisplaySupported()
-// ----------------------------------------------------------------------------
-
-TBool CSysApAppUi::CoverDisplaySupported()
- {
- return iSysApFeatureManager->CoverDisplaySupported();
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::StarterSession()
-// ----------------------------------------------------------------------------
-
-RStarterSession& CSysApAppUi::StarterSession()
- {
- if ( !iStarterSession.Handle() )
+
+ switch( aType )
{
- // All server connections are tried to be made KTriesToConnectServer times because occasional
- // fails on connections are possible at least on some servers
- TRACES( RDebug::Print( _L("CSysApAppUi::StarterSession: trying RStarterSession::Connect()") ) );
- TInt thisTry = 0;
- TInt err;
- while ( ( err = iStarterSession.Connect() ) != KErrNone && ( thisTry++ ) <= KTriesToConnectServer )
- {
- User::After( KTimeBeforeRetryingServerConnection );
- }
-
- if ( err != KErrNone )
- {
- // What do in error case?
- TRACES( RDebug::Print( _L("CSysApAppUi::StarterSession: RStarterSession::Connect() failed with %d"), err ) );
- }
- }
-
- return iStarterSession;
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::KeyLock()
-// ----------------------------------------------------------------------------
-
-RAknKeylock2& CSysApAppUi::KeyLock()
- {
- if ( !iKeyLock.Handle() )
- {
- // All server connections are tried to be made KTriesToConnectServer times because occasional
- // fails on connections are possible at least on some servers
- TInt thisTry = 0;
- TInt err;
-
- TRACES( RDebug::Print( _L("CSysApAppUi::KeyLock: trying RAknKeylock2::Connect()") ) );
- thisTry = 0;
- while ( ( err = iKeyLock.Connect() ) != KErrNone && ( thisTry++ ) <= KTriesToConnectServer )
- {
- User::After( KTimeBeforeRetryingServerConnection );
- }
-
- if ( err != KErrNone )
- {
- // What do in error case?
- TRACES( RDebug::Print( _L("CSysApAppUi::KeyLock: RAknKeylock2::Connect() failed with %d"), err ) );
- }
- }
-
- return iKeyLock;
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::CenRepController()
-// ----------------------------------------------------------------------------
-
-CSysApCenRepController& CSysApAppUi::CenRepController()
- {
- __ASSERT_ALWAYS( iSysApCenRepController, User::Panic( _L("CSysApAppUi::CenRepController"), KErrBadHandle ) );
-
- return *iSysApCenRepController;
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::ExecCommandL
-// ----------------------------------------------------------------------------
-//
-void CSysApAppUi::ExecCommandL( TSysapCommand aCommand )
- {
- ExecCommandL( aCommand, KNullDesC8 );
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::ExecCommandL
-// ----------------------------------------------------------------------------
-//
-void CSysApAppUi::ExecCommandL( TSysapCommand aCommand, const TDesC8& aParam )
- {
- TRACES( RDebug::Print(_L("CSysApAppUi::ExecCommandL: aCommand=%d"), aCommand ) );
-
- switch ( aCommand )
- {
- case EResetKeyguardState: // reset the internal keyguard flags of the SysAp, except for iKeyLockOnBeforeCradle
- iKeyLockOnBeforeCall = EFalse;
- iKeyLockOnBeforeAlarm = EFalse;
+ case EEikKeyLockEnabled:
+ iKeyLockEnabled = ETrue;
+ iSysApCenRepController->SetInt( KCRUidCoreApplicationUIsSysAp, KSysApKeyguardActive, 1 );
+// SetIndicatorStateL( EAknIndicatorKeyguard, EAknIndicatorStateOn );
+ iSysApLightsController->KeylockStateChangedL( ETrue );
break;
-
- case ECancelPowermenu: // hide power menu if it is visible
- if( iPowerKeyPopupMenuActive )
+ case EEikKeyLockDisabled:
+ iKeyLockEnabled = EFalse;
+ iSysApCenRepController->SetInt( KCRUidCoreApplicationUIsSysAp, KSysApKeyguardActive, 0 );
+// SetIndicatorStateL( EAknIndicatorKeyguard, EAknIndicatorStateOff );
+ if (! iDeviceLockEnabled )
{
- CancelGlobalListQuery();
+ iSysApLightsController->KeylockStateChangedL( EFalse );
+ if ( iSysApFeatureManager->MmcHotSwapSupported() )
+ {
+ if ( StateOfProperty( KPSUidCtsyCallInformation, KCTsyCallState ) != EPSCTsyCallStateRinging && StateOfProperty( KPSUidCtsyCallInformation, KCTsyCallState ) != EPSCTsyCallStateAlerting )
+ {
+ RunUnlockNotifierL();
+ }
+ }
}
break;
-
- case EUpdateLights: // apply key specific light handling
- {
- TUpdateLightsBuf lightBuf;
- lightBuf.Copy( aParam );
-
- switch ( lightBuf() )
- {
- case EKeyGripClose:
- SetGripOpenL( EFalse );
- break;
-
- case EKeyGripOpen:
- SetGripOpenL( ETrue );
- break;
-
- case EKeyFlipClose:
- SetFlipOpenL( EFalse );
- break;
-
- case EKeyFlipOpen:
- SetFlipOpenL( ETrue );
- break;
-
- default:
- // No specific light handling for other keys.
- break;
- }
- }
+ case EEikKeyLockPowerKeyPressed: //sent when power key is captured by keylockserver
+// HandleShortPowerKeyPressedL();
+ break;
+
+ case EEikKeyLockLightsOnRequest:
+ iSysApLightsController->SetLightsOnUnlockNoteL();
+ break;
+
+ case EEikEcsQueryLights: // emergency note is shown
+ iSysApLightsController->SetLightsOnEcsQueryL();
+ break;
+
+ case EEikSecurityQueryLights: // for device lock security query
+ iSysApLightsController->SetLightsOnSecurityQueryL();
break;
default:
- // do nothing in release builds since no harm is done
- __ASSERT_DEBUG( EFalse, User::Panic( _L("CSysApAppUi::ExecCommandL: Invalid command"), KErrArgument ) );
break;
- }
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::ExecQueryL
-// ----------------------------------------------------------------------------
-//
-void CSysApAppUi::ExecQueryL( TSysapQuery aQuery, TDes8& aReturn )
- {
- ExecQueryL( aQuery, aReturn, KNullDesC8 );
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::ExecQueryL
-// ----------------------------------------------------------------------------
-//
-void CSysApAppUi::ExecQueryL( TSysapQuery aQuery, TDes8& aReturn, const TDesC8& /*aParam*/ )
- {
- TRACES( RDebug::Print(_L("CSysApAppUi::ExecQueryL: aQuery=%d"), aQuery ) );
-
- switch ( aQuery )
- {
- case EGetHwrmLight: // get handle to HWRM client session. Returns CHWRMLight*.
- {
- THwrmLightBuf retBuf( iSysApLightsController->GetHwrmLight() );
- aReturn.Copy( retBuf );
}
- break;
-
- case EGetKeylock: // get handle to keylock client session. Returns RAknKeylock2*.
- {
- TKeyLockBuf retBuf( &(KeyLock()) );
- aReturn.Copy( retBuf );
- }
- break;
-
- default:
- __ASSERT_DEBUG( EFalse, User::Panic( _L("CSysApAppUi::ExecQueryL: Invalid query"), KErrArgument ) );
- User::Leave( KErrArgument );
- break;
- }
}
-// ----------------------------------------------------------------------------
-// CSysApAppUi::ShowShutdownImage
-// ----------------------------------------------------------------------------
-//
-TInt CSysApAppUi::ShowShutdownImage( TInt aBitmapId )
- {
- TRACES( RDebug::Print(_L("CSysApAppUi::ShowShutdownImage") ) );
-
- TRAPD( err, ShowShutdownImageL( aBitmapId ) );
-
- if ( err != KErrNone )
- {
- TRACES( RDebug::Print(_L("CSysApAppUi::ShowShutdownImageL failed, err=%d"), err ) );
- }
-
- return err;
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::ShowShutdownImageL
-// ----------------------------------------------------------------------------
-//
-void CSysApAppUi::ShowShutdownImageL( TInt aBitmapId )
- {
- TRACES( RDebug::Print(_L("CSysApAppUi::ShowShutdownImageL") ) );
-
- if ( !iSysApShutdownImage ) // Shutdown image may be shown without entering normal state (e.g. charging), so construct here
- {
- TRACES( RDebug::Print( _L("CSysApAppUi::ShowShutdownImageL: trying CSysApShutdownImage::NewL()") ) );
- iSysApShutdownImage = CSysApShutdownImage::NewL();
- }
-
- TRACES( RDebug::Print( _L("CSysApAppUi::ShowShutdownImageL: trying CSysApShutdownImage::ShowShutdownImageL()") ) );
- iSysApShutdownImage->ShowShutdownImageL( aBitmapId );
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::IgnoreZeroNetworkBarNotifications
-// ----------------------------------------------------------------------------
-//
-void CSysApAppUi::IgnoreZeroNetworkBarNotifications(TBool aIgnore)
- {
- iIgnoreZeroNetworkBarNotifications = aIgnore;
- }
+
// ----------------------------------------------------------------------------
-// CSysApAppUi::BtSapEnabled()
+// CSysApAppUi::HandleNspsRawKeyEventL()
// ----------------------------------------------------------------------------
-TBool CSysApAppUi::BtSapEnabled()
- {
- if ( iSysApBtSapController )
- {
- return iSysApBtSapController->BtSapEnabled();
- }
-
- return EFalse;
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::DeactivateBT
-// ----------------------------------------------------------------------------
-//
-void CSysApAppUi::DeactivateBT()
+void CSysApAppUi::HandleNspsRawKeyEventL()
{
- // Will deactivate BT when changing to normal mode
- iDeactivateBt = ETrue;
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::SetHacIndicatorL()
-// ----------------------------------------------------------------------------
-void CSysApAppUi::SetHacIndicatorL()
- {
-
- if ( !iSysApCenRepHacSettingObserver )
- {
- // Do nothing if HAC setting observer has not been created yet
- // This occurs in case some party is trying to set HAC indicator during
- // ConstructL(), e.g. when switching from offline to online during startup
- TRACES( RDebug::Print( _L("CSysApAppUi::SetHacIndicatorL: do nothing, HAC observer does not exist yet") ) );
- return;
- }
-
- if ( iSysApCenRepHacSettingObserver->HacMode() )
+#ifdef __SYSAP_MODULE_TEST
+ ModuleTestShowUiNoteL( _L("Network wakeup from NSPS") );
+#endif
+
+ if ( iSysApEtelConnector )
{
- TBool accessoryConnected ( EFalse );
-
- TAccMode accMode(EAccModeHandPortable);
-
- if ( iSysApAccessoryObserver )
- {
- accMode = iSysApAccessoryObserver->GetAccessoryMode();
-
- if ( accMode != EAccModeHandPortable )
- {
- accessoryConnected = ETrue;
- }
- }
-
- TInt indicatorState = EAknIndicatorStateOn;
-
- if ( !accessoryConnected ) // When accessory is not connected, check offline and call state
- {
- if ( OfflineModeActive() ) // HAC indicator is not shown in offline mode
- {
- indicatorState = EAknIndicatorStateOff;
- }
- else
- {
- // during active call with IHF activated HAC indicator is not shown
- TInt callState( StateOfProperty( KPSUidCtsyCallInformation, KCTsyCallState ) );
- if ( callState < KErrNone )
- {
- callState = EPSCTsyCallStateNone;
- }
-
- if ( callState != EPSCTsyCallStateNone && IhfEnabledL() )
- {
- indicatorState = EAknIndicatorStateOff;
- }
- }
-
- }
- else
- {
- // If an accessory is connected, HAC indicator should not be shown
- indicatorState = EAknIndicatorStateOff;
- }
-
- SetIndicatorStateL( EAknIndicatorHAC, indicatorState );
-
- }
- else
- {
- // If HAC is not active, always disable indicator regardless of accessory state
- SetIndicatorStateL( EAknIndicatorHAC, EAknIndicatorStateOff );
- }
-
-
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::HandleResourceChangeL()
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::HandleResourceChangeL( TInt aType )
- {
- TRACES( RDebug::Print( _L("CSysApAppUi::HandleResourceChangeL aType: %d"), aType ) );
- CAknAppUi::HandleResourceChangeL(aType);
-
- if ( aType == KEikDynamicLayoutVariantSwitch )
- {
-#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION
- iSysApShutdownImage->SetRect( ApplicationRect() );
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-
- TInt mode;
- User::LeaveIfError( RProperty::Get( KPSUidStartup, KPSGlobalStartupMode, mode ) );
-
- if ( mode == EStartupModeAlarm )
- {
- SetStatusPaneLayoutL( ESysApAlarm );
- }
+ iSysApEtelConnector->CommandNetCsWakeupOnNsps();
}
}
// ----------------------------------------------------------------------------
-// CSysApAppUi::SetMemoryCardIndicatorL
+// CSysApAppUi::UpdateSignalBarsL()
// ----------------------------------------------------------------------------
-void CSysApAppUi::SetMemoryCardIndicatorL()
+void CSysApAppUi::UpdateSignalBarsL()
{
- if ( iSysApFeatureManager->Supported( KSysApFeatureIdMemoryCardIcon ) )
- {
-#ifndef RD_MULTIPLE_DRIVE
- TSysApMemoryCardStatus memoryCardStatus = iSysApMMCObserver->MemoryCardStatus();
-
- TRACES( RDebug::Print( _L("CSysApAppUi::SetMemoryCardIndicatorL: memoryCardStatus=%d"), memoryCardStatus ) );
-
- if ( memoryCardStatus == ESysApMemoryCardInserted || memoryCardStatus == ESysApMemoryCardLocked )
-#else // RD_MULTIPLE_DRIVE
- TInt insertedCount( CSysApDriveList::NonUsbDriveCount( iInsertedMemoryCards ) );
-
- TRACES( RDebug::Print( _L("CSysApAppUi::SetMemoryCardIndicatorL: insertedCount=%d"), insertedCount ) );
-
- if ( insertedCount > 0 )
-#endif // RD_MULTIPLE_DRIVE
- {
- SetIndicatorStateL( EAknIndicatorMemoryCard, EAknIndicatorStateOn );
- }
- else
- {
- SetIndicatorStateL( EAknIndicatorMemoryCard, EAknIndicatorStateOff );
- }
- }
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::SysApFeatureManager
-// ----------------------------------------------------------------------------
-
-CSysApFeatureManager& CSysApAppUi::SysApFeatureManager()
- {
- __ASSERT_DEBUG( iSysApFeatureManager, User::Panic( _L("iSysApFeatureManager == NULL"), KErrBadHandle ) );
-
- return *iSysApFeatureManager;
+// UpdateSignalBarsL(iSysApEtelConnector->GetSignalBars());
}
// ----------------------------------------------------------------------------
-// CSysApAppUi::SetUsbAttachStatus
+// CSysApAppUi::HandleSmsStorageNotificationL( TBool aSimStoreFull )
// ----------------------------------------------------------------------------
-#ifndef RD_MULTIPLE_DRIVE
-void CSysApAppUi::SetUsbAttachStatus( const TBool aUsbAttached )
+
+void CSysApAppUi::HandleSmsStorageNotificationL( TBool aSimStoreFull )
{
- // Prevent double beep when USB file transfer gets activated but
- // allow MMC inserted beep when:
- // a) USB file transfer is active
- // b) MMC is not inserted when USB cable is attached
- iHideNextBeep = ( iMMCInserted && aUsbAttached );
- }
-#else // RD_MULTIPLE_DRIVE
-void CSysApAppUi::SetUsbAttachStatus( const TBool aUsbAttached )
- {
- TRACES( RDebug::Print(
- _L( "CSysApAppUi::SetUsbAttachStatus: aUsbAttached: %d" ),
- aUsbAttached ) );
-
- if ( aUsbAttached )
+ TRACES( RDebug::Print( _L("CSysApAppUi::HandleSmsStorageNotificationL: aSimStoreFull: %d "), aSimStoreFull ) );
+
+ if ( aSimStoreFull )
{
- // For ignoring extra beeps caused by USB file transfer
- iSysApDriveList->ResetDrivesInsertBeepIgnored();
- iSysApDriveList->MarkDrivesInsertBeepIgnored( iInsertedMemoryCards );
- }
- }
-#endif // RD_MULTIPLE_DRIVE
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::IhfEnabledL
-// ----------------------------------------------------------------------------
-
-TBool CSysApAppUi::IhfEnabledL()
- {
- TRACES( RDebug::Print( _L("CSysApAppUi::IhfEnabledL(): iSysApAudioRoutingObserver=0x%x"), iSysApAudioRoutingObserver ) );
-
- if ( !iSysApAudioRoutingObserver ) // create observer if needed
- {
- iSysApAudioRoutingObserver = CSysApAudioRoutingObserver::NewL( *this );
- }
-
- return iSysApAudioRoutingObserver->IhfEnabled();
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::IsDeviceModeKey
-// ----------------------------------------------------------------------------
-
-TBool CSysApAppUi::IsDeviceModeKey( const TKeyEvent& aKeyEvent ) const
- {
- return CSysApDefaultKeyHandler::IsDeviceModeKey( aKeyEvent );
+/* HBufC* noteStringBuf;
+ noteStringBuf = StringLoader::LoadLC( R_QTN_MEMLO_MEMORY_LOW_SIM_MES, iEikonEnv );
+ TPtr textBuffer = noteStringBuf->Des();
+ iSysApMsgSimMemLowQuery->StartL( textBuffer );
+ CleanupStack::PopAndDestroy();
+*/ }
+
+// SetEnvelopeIndicatorL();
}
// ----------------------------------------------------------------------------
-// CSysApAppUi::ResourcesFreed
+// CSysApAppUi::HandleNetworkNspsNotification( RMmCustomAPI::TNspsStatus aNspsStatus )
// ----------------------------------------------------------------------------
-TBool CSysApAppUi::ResourcesFreed() const
- {
- return iResourcesFreed;
- }
-
-/*
-----------------------------------------------------------------------------
-CSysApAppUi::IsEncryptionOperationOngoingL()
-Introduced the code as a part of Sub : 405-3362 - Power Management SUB for ES
-recapture functionalities in platform which support multidrive as well.
--------------------------------------------------------------------------------
-*/
-TBool CSysApAppUi::IsEncryptionOperationOngoingL() const
+void CSysApAppUi::HandleNetworkNspsNotification( RMmCustomAPI::TNspsStatus aNspsStatus )
{
- TBool deFeatureSupported(EFalse);
- FeatureManager::InitializeLibL();
- deFeatureSupported = FeatureManager::FeatureSupported( KFeatureIdFfDeviceEncryptionFeature);
- FeatureManager::UnInitializeLib();
-
- if(deFeatureSupported)
- {
- /**
- * Store the last memory status changed
- * 0: Idle. It can be Encrypted or Decrypted
- * 1: Encrypting
- * 2: Decrypting
- **/
-
- RProperty deProperty;
- User::LeaveIfError(deProperty.Attach(KDevEncProtectedUid, KDevEncOperationKey,EOwnerThread));
- TInt deValue = 0;
- if((deProperty.Get(deValue)== KErrNone)&&( deValue == EOpEncrypting || deValue == EOpDecrypting))
- {
- deProperty.Close();
- return ETrue;
- }
- else
- {
- deProperty.Close();
- return EFalse;
- }
- }
- else
- {
- return EFalse;
- }
- }
-// ----------------------------------------------------------------------------
-// CSysApAppUi::EtelConnector
-// ----------------------------------------------------------------------------
-
-CSysApEtelConnector* CSysApAppUi::EtelConnector() const
- {
- return iSysApEtelConnector;
- }
-
-#ifndef RD_MULTIPLE_DRIVE
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::EjectUsed
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::EjectUsed( TInt /*aDrive*/ )
- {
- }
-
-#else // RD_MULTIPLE_DRIVE
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::ShowEjectWaitNoteL
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::ShowEjectWaitNoteL( TInt aDriveToEject )
- {
- if ( iSysApWaitNote )
- {
- return;
- }
- HBufC* text = iSysApDriveList->GetFormattedDriveNameLC(
- aDriveToEject,
- 0, // Not used
- R_QTN_EJECTING_MEMORY_NAME_WAIT );
- iSysApWaitNote = CSysApWaitNote::NewL(
- iSysApFeatureManager->CoverDisplaySupported() );
- iSysApWaitNote->ShowNoteL( EClosingApplicationsNote, text );
- CleanupStack::PopAndDestroy( text );
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::IsEjectQueryVisible
-// ----------------------------------------------------------------------------
-
-TBool CSysApAppUi::IsEjectQueryVisible()
- {
- if ( !iSysApConfirmationQuery )
+ TRACES( RDebug::Print( _L("CSysApAppUi::HandleNetworkNspsNotification aNspsStatus:%d, iNsps:%d )" ), aNspsStatus, iNsps ) );
+ if( iSysApNspsHandler )
{
- return EFalse;
- }
- TInt queryId( iSysApConfirmationQuery->CurrentQuery() );
- return ( queryId == ESysApEjectMmcQuery || queryId == ESysApRemoveMmcNote );
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::UpdateInsertedMemoryCardsL
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::UpdateInsertedMemoryCardsL()
- {
- // Update inserted memory cards
- iSysApDriveList->GetMemoryCardsL(
- iInsertedMemoryCards, CSysApDriveList::EIncludeInserted );
-
- // Update memory card indicator status
- SetMemoryCardIndicatorL();
-
- // Handle unlock
- RunUnlockNotifierL();
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::EjectUsed
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::EjectUsed( TInt aDrive )
- {
- // Check drive inserted before starting eject confirm query
- TInt insertedIndex( CSysApDriveList::Find( iInsertedMemoryCards, aDrive ) );
-
- TRACES( RDebug::Print(
- _L( "CSysApAppUi::EjectUsed: drive: %d, index: %d" ),
- aDrive, insertedIndex ) );
-
- if ( insertedIndex == KErrNotFound )
- {
- return;
- }
-
- iMMCEjectUsed = ETrue;
- iDriveToEject = aDrive;
- iSysApDriveList->ResetDrivesToEject();
- TRAPD( err, EjectMMCL() );
- if ( err != KErrNone )
- {
- TRACES( RDebug::Print(
- _L( "CSysApAppUi::EjectUsed: err: %d" ), err ) );
- iMMCEjectUsed = EFalse;
- }
- }
-
-#endif // RD_MULTIPLE_DRIVE
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::EjectMMCCanceled
-// ----------------------------------------------------------------------------
-
-void CSysApAppUi::EjectMMCCanceled()
- {
- // Called from eject confirm query, reset eject status
-#ifdef RD_MULTIPLE_DRIVE
- iMMCEjectUsed = EFalse;
-#endif // RD_MULTIPLE_DRIVE
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::UsbChargerDetector
-// ----------------------------------------------------------------------------
-//
-TSysApUsbChargerDetector& CSysApAppUi::UsbChargerDetector()
- {
- return iSysApUsbChargerDetector;
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::HandleUsbCharger
-// ----------------------------------------------------------------------------
-//
-void CSysApAppUi::HandleUsbCharger( const TInt aValue )
- {
- if ( aValue == EChargingStatusCharging ||
- aValue == EChargingStatusChargingContinued ||
- aValue == EChargingStatusAlmostComplete )
- {
- iSysApUsbChargerDetector.SetChargingUsed( ETrue );
- if ( !iSysApUsbIndicatorController &&
- iSysApFeatureManager->Supported( KSysApFeatureIdChargerReminderNotes ) &&
- iSysApFeatureManager->Supported( KSysApFeatureIdUsbChargingWithoutReminderNotes ) )
+ if( aNspsStatus == RMmCustomAPI::ENspsOn )
{
- // Start observing USB state for the reminder note
- TRAPD ( usbErr, iSysApUsbIndicatorController = CreateSysApUsbIndicatorL( *this ) );
- if ( usbErr )
+ if( !iNsps )
{
- TRACES( RDebug::Print(
- _L("CSysApAppUi::HandleUsbCharger: error in constructing USB ind. controller %d" ),
- usbErr ) );
+#ifdef __SYSAP_MODULE_TEST
+ TRAPD( err, ModuleTestShowUiNoteL( _L("Setting NSPS on") ) );
+#endif
+ iSysApNspsHandler->SetNspsOn();
+ iNsps = ETrue;
+ }
+ }
+ else if( aNspsStatus == RMmCustomAPI::ENspsOff )
+ {
+ if( iNsps )
+ {
+#ifdef __SYSAP_MODULE_TEST
+ TRAPD( err, ModuleTestShowUiNoteL( _L("Setting NSPS off") ) );
+#endif
+ iSysApNspsHandler->SetNspsOff();
+ iNsps = EFalse;
}
}
}
}
-// ----------------------------------------------------------------------------
-// CSysApAppUi::SetEnvelopeIndicatorL
-// ----------------------------------------------------------------------------
-//
-void CSysApAppUi::SetEnvelopeIndicatorL()
- {
- TInt phoneStoreStatus( StateOfProperty( KUidPSSMSStackCategory, KUidPSSMSStackDiskSpaceMonitorKey ) );
- TInt inboxStatus( StateOfProperty( KUidSystemCategory, KUidInboxStatusValue ) );
- TBool simStoreFull( iSysApEtelConnector && iSysApEtelConnector->IsSimSmsStoreFull() );
-
- TRACES( RDebug::Print(
- _L("CSysApAppUi::SetEnvelopeIndicatorL() phoneStoreStatus %d, simStoreFull %d, inboxStatus %d"),
- phoneStoreStatus, simStoreFull, inboxStatus ) );
-
- if ( phoneStoreStatus == ESmsDiskSpaceFull || simStoreFull )
- {
- // Blink the Envelope indicator
- SetIndicatorStateL( EAknIndicatorEnvelope, EAknIndicatorStateAnimate );
- }
- else if ( inboxStatus == ESADocumentsInInbox )
- {
- // Show the Envelope indicator.
- SetIndicatorStateL( EAknIndicatorEnvelope, EAknIndicatorStateOn );
- }
- else
- {
- // Hide the Envelope indicator.
- SetIndicatorStateL( EAknIndicatorEnvelope, EAknIndicatorStateOff );
- }
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::LogsObserverL
-// ----------------------------------------------------------------------------
-//
-CSysApCenRepLogsObserver& CSysApAppUi::LogsObserverL()
- {
- TRACES( RDebug::Print( _L("CSysApAppUi::LogsObserverL()") ) );
-
- // Create Logs observer when it is needed for the first time
- if ( !iSysApCenRepLogsObserver )
- {
- iSysApCenRepLogsObserver = CSysApCenRepLogsObserver::NewL( *this );
- }
-
- return *iSysApCenRepLogsObserver;
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::NotifyPowerSaveModeL
-// ----------------------------------------------------------------------------
-//
-void CSysApAppUi::NotifyPowerSaveModeL( TSysApPsmStatus aStatus )
- {
- TRACES( RDebug::Print( _L("CSysApAppUi::NotifyPowerSaveModeL aStatus: %d"), aStatus ) );
-
- // cancel any active power saving query because user has changed the state manually
- CancelQuery( ESysApBattChargingPowerSavingQuery );
- CancelQuery( ESysApBattLowPowerSavingQuery );
-
- switch ( aStatus )
- {
- case MSysApPsmControllerNotifyCallback::EPsmActivationComplete:
- UpdateBatteryBarsL( StateOfProperty( KPSUidHWRMPowerState, KHWRMBatteryLevel ) );
- ShowUiNoteL( EPowerSaveModeActivated );
- break;
-
- case MSysApPsmControllerNotifyCallback::EPsmDeactivationComplete:
- UpdateBatteryBarsL( StateOfProperty( KPSUidHWRMPowerState, KHWRMBatteryLevel ) );
- ShowUiNoteL( EPowerSaveModeDeactivated );
- break;
-
- case MSysApPsmControllerNotifyCallback::EPsmActivationFailed:
- ShowUiNoteL( ECannotActivatePowerSaveMode );
- break;
-
- case MSysApPsmControllerNotifyCallback::EPsmDeactivationFailed:
- ShowUiNoteL( ECannotDeactivatePowerSaveMode );
- break;
-
- default:
- break;
- }
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::HandleBatteryStatusL
-// ----------------------------------------------------------------------------
-//
-void CSysApAppUi::HandleBatteryStatusL( const TInt aValue )
- {
- TRACES( RDebug::Print( _L("CSysApAppUi::HandleBatteryStatusL aValue: %d"), aValue ) );
-
- if ( aValue == EBatteryStatusEmpty )
- {
- //Display Recharge Battery note
- ShowUiNoteL( ERechargeBatteryNote );
- BatteryEmptyL();
- }
- else if ( aValue == EBatteryStatusLow )
- {
- if ( iSysApPsmController && UiReady() )
- {
- iSysApPsmController->BatteryLow( ETrue );
-
- if ( iSysApPsmController->ShowActivateQuery())
- {
- // show activation query, replaces the first battery low query
- ShowQueryL( ESysApBattLowPowerSavingQuery );
- }
- else // default low warning note must be shown
- {
- // activate partial power save mode on first low warning
- iSysApPsmController->DoEnablePartialPsm( ETrue ); // activated on first warning note
- //Display Battery Low note.
- ShowUiNoteL( EBatteryLowNote );
- }
- }
- else
- {
- //Display Battery Low note.
- ShowUiNoteL( EBatteryLowNote );
- }
- }
-
- if ( iSysApBatteryInfoController )
- {
- iSysApBatteryInfoController->BatteryStatusUpdated( aValue );
- }
-
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::HandleChargingStatusL
-// ----------------------------------------------------------------------------
-//
-void CSysApAppUi::HandleChargingStatusL( const TInt aValue )
- {
- TRACES( RDebug::Print( _L("CSysApAppUi::HandleChargingStatusL aValue: %d"), aValue ) );
-
- TBool showNote( ETrue );
-
- UpdateBatteryBarsL( StateOfProperty( KPSUidHWRMPowerState, KHWRMBatteryLevel ) );
-
- if ( iSysApPsmController && UiReady() )
- {
- if ( iCharging ) // iCharging updated in UpdateBatteryBarsL
- {
- // cancel activation query if charger is connected while query is on display
- CancelQuery( ESysApBattLowPowerSavingQuery );
- }
-
- if ( iCharging && !iSysApPsmController->ChargerConnected() ) // first time after charger connection
- {
- iSysApPsmController->ConnectCharger( ETrue );
-
- if ( iSysApPsmController->ShowDeactivateQuery() )
- {
- ShowQueryL( ESysApBattChargingPowerSavingQuery );
- // Query is on the display. Don't show the note.
- showNote = EFalse;
- }
- else
- {
- iSysApPsmController->DoEnablePartialPsm( EFalse );
- }
- }
- else if ( aValue == EChargingStatusNotConnected )
- {
- iSysApPsmController->ConnectCharger( EFalse );
-
- // cancel deactivation query if charger is disconnected while query is on display
- CancelQuery( ESysApBattChargingPowerSavingQuery );
- }
- }
- if( showNote )
- {
- HandleChargerNotesL( aValue );
- }
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::HandleActivatePsmQueryResponse
-// ----------------------------------------------------------------------------
-//
-void CSysApAppUi::HandleActivatePsmQueryResponse( TBool aEnable )
- {
- TRACES( RDebug::Print( _L("CSysApAppUi::HandleActivatePsmQueryResponse aEnable: %d"),
- aEnable ) );
-
- __ASSERT_DEBUG( iSysApPsmController, User::Invariant() );
-
- if ( aEnable )
- {
- iSysApPsmController->DoEnableFullPsm( ETrue );
- }
- else
- {
- iSysApPsmController->DoEnablePartialPsm( ETrue );
- }
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::HandleDeactivatePsmQueryResponse
-// ----------------------------------------------------------------------------
-//
-void CSysApAppUi::HandleDeactivatePsmQueryResponse( TBool aDisable )
- {
- TRACES( RDebug::Print( _L("CSysApAppUi::HandleDeactivatePsmQueryResponse aDisable: %d"),
- aDisable ) );
-
- __ASSERT_DEBUG( iSysApPsmController, User::Invariant() );
-
- if ( aDisable )
- {
- iSysApPsmController->DoEnableFullPsm( EFalse );
- }
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::CancelQuery
-// ----------------------------------------------------------------------------
-//
-void CSysApAppUi::CancelQuery( TSysApConfirmationQueryIds aQueryId )
- {
- TRACES( RDebug::Print( _L("CSysApAppUi::CancelQuery aQueryId: %d"), aQueryId ) );
-
- if ( iSysApConfirmationQuery )
- {
- if ( aQueryId == iSysApConfirmationQuery->CurrentQuery() || aQueryId == ESysApNoQuery )
- {
- iSysApConfirmationQuery->Cancel();
- }
- }
- }
-
-TBool CSysApAppUi::IsDefaultPowerKeyBehavior()
- {
- TRACES( RDebug::Print( _L("CSysApAppUi::IsDefaultPowerKeyBehavior" ) ) );
- TBool powerKeyIsLockKey = iSysApFeatureManager->PowerKeyIsLockKey();
- if ( !powerKeyIsLockKey )
- return ETrue; //no need for further processing
- TInt securityDialogStatus = StateOfProperty( KPSUidStartup, KStartupSecurityCodeQueryStatus );
- TRACES( RDebug::Printf( "CSysApAppUi::IsDefaultPowerKeyBehavior: securityDialogStatus = %d", securityDialogStatus ) );
- if ( securityDialogStatus == ESecurityQueryActive )
- {
- // handle the exception from the exception. Currently used only when a long power key press is detected
- return ETrue;
- }
- //make sure we can turn off device when 'sim invalid' dlg is displayed
- TInt simStatus = StateOfProperty( KPSUidStartup, KStartupSimSecurityStatus );
- TBool simBogus = ( simStatus == ESimRejected ) || ( simStatus == ESimUnaccepted ) || (simStatus == ESimInvalid );
-
- // check if the phone has fully booted into idle
- TInt startupPhase = StateOfProperty ( KPSUidStartup, KPSStartupUiPhase );
- TBool bootCompleted = (EStartupUiPhaseAllDone == startupPhase);
-
- // Another exception from the exception:
- // check if we're in charging or alert mode (only then we have a status pane instance)
- TBool haveStatusPane = ( StatusPane()== NULL ) ? EFalse : StatusPane()->IsVisible();
- TBool defaultPowerKeyBehaviour = !bootCompleted || simBogus || haveStatusPane || iPowerKeyPopupMenuActive || !powerKeyIsLockKey;
-
- TRACES( RDebug::Printf( "CSysApAppUi::IsDefaultPowerKeyBehavior: Sim Status = %d, haveStatusPane = %d, power key menu active? %d" , simStatus, haveStatusPane, iPowerKeyPopupMenuActive ) );
- TRACES( RDebug::Printf( "CSysApAppUi::IsDefaultPowerKeyBehavior returns %d", defaultPowerKeyBehaviour ) );
- TRACES( RDebug::Printf( "CSysApAppUi::IsDefaultPowerKeyBehavior: startupPhase = %d", startupPhase ) );
- return defaultPowerKeyBehaviour;
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::StartChargingBatteryL
-// ----------------------------------------------------------------------------
-//
-void CSysApAppUi::StartChargingBatteryL()
- {
- TRACES( RDebug::Print( _L("CSysApAppUi::StartChargingBatteryL") ) );
- iBatteryNotify->StartChargingL();
- }
-
-// ----------------------------------------------------------------------------
-// CSysApAppUi::StopChargingBatteryL
-// ----------------------------------------------------------------------------
-//
-void CSysApAppUi::StopChargingBatteryL()
- {
- TRACES( RDebug::Print( _L("CSysApAppUi::StopChargingBatteryL") ) );
- iBatteryNotify->StopChargingL();
- }
-
-// End of File
+
+
+//end of file
--- a/coreapplicationuis/SysAp/Src/SysApCenRepController.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/SysApCenRepController.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -20,7 +20,7 @@
#include "SysApCenRepController.h"
#include "SysApAppUi.h"
#include "SysAp.hrh"
-#include "CoreApplicationUIsPrivateCRKeys.h"
+#include "coreapplicationuisprivatecrkeys.h"
#include "accessoriescrkeys.h"
--- a/coreapplicationuis/SysAp/Src/SysApConfirmationQuery.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/SysApConfirmationQuery.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -27,7 +27,7 @@
#include <avkon.hrh>
#include <avkon.rsg>
#include <SysAp.rsg>
-#include <secondarydisplay/SecondaryDisplaySysApAPI.h>
+#include <SecondaryDisplay/SecondaryDisplaySysApAPI.h>
#include <aknSDData.h>
// Constants
@@ -181,14 +181,14 @@
anim = R_QGN_NOTE_INFO_ANIM;
secondaryDisplayCmdId = SecondaryDisplay::ECmdShowMemoryCardLockedQuery;
break;
- case ESysApUseFmTxInOfflineQuery:
+/* case ESysApUseFmTxInOfflineQuery:
queryStringBuf
= StringLoader::LoadLC( R_QTN_FMTX_SYSAP_NOTE_ACTIVATE_IN_OFFLINE,
aLoaderEnv );
keys = R_AVKON_SOFTKEYS_YES_NO;
secondaryDisplayCmdId = SecondaryDisplay::ECmdShowFmTxKeepOnInOfflineQuery;
break;
- case ESysApBattChargingPowerSavingQuery:
+*/ case ESysApBattChargingPowerSavingQuery:
queryStringBuf = StringLoader::LoadLC( R_QTN_BATTERY_CHARGING_POWER_SAVING_QUERY, aLoaderEnv );
keys = R_AVKON_SOFTKEYS_YES_NO;
secondaryDisplayCmdId = SecondaryDisplay::ECmdShowChargingDeactivatePowerSavingQuery;
@@ -325,14 +325,14 @@
ShowQueryL( iPendingQuery, CCoeEnv::Static() );
}
break;
- case ESysApUseFmTxInOfflineQuery:
+/* case ESysApUseFmTxInOfflineQuery:
if ( iStatus.Int() == EAknSoftkeyNo )
{
TRACES( RDebug::Print( _L( "CSysApConfirmationQuery::RunL: calling CSysApAppUi::ChangeFmTxStateL( EFalse )" ) ) );
iSysApAppUi.ChangeFmTxStateL( EFalse ); // disable FM TX
}
break;
- case ESysApBattChargingPowerSavingQuery:
+*/ case ESysApBattChargingPowerSavingQuery:
iSysApAppUi.HandleDeactivatePsmQueryResponse( iStatus.Int() == EAknSoftkeyYes );
break;
--- a/coreapplicationuis/SysAp/Src/SysApDocument.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/SysApDocument.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -31,7 +31,26 @@
CSysApDocument::~CSysApDocument()
{
}
+/*
+// ---------------------------------------------------------
+// CSysApDocument::ConstructL()
+// ---------------------------------------------------------
+void CSysApDocument::ConstructL()
+ {
+ }
+// ---------------------------------------------------------
+// CSysApDocument::NewL()
+// ---------------------------------------------------------
+CSysApDocument* CSysApDocument::NewL(CEikApplication& aApp) // CSysApp reference
+ {
+ CSysApDocument* self = new (ELeave) CSysApDocument(aApp);
+ CleanupStack::PushL(self);
+ self->ConstructL();
+ CleanupStack::Pop(); // self
+ return self;
+ }
+*/
// ----------------------------------------------------------------------------
// CSysApDocument::CreateAppUiL()
// constructs CSysApUi
@@ -46,7 +65,7 @@
// ----------------------------------------------------------------------------
void CSysApDocument::UpdateTaskNameL( CApaWindowGroupName* aWgName )
{
- CAknDocument::UpdateTaskNameL( aWgName );
+ CEikDocument::UpdateTaskNameL( aWgName );
aWgName->SetHidden( ETrue );
}
--- a/coreapplicationuis/SysAp/Src/SysApEtelSmsStoreObserver.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/SysApEtelSmsStoreObserver.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -211,10 +211,10 @@
if ( info.iTotalEntries > 0 && info.iUsedEntries >= info.iTotalEntries )
{
// Blink the Envelope indicator
- iObserver.iSysApAppUi.SetIndicatorStateL(
+/* iObserver.iSysApAppUi.SetIndicatorStateL(
EAknIndicatorEnvelope, EAknIndicatorStateAnimate );
iObserver.iStoreFull = ETrue;
- }
+*/ }
}
TRACES( RDebug::Print(
--- a/coreapplicationuis/SysAp/Src/SysApFeatureManager.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/SysApFeatureManager.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2003-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"
@@ -23,7 +23,7 @@
#include "SysApFeatureManager.h"
#include "SysAp.hrh"
#include <centralrepository.h>
-#include "CoreApplicationUIsPrivateCRKeys.h"
+#include "coreapplicationuisprivatecrkeys.h"
#include <hwrmlight.h>
#include <AknUtils.h>
@@ -63,10 +63,6 @@
iGripNotSupported = FeatureManager::FeatureSupported( KFeatureIdKeypadNoSlider );
TRACES( RDebug::Print( _L("CSysApFeatureManager::ConstructL: iGripNotSupported=%d"), iGripNotSupported ) );
-// iSlideSupported = FeatureManager::FeatureSupported( KFeatureIdFfCommonSlide );
- iSlideSupported = EFalse;
- TRACES( RDebug::Print( _L("CSysApFeatureManager::ConstructL: iSlideSupported=%d"), iSlideSupported ) );
-
iLocationPrivacySupported = FeatureManager::FeatureSupported( KFeatureIdPrivacyFramework );
TRACES( RDebug::Print( _L("CSysApFeatureManager::ConstructL: Location Privacy supported=%d"), iLocationPrivacySupported ) );
@@ -97,10 +93,10 @@
iNoPowerKeySupported = FeatureManager::FeatureSupported( KFeatureIdNoPowerkey );
TRACES( RDebug::Print( _L("CSysApFeatureManager::ConstructL: No power key supported=%d"), iNoPowerKeySupported ) );
- iFmTxSupported = FeatureManager::FeatureSupported( KFeatureIdFmtx );
- TRACES( RDebug::Print( _L("CSysApFeatureManager::ConstructL: FM TX supported=%d"), iFmTxSupported ) );
+// iFmTxSupported = FeatureManager::FeatureSupported( KFeatureIdFmtx );
+// TRACES( RDebug::Print( _L("CSysApFeatureManager::ConstructL: FM TX supported=%d"), iFmTxSupported ) );
- iPenEnabled = AknLayoutUtils::PenEnabled();
+// iPenEnabled = AknLayoutUtils::PenEnabled();
TRACES( RDebug::Print( _L("CSysApFeatureManager::ConstructL: Pen enabled=%d"), iPenEnabled ) );
iVmbxCallDivertIconSupported = FeatureManager::FeatureSupported( KFeatureIdVmbxCallDivertIcon );
@@ -109,14 +105,8 @@
iTouchUnlockStrokeSupported = FeatureManager::FeatureSupported( KFeatureIdFfTouchUnlockStroke );
TRACES( RDebug::Print( _L("CSysApFeatureManager::ConstructL: Touch unlock stroke supported=%d"), iTouchUnlockStrokeSupported ) );
- iFmTxRdsTextSupported = FeatureManager::FeatureSupported( KFeatureIdFfFmtxRdsText );
- TRACES( RDebug::Print( _L("CSysApFeatureManager::ConstructL: FM TX RDS-TEXT supported=%d"), iFmTxRdsTextSupported ) );
-
- iPowerKeyIsLockKey = FeatureManager::FeatureSupported( KFeatureIdFfPowerKeyAsKeyguard );
- TRACES( RDebug::Print( _L("CSysApFeatureManager::ConstructL: Power Key as keyguard supported=%d"), iPowerKeyIsLockKey ) );
-
- iGanSupported = FeatureManager::FeatureSupported( KFeatureIdFfGenericAccessNetwork );
- TRACES( RDebug::Print( _L("CSysApFeatureManager::ConstructL: GAN supported=%d"), iGanSupported ) );
+// iFmTxRdsTextSupported = FeatureManager::FeatureSupported( KFeatureIdFfFmtxRdsText );
+// TRACES( RDebug::Print( _L("CSysApFeatureManager::ConstructL: FM TX RDS-TEXT supported=%d"), iFmTxRdsTextSupported ) );
CRepository* repository = NULL;
@@ -190,13 +180,12 @@
iGripNotSupported( ETrue ),
iPowerSaveSupported( EFalse ),
iNoPowerKeySupported( EFalse ),
- iFmTxSupported( EFalse ),
+ //iFmTxSupported( EFalse ),
iPenEnabled( EFalse ),
iVmbxCallDivertIconSupported( EFalse ),
- iTouchUnlockStrokeSupported( EFalse ),
- iFmTxRdsTextSupported( EFalse ),
- iPowerKeyIsLockKey ( EFalse ),
- iGanSupported( EFalse )
+ iTouchUnlockStrokeSupported( EFalse )
+ //iFmTxRdsTextSupported( EFalse )
+
{
}
@@ -353,15 +342,6 @@
{
return iGripNotSupported;
}
-
-// ----------------------------------------------------------------------------
-// CSysApFeatureManager::SlideSupported()
-// ----------------------------------------------------------------------------
-//
-TBool CSysApFeatureManager::SlideSupported() const
- {
- return iSlideSupported;
- }
// ----------------------------------------------------------------------------
// CSysApFeatureManager::CoverDisplaySupported()
@@ -389,7 +369,7 @@
{
return iNoPowerKeySupported;
}
-
+/*
// ----------------------------------------------------------------------------
// CSysApFeatureManager::FmTxSupported()
// ----------------------------------------------------------------------------
@@ -398,6 +378,7 @@
{
return iFmTxSupported;
}
+*/
// ----------------------------------------------------------------------------
// CSysApFeatureManager::PenEnabled()
@@ -425,7 +406,7 @@
{
return iTouchUnlockStrokeSupported;
}
-
+/*
// ----------------------------------------------------------------------------
// CSysApFeatureManager::FmTxRdsTextSupported()
// ----------------------------------------------------------------------------
@@ -434,25 +415,7 @@
{
return iFmTxRdsTextSupported;
}
-
-//-----------------------------------------------------------------------------
-// CSysApFeatureManager::PowerKeyIsLockKey()
-//-----------------------------------------------------------------------------
-//
-TBool CSysApFeatureManager::PowerKeyIsLockKey() const
- {
- return iPowerKeyIsLockKey;
- }
-
-// ----------------------------------------------------------------------------
-// CSysApFeatureManager::GanSupported()
-// ----------------------------------------------------------------------------
-//
-TBool CSysApFeatureManager::GanSupported() const
- {
- return iGanSupported;
- }
-
+*/
// End of File
--- a/coreapplicationuis/SysAp/Src/SysApLightsController.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/SysApLightsController.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-2008 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"
@@ -20,7 +20,7 @@
#include <activitymanager.h>
#include "SysApLightsController.h"
#include "SysApAppUi.h"
-#include "CoreApplicationUIsInternalPSKeys.h"
+#include "coreapplicationuisinternalpskeys.h"
#include <e32svr.h>
#include <hwrmdomainpskeys.h>
#include "SysApFeatureManager.h"
@@ -29,9 +29,6 @@
#endif // RD_LIGHT_CONTROL_CHANGE
#include "SysApFeatureManager.h"
-#include "startupdomainpskeys.h"
-#include <hal.h>
-#include <hwrmpowerstatesdkpskeys.h>
// CONSTANTS
@@ -153,7 +150,7 @@
TBool blinkEnabled = ETrue;
- if( iSysApFeatureManager->Supported( KSysApFeatureIdNoFlasUiInSilentMode ) )
+ if( iSysApFeatureManager->Supported( KSysApFeatureIdNoFlasUiInSilentMode ))
{
blinkEnabled = EFalse;
}
@@ -219,13 +216,7 @@
{
iLightPluginHandler->HandleEventNoAction( SysApLightExtension::EChargerConnection, TPckgBuf<TBool>(aConnected) );
}
-#endif // RD_LIGHT_CONTROL_CHANGE
- TInt state( 0 );
- TInt error = RProperty::Get( KPSUidStartup, KPSGlobalSystemState, state );
- if ( error == KErrNone && state == ESwStateCharging )
- {
- EnableActivityManagerL();
- }
+#endif // RD_LIGHT_CONTROL_CHANGE
}
// ----------------------------------------------------------------------------
@@ -978,28 +969,16 @@
return;
}
- TInt err(KErrNone);
- TInt state( 0 );
- TInt error = RProperty::Get( KPSUidStartup, KPSGlobalSystemState, state );
+ TInt err(KErrNone);
- if ( error == KErrNone && state != ESwStateCharging )
- {
#ifdef RD_LIGHT_CONTROL_CHANGE
- if ( !iLightPluginHandler->HandleCommand( SysApLightExtension::ELightCommandOff ) )
- {
- TRAP(err, iLight->LightOffL(CHWRMLight::ESystemTarget));
- }
+ if ( !iLightPluginHandler->HandleCommand( SysApLightExtension::ELightCommandOff ) )
+ {
+ TRAP(err, iLight->LightOffL(CHWRMLight::ESystemTarget));
+ }
#else // RD_LIGHT_CONTROL_CHANGE
- TRAP(err, iLight->LightOffL(CHWRMLight::ESystemTarget));
-#endif // RD_LIGHT_CONTROL_CHANGE
- }
- else
- {
- TRAP(err, iLight->LightOffL(CHWRMLight::ESystemTarget));
- iSysApAppUi.StopChargingBatteryL();
- //To switch off the display
- TInt result = HAL::Set( HALData::EDisplayState, 0 );
- }
+ TRAP(err, iLight->LightOffL(CHWRMLight::ESystemTarget));
+#endif // RD_LIGHT_CONTROL_CHANGE
// Ignore unreserved in use warnings.
if ( err != KErrNone && err != KErrInUse )
{
@@ -1099,23 +1078,6 @@
iLightsCurrentlyOn = ETrue;
iLastLightsOnTime.HomeTime();
}
-
- TInt state( 0 );
- TInt error = RProperty::Get( KPSUidStartup, KPSGlobalSystemState, state );
- if ( error == KErrNone && state == ESwStateCharging )
- {
- TInt value = iSysApAppUi.StateOfProperty( KPSUidHWRMPowerState, KHWRMChargingStatus );
- if (value == EChargingStatusChargingComplete )
- {
- iSysApAppUi.StopChargingBatteryL();
- }
- else
- {
- iSysApAppUi.StartChargingBatteryL();
- //To switch on the display
- TInt result = HAL::Set( HALData::EDisplayState, 1 );
- }
- }
}
else
{
--- a/coreapplicationuis/SysAp/Src/SysApMsgSimMemLowQuery.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/SysApMsgSimMemLowQuery.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -20,7 +20,7 @@
#include <AknGlobalConfirmationQuery.h>
#include "SysApMsgSimMemLowQuery.h"
#include "SysAp.hrh"
-#include <secondarydisplay/SecondaryDisplaySysApAPI.h>
+#include <SecondaryDisplay/SecondaryDisplaySysApAPI.h>
#include <aknSDData.h>
// ============================ MEMBER FUNCTIONS ==============================
--- a/coreapplicationuis/SysAp/Src/SysApNspsAnim.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/SysApNspsAnim.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -19,7 +19,7 @@
// INCLUDE FILES
#include "SysApNspsAnim.h" // This
#include <coecntrl.h> // CCoeControl
-#include "NspsWsPluginDllStd.h" // Command
+#include "nspswsplugindllstd.h" // Command
// ============================ MEMBER FUNCTIONS ==============================
--- a/coreapplicationuis/SysAp/Src/SysApPubSubObserver.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/SysApPubSubObserver.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-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"
@@ -20,7 +20,7 @@
#include <e32property.h>
#include <sacls.h>
#include <startupdomainpskeys.h>
-#include "CoreApplicationUIsPrivatePSKeys.h"
+#include "coreapplicationuisprivatepskeys.h"
#include <ctsydomainpskeys.h>
#include <wlaninternalpskeys.h>
#include <connect/sbdefs.h>
@@ -30,14 +30,15 @@
#include "SysApAppUi.h"
#include "SysApFeatureManager.h"
#include <ir_sock.h>
-#include <NetworkHandlingDomainPSKeys.h>
+#include <networkhandlingdomainpskeys.h>
#include <hwrmdomainpskeys.h>
#include <DataSyncInternalPSKeys.h>
-#include <hwrmfmtxdomainpskeys.h>
-#include <hwrmfmtx.h>
+//#include <hwrmfmtxdomainpskeys.h>
+//#include <hwrmfmtx.h>
#include "sysapremconobserver.h"
#include <lbs/locationfwdomainpskeys.h>
#include <smsuaddr.h>
+#include <avkondomainpskeys.h>
#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
#include <ASShdAlarm.h>
@@ -47,11 +48,14 @@
#include <asshdalarm.h>
#endif //SYMBIAN_ENABLE_SPLIT_HEADERS
-
// CONSTANTS
const TUint KCoreAppUIsMmcRemovedWithoutEjectCmdMask = 0xFFFF;
const TUint KCoreAppUIsMmcRemovedWithoutEjectValShift = 16;
+_LIT(KGpsIndicatorPlugin, "com.nokia.positioning.indicatorplugin/1.0");
+const TUid KPSUidSecurityUIs = { 0x100059b5 };
+const TUint32 KSecurityUIsLights = 0x00000308;
+
// ============================ MEMBER FUNCTIONS ==============================
// ----------------------------------------------------------------------------
@@ -93,10 +97,10 @@
iOutboxStatusSubscriber->Subscribe();
iIrdaStatusSubscriber = CSysApSubscriber::NewL( *this, KIrdaPropertyCategory, KIrdaStatus );
iIrdaStatusSubscriber->Subscribe();
- iGprsStatusSubscriber = CSysApSubscriber::NewL( *this, KUidSystemCategory, KPSUidGprsStatusValue );
- iGprsStatusSubscriber->Subscribe();
- iWcdmaStatusSubscriber = CSysApSubscriber::NewL( *this, KUidSystemCategory, KPSUidWcdmaStatusValue );
- iWcdmaStatusSubscriber->Subscribe();
+// iGprsStatusSubscriber = CSysApSubscriber::NewL( *this, KUidSystemCategory, KPSUidGprsStatusValue );
+// iGprsStatusSubscriber->Subscribe();
+// iWcdmaStatusSubscriber = CSysApSubscriber::NewL( *this, KUidSystemCategory, KPSUidWcdmaStatusValue );
+// iWcdmaStatusSubscriber->Subscribe();
iLocationGlobalPrivacySubscriber = CSysApSubscriber::NewL( *this, KUidSystemCategory, KPSUidLocationGlobalPrivacyValue );
iLocationGlobalPrivacySubscriber->Subscribe();
iRestoreBackupSubscriber = CSysApSubscriber::NewL( *this, KUidSystemCategory, conn::KUidBackupRestoreKey );
@@ -166,14 +170,14 @@
iFlipStatusSubscriber = CSysApSubscriber::NewL( *this, KPSUidHWRM, KHWRMFlipStatus );
iFlipStatusSubscriber->Subscribe();
- if ( iSysApAppUi.SysApFeatureManager().FmTxSupported() )
+/* if ( iSysApAppUi.SysApFeatureManager().FmTxSupported() )
{
// Category KHWRMFmTxStatus
iFmTxStatusSubscriber = CSysApSubscriber::NewL( *this, KPSUidHWRMFmTx, KHWRMFmTxStatus );
iFmTxStatusSubscriber->Subscribe();
iPreviousFmTxPSValue = EFmTxStateUnknown;
}
-
+*/
iSyncStatusSubscriber = CSysApSubscriber::NewL( *this, KPSUidDataSynchronizationInternalKeys, KDataSyncStatus );
iSyncStatusSubscriber->Subscribe();
@@ -185,6 +189,15 @@
iSmsPhoneStoreSubscriber = CSysApSubscriber::NewL( *this, KUidPSSMSStackCategory, KUidPSSMSStackDiskSpaceMonitorKey );
iSmsPhoneStoreSubscriber->Subscribe();
+
+ iKeylockEventSubscriber = CSysApSubscriber::NewL( *this, KPSUidAvkonDomain, KAknKeyguardStatus );
+ iKeylockEventSubscriber->Subscribe();
+
+ iLightsOnRequestSubscriber = CSysApSubscriber::NewL( *this, KPSUidSecurityUIs, KSecurityUIsLights );
+ iLightsOnRequestSubscriber->Subscribe();
+
+ iPowerMenuCustomDialogSubscriber = CSysApSubscriber::NewL( *this, KPSUidCoreApplicationUIs, KCoreAppUIsPowerMenuCustomDialogStatus );
+ iPowerMenuCustomDialogSubscriber->Subscribe();
}
// ----------------------------------------------------------------------------
@@ -202,8 +215,8 @@
delete iInboxStatusSubscriber;
delete iOutboxStatusSubscriber;
delete iIrdaStatusSubscriber;
- delete iGprsStatusSubscriber;
- delete iWcdmaStatusSubscriber;
+// delete iGprsStatusSubscriber;
+// delete iWcdmaStatusSubscriber;
delete iHomeZoneStatusSubscriber;
delete iNewEmailStatusSubscriber;
delete iLocationGlobalPrivacySubscriber;
@@ -230,12 +243,15 @@
delete iNetworkModeSubscriber;
delete iWlanIndicatorSubscriber;
delete iFlipStatusSubscriber;
- delete iFmTxStatusSubscriber;
- delete iFmTxRemConObserver;
+// delete iFmTxStatusSubscriber;
+// delete iFmTxRemConObserver;
delete iSyncStatusSubscriber;
delete iVideoSharingIndicatorSubscriber;
delete iGpsIndicatorSubscriber;
delete iSmsPhoneStoreSubscriber;
+ delete iKeylockEventSubscriber;
+ delete iLightsOnRequestSubscriber;
+ delete iPowerMenuCustomDialogSubscriber;
}
@@ -302,10 +318,11 @@
{
HandleHwrmCategoryL( aKey, value );
}
- else if ( aCategory == KPSUidHWRMFmTx )
+/* else if ( aCategory == KPSUidHWRMFmTx )
{
HandleHwrmFmTxCategoryL( aKey, value );
}
+*/
else if ( aCategory == KPSUidDataSynchronizationInternalKeys )
{
HandleDataSyncCategoryL( aKey, value );
@@ -318,6 +335,14 @@
{
HandleSmsStackCategoryL( aKey, value );
}
+ else if ( aCategory == KPSUidAvkonDomain)
+ {
+ HandleLKeylockEventL( aKey, value );
+ }
+ else if ( aCategory == KPSUidSecurityUIs)
+ {
+ HandleLightsOnRequestL( aKey, value );
+ }
}
// ----------------------------------------------------------------------------
// CSysApPubSubObserver::HandleCoreAppUIsCategoryL()
@@ -361,15 +386,15 @@
case KCoreAppUIsUipInd:
if ( aValue == ECoreAppUIsDoNotShow )
{
- iSysApAppUi.SetIndicatorStateL( EAknIndicatorInstantMessage, EAknIndicatorStateOff );
+ // iSysApAppUi.SetIndicatorStateL( EAknIndicatorInstantMessage, EAknIndicatorStateOff );
}
else if ( aValue == ECoreAppUIsShow )
{
- iSysApAppUi.SetIndicatorStateL( EAknIndicatorInstantMessage, EAknIndicatorStateOn );
+// iSysApAppUi.SetIndicatorStateL( EAknIndicatorInstantMessage, EAknIndicatorStateOn );
}
break;
case KCoreAppUIsMessageToneQuit:
- iSysApAppUi.HandleMessageTonePlayingQuitability( aValue );
+ // iSysApAppUi.HandleMessageTonePlayingQuitability( aValue );
break;
case KCoreAppUIsNspsRawKeyEvent:
iSysApAppUi.HandleNspsRawKeyEventL();
@@ -401,11 +426,11 @@
case KCoreAppUIsNewEmailStatus:
if ( aValue == ECoreAppUIsNewEmail )
{
- iSysApAppUi.SetIndicatorStateL( EAknIndicatorEmailMessage, EAknIndicatorStateOn );
+ // iSysApAppUi.SetIndicatorStateL( EAknIndicatorEmailMessage, EAknIndicatorStateOn );
}
else if ( aValue == ECoreAppUIsNoNewEmail )
{
- iSysApAppUi.SetIndicatorStateL( EAknIndicatorEmailMessage, EAknIndicatorStateOff );
+ // iSysApAppUi.SetIndicatorStateL( EAknIndicatorEmailMessage, EAknIndicatorStateOff );
}
break;
@@ -423,68 +448,104 @@
case KCoreAppUIsPoCIndicator:
if ( aValue == ECoreAppUIsPocIndicatorOff || aValue == ECoreAppUIsPocIndicatorUninitialized )
{
- iSysApAppUi.SetIndicatorStateL( EAknIndicatorPoC, EAknIndicatorStateOff );
- iSysApAppUi.SetIndicatorStateL( EAknIndicatorPoCDnD, EAknIndicatorStateOff );
+ // iSysApAppUi.SetIndicatorStateL( EAknIndicatorPoC, EAknIndicatorStateOff );
+ // iSysApAppUi.SetIndicatorStateL( EAknIndicatorPoCDnD, EAknIndicatorStateOff );
}
else if ( aValue == ECoreAppUIsPocIndicatorDoNotDisturb )
{
- iSysApAppUi.SetIndicatorStateL( EAknIndicatorPoC, EAknIndicatorStateOff );
- iSysApAppUi.SetIndicatorStateL( EAknIndicatorPoCDnD, EAknIndicatorStateOn );
+ // iSysApAppUi.SetIndicatorStateL( EAknIndicatorPoC, EAknIndicatorStateOff );
+ // iSysApAppUi.SetIndicatorStateL( EAknIndicatorPoCDnD, EAknIndicatorStateOn );
}
else if ( aValue == ECoreAppUIsPocIndicatorConnectionOn )
{
- iSysApAppUi.SetIndicatorStateL( EAknIndicatorPoC, EAknIndicatorStateOn );
- iSysApAppUi.SetIndicatorStateL( EAknIndicatorPoCDnD, EAknIndicatorStateOff );
+// iSysApAppUi.SetIndicatorStateL( EAknIndicatorPoC, EAknIndicatorStateOn );
+// iSysApAppUi.SetIndicatorStateL( EAknIndicatorPoCDnD, EAknIndicatorStateOff );
}
break;
case KCoreAppUIsPoCMissedIndicator:
if ( aValue == ECoreAppUIsPocMissedIndicatorOff || aValue == ECoreAppUIsPocMissedIndicatorUninitialized )
{
- iSysApAppUi.SetIndicatorStateL( EAknIndicatorPoCMissed, EAknIndicatorStateOff );
+ // iSysApAppUi.SetIndicatorStateL( EAknIndicatorPoCMissed, EAknIndicatorStateOff );
}
else if ( aValue == ECoreAppUIsPocMissedIndicatorOn )
{
- iSysApAppUi.SetIndicatorStateL( EAknIndicatorPoCMissed, EAknIndicatorStateOn );
+ // iSysApAppUi.SetIndicatorStateL( EAknIndicatorPoCMissed, EAknIndicatorStateOn );
}
break;
case KCoreAppUIsTarmIndicator:
- iSysApAppUi.HandleTarmIndicatorL( aValue );
+ // iSysApAppUi.HandleTarmIndicatorL( aValue );
break;
case KCoreAppUIsMtvRecStatus:
if ( aValue == ECoreAppUIsMtvRecStatusOn )
{
- iSysApAppUi.SetIndicatorStateL( EAknIndicatorMobileTVRec, EAknIndicatorStateOn );
+ // iSysApAppUi.SetIndicatorStateL( EAknIndicatorMobileTVRec, EAknIndicatorStateOn );
}
else if ( aValue == ECoreAppUIsMtvRecStatusOff || aValue == ECoreAppUIsMtvRecStatusUninitialized )
{
- iSysApAppUi.SetIndicatorStateL( EAknIndicatorMobileTVRec, EAknIndicatorStateOff );
+ // iSysApAppUi.SetIndicatorStateL( EAknIndicatorMobileTVRec, EAknIndicatorStateOff );
}
break;
case KCoreAppUIsMtvDvbhStatus:
if ( aValue == ECoreAppUIsMtvDvbhStatusOn )
{
- iSysApAppUi.SetIndicatorStateL( EAknIndicatorMobileTV, EAknIndicatorStateOn );
+ // iSysApAppUi.SetIndicatorStateL( EAknIndicatorMobileTV, EAknIndicatorStateOn );
}
else if ( aValue == ECoreAppUIsMtvDvbhStatusOff || aValue == ECoreAppUIsMtvDvbhStatusUninitialized )
{
- iSysApAppUi.SetIndicatorStateL( EAknIndicatorMobileTV, EAknIndicatorStateOff );
+// iSysApAppUi.SetIndicatorStateL( EAknIndicatorMobileTV, EAknIndicatorStateOff );
}
break;
case KCoreAppUIsVideoSharingIndicator:
if ( aValue == ECoreAppUIsVideoSharingIndicatorOn )
{
- iSysApAppUi.SetIndicatorStateL( EAknIndicatorVideoSharing, EAknIndicatorStateOn );
+ // iSysApAppUi.SetIndicatorStateL( EAknIndicatorVideoSharing, EAknIndicatorStateOn );
}
else if ( aValue == ECoreAppUIsVideoSharingIndicatorOff || aValue == ECoreAppUIsVideoSharingIndicatorUninitialized )
{
- iSysApAppUi.SetIndicatorStateL( EAknIndicatorVideoSharing, EAknIndicatorStateOff );
+ // iSysApAppUi.SetIndicatorStateL( EAknIndicatorVideoSharing, EAknIndicatorStateOff );
}
break;
-
+
+ case KCoreAppUIsPowerMenuCustomDialogStatus:
+ if ( aValue == ECoreAppUIsPowerMenuCustomDialogOn )
+ {
+ TBool powerMenuMemoryStatus = EFalse;
+ powerMenuMemoryStatus = iSysApAppUi.ReleasePowerMenuCustomDialogMemory();
+ if(powerMenuMemoryStatus)
+ {
+ RProperty::Set( KPSUidCoreApplicationUIs, KCoreAppUIsPowerMenuCustomDialogStatus, ECoreAppUIsPowerMenuCustomDialogOff );
+ }
+ }
+ else if(aValue == ECoreAppUIsMemoryCardCustomDialogOk)
+ {
+ TRACES( RDebug::Print(_L("CSysApAppUi::ECoreAppUIsMemoryCardCustomDialogOk") ) );
+ TBool memoryCardStatus = EFalse;
+ memoryCardStatus = iSysApAppUi.NotifiedDialogIfRequiredAndReleaseMemory();
+ if(memoryCardStatus)
+ {
+ TRACES( RDebug::Print(_L("CSysApAppUi::ECoreAppUIsMemoryCardCustomDialogOn: memoryCardStatus Begin") ) );
+ RProperty::Set( KPSUidCoreApplicationUIs, KCoreAppUIsPowerMenuCustomDialogStatus, ECoreAppUIsPowerMenuCustomDialogOff );
+ TRACES( RDebug::Print(_L("CSysApAppUi::ECoreAppUIsMemoryCardCustomDialogOn: memoryCardStatus end") ) );
+ }
+ TRACES( RDebug::Print(_L("CSysApAppUi::ECoreAppUIsMemoryCardCustomDialogOn: memoryCardStatus final end") ) );
+
+ }
+ else if(aValue == ECoreAppUIsMemoryCardCustomDialogCancel)
+ {
+ TRACES( RDebug::Print(_L("CSysApAppUi::ECoreAppUIsMemoryCardCustomDialogCancel") ) );
+ iSysApAppUi.ReleaseMemoryForMemoryCardDialog();
+ RProperty::Set( KPSUidCoreApplicationUIs, KCoreAppUIsPowerMenuCustomDialogStatus, ECoreAppUIsPowerMenuCustomDialogOff );
+ }
+ else if ( aValue == ECoreAppUIsPowerMenuCustomDialogOff || aValue == ECoreAppUIsPowerMenuCustomDialogUninitialized )
+ {
+ // do nothing
+ }
+ break;
+
default:
break;
}
@@ -525,43 +586,43 @@
switch ( aKey )
{
case KUidInboxStatusValue:
- iSysApAppUi.SetEnvelopeIndicatorL();
+// iSysApAppUi.SetEnvelopeIndicatorL();
break;
case KUidOutboxStatusValue:
if ( aValue == ESADocumentsInOutbox )
{
- iSysApAppUi.SetIndicatorStateL( EAknIndicatorOutbox, EAknIndicatorStateOn );
+ // iSysApAppUi.SetIndicatorStateL( EAknIndicatorOutbox, EAknIndicatorStateOn );
}
//Hide the Outbox indicator
else if ( aValue == ESAOutboxEmpty )
{
- iSysApAppUi.SetIndicatorStateL( EAknIndicatorOutbox, EAknIndicatorStateOff );
+// iSysApAppUi.SetIndicatorStateL( EAknIndicatorOutbox, EAknIndicatorStateOff );
}
break;
case KIrdaStatus:
if ( aValue == TIrdaStatusCodes::EIrLoaded || aValue == TIrdaStatusCodes::EIrBlocked || aValue == TIrdaStatusCodes::EIrDisconnected )
{
- iSysApAppUi.SetIndicatorStateL( EAknIndicatorIrActive, EAknIndicatorStateAnimate );
+ // iSysApAppUi.SetIndicatorStateL( EAknIndicatorIrActive, EAknIndicatorStateAnimate );
}
else if ( aValue == TIrdaStatusCodes::EIrConnected )
{
- iSysApAppUi.SetIndicatorStateL( EAknIndicatorIrActive, EAknIndicatorStateOn );
+ // iSysApAppUi.SetIndicatorStateL( EAknIndicatorIrActive, EAknIndicatorStateOn );
}
else if ( aValue == TIrdaStatusCodes::EIrUnloaded )
{
- iSysApAppUi.SetIndicatorStateL( EAknIndicatorIrActive, EAknIndicatorStateOff );
+ // iSysApAppUi.SetIndicatorStateL( EAknIndicatorIrActive, EAknIndicatorStateOff );
}
break;
- case KPSUidGprsStatusValue:
- case KPSUidWcdmaStatusValue:
- iSysApAppUi.SetSignalIndicatorL();
- break;
+// case KPSUidGprsStatusValue:
+ // case KPSUidWcdmaStatusValue:
+ // iSysApAppUi.SetSignalIndicatorL();
+// break;
case KPSUidLocationGlobalPrivacyValue:
- iSysApAppUi.HandleLocationPrivacyIndicatorL( aValue );
+// iSysApAppUi.HandleLocationPrivacyIndicatorL( aValue );
break;
case conn::KUidBackupRestoreKey:
@@ -594,7 +655,7 @@
switch ( aKey )
{
case KHWRMBatteryLevel:
- iSysApAppUi.UpdateBatteryBarsL( aValue );
+ // iSysApAppUi.UpdateBatteryBarsL( aValue );
break;
case KHWRMBatteryStatus:
@@ -609,7 +670,7 @@
break;
}
}
-
+/*
// ----------------------------------------------------------------------------
// CSysApPubSubObserver::HandleHwrmFmTxCategoryL()
// ----------------------------------------------------------------------------
@@ -642,17 +703,17 @@
TRACES(RDebug::Print(_L("CSysApPubSubObserver::HandleHwrmFmTxCategoryL Active/Inactive -> Off transition")));
// turn any FM TX indicators off
- iSysApAppUi.SetIndicatorStateL( KFmTxActiveIndicator, EAknIndicatorStateOff );
- iSysApAppUi.SetIndicatorStateL( KFmTxNotSendingIndicator, EAknIndicatorStateOff );
+// iSysApAppUi.SetIndicatorStateL( KFmTxActiveIndicator, EAknIndicatorStateOff );
+// iSysApAppUi.SetIndicatorStateL( KFmTxNotSendingIndicator, EAknIndicatorStateOff );
// give notification
if ( aValue == EFmTxStatePowerSaveAccessory )
{
- iSysApAppUi.ShowUiNoteL( EFmTxAccessoryStandbyNote );
+// iSysApAppUi.ShowUiNoteL( EFmTxAccessoryStandbyNote );
}
else
{
- iSysApAppUi.ShowUiNoteL( EFmTxOffNote );
+ // iSysApAppUi.ShowUiNoteL( EFmTxOffNote );
}
isFmTxTurnedOff = ETrue;
}
@@ -662,8 +723,8 @@
TRACES(RDebug::Print(_L("CSysApPubSubObserver::HandleHwrmFmTxCategoryL Active -> Inactive transition")));
// enable not sending indicator
- iSysApAppUi.SetIndicatorStateL( KFmTxActiveIndicator, EAknIndicatorStateOff );
- iSysApAppUi.SetIndicatorStateL( KFmTxNotSendingIndicator, EAknIndicatorStateOn );
+// iSysApAppUi.SetIndicatorStateL( KFmTxActiveIndicator, EAknIndicatorStateOff );
+// iSysApAppUi.SetIndicatorStateL( KFmTxNotSendingIndicator, EAknIndicatorStateOn );
}
else if ( aValue == EFmTxStateActive )
{
@@ -671,8 +732,8 @@
TRACES(RDebug::Print(_L("CSysApPubSubObserver::HandleHwrmFmTxCategoryL Inactive -> Active transition")));
// enable active indicator
- iSysApAppUi.SetIndicatorStateL( KFmTxNotSendingIndicator, EAknIndicatorStateOff );
- iSysApAppUi.SetIndicatorStateL( KFmTxActiveIndicator, EAknIndicatorStateOn );
+// iSysApAppUi.SetIndicatorStateL( KFmTxNotSendingIndicator, EAknIndicatorStateOff );
+// iSysApAppUi.SetIndicatorStateL( KFmTxActiveIndicator, EAknIndicatorStateOn );
}
break;
@@ -689,11 +750,11 @@
TRACES(RDebug::Print(_L("CSysApPubSubObserver::HandleHwrmFmTxCategoryL Off -> Active transition")));
// enable active indicator
- iSysApAppUi.SetIndicatorStateL( KFmTxNotSendingIndicator, EAknIndicatorStateOff );
- iSysApAppUi.SetIndicatorStateL( KFmTxActiveIndicator, EAknIndicatorStateOn );
+ // iSysApAppUi.SetIndicatorStateL( KFmTxNotSendingIndicator, EAknIndicatorStateOff );
+ // iSysApAppUi.SetIndicatorStateL( KFmTxActiveIndicator, EAknIndicatorStateOn );
// give notification
- iSysApAppUi.ShowUiNoteL( EFmTxOnNote );
+ // iSysApAppUi.ShowUiNoteL( EFmTxOnNote );
isFmTxTurnedOn = ETrue;
}
else if ( aValue == EFmTxStateInactive || aValue == EFmTxStateScanning )
@@ -702,34 +763,17 @@
TRACES(RDebug::Print(_L("CSysApPubSubObserver::HandleHwrmFmTxCategoryL Off -> Inactive transition")));
// enable not sending indicator
- iSysApAppUi.SetIndicatorStateL( KFmTxActiveIndicator, EAknIndicatorStateOff );
- iSysApAppUi.SetIndicatorStateL( KFmTxNotSendingIndicator, EAknIndicatorStateOn );
+// iSysApAppUi.SetIndicatorStateL( KFmTxActiveIndicator, EAknIndicatorStateOff );
+ // iSysApAppUi.SetIndicatorStateL( KFmTxNotSendingIndicator, EAknIndicatorStateOn );
// give notification
- iSysApAppUi.ShowUiNoteL( EFmTxOnNote );
+ // iSysApAppUi.ShowUiNoteL( EFmTxOnNote );
isFmTxTurnedOn = ETrue;
}
break;
}
-
- if ( aValue == EFmTxStateActive )
- {
- if(iFmTxRemConObserver)
- {
- //Open Remcon and reserve the volume keys
- iFmTxRemConObserver->StartRemconInterfaceL();
- }
- }
- else
- {
- if(iFmTxRemConObserver)
- {
- //Disconnect from Remcon and release keys for other apps like phone app during call
- iFmTxRemConObserver->StopRemconInterface();
- }
- }
-
+
if ( isFmTxTurnedOn )
{
if ( !iFmTxRemConObserver )
@@ -767,6 +811,7 @@
iPreviousFmTxPSValue = aValue;
}
}
+*/
// ----------------------------------------------------------------------------
// CSysApPubSubObserver::HandleWlanCategoryL()
@@ -810,16 +855,16 @@
case KNWHomeZoneStatus:
if ( aValue == ENWHomeZone )
{
- iSysApAppUi.SetIndicatorStateL( EAknIndicatorHomeZone, EAknIndicatorStateOn );
+ // iSysApAppUi.SetIndicatorStateL( EAknIndicatorHomeZone, EAknIndicatorStateOn );
}
else if ( aValue == ENWNone || aValue == ENWCityZone )
{
- iSysApAppUi.SetIndicatorStateL( EAknIndicatorHomeZone, EAknIndicatorStateOff );
+ // iSysApAppUi.SetIndicatorStateL( EAknIndicatorHomeZone, EAknIndicatorStateOff );
}
break;
case KNWTelephonyNetworkMode:
- iSysApAppUi.SetSignalIndicatorL();
+ // iSysApAppUi.SetSignalIndicatorL();
break;
default:
@@ -837,11 +882,11 @@
case KHWRMFlipStatus:
if ( aValue == EPSHWRMFlipClosed )
{
- iSysApAppUi.SimulateFlipKeyEventL( EFalse );
+ // iSysApAppUi.SimulateFlipKeyEventL( EFalse );
}
else if ( aValue == EPSHWRMFlipOpen )
{
- iSysApAppUi.SimulateFlipKeyEventL( ETrue );
+ // iSysApAppUi.SimulateFlipKeyEventL( ETrue );
}
break;
@@ -860,11 +905,11 @@
case KDataSyncStatus:
if ( aValue > EDataSyncNotRunning )
{
- iSysApAppUi.SetIndicatorStateL( EAknIndicatorSynchronization , EAknIndicatorStateOn );
+ // iSysApAppUi.SetIndicatorStateL( EAknIndicatorSynchronization , EAknIndicatorStateOn );
}
else
{
- iSysApAppUi.SetIndicatorStateL( EAknIndicatorSynchronization, EAknIndicatorStateOff );
+ // iSysApAppUi.SetIndicatorStateL( EAknIndicatorSynchronization, EAknIndicatorStateOff );
}
break;
@@ -884,15 +929,17 @@
case KPosIntGpsHwStatus:
if ( aValue == EPosIntGpsHwOff )
{
- iSysApAppUi.SetIndicatorStateL( EAknIndicatorGPS, EAknIndicatorStateOff );
+ iSysApAppUi.iHbIndicatorSymbian->Deactivate(KGpsIndicatorPlugin);
+ // iSysApAppUi.SetIndicatorStateL( EAknIndicatorGPS, EAknIndicatorStateOff );
}
else if ( aValue == EPosIntGpsHwOn )
{
- iSysApAppUi.SetIndicatorStateL( EAknIndicatorGPS, EAknIndicatorStateOn );
+ iSysApAppUi.iHbIndicatorSymbian->Activate(KGpsIndicatorPlugin);
+ // iSysApAppUi.SetIndicatorStateL( EAknIndicatorGPS, EAknIndicatorStateOn );
}
else if ( aValue == EPosIntGpsHwIntermediate )
{
- iSysApAppUi.SetIndicatorStateL( EAknIndicatorGPS, EAknIndicatorStateAnimate );
+ // iSysApAppUi.SetIndicatorStateL( EAknIndicatorGPS, EAknIndicatorStateAnimate );
}
break;
@@ -909,8 +956,8 @@
{
switch ( aKey )
{
- case KUidPSSMSStackDiskSpaceMonitorKey:
- iSysApAppUi.SetEnvelopeIndicatorL();
+ case KAknKeyguardStatus:
+ // iSysApAppUi.SetEnvelopeIndicatorL();
break;
default:
@@ -918,7 +965,39 @@
}
}
-// End of File
+void CSysApPubSubObserver::HandleLKeylockEventL( const TUint /* aKey */, const TInt aValue )
+ {
+ switch( aValue )
+ {
+ case EEikKeyLockEnabled:
+ iSysApAppUi.SetKeyLockEnabledL();
+ break;
+ case EEikKeyLockDisabled:
+ iSysApAppUi.SetKeyLockDisabledL();
+ break;
+ default:
+ break;
+ }
+ }
+void CSysApPubSubObserver::HandleLightsOnRequestL( const TUint /* aKey */, const TInt aValue )
+ {
+ switch ( aValue )
+ {
+ case EEikKeyLockLightsOnRequest:
+ iSysApAppUi.SetLightsOnUnlockNoteL();
+ break;
+ case EEikEcsQueryLights: // emergency note is shown
+ iSysApAppUi.SetLightsOnEcsQueryL();
+ break;
+ case EEikSecurityQueryLights: // for device lock security query
+ iSysApAppUi.SetLightsOnSecurityQueryL();
+ break;
+ default:
+ break;
+ }
+ }
+
+// End of File
--- a/coreapplicationuis/SysAp/Src/SysApSatObserver.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/SysApSatObserver.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009-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"
--- a/coreapplicationuis/SysAp/Src/SysApShutdownAnimation.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/SysApShutdownAnimation.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -21,13 +21,21 @@
#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION
-#include <aknappui.h>
-#include <secondarydisplay/SecondaryDisplayStartupAPI.h>
+//#include <aknappui.h>
+#include <sysapappui.h>
+#include <SecondaryDisplay/SecondaryDisplayStartupAPI.h>
#include <startupdomaincrkeys.h>
#include "SysApShutdownAnimation.h"
#include "SysApShutdownImage.h"
#include "SysAp.hrh"
+#include <eikdef.h>
+#include <eikenv.h>
+#include <coemain.h>
+#include <coecntrl.h>
+#include <coeaui.h>
+
+#define iSysApUiHandle ((CSysApAppUi*)CEikonEnv::Static()->EikAppUi())
// ======== MEMBER FUNCTIONS ========
@@ -99,8 +107,11 @@
iCtrl = NULL;
}
- iAvkonAppUi->StatusPane()->MakeVisible( EFalse );
- iView.SetRect( iAvkonAppUi->ApplicationRect() );
+// iAvkonAppUi->StatusPane()->MakeVisible( EFalse );
+// iView.SetRect( iAvkonAppUi->ApplicationRect() );
+// iAvkonAppUi->StatusPane()->MakeVisible( EFalse );
+// iSysApUiHandle->StatusPane()->MakeVisible( EFalse );
+ iView.SetRectForAnimation();
iState = ELoading;
TRAPD( errorCode, iCtrl = CSAnimStartupCtrl::NewL( iView.Rect(), iView ) );
--- a/coreapplicationuis/SysAp/Src/SysApShutdownImage.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/SysApShutdownImage.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -17,15 +17,20 @@
// INCLUDE FILES
-#include <aknappui.h>
-#include <AknIconUtils.h>
-#include <AknUtils.h>
+//#include <aknappui.h>
+//#include <AknIconUtils.h>
+//#include <AknUtils.h>
+#include <eikenv.h>
#include <coemain.h>
#include <barsread.h> //use of TResourceReader
-#include <sysap.mbg>
+//#include <sysap.mbg>
#include "SysApShutdownImage.h"
#include "SysAp.hrh"
#include <data_caging_path_literals.hrh>
+#include <HbDeviceMessageBoxSymbian.h>
+#include <SVGEngineInterfaceImpl.h>
+
+//_LIT(KDC_APP_BITMAP_DIR,"\\resource\\apps\\");
// ============================ MEMBER FUNCTIONS ==============================
@@ -69,14 +74,18 @@
void CSysApShutdownImage::ShowShutdownImageL(TInt aBitmapId)
{
TRACES( RDebug::Print(_L("CSysApShutdownImage::ShowShutdownImageL:start" ) ) );
+
TInt err ( 0 );
+ TRect rect(iCoeEnv->ScreenDevice()->SizeInPixels());
+ SetRect(rect);
+ TRACES( RDebug::Print(_L("CSysApShutdownImage::After:SetRect --Minus one" ) ) );
+ ActivateL();
- SetRect(iAvkonAppUi->ApplicationRect());
- ActivateL();
+ TRACES( RDebug::Print(_L("CSysApShutdownImage::After:ActivateL --Zero" ) ) );
if ( aBitmapId )
{
- _LIT( KDirAndFile, "z:sysap.mif" );
+ _LIT( KDirAndFile, "z:qgn_sysap_screen.svg" );
TParse* fp = new (ELeave) TParse();
CleanupStack::PushL(fp);
fp->Set( KDirAndFile, &KDC_APP_BITMAP_DIR, NULL );
@@ -99,27 +108,35 @@
delete iBitmap;
iBitmap = NULL;
// Ownership of bitmap is transferred to CSysApShutdownImage in CreateIconL
- iBitmap = AknIconUtils::CreateIconL( fp->FullName(), aBitmapId );
- TAknLayoutRect bitmapRect;
- bitmapRect.LayoutRect( Rect(), AKN_LAYOUT_WINDOW_screen );
- AknIconUtils::SetSize( iBitmap, bitmapRect.Rect().Size(), EAspectRatioPreservedAndUnusedSpaceRemoved );
+ iBitmap = ReadSVGL(fp->FullName());
+ TRACES( RDebug::Print(_L("CSysApShutdownImage::After:ReadSVGL --First" ) ) );
TInt xDelta=0; // for x coordinates
TInt yDelta=0; // for y coordinates
TSize bmpSizeInPixels = iBitmap->SizeInPixels();
+ TRACES( RDebug::Print(_L("CSysApShutdownImage::After:SizeInPixels --Second" ) ) );
//center image to the center of the screen
TRect rect = Rect();
xDelta=( rect.Width() - bmpSizeInPixels.iWidth ) / 2;
yDelta=( rect.Height() - bmpSizeInPixels.iHeight ) / 2;
TPoint pos = TPoint( xDelta , yDelta ); // displacement vector
//pos += rect.iTl; // bitmap top left corner position
+ TRACES( RDebug::Print(_L("CSysApShutdownImage::After:TPoint --Three" ) ) );
CWindowGc& gc = SystemGc();
+ TRACES( RDebug::Print(_L("CSysApShutdownImage::After:SystemGc --Four" ) ) );
ActivateGc();
+ TRACES( RDebug::Print(_L("CSysApShutdownImage::After:ActivateGc --Five" ) ) );
Window().Invalidate( rect );
+ TRACES( RDebug::Print(_L("CSysApShutdownImage::After:Invalidate --Six" ) ) );
Window().BeginRedraw( rect );
+ TRACES( RDebug::Print(_L("CSysApShutdownImage::After:BeginRedraw --Seven" ) ) );
gc.Clear();
+ TRACES( RDebug::Print(_L("CSysApShutdownImage::After:gc.Clear --Eight" ) ) );
gc.BitBlt( pos, iBitmap ); // CWindowGc member function
+ TRACES( RDebug::Print(_L("CSysApShutdownImage::After:gc.BitBlt --Nine" ) ) );
Window().EndRedraw();
+ TRACES( RDebug::Print(_L("CSysApShutdownImage::After:gc.EndRedraw --Ten" ) ) );
DeactivateGc();
+ TRACES( RDebug::Print(_L("CSysApShutdownImage::After:gc.DeactivateGc --Eleven" ) ) );
ControlEnv()->WsSession().Flush(); // force draw of the context
TRACES( RDebug::Print(_L("CSysApShutdownImage::ShowShutdownImageL:end" ) ) );
}
@@ -144,7 +161,60 @@
ControlEnv()->WsSession().Flush(); // force draw of the context
#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
}
+ }
+// ----------------------------------------------------------------------------
+// CSysApShutdownImage::ShowShutdownImage()
+// ----------------------------------------------------------------------------
+CFbsBitmap* CSysApShutdownImage::ReadSVGL (TFileName aFileName)
+ {
+ TRACES( RDebug::Print(_L("CSysApShutdownImage::ReadSVGL:start" ) ) );
+ TFontSpec fontspec;
+ TDisplayMode mode = EColor16MA;
+ TInt SIZE_X(360), SIZE_Y(360);
+ TSize size(SIZE_X, SIZE_Y);
+
+ //if ( mode >= (TDisplayMode)13 ) { mode = EColor16MA; }
+
+ CFbsBitmap* frameBuffer = new ( ELeave ) CFbsBitmap;
+ CleanupStack::PushL( frameBuffer );
+ frameBuffer->Create( size, mode );
+
+ CSvgEngineInterfaceImpl* svgEngine = NULL;
+ svgEngine = CSvgEngineInterfaceImpl::NewL(frameBuffer, NULL, fontspec );
+
+ if (svgEngine == NULL)
+ {
+ TRACES( RDebug::Print(_L("CSysApShutdownImage::ReadSVGL:SVG engine creation failed" ) ) );
+ }
+
+ CleanupStack::PushL( svgEngine );
+ TInt domHandle = 0;
+ svgEngine->PrepareDom( aFileName, domHandle ) ;
+ if (domHandle == 0)
+ {
+ TRACES( RDebug::Print(_L("CSysApShutdownImage::ReadSVGL():DOM handle creation failed" ) ) );
+ }
+
+ CFbsBitmap* bitmap = new(ELeave) CFbsBitmap;
+ CleanupStack::PushL( bitmap );
+ User::LeaveIfError( bitmap->Create( size, EColor64K ) );
+
+ svgEngine->UseDom( domHandle, bitmap, NULL ) ;
+
+ MSvgError* err;
+ svgEngine->Start( err );
+ if (err->HasError())
+ {
+ TRACES( RDebug::Print(_L("CSysApShutdownImage::ReadSVGL(): SVG Engine Start failed" ) ) );
+ }
+
+ svgEngine->DeleteDom( domHandle );
+ CleanupStack::Pop( bitmap );
+ CleanupStack::PopAndDestroy( svgEngine );
+ CleanupStack::PopAndDestroy( frameBuffer );
+ TRACES( RDebug::Print(_L("CSysApShutdownImage::ReadSVGL:End" ) ) );
+ return bitmap;
}
// ----------------------------------------------------------------------------
@@ -283,4 +353,10 @@
return EKeyWasNotConsumed;
}
+void CSysApShutdownImage::SetRectForAnimation()
+ {
+ TRect rect(iCoeEnv->ScreenDevice()->SizeInPixels());
+ SetRect(rect);
+ }
+
// End of File
--- a/coreapplicationuis/SysAp/Src/SysApSimChanged.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/SysApSimChanged.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -20,11 +20,11 @@
#include "SysApSimChanged.h"
#include "SysApAppUi.h"
#include <settingsinternalcrkeys.h>
-#include <LogsDomainCRKeys.h>
+//#include <LogsDomainCRKeys.h>
#include <logcli.h>
#include <centralrepository.h>
const TInt KPSetDefaultCFTimer = 30;
-#include <RSSSettings.h>
+#include <rsssettings.h>
#include <startupdomainpskeys.h>
#include <PSVariables.h>
#include "SysAp.hrh"
@@ -71,6 +71,12 @@
void CSysApSimChanged::ClearRepositoriesL()
{
+ const TUid KCRUidLogs = {0x101F874E};
+ /**
+ * Informs the Logs application about the amount of new missed calls.
+ * Integer type
+ **/
+ const TUint32 KLogsNewMissedCalls = 0x00000006;
TRACES( RDebug::Print( _L("CSysApSimChanged::ClearRepositoriesL(): opening KCRUidCallForwarding") ) );
CRepository* repository = CRepository::NewL( KCRUidCallForwarding );
@@ -111,13 +117,13 @@
dateTime.Set( 2100, EJanuary, 1, 0, 0, 0, 0 );
TTime date(dateTime);
- TRACES( RDebug::Print( _L("CSysApSimChanged::ClearLogsL(): trying CLogClient::NewL") ) );
+/* TRACES( RDebug::Print( _L("CSysApSimChanged::ClearLogsL(): trying CLogClient::NewL") ) );
CLogClient* logClient = CLogClient::NewL( iFs );
logClient->ClearLog( date, active->iStatus );
-
+*/
CActiveScheduler::Start();
- delete logClient;
+// delete logClient;
CleanupStack::PopAndDestroy( active );
}
@@ -130,7 +136,7 @@
TRACES( RDebug::Print( _L("CSysApSimChanged::ClearSsSettingsL()") ) );
// Reset SSSettings values
- RSSSettings ssSettings;
+/* RSSSettings ssSettings;
User::LeaveIfError( ssSettings.Open( iSysApAppUi.GetTelServer() ) );
TRACES( RDebug::Print( _L("CSysApSimChanged::ClearSsSettingsL(): trying RSSSettings::HandleSIMChanged") ) );
@@ -138,6 +144,7 @@
ssSettings.Close();
User::LeaveIfError( err );
+*/
}
// -----------------------------------------------------------------------------
@@ -164,7 +171,7 @@
if ( simNotOwned )
{
ClearRepositoriesL();
- ClearLogsL();
+// ClearLogsL();
}
}
// =============== CShareActive MEMBER FUNCTIONS ===============================
--- a/coreapplicationuis/SysAp/Src/SysApSsSettingsObserver.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/SysApSsSettingsObserver.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -20,7 +20,7 @@
#include "SysApSsSettingsObserver.h"
#include "SysApAppUi.h"
#include <avkon.hrh>
-#include <RSSSettings.h>
+#include <rsssettings.h>
//CONSTANTS
--- a/coreapplicationuis/SysAp/Src/SysApStartupController.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/SysApStartupController.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -20,7 +20,7 @@
#include <startupdomainpskeys.h>
#include <startupdomaincrkeys.h>
-#include "CoreApplicationUIsPrivateCRKeys.h"
+#include "coreapplicationuisprivatecrkeys.h"
#include <hwrmpowerstatesdkpskeys.h>
#include "SysApStartupController.h"
#include "SysApAppUi.h"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/SysAp/Src/SysApTaskList.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,122 @@
+/*
+* 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:
+*
+*/
+#include "SysApTaskList.h"
+#include <apgwgnam.h>
+
+CSysApTaskList* CSysApTaskList::NewL(RWsSession& aWsSession)
+ {
+ CSysApTaskList* self = NewLC(aWsSession);
+ CleanupStack::Pop(self);
+ return self;
+ }
+
+ CSysApTaskList* CSysApTaskList::NewLC(RWsSession& aWsSession)
+ {
+ CSysApTaskList* self = new(ELeave) CSysApTaskList(aWsSession);
+ CleanupStack::PushL(self);
+ self->ConstructL();
+ return self;
+ }
+
+CSysApTaskList::CSysApTaskList(RWsSession& aWsSession)
+: iWs(aWsSession)
+ {
+ }
+
+void CSysApTaskList::ConstructL()
+ {
+ UpdateListL();
+ }
+
+ CSysApTaskList::~CSysApTaskList()
+ {
+ iWgs.Close();
+ }
+
+ void CSysApTaskList::UpdateListL()
+ {
+ User::LeaveIfError(iWs.WindowGroupList(0, &iWgs));
+ }
+
+ const RArray<RWsSession::TWindowGroupChainInfo>& CSysApTaskList::WgArray() const
+ {
+ return iWgs;
+ }
+
+ TApaTask CSysApTaskList::FindRootApp(TUid aAppUid) const
+ {
+ TApaTask task(iWs);
+ task.SetWgId(0); // initialise task to non-existant task
+ // wgId = 0 tells FindAppByUid to start looking for apps
+ TInt wgId=0;
+ FOREVER
+ {
+ CApaWindowGroupName::FindByAppUid(aAppUid, iWs, wgId);
+ // KErrNotFound means that no more apps can be found
+ if (wgId == KErrNotFound)
+ break;
+ if (IsRootWindowGroup(wgId))
+ {
+ // Found a root wg with the right app UID, return it.
+ task.SetWgId(wgId);
+ break;
+ }
+ }
+ return task;
+ }
+
+ TBool CSysApTaskList::IsRootWindowGroup(TInt aWgId) const
+ {
+ TInt count = iWgs.Count();
+ for (TInt ii=0; ii<count; ii++)
+ {
+ const RWsSession::TWindowGroupChainInfo& info = iWgs[ii];
+ // find the window group id and check that it has no parent
+ if (info.iId == aWgId)
+ return (info.iParentId <= 0);
+ }
+ return EFalse;
+ }
+
+ TInt CSysApTaskList::FindParentWgId(TInt aWgId) const
+ {
+ TInt count = iWgs.Count();
+ for (TInt ii=0; ii<count; ii++)
+ {
+ const RWsSession::TWindowGroupChainInfo& info = iWgs[ii];
+ if (info.iId == aWgId && info.iParentId > 0 && info.iParentId != info.iId)
+ return info.iParentId;
+ }
+ return 0;
+ }
+
+ TInt CSysApTaskList::FindChildWgId(TInt aWgId) const
+ {
+ TInt count = iWgs.Count();
+ for (TInt ii=0; ii<count; ii++)
+ {
+ const RWsSession::TWindowGroupChainInfo& info = iWgs[ii];
+ if (info.iParentId == aWgId && info.iId > 0 && info.iParentId != info.iId)
+ return info.iId;
+ }
+ return 0;
+ }
+
+
+
+
+
--- a/coreapplicationuis/SysAp/Src/SysApTimer.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/SysApTimer.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -18,8 +18,8 @@
// INCLUDES
-#include <avkon.hrh>
-#include <avkon.rsg>
+//#include <avkon.hrh>
+//#include <avkon.rsg>
#include "SysAp.hrh"
#include "SysApTimer.h"
--- a/coreapplicationuis/SysAp/Src/SysApWaitNote.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/SysApWaitNote.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -22,7 +22,7 @@
#include <avkon.rsg>
#include "SysAp.hrh"
#include "SysApWaitNote.h"
-#include <secondarydisplay/SecondaryDisplaySysApAPI.h>
+#include <SecondaryDisplay/SecondaryDisplaySysApAPI.h>
#include <aknSDData.h>
--- a/coreapplicationuis/SysAp/Src/gan/msysapganpropertyobserver.h Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +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: MSysApGanPropertyObserver class definition. This is a callback
-* interface from RProperty listener to client application.
-*
-*/
-
-#ifndef MSYSAPGANPROPERTYOBSERVER_H_
-#define MSYSAPGANPROPERTYOBSERVER_H_
-
-class CSysApGanPropertyListener;
-
-NONSHARABLE_CLASS( MSysApGanPropertyObserver )
- {
-public:
- /**
- * Method is called when property value changes.
- * @param aPropertyListener Listener of the changed property.
- * @param aStatus Status of the event.
- */
- virtual void PropertyEvent(
- CSysApGanPropertyListener& aPropertyListener,
- TInt aStatus ) = 0;
- };
-
-#endif /* MSYSAPGANPROPERTYOBSERVER_H_ */
--- a/coreapplicationuis/SysAp/Src/gan/sysapganhandler.cpp Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,142 +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: Handle GAN server events
-*
-*/
-
-#include <e32base.h>
-#include "coreapplicationuisdomainpskeys.h"
-#include "sysapganhandler.h"
-#include "SysApAppUi.h"
-#include "SysAp.hrh"
-
-// ======== MEMBER FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-// C++ constructor
-// ---------------------------------------------------------------------------
-//
-CSysApGanHandler::CSysApGanHandler( CSysApAppUi& aSysApAppUi ) :
- iSysApAppUi( aSysApAppUi ),
- iGanMode( EGanModeUnspecified )
- {
- }
-
-// ---------------------------------------------------------------------------
-// Symbian 2nd phase constructor
-// ---------------------------------------------------------------------------
-//
-void CSysApGanHandler::ConstructL()
- {
- TRACES( RDebug::Print( _L("CSysApGanHandler::ConstructL IN") ) );
- TInt err( KErrNone );
-
- // Start listening for GAN mode
- err = iPropertyGanMode.Attach( KPSUidCoreApplicationUIs, KCoreAppUIsGanPropertyGanMode );
- User::LeaveIfError( err );
- iGanModeListener = CSysApGanPropertyListener::NewL( iPropertyGanMode, *this );
- iGanModeListener->Subscribe();
-
- // Start listening for signal strength
- err = iPropertySignalLevel.Attach( KPSUidCoreApplicationUIs, KCoreAppUIsGanPropertySignalLevel );
- User::LeaveIfError( err );
- iSignalLevelListener = CSysApGanPropertyListener::NewL( iPropertySignalLevel, *this );
- iSignalLevelListener->Subscribe();
-
- // Get current GAN mode
- TInt mode;
- err = iPropertyGanMode.Get( mode );
- if( KErrNone == err )
- {
- iGanMode = (TCoreAppUIsGanMode)mode;
- }
-
- // Get current GAN signal level
- iPropertySignalLevel.Get( iGanSignalLevel );
-
- TRACES( RDebug::Print( _L("CSysApGanHandler::ConstructL OUT") ) );
- }
-
-// ---------------------------------------------------------------------------
-// Static constructor.
-// ---------------------------------------------------------------------------
-//
-CSysApGanHandler* CSysApGanHandler::NewL( CSysApAppUi& aSysApAppUi )
- {
- CSysApGanHandler* self = new (ELeave) CSysApGanHandler( aSysApAppUi );
- CleanupStack::PushL( self );
- self->ConstructL();
- CleanupStack::Pop( self );
- return self;
- }
-
-// ---------------------------------------------------------------------------
-// Destructor.
-// ---------------------------------------------------------------------------
-//
-CSysApGanHandler::~CSysApGanHandler()
- {
- delete iGanModeListener;
- delete iSignalLevelListener;
- iPropertyGanMode.Close();
- iPropertySignalLevel.Close();
- }
-
-TBool CSysApGanHandler::IsInGanMode()
- {
- return iGanMode == EGanModeGAN;
- }
-
-TInt CSysApGanHandler::GanSignalLevel()
- {
- return iGanSignalLevel;
- }
-
-// ---------------------------------------------------------------------------
-// Handle UI Status RProperty change event. Read the new RProperty value
-// and publish the content on idle screen.
-// ---------------------------------------------------------------------------
-//
-void CSysApGanHandler::PropertyEvent(
- CSysApGanPropertyListener& aPropertyListener,
- TInt aStatus )
- {
- TRACES( RDebug::Print( _L("CSysApGanHandler::PropertyEvent IN") ) );
- TRACES( RDebug::Print( _L("CSysApGanHandler::PropertyEvent status %d"), aStatus ) );
-
- if( KErrNone == aStatus )
- {
- if( iGanModeListener == &aPropertyListener )
- {
- // GAN mode event
- TInt mode;
- TInt err = iPropertyGanMode.Get( mode );
- iGanMode = (TCoreAppUIsGanMode)mode;
- TRACES( RDebug::Print( _L("CSysApGanHandler::PropertyEvent RProp err %d"), err ) );
- TRACES( RDebug::Print( _L("CSysApGanHandler::PropertyEvent GAN mode %d"), iGanMode ) );
- iSysApAppUi.SetSignalIndicatorL();
- }
- else if( iSignalLevelListener == &aPropertyListener )
- {
- // Signal level event
- TInt err = iPropertySignalLevel.Get( iGanSignalLevel );
- TRACES( RDebug::Print( _L("CSysApGanHandler::PropertyEvent RProp err %d"), err ) );
- TRACES( RDebug::Print( _L("CSysApGanHandler::PropertyEvent signal level %d"), iGanSignalLevel ) );
- iSysApAppUi.UpdateSignalBarsL();
- }
- }
- aPropertyListener.Subscribe();
- TRACES( RDebug::Print( _L("CSysApGanHandler::PropertyEvent OUT") ) );
- }
-
--- a/coreapplicationuis/SysAp/Src/gan/sysapganhandler.h Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,121 +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: CSysApGanHandler class definition.
-*
-*/
-
-#ifndef SYSAPGANHANDLER_H_
-#define SYSAPGANHANDLER_H_
-
-#include <e32base.h>
-#include <e32property.h>
-#include "sysapganpropertylistener.h"
-
-class CSysApAppUi;
-
-/**
- * Listen RProperty events from GAN server.
- */
-NONSHARABLE_CLASS( CSysApGanHandler ) :
- public CBase,
- private MSysApGanPropertyObserver
- {
-public:
- /**
- * Static constructor.
- * @param aSysApUi Application UI.
- */
- static CSysApGanHandler* NewL( CSysApAppUi& aSysApAppUi );
-
- /**
- * Destructor.
- */
- ~CSysApGanHandler();
-
- /**
- * Tells if phone is in GAN mode.
- * @return ETrue if in GAN mode (not in GERAN)
- */
- TBool IsInGanMode();
-
- /**
- * Tells the signal bar level in GAN mode.
- * @return The number of signal bar blocks.
- */
- TInt GanSignalLevel();
-
-private: // from MSysApGanPropertyObserver
-
- /**
- * Receive RProperty notification. This same interface can receive
- * notifications from multiple listeners.
- * @param aPropertyListener Property lister that received the notification.
- * @param aStatus Status of the notification.
- */
- void PropertyEvent(
- CSysApGanPropertyListener& aPropertyListener, TInt aStatus );
-
-private:
- /**
- * C++ constructor.
- * @param aSysApUi Application UI.
- */
- CSysApGanHandler( CSysApAppUi& aSysApAppUi );
-
- /**
- * Symbian 2nd phase constructor.
- */
- void ConstructL();
-
-
-protected: // Data
-
- /**
- * Application UI.
- */
- CSysApAppUi& iSysApAppUi;
-
- /**
- * Current GAN mode.
- */
- TCoreAppUIsGanMode iGanMode;
-
- /**
- * Current GAN signal level.
- */
- TInt iGanSignalLevel;
-
- /**
- * GAN mode property.
- */
- RProperty iPropertyGanMode;
-
- /**
- * Signal level property.
- */
- RProperty iPropertySignalLevel;
-
- /**
- * Listener for GAN mode property.
- */
- CSysApGanPropertyListener* iGanModeListener;
-
- /**
- * Listener for signal level property.
- */
- CSysApGanPropertyListener* iSignalLevelListener;
-
- };
-
-#endif /* SYSAPGANHANDLER_H_ */
--- a/coreapplicationuis/SysAp/Src/gan/sysapganpropertylistener.cpp Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,99 +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: Listens to given P&S key and notifies
-* observer whenever the value changes.
-*/
-
-
-#include "sysapganpropertylistener.h"
-
-// ======== MEMBER FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-// C++ constructor
-// ---------------------------------------------------------------------------
-//
-CSysApGanPropertyListener::CSysApGanPropertyListener(
- RProperty& aProperty,
- MSysApGanPropertyObserver& aObserver ) :
- CActive( CActive::EPriorityStandard ),
- iObserver( aObserver ),
- iProperty( aProperty )
- {
- CActiveScheduler::Add( this );
- }
-
-// ---------------------------------------------------------------------------
-// Static constructor.
-// ---------------------------------------------------------------------------
-//
-CSysApGanPropertyListener* CSysApGanPropertyListener::NewL(
- RProperty& aProperty,
- MSysApGanPropertyObserver& aObserver )
- {
- CSysApGanPropertyListener* self =
- new ( ELeave ) CSysApGanPropertyListener( aProperty, aObserver );
- return self;
- }
-
-// ---------------------------------------------------------------------------
-// Destructor.
-// ---------------------------------------------------------------------------
-//
-CSysApGanPropertyListener::~CSysApGanPropertyListener()
- {
- Cancel(); // Cancel any request, if outstanding
- }
-
-// ---------------------------------------------------------------------------
-// Subscribe for property value changes.
-// ---------------------------------------------------------------------------
-//
-void CSysApGanPropertyListener::Subscribe()
- {
- // Cancel any outstanding request
- Cancel();
-
- iProperty.Subscribe( iStatus );
- SetActive();
- }
-
-// ---------------------------------------------------------------------------
-// Property value changed.
-// ---------------------------------------------------------------------------
-//
-void CSysApGanPropertyListener::RunL()
- {
- // Notify the observer.
- iObserver.PropertyEvent( *this, iStatus.Int() );
- }
-
-// ---------------------------------------------------------------------------
-// Subscription cancelled.
-// ---------------------------------------------------------------------------
-//
-void CSysApGanPropertyListener::DoCancel()
- {
- iProperty.Cancel();
- }
-
-// ---------------------------------------------------------------------------
-// Error in RunL.
-// ---------------------------------------------------------------------------
-//
-TInt CSysApGanPropertyListener::RunError( TInt /*aError*/ )
- {
- // ignore error
- return KErrNone;
- }
--- a/coreapplicationuis/SysAp/Src/gan/sysapganpropertylistener.h Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,100 +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: CSysApGanPropertyListener class definition. Class for
-* RProperty changes from GAN server.
-*/
-
-
-#ifndef C_SYSAPGANPROPERTYLISTENER_H
-#define C_SYSAPGANPROPERTYLISTENER_H
-
-#include <e32base.h>
-#include <e32property.h>
-#include "msysapganpropertyobserver.h"
-
-/**
- * Listen RProperty events.
- */
-NONSHARABLE_CLASS( CSysApGanPropertyListener ) :
- public CActive
- {
-public:
- /**
- * Static constructor.
- * @param aProperty Property to listen to.
- * @param aObserver Object that is informed about about new IAP usage.
- */
- static CSysApGanPropertyListener* NewL(
- RProperty& aProperty,
- MSysApGanPropertyObserver& aObserver );
-
- /**
- * Destructor.
- */
- ~CSysApGanPropertyListener();
-
-protected:
- /**
- * C++ constructor.
- * @param aProperty Property to listen to.
- * @param aObserver Object that is informed about about new IAP usage.
- */
- CSysApGanPropertyListener(
- RProperty& aProperty,
- MSysApGanPropertyObserver& aObserver );
-
- /**
- * Symbian 2nd phase constructor.
- */
- void ConstructL();
-
-public:
- /**
- * Subscribes to a property.
- */
- void Subscribe();
-
-protected: // From CActive
-
- /**
- * Handles an active object's request completion event.
- */
- void RunL();
-
- /**
- * Cancels asynchronous request.
- */
- void DoCancel();
-
- /**
- * Handles a leave occurring in RunL().
- * @param aError Error that caused RunL to leave.
- */
- TInt RunError( TInt aError );
-
-protected: // Data
-
- /**
- * Observer to notifiy about property changes.
- */
- MSysApGanPropertyObserver& iObserver;
-
- /**
- * Property to listen to.
- */
- RProperty& iProperty;
-
- };
-
-#endif // C_SYSAPGANPROPERTYLISTENER_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/SysAp/Src/hbdeviceinputdialogsymbian.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,250 @@
+/****************************************************************************
+**
+** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (developer.feedback@nokia.com)
+**
+** This file is part of the HbWidgets module of the UI Extensions for Mobile.
+**
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at developer.feedback@nokia.com.
+**
+****************************************************************************/
+
+#include "hbdeviceinputdialogsymbian.h"
+
+#include <hbsymbianvariant.h>
+#include <hbdevicedialogsymbian.h>
+#include <coreapplicationuisdomainpskeys.h>
+
+#define ARG_UNUSED(x) (void)x;
+
+//_LIT(KDialogText, "text");
+
+enum TInputDialogPanic {
+ ELineEditPanic,
+ EPropertyPanic,
+ EButtonIdPanic
+};
+
+NONSHARABLE_CLASS(CHbDeviceInputDialogPrivate) : public CBase, public MHbDeviceDialogObserver
+{
+public:
+
+ void ConstructL(MHbDeviceInputDialogObserver *aObserver);
+ ~CHbDeviceInputDialogPrivate();
+
+ void SetButtonNull(CHbDeviceInputDialogSymbian::TButtonId aButtonId, bool aValue);
+ void SetButtonTextL(CHbDeviceInputDialogSymbian::TButtonId aButtonId, const TDesC &aValue);
+ void SendToServerL(bool aShow = false);
+ void Close();
+ bool WaitForClosed();
+ void AddVariantL(const TDesC& aKey, const TAny* aData,CHbSymbianVariant::TType aDataType, CHbSymbianVariantMap* map);
+
+public: // MHbDeviceDialogObserver
+ void DataReceived(CHbSymbianVariantMap& aData);
+ void DeviceDialogClosed(TInt aCompletionCode);
+
+public: // data
+
+ CHbDeviceInputDialogSymbian *q;
+ CHbDeviceDialogSymbian *mDeviceDialog;
+ bool mShowCalled;
+ CHbDeviceInputDialogSymbian::TButtonId mReceivedButton;
+ MHbDeviceInputDialogObserver *mObserver;
+ CHbSymbianVariantMap* iVariantMap;
+
+ bool *mDeleted;
+ CActiveSchedulerWait mActiveSchedulerWait;
+};
+
+
+void CHbDeviceInputDialogPrivate::ConstructL(MHbDeviceInputDialogObserver *aObserver)
+{
+ TRACES( RDebug::Print( _L("CHbDeviceInputDialogPrivate::ConstructL::Begin") ) );
+ mDeviceDialog = CHbDeviceDialogSymbian::NewL();
+ iVariantMap = CHbSymbianVariantMap::NewL();
+
+
+
+ mReceivedButton = CHbDeviceInputDialogSymbian::ERejectButton;
+ mObserver = aObserver;
+ TRACES( RDebug::Print( _L("CHbDeviceInputDialogPrivate::ConstructL::End") ) );
+}
+
+// Destructor
+CHbDeviceInputDialogPrivate::~CHbDeviceInputDialogPrivate()
+{
+ // If no observer, remove observer from device dialog. This leaves the
+ // dialog widget executing at server when client closes connection.
+ TRACES( RDebug::Print( _L("CHbDeviceInputDialogPrivate::Destructor::Begin") ) );
+ if (!mObserver) {
+ mDeviceDialog->SetObserver(0);
+ }
+
+ delete mDeviceDialog;
+ delete iVariantMap;
+
+ // Set object deleted flag
+ if (mDeleted) {
+ // Mark the object as deleted.
+ *mDeleted = true;
+ mDeleted = 0;
+ }
+ TRACES( RDebug::Print( _L("CHbDeviceInputDialogPrivate::Destructor::End") ) );
+}
+
+void CHbDeviceInputDialogPrivate::AddVariantL(const TDesC& aKey,const TAny* aData,CHbSymbianVariant::TType aDataType,CHbSymbianVariantMap* map )
+ {
+ CHbSymbianVariant *variant = CHbSymbianVariant::NewL(aData, aDataType);
+ CleanupStack::PushL(variant);
+ User::LeaveIfError(map->Add(aKey, variant));
+ CleanupStack::Pop(variant);
+ }
+
+// Send properties to server. Show or update.
+void CHbDeviceInputDialogPrivate::SendToServerL(bool /* aShow */)
+{
+ TRACES( RDebug::Print( _L("CHbDeviceInputDialogPrivate::SendToServerL::Begin") ) );
+ _LIT(KDeviceDialogType, "com.nokia.hb.deviceinputdialog/1.0");
+ TInt error;
+ mReceivedButton = CHbDeviceInputDialogSymbian::ERejectButton;
+ error = mDeviceDialog->Show(KDeviceDialogType, *iVariantMap, this);
+ User::LeaveIfError(error);
+ mShowCalled = true;
+ TRACES( RDebug::Print( _L("CHbDeviceInputDialogPrivate::SendToServerL::End") ) );
+}
+
+
+// Close input dialog
+void CHbDeviceInputDialogPrivate::Close()
+{
+ TRACES( RDebug::Print( _L("CHbDeviceInputDialogPrivate::Close::Begin") ) );
+ mDeviceDialog->Cancel();
+ TRACES( RDebug::Print( _L("CHbDeviceInputDialogPrivate::Close::End") ) );
+}
+
+// Wait for input dialog to close
+bool CHbDeviceInputDialogPrivate::WaitForClosed()
+{
+ // Returns true if object was not deleted during wait
+ if (!mShowCalled) {
+ return true;
+ }
+ return true;
+}
+
+// Observer, data received from device input dialog
+void CHbDeviceInputDialogPrivate::DataReceived(CHbSymbianVariantMap& aData)
+{
+ TRACES( RDebug::Print( _L("CHbDeviceInputDialogPrivate::DataReceived::Begin") ) );
+ mReceivedButton = CHbDeviceInputDialogSymbian::ERejectButton;
+ _LIT(KKeyOk, "ok");
+ _LIT(KKeyCancel, "cancel");
+ const CHbSymbianVariant* variantOk = aData.Get(KKeyOk);
+ const CHbSymbianVariant* variantCancel = aData.Get(KKeyCancel);
+ if (variantOk)
+ {
+ const TDesC *value = variantOk->Value<const TDesC>();
+ q->iPassword = *value;
+ mReceivedButton = CHbDeviceInputDialogSymbian::EAcceptButton;
+ RProperty::Set( KPSUidCoreApplicationUIs, KCoreAppUIsPowerMenuCustomDialogStatus, ECoreAppUIsMemoryCardCustomDialogOk );
+ }
+ else if(variantCancel)
+ {
+ const TDesC *value = variantCancel->Value<const TDesC>();
+ q->iPassword = *value;
+ mReceivedButton = CHbDeviceInputDialogSymbian::EAcceptButton;
+ RProperty::Set( KPSUidCoreApplicationUIs, KCoreAppUIsPowerMenuCustomDialogStatus, ECoreAppUIsMemoryCardCustomDialogCancel);
+ }
+
+ TRACES( RDebug::Print( _L("CHbDeviceInputDialogPrivate::DataReceived::End") ) );
+}
+
+// Observer, device input dialog closed
+void CHbDeviceInputDialogPrivate::DeviceDialogClosed(TInt aCompletionCode)
+{
+ ARG_UNUSED(aCompletionCode)
+ TRACES( RDebug::Print( _L("CHbDeviceInputDialogPrivate::DeviceDialogClosed::Begin") ) );
+
+ mShowCalled = false;
+
+
+ if (mObserver) {
+ mObserver->InputDialogClosed(q, mReceivedButton);
+ return; // observer callback deleted this object. Do not touch it anymore.
+ }
+ TRACES( RDebug::Print( _L("CHbDeviceInputDialogPrivate::DeviceDialogClosed::End") ) );
+}
+
+// Constructor
+CHbDeviceInputDialogSymbian::CHbDeviceInputDialogSymbian()
+{
+}
+
+// Destructor
+CHbDeviceInputDialogSymbian::~CHbDeviceInputDialogSymbian()
+{
+ delete d;
+}
+
+CHbDeviceInputDialogSymbian* CHbDeviceInputDialogSymbian::NewL(MHbDeviceInputDialogObserver *aObserver)
+{
+ TRACES( RDebug::Print( _L("CHbDeviceInputDialogSymbian::NewL::Begin") ) );
+ ARG_UNUSED(aObserver)
+ CHbDeviceInputDialogSymbian *inputDialog = new (ELeave) CHbDeviceInputDialogSymbian;
+ CleanupStack::PushL(inputDialog);
+ CHbDeviceInputDialogPrivate *idialogPrivate = new (ELeave) CHbDeviceInputDialogPrivate;
+ idialogPrivate->q = inputDialog;
+ CleanupStack::PushL(idialogPrivate);
+ idialogPrivate->ConstructL( aObserver);
+ inputDialog->d = idialogPrivate;
+ CleanupStack::Pop(2); // inputDialog, idialogPrivate
+ inputDialog->SetObserver(aObserver);
+ TRACES( RDebug::Print( _L("CHbDeviceInputDialogSymbian::NewL::End") ) );
+ return inputDialog;
+}
+
+
+void CHbDeviceInputDialogSymbian::ShowL()
+{
+ TRACES( RDebug::Print( _L("CHbDeviceInputDialogSymbian::ShowL::Begin") ) );
+ d->SendToServerL(true);
+ TRACES( RDebug::Print( _L("CHbDeviceInputDialogSymbian::ShowL::End") ) );
+}
+
+
+TPtrC CHbDeviceInputDialogSymbian::getTextL()
+{
+ TRACES( RDebug::Print( _L("CHbDeviceInputDialogSymbian::getTextL::Begin") ) );
+ TRACES( RDebug::Print(_L( "CHbDeviceInputDialogSymbian::getTextL::Begin %S" ),&iPassword));
+ HBufC* sample1 = HBufC::NewLC(iPassword.Length());
+ TPtrC aStringPointer = sample1->Des();
+ aStringPointer.Set(iPassword);
+ CleanupStack::PopAndDestroy();
+ TRACES( RDebug::Print( _L("CHbDeviceInputDialogSymbian::getTextL::End") ) );
+ return aStringPointer;
+}
+
+void CHbDeviceInputDialogSymbian::Close()
+{
+ TRACES( RDebug::Print( _L("CHbDeviceInputDialogSymbian::Close::Begin") ) );
+ d->Close();
+}
+
+void CHbDeviceInputDialogSymbian::SetObserver(MHbDeviceInputDialogObserver *aObserver)
+{
+ d->mObserver = aObserver;
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/SysAp/Src/hbdevicepowermenusymbian.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,443 @@
+/*
+ * 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:
+ *
+ */
+
+#include <hbdevicedialogsymbian.h>
+#include <hbsymbianvariant.h>
+#include <coreapplicationuisdomainpskeys.h>
+#include <CoreApplicationUIsSDKCRKeys.h>
+#include "hbdevicepowermenusymbian.h"
+
+
+//These Keys will be used in CHbSymbianVariantMap
+//Donot Change these strings
+_LIT(KVolumeLevel, "VolumeLevel");
+_LIT(KSilenceLatchOn, "SilenceLatchOn"); //Used to latch silencebutton
+_LIT(KCypherOff, "CypherOff"); //used to poweroffButtonEnabled/Disabled
+_LIT(KVibrationEnable, "VibrationEnable");
+_LIT(KOfflineEnable, "OfflineEnable");
+_LIT(KShutDown, "ShutDown");
+
+//used to load plugin
+_LIT(KPluginIdentifier, "com.nokia.hb.devicepowermenu/1.0");
+
+
+NONSHARABLE_CLASS(CHbDevicePowerMenuPrivate) : public CBase, public MHbDeviceDialogObserver
+{
+public:
+ static CHbDevicePowerMenuPrivate* NewL(CHbDevicePowerMenuSymbian* aDialog);
+ virtual ~CHbDevicePowerMenuPrivate();
+
+ void ShowL();
+ void AddVariantL(const TDesC& aKey, const TAny* aData, CHbSymbianVariant::TType aDataType);
+
+ //Set Methods
+ void SetVolume(TInt aVolume);
+ void SetSilenceMode(TBool aEnable);
+ void SetOfflineMode(TBool aChecked);
+ void SetVibrationEnabled(TBool aEnable);
+ void SetPowerOffEnabled(TBool aEnable);
+
+public:
+ // MHbDeviceDialogObserver
+ void DataReceived(CHbSymbianVariantMap& aData);
+ void DeviceDialogClosed(TInt aCompletionCode);
+
+private:
+ CHbDevicePowerMenuPrivate();
+ void ConstructL(CHbDevicePowerMenuSymbian* aDialog);
+
+private:
+ //symbian FW client intreface to load Qt.plugin
+ CHbDeviceDialogSymbian* iDeviceDialog;
+ //Parameter for loading qt.plugin
+ CHbSymbianVariantMap* iVariantMap;
+ //Symbian client interface for Powermenu
+ CHbDevicePowerMenuSymbian* iPowerMenuManager;
+
+ //Variants used in VariantMap
+ TInt iVolumeLevel; //Volume level ranges 1 to 10
+ TBool iSilenceLatchOn; //Silence Enabled or Disbaled
+ TBool iVibrationEnable; //Master Vibarate enabled/Disabled
+ TBool iOfflineEnable; //Oflline Mode enabled or Disabled
+ TBool iCypherOff; //Encryption/Decryption ON/OFF
+};
+
+/**
+ * Create an object of CHbDevicePowerMenuPrivate
+ */
+CHbDevicePowerMenuPrivate* CHbDevicePowerMenuPrivate::NewL(CHbDevicePowerMenuSymbian* aDialog)
+ {
+ TRACES( RDebug::Print( _L("CHbDevicePowerMenuPrivate::NewL: START") ) );
+ CHbDevicePowerMenuPrivate* self = new (ELeave) CHbDevicePowerMenuPrivate();
+ CleanupStack::PushL(self);
+ self->ConstructL(aDialog);
+ CleanupStack::Pop(self);
+ TRACES( RDebug::Print( _L("CHbDevicePowerMenuPrivate::NewL: END") ) );
+ return self;
+ }
+
+/**
+ * Constructor
+ */
+CHbDevicePowerMenuPrivate::CHbDevicePowerMenuPrivate()
+ {
+ TRACES( RDebug::Print( _L("CHbDevicePowerMenuPrivate::Constructor") ) );
+ //Do nothing
+ }
+
+/**
+ * Destructor
+ */
+CHbDevicePowerMenuPrivate::~CHbDevicePowerMenuPrivate()
+ {
+ TRACES( RDebug::Print( _L("CHbDevicePowerMenuPrivate::Destructor: START") ) );
+ delete iDeviceDialog;
+ delete iVariantMap;
+ TRACES( RDebug::Print( _L("CHbDevicePowerMenuPrivate::Destructor: END") ) );
+ }
+
+/**
+ * Constrcuts all its member variables
+ */
+void CHbDevicePowerMenuPrivate::ConstructL(CHbDevicePowerMenuSymbian* aDialog)
+ {
+ TRACES( RDebug::Print( _L("CHbDevicePowerMenuPrivate::ConstructL: START") ) );
+ iPowerMenuManager = aDialog;
+ iDeviceDialog = CHbDeviceDialogSymbian::NewL();
+ iVariantMap = CHbSymbianVariantMap::NewL();
+ TRACES( RDebug::Print( _L("CHbDevicePowerMenuPrivate::ConstructL: END") ) );
+ }
+
+/**
+ * Builds all parameters required for showing the PowerMenu Dialog.
+ * Loads the required powermenu plugin and calls show on DeviceDialog.
+ * This Displays the Customized PowerMenu Widget.
+ */
+void CHbDevicePowerMenuPrivate::ShowL()
+ {
+ TRACES( RDebug::Print( _L("CHbDevicePowerMenuPrivate::ShowL: START") ) );
+ AddVariantL(KVolumeLevel, &iVolumeLevel, CHbSymbianVariant::EInt);
+ AddVariantL(KSilenceLatchOn, &iSilenceLatchOn, CHbSymbianVariant::EBool);
+ AddVariantL(KVibrationEnable, &iVibrationEnable, CHbSymbianVariant::EBool);
+ AddVariantL(KOfflineEnable, &iOfflineEnable, CHbSymbianVariant::EBool);
+ AddVariantL(KCypherOff, &iCypherOff, CHbSymbianVariant::EBool);
+ //No shutdown varinat will be added to showL
+ User::LeaveIfError(iDeviceDialog->Show(KPluginIdentifier, *iVariantMap, this));
+ TRACES( RDebug::Print( _L("CHbDevicePowerMenuPrivate::ShowL: END") ) );
+ }
+
+/**
+ * Sets Volume to aVolume
+ */
+void CHbDevicePowerMenuPrivate::SetVolume(TInt aVolume)
+ {
+ TRACES( RDebug::Print( _L("CHbDevicePowerMenuPrivate::SetVolume: START") ) );
+ iVolumeLevel = aVolume;
+ TRACES( RDebug::Print( _L("CHbDevicePowerMenuPrivate::SetVolume: END") ) );
+ }
+
+/**
+ * Sets SilenceMode to Enable/Disable
+ */
+void CHbDevicePowerMenuPrivate::SetSilenceMode(TBool aEnable)
+ {
+ TRACES( RDebug::Print( _L("CHbDevicePowerMenuPrivate::SetSilenceMode: START") ) );
+ iSilenceLatchOn = aEnable;
+ TRACES( RDebug::Print( _L("CHbDevicePowerMenuPrivate::SetSilenceMode: END") ) );
+ }
+
+/**
+ * Sets OfflineMode to Checked/UnChecked
+ */
+void CHbDevicePowerMenuPrivate::SetOfflineMode(TBool aChecked)
+ {
+ TRACES( RDebug::Print( _L("CHbDevicePowerMenuPrivate::SetOfflineMode: START") ) );
+ iOfflineEnable = aChecked;
+ TRACES( RDebug::Print( _L("CHbDevicePowerMenuPrivate::SetOfflineMode: END") ) );
+ }
+
+/**
+ * Sets VibrationEnabled to Checked/UnChecked
+ */
+void CHbDevicePowerMenuPrivate::SetVibrationEnabled(TBool aChecked)
+ {
+ TRACES( RDebug::Print( _L("CHbDevicePowerMenuPrivate::SetVibrationEnabled: START") ) );
+ iVibrationEnable = aChecked;
+ TRACES( RDebug::Print( _L("CHbDevicePowerMenuPrivate::SetVibrationEnabled: END") ) );
+ }
+
+/**
+ * Sets PowerOffEnabled to Enable/Disable
+ */
+void CHbDevicePowerMenuPrivate::SetPowerOffEnabled(TBool aEnable)
+ {
+ TRACES( RDebug::Print( _L("CHbDevicePowerMenuPrivate::SetPowerOffEnabled: START") ) );
+ iCypherOff = aEnable;
+ TRACES( RDebug::Print( _L("CHbDevicePowerMenuPrivate::SetPowerOffEnabled: END") ) );
+ }
+
+/**
+ * Data received from HBDeviceDialog will hit by emit deviceDialogData in plugin
+ * The values received from UI will set to ControlPanel.
+ */
+void CHbDevicePowerMenuPrivate::DataReceived(CHbSymbianVariantMap& aData)
+ {
+ TRACES( RDebug::Print( _L("CHbDevicePowerMenuPrivate::DataReceived: START") ) );
+ // Updates received from the plugin.
+ //1. Volume
+ const CHbSymbianVariant* volumeVariant = aData.Get(KVolumeLevel);
+ if(volumeVariant)
+ {
+ TRACES( RDebug::Print( _L("CHbDevicePowerMenuPrivate::DataReceived: volumeVariant::Start") ) );
+ TInt* volumeValue = volumeVariant->Value<TInt>();
+ if(volumeValue)
+ {
+ iVolumeLevel = *volumeValue;
+ iPowerMenuManager->iProfileEngine->SetMasterVolumeL( iVolumeLevel );
+ }
+ TRACES( RDebug::Print( _L("CHbDevicePowerMenuPrivate::DataReceived:volumeVariant::End") ) );
+ }
+
+ //2. Silence
+ const CHbSymbianVariant* SilenceVariant = aData.Get(KSilenceLatchOn);
+ if(SilenceVariant)
+ {
+ TRACES( RDebug::Print( _L("CHbDevicePowerMenuPrivate::DataReceived: SilenceVariant::Start") ) );
+ TBool* LatchValue = SilenceVariant->Value<TBool>();
+ if(LatchValue)
+ {
+ iSilenceLatchOn = *LatchValue;
+ iPowerMenuManager->iProfileEngine->SetSilenceModeL( iSilenceLatchOn );//member in CHbDevicePowerMenuSymbian
+ }
+ TRACES( RDebug::Print( _L("CHbDevicePowerMenuPrivate::DataReceived: SilenceVariant::End") ) );
+ }
+
+ //3. Vibration
+ const CHbSymbianVariant* VibrationVariant = aData.Get(KVibrationEnable);
+ if(VibrationVariant)
+ {
+ TRACES( RDebug::Print( _L("CHbDevicePowerMenuPrivate::DataReceived: VibrationVariant::Start") ) );
+ TBool* VibrationValue = VibrationVariant->Value<TBool>();
+ if(VibrationValue)
+ {
+ iVibrationEnable = *VibrationValue;
+ iPowerMenuManager->iProfileEngine->SetMasterVibraL( iVibrationEnable );//member in CHbDevicePowerMenuSymbian
+ }
+ TRACES( RDebug::Print( _L("CHbDevicePowerMenuPrivate::DataReceived: VibrationVariant::End") ) );
+ }
+
+ //4.Offline
+ const CHbSymbianVariant* OfflineVariant = aData.Get(KOfflineEnable);
+ if(OfflineVariant)
+ {
+ TRACES( RDebug::Print( _L("CHbDevicePowerMenuPrivate::DataReceived: OfflineVariant::Start") ) );
+ TBool* OfflineValue = OfflineVariant->Value<TBool>();
+ if(OfflineValue)
+ {
+ iOfflineEnable = *OfflineValue;
+ // negate the value before storing in cen rep as the n/w conn allowed key is complement of offline mode
+ User::LeaveIfError( iPowerMenuManager->iCenrepOffline->Set(KCoreAppUIsNetworkConnectionAllowed, !iOfflineEnable ) );
+ }
+ TRACES( RDebug::Print( _L("CHbDevicePowerMenuPrivate::DataReceived: OfflineVariant::End") ) );
+ }
+
+ //5.shutdown
+ const CHbSymbianVariant* ShutDownVariant = aData.Get(KShutDown);
+ if(ShutDownVariant)
+ {
+ TRACES( RDebug::Print( _L("CHbDevicePowerMenuPrivate::DataReceived: ShutDownVariant::Start") ) );
+ TBool* ShutDownValue = ShutDownVariant->Value<TBool>();
+ if(ShutDownValue)
+ {
+ TBool shutDown = *ShutDownValue;
+ if (shutDown)
+ {
+ iPowerMenuManager->iSysApServer.HandleLongPowerKeyPressedL();
+ }
+
+ }
+ TRACES( RDebug::Print( _L("CHbDevicePowerMenuPrivate::DataReceived: ShutDownVariant::End") ) );
+ }
+ TRACES( RDebug::Print( _L("CHbDevicePowerMenuPrivate::DataReceived: END") ) );
+ return;
+ }
+
+/**
+ * DeviceDialogClosed will be executed by the event emit deviceDialogClosed in plugin.
+ * This will be executed when 1. Tap out side the Dialog to Close
+ * 2. When Power Off Button is clicked.
+ */
+void CHbDevicePowerMenuPrivate::DeviceDialogClosed(TInt /*aCompletionCode*/)
+ {
+ TRACES( RDebug::Print( _L("CHbDevicePowerMenuPrivate::DeviceDialogClosed") ) );
+ // Inform sysap to release the memory of power menu custom dialog.
+ RProperty::Set( KPSUidCoreApplicationUIs, KCoreAppUIsPowerMenuCustomDialogStatus, ECoreAppUIsPowerMenuCustomDialogOn );
+ }
+
+/**
+ * Contrcuts VariantMap
+ */
+void CHbDevicePowerMenuPrivate::AddVariantL(const TDesC& aKey, const TAny* aData, CHbSymbianVariant::TType aDataType)
+ {
+ TRACES( RDebug::Print( _L("CHbDevicePowerMenuPrivate::AddVariantL: START") ) );
+ CHbSymbianVariant *variant = CHbSymbianVariant::NewL(aData, aDataType);
+ CleanupStack::PushL(variant);
+ //iVariantMap takes the ownerhip of variant
+ User::LeaveIfError(iVariantMap->Add(aKey, variant));
+ CleanupStack::Pop(variant);
+ TRACES( RDebug::Print( _L("CHbDevicePowerMenuPrivate::AddVariantL: End") ) );
+ }
+
+/*
+ * Creates an object of CHbDevicePowerMenuSymbian
+*/
+CHbDevicePowerMenuSymbian* CHbDevicePowerMenuSymbian::NewL(CSysApAppUi& aSysApServer)
+ {
+ TRACES( RDebug::Print( _L("CHbDevicePowerMenuSymbian::NewL: START") ) );
+ CHbDevicePowerMenuSymbian* self = new (ELeave) CHbDevicePowerMenuSymbian(aSysApServer);
+ CleanupStack::PushL(self);
+ self->ConstructL();
+ CleanupStack::Pop(self);
+ TRACES( RDebug::Print( _L("CHbDevicePowerMenuSymbian::NewL: END") ) );
+ return self;
+ }
+
+/*
+ * Destructs the class.
+*/
+CHbDevicePowerMenuSymbian::~CHbDevicePowerMenuSymbian()
+ {
+ TRACES( RDebug::Print( _L("CHbDevicePowerMenuSymbian::Destructor: START") ) );
+ delete iCenrepProfile;
+ delete iCenrepOffline;
+ iProfileEngine->Release();
+ delete iPowerMenuPrivate;
+ TRACES( RDebug::Print( _L("CHbDevicePowerMenuSymbian::Destructor: End") ) );
+ }
+
+/*
+ * Executes the dialog asynchronously.
+*/
+void CHbDevicePowerMenuSymbian::ShowL()
+ {
+ TRACES( RDebug::Print( _L("CHbDevicePowerMenuSymbian::ShowL: START") ) );
+ iPowerMenuPrivate->ShowL();
+ TRACES( RDebug::Print( _L("CHbDevicePowerMenuSymbian::ShowL: End") ) );
+ }
+
+/**
+ * Sets Volume to aVolume
+ */
+void CHbDevicePowerMenuSymbian::SetVolume(TInt aVolume)
+ {
+ TRACES( RDebug::Print( _L("CHbDevicePowerMenuSymbian::SetVolume: START") ) );
+ iPowerMenuPrivate->SetVolume(aVolume);
+ TRACES( RDebug::Print( _L("CHbDevicePowerMenuSymbian::SetVolume: End") ) );
+ }
+
+/**
+ * Sets SilenceMode to Enable/Disable
+ */
+void CHbDevicePowerMenuSymbian::SetSilenceMode(TBool aEnable)
+ {
+ TRACES( RDebug::Print( _L("CHbDevicePowerMenuSymbian::SetSilenceMode: START") ) );
+ iPowerMenuPrivate->SetSilenceMode(aEnable);
+ TRACES( RDebug::Print( _L("CHbDevicePowerMenuSymbian::SetSilenceMode: END") ) );
+ }
+
+/**
+ * Sets OfflineMode to Checked/UnChecked
+ */
+void CHbDevicePowerMenuSymbian::SetOfflineMode(TBool aChecked)
+ {
+ TRACES( RDebug::Print( _L("CHbDevicePowerMenuSymbian::SetOfflineMode: START") ) );
+ iPowerMenuPrivate->SetOfflineMode(aChecked);
+ TRACES( RDebug::Print( _L("CHbDevicePowerMenuSymbian::SetOfflineMode: End") ) );
+ }
+
+/**
+ * Sets VibrationEnabled to Checked/UnChecked
+ */
+void CHbDevicePowerMenuSymbian::SetVibrationEnabled(TBool aEnable)
+ {
+ TRACES( RDebug::Print( _L("CHbDevicePowerMenuSymbian::SetVibrationEnabled: START") ) );
+ iPowerMenuPrivate->SetVibrationEnabled(aEnable);
+ TRACES( RDebug::Print( _L("CHbDevicePowerMenuSymbian::SetVibrationEnabled: End") ) );
+ }
+
+/**
+ * Sets PowerOffEnabled to Enable/Disable
+ */
+void CHbDevicePowerMenuSymbian::SetPowerOffEnabled(TBool aEnable)
+ {
+ TRACES( RDebug::Print( _L("CHbDevicePowerMenuSymbian::SetPowerOffEnabled: START") ) );
+ iPowerMenuPrivate->SetPowerOffEnabled(aEnable);
+ TRACES( RDebug::Print( _L("CHbDevicePowerMenuSymbian::SetPowerOffEnabled: END") ) );
+ }
+
+/*
+ * Constructor.
+*/
+CHbDevicePowerMenuSymbian::CHbDevicePowerMenuSymbian(CSysApAppUi& aSysApServer)
+ :iSysApServer(aSysApServer)
+ {
+ TRACES( RDebug::Print( _L("CHbDevicePowerMenuSymbian::Constructor") ) );
+ //Do Nothing
+ }
+
+/*
+ * 2nd Constructor.
+ * Constructs and initializes all its meber variables
+*/
+void CHbDevicePowerMenuSymbian::ConstructL()
+ {
+ TRACES( RDebug::Print( _L("CHbDevicePowerMenuSymbian::ConstructL: START") ) );
+ iProfileEngine = ::CreateProfileEngineExtended2L();
+ iCenrepOffline = CRepository::NewL( KCRUidCoreApplicationUIs );
+ iCenrepProfile = CRepository::NewL( KCRUidProfileEngine );
+ iPowerMenuPrivate = CHbDevicePowerMenuPrivate::NewL(this);
+
+ //To Sync with Contro panel
+ TBool networkConnectionAllowed(EFalse);
+ TInt error = iCenrepOffline->Get( KCoreAppUIsNetworkConnectionAllowed, networkConnectionAllowed );
+ TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: KCoreAppUIsNetworkConnectionAllowed = %d"), error ) );
+
+ // The value of KCoreAppUIsNetworkConnectionAllowed is Inverted status of Offline mode
+ // Hence negate the value and use as Offline mode
+ SetOfflineMode(!networkConnectionAllowed);
+
+ TInt masterVolume(0);
+ error = iCenrepProfile->Get( KProEngMasterVolume, masterVolume );
+ TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: KProEngMasterVolume = %d"), error ) );
+ SetVolume(masterVolume);
+
+ TBool masterVibrate(0);
+ error = iCenrepProfile->Get( KProEngMasterVibra, masterVibrate );
+ TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: KProEngMasterVibra = %d"), error ) );
+ SetVibrationEnabled(masterVibrate);
+
+ TBool silenceMode(EFalse);
+ error = iCenrepProfile->Get( KProEngSilenceMode, silenceMode );
+ TRACES( RDebug::Print( _L("CSysApAppUi::ConstructL: KProEngSilenceMode = %d"), error ) );
+ SetSilenceMode(silenceMode);
+
+ //Cypheroff is True when No encryption/Decryption is happening
+ TBool cypherOff(!(iSysApServer.IsEncryptionOperationOngoingL()));
+ SetPowerOffEnabled(cypherOff);
+ TRACES( RDebug::Print( _L("CHbDevicePowerMenuSymbian::ConstructL: END") ) );
+ }
+
--- a/coreapplicationuis/SysAp/Src/memorycard/sysapdriveejecthandler.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/memorycard/sysapdriveejecthandler.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -163,7 +163,6 @@
aError ) );
}
// Ensure that the wait note without softkeys gets closed
- iSysApAppUi.CancelWaitNote();
iSysApDriveList.ResetDrivesToEject();
iDriveToEject = KErrNotFound;
iDiskNotifyHandler->CancelStartedDismount();
@@ -185,7 +184,6 @@
aError, aEvent.iDrive, aEvent.iForcedDismount ) );
iDriveToEject = KErrNotFound;
- iSysApAppUi.CancelWaitNote();
// Show dismount ready note
TBool dialogShown( EFalse );
--- a/coreapplicationuis/SysAp/Src/memorycard/sysapdrivelist.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/memorycard/sysapdrivelist.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -55,6 +55,8 @@
{
// Get the default memory card. If memory card is unavailable,
// then get the next best suitable drive.
+ iDefaultMemoryCard = 0;
+
TInt err( DriveInfo::GetDefaultDrive(
DriveInfo::EDefaultRemovableMassStorage, iDefaultMemoryCard ) );
if ( err != KErrNone )
--- a/coreapplicationuis/SysAp/Src/memorycard/sysapdriveunlockhandler.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/memorycard/sysapdriveunlockhandler.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -53,7 +53,8 @@
const TBool aMemoryCardLockSupported ) :
iSysApDriveList( aSysApDriveList ),
iSysApAppUi( aSysApAppUi ),
- iMemoryCardLockSupported( aMemoryCardLockSupported )
+ iMemoryCardLockSupported( aMemoryCardLockSupported ),
+ iMemCardPwdDialog(NULL)
{
}
@@ -67,8 +68,12 @@
_L( "CSysApDriveUnlockHandler::~CSysApDriveUnlockHandler" ) ) );
iIgnoreQueryResult = ETrue;
- delete iQueryShowCB;
- delete iMemoryCardDialog;
+ if (iMemCardPwdDialog!=NULL)
+ {
+ //MemoryCardDialog already exist
+ delete iMemCardPwdDialog;
+ iMemCardPwdDialog = NULL;
+ }
}
// ---------------------------------------------------------------------------
@@ -77,16 +82,6 @@
//
void CSysApDriveUnlockHandler::StartUnlock()
{
- TBool isOngoing( IsQueryOngoing() );
-
- TRACES( RDebug::Print(
- _L( "CSysApMCSysApMMCUnlockObserver::StartUnlock: ongoing: %d" ),
- isOngoing ) );
-
- if ( isOngoing )
- {
- return;
- }
TRAPD( err, DoStartQueryIfNeededL() );
if ( err != KErrNone )
{
@@ -150,7 +145,6 @@
// Mark handled and start next query
iSysApDriveList.MarkDriveUnlockQueryShown( iDriveToUnlock );
- DoStartQueryAsyncIfNeeded();
}
// ---------------------------------------------------------------------------
@@ -175,19 +169,23 @@
//
void CSysApDriveUnlockHandler::ShowUnlockQueryL()
{
+ iDriveToUnlock = iSysApDriveList.DriveToUnlock();
TRACES( RDebug::Print(
_L( "CSysApMCSysApMMCUnlockObserver::ShowUnlockQueryL: drive: %d" ),
iDriveToUnlock ) );
- if ( !iMemoryCardDialog )
+ if (iMemCardPwdDialog!=NULL)
{
- CAknMemoryCardDialog* mmcDialog = CAknMemoryCardDialog::NewLC( this );
- iMemoryCardDialog = mmcDialog; // temporary variable used for hiding codescanner error
- iMemoryCardDialog->SetSelfPointer( &iMemoryCardDialog );
- TDriveNumber drive( static_cast< TDriveNumber >( iDriveToUnlock ) );
- iMemoryCardDialog->UnlockCardLD( drive, ETrue );
- }
- }
+ //PowerMenu already exist
+ delete iMemCardPwdDialog;
+ iMemCardPwdDialog = NULL;
+ }
+ TRACES( RDebug::Print(_L("CSysApAppUi::HandleKeyEventL, JEELani 01") ) );
+ iMemCardPwdDialog = CHbDeviceInputDialogSymbian::NewL();
+ TRACES( RDebug::Print(_L("CSysApAppUi::HandleKeyEventL, JEELani 02") ) );
+ iMemCardPwdDialog->ShowL();
+ TRACES( RDebug::Print(_L("CSysApAppUi::HandleKeyEventL, JEELani 03") ) );
+}
// ---------------------------------------------------------------------------
// CSysApDriveUnlockHandler::IsQueryOngoing
@@ -195,7 +193,7 @@
//
TBool CSysApDriveUnlockHandler::IsQueryOngoing() const
{
- return ( iMemoryCardDialog || iQueryShowCB );
+ return 0;
}
// ---------------------------------------------------------------------------
@@ -205,10 +203,19 @@
void CSysApDriveUnlockHandler::DoStartQueryIfNeededL()
{
iDriveToUnlock = iSysApDriveList.DriveToUnlock();
+
if ( iDriveToUnlock == KErrNotFound )
{
+ _LIT(KChargingNote,"Phone does not found drive to unlock");
+ HBufC* aString = HBufC16::NewLC(150);
+ TPtrC aStringPointer = aString->Des();
+ aStringPointer.Set(KChargingNote);
+ TRACES( RDebug::Print( _L("CSysApWsClient::RunL(): Key EEventKeyUp 01") ) );
+ iSysApAppUi.ShowExampleUiNoteL( aStringPointer );
+ CleanupStack::PopAndDestroy(); // aString
return;
}
+
if ( iMemoryCardLockSupported )
{
ShowUnlockQueryL();
@@ -216,6 +223,13 @@
else
{
iSysApAppUi.ShowQueryL( ESysApMemoryCardLockedNote );
+ _LIT(KChargingNote,"Phone does not support locked memory cards");
+ HBufC* aString = HBufC16::NewLC(150);
+ TPtrC aStringPointer = aString->Des();
+ aStringPointer.Set(KChargingNote);
+ TRACES( RDebug::Print( _L("CSysApWsClient::RunL(): Key EEventKeyUp 01") ) );
+ iSysApAppUi.ShowExampleUiNoteL( aStringPointer );
+ CleanupStack::PopAndDestroy(); // aString
iSysApDriveList.MarkDriveUnlockQueryShown( iDriveToUnlock );
}
}
@@ -232,18 +246,6 @@
DoStopUnlock( KErrNone );
return;
}
- delete iQueryShowCB;
- iQueryShowCB = NULL;
- iQueryShowCB = new CAsyncCallBack(
- TCallBack( QueryShowCB, this ), CActive::EPriorityStandard );
- if ( iQueryShowCB )
- {
- iQueryShowCB->CallBack();
- }
- else
- {
- DoStopUnlock( KErrNoMemory );
- }
}
// ---------------------------------------------------------------------------
@@ -258,12 +260,117 @@
_L( "CSysApMCSysApMMCUnlockObserver::DoStopUnlock: error: %d" ),
aError ) );
}
+ ReleaseMemoryForInputCardDialog();
iIgnoreQueryResult = ETrue;
- delete iMemoryCardDialog;
- iMemoryCardDialog = NULL;
- delete iQueryShowCB;
- iQueryShowCB = NULL;
iIgnoreQueryResult = EFalse;
}
+void CSysApDriveUnlockHandler::ReleaseMemoryForInputCardDialog()
+ {
+ if (iMemCardPwdDialog!=NULL)
+ {
+ //MemoryCardDialog already exist
+ delete iMemCardPwdDialog;
+ iMemCardPwdDialog = NULL;
+ }
+ }
+
+TInt CSysApDriveUnlockHandler::CheckMemoryDialogIfNeeded()
+ {
+ TRACES( RDebug::Print(_L( "CSysApDriveUnlockHandler::CheckMemoryDialogIfNeeded(): Begin" )));
+ TDriveNumber drive( static_cast< TDriveNumber >( iDriveToUnlock ) );
+ TRACES( RDebug::Print(_L( "CSysApDriveUnlockHandler::CheckMemoryDialogIfNeeded()" )));
+ TPtrC aStringPointer11 = iMemCardPwdDialog->getTextL();
+ ConvertCharactersToPwd(aStringPointer11,iPassword);
+
+ if(!aStringPointer11.Length())
+ {
+ return EFalse; // It meant user has pressed OK without password
+ }
+
+ TRACES( RDebug::Print(_L( "CSysApMCSysApMMCUnlockObserver::RunL; iPassword %S" ),&iPassword));
+ CEikonEnv* eikEnv = CEikonEnv:: Static();
+ TInt err = eikEnv->FsSession().UnlockDrive(drive,iPassword,ETrue);
+ ReleaseMemoryForInputCardDialog();
+
+ if ( err == KErrNone)
+ {
+ TRACES( RDebug::Print(_L( "CSysApAppUi::ReleaseMemoryCardCustomDialogMemory(), Drive Unlocked Succesfully" )));
+ _LIT(KUnlockNote,"The memory is unlocked!");
+ HBufC* aString = HBufC16::NewLC(150);
+ TPtrC aStringPointer = aString->Des();
+ aStringPointer.Set(KUnlockNote);
+ iSysApAppUi.ShowExampleUiNoteL( aStringPointer );
+ CleanupStack::PopAndDestroy(); // aString
+ return ETrue;
+ }
+ else if( err == KErrAccessDenied )
+ {
+ TRACES( RDebug::Print(_L( "CSysApAppUi::ReleaseMemoryCardCustomDialogMemory(), Password InCorrect" )));
+ _LIT(KUnlockDeniedNote,"The password is incorrect, try again!");
+ HBufC* aString = HBufC16::NewLC(150);
+ TPtrC aStringPointer = aString->Des();
+ aStringPointer.Set(KUnlockDeniedNote);
+ iSysApAppUi.ShowExampleUiNoteL( aStringPointer );
+ CleanupStack::PopAndDestroy(); // aString
+ return EFalse;
+ }
+ else if( err == KErrAlreadyExists )
+ {
+ TRACES( RDebug::Print(_L( "CSysApAppUi::ReleaseMemoryCardCustomDialogMemory(), Already been Drive Unlocked" )));
+ _LIT(KUnlockAlreadyExistNote,"The disk has already been unlocked!");
+ HBufC* aString = HBufC16::NewLC(150);
+ TPtrC aStringPointer = aString->Des();
+ aStringPointer.Set(KUnlockAlreadyExistNote);
+ iSysApAppUi.ShowExampleUiNoteL( aStringPointer );
+ CleanupStack::PopAndDestroy(); // aString
+ return ETrue;
+ }
+ else if( err == KErrNotSupported )
+ {
+ TRACES( RDebug::Print(_L( "CSysApAppUi::ReleaseMemoryCardCustomDialogMemory(), Media does not support password locking." )));
+ _LIT(KUnlockNotSupporrtedNote,"The media does not support password locking!");
+ HBufC* aString = HBufC16::NewLC(150);
+ TPtrC aStringPointer = aString->Des();
+ aStringPointer.Set(KUnlockNotSupporrtedNote);
+ TRACES( RDebug::Print( _L("CSysApWsClient::RunL(): Key EEventKeyUp 01") ) );
+ iSysApAppUi.ShowExampleUiNoteL( aStringPointer );
+ CleanupStack::PopAndDestroy(); // aString
+ return ETrue;
+ }
+ else
+ {
+ // check for error -18 what it is .
+ _LIT(KUnlockOperationCancelNote,"Error occurred, operation cancelled!");
+ HBufC* aString = HBufC16::NewLC(150);
+ TPtrC aStringPointer = aString->Des();
+ aStringPointer.Set(KUnlockOperationCancelNote);
+ TRACES( RDebug::Print( _L("CSysApWsClient::RunL(): Key EEventKeyUp 01") ) );
+ iSysApAppUi.ShowExampleUiNoteL( aStringPointer );
+ CleanupStack::PopAndDestroy(); // aString
+ return ETrue;
+ }
+}
+
+HBufC8* CSysApDriveUnlockHandler::Convert16to8L(TDesC16& aStr)//const
+ {
+
+ HBufC8* newFrom1 = HBufC8::NewL(aStr.Length());
+
+ newFrom1->Des().Copy(aStr);
+
+ return newFrom1;
+ }
+
+void CSysApDriveUnlockHandler::ConvertCharactersToPwd(TDesC& aWord, TDes8& aConverted)
+{
+ aConverted.FillZ(aConverted.MaxLength());
+ aConverted.Zero();
+
+ if (aWord.Length())
+ {
+ aConverted.Copy( (TUint8*)(&aWord[0]), aWord.Size() );
+ }
+}
+
// End of File
--- a/coreapplicationuis/SysAp/Src/memorycard/sysapdriveunlockhandler.h Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/memorycard/sysapdriveunlockhandler.h Tue Aug 31 15:24:25 2010 +0300
@@ -22,14 +22,14 @@
// INCLUDES
#include <e32std.h>
#include <aknmemorycarddialog.h>
+#include "hbdeviceinputdialogsymbian.h"
// FORWARD DECLARATIONS
class CSysApDriveList;
class CSysApAppUi;
// CLASS DECLARATION
-class CSysApDriveUnlockHandler : public CBase,
- public MAknMemoryCardDialogObserver
+class CSysApDriveUnlockHandler : public CBase
{
public:
/**
@@ -57,6 +57,17 @@
* @param aDrive Drive to stop unlock notifier if ongoing
*/
void StopUnlock( TInt aDrive );
+
+ void ReleaseMemoryForInputCardDialog();
+ TInt CheckMemoryDialogIfNeeded();
+ void ConvertCharactersToPwd(TDesC& aWord, TDes8& aConverted);
+
+ /**
+ * Shows unlock query.
+ */
+ void ShowUnlockQueryL();
+ HBufC8* Convert16to8L(TDesC16& aStr);
+ void UnlockComplete( TInt aResult );
private:
/**
@@ -66,18 +77,13 @@
CSysApDriveList& aSysApDriveList,
CSysApAppUi& aSysApAppUi,
const TBool aMemoryCardLockSupported );
-
+
/**
* Handles query show from CAsyncCallBack.
*/
static TInt QueryShowCB( TAny* aPtr );
/**
- * Shows unlock query.
- */
- void ShowUnlockQueryL();
-
- /**
* Checks is unlock query ongoing.
*/
TBool IsQueryOngoing() const;
@@ -97,9 +103,6 @@
*/
void DoStopUnlock( TInt aError );
-private: // From MAknMemoryCardDialogObserver
- void UnlockComplete( TInt aResult );
-
private: // Data
// Reference to the drive list
CSysApDriveList& iSysApDriveList;
@@ -109,19 +112,16 @@
// Indicates if memory card locking is supported
TBool iMemoryCardLockSupported;
-
- // Pointer to unlock query. Own,
- CAknMemoryCardDialog* iMemoryCardDialog;
-
- // Current drive to be unlocked
+
+ CHbDeviceInputDialogSymbian* iMemCardPwdDialog;
+
+ // Current drive to be unlocked
TInt iDriveToUnlock;
- // Pointer to the callback. Own.
- CAsyncCallBack* iQueryShowCB;
-
// Indicates if the query result can be ignored i.e. query was canceled
TBool iIgnoreQueryResult;
-
+
+ TMediaPassword iPassword;
};
#endif // SYSAPDRIVEUNLOCKHANDLER_H
--- a/coreapplicationuis/SysAp/Src/sysapbatteryinfocontroller.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/sysapbatteryinfocontroller.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -19,13 +19,8 @@
#include <e32debug.h>
#include <e32property.h>
#include <StringLoader.h>
-#include <SysAp.rsg>
#include "bsutil.h"
#include <hwrmpowerstatesdkpskeys.h>
-#include <aknappui.h>
-#include <AknCapServerClient.h>
-#include <AknSgcc.h>
-#include "batterypopupcontrol.h"
#include "sysapbatteryinfocontroller.h"
#include "SysAp.hrh"
@@ -43,8 +38,8 @@
: iBsUtil( NULL ),
iCurrentCapacity( KNotInitialized ),
iThresholdCapacity( aThreshold ),
- iBatteryInfoState( EBatteryInfoAboveThreshold ),
- iBatteryPopup( NULL )
+ iBatteryInfoState( EBatteryInfoAboveThreshold )
+ // iBatteryPopup( NULL )
{
// sanity check, fall back to hard coded default value
const TInt min(0);
@@ -92,7 +87,7 @@
{
TRACES( RDebug::Print( _L("CSysApBatteryInfoController::~CSysApBatteryInfoController") ) );
delete iBsUtil;
- delete iBatteryPopup;
+ // delete iBatteryPopup;
}
// ---------------------------------------------------------------------------
@@ -183,48 +178,12 @@
// CSysApBatteryInfoController::ShowBatteryPreviewPopupL
// ---------------------------------------------------------------------------
//
-void CSysApBatteryInfoController::ShowBatteryPreviewPopupL( TInt aCapacity )
+void CSysApBatteryInfoController::ShowBatteryPreviewPopupL( TInt /* aCapacity */ )
{
- TRACES( RDebug::Print( _L("CSysApBatteryInfoController::ShowBatteryPreviewPopupL: aCapacity=%d"), aCapacity ) );
-
- delete iBatteryPopup;
- iBatteryPopup = NULL;
- HBufC* popupTextBuf = StringLoader::LoadLC( R_QTN_BATTERY_STATUS_POPUP, aCapacity );
- iBatteryPopup = CBatteryPopupControl::NewL( *popupTextBuf, KNullDesC );
- CleanupStack::PopAndDestroy( popupTextBuf );
-
- // switch layout for showing the battery popup
- CAknAppUi* appUi = static_cast<CAknAppUi*>(CCoeEnv::Static()->AppUi());
- CEikStatusPane* statusPane = appUi->StatusPane();
+ // TRACES( RDebug::Print( _L("CSysApBatteryInfoController::ShowBatteryPreviewPopupL: aCapacity=%d"), aCapacity ) );
- TInt currLayout = statusPane->CurrentLayoutResId();
-
- RAknUiServer* aknSrv = CAknSgcClient::AknSrv();
- if ( aknSrv )
- {
- statusPane->SwitchLayoutL( aknSrv->StatusPaneResourceId() );
- }
- // Trap for switching layout back to current.
- TRAPD( err, iBatteryPopup->ShowPopUpL() );
-
- if( err )
- {
- TRACES( RDebug::Print( _L("CSysApBatteryInfoController::ShowBatteryPreviewPopupL ShowPopUpL() leaved: %d"), err ) );
- }
-
- // restore layout
- statusPane->SwitchLayoutL( currLayout );
-
- User::LeaveIfError( err );
+ // delete iBatteryPopup;
+ // iBatteryPopup = NULL;
+ // preview battery capacity
}
-
-// ---------------------------------------------------------------------------
-// CSysApBatteryInfoController::IsBatteryInfoAboveThreshold
-// ---------------------------------------------------------------------------
-//
-TBool CSysApBatteryInfoController::IsBatteryInfoAboveThreshold() const
- {
- TInt capacity = iBsUtil->GetBatteryCapacity();
- return ((capacity <= iThresholdCapacity ? EBatteryInfoBelowThreshold : EBatteryInfoAboveThreshold) == EBatteryInfoAboveThreshold);
- }
--- a/coreapplicationuis/SysAp/Src/sysapdefaultkeyhandler.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/sysapdefaultkeyhandler.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2008 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"
@@ -19,8 +19,9 @@
#include <e32property.h>
#include <eikon.hrh>
#include <coemain.h>
-#include <aknkeylock.h>
-#include <AknTaskList.h>
+//#include <aknkeylock.h>
+//#include <AknTaskList.h>
+#include "SysApTaskList.h"
#include <apgtask.h>
#include <apgcli.h>
#include <apgwgnam.h>
@@ -33,16 +34,13 @@
#include <startupdomainpskeys.h>
#include <hwrmdomainpskeys.h>
#include <u32hal.h>
-#include <SysAp.rsg>
-#include <centralrepository.h> //for CRepository
-#include <settingsinternalcrkeys.h>
-#include <keylockpolicyapi.h>
-#include <ctsydomainpskeys.h>
-#include <hwrmdomainpskeys.h>
+//#include <SysAp.rsg>
#include "sysapdefaultkeyhandler.h"
#include "sysapcallback.h"
#include "SysAp.hrh"
-#include "AknSgcc.h"
+#include <AknSgcc.h>
+//#include "sysapappui.h"
+#include <w32std.h>
const TInt KModifierMask( 0 );
@@ -53,18 +51,18 @@
// CSysApDefaultKeyHandler::CSysApDefaultKeyHandler
// ---------------------------------------------------------------------------
//
-CSysApDefaultKeyHandler::CSysApDefaultKeyHandler( MSysapCallback& aCallback ) :
+CSysApDefaultKeyHandler::CSysApDefaultKeyHandler( MSysapCallback& aCallback ):
iCallback(aCallback),
iCameraSupported(EFalse),
iCoverDisplaySupported(EFalse),
- iKeylock(NULL),
+// iKeylock(NULL),
iCapturedEKeyCamera(0),
iCapturedEKeyTwistOpen(0),
iCapturedEKeyTwistClose(0),
iCapturedEKeyGripOpen(0),
iCapturedEKeyGripClose(0),
- iCapturedEKeyPoC(0),
- iAknUiServerConnected(EFalse)
+ iCapturedEKeyPoC(0)
+// iAknUiServerConnected(EFalse)
{
}
@@ -78,72 +76,23 @@
RWindowGroup groupWin = CCoeEnv::Static()->RootWin();
User::LeaveIfError ( iCapturedEKeyCamera = groupWin.CaptureKey( EKeyCamera, KModifierMask, KModifierMask ) );
- User::LeaveIfError ( iCapturedEKeyTwistOpen = groupWin.CaptureKey( EKeyTwistOpen, KModifierMask, KModifierMask ) );
- User::LeaveIfError ( iCapturedEKeyTwistClose = groupWin.CaptureKey( EKeyTwistClose, KModifierMask, KModifierMask ) );
- User::LeaveIfError ( iCapturedEKeyGripOpen = groupWin.CaptureKey( EKeyGripOpen, KModifierMask, KModifierMask ) );
- User::LeaveIfError ( iCapturedEKeyGripClose = groupWin.CaptureKey( EKeyGripClose, KModifierMask, KModifierMask ) );
- User::LeaveIfError ( iCapturedEKeyPoC = groupWin.CaptureKey( EKeyPoC, KModifierMask, KModifierMask ) );
-
- // flip key events don't need to be captured, because in current setup they are not real events but simulated by SysAp
- // according to notifications received from P&S key that stores flip information
FeatureManager::InitializeLibL();
iCameraSupported = FeatureManager::FeatureSupported( KFeatureIdCamera );
iCoverDisplaySupported = FeatureManager::FeatureSupported( KFeatureIdCoverDisplay );
FeatureManager::UnInitializeLib();
-
- TKeyLockBuf lockBuf;
- iCallback.ExecQueryL( MSysapCallback::EGetKeylock, lockBuf );
- iKeylock = lockBuf();
-
- iKeypadWasLocked = iKeylock->IsKeyLockEnabled();
-
- __ASSERT_DEBUG( iKeylock, User::Panic( _L("CSysApDefaultKeyHandler::ConstructL: iKeylock not initialized"), KErrBadHandle ) );
-
- if ( iCoverDisplaySupported ) // if flip status is monitored, set the initial flip status now
- {
- TInt flipValue;
- TInt err = RProperty::Get( KPSUidHWRM, KHWRMFlipStatus, flipValue );
-
- TRACES( RDebug::Print( _L("CSysApDefaultKeyHandler::ConstructL: flipValue=%d, err=%d"), flipValue, err ) );
-
- if ( err == KErrNone )
- {
- switch ( flipValue )
- {
- case EPSHWRMFlipOpen:
- SetDisplayState( ETrue );
- break;
-
- case EPSHWRMFlipClosed:
- SetDisplayState( EFalse );
- break;
-
- case EPSHWRMFlipStatusUninitialized:
- default:
- // set display state only if the current flip position is known
- break;
- }
- }
- }
-
- //Load keylock slide handling CR
- TRAP_IGNORE( iSlideRepository = CRepository::NewL( KCRUidSlideSettings ) );
- iKeylockPolicy = CKeyLockPolicyApi::NewL( EPolicyActivateKeyguard );
-
- //Load PhoneCallStatus P&S
- TInt err = iCallStateProperty.Attach(KPSUidCtsyCallInformation, KCTsyCallState);
+
}
// ---------------------------------------------------------------------------
// CSysApDefaultKeyHandler::NewL
// ---------------------------------------------------------------------------
//
-CSysApDefaultKeyHandler* CSysApDefaultKeyHandler::NewL( MSysapCallback& aCallback )
+CSysApDefaultKeyHandler* CSysApDefaultKeyHandler::NewL(MSysapCallback& aCallback )
{
TRACES( RDebug::Print( _L("CSysApDefaultKeyHandler::NewL()") ) );
- CSysApDefaultKeyHandler* self = new( ELeave ) CSysApDefaultKeyHandler( aCallback) ;
+ CSysApDefaultKeyHandler* self = new( ELeave ) CSysApDefaultKeyHandler(aCallback) ;
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop( self );
@@ -158,18 +107,8 @@
CSysApDefaultKeyHandler::~CSysApDefaultKeyHandler()
{
TRACES( RDebug::Print( _L("CSysApDefaultKeyHandler::~CSysApDefaultKeyHandler()") ) );
-
- iAknUiServer.Close();
-
RWindowGroup groupWin = CCoeEnv::Static()->RootWin();
- groupWin.CancelCaptureKey( iCapturedEKeyCamera );
- groupWin.CancelCaptureKey( iCapturedEKeyTwistOpen );
- groupWin.CancelCaptureKey( iCapturedEKeyTwistClose );
- groupWin.CancelCaptureKey( iCapturedEKeyGripOpen );
- groupWin.CancelCaptureKey( iCapturedEKeyGripClose );
- groupWin.CancelCaptureKey( iCapturedEKeyPoC );
- delete iSlideRepository;
- delete iKeylockPolicy;
+ groupWin.CancelCaptureKey( iCapturedEKeyCamera );
}
@@ -191,127 +130,18 @@
response = EKeyWasConsumed; // set again in default case if not consumed
switch ( aKeyEvent.iCode )
- {
- case EKeyGripOpen:
- TRACES( RDebug::Print(_L("CSysApDefaultKeyHandler::HandleKeyEventL: EKeyGripOpen") ) );
- RProperty::Set( KPSUidHWRM, KHWRMGripStatus, EPSHWRMGripOpen );
- iKeypadWasLocked = iKeylock->IsKeyLockEnabled();
- iKeylockPolicy->DisableKeyguardFeature();
- if (!IsDeviceLocked())
- {
- iCallback.ExecCommandL( MSysapCallback::EResetKeyguardState );
- iKeylock->DisableKeyLock();
- iCallback.ExecCommandL( MSysapCallback::ECancelPowermenu );
- }
- // apply default light control
- iCallback.ExecCommandL( MSysapCallback::EUpdateLights, TUpdateLightsBuf(EKeyGripOpen) );
- break;
-
- case EKeyGripClose:
- TRACES( RDebug::Print(_L("CSysApDefaultKeyHandler::HandleKeyEventL: EKeyGripClosed") ) );
- RProperty::Set( KPSUidHWRM, KHWRMGripStatus, EPSHWRMGripClosed );
- iKeylockPolicy->EnableKeyguardFeature();
- iCallback.ExecCommandL( MSysapCallback::ECancelPowermenu );
- if( !iSlideRepository )
- { // default behavior is to always ask for keylock
- if ( !IsDeviceLocked() && UiReady() )
- {
- iKeylock->OfferKeyLock();
- }
- }
- else
- { // keylock action is defined by user setting
- TInt value = 0;
- RProperty::Get(KPSUidStartup, KPSStartupUiPhase, value);
- TBool startupOver = (value == EStartupUiPhaseAllDone);
- if(startupOver)
- {
- TInt status(0);
- TInt err = iCallStateProperty.Get( status );
- if (err == KErrNone)
- {
- switch ( status )
- {
- case EPSCTsyCallStateUninitialized:
- case EPSCTsyCallStateNone:
- {
-
- TInt keyGuardSetting;
- User::LeaveIfError(iSlideRepository->Get( KSlideKeyguard, keyGuardSetting ));
- switch( ( TSlideSettingKeyguard ) keyGuardSetting )
- {
- case ESlideSettingsKeyguardActivatingOn:
- iKeylock->EnableKeyLock();
- break;
- case ESlideSettingsKeyguardActivatingAskMe:
- iKeylock->OfferKeyLock();
- break;
- case ESlideSettingsKeyguardActivatingOff:
- //do nothing
- break;
- case ESlideSettingsKeyguardActivatingAutomatic:
- if( iKeypadWasLocked )
- {
- iKeylock->EnableKeyLock();
- }
- break;
- }
- }
- default: // any other state
- break;
- }
- }
- }
- }
- // apply default light control
- iCallback.ExecCommandL( MSysapCallback::EUpdateLights, TUpdateLightsBuf(EKeyGripClose) );
- break;
-
- case EKeyFlipOpen: // simulated key event
- {
- TRACES( RDebug::Print(_L("CSysApDefaultKeyHandler::HandleKeyEventL: EKeyFlipOpen") ) );
- SetDisplayState( ETrue );
- // apply default light control
- iCallback.ExecCommandL( MSysapCallback::EUpdateLights, TUpdateLightsBuf(EKeyFlipOpen) );
- }
- break;
-
- case EKeyFlipClose: // simulated key event
- TRACES( RDebug::Print(_L("CSysApDefaultKeyHandler::HandleKeyEventL: EKeyFlipClose") ) );
- SetDisplayState( EFalse );
- // apply default light control
- iCallback.ExecCommandL( MSysapCallback::EUpdateLights, TUpdateLightsBuf(EKeyFlipClose) );
- break;
-
- case EKeyTwistOpen:
- TRACES( RDebug::Print(_L("CSysApDefaultKeyHandler::HandleKeyEventL: EKeyTwistOpen") ) );
- RProperty::Set( KPSUidHWRM, KHWRMTwistStatus, EPSHWRMTwistOpen );
- break;
-
- case EKeyTwistClose:
- TRACES( RDebug::Print(_L("CSysApDefaultKeyHandler::HandleKeyEventL: EKeyTwistClose") ) );
- RProperty::Set( KPSUidHWRM, KHWRMTwistStatus, EPSHWRMTwistClose );
- break;
-
+ {
case EKeyCamera:
TRACES( RDebug::Print(_L("CSysApDefaultKeyHandler::HandleKeyEventL: EKeyCamera") ) );
if ( iCameraSupported && !IsDeviceLocked() && !DoShowKeysLockedNote() )
{
- iCallback.ExecCommandL( MSysapCallback::ECancelPowermenu );
ActivateApplicationL( KSysApCamcorderUid );
}
break;
-
- case EKeyPoC:
- TRACES( RDebug::Print(_L("CSysApDefaultKeyHandler::HandleKeyEventL: EKeyPoC") ) );
- LaunchPocL();
- break;
-
default:
response = EKeyWasNotConsumed;
TRACES( RDebug::Print( _L("CSysApDefaultKeyHandler::CSysApDefaultKeyHandler: key was not consumed.") ) );
- break;
-
+ break;
}
}
@@ -384,15 +214,16 @@
//
void CSysApDefaultKeyHandler::ActivateApplicationL( const TUid aUid ) const
{
+
TRACES( RDebug::Print( _L( "CSysApDefaultKeyHandler::ActivateApplicationL") ) );
// Applications must not be activated before reaching normal system operation state
if ( UiReady() )
{
- CAknTaskList* apaTaskList = CAknTaskList::NewL( CCoeEnv::Static()->WsSession() );
+ CSysApTaskList* apaTaskList = CSysApTaskList::NewLC( CCoeEnv::Static()->WsSession() );
TApaTask apaTask = apaTaskList->FindRootApp( aUid ); // only root application should not be activated
- delete apaTaskList;
-
+ CleanupStack::PopAndDestroy( apaTaskList );
+
if ( apaTask.Exists() )
{
TRACES( RDebug::Print( _L( "CSysApDefaultKeyHandler::ActivateApplicationL: application brought to foreground") ) );
@@ -402,8 +233,8 @@
{
TRACES( RDebug::Print( _L("e_CAM_PRI_OFF_TO_ON 1") ) );
}
-#endif // _DEBUG
- CAknSgcClient::MoveApp ( apaTask.WgId(), ESgcMoveAppToForeground );
+#endif // _DEBUG
+ apaTask.BringToForeground();
}
else
{
@@ -446,20 +277,8 @@
void CSysApDefaultKeyHandler::LaunchPocL()
{
TRACES( RDebug::Print(_L("CSysApDefaultKeyHandler::LaunchPocL") ) );
-
- if ( UiReady() && !IsDeviceLocked() && !DoShowKeysLockedNote() )
- {
- CAiwServiceHandler* serviceHandler = CAiwServiceHandler::NewLC();
- serviceHandler->AttachL( R_POC_AIW_INTEREST );
-
- CAiwGenericParamList* inParams = CAiwGenericParamList::NewLC();
- inParams->AppendL(TAiwGenericParam( EGenericParamPoCLaunchView, TAiwVariant(EAiwPoCMainView)));
- serviceHandler->ExecuteServiceCmdL( KAiwCmdPoC, *inParams, serviceHandler->OutParamListL());
-
- CleanupStack::PopAndDestroy( inParams );
- CleanupStack::PopAndDestroy( serviceHandler);
- }
- }
+ // not supported
+ }
// ----------------------------------------------------------------------------
// CSysApDefaultKeyHandler::IsDeviceLocked()
@@ -513,29 +332,29 @@
{
TRACES( RDebug::Print( _L("CSysApDefaultKeyHandler::DoShowKeysLockedNote: iAknUiServerConnected=%d"), iAknUiServerConnected ) );
- TInt err(KErrNone);
+// TInt err(KErrNone);
if ( !iAknUiServerConnected )
{
- err = iAknUiServer.Connect();
+/* err = iAknUiServer.Connect();
if ( err != KErrNone )
{
- TRACES( RDebug::Print( _L("CSysApDefaultKeyHandler::DoShowKeysLockedNote: RAknUiServer::Connect failed, err=%d"), err ) );
+ // TRACES( RDebug::Print( _L("CSysApDefaultKeyHandler::DoShowKeysLockedNote: RAknUiServer::Connect failed, err=%d"), err ) );
return ETrue; // assume that keypad/device is locked
}
iAknUiServerConnected = ETrue;
- }
+ */ }
- TBool keysLocked;
- err = iAknUiServer.ShowKeysLockedNote( keysLocked );
+ TBool keysLocked = EFalse;
+/* err = iAknUiServer.ShowKeysLockedNote( keysLocked );
if ( err != KErrNone )
{
TRACES( RDebug::Print( _L("CSysApDefaultKeyHandler::DoShowKeysLockedNote: RAknUiServer::ShowKeysLockedNote failed, err=%d"), err ) );
keysLocked = ETrue; // assume that keypad/device is locked
}
-
+ */
return keysLocked;
}
@@ -566,3 +385,6 @@
return response;
}
+
+
+
--- a/coreapplicationuis/SysAp/Src/sysapeteldatabearerobserver.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/sysapeteldatabearerobserver.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -110,11 +110,11 @@
if ( newHsdpaState != iHsdpaActive )
{
iHsdpaActive = newHsdpaState;
- TRAPD( err, iSysApAppUi.SetSignalIndicatorL() );
+// TRAPD( err, iSysApAppUi.SetSignalIndicatorL() );
- if ( err != KErrNone )
+// if ( err != KErrNone )
{
- TRACES( RDebug::Print( _L("CSysApEtelDataBearerObserver::RunL: err=%d"), err ) );
+// TRACES( RDebug::Print( _L("CSysApEtelDataBearerObserver::RunL: err=%d"), err ) );
}
}
}
--- a/coreapplicationuis/SysAp/Src/sysapetelnetworkinfoobserver.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/sysapetelnetworkinfoobserver.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -111,13 +111,13 @@
if ( hsdpaAvailable != iHsdpaAvailable )
{
iHsdpaAvailable = hsdpaAvailable;
- TRAPD( err, iSysApAppUi.SetSignalIndicatorL() );
+/* TRAPD( err, iSysApAppUi.SetSignalIndicatorL() );
if ( err != KErrNone )
{
TRACES( RDebug::Print( _L("CSysApEtelNetworkInfoObserver::RunL: err=%d"), err ) );
}
- }
+*/ }
}
OrderNotification();
--- a/coreapplicationuis/SysAp/Src/sysapkeymanagement.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/sysapkeymanagement.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -134,6 +134,10 @@
{
iRootWindowGroup.CancelCaptureKeyUpAndDowns( info->iUpAndDownKeyHandles[upAndDownKeyHandleCounter] );
}
+ for ( TInt keyHandleCounter = info->iLongKeyPressHandle.Count()-1; keyHandleCounter >= 0; keyHandleCounter-- )
+ {
+ iRootWindowGroup.CancelCaptureLongKey( info->iLongKeyPressHandle[keyHandleCounter] );
+ }
}
}
@@ -166,8 +170,10 @@
captureKey, info->iPluginUid ) );
if (info->iIsKeyProvider)
{
+ TUint repeatValue = 0;
TInt captureUpDownKey = info->iKeys[keyCounter].iScanCode;
TUint modifiers = info->iKeys[keyCounter].iModifiers;
+ repeatValue = info->iKeys[keyCounter].iRepeats;
TInt32 keyHandle = iRootWindowGroup.CaptureKey( captureKey, modifiers, modifiers );
@@ -196,6 +202,19 @@
//error of Append ignored, key will not be cancelled. We can live with that.
TRACES( RDebug::Print( _L("CSysApKeyManagement::CaptureKeys UpAndDowns: Append failed, error %d"), upAndDownKeyHandle ) );
}
+ if( repeatValue == 1 )
+ {
+ TInt32 longKeyPressHandle = iRootWindowGroup.CaptureLongKey( captureKey, captureKey,0, modifiers,0, ELongCaptureWaitShort);
+ if ( longKeyPressHandle < KErrNone )
+ {
+ TRACES( RDebug::Print( _L("CSysApKeyManagement::CaptureLongKey : error %d"), longKeyPressHandle ) );
+ continue; // other keys may be possible to capture, so continue
+ }
+ if ( ( longKeyPressHandle = info->iLongKeyPressHandle.Append( longKeyPressHandle ) ) != KErrNone ) //store handle for CancelCaptureKeyUpAndDowns
+ {
+ TRACES( RDebug::Print( _L("CSysApKeyManagement::CaptureLongKey : Append failed, error %d"), longKeyPressHandle ) );
+ }
+ }
}
else
{
--- a/coreapplicationuis/SysAp/Src/sysapremconobserver.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/sysapremconobserver.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007 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"
@@ -19,7 +19,7 @@
// INCLUDE FILES
#include <remconcoreapitarget.h>
#include <remconinterfaceselector.h>
-#include <aknconsts.h>
+//#include <aknconsts.h>
#include "sysapremconobserver.h"
#include "SysApAppUi.h"
@@ -47,6 +47,12 @@
void CSysApRemConObserver::ConstructL()
{
TRACES( RDebug::Print( _L("CSysApRemConObserver::ConstructL") ) );
+
+ iInterfaceSelector = CRemConInterfaceSelector::NewL();
+
+ iCoreTarget = CRemConCoreApiTarget::NewL( *iInterfaceSelector, *this );
+
+ iInterfaceSelector->OpenTargetL();
}
// -----------------------------------------------------------------------------
@@ -75,6 +81,7 @@
CSysApRemConObserver::~CSysApRemConObserver()
{
TRACES( RDebug::Print( _L("CSysApRemConObserver::~CSysApRemConObserver") ) );
+ delete iInterfaceSelector; // Internally deletes iCoreTarget
}
// -----------------------------------------------------------------------------
@@ -105,31 +112,4 @@
}
}
-/**
- * Reserve the volume keys
- */
-void CSysApRemConObserver::StartRemconInterfaceL()
- {
- TRACES( RDebug::Print( _L("CSysApRemConObserver::BlockKeys")));
- if(!iInterfaceSelector)
- {
- iInterfaceSelector = CRemConInterfaceSelector::NewL();
- iCoreTarget = CRemConCoreApiTarget::NewL( *iInterfaceSelector, *this );
- iInterfaceSelector->OpenTargetL();
- }
- }
-
-/**
- * Release the volume keys for other application like phone app during call
- */
-void CSysApRemConObserver::StopRemconInterface()
- {
- TRACES( RDebug::Print( _L("CSysApRemConObserver::UnBlockKeys")));
- if(iInterfaceSelector)
- {
- delete iInterfaceSelector;
- iInterfaceSelector = NULL;
- }
- }
-
// End of File
Binary file coreapplicationuis/SysAp/conf/coreapplicationuis_101F876C.crml has changed
--- a/coreapplicationuis/SysAp/rom/SysAp.iby Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/SysAp/rom/SysAp.iby Tue Aug 31 15:24:25 2010 +0300
@@ -20,6 +20,7 @@
#define __SysAp_IBY__
file=ABI_DIR\BUILD_DIR\NspsWsPlugin.dll SHARED_LIB_DIR\NspsWsPlugin.dll
+data=DATAZ_\resource\apps\qgn_sysap_screen.svg resource\apps\qgn_sysap_screen.svg
S60_APP_EXE(SysAp)
S60_APP_AIF_RSC(SysAp)
--- a/coreapplicationuis/VariatedSettings/group/bld.inf Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/VariatedSettings/group/bld.inf Tue Aug 31 15:24:25 2010 +0300
@@ -26,33 +26,33 @@
../rom/VariatedSettings_variant.iby CUSTOMER_MW_LAYER_IBY_EXPORT_PATH(VariatedSettings_variant.iby)
// Normal RFS script
-../scripts/script0.txt /epoc32/release/winscw/udeb/z/private/100059C9/script0.txt
-../scripts/script0.txt /epoc32/release/winscw/urel/z/private/100059C9/script0.txt
-../scripts/script0.txt /epoc32/release/thumb/udeb/z/private/100059C9/script0.txt
-../scripts/script0.txt /epoc32/release/thumb/urel/z/private/100059C9/script0.txt
-../scripts/script0.txt /epoc32/release/arm4/udeb/z/private/100059C9/script0.txt
-../scripts/script0.txt /epoc32/release/arm4/urel/z/private/100059C9/script0.txt
-../scripts/script0.txt /epoc32/release/armv5/udeb/z/private/100059C9/script0.txt
-../scripts/script0.txt /epoc32/release/armv5/urel/z/private/100059C9/script0.txt
+../scripts/script0.txt /epoc32/release/winscw/udeb/z/private/100059c9/script0.txt
+../scripts/script0.txt /epoc32/release/winscw/urel/z/private/100059c9/script0.txt
+../scripts/script0.txt /epoc32/release/thumb/udeb/z/private/100059c9/script0.txt
+../scripts/script0.txt /epoc32/release/thumb/urel/z/private/100059c9/script0.txt
+../scripts/script0.txt /epoc32/release/arm4/udeb/z/private/100059c9/script0.txt
+../scripts/script0.txt /epoc32/release/arm4/urel/z/private/100059c9/script0.txt
+../scripts/script0.txt /epoc32/release/armv5/udeb/z/private/100059c9/script0.txt
+../scripts/script0.txt /epoc32/release/armv5/urel/z/private/100059c9/script0.txt
// Deep RFS script
-../scripts/script1.txt /epoc32/release/winscw/udeb/z/private/100059C9/script1.txt
-../scripts/script1.txt /epoc32/release/winscw/urel/z/private/100059C9/script1.txt
-../scripts/script1.txt /epoc32/release/thumb/udeb/z/private/100059C9/script1.txt
-../scripts/script1.txt /epoc32/release/thumb/urel/z/private/100059C9/script1.txt
-../scripts/script1.txt /epoc32/release/arm4/udeb/z/private/100059C9/script1.txt
-../scripts/script1.txt /epoc32/release/arm4/urel/z/private/100059C9/script1.txt
-../scripts/script1.txt /epoc32/release/armv5/udeb/z/private/100059C9/script1.txt
-../scripts/script1.txt /epoc32/release/armv5/urel/z/private/100059C9/script1.txt
+../scripts/script1.txt /epoc32/release/winscw/udeb/z/private/100059c9/script1.txt
+../scripts/script1.txt /epoc32/release/winscw/urel/z/private/100059c9/script1.txt
+../scripts/script1.txt /epoc32/release/thumb/udeb/z/private/100059c9/script1.txt
+../scripts/script1.txt /epoc32/release/thumb/urel/z/private/100059c9/script1.txt
+../scripts/script1.txt /epoc32/release/arm4/udeb/z/private/100059c9/script1.txt
+../scripts/script1.txt /epoc32/release/arm4/urel/z/private/100059c9/script1.txt
+../scripts/script1.txt /epoc32/release/armv5/udeb/z/private/100059c9/script1.txt
+../scripts/script1.txt /epoc32/release/armv5/urel/z/private/100059c9/script1.txt
// Init RFS script
-../scripts/ScriptInit.txt /epoc32/release/winscw/udeb/z/private/100059C9/ScriptInit.txt
-../scripts/ScriptInit.txt /epoc32/release/winscw/urel/z/private/100059C9/ScriptInit.txt
-../scripts/ScriptInit.txt /epoc32/release/thumb/udeb/z/private/100059C9/ScriptInit.txt
-../scripts/ScriptInit.txt /epoc32/release/thumb/urel/z/private/100059C9/ScriptInit.txt
-../scripts/ScriptInit.txt /epoc32/release/arm4/udeb/z/private/100059C9/ScriptInit.txt
-../scripts/ScriptInit.txt /epoc32/release/arm4/urel/z/private/100059C9/ScriptInit.txt
-../scripts/ScriptInit.txt /epoc32/release/armv5/udeb/z/private/100059C9/ScriptInit.txt
-../scripts/ScriptInit.txt /epoc32/release/armv5/urel/z/private/100059C9/ScriptInit.txt
+../scripts/ScriptInit.txt /epoc32/release/winscw/udeb/z/private/100059c9/scriptinit.txt
+../scripts/ScriptInit.txt /epoc32/release/winscw/urel/z/private/100059c9/scriptinit.txt
+../scripts/ScriptInit.txt /epoc32/release/thumb/udeb/z/private/100059c9/scriptinit.txt
+../scripts/ScriptInit.txt /epoc32/release/thumb/urel/z/private/100059c9/scriptinit.txt
+../scripts/ScriptInit.txt /epoc32/release/arm4/udeb/z/private/100059c9/scriptinit.txt
+../scripts/ScriptInit.txt /epoc32/release/arm4/urel/z/private/100059c9/scriptinit.txt
+../scripts/ScriptInit.txt /epoc32/release/armv5/udeb/z/private/100059c9/scriptinit.txt
+../scripts/ScriptInit.txt /epoc32/release/armv5/urel/z/private/100059c9/scriptinit.txt
PRJ_MMPFILES
--- a/coreapplicationuis/accfwuinotifier/data/accfwnoteuinotifier.rss Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/accfwuinotifier/data/accfwnoteuinotifier.rss Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2004 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2004-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"
@@ -25,140 +25,11 @@
#include <avkon.loc>
#include <avkon.rsg>
-#include <accfwnotifier.loc>
-
-
// RESOURCE DEFINITIONS
RESOURCE RSS_SIGNATURE { }
RESOURCE TBUF r_text_unsupp_accessory_connected { buf = text_unsupp_accessory_connected; }
-RESOURCE TBUF r_text_default_enhanc { buf = qtn_acc_default_enhanc; }
-RESOURCE TBUF r_text_headphones_mic { buf = qtn_acc_headphones_mic; }
-
-//------------------------------------------------------------------------------
-// SELECTION_DATA structure.
-//------------------------------------------------------------------------------
-
-STRUCT SELECTION_DATA
- {
- LONG index; //selection index
- LTEXT nameliteral; //name literal
- }
-
-//------------------------------------------------------------------------------
-// SELECTION_LITERALS_ARRAY structure.
-//------------------------------------------------------------------------------
-
-STRUCT SELECTION_LITERALS_ARRAY
- {
- STRUCT literals[];
- }
-
-//------------------------------------------------------------------------------
-// r_selection_dialog_list_query.
-//------------------------------------------------------------------------------
-
-RESOURCE DIALOG r_selection_dialog_list_query
-{
- flags = EGeneralQueryFlags;
- buttons = R_AVKON_SOFTKEYS_OK_CANCEL;
- items =
- {
- DLG_LINE
- {
- type = EAknCtListQueryControl;
- id = EListQueryControl;
-
- control = AVKON_LIST_QUERY_CONTROL
- {
- listtype = EAknCtSinglePopupMenuListBox;
- listbox = LISTBOX
- {
- flags = EAknListBoxMenuList;
-
- };
- heading = qtn_acc_select_acc;
- };
-
- }
- };
-}
-
-//------------------------------------------------------------------------------
-// r_accfwuinotifier_information_note
-//------------------------------------------------------------------------------
-
-RESOURCE DIALOG r_accfwuinotifier_information_note
- {
- flags = EEikDialogFlagNoDrag |
- EEikDialogFlagNoTitleBar |
- EEikDialogFlagCbaButtons;
-
- buttons = R_AVKON_SOFTKEYS_EMPTY;
- items =
- {
- DLG_LINE
- {
- type = EAknCtNote;
- id = EGeneralNote;
- control = AVKON_NOTE
- {
- layout = EGeneralLayout;
- singular_label = " ";
- animation = R_QGN_NOTE_INFO_ANIM;
- };
- }
- };
-
- }
-
-//------------------------------------------------------------------------------
-// r_selection_dialog_literals.
-//------------------------------------------------------------------------------
-
-RESOURCE SELECTION_LITERALS_ARRAY r_selection_dialog_literals
-{
- literals =
- {
- SELECTION_DATA
- {
- index = 0x1;
- nameliteral = qtn_tty_acc_selection_dialog;
- },
- SELECTION_DATA
- {
- index = 0x2;
- nameliteral = qtn_loopset_acc_selection_dialog;
- },
- SELECTION_DATA
- {
- index = 0x4;
- nameliteral = qtn_headset_acc_selection_dialog;
- },
- SELECTION_DATA
- {
- index = 0x8;
- nameliteral = qtn_headphones_acc_selection_dialog;
- },
- SELECTION_DATA
- {
- index = 0x10;
- nameliteral = qtn_lineout_acc_selection_dialog;
- },
- SELECTION_DATA
- {
- index = 0x20;
- nameliteral = qtn_tvout_acc_selection_dialog;
- },
- SELECTION_DATA
- {
- index = 0x40;
- nameliteral = qtn_musicstand_acc_selection_dialog;
- }
- };
-}
-
// End of File
--- a/coreapplicationuis/accfwuinotifier/group/accfwuinotifier.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/accfwuinotifier/group/accfwuinotifier.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-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"
@@ -28,11 +28,17 @@
CAPABILITY CAP_ECOM_PLUGIN
+
+
+
+
+SYSTEMINCLUDE /epoc32/include/mw/hb/hbwidgets
+
SOURCEPATH ../src
SOURCE AccFwUiNotifierProxy.cpp
SOURCE AccFwUiNoteNotifier.cpp
-SOURCE AccFwUiDialogNotifier.cpp
+
USERINCLUDE ../inc
@@ -52,14 +58,15 @@
LIBRARY euser.lib
LIBRARY eiksrv.lib
LIBRARY efsrv.lib
-LIBRARY FeatMgr.lib
+LIBRARY featmgr.lib
LIBRARY eikdlg.lib
-LIBRARY Avkon.lib
-LIBRARY bafl.lib
-LIBRARY cone.lib
-
+LIBRARY bafl.lib
+LIBRARY cone.lib
+//hb
+LIBRARY HbWidgets.lib
MACRO API_TRACE_FLAG
MACRO COMPONENT_TRACE_FLAG
// End of file
+
--- a/coreapplicationuis/accfwuinotifier/group/bld.inf Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/accfwuinotifier/group/bld.inf Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2004 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2004-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"
@@ -22,7 +22,6 @@
DEFAULT
PRJ_EXPORTS
-../loc/accfwnotifier.loc MW_LAYER_LOC_EXPORT_PATH(accfwnotifier.loc)
../rom/accfwuinotifier.iby CORE_MW_LAYER_IBY_EXPORT_PATH(accfwuinotifier.iby)
../rom/accfwuinotifierresources.iby LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(accfwuinotifierresources.iby)
--- a/coreapplicationuis/accfwuinotifier/inc/AccFwUiDialogNotifier.h Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,145 +0,0 @@
-/*
-* Copyright (c) 2002-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: Implementation of accessory selection dialog.
-*
-*/
-
-#ifndef __CACCFWUIDIALOGNOTIFIER_H
-#define __CACCFWUIDIALOGNOTIFIER_H
-
-// INCLUDES
-#include <e32std.h>
-#include <e32base.h>
-#include <eiknotapi.h>
-#include <badesca.h>
-#include <aknkeylock.h>
-
-// CONSTANTS
-const TUid KAccFwUiDialogNotifierUid={0x10205062};
-// MACROS
-
-// DATA TYPES
-
-// FUNCTION PROTOTYPES
-
-// FORWARD DECLARATIONS
-
-class CCoeEnv;
-class CAknListQueryDialog;
-
-// CLASS DECLARATION
-/**
-* Implementation of accessory selection dialog.
-* @lib -
-* @since S60 3.1
-*/
-class CAccFwUiDialogNotifier : public CActive, public MEikSrvNotifierBase2
- {
- public: // Constructors and destructor
-
- /**
- * Two-phased constructor.
- * @return The created object.
- */
- static CAccFwUiDialogNotifier* NewL();
-
- ~CAccFwUiDialogNotifier();
-
- public: // From MEikSrvNotifierBase2
-
- void Release();
-
- TNotifierInfo RegisterL();
-
- TNotifierInfo Info() const;
-
- TPtrC8 StartL(const TDesC8& aBuffer);
-
- void StartL(const TDesC8& aBuffer, TInt aReplySlot, const RMessagePtr2& aMessage);
-
- void Cancel();
-
- TPtrC8 UpdateL(const TDesC8& aBuffer);
-
- //from CActive
-
- void RunL();
- TInt RunError(TInt aError);
-
- protected:
- //from CActive
- void DoCancel();
-
-
- private: // Functions
-
- /**
- * C++ default constructor.
- */
- CAccFwUiDialogNotifier();
-
- /**
- * By default Symbian 2nd phase constructor is private.
- */
- void ConstructL();
-
- private: // Data
-
- //Notifier info
- TNotifierInfo iInfo;
-
- //resource file offset
- TInt iResourceFileOffset;
-
- //item list...
- CDesCArray *iItemList;
-
- //selection dialog
- CAknListQueryDialog * iDialog;
-
- //selections list
- RArray<TInt> iSelections;
-
- //for coverui
- CArrayFixFlat<TInt>* iCoverUIITems;
-
- //message to complete
- RMessagePtr2 iMessage;
-
- //rmessage reply slot
- TInt iReplySlot;
-
- //is notifier cancelled
- TBool iIsCancelled;
-
- CCoeEnv* iCoeEnv; // not owned
-
- RAknKeylock2 iServer;
-
- // Check if keys should be locked
- TBool iLockKeys;
-
- // Check if keys were locked
- TBool iWasLocked;
-
- // Error in connection to keylock server
- TInt iErr;
-
- };
-
-#endif // __CACCFWUIDIALOGNOTIFIER_H
-
-// End of File
-
-
--- a/coreapplicationuis/accfwuinotifier/inc/AccFwUiNoteNotifier.h Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/accfwuinotifier/inc/AccFwUiNoteNotifier.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-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"
@@ -23,6 +23,8 @@
#include <e32std.h>
#include <e32base.h>
#include <eiknotapi.h>
+#include <eikenv.h>
+
// CONSTANTS
const TUid KAccFwUiNoteNotifierUid = { 0x10205061 };
@@ -32,7 +34,7 @@
// FORWARD DECLARATIONS
class CCoeEnv;
-class CAknNoteDialog;
+
// CLASS DECLARATION
/**
@@ -97,13 +99,11 @@
RMessagePtr2 iMessage;
// Indication whether notifier cancelled
TBool iIsCancelled;
- // Note
- CAknNoteDialog* iNote;
- // Indication whether to show not supported note in cover display
- TBool iPublishNote;
+
// Text to show in note
HBufC* iNoteText;
-
+
+
};
#endif // __CACCFWUINOTENOTIFIER_H
--- a/coreapplicationuis/accfwuinotifier/loc/accfwnotifier.loc Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,92 +0,0 @@
-/*
-* Copyright (c) 2005-2008 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: Localization strings for AccFWNotifier
-*
-*/
-
-
-// LOCALISATION STRINGS
-
-//d:Text of a default accessory in use note
-//d:Shown when accessory connected and default accessory is used
-//l:popup_note_window
-//w:
-//r: 3.1
-#define qtn_acc_default_enhanc "Default enhancement:"
-
-//d:Text of a accessory use phone microphone information note
-//d:Shown when headphones are connected
-//l:popup_note_window
-//w:
-//r: 3.1
-#define qtn_acc_headphones_mic "Use phone microphone."
-
-//d:Text of a accessory selection dialog header
-//d:Accessory selection dialog
-//l:heading_pane_t1
-//w:
-//r: 3.1
-#define qtn_acc_select_acc "Select accessory:"
-
-
-//d:Text for TTY selection
-//d:Accessory selection dialog
-//l:list_single_pane_t1_cp2
-//w:
-//r: 3.1
-#define qtn_tty_acc_selection_dialog "TTY"
-
-//d:Text for loopset selection
-//d:Accessory selection dialog
-//l:list_single_pane_t1_cp2
-//w:
-//r: 3.1
-#define qtn_loopset_acc_selection_dialog "Loopset"
-
-//d:Text for headset selection
-//d:Accessory selection dialog
-//l:list_single_pane_t1_cp2
-//w:
-//r: 3.1
-#define qtn_headset_acc_selection_dialog "Headset"
-
-//d:Text for headphones selection
-//d:Accessory selection dialog
-//l:list_single_pane_t1_cp2
-//w:
-//r: 3.1
-#define qtn_headphones_acc_selection_dialog "Headphones"
-
-//d:Text for lineout selection
-//d:Accessory selection dialog
-//l:list_single_pane_t1_cp2
-//w:
-//r: 3.1
-#define qtn_lineout_acc_selection_dialog "Lineout"
-
-//d:Text for tv-out selection
-//d:Accessory selection dialog
-//l:list_single_pane_t1_cp2
-//w:
-//r: 3.1
-#define qtn_tvout_acc_selection_dialog "TV-out"
-
-//d:Text for Music Stand selection
-//d:Accessory selection dialog
-//l: heading_pane_t1
-//w:
-//r: 3.1
-#define qtn_musicstand_acc_selection_dialog "Music Stand"
-
-// End of File
--- a/coreapplicationuis/accfwuinotifier/src/AccFwUiDialogNotifier.cpp Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,458 +0,0 @@
-/*
-* Copyright (c) 2002-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: Implementation of Accessory selection dialog.
-*
-*/
-
-
-// INCLUDE FILES
-#include "AccFwUiDialogNotifier.h"
-#include "acc_debug.h"
-
-#include <featmgr.h>
-#include <secondarydisplay/SecondaryDisplayAccFwAPI.h>
-#include <accfwnoteuinotifier.rsg>
-#include <aknlistquerydialog.h>
-#include <aknlists.h>
-#include <bautils.h>
-#include <data_caging_path_literals.hrh>
-
-// EXTERNAL DATA STRUCTURES
-
-// EXTERNAL FUNCTION PROTOTYPES
-
-// CONSTANTS
-
-const TUid KScreenOutputChannel = { 0x10282E0A };
-_LIT(KAccFwUiNotifierResource, "accfwnoteuinotifier.rsc");
-
-
-// MACROS
-
-// LOCAL CONSTANTS AND MACROS
-
-// MODULE DATA STRUCTURES
-
-// LOCAL FUNCTION PROTOTYPES
-
-// FORWARD DECLARATIONS
-
-// ============================= LOCAL FUNCTIONS ===============================
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CAccFwUiDialogNotifier::CAccFwUiDialogNotifier()
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CAccFwUiDialogNotifier::CAccFwUiDialogNotifier()
- : CActive( EPriorityStandard)
- {
- API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiDialogNotifier::CAccFwUiDialogNotifier() - enter" );
-
- API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiDialogNotifier::CAccFwUiDialogNotifier() - return void" );
- }
-
-// Destructor
-CAccFwUiDialogNotifier::~CAccFwUiDialogNotifier()
- {
- API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiDialogNotifier::~CAccFwUiDialogNotifier() - enter" );
-
- delete iDialog;
- delete iCoverUIITems;
- iSelections.Close();
- CActive::Cancel();
-
- API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccPolAccessoryPolicy::~CAccFwUiDialogNotifier() - return void" );
- }
-
-// -----------------------------------------------------------------------------
-// CAccFwUiDialogNotifier::ConstructL()
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CAccFwUiDialogNotifier::ConstructL()
- {
- API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiDialogNotifier::ConstructL() - enter" );
-
- iErr = KErrNone;
-
- //get pointer to CEikonEnv
- iCoeEnv = CEikonEnv::Static();
-
- if ( !iCoeEnv )
- {
- User::Leave( KErrGeneral );
- }
-
- iLockKeys = ETrue;
-
- //Open resource file
- TFileName fileName;
- fileName.Zero();
-
- TFileName drivePath;
- Dll::FileName( drivePath );
-
- fileName.Append( TParsePtrC( drivePath ).Drive() );
- fileName.Append( KDC_RESOURCE_FILES_DIR );
- fileName.Append( KAccFwUiNotifierResource );
-
- BaflUtils::NearestLanguageFile( iCoeEnv->FsSession(), fileName );
-
- //handle to resource file
- iResourceFileOffset = iCoeEnv->AddResourceFileL( fileName );
-
- //add to scheduler
- CActiveScheduler::Add( this );
-
- API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiDialogNotifier::ConstructL() - return void" );
- }
-
-// -----------------------------------------------------------------------------
-// CAccFwUiDialogNotifier::NewL()
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CAccFwUiDialogNotifier* CAccFwUiDialogNotifier::NewL()
- {
- API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiDialogNotifier::NewL() - enter" );
-
- CAccFwUiDialogNotifier* self = new( ELeave ) CAccFwUiDialogNotifier;
-
- CleanupStack::PushL( self );
- self->ConstructL();
- CleanupStack::Pop( self );
-
- API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiDialogNotifier::CAccFwUiDialogNotifier::NewL() - return" );
- return self;
- }
-
-// -----------------------------------------------------------------------------
-// CAccFwUiDialogNotifier::Release()
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-void CAccFwUiDialogNotifier::Release()
- {
- API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiDialogNotifier::Release() - enter" );
-
- if( iResourceFileOffset )
- {
- iCoeEnv->DeleteResourceFile( iResourceFileOffset );
- }
-
- delete this;
-
- API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiDialogNotifier::Release() - return void" );
- }
-
-// -----------------------------------------------------------------------------
-// CAccFwUiDialogNotifier::RegisterL()
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-CAccFwUiDialogNotifier::TNotifierInfo CAccFwUiDialogNotifier::RegisterL()
- {
- API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiDialogNotifier::RegisterL() - enter" );
-
- iInfo.iUid=KAccFwUiDialogNotifierUid;
- iInfo.iChannel=KScreenOutputChannel;
- iInfo.iPriority=ENotifierPriorityHigh;
-
- API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiDialogNotifier::CAccFwUiDialogNotifier::RegisterL() - return" );
- return iInfo;
- }
-
-// -----------------------------------------------------------------------------
-// CAccFwUiDialogNotifier::Info()
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-CAccFwUiDialogNotifier::TNotifierInfo CAccFwUiDialogNotifier::Info() const
- {
- API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiDialogNotifier::Info() - enter" );
- API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiDialogNotifier::Info() - return void" );
- return iInfo;
- }
-
-// -----------------------------------------------------------------------------
-// CAccFwUiDialogNotifier::StartL()
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-TPtrC8 CAccFwUiDialogNotifier::StartL( const TDesC8& /*aBuffer*/ )
- {
- API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiDialogNotifier::StartL() - enter" );
- API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiDialogNotifier::StartL() - return void" );
- return KNullDesC8();
- }
-
-// -----------------------------------------------------------------------------
-// CAccFwUiDialogNotifier::StartL()
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-void CAccFwUiDialogNotifier::StartL(
- const TDesC8& aBuffer,
- TInt aReplySlot,
- const RMessagePtr2& aMessage )
- {
- API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiDialogNotifier::StartL() - enter" );
-
- // Connect to AknKeylock2 server;
- iErr = iServer.Connect();
-
- //get selection bit mask
- TUint32 selectionBitmask( 0 );
- TPckg<TUint32> selectioPckg( selectionBitmask );
- selectioPckg.Copy( aBuffer );
-
- //prepare selection array
- iSelections.Close();
-
-
- // construct listbox item array
- iItemList = new ( ELeave ) CDesCArrayFlat( 10 );
-
- //if cover UI exist
- if( FeatureManager::FeatureSupported( KFeatureIdCoverDisplay ) )
- {
- delete iCoverUIITems;
- iCoverUIITems = 0;
- iCoverUIITems = new ( ELeave ) CArrayFixFlat<TInt>( 10 );
- }
- TResourceReader reader;
- HBufC8* literals = iCoeEnv->AllocReadResourceAsDes8LC( R_SELECTION_DIALOG_LITERALS );
- reader.SetBuffer( literals );
-
- TInt count( reader.ReadInt16() );
- TInt coverUIItemCounter( 0 );
-
- //add items to dialog
- for ( TInt i(0); i < count; i++ )
- {
- //read from resource
- TUint32 index( reader.ReadUint32() );
- HBufC * buf( reader.ReadHBufCL() );
- CleanupStack::PushL( buf );
-
- if ( index & selectionBitmask )
- {
- iItemList->AppendL( *buf );
- iSelections.Append( index );
-
- //append cover UI items
- if ( iCoverUIITems )
- {
- iCoverUIITems->AppendL( coverUIItemCounter++ );
- }
- }
-
- CleanupStack::PopAndDestroy( buf );
-
- if ( ( index << 1 ) > selectionBitmask )
- {
- //stop for-loop, selectionbitmask can't match anymore
- break;
- }
- }
- CleanupStack::PopAndDestroy( literals );
- iMessage = aMessage;
- iReplySlot = aReplySlot;
- iIsCancelled = EFalse;
-
- //prepare active object
- SetActive();
- TRequestStatus* status = &iStatus;
- User::RequestComplete( status, KErrNone );//RunL() function will get called
-
-
- API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiDialogNotifier::StartL() - return void" );
- }
-
-
-// -----------------------------------------------------------------------------
-// CAccFwUiDialogNotifier::RunL()
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-
-void CAccFwUiDialogNotifier::RunL()
- {
- API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiDialogNotifier::RunL() - enter" );
-
- if ( iIsCancelled )
- {
- return;
- }
-
- if( iErr == KErrNone )
- {
- iWasLocked = iServer.IsKeyLockEnabled();
- // Change the bit on and off. SysAp will detect that
- // the lights should be switched on for the specified time.
- iServer.DisableKeyLock();
- }
-
- TInt replyValue;
-
- //create and prepare dialog
- iDialog = new ( ELeave ) CAknListQueryDialog ( &replyValue );
- iDialog->PrepareLC( R_SELECTION_DIALOG_LIST_QUERY );
-
- //add items to popup list
- iDialog->SetItemTextArray( iItemList );
-
- if( FeatureManager::FeatureSupported( KFeatureIdCoverDisplay ) )
- {
- API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiDialogNotifier::RunL() - Publish cover UI ");
- iDialog->PublishDialogL( ECmdShowAccessorySelectionDialog,
- KCatAccFw,
- iCoverUIITems );
- //iDialog take ownership
- iCoverUIITems = 0;
- }
-
- //show dialog...
- API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiDialogNotifier::RunL() - Show dialog -> RunLD()" );
- TBool result = iDialog->RunLD();
- iDialog = 0;
-
- //create package
- TInt returnValue( 0 );
- TPckg<TInt> valuePck( returnValue );
-
- if ( !iIsCancelled )
- {
- API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiDialogNotifier::RunL() - Check dialog result" );
-
- if ( result )
- {
- //write selected item to reply slot
- if ( returnValue >= 0 && iSelections.Count() )
- {
- returnValue = iSelections[ replyValue ];
- API_TRACE_1( "[AccFW: ACCFWUINOTIFIER] CAccFwUiDialogNotifier::RunL() - Set selection: %d", returnValue );
- }
- // Don't lock keys if something was selected
- iLockKeys = EFalse;
- }
- else
- {
- API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiDialogNotifier::RunL() - Cancel pressed" );
- returnValue = 0;
- iLockKeys = ETrue;
- }
-
- //complete client requests
- API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiDialogNotifier::RunL() - Write response value to message" );
- iMessage.Write( iReplySlot, valuePck, 0 );
- API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiDialogNotifier::RunL() - Complete message" );
- iMessage.Complete( KErrNone );
- }
- else
- {
- // Message is being completed with KErrCancel in Cancel-method
- }
-
- API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiDialogNotifier::RunL() - Release resources" );
- delete iCoverUIITems;
- iCoverUIITems = 0;
- iSelections.Close();
-
- API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiDialogNotifier::RunL() - return void" );
- }
-
-// -----------------------------------------------------------------------------
-// CAccFwUiDialogNotifier::RunError()
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-TInt CAccFwUiDialogNotifier::RunError(TInt aError)
- {
- API_TRACE_1( "[AccFW: ACCFWUINOTIFIER] CAccFwUiDialogNotifier::RunError() - %d", aError );
- if( !iMessage.IsNull() )
- {
- iMessage.Complete( aError );
- }
- aError = KErrNone;
- API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiDialogNotifier::RunError() - return" );
- return aError;
- }
-
-// -----------------------------------------------------------------------------
-// CAccFwUiDialogNotifier::DoCancel()
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-void CAccFwUiDialogNotifier::DoCancel()
- {
- API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiDialogNotifier::DoCancel() - enter" );
- if( !iMessage.IsNull() )
- {
- iMessage.Complete( KErrCancel );
- }
- API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiDialogNotifier::DoCancel() - return" );
- }
-
-
-// -----------------------------------------------------------------------------
-// CAccFwUiDialogNotifier::Cancel()
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-void CAccFwUiDialogNotifier::Cancel()
- {
- API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiDialogNotifier::Cancel() - enter" );
-
- iIsCancelled = ETrue;
-
- if( iLockKeys && iWasLocked && ( iErr == KErrNone ) )
- {
- iServer.EnableKeyLock();
- }
-
- iLockKeys = ETrue;
-
- if ( iDialog )
- {
- //cancel active object, delete dialog and release resources
- if ( IsActive() )
- {
- CActive::Cancel();
- }
- delete iDialog;
- iDialog = 0;
- delete iCoverUIITems;
- iCoverUIITems = 0;
- iSelections.Close();
-
- TInt returnValue( 0 );
- TPckg<TInt> valuePck( returnValue );
- API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiDialogNotifier::Cancel() - Write response value to message" );
- iMessage.Write( iReplySlot, valuePck, 0 );
- API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiDialogNotifier::Cancel() - Complete message with Cancel" );
- iMessage.Complete( KErrCancel );
- }
-
- API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiDialogNotifier::Cancel() - return void" );
- }
-
-// -----------------------------------------------------------------------------
-// CAccFwUiDialogNotifier::UpdateL()
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-TPtrC8 CAccFwUiDialogNotifier::UpdateL(
- const TDesC8& /*aBuffer*/ )
- {
- API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiDialogNotifier::UpdateL() - enter" );
- API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiDialogNotifier::UpdateL() - return void" );
- return KNullDesC8();
- }
-
-// End of File
--- a/coreapplicationuis/accfwuinotifier/src/AccFwUiNoteNotifier.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/accfwuinotifier/src/AccFwUiNoteNotifier.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-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"
@@ -20,10 +20,9 @@
#include <featmgr.h>
#include <accfwnoteuinotifier.rsg>
#include <data_caging_path_literals.hrh>
-#include <aknnotewrappers.h>
-#include <secondarydisplay/SecondaryDisplayAccFwAPI.h>
+#include <SecondaryDisplay/SecondaryDisplayAccFwAPI.h>
#include <bautils.h>
-
+#include <hbdevicemessageboxsymbian.h>
#include "AccFwUiNoteNotifier.h"
#include "acc_debug.h"
@@ -68,7 +67,6 @@
{
API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiNoteNotifier::~CAccFwUiNoteNotifier()" );
- delete iNote;
delete iNoteText;
CActive::Cancel();
@@ -211,144 +209,7 @@
if ( aBuffer.Length() )
{
- API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiNoteNotifier::StartL() - Default accessory selection or headphones information" );
-
- TInt value( 0 );
- TPckg<TInt> pckg( value );
- pckg.Copy( aBuffer );
-
- //get "default enhancement" string resource
- API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiNoteNotifier::StartL() - Read default enhancement string" );
- defaultText = iCoeEnv->AllocReadResourceLC( R_TEXT_DEFAULT_ENHANC );
-
- TPtrC enhancement;
- TBool enhancementOk( ETrue );
-
- if ( value != 0 )
- {
- API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiNoteNotifier::StartL() - Default selection" );
-
- enhancementOk = EFalse;
- HBufC8* literals = iCoeEnv->AllocReadResourceAsDes8L( R_SELECTION_DIALOG_LITERALS );
- TResourceReader reader;
- reader.SetBuffer( literals );
-
- TInt count( reader.ReadInt16() );
- API_TRACE_1( "[AccFW: ACCFWUINOTIFIER] CAccFwUiNoteNotifier::StartL() - Read literals, count %d", count );
-
- // Find correct accessory literal
- for ( TInt i = 0; i < count; i++ )
- {
- //read from resource
- TUint32 index( reader.ReadUint32() );
- API_TRACE_1( "[AccFW: ACCFWUINOTIFIER] CAccFwUiNoteNotifier::StartL() - Read literal, index %d", index );
-
- if ( index == value )
- {
- API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiNoteNotifier::StartL() - Literal found!" );
- // Literal found
- enhancement.Set( reader.ReadTPtrC() );
- enhancementOk = ETrue;
- break;
- }
- else
- {
- API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiNoteNotifier::StartL() - Not found!" );
- reader.ReadTPtrC();
- }
- }
-
- delete literals;
- }
-
- if ( enhancementOk )
- {
- API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiNoteNotifier::StartL() - Enhancement OK!" );
- HBufC* noteStr = NULL;
-
- // Headphones...
- if ( value == 0x08 || value == 0x40 || value == 0 )
- {
- API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiNoteNotifier::StartL() - Show headphones information!" );
-
- // Default enhancement string if needed
- if ( value != 0 )
- {
- API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiNoteNotifier::StartL() - Show also default information!" );
- noteStr = HBufC::NewL( defaultText->Length() + enhancement.Length() + 3 );
-
- TPtr ptr( noteStr->Des() );
- ptr.Append( defaultText->Des() );
- ptr.Append( ' ' );
- ptr.Append( enhancement );
- API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiNoteNotifier::StartL() - Default string ready!" );
- }
-
- API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiNoteNotifier::StartL() - Read use phone mic string!" );
- // Read resource use phone mic and default enhancement text...
- HBufC* usePhoneMicTextHolder = iCoeEnv->AllocReadResourceLC( R_TEXT_HEADPHONES_MIC );
-
- TBool chekcNoteStr( EFalse );
- if ( noteStr )
- {
- API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiNoteNotifier::StartL() - Add phone mic string to default accessory string!" );
- CleanupStack::PushL( noteStr );
- HBufC* temp = noteStr->ReAllocL( noteStr->Length() + 2 + usePhoneMicTextHolder->Length() + 1 );
- CleanupStack::Pop( noteStr );
- noteStr = temp;
- chekcNoteStr = ETrue;
- }
- else
- {
- API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiNoteNotifier::StartL() - Only use phone mic string!" );
- noteStr = HBufC::NewL( usePhoneMicTextHolder->Length() + 1 );
- }
-
- TPtr ptr( noteStr->Des() );
-
-
- if( chekcNoteStr )
- {
- ptr.Append( _L( ". " ) );
- ptr.Append( usePhoneMicTextHolder->Des() );
- }
- else
- {
- ptr.Append( usePhoneMicTextHolder->Des() );
- }
- // Cleanup
- CleanupStack::PopAndDestroy( usePhoneMicTextHolder );
-
- API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiNoteNotifier::StartL() - String ready!" );
- }
- else
- {
- API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiNoteNotifier::StartL() - Create default accessory text!" );
- //only default accessory text
- noteStr = HBufC::NewL( defaultText->Length() + enhancement.Length() + 1 );
- TPtr ptr( noteStr->Des() );
-
- ptr.Append( defaultText->Des() );
- ptr.Append( ' ' );
- ptr.Append( enhancement );
- API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiNoteNotifier::StartL() - Default accessory text ready!" );
- }
-
- // Pass string to member string and free local copies
- CleanupStack::PopAndDestroy( defaultText );
- CleanupStack::PushL( noteStr );
- iNoteText = HBufC::NewL( noteStr->Length() );
- TPtr ptr( iNoteText->Des() );
- ptr.Append( noteStr->Des() );
- CleanupStack::PopAndDestroy( noteStr );
- showNote = ETrue;
- }
- else
- {
- API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiNoteNotifier::StartL() - No note" );
- // No need to check this one, always set into cleanup stack
- CleanupStack::PopAndDestroy( defaultText );
- }
+ //Do nothing as accessory is rightly detected by accessory server and adaptation.
}
else
{
@@ -365,13 +226,7 @@
iMessage = aMessage;
if( showNote )
{
- if ( FeatureManager::FeatureSupported( KFeatureIdCoverDisplay ) )
- {
- API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiNoteNotifier::StartL() - Cover UI supported" );
- iPublishNote = ETrue;
- }
-
- iIsCancelled = EFalse;
+ iIsCancelled = EFalse;
SetActive();
TRequestStatus* status = &iStatus;
User::RequestComplete( status, KErrNone ); // RunL() function will get called
@@ -398,25 +253,13 @@
return;
}
- // Create note
- iNote = new ( ELeave ) CAknNoteDialog(
- CAknNoteDialog::ENoTone,
- CAknNoteDialog::ELongTimeout );
-
- iNote->PrepareLC( R_ACCFWUINOTIFIER_INFORMATION_NOTE ); // Adds to CleanupStack
-
- if ( iPublishNote )
- {
- iNote->PublishDialogL( ECmdShowAccessoryNotSupportedNote, KCatAccFw );
- iPublishNote = EFalse;
- }
-
- iNote->SetTextL( *iNoteText );
- API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiNoteNotifier::StartL() - iNote->RunLD()!" );
- iNote->RunLD();
- iNote = NULL;
- delete iNoteText;
- iNoteText = NULL;
+ CHbDeviceMessageBoxSymbian *messageBox = CHbDeviceMessageBoxSymbian::NewL(CHbDeviceMessageBoxSymbian::EInformation);
+ CleanupStack::PushL(messageBox);
+ messageBox->SetTextL(*iNoteText);
+ messageBox->ShowL();
+ CleanupStack::PopAndDestroy(messageBox); // messageBox
+ delete iNoteText;
+ iNoteText = NULL;
API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiNoteNotifier::RunL() - Complete message" );
iMessage.Complete( KErrNone );
@@ -465,21 +308,17 @@
iIsCancelled = ETrue;
- if ( iNote )
- {
- // Cancel active object, delete dialog and free resources
+ // Cancel active object and free resources
if ( IsActive() )
{
CActive::Cancel();
}
- delete iNote;
- iNote = NULL;
- delete iNoteText;
+ delete iNoteText;
iNoteText = NULL;
API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiNoteNotifier::Cancel() - Complete message with Cancel" );
iMessage.Complete( KErrCancel );
- }
+
API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CAccFwUiNoteNotifier::Cancel() - return" );
}
--- a/coreapplicationuis/accfwuinotifier/src/AccFwUiNotifierProxy.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/accfwuinotifier/src/AccFwUiNotifierProxy.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2002-2004 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-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"
@@ -19,9 +19,7 @@
// INCLUDE FILES
#include <e32std.h>
#include <ecom/implementationproxy.h>
-
#include "AccFwUiNoteNotifier.h"
-#include "AccFwUiDialogNotifier.h"
#include "acc_debug.h"
// EXTERNAL DATA STRUCTURES
@@ -30,7 +28,7 @@
// CONSTANTS
-const TInt KNumberOfImplementations(2);
+const TInt KNumberOfImplementations(1);
// MACROS
@@ -51,15 +49,10 @@
API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CreateNotifiersL() - enter" );
MEikSrvNotifierBase2* note = CAccFwUiNoteNotifier::NewL();
CleanupStack::PushL( note );
-
- MEikSrvNotifierBase2* dialog = CAccFwUiDialogNotifier::NewL();
- CleanupStack::PushL( dialog );
-
+
aSubjects->AppendL( note );
- aSubjects->AppendL( dialog );
-
- CleanupStack::Pop( dialog );
- CleanupStack::Pop( note );
+
+ CleanupStack::Pop( note );
API_TRACE_( "[AccFW: ACCFWUINOTIFIER] CreateNotifiersL() - return void" );
}
--- a/coreapplicationuis/advancedtspcontroller/group/RemConTspController.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/advancedtspcontroller/group/RemConTspController.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -19,7 +19,7 @@
#include <remcon/remconservercaps.mmh> // RemCon has defined capabilities
#include <platform_paths.hrh>
-TARGET AdvancedTspController.dll
+TARGET advancedtspcontroller.dll
TARGETTYPE PLUGIN
UID 0x10009d8d 0x10282CD5
@@ -33,7 +33,7 @@
SOURCE tsptriggerevents.cpp
START RESOURCE ../data/10282CD5.rss
-target AdvancedTspController.rsc
+target advancedtspcontroller.rsc
END
USERINCLUDE ../inc
@@ -47,8 +47,8 @@
LIBRARY apparc.lib
LIBRARY remcontargetselectorplugin.lib
LIBRARY remcontypes.lib
-LIBRARY CFClient.lib
-LIBRARY CFServices.lib
+LIBRARY cfclient.lib
+LIBRARY cfservices.lib
LIBRARY ws32.lib
LIBRARY apgrfx.lib
LIBRARY tspclientmapper.lib
--- a/coreapplicationuis/advancedtspcontroller/tsrc/mt_atspc/group/envrecall.cmd Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/advancedtspcontroller/tsrc/mt_atspc/group/envrecall.cmd Tue Aug 31 15:24:25 2010 +0300
@@ -25,7 +25,16 @@
@echo Cleaning advanced tsp test stub... Finished
@echo Restoring remcon...
-move remconservercaps_orig.mmh \epoc32\include\remcon\remconservercaps.mmh
+pushd \sf\os\devicesrv\accessoryservices\remotecontrolfw\server\group
+call bldmake bldfiles
+call abld cleanexport
+call abld export
+popd
+pushd \sf\os\devicesrv\accessoryservices\remotecontrolfw\targetselectorplugin\group
+call bldmake bldfiles
+call abld reallyclean
+call abld build
+popd
@echo Restoring remcon... Finished
@echo Restoring advanced tsp
--- a/coreapplicationuis/advancedtspcontroller/tsrc/mt_atspc/group/envsetup.cmd Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/advancedtspcontroller/tsrc/mt_atspc/group/envsetup.cmd Tue Aug 31 15:24:25 2010 +0300
@@ -16,8 +16,6 @@
REM
@echo on
-@echo Copying remconservercaps.mmh to safe place for envrecall
-copy \epoc32\include\remcon\remconservercaps.mmh remconservercaps_orig.mmh
@echo Setting up advanced tsp test stub...
pushd ..\..\stub\group
@@ -25,4 +23,9 @@
call abld test reallyclean
call abld test build
popd
+pushd \sf\os\devicesrv\accessoryservices\remotecontrolfw\targetselectorplugin\group
+call bldmake bldfiles
+call abld reallyclean
+call abld build
+popd
@echo Setting up advanced tsp test stub... Finished
--- a/coreapplicationuis/advancedtspcontroller/tsrc/mt_atspc/group/mt_atspc.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/advancedtspcontroller/tsrc/mt_atspc/group/mt_atspc.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -32,7 +32,7 @@
USERINCLUDE ../inc
-SYSTEMINCLUDE /epoc32/include/platform/Digia/EUnit
+SYSTEMINCLUDE /epoc32/include/Digia/EUnit
MW_LAYER_SYSTEMINCLUDE
LIBRARY EUnit.lib
--- a/coreapplicationuis/advancedtspcontroller/tsrc/mt_atspc/inc/mt_atspc.h Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/advancedtspcontroller/tsrc/mt_atspc/inc/mt_atspc.h Tue Aug 31 15:24:25 2010 +0300
@@ -82,16 +82,6 @@
virtual void MrctspoDoOutgoingResponsePermitted(TBool /*aIsPermitted*/) {}
virtual void MrctspoDoIncomingNotifyAddressed(TClientInfo* /*aClientInfo*/, TInt aError ) { iObserverResponse = aError; }
virtual void MrctspoDoReAddressNotifies() {}
-
-
- virtual TInt MrctspoSetLocalAddressedClient(const TUid& aBearerUid, const TClientInfo& aClientInfo){ return 0; }
- virtual void MrctspoDoIncomingNotifyPermitted(TBool aIsPermitted){ }
-
- virtual void MrctspoDoIncomingCommandPermitted(TBool aIsPermitted) { }
-
- virtual void MrctspoDoOutgoingNotifyCommandPermitted(TBool aIsPermitted){ }
-
- virtual void MrctspoDoOutgoingNotifyCommandAddressed(TRemConAddress* aConnection, TInt aError) { }
public: // from MCFListener
void ContextIndicationL( const CCFContextIndication& aChangedContext ) {}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/devicepowermenuplugin/devicepowermenuplugin.pro Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,63 @@
+#
+#############################################################################
+##
+## 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:
+##
+#############################################################################
+#
+
+TEMPLATE = lib
+TARGET = DevicePowerMenuPlugin
+CONFIG += hb plugin
+
+INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE
+
+# Input
+HEADERS += .\inc\hbdevicepowermenuplugin_p.h \
+ .\inc\hbdevicepowermenupluginerrors_p.h \
+ .\inc\hbdevicepowermenuwidegt_p.h
+
+
+SOURCES += .\src\hbdevicepowermenuplugin.cpp \
+ .\src\hbdevicepowermenuwidegt.cpp
+
+RESOURCES += hbdevicepowermenu.qrc
+
+MOC_DIR = ./tmp
+
+TRANSLATIONS += power_menu.ts
+
+symbian:
+{
+TARGET.UID3 = 0x2002F375
+TARGET.CAPABILITY = ALL -TCB
+TARGET.EPOCALLOWDLLDATA = 1
+
+pluginstub.sources = DevicePowerMenuPlugin.dll
+pluginstub.path = /resource/plugins/devicedialogs
+DEPLOYMENT += pluginstub
+}
+
+symbian:
+{
+BLD_INF_RULES.prj_exports += \
+ "$${LITERAL_HASH}include <platform_paths.hrh>" \
+ "qmakepluginstubs/DevicePowerMenuPlugin.qtplugin /epoc32/data/z/pluginstub/DevicePowerMenuPlugin.qtplugin" \
+ ".\rom\devicepowermenuplugin.iby CORE_MW_LAYER_IBY_EXPORT_PATH(devicepowermenuplugin.iby)" \
+ ".\rom\devicepowermenu_resources.iby LANGUAGE_APP_LAYER_IBY_EXPORT_PATH(devicepowermenu_resources.iby)"
+}
+
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/devicepowermenuplugin/docml/powermenu.docml Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<hbdocument context="pwr_grid" version="1.1">
+ <widget name="maindialog" type="HbDialog">
+ <point name="pos" x="1.19403un" y="0.44776un"/>
+ <widget name="container_1" role="HbDialog:contentWidget" type="HbWidget">
+ <widget name="Silence" type="HbPushButton">
+ <real name="z" value="2"/>
+ <string locid="txt_pm_button_silence" name="text" value="Silence"/>
+ <bool name="visible" value="TRUE"/>
+ <string name="state" value="normal"/>
+ <sizepolicy horizontalPolicy="MinimumExpanding" />
+ </widget>
+ <widget name="label" type="HbLabel">
+ <real name="z" value="4"/>
+ <string locid="txt_pm_setlabel_ringing_volume" name="plainText" value="Ringing volume"/>
+ <sizepolicy horizontalPolicy="MinimumExpanding" />
+ </widget>
+ <widget name="Volume" type="HbSlider">
+ <integer name="majorTickInterval" value="5"/>
+ <real name="z" value="3"/>
+ <enums name="orientation" value="Horizontal"/>
+ <integer name="minorTickInterval" value="2"/>
+ <integer name="value" value="30"/>
+ <sizepolicy horizontalPolicy="MinimumExpanding" />
+ </widget>
+ <widget name="Vibrate" type="HbCheckBox">
+ <string locid="txt_pm_list_vibrate" name="text" value="Vibrate"/>
+ <sizepolicy horizontalPolicy="MinimumExpanding" />
+ </widget>
+ <widget name="Offline" type="HbCheckBox">
+ <string locid="txt_pm_list_offline_airplane_mode" name="text" value="Offline (Airplane Mode)"/>
+ <sizepolicy horizontalPolicy="MinimumExpanding" />
+ </widget>
+ <widget name="PowerOff" type="HbPushButton">
+ <string locid="txt_pm_button_power_off" name="text" value="Power Off"/>
+ <string name="state" value="normal"/>
+ <sizepolicy horizontalPolicy="MinimumExpanding" />
+ </widget>
+ <real name="z" value="0"/>
+ <layout type="anchor">
+ <anchoritem dst="" dstEdge="LEFT" spacing="-0un" src="Silence" srcEdge="LEFT"/>
+ <anchoritem dst="" dstEdge="RIGHT" spacing="0un" src="Silence" srcEdge="RIGHT"/>
+ <anchoritem dst="" dstEdge="TOP" spacing="0un" src="Silence" srcEdge="TOP"/>
+
+ <anchoritem dst="" dstEdge="LEFT" spacing="-0un" src="label" srcEdge="LEFT"/>
+ <anchoritem dst="" dstEdge="RIGHT" spacing="0un" src="label" srcEdge="RIGHT"/>
+ <anchoritem dst="Silence" dstEdge="BOTTOM" spacing="-1un" src="label" srcEdge="TOP"/>
+
+
+ <anchoritem dst="" dstEdge="LEFT" spacing="-0un" src="Volume" srcEdge="LEFT"/>
+ <anchoritem dst="" dstEdge="RIGHT" spacing="0un" src="Volume" srcEdge="RIGHT"/>
+ <anchoritem dst="label" dstEdge="BOTTOM" spacing="-1un" src="Volume" srcEdge="TOP"/>
+
+ <anchoritem dst="" dstEdge="LEFT" spacing="-0un" src="Vibrate" srcEdge="LEFT"/>
+ <anchoritem dst="" dstEdge="RIGHT" spacing="0un" src="Vibrate" srcEdge="RIGHT"/>
+ <anchoritem dst="Volume" dstEdge="BOTTOM" spacing="-0un" src="Vibrate" srcEdge="TOP"/>
+
+ <anchoritem dst="" dstEdge="LEFT" spacing="-0un" src="Offline" srcEdge="LEFT"/>
+ <anchoritem dst="" dstEdge="RIGHT" spacing="0un" src="Offline" srcEdge="RIGHT"/>
+ <anchoritem dst="Vibrate" dstEdge="BOTTOM" spacing="-0un" src="Offline" srcEdge="TOP"/>
+
+ <anchoritem dst="" dstEdge="LEFT" spacing="-0un" src="PowerOff" srcEdge="LEFT"/>
+ <anchoritem dst="" dstEdge="RIGHT" spacing="0un" src="PowerOff" srcEdge="RIGHT"/>
+ <anchoritem dst="Offline" dstEdge="BOTTOM" spacing="-1un" src="PowerOff" srcEdge="TOP"/>
+
+ <anchoritem dst="" dstEdge="BOTTOM" spacing="0un" src="PowerOff" srcEdge="BOTTOM"/>
+
+ </layout>
+ </widget>
+ </widget>
+ <metadata activeUIState="Common ui state" display="NHD-3.2-inch_portrait" unit="un">
+ <uistate name="Common ui state" sections="#common"/>
+ </metadata>
+</hbdocument>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/devicepowermenuplugin/hbdevicepowermenu.qrc Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,11 @@
+<RCC>
+ <qresource prefix="/xml" >
+ <file alias="powermenu.docml" >docml/powermenu.docml</file>
+ </qresource>
+ <qresource prefix="/images" >
+ <file alias="decrement.svg" >images/decrement.svg</file>
+ <file alias="increment.svg" >images/increment.svg</file>
+ <file alias="muted.svg" >images/muted.svg</file>
+ <file alias="unmuted.svg" >images/unmuted.svg</file>
+ </qresource>
+</RCC>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/devicepowermenuplugin/images/decrement.svg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<polygon points="33.999,26 10,26 10,17.998 33.999,17.998 "/>
+<rect fill="#FFFFFF" height="4" width="20" x="12" y="20"/>
+</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/devicepowermenuplugin/images/increment.svg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<polygon points="26.001,33.999 18,33.999 18,26.001 10,26.001 10,18 18,18 18,9.999 26.001,9.999 26.001,18 33.999,18 33.999,26.001 26.001,26.001 "/>
+<polygon fill="#FFFFFF" points="31.999,20 23.999,20 23.999,12 20,12 20,20 12,20 12,23.999 20,23.999 20,31.999 23.999,31.999 23.999,23.999 31.999,23.999 "/>
+</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/devicepowermenuplugin/images/muted.svg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<path d="M25.824,21.015V8.411h-9.979l-1.025,1.6L8.354,3.545L3.651,8.242l6.797,6.795H4.931v15.818h6.671l4.24,6.625h9.982v-7.067 l7.902,7.905l4.697-4.703L25.824,21.015z M19.179,30.336L15.26,24.21h-3.682v-2.524h3.682l0.715-1.121l3.204,3.203V30.336z"/>
+<rect fill="#FFFFFF" height="2.648" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 21.1169 50.6082)" width="38.533" x="1.773" y="19.607"/>
+<polygon fill="#FFFFFF" points="21.179,32.835 18.403,32.835 14.166,26.209 9.578,26.209 9.578,19.685 14.166,19.685 14.463,19.219 12.279,17.037 6.931,17.037 6.931,28.855 12.695,28.855 16.937,35.48 23.824,35.48 23.824,28.579 21.179,25.936 "/>
+<polygon fill="#FFFFFF" points="18.403,13.06 21.179,13.06 21.179,16.202 23.824,18.847 23.824,10.412 16.937,10.412 16.332,11.355 18.259,13.284 "/>
+</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/devicepowermenuplugin/images/unmuted.svg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<path d="M34.951,38.12l-5.054-4.302l1.282-1.521c0.877-1.04,8.324-10.39,0.111-18.605l-1.414-1.413l4.697-4.701l1.413,1.415 c12.695,12.699,0.386,27.46,0.259,27.606L34.951,38.12L34.951,38.12z"/>
+<path d="M30.761,14.545l-1.414-1.412l-3.521,3.521V8.411h-9.981l-4.24,6.624H4.93v15.82h6.674l4.24,6.625h9.981v-8.201l3.855,3.287 l1.298-1.521C33.574,28.005,36.864,20.643,30.761,14.545z M19.18,30.335l-3.921-6.128h-3.682v-2.522h3.682l3.921-6.128V30.335z M25.918,26.742l-0.094,0.109v-7.844l0.237,0.236C29.324,22.505,26.277,26.318,25.918,26.742z"/>
+<path d="M27.476,17.83c4.622,4.622,0.158,9.979-0.031,10.203l2.014,1.714c2.181-2.554,4.957-8.725-0.11-13.788 L27.476,17.83z" fill="#FFFFFF"/>
+<path d="M34.576,10.406l-1.873,1.871c9.664,9.663,0.404,20.838,0.006,21.309l2.017,1.717 C34.838,35.17,45.974,21.811,34.576,10.406z" fill="#FFFFFF"/>
+<path d="M16.937,10.411l-4.242,6.625H6.931v11.819h5.764l4.242,6.625h6.887V10.411H16.937z M21.179,32.834h-2.776 l-4.237-6.626H9.578v-6.524h4.588l4.237-6.625h2.776V32.834z" fill="#FFFFFF"/>
+</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/devicepowermenuplugin/inc/hbdevicepowermenuplugin_p.h Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,54 @@
+/*
+ * 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:
+ *
+ */
+
+#ifndef HBDEVICEPOWERMENUPLUGIN_P_H
+#define HBDEVICEPOWERMENUPLUGIN_P_H
+
+#include <QObject>
+#include <QVariantMap>
+
+#include <hbdevicedialogplugin.h>
+
+//fwd Declaration
+class HbDevicePowerMenuPluginPrivate;
+
+class HbDevicePowerMenuPlugin : public HbDeviceDialogPlugin
+{
+ Q_OBJECT
+
+public:
+ friend class HbDevicePowerMenuPluginPrivate;
+
+ HbDevicePowerMenuPlugin();
+ ~HbDevicePowerMenuPlugin();
+
+ //Pure Virtual method of class HbDeviceDialogPluginInterface
+ HbDeviceDialogInterface *createDeviceDialog(const QString &deviceDialogType, const QVariantMap ¶meters);
+ //Pure Virtual Mehods of class HbDeviceDialogPlugin
+ bool accessAllowed(const QString &deviceDialogType, const QVariantMap ¶meters, const QVariantMap &securityInfo) const;
+ bool deviceDialogInfo(const QString &deviceDialogType, const QVariantMap ¶meters, DeviceDialogInfo *info) const;
+ QStringList deviceDialogTypes() const;
+ PluginFlags pluginFlags() const;
+ int error() const;
+
+private:
+ Q_DISABLE_COPY(HbDevicePowerMenuPlugin)
+ HbDevicePowerMenuPluginPrivate *d;
+};
+
+#endif // HBDEVICEPOWERMENUPLUGIN_P_H
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/devicepowermenuplugin/inc/hbdevicepowermenupluginerrors_p.h Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,41 @@
+/*
+ * 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:
+ *
+ */
+
+#ifndef HBDEVICEPOWERMENUPLUGINERRORS_P_H
+#define HBDEVICEPOWERMENUPLUGINERRORS_P_H
+
+#include <hbdevicedialog.h>
+#include <e32debug.h>
+#ifdef _DEBUG
+
+ #define TRACES( x ) x
+
+#else
+
+ #define TRACES( x )
+
+#endif
+
+
+// No error
+const int NoError = 0;
+// Illegal parameter error
+const int ParameterError = HbDeviceDialog::PluginErrors + 1;
+// Unknown device dialog error
+const int UnknownDeviceDialogError = HbDeviceDialog::PluginErrors + 2;
+
+#endif // HBDEVICEPOWERMENUPLUGINERRORS_P_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/devicepowermenuplugin/inc/hbdevicepowermenuwidegt_p.h Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,95 @@
+/*
+ * 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:
+ *
+ */
+
+#ifndef HBDEVICEPOWERMENUWIDEGT_P_H
+#define HBDEVICEPOWERMENUWIDEGT_P_H
+
+
+#include <QObject>
+#include <QVariantMap>
+#include <hbdevicedialoginterface.h>
+#include <hbdevicedialog.h>
+#include <hbdialog.h>
+#include <hbdocumentloader.h>
+#include <HbTranslator.h>
+//For widgets used
+#include <hbpushbutton.h>
+#include <hbslider.h>
+#include <hbcheckBox.h>
+#include <hbinstance.h>
+
+class HbDevicePowerMenuWidget : public QObject, public HbDeviceDialogInterface
+{
+ Q_OBJECT
+
+public:
+ HbDevicePowerMenuWidget(const QVariantMap ¶meters);
+ ~HbDevicePowerMenuWidget();
+
+public:
+ //HbDeviceDialogInterface methods to be implemented
+ bool setDeviceDialogParameters(const QVariantMap ¶meters);
+ int deviceDialogError() const;
+ void closeDeviceDialog(bool byClient);
+ HbPopup *deviceDialogWidget() const;
+ virtual QObject *signalSender() const;
+
+
+private:
+ bool preConstructDialog();
+ void constructDialog(const QVariantMap ¶meters);
+ void cleanupMemory();
+
+private:
+ void customizeVolumeSlider();
+ void setSpeakerIcon();
+ bool IsValidHandles();
+
+private slots:
+ void handleVolumeChanged(int aVolume);
+ void handleSilenceMode(bool aState);
+ void handleVibrationToggled(int aVibrationToggel);
+ void handleOfflineToggled(int aOfflineToggel);
+ void handlePowerOff(bool aState);
+ void closedialog();
+
+signals:
+ void deviceDialogClosed();
+ void deviceDialogData(QVariantMap data);
+
+private:
+ Q_DISABLE_COPY(HbDevicePowerMenuWidget)
+
+ int mDeviceDialogError; //DeviceDialogError
+ int mVolumeLevel; //shows current Volume Level
+ bool mShowVolume; //used to Enable or Disbale Volume
+ bool mVibrationChecked; //Vibration enabled or Disabled
+ bool mOfflineChecked; //offline enabled or Disabled
+ bool mSilencelatched; //SilenceMode Enabled or Disabled
+ bool mCypherOff; //Shows Encryption/Decryption ON/OFF
+
+ HbDialog* mDialogWidget; //Handle for Powermenu Dialog
+ HbPushButton* mSilenceButton; //Handle for Silence button
+ HbSlider* mVolumeSlider; //Handle for Slider
+ HbCheckBox* mVibarte; //Handle for Vibration check Box
+ HbCheckBox* mOffline; //Handle for Offline CheckBox
+ HbPushButton * mPowerOffButton; //Handle for PowerOff Button
+ HbDocumentLoader* mLoader; //Hnadle for Documnet Loader to load docml
+ HbTranslator* mHbTranslator; //Translator used for localization; loads translation files
+};
+
+#endif // HBDEVICEPOWERMENUWIDEGT_P_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/devicepowermenuplugin/rom/devicepowermenu_resources.iby Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,27 @@
+/*
+ * 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:
+ *
+ */
+
+#ifndef __DEVICEPOWERMENU_RESOURCES_IBY__
+#define __DEVICEPOWERMENU_RESOURCES_IBY__
+
+//this iby is required for language specific things to be exported to Language iby layer
+#include <data_caging_paths_for_iby.hrh>
+
+data=DATAZ_\QT_TRANSLATIONS_DIR\power_menu.qm QT_TRANSLATIONS_DIR\power_menu.qm
+
+
+#endif //__DEVICEPOWERMENU_RESOURCES_IBY__
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/devicepowermenuplugin/rom/devicepowermenuplugin.iby Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,24 @@
+/*
+ * 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:
+ *
+ */
+
+#ifndef __DEVICEPOWERMENUPLUGIN_IBY__
+#define __DEVICEPOWERMENUPLUGIN_IBY__
+
+file = \epoc32\release\armv5\urel\DevicePowerMenuPlugin.dll \sys\bin\DevicePowerMenuPlugin.dll UNPAGED
+data=\epoc32\data\z\pluginstub\DevicePowerMenuPlugin.qtplugin \resource\plugins\devicedialogs\DevicePowerMenuPlugin.qtplugin
+
+#endif //__DEVICEPOWERMENUPLUGIN_IBY__
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/devicepowermenuplugin/src/hbdevicepowermenuplugin.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,166 @@
+/*
+ * 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:
+ *
+ */
+
+//System includes
+#include <QtPlugin>
+#include <hbdevicedialog.h>
+
+//user includes
+#include "hbdevicepowermenuplugin_p.h"
+#include "hbdevicepowermenuwidegt_p.h"
+#include "hbdevicepowermenupluginerrors_p.h"
+
+//SysAp's Secure UID
+const quint32 KSecureUid = 0x100058F3;
+
+Q_EXPORT_PLUGIN2(devicepowermenuplugin, HbDevicePowerMenuPlugin)
+
+// This plugin implements a device dialog type
+static const struct
+ {
+ const char *mTypeString;
+ } dialogInfos[] = {{"com.nokia.hb.devicepowermenu/1.0"}};
+
+class HbDevicePowerMenuPluginPrivate
+ {
+public:
+ HbDevicePowerMenuPluginPrivate() {mError = NoError;}
+ int mError;
+ };
+
+/**
+ * Constructor
+ */
+HbDevicePowerMenuPlugin::HbDevicePowerMenuPlugin()
+ {
+ TRACES( RDebug::Print( _L("HbDevicePowerMenuPlugin::Constructor:Begin") ) );
+ d = new HbDevicePowerMenuPluginPrivate;
+ TRACES( RDebug::Print( _L("HbDevicePowerMenuPlugin::Constructor:End") ) );
+ }
+
+/**
+ * Destructor
+ */
+HbDevicePowerMenuPlugin::~HbDevicePowerMenuPlugin()
+ {
+ TRACES( RDebug::Print( _L("HbDevicePowerMenuPlugin::Destructor:Begin") ) );
+ delete d;
+ TRACES( RDebug::Print( _L("HbDevicePowerMenuPlugin::Destructor:End") ) );
+ }
+
+/**
+ * This method is Pure Virtual in HbDeviceDialogPlugin
+ * Checks if client is allowed to use device dialog widget
+ * Its a customized widget for Sysap, and allows only Sysap to use this plugin
+ */
+bool HbDevicePowerMenuPlugin::accessAllowed(const QString &deviceDialogType, const QVariantMap ¶meters, const QVariantMap &securityInfo) const
+ {
+ TRACES( RDebug::Print( _L("HbDevicePowerMenuPlugin::accessAllowed:Begin") ) );
+ Q_UNUSED(deviceDialogType)
+ Q_UNUSED(parameters)
+ TBool secured(false);
+ quint32 secUid = static_cast<quint32>(securityInfo.value("sym-secureId").toInt());
+ if (secUid == KSecureUid )
+ {
+ secured = true;
+ }
+ TRACES( RDebug::Print( _L("HbDevicePowerMenuPlugin::accessAllowed:End") ) );
+ return secured;
+ }
+
+/**
+ * Creates device dialog widget
+ */
+HbDeviceDialogInterface *HbDevicePowerMenuPlugin::createDeviceDialog(const QString &deviceDialogType, const QVariantMap ¶meters)
+ {
+ TRACES( RDebug::Print( _L("HbDevicePowerMenuPlugin::createDeviceDialog:Begin") ) );
+ d->mError = NoError;
+
+ HbDeviceDialogInterface *ret(NULL);
+ if (dialogInfos[0].mTypeString == deviceDialogType)
+ {
+ QVariantMap params = parameters;
+ HbDevicePowerMenuWidget *powMenu = new HbDevicePowerMenuWidget(params);
+ d->mError = powMenu->deviceDialogError();
+ if (d->mError != NoError)
+ {
+ delete powMenu;
+ powMenu = NULL;
+ }
+ ret = powMenu;
+ }
+ else
+ {
+ d->mError = UnknownDeviceDialogError;
+ ret = NULL;
+ }
+ TRACES( RDebug::Print( _L("HbDevicePowerMenuPlugin::createDeviceDialog:End") ) );
+ return ret;
+ }
+
+/**
+ * Return information of device dialog the plugin creates
+ */
+bool HbDevicePowerMenuPlugin::deviceDialogInfo(const QString &deviceDialogType, const QVariantMap ¶meters, DeviceDialogInfo *info) const
+ {
+ TRACES( RDebug::Print( _L("HbDevicePowerMenuPlugin::deviceDialogInfo:Begin") ) );
+ Q_UNUSED(parameters)
+ Q_UNUSED(deviceDialogType)
+
+ info->group = GenericDeviceDialogGroup;
+ info->flags = SecurityCheck;
+ info->priority = DefaultPriority;
+ TRACES( RDebug::Print( _L("HbDevicePowerMenuPlugin::deviceDialogInfo:End") ) );
+ return true;
+ }
+
+/**
+ * Return device dialog types this plugin implements
+ */
+QStringList HbDevicePowerMenuPlugin::deviceDialogTypes() const
+ {
+ TRACES( RDebug::Print( _L("HbDevicePowerMenuPlugin::deviceDialogTypes:Begin") ) );
+ QStringList types;
+ const int numTypes = sizeof(dialogInfos) / sizeof(dialogInfos[0]);
+ for(int i = 0; i < numTypes; i++)
+ {
+ types.append(dialogInfos[i].mTypeString);
+ }
+ TRACES( RDebug::Print( _L("HbDevicePowerMenuPlugin::deviceDialogTypes:End") ) );
+ return types;
+ }
+
+/**
+ * Return plugin flags
+ */
+HbDeviceDialogPlugin::PluginFlags HbDevicePowerMenuPlugin::pluginFlags() const
+ {
+ TRACES( RDebug::Print( _L("HbDevicePowerMenuPlugin::pluginFlags:Begin") ) );
+ TRACES( RDebug::Print( _L("HbDevicePowerMenuPlugin::pluginFlags:End") ) );
+ return NoPluginFlags;
+ }
+
+/**
+ * Return last error
+ */
+int HbDevicePowerMenuPlugin::error() const
+ {
+ TRACES( RDebug::Print( _L("HbDevicePowerMenuPlugin::error:Begin") ) );
+ TRACES( RDebug::Print( _L("HbDevicePowerMenuPlugin::error:End") ) );
+ return d->mError;
+ }
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/devicepowermenuplugin/src/hbdevicepowermenuwidegt.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,438 @@
+/*
+ * 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:
+ *
+ */
+
+
+#include "hbdevicepowermenuwidegt_p.h"
+#include "hbdevicepowermenupluginerrors_p.h"
+#include <HbInstance.h>
+
+//resuorces
+QString POWER_MENU_DOCML(":/xml/powermenu.docml");
+QString VOLUME_DECREASE_ICON(":/images/decrement.svg");
+QString VOLUME_INCREASE_ICON(":/images/increment.svg");
+QString VOLUME_UNMUTE_ICON(":/images/unmuted.svg");
+QString VOLUME_MUTE_ICON(":/images/muted.svg");
+//For Localization
+QString LOCALE_PATH("/resource/qt/translations/");
+QString TS_FILE("power_menu");
+
+//Widget names
+QString MAIN_DLG("maindialog");
+QString PWR_SILENCE("Silence");
+QString PWR_VOLUME("Volume");
+QString PWR_VIBARTE("Vibrate");
+QString PWR_OFFLINE("Offline");
+QString PWR_POWEROFF("PowerOff");
+QString PWR_CONTAINER("container_1");
+
+//DO not modify these strings
+QString KVolumeLevel("VolumeLevel");
+QString KSilenceLatchOn("SilenceLatchOn"); //Used to latch silencebutton
+QString KVibrationEnable("VibrationEnable");
+QString KOfflineEnable("OfflineEnable");
+QString KCypherOff("CypherOff"); //used to poweroffButtonEnabled/Disabled
+QString KShutDown("ShutDown");
+
+//Used for Orientation of PowerMenu
+qreal KVerticalX = 175;
+//width of PowerMenu
+qreal KPMWidth = 360;
+
+/**
+ * Constructor
+ */
+HbDevicePowerMenuWidget::HbDevicePowerMenuWidget(const QVariantMap ¶meters)
+ :mDeviceDialogError(NoError),
+ mVolumeLevel(0),
+ mShowVolume(false),
+ mVibrationChecked(true),
+ mOfflineChecked(true),
+ mSilencelatched(true),
+ mCypherOff(true),
+ mDialogWidget(NULL),
+ mSilenceButton(NULL),
+ mVolumeSlider(NULL),
+ mVibarte(NULL),
+ mOffline(NULL),
+ mPowerOffButton(NULL),
+ mLoader(NULL),
+ mHbTranslator(NULL)
+ {
+ // mMainWindow(NULL),
+ TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::Constructor:Begin") ) );
+ if (preConstructDialog())
+ {
+ //Translator loaded succesfully then olny construct widgets
+ constructDialog(parameters);
+ }
+ TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::Constructor:End") ) );
+ }
+
+/**
+ * Destructor
+ */
+HbDevicePowerMenuWidget::~HbDevicePowerMenuWidget()
+ {
+ TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::Destructor()") ) );
+ cleanupMemory();
+ }
+
+/**
+ * Implementation of HbDeviceDialogInterface method
+ * sets parameters of custom widget
+ */
+bool HbDevicePowerMenuWidget::setDeviceDialogParameters(const QVariantMap ¶meters)
+ {
+ TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::setDeviceDialogParameters:Begin") ) );
+ if(parameters.contains(KVolumeLevel))
+ {
+ mVolumeLevel = parameters.value(KVolumeLevel).toInt();
+ }
+ if(parameters.contains(KSilenceLatchOn))
+ {
+ mSilencelatched = parameters.value(KSilenceLatchOn).toBool();
+ //If SilenceMode is Enabled then MasterVolume control is Disabled
+ mShowVolume = mSilencelatched? false:true;
+ }
+ if(parameters.contains(KVibrationEnable))
+ {
+ mVibrationChecked = parameters.value(KVibrationEnable).toBool();
+ }
+ if(parameters.contains(KOfflineEnable))
+ {
+ mOfflineChecked = parameters.value(KOfflineEnable).toBool();
+ }
+ if(parameters.contains(KCypherOff))
+ {
+ mCypherOff = parameters.value(KCypherOff).toBool();
+ }
+ TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::setDeviceDialogParameters:End") ) );
+ return true;
+ }
+
+/**
+ * Returns error code
+ */
+int HbDevicePowerMenuWidget::deviceDialogError() const
+ {
+ TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::deviceDialogError") ) );
+ return mDeviceDialogError;
+ }
+
+/**
+ * Close DeviceDialog
+ */
+void HbDevicePowerMenuWidget::closeDeviceDialog(bool byClient)
+ {
+ TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::closeDeviceDialog:Begin") ) );
+ Q_UNUSED(byClient);
+ TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::closeDeviceDialog:End") ) );
+ mDialogWidget->close();
+ }
+
+/**
+ * Implementation of HbDeviceDialogInterface method
+ */
+HbPopup* HbDevicePowerMenuWidget::deviceDialogWidget() const
+ {
+ TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::deviceDialogWidget") ) );
+ return mDialogWidget;
+ }
+
+/**
+ * Implementation of HbDeviceDialogInterface method
+ * to get signals from action events
+ */
+QObject* HbDevicePowerMenuWidget::signalSender() const
+ {
+ TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::signalSender") ) );
+ return const_cast<HbDevicePowerMenuWidget*>(this);
+ }
+
+/**
+ * Before loading docml and widgets Translator must be loaded
+ */
+bool HbDevicePowerMenuWidget::preConstructDialog()
+ {
+ TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::preConstructDialog:Begin") ) );
+ //Translator
+ mHbTranslator = new HbTranslator(LOCALE_PATH,TS_FILE);
+ if(!mHbTranslator)
+ {
+ //Translator is failed to create
+ mDeviceDialogError = UnknownDeviceDialogError;
+ TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::preConstructDialog:MemoryAllocation Failed") ) );
+ return false;
+ }
+ TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::preConstructDialog:End") ) );
+ return true;
+ }
+
+/**
+ * Constrcuts customized widget dialog by loading the UI from docml and
+ * initializes all parameters and attributes.
+ * Throws bad-memory on Un-succesful memory allocations
+ */
+void HbDevicePowerMenuWidget::constructDialog(const QVariantMap ¶meters)
+ {
+ TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::constructDialog:Begin") ) );
+ bool dialogLoaded(false);
+ //Docml loader
+ mLoader = new HbDocumentLoader();
+ if(!mLoader)
+ {
+ //Document Loader failed to create
+ mDeviceDialogError = UnknownDeviceDialogError;
+ cleanupMemory();
+ TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::constructDialog:mLoader::MemoryAllocation Failed") ) );
+ return;
+ }
+ mLoader->load(POWER_MENU_DOCML, &dialogLoaded);
+ Q_ASSERT_X(dialogLoaded, "HbDevicePowerMenuWidget", "Invalid xml file");
+ //Widgets
+ if (dialogLoaded)
+ {
+ //Dialog loaded succesfully from docml
+ TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::constructDialog:dialogLoaded:Begin") ) );
+
+ //Initialize Parameters received
+ setDeviceDialogParameters(parameters);
+ mDialogWidget = qobject_cast <HbDialog *>(mLoader->findWidget(MAIN_DLG));
+ //Find the handles for all widget items
+ mSilenceButton = qobject_cast <HbPushButton *>(mLoader->findWidget(PWR_SILENCE));
+ mVolumeSlider = qobject_cast <HbSlider *>(mLoader->findWidget(PWR_VOLUME));
+ mVibarte = qobject_cast <HbCheckBox *>(mLoader->findWidget(PWR_VIBARTE));
+ mOffline = qobject_cast <HbCheckBox *>(mLoader->findWidget(PWR_OFFLINE));
+ mPowerOffButton = qobject_cast <HbPushButton *>(mLoader->findWidget(PWR_POWEROFF));
+ QGraphicsWidget *widget(NULL);
+ widget = mLoader->findWidget(PWR_CONTAINER);
+ if (!(IsValidHandles()&&(widget)))
+ {
+ //Atleast, One of the Handles are not allocated memory
+ mDeviceDialogError = UnknownDeviceDialogError;
+ cleanupMemory();
+ TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::constructDialog:Widgets::MemoryAllocation Failed") ) );
+ return;
+ }
+ //Sets Speaker icon
+ setSpeakerIcon();
+ //Customize slider to VolumeSlider
+ customizeVolumeSlider();
+ mDialogWidget->setContentWidget(widget);
+ //SetWidget Attributes
+ //1. Volume
+ mVolumeSlider->setSliderPosition(mVolumeLevel);
+ mVolumeSlider->setEnabled(mShowVolume);
+ //This will avoid IPC calls while dragging the Slider
+ mVolumeSlider->setTracking(false);
+ bool ok = connect(mVolumeSlider,SIGNAL(valueChanged(int)) , this , SLOT(handleVolumeChanged(int)));
+ Q_ASSERT_X(ok, "VolumeSlider", "Invalid IncrementDecrement Change");
+
+ //2.Silence Mode
+ mSilenceButton->setDown(mSilencelatched);
+ ok = connect(mSilenceButton,SIGNAL(clicked(bool)) , this , SLOT(handleSilenceMode(bool)));
+ Q_ASSERT_X(ok, "SilenceButton", "Invalid Clicked");
+
+ //3.Master Vibration
+ mVibarte->setChecked(mVibrationChecked);
+ ok = connect(mVibarte,SIGNAL(stateChanged(int)) , this , SLOT(handleVibrationToggled(int)));
+ Q_ASSERT_X(ok, "Vibrator", "Invalid Vibrator Toggeld");
+
+ //4.Offline
+ mOffline->setChecked(mOfflineChecked);
+ ok = connect(mOffline,SIGNAL(stateChanged(int)) , this , SLOT(handleOfflineToggled(int)));
+ Q_ASSERT_X(ok, "Vibrator", "Invalid Offline Toggeld");
+
+ //5.Power off
+ mPowerOffButton->setEnabled(mCypherOff);
+ ok = connect(mPowerOffButton,SIGNAL(clicked(bool)) , this , SLOT(handlePowerOff(bool)));
+ Q_ASSERT_X(ok, "PowerOffButton", "Invalid Clicked");
+
+ //Dialog dismiss only with Tap outside
+ mDialogWidget->setTimeout(HbPopup::NoTimeout);
+ mDialogWidget->setDismissPolicy(HbPopup::TapOutside);
+ mDialogWidget->setPreferredWidth(KPMWidth);
+
+ connect(mDialogWidget,SIGNAL(aboutToClose()),this, SLOT(closedialog()));
+ TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::constructDialog:dialogLoaded:End") ) );
+ }
+ TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::constructDialog:End") ) );
+ }
+
+/**
+ * Checks whether all Hadles for widgets DialogWidget,
+ * SilenceButton, Vibrate, Offline and Poweroff Button allocated memory.
+ * Returns True, if all Handles allocated memory.
+ * Flase, atleast one of them NOT allocated memory.
+ */
+bool HbDevicePowerMenuWidget::IsValidHandles()
+ {
+ if((!mDialogWidget) || (!mSilenceButton) || (!mVolumeSlider)||(!mVibarte) || (!mOffline) || (!mPowerOffButton))
+ {
+ return false;
+ }
+ else{
+ //All handles are allocated memory
+ return true;
+ }
+ }
+
+/**
+ * Sets Mute/Unmute icon for Volume slider
+ * Mute/Unmute icon to display the current status of Silence Mode.
+ * Mute icon dispalyed when Device in Silence mode.
+ * Unmute icon dispalyed when Device Non-Silence mode.
+ */
+void HbDevicePowerMenuWidget::setSpeakerIcon()
+ {
+ TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::setSpeakerIcon:Begin") ) );
+ QString speakerIcon= ( mSilencelatched )? VOLUME_MUTE_ICON : VOLUME_UNMUTE_ICON ;
+ mVolumeSlider->setElementIcon(HbSlider:: IconElement,HbIcon(speakerIcon));
+ TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::setSpeakerIcon:End") ) );
+ }
+
+
+/**
+ * Customizes the slider to Vloume Slider
+ */
+void HbDevicePowerMenuWidget::customizeVolumeSlider()
+ {
+ TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::customizeVolumeSlider:Begin") ) );
+ //Construct Volume Slider from the HbSlider
+ mVolumeSlider->setSliderElements(QList<QVariant>()
+ << HbSlider::DecreaseElement
+ << HbSlider::TrackElement
+ << HbSlider::IncreaseElement
+ << HbSlider::IconElement );
+
+ // To set DecreaseIcon and IncreseIcon
+ mVolumeSlider->setElementIcon(HbSlider::DecreaseElement, HbIcon(VOLUME_DECREASE_ICON));
+ mVolumeSlider->setElementIcon(HbSlider:: IncreaseElement, HbIcon(VOLUME_INCREASE_ICON));
+ //set Range of volume
+ mVolumeSlider->setRange(1,10);
+ TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::customizeVolumeSlider:End") ) );
+ }
+
+/**
+ * Slot
+ * Widget is about to Close.
+ */
+void HbDevicePowerMenuWidget::closedialog()
+ {
+ TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::closedialog:Begin") ) );
+ emit deviceDialogClosed();
+ TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::closedialog:Begin") ) );
+ }
+
+/**
+ * Slot
+ */
+void HbDevicePowerMenuWidget::handleVolumeChanged(int aVolume)
+ {
+ TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::handleVolumeChanged:Begin") ) );
+ mVolumeLevel = aVolume;
+ //inform the client may be through data changed etc.
+ QVariantMap mDataToSend;
+ QVariant volume(mVolumeLevel);
+ mDataToSend.insert(KVolumeLevel, volume);
+ emit deviceDialogData(mDataToSend);
+ TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::handleVolumeChanged:Begin") ) );
+ }
+
+/**
+ * Slot
+ * Switch between the states to latch down and latch up.
+ * In case of Silence mode, The Silence button id latched down and Disables Volume control.
+ * In case of Non-Silence mode, The Silence button id latched Up and enables Volume control.
+ */
+void HbDevicePowerMenuWidget::handleSilenceMode(bool aState)
+ {
+ TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::handleSilenceMode:Begin") ) );
+ Q_UNUSED(aState);
+ mShowVolume = !(mShowVolume);
+ mSilencelatched = !(mSilencelatched);
+ mSilenceButton->setDown(mSilencelatched);
+ mVolumeSlider->setEnabled(mShowVolume);
+ setSpeakerIcon();
+ //inform the client may be through data changed etc.
+ QVariantMap mDataToSend;
+ QVariant silence(mSilencelatched);
+ mDataToSend.insert(KSilenceLatchOn, silence);
+ emit deviceDialogData(mDataToSend);
+ TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::handleSilenceMode:End") ) );
+ }
+
+/**
+ * Slot
+ */
+void HbDevicePowerMenuWidget::handlePowerOff(bool aState)
+ {
+ TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::handlePowerOff:Begin") ) );
+ Q_UNUSED(aState);
+ QVariantMap mDataToSend;
+ QVariant shutdown(true);
+ mDataToSend.insert(KShutDown, shutdown);
+ emit deviceDialogData(mDataToSend);
+ emit deviceDialogClosed();
+ TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::handlePowerOff:End") ) );
+ }
+
+/**
+ * Slot
+ */
+void HbDevicePowerMenuWidget::handleOfflineToggled(int aOfflineToggel)
+ {
+ TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::handleOfflineToggled:Begin") ) );
+ mOfflineChecked = aOfflineToggel;
+ QVariantMap mDataToSend;
+ QVariant offline(mOfflineChecked);
+ mDataToSend.insert(KOfflineEnable, offline);
+ emit deviceDialogData(mDataToSend);
+ TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::handleOfflineToggled:End") ) );
+ }
+
+/**
+ * Slot
+ */
+void HbDevicePowerMenuWidget::handleVibrationToggled(int aVibrationToggel)
+ {
+ TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::handleVibrationToggled:Begin") ) );
+ mVibrationChecked = aVibrationToggel;
+ QVariantMap mDataToSend;
+ QVariant vibration(mVibrationChecked);
+ mDataToSend.insert(KVibrationEnable, vibration);
+ emit deviceDialogData(mDataToSend);
+ TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::handleVibrationToggled:End") ) );
+ }
+
+/**
+ * Cleans up memory allocations
+ */
+void HbDevicePowerMenuWidget::cleanupMemory()
+ {
+ TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::cleanupMemory:Begin") ) );
+ if(mLoader)
+ {
+ delete mLoader;
+ }
+ if(mHbTranslator)
+ {
+ delete mHbTranslator;
+ }
+ TRACES( RDebug::Print( _L("HbDevicePowerMenuWidget::cleanupMemory:End") ) );
+ }
+
--- a/coreapplicationuis/group/bld.inf Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/group/bld.inf Tue Aug 31 15:24:25 2010 +0300
@@ -32,7 +32,6 @@
#include "../accfwuinotifier/group/bld.inf"
#include "../kefmapper/group/bld.inf"
#include "../advancedtspcontroller/group/bld.inf"
-#include "../powersaveutilities/group/bld.inf"
#include "../gsserverenginestub/group/bld.inf"
#include "../GSServerEngine/group/bld.inf"
#include "../sensordatacompensatorplugin/group/bld.inf"
--- a/coreapplicationuis/gsserverenginestub/group/GSServerEnginestub.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/gsserverenginestub/group/GSServerEnginestub.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -19,7 +19,7 @@
// To get the MW_LAYER_SYSTEMINCLUDE-definition
#include <platform_paths.hrh>
-TARGET GSServerEnginestub.dll
+TARGET gsserverenginestub.dll
TARGETTYPE dll
UID 0x10281F16
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/hbdeviceinputdialogplugin/hbdeviceinputdialogplugin.pro Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,60 @@
+#
+#############################################################################
+##
+## 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:
+##
+#############################################################################
+#
+
+TEMPLATE = lib
+TARGET = HbDeviceInputDialogPlugin
+CONFIG += hb plugin
+
+INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE
+
+
+
+
+HEADERS += .\inc\hbdeviceinputdialogplugin_p.h \
+ .\inc\hbdeviceinputdialogpluginerrors_p.h \
+ .\inc\hbdeviceinputdialogwidget_p.h
+
+SOURCES += .\src\hbdeviceinputdialogplugin.cpp \
+ .\src\hbdeviceinputdialogwidget.cpp
+
+MOC_DIR = ./tmp
+
+TRANSLATIONS += filemanager.ts
+symbian: {
+ TARGET.UID3 = 0x2002F376
+ TARGET.CAPABILITY = ALL -TCB
+ TARGET.EPOCALLOWDLLDATA = 1
+
+ pluginstub.sources = HbDeviceInputDialogPlugin.dll
+ pluginstub.path = /resource/plugins/devicedialogs
+ DEPLOYMENT += pluginstub
+}
+
+symbian:
+{
+BLD_INF_RULES.prj_exports += \
+ "$${LITERAL_HASH}include <platform_paths.hrh>" \
+ "qmakepluginstubs/HbDeviceInputDialogPlugin.qtplugin /epoc32/data/z/pluginstub/HbDeviceInputDialogPlugin.qtplugin"\
+ ".\rom\hbdeviceinputdialogplugin.iby CORE_MW_LAYER_IBY_EXPORT_PATH(hbdeviceinputdialogplugin.iby)" \
+ ".\rom\hbdeviceinputdialogplugin_resources.iby LANGUAGE_APP_LAYER_IBY_EXPORT_PATH(hbdeviceinputdialogplugin_resources.iby)"
+}
+
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/hbdeviceinputdialogplugin/inc/hbdeviceinputdialogplugin_p.h Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,50 @@
+/****************************************************************************
+ * 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:
+ *
+ ****************************************************************************/
+
+#ifndef HBDEVICEINPUTDIALOGPLUGIN_P_H
+#define HBDEVICEINPUTDIALOGPLUGIN_P_H
+
+#include <QObject>
+#include <QVariantMap>
+
+#include <hbdevicedialogplugin.h>
+
+class HbDeviceInputDialogPluginPrivate;
+
+class HbDeviceInputDialogPlugin : public HbDeviceDialogPlugin
+{
+ Q_OBJECT
+
+public:
+ friend class HbDeviceInputDialogPluginPrivate;
+
+ HbDeviceInputDialogPlugin();
+ ~HbDeviceInputDialogPlugin();
+
+ bool accessAllowed(const QString &deviceDialogType,const QVariantMap ¶meters, const QVariantMap &securityInfo) const;
+ HbDeviceDialogInterface *createDeviceDialog(const QString &deviceDialogType,const QVariantMap ¶meters);
+ bool deviceDialogInfo(const QString &deviceDialogType,const QVariantMap ¶meters, DeviceDialogInfo *info) const;
+ QStringList deviceDialogTypes() const;
+ PluginFlags pluginFlags() const;
+ int error() const;
+
+private:
+ Q_DISABLE_COPY(HbDeviceInputDialogPlugin)
+ HbDeviceInputDialogPluginPrivate *d;
+};
+
+#endif // HBDEVICEINPUTDIALOGPLUGIN_P_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/hbdeviceinputdialogplugin/inc/hbdeviceinputdialogpluginerrors_p.h Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,41 @@
+/****************************************************************************
+ * 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:
+ *
+ ****************************************************************************/
+
+#ifndef HBDEVICEINPUTDIALOGPLUGINERRORS_P_H
+#define HBDEVICEINPUTDIALOGPLUGINERRORS_P_H
+
+#include <hbdevicedialog.h>
+#include <e32debug.h>
+#ifdef _DEBUG
+
+ #define TRACES( x ) x
+
+#else
+
+ #define TRACES( x )
+
+#endif
+
+
+// No error
+const int NoError = 0;
+// Illegal parameter error
+const int ParameterError = HbDeviceDialog::PluginErrors + 1;
+// Unknown device dialog error
+const int UnknownDeviceDialogError = HbDeviceDialog::PluginErrors + 2;
+
+#endif // HBDEVICEINPUTDIALOGPLUGINERRORS_P_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/hbdeviceinputdialogplugin/inc/hbdeviceinputdialogwidget_p.h Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,97 @@
+/****************************************************************************
+ * 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:
+ *
+****************************************************************************/
+
+#ifndef HBDEVICEINPUTDIALOGWIDGET_P_H
+#define HBDEVICEINPUTDIALOGWIDGET_P_H
+
+#include <QObject>
+#include <QVariantMap>
+
+#include <hbdevicedialoginterface.h>
+#include <hbdevicedialog.h>
+#include <hbinputdialog.h>
+#include <hbTranslator.h>
+
+class HbDialog;
+
+class HbDeviceInputDialogWidget : public HbInputDialog, public HbDeviceDialogInterface
+{
+ Q_OBJECT
+ Q_PROPERTY(QString primaryActionText READ primaryActionText WRITE setPrimaryActionText)
+ Q_PROPERTY(QString secondaryActionText READ secondaryActionText WRITE setSecondaryActionText)
+ Q_PROPERTY(bool primaryActionNull READ primaryActionNull WRITE setPrimaryActionNull)
+ Q_PROPERTY(bool secondaryActionNull READ secondaryActionNull WRITE setSecondaryActionNull)
+ Q_PROPERTY(QString animationDefinition READ animationDefinition WRITE setAnimationDefinition)
+
+public:
+ HbDeviceInputDialogWidget(const QVariantMap ¶meters);
+ ~HbDeviceInputDialogWidget();
+
+ bool setDeviceDialogParameters(const QVariantMap ¶meters);
+ int deviceDialogError() const;
+ void closeDeviceDialog(bool byClient);
+ HbDialog *deviceDialogWidget() const;
+
+public slots:
+ void primaryActionTriggered();
+ void secondaryActionTriggered();
+ void closeDialog();
+
+private:
+ bool preConstructDialog();
+ bool constructDialog(const QVariantMap ¶meters);
+ bool checkProperties(const QVariantMap ¶meters);
+ void setProperties(const QVariantMap ¶meters);
+ void resetProperties();
+ QString primaryActionText() const;
+ void setPrimaryActionText(QString &actionText);
+ QString secondaryActionText() const;
+ void setSecondaryActionText(QString &actionText);
+ bool primaryActionNull() const;
+ void setPrimaryActionNull(bool null);
+ bool secondaryActionNull() const;
+ void setSecondaryActionNull(bool null);
+ void hideEvent(QHideEvent *event);
+ void showEvent(QShowEvent *event);
+ void setAnimationDefinition(QString &animationDefinition);
+ QString animationDefinition() const;
+
+signals:
+ void deviceDialogClosed();
+ void deviceDialogData(QVariantMap data); //used to send the inputted text from server to client
+
+private:
+ Q_DISABLE_COPY(HbDeviceInputDialogWidget)
+
+ int mLastError;
+ int mDeviceDialogError; //DeviceDialogError
+ int mHack;
+
+ QString mPrimaryActionText;
+ QString mSecondaryActionText;
+ bool mPrimaryActionNull;
+ bool mSecondaryActionNull;
+ int mSendAction;
+ bool mShowEventReceived;
+ QString mAnimationDefinition;
+ QVariantMap data;
+ HbAction* mPrimaryAction;
+ HbAction* mSecondaryAction;
+ HbTranslator* mHbTranslator;
+};
+
+#endif // HBDEVICEINPUTDIALOGWIDGET_P_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/hbdeviceinputdialogplugin/rom/hbdeviceinputdialogplugin.iby Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,26 @@
+/*
+ * 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:
+ *
+ */
+
+#ifndef __HBDEVICEINPUTDIALOGPLUGIN_IBY__
+#define __HBDEVICEINPUTDIALOGPLUGIN_IBY__
+
+
+file = \epoc32\release\armv5\urel\HbDeviceInputDialogPlugin.dll \sys\bin\HbDeviceInputDialogPlugin.dll UNPAGED
+data=\epoc32\data\z\pluginstub\HbDeviceInputDialogPlugin.qtplugin \resource\plugins\devicedialogs\HbDeviceInputDialogPlugin.qtplugin
+
+
+#endif //__HBDEVICEINPUTDIALOGPLUGIN_IBY__
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/hbdeviceinputdialogplugin/rom/hbdeviceinputdialogplugin_resources.iby Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,27 @@
+/*
+ * 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:
+ *
+ */
+
+#ifndef __HBDEVICEINPUTDIALOGPLUGIN_RESOURCES_IBY__
+#define __HBDEVICEINPUTDIALOGPLUGIN_RESOURCES_IBY__
+
+//this iby is required for language specific things to be exported to Language iby layer
+#include <data_caging_paths_for_iby.hrh>
+
+data=DATAZ_\QT_TRANSLATIONS_DIR\device_input_dialog.qm QT_TRANSLATIONS_DIR\device_input_dialog.qm
+
+
+#endif //__HBDEVICEINPUTDIALOGPLUGIN_RESOURCES_IBY__
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/hbdeviceinputdialogplugin/src/hbdeviceinputdialogplugin.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,147 @@
+/****************************************************************************
+ * 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:
+ ***************************************************************************/
+
+#include <QtPlugin>
+
+#include <hbdevicedialog.h>
+//#include <hbdevicedialogtrace_p.h>
+#include "hbdeviceinputdialogplugin_p.h"
+#include "hbdeviceinputdialogwidget_p.h"
+#include "hbdeviceinputdialogpluginerrors_p.h"
+
+Q_EXPORT_PLUGIN2(deviceinputdialogplugin, HbDeviceInputDialogPlugin)
+
+// This plugin implements one device dialog type
+static const struct {
+ const char *mTypeString;
+} dialogInfos[] = {
+ {"com.nokia.hb.deviceinputdialog/1.0"}
+};
+
+class HbDeviceInputDialogPluginPrivate
+{
+public:
+ HbDeviceInputDialogPluginPrivate() {mError = NoError;}
+
+ int mError;
+};
+
+// Constructor
+HbDeviceInputDialogPlugin::HbDeviceInputDialogPlugin()
+{
+ TRACES( RDebug::Print( _L("HbDeviceInputDialogPlugin::Constructor:Begin") ) );
+ d = new HbDeviceInputDialogPluginPrivate;
+ TRACES( RDebug::Print( _L("HbDeviceInputDialogPlugin::Constructor:End") ) );
+}
+
+// Destructor
+HbDeviceInputDialogPlugin::~HbDeviceInputDialogPlugin()
+{
+ TRACES( RDebug::Print( _L("HbDeviceInputDialogPlugin::Destructor:Begin") ) );
+ delete d;
+ TRACES( RDebug::Print( _L("HbDeviceInputDialogPlugin::Destructor:End") ) );
+}
+
+// Check if client is allowed to use device dialog widget
+bool HbDeviceInputDialogPlugin::accessAllowed(const QString &deviceDialogType,
+ const QVariantMap ¶meters, const QVariantMap &securityInfo) const
+{
+ TRACES( RDebug::Print( _L("HbDeviceInputDialogPlugin::AccessAllowed:Begin") ) );
+ Q_UNUSED(deviceDialogType)
+ Q_UNUSED(parameters)
+ Q_UNUSED(securityInfo)
+
+ // This plugin doesn't perform operations that may compromise security.
+ // All clients are allowed to use.
+ TRACES( RDebug::Print( _L("HbDeviceInputDialogPlugin::AccessAllowed:End") ) );
+ return true;
+
+}
+
+// Create device dialog widget
+HbDeviceDialogInterface *HbDeviceInputDialogPlugin::createDeviceDialog(const QString &deviceDialogType, const QVariantMap ¶meters)
+{
+ TRACES( RDebug::Print( _L("HbDeviceInputDialogPlugin::createDeviceDialog:Begin") ) );
+ d->mError = NoError;
+
+ HbDeviceDialogInterface *ret(0);
+ int i(0);
+ const int numTypes = sizeof(dialogInfos) / sizeof(dialogInfos[0]);
+ for(i = 0; i < numTypes; i++) {
+ if (dialogInfos[i].mTypeString == deviceDialogType) {
+ break;
+ }
+ }
+ if (i < numTypes) {
+ QVariantMap params = parameters;
+ HbDeviceInputDialogWidget *deviceDialog = new HbDeviceInputDialogWidget(params);
+ d->mError = deviceDialog->deviceDialogError();
+ if (d->mError != NoError) {
+ delete deviceDialog;
+ deviceDialog = 0;
+ }
+ ret = deviceDialog;
+ } else {
+ d->mError = UnknownDeviceDialogError;
+ ret = 0;
+ }
+ TRACES( RDebug::Print( _L("HbDeviceInputDialogPlugin::createDeviceDialog:End") ) );
+ return ret;
+}
+
+// Return information of device dialog the plugin creates
+bool HbDeviceInputDialogPlugin::deviceDialogInfo(const QString &deviceDialogType, const QVariantMap ¶meters, DeviceDialogInfo *info) const
+{
+ TRACES( RDebug::Print( _L("HbDeviceInputDialogPlugin::deviceDialogInfo:Begin") ) );
+ Q_UNUSED(parameters)
+ Q_UNUSED(deviceDialogType)
+
+ info->group = GenericDeviceDialogGroup;
+ info->flags = NoDeviceDialogFlags;
+ info->priority = DefaultPriority;
+ TRACES( RDebug::Print( _L("HbDeviceInputDialogPlugin::deviceDialogInfo:End") ) );
+ return true;
+
+}
+
+// Return device dialog types this plugin implements
+QStringList HbDeviceInputDialogPlugin::deviceDialogTypes() const
+{
+ TRACES( RDebug::Print( _L("HbDeviceInputDialogPlugin::deviceDialogTypes:Begin") ) );
+ QStringList types;
+ const int numTypes = sizeof(dialogInfos) / sizeof(dialogInfos[0]);
+ for(int i = 0; i < numTypes; i++) {
+ types.append(dialogInfos[i].mTypeString);
+ }
+ TRACES( RDebug::Print( _L("HbDeviceInputDialogPlugin::deviceDialogTypes:End") ) );
+ return types;
+}
+
+// Return plugin flags
+HbDeviceDialogPlugin::PluginFlags HbDeviceInputDialogPlugin::pluginFlags() const
+{
+ TRACES( RDebug::Print( _L("HbDeviceInputDialogPlugin::pluginFlags:Begin") ) );
+ TRACES( RDebug::Print( _L("HbDeviceInputDialogPlugin::pluginFlags:End") ) );
+ return NoPluginFlags;
+}
+
+// Return last error
+int HbDeviceInputDialogPlugin::error() const
+{
+ TRACES( RDebug::Print( _L("HbDeviceInputDialogPlugin::error:Begin") ) );
+ TRACES( RDebug::Print( _L("HbDeviceInputDialogPlugin::error:End") ) );
+ return d->mError;
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/hbdeviceinputdialogplugin/src/hbdeviceinputdialogwidget.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,378 @@
+/****************************************************************************
+ * 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:
+ *
+***************************************************************************/
+
+#include <hbaction.h>
+#include <hbdialog.h>
+#include <hbinputdialog.h>
+#include<hblineedit.h>
+#include <hbiconanimationmanager.h>
+#include "hbdeviceinputdialogwidget_p.h"
+#include "hbdeviceinputdialogpluginerrors_p.h"
+
+//For Localization
+QString LOCALE_PATH("/resource/qt/translations/");
+QString TS_FILE("filemanager");
+
+// Constructor
+HbDeviceInputDialogWidget::HbDeviceInputDialogWidget(const QVariantMap ¶meters):HbInputDialog()
+{
+ TRACES( RDebug::Print( _L("HbDeviceInputDialogWidget::Constructor:Begin") ) );
+ mLastError = NoError;
+ mShowEventReceived = false;
+ mPrimaryAction = 0;
+ mSecondaryAction = 0;
+ mDeviceDialogError =0;
+ mHack = 1;
+ //resetProperties();
+ if (preConstructDialog())
+ {
+ //Translator loaded succesfully then olny construct widgets
+ constructDialog(parameters);
+ if (!mPrimaryAction) {
+ // If default button provided by HbInputDialog is used, connect into its triggered signal.
+ QAction *action = /*primaryAction()*/this->actions().first();
+ if (action) {
+ connect(action, SIGNAL(triggered()), SLOT(primaryActionTriggered()));
+ }
+ }
+ if (!mSecondaryAction) {
+ // If default button provided by HbInputDialog is used, connect into its triggered signal.
+ QAction *action = /*secondaryAction()*/ this->actions().at(1);
+ if (action) {
+ connect(action, SIGNAL(triggered()), SLOT(secondaryActionTriggered()));
+ }
+ }
+ connect(this, SIGNAL(visibilityChanged()), SLOT(closeDialog()));
+ }
+ TRACES( RDebug::Print( _L("HbDeviceInputDialogWidget::Constructor:End") ) );
+}
+
+// Destructor
+HbDeviceInputDialogWidget::~HbDeviceInputDialogWidget()
+{
+ TRACES( RDebug::Print( _L("HbDeviceInputDialogWidget::Destrcuctor:Begin") ) );
+ delete mPrimaryAction;
+ delete mSecondaryAction;
+ delete mHbTranslator;
+ TRACES( RDebug::Print( _L("HbDeviceInputDialogWidget::Destructor:End") ) );
+}
+
+// Set parameters
+bool HbDeviceInputDialogWidget::setDeviceDialogParameters(const QVariantMap ¶meters)
+{
+ TRACES( RDebug::Print( _L("HbDeviceInputDialogWidget::setDeviceDialogParameters:Begin") ) );
+ mLastError = NoError;
+ bool ret(false);
+ if (checkProperties(parameters)) {
+ setProperties(parameters);
+ ret = true;
+ }
+ else {
+ mLastError = ParameterError;
+ ret = false;
+ }
+ TRACES( RDebug::Print( _L("HbDeviceInputDialogWidget::setDeviceDialogParameters:End") ) );
+ return ret;
+}
+
+/**
+ * Before creating widgets Translator must be loaded
+ */
+bool HbDeviceInputDialogWidget::preConstructDialog()
+ {
+ TRACES( RDebug::Print( _L("HbDeviceInputDialogWidget::preConstructDialog:Begin") ) );
+ //Translator
+ mHbTranslator = new HbTranslator(LOCALE_PATH,TS_FILE);
+ if(!mHbTranslator)
+ {
+ //Translator is failed to create
+ mDeviceDialogError = UnknownDeviceDialogError;
+ TRACES( RDebug::Print( _L("HbDeviceInputDialogWidget::preConstructDialog:MemoryAllocation Failed") ) );
+ return false;
+ }
+ TRACES( RDebug::Print( _L("HbDeviceInputDialogWidget::preConstructDialog:End") ) );
+ return true;
+ }
+
+// Get error
+int HbDeviceInputDialogWidget::deviceDialogError() const
+{
+ TRACES( RDebug::Print( _L("HbDeviceInputDialogWidget::deviceDialogError:Begin") ) );
+ TRACES( RDebug::Print( _L("HbDeviceInputDialogWidget::deviceDialogError:End") ) );
+ return mLastError;
+}
+
+// Close device dialog
+void HbDeviceInputDialogWidget::closeDeviceDialog(bool byClient)
+{
+ TRACES( RDebug::Print( _L("HbDeviceInputDialogWidget::closeDeviceDialog:Begin") ) );
+ Q_UNUSED(byClient);
+ // Closed by client or internally by server -> no action to be transmitted.
+ mSendAction = false;
+ close();
+ // If show event has been received, close is signalled from hide event. If not,
+ // hide event does not come and close is signalled from here.
+ if (!mShowEventReceived) {
+ emit deviceDialogClosed();
+ }
+ TRACES( RDebug::Print( _L("HbDeviceInputDialogWidget::closeDeviceDialog:End") ) );
+}
+
+// Return display widget
+HbDialog *HbDeviceInputDialogWidget::deviceDialogWidget() const
+{
+ TRACES( RDebug::Print( _L("HbDeviceInputDialogWidget::deviceDialogWidget:Begin") ) );
+ TRACES( RDebug::Print( _L("HbDeviceInputDialogWidget::deviceDialogWidget:End") ) );
+ return const_cast<HbDeviceInputDialogWidget*>(this);
+}
+
+
+// Construct dialog
+bool HbDeviceInputDialogWidget::constructDialog(const QVariantMap ¶meters)
+{
+ TRACES( RDebug::Print( _L("HbDeviceInputDialogWidget::constructDialog:Begin") ) );
+ bool ret(false);
+ // Check that parameters are valid
+
+ if (!checkProperties(parameters)) {
+ mLastError = ParameterError;
+ ret = false;
+ }
+ else {
+ setProperties(parameters);
+ resetProperties();
+ ret = true;
+ }
+
+ TRACES( RDebug::Print( _L("HbDeviceInputDialogWidget::constructDialog:End") ) );
+ return ret;
+}
+
+// Check that device dialog parameters are valid
+bool HbDeviceInputDialogWidget::checkProperties(const QVariantMap ¶meters)
+{
+ TRACES( RDebug::Print( _L("HbDeviceInputDialogWidget::checkProperties:Begin") ) );
+ QVariantMap::const_iterator i = parameters.constBegin();
+ while (i != parameters.constEnd()) {
+ QByteArray key = i.key().toAscii();
+ if (!property(key.constData()).isValid()) {
+ TRACES( RDebug::Print( _L("HbDeviceInputDialogWidget::checkProperties:End :: returning false") ) );
+ return false;
+ }
+ ++i;
+ }
+ TRACES( RDebug::Print( _L("HbDeviceInputDialogWidget::checkProperties:End :: returning true") ) );
+ return true;
+}
+
+// Set properties
+void HbDeviceInputDialogWidget::setProperties(const QVariantMap ¶meters)
+{
+ TRACES( RDebug::Print( _L("HbDeviceInputDialogWidget::setProperties:Begin") ) );
+ QVariantMap::const_iterator i = parameters.constBegin();
+ while (i != parameters.constEnd()) {
+ QByteArray key = i.key().toAscii();
+ if (property(key.constData()).isValid()) {
+ setProperty(key.constData(), i.value());
+ }
+ ++i;
+ }
+ TRACES( RDebug::Print( _L("HbDeviceInputDialogWidget::setProperties:End") ) );
+ return;
+}
+
+// Reset properties to default values
+void HbDeviceInputDialogWidget::resetProperties()
+{
+ TRACES( RDebug::Print( _L("HbDeviceInputDialogWidget::resetProperties:Begin") ) );
+// mIconName.clear();
+ setModal(true);
+ setPromptText(hbTrId("txt_common_dialog_password"), 0);
+ setInputMode(TextInput,0);
+ setEchoMode(HbLineEdit::Password,0);
+ setTimeout(HbPopup::NoTimeout);
+ setDismissPolicy(HbPopup::NoDismiss);
+
+ mPrimaryActionNull = false;
+ mSecondaryActionNull = false;
+ mSendAction = true;
+ TRACES( RDebug::Print( _L("HbDeviceInputDialogWidget::resetProperties:End") ) );
+ return;
+}
+
+QString HbDeviceInputDialogWidget::primaryActionText() const
+{
+ TRACES( RDebug::Print( _L("HbDeviceInputDialogWidget::primaryActionText:Begin") ) );
+ QAction *action = /*primaryAction()*/this->actions().first();
+ TRACES( RDebug::Print( _L("HbDeviceInputDialogWidget::primaryActionText:End") ) );
+ return action ? action->text() : QString();
+}
+
+void HbDeviceInputDialogWidget::setPrimaryActionText(QString &actionText)
+{
+ TRACES( RDebug::Print( _L("HbDeviceInputDialogWidget::setPrimaryActionText:Begin") ) );
+ QAction *action = /*primaryAction()*/this->actions().first();
+ if (action) {
+ action->setText(actionText);
+ } else {
+ if (!mPrimaryAction) {
+ mPrimaryAction = new HbAction(actionText);
+ connect(mPrimaryAction, SIGNAL(triggered()), this, SLOT(primaryActionTriggered()));
+ } else {
+ mPrimaryAction->setText(actionText);
+ }
+ setPrimaryAction(mPrimaryAction);
+ }
+ TRACES( RDebug::Print( _L("HbDeviceInputDialogWidget::setPrimaryActionText:End") ) );
+}
+
+QString HbDeviceInputDialogWidget::secondaryActionText() const
+{
+ TRACES( RDebug::Print( _L("HbDeviceInputDialogWidget::secondaryActionText:Begin") ) );
+ QAction *action = /*secondaryAction()*/ this->actions().at(1);
+ TRACES( RDebug::Print( _L("HbDeviceInputDialogWidget::secondaryActionText:End") ) );
+ return action ? action->text() : QString();
+
+}
+
+void HbDeviceInputDialogWidget::setSecondaryActionText(QString &actionText)
+{
+ TRACES( RDebug::Print( _L("HbDeviceInputDialogWidget::setSecondaryActionText:Begin") ) );
+ QAction *action = /*secondaryAction()*/ this->actions().at(1);
+ if (action) {
+ action->setText(actionText);
+ } else {
+ if (!mSecondaryAction) {
+ mSecondaryAction = new HbAction(actionText);
+ connect(mSecondaryAction, SIGNAL(triggered()), this, SLOT(secondaryActionTriggered()));
+ } else {
+ mSecondaryAction->setText(actionText);
+ }
+ setSecondaryAction(mSecondaryAction);
+ }
+ TRACES( RDebug::Print( _L("HbDeviceInputDialogWidget::setSecondaryActionText:End") ) );
+}
+
+bool HbDeviceInputDialogWidget::primaryActionNull() const
+{
+ return this->actions().first() == 0;
+}
+
+void HbDeviceInputDialogWidget::setPrimaryActionNull(bool isNull)
+{
+ TRACES( RDebug::Print( _L("HbDeviceInputDialogWidget::setPrimaryActionNull:Begin") ) );
+ if (isNull) {
+ // If there is a message box's default action, disconnect from it.
+ QAction *action = /*primaryAction()*/this->actions().first();
+ if (action && mPrimaryAction == 0) {
+ action->disconnect(SIGNAL(triggered()), this, SLOT(primaryActionTriggered()));
+ }
+ setPrimaryAction(0);
+ } else {
+ QString text = mPrimaryAction ? mPrimaryAction->text() : QString();
+ setPrimaryActionText(text);
+ }
+ TRACES( RDebug::Print( _L("HbDeviceInputDialogWidget::setPrimaryActionNull:End") ) );
+}
+
+bool HbDeviceInputDialogWidget::secondaryActionNull() const
+{
+ return this->actions().at(1) == 0;
+}
+
+void HbDeviceInputDialogWidget::setSecondaryActionNull(bool isNull)
+{
+ TRACES( RDebug::Print( _L("HbDeviceInputDialogWidget::setSecondaryActionNull:Begin") ) );
+ if (isNull) {
+ // If there is a message box's default action, disconnect from it.
+ QAction *action = /*secondaryAction()*/ this->actions().at(1);
+ if (action && mSecondaryAction == 0) {
+ action->disconnect(SIGNAL(triggered()), this, SLOT(secondaryActionTriggered()));
+ }
+ setSecondaryAction(0);
+ } else {
+ QString text = mSecondaryAction ? mSecondaryAction->text() : QString();
+ setSecondaryActionText(text);
+ }
+ TRACES( RDebug::Print( _L("HbDeviceInputDialogWidget::setSecondaryActionNull:End") ) );
+}
+
+// Widget is about to hide. Closing effect has ended.
+void HbDeviceInputDialogWidget::hideEvent(QHideEvent *event)
+{
+ Q_UNUSED(event);
+ TRACES( RDebug::Print( _L("HbDeviceInputDialogWidget::hideEvent:Begin") ) );
+ HbInputDialog::hideEvent(event);
+ emit deviceDialogClosed();
+ TRACES( RDebug::Print( _L("HbDeviceInputDialogWidget::hideEvent:End") ) );
+}
+
+// Widget is about to show
+void HbDeviceInputDialogWidget::showEvent(QShowEvent *event)
+{
+ Q_UNUSED(event);
+ TRACES( RDebug::Print( _L("HbDeviceInputDialogWidget::showEvent:Begin") ) );
+ HbInputDialog::showEvent(event);
+ mShowEventReceived = true;
+ TRACES( RDebug::Print( _L("HbDeviceInputDialogWidget::showEvent:End") ) );
+}
+
+void HbDeviceInputDialogWidget::setAnimationDefinition(QString &animationDefinition)
+{
+ mAnimationDefinition = animationDefinition;
+}
+
+QString HbDeviceInputDialogWidget::animationDefinition() const
+{
+ return mAnimationDefinition;
+}
+
+// Primary action triggered
+void HbDeviceInputDialogWidget::primaryActionTriggered()
+{
+ TRACES( RDebug::Print( _L("HbDeviceInputDialogWidget::primaryActionTriggered:Begin") ) );
+ //Get the string enter by user
+ QString myString = this->value().toString();
+ data.insert("ok",myString);
+ emit deviceDialogData(data);
+ mSendAction = true;
+ TRACES( RDebug::Print( _L("HbDeviceInputDialogWidget::primaryActionTriggered:End") ) );
+}
+
+// Secondary action triggered
+void HbDeviceInputDialogWidget::secondaryActionTriggered()
+{
+ TRACES( RDebug::Print( _L("HbDeviceInputDialogWidget::secondaryActionTriggered:Begin") ) );
+ data.insert("cancel","cancel");
+ emit deviceDialogData(data);
+ mSendAction = false;
+ TRACES( RDebug::Print( _L("HbDeviceInputDialogWidget::secondaryActionTriggered:End") ) );
+}
+
+
+// Close Dialog when visibility changed
+void HbDeviceInputDialogWidget::closeDialog()
+ {
+ TRACES( RDebug::Print( _L("HbDeviceInputDialogWidget::closeDialog:Begin") ) );
+ if(mHack == 1)
+ {
+ emit deviceDialogData(data); // first time plugin didnt called deviceDialogData and hence this hack added.
+ }
+ emit deviceDialogClosed();
+ TRACES( RDebug::Print( _L("HbDeviceInputDialogWidget::closeDialog:End") ) );
+ mHack = 0;
+ }
--- a/coreapplicationuis/kefmapper/data/AknKeyEventMap.rss Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/kefmapper/data/AknKeyEventMap.rss Tue Aug 31 15:24:25 2010 +0300
@@ -44,22 +44,7 @@
devicemode = { KKefModeDefault };
eventtype = { KKefTypeShort | KKefTypeKey };
feedbacktype = 1; // 1 = Basic feedback
- },
- KEF_KEY_EVENT
- {
- scancode = { EStdKeyRightFunc, EStdKeyUpArrow } ;
- keycode = { EStdKeyApplicationC, EStdKeyApplicationC, EStdKeyApplicationC } ;
- devicemode = { 0, 1, 2 };
- eventtype = { KKefTypeShort | KKefTypeLong, KKefTypeShort | KKefTypeLong, KKefTypeShort | KKefTypeLong };
- },
-
- KEF_KEY_EVENT
- {
- scancode = { EStdKeyRightFunc, EStdKeyDownArrow } ;
- keycode = { EStdKeyApplicationD, EStdKeyApplicationD, EStdKeyApplicationD } ;
- devicemode = { 0, 1, 2 };
- eventtype = { KKefTypeShort | KKefTypeLong, KKefTypeShort | KKefTypeLong, KKefTypeShort | KKefTypeLong };
- }
+ }
};
}
--- a/coreapplicationuis/kefmapper/group/KeyEventFw.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/kefmapper/group/KeyEventFw.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -19,7 +19,7 @@
#include <platform_paths.hrh>
#include <data_caging_paths.hrh>
-TARGET KeyEventFw.DLL
+TARGET keyeventfw.dll
TARGETTYPE dll
UID 0x1000008D 0x102824C2
--- a/coreapplicationuis/powersaveutilities/BWINS/batterypopupcontrolu.DEF Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-EXPORTS
- ??1CBatteryPopupControl@@UAE@XZ @ 1 NONAME ; CBatteryPopupControl::~CBatteryPopupControl(void)
- ?NewL@CBatteryPopupControl@@SAPAV1@ABVTDesC16@@0@Z @ 2 NONAME ; class CBatteryPopupControl * CBatteryPopupControl::NewL(class TDesC16 const &, class TDesC16 const &)
- ?SetCommandObserver@CBatteryPopupControl@@QAEXAAVMEikCommandObserver@@@Z @ 3 NONAME ; void CBatteryPopupControl::SetCommandObserver(class MEikCommandObserver &)
- ?ShowPopUpL@CBatteryPopupControl@@QAEXXZ @ 4 NONAME ; void CBatteryPopupControl::ShowPopUpL(void)
-
Binary file coreapplicationuis/powersaveutilities/CenRep/keys_bsutil.xls has changed
--- a/coreapplicationuis/powersaveutilities/EABI/batterypopupcontrolu.DEF Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-EXPORTS
- _ZN20CBatteryPopupControl10ShowPopUpLEv @ 1 NONAME
- _ZN20CBatteryPopupControl18SetCommandObserverER19MEikCommandObserver @ 2 NONAME
- _ZN20CBatteryPopupControl4NewLERK7TDesC16S2_ @ 3 NONAME
- _ZN20CBatteryPopupControlD0Ev @ 4 NONAME
- _ZN20CBatteryPopupControlD1Ev @ 5 NONAME
- _ZN20CBatteryPopupControlD2Ev @ 6 NONAME
-
--- a/coreapplicationuis/powersaveutilities/batindicatorpaneplugin/inc/batindicatorpanepluginimpl.h Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,180 +0,0 @@
-/*
-* Copyright (c) 2007 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: BatIndicatorPanePlugin plugin implementation
-*
-*/
-
-
-#ifndef BATINDICATORPANEPLUGINIMPL_H
-#define BATINDICATORPANEPLUGINIMPL_H
-
-// INCLUDES
-#include <AknIndicatorPlugin.h> // CAknIndicatorPlugin
-#include <eikcmobs.h>
-#include <psmclientobserver.h> // CPsmClient
-#include <ConeResLoader.h> // RConeResourceLoader
-#include "batterypopupcontrol.h"
-
-class CPsmClient;
-class CBSUtil;
-
-/**
-* BatIndicatorPanePlugin Plug-in implementation
-*
-* @lib BatIndicatorPanePlugin
-* @since S60 5.0
-*/
-class CBatIndicatorPanePluginImpl : public CAknIndicatorPlugin,
- public MEikCommandObserver,
- public MPsmClientObserver
-{
-
-private:
-
- // Preview popup command ids
- enum TLinkCommandID
- {
- ELinkNone = 0,
- ELinkFirst = 1
- };
-
-public: // Constructors and destructor
-
- /**
- * Two-phased constructor.
- * @since S60 5.0
- * @param aCallback Callback for psm client.
- */
- static CBatIndicatorPanePluginImpl* NewL( );
-
- /**
- * Destructor.
- */
- ~CBatIndicatorPanePluginImpl();
-
-// From MEikCommandObserver
-
- /**
- * @see MEikCommandObserver
- */
- void ProcessCommandL( TInt aCommandId );
-
-private:
-
- /**
- * C++ default constructor.
- */
- CBatIndicatorPanePluginImpl();
-
- /**
- * By default Symbian 2nd phase constructor is private.
- */
- void ConstructL( );
-
- /**
- * Shows preview popup.
- *
- * @since S60 5.0
- */
- void ShowPreviewPopupL( );
-
- /**
- * Enables or disables power save mode.
- * If the wished state is already active, does nothing.
- *
- * @since S60 5.0
- */
- void SetPowerSaveModeEnabled( );
-
- /**
- * Gets local variation for plugin.
- *
- * @since S60 5.0
- */
- void GetFeatures( );
-
- /**
- * This method can check if feature is supported or not.
- * @param TInt aFeatureId (defined in batindpanepluginprivatecrkeys.h)
- * @return TInt: aFeatureId supported if != 0
- *
- * @since S60 5.0
- */
- TInt Supported( TInt aFeatureId );
-
-// From CAknIndicatorPlugin
-
- /**
- * @see CAknIndicatorPlugin
- */
- void HandleIndicatorTapL( const TInt aUid );
-
-// from MPsmClientObserver
-
- /**
- * @see MPsmClientObserver
- */
- virtual void PowerSaveModeChanged( const TPsmsrvMode aMode );
-
- /**
- * @see MPsmClientObserver
- */
- virtual void PowerSaveModeChangeError( const TInt aError );
-
-private: // data
-
- /**
- * Actual content
- * Own.
- */
- HBufC* iContentText;
-
- /**
- * Link text
- * Own.
- */
- HBufC* iLinkText;
-
- /**
- * PSM Server client.
- * Own.
- */
- CPsmClient* iPsmClient;
-
- /**
- * Battery status utility.
- * Own.
- */
- CBSUtil* iBatteryStateUtil;
-
- /**
- * Control for preview popup.
- * Own.
- */
- CBatteryPopupControl* iPopupControl;
-
- /**
- * Resource loader.
- */
- RConeResourceLoader iResourceLoader;
-
- /**
- * Value of KBatIndPanePlugin.
- */
- TInt iBatIndPanePluginFeatures;
- };
-
-#endif // BATINDICATORPANEPLUGINIMPL_H
-
-// End of File
--- a/coreapplicationuis/powersaveutilities/batindicatorpaneplugin/inc/batindpanepluginprivatecrkeys.h Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-/*
-* Copyright (c) 2007 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: Battery Indicator Pane Plug-in central repository
-* configuration keys.
-*
-*/
-
-
-#ifndef BATINDPANEPLUGINPRIVATECRKEYS_H
-#define BATINDPANEPLUGINPRIVATECRKEYS_H
-
-// INCLUDES
-
-// =============================================================================
-// Battery Indicator Pane Plug-in Configuration API
-// =============================================================================
-const TUid KCRUidBatIndPanePluginConf = { 0x2001011A };
-
-/**
-* Bitmask used in configuring Battery Indicator Pane Plug-in.
-*/
-const TUint32 KBatIndPanePlugin = 0x00000001;
-
-// =============================================================================
-// Battery Indicator Pane Plug-in Local Variation constants
-// =============================================================================
-
-/**
-* KBatIndPanePluginLinkOnly is an on/off setting for enabling
-* a preview popup with battery level information in percents. If enabled, this popup
-* is shown only with link for activate/deactivate power save mode. If disabled, this
-* popup is shown with icon, battery level information and link.
-*
-*/
-const TUint32 KBatIndPanePluginLinkOnly = 0x01; // 2^0
-
-#endif // BATINDPANEPLUGINPRIVATECRKEYS_H
-
-// End of File
-
--- a/coreapplicationuis/powersaveutilities/batindicatorpaneplugin/inc/trace.h Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,378 +0,0 @@
-/*
-* Copyright (c) 2007 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: Battery Indicator Pane Plug-in trace definitions.
-*
-*/
-
-
-#ifndef TRACE_H
-#define TRACE_H
-
-#include "traceconfiguration.hrh"
-
-#ifdef TRACE_INTO_FILE
-#include <flogger.h> // RFileLogger
-#else
-#include <e32debug.h> // RDebug
-#endif
-
-//-----------------------------------------------------------------------------
-// Constants
-//-----------------------------------------------------------------------------
-//
-
-/**
-* Prefix trace macro to complete tracing with component name.
-* Returns TDesC which can be used directly with RDebug or RFileLogger.
-*/
-#define _PREFIX_TRACE( aMsg ) TPtrC( (const TText*)L"[BatIndicatorPanePlugin]: " L##aMsg )
-
-/**
-* Prefix error trace
-*/
-#define _PREFIX_ERROR( aMsg ) _PREFIX_TRACE( "[ERROR: %d]: " L##aMsg )
-
-/**
-* Prefix info trace.
-*/
-#define _PREFIX_INFO( aMsg ) _PREFIX_TRACE( "[INFO]: " L##aMsg )
-
-/**
-* Prefix macro for strings
-*/
-#define _PREFIX_CHAR( aMsg ) (const char*)"[BatIndicatorPanePlugin]: " ##aMsg
-
-/**
-* Define needed directories if TRACE_INTO_FILE macro in use
-*/
-#ifdef TRACE_INTO_FILE
-
- _LIT( KDir, "BatIndicatorPanePlugin" );
- _LIT( KFile, "BatIndicatorPanePlugin_log.txt" );
- _LIT( KFullPath, "c:\\logs\\BatIndicatorPanePlugin\\" );
-
-#endif
-
-//-----------------------------------------------------------------------------
-// Error trace macros
-//-----------------------------------------------------------------------------
-//
-#ifdef ERROR_TRACE
-
- /**
- * Error trace definitions.
- */
- #ifdef TRACE_INTO_FILE
-
- #define ERROR( aErr, aMsg )\
- {\
- if( aErr < KErrNone )\
- {\
- RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_ERROR( aMsg ), aErr );\
- }\
- }
- #define ERROR_1( aErr, aMsg, aP1 )\
- {\
- if( aErr < KErrNone )\
- {\
- RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_ERROR( aMsg ), aErr, aP1 );\
- }\
- }
- #define ERROR_2( aErr, aMsg, aP1, aP2 )\
- {\
- if( aErr < KErrNone )\
- {\
- RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_ERROR( aMsg ), aErr, aP1, aP2 );\
- }\
- }
- #define ERROR_3( aErr, aMsg, aP1, aP2, aP3 )\
- {\
- if( aErr < KErrNone )\
- {\
- RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_ERROR( aMsg ), aErr, aP1, aP2, aP3 );\
- }\
- }
-
- #else//TRACE_INTO_FILE not defined
-
- #define ERROR( aErr, aMsg )\
- {\
- if( aErr < KErrNone )\
- {\
- RDebug::Print( _PREFIX_ERROR( aMsg ), aErr );\
- }\
- }
- #define ERROR_1( aErr, aMsg, aP1 )\
- {\
- if( aErr < KErrNone )\
- {\
- RDebug::Print( _PREFIX_ERROR( aMsg ), aErr, aP1 );\
- }\
- }
- #define ERROR_2( aErr, aMsg, aP1, aP2 )\
- {\
- if( aErr < KErrNone )\
- {\
- RDebug::Print( _PREFIX_ERROR( aMsg ), aErr, aP1, aP2 );\
- }\
- }
- #define ERROR_3( aErr, aMsg, aP1, aP2, aP3 )\
- {\
- if( aErr < KErrNone )\
- {\
- RDebug::Print( _PREFIX_ERROR( aMsg ), aErr, aP1, aP2, aP3 );\
- }\
- }
-
- #endif//TRACE_INTO_FILE
-
- #define ERROR_GEN( aMsg ) ERROR( KErrGeneral, aMsg )
- #define ERROR_GEN_1( aMsg, aP1 ) ERROR_1( KErrGeneral, aMsg, aP1 )
- #define ERROR_GEN_2( aMsg, aP1, aP2 ) ERROR_2( KErrGeneral, aMsg, aP1, aP2 )
- #define ERROR_GEN_3( aMsg, aP1, aP2, aP3 ) ERROR_3( KErrGeneral, aMsg, aP1, aP3 )
-
-#else//ERROR_TRACE not defined
-
- #define ERROR( aErr, aMsg )
- #define ERROR_1( aErr, aMsg, aP1 )
- #define ERROR_2( aErr, aMsg, aP1, aP2 )
- #define ERROR_3( aErr, aMsg, aP1, aP2, aP3 )
- #define ERROR_GEN( aMsg )
- #define ERROR_GEN_1( aMsg, aP1 )
- #define ERROR_GEN_2( aMsg, aP1, aP2 )
- #define ERROR_GEN_3( aMsg, aP1, aP2, aP3 )
-
-#endif//ERROR_TRACE
-
-//-----------------------------------------------------------------------------
-// Info trace macros
-//-----------------------------------------------------------------------------
-//
-#ifdef INFO_TRACE
-
- /**
- * Info log message definitions.
- */
- #ifdef TRACE_INTO_FILE
-
- #define INFO( aMsg )\
- {\
- RFileLogger::Write( KDir, KFile, EFileLoggingModeAppend, _PREFIX_INFO( aMsg ) );\
- }
- #define INFO_1( aMsg, aP1 )\
- {\
- RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_INFO( aMsg ), aP1 );\
- }
- #define INFO_2( aMsg, aP1, aP2 )\
- {\
- RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_INFO( aMsg ), aP1, aP2 );\
- }
- #define INFO_3( aMsg, aP1, aP2, aP3 )\
- {\
- RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_INFO( aMsg ), aP1, aP2, aP3 );\
- }
-
- #else//TRACE_INTO_FILE not defined
-
- #define INFO( aMsg )\
- {\
- RDebug::Print( _PREFIX_INFO( aMsg ) );\
- }
- #define INFO_1( aMsg, aP1 )\
- {\
- RDebug::Print( _PREFIX_INFO( aMsg ), aP1 );\
- }
- #define INFO_2( aMsg, aP1, aP2 )\
- {\
- RDebug::Print( _PREFIX_INFO( aMsg ), aP1, aP2 );\
- }
- #define INFO_3( aMsg, aP1, aP2, aP3 )\
- {\
- RDebug::Print( _PREFIX_INFO( aMsg ), aP1, aP2, aP3 );\
- }
-
- #endif//TRACE_INTO_FILE
-
-#else//INFO_TRACE not defined
-
- #define INFO( aMsg )
- #define INFO_1( aMsg, aP1 )
- #define INFO_2( aMsg, aP1, aP2 )
- #define INFO_3( aMsg, aP1, aP2, aP3 )
-
-#endif//INFO_TRACE
-
-//-----------------------------------------------------------------------------
-// Trace current client thread name and process id
-//-----------------------------------------------------------------------------
-//
-#ifdef CLIENT_TRACE
-
- #define CLIENT( aMessage )\
- {\
- RThread thread;\
- TInt err = aMessage.Client( thread );\
- if( err == KErrNone )\
- {\
- RProcess process;\
- err = thread.Process( process );\
- if( err == KErrNone )\
- {\
- TPtrC thredName( thread.Name() );\
- TUid processUid( process.SecureId() );\
- INFO_2( "Current client process UID: [%x], thread name: [%S]",\
- processUid,\
- &thredName );\
- }\
- process.Close();\
- }\
- thread.Close();\
- }
-
-#else
-
- #define CLIENT( aMessage )
-
-#endif
-
-//-----------------------------------------------------------------------------
-// Function trace macros
-//-----------------------------------------------------------------------------
-//
-#ifdef FUNC_TRACE
-
- /**
- * Function logging definitions.
- */
- #ifdef TRACE_INTO_FILE
-
- #define FUNC( aMsg, aP1 )\
- {\
- TPtrC8 trace( _S8( aMsg ) );\
- RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, trace, aP1 );\
- }\
-
- #else//TRACE_INTO_FILE not defined
-
- #define FUNC( aMsg, aP1 )\
- {\
- RDebug::Printf( aMsg, aP1 );\
- }\
-
- #endif//TRACE_INTO_FILE
-
- /**
- * Function trace helper class.
- *
- * NOTE:
- * LC -methods cannot be trapped. Therefore if LC -method leaves
- * END trace is used instead of LEAVE trace.
- * If you have an idea how to round this problem please tell.
- */
- _LIT8( KFuncNameTerminator, "(" );
- _LIT8( KFuncLeavePatternL, "L" );
- class TFuncLog
- {
- public:
- static void Cleanup( TAny* aPtr )
- {
- TFuncLog* self = static_cast< TFuncLog* >( aPtr );
- self->iLeft = ETrue;
- FUNC( _PREFIX_CHAR("%S-LEAVE"), &self->iFunc ); // Leave detected
- }
- inline TFuncLog( const char* aFunc ) :
- iFunc( aFunc ? _S8( aFunc ) : _S8("") ),
- iLeft( EFalse ),
- iCleanupItem( Cleanup, this ),
- iCanLeave( EFalse )
- {
- TInt pos( iFunc.Find( KFuncNameTerminator ) );
- if( pos != KErrNotFound )
- {
- iFunc.Set( iFunc.Left( pos ) );
- iCanLeave = !iFunc.Right( KFuncLeavePatternL().Length() ).Compare( KFuncLeavePatternL );
- if ( iCanLeave )
- {
- CleanupStack::PushL( iCleanupItem ); // Ignore warnings
- }
- }
- FUNC( _PREFIX_CHAR("%S-START"), &iFunc );
- }
-
- inline ~TFuncLog()
- {
- if ( !iLeft )
- {
- if ( iCanLeave )
- {
- CleanupStack::Pop( this ); // Pop the cleanup item
- }
- FUNC( _PREFIX_CHAR("%S-END"), &iFunc ); // Normally finished
- }
- }
-
- private: // Data
- TPtrC8 iFunc;
- TBool iLeft;
- TCleanupItem iCleanupItem;
- TBool iCanLeave;
- };
- #define FUNC_LOG TFuncLog _fl( __PRETTY_FUNCTION__ );
-
-#else//FUNC_TRACE not defined
-
- #define FUNC_LOG
-
-#endif//FUNC_TRACE
-
-//-----------------------------------------------------------------------------
-// Timestamp trace macros
-//-----------------------------------------------------------------------------
-//
-#ifdef TIMESTAMP_TRACE
-
- #ifdef TRACE_INTO_FILE
-
- #define TIMESTAMP( aCaption )\
- {\
- TTime t;\
- t.HomeTime();\
- TDateTime dt = t.DateTime();\
- _LIT( KCaption, aCaption );\
- RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend,\
- _PREFIX_TRACE("[TIMESTAMP] %S %d:%02d:%02d.%d us"),\
- &KCaption, dt.Hour(), dt.Minute(), dt.Second(), dt.MicroSecond() );\
- }
-
- #else//TRACE_INTO_FILE not defined
-
- #define TIMESTAMP( aCaption )\
- {\
- TTime t;\
- t.HomeTime();\
- TDateTime dt = t.DateTime();\
- _LIT( KCaption, aCaption );\
- RDebug::Print( _PREFIX_TRACE("[TIMESTAMP] %S %d:%02d:%02d.%d us"),\
- &KCaption, dt.Hour(), dt.Minute(), dt.Second(), dt.MicroSecond() );\
- }
-
- #endif//TRACE_INTO_FILE
-
-#else//TIMESTAMP_TRACE not defined
-
- #define TIMESTAMP( aCaption )
-
-#endif//TIMESTAMP_TRACE
-
-#endif
--- a/coreapplicationuis/powersaveutilities/batindicatorpaneplugin/inc/traceconfiguration.hrh Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,77 +0,0 @@
-/*
-* Copyright (c) 2007 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: Trace configuration for Battery Indicator Pane Plug-in
-*
-*/
-
-
-#ifndef TRACECONFIGURATION_HRH
-#define TRACECONFIGURATION_HRH
-
-//-----------------------------------------------------------------------------
-// Trace definitions
-//-----------------------------------------------------------------------------
-//
-
-/**
-* Error trace enabled
-*/
-#ifdef _DEBUG
- #define ERROR_TRACE
-#else
- #undef ERROR_TRACE
-#endif
-
-/**
-* Info trace enabled
-*/
-#ifdef _DEBUG
- #define INFO_TRACE
-#else
- #undef INFO_TRACE
-#endif
-
-/**
-* Function trace enabled
-*/
-#ifdef _DEBUG
- #define FUNC_TRACE
-#else
- #undef FUNC_TRACE
-#endif
-
-/**
-* Timestamp tracing on
-*/
-#ifdef _DEBUG
- #define TIMESTAMP_TRACE
-#else
- #undef TIMESTAMP_TRACE
-#endif
-
-/**
-* Tracing current client process and thread
-*/
-#ifdef _DEBUG
- #define CLIENT_TRACE
-#else
- #undef CLIENT_TRACE
-#endif
-
-/**
-* Tracing into file enabled, default RDebug
-*/
-#undef TRACE_INTO_FILE
-
-#endif
\ No newline at end of file
--- a/coreapplicationuis/powersaveutilities/batindicatorpaneplugin/src/batindicatorpanepluginimpl.cpp Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,293 +0,0 @@
-/*
-* Copyright (c) 2007 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: BatIndicatorPanePlugin plugin implementation
-*
-*/
-
-
-// INCLUDE FILES
-#include <e32property.h> // RPropert
-#include <batindpaneplugin.rsg> // BatIndicatorPanePlugin resources
-#include <StringLoader.h> // Stringloader
-#include <psmclient.h>
-#include <psmsettings.h>
-#include <hwrmpowerstatesdkpskeys.h>
-#include <data_caging_path_literals.hrh> // KDC_ECOM_RESOURCE_DIR
-#include <centralrepository.h>
-#include "batindicatorpanepluginimpl.h"
-#include "batindpanepluginprivatecrkeys.h"
-#include "bsutil.h"
-#include "trace.h"
-
-// CONSTANTS
-_LIT( KIndicatorResourceFile,"z:batindpaneplugin.rsc" );
-
-
-// ======== MEMBER FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-// Two-phased constructor.
-// ---------------------------------------------------------------------------
-//
-CBatIndicatorPanePluginImpl* CBatIndicatorPanePluginImpl::NewL( )
- {
- FUNC_LOG
-
- CBatIndicatorPanePluginImpl* self = new( ELeave ) CBatIndicatorPanePluginImpl( );
- CleanupStack::PushL( self );
- self->ConstructL();
- CleanupStack::Pop( self );
- return self;
- }
-
-// ---------------------------------------------------------------------------
-// Destructor
-// ---------------------------------------------------------------------------
-//
-CBatIndicatorPanePluginImpl::~CBatIndicatorPanePluginImpl()
- {
- FUNC_LOG
-
- delete iContentText;
- delete iPsmClient;
- delete iBatteryStateUtil;
- delete iPopupControl;
- delete iLinkText;
- iResourceLoader.Close();
- }
-
-// ---------------------------------------------------------------------------
-// From MEikCommandObserver
-// ---------------------------------------------------------------------------
-//
-void CBatIndicatorPanePluginImpl::ProcessCommandL( TInt aCommandId )
- {
- FUNC_LOG
-
- if( aCommandId == ELinkFirst )
- {
- SetPowerSaveModeEnabled();
- }
- }
-
-// ---------------------------------------------------------------------------
-// CBatIndicatorPanePluginImpl::CBatIndicatorPanePluginImpl
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// ---------------------------------------------------------------------------
-//
-CBatIndicatorPanePluginImpl::CBatIndicatorPanePluginImpl( ):
- iResourceLoader( *CEikonEnv::Static() ),
- iBatIndPanePluginFeatures( 0 )
- {
- FUNC_LOG
- }
-
-// ---------------------------------------------------------------------------
-// CBatIndicatorPanePluginImpl::ConstructL
-// Symbian 2nd phase constructor can leave.
-// ---------------------------------------------------------------------------
-//
-void CBatIndicatorPanePluginImpl::ConstructL( )
- {
- FUNC_LOG
- // Create PSM client
- iPsmClient = CPsmClient::NewL( *this );
-
- GetFeatures();
-
- // Create Battery State Utilities
- if( !Supported( KBatIndPanePluginLinkOnly ) )
- {
- iBatteryStateUtil = CBSUtil::NewL();
- }
-
- // Read resource strings
- TParse* fp = new( ELeave ) TParse();
- CleanupStack::PushL( fp );
- fp->Set( KIndicatorResourceFile, &KDC_ECOM_RESOURCE_DIR , NULL );
- TFileName filename = fp->FullName();
- iResourceLoader.OpenL( filename );
- CleanupStack::PopAndDestroy( fp );
- }
-
-// ---------------------------------------------------------------------------
-// Shows soft notification.
-// ---------------------------------------------------------------------------
-//
-void CBatIndicatorPanePluginImpl::ShowPreviewPopupL( )
- {
- FUNC_LOG
-
- delete iPopupControl;
- iPopupControl = NULL;
-
- if( iContentText )
- {
- iPopupControl = CBatteryPopupControl::NewL( *iContentText,
- *iLinkText );
- }
- else
- {
- iPopupControl = CBatteryPopupControl::NewL( KNullDesC,
- *iLinkText );
- }
-
- iPopupControl->SetCommandObserver( *this );
- // Launch
- iPopupControl->ShowPopUpL();
-
- delete iContentText;
- iContentText = NULL;
-
- delete iLinkText;
- iLinkText = NULL;
- }
-
-// ---------------------------------------------------------------------------
-// Enables or disables power save mode.
-// ---------------------------------------------------------------------------
-//
-void CBatIndicatorPanePluginImpl::SetPowerSaveModeEnabled( )
- {
- FUNC_LOG
- // Get PSM state
- TInt mode;
- TInt err = iPsmClient->PsmSettings().GetCurrentMode( mode );
-
- if ( err == KErrNone )
- {
- if( mode == EPsmsrvModeNormal ||
- mode == EPsmsrvPartialMode )
- {
- iPsmClient->ChangePowerSaveMode( EPsmsrvModePowerSave );
- }
- else
- {
- iPsmClient->ChangePowerSaveMode( EPsmsrvModeNormal );
- }
- }
- }
-
-// ---------------------------------------------------------------------------
-// From CAknIndicatorPlugin
-// ---------------------------------------------------------------------------
-//
-void CBatIndicatorPanePluginImpl::HandleIndicatorTapL( const TInt /*aUid*/ )
- {
- FUNC_LOG
-
- delete iContentText;
- iContentText = NULL;
-
- delete iLinkText;
- iLinkText = NULL;
-
- TInt err = KErrNone;
-
- if ( iBatteryStateUtil )
- {
- TInt batteryStatus;
- err = RProperty::Get( KPSUidHWRMPowerState, KHWRMBatteryStatus, batteryStatus );
-
- if( !err && batteryStatus == EBatteryStatusLow )
- {
- iContentText = StringLoader::LoadL( R_QTN_BATTERY_LOW_PREVIEW_POPUP );
- }
- else
- {
- TUint8 batteryCapacity = iBatteryStateUtil->GetBatteryCapacity();
-
- iContentText = StringLoader::LoadL( R_QTN_BATTERY_STATUS_POPUP,
- batteryCapacity );
- }
- }
-
- // Get PSM state
- TInt mode;
- TBool psmActive = EFalse;
- err = iPsmClient->PsmSettings().GetCurrentMode( mode );
-
- if ( err == KErrNone )
- {
- psmActive = ( mode == EPsmsrvModePowerSave );
- }
-
- if ( psmActive )
- {
- iLinkText = StringLoader::LoadL( R_QTN_DEACTIVATE_POWER_SAVING );
- }
- else
- {
- iLinkText = StringLoader::LoadL( R_QTN_ACTIVATE_POWER_SAVING );
- }
- ShowPreviewPopupL();
- }
-
-// ----------------------------------------------------------------------------
-// CBatIndicatorPanePluginImpl::GetFeatures()
-// ----------------------------------------------------------------------------
-//
-void CBatIndicatorPanePluginImpl::GetFeatures( )
- {
- FUNC_LOG
-
- CRepository* repository = NULL;
-
- TRAPD( err, repository = CRepository::NewL( KCRUidBatIndPanePluginConf ) );
-
- if ( err == KErrNone )
- {
- err = repository->Get( KBatIndPanePlugin, iBatIndPanePluginFeatures );
-
- if ( err != KErrNone || iBatIndPanePluginFeatures < 0 ) // ERROR
- {
- INFO_1( "CBatIndicatorPanePluginImpl::GetFeatures - Reading features err %d", err )
- iBatIndPanePluginFeatures = 0;
- }
- }
- else
- {
- INFO_1( "CBatIndicatorPanePluginImpl::GetFeatures: open KCRUidBatIndPanePluginConf failed, err=%d", err )
- }
- delete repository;
- }
-
-// ----------------------------------------------------------------------------
-// CBatIndicatorPanePluginImpl::Supported()
-// ----------------------------------------------------------------------------
-//
-TInt CBatIndicatorPanePluginImpl::Supported( TInt aFeatureId )
- {
- FUNC_LOG
- return aFeatureId & iBatIndPanePluginFeatures;
- }
-// ---------------------------------------------------------------------------
-// From MPsmClientObserver
-// ---------------------------------------------------------------------------
-//
-void CBatIndicatorPanePluginImpl::PowerSaveModeChanged( const TPsmsrvMode /*aMode*/ )
- {
- FUNC_LOG
- }
-
-// ---------------------------------------------------------------------------
-// From MPsmClientObserver
-// ---------------------------------------------------------------------------
-//
-void CBatIndicatorPanePluginImpl::PowerSaveModeChangeError( const TInt /*aError*/ )
- {
- FUNC_LOG
- }
-// End of File
--- a/coreapplicationuis/powersaveutilities/batindicatorpaneplugin/src/dllmain.cpp Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-/*
-* Copyright (c) 2007 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: Implementation for DllMain.
-*
-*/
-
-
-#include "batindicatorpanepluginimpl.h"
-
-#include <ecom/implementationproxy.h>
-#include <AknIndicatorPluginImplUIDs.hrh>
-
-// ---------------------------------------------------------------------------
-// Define the interface UIDs
-// Map the interface implementation UIDs to implementation factory functions
-// ---------------------------------------------------------------------------
-//
-const TImplementationProxy ImplementationTable[] =
- {
-#ifdef KImplUIDBatteryIndicatorPlugin
- IMPLEMENTATION_PROXY_ENTRY( KImplUIDBatteryIndicatorPlugin,
- CBatIndicatorPanePluginImpl::NewL )
-#else
- IMPLEMENTATION_PROXY_ENTRY( 0x2000E51D,
- CBatIndicatorPanePluginImpl::NewL )
-#endif //KImplUIDBatteryIndicatorPlugin
- };
-
-// ---------------------------------------------------------------------------
-// Exported proxy for instantiation method resolution.
-// ---------------------------------------------------------------------------
-//
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy
- (TInt& aTableCount)
- {
- aTableCount = sizeof(ImplementationTable) / sizeof(ImplementationTable[0]);
- return ImplementationTable;
- }
-
-// End of file
--- a/coreapplicationuis/powersaveutilities/batterypopupcontrol/inc/batterypopupcontrol.h Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,302 +0,0 @@
-/*
-* Copyright (c) 2007-10 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: Content for preview pop-up.
-*
-*/
-
-
-#ifndef CBATTERYPOPUPCONTROL_H
-#define CBATTERYPOPUPCONTROL_H
-
-#include <AknControl.h>
-#include <AknUtils.h>
-#include <AknPreviewPopUpController.h> // Controlling the preview pop-up component
-
-class MEikCommandObserver;
-class CEikLabel;
-class CGulIcon;
-
-
-/**
-* Class defining stylus activated pop-up content.
-*
-* This content is intended to be used in connection with preview pop-up
-* component. Content shows an icon, text and
-* an optional stylus tappable function link. If using link, the user gives link text and
-* corresponding ID for link in construction. The user must also set
-* itself as an observer for this content when using function links. This
-* way the user gets callbacks (with ID) for its ProcessCommandL() function
-* when the link is tapped.
-*
-* @lib BatteryPopupControl.lib
-* @since S60 5.0
-*/
-NONSHARABLE_CLASS( CBatteryPopupControl ) :
- public CAknControl,
- public MCoeControlObserver,
- public MAknPreviewPopUpObserver
- {
-public:
-
- /** Preview popup command ids */
- enum TLinkCommandID
- {
- ELinkNone = 0,
- ELinkFirst = 1
- };
-
- /**
- * Two-phased constructor. Constructs the content
- * with text and function link.
- *
- * @since S60 5.0
- * @param aContentText Text for the popup. Mandatory.
- * @param aLinkText Link text.
- * @return Pointer to the created content object.
- */
-
- IMPORT_C static CBatteryPopupControl* NewL( const TDesC& aContentText,
- const TDesC& aLinkText );
-
- /**
- * Destructor.
- */
- ~CBatteryPopupControl();
-
- /**
- * Sets the command observer of the preview pop-up content. When
- * link that is set to the content is pressed, the command
- * observer's ProcessCommandL() method is called with the command ID
- * of the pressed component.
- *
- * @since S60 5.0
- * @param aCommandObserver Command observer.
- */
- IMPORT_C void SetCommandObserver( MEikCommandObserver& aCommandObserver );
-
- /**
- * Shows preview popup
- *
- * @since S60 5.0
- */
- IMPORT_C void ShowPopUpL();
-
-private:
-// from base class CCoeControl
-
- /**
- * Handles a change to the control's resources of type aType which are
- * shared across the environment.
- *
- * @param aType The type of resource that have changed.
- */
- void HandleResourceChange( TInt aType );
-
- /**
- * Sets container window.
- *
- * @param aContainer Container.
- */
- void SetContainerWindowL( const CCoeControl& aContainer );
-
- /**
- * Handles pointer events
- *
- * @param aPointerEvent information about the pointer event.
- */
- void HandlePointerEventL( const TPointerEvent& aPointerEvent );
-
-
-// from base class MCoeControlObserver
-
- /**
- * Handles an event from an observed control.
- *
- * @param aControl The control that sent the event.
- * @param aEventType The event type.
- */
- void HandleControlEventL( CCoeControl *aControl,
- TCoeEvent aEventType );
-
-// From MAknPreviewPopUpObserver
-
- /**
- * @see MAknPreviewPopUpObserver
- */
- void HandlePreviewPopUpEventL( CAknPreviewPopUpController* aController,
- TPreviewPopUpEvent aEvent );
-
- /**
- * Default constructor.
- */
- CBatteryPopupControl();
-
- /**
- * Symbian 2nd phase constructor.
- *
- * @since S60 5.0
- * @param aContentText Text for the popup.
- * @param aLinkText Link text.
- */
- void ConstructL( const TDesC& aContentText,
- const TDesC& aLinkText );
-
- /**
- * Gets rect from layout data.
- *
- * @since S60 5.0
- * @param aParent Parent rect.
- * @param aComponentLayout Layout data.
- */
- TRect RectFromLayout( const TRect& aParent,
- const TAknWindowComponentLayout& aComponentLayout ) const;
-
- /**
- * Gets rect from layout data.
- *
- * @since S60 5.0
- * @param aComponentLayout Layout data.
- */
- TRect PopUpWindowRectFromLayout( const TAknWindowComponentLayout&
- aComponentLayout ) const;
-
- /**
- * Creates CGulIcon.
- *
- * @since S60 5.0
- */
- void CreateIconL( );
-
-// from base class CCoeControl
-
- /**
- * Returns a control determined by control index.
- *
- * @param aIndex Index of a control to be returned.
- * @return Pointer to control.
- */
- CCoeControl* ComponentControl( TInt aIndex ) const;
-
- /**
- * Returns the number of controls inside the control.
- *
- * @return The number of component controls.
- */
- TInt CountComponentControls() const;
-
- /**
- * Draws the control.
- *
- * @param aRect The control's area.
- */
- void Draw( const TRect& aRect ) const;
-
- /**
- * Returns the control's minimum required size.
- *
- * @return The minimum size required by the control.
- */
- TSize MinimumSize();
-
- /**
- * Responds to size changes to set the size and position for
- * the contents of this control.
- */
- void SizeChanged();
-
-private: // data
- /** Variant ids */
- enum TVariantID
- {
- EVariantIconText = 0,
- EVariantIconTextLink = 1
- };
-
- /**
- * Label for informative text.
- * Own.
- */
- CEikLabel* iText;
-
- /**
- * Link text.
- * Own.
- */
- HBufC* iLinkText;
-
- /**
- * Command observer.
- * Not own.
- */
- MEikCommandObserver* iCommandObserver;
-
- /**
- * Font
- * Not own
- */
- const CFont* iFont;
-
- /**
- * Status of highlighted item.
- */
- TBool iHighlightedItem;
-
- /**
- * Id for icon bitmap
- */
- TInt iIconId;
-
- /**
- * Id for icon mask
- */
- TInt iMaskId;
-
- /**
- * Icon.
- * Own.
- */
- CGulIcon* iIcon;
-
- /**
- * Layout for icon
- */
- TAknLayoutRect iBitmapLayout;
-
- /**
- * Variant,
- * 0 = icon and text
- * 1 = icon, text and function link
- */
- TInt iVariant;
-
- /**
- * Popup controller
- * Own.
- */
- CAknPreviewPopUpController* iController;
-
- /**
- * Rect for link
- */
- TRect iLinkRect;
-
- /**
- * Alignment of the Layout either ERight or ELeft
- */
- CGraphicsContext::TTextAlign iAlign;
- };
-
-
-#endif // CBATTERYPOPUPCONTROL_H
-
--- a/coreapplicationuis/powersaveutilities/batterypopupcontrol/inc/trace.h Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,379 +0,0 @@
-/*
-* Copyright (c) 2007 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: Battery Popup Control trace definitions.
-*
-*/
-
-
-#ifndef TRACE_H
-#define TRACE_H
-
-#include "traceconfiguration.hrh"
-
-#ifdef TRACE_INTO_FILE
-#include <flogger.h> // RFileLogger
-#else
-#include <e32debug.h> // RDebug
-#endif
-
-//-----------------------------------------------------------------------------
-// Constants
-//-----------------------------------------------------------------------------
-//
-
-/**
-* Prefix trace macro to complete tracing with component name.
-* Returns TDesC which can be used directly with RDebug or RFileLogger.
-*/
-#define _PREFIX_TRACE( aMsg ) TPtrC( (const TText*)L"[BatteryPopupControl]: " L##aMsg )
-
-/**
-* Prefix error trace
-*/
-#define _PREFIX_ERROR( aMsg ) _PREFIX_TRACE( "[ERROR: %d]: " L##aMsg )
-
-/**
-* Prefix info trace.
-*/
-#define _PREFIX_INFO( aMsg ) _PREFIX_TRACE( "[INFO]: " L##aMsg )
-
-/**
-* Prefix macro for strings
-*/
-#define _PREFIX_CHAR( aMsg ) (const char*)"[BatteryPopupControl]: " aMsg
-
-
-/**
-* Define needed directories if TRACE_INTO_FILE macro in use
-*/
-#ifdef TRACE_INTO_FILE
-
- _LIT( KDir, "BatteryPopupControl" );
- _LIT( KFile, "BatteryPopupControl_log.txt" );
- _LIT( KFullPath, "c:\\logs\\BatteryPopupControl\\" );
-
-#endif
-
-//-----------------------------------------------------------------------------
-// Error trace macros
-//-----------------------------------------------------------------------------
-//
-#ifdef ERROR_TRACE
-
- /**
- * Error trace definitions.
- */
- #ifdef TRACE_INTO_FILE
-
- #define ERROR( aErr, aMsg )\
- {\
- if( aErr < KErrNone )\
- {\
- RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_ERROR( aMsg ), aErr );\
- }\
- }
- #define ERROR_1( aErr, aMsg, aP1 )\
- {\
- if( aErr < KErrNone )\
- {\
- RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_ERROR( aMsg ), aErr, aP1 );\
- }\
- }
- #define ERROR_2( aErr, aMsg, aP1, aP2 )\
- {\
- if( aErr < KErrNone )\
- {\
- RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_ERROR( aMsg ), aErr, aP1, aP2 );\
- }\
- }
- #define ERROR_3( aErr, aMsg, aP1, aP2, aP3 )\
- {\
- if( aErr < KErrNone )\
- {\
- RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_ERROR( aMsg ), aErr, aP1, aP2, aP3 );\
- }\
- }
-
- #else//TRACE_INTO_FILE not defined
-
- #define ERROR( aErr, aMsg )\
- {\
- if( aErr < KErrNone )\
- {\
- RDebug::Print( _PREFIX_ERROR( aMsg ), aErr );\
- }\
- }
- #define ERROR_1( aErr, aMsg, aP1 )\
- {\
- if( aErr < KErrNone )\
- {\
- RDebug::Print( _PREFIX_ERROR( aMsg ), aErr, aP1 );\
- }\
- }
- #define ERROR_2( aErr, aMsg, aP1, aP2 )\
- {\
- if( aErr < KErrNone )\
- {\
- RDebug::Print( _PREFIX_ERROR( aMsg ), aErr, aP1, aP2 );\
- }\
- }
- #define ERROR_3( aErr, aMsg, aP1, aP2, aP3 )\
- {\
- if( aErr < KErrNone )\
- {\
- RDebug::Print( _PREFIX_ERROR( aMsg ), aErr, aP1, aP2, aP3 );\
- }\
- }
-
- #endif//TRACE_INTO_FILE
-
- #define ERROR_GEN( aMsg ) ERROR( KErrGeneral, aMsg )
- #define ERROR_GEN_1( aMsg, aP1 ) ERROR_1( KErrGeneral, aMsg, aP1 )
- #define ERROR_GEN_2( aMsg, aP1, aP2 ) ERROR_2( KErrGeneral, aMsg, aP1, aP2 )
- #define ERROR_GEN_3( aMsg, aP1, aP2, aP3 ) ERROR_3( KErrGeneral, aMsg, aP1, aP3 )
-
-#else//ERROR_TRACE not defined
-
- #define ERROR( aErr, aMsg )
- #define ERROR_1( aErr, aMsg, aP1 )
- #define ERROR_2( aErr, aMsg, aP1, aP2 )
- #define ERROR_3( aErr, aMsg, aP1, aP2, aP3 )
- #define ERROR_GEN( aMsg )
- #define ERROR_GEN_1( aMsg, aP1 )
- #define ERROR_GEN_2( aMsg, aP1, aP2 )
- #define ERROR_GEN_3( aMsg, aP1, aP2, aP3 )
-
-#endif//ERROR_TRACE
-
-//-----------------------------------------------------------------------------
-// Info trace macros
-//-----------------------------------------------------------------------------
-//
-#ifdef INFO_TRACE
-
- /**
- * Info log message definitions.
- */
- #ifdef TRACE_INTO_FILE
-
- #define INFO( aMsg )\
- {\
- RFileLogger::Write( KDir, KFile, EFileLoggingModeAppend, _PREFIX_INFO( aMsg ) );\
- }
- #define INFO_1( aMsg, aP1 )\
- {\
- RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_INFO( aMsg ), aP1 );\
- }
- #define INFO_2( aMsg, aP1, aP2 )\
- {\
- RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_INFO( aMsg ), aP1, aP2 );\
- }
- #define INFO_3( aMsg, aP1, aP2, aP3 )\
- {\
- RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_INFO( aMsg ), aP1, aP2, aP3 );\
- }
-
- #else//TRACE_INTO_FILE not defined
-
- #define INFO( aMsg )\
- {\
- RDebug::Print( _PREFIX_INFO( aMsg ) );\
- }
- #define INFO_1( aMsg, aP1 )\
- {\
- RDebug::Print( _PREFIX_INFO( aMsg ), aP1 );\
- }
- #define INFO_2( aMsg, aP1, aP2 )\
- {\
- RDebug::Print( _PREFIX_INFO( aMsg ), aP1, aP2 );\
- }
- #define INFO_3( aMsg, aP1, aP2, aP3 )\
- {\
- RDebug::Print( _PREFIX_INFO( aMsg ), aP1, aP2, aP3 );\
- }
-
- #endif//TRACE_INTO_FILE
-
-#else//INFO_TRACE not defined
-
- #define INFO( aMsg )
- #define INFO_1( aMsg, aP1 )
- #define INFO_2( aMsg, aP1, aP2 )
- #define INFO_3( aMsg, aP1, aP2, aP3 )
-
-#endif//INFO_TRACE
-
-//-----------------------------------------------------------------------------
-// Trace current client thread name and process id
-//-----------------------------------------------------------------------------
-//
-#ifdef CLIENT_TRACE
-
- #define CLIENT( aMessage )\
- {\
- RThread thread;\
- TInt err = aMessage.Client( thread );\
- if( err == KErrNone )\
- {\
- RProcess process;\
- err = thread.Process( process );\
- if( err == KErrNone )\
- {\
- TPtrC thredName( thread.Name() );\
- TUid processUid( process.SecureId() );\
- INFO_2( "Current client process UID: [%x], thread name: [%S]",\
- processUid,\
- &thredName );\
- }\
- process.Close();\
- }\
- thread.Close();\
- }
-
-#else
-
- #define CLIENT( aMessage )
-
-#endif
-
-//-----------------------------------------------------------------------------
-// Function trace macros
-//-----------------------------------------------------------------------------
-//
-#ifdef FUNC_TRACE
-
- /**
- * Function logging definitions.
- */
- #ifdef TRACE_INTO_FILE
-
- #define FUNC( aMsg, aP1 )\
- {\
- TPtrC8 trace( _S8( aMsg ) );\
- RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, trace, aP1 );\
- }\
-
- #else//TRACE_INTO_FILE not defined
-
- #define FUNC( aMsg, aP1 )\
- {\
- RDebug::Printf( aMsg, aP1 );\
- }\
-
- #endif//TRACE_INTO_FILE
-
- /**
- * Function trace helper class.
- *
- * NOTE:
- * LC -methods cannot be trapped. Therefore if LC -method leaves
- * END trace is used instead of LEAVE trace.
- * If you have an idea how to round this problem please tell.
- */
- _LIT8( KFuncNameTerminator, "(" );
- _LIT8( KFuncLeavePatternL, "L" );
- class TFuncLog
- {
- public:
- static void Cleanup( TAny* aPtr )
- {
- TFuncLog* self = static_cast< TFuncLog* >( aPtr );
- self->iLeft = ETrue;
- FUNC( _PREFIX_CHAR("%S-LEAVE"), &self->iFunc ); // Leave detected
- }
- inline TFuncLog( const char* aFunc ) :
- iFunc( aFunc ? _S8( aFunc ) : _S8("") ),
- iLeft( EFalse ),
- iCleanupItem( Cleanup, this ),
- iCanLeave( EFalse )
- {
- TInt pos( iFunc.Find( KFuncNameTerminator ) );
- if( pos != KErrNotFound )
- {
- iFunc.Set( iFunc.Left( pos ) );
- iCanLeave = !iFunc.Right( KFuncLeavePatternL().Length() ).Compare( KFuncLeavePatternL );
- if ( iCanLeave )
- {
- CleanupStack::PushL( iCleanupItem ); // Ignore warnings
- }
- }
- FUNC( _PREFIX_CHAR("%S-START"), &iFunc );
- }
-
- inline ~TFuncLog()
- {
- if ( !iLeft )
- {
- if ( iCanLeave )
- {
- CleanupStack::Pop( this ); // Pop the cleanup item
- }
- FUNC( _PREFIX_CHAR("%S-END"), &iFunc ); // Normally finished
- }
- }
-
- private: // Data
- TPtrC8 iFunc;
- TBool iLeft;
- TCleanupItem iCleanupItem;
- TBool iCanLeave;
- };
- #define FUNC_LOG TFuncLog _fl( __PRETTY_FUNCTION__ );
-
-#else//FUNC_TRACE not defined
-
- #define FUNC_LOG
-
-#endif//FUNC_TRACE
-
-//-----------------------------------------------------------------------------
-// Timestamp trace macros
-//-----------------------------------------------------------------------------
-//
-#ifdef TIMESTAMP_TRACE
-
- #ifdef TRACE_INTO_FILE
-
- #define TIMESTAMP( aCaption )\
- {\
- TTime t;\
- t.HomeTime();\
- TDateTime dt = t.DateTime();\
- _LIT( KCaption, aCaption );\
- RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend,\
- _PREFIX_TRACE("[TIMESTAMP] %S %d:%02d:%02d.%d us"),\
- &KCaption, dt.Hour(), dt.Minute(), dt.Second(), dt.MicroSecond() );\
- }
-
- #else//TRACE_INTO_FILE not defined
-
- #define TIMESTAMP( aCaption )\
- {\
- TTime t;\
- t.HomeTime();\
- TDateTime dt = t.DateTime();\
- _LIT( KCaption, aCaption );\
- RDebug::Print( _PREFIX_TRACE("[TIMESTAMP] %S %d:%02d:%02d.%d us"),\
- &KCaption, dt.Hour(), dt.Minute(), dt.Second(), dt.MicroSecond() );\
- }
-
- #endif//TRACE_INTO_FILE
-
-#else//TIMESTAMP_TRACE not defined
-
- #define TIMESTAMP( aCaption )
-
-#endif//TIMESTAMP_TRACE
-
-#endif
--- a/coreapplicationuis/powersaveutilities/batterypopupcontrol/inc/traceconfiguration.hrh Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,77 +0,0 @@
-/*
-* Copyright (c) 2007 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: Trace configuration for Battery Popup Control
-*
-*/
-
-
-#ifndef TRACECONFIGURATION_HRH
-#define TRACECONFIGURATION_HRH
-
-//-----------------------------------------------------------------------------
-// Trace definitions
-//-----------------------------------------------------------------------------
-//
-
-/**
-* Error trace enabled
-*/
-#ifdef _DEBUG
- #define ERROR_TRACE
-#else
- #undef ERROR_TRACE
-#endif
-
-/**
-* Info trace enabled
-*/
-#ifdef _DEBUG
- #define INFO_TRACE
-#else
- #undef INFO_TRACE
-#endif
-
-/**
-* Function trace enabled
-*/
-#ifdef _DEBUG
- #define FUNC_TRACE
-#else
- #undef FUNC_TRACE
-#endif
-
-/**
-* Timestamp tracing on
-*/
-#ifdef _DEBUG
- #define TIMESTAMP_TRACE
-#else
- #undef TIMESTAMP_TRACE
-#endif
-
-/**
-* Tracing current client process and thread
-*/
-#ifdef _DEBUG
- #define CLIENT_TRACE
-#else
- #undef CLIENT_TRACE
-#endif
-
-/**
-* Tracing into file enabled, default RDebug
-*/
-#undef TRACE_INTO_FILE
-
-#endif
\ No newline at end of file
--- a/coreapplicationuis/powersaveutilities/batterypopupcontrol/src/batterypopupcontrol.cpp Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,628 +0,0 @@
-/*
-* Copyright (c) 2007-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: BatteryPopupControl implementation
-*
-*/
-
-
-#include <AknUtils.h>
-#include <AknPanic.h>
-#include <AknPreviewPopUpController.h>
-#include <aknglobalpopupprioritycontroller.h>
-#include <barsread.h> // TResourceReader
-#include <eiklabel.h>
-#include <fbs.h>
-#include <aknappui.h>
-#include <aknlayoutscalable_avkon.cdl.h>
-#include <AknsDrawUtils.h>
-#include <AknBidiTextUtils.h>
-#include <data_caging_path_literals.hrh> // KDC_RESOURCE_FILES_DIR
-#include <batterypopupcontrol.mbg>
-// ----------- Touch feedback additions start
-#ifdef RD_TACTILE_FEEDBACK
-#include <touchfeedback.h>
-#endif //RD_TACTILE_FEEDBACK
-// ----------- Touch feedback additions end
-#include <gulicon.h>
-#include "batterypopupcontrol.h"
-#include "trace.h"
-
-// Constants
-const TInt KPopupShowDelay = 0; // Show immediately
-const TInt KPopupHideDelay = 3000000; // hide after 3 sec
-const TInt KMaxLinkTextLength = 255;
-
-// ======== MEMBER FUNCTIONS ========
-
-// -----------------------------------------------------------------------------
-// Default constructor.
-// -----------------------------------------------------------------------------
-//
-CBatteryPopupControl::CBatteryPopupControl():
- iHighlightedItem( EFalse )
- {
- FUNC_LOG
- }
-
-// -----------------------------------------------------------------------------
-// CBatteryPopupControl::NewL
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CBatteryPopupControl* CBatteryPopupControl::NewL(
- const TDesC& aContentText,
- const TDesC& aLinkText )
- {
- FUNC_LOG
- CBatteryPopupControl* self =
- new ( ELeave ) CBatteryPopupControl();
-
- CleanupStack::PushL( self );
- self->ConstructL( aContentText, aLinkText );
- CleanupStack::Pop( self );
- return self;
- }
-
-// -----------------------------------------------------------------------------
-// Destructor
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CBatteryPopupControl::~CBatteryPopupControl()
- {
- FUNC_LOG
- delete iController;
- delete iText;
- delete iIcon;
- delete iLinkText;
- }
-
-// -----------------------------------------------------------------------------
-// CBatteryPopupControl::SetCommandObserver
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void CBatteryPopupControl::SetCommandObserver(
- MEikCommandObserver& aCommandObserver )
- {
- FUNC_LOG
- iCommandObserver = &aCommandObserver;
- }
-
-// -----------------------------------------------------------------------------
-// CBatteryPopupControl::ShowPopUpL
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void CBatteryPopupControl::ShowPopUpL()
- {
- FUNC_LOG
-
- iController = CAknPreviewPopUpController::NewL( *this, CAknPreviewPopUpController::ELayoutDefault | CAknPreviewPopUpController::EDontClose );
- iController->AddObserverL( *this );
-
- // Set popup's hide/show delays
- iController->SetPopUpShowDelay( KPopupShowDelay );
- iController->SetPopUpHideDelay( KPopupHideDelay );
-
- // Position
- TPoint uipRect;
- if( AknLayoutUtils::LayoutMetricsPosition(
- AknLayoutUtils::EBatteryPane, uipRect ) )
- {
- iController->SetPosition( uipRect );
- }
-
- // Launch
- iController->ShowPopUp();
- }
-
-// -----------------------------------------------------------------------------
-// From class CCoeControl.
-// CBatteryPopupControl::HandleResourceChange
-// -----------------------------------------------------------------------------
-//
-void CBatteryPopupControl::HandleResourceChange(
- TInt aType )
- {
- FUNC_LOG
-
- CCoeControl::HandleResourceChange( aType );
- if ( aType == KEikDynamicLayoutVariantSwitch )
- {
- SizeChanged();
- }
-
- // Position
- TPoint uipRect;
- if( AknLayoutUtils::LayoutMetricsPosition( AknLayoutUtils::EBatteryPane, uipRect ) )
- {
- iController->SetPosition( uipRect );
- }
- }
-
-
-// -----------------------------------------------------------------------------
-// From class CCoeControl.
-// CBatteryPopupControl::SetContainerWindowL
-// -----------------------------------------------------------------------------
-//
-void CBatteryPopupControl::SetContainerWindowL(
- const CCoeControl& aContainer )
- {
- FUNC_LOG
-
- CCoeControl::SetContainerWindowL( aContainer );
-
- if( iText )
- {
- iText->SetContainerWindowL( aContainer );
- }
- }
-
-// -----------------------------------------------------------------------------
-// From class MCoeControlObserver.
-// CBatteryPopupControl::HandleControlEventL
-// -----------------------------------------------------------------------------
-//
-void CBatteryPopupControl::HandleControlEventL(
- CCoeControl* /*aControl*/,
- TCoeEvent /*aEventType*/ )
- {
- FUNC_LOG
- }
-// ---------------------------------------------------------------------------
-// From MAknPreviewPopUpObserver
-// ---------------------------------------------------------------------------
-//
-void CBatteryPopupControl::HandlePreviewPopUpEventL(
- CAknPreviewPopUpController* /*aController*/,
- TPreviewPopUpEvent aEvent )
- {
- FUNC_LOG
-
- switch ( aEvent )
- {
- case EPreviewPopUpShown:
- AknGlobalPopupPriorityController::ShowPopup( *this, ETrue );
- break;
- case EPreviewPopUpHidden:
- AknGlobalPopupPriorityController::RemovePopupPriority( *this );
- break;
- }
- }
-
-// -----------------------------------------------------------------------------
-// CAknStylusActivatedPopUpContent::ConstructL
-// -----------------------------------------------------------------------------
-//
-void CBatteryPopupControl::ConstructL( const TDesC& aContentText,
- const TDesC& aLinkText )
- {
- FUNC_LOG
-
- if( aContentText != KNullDesC )
- {
- iText = new ( ELeave ) CEikLabel;
- iText->SetTextL( aContentText );
- CreateIconL();
- }
-
- if( aLinkText != KNullDesC )
- {
- // Check if only link is displayed.
- if( aContentText != KNullDesC )
- {
- iVariant = EVariantIconTextLink;
- }
- iLinkText = aLinkText.AllocL();
- }
-
- TRect rectPopUpWindow = PopUpWindowRectFromLayout(
- AknLayoutScalable_Avkon::popup_battery_window( iVariant ) );
-
- TAknWindowComponentLayout infoPaneLayout =
- AknLayoutScalable_Avkon::bg_popup_sub_pane_cp25( iVariant );
-
- TRect rectInfoPane = RectFromLayout( rectPopUpWindow, infoPaneLayout );
-
- TAknTextComponentLayout textLayout =
- AknLayoutScalable_Avkon::popup_battery_window_t1( iVariant );
- TAknLayoutText textRect;
- textRect.LayoutText( rectPopUpWindow, textLayout );
-
- // Font for command links
- iFont = textRect.Font();
- }
-
-// -----------------------------------------------------------------------------
-// From class CCoeControl.
-// CBatteryPopupControl::ComponentControl
-// -----------------------------------------------------------------------------
-//
-CCoeControl* CBatteryPopupControl::ComponentControl(
- TInt aIndex ) const
- {
- FUNC_LOG
- switch ( aIndex )
- {
- case 0:
- {
- if( iText )
- {
- return iText;
- }
- }
- default:
- __ASSERT_ALWAYS( aIndex >= 0, User::Panic(
- _L("CBatteryPopupControl::ComponentControl"), EAknPanicOutOfRange ) );
- return NULL;
- }
- }
-
-
-// -----------------------------------------------------------------------------
-// From class CCoeControl.
-// CBatteryPopupControl::CountComponentControls
-// -----------------------------------------------------------------------------
-//
-TInt CBatteryPopupControl::CountComponentControls() const
- {
- FUNC_LOG
- TInt count = 0;
-
- if( iText )
- {
- count++;
- }
-
- return count;
- }
-
-
-// -----------------------------------------------------------------------------
-// From class CCoeControl.
-// CBatteryPopupControl::Draw
-// -----------------------------------------------------------------------------
-//
-void CBatteryPopupControl::Draw( const TRect& /*aRect*/ ) const
- {
- FUNC_LOG
-
- CWindowGc& gc = SystemGc();
- MAknsSkinInstance* skin = AknsUtils::SkinInstance();
-
- if( iIcon )
- {
- TRgb color( KRgbWhite ); // Default never used
-
- AknsUtils::GetCachedColor( skin, color,
- KAknsIIDQsnIconColors, EAknsCIQsnIconColorsCG6 );
-
- if (AknIconUtils::IsMifIcon(iIcon->Bitmap()))
- {
- AknIconUtils::SetIconColor( iIcon->Bitmap(), color );
- }
-
- AknIconUtils::SetSize( iIcon->Bitmap(), iBitmapLayout.Rect().Size() );
- iBitmapLayout.DrawImage( gc, iIcon->Bitmap(), iIcon->Mask() );
-
- gc.Reset();
- }
-
- gc.SetPenStyle( CGraphicsContext::ESolidPen );
- const CFont* font = iFont;
- if ( !font )
- {
- font = iCoeEnv->NormalFont();
- }
- gc.UseFont( font );
-
- if(iText)
- {
- TRect rect( iLinkRect );
- TRgb textContentColor;
- TInt err = AknsUtils::GetCachedColor( skin, textContentColor, KAknsIIDQsnTextColors, EAknsCIQsnTextColorsCG6 );
-
- if (!err)
- {
- TRAP_IGNORE( AknLayoutUtils::OverrideControlColorL( *iText,
- EColorLabelText, textContentColor ) );
- }
-
- gc.SetPenColor( textContentColor );
-
- TInt textBaseLineOffset = 0;
- textBaseLineOffset = (rect.Height() - font->FontMaxHeight())/2;
- gc.DrawText( *(iText->Text()), rect, textBaseLineOffset, iAlign );
- //gc.Reset();
-
- }
-
- TRgb textColor;
- AknsUtils::GetCachedColor( skin, textColor, KAknsIIDQsnHighlightColors,
- EAknsCIQsnHighlightColorsCG3 );
-
- gc.SetPenColor( textColor );
- gc.SetUnderlineStyle( EUnderlineOn );
- if(iLinkText)
- {
- TRect rect( iLinkRect );
- if ( Background() )
- {
- Background()->Draw( gc, *this, rect );
- }
-
- // buffer for visually ordered text
- HBufC* visualText = NULL;
- TRAPD( err, visualText = HBufC::NewL( KMaxLinkTextLength +
- KAknBidiExtraSpacePerLine ) );
- if ( err != KErrNone )
- {
- return;
- }
- TPtr ptr = visualText->Des();
- TInt clipWidth = rect.Width();
-
- if ( iHighlightedItem )
- {
- TRgb highlightcolor = AKN_LAF_COLOR( 244 );
- AknsUtils::GetCachedColor( skin, highlightcolor,
- KAknsIIDQsnHighlightColors, EAknsCIQsnHighlightColorsCG1 );
-
- gc.SetBrushColor( highlightcolor );
- gc.SetBrushStyle( CGraphicsContext::ESolidBrush );
- }
- else
- {
- gc.SetBrushStyle( CGraphicsContext::ENullBrush );
- }
-
- // bidi processing - using AknBidiTextUtils.
- AknBidiTextUtils::ConvertToVisualAndClip(
- *(iLinkText),
- ptr,
- *font,
- clipWidth,
- clipWidth );
-
- TInt baselineOffset = 0;
- baselineOffset = font->AscentInPixels() +
- ( rect.Height() - font->AscentInPixels() ) / 2;
- gc.DrawText( ptr, rect, baselineOffset,
- iAlign );
- delete visualText;
- }
- }
-
-
-// -----------------------------------------------------------------------------
-// From class CCoeControl.
-// CBatteryPopupControl::MinimumSize
-// -----------------------------------------------------------------------------
-//
-TSize CBatteryPopupControl::MinimumSize()
- {
- FUNC_LOG
- TInt nbrOfInfoLines = 0;
- TInt minWidth = 0;
-
- if( iText )
- {
- nbrOfInfoLines = iText->NumberOfLines();
- CEikLabel* textLabel;
- for ( TInt i=0; i < nbrOfInfoLines; i++ )
- {
- textLabel = iText;
- TPtrC ptrText = ( *textLabel->Text() );
- minWidth = Max( textLabel->CalcMinimumSize( ptrText ).iWidth, minWidth );
- }
- }
- if(iLinkText)
- {
- TInt tempWidth = iFont->TextWidthInPixels( *( iLinkText ) );
- minWidth = Max( minWidth, tempWidth );
- }
- TInt rectWidth = 0;
-
- TAknWindowComponentLayout infoPaneLayout =
- AknLayoutScalable_Avkon::bg_popup_sub_pane_cp25( iVariant );
-
- TRect rectPopUpWindow = PopUpWindowRectFromLayout(
- AknLayoutScalable_Avkon::popup_battery_window( iVariant ) );
-
- TRect rectInfoPane = RectFromLayout( rectPopUpWindow, infoPaneLayout );
-
- rectWidth = Max( rectInfoPane.Width(), minWidth );
-
- TInt rectHeight = rectInfoPane.Height();
-
- return TSize( rectWidth, rectHeight );
- }
-
-
-// -----------------------------------------------------------------------------
-// From class CCoeControl.
-// CBatteryPopupControl::SizeChanged
-// -----------------------------------------------------------------------------
-//
-void CBatteryPopupControl::SizeChanged()
- {
- FUNC_LOG
- // Get popup window rect
- TRect rectPopUpWindow = PopUpWindowRectFromLayout(
- AknLayoutScalable_Avkon::bg_popup_sub_pane_cp25( iVariant ) );
-
- // Get pane icon and text layouts
- TAknWindowLineLayout paneIconLayout(
- AknLayoutScalable_Avkon::popup_battery_window_g1(iVariant));
-
- //Set icon and text rects
- if( iIcon )
- {
- iBitmapLayout.LayoutRect( rectPopUpWindow, paneIconLayout );
- }
-
- if( iText )
- {
- TAknTextComponentLayout textLayout =
- AknLayoutScalable_Avkon::popup_battery_window_t1( iVariant );
-
- AknLayoutUtils::LayoutLabel(iText, rectPopUpWindow, textLayout);
-
- }
-
- // Set link text rect
- if( iLinkText )
- {
- TAknLayoutText linkLayoutText;
- // popup_battery_window_t2 doesn't have other variants as EVariantIconTextLink
- linkLayoutText.LayoutText( rectPopUpWindow,
- AknLayoutScalable_Avkon::popup_battery_window_t2( EVariantIconTextLink ) );
-
- iAlign = linkLayoutText.Align();
-
- iFont = linkLayoutText.Font();
-
- TInt tempWidth = iFont->TextWidthInPixels( *(iLinkText) );
- TRect tempRect;
-
- if( iText )
- {
- tempRect = TRect( linkLayoutText.TextRect() );
- }
- else
- {
- TAknLayoutRect linkLayout;
-
- linkLayout.LayoutRect( rectPopUpWindow, paneIconLayout );
-
- tempRect = TRect( linkLayout.Rect() );
- }
-
- if( iAlign == CGraphicsContext::ERight )
- {
- tempRect.iTl.iX = tempWidth - tempRect.iBr.iX;
- }
- else
- {
- tempRect.SetWidth( tempWidth );
- }
-
-
- iLinkRect = tempRect;
- }
- }
-
-// -----------------------------------------------------------------------------
-// RectFromLayout
-// -----------------------------------------------------------------------------
-//
-TRect CBatteryPopupControl::RectFromLayout( const TRect& aParent,
- const TAknWindowComponentLayout& aComponentLayout ) const
- {
- TAknWindowLineLayout lineLayout = aComponentLayout.LayoutLine();
- TAknLayoutRect layoutRect;
- layoutRect.LayoutRect( aParent, lineLayout );
- return layoutRect.Rect();
- }
-
-// -----------------------------------------------------------------------------
-// PopUpWindowRectFromLayout
-// -----------------------------------------------------------------------------
-//
-TRect CBatteryPopupControl::PopUpWindowRectFromLayout( const
- TAknWindowComponentLayout& aComponentLayout ) const
- {
- FUNC_LOG
- // get popup window width from the widest variety
- TAknWindowLineLayout lineLayout = aComponentLayout.LayoutLine();
-
- lineLayout.iW = AknLayoutScalable_Avkon::
- popup_battery_window( iVariant ).LayoutLine().iW;
- TAknLayoutRect layoutRect;
- layoutRect.LayoutRect( iAvkonAppUi->ApplicationRect(), lineLayout );
-
- return layoutRect.Rect();
- }
-
-// -----------------------------------------------------------------------------
-// From class CCoeControl
-// CBatteryPopupControl::HandlePointerEventL
-// -----------------------------------------------------------------------------
-//
-void CBatteryPopupControl::HandlePointerEventL(
- const TPointerEvent& aPointerEvent )
- {
- FUNC_LOG
- if(iLinkText)
- {
- if ( iLinkRect.Contains( aPointerEvent.iPosition ) )
- {
- if ( !iHighlightedItem )
- {
- iHighlightedItem = ETrue;
- DrawNow( iLinkRect );
- }
-#ifdef RD_TACTILE_FEEDBACK
- if ( aPointerEvent.iType == TPointerEvent::EButton1Down )
- {
- MTouchFeedback* feedback = MTouchFeedback::Instance();
-
- if ( feedback )
- {
- feedback->InstantFeedback( ETouchFeedbackBasic );
- }
- }
-#endif // RD_TACTILE_FEEDBACK
- // Nofity command observer
- if ( aPointerEvent.iType == TPointerEvent::EButton1Up )
- {
- iCommandObserver->ProcessCommandL( ELinkFirst );
- iHighlightedItem = EFalse;
- }
- }
- else
- {
- if ( iHighlightedItem )
- {
- iHighlightedItem = EFalse;
- DrawNow( iLinkRect );
- }
- }
- }
- }
-// -----------------------------------------------------------------------------
-// CBatteryPopupControl::CreateIconL()
-//
-//
-// -----------------------------------------------------------------------------
-//
-void CBatteryPopupControl::CreateIconL( )
- {
- FUNC_LOG
-
- TParse* fp = new( ELeave ) TParse();
- CleanupStack::PushL( fp );
- _LIT( KBIPPluginIconDirAndName, "z:\\resource\\apps\\batterypopupcontrol.mif");
- fp->Set( KBIPPluginIconDirAndName, &KDC_BITMAP_DIR, NULL );
-
- delete iIcon;
- iIcon = NULL;
-
- iIcon = AknsUtils::CreateGulIconL( AknsUtils::SkinInstance(),
- KAknsIIDQgnPropBatteryIcon,
- fp->FullName(),
- EMbmBatterypopupcontrolQgn_prop_battery_ps_deactivate,
- EMbmBatterypopupcontrolQgn_prop_battery_ps_deactivate_mask );
-
- CleanupStack::PopAndDestroy( fp );
- }
-// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/powersaveutilities/bsutil/group/BSUtil.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,46 @@
+/*
+* Copyright (c) 2007 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: Project definition file for project BSUtil
+*
+*/
+
+
+#include <platform_paths.hrh>
+
+TARGET bsutil.dll
+TARGETTYPE dll
+
+UID 0x1000008D 0x2000B5E2
+
+VENDORID VID_DEFAULT
+
+CAPABILITY CAP_GENERAL_DLL
+
+#if defined( ARMCC )
+ deffile ../../EABI/BSUtil.DEF
+#elif defined( WINSCW )
+ deffile ../../BWINS/BSUtil.DEF
+#endif
+
+SOURCEPATH ../src
+SOURCE bsutil.cpp
+
+USERINCLUDE ../inc
+
+MW_LAYER_SYSTEMINCLUDE
+
+LIBRARY euser.lib
+LIBRARY centralrepository.lib
+
+LANG SC
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/powersaveutilities/bsutil/group/bld.inf Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,37 @@
+/*
+* Copyright (c) 2009-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: Battery state utility build file.
+*
+*/
+
+
+#include <platform_paths.hrh>
+
+PRJ_PLATFORMS
+DEFAULT
+
+PRJ_EXPORTS
+
+../inc/bsutil.h |../../../inc/bsutil.h
+../rom/powersaveutilities.iby CORE_MW_LAYER_IBY_EXPORT_PATH(powersaveutilities.iby)
+
+
+PRJ_MMPFILES
+BSUtil.mmp
+
+PRJ_EXTENSIONS
+
+
+
+// End of File
\ No newline at end of file
--- a/coreapplicationuis/powersaveutilities/bsutil/inc/trace.h Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/powersaveutilities/bsutil/inc/trace.h Tue Aug 31 15:24:25 2010 +0300
@@ -51,8 +51,7 @@
/**
* Prefix macro for strings
*/
-#define _PREFIX_CHAR( aMsg ) (const char*)"[BSUtil]: " aMsg
-
+#define _PREFIX_CHAR( aMsg ) (const char*)"[BSUtil]: " ##aMsg
/**
* Define needed directories if TRACE_INTO_FILE macro in use
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/powersaveutilities/bsutil/rom/powersaveutilities.iby Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,25 @@
+/*
+* 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:
+*
+*
+*
+*/
+
+
+#ifndef __POWERSAVEUTILITIES_IBY__
+#define __POWERSAVEUTILITIES_IBY__
+
+file=ABI_DIR\BUILD_DIR\BSUtil.dll SHARED_LIB_DIR\BSUtil.dll
+
+#endif // __POWERSAVEUTILITIES_IBY__
+
Binary file coreapplicationuis/powersaveutilities/conf/powersaveutilities.confml has changed
Binary file coreapplicationuis/powersaveutilities/conf/powersaveutilities_2000B5E3.crml has changed
Binary file coreapplicationuis/powersaveutilities/conf/powersaveutilities_2001011A.crml has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/powersaveutilities/cppsmplugin/cppsmplugin.pro Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,66 @@
+#
+# 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: Project file for the RFS Plugin. It creates the bld.inf and .mmp file on executing
+# qmake command.
+#
+#
+
+TEMPLATE = lib
+TARGET = cppsmplugin
+DEPENDPATH += . inc src
+INCLUDEPATH += .
+INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE
+
+CONFIG += hb\
+ plugin
+
+MOC_DIR = moc
+OBJECTS_DIR = obj
+RCC_DIR = rcc
+
+# Platforms
+SYMBIAN_PLATFORMS = WINSCW \
+ ARMV5
+
+LIBS += -lcpframework -lpsmclient -lcentralrepository -lcenrepnotifhandler
+HEADERS += src/cppsmplugin.h \
+ src/cppsmview.h
+
+SOURCES += src/cppsmplugin.cpp \
+ src/cppsmview.cpp
+
+symbian: {
+ TARGET.EPOCALLOWDLLDATA = 1
+ DEFINES += PLUGINUID3=0x2000E51E
+ TARGET.UID3 = 0x2000E51E
+}
+
+symbian {
+ deploy.path = C:
+ qtplugins.path = /resource/qt/plugins/controlpanel
+ qtplugins.sources += qmakepluginstubs/cppsmplugin.qtplugin
+ # This is for new exporting system coming in garden
+ for(qtplugin, qtplugins.sources):BLD_INF_RULES.prj_exports += "./$$qtplugin $$deploy.path$$qtplugins.path/$$basename(qtplugin)"
+}
+# common translation file for all plugins
+TRANSLATIONS = powermanagement.ts
+
+# Build.inf rules
+BLD_INF_RULES.prj_exports += "$${LITERAL_HASH}include <platform_paths.hrh>" \
+ "rom/cppsmplugin.iby CORE_MW_LAYER_IBY_EXPORT_PATH(cppsmplugin.iby)" \
+ ".\rom\cppsmplugin_resources.iby LANGUAGE_APP_LAYER_IBY_EXPORT_PATH(cppsmplugin_resources.iby)"
+TARGET.CAPABILITY = All -TCB
+plugin.sources = cppsmplugin.dll
+plugin.path = \resource\qt\plugins\controlpanel
+DEPLOYMENT += plugin
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/powersaveutilities/cppsmplugin/rom/cppsmplugin.iby Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,26 @@
+/*
+ * 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:
+ *
+ */
+
+#ifndef __CPPSMPLUGIN_IBY__
+#define __CPPSMPLUGIN_IBY__
+
+#include <bldvariant.hrh>
+file=ABI_DIR\BUILD_DIR\cppsmplugin.dll SHARED_LIB_DIR\cppsmplugin.dll
+//data=\epoc32\release\winscw\udeb\z\resource\qt\translations\powermanagement_en.qm resource\qt\translations\powermanagement_en.qm
+data=\epoc32\data\c\resource\qt\plugins\controlpanel\cppsmplugin.qtplugin resource\qt\plugins\controlpanel\cppsmplugin.qtplugin
+
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/powersaveutilities/cppsmplugin/rom/cppsmplugin_resources.iby Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,27 @@
+/*
+ * 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:
+ *
+ */
+
+#ifndef __CPPSMPLUGIN_RESOURCES_IBY__
+#define __CPPSMPLUGIN_RESOURCES_IBY__
+
+//this iby is required for language specific things to be exported to Language iby layer
+#include <data_caging_paths_for_iby.hrh>
+
+data=DATAZ_\QT_TRANSLATIONS_DIR\powermanagement.qm QT_TRANSLATIONS_DIR\powermanagement.qm
+
+
+#endif //__CPPSMPLUGIN_RESOURCES_IBY__
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/powersaveutilities/cppsmplugin/src/cppsmplugin.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,60 @@
+/*
+ * 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:
+ *
+ */
+#include "cppsmplugin.h"
+#include "cppsmview.h"
+#include <cpsettingformentryitemdataimpl.h>
+#include <e32debug.h>
+
+
+CpPsmPlugin::CpPsmPlugin()
+{
+ RDebug::Print( _L("CpPsmPlugin::constructor:Begin") );
+ iTrans=new HbTranslator("powermanagement");
+ RDebug::Print( _L("CpPsmPlugin::constructor:end") );
+}
+
+CpPsmPlugin::~CpPsmPlugin()
+{
+ RDebug::Print( _L("CpPsmPlugin::destructor:Begin") );
+ delete iTrans;
+ RDebug::Print( _L("CpPsmPlugin::destructor:end"));
+}
+QList<CpSettingFormItemData*> CpPsmPlugin::createSettingFormItemData(CpItemDataHelper &itemDataHelper) const
+{
+ //QList<T> is represented as an array of pointers to items of type T,here T is CpSettingFormItemData
+ //and here the << function is used which appends object to the list
+ RDebug::Print( _L("CpPsmPlugin::createSettingFormItemData:Begin") );
+ return QList<CpSettingFormItemData*>()
+ << new CpSettingFormEntryItemDataImpl<CpPsmView>(
+ itemDataHelper,
+ hbTrId("txt_power_management_subhead_power_management"),
+ hbTrId("txt_power_list_power_save_mode"),
+ QString("qtg_large_power_management"));
+
+}
+
+CpBaseSettingView *CpPsmPlugin::createSettingView(const QVariant &hint) const
+{
+ RDebug::Print( _L("CpPsmPlugin::createSettingView:Begin") );
+ if (hint.toString().compare("psm_view",Qt::CaseInsensitive) == 0) {
+ return new CpPsmView;
+ }
+ RDebug::Print( _L("CpPsmPlugin::createSettingView:end") );
+ return 0;
+}
+
+Q_EXPORT_PLUGIN2(cppsmplugin, CpPsmPlugin);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/powersaveutilities/cppsmplugin/src/cppsmplugin.h Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,44 @@
+/*
+ * 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:
+ *
+ */
+#ifndef CPPSMPLUGIN_H
+#define CPPSMPLUGIN_H
+
+#include <qobject.h>
+#include <cpplugininterface.h>
+#include <cplauncherinterface.h>
+#include <hbtranslator.h>
+
+class CpBaseSettingView;
+class QVariant;
+
+class CpPsmPlugin : public QObject, public CpPluginInterface,public CpLauncherInterface
+{
+ Q_OBJECT
+ Q_INTERFACES(CpPluginInterface)
+ Q_INTERFACES(CpLauncherInterface)
+public:
+ CpPsmPlugin();
+ virtual ~CpPsmPlugin();
+ //from CpPluginInterface
+ virtual QList<CpSettingFormItemData*> createSettingFormItemData(CpItemDataHelper &itemDataHelper) const;
+ //from CpLauncherInterface
+ virtual CpBaseSettingView *createSettingView(const QVariant &hint) const;
+private:
+ HbTranslator* iTrans;
+};
+
+#endif //CPPSMPLUGIN_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/powersaveutilities/cppsmplugin/src/cppsmview.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,204 @@
+/*
+ * 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:
+ *
+ */
+#include "cppsmview.h"
+#include <hbdataform.h>
+#include <qstringlist>
+#include <QDebug>
+#include <hbdataformmodel.h>
+#include <cpsettingformitemdata.h>
+#include <hbmessagebox.h>
+#include <hblineedit.h>
+#include <hwrmpowerstatesdkpskeys.h>
+#include <hwrmdomainpskeys.h>
+#include <e32property.h>
+#include <psmclient.h>
+#include <psmsettings.h>
+#include <hwrmpowerstatesdkpskeys.h>
+#include <centralrepository.h>
+#include <settingsinternalcrkeys.h>
+#include <hbcheckbox.h>
+#include <e32debug.h>
+
+CpPsmView::CpPsmView(QGraphicsItem *parent) :
+ CpBaseSettingView(0,parent),iCheckBoxItem(0),iTrans(new HbTranslator("powermanagement"))
+{
+ RDebug::Print( _L("CpPsmView::CpPsmView:Begin") );
+ iForm = new HbDataForm();
+ iModel = new HbDataFormModel();
+ iForm->setHeading(hbTrId("txt_power_management_subhead_power_management"));
+ //our view has 3 items first one being toggle button for enabling and disabling PSM
+ iPowerSaveMode = iModel->appendDataFormItem(HbDataFormModelItem::ToggleValueItem,
+ hbTrId("txt_power_list_power_save_mode"));
+ iPsmClient = CPsmClient::NewL( *this );
+ iPsmClient->RequestPowerSaveModeNotification();
+ TInt mode;
+ TInt err = iPsmClient->PsmSettings().GetCurrentMode( mode );
+ //setting of toggle value to on or off depends on the current mode
+ if( mode == EPsmsrvModePowerSave )
+ {
+ iPowerSaveMode->setContentWidgetData(QString("text"), hbTrId("txt_power_setlabel_val_off"));
+ }
+ else
+ {
+ iPowerSaveMode->setContentWidgetData(QString("text"), hbTrId("txt_power_setlabel_val_on"));
+ }
+
+ iForm->addConnection(iPowerSaveMode,SIGNAL(clicked()), this,SLOT(toggleChange()));
+
+ RDebug::Print( _L("CpPsmView::toggle button added") );
+ //this is the second item which is a text item which is readonly and describes what PSM does
+ HbDataFormModelItem *dataItem2 = iModel->appendDataFormItem(HbDataFormModelItem::TextItem);
+ //setting the maxrows property of hblineedit
+ dataItem2->setContentWidgetData("maxRows",11);
+ //setting the text property of hblineedit
+ dataItem2->setContentWidgetData("text",hbTrId("txt_power_list_activating_power_save_mode_will_con"));
+ dataItem2->setContentWidgetData("readOnly" , true);
+ RDebug::Print( _L("CpPsmView::text item added") );
+
+ //now the third item which is checkbox item for enabling psm automatically when low power
+ iCheckBoxItem = iModel->appendDataFormItem(
+ HbDataFormModelItem::CheckBoxItem);
+ //setting the text property of check box.
+ iCheckBoxItem->setContentWidgetData("text",hbTrId("txt_power_list_activate_power_save_mode_automatica"));
+ RDebug::Print( _L("CpPsmView::check box added") );
+
+ CRepository* repository( NULL );
+ TRAPD(err1,repository =CRepository::NewL(KCRUidDeviceManagementSettings));
+ TInt value;
+ err1 = repository->Get( KSettingsPowerSavingQuery, value );
+
+ if ( err1 == KErrNone )
+ {
+ //checkbox state is initialised based on cenrep key and default value of the key is 1 (meaning unchecked)
+ if(value==0)
+ {
+ RDebug::Print( _L("CpPsmView::checkbox state is checked ") );
+ iCheckBoxItem->setContentWidgetData("checkState",2);
+ }
+ }
+ delete repository;
+ iForm->addConnection(iCheckBoxItem,SIGNAL(stateChanged(int)),this,SLOT(checkBoxStateChanged(int)));
+
+
+ err = iPsmClient->PsmSettings().GetCurrentMode( mode );
+
+ if ( err == KErrNone && mode == EPsmsrvModePowerSave )
+ {
+ //if device is in powersavemode then disable the checkbox
+ RDebug::Print( _L("CpPsmView::checkbox disabled ") );
+ iCheckBoxItem->setEnabled(0);
+ }
+
+ iForm->setModel(iModel);
+ setWidget(iForm);
+ RDebug::Print( _L("CpPsmView::end "));
+}
+
+CpPsmView::~CpPsmView()
+{
+RDebug::Print( _L("CpPsmView::destructor begin ") );
+delete iTrans;
+delete iPsmClient;
+RDebug::Print( _L("CpPsmView::destructor end ") );
+}
+
+
+void CpPsmView::checkBoxStateChanged(int state)
+{
+ // store your changes
+ //state=1 means ->"checked" else it is "un-checked"
+ RDebug::Print( _L("CpPsmView::checkBoxStateChanged begin ") );
+ CRepository* repository( NULL );
+
+ TRAPD( err, repository = CRepository::NewL( KCRUidDeviceManagementSettings ) );
+
+ if ( err == KErrNone )
+ {
+ TInt value( 0 );
+ //default value of the key is 1 meaning unchecked,so if the checkbox is checked then state=1 so key is set to 0
+ if(state)
+ {
+ err = repository->Set( KSettingsPowerSavingQuery, value );
+ RDebug::Print( _L("CpPsmView::checkBoxStateChanged checked ") );
+ }
+ else
+ {
+ err = repository->Set( KSettingsPowerSavingQuery, 1 );
+ RDebug::Print( _L("CpPsmView::checkBoxStateChanged unchecked ") );
+ }
+ }
+
+ delete repository;
+ RDebug::Print( _L("CpPsmView::checkBoxStateChanged end ") );
+
+}
+
+void CpPsmView::toggleChange()
+ {
+ // iPsmClient = CPsmClient::NewL( *this );
+ RDebug::Print( _L("CpPsmView::toggleChange begin ") );
+ TInt mode;
+ TInt err = iPsmClient->PsmSettings().GetCurrentMode( mode );
+
+ if ( err == KErrNone )
+ {
+ if( mode == EPsmsrvModeNormal || mode == EPsmsrvPartialMode )
+ {
+ iPsmClient->CancelPowerSaveModeNotificationRequest();
+ iPsmClient->ChangePowerSaveMode( EPsmsrvModePowerSave );
+ // powerSaveMode->setContentWidgetData(QString("additionalText"), QString("off"));
+ RDebug::Print( _L("CpPsmView::toggleChange psm on ") );
+ }
+ else
+ {
+ iPsmClient->CancelPowerSaveModeNotificationRequest();
+ iPsmClient->ChangePowerSaveMode( EPsmsrvModeNormal );
+ // powerSaveMode->setContentWidgetData(QString("text"), QString("on"));
+ RDebug::Print( _L("CpPsmView::toggleChange psm off ") );
+ }
+ }
+ RDebug::Print( _L("CpPsmView::toggleChange end ") );
+ }
+
+
+void CpPsmView::PowerSaveModeChanged( const TPsmsrvMode aMode )
+ {
+ RDebug::Print( _L("CpPsmView::PowerSaveModeChanged begin ") );
+ iPsmClient->RequestPowerSaveModeNotification();
+ if( aMode == EPsmsrvModePowerSave )
+ {
+ //device in psm mode so disable checkbox and set the value of toggle button to off
+ iCheckBoxItem->setEnabled(0);
+ iPowerSaveMode->setContentWidgetData(QString("text"), hbTrId("txt_power_setlabel_val_off"));
+ RDebug::Print( _L("CpPsmView::PowerSaveModeChanged powersavemode enabled ") );
+ }
+ else
+ {
+ //device is in normal mode so enable checkbox and set the value of toggle button to on
+ iCheckBoxItem->setEnabled(1);
+ iPowerSaveMode->setContentWidgetData(QString("text"), hbTrId("txt_power_setlabel_val_on"));
+ RDebug::Print( _L("CpPsmView::PowerSaveModeChanged powersavemode disabled ") );
+ }
+ RDebug::Print( _L("CpPsmView::PowerSaveModeChanged end ") );
+ }
+
+
+void CpPsmView::PowerSaveModeChangeError( const TInt aError )
+ {
+ RDebug::Print( _L("CpPsmView::PowerSaveModeChangeError ") );
+ }
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/powersaveutilities/cppsmplugin/src/cppsmview.h Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,60 @@
+/*
+ * 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:
+ *
+ */
+#ifndef CPPSMVIEW_H
+#define CPPSMVIEW_H
+
+#include <cpbasesettingview.h>
+#include <psmclient.h>
+#include <psmsettings.h>
+#include <hwrmpowerstatesdkpskeys.h>
+#include <psmclientobserver.h> // CPsmClient
+#include <hbtranslator.h>
+
+class HbDataFormModel;
+class HbDataFormModelItem;
+class CpSettingFormItemData;
+class CPsmClient;
+
+
+class CpPsmView : public CpBaseSettingView,public MPsmClientObserver
+{
+ Q_OBJECT
+public:
+ explicit CpPsmView(QGraphicsItem *parent = 0);
+ virtual ~CpPsmView();
+
+ void PowerSaveModeChanged( const TPsmsrvMode aMode );
+
+ /**
+ * @see MPsmClientObserver
+ */
+ void PowerSaveModeChangeError( const TInt aError );
+
+private slots:
+ //need handling your member's value change
+ void checkBoxStateChanged(int state);
+ void toggleChange();
+private:
+ HbDataForm *iForm;
+ HbDataFormModel *iModel ;
+ HbDataFormModelItem *iCheckBoxItem;
+ CPsmClient* iPsmClient;
+ HbDataFormModelItem *iPowerSaveMode;
+ HbTranslator *iTrans;
+
+};
+#endif// CPPSMVIEW_H
--- a/coreapplicationuis/powersaveutilities/data/2000E51E.rss Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-/*
-* 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: This file contains all the resources to launch battery indicator plugin
-*
-*/
-
-
-#include <ecom/registryinfo.rh>
-
-RESOURCE REGISTRY_INFO theInfo
- {
- dll_uid = 0x2000E51E;
- interfaces =
- {
- INTERFACE_INFO
- {
- interface_uid = 0x10275092;
- implementations =
- {
- IMPLEMENTATION_INFO
- {
- implementation_uid = 0x2000E51D;
- version_no = 1;
- display_name = "";
- default_data = "Default";
- opaque_data = "";
- }
- };
- }
- };
- }
-
-// End of file
--- a/coreapplicationuis/powersaveutilities/data/batindpaneplugin.rss Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-/*
-* Copyright (c) 2007-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: Resource definitions for battery indicator pane plugin
-*
-*/
-
-
-// RESOURCE IDENTIFIER
-NAME BIPP
-
-#include <eikon.rh>
-#include <batindicatorpaneplugin.loc>
-
-
-RESOURCE RSS_SIGNATURE { }
-
-RESOURCE TBUF r_qtn_deactivate_power_saving
-{
-buf = qtn_battery_link_deactivate_power_saving;
-}
-
-RESOURCE TBUF r_qtn_activate_power_saving
-{
-buf = qtn_battery_link_activate_power_saving;
-}
-
-RESOURCE TBUF r_qtn_battery_low_preview_popup
-{
-buf = qtn_battery_low_preview_popup;
-}
-
-RESOURCE TBUF r_qtn_battery_status_popup
-{
-buf = qtn_battery_status_popup;
-}
--- a/coreapplicationuis/powersaveutilities/group/BSUtil.mmp Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-/*
-* Copyright (c) 2007 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: Project definition file for project BSUtil
-*
-*/
-
-
-#include <platform_paths.hrh>
-
-TARGET BSUtil.dll
-TARGETTYPE dll
-
-UID 0x1000008D 0x2000B5E2
-
-VENDORID VID_DEFAULT
-
-CAPABILITY CAP_GENERAL_DLL
-
-#if defined( ARMCC )
- deffile ../EABI/BSUtil.DEF
-#elif defined( WINSCW )
- deffile ../BWINS/BSUtil.DEF
-#endif
-
-SOURCEPATH ../bsutil/src
-SOURCE bsutil.cpp
-
-USERINCLUDE ../bsutil/inc
-
-MW_LAYER_SYSTEMINCLUDE
-
-LIBRARY euser.lib
-LIBRARY centralrepository.lib
-
-LANG SC
--- a/coreapplicationuis/powersaveutilities/group/batindicatorpaneplugin.mmp Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-/*
-* Copyright (c) 2007 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: This is project specification file for handling
-* UIP taps in BatIndicatorPanePlugin
-*
-*/
-
-
-CAPABILITY CAP_ECOM_PLUGIN
-
-#include <data_caging_paths.hrh>
-#include <platform_paths.hrh>
-
-// Build target
-TARGET batindicatorpaneplugin.dll
-TARGETTYPE PLUGIN
-UID 0x10009D8D 0x2000E51E
-VENDORID VID_DEFAULT
-
-
-// Source files location
-SOURCEPATH ../batindicatorpaneplugin/src
-SOURCE batindicatorpanepluginimpl.cpp
-SOURCE dllmain.cpp
-
-
-// Resources
-START RESOURCE ../../data/2000E51E.rss
-TARGET batindicatorpaneplugin.rsc
-TARGETPATH ECOM_RESOURCE_DIR
-END
-
-START RESOURCE ../../data/batindpaneplugin.rss
-TARGETPATH ECOM_RESOURCE_DIR
-HEADER
-LANGUAGE_IDS
-END
-
-
-// Include paths
-USERINCLUDE ../batindicatorpaneplugin/inc
-USERINCLUDE ../../inc
-
-MW_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE /epoc32/include/ecom
-
-// Dependencies to system components
-LIBRARY eikcore.lib
-LIBRARY cone.lib
-LIBRARY euser.lib
-LIBRARY ecom.lib
-LIBRARY avkon.lib
-LIBRARY commonengine.lib // stringloader
-LIBRARY efsrv.lib // TParsePtrC
-LIBRARY flogger.lib
-LIBRARY psmclient.lib
-LIBRARY BSUtil.lib
-LIBRARY batterypopupcontrol.lib
-LIBRARY centralrepository.lib
-// End of File
-
--- a/coreapplicationuis/powersaveutilities/group/batterypopupcontrol.mmp Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-/*
-* 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: This is project specification file for handling UIP taps
-* in BatteryPopupControl
-*
-*/
-
-
-#include <platform_paths.hrh>
-
-// Build target
-TARGET batterypopupcontrol.dll
-TARGETTYPE dll
-UID 0x10009D8D 0x2000F85F
-VENDORID VID_DEFAULT
-CAPABILITY CAP_GENERAL_DLL
-
-// Source files location
-SOURCEPATH ../batterypopupcontrol/src
-SOURCE batterypopupcontrol.cpp
-
-// Include paths
-USERINCLUDE ../batterypopupcontrol/inc
-
-MW_LAYER_SYSTEMINCLUDE
-
-// Dependencies to system components
-LIBRARY cone.lib
-LIBRARY euser.lib
-LIBRARY avkon.lib
-LIBRARY efsrv.lib // TParsePtrC
-LIBRARY flogger.lib
-LIBRARY eikcoctl.lib
-LIBRARY AknLayout2.lib
-LIBRARY AknLayout2Scalable.lib
-LIBRARY CdlEngine.lib
-LIBRARY AknSkins.lib // Skins support
-LIBRARY gdi.lib
-LIBRARY AknIcon.lib
-LIBRARY egul.lib
-LIBRARY FontProvider.lib
-LIBRARY FontUtils.lib
-#ifndef AVKON_BATTERYPOPUP_LAYOUTS
-LIBRARY aknnotify.lib
-#endif //AVKON_BATTERYPOPUP_LAYOUTS
-// ----------- Touch feedback additions start
-#ifdef RD_TACTILE_FEEDBACK
-LIBRARY touchfeedback.lib
-#endif //RD_TACTILE_FEEDBACK
-
-// End of File
-
--- a/coreapplicationuis/powersaveutilities/group/batterypopupcontrol_icons.mk Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-#
-# Copyright (c) 2007 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:
-#
-#
-
-
-ifeq (WINS,$(findstring WINS, $(PLATFORM)))
-ZDIR=\epoc32\release\$(PLATFORM)\$(CFG)\z
-else
-ZDIR=\epoc32\data\z
-endif
-
-# ----------------------------------------------------------------------------
-# Configure these
-# ----------------------------------------------------------------------------
-
-TARGETDIR=$(ZDIR)\resource\apps
-HEADERDIR=\epoc32\include
-ICONTARGETFILENAME=$(TARGETDIR)\batterypopupcontrol.mif
-HEADERFILENAME=$(HEADERDIR)\batterypopupcontrol.mbg
-
-do_nothing :
- @rem do_nothing
-
-MAKMAKE : do_nothing
-
-BLD : do_nothing
-
-CLEAN : do_nothing
-
-LIB : do_nothing
-
-CLEANLIB : do_nothing
-
-# ----------------------------------------------------------------------------
-# Configure these.
-#
-# NOTE 1: DO NOT DEFINE MASK FILE NAMES! They are included automatically by
-# MifConv if the mask detph is defined.
-#
-# NOTE 2: Usually, source paths should not be included in the bitmap
-# definitions. MifConv searches for the icons in all icon directories in a
-# predefined order, which is currently \s60\icons, \s60\bitmaps2.
-# The directory \s60\icons is included in the search only if the feature flag
-# __SCALABLE_ICONS is defined.
-# ----------------------------------------------------------------------------
-
-#ENABLE ANIMATION: Add background bitmap and animation frames here
-RESOURCE :
- mifconv $(ICONTARGETFILENAME) /h$(HEADERFILENAME) \
- /c8,8 qgn_prop_battery_ps_deactivate.svg
-
-FREEZE : do_nothing
-
-SAVESPACE : do_nothing
-
-RELEASABLES :
- @echo $(HEADERFILENAME)&& \
- @echo $(ICONTARGETFILENAME)
-
-FINAL : do_nothing
--- a/coreapplicationuis/powersaveutilities/group/bld.inf Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/*
-* Copyright (c) 2009-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: Battery state utility build file.
-*
-*/
-
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-//Configuration tool migration
-../conf/powersaveutilities.confml MW_LAYER_CONFML(powersaveutilities.confml)
-../conf/powersaveutilities_2000B5E3.crml MW_LAYER_CRML(powersaveutilities_2000B5E3.crml)
-../conf/powersaveutilities_2001011A.crml MW_LAYER_CRML(powersaveutilities_2001011A.crml)
-
-../rom/powersaveutilities.iby CORE_MW_LAYER_IBY_EXPORT_PATH(powersaveutilities.iby)
-../rom/powersaveutilitiesresources.iby LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(powersaveutilitiesresources.iby)
-../bsutil/inc/bsutil.h |../../inc/bsutil.h
-
-// batterypopupcontrol
-../batterypopupcontrol/inc/batterypopupcontrol.h |../../inc/batterypopupcontrol.h
-
-// batindicatorpaneplugin
-../loc/batindicatorpaneplugin.loc MW_LAYER_LOC_EXPORT_PATH(batindicatorpaneplugin.loc)
-
-PRJ_MMPFILES
-BSUtil.mmp
-batterypopupcontrol.mmp
-batindicatorpaneplugin.mmp
-
-PRJ_EXTENSIONS
-
-START EXTENSION s60/mifconv
-OPTION TARGETFILE batterypopupcontrol.mif
-OPTION HEADERFILE batterypopupcontrol.mbg
-OPTION SOURCES -c8,8 qgn_prop_battery_ps_deactivate
-END
-
-// End of File
\ No newline at end of file
--- a/coreapplicationuis/powersaveutilities/loc/batindicatorpaneplugin.loc Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-/*
-* Copyright (c) 2007-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: Localisation file for BatIndicatorPanePlugin plug-in
-*
-*/
-
-
-// LOCALISATION STRINGS
-
-
-// ---[ touch support: strings for preview popup ]---
-
-
-// d: Link Label for a preview popup.
-// d: Popup is shown when user taps the battery indicator from status pane popup.
-// l: popup_battery_window_t2/opt1
-// r:5.0
-//
-#define qtn_battery_link_deactivate_power_saving "Deactivate power saving"
-
-// d: Link Label for a preview popup.
-// d: Popup is shown when user taps the battery indicator from status pane popup.
-// l: popup_battery_window_t2/opt1
-// r:5.0
-//
-#define qtn_battery_link_activate_power_saving "Activate power saving"
-
-// d: Label for a preview popup.
-// d: Popup is shown when user taps the battery indicator from status pane popup.
-// d: If battery status is low, "Battery low" is shown instead of battery capacity
-// l: popup_battery_window_t1/opt1
-// r:5.0
-//
-#define qtn_battery_low_preview_popup "Battery low"
-
-// d: Label for a preview popup.
-// d: Popup is shown when user taps the battery indicator from status pane popup.
-// d: %N is the battery capacity in percents.
-// l: popup_battery_window_t1
-// r:5.0
-//
-#define qtn_battery_status_popup "%N %"
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/powersaveutilities/pluginlauncher/pluginlauncher.pro Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,41 @@
+#
+# 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: cpframework source files
+#
+
+TEMPLATE = app
+TARGET = CpPsmPluginLauncher
+DEPENDPATH += .
+INCLUDEPATH += .
+
+HEADERS += src/*.h
+SOURCES += src/*.cpp
+
+CONFIG += hb
+CONFIG += no_icon
+
+MOC_DIR = moc
+OBJECT_DIR = obj
+RCC_DIR = rcc
+
+symbian: {
+ TARGET.UID3 = 0x2002DD0C
+ INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE
+ TARGET.CAPABILITY = ReadDeviceData WriteDeviceData
+ TARGET.EPOCALLOWDLLDATA = 1
+}
+
+LIBS += -lcpframework
+BLD_INF_RULES.prj_exports += "$${LITERAL_HASH}include <platform_paths.hrh>" \
+ "rom/pluginlauncher.iby CORE_MW_LAYER_IBY_EXPORT_PATH(pluginlauncher.iby)"
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/powersaveutilities/pluginlauncher/rom/pluginlauncher.iby Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,22 @@
+
+/*
+* 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:
+*
+*/
+
+file=ABI_DIR\BUILD_DIR\CpPsmPluginLauncher.exe \sys\bin\CpPsmPluginLauncher.exe
+CP_UPGRADABLE_APP_REG_RSC(CpPsmPluginLauncher)
+S60_APP_RESOURCE(CpPsmPluginLauncher)
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/powersaveutilities/pluginlauncher/src/main.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,39 @@
+/*
+* 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:
+*
+*/
+
+#include <hbapplication.h>
+#include <QDir>
+#include <hbmainwindow.h>
+#include <cpbasepath.h>
+#include "mainview.h"
+#include <e32debug.h>
+
+int main(int argc, char **argv)
+{
+ RDebug::Print( _L("plugin launcher main begin ") );
+ HbApplication app(argc, argv);
+
+ HbMainWindow mainWindow;
+ MainView *mainView = new MainView();
+ mainWindow.addView(mainView);
+ mainWindow.show();
+ RDebug::Print( _L("plugin launcher main end") );
+ return app.exec();
+}
+
+//End of File
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/powersaveutilities/pluginlauncher/src/mainview.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,58 @@
+/*
+* 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:
+*
+*/
+#include "mainview.h"
+#include <hbmenu.h>
+#include <hbaction.h>
+#include <qcoreapplication.h>
+#include <cppluginlauncher.h>
+#include <QStringList>
+#include <cpbasesettingview.h>
+#include <hbmessagebox.h>
+#include <e32debug.h>
+
+
+MainView::MainView(QGraphicsItem *parent/* = 0*/)
+: HbView(parent)
+{
+ RDebug::Print( _L("plugin launcher MainView begin ") );
+ init();
+ RDebug::Print( _L("plugin launcher MainView end ") );
+}
+
+MainView::~MainView()
+{
+RDebug::Print( _L("plugin launcher MainView desructor ") );
+}
+
+void MainView::init()
+{
+ RDebug::Print( _L("plugin launcher MainView init begin ") );
+ launchInProcessProfileView();
+ RDebug::Print( _L("plugin launcher MainView init end ") ) ;
+}
+
+void MainView::launchInProcessProfileView()
+{
+ RDebug::Print( _L("plugin launcher MainView launchInProcessProfileView begin ") );
+ //static function which launches the psmplugin view
+ CpPluginLauncher::launchSettingView("C:/resource/qt/plugins/controlpanel/cppsmplugin.dll","psm_view");
+ RDebug::Print( _L("plugin launcher MainView launchInProcessProfileView end "));
+}
+
+
+
+//End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/powersaveutilities/pluginlauncher/src/mainview.h Tue Aug 31 15:24:25 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:
+*
+*/
+#ifndef MAINVIEW_H
+#define MAINVIEW_H
+
+#include <hbview.h>
+
+class MainView : public HbView
+{
+ Q_OBJECT
+public:
+ explicit MainView(QGraphicsItem *parent = 0);
+ virtual ~MainView();
+private:
+ void init();
+private slots:
+ void launchInProcessProfileView();
+private:
+ Q_DISABLE_COPY(MainView)
+};
+
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/powersaveutilities/powersaveutilities.pro Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,26 @@
+#
+# 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:
+#
+
+TEMPLATE = subdirs
+
+symbian: {
+:BLD_INF_RULES.prj_mmpfiles += $$LITERAL_HASH"include \"bsutil/group/bld.inf\""
+SUBDIRS = cppsmplugin \
+ psmindicatorplugin \
+ pluginlauncher
+
+}
+CONFIG += ordered
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/powersaveutilities/psmindicatorplugin/inc/psmindicator.h Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,80 @@
+/*
+ * 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: power save mode Indicator class
+ *
+ */
+
+#ifndef PSMINDICATOR_H
+#define PSMINDICATOR_H
+
+#include <QObject>
+
+#include <QVariant>
+#include <QtCore/QProcess>
+
+#include <hbindicatorinterface.h>
+#include <hbindicatorplugininterface.h>
+#include <hbtranslator.h>
+
+
+/**
+ * PSM indicator class.
+ * Handles client request and shows the indications.
+ */
+class PsmIndicatorPlugin : public HbIndicatorInterface, public HbIndicatorPluginInterface
+{
+ Q_OBJECT
+ Q_INTERFACES(HbIndicatorPluginInterface)
+
+public:
+
+ PsmIndicatorPlugin();
+ ~PsmIndicatorPlugin();
+public:
+ //from HbindicatorInterface
+ bool handleInteraction(InteractionType type);
+ QVariant indicatorData(int role) const;
+
+public:
+ //from HbIndicatorPluginInterface
+ QStringList indicatorTypes() const;
+ bool accessAllowed(const QString &indicatorType,const QVariantMap & securityInfo) const;
+ HbIndicatorInterface* createIndicator(const QString &indicatorType);
+ int error() const;
+
+
+protected:
+ //from HbindicatorInterface
+ bool handleClientRequest(RequestType type, const QVariant ¶meter);
+
+
+private:
+
+ QString iDisplayName;
+ QString iIcon;
+ QProcess iProcess;
+ QStringList iIndicatorTypes;
+ HbTranslator *iTrans;
+
+
+private slots:
+ void processError(QProcess::ProcessError err); // handler for error codes
+
+private:
+ Q_DISABLE_COPY(PsmIndicatorPlugin)
+ int mError;
+ };
+
+#endif // PSMINDICATOR_H
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/powersaveutilities/psmindicatorplugin/psmindicatorplugin.pro Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,40 @@
+#
+# 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:
+#
+TEMPLATE = lib
+TARGET = psmindicatorplugin
+CONFIG += plugin
+CONFIG += hb
+INCLUDEPATH += .
+DEPENDPATH += .
+INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE
+
+# Input
+HEADERS += inc/psmindicator.h
+SOURCES += src/psmindicator.cpp
+RESOURCES =
+symbian {
+ TARGET.EPOCALLOWDLLDATA = 1
+ TARGET.CAPABILITY = CAP_GENERAL_DLL
+ SYMBIAN_PLATFORMS = WINSCW ARMV5
+ TARGET.UID3 = 0x2000F85F
+ pluginstub.sources = psmindicatorplugin.dll
+ pluginstub.path = /resource/plugins/indicators
+ DEPLOYMENT += pluginstub
+ LIBS += -lcpframework
+
+}
+BLD_INF_RULES.prj_exports += "$${LITERAL_HASH}include <platform_paths.hrh>" \
+ "rom/psmindicatorplugin.iby CORE_MW_LAYER_IBY_EXPORT_PATH(psmindicatorplugin.iby)"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/powersaveutilities/psmindicatorplugin/rom/psmindicatorplugin.iby Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,24 @@
+/*
+* 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. Y:\epoc32\s60\icons\qgn_note_batt_charging.svg
+*
+* Contributors:
+*
+* Description:
+*
+*/
+#ifndef __PSMINDICATORPLUGIN_IBY__
+#define __PSMINDICATORPLUGIN_IBY__
+
+REM DLL
+file=ABI_DIR\UREL\psmindicatorplugin.dll SHARED_LIB_DIR\psmindicatorplugin.dll
+data=\epoc32\data\z\resource\plugins\indicators\psmindicatorplugin.qtplugin \resource\plugins\indicators\psmindicatorplugin.qtplugin
+
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/powersaveutilities/psmindicatorplugin/src/psmindicator.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,224 @@
+/*
+ * 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:
+ *
+ */
+#include "psmindicator.h"
+
+#include <QWidget>
+#include <QtPlugin>
+#include <QProcess>
+#include <cppluginlauncher.h>
+#include <hbview.h>
+#include <hbapplication.h>
+#include <hbmainwindow.h>
+#include <hbaction.h>
+#include <cpbasesettingview.h>
+#include <e32debug.h>
+
+
+Q_EXPORT_PLUGIN(PsmIndicatorPlugin)
+const static char IndicatorType[] = "com.nokia.hb.powersavemodeplugin/1.0";
+QString KPsm = "PSM";
+QString KCharging = "Charging";
+
+PsmIndicatorPlugin::PsmIndicatorPlugin():HbIndicatorInterface(IndicatorType,HbIndicatorInterface::NotificationCategory,InteractionActivated)
+ {
+ RDebug::Print( _L("PsmIndicatorPlugin constructor begin ") );
+ iIndicatorTypes << "com.nokia.hb.powersavemodeplugin/1.0";
+ RDebug::Print( _L("PsmIndicatorPlugin constructor end ") );
+ }
+
+PsmIndicatorPlugin::~PsmIndicatorPlugin()
+ {
+ RDebug::Print( _L("PsmIndicatorPlugin destructor begin ") );
+ }
+
+// ----------------------------------------------------------------------------
+// psmIndicatorPlugin::indicatorTypes
+// returns the indicator types handled by this plugin
+// ----------------------------------------------------------------------------
+
+QStringList PsmIndicatorPlugin::indicatorTypes() const
+ {
+ RDebug::Print( _L("PsmIndicatorPlugin indicatortypes "));
+ return iIndicatorTypes;
+ }
+
+// ----------------------------------------------------------------------------
+// psmIndicatorPlugin::createIndicator
+// creates an indicator.
+// ----------------------------------------------------------------------------
+
+HbIndicatorInterface* PsmIndicatorPlugin::createIndicator(
+ const QString &indicatorType)
+ {
+ Q_UNUSED(indicatorType)
+ RDebug::Print( _L("PsmIndicatorPlugin createindicator ") );
+ return this;
+ }
+
+// ----------------------------------------------------------------------------
+// psmIndicatorPlugin::error
+// returns the error code.
+// ----------------------------------------------------------------------------
+
+int PsmIndicatorPlugin::error() const
+ {
+ RDebug::Print( _L("PsmIndicatorPlugin error ") );
+ return mError;
+ }
+
+// ----------------------------------------------------------------------------
+// psmIndicatorPlugin::accessAllowed
+// check for the access rights of the client. As there are no restrictions for
+// this plugin it always returns true.
+// ----------------------------------------------------------------------------
+
+bool PsmIndicatorPlugin::accessAllowed(const QString &indicatorType,
+ const QVariantMap & securityInfo) const
+ {
+ Q_UNUSED(indicatorType)
+ Q_UNUSED(securityInfo)
+
+ RDebug::Print( _L("PsmIndicatorPlugin accessallowed ") );
+ return true;
+ }
+
+// ----------------------------------------------------------------------------
+// psmIndicator::handleInteraction
+// called when the user interacts with the indicator.Enable the interaction
+// for psm enabled and charger connected
+// ----------------------------------------------------------------------------
+bool PsmIndicatorPlugin::handleInteraction(InteractionType type)
+ {
+ bool handled = false;
+ RDebug::Print( _L("PsmIndicatorPlugin handleinteraction begin "));
+ if (type == InteractionActivated)
+ {
+ RDebug::Print( _L("PsmIndicatorPlugin handleinteraction inside interactionactivated ") );
+ QObject::connect( &iProcess, SIGNAL(error(QProcess::ProcessError)),
+ this, SLOT(processError(QProcess::ProcessError)));
+
+ // Launch the process to show the view.
+ iProcess.start("CpPsmPluginLauncher");
+ handled = true;
+
+ }
+ RDebug::Print( _L("PsmIndicatorPlugin handleinteraction end ") );
+ return handled;
+ }
+
+// ----------------------------------------------------------------------------
+// psmIndicator::indicatorData
+// returns the name and icon to be displayed in the universal indicator menu.
+// ----------------------------------------------------------------------------
+QVariant PsmIndicatorPlugin::indicatorData(int role) const
+ {
+ RDebug::Print( _L("PsmIndicatorPlugin indicatordata begin ") );
+ switch(role)
+ {
+ //for displaying the string in indicator.
+ case PrimaryTextRole:
+ {
+ return iDisplayName;
+ }
+ //for displaying the icon in indicator.
+ case DecorationNameRole:
+ {
+ return iIcon;
+ }
+ default:
+ return QVariant();
+ }
+ }
+
+// ----------------------------------------------------------------------------
+// psmIndicatorPlugin::handleClientRequest
+// this function gets called when client activates plugin
+// ----------------------------------------------------------------------------
+bool PsmIndicatorPlugin::handleClientRequest( RequestType type,
+ const QVariant ¶meter)
+ {
+ RDebug::Print( _L("PsmIndicatorPlugin handleclientrequest begin ") );
+ bool handled(false);
+ switch (type)
+ {
+ case RequestActivate:
+ {
+ RDebug::Print( _L("PsmIndicatorPlugin handleclientrequest requestactivate ") );
+ // Get the param from the hbindicator.activate() which is called from sysap.
+ HbTranslator trans("powermanagement");
+ iDisplayName.clear();
+ //if it's a PSM indicator then prepare the string and icon accordingly
+ if((parameter.operator ==(QString("PSM"))))
+ {
+ RDebug::Print( _L("PsmIndicatorPlugin handleclientrequest requestactivate PSM "));
+ iDisplayName.append(hbTrId("txt_power_management_dpopinfo_psm_activated_automa"));
+ iIcon.append(QString("qtg_large_psm"));
+ }
+ //else it's a charging indicator then prepare the string and icon accordingly
+ else
+ {
+ RDebug::Print( _L("PsmIndicatorPlugin handleclientrequest requestactivate charging ") );
+ iDisplayName.append(hbTrId("txt_power_management_dblist_charging"));
+ iIcon.append(QString("qtg_mono_flash_charging"));
+ }
+
+
+ emit dataChanged();
+ handled = true;
+ }
+ break;
+ case RequestDeactivate:
+ {
+ RDebug::Print( _L("PsmIndicatorPlugin handleclientrequest requestdeactivate ") );
+ // reset data
+ iDisplayName = QString();
+ iIcon=QString();
+
+ emit deactivate();
+ }
+ break;
+ default:
+ break;
+ }
+ RDebug::Print( _L("PsmIndicatorPlugin handleclientrequest end ") );
+ return handled;
+ }
+
+
+// ----------------------------------------------------------------------------
+// psmIndicator::processError
+// handle the error conditions returned by the QProcess.
+// ----------------------------------------------------------------------------
+
+void PsmIndicatorPlugin::processError(QProcess::ProcessError err)
+ {
+ RDebug::Print( _L("PsmIndicatorPlugin processerror begin "));
+ switch (err)
+ {
+ case QProcess::FailedToStart:
+ case QProcess::Crashed:
+ case QProcess::Timedout:
+ case QProcess::ReadError:
+ case QProcess::WriteError:
+ case QProcess::UnknownError:
+ break;
+ default:
+ break;
+ }
+ }
+
+
--- a/coreapplicationuis/powersaveutilities/rom/powersaveutilities.iby Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-/*
-* Copyright (c) 2007-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: powesaveutilities files needed to image
-*
-*/
-
-
-#ifndef __POWERSAVEUTILITIES_IBY__
-#define __POWERSAVEUTILITIES_IBY__
-
-file=ABI_DIR\BUILD_DIR\BSUtil.dll SHARED_LIB_DIR\BSUtil.dll
-file=ABI_DIR\BUILD_DIR\batterypopupcontrol.dll SHARED_LIB_DIR\batterypopupcontrol.dll
-
-//ECOM_PLUGIN_UDEB( batindicatorpaneplugin.dll, batindicatorpaneplugin.rsc )
-ECOM_PLUGIN( batindicatorpaneplugin.dll, batindicatorpaneplugin.rsc )
-
-data=DATAZ_\ECOM_RESOURCE_DIR\batindicatorpaneplugin.rsc ECOM_RESOURCE_DIR\batindicatorpaneplugin.rsc
-data=DATAZ_\APP_RESOURCE_DIR\batterypopupcontrol.mif APP_RESOURCE_DIR\batterypopupcontrol.mif
-
-#endif // __POWERSAVEUTILITIES_IBY__
-
--- a/coreapplicationuis/powersaveutilities/rom/powersaveutilitiesresources.iby Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +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: powesaveutilities resources
-*
-*/
-
-
-#ifndef __POWERSAVEUTILITIES_RESOURCES_IBY__
-#define __POWERSAVEUTILITIES_RESOURCES_IBY__
-
-data=DATAZ_\ECOM_RESOURCE_DIR\batindpaneplugin.rsc ECOM_RESOURCE_DIR\batindpaneplugin.rsc
-
-
-#endif // __POWERSAVEUTILITIES_RESOURCES_IBY__
-
--- a/coreapplicationuis/rfsplugins/AIRFSPlugin/group/AIRFSPlugin.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/rfsplugins/AIRFSPlugin/group/AIRFSPlugin.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -19,7 +19,7 @@
#include <platform_paths.hrh>
-TARGET AIRFSPlugin.dll
+TARGET airfsplugin.dll
TARGETTYPE PLUGIN
@@ -34,7 +34,7 @@
START RESOURCE 2000F8BD.rss
#ifdef SYMBIAN_SECURE_ECOM
- TARGET AIRFSPlugin.rsc
+ TARGET airfsplugin.rsc
#endif
END
@@ -45,4 +45,4 @@
MW_LAYER_SYSTEMINCLUDE
LIBRARY euser.lib // Base library
-LIBRARY ECom.lib // ECom library
+LIBRARY ecom.lib // ECom library
--- a/coreapplicationuis/rfsplugins/CertRFSPlugin/group/CertRFSPlugin.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/rfsplugins/CertRFSPlugin/group/CertRFSPlugin.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -19,7 +19,7 @@
#include <platform_paths.hrh>
-TARGET CertRFSPlugin.dll
+TARGET certrfsplugin.dll
TARGETTYPE PLUGIN
@@ -34,7 +34,7 @@
START RESOURCE 2000F8B9.rss
#ifdef SYMBIAN_SECURE_ECOM
- TARGET CertRFSPlugin.rsc
+ TARGET certrfsplugin.rsc
#endif
END
@@ -45,4 +45,4 @@
MW_LAYER_SYSTEMINCLUDE
LIBRARY euser.lib // Base library
-LIBRARY ECom.lib // ECom library
+LIBRARY ecom.lib // ECom library
--- a/coreapplicationuis/rfsplugins/ClockRFSPlugin/group/ClockRFSPlugin.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/rfsplugins/ClockRFSPlugin/group/ClockRFSPlugin.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -19,7 +19,7 @@
#include <platform_paths.hrh>
-TARGET ClockRFSPlugin.dll
+TARGET clockrfsplugin.dll
TARGETTYPE PLUGIN
@@ -34,7 +34,7 @@
START RESOURCE 2000F8BE.rss
#ifdef SYMBIAN_SECURE_ECOM
- TARGET ClockRFSPlugin.rsc
+ TARGET clockrfsplugin.rsc
#endif
END
@@ -45,4 +45,4 @@
MW_LAYER_SYSTEMINCLUDE
LIBRARY euser.lib // Base library
-LIBRARY ECom.lib // ECom library
+LIBRARY ecom.lib // ECom library
--- a/coreapplicationuis/rfsplugins/DatastoreRFSPlugin/group/DatastoreRFSPlugin.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/rfsplugins/DatastoreRFSPlugin/group/DatastoreRFSPlugin.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -19,7 +19,7 @@
#include <platform_paths.hrh>
-TARGET DatastoreRFSPlugin.dll
+TARGET datastorerfsplugin.dll
TARGETTYPE PLUGIN
@@ -34,7 +34,7 @@
START RESOURCE 2000F8C2.rss
#ifdef SYMBIAN_SECURE_ECOM
- TARGET DatastoreRFSPlugin.rsc
+ TARGET datastorerfsplugin.rsc
#endif
END
@@ -45,4 +45,4 @@
MW_LAYER_SYSTEMINCLUDE
LIBRARY euser.lib // Base library
-LIBRARY ECom.lib // ECom library
+LIBRARY ecom.lib // ECom library
--- a/coreapplicationuis/rfsplugins/DefaultFolderRFSPlugin/group/DefaultFolderRFSPlugin.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/rfsplugins/DefaultFolderRFSPlugin/group/DefaultFolderRFSPlugin.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -19,7 +19,7 @@
#include <platform_paths.hrh>
-TARGET DefaultFolderRFSPlugin.dll
+TARGET defaultfolderrfsplugin.dll
TARGETTYPE PLUGIN
@@ -34,7 +34,7 @@
START RESOURCE 2000F8BA.rss
#ifdef SYMBIAN_SECURE_ECOM
- TARGET DefaultFolderRFSPlugin.rsc
+ TARGET defaultfolderrfsplugin.rsc
#endif
END
@@ -45,4 +45,4 @@
MW_LAYER_SYSTEMINCLUDE
LIBRARY euser.lib // Base library
-LIBRARY ECom.lib // ECom library
+LIBRARY ecom.lib // ECom library
--- a/coreapplicationuis/rfsplugins/DisplayContrastPlugin/group/RfsDisplayContrastPlugin.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/rfsplugins/DisplayContrastPlugin/group/RfsDisplayContrastPlugin.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -19,7 +19,7 @@
#include <platform_paths.hrh>
-TARGET RfsDisplayContrastPlugin.dll
+TARGET rfsdisplaycontrastplugin.dll
TARGETTYPE PLUGIN
@@ -34,7 +34,7 @@
START RESOURCE 102071F7.rss
#ifdef SYMBIAN_SECURE_ECOM
- TARGET RfsDisplayContrastPlugin.rsc
+ TARGET rfsdisplaycontrastplugin.rsc
#endif
END
@@ -44,5 +44,5 @@
MW_LAYER_SYSTEMINCLUDE
LIBRARY euser.lib // Base library
-LIBRARY ECom.lib // ECom library
+LIBRARY ecom.lib // ECom library
LIBRARY hal.lib // HAL library
\ No newline at end of file
Binary file coreapplicationuis/rfsplugins/FavouritesRFSPlugin/cenrep/keys_favouritesplugin.xls has changed
Binary file coreapplicationuis/rfsplugins/FavouritesRFSPlugin/conf/favouritesplugin.confml has changed
Binary file coreapplicationuis/rfsplugins/FavouritesRFSPlugin/conf/favouritesplugin_2000F8EF.crml has changed
--- a/coreapplicationuis/rfsplugins/FavouritesRFSPlugin/group/FavouritesRFSPlugin.mmp Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-/*
-* Copyright (c) 2005 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:
-*
-*
-*/
-
-
-#include <platform_paths.hrh>
-
-TARGET FavouritesRFSPlugin.dll
-
-TARGETTYPE PLUGIN
-
-CAPABILITY CAP_ECOM_PLUGIN
-VENDORID VID_DEFAULT
-
-UID 0x10009D8D 0x102071F6
-
-SOURCEPATH ../src
-SOURCE FavouritesRFSPlugin.cpp
-SOURCE Proxy.cpp
-
-START RESOURCE 102071F6.rss
-#ifdef SYMBIAN_SECURE_ECOM
- TARGET FavouritesRFSPlugin.rsc
-#endif
-END
-
-LANG SC
-
-USERINCLUDE ../inc
-
-MW_LAYER_SYSTEMINCLUDE
-
-LIBRARY euser.lib // Base library
-LIBRARY ECom.lib // ECom library
-LIBRARY FavouritesEngine.lib // Favourites engine library
--- a/coreapplicationuis/rfsplugins/FavouritesRFSPlugin/group/bld.inf Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/*
-* Copyright (c) 2005 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:
-* This file provides the information required for building RFS Favourites
-* plugin
-*
-*/
-
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-
-PRJ_MMPFILES
-
-../group/FavouritesRFSPlugin.mmp
-
-PRJ_EXPORTS
-../conf/favouritesplugin.confml APP_LAYER_CONFML(favouritesplugin.confml)
-../conf/favouritesplugin_2000F8EF.crml APP_LAYER_CRML(favouritesplugin_2000F8EF.crml)
-
-PRJ_TESTMMPFILES
--- a/coreapplicationuis/rfsplugins/FavouritesRFSPlugin/inc/FavouritesRFSPlugin.h Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,90 +0,0 @@
-/*
-* Copyright (c) 2005 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:
-*
-*
-*/
-
-
-#ifndef FAVOURITESRFSPLUGIN_H
-#define FAVOURITESRFSPLUGIN_H
-
-// INCLUDES
-#include <e32base.h>
-#include <rfsApMapper.h>
-#include "rfsPlugin.h"
-
-// CLASS DECLARATION
-
-class CFavouritesRFSPlugin: public CRFSPlugin, public MRfsApMapper
- {
-public:
-
- /**
- * Two-phased constructor.
- * @param aInitParams initial parameters
- */
- static CFavouritesRFSPlugin* NewL(TAny* aInitParams);
-
- /**
- * Destructor.
- */
- virtual ~CFavouritesRFSPlugin();
-
- /**
- *
- * @param
- */
- void RestoreFactorySettingsL( const TRfsReason aType );
-
- /**
- *
- * @param
- */
- void GetScriptL( const TRfsReason aType, TDes& aPath );
-
- /**
- *
- * @param
- */
- void ExecuteCustomCommandL( const TRfsReason aType, TDesC& aCommand );
-
-public: // from MRfsApMapper
-
- TBool MapAccessPoint( TUint aOldUid, TUint& aNewUid );
-
-private:
-
- /**
- * C++ default constructor.
- */
- CFavouritesRFSPlugin();
-
- /**
- * Constructor.
- * @param aInitParams initial parameters
- */
- CFavouritesRFSPlugin(TAny* aInitParams);
-
- /**
- * Constructor
- */
- void ConstructL();
- };
-
-
-
-#endif // FAVOURITESRFSPLUGIN_H
-
-// End of File
--- a/coreapplicationuis/rfsplugins/FavouritesRFSPlugin/inc/FavouritesRFSPluginPrivateCRKeys.h Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-/*
-* Copyright (c) 2007 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: Private Central Repository keys.
-*
-*
-*/
-
-
-#ifndef __FAVOURITESRFSPLUGINPRIVATECRKEYS_H__
-#define __FAVOURITESRFSPLUGINPRIVATECRKEYS_H__
-
-const TUid KCRUidFavouritesRFSPlugin = {0x2000F8EF};
-
-/*
- * Used to store init RFS scripts of FavouritesPlugin
- */
-const TUint32 KInitFavouritesRFSPlugin = 0x00000001;
-
-#endif // __FAVOURITESRFSPLUGINPRIVATECRKEYS_H__
--- a/coreapplicationuis/rfsplugins/FavouritesRFSPlugin/src/102071F6.rss Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-/*
-* 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:
-*
-*
-*/
-
-
-#include "ecom/registryinfo.rh"
-
-// Declares info for two implementations
-RESOURCE REGISTRY_INFO theInfo
- {
- // UID for the DLL
- dll_uid = 0x102071F6;
- // Declare array of interface info
- interfaces =
- {
- INTERFACE_INFO
- {
- // UID of interface that is implemented
- interface_uid = 0x102073BB;
- implementations =
- {
- // Info for CSrcsBTConnection
- IMPLEMENTATION_INFO
- {
- implementation_uid = 0x102073BE;
- version_no = 1;
- display_name = "FavouritesRFSPlugin";
- default_data = "NI"; // N = Normal RFS, D = Deep RFS, I = Init RFS (FirstBoot RFS)
- opaque_data = "";
- }
- };
- }
- };
- }
-
--- a/coreapplicationuis/rfsplugins/FavouritesRFSPlugin/src/FavouritesRFSPlugin.cpp Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,123 +0,0 @@
-/*
-* Copyright (c) 2005 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:
-*
-*/
-
-
-// INCLUDE FILES
-#include <favouritesdb.h>
-#include <favouriteslimits.h>
-#include "FavouritesRFSPluginPrivateCRKeys.h"
-#include "FavouritesRFSPlugin.h"
-
-_LIT( KRfsDefaultBookmarkDbPath, "Z:\\private\\10008D38\\DBS_101FD685_BrowserBookmarks.db" );
-
-const TInt KHexLength = 8;
-// ================= MEMBER FUNCTIONS =======================
-
-// C++ default constructor can NOT contain any code, that
-// might leave.
-//
-CFavouritesRFSPlugin::CFavouritesRFSPlugin()
- {
- }
-
-CFavouritesRFSPlugin::CFavouritesRFSPlugin(TAny* /*aInitParams*/)
- {
- }
-
-// Destructor
-CFavouritesRFSPlugin::~CFavouritesRFSPlugin()
- {
- }
-
-// ---------------------------------------------------------
-// NewL
-// ---------------------------------------------------------
-//
-CFavouritesRFSPlugin* CFavouritesRFSPlugin::NewL(TAny* aInitParams)
- {
- #ifdef _DEBUG
- RDebug::Print(_L("CFavouritesRFSPlugin::NewL()"));
- #endif
- CFavouritesRFSPlugin* self = new (ELeave) CFavouritesRFSPlugin(aInitParams);
- CleanupStack::PushL(self);
- self->ConstructL();
- CleanupStack::Pop();
- return self;
- }
-
-
-// ---------------------------------------------------------
-// ConstructL
-// ---------------------------------------------------------
-//
-void CFavouritesRFSPlugin::ConstructL()
- {
- #ifdef _DEBUG
- RDebug::Print(_L("CFavouritesRFSPlugin::ConstructL()"));
- #endif
- }
-
-void CFavouritesRFSPlugin::RestoreFactorySettingsL( const TRfsReason aType )
- {
- #ifdef _DEBUG
- RDebug::Print(_L("CFavouritesRFSPlugin::RestoreFactorySettingsL(%d)"), aType);
- #endif
- if (aType == ENormalRfs)
- {
- RFavouritesDb::RestoreFactorySettingsL(KBrowserBookmarks, KRfsDefaultBookmarkDbPath, *this );
- }
- #ifdef _DEBUG
- RDebug::Print(_L("CFavouritesRFSPlugin::RestoreFactorySettingsL: End"));
- #endif
- }
-
-void CFavouritesRFSPlugin::GetScriptL( const TRfsReason aType, TDes& aPath )
- {
- if (aType == EInitRfs)
- {
- // Add CenRep UID and key
- TUid hexuid(KCRUidFavouritesRFSPlugin);
- TUint32 hexkey(KInitFavouritesRFSPlugin);
- HBufC* hbuf = HBufC::New( KMaxPath );
- TPtr buf = hbuf->Des();
- buf.Zero();
- buf.AppendNumFixedWidthUC( hexuid.iUid, EHex, KHexLength );
- buf.Append(_L(":"));
- buf.AppendNumFixedWidthUC( hexkey, EHex, KHexLength );
- buf.Append(_L(";"));
- RDebug::Print( buf );
- aPath.Copy( buf );
- delete hbuf;
- }
- }
-
-void CFavouritesRFSPlugin::ExecuteCustomCommandL( const TRfsReason /*aType*/,
- TDesC& aCommand )
- {
- #ifdef _DEBUG
- RDebug::Print(_L("CFavouritesRFSPlugin::ExecuteCustomCommandL"));
- RDebug::Print(_L("CFavouritesRFSPlugin::ExecuteCustomCommandL Command: %S"), &aCommand);
- #endif
- }
-
-TBool CFavouritesRFSPlugin::MapAccessPoint( TUint aOldUid, TUint& aNewUid )
- {
- aNewUid = aOldUid;
- return ETrue;
- }
-
-// End of file
--- a/coreapplicationuis/rfsplugins/FavouritesRFSPlugin/src/Proxy.cpp Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-/*
-* Copyright (c) 2005 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:
-* This class export ECom interface implementations.
-*
-*/
-
-
-#include <e32std.h>
-#include <ecom/implementationproxy.h>
-
-#include "FavouritesRFSPlugin.h"
-
-// Map the interface UIDs to implementation factory functions
-const TImplementationProxy ImplementationTable[] =
- {
- IMPLEMENTATION_PROXY_ENTRY(0x102073BE, CFavouritesRFSPlugin::NewL)
- };
-
-// Exported proxy for instantiation method resolution
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy(TInt& aTableCount)
- {
- aTableCount = sizeof(ImplementationTable) / sizeof(TImplementationProxy);
-
- return ImplementationTable;
- }
-
--- a/coreapplicationuis/rfsplugins/FormatterRFSPlugin/src/selectiveformatter.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/rfsplugins/FormatterRFSPlugin/src/selectiveformatter.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -130,7 +130,7 @@
HandleAppExcludeListsL();
// Handle NR-Applications
- HandleNrExcludeListsL();
+ //HandleNrExcludeListsL();
if( !iValidExcludeListFound )
{
--- a/coreapplicationuis/rfsplugins/NitzRFSPlugin/group/NitzRFSPlugin.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/rfsplugins/NitzRFSPlugin/group/NitzRFSPlugin.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -19,7 +19,7 @@
#include <platform_paths.hrh>
-TARGET NitzRFSPlugin.dll
+TARGET nitzrfsplugin.dll
TARGETTYPE PLUGIN
@@ -34,7 +34,7 @@
START RESOURCE 2000F8BF.rss
#ifdef SYMBIAN_SECURE_ECOM
- TARGET NitzRFSPlugin.rsc
+ TARGET nitzrfsplugin.rsc
#endif
END
@@ -45,4 +45,4 @@
MW_LAYER_SYSTEMINCLUDE
LIBRARY euser.lib // Base library
-LIBRARY ECom.lib // ECom library
+LIBRARY ecom.lib // ECom library
--- a/coreapplicationuis/rfsplugins/SIPRFSPlugin/group/SipRFSPlugin.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/rfsplugins/SIPRFSPlugin/group/SipRFSPlugin.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -19,7 +19,7 @@
#include <platform_paths.hrh>
-TARGET SIPRFSPlugin.dll
+TARGET siprfsplugin.dll
TARGETTYPE PLUGIN
@@ -34,7 +34,7 @@
START RESOURCE 2001959D.rss
#ifdef SYMBIAN_SECURE_ECOM
- TARGET SIPRFSPlugin.rsc
+ TARGET siprfsplugin.rsc
#endif
END
@@ -45,4 +45,4 @@
MW_LAYER_SYSTEMINCLUDE
LIBRARY euser.lib // Base library
-LIBRARY ECom.lib // ECom library
+LIBRARY ecom.lib // ECom library
--- a/coreapplicationuis/rfsplugins/StarterRFSPlugin/group/StarterRFSPlugin.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/rfsplugins/StarterRFSPlugin/group/StarterRFSPlugin.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -19,7 +19,7 @@
#include <platform_paths.hrh>
-TARGET StarterRFSPlugin.dll
+TARGET starterrfsplugin.dll
TARGETTYPE PLUGIN
@@ -34,7 +34,7 @@
START RESOURCE 2000F8BB.rss
#ifdef SYMBIAN_SECURE_ECOM
- TARGET StarterRFSPlugin.rsc
+ TARGET starterrfsplugin.rsc
#endif
END
@@ -45,4 +45,4 @@
MW_LAYER_SYSTEMINCLUDE
LIBRARY euser.lib // Base library
-LIBRARY ECom.lib // ECom library
+LIBRARY ecom.lib // ECom library
--- a/coreapplicationuis/rfsplugins/SyncMLRFSPlugin/group/SyncMLRFSPlugin.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/rfsplugins/SyncMLRFSPlugin/group/SyncMLRFSPlugin.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -19,7 +19,7 @@
#include <platform_paths.hrh>
-TARGET SyncMLRFSPlugin.dll
+TARGET syncmlrfsplugin.dll
TARGETTYPE PLUGIN
@@ -34,7 +34,7 @@
START RESOURCE 2000F8BC.rss
#ifdef SYMBIAN_SECURE_ECOM
- TARGET SyncMLRFSPlugin.rsc
+ TARGET syncmlrfsplugin.rsc
#endif
END
@@ -45,4 +45,4 @@
MW_LAYER_SYSTEMINCLUDE
LIBRARY euser.lib // Base library
-LIBRARY ECom.lib // ECom library
+LIBRARY ecom.lib // ECom library
--- a/coreapplicationuis/rfsplugins/TelephonyRFSPlugin/group/TelephonyRFSPlugin.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/rfsplugins/TelephonyRFSPlugin/group/TelephonyRFSPlugin.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -19,7 +19,7 @@
#include <platform_paths.hrh>
-TARGET TelephonyRFSPlugin.dll
+TARGET telephonyrfsplugin.dll
TARGETTYPE PLUGIN
@@ -34,7 +34,7 @@
START RESOURCE 2000F8C1.rss
#ifdef SYMBIAN_SECURE_ECOM
- TARGET TelephonyRFSPlugin.rsc
+ TARGET telephonyrfsplugin.rsc
#endif
END
@@ -45,4 +45,4 @@
MW_LAYER_SYSTEMINCLUDE
LIBRARY euser.lib // Base library
-LIBRARY ECom.lib // ECom library
+LIBRARY ecom.lib // ECom library
--- a/coreapplicationuis/rfsplugins/UnitconverterRFSPlugin/group/UnitconverterRFSPlugin.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/rfsplugins/UnitconverterRFSPlugin/group/UnitconverterRFSPlugin.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -19,7 +19,7 @@
#include <platform_paths.hrh>
-TARGET UnitconverterRFSPlugin.dll
+TARGET unitconverterrfsplugin.dll
TARGETTYPE PLUGIN
@@ -34,7 +34,7 @@
START RESOURCE 2000F8C0.rss
#ifdef SYMBIAN_SECURE_ECOM
- TARGET UnitconverterRFSPlugin.rsc
+ TARGET unitconverterrfsplugin.rsc
#endif
END
@@ -45,4 +45,4 @@
MW_LAYER_SYSTEMINCLUDE
LIBRARY euser.lib // Base library
-LIBRARY ECom.lib // ECom library
+LIBRARY ecom.lib // ECom library
--- a/coreapplicationuis/rfsplugins/group/bld.inf Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/rfsplugins/group/bld.inf Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* 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"
@@ -13,6 +13,16 @@
*
* Description: Build information file for RFS plugins.
*
+* Copyright (c) 2008 Nokia Corporation.
+* This material, including documentation and any related
+* computer programs, is protected by copyright controlled by
+* Nokia Corporation. All rights are reserved. Copying,
+* including reproducing, storing, adapting or translating, any
+* or all of this material requires the prior written consent of
+* Nokia Corporation. This material also contains confidential
+* information which may not be disclosed to others without the
+* prior written consent of Nokia Corporation.
+* ==============================================================================
*/
#include <platform_paths.hrh>
@@ -27,7 +37,6 @@
#include "../AIRFSPlugin/group/bld.inf"
#include "../DisplayContrastPlugin/group/bld.inf"
-#include "../FavouritesRFSPlugin/group/bld.inf"
#include "../CertRFSPlugin/group/bld.inf"
#include "../ClockRFSPlugin/group/bld.inf"
#include "../DatastoreRFSPlugin/group/bld.inf"
--- a/coreapplicationuis/rfsplugins/msgcentrerfsplugin/group/msgcentrerfsplugin.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/rfsplugins/msgcentrerfsplugin/group/msgcentrerfsplugin.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -44,4 +44,4 @@
LIBRARY eikcore.lib // Eikon library
LIBRARY euser.lib // Base library
LIBRARY cone.lib // Control environment library
-LIBRARY muiu.lib // For message centre reset
+LIBRARY muiuutils.lib // For message centre reset
--- a/coreapplicationuis/rfsplugins/rom/RFSPlugins.iby Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/rfsplugins/rom/RFSPlugins.iby Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* 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"
@@ -26,7 +26,6 @@
ECOM_PLUGIN(DatastoreRFSPlugin.dll,2000F8C2.rsc)
ECOM_PLUGIN(DefaultFolderRFSPlugin.dll,2000F8BA.rsc)
ECOM_PLUGIN(RfsDisplayContrastPlugin.dll,102071F7.rsc)
-ECOM_PLUGIN(FavouritesRFSPlugin.dll,102071F6.rsc)
ECOM_PLUGIN(NitzRFSPlugin.dll,2000F8BF.rsc)
ECOM_PLUGIN(StarterRFSPlugin.dll,2000F8BB.rsc)
ECOM_PLUGIN(SyncMLRFSPlugin.dll,2000F8BC.rsc)
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/rfstestapp/data/rfstestapp.rss Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/rfstestapp/data/rfstestapp.rss Tue Aug 31 15:24:25 2010 +0300
@@ -21,8 +21,8 @@
#include <appinfo.rh>
#include <avkon.rh>
#include <avkon.rsg>
-//#include <commondialogs.hrh>
-//#include <commondialogs.rh>
+#include <commondialogs.hrh>
+#include <commondialogs.rh>
#include <eikon.rh>
#include <avkon.loc>
#include "rfstestappcmds.hrh"
@@ -120,19 +120,17 @@
// r_rfstestapp_memory_selection
// ---------------------------------------------------------------------------
//
-/*
RESOURCE MEMORYSELECTIONDIALOG r_rfstestapp_memory_selection
{
title = "";
softkey_1 = "Ok";
}
-*/
+
// ---------------------------------------------------------------------------
// r_rfstestapp_specfile_selection
// ---------------------------------------------------------------------------
//
-/*
RESOURCE FILESELECTIONDIALOG r_rfstestapp_specfile_selection
{
title = "Select Data Specification File";
@@ -149,14 +147,13 @@
filter_data = { "*.spc" };
}
};
- }*/
+ }
// ---------------------------------------------------------------------------
// r_rfstestapp_excludelist_selection
// ---------------------------------------------------------------------------
//
-/*
RESOURCE FILESELECTIONDIALOG r_rfstestapp_excludelist_selection
{
title = "Select Exclude List File";
@@ -174,7 +171,7 @@
}
};
}
-*/
+
// ---------------------------------------------------------------------------
// r_rfstestapp_progress
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/rfstestapp/src/rfstestappui.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/rfstestapp/src/rfstestappui.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -16,9 +16,9 @@
*/
-//#include <akncommondialogsdynmem.h>
+#include <akncommondialogsdynmem.h>
#include <aknwaitdialog.h>
-//#include <commondialogs.hrh>
+#include <commondialogs.hrh>
#include <rfstestapp.rsg>
#include <aknlists.h>
#include <aknpopup.h>
@@ -63,13 +63,13 @@
TParsePtr parse( aPath );
TPtrC rootFolder = parse.DriveAndPath();
INFO_1( "Root folder for opening test files: %S", &rootFolder );
- TBool ret =ETrue;// = AknCommonDialogsDynMem::RunSelectDlgLD(
- //AknCommonDialogsDynMem::EMemoryTypePhone |
- //AknCommonDialogsDynMem::EMemoryTypeMMC,
- //aPath,
- //rootFolder,
- //R_RFSTESTAPP_MEMORY_SELECTION,
- //aResId );
+ TBool ret = AknCommonDialogsDynMem::RunSelectDlgLD(
+ AknCommonDialogsDynMem::EMemoryTypePhone |
+ AknCommonDialogsDynMem::EMemoryTypeMMC,
+ aPath,
+ rootFolder,
+ R_RFSTESTAPP_MEMORY_SELECTION,
+ aResId );
return ret;
}
@@ -234,7 +234,6 @@
HBufC* specFile = HBufC::NewLC( KMaxFileName );
TPtr specFileDes = specFile->Des();
specFileDes = aSpec;
- /*
if ( AskPathL( specFileDes, R_RFSTESTAPP_SPECFILE_SELECTION ) )
{
HBufC* excludeFile = HBufC::NewLC( KMaxFileName );
@@ -279,7 +278,7 @@
}
CleanupStack::PopAndDestroy( excludeFile );
- }*/
+ }
CleanupStack::PopAndDestroy( specFile );
}
--- a/coreapplicationuis/sensordatacompensatorplugin/group/bld.inf Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/sensordatacompensatorplugin/group/bld.inf Tue Aug 31 15:24:25 2010 +0300
@@ -23,13 +23,13 @@
PRJ_EXPORTS
-../data/sensordatacompensationui.rul /epoc32/data/Z/private/10282bc4/rules/sensordatacompensationui.rul
-../data/sensordatacompensationui.rul /epoc32/RELEASE/winscw/UDEB/Z/private/10282bc4/rules/sensordatacompensationui.rul
-../data/sensordatacompensationui.rul /epoc32/RELEASE/winscw/UREL/Z/private/10282bc4/rules/sensordatacompensationui.rul
+../data/sensordatacompensationui.rul /epoc32/data/z/private/10282bc4/rules/sensordatacompensationui.rul
+../data/sensordatacompensationui.rul /epoc32/release/winscw/udeb/z/private/10282bc4/rules/sensordatacompensationui.rul
+../data/sensordatacompensationui.rul /epoc32/release/winscw/urel/z/private/10282bc4/rules/sensordatacompensationui.rul
-../data/sensordatacompensationdevice.rul /epoc32/data/Z/private/10282bc4/rules/sensordatacompensationdevice.rul
-../data/sensordatacompensationdevice.rul /epoc32/RELEASE/winscw/UDEB/Z/private/10282bc4/rules/sensordatacompensationdevice.rul
-../data/sensordatacompensationdevice.rul /epoc32/RELEASE/winscw/UREL/Z/private/10282bc4/rules/sensordatacompensationdevice.rul
+../data/sensordatacompensationdevice.rul /epoc32/data/z/private/10282bc4/rules/sensordatacompensationdevice.rul
+../data/sensordatacompensationdevice.rul /epoc32/release/winscw/udeb/z/private/10282bc4/rules/sensordatacompensationdevice.rul
+../data/sensordatacompensationdevice.rul /epoc32/release/winscw/urel/z/private/10282bc4/rules/sensordatacompensationdevice.rul
../rom/sensordatacompensatorplugin.iby CORE_MW_LAYER_IBY_EXPORT_PATH( sensordatacompensatorplugin.iby )
--- a/coreapplicationuis/tsrc/public/basic/MT_PhoneCmdhandler/MT_CPhoneHandler.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/tsrc/public/basic/MT_PhoneCmdhandler/MT_CPhoneHandler.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -35,7 +35,7 @@
MW_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE /epoc32/include/platform/Digia/EUnit
+SYSTEMINCLUDE /epoc32/include/Digia/EUnit
LIBRARY EUnit.lib
LIBRARY EUnitUtil.lib
--- a/coreapplicationuis/tsrc/public/basic/MT_kefmapper/MT_kefmapper.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/tsrc/public/basic/MT_kefmapper/MT_kefmapper.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -35,7 +35,7 @@
MW_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE /epoc32/include/platform/Digia/EUnit
+SYSTEMINCLUDE /epoc32/include/Digia/EUnit
LIBRARY EUnit.lib
--- a/coreapplicationuis/tsrc/public/basic/group/MT_Rfs.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/tsrc/public/basic/group/MT_Rfs.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -32,7 +32,8 @@
USERINCLUDE ../MT_Rfs/Src .
MW_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE /epoc32/include/platform/Digia/EUnit
+
+SYSTEMINCLUDE /epoc32/include/Digia/EUnit
LIBRARY EUnit.lib
LIBRARY EUnitUtil.lib
Binary file filehandling/fileconverterfw/doc_pub/SGL.GT0093.110_How_To_Implement_and_use_a_file converter_objectv1.4.doc has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/filehandling/fileconverterfw/group/ConarcTest.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,31 @@
+;
+; 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:
+;
+
+;Languages
+&EN
+
+
+;Localised Vendor name
+%{"ConarcTest.pkg EN"}
+
+; Vendor name
+: "ConarcTest"
+
+
+"\epoc32\data\z\conarctest\conarctest_run.bat"-"c:\conarctest_run.bat"
+"\epoc32\data\z\conarctest\conarctest_t_b64cnv.script"-"c:\conarctest\conarctest_t_b64cnv.script"
+"\epoc32\data\z\conarctest\conarctest_t_cnf.script"-"c:\conarctest\conarctest_t_cnf.script"
+"\epoc32\data\z\conarctest\conarctest_t_loadecomcnv.script"-"c:\conarctest\conarctest_t_loadecomcnv.script"
Binary file filehandling/htmltorichtextconverter/doc_pub/CHTMLTOCRTCONVERTER test code.rtf has changed
--- a/filehandling/richtexttohtmlconverter/Group/BLD.INF Thu Aug 19 10:05:08 2010 +0300
+++ b/filehandling/richtexttohtmlconverter/Group/BLD.INF Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1997-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"
@@ -17,6 +17,7 @@
DEFAULT
PRJ_EXPORTS
+ ./RichTextToHtmlConv.iby /epoc32/rom/include/core/mw/richtexttohtmlconv.iby
./RichTextToHtmlConv.iby /epoc32/rom/include/richtexttohtmlconv.iby
PRJ_MMPFILES
--- a/layers.sysdef.xml Thu Aug 19 10:05:08 2010 +0300
+++ b/layers.sysdef.xml Tue Aug 31 15:24:25 2010 +0300
@@ -1,13 +1,13 @@
<?xml version="1.0"?>
-<!DOCTYPE SystemDefinition SYSTEM "sysdef_1_4_0.dtd" [
+<!DOCTYPE SystemDefinition SYSTEM "sysdef_1_5_1.dtd" [
<!ENTITY layer_real_source_path "sf/mw/appsupport" >
]>
-<SystemDefinition name="appsupport" schema="1.4.0">
+<SystemDefinition name="appsupport" schema="1.5.1">
<systemModel>
<layer name="mw_layer">
<module name="appsupport">
- <unit unitID="sydo.appsupport" name="appsupport" bldFile="&layer_real_source_path;/group" mrp="" />
+ <unit unitID="sydo.appsupport" name="appsupport" bldFile="&layer_real_source_path;" mrp="" proFile="appsupport.pro"/>
</module>
<module name="">
<unit unitID="sydo.appsupport.appsupport_plat.flash_mmi_service_interface_custom_api" name="sydo_appsupport_appsupport_plat_flash_mmi_service_interface_custom_api" bldFile="&layer_real_source_path;/appsupport_plat/flash_mmi_service_interface_custom_api/group" mrp="" filter="!sf_build" />
--- a/mediakeys/KeyPublisherPlugin/group/KeyPublisherPlugin.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/mediakeys/KeyPublisherPlugin/group/KeyPublisherPlugin.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -18,7 +18,7 @@
#include <platform_paths.hrh>
-TARGET KeyPublisherPlugin.DLL
+TARGET keypublisherplugin.dll
TARGETTYPE ani
UID 0x10003B22 0x1020724B
--- a/mediakeys/MMKeyBearer/group/MMKeyBearer.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/mediakeys/MMKeyBearer/group/MMKeyBearer.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2002-2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-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"
@@ -21,7 +21,7 @@
#include <platform_paths.hrh>
-TARGET MMKeyBearer.dll
+TARGET mmkeybearer.dll
// CAPABILITY CAP_ECOM_PLUGIN
// capabilities are required as that of remconbearerplugin.dll
@@ -41,7 +41,7 @@
SOURCEPATH .
START RESOURCE 10207235.rss
-target MMKeyBearer.rsc
+target mmkeybearer.rsc
END
@@ -52,15 +52,14 @@
MW_LAYER_SYSTEMINCLUDE
LIBRARY euser.lib
-LIBRARY ECom.lib
+LIBRARY ecom.lib
LIBRARY c32.lib
LIBRARY remconbearerplugin.lib
LIBRARY remcontypes.lib
LIBRARY flogger.lib
-LIBRARY avkon.lib
-LIBRARY akncapserverclient.lib
LIBRARY apparc.lib
LIBRARY eikcore.lib
+LIBRARY lockclient.lib
#include <comms-infras/commsdebugutility.mmh>
#include "../../group/mediakeys.mmh"
--- a/mediakeys/MMKeyBearer/inc/MMKeyBearerImplementation.h Thu Aug 19 10:05:08 2010 +0300
+++ b/mediakeys/MMKeyBearer/inc/MMKeyBearerImplementation.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2005 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-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"
@@ -26,7 +26,9 @@
#include <remcon/remconbearerplugin.h>
#include <remcon/remconbearerinterface.h>
#include <remcon/messagetype.h>
-#include <AknCapServerClient.h>
+#include <keyguardaccessapi.h>
+
+
#include "MMKeyBearerObserverPS.h"
@@ -155,8 +157,7 @@
RProperty iProperty;
// For keylock interaction
- RAknUiServer iAknServer;
- TBool iAknServerConnected;
- };
+ CKeyguardAccessApi* iKeyguardAccess;
+ };
#endif // __MMKEYBEARERIMPLEMENTATION_H__
--- a/mediakeys/MMKeyBearer/src/MMKeyBearerImplementation.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/mediakeys/MMKeyBearer/src/MMKeyBearerImplementation.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -26,6 +26,7 @@
#include <UsbWatcherInternalPSKeys.h>
#include <usbpersonalityids.h>
#include <PSVariables.h> // Property values
+#include <keyguardaccessapi.h>
// Include this once it is exported
// #include <RemConExtensionApi.h>
@@ -74,7 +75,7 @@
delete iMediaKeyObserver;
delete iAccessoryVolKeyObserver;
delete iUSBFileTransferObserver;
- iAknServer.Close();
+ delete iKeyguardAccess;
}
// ---------------------------------------------------------
@@ -84,11 +85,10 @@
//
CMMKeyBearer::CMMKeyBearer(TBearerParams& aParams)
: CRemConBearerPlugin(aParams),
- iUSBFileTransfer(KUsbWatcherSelectedPersonalityNone),
- iAknServerConnected(EFalse)
+ iUSBFileTransfer(KUsbWatcherSelectedPersonalityNone)
{
FUNC_LOG;
-
+
//Pass
}
@@ -105,6 +105,7 @@
TRemConAddress addr;
addr.BearerUid() = Uid();
TInt err = Observer().ConnectIndicate(addr);
+ iKeyguardAccess = CKeyguardAccessApi::NewL();
// Start Active object for listening key events from P&S
TRAP_AND_LEAVE(
@@ -342,12 +343,6 @@
INFO_3( "Received key: enumValue = %d, keyType = %d, usbFileTransfer = %d",
aEnumValue, aKeyType, iUSBFileTransfer );
- //Start the listener once again
- if (aKeyType == ESideVolumeKeys)
- {
- iMMKeyBearerObserver->Start();
- }
-
// Mediakeys must be disabled when MTP (Music Transfer) is happening.
if (aKeyType == EFileTransferStatus)
{
@@ -367,25 +362,20 @@
// If events are from accessory device,then do not check for keypadlock
if (aKeyType != EAccessoryVolumeKeys && aKeyType != ESideVolumeKeys )
{
- TBool keysLocked = EFalse;
- if (!(iAknServerConnected)) // Connect to server for first time
+
+ TInt err=iKeyguardAccess->ShowKeysLockedNote();
+
+ if (err==KErrNone)
{
- if(iAknServer.Connect() == KErrNone)
- {
- iAknServerConnected = ETrue;
- }
- else if (aKeyType == EMediaKeys) // If connection fails, then return
+ // Device is locked , Discard the key event
+
+ //Start the listener once again
+
+ if (aKeyType == EMediaKeys)
{
iMediaKeyObserver->Start();
- return ;
}
- }
- iAknServer.ShowKeysLockedNote(keysLocked);
- if (keysLocked && aKeyType == EMediaKeys)
- {
- // Device is locked , Discard the key event
- iMediaKeyObserver->Start();
return;
}
}
@@ -418,7 +408,11 @@
TInt aError = Observer().NewCommand(addr);
//Start the listener once again
- if (aKeyType == EMediaKeys)
+ if (aKeyType == ESideVolumeKeys)
+ {
+ iMMKeyBearerObserver->Start();
+ }
+ else if (aKeyType == EMediaKeys)
{
iMediaKeyObserver->Start();
}
--- a/printingsupport/printinguisupport/group/BLD.INF Thu Aug 19 10:05:08 2010 +0300
+++ b/printingsupport/printinguisupport/group/BLD.INF Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 1999-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1999-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"
@@ -31,7 +31,7 @@
// specify the source file followed by its destination here
// copy will be used to copy the source file to its destination
// If there's no destination then the source file will be copied
-// to the same name in \epoc32\include
+// to the same name in /epoc32/include
../inc/PRNINF.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(prninf.h)
../inc/PRNPREV.H SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(prnprev.h)
--- a/printingsupport/printinguisupport/group/print.iby Thu Aug 19 10:05:08 2010 +0300
+++ b/printingsupport/printinguisupport/group/print.iby Tue Aug 31 15:24:25 2010 +0300
@@ -18,7 +18,7 @@
#ifndef __PRINT_IBY__
#define __PRINT_IBY__
-#ifdef SYMBIAN_EXCLUDE_PRINT
+#ifndef __UPNP_PRINT_FRAMEWORK
REM Feature PRINT is not included in this ROM
#else
REM Print
--- a/printingsupport/printinguisupport/inc/PRNSETUP.H Thu Aug 19 10:05:08 2010 +0300
+++ b/printingsupport/printinguisupport/inc/PRNSETUP.H Tue Aug 31 15:24:25 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1997-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"
@@ -29,10 +29,6 @@
#include <prninf.h>
#endif
-#ifndef SYMBIAN_ENABLE_MIXED_HEADERS
-#include <printinguisupport/prnpath.h>
-#endif
-
/**
@publishedAll
@released */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sensorsupport/testsensor/data/ssyreference_config_template.xml Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,149 @@
+<!-- ssyreference_config_template.xml -->
+<!-- SsyReference configuration file template -->
+<!-- ************************************************************* -->
+<!-- * NOTE. DO NOT LEAVE ANY COMMENTS IN THE ACTUAL CONFIG FILE * -->
+<!-- ************************************************************* -->
+<SsyReferenceConfig>
+ <SsyGeneralInformation>
+ <!-- General information for SSY itself -->
+ <Properties>
+ <!-- General properties of the sensor -->
+ <!-- TSensrvProperty. Each property has its own item defined in here -->
+
+ <!-- Property example 1 -->
+ <PropertyItem PropertyId="TSensrvPropertyId"
+ ItemIndex="Item index in channel data structure"
+ PropertyValue="Value of the property"
+ MaxValue="Maximum value of data"
+ MinValue="Minimum value of data"
+ ReadOnly="Read only or modifiable"
+ PropertyType="TSensrvPropertyType">
+ </PropertyItem>
+ <!-- Property example 2 -->
+ <PropertyItem PropertyId="TSensrvPropertyId"
+ ItemIndex="Item index in channel data structure"
+ PropertyValue="Value of the property"
+ MaxValue="Maximum value of data"
+ MinValue="Minimum value of data"
+ ReadOnly="Read only or modifiable"
+ PropertyType="TSensrvPropertyType">
+ </PropertyItem>
+ </Properties>
+ </SsyGeneralInformation>
+ <ChannelInformationGroup ChannelCount="2">
+ <!-- Channel definitions. Each channel item contains all information of one channel -->
+ <!-- Channel example 1 -->
+ <ChannelItem
+ ChannelId="This value is updated runtime when Sensrv has defined channel IDs"
+ ContextType="TSensrvContextType"
+ Quantity="TSensrvQuantity"
+ ChannelType="TSensrvChannelTypeId"
+ Location="Location of the sensor"
+ Vendor="Vendor ID"
+ DataTypeId="data type ID identifies data type defined here. See sensrvchanneldatatypes.h">
+ <!-- One channel definition. Each channel has its own item block -->
+ <!-- TSensrvChannelInfo. Contains information of this channel; Context type, Quantity etc. -->
+
+ <!-- Contains properties of this channel. -->
+ <Properties>
+ <!-- TSensrvProperty. Each property has its own item defined in here -->
+ <!-- Property example 3 -->
+ <PropertyItem PropertyId="TSensrvPropertyId"
+ ItemIndex="Item index in channel data structure"
+ PropertyValue="Value of the property"
+ MaxValue="Maximum value of data"
+ MinValue="Minimum value of data"
+ ReadOnly="Read only or modifiable"
+ PropertyType="TSensrvPropertyType">
+ </PropertyItem>
+ <!-- Property example 4 -->
+ <PropertyItem PropertyId="TSensrvPropertyId"
+ ItemIndex="Item index in channel data structure"
+ PropertyValue="Value of the property"
+ MaxValue="Maximum value of data"
+ MinValue="Minimum value of data"
+ ReadOnly="Read only or modifiable"
+ PropertyType="TSensrvPropertyType">
+ </PropertyItem>
+ </Properties>
+
+ <!-- Channel data. Information of generated data by this channel. -->
+ <!-- There may be several different (yet same type) data items. Next data item is added to -->
+ <!-- buffer after the previous data items (all according to count) are added and last Interval is passed -->
+
+ <ChannelData StartIntervalMs="Time in milliseconds to start filling buffer after StartChannelData()">
+ <ChannelDataItem DataTypeId="data type ID identifies data type defined here. See sensrvchanneldatatypes.h" count="Number of this data items to be added into buffer (with the same values)"
+ IntervalMs="Time in milliseconds after next data item is added into buffer">
+ <!-- Content of this channel item is dependent on the type of this channel. It must be one and only one of the following -->
+ <SsyRefChannelDataAxis XAxis="Integer value of X Axis" YAxis="Integer value of Y Axis" ZAxis="Integer value of Z Axis" ><!-- This type has DataTypeID 0x00010001 --></SsyRefChannelDataAxis>
+ <SsyRefChannelDataTapping Direction="direction of tapping"><!-- This type has DataTypeID 0x00010002 --></SsyRefChannelDataTapping>
+ </ChannelDataItem>
+
+ <!-- Next channel data item -->
+ <ChannelDataItem DataTypeId="data type ID identifies data type defined here. See sensrvchanneldatatypes.h" count="Number of this data items to be added into buffer (with the same values)"
+ IntervalMs="Time in milliseconds after next data item is added into buffer">
+ <!-- Content of this channel item is dependent on the type of this channel. It must be one and only one of the following -->
+ <SsyRefChannelDataAxis XAxis="Integer value of X Axis" YAxis="Integer value of Y Axis" ZAxis="Integer value of Z Axis" ><!-- This type has DataTypeID 0x00010001 --></SsyRefChannelDataAxis>
+ <SsyRefChannelDataTapping Direction="direction of tapping"><!-- This type has DataTypeID 0x00010002 --></SsyRefChannelDataTapping>
+ </ChannelDataItem>
+ </ChannelData>
+ </ChannelItem>
+ <!-- Channel example 2 -->
+ <ChannelItem
+ ChannelId="This value is updated runtime when Sensrv has defined channel IDs"
+ ContextType="TSensrvContextType"
+ Quantity="TSensrvQuantity"
+ ChannelType="TSensrvChannelTypeId"
+ Location="Location of the sensor"
+ Vendor="Vendor ID"
+ DataTypeId="data type ID identifies data type defined here. See sensrvchanneldatatypes.h">
+ <!-- One channel definition. Each channel has its own item block -->
+ <!-- TSensrvChannelInfo. Contains information of this channel; Context type, Quantity etc. -->
+
+ <!-- Contains properties of this channel. -->
+ <Properties>
+ <!-- TSensrvProperty. Each property has its own item defined in here -->
+ <!-- Property example 5 -->
+ <PropertyItem PropertyId="TSensrvPropertyId"
+ ItemIndex="Item index in channel data structure"
+ PropertyValue="Value of the property"
+ MaxValue="Maximum value of data"
+ MinValue="Minimum value of data"
+ ReadOnly="Read only or modifiable"
+ PropertyType="TSensrvPropertyType">
+ </PropertyItem>
+
+ <!-- Property example 6 -->
+ <PropertyItem PropertyId="TSensrvPropertyId"
+ ItemIndex="Item index in channel data structure"
+ PropertyValue="Value of the property"
+ MaxValue="Maximum value of data"
+ MinValue="Minimum value of data"
+ ReadOnly="Read only or modifiable"
+ PropertyType="TSensrvPropertyType">
+ </PropertyItem>
+ </Properties>
+
+ <!-- Channel data. Information of generated data by this channel. -->
+ <!-- There may be several different (yet same type) data items. Next data item is added to -->
+ <!-- buffer after the previous data items (all according to count) are added and last Interval is passed -->
+
+ <ChannelData StartIntervalMs="Time in milliseconds to start filling buffer after StartChannelData()">
+ <ChannelDataItem DataTypeId="data type ID identifies data type defined here. See sensrvchanneldatatypes.h" count="Number of this data items to be added into buffer (with the same values)"
+ IntervalMs="Time in milliseconds after next data item is added into buffer">
+ <!-- Content of this channel item is dependent on the type of this channel. It must be one and only one of the following -->
+ <SsyRefChannelDataAxis XAxis="Integer value of X Axis" YAxis="Integer value of Y Axis" ZAxis="Integer value of Z Axis" ><!-- This type has DataTypeID 0x00010001 --></SsyRefChannelDataAxis>
+ <SsyRefChannelDataTapping Direction="direction of tapping"><!-- This type has DataTypeID 0x00010002 --></SsyRefChannelDataTapping>
+ </ChannelDataItem>
+
+ <!-- Next channel data item -->
+ <ChannelDataItem DataTypeId="data type ID identifies data type defined here. See sensrvchanneldatatypes.h" count="Number of this data items to be added into buffer (with the same values)"
+ IntervalMs="Time in milliseconds after next data item is added into buffer">
+ <!-- Content of this channel item is dependent on the type of this channel. It must be one and only one of the following -->
+ <SsyRefChannelDataAxis XAxis="Integer value of X Axis" YAxis="Integer value of Y Axis" ZAxis="Integer value of Z Axis" ><!-- This type has DataTypeID 0x00010001 --></SsyRefChannelDataAxis>
+ <SsyRefChannelDataTapping Direction="direction of tapping"><!-- This type has DataTypeID 0x00010002 --></SsyRefChannelDataTapping>
+ </ChannelDataItem>
+ </ChannelData>
+ </ChannelItem>
+ </ChannelInformationGroup>
+</SsyReferenceConfig>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sensorsupport/testsensor/data/ssyreferenceconfig.xml Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,144 @@
+<!-- ssyreferenceconfig.xml -->
+<!-- SSY reference configuration file-->
+<SsyReferenceConfig>
+ <SsyGeneralInformation>
+ </SsyGeneralInformation>
+ <ChannelInformationGroup ChannelCount="2">
+ <ChannelItem
+ ChannelId="5"
+ ContextType="2"
+ Quantity="11"
+ ChannelType="0x10205081"
+ Location="NoLoc"
+ Vendor="SsyRefVendor"
+ DataTypeId="0x1020507F">
+ <Properties>
+ <PropertyItem PropertyId="0x00000002"
+ ItemIndex="0"
+ PropertyValue="100"
+ MaxValue="150"
+ MinValue="0"
+ ReadOnly="0"
+ PropertyType="1">
+ <!-- Channel property, data rate, mandatory for all channels, see KSensrvPropIdDataRate -->
+ </PropertyItem>
+ <PropertyItem PropertyId="0x00000004"
+ ItemIndex="0"
+ PropertyValue="1"
+ MaxValue="0"
+ MinValue="0"
+ ReadOnly="1"
+ PropertyType="1">
+ <!-- Channel property, availability of the channel, mandatory for all channels, see KSensrvPropIdAvailability -->
+ </PropertyItem>
+ </Properties>
+ <ChannelData StartIntervalMs="3000">
+ <ChannelDataItem DataTypeId="0x1020507F" count="1" IntervalMs="3000">
+ <SsyRefChannelDataTapping Direction="0x01"></SsyRefChannelDataTapping>
+ </ChannelDataItem>
+ <ChannelDataItem DataTypeId="0x1020507F" count="1" IntervalMs="5000">
+ <SsyRefChannelDataTapping Direction="0x02"></SsyRefChannelDataTapping>
+ </ChannelDataItem>
+ </ChannelData>
+ </ChannelItem>
+ <ChannelItem
+ ChannelId="2"
+ ContextType="2"
+ Quantity="10"
+ ChannelType="0x1020507E"
+ Location="Event%d"
+ Vendor="SsyRefVendor"
+ DataTypeId="0x1020507E">
+ <Properties>
+ <!-- First four properties has same property Id, they are grouped to array property -->
+ <!-- First is array info -2, which tells currently selected property, value = 1 -->
+ <!-- Max and Min values tells max and min property array indexes, not the actual values -->
+ <!-- Array index is mandatory only for array type of properties, by default it is -1 -->
+ <PropertyItem PropertyId="0x00000002"
+ ArrayIndex="-2"
+ ItemIndex="0"
+ PropertyValue="1"
+ MaxValue="2"
+ MinValue="0"
+ ReadOnly="0"
+ PropertyType="1">
+ <!-- Channel property, data rate, mandatory for all channels, see KSensrvPropIdDataRate -->
+ </PropertyItem>
+ <PropertyItem PropertyId="0x00000002"
+ ArrayIndex="0"
+ ItemIndex="0"
+ PropertyValue="10"
+ MaxValue="0"
+ MinValue="0"
+ ReadOnly="1"
+ PropertyType="1">
+ <!-- Channel property, data rate, mandatory for all channels, see KSensrvPropIdDataRate -->
+ </PropertyItem>
+ <PropertyItem PropertyId="0x00000002"
+ ArrayIndex="1"
+ ItemIndex="0"
+ PropertyValue="30"
+ MaxValue="0"
+ MinValue="0"
+ ReadOnly="1"
+ PropertyType="1">
+ <!-- Channel property, data rate, mandatory for all channels, see KSensrvPropIdDataRate -->
+ </PropertyItem>
+ <PropertyItem PropertyId="0x00000002"
+ ArrayIndex="2"
+ ItemIndex="0"
+ PropertyValue="50"
+ MaxValue="0"
+ MinValue="0"
+ ReadOnly="1"
+ PropertyType="1">
+ <!-- Channel property, data rate, mandatory for all channels, see KSensrvPropIdDataRate -->
+ </PropertyItem>
+ <PropertyItem PropertyId="0x00000004"
+ ItemIndex="0"
+ PropertyValue="1"
+ MaxValue="0"
+ MinValue="0"
+ ReadOnly="1"
+ PropertyType="1">
+ <!-- Channel property, availability of the channel, mandatory for all channels, see KSensrvPropIdAvailability -->
+ </PropertyItem>
+ <PropertyItem PropertyId="0x00000005"
+ ItemIndex="1"
+ PropertyValue="14.56"
+ MaxValue="128"
+ MinValue="1"
+ ReadOnly="0"
+ PropertyType="2">
+ <!-- Channel item property, measure range for X-axis (item index = 1), see KSensrvPropIdMeasureRange -->
+ </PropertyItem>
+ <PropertyItem PropertyId="0x00000005"
+ ItemIndex="2"
+ PropertyValue="20.65"
+ MaxValue="256"
+ MinValue="1"
+ ReadOnly="0"
+ PropertyType="2">
+ <!-- Channel item property, measure range for Y-axis (item index = 2), see KSensrvPropIdMeasureRange -->
+ </PropertyItem>
+ <PropertyItem PropertyId="0x00000005"
+ ItemIndex="3"
+ PropertyValue="10.56"
+ MaxValue="128"
+ MinValue="1"
+ ReadOnly="0"
+ PropertyType="2">
+ <!-- Channel item property, measure range for Z-axis (item index = 3), see KSensrvPropIdMeasureRange -->
+ </PropertyItem>
+ </Properties>
+ <ChannelData StartIntervalMs="5000">
+ <ChannelDataItem DataTypeId="0x1020507E" count="3" IntervalMs="4000">
+ <SsyRefChannelDataAxis XAxis="-50" YAxis="-32" ZAxis="44" ></SsyRefChannelDataAxis>
+ </ChannelDataItem>
+ <ChannelDataItem DataTypeId="0x1020507E" count="4" IntervalMs="5000">
+ <SsyRefChannelDataAxis XAxis="22" YAxis="49" ZAxis="55" ></SsyRefChannelDataAxis>
+ </ChannelDataItem>
+ </ChannelData>
+ </ChannelItem>
+ </ChannelInformationGroup>
+</SsyReferenceConfig>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sensorsupport/testsensor/group/bld.inf Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,48 @@
+// bld.inf
+
+// Copyright (c) 2006-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:
+//
+
+
+
+PRJ_PLATFORMS
+ DEFAULT
+
+PRJ_EXPORTS
+ ssyreference.iby /epoc32/rom/include/ssyreference.iby
+
+ // Export config to SensorServers private folder.
+ // For emulator use.
+ ../data/ssyreferenceconfig.xml /epoc32/release/winscw/udeb/z/refssy/ssyreferenceconfig.xml
+ ../data/ssyreferenceconfig.xml /epoc32/release/winscw/urel/z/refssy/ssyreferenceconfig.xml
+
+ // For hardware use.
+ ../data/ssyreferenceconfig.xml /epoc32/data/z/refssy/ssyreferenceconfig.xml
+
+#ifdef SYMBIAN_OLD_EXPORT_LOCATION
+ ../inc/ssyreferenceaccelerometer.h /epoc32/include/sensors/channels/ssyreferenceaccelerometer.h
+#endif
+#ifdef SYMBIAN_OLD_EXPORT_LOCATION
+ ../inc/ssyreferencemagnetometer.h /epoc32/include/sensors/channels/ssyreferencemagnetometer.h
+#endif
+#ifdef SYMBIAN_OLD_EXPORT_LOCATION
+ ../inc/ssyreferenceorientation.h /epoc32/include/sensors/channels/ssyreferenceorientation.h
+#endif
+#ifdef SYMBIAN_OLD_EXPORT_LOCATION
+ ../inc/ssyreferenceproximity.h /epoc32/include/sensors/channels/ssyreferenceproximity.h
+#endif
+
+PRJ_MMPFILES
+ ssyreferenceplugin.mmp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sensorsupport/testsensor/group/ssyreference.iby Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,27 @@
+// ssyreference.iby
+
+// Copyright (c) 2006-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:
+//
+
+
+
+#ifndef SSYREFERENCE_IBY
+#define SSYREFERENCE_IBY
+
+#include <gmxml.iby>
+
+ECOM_PLUGIN(ssyreferenceplugin.dll, ssyreferenceplugin.rsc)
+data=DATAZ_\refssy\ssyreferenceconfig.xml \refssy\ssyreferenceconfig.xml
+#endif // SSYREFERENCE_IBY
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sensorsupport/testsensor/group/ssyreferenceplugin.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,58 @@
+// ssyreferenceplugin.mmp
+
+// Copyright (c) 2006-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:
+//
+
+
+
+#include <sensors/spi/sensrvresource.hrh>
+
+TARGET ssyreferenceplugin.dll
+TARGETTYPE plugin
+VENDORID 0x70000001
+
+// ECom Dll recognition UID followed by the unique UID for this dll
+UID 0x10009D8D 0x10205089
+
+CAPABILITY SENSOR_PLUGIN_CAPABILITIES
+
+SOURCEPATH ../src
+SOURCE ssyreferencechanneldataprovider.cpp
+SOURCE ssyreferencecontrol.cpp
+SOURCE ssyreferencepropertyprovider.cpp
+SOURCE ssyreferencechannel.cpp
+SOURCE ssyreferenceconfig.cpp
+SOURCE ssyreferencecmdhandler.cpp
+SOURCE ecomentrypoint.cpp
+
+USERINCLUDE ../src
+
+SYSTEMINCLUDE /epoc32/include
+SYSTEMINCLUDE /epoc32/include/ecom
+SYSTEMINCLUDE /epoc32/include/sensors
+SYSTEMINCLUDE /epoc32/include/sensors/spi
+SYSTEMINCLUDE /epoc32/include/sensors/channels
+
+// The resource name should have to be same as the third UID above
+START RESOURCE ../src/10205089.rss
+TARGET ssyreferenceplugin.rsc
+END
+
+LIBRARY euser.lib
+LIBRARY ecom.lib
+LIBRARY sensrvutil.lib
+LIBRARY xmlparser.lib // for XML parser
+LIBRARY efsrv.lib
+LIBRARY xmldom.lib
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sensorsupport/testsensor/group/syslibs_sensors_ssyreference.history.xml Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<relnotes schema="1.0.0" name="Reference SSY">
+ <purpose>
+ Referencey SSY for testing the Sensors Framework.
+ </purpose>
+
+ <deliverystep number="1120" name="PREQ2039: Base Services: Sensor Server (tr2.1.5 Prototype)" osproject="Sphinx" revision="002">
+ <preq number="2039" title="Sensor server">
+ Update to Sensors framework as part of the Core OS 2 project.
+ </preq>
+ <milestone project="GT0461" number="3.2"/>
+ </deliverystep>
+ <deliverystep number="1105" name="PREQ2039: Base Services: Sensor Server (TR2 Prototype)" osproject="Sphinx" revision="001">
+ <preq number="2039" title="Sensor server">
+ Adding Reference SSY to Symbian OS as part of the Core OS 2 project.
+ </preq>
+ <cr number="1603" title="Bring PREQ2039 (Sensor server) into the scope of Sphinx"/>
+ <milestone project="GT0461" number="3.1"/>
+ </deliverystep>
+
+</relnotes>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sensorsupport/testsensor/group/syslibs_sensors_ssyreference.mrp Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,10 @@
+component syslibs_sensors_ssyreference
+
+source \sf\mw\appsupport\sensorsupport\testsensor
+
+exports \sf\mw\appsupport\sensorsupport\testsensor\group
+binary \sf\mw\appsupport\sensorsupport\testsensor\group all
+
+notes_source \component_defs\release.src
+
+ipr T
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sensorsupport/testsensor/inc/ssyreferenceaccelerometer.h Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,256 @@
+// ssyreferenceaccelerometer.h
+
+/*
+* Copyright (c) 2008-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:
+*
+*/
+
+
+
+
+/**
+ @file
+ @internalAll Sensor framework Reference SSY header file
+ @test
+*/
+
+
+#ifndef SSYREFERENCEACCELEROMETER_H
+#define SSYREFERENCEACCELEROMETER_H
+
+// INCLUDES
+#include <e32base.h>
+#include <sensors/sensrvtypes.h>
+
+
+// ACCELEROMETER RELATED CHANNELS
+
+/**
+* - Name: Accelerometer XYZ-axis data channel type
+* - Type: Rawdata
+* - Datatype: TSensrvAccelerometerAxisData
+* - Description: Accelerometer x-, y-, z-axis data
+*/
+const TSensrvChannelTypeId KSensrvChannelTypeIdAccelerometerXYZAxisData = 0x1020507E;
+
+// ACCELEROMETER RELATED PROPERTIES
+
+/**
+* - Name: Axis active
+* - Type: TInt
+* - Scope: Channel item property
+* - Mandatory: No
+* - Capability: None
+* - Description: Indicates is sensor axis activated.
+* Value is one if the axis is activated, zero otherwise.
+*/
+const TSensrvPropertyId KSensrvPropIdAxisActive = 0x00001001;
+
+/**
+* - Name: Axis threshold value
+* - Type: TReal
+* - Scope: Channel item property
+* - Mandatory: No
+* - Capability: None
+* - Description: Threshold value for a sensor channel
+*/
+const TSensrvPropertyId KSensrvPropIdAxisThresholdValue = 0x00001002;
+
+// ACCELEROMETER RELATED DATATYPES
+
+/**
+* Accelerometer axis data type
+*/
+class TSensrvAccelerometerAxisData
+ {
+public:
+ /**
+ * Channel data type Id number
+ */
+ static const TSensrvChannelDataTypeId KDataTypeId = 0x1020507E;
+
+ /**
+ * Channel data type index numbers
+ */
+ enum TSensrvAccelerometerAxisDataIndexes
+ {
+ ETimeStamp = 0,
+ EAxisX,
+ EAxisY,
+ EAxisZ
+ };
+
+public:
+ /**
+ * - Item name: Sampling time.
+ * - Item Index: 0
+ * - Conditions: None
+ * - Description: Timestamp for a sample.
+ */
+ TTime iTimeStamp;
+
+ /**
+ * - Item name: Accelerometer x-axis
+ * - Item Index: 1
+ * - Conditions: Single limit and range
+ * - Description: Accelerometer values from x-axis
+ */
+ TInt iAxisX;
+
+ /**
+ * - Item name: Accelerometer y-axis
+ * - Item Index: 2
+ * - Conditions: Single limit and range
+ * - Description: Accelerometer values from y-axis
+ */
+ TInt iAxisY;
+
+ /**
+ * - Item name: Accelerometer z-axis
+ * - Item Index: 3
+ * - Conditions: Single limit and range
+ * - Description: Accelerometer values from z-axis
+ */
+ TInt iAxisZ;
+ };
+
+
+// TAPPING RELATED CHANNELS
+
+/**
+* - Name: Wakeup event channel type
+* - Type: Event
+* - Datatype: TSensrvTappingData
+* - Description: Wakeup events
+*/
+const TSensrvChannelTypeId KSensrvChannelTypeIdAccelerometerWakeupData = 0x1020507F;
+
+/**
+* - Name: Double tapping event channel type
+* - Type: Event
+* - Datatype: TSensrvTappingData
+* - Description: Double tapping events
+*/
+const TSensrvChannelTypeId KSensrvChannelTypeIdAccelerometerDoubleTappingData = 0x10205081;
+
+// TAPPING RELATED PROPERTIES
+
+/**
+* - Name: Tapping axis active
+* - Type: TInt
+* - Scope: Channel item property
+* - Mandatory: No
+* - Capability: None
+* - Description: Indicates is sensor axis activated.
+* Value is one if the axis is activated, zero otherwise.
+*/
+const TSensrvPropertyId KSensrvPropIdTappingAxisActive = 0x00001001;
+
+/**
+* - Name: Tapping axis threshold value
+* - Type: TReal
+* - Scope: Channel item property
+* - Mandatory: No
+* - Capability: None
+* - Description: Threshold value for a sensor channel
+*/
+const TSensrvPropertyId KSensrvPropIdTappingAxisThresholdValue = 0x00001002;
+
+/**
+* - Name: Tap duration in milliseconds
+* - Type: TInt
+* - Scope: Channel property
+* - Mandatory: No
+* - Capability: None
+* - Description: Tapping duration setting
+*/
+const TSensrvPropertyId KSensrvPropIdTapDurationValue = 0x00001003;
+
+/**
+* - Name: Double tap latency
+* - Type: TInt
+* - Scope: Channel property
+* - Mandatory: No
+* - Capability: None
+* - Description: Double tap latency in milliseconds
+*/
+const TSensrvPropertyId KSensrvPropIdDblTapLatency = 0x00001004;
+
+/**
+* - Name: Double tap interval
+* - Type: TInt
+* - Scope: Channel property
+* - Mandatory: No
+* - Capability: None
+* - Description: Double tap interval in milliseconds
+*/
+const TSensrvPropertyId KSensrvPropIdDblTapInterval = 0x00001005;
+
+
+
+// TAPPING RELATED DATATYPES
+
+/**
+* Direction of the tapping data. If direction (plus or minus) is not known,
+* direction is, for example in x-axis case
+* KSensrvAccelerometerDirectionXplus | KSensrvAccelerometerDirectionXminus
+*/
+const TUint8 KSensrvAccelerometerDirectionXplus = 0x01;
+const TUint8 KSensrvAccelerometerDirectionXminus = 0x02;
+const TUint8 KSensrvAccelerometerDirectionYplus = 0x04;
+const TUint8 KSensrvAccelerometerDirectionYminus = 0x08;
+const TUint8 KSensrvAccelerometerDirectionZplus = 0x10;
+const TUint8 KSensrvAccelerometerDirectionZminus = 0x20;
+
+/**
+* Tapping data type
+*/
+class TSensrvTappingData
+ {
+public:
+ /**
+ * Channel data type Id number
+ */
+ static const TSensrvChannelDataTypeId KDataTypeId = 0x1020507F;
+
+ /**
+ * Channel data type index numbers
+ */
+ enum TSensrvAccelerometerAxisDataIndexes
+ {
+ ETimeStamp = 0,
+ EDirection
+ };
+
+public:
+ /**
+ * - Item name: Sampling time.
+ * - Item Index: 0
+ * - Conditions: None
+ * - Description: Timestamp for a sample.
+ */
+ TTime iTimeStamp;
+
+ /**
+ * - Item name: Tapping direction bitmask
+ * - Item Index: 1
+ * - Conditions: Binary
+ * - Description: Direction bitmask of the tapping event.
+ * See constant definitions above.
+ */
+ TUint32 iDirection;
+ };
+
+#endif //SSYREFERENCEACCELEROMETER_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sensorsupport/testsensor/inc/ssyreferencemagnetometer.h Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,170 @@
+// ssyreferencemagnetometer.h
+
+/*
+* Copyright (c) 2008-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:
+*
+*/
+
+
+
+
+/**
+ @file
+ @internalAll Sensor framework Reference SSY header file
+ @test
+*/
+
+
+#ifndef SSYREFERENCEMAGNETOMETER_H
+#define SSYREFERENCEMAGNETOMETER_H
+
+// INCLUDES
+#include <e32base.h>
+#include <sensors/sensrvtypes.h>
+
+
+// MAGNETOMETER RELATED CHANNELS
+
+/**
+* - Name: Magnetometer XYZ-axis data channel type
+* - Type: Rawdata
+* - Datatype: TSensrvMagnetometerAxisData
+* - Description: Magnetometer x-, y-, z-axis data
+*/
+const TSensrvChannelTypeId KSensrvChannelTypeIdMagnetometerXYZAxisData = 0x2000BEE0;
+
+
+// MAGNETOMETER RELATED PROPERTIES
+
+/**
+* - Name: Name of the property
+* - Type: Defines type of the property (TInt/TReal/TBuf)
+* - Scope: Defines a property scope. Property can be defined for a channel,
+* for a specific item in a channel or for a server related to
+* channel.
+* - Mandatory: Defines is property mandatory
+* - Capability: Capabilities needed to set this property
+* - Description: Description of the property
+*/
+
+/**
+* - Name: Auto calibration active
+* - Type: TInt
+* - Scope: Channel item property
+* - Mandatory: No
+* - Capability: None
+* - Description: Indicates is auto calibration active.
+* Value is one if calibration is activated, zero otherwise.
+*/
+const TSensrvPropertyId KSensrvPropAutoCalibrationActive = 0x00001006;
+
+/**
+* - Name: Calibration status
+* - Type: TInt
+* - Scope: Channel item property
+* - Mandatory: No
+* - Capability: None
+* - Description: Indicates the calibration level.
+* Calibration level scales between minimum and maximum value.
+* Maximum indicates that calibration level is at its best
+* level. Minimum indicates that calibration is undefined.
+*/
+const TSensrvPropertyId KSensrvPropCalibrationLevel = 0x00001007;
+
+// MAGNETOMETER RELATED DATATYPES
+
+/**
+* Magnetometer axis data type
+*/
+class TSensrvMagnetometerAxisData
+ {
+public:
+ /**
+ * Channel data type Id number
+ */
+ static const TSensrvChannelDataTypeId KDataTypeId = 0x2000BEE0;
+
+ /**
+ * Channel data type index numbers
+ */
+ enum TSensrvMagnetometerAxisDataIndexes
+ {
+ ETimeStamp = 0,
+ EAxisX,
+ EAxisY,
+ EAxisZ
+ };
+
+public:
+
+ /**
+ * - Item name: Sampling time.
+ * - Item Index: 0
+ * - Conditions: None
+ * - Description: Timestamp for a sample.
+ */
+ TTime iTimeStamp;
+
+ /**
+ * - Item name: Magnetometer x-axis
+ * - Item Index: 1
+ * - Conditions: Single limit and range
+ * - Description: Magnetometer values from x-axis
+ */
+ TInt iAxisXRaw;
+
+ /**
+ * - Item name: Magnetometer y-axis
+ * - Item Index: 2
+ * - Conditions: Single limit and range
+ * - Description: Magnetometer values from y-axis
+ */
+ TInt iAxisYRaw;
+
+ /**
+ * - Item name: Magnetometer z-axis
+ * - Item Index: 3
+ * - Conditions: Single limit and range
+ * - Description: Magnetometer values from z-axis
+ */
+ TInt iAxisZRaw;
+
+ /**
+ * - Item name: Magnetometer x-axis
+ * - Item Index: 1
+ * - Conditions: Single limit and range
+ * - Description: Magnetometer values from x-axis
+ */
+ TInt iAxisXCalibrated;
+
+ /**
+ * - Item name: Magnetometer y-axis
+ * - Item Index: 2
+ * - Conditions: Single limit and range
+ * - Description: Magnetometer values from y-axis
+ */
+ TInt iAxisYCalibrated;
+
+ /**
+ * - Item name: Magnetometer z-axis
+ * - Item Index: 3
+ * - Conditions: Single limit and range
+ * - Description: Magnetometer values from z-axis
+ */
+ TInt iAxisZCalibrated;
+ };
+
+#endif //SSYREFERENCEMAGNETOMETER_H
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sensorsupport/testsensor/inc/ssyreferenceorientation.h Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,172 @@
+// ssyreferenceorientation.h
+
+/*
+* Copyright (c) 2008-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:
+*
+*/
+
+
+
+
+/**
+ @file
+ @internalAll Sensor framework Reference SSY header file
+ @test
+*/
+
+
+#ifndef SSYREFERENCEORIENTATION_H
+#define SSYREFERENCEORIENTATION_H
+
+// INCLUDES
+#include <e32base.h>
+#include <sensors/sensrvtypes.h>
+
+
+// ORIENTATION RELATED CHANNELS
+
+/**
+* - Name: Orientation event channel type
+* - Type: Event
+* - Datatype: TSensrvOrientationData
+* - Description: Orientation events
+*/
+const TSensrvChannelTypeId KSensrvChannelTypeIdOrientationData = 0x10205088;
+
+/**
+* - Name: Rotation event channel type
+* - Type: Event
+* - Datatype: TSensrvRotationData
+* - Description: Rotation events
+*/
+const TSensrvChannelTypeId KSensrvChannelTypeIdRotationData = 0x10205089;
+
+// ORIENTATION RELATED DATATYPES
+
+class TSensrvOrientationData
+ {
+public:
+ /**
+ * Channel data type Id number
+ */
+ static const TSensrvChannelDataTypeId KDataTypeId = 0x10205088;
+
+ /**
+ * Channel data type index numbers
+ */
+ enum TSensrvOrientationEventIndexes
+ {
+ ETimeStamp = 0,
+ EDeviceOrientation
+ };
+
+ /**
+ * Possible device orientations
+ */
+ enum TSensrvDeviceOrientation
+ {
+ EOrientationUndefined = 0,
+ EOrientationDisplayUp,
+ EOrientationDisplayDown,
+ EOrientationDisplayLeftUp,
+ EOrientationDisplayRightUp,
+ EOrientationDisplayUpwards,
+ EOrientationDisplayDownwards
+ };
+
+public:
+
+ /**
+ * - Item name: Sampling time
+ * - Item Index: 0
+ * - Description: Timestamp for a sample
+ */
+ TTime iTimeStamp;
+
+ /**
+ * - Item name: Device orientation
+ * - Item Index: 1
+ * - Description: Contains one of the six basic orientations of the device
+ */
+ TSensrvDeviceOrientation iDeviceOrientation;
+ };
+
+
+class TSensrvRotationData
+ {
+public:
+ /**
+ * Channel data type Id number
+ */
+ static const TSensrvChannelDataTypeId KDataTypeId = 0x10205089;
+
+ /**
+ * Rotation axis value equals -1 when it cannot be defined.
+ * The undefined situation varies depending on the sensor type.
+ * In the case of an accelerometer, the rotation value cannot be defined
+ * when the corresponding axis is parallel to the gravitational force or
+ * the device is in motion. In the case of a magnetometer, there are
+ * difficulties in measuring values, when the axis is parallel to the
+ * magnetic field.
+ */
+ static const TInt KSensrvRotationUndefined = -1;
+
+ /**
+ * Channel data type index numbers
+ */
+ enum TSensrvRotationDataIndexes
+ {
+ ETimeStamp = 0,
+ EDeviceRotationAboutXAxis,
+ EDeviceRotationAboutYAxis,
+ EDeviceRotationAboutZAxis,
+ };
+
+public:
+ /**
+ * - Item name: Sampling time.
+ * - Item Index: 0
+ * - Description: Timestamp for a sample
+ */
+ TTime iTimeStamp;
+
+ /**
+ * - Item name: Rotation about x-axis
+ * - Item Index: 1
+ * - Description: Positive rotation in Cartesian coordinate system about the x-axis.
+ * If the value cannot be defined it is set to KSensrvRotationUndefined.
+ */
+ TInt iDeviceRotationAboutXAxis;
+
+ /**
+ * - Item name: Rotation about y-axis
+ * - Item Index: 2
+ * - Description: Positive rotation in Cartesian coordinate system about the y-axis.
+ * If the value cannot be defined it is set to KSensrvRotationUndefined.
+ */
+ TInt iDeviceRotationAboutYAxis;
+
+
+ /**
+ * - Item name: Rotation about z-axis
+ * - Item Index: 3
+ * - Description: Positive rotation in Cartesian coordinate system about the z-axis.
+ * If the value cannot be defined it is set to KSensrvRotationUndefined.
+ */
+ TInt iDeviceRotationAboutZAxis;
+ };
+
+#endif //SSYREFERENCEORIENTATION_H
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sensorsupport/testsensor/inc/ssyreferenceproximity.h Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,101 @@
+// ssyreferenceproximity.h
+
+/*
+* Copyright (c) 2008-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:
+*
+*/
+
+
+
+
+/**
+ @file
+ @internalAll Sensor framework Reference SSY header file
+ @test
+*/
+
+
+#ifndef SSYREFERENCEPROXIMITY_H
+#define SSYREFERENCEPROXIMITY_H
+
+// INCLUDES
+#include <e32base.h>
+#include <sensors/sensrvtypes.h>
+
+
+// PROXIMITY RELATED CHANNELS
+
+/**
+* - Name: Proximity data channel
+* - Type: Event
+* - Datatype: TSensrvProximityMonitorData
+* - Description: Proximity status
+*/
+const TSensrvChannelTypeId KSensrvChannelTypeIdProximityMonitor = 0x2000E585;
+
+// PROXIMITY RELATED DATATYPES
+
+/**
+* Proximity monitoring data type
+*/
+class TSensrvProximityData
+ {
+public:
+ /**
+ * Channel data type Id number
+ */
+ static const TSensrvChannelDataTypeId KDataTypeId = 0x2000E585;
+
+ /**
+ * Channel data type index numbers
+ */
+ enum TSensrvProximityDataIndexes
+ {
+ ETimeStamp = 0,
+ EState
+ };
+
+ /**
+ * Possible values for proximito state
+ */
+ enum TProximityState
+ {
+ EProximityUndefined = 0,
+ EProximityIndiscernible,
+ EProximityDiscernible
+ };
+
+public:
+
+ /**
+ * - Item name: Sampling time.
+ * - Item Index: 0
+ * - Conditions: None
+ * - Description: Timestamp for a sample.
+ */
+ TTime iTimeStamp;
+
+ /**
+ * - Item name: Proximity state
+ * - Item Index: 0
+ * - Conditions: None
+ * - Description: -
+ */
+ TProximityState iProximityState;
+
+};
+
+#endif //SSYREFERENCEPROXIMITY_H
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sensorsupport/testsensor/src/10205089.rss Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,80 @@
+// 10205089.rss
+
+// Copyright (c) 2006-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:
+//
+
+
+
+#include <sensors/spi/sensrvresource.hrh>
+#include <ecom/registryinfov2.rh>
+
+// RESOURCE DEFINITIONS
+// -----------------------------------------------------------------------------
+//
+// Declares info for SSYReference ECom plugin
+//
+// -----------------------------------------------------------------------------
+
+RESOURCE REGISTRY_INFO SSYReferencePlugin
+ {
+ // UID for the DLL. See ssyreferenceplugin.mmp
+ resource_format_version = RESOURCE_FORMAT_VERSION_2;
+ dll_uid = 0x10205089;
+ interfaces =
+ {
+ INTERFACE_INFO
+ {
+ // UID of interface that is implemented
+ interface_uid = KSsyControlInterfaceUid;
+ implementations =
+ {
+ BINARY_IMPLEMENTATION_INFO
+ {
+ implementation_uid = 0x10205088;
+ version_no = 1;
+ display_name = "SSYReferencePlugin";
+ default_data = {
+ // Double tap channel
+ 0x01, // ChannelInfoVersion
+ 0x2E, // ChannelInfoLength
+ 0x1E, // Flags
+ 0x81, 0x50, 0x20, 0x10, // ChannelType
+ 0x02, 0x00, 0x00, 0x00, // ContextType
+ 0x0B, 0x00, 0x00, 0x00, // Quantity
+ 0x05, 0x4e, 0x6f, 0x4c, 0x6f, 0x63, // Location: NoLoc
+ 0x0C, 0x53, 0x73, 0x79, 0x52, 0x65, 0x66, 0x56, 0x65, 0x6E, 0x64, 0x6F, 0x72, // VendorId: SsyRefVendor
+ 0x7F, 0x50, 0x20, 0x10, // ChannelDataTypeId
+ 0x01, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // ChannelSecurityPolicy
+
+ // Accelerometer channel
+ 0x01, // ChannelInfoVersion
+ 0x30, // ChannelInfoLength
+ 0x1E, // Flags
+ 0x7E, 0x50, 0x20, 0x10, // ChannelType
+ 0x02, 0x00, 0x00, 0x00, // ContextType
+ 0x0A, 0x00, 0x00, 0x00, // Quantity
+ 0x07, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x25, 0x64, // Location
+ 0x0C, 0x53, 0x73, 0x79, 0x52, 0x65, 0x66, 0x56, 0x65, 0x6E, 0x64, 0x6F, 0x72, // VendorId: SsyRefVendor
+ 0x7E, 0x50, 0x20, 0x10, // ChannelDataTypeId
+ 0x01, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF // ChannelSecurityPolicy
+
+ };
+ opaque_data = {};
+ }
+ };
+ }
+ };
+ }
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sensorsupport/testsensor/src/ecomentrypoint.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,40 @@
+// ecomentrypoint.cpp
+
+// Copyright (c) 2006-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:
+//
+
+
+
+
+// INCLUDE FILES
+#include <e32std.h>
+#include <ecom/implementationproxy.h>
+#include "ssyreferencecontrol.h"
+
+// Define the interface UIDs
+const TImplementationProxy ImplementationTable[] =
+ {
+ IMPLEMENTATION_PROXY_ENTRY( 0x10205088,
+ CSsyReferenceControl::NewL )
+ };
+
+// The one and only exported function that is the ECom entry point
+EXPORT_C const TImplementationProxy* ImplementationGroupProxy
+ (TInt& aTableCount)
+ {
+ aTableCount = sizeof( ImplementationTable ) / sizeof( TImplementationProxy );
+
+ return ImplementationTable;
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sensorsupport/testsensor/src/ssyreferencechannel.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,443 @@
+// ssyreferencechannel.cpp
+
+// Copyright (c) 2006-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:
+//
+
+
+
+#include <sensors/spi/ssycallback.h> // MSsyCallback
+#include "ssyreferencechannel.h"
+#include "ssyreferencecontrol.h" // SSY Control
+#include "ssyreferencepropertyprovider.h" // iChannelPropertyProvider
+#include "ssyreferencechanneldataprovider.h" // iChannelDataProvider
+#include "ssyreferencetrace.h"
+#include "ssyreferencecmdhandler.h"
+
+
+// ======== MEMBER FUNCTIONS ========
+
+// ---------------------------------------------------------------------------
+// CSsyReferenceChannel C++ constructor
+// ---------------------------------------------------------------------------
+//
+CSsyReferenceChannel::CSsyReferenceChannel( CSsyReferenceControl& aSsyControl, TSensrvChannelInfo aChannelInfo ) :
+ iSsyControl( aSsyControl ),
+ iChannelInfo( aChannelInfo ),
+ iState( ESsyReferenceChannelIdle )
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannel::CSsyReferenceChannel()" ) ) );
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannel::CSsyReferenceChannel() - return" ) ) );
+ }
+
+
+// ---------------------------------------------------------------------------
+// Symbian 2nd phase constructor
+// ---------------------------------------------------------------------------
+//
+void CSsyReferenceChannel::ConstructL()
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannel::ConstructL()" ) ) );
+
+ // Create command handler
+ iCmdHandler = CSsyReferenceCmdHandler::NewL( *this );
+
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannel::ConstructL() - return" ) ) );
+ }
+
+// ---------------------------------------------------------------------------
+// CSsyReferenceChannel::NewL
+// ---------------------------------------------------------------------------
+//
+CSsyReferenceChannel* CSsyReferenceChannel::NewL( CSsyReferenceControl& aSsyControl, TSensrvChannelInfo aChannelInfo )
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannel::NewL()" ) ) );
+ CSsyReferenceChannel* self = new ( ELeave ) CSsyReferenceChannel( aSsyControl, aChannelInfo );
+ CleanupStack::PushL( self );
+ self->ConstructL();
+ CleanupStack::Pop( self );
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannel::NewL() - return" ) ) );
+ return self;
+ }
+
+// ---------------------------------------------------------------------------
+// Destructor
+// ---------------------------------------------------------------------------
+//
+CSsyReferenceChannel::~CSsyReferenceChannel()
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannel::~CSsyReferenceChannel()" ) ) );
+
+ // In case channel is not closed before destruction, providers are not deleted
+ if ( iChannelDataProvider )
+ {
+ delete iChannelDataProvider;
+ iChannelDataProvider = NULL;
+ }
+
+ if ( iChannelPropertyProvider )
+ {
+ delete iChannelPropertyProvider;
+ iChannelPropertyProvider = NULL;
+ }
+
+ if ( iCmdHandler )
+ {
+ delete iCmdHandler;
+ iCmdHandler = NULL;
+ }
+
+ iProperties.Reset();
+
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannel::~CSsyReferenceChannel() - return" ) ) );
+ }
+
+// ---------------------------------------------------------------------------
+// CSsyReferenceChannel::ChannelId
+// ---------------------------------------------------------------------------
+//
+TInt CSsyReferenceChannel::ChannelId()
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannel::ChannelId() - %i" ), iChannelInfo.iChannelId ) );
+ return iChannelInfo.iChannelId;
+ }
+
+// ---------------------------------------------------------------------------
+// CSsyReferenceChannel::SsyControl
+// ---------------------------------------------------------------------------
+//
+CSsyReferenceControl& CSsyReferenceChannel::SsyControl() const
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannel::SsyControl()" ) ) );
+ return iSsyControl;
+ }
+
+// ---------------------------------------------------------------------------
+// CSsyReferenceControl::SsyCmdHandler
+// ---------------------------------------------------------------------------
+//
+CSsyReferenceCmdHandler& CSsyReferenceChannel::CommandHandler() const
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannel::SsyCmdHandler()" ) ) );
+ return *iCmdHandler;
+ }
+
+// ---------------------------------------------------------------------------
+// CSsyReferenceChannel::FindPropertyL
+// ---------------------------------------------------------------------------
+//
+TSensrvProperty& CSsyReferenceChannel::FindPropertyL(
+ const TSensrvPropertyId aPropertyId,
+ TInt aItemIndex,
+ TInt aArrayIndex )
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannel::FindPropertyL()" ) ) );
+ TSensrvProperty* property = NULL;
+ TBool propertyFound( EFalse );
+
+ // Search property
+ for ( TInt i = 0; i < iProperties.Count() && !propertyFound; i++ )
+ {
+ property = static_cast<TSensrvProperty*>( &iProperties[i] );
+
+ // Compare property IDs and array index
+ if ( property->GetPropertyId() == aPropertyId )
+ {
+ // Compare item index if it is given
+ if ( ( KErrNotFound == aItemIndex ) || ( property->PropertyItemIndex() == aItemIndex ) )
+ {
+ // Correct property ID is found, now check is it array type of property.
+ // Either array indexes must match or propertys array index has to be array info
+ if ( ( property->GetArrayIndex() == aArrayIndex ) ||
+ ( ( property->GetArrayIndex() == ESensrvArrayPropertyInfo ) &&
+ ( ESensrvSingleProperty == aArrayIndex ) ) )
+ {
+ // Correct array index found
+ propertyFound = ETrue;
+ }
+ }
+ }
+ }
+
+ // Leave if not found
+ if ( !propertyFound )
+ {
+ iSsyControl.FindPropertyL( aPropertyId, aArrayIndex, *property );
+ }
+
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannel::FindPropertyL() - return" ) ) );
+ return *property;
+ }
+
+// ---------------------------------------------------------------------------
+// CSsyReferenceChannel::FindAndUpdatePropertyL
+// ---------------------------------------------------------------------------
+//
+void CSsyReferenceChannel::FindAndUpdatePropertyL( const TSensrvProperty& aProperty )
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannel::FindAndUpdatePropertyL()" ) ) );
+ TBool propertyFound( EFalse );
+
+ // Search property
+ for ( TInt i = 0; i < iProperties.Count() && !propertyFound; i++ )
+ {
+ // Compare property IDs
+ if ( iProperties[i].GetPropertyId() == aProperty.GetPropertyId() )
+ {
+ // Compare item index if it is given
+ if ( ( KErrNotFound != aProperty.PropertyItemIndex() ) &&
+ ( iProperties[i].PropertyItemIndex() == aProperty.PropertyItemIndex() ) )
+ {
+ // Property found -> update if possible
+ if ( iProperties[i].ReadOnly() )
+ {
+ User::Leave( KErrAccessDenied );
+ }
+ // If modifiable, get type and update value
+ switch ( iProperties[i].PropertyType() )
+ {
+ case ESensrvIntProperty:
+ {
+ TInt value( 0 );
+ aProperty.GetValue( value );
+ iProperties[i].SetValue( value );
+ break;
+ }
+ case ESensrvRealProperty:
+ {
+ TReal value( 0 );
+ aProperty.GetValue( value );
+ iProperties[i].SetValue( (TReal) value );
+ break;
+ }
+ case ESensrvBufferProperty:
+ {
+ TBuf8<20> propValue;
+ aProperty.GetValue( propValue );
+ iProperties[i].SetValue( propValue );
+ break;
+ }
+ default:
+ {
+ break;
+ }
+ }
+ propertyFound = ETrue;
+ }
+ }
+ }
+
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannel::FindPropertyL() - return" ) ) );
+ }
+
+// ---------------------------------------------------------------------------
+// CSsyReferenceChannel::GetProperties
+// ---------------------------------------------------------------------------
+//
+void CSsyReferenceChannel::GetProperties( RSensrvPropertyList& aPropertyList )
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannel::GetProperties()" ) ) );
+ // Copy properties one by one to param aPropertyList
+ TInt propCount( iProperties.Count() );
+ RSensrvPropertyList propList( propCount );
+
+ for ( TInt i = 0; i < propCount; i++ )
+ {
+ propList.Append( iProperties[i] );
+ }
+
+ aPropertyList = propList;
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannel::GetProperties() - return" ) ) );
+ }
+
+// ---------------------------------------------------------------------------
+// CSsyReferenceChannel::UpdateState
+// ---------------------------------------------------------------------------
+//
+void CSsyReferenceChannel::UpdateState( const TSsyReferenceChannelState aNewState )
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannel::UpdateState() - %i" ), aNewState ) );
+ iState = aNewState;
+ }
+
+// ---------------------------------------------------------------------------
+// CSsyReferenceChannel::ProcessResponse
+// ---------------------------------------------------------------------------
+//
+void CSsyReferenceChannel::ProcessResponse( TSsyReferenceMsg* aMessage )
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannel::ProcessResponse()" ) ) );
+
+ if ( aMessage )
+ {
+ switch ( aMessage->Function() )
+ {
+ case ESsyReferenceOpenChannelResp:
+ {
+ // Open channel specific handling here
+ TRAPD( err, HandleOpenChannelRespL( aMessage->Error() ) );
+ if ( KErrNone != err )
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannel::ProcessResponse() - Error opening channel: %i" ), err ) );
+ }
+ break;
+ }
+ case ESsyReferenceDataItemReceived:
+ {
+ // Send data item to data provider
+ TRAPD( err, iChannelDataProvider->ChannelDataReceivedL( aMessage ) );
+ if ( KErrNone != err )
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannel::ProcessResponse() - Error receiving data: %i" ), err ) );
+ }
+ break;
+ }
+ case ESsyReferenceCloseChannelResp:
+ {
+ // Close channel specific handling here
+ HandleCloseChannelResp();
+ break;
+ }
+ default:
+ {
+ // This command was not intended to process here, try Control class
+ iSsyControl.ProcessResponse( aMessage );
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannel::ProcessResponse() - Unknown function" ) ) );
+ }
+ }
+ }
+
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannel::ProcessResponse() - return" ) ) );
+ }
+
+// ---------------------------------------------------------------------------
+// CSsyReferenceChannel::OpenChannel
+// ---------------------------------------------------------------------------
+//
+TInt CSsyReferenceChannel::OpenChannel()
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannel::OpenChannel()" ) ) );
+
+ TInt err( KErrAlreadyExists );
+
+ // Check that this channel is not already open
+ if ( ESsyReferenceChannelIdle == iState )
+ {
+ // Update state and issue request. Will continue in HandleOpenChannelResp
+ UpdateState( ESsyReferenceChannelOpening );
+
+ // Create message with function spesific information
+ // and pass it to command handler
+ err = iCmdHandler->ProcessCommand( TSsyReferenceMsg( ChannelId(), ESsyReferenceOpenChannel ) );
+ }
+
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannel::OpenChannel() - return" ) ) );
+ return err;
+ }
+
+// ---------------------------------------------------------------------------
+// CSsyReferenceChannel::HandleOpenChannelResp
+// ---------------------------------------------------------------------------
+//
+void CSsyReferenceChannel::HandleOpenChannelRespL( const TInt aError )
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannel::HandleOpenChannelResp()" ) ) );
+
+ // Open channel asynhronously and complete request with MSsyCallback::ChannelOpened() when
+ // channel is opened.
+
+ // Create instance of the data provider of this channel
+ iChannelDataProvider = CSsyReferenceChannelDataProvider::NewL( *this );
+ // Create instance of the property provider of this channel
+ iChannelPropertyProvider = CSsyReferencePropertyProvider::NewL( *this );
+
+ TInt error( aError );
+
+ // If channel opening succeeds, update state to Open
+ if ( KErrNone == aError )
+ {
+ // Update state to Open
+ UpdateState( ESsyReferenceChannelOpen );
+ // Get channel properties
+ TRAP( error, iSsyControl.SsyConfig().GetChannelPropertiesL( ChannelId(), iProperties ) );
+ }
+ else
+ {
+ // Channel opening failed, back to idle
+ UpdateState( ESsyReferenceChannelIdle );
+ }
+
+ // Complete transaction
+ iSsyControl.SsyCallback().ChannelOpened( ChannelId(),
+ error,
+ iChannelDataProvider,
+ iChannelPropertyProvider );
+
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannel::HandleOpenChannelResp() - return" ) ) );
+ }
+
+// ---------------------------------------------------------------------------
+// CSsyReferenceChannel::CloseChannel
+// ---------------------------------------------------------------------------
+//
+TInt CSsyReferenceChannel::CloseChannel()
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannel::CloseChannel()" ) ) );
+
+ TInt err( KErrNotFound );
+
+ // Check that this channel is open
+ if ( ESsyReferenceChannelOpen == iState )
+ {
+ // Update state and issue request. Will continue in HandleCloseChannelResp
+ UpdateState( ESsyReferenceChannelClosing );
+ // Create message with function spesific information
+ // and pass it to command handler
+ err = iCmdHandler->ProcessCommand( TSsyReferenceMsg( ChannelId(), ESsyReferenceCloseChannel ) );
+ }
+
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannel::CloseChannel() - return" ) ) );
+ return err;
+ }
+
+// ---------------------------------------------------------------------------
+// CSsyReferenceChannel::HandleCloseChannelResp
+// ---------------------------------------------------------------------------
+//
+void CSsyReferenceChannel::HandleCloseChannelResp()
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannel::HandleCloseChannelResp()" ) ) );
+
+ // Close channel and complete request with MSsyCallback::ChannelClosed() when
+ // channel is closed.
+
+ // Delete providers
+ delete iChannelDataProvider;
+ iChannelDataProvider = NULL;
+
+ delete iChannelPropertyProvider;
+ iChannelPropertyProvider = NULL;
+
+ // Update state to idle
+ UpdateState( ESsyReferenceChannelIdle );
+
+ // Reset properties
+ iProperties.Reset();
+
+ // Complete transaction
+ iSsyControl.SsyCallback().ChannelClosed( ChannelId() );
+
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannel::HandleCloseChannelResp() - return" ) ) );
+ }
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sensorsupport/testsensor/src/ssyreferencechannel.h Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,228 @@
+// ssyreferencechannel.h
+
+/*
+* Copyright (c) 2006-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:
+*
+*/
+
+
+
+
+/**
+ @file
+ @internalComponent
+*/
+
+#ifndef SSYREFERENCECHANNEL_H
+#define SSYREFERENCECHANNEL_H
+
+#include <e32base.h>
+#include <sensors/sensrvtypes.h>
+#include "ssyreferenceconfig.h"
+
+class CSsyReferenceControl;
+class CSsyReferenceChannelDataProvider;
+class CSsyReferencePropertyProvider;
+class CSsyReferenceCmdHandler;
+
+/**
+ * Main control class for SSY. Controls sensor basic functionality and provides mandatory
+ * ECOM interface specific things.
+ */
+class CSsyReferenceChannel : public CBase
+ {
+
+public:
+
+ /**
+ * Enumeration of the state of this channel
+ */
+ enum TSsyReferenceChannelState
+ {
+ ESsyReferenceChannelIdle, // Channel created, not opened
+ ESsyReferenceChannelOpening, // Processing channel opening
+ ESsyReferenceChannelOpen, // Channel is open
+ ESsyReferenceChannelReceiving, // Channel is receiving data
+ ESsyReferenceChannelClosing // Processing channel closing. After this state is idle
+ };
+
+public:
+
+ /**
+ * Two-phase constructor
+ *
+ * @param[in] aSsyControl Reference to SSY control instance.
+ * @param[in] aChannelInfo Information of this channel
+ * @return Pointer to created CSsyReferenceControl object
+ */
+ static CSsyReferenceChannel* NewL( CSsyReferenceControl& aSsyControl, TSensrvChannelInfo aChannelInfo );
+
+ /**
+ * Virtual destructor
+ */
+ virtual ~CSsyReferenceChannel();
+
+ /**
+ * Request for SSY to open a sensor channel asynchronously.
+ * Response to the request is delivered through MSsyCallback::ChannelOpened().
+ * Initilizes SSY (and the sensor) to be ready for other control commands via
+ * data and property providers. Multiple OpenChannel()-requests can be
+ * active for different channels at the same time.
+ *
+ * @return Symbian error code
+ */
+ TInt OpenChannel();
+
+ /**
+ * Request to close a sensor channel asynchronously.
+ * Response to the request is delivered through MSsyCallback::ChannelClosed().
+ * Multiple CloseChannel()-requests can be active for different channels
+ * at the same time.
+ *
+ * @return Symbian error code
+ */
+ TInt CloseChannel();
+
+ /**
+ * Returns ID of this channel
+ */
+ TInt ChannelId();
+
+ /**
+ * Handles response directed to this channel
+ *
+ * @param[in] aMessage Contains information of the response
+ */
+ void ProcessResponse( TSsyReferenceMsg* aMessage );
+
+ /**
+ * Updates the state of this channel
+ *
+ * @param[in] aNewState State to update this channel
+ */
+ void UpdateState( const TSsyReferenceChannelState aNewState );
+
+ /**
+ * Reference to SsyControl
+ */
+ CSsyReferenceControl& SsyControl() const;
+
+ /**
+ * Reference to command handler
+ */
+ CSsyReferenceCmdHandler& CommandHandler() const;
+
+ /**
+ * Search property of given property id from the channel properties and
+ * returns reference to that. Leaves with KErrNotFound if property is not found
+ *
+ * @param[in] aPropertyId Property ID to locate
+ * @param[in] aItemIndex Item index if this search conserns specific property
+ * @param[in] aArrayIndex Indicates array index of property
+ */
+ TSensrvProperty& FindPropertyL( const TSensrvPropertyId aPropertyId,
+ TInt aItemIndex = KErrNotFound,
+ TInt aArrayIndex = ESensrvSingleProperty );
+
+ /**
+ * Search property of given property id from the channel properties and
+ * update property values, if not read only
+ *
+ * @param[in] aProperty Property to find and update
+ */
+ void FindAndUpdatePropertyL( const TSensrvProperty& aProperty );
+
+
+ /**
+ * Copies properties to param PropertyList
+ *
+ * @param[in, out] aPropertyList List where to copy properties
+ */
+ void GetProperties( RSensrvPropertyList& aPropertyList );
+
+private:
+
+ /**
+ * C++ constructor.
+ *
+ * @param[in] aSsyControl Reference to SSY Control instance.
+ * @param[in] aChannelInfo Information of this channel
+ */
+ CSsyReferenceChannel( CSsyReferenceControl& aSsyControl, TSensrvChannelInfo aChannelInfo );
+
+ /**
+ * Symbian 2nd phase constructor.
+ */
+ void ConstructL();
+
+ /**
+ * Handles response for OpenChannel and completes transaction by calling
+ * MSsyCallback::ChannelOpened
+ *
+ * @param[in] aError Error code indicating the channel opening status
+ */
+ void HandleOpenChannelRespL( const TInt aError );
+
+ /**
+ * Handles response for CloseChannel and completes transaction by calling
+ * MSsyCallback::ChannelClosed
+ */
+ void HandleCloseChannelResp();
+
+ /**
+ * Handles response for StartChannelData. Loops all channel data items and sends
+ * each item to ChannelDataProvider
+ */
+ void HandleDataReceivedResp();
+
+private: // data
+
+ /**
+ * Reference to SSY Control to send responses to Sensor Server
+ */
+ CSsyReferenceControl& iSsyControl;
+
+ /**
+ * Pointer to CSsyReferenceChannelDataProvider owned by this channel
+ */
+ CSsyReferenceChannelDataProvider* iChannelDataProvider;
+
+ /**
+ * Pointer to CSsyReferencePropertyProvider owned by this channel
+ */
+ CSsyReferencePropertyProvider* iChannelPropertyProvider;
+
+ /**
+ * Pointer to command handler
+ */
+ CSsyReferenceCmdHandler* iCmdHandler;
+
+ /**
+ * Information of this channel
+ */
+ TSensrvChannelInfo iChannelInfo;
+
+ /**
+ * State of this channel. See CSsyReferenceChannel::TSsyReferenceChannelState
+ */
+ TInt iState;
+
+ /**
+ * Property list of this channel
+ */
+ RSensrvPropertyList iProperties;
+ };
+
+#endif // SSYREFERENCECHANNEL_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sensorsupport/testsensor/src/ssyreferencechanneldataprovider.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,269 @@
+// ssyreferencechanneldataprovider.cpp
+
+// Copyright (c) 2006-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:
+//
+
+
+
+#include "ssyreferencechanneldataprovider.h"
+#include "ssyreferencetrace.h"
+#include "ssyreferencechannel.h"
+#include "ssyreferencecontrol.h"
+#include "ssyreferencecmdhandler.h"
+#include <sensors/spi/ssycallback.h>
+
+// ======== MEMBER FUNCTIONS ========
+
+// ---------------------------------------------------------------------------
+// CSsyReferenceChannelDataProvider C++ constructor
+// ---------------------------------------------------------------------------
+//
+CSsyReferenceChannelDataProvider::CSsyReferenceChannelDataProvider( CSsyReferenceChannel& aChannel ) :
+ iChannel( aChannel )
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannelDataProvider::CSsyReferenceChannelDataProvider()" ) ) );
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannelDataProvider::CSsyReferenceChannelDataProvider() - return" ) ) );
+ }
+
+
+// ---------------------------------------------------------------------------
+// Symbian 2nd phase constructor
+// ---------------------------------------------------------------------------
+//
+void CSsyReferenceChannelDataProvider::ConstructL()
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannelDataProvider::ConstructL()" ) ) );
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannelDataProvider::ConstructL() - return" ) ) );
+ }
+
+
+// ---------------------------------------------------------------------------
+// CSsyReferenceChannelDataProvider::NewL
+// ---------------------------------------------------------------------------
+//
+CSsyReferenceChannelDataProvider* CSsyReferenceChannelDataProvider::NewL( CSsyReferenceChannel& aChannel )
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannelDataProvider::NewL()" ) ) );
+ CSsyReferenceChannelDataProvider* self = new ( ELeave ) CSsyReferenceChannelDataProvider( aChannel );
+ CleanupStack::PushL( self );
+ self->ConstructL();
+ CleanupStack::Pop( self );
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannelDataProvider::NewL() - return" ) ) );
+ return self;
+ }
+
+// ---------------------------------------------------------------------------
+// Destructor
+// ---------------------------------------------------------------------------
+//
+CSsyReferenceChannelDataProvider::~CSsyReferenceChannelDataProvider()
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannelDataProvider::~CSsyReferenceChannelDataProvider()" ) ) );
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannelDataProvider::~CSsyReferenceChannelDataProvider() - return" ) ) );
+ }
+
+// ---------------------------------------------------------------------------
+// CSsyReferenceChannelDataProvider::StartChannelDataL
+// ---------------------------------------------------------------------------
+//
+void CSsyReferenceChannelDataProvider::StartChannelDataL(
+ const TSensrvChannelId aChannelId,
+ TUint8* aBuffer,
+ TInt aCount )
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannelDataProvider::StartChannelDataL()" ) ) );
+
+ if ( iChannel.ChannelId() != aChannelId )
+ {
+ User::Leave( KErrNotFound );
+ }
+
+ // Store buffer pointer
+ iDataBuffer = aBuffer;
+ iMaxCount = aCount;
+ iDataCount = 0;
+
+ // Udpate channel state
+ iChannel.UpdateState( CSsyReferenceChannel::ESsyReferenceChannelReceiving );
+
+ // Start receiving
+ iChannel.CommandHandler().ProcessCommand( TSsyReferenceMsg( aChannelId, ESsyReferenceStartChannelData ) );
+
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannelDataProvider::StartChannelDataL() - return" ) ) );
+ }
+
+// ---------------------------------------------------------------------------
+// CSsyReferenceChannelDataProvider::StopChannelDataL
+// ---------------------------------------------------------------------------
+//
+void CSsyReferenceChannelDataProvider::StopChannelDataL( const TSensrvChannelId aChannelId )
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannelDataProvider::StopChannelDataL()" ) ) );
+
+ // Leave if wrong channel
+ if ( iChannel.ChannelId() != aChannelId )
+ {
+ User::Leave( KErrNotFound );
+ }
+
+ // Udpate channel state
+ iChannel.UpdateState( CSsyReferenceChannel::ESsyReferenceChannelOpen );
+
+ // Stop receiving
+ iChannel.CommandHandler().ProcessCommand( TSsyReferenceMsg( aChannelId, ESsyReferenceStopChannelData ) );
+
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannelDataProvider::StopChannelDataL() - return" ) ) );
+ }
+
+// ---------------------------------------------------------------------------
+// CSsyReferenceChannelDataProvider::ForceBufferFilledL
+// ---------------------------------------------------------------------------
+//
+void CSsyReferenceChannelDataProvider::ForceBufferFilledL( const TSensrvChannelId aChannelId )
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannelDataProvider::ForceBufferFilledL()" ) ) );
+
+ // Leave if wrong channel
+ if ( iChannel.ChannelId() != aChannelId )
+ {
+ User::Leave( KErrNotFound );
+ }
+
+ // Send current buffer. Channel keeps receiveing
+ SendBufferFilled();
+
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannelDataProvider::ForceBufferFilledL() - return" ) ) );
+ }
+
+// -----------------------------------------------------------------------------
+// CSensrvTestCases::GetChannelDataProviderInterfaceL
+// -----------------------------------------------------------------------------
+//
+void CSsyReferenceChannelDataProvider::GetChannelDataProviderInterfaceL( TUid /*aInterfaceUid*/,
+ TAny*& aInterface )
+ {
+ aInterface = NULL;
+ }
+
+// ---------------------------------------------------------------------------
+// CSsyReferenceChannelDataProvider::ChannelDataReceived
+// ---------------------------------------------------------------------------
+//
+void CSsyReferenceChannelDataProvider::ChannelDataReceivedL( TSsyReferenceMsg* aMessage )
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannelDataProvider::ChannelDataReceived()" ) ) );
+
+ // Get base class from message
+ TSsyRefChannelDataBase* dataItemBase = aMessage->DataItem();
+
+ if ( !dataItemBase )
+ {
+ User::Leave( KErrArgument );
+ }
+
+ // get size of the object
+ TInt size( dataItemBase->Size() );
+
+ // First, resolve data item type
+ switch ( dataItemBase->ChannelDataType() )
+ {
+ case TSsyRefChannelDataBase::ESsyRefChannelTypeTapping:
+ {
+ // Cast data item base to tapping data item
+ TSsyRefChannelDataTapping* tappingData = static_cast<TSsyRefChannelDataTapping*>( dataItemBase );
+ TSensrvTappingData senSrvTapping;
+ senSrvTapping.iTimeStamp = tappingData->Timestamp();
+ senSrvTapping.iDirection = tappingData->Direction();
+
+ // Add mapped data item into buffer
+ AddDataToBuffer( reinterpret_cast<TUint8*>( &senSrvTapping ), size );
+ break;
+ }
+ case TSsyRefChannelDataBase::ESsyRefChannelTypeAxis:
+ {
+ // Cast data item base to Axis data item
+ TSsyRefChannelDataAxis* axisData = static_cast<TSsyRefChannelDataAxis*>( dataItemBase );
+ TSensrvAccelerometerAxisData senSrvAxis;
+ senSrvAxis.iTimeStamp = axisData->Timestamp();
+ senSrvAxis.iAxisX = axisData->XAxis();
+ senSrvAxis.iAxisY = axisData->YAxis();
+ senSrvAxis.iAxisZ = axisData->ZAxis();
+
+ // Add data to buffer
+ AddDataToBuffer( reinterpret_cast<TUint8*>( &senSrvAxis ), size );
+ break;
+ }
+ case TSsyRefChannelDataBase::ESsyRefChannelTypeProximity:
+ {
+ // Cast data item base to tapping data item
+ TSsyRefChannelDataProximity* proximityData = static_cast<TSsyRefChannelDataProximity*>( dataItemBase );
+ TSensrvProximityData senSrvProximity;
+ senSrvProximity.iProximityState = ( TSensrvProximityData::TProximityState ) proximityData->ProximityState();
+
+ // Add mapped data item into buffer
+ AddDataToBuffer( reinterpret_cast<TUint8*>( &senSrvProximity ), size );
+ break;
+ }
+ default:
+ {
+ // Unknown data item -> Leave
+ User::Leave( KErrUnknown );
+ }
+ }
+
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannelDataProvider::ChannelDataReceived() - return" ) ) );
+ }
+
+// ---------------------------------------------------------------------------
+// CSsyReferenceChannelDataProvider::AddDataToBuffer
+// ---------------------------------------------------------------------------
+//
+void CSsyReferenceChannelDataProvider::AddDataToBuffer( TUint8* aData, const TInt aSize )
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannelDataProvider::AddDataToBuffer()" ) ) );
+ // Write data to buffer. If buffer is full, send notification to SensorServer
+
+ // Write data bytes one by one to buffer pointer. The actual buffer is in Sensor Server
+ for ( TInt i = 0; i < aSize; i++ )
+ {
+ *iDataBuffer++ = *aData++;
+ }
+
+ // Increase number of items count
+ iDataCount++;
+
+ // Check is maximum data count received
+ if ( iDataCount == iMaxCount )
+ {
+ // Send BufferFilled notification to Sensor server
+ SendBufferFilled();
+ }
+
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannelDataProvider::AddDataToBuffer() - return" ) ) );
+ }
+
+// ---------------------------------------------------------------------------
+// CSsyReferenceChannelDataProvider::SendBufferFilled
+// ---------------------------------------------------------------------------
+//
+void CSsyReferenceChannelDataProvider::SendBufferFilled()
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannelDataProvider::SendBufferFilled()" ) ) );
+ // Send BufferFilled notification to Sensor server
+ iChannel.SsyControl().SsyCallback().BufferFilled( iChannel.ChannelId(), iDataCount, iDataBuffer, iMaxCount );
+ iDataCount = 0;
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceChannelDataProvider::SendBufferFilled() - return" ) ) );
+ }
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sensorsupport/testsensor/src/ssyreferencechanneldataprovider.h Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,149 @@
+// ssyreferencechanneldataprovider.h
+
+/*
+* Copyright (c) 2006-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:
+*
+*/
+
+
+
+
+/**
+ @file
+ @internalComponent
+*/
+
+#ifndef SSYREFERENCECHANNELDATAPROVIDER_H
+#define SSYREFERENCECHANNELDATAPROVIDER_H
+
+#include <sensors/spi/ssychanneldataprovider.h>
+
+class CSsyReferenceChannel;
+class TSsyReferenceMsg;
+
+/**
+ * Channel data provider implementation.
+ */
+class CSsyReferenceChannelDataProvider : public CBase, public MSsyChannelDataProvider
+ {
+
+public:
+
+ /**
+ * Two-phase constructor
+ *
+ * @param[in] aChannel Reference to channel this provider belongs to
+ * @return Pointer to created CSsyReferenceControl object
+ */
+ static CSsyReferenceChannelDataProvider* NewL( CSsyReferenceChannel& aChannel );
+
+ /**
+ * Virtual destructor
+ */
+ virtual ~CSsyReferenceChannelDataProvider();
+
+// from base class MSsyChannelDataProvider
+
+ /**
+ * From MSsyChannelDataProvider
+ * Starts asynchronous data listening. Multiple OpenChannel()-requests
+ * can be active for different channels at the same time.
+ *
+ * @param[in] aBuffer Pointer to a data buffer
+ * @param[in] aCount Indicates data buffer size as a count of the data objects.
+ */
+ void StartChannelDataL( const TSensrvChannelId aChannelId, TUint8* aBuffer, TInt aCount );
+
+ /**
+ * From MSsyChannelDataProvider
+ * Stops asynchronous data listening. The data buffer is not valid after call of
+ * this function.
+ */
+ void StopChannelDataL( const TSensrvChannelId aChannelId );
+
+ /**
+ * From MSsyChannelDataProvider
+ * Forces SSY to call BufferFilled() regardless of how many data items have been
+ * written to buffer. Even if no data items have yet been written, BufferFilled()
+ * must be called.
+ */
+ void ForceBufferFilledL( const TSensrvChannelId aChannelId );
+
+ /**
+ * Returns a pointer to a specified interface - to allow future extension
+ * of this class without breaking binary compatibility
+ *
+ * @param aInterfaceUid Identifier of the interface to be retrieved
+ * @param aInterface A reference to a pointer that retrieves the specified interface.
+ */
+ void GetChannelDataProviderInterfaceL( TUid aInterfaceUid, TAny*& aInterface );
+
+ /**
+ * Channel data item received
+ *
+ * @param[in] aMessage Contains channel item
+ */
+ void ChannelDataReceivedL( TSsyReferenceMsg* aMessage );
+
+private:
+
+ /**
+ * C++ constructor.
+ * @param[in] aChannel Reference to channel this provider belongs to
+ */
+ CSsyReferenceChannelDataProvider( CSsyReferenceChannel& aChannel );
+
+ /**
+ * Symbian 2nd phase constructor.
+ */
+ void ConstructL();
+
+ /**
+ * Adds data into buffer.
+ *
+ *@param[in] aData Data to add to buffer
+ *@param[in] aSize Size of data
+ */
+ void AddDataToBuffer( TUint8* aData, const TInt aSize );
+
+ /**
+ * Sends BufferFilled notification to MSsyCallback
+ */
+ void SendBufferFilled();
+
+private: // data
+
+ /**
+ * Reference to channel for which this provider belongs to
+ */
+ CSsyReferenceChannel& iChannel;
+
+ /**
+ * Pointer to data buffer in Sensor Server side
+ */
+ TUint8* iDataBuffer;
+
+ /**
+ * Maximum requested data items
+ */
+ TInt iMaxCount;
+
+ /**
+ * Number of items in buffer
+ */
+ TInt iDataCount;
+ };
+
+#endif // SSYREFERENCECHANNELDATAPROVIDER_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sensorsupport/testsensor/src/ssyreferencecmdhandler.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,367 @@
+// ssyreferencecmdhandler.cpp
+
+// Copyright (c) 2006-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:
+//
+
+
+
+#include <e32property.h>
+#include "ssyreferencecmdhandler.h"
+#include "ssyreferencecontrol.h"
+#include "ssyreferencechannel.h"
+#include "ssyreferencetrace.h"
+
+// ======== CONSTANTS ========
+const TInt KSsyRefShortDelay = 100;
+
+// ======== MEMBER FUNCTIONS ========
+
+// ---------------------------------------------------------------------------
+// CSsyReferenceCmdHandler C++ constructor
+// ---------------------------------------------------------------------------
+//
+CSsyReferenceCmdHandler::CSsyReferenceCmdHandler( CSsyReferenceChannel& aSsyChannel ) :
+ CActive( EPriorityNormal ),
+ iSsyChannel( aSsyChannel )
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceCmdHandler::CSsyReferenceCmdHandler()" ) ) );
+ CActiveScheduler::Add( this );
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceCmdHandler::CSsyReferenceCmdHandler() - return" ) ) );
+ }
+
+
+// ---------------------------------------------------------------------------
+// Symbian 2nd phase constructor
+// ---------------------------------------------------------------------------
+//
+void CSsyReferenceCmdHandler::ConstructL()
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceCmdHandler::ConstructL()" ) ) );
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceCmdHandler::ConstructL() - return" ) ) );
+ }
+
+
+// ---------------------------------------------------------------------------
+// CSsyReferenceCmdHandler::NewL
+// ---------------------------------------------------------------------------
+//
+CSsyReferenceCmdHandler* CSsyReferenceCmdHandler::NewL( CSsyReferenceChannel& aSsyChannel )
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceCmdHandler::NewL()" ) ) );
+ CSsyReferenceCmdHandler* self = new ( ELeave ) CSsyReferenceCmdHandler( aSsyChannel );
+ CleanupStack::PushL( self );
+ self->ConstructL();
+ CleanupStack::Pop( self );
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceCmdHandler::NewL() - return" ) ) );
+ return self;
+ }
+
+// ---------------------------------------------------------------------------
+// Destructor
+// ---------------------------------------------------------------------------
+//
+CSsyReferenceCmdHandler::~CSsyReferenceCmdHandler()
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceCmdHandler::~CSsyReferenceCmdHandler()" ) ) );
+
+ if ( iMessage )
+ {
+ // Send ProcessResponse
+ iMessage->SetError( KErrCancel );
+ iSsyChannel.ProcessResponse( iMessage );
+ delete iMessage;
+ iMessage = NULL;
+ }
+
+ if ( iTimer )
+ {
+ iTimer->Cancel();
+ delete iTimer;
+ }
+
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceCmdHandler::~CSsyReferenceCmdHandler() - return" ) ) );
+ }
+
+// ---------------------------------------------------------------------------
+// CSsyReferenceCmdHandler::ProcessCommand
+// ---------------------------------------------------------------------------
+//
+TInt CSsyReferenceCmdHandler::ProcessCommand( TSsyReferenceMsg aMessage )
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceCmdHandler::ProcessCommand()" ) ) );
+ TInt err( KErrAlreadyExists );
+
+ // Special case, when channel is reciving, iMessage is not deleted after ProcessCommand
+ if ( aMessage.Function() == ESsyReferenceStopChannelData )
+ {
+ // Stop 'receiving'. No need to handle this asynchronously
+ if ( iTimer )
+ {
+ iTimer->Cancel();
+ delete iTimer;
+ iTimer = NULL;
+ }
+
+ iDataItemArray.Reset();
+ iDataItemPtr = 0;
+ err = KErrNone;
+ // No need to send ProcessResponse either
+ delete iMessage;
+ iMessage = NULL;
+ }
+ else if ( !iMessage )
+ {
+ iMessage = new TSsyReferenceMsg( aMessage );
+ if(iMessage)
+ {
+ switch( aMessage.Function() )
+ {
+ case ESsyReferenceStartChannelData:
+ {
+ // Get channel data items and start 'receiving'
+ IssueRequest();
+ err = KErrNone;
+ break;
+ }
+ case ESsyReferenceOpenChannel:
+ {
+ // Open channel specific handling here
+ IssueRequest();
+ err = KErrNone;
+ break;
+ }
+ case ESsyReferenceCloseChannel:
+ {
+ // Close channel specific handling here
+ IssueRequest();
+ err = KErrNone;
+ break;
+ }
+ default:
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceCmdHandler::ProcessCommand() - Unknown function" ) ) );
+ err = KErrNotFound;
+ }
+ }
+ }
+ else
+ {
+ err = KErrNoMemory;
+ }
+ }
+ else
+ {
+ err = KErrUnknown;
+ }
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceCmdHandler::ProcessCommand() - return" ) ) );
+ return err;
+ }
+
+// ---------------------------------------------------------------------------
+// CSsyReferenceCmdHandler::IssueRequest
+// ---------------------------------------------------------------------------
+//
+void CSsyReferenceCmdHandler::IssueRequest( TInt aError )
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceCmdHandler::IssueRequest()" ) ) );
+ // Provides synchronous function calls to be handled as asynchronous
+ if ( !IsActive() )
+ {
+ TRequestStatus *s = &iStatus;
+ User::RequestComplete( s, aError );
+ SetActive();
+ }
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceCmdHandler::IssueRequest() - return" ) ) );
+ }
+
+// ---------------------------------------------------------------------------
+// CSsyReferenceCmdHandler::SendResponse
+// ---------------------------------------------------------------------------
+//
+void CSsyReferenceCmdHandler::SendResponse( TInt aError )
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceCmdHandler::SendResponse()" ) ) );
+ // Send response to channel
+ if ( iMessage )
+ {
+ iMessage->SetError( aError );
+ iSsyChannel.ProcessResponse( iMessage );
+ delete iMessage;
+ iMessage = NULL;
+ }
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceCmdHandler::SendResponse() - return" ) ) );
+ }
+
+// ---------------------------------------------------------------------------
+// CSsyReferenceCmdHandler::RunL
+// ---------------------------------------------------------------------------
+//
+void CSsyReferenceCmdHandler::RunL()
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceCmdHandler::RunL() - %i" ), iStatus.Int() ) );
+
+ TInt err( iStatus.Int() );
+
+ if ( iMessage )
+ {
+ switch( iMessage->Function() )
+ {
+ case ESsyReferenceStartChannelData:
+ {
+ TInt startInterval( 0 );
+
+ // Get all Channel data information from config file
+ iSsyChannel.SsyControl().SsyConfig().
+ GetChannelDataInformationL( iMessage->ChannelId(), iDataItemArray, startInterval );
+
+ // Check that channel data items were found
+ if ( iDataItemArray.Count() )
+ {
+ // If interval is zero, set small interval
+ if ( startInterval == 0 )
+ {
+ startInterval = KSsyRefShortDelay;
+ }
+
+ // wait that interval
+ if ( iTimer )
+ {
+ iTimer->Cancel();
+ delete iTimer;
+ iTimer = NULL;
+ }
+
+ // Reset pointer
+ iDataItemPtr = 0;
+
+ // Start timer and continue processing in callback function
+ iTimer = CPeriodic::NewL( EPriorityNormal );
+ iTimer->Start( startInterval * 1000, 0, TCallBack( DataItemCallback, this ) );
+ }
+ break;
+ }
+ case ESsyReferenceOpenChannel:
+ {
+ // Open channel response specific handling here
+ iMessage->SetFunction( ESsyReferenceOpenChannelResp );
+ SendResponse();
+ break;
+ }
+ case ESsyReferenceCloseChannel:
+ {
+ // Close channel response specific handling here
+ iMessage->SetFunction( ESsyReferenceCloseChannelResp );
+ SendResponse();
+ break;
+ }
+ default:
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceCmdHandler::ProcessCommand() - Unknown function" ) ) );
+ err = KErrNotFound;
+ }
+ }
+ }
+
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceCmdHandler::RunL() - return" ) ) );
+ }
+
+// ---------------------------------------------------------------------------
+// CSsyReferenceCmdHandler::DoCancel
+// ---------------------------------------------------------------------------
+//
+void CSsyReferenceCmdHandler::DoCancel()
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceCmdHandler::DoCancel()" ) ) );
+
+ // Handle cancel for this channel. Cancel any ongoing requests
+
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceCmdHandler::DoCancel() - return" ) ) );
+ }
+
+// ---------------------------------------------------------------------------
+// CSsyReferenceCmdHandler::RunError
+// ---------------------------------------------------------------------------
+//
+TInt CSsyReferenceCmdHandler::RunError( TInt /*aError*/ )
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceCmdHandler::RunError()" ) ) );
+
+ // Handle possible errors here and return KErrNone to prevent SSY from panic
+
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceCmdHandler::RunError() - return" ) ) );
+ return KErrNone;
+ }
+
+// ---------------------------------------------------------------------------
+// CSsyReferenceCmdHandler::DataItemCallback
+// ---------------------------------------------------------------------------
+//
+TInt CSsyReferenceCmdHandler::DataItemCallback( TAny* aThis )
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceCmdHandler::DataItemCallback()" ) ) );
+ return static_cast<CSsyReferenceCmdHandler*>( aThis )->GenerateChannelDataItem();
+ }
+
+// ---------------------------------------------------------------------------
+// CSsyReferenceCmdHandler::GenerateChannelDataItem
+// ---------------------------------------------------------------------------
+//
+TInt CSsyReferenceCmdHandler::GenerateChannelDataItem()
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceCmdHandler::GenerateChannelDataItem()" ) ) );
+
+ // Get next item from list and set pointer to next item
+ TSsyRefChannelDataBase dataItem = iDataItemArray[iDataItemPtr++];
+
+ // Get next item interval from data item
+ TInt nextInterval( dataItem.Interval() );
+
+ // Set timestamp to data item
+ TTime time;
+ time.HomeTime();
+ dataItem.SetTimestamp( time );
+
+ // If interval is zero, set small interval
+ if ( nextInterval == 0 )
+ {
+ nextInterval = KSsyRefShortDelay;
+ }
+
+ // Add data item to message
+ iMessage->SetDataItem( &dataItem );
+
+ // If in last data item, set pointer back to first item
+ if ( iDataItemArray.Count() == iDataItemPtr )
+ {
+ iDataItemPtr = 0;
+ }
+
+ // Send response and start new timer
+ iMessage->SetFunction( ESsyReferenceDataItemReceived );
+ iSsyChannel.ProcessResponse( iMessage );
+
+ if ( iTimer )
+ {
+ delete iTimer;
+ iTimer = NULL;
+ }
+
+ TRAP_IGNORE( iTimer = CPeriodic::NewL( EPriorityNormal );
+ iTimer->Start( nextInterval * 1000, 0, TCallBack( DataItemCallback, this ) ); )
+
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceCmdHandler::GenerateChannelDataItem() - return" ) ) );
+ return KErrNone;
+ }
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sensorsupport/testsensor/src/ssyreferencecmdhandler.h Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,147 @@
+// ssyreferencecmdhandler.h
+
+/*
+* Copyright (c) 2006-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:
+*
+*/
+
+
+
+
+/**
+ @file
+ @internalComponent
+*/
+
+#ifndef SSYREFERENCECMDHANDLER_H
+#define SSYREFERENCECMDHANDLER_H
+
+#include <e32base.h>
+#include "ssyreferenceconfig.h"
+
+// FORWARD DECLARATIONS
+class CSsyReferenceChannel;
+
+/**
+ * Command handler class for handling commands of one channel. Each opened
+ * channel has its own instance of this class
+ */
+class CSsyReferenceCmdHandler : public CActive
+ {
+
+public:
+
+ /**
+ * Two-phase constructor
+ *
+ * @param[in] aSsyChannel Reference to SSY Channel instance.
+ * @return Pointer to created CSsyReferenceCmdHandler object
+ */
+ static CSsyReferenceCmdHandler* NewL( CSsyReferenceChannel& aSsyChannel );
+
+ /**
+ * Virtual destructor
+ */
+ virtual ~CSsyReferenceCmdHandler();
+
+// from base class CSsyControl
+
+ /**
+ * Processes command specified in param aMessage.
+ *
+ * @param[in] aMessage Contains command information to process
+ * @return Symbian error code
+ */
+ TInt ProcessCommand( TSsyReferenceMsg aMessage );
+
+ /**
+ * From CActive
+ */
+ void RunL();
+
+ /**
+ * From CActive
+ */
+ void DoCancel();
+
+ /**
+ * From CActive
+ */
+ TInt RunError( TInt aError );
+
+ /**
+ * Callback function for DataItem generation
+ */
+ static TInt DataItemCallback( TAny* aThis );
+
+ /**
+ * Handles data item generation. Called from DataItemCallback
+ */
+ TInt GenerateChannelDataItem();
+
+private:
+
+ /**
+ * C++ constructor.
+ *
+ * @param[in] aSsyChannel Reference to SSY Channel instance.
+ */
+ CSsyReferenceCmdHandler( CSsyReferenceChannel& aSsyChannel );
+
+ /**
+ * Symbian 2nd phase constructor.
+ */
+ void ConstructL();
+
+ /**
+ * Makes synchronous calls asynchronous
+ */
+ void IssueRequest( TInt aError = KErrNone );
+
+ /**
+ * Sends response to channel
+ */
+ void SendResponse( TInt aError = KErrNone );
+
+private: // data
+
+ /**
+ * Reference to SSY Conrtol to send responses for commands
+ */
+ CSsyReferenceChannel& iSsyChannel;
+
+ /**
+ * Pointer to currently processing message
+ */
+ TSsyReferenceMsg* iMessage;
+
+ /**
+ * Data item array
+ */
+ TSsyRefDataItemArray iDataItemArray;
+
+ /**
+ * Pointer to next item to generate in iDataItemArray
+ */
+ TInt iDataItemPtr;
+
+ /**
+ * Periodic timer for generating channel data
+ */
+ CPeriodic* iTimer;
+ };
+
+#endif // SSYREFERENCECMDHANDLER_H
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sensorsupport/testsensor/src/ssyreferenceconfig.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,896 @@
+// ssyreferenceconfig.cpp
+
+// Copyright (c) 2006-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:
+//
+
+
+
+#include <sensors/sensrvtypes.h>
+#include <f32file.h>
+#include <gmxmldocument.h>
+#include <gmxmlelement.h>
+#include <sensors/channels/ssyreferenceaccelerometer.h>
+#include <sensors/channels/ssyreferencemagnetometer.h>
+#include <sensors/channels/ssyreferenceorientation.h>
+#include <sensors/channels/ssyreferenceproximity.h>
+
+#include "ssyreferencecontrol.h"
+#include "ssyreferenceconfig.h"
+#include "ssyreferencetrace.h"
+
+
+// ======== CONSTANTS =======
+_LIT( KSsyReferenceCfgFileOrig, "z:\\refssy\\ssyreferenceconfig.xml" );
+_LIT( KSsyReferenceCfgFileExt, "c:\\refssy\\ssyreferenceconfig.xml" );
+
+// Config file definitions
+
+// Maximum attribute length
+const TInt KSsyRefMaxAttribLength = 20;
+
+// TAG DEFINITIONS
+_LIT( KSsyRefRootTag, "SsyReferenceConfig" ); // Ssy general information tag
+_LIT( KSsyRefGeneralInfoTag, "SsyGeneralInformation" ); // Ssy general information tag
+_LIT( KSsyRefChannelInfoGroupTag, "ChannelInformationGroup" ); // Channel information group tag
+_LIT( KSsyRefChannelItemTag, "ChannelItem" ); // Channel item tag
+_LIT( KSsyRefChannelDataTag, "ChannelData" ); // Channel data tag
+_LIT( KSsyRefChannelDataItemTag, "ChannelDataItem" ); // Channel data item tag
+
+_LIT( KSsyRefProperties, "Properties" ); // Properties tag
+_LIT( KSsyRefPropertyItem, "PropertyItem" ); // PropertyItem tag
+
+// Data item definitions
+_LIT( KSsyRefAxisDataItemTag, "SsyRefChannelDataAxis" ); // SsyRefChannelDataAxis data item tag
+_LIT( KSsyRefXAxis, "XAxis" ); // XAxis from SsyRefChannelDataAxis
+_LIT( KSsyRefYAxis, "YAxis" ); // YAxis from SsyRefChannelDataAxis
+_LIT( KSsyRefZAxis, "ZAxis" ); // ZAxis from SsyRefChannelDataAxis
+
+_LIT( KSsyRefTappingDataItemTag, "SsyRefChannelDataTapping" ); // SsyRefChannelDataTapping data item tag
+_LIT( KSsyRefDirection, "Direction" ); // Direction from SsyRefChannelDataTapping
+
+_LIT( KSsyRefProximityDataItemTag, "SsyRefChannelDataProximity" ); // SsyRefChannelDataProximity data item tag
+_LIT( KSsyRefProximityState, "ProximityState" ); // ProximityStatus from SsyRefChannelDataProximity
+
+// ATTRIBUTE DEFINITIONS
+_LIT( KSsyRefChannelCount, "ChannelCount" ); // Channel count from ChannelInformationGroup
+_LIT( KSsyRefChannelId, "ChannelId" ); // Channel ID from ChannelItem
+_LIT( KSsyRefContextType, "ContextType" ); // Context type from ChannelItem
+_LIT( KSsyRefQuantity, "Quantity" ); // Quantity from ChannelItem
+_LIT( KSsyRefChannelType, "ChannelType" ); // ChannelType from ChannelItem
+_LIT( KSsyRefLocation, "Location" ); // Location from ChannelItem
+_LIT( KSsyRefVendorId, "Vendor" ); // Vendor from ChannelItem
+
+
+// Channel data item specific attribute definitions
+_LIT( KSsyRefStartInterval, "StartIntervalMs" ); // StartInterval from ChannelData
+_LIT( KSsyRefDataItemCount, "count" ); // count from ChannelDataItem
+_LIT( KSsyRefDataTypeID, "DataTypeId" ); // DataTypeId from ChannelDataItem
+_LIT( KSsyRefInterval, "IntervalMs" ); // IntervalMs from ChannelDataItem
+
+// Property spesific attributes
+_LIT( KSsyRefPropertyId, "PropertyId" ); // PropertyId from PropertyItem
+_LIT( KSsyRefArrayIndex, "ArrayIndex" ); // ArrayIndex from PropertyItem
+_LIT( KSsyRefItemIndex, "ItemIndex" ); // ItemIndex from PropertyItem
+_LIT( KSsyRefPropertyValue, "PropertyValue" ); // PropertyValue from PorpertyItem
+_LIT( KSsyRefPropertyType, "PropertyType" ); // PropertyType from PropertyItem
+_LIT( KSsyRefMaxValue, "MaxValue" ); // MaxValue from PropertyItem
+_LIT( KSsyRefMinValue, "MinValue" ); // MinValue from PorpertyItem
+_LIT( KSsyRefReadOnly, "ReadOnly" ); // ReadOnly from PropertyItem
+
+
+// ======== MEMBER FUNCTIONS ========
+
+// ---------------------------------------------------------------------------
+// CSsyReferenceConfig C++ constructor
+// ---------------------------------------------------------------------------
+//
+CSsyReferenceConfig::CSsyReferenceConfig() :
+ CActive( EPriorityMuchLess )
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::CSsyReferenceConfig()" ) ) );
+ CActiveScheduler::Add( this );
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::CSsyReferenceConfig() - return" ) ) );
+ }
+
+
+// ---------------------------------------------------------------------------
+// Symbian 2nd phase constructor
+// ---------------------------------------------------------------------------
+//
+void CSsyReferenceConfig::ConstructL()
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::ConstructL()" ) ) );
+ // Create config file parser
+ iConfigParser = CMDXMLParser::NewL( this );
+
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::ConstructL() - return" ) ) );
+ }
+
+
+// ---------------------------------------------------------------------------
+// CSsyReferenceConfig::NewL
+// ---------------------------------------------------------------------------
+//
+CSsyReferenceConfig* CSsyReferenceConfig::NewL()
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::NewL()" ) ) );
+ CSsyReferenceConfig* self = new ( ELeave ) CSsyReferenceConfig();
+ CleanupStack::PushL( self );
+ self->ConstructL();
+ CleanupStack::Pop( self );
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::NewL() - return" ) ) );
+ return self;
+ }
+
+// ---------------------------------------------------------------------------
+// Destructor
+// ---------------------------------------------------------------------------
+//
+CSsyReferenceConfig::~CSsyReferenceConfig()
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::~CSsyReferenceConfig()" ) ) );
+
+ if ( iConfigParser )
+ {
+ delete iConfigParser;
+ iConfigParser = NULL;
+ }
+
+ if ( iGenralInfoElement )
+ {
+ delete iGenralInfoElement;
+ iGenralInfoElement = NULL;
+ }
+
+ if ( iChannelGroupElement )
+ {
+ delete iChannelGroupElement;
+ iChannelGroupElement = NULL;
+ }
+
+ if ( iSsyReferenceConfig )
+ {
+ delete iSsyReferenceConfig;
+ iSsyReferenceConfig = NULL;
+ }
+
+ if ( iConfigFile )
+ {
+ delete iConfigFile;
+ iConfigFile = NULL;
+ }
+
+ iChannelPairArray.Reset();
+
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::~CSsyReferenceConfig() - return" ) ) );
+ }
+
+// ---------------------------------------------------------------------------
+// CSsyReferenceConfig::InitConfig
+// ---------------------------------------------------------------------------
+//
+void CSsyReferenceConfig::InitConfigL()
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::InitConfig()" ) ) );
+
+ // Open config file
+ RFs fileSession;
+ User::LeaveIfError( fileSession.Connect() );
+
+ // Locate extrenal file...
+ RFile file;
+ TInt err( file.Open( fileSession, KSsyReferenceCfgFileExt, EFileRead ) );
+ file.Close();
+
+ // Check is external file found
+ if ( KErrNone == err )
+ {
+ // Use SSY with external configuration
+ User::LeaveIfError( iConfigParser->ParseFile( fileSession, KSsyReferenceCfgFileExt ) );
+ }
+ else
+ {
+ // Use SSY with original configuration
+
+ // Start parsing file and wait notification to ParseFileCompleteL
+ // XML Parser takes ownership of the RFs and closes it when file is parsed
+ User::LeaveIfError( iConfigParser->ParseFile( fileSession, KSsyReferenceCfgFileOrig ) );
+ }
+
+ iConfigFileParsed = EFalse;
+
+ // This active object has very low priority since XML parser uses Active objects also,
+ // so it is mandatory to let XML parser to complete sooner than this active object
+ IssueRequest();
+ iSchedulerWait.Start(); // Blocks until file is parsed
+
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::InitConfig() - return" ) ) );
+ }
+
+// ---------------------------------------------------------------------------
+// CSsyReferenceConfig::IssueRequest
+// ---------------------------------------------------------------------------
+//
+void CSsyReferenceConfig::IssueRequest( TInt aError )
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::IssueRequest()" ) ) );
+ // Provides synchronous function calls to be handled as asynchronous
+ if ( !IsActive() )
+ {
+ SetActive();
+ TRequestStatus *s = &iStatus;
+ User::RequestComplete( s, aError );
+ }
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::IssueRequest() - return" ) ) );
+ }
+
+// ---------------------------------------------------------------------------
+// CSsyReferenceConfig::RunL
+// ---------------------------------------------------------------------------
+//
+void CSsyReferenceConfig::RunL()
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::RunL() - %i" ), iStatus.Int() ) );
+
+ if ( iConfigFileParsed )
+ {
+ // Stop blocking
+ iSchedulerWait.AsyncStop();
+ }
+ else
+ {
+ // Continue RunL loop
+ IssueRequest();
+ }
+
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::RunL() - return" ) ) );
+ }
+
+// ---------------------------------------------------------------------------
+// CSsyReferenceConfig::DoCancel
+// ---------------------------------------------------------------------------
+//
+void CSsyReferenceConfig::DoCancel()
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::DoCancel()" ) ) );
+
+ // Stop blocking
+ iSchedulerWait.AsyncStop();
+
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::DoCancel() - return" ) ) );
+ }
+
+// ---------------------------------------------------------------------------
+// CSsyReferenceConfig::RunError
+// ---------------------------------------------------------------------------
+//
+TInt CSsyReferenceConfig::RunError( TInt /*aError*/ )
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::RunError()" ) ) );
+
+ // Handle possible errors here and return KErrNone to prevent SSY from panic
+
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::RunError() - return" ) ) );
+ return KErrNone;
+ }
+
+// ---------------------------------------------------------------------------
+// CSsyReferenceConfig::ParseFileCompleteL
+// ---------------------------------------------------------------------------
+//
+void CSsyReferenceConfig::ParseFileCompleteL()
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::ParseFileCompleteL()" ) ) );
+ // First get document
+ iConfigFile = iConfigParser->DetachXMLDoc();
+ // Then get document element
+ CMDXMLElement* documentElement = iConfigFile->DocumentElement();
+ // Get root element, 'SsyReferenceConfig'
+ iSsyReferenceConfig = documentElement->FirstChildOfType( KSsyRefRootTag );
+ // Get gereral information element
+ iGenralInfoElement = iSsyReferenceConfig->FirstChildOfType( KSsyRefGeneralInfoTag );
+ // Get channel information group element
+ iChannelGroupElement = iSsyReferenceConfig->FirstChildOfType( KSsyRefChannelInfoGroupTag );
+ // Get channel count
+ iChannelCount = GetAttributeIntValue( *iChannelGroupElement, KSsyRefChannelCount );
+
+ // No need to delete documentElement, it is owned by iConfigFile.
+ documentElement = NULL;
+ iConfigFileParsed = ETrue;
+
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::ParseFileCompleteL() - return" ) ) );
+ }
+
+// ---------------------------------------------------------------------------
+// CSsyReferenceConfig::GetAttributeIntValue
+// ---------------------------------------------------------------------------
+//
+TInt CSsyReferenceConfig::GetAttributeIntValue( CMDXMLElement& aElement, const TDesC& aAttrib )
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::GetAttributeIntValue()" ) ) );
+ COMPONENT_TRACE( ( _L( " Element: %s", aElement.NodeName() ) ) );
+ COMPONENT_TRACE( ( _L( " Attribute: %s", aAttrib ) ) );
+
+ TInt intValue( 0 );
+
+ // Check availability
+ if ( aElement.IsAttributeSpecified( aAttrib ) )
+ {
+ // Buffer to where to read value
+ TBufC<KSsyRefMaxAttribLength> buffer( KNullDesC );
+ TPtrC ptr( buffer );
+
+ // Read attribute value
+ aElement.GetAttribute( aAttrib, ptr );
+
+ // Cast literal value into TInt
+ TLex lexValue( ptr );
+ lexValue.Val( intValue );
+ }
+
+ COMPONENT_TRACE( ( _L( " IntValue: %i", intValue ) ) );
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::GetAttributeIntValue() - return" ) ) );
+ return intValue;
+ }
+
+// ---------------------------------------------------------------------------
+// CSsyReferenceConfig::GetAttributeStrValue
+// ---------------------------------------------------------------------------
+//
+void CSsyReferenceConfig::GetAttributeStrValue( CMDXMLElement& aElement, const TDesC& aAttrib, TDes8& aTarget )
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::GetAttributeStrValue()" ) ) );
+ COMPONENT_TRACE( ( _L( " Element: %s", aElement.NodeName() ) ) );
+ COMPONENT_TRACE( ( _L( " Attribute: %s", aAttrib ) ) );
+
+ // Check availability
+ if ( aElement.IsAttributeSpecified( aAttrib ) )
+ {
+ // Buffer to where to read value
+ TBufC<KSsyRefMaxAttribLength> buffer( KNullDesC );
+ TPtrC ptr( buffer );
+
+ // Read attribute value
+ aElement.GetAttribute( aAttrib, ptr );
+
+ // Copy string from 16-bit descriptor to 8-bit descriptor
+ aTarget.Copy( ptr );
+ }
+
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::GetAttributeStrValue() - return" ) ) );
+ }
+
+// ---------------------------------------------------------------------------
+// CSsyReferenceConfig::GetAttributeHexValue
+// ---------------------------------------------------------------------------
+//
+TUint CSsyReferenceConfig::GetAttributeHexValue( CMDXMLElement& aElement, const TDesC& aAttrib )
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::GetAttributeHexValue()" ) ) );
+ COMPONENT_TRACE( ( _L( " Element: %s", aElement.NodeName() ) ) );
+ COMPONENT_TRACE( ( _L( " Attribute: %s", aAttrib ) ) );
+
+ TUint32 hexValue( 0 );
+
+ // Check availability
+ if ( aElement.IsAttributeSpecified( aAttrib ) )
+ {
+ // Buffer to where to read value
+ TBufC<KSsyRefMaxAttribLength> buffer( KNullDesC );
+ TPtrC ptr( buffer );
+
+ // Read attribute value
+ aElement.GetAttribute( aAttrib, ptr );
+
+ // Get bounded value and cast it into TUint32 (hex)
+ TRadix radix( EHex );
+ TUint limit( 0xFFFFFFFF );
+
+ // Append string into Lex and skip first two characters, 0x
+ TLex lexValue( ptr );
+ lexValue.Inc( 2 );
+
+ // Read value
+ lexValue.BoundedVal( hexValue, radix, limit );
+ }
+
+ COMPONENT_TRACE( ( _L( " HexValue: %x", hexValue ) ) );
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::GetAttributeHexValue() - return" ) ) );
+ return hexValue;
+ }
+
+// ---------------------------------------------------------------------------
+// CSsyReferenceConfig::GetAttributeRealValue
+// ---------------------------------------------------------------------------
+//
+TReal CSsyReferenceConfig::GetAttributeRealValue( CMDXMLElement& aElement, const TDesC& aAttrib )
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::GetAttributeRealValue()" ) ) );
+ COMPONENT_TRACE( ( _L( " Element: %s", aElement.NodeName() ) ) );
+ COMPONENT_TRACE( ( _L( " Attribute: %s", aAttrib ) ) );
+
+ TReal realValue( 0 );
+
+ // Check availability
+ if ( aElement.IsAttributeSpecified( aAttrib ) )
+ {
+
+ // Buffer to where to read value
+ TBufC<KSsyRefMaxAttribLength> buffer( KNullDesC );
+ TPtrC ptr( buffer );
+
+ // Read attribute value
+ aElement.GetAttribute( aAttrib, ptr );
+
+ // Cast literal value into TReal
+ TLex lexValue( ptr );
+ TInt error = lexValue.Val( realValue );
+ if( error!=KErrNone )
+ {
+ realValue = error;
+ }
+ }
+
+ COMPONENT_TRACE( ( _L( " IntValue: %i", realValue ) ) );
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::GetAttributeRealValue() - return" ) ) );
+ return realValue;
+ }
+
+// ---------------------------------------------------------------------------
+// CSsyReferenceConfig::ChannelCount
+// ---------------------------------------------------------------------------
+//
+TInt CSsyReferenceConfig::ChannelCount()
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::ChannelCount() - %i" ), iChannelCount ) );
+ return iChannelCount;
+ }
+
+// ---------------------------------------------------------------------------
+// CSsyReferenceConfig::GenerateChannels
+// ---------------------------------------------------------------------------
+//
+void CSsyReferenceConfig::GenerateChannels( RSensrvChannelInfoList& aChannelList )
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::GenerateChannels()" ) ) );
+
+ // Initialize channel pair array
+ TSsyRefChannelIdArray tempArray( iChannelCount );
+ iChannelPairArray = tempArray;
+
+ // Go through Channel group element and get all information
+ TSensrvChannelInfo channelInfo;
+ CMDXMLElement* channelElement = iChannelGroupElement->FirstChildOfType( KSsyRefChannelItemTag );
+
+ while( channelElement )
+ {
+ // check is element correct type of node
+ if ( channelElement->NodeType() == CMDXMLNode::EElementNode )
+ {
+ // read channel identifier
+ iChannelPairArray.Append( TSsyRefChannelIdPair( GetAttributeIntValue( *channelElement, KSsyRefChannelId ) ) );
+
+ // Read attributes
+ channelInfo.iContextType = ( TSensrvContextType ) GetAttributeIntValue( *channelElement, KSsyRefContextType );
+ channelInfo.iQuantity = ( TSensrvQuantity ) GetAttributeIntValue( *channelElement, KSsyRefQuantity );
+ channelInfo.iChannelType = ( TSensrvChannelTypeId ) GetAttributeHexValue( *channelElement, KSsyRefChannelType );
+ GetAttributeStrValue( *channelElement, KSsyRefLocation, channelInfo.iLocation );
+ GetAttributeStrValue( *channelElement, KSsyRefVendorId, channelInfo.iVendorId );
+ channelInfo.iChannelDataTypeId = ( TSensrvChannelDataTypeId ) GetAttributeHexValue( *channelElement, KSsyRefDataTypeID );
+
+ // Calculate data item size based on channel type
+ switch ( channelInfo.iChannelType )
+ {
+ case KSensrvChannelTypeIdAccelerometerXYZAxisData:
+ {
+ channelInfo.iDataItemSize = KSsyRefAxisDataItemSize;
+ break;
+ }
+ case KSensrvChannelTypeIdProximityMonitor:
+ {
+ channelInfo.iDataItemSize = KSsyRefProximityDataItemSize;
+ break;
+ }
+ case KSensrvChannelTypeIdAccelerometerWakeupData:
+ case KSensrvChannelTypeIdAccelerometerDoubleTappingData:
+ {
+ channelInfo.iDataItemSize = KSsyRefTappingDataItemSize;
+ break;
+ }
+ default:
+ {
+ channelInfo.iDataItemSize = 0;
+ break;
+ }
+ }
+
+ // Append channel info to list
+ aChannelList.Append( channelInfo );
+ }
+ channelElement = static_cast<CMDXMLElement*>( channelElement->NextSibling() );
+ }
+
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::GenerateChannels() - return" ) ) );
+ }
+
+// ---------------------------------------------------------------------------
+// CSsyReferenceConfig::GetChannelDataInformation
+// ---------------------------------------------------------------------------
+//
+void CSsyReferenceConfig::GetChannelDataInformationL(
+ const TInt aSrvChannelId,
+ TSsyRefDataItemArray& aDataItemList,
+ TInt& aStartInterval )
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::GetChannelDataInformation()" ) ) );
+
+ // First, get correct config channel element corresponding to aSrvChannelId
+ CMDXMLElement* channelElement = ChannelElement( aSrvChannelId );
+
+ if ( channelElement )
+ {
+ // Channel element found, get channel data group element
+ CMDXMLElement* groupElement = channelElement->FirstChildOfType( KSsyRefChannelDataTag );
+
+ if ( groupElement )
+ {
+ // Get start interval
+ aStartInterval = GetAttributeIntValue( *groupElement, KSsyRefStartInterval );
+
+ // First, loop channel data items to get total count
+ CMDXMLElement* dataItemElement = groupElement->FirstChildOfType( KSsyRefChannelDataItemTag );
+
+ // Take channel data item type at this point. One channel can produce only one type of
+ // channel data item
+ TUint channelType( GetAttributeHexValue( *dataItemElement, KSsyRefDataTypeID ) );
+
+ TInt channelItemCount( 0 ); // Total number of data items
+ TInt definitionCount( 0 ); // Total number of different definitions
+
+ // Go through elements and get counters
+ while ( dataItemElement )
+ {
+ definitionCount++;
+ channelItemCount = channelItemCount + GetAttributeIntValue( *dataItemElement, KSsyRefDataItemCount );
+ // This will return NULL if no next sibling found
+ dataItemElement = static_cast<CMDXMLElement*>( dataItemElement->NextSibling() );
+ }
+
+ // Now, start all over to get item information
+ dataItemElement = groupElement->FirstChildOfType( KSsyRefChannelDataItemTag );
+
+ // Create temp array now that we know the data item count
+ TSsyRefDataItemArray tempArray( channelItemCount );
+
+ for ( TInt i = 0; i < definitionCount; i++ )
+ {
+ // Check element type
+ if ( dataItemElement->NodeType() == CMDXMLNode::EElementNode )
+ {
+ // First we get interval and count from channel item
+ TInt interval( GetAttributeIntValue( *dataItemElement, KSsyRefInterval ) );
+ TInt countOfType( GetAttributeIntValue( *dataItemElement, KSsyRefDataItemCount ) );
+
+ // Read next child values to corresponding data type class
+ switch ( channelType )
+ {
+ case TSensrvAccelerometerAxisData::KDataTypeId:
+ {
+ CMDXMLElement* axisDataElement = dataItemElement->FirstChildOfType( KSsyRefAxisDataItemTag );
+ TInt axisX( GetAttributeIntValue( *axisDataElement, KSsyRefXAxis ) );
+ TInt axisY( GetAttributeIntValue( *axisDataElement, KSsyRefYAxis ) );
+ TInt axisZ( GetAttributeIntValue( *axisDataElement, KSsyRefZAxis ) );
+
+ // Create channel data type item
+ TSsyRefChannelDataAxis channelData( axisX, axisY, axisZ, interval );
+ // add items into array
+ for ( TInt k = 0; k < countOfType; k++ )
+ {
+ tempArray.Append( channelData );
+ }
+ break;
+ }
+ case TSensrvTappingData::KDataTypeId:
+ {
+ CMDXMLElement* tappingDataElement = dataItemElement->FirstChildOfType( KSsyRefTappingDataItemTag );
+ TInt direction( GetAttributeHexValue( *tappingDataElement, KSsyRefDirection ) );
+
+ // Create channel data type item
+ TSsyRefChannelDataTapping channelData( direction, interval );
+ // add items into array
+ for ( TInt k = 0; k < countOfType; k++ )
+ {
+ tempArray.Append( channelData );
+ }
+ break;
+ }
+ case TSensrvProximityData::KDataTypeId:
+ {
+ CMDXMLElement* proximityDataElement = dataItemElement->FirstChildOfType( KSsyRefProximityDataItemTag );
+ TInt state( GetAttributeIntValue( *proximityDataElement, KSsyRefProximityState ) );
+
+ // Create channel data type item
+ TSsyRefChannelDataProximity channelData( state, interval );
+ // add items into array
+ for ( TInt k = 0; k < countOfType; k++ )
+ {
+ tempArray.Append( channelData );
+ }
+ break;
+ }
+ default:
+ {
+ // Other data items are not supported
+ User::Leave( KErrGeneral );
+ }
+ }
+ }
+
+ // Get next channel data item element
+ dataItemElement = static_cast<CMDXMLElement*>( dataItemElement->NextSibling() );
+ }
+
+ // Compress temp array in case there were comments
+ tempArray.Compress();
+
+ // copy information to param array
+ aDataItemList = tempArray;
+ }
+ else
+ {
+ User::Leave( KErrNotFound );
+ }
+ }
+ else
+ {
+ User::Leave( KErrNotFound );
+ }
+
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::GetChannelDataInformation() - return" ) ) );
+ }
+
+// ---------------------------------------------------------------------------
+// CSsyReferenceConfig::GetElementPropertiesL
+// ---------------------------------------------------------------------------
+//
+void CSsyReferenceConfig::GetElementPropertiesL(
+ CMDXMLElement& aElement,
+ RSensrvPropertyList& aPropertyList )
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::GetElementPropertiesL()" ) ) );
+
+ // First we need 'Properties' element
+ CMDXMLElement* properties = aElement.FirstChildOfType( KSsyRefProperties );
+
+ if ( !properties )
+ {
+ // Wrong element... or properties are not defined
+ User::Leave( KErrNotFound );
+ }
+
+ // Get first property get started
+ CMDXMLElement* propertyItem = properties->FirstChildOfType( KSsyRefPropertyItem );
+ TInt propertyCount( 0 );
+
+ // Loop properties to get count of properties
+ while ( propertyItem )
+ {
+ propertyCount++;
+ propertyItem = static_cast<CMDXMLElement*>( propertyItem->NextSibling() ); // returns NULL if next not found
+ }
+
+ if ( !propertyCount )
+ {
+ // Check that there are properties
+ User::Leave( KErrNotFound );
+ }
+
+ // Temporary property list now that we know the property count
+ RSensrvPropertyList tempList( propertyCount );
+
+ // Start loop again from the start and read each property
+ propertyItem = properties->FirstChildOfType( KSsyRefPropertyItem );
+ for ( TInt i = 0; i < propertyCount; i++ )
+ {
+ // Check element type
+ if ( propertyItem->NodeType() == CMDXMLNode::EElementNode )
+ {
+ // Read property values
+ const TSensrvPropertyId propertyId( ( TSensrvPropertyId )GetAttributeHexValue( *propertyItem, KSsyRefPropertyId ) );
+ const TInt itemIndex( GetAttributeIntValue( *propertyItem, KSsyRefItemIndex ) );
+ const TBool readOnly( ( TBool )GetAttributeIntValue( *propertyItem, KSsyRefReadOnly ) );
+ const TSensrvPropertyType propertyType( ( TSensrvPropertyType ) GetAttributeIntValue( *propertyItem, KSsyRefPropertyType ) );
+
+ // Array index must be handled in different way as it is not mandatory and it may not exist in XML file
+ TInt arrayIndex( ESensrvSingleProperty );
+
+ // Extra check is needed, otherwise this value is always '0' when it should be 'ESensrvSingleProperty' by default
+ if ( propertyItem->IsAttributeSpecified( KSsyRefArrayIndex ) )
+ {
+ // Attribute exists, now we can read the value
+ arrayIndex = GetAttributeIntValue( *propertyItem, KSsyRefArrayIndex );
+ }
+
+ // Resolve type, get correct type value and append property into list
+ switch ( propertyType )
+ {
+ case ESensrvIntProperty:
+ {
+ const TInt intValue( GetAttributeIntValue( *propertyItem, KSsyRefPropertyValue ) );
+ const TInt maxValue( GetAttributeIntValue( *propertyItem, KSsyRefMaxValue ) );
+ const TInt minValue( GetAttributeIntValue( *propertyItem, KSsyRefMinValue ) );
+ TSensrvProperty property( propertyId, itemIndex, intValue, maxValue, minValue, readOnly, propertyType );
+ property.SetArrayIndex( arrayIndex );
+ tempList.Append( property );
+ break;
+ }
+ case ESensrvRealProperty:
+ {
+ const TReal intValue( GetAttributeRealValue( *propertyItem, KSsyRefPropertyValue ) );
+ const TReal maxValue( GetAttributeRealValue( *propertyItem, KSsyRefMaxValue ) );
+ const TReal minValue( GetAttributeRealValue( *propertyItem, KSsyRefMinValue ) );
+ TSensrvProperty property( propertyId, itemIndex, intValue, maxValue, minValue, readOnly, propertyType );
+ property.SetArrayIndex( arrayIndex );
+ tempList.Append( property );
+ break;
+ }
+ case ESensrvBufferProperty:
+ {
+ TBuf8<KSensrvPropertyTextBufferSize> desValue;
+ GetAttributeStrValue( *propertyItem, KSsyRefPropertyValue, desValue );
+ TSensrvProperty property( propertyId, itemIndex, desValue, readOnly, propertyType );
+ property.SetArrayIndex( arrayIndex );
+ tempList.Append( property );
+ break;
+ }
+ default:
+ {
+ // Unknown property type -> leave
+ User::Leave( KErrArgument );
+ }
+ }
+ }
+
+ // Next property
+ propertyItem = static_cast<CMDXMLElement*>( propertyItem->NextSibling() ); // returns NULL if next not found
+ }
+
+ // Compress temp list in case there were comment nodes
+ tempList.Compress();
+
+ // copy temp list to parameter list
+ aPropertyList = tempList;
+
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::GetElementPropertiesL() - return" ) ) );
+ }
+
+// ---------------------------------------------------------------------------
+// CSsyReferenceConfig::ChannelElement
+// ---------------------------------------------------------------------------
+//
+CMDXMLElement* CSsyReferenceConfig::ChannelElement( const TInt aSrvChannelId )
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::ChannelElement()" ) ) );
+
+ const TInt configId( ConfigChannelId( aSrvChannelId ) );
+ TBool channelFound( EFalse );
+
+ // Loop channel group and match configId for the channel ID in element
+ CMDXMLElement* channelItemElement = iChannelGroupElement->FirstChildOfType( KSsyRefChannelItemTag );
+
+ for ( TInt i = 0; i < iChannelCount && !channelFound; i++ )
+ {
+ TInt channelId( GetAttributeIntValue( *channelItemElement, KSsyRefChannelId ) );
+ if ( configId == channelId )
+ {
+ // Channel found, no need to loop
+ channelFound = ETrue;
+ }
+ else
+ {
+ // Take next channel
+ channelItemElement = static_cast<CMDXMLElement*>( channelItemElement->NextSibling() );
+ }
+ }
+
+ // If not found, return NULL
+ if ( !channelFound )
+ {
+ channelItemElement = NULL;
+ }
+
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::ChannelElement() - return" ) ) );
+ return channelItemElement;
+ }
+
+// ---------------------------------------------------------------------------
+// CSsyReferenceConfig::UpdateChannelIds
+// ---------------------------------------------------------------------------
+//
+void CSsyReferenceConfig::UpdateChannelIds( RSensrvChannelInfoList aChannelList )
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::UpdateChannelIds()" ) ) );
+
+
+ if ( ChannelCount() == aChannelList.Count() )
+ {
+ for ( TInt i = 0; i < aChannelList.Count(); i++ )
+ {
+ iChannelPairArray[i].SetServerId( aChannelList[i].iChannelId );
+ }
+ }
+
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::UpdateChannelIds() - return" ) ) );
+ }
+
+// ---------------------------------------------------------------------------
+// CSsyReferenceConfig::ConfigChannelId
+// ---------------------------------------------------------------------------
+//
+TInt CSsyReferenceConfig::ConfigChannelId( const TInt aSrvChannelId ) const
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::ConfigChannelId()" ) ) );
+ TInt returnValue( 0 );
+
+ for ( TInt i = 0; i < iChannelPairArray.Count(); i++ )
+ {
+ if ( iChannelPairArray[i].ServerId() == aSrvChannelId )
+ {
+ returnValue = iChannelPairArray[i].ConfigId();
+ }
+ }
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::ConfigChannelId() - return" ) ) );
+ return returnValue;
+ }
+
+// ---------------------------------------------------------------------------
+// CSsyReferenceConfig::GetSensorPropertiesL
+// ---------------------------------------------------------------------------
+//
+void CSsyReferenceConfig::GetSensorPropertiesL( RSensrvPropertyList& aPropertyList )
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::GetSensorPropertiesL()" ) ) );
+
+ // We already have SsyGeneralInformation element, read properties from that
+ GetElementPropertiesL( *iGenralInfoElement, aPropertyList );
+
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::GetSensorPropertiesL() - return" ) ) );
+ }
+
+// ---------------------------------------------------------------------------
+// CSsyReferenceConfig::GetChannelPropertiesL
+// ---------------------------------------------------------------------------
+//
+void CSsyReferenceConfig::GetChannelPropertiesL(
+ const TInt aSrvChannelId,
+ RSensrvPropertyList& aPropertyList )
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::GetChannelPropertiesL()" ) ) );
+
+ // Get channel element first
+ CMDXMLElement* channelElement = ChannelElement( aSrvChannelId );
+
+ if ( !channelElement )
+ {
+ // Leave, channel element is not found
+ User::Leave( KErrNotFound );
+ }
+
+ // Get properties of this channel element
+ GetElementPropertiesL( *channelElement, aPropertyList );
+
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceConfig::GetChannelPropertiesL() - return" ) ) );
+ }
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sensorsupport/testsensor/src/ssyreferenceconfig.h Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,522 @@
+// ssyreferenceconfig.h
+
+/*
+* Copyright (c) 2006-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:
+*
+*/
+
+
+
+
+/**
+ @file
+ @internalComponent
+*/
+
+
+#ifndef SSYREFERENCECONFIG_H
+#define SSYREFERENCECONFIG_H
+
+// INCLUDES
+#include <e32base.h>
+#include <sensors/sensrvtypes.h>
+#include <sensors/sensrvchannelinfo.h>
+#include <gmxmlparser.h>
+#include <sensors/channels/ssyreferenceaccelerometer.h>
+#include <sensors/channels/ssyreferencemagnetometer.h>
+#include <sensors/channels/ssyreferenceorientation.h>
+#include <sensors/channels/ssyreferenceproximity.h>
+
+// CONSTANTS
+// Data item sizes
+const TInt KSsyRefAxisDataItemSize = sizeof( TSensrvAccelerometerAxisData );
+const TInt KSsyRefTappingDataItemSize = sizeof( TSensrvTappingData );
+const TInt KSsyRefProximityDataItemSize = sizeof( TSensrvProximityData );
+
+// ENUMS
+enum TSsyReferenceFunctions
+ {
+ ESsyReferenceOpenChannel,
+ ESsyReferenceOpenChannelResp,
+ ESsyReferenceDataItemReceived,
+ ESsyReferenceCloseChannel,
+ ESsyReferenceCloseChannelResp,
+ ESsyReferenceStartChannelData,
+ ESsyReferenceStopChannelData
+ };
+
+/**
+ * Base class for Channel data types. Contains iChannelDataType which is set
+ * by derived classes on construction.
+ */
+class TSsyRefChannelDataBase
+ {
+ public:
+ /**
+ * Enumeration for possible channel data types
+ */
+ enum TSsyRefChannelDataType
+ {
+ ESsyRefChannelTypeTapping = 5000,
+ ESsyRefChannelTypeAxis,
+ ESsyRefChannelTypeProximity,
+ ESsyRefChannelTypeAmbientLight
+ };
+
+ TInt ChannelDataType() const { return iChannelDataType; }
+ TInt Interval() const { return iInterval; }
+
+ void SetTimestamp( const TTime aTimestamp ) { iTimestamp = aTimestamp; }
+ TTime Timestamp() const { return iTimestamp; }
+
+ TInt Size() const { return iSize; }
+
+ protected:
+
+ /**
+ * Protected constructor as this class is not supposed to be instantiate
+ * directly.
+ */
+ TSsyRefChannelDataBase() {}
+
+ protected: // data
+
+ /**
+ * Identifies the type of data type class derived from this base class
+ */
+ TInt iChannelDataType;
+
+ /**
+ * Interval. Indicates time in ms from previous item until next item is produced
+ */
+ TInt iInterval;
+
+ /**
+ * Timestamp. Time when this data item is generated.
+ */
+ TTime iTimestamp;
+
+ /**
+ * Size of one data item. This is filled by derived class
+ */
+ TInt iSize;
+
+ /**
+ * Axis data item values.
+ * Accessible only from TSsyRefChannelDataAxis class
+ */
+ TInt iXAxis;
+ TInt iYAxis;
+ TInt iZAxis;
+
+
+ /**
+ * Proximity data item values.
+ * Accessible only from TSsyRefChannelProximity class
+ */
+ TInt iProximityState;
+
+ /**
+ * AmbientLight data item values.
+ * Accessible only from TSsyRefChannelAmbientLight class
+ */
+ TInt iAmbientLightState;
+
+ /**
+ * Tapping data item values. Difrection of the tapping.
+ * Accessible only from TSsyRefChannelDataTapping class
+ */
+ TInt iDirection;
+ };
+
+// Type definition array for Data item base class
+typedef RArray<TSsyRefChannelDataBase> TSsyRefDataItemArray;
+
+/**
+ * Message item for SSY <--> Sensor communications
+ * Contains Channel ID for which the message belongs to,
+ * Function ID that identifies the command and
+ * error for error cases.
+ */
+class TSsyReferenceMsg
+ {
+ public:
+
+ /**
+ * Constructor of the TSsyReferenceMsg
+ *
+ * @param[in] aChannelId Channel identifier
+ * @param[in] aFunction See TSsyReferenceFunctions
+ */
+ TSsyReferenceMsg( TInt aChannelId, TInt aFunction ) :
+ iChannelId( aChannelId ),
+ iFunction( aFunction ),
+ iError( KErrNone )
+ {}
+
+ /**
+ * Copy constructor of the TSsyReferenceMsg
+ *
+ * @param[in] aMsg Object to be copied to constructed object
+ */
+ TSsyReferenceMsg( const TSsyReferenceMsg& aMsg ) :
+ iChannelId( aMsg.iChannelId ),
+ iFunction( aMsg.iFunction ),
+ iError( aMsg.iError )
+ {}
+
+ TInt ChannelId() { return iChannelId; }
+
+ void SetFunction( TInt aFunction ) { iFunction = aFunction; }
+ TInt Function() { return iFunction; }
+
+ void SetError( TInt aError ) { iError = aError; }
+ TInt Error() { return iError; }
+
+ void SetDataItem( TSsyRefChannelDataBase* aDataItem ) { iDataItem = aDataItem; }
+ TSsyRefChannelDataBase* DataItem() const { return iDataItem; }
+
+ private: // data
+
+ TInt iChannelId; // Identifies the channel
+ TInt iFunction; // Identifies the command
+ TInt iError; // Error is passed to response handler
+
+ // Data item for received data. This is casted to correct data item
+ // class implementation according to ChannelDataType
+ TSsyRefChannelDataBase* iDataItem;
+ };
+
+/**
+ * Tapping data type class implementation.
+ */
+class TSsyRefChannelDataTapping : public TSsyRefChannelDataBase
+ {
+ public:
+
+ TSsyRefChannelDataTapping( TInt aDirection, TInt aInterval )
+ {
+ iChannelDataType = ESsyRefChannelTypeTapping;
+ iSize = KSsyRefTappingDataItemSize;
+ iInterval = aInterval;
+ iDirection = aDirection;
+ }
+
+ TInt Direction() const { return iDirection; }
+ };
+
+/**
+ * XYZ Axis data type class implementation.
+ */
+class TSsyRefChannelDataAxis : public TSsyRefChannelDataBase
+ {
+ public:
+
+ TSsyRefChannelDataAxis( TInt aXAxis, TInt aYAxis, TInt aZAxis,
+ TInt aInterval )
+ {
+ iChannelDataType = ESsyRefChannelTypeAxis;
+ iSize = KSsyRefAxisDataItemSize;
+ iInterval = aInterval;
+ iXAxis = aXAxis;
+ iYAxis = aYAxis;
+ iZAxis = aZAxis;
+ }
+
+ TInt XAxis() const { return iXAxis; }
+ TInt YAxis() const { return iYAxis; }
+ TInt ZAxis() const { return iZAxis; }
+ };
+
+
+/**
+ * Proximity data type class implementation.
+ */
+class TSsyRefChannelDataProximity : public TSsyRefChannelDataBase
+ {
+ public:
+
+ TSsyRefChannelDataProximity( TInt aProximityState, TInt aInterval )
+ {
+ iChannelDataType = ESsyRefChannelTypeProximity;
+ iSize = KSsyRefProximityDataItemSize;
+ iInterval = aInterval;
+ iProximityState = aProximityState;
+ }
+
+ TInt ProximityState() const { return iProximityState; }
+ };
+
+/**
+ * Channel ID pair class for pairing config file channel id and
+ * Sensor Server generated channel ID.
+ */
+class TSsyRefChannelIdPair
+ {
+ public:
+ /**
+ * Constructor of the TSsyRefChannelIdPair
+ *
+ * @param[in] aConfigChannelId Channel identifier from config file
+ */
+ TSsyRefChannelIdPair( TInt aConfigChannelId ) :
+ iConfigChannelId( aConfigChannelId )
+ {}
+
+ TInt ConfigId() const { return iConfigChannelId; }
+ TInt ServerId() const { return iSrvChannelId; }
+
+ void SetServerId( const TInt aSrvId ) { iSrvChannelId = aSrvId; }
+
+ private: // data
+
+ TInt iConfigChannelId; // Config file ID of the channel
+ TInt iSrvChannelId; // Sensor server assigned ID of the channel
+ };
+
+typedef RArray<TSsyRefChannelIdPair> TSsyRefChannelIdArray;
+
+
+// CONSTANTS
+
+/**
+ * Configuration class for SSY reference plugin. Generates configured SSY channel information.
+ * This keeps reference SSY implementation independent from 'sensor' it uses. This class is fully
+ * modifiable regarding to the needs of this SSY. It may be for example accelerometer sensor
+ * without any changes in the SSY reference implementation. Only this class is modified.
+ */
+class CSsyReferenceConfig : public CActive, public MMDXMLParserObserver
+ {
+
+public:
+
+ /**
+ * Two-phase constructor
+ *
+ * @return Pointer to created CSsyReferenceControl object
+ */
+ static CSsyReferenceConfig* NewL();
+
+ /**
+ * Virtual destructor
+ */
+ virtual ~CSsyReferenceConfig();
+
+ /**
+ * From CActive
+ */
+ void RunL();
+
+ /**
+ * From CActive
+ */
+ void DoCancel();
+
+ /**
+ * From CActive
+ */
+ TInt RunError( TInt aError );
+
+ /**
+ * From MMDXMLParserObserver
+ *
+ * Call back function used to inform a client of the Parser when a parsing operation completes.
+ */
+ void ParseFileCompleteL();
+
+ /**
+ * Starts parsing config file. This function blocks until file is parsed
+ */
+ void InitConfigL();
+
+ /**
+ * Total number of channels this SSY provides
+ *
+ * @return Count of channels this SSY is configured to provide
+ */
+ TInt ChannelCount();
+
+ /**
+ * Generates channels this SSY is configured to provide
+ *
+ * @param[in,out] aChannnelList Filled with generated channels by this configurator
+ */
+ void GenerateChannels( RSensrvChannelInfoList& aChannelList );
+
+ /**
+ * Updates Sensor server's generated channel Ids
+ *
+ * @param[in] aChannnelList Same list as GenerateChannels produces but
+ * this contains channel identifiers
+ */
+ void UpdateChannelIds( RSensrvChannelInfoList aChannelList );
+
+ /**
+ * Reads all channel data information from config file and fills
+ * parameters with information
+ *
+ * @param[in] aSrvChannelId Sensor server generated channel id of the target channel
+ * @param[in,out] aDataItemList Contains data item objects defined in config file. Each
+ * Data item is presented as Data Item class derived from TSsyRefChannelDataBase.
+ * List can contain only one type of derived channel data items
+ * @param[in,out] aStartInterval Contains start interval to start producing data items
+ */
+ void GetChannelDataInformationL( const TInt aSrvChannelId,
+ TSsyRefDataItemArray& aDataItemList,
+ TInt& aStartInterval );
+
+ /**
+ * Reads sensor properties from config file and adds them to list
+ *
+ * @param[out] aPropertyList List where to append properties
+ */
+ void GetSensorPropertiesL( RSensrvPropertyList& aPropertyList );
+
+ /**
+ * Reads channel properties from config file and adds them to list
+ *
+ * @param[in] aSenSrvChannelId Sensor server generated channel id
+ * @param[out] aPropertyList List where to append properties
+ */
+ void GetChannelPropertiesL( const TInt aSrvChannelId,
+ RSensrvPropertyList& aPropertyList );
+
+private:
+
+ /**
+ * C++ constructor.
+ */
+ CSsyReferenceConfig();
+
+ /**
+ * Symbian 2nd phase constructor.
+ */
+ void ConstructL();
+
+ /**
+ * Makes synchronous calls asynchronous
+ */
+ void IssueRequest( TInt aError = KErrNone );
+
+ /**
+ * Reads attribute value from element and casts it into TInt value
+ *
+ * @param[in] aElement Element from where to read attribute
+ * @param[in] aAttrib Attribute name which to read
+ * @return Integer value of read value
+ */
+ TInt GetAttributeIntValue( CMDXMLElement& aElement, const TDesC& aAttrib );
+
+ /**
+ * Reads attribute value from element and casts it into literal value
+ *
+ * @param[in] aElement Element from where to read attribute
+ * @param[in] aAttrib Attribute name which to read
+ * @param[in/out] aTarget Target descriptor where to copy read literal
+ */
+ void GetAttributeStrValue( CMDXMLElement& aElement, const TDesC& aAttrib, TDes8& aTarget );
+
+ /**
+ * Reads attribute value from element and casts it into TReal value
+ *
+ * @param[in] aElement Element from where to read attribute
+ * @param[in] aAttrib Attribute name which to read
+ * @return value of the attribute
+ */
+ TReal GetAttributeRealValue( CMDXMLElement& aElement, const TDesC& aAttrib );
+
+ /**
+ * Reads Hexadesimal attribute value from element and casts it into Integer value
+ *
+ * @param[in] aElement Element from where to read attribute
+ * @param[in] aAttrib Attribute name which to read
+ * @return Unsigned integer value of read Hexadesimal value
+ */
+ TUint GetAttributeHexValue( CMDXMLElement& aElement, const TDesC& aAttrib );
+
+ /**
+ * Compares Sensor server generated channel IDs and return corresponding
+ * ConfigFile channel id
+ *
+ * @param[in] aSrvChannelId SenServer generated channel ID for which pair is needed
+ * @return ConfigFile channel ID that is paired with aSrvChannelId
+ */
+ TInt ConfigChannelId( const TInt aSrvChannelId ) const;
+
+ /**
+ * Searches channel element for given SensorServer generated channel ID
+ *
+ * @param[in] aSrvChannelId SenServer generated channel ID identifying wanted channel element
+ * @return Pointer to found channel element or NULL if not found
+ */
+ CMDXMLElement* ChannelElement( const TInt aSrvChannelId );
+
+ /**
+ * Reads properties from given element and adds them to list.
+ * Element can be either 'SsyGenealInformation' or 'ChannelItem'
+ *
+ * @param[in] aElement Element from where to read properties
+ * @param[out] aPropertyList List where to append properties
+ */
+ void GetElementPropertiesL( CMDXMLElement& aElement, RSensrvPropertyList& aPropertyList );
+
+
+private: // data
+
+ /**
+ * Pointer of the config xml-file parser
+ */
+ CMDXMLParser* iConfigParser;
+
+ /**
+ * Contains Ssy general information element and all of its childs
+ */
+ CMDXMLElement* iGenralInfoElement;
+
+ /**
+ * Contains Ssy Channel information group element and all of its childs
+ * including each channel information and channel data for testing purpose
+ */
+ CMDXMLElement* iChannelGroupElement;
+
+ /**
+ * Number of channels defined in config file
+ */
+ TInt iChannelCount;
+
+ /**
+ * Active scheduler wait for blocking construction until config file is parsed
+ */
+ CActiveSchedulerWait iSchedulerWait;
+
+ /**
+ * Indicates is config file parsed
+ */
+ TBool iConfigFileParsed;
+
+ /**
+ * Channel ID pair array
+ */
+ TSsyRefChannelIdArray iChannelPairArray;
+
+ /**
+ * Elements of the config file. These needs to be stored
+ */
+ CMDXMLDocument* iConfigFile;
+ CMDXMLElement* iSsyReferenceConfig; // Root of the config
+ };
+
+#endif //SSYREFERENCECONFIG_H
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sensorsupport/testsensor/src/ssyreferencecontrol.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,281 @@
+// ssyreferencecontrol.cpp
+
+// Copyright (c) 2006-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:
+//
+
+
+
+
+#include <sensors/spi/ssycallback.h> // MSsyCallback
+#include "ssyreferencecontrol.h"
+#include "ssyreferencetrace.h"
+#include "ssyreferencechannel.h"
+#include "ssyreferencecmdhandler.h"
+
+
+// ======== MEMBER FUNCTIONS ========
+
+// ---------------------------------------------------------------------------
+// CSsyReferenceControl C++ constructor
+// ---------------------------------------------------------------------------
+//
+CSsyReferenceControl::CSsyReferenceControl( MSsyCallback& aSsyCallback ) :
+ iSsyCallback( aSsyCallback )
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceControl::CSsyReferenceControl()" ) ) );
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceControl::CSsyReferenceControl() - return" ) ) );
+ }
+
+
+// ---------------------------------------------------------------------------
+// Symbian 2nd phase constructor
+// ---------------------------------------------------------------------------
+//
+void CSsyReferenceControl::ConstructL()
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceControl::ConstructL()" ) ) );
+
+ // Create configurator and start config file parsing
+ iConfigFile = CSsyReferenceConfig::NewL();
+ TRAPD( err, iConfigFile->InitConfigL() ); // This will block until config is ready
+
+ if ( KErrNone != err )
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceControl::ConstructL() - Init config failed: %i" ), err ) );
+ }
+
+ // ---------------------------------------------------------------
+
+ // Store channel count for later use
+ const TInt channelCount( iConfigFile->ChannelCount() );
+
+ // Instantiate channel info list
+ RSensrvChannelInfoList channelInfoList( channelCount );
+ CleanupClosePushL( channelInfoList );
+
+ // Fills channel info list with generated channel info objects
+ iConfigFile->GenerateChannels( channelInfoList );
+
+ // Register channels. Sensor Server generates unique ID for each channel
+ iSsyCallback.RegisterChannelsL( channelInfoList );
+
+ // Update channel IDs to ConfigFile
+ iConfigFile->UpdateChannelIds( channelInfoList );
+
+ // Create channels
+ iChannelArray = new ( ELeave ) CArrayPtrFlat<CSsyReferenceChannel>( channelCount );
+ for ( TInt i = 0; i < channelCount; i++ )
+ {
+ CSsyReferenceChannel* channel = CSsyReferenceChannel::NewL( *this, channelInfoList[i] );
+ iChannelArray->AppendL( channel );
+ }
+
+ // Clean up
+ CleanupStack::PopAndDestroy( &channelInfoList );
+
+ // Get properties of this SSY. Leaves with KErrNotFound if not found. These properties are
+ // not mandatory, so we can ignore that leave
+ TRAP_IGNORE( iConfigFile->GetSensorPropertiesL( iProperties ) );
+
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceControl::ConstructL() - return" ) ) );
+ }
+
+
+// ---------------------------------------------------------------------------
+// CSsyReferenceControl::NewL
+// ---------------------------------------------------------------------------
+//
+CSsyReferenceControl* CSsyReferenceControl::NewL( MSsyCallback& aSsyCallback )
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceControl::NewL()" ) ) );
+ CSsyReferenceControl* self = new ( ELeave ) CSsyReferenceControl( aSsyCallback );
+ CleanupStack::PushL( self );
+ self->ConstructL();
+ CleanupStack::Pop( self );
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceControl::NewL() - return" ) ) );
+ return self;
+ }
+
+// ---------------------------------------------------------------------------
+// Destructor
+// ---------------------------------------------------------------------------
+//
+CSsyReferenceControl::~CSsyReferenceControl()
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceControl::~CSsyReferenceControl()" ) ) );
+
+ if ( iChannelArray )
+ {
+ if ( iChannelArray->Count() )
+ {
+ iChannelArray->ResetAndDestroy();
+ }
+
+ delete iChannelArray;
+ }
+
+ if ( iConfigFile )
+ {
+ delete iConfigFile;
+ iConfigFile = NULL;
+ }
+
+ iProperties.Reset();
+
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceControl::~CSsyReferenceControl() - return" ) ) );
+ }
+
+// ---------------------------------------------------------------------------
+// CSsyReferenceControl::SsyCallback
+// ---------------------------------------------------------------------------
+//
+MSsyCallback& CSsyReferenceControl::SsyCallback() const
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceControl::SsyCallback()" ) ) );
+ return iSsyCallback;
+ }
+
+// ---------------------------------------------------------------------------
+// CSsyReferenceControl::SsyConfig
+// ---------------------------------------------------------------------------
+//
+CSsyReferenceConfig& CSsyReferenceControl::SsyConfig() const
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceControl::SsyConfig()" ) ) );
+ return *iConfigFile;
+ }
+
+// ---------------------------------------------------------------------------
+// CSsyReferenceControl::FindPropertyL
+// ---------------------------------------------------------------------------
+//
+void CSsyReferenceControl::FindPropertyL(
+ const TSensrvPropertyId aPropertyId,
+ const TInt aArrayIndex,
+ TSensrvProperty& aProperty )
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceControl::FindPropertyL()" ) ) );
+ TSensrvProperty* property = NULL;
+ TBool propertyFound( EFalse );
+
+ // Search property
+ for ( TInt i = 0; i < iProperties.Count() && !propertyFound; i++ )
+ {
+ property = static_cast<TSensrvProperty*>( &iProperties[i] );
+
+ // Compare property IDs
+ if ( property->GetPropertyId() == aPropertyId )
+ {
+ // Correct property ID is found, now check is it array type of property.
+ // Either array indexes must match or propertys array index has to be array info
+ if ( ( property->GetArrayIndex() == aArrayIndex ) ||
+ ( ( property->GetArrayIndex() == ESensrvArrayPropertyInfo ) &&
+ ( ESensrvSingleProperty == aArrayIndex ) ) )
+ {
+ // Correct array index found
+ propertyFound = ETrue;
+ }
+ }
+ }
+
+ // Leave if not found
+ if ( !propertyFound )
+ {
+ User::Leave( KErrNotFound );
+ }
+
+ aProperty = *property;
+
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceControl::FindPropertyL() - return" ) ) );
+ }
+
+
+// ---------------------------------------------------------------------------
+// CSsyReferenceControl::FindChannel
+// ---------------------------------------------------------------------------
+//
+CSsyReferenceChannel* CSsyReferenceControl::FindChannelL( TSensrvChannelId aChannelID )
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceControl::FindChannel()" ) ) );
+
+ if ( !iChannelArray )
+ {
+ User::Leave( KErrNotFound );
+ }
+
+ const TInt channelCount( iChannelArray->Count() );
+ CSsyReferenceChannel* channel = NULL;
+
+ // Check that there are channels
+ if ( channelCount )
+ {
+ // Loop channels until correct channel is found
+ for ( TInt i = 0; i < channelCount; i++ )
+ {
+ channel = iChannelArray->At( i );
+
+ // Compare channel id
+ if ( channel->ChannelId() == aChannelID )
+ {
+ // Channel found, no need to loop rest
+ i = channelCount;
+ }
+ }
+ }
+
+ // Leave if channel is not found
+ if ( !channel )
+ {
+ User::Leave( KErrNotFound );
+ }
+
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceControl::FindChannel() - return" ) ) );
+ return channel;
+ }
+
+// ---------------------------------------------------------------------------
+// CSsyReferenceControl::OpenChannelL
+// ---------------------------------------------------------------------------
+//
+void CSsyReferenceControl::OpenChannelL( TSensrvChannelId aChannelID )
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceControl::OpenChannelL()" ) ) );
+ // Find and open channel
+ User::LeaveIfError( FindChannelL( aChannelID )->OpenChannel() );
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceControl::OpenChannelL() - return" ) ) );
+ }
+
+// ---------------------------------------------------------------------------
+// CSsyReferenceControl::CloseChannelL
+// ---------------------------------------------------------------------------
+//
+void CSsyReferenceControl::CloseChannelL( TSensrvChannelId aChannelID )
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceControl::CloseChannelL()" ) ) );
+ // Find and close channel
+ User::LeaveIfError( FindChannelL( aChannelID )->CloseChannel() );
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceControl::CloseChannelL() - return" ) ) );
+ }
+
+// ---------------------------------------------------------------------------
+// CSsyReferenceControl::ProcessResponse
+// ---------------------------------------------------------------------------
+//
+void CSsyReferenceControl::ProcessResponse( TSsyReferenceMsg* /*aMessage*/ )
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceControl::ProcessResponse()" ) ) );
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferenceControl::ProcessResponse() - return" ) ) );
+ }
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sensorsupport/testsensor/src/ssyreferencecontrol.h Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,156 @@
+// ssyreferencecontrol.h
+
+/*
+* Copyright (c) 2006-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:
+*
+*/
+
+
+
+
+/**
+ @file
+ @internalComponent
+*/
+
+#ifndef SSYREFERENCECONTROL_H
+#define SSYREFERENCECONTROL_H
+
+#include <sensors/spi/ssycontrol.h>
+#include "ssyreferenceconfig.h"
+
+// FORWARD DECLARATIONS
+class CSsyReferenceChannel;
+
+/**
+ * Main control class for SSY. Controls sensor basic functionality and provides mandatory
+ * ECOM interface specific things.
+ */
+class CSsyReferenceControl : public CSsyControl
+ {
+
+public:
+
+ /**
+ * Two-phase constructor
+ *
+ * @param[in] aSsyCallback Reference to SSY callback instance.
+ * @return Pointer to created CSsyReferenceControl object
+ */
+ static CSsyReferenceControl* NewL( MSsyCallback& aSsyCallback );
+
+ /**
+ * Virtual destructor
+ */
+ virtual ~CSsyReferenceControl();
+
+// from base class CSsyControl
+
+ /**
+ * From CSsyControl
+ * Request for SSY to open a sensor channel asynchronously.
+ * Response to the request is delivered through MSsyCallback::ChannelOpened().
+ * Initilizes SSY (and the sensor) to be ready for other control commands via
+ * data and property providers. Multiple OpenChannel()-requests can be
+ * active for different channels at the same time.
+ *
+ * @param[in] aChannelID Channel that is requested to be opened
+ * @return Symbian error code
+ */
+ void OpenChannelL( TSensrvChannelId aChannelID );
+
+ /**
+ * From CSsyControl
+ * Request to close a sensor channel asynchronously.
+ * Response to the request is delivered through MSsyCallback::ChannelClosed().
+ * Multiple CloseChannel()-requests can be active for different channels
+ * at the same time.
+ *
+ * @param[in] aChannelID Channel that is reqeusted to be closed
+ * @leave Any One of the system wide error codes
+ */
+ void CloseChannelL( TSensrvChannelId aChannelID );
+
+ /**
+ * Reference to SSY Callback instance
+ */
+ MSsyCallback& SsyCallback() const;
+
+ /**
+ * Reference to SSY Config file
+ */
+ CSsyReferenceConfig& SsyConfig() const;
+ /**
+ * Handles response to CSsyReferenceCmdHandler::ProcessCommand
+ *
+ * @param[in] aMessage Contains information of the response
+ */
+ void ProcessResponse( TSsyReferenceMsg* aMessage );
+
+ /**
+ * Search property of given property id from the channel properties and
+ * returns reference to that. Leaves with KErrNotFound if property is not found
+ *
+ * @param[in] aPropertyId Property ID to locate
+ * @param[in] aArrayIndex Propertys array index
+ * @param[out] aProperty Contains found property
+ */
+ void FindPropertyL( const TSensrvPropertyId aPropertyId,
+ const TInt aArrayIndex,
+ TSensrvProperty& aProperty );
+
+private:
+
+ /**
+ * C++ constructor.
+ *
+ * @param[in] aSsyCallback Reference to SSY callback instance.
+ */
+ CSsyReferenceControl( MSsyCallback& aSsyCallback );
+
+ /**
+ * Symbian 2nd phase constructor.
+ */
+ void ConstructL();
+
+ /**
+ * Finds and returns pointer to channel
+ */
+ CSsyReferenceChannel* FindChannelL( TSensrvChannelId aChannelID );
+
+private: // data
+
+ /**
+ * Reference to SSY CallBack to send responses to Sensor Server
+ */
+ MSsyCallback& iSsyCallback;
+
+ /**
+ * Pointer array of all channels provided by this SSY
+ */
+ CArrayPtrFlat<CSsyReferenceChannel>* iChannelArray;
+
+ /**
+ * Pointer to config file parser
+ */
+ CSsyReferenceConfig* iConfigFile;
+
+ /**
+ * Property list of general properties of this SSY
+ */
+ RSensrvPropertyList iProperties;
+ };
+
+#endif // SSYREFERENCECONTROL_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sensorsupport/testsensor/src/ssyreferencepropertyprovider.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,164 @@
+// ssyreferencepropertyprovider.cpp
+
+// Copyright (c) 2006-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:
+//
+
+
+
+#include "ssyreferencepropertyprovider.h"
+#include "ssyreferencetrace.h"
+#include "ssyreferencechannel.h"
+
+// ======== MEMBER FUNCTIONS ========
+
+// ---------------------------------------------------------------------------
+// CSsyReferencePropertyProvider C++ constructor
+// ---------------------------------------------------------------------------
+//
+CSsyReferencePropertyProvider::CSsyReferencePropertyProvider( CSsyReferenceChannel& aChannel ) :
+ iChannel( aChannel )
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferencePropertyProvider::CSsyReferencePropertyProvider()" ) ) );
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferencePropertyProvider::CSsyReferencePropertyProvider() - return" ) ) );
+ }
+
+
+// ---------------------------------------------------------------------------
+// Symbian 2nd phase constructor
+// ---------------------------------------------------------------------------
+//
+void CSsyReferencePropertyProvider::ConstructL()
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferencePropertyProvider::ConstructL()" ) ) );
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferencePropertyProvider::ConstructL() - return" ) ) );
+ }
+
+
+// ---------------------------------------------------------------------------
+// CSsyReferencePropertyProvider::NewL
+// ---------------------------------------------------------------------------
+//
+CSsyReferencePropertyProvider* CSsyReferencePropertyProvider::NewL( CSsyReferenceChannel& aChannel )
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferencePropertyProvider::NewL()" ) ) );
+ CSsyReferencePropertyProvider* self = new ( ELeave ) CSsyReferencePropertyProvider( aChannel );
+ CleanupStack::PushL( self );
+ self->ConstructL();
+ CleanupStack::Pop( self );
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferencePropertyProvider::NewL() - return" ) ) );
+ return self;
+ }
+
+// ---------------------------------------------------------------------------
+// Destructor
+// ---------------------------------------------------------------------------
+//
+CSsyReferencePropertyProvider::~CSsyReferencePropertyProvider()
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferencePropertyProvider::~CSsyReferencePropertyProvider()" ) ) );
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferencePropertyProvider::~CSsyReferencePropertyProvider() - return" ) ) );
+ }
+
+// ---------------------------------------------------------------------------
+// CSsyReferencePropertyProvider::CheckPropertyDependenciesL
+// ---------------------------------------------------------------------------
+//
+void CSsyReferencePropertyProvider::CheckPropertyDependenciesL(
+ const TSensrvChannelId /*aChannelId*/,
+ const TSensrvProperty& /*aProperty*/,
+ RSensrvChannelList& /*aAffectedChannels*/ )
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferencePropertyProvider::CheckPropertyDependenciesL()" ) ) );
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferencePropertyProvider::CheckPropertyDependenciesL() - return" ) ) );
+ }
+
+// ---------------------------------------------------------------------------
+// CSsyReferencePropertyProvider::SetPropertyL
+// ---------------------------------------------------------------------------
+//
+void CSsyReferencePropertyProvider::SetPropertyL(
+ const TSensrvChannelId aChannelId,
+ const TSensrvProperty& aProperty )
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferencePropertyProvider::SetPropertyL()" ) ) );
+
+ if ( iChannel.ChannelId() != aChannelId )
+ {
+ User::Leave( KErrArgument );
+ }
+
+ // Search property. Leaves with KErrNotFound if property is not found.
+ // Leaves with KErrAccessDenied if found property is Read only
+ iChannel.FindAndUpdatePropertyL( aProperty );
+
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferencePropertyProvider::SetPropertyL() - return" ) ) );
+ }
+
+// ---------------------------------------------------------------------------
+// CSsyReferencePropertyProvider::GetPropertyL
+// ---------------------------------------------------------------------------
+//
+void CSsyReferencePropertyProvider::GetPropertyL(
+ const TSensrvChannelId aChannelId,
+ TSensrvProperty& aProperty )
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferencePropertyProvider::GetPropertyL()" ) ) );
+
+ if ( iChannel.ChannelId() != aChannelId && aChannelId != 0 )
+ {
+ User::Leave( KErrArgument );
+ }
+ else
+ {
+ // Search property. Leaves with KErrNotFound if property is not found
+ aProperty = iChannel.FindPropertyL(
+ aProperty.GetPropertyId(),
+ aProperty.PropertyItemIndex(),
+ aProperty.GetArrayIndex() );
+ }
+
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferencePropertyProvider::GetPropertyL() - return" ) ) );
+ }
+
+// ---------------------------------------------------------------------------
+// CSsyReferencePropertyProvider::GetAllPropertiesL
+// ---------------------------------------------------------------------------
+//
+void CSsyReferencePropertyProvider::GetAllPropertiesL(
+ const TSensrvChannelId aChannelId,
+ RSensrvPropertyList& aChannelPropertyList )
+ {
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferencePropertyProvider::GetAllPropertiesL()" ) ) );
+
+ if ( iChannel.ChannelId() != aChannelId )
+ {
+ User::Leave( KErrArgument );
+ }
+
+ iChannel.GetProperties( aChannelPropertyList );
+
+ COMPONENT_TRACE( ( _L( "SSY Reference Plugin - CSsyReferencePropertyProvider::GetAllPropertiesL() - return" ) ) );
+ }
+
+// ---------------------------------------------------------------------------
+// CSsyReferencePropertyProvider::GetPropertyProviderInterfaceL
+// ---------------------------------------------------------------------------
+//
+void CSsyReferencePropertyProvider::GetPropertyProviderInterfaceL( TUid /*aInterfaceUid*/,
+ TAny*& aInterface )
+ {
+ aInterface = NULL;
+ }
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sensorsupport/testsensor/src/ssyreferencepropertyprovider.h Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,139 @@
+// ssyreferencepropertyprovider.h
+
+/*
+* Copyright (c) 2006-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:
+*
+*/
+
+
+
+
+/**
+ @file
+ @internalComponent
+*/
+
+
+#ifndef SSYREFERENCEPROPERTYPROVIDER_H
+#define SSYREFERENCEPROPERTYPROVIDER_H
+
+#include <sensors/spi/ssypropertyprovider.h>
+
+
+class CSsyReferenceChannel;
+
+/**
+ * Channel property provider implementation.
+ */
+class CSsyReferencePropertyProvider : public CBase, public MSsyPropertyProvider
+ {
+
+public:
+
+ /**
+ * Two-phase constructor
+ *
+ * @param[in] aChannel Reference to channel this provider belongs to
+ * @return Pointer to created CSsyReferenceControl object
+ */
+ static CSsyReferencePropertyProvider* NewL( CSsyReferenceChannel& aChannel );
+
+ /**
+ * Virtual destructor
+ */
+ virtual ~CSsyReferencePropertyProvider();
+
+// from base class MSsyPropertyProvider
+
+ /**
+ * From MSsyPropertyProvider
+ * Check if property value affects other sensor channels already open.
+ * If the new property value is legal but affects somehow other channels' properties,
+ * SSY must return list of the affected channels so that the sensor server can
+ * check if the client allowed to set this property. If the SSY value
+ * is not legal SSY must leave with KErrArgument-value.
+ *
+ * @param[in] aProperty Property to be checked.
+ * @param[out] aAffectedChannels Return list of the channel which will be affected if the property
+ * value will be set.
+ * @leave KErrArgument If the property value is illegal.
+ */
+ void CheckPropertyDependenciesL( const TSensrvChannelId aChannelId,
+ const TSensrvProperty& aProperty,
+ RSensrvChannelList& aAffectedChannels );
+
+ /**
+ * From MSsyPropertyProvider
+ * Set property for the channel. Before the sensor server sets the property value,
+ * it is checked with CheckPropertyDependenciesL()-function.
+ * This means a property value should always be valid for the SSY.
+ *
+ * @param[in] aProperty Rereference to a property object to be set
+ */
+ void SetPropertyL( const TSensrvChannelId aChannelId,
+ const TSensrvProperty& aProperty );
+
+ /**
+ * From MSsyPropertyProvider
+ * Get channel property value. The property parameter contains channel id and
+ * item index. SSY fills values and attributes to the property object.
+ *
+ * @param[in, out] aProperty Reference to a property object to be filled
+ * with property values and attributes.
+ */
+ void GetPropertyL( const TSensrvChannelId aChannelId,
+ TSensrvProperty& aProperty );
+
+ /**
+ * From MSsyPropertyProvider
+ * Get all channel properties. Returns all properties which are related to this channel.
+ *
+ * @param[out] aChannelPropertyList List of the all properties of the channel.
+ */
+ void GetAllPropertiesL( const TSensrvChannelId aChannelId,
+ RSensrvPropertyList& aChannelPropertyList );
+
+ /**
+ * Returns a pointer to a specified interface - to allow future extension
+ * of this class without breaking binary compatibility
+ *
+ * @param aInterfaceUid Identifier of the interface to be retrieved
+ * @param aInterface A reference to a pointer that retrieves the specified interface.
+ */
+ void GetPropertyProviderInterfaceL( TUid aInterfaceUid,
+ TAny*& aInterface );
+
+private:
+
+ /**
+ * C++ constructor.
+ * @param[in] aChannel Reference to channel this provider belongs to
+ */
+ CSsyReferencePropertyProvider( CSsyReferenceChannel& aChannel );
+
+ /**
+ * Symbian 2nd phase constructor.
+ */
+ void ConstructL();
+
+private: // data
+
+ /**
+ * Reference to channel for which this provider belongs to
+ */
+ CSsyReferenceChannel& iChannel;
+ };
+
+#endif // SSYREFERENCEPROPERTYPROVIDER_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sensorsupport/testsensor/src/ssyreferencetrace.h Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,117 @@
+// ssyreferencetrace.h
+
+/*
+* Copyright (c) 2006-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:
+*
+*/
+
+
+
+
+/**
+ @file
+ @internalComponent
+*/
+#ifndef SSYREFERENCETRACE_H
+#define SSYREFERENCETRACE_H
+
+
+// INCLUDES
+#include <e32svr.h>
+
+
+// PC-LINT OPTIONS
+// Removes null statement not in line by itself warnings from
+// COMPONENT_TRACE macros
+//lint -esym(960,54)
+
+// Removes "area too small" pointer cast warnings.
+//lint -e826
+
+
+
+// CONSTANTS
+// MACROS
+#ifdef _DEBUG
+
+ #ifdef THREAD_TRACE_FLAG
+
+ #define THREAD_TRACE RDebug::Print(RThread().Name());
+
+ #else
+
+ #define THREAD_TRACE
+
+ #endif // #ifdef THREAD_TRACE_FLAG
+
+ #ifdef BUFFER_TRACE_FLAG
+
+ #define BUFFER_TRACE_DEBUG
+ #define DEBUG_PRINT_BUFFER DebugPrintBuffer();
+ #define BUFFER_TRACE( a ) RDebug::Print a
+
+ #else
+
+ #define DEBUG_PRINT_BUFFER
+ #define BUFFER_TRACE( a )
+
+ #endif // #ifdef THREAD_TRACE_FLAG
+
+ #ifdef COMPONENT_TRACE_FLAG
+
+ #define COMPONENT_TRACE( a ) THREAD_TRACE;RDebug::Print a
+ #define COMPONENT_TRACE_DEBUG
+
+ #else // #ifdef COMPONENT_TRACE_FLAG
+
+ #define COMPONENT_TRACE( a )
+
+ #endif //#ifdef COMPONENT_TRACE_FLAG
+
+ #ifdef API_TRACE_FLAG
+
+ #define API_TRACE( a ) THREAD_TRACE;RDebug::Print a
+ #define API_TRACE_DEBUG
+
+ #else //#ifdef API_TRACE_FLAG
+
+ #define API_TRACE( a )
+
+ #endif //#ifdef API_TRACE_FLAG
+
+ #ifdef ERROR_TRACE_FLAG
+
+ #define ERROR_TRACE( a ) THREAD_TRACE;RDebug::Print a
+ #define ERROR_TRACE_DEBUG
+
+ #else //#ifdef ERROR_TRACE_FLAG
+
+ #define ERROR_TRACE( a )
+
+ #endif //#ifdef ERROR_TRACE_FLAG
+
+#else // #ifdef _DEBUG
+
+ #define COMPONENT_TRACE( a )
+ #define API_TRACE( a )
+ #define ERROR_TRACE( a )
+ #define BUFFER_TRACE( a )
+ #define THREAD_TRACE
+ #define DEBUG_PRINT_BUFFER
+
+#endif //#ifdef _DEBUG
+
+#endif // SSYREFERENCETRACE_H
+
--- a/startupservices/SplashScreen/group/bld.inf Thu Aug 19 10:05:08 2010 +0300
+++ b/startupservices/SplashScreen/group/bld.inf Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
@@ -25,12 +25,9 @@
../rom/splashscreen.iby CORE_MW_LAYER_IBY_EXPORT_PATH(splashscreen.iby)
../rom/splashscreen_variant.iby CUSTOMER_MW_LAYER_IBY_EXPORT_PATH(splashscreen_variant.iby)
+/epoc32/s60/icons/qgn_startup_screen.svg /epoc32/data/z/resource/apps/qgn_startup_screen.svg
+/epoc32/s60/icons/qgn_startup_screen.svg /epoc32/release/winscw/udeb/z/resource/apps/qgn_startup_screen.svg
+/epoc32/s60/icons/qgn_startup_screen.svg /epoc32/release/winscw/urel/z/resource/apps/qgn_startup_screen.svg
PRJ_MMPFILES
splashscreen.mmp
-PRJ_EXTENSIONS
-START EXTENSION s60/mifconv
- OPTION TARGETFILE splashscreen.mif
- OPTION HEADERFILE splashscreen.mbg
- OPTION SOURCES -c8 qgn_startup_screen
-END
--- a/startupservices/SplashScreen/group/splashscreen.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/startupservices/SplashScreen/group/splashscreen.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-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"
@@ -20,7 +20,7 @@
#include <platform_paths.hrh>
#include <data_caging_paths.hrh>
-TARGET SPLASHSCREEN.EXE
+TARGET splashscreen.exe
TARGETTYPE EXE
TARGETPATH PROGRAMS_DIR
UID 0x100039CE 0x100059DE
@@ -45,5 +45,8 @@
LIBRARY euser.lib
LIBRARY ws32.lib
LIBRARY efsrv.lib
-LIBRARY AknIcon.lib // AknIconUtils
LIBRARY fbscli.lib
+LIBRARY SVGEngine.lib
+LIBRARY gdi.lib
+LIBRARY cone.lib
+SMPSAFE
--- a/startupservices/SplashScreen/inc/SplashScreen.h Thu Aug 19 10:05:08 2010 +0300
+++ b/startupservices/SplashScreen/inc/SplashScreen.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-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"
@@ -42,8 +42,6 @@
void ConstructL(CMainWindow* aWindow);
void RunL();
void SetMainWindow(CMainWindow* aWindow);
-//protected:
-// TCallBack iCallBack;
private:
CMainWindow* iWindow;
};
@@ -69,7 +67,7 @@
// destruct
~CWsClient();
// main window
- virtual void ConstructMainWindowL();
+ virtual void ConstructMainWindowL()=0;
// terminate cleanly
void Exit();
// active object protocol
@@ -157,6 +155,7 @@
CMainWindow (CWsClient* aClient);
~CMainWindow ();
void Draw (const TRect& aRect);
+ CFbsBitmap* ReadSVGL (TFileName aFileName);
void HandlePointerEvent (TPointerEvent& aPointerEvent);
void ConstructL (const TRect& aRect, CWindow* aParent=0);
private:
--- a/startupservices/SplashScreen/inc/SplashScreenDefines.h Thu Aug 19 10:05:08 2010 +0300
+++ b/startupservices/SplashScreen/inc/SplashScreenDefines.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2005 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-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"
@@ -20,7 +20,7 @@
#define SPLASHSCREENDEFINES_H
//CONSTANTS
-_LIT(KSplashBitmapName, "Z:SPLASHSCREEN.MIF");
+_LIT(KSplashBitmapName, "Z:QGN_STARTUP_SCREEN.SVG");
_LIT(KPanicMsg,"SplashScreen");
_LIT(KSplashScreenWindowGroup, "S60SplashScreenGroup");
@@ -28,6 +28,8 @@
_LIT_SECURITY_POLICY_C1(KReadPolicy, ECapabilityReadDeviceData);
_LIT_SECURITY_POLICY_C1(KWritePolicy, ECapabilityWriteDeviceData);
+#define SIZE_X 360
+#define SIZE_Y 360
// MACROS
#define TRACE_ADDPREFIX(aText) (TPtrC((const TText *)L"SplashScreen: \"" L##aText L"\""))
--- a/startupservices/SplashScreen/rom/splashscreen.iby Thu Aug 19 10:05:08 2010 +0300
+++ b/startupservices/SplashScreen/rom/splashscreen.iby Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009-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"
@@ -20,5 +20,6 @@
#define __SplashScreen_IBY__
file=ABI_DIR\BUILD_DIR\SplashScreen.exe System\Programs\SplashScreen.exe
+data=DATAZ_\resource\apps\qgn_startup_screen.svg resource\apps\qgn_startup_screen.svg
#endif
--- a/startupservices/SplashScreen/src/SplashScreen.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/startupservices/SplashScreen/src/SplashScreen.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2002-2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-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"
@@ -18,11 +18,13 @@
// SYSTEM INCLUDES
#include <w32std.h>
+#include <eikenv.h>
#include <coedef.h>
#include <data_caging_path_literals.hrh>
-#include <splashscreen.mbg>
-#include <AknIconSrvClient.h>
#include <startupdomainpskeys.h>
+#include <SVGEngineInterfaceImpl.h>
+#include <gdi.h>
+#include <coemain.h>
// USER INCLUDES
#include "SplashScreen.h"
@@ -243,7 +245,6 @@
// construct redrawer
iRedrawer=new (ELeave) CWsRedrawer;
iRedrawer->ConstructL(this);
- User::LeaveIfError( RAknIconSrvClient::Connect() );
// construct main window
ConstructMainWindowL();
@@ -261,7 +262,6 @@
CWsClient::~CWsClient()
{
TRACES("CWsClient::~CWsClient(): Start");
- RAknIconSrvClient::Disconnect();
// neutralize us as an active object
Deque(); // cancels and removes from scheduler
// get rid of scheduler and all attached objects
@@ -301,11 +301,6 @@
TRACES("CWsClient::DoCancel(): End");
}
-void CWsClient::ConstructMainWindowL()
- {
- TRACES("CWsClient::ConstructMainWindowL()");
- }
-
//////////////////////////////////////////////////////////////////////////////
@@ -336,6 +331,57 @@
TRACES("CMainWindow::~CMainWindow(): End");
}
+CFbsBitmap* CMainWindow::ReadSVGL (TFileName aFileName)
+ {
+ TRACES("CMainWindow::ReadSVGL(): Start");
+ TFontSpec fontspec;
+ TDisplayMode mode = EColor16MA;
+ TSize size(SIZE_X, SIZE_Y);
+
+ //if ( mode >= (TDisplayMode)13 ) { mode = EColor16MA; }
+
+ CFbsBitmap* frameBuffer = new ( ELeave ) CFbsBitmap;
+ CleanupStack::PushL( frameBuffer );
+ frameBuffer->Create( size, mode );
+
+ CSvgEngineInterfaceImpl* svgEngine = NULL;
+ svgEngine = CSvgEngineInterfaceImpl::NewL(frameBuffer, NULL, fontspec );
+
+ if (svgEngine == NULL)
+ {
+ TRACES("CMainWindow::ReadSVGL(): Splashscreen SVG engine creation failed");
+ }
+
+ CleanupStack::PushL( svgEngine );
+ TInt domHandle = 0;
+ svgEngine->PrepareDom( aFileName, domHandle ) ;
+ if (domHandle == 0)
+ {
+ TRACES("CMainWindow::ReadSVGL(): Splashscreen DOM handle creation failed");
+ }
+
+ CFbsBitmap* bitmap = new(ELeave) CFbsBitmap;
+ CleanupStack::PushL( bitmap );
+ User::LeaveIfError( bitmap->Create( size, EColor64K ) );
+
+ svgEngine->UseDom( domHandle, bitmap, NULL ) ;
+
+ MSvgError* err;
+ svgEngine->Start( err );
+ if (err->HasError())
+ {
+ TRACES("CMainWindow::ReadSVGL(): Splashscreen SVG Engine Start failed");
+ }
+
+ svgEngine->DeleteDom( domHandle );
+ CleanupStack::Pop( bitmap );
+ CleanupStack::PopAndDestroy( svgEngine );
+ CleanupStack::PopAndDestroy( frameBuffer );
+
+ TRACES("CMainWindow::ReadSVGL(): End");
+ return bitmap;
+ }
+
void CMainWindow::ConstructL (const TRect& aRect, CWindow* aParent)
{
TRACES("CMainWindow::ConstructL(): Start");
@@ -361,9 +407,7 @@
if ( !err )
{
TRACES("CMainWindow::ConstructL(): Image found");
- iBitmap = AknIconUtils::CreateIconL( fp->FullName(), EMbmSplashscreenQgn_startup_screen );
- AknIconUtils::ExcludeFromCache(iBitmap);
- AknIconUtils::SetSize( iBitmap, iRect.Size(), EAspectRatioPreservedAndUnusedSpaceRemoved );
+ iBitmap = ReadSVGL(fp->FullName());
}
else
{
@@ -428,8 +472,7 @@
void CMainWindow::HandlePointerEvent (TPointerEvent& /*aPointerEvent*/)
{
TRACES("CMainWindow::HandlePointerEvent(): Start");
-// TPoint point = aPointerEvent.iPosition;
-// (void)point;
+
TRACES("CMainWindow::HandlePointerEvent(): End");
}
--- a/startupservices/Startup/MediatorPlugin/group/StartupMediatorPlugin.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/startupservices/Startup/MediatorPlugin/group/StartupMediatorPlugin.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -20,14 +20,14 @@
// Build target
-TARGET StartupMediatorPlugin.dll
+TARGET startupmediatorplugin.dll
CAPABILITY CAP_ECOM_PLUGIN
TARGETTYPE PLUGIN
UID 0x10009D8D 0x102750AF
VENDORID VID_DEFAULT
START RESOURCE ../src/102750AF.rss
-TARGET StartupMediatorPlugin.rsc
+TARGET startupmediatorplugin.rsc
TARGETPATH resource/plugins
END
@@ -45,13 +45,16 @@
LIBRARY euser.lib // Core
-LIBRARY ECom.lib // ECom
-LIBRARY MediatorClient.lib // Mediator client
-LIBRARY MediatorPluginBase.lib // Mediator client
+LIBRARY ecom.lib // ECom
+LIBRARY mediatorclient.lib // Mediator client
+LIBRARY mediatorpluginbase.lib // Mediator client
LIBRARY featmgr.lib // FeatureManager
LIBRARY centralrepository.lib // Central Repository
// Logger
DEBUGLIBRARY flogger.lib
+
+SMPSAFE
// End of File
+
--- a/startupservices/Startup/MediatorPlugin/inc/StartupMediatorPlugin.h Thu Aug 19 10:05:08 2010 +0300
+++ b/startupservices/Startup/MediatorPlugin/inc/StartupMediatorPlugin.h Tue Aug 31 15:24:25 2010 +0300
@@ -23,7 +23,7 @@
#include <MediatorCommandResponder.h>
#include <MediatorPluginBase.h>
#include <MediatorEventProvider.h>
-#include <secondarydisplay/SecondaryDisplaySystemStateAPI.h>
+#include <SecondaryDisplay/SecondaryDisplaySystemStateAPI.h>
// FORWARD DECLARATIONS
--- a/startupservices/Startup/MediatorPlugin/src/StartupMediatorPluginPSObserver.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/startupservices/Startup/MediatorPlugin/src/StartupMediatorPluginPSObserver.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-2006 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"
@@ -22,7 +22,7 @@
// SYSTEM INCLUDES
#include <MediatorDomainUIDs.h>
#include <startupdomainpskeys.h>
-#include <secondarydisplay/SecondaryDisplaySystemStateAPI.h>
+#include <SecondaryDisplay/SecondaryDisplaySystemStateAPI.h>
#include <avkondomainpskeys.h>
#include <coreapplicationuisdomainpskeys.h>
Binary file startupservices/Startup/conf/startup.confml has changed
Binary file startupservices/Startup/conf/startup_101F8763.crml has changed
--- a/startupservices/Startup/group/bld.inf Thu Aug 19 10:05:08 2010 +0300
+++ b/startupservices/Startup/group/bld.inf Tue Aug 31 15:24:25 2010 +0300
@@ -36,9 +36,9 @@
../loc/startup.loc MW_LAYER_LOC_EXPORT_PATH(startup.loc)
- ../data/backup_registration.xml /epoc32/data/z/private/100058F4/backup_registration.xml
- ../data/backup_registration.xml /epoc32/release/winscw/udeb/z/private/100058F4/backup_registration.xml
- ../data/backup_registration.xml /epoc32/release/winscw/urel/z/private/100058F4/backup_registration.xml
+ ../data/backup_registration.xml /epoc32/data/z/private/100058f4/backup_registration.xml
+ ../data/backup_registration.xml /epoc32/release/winscw/udeb/z/private/100058f4/backup_registration.xml
+ ../data/backup_registration.xml /epoc32/release/winscw/urel/z/private/100058f4/backup_registration.xml
PRJ_EXTENSIONS
START EXTENSION s60/mifconv
--- a/startupservices/Startup/group/startup.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/startupservices/Startup/group/startup.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies).
+* 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"
@@ -33,20 +33,10 @@
SOURCE StartupApplication.cpp
SOURCE StartupAppUi.cpp
-#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION
SOURCE startupanimationwrapper.cpp
SOURCE startupview.cpp
-#else // RD_STARTUP_ANIMATION_CUSTOMIZATION
-SOURCE StartupWelcomeAnimation.cpp
-SOURCE StartupOperatorAnimation.cpp
-SOURCE StartupTone.cpp
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
SOURCE StartupDocument.cpp
-SOURCE StartupUserWelcomeNote.cpp
-SOURCE StartupQueryDialog.cpp
SOURCE StartupSubscriber.cpp
-SOURCE StartupMediatorObserver.cpp
-SOURCE StartupPopupList.cpp
SOURCE StartupPubSubObserver.cpp
@@ -56,12 +46,7 @@
LANGUAGE_IDS
END // RESOURCE
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
- START RESOURCE ../data/operatoranimation.rss
- HEADER
- TARGETPATH APP_RESOURCE_DIR
- END // RESOURCE
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
+
START RESOURCE ../data/Startup_reg.rss
HEADER
@@ -74,14 +59,15 @@
USERINCLUDE ../../inc
USERINCLUDE ../../../inc
+SYSTEMINCLUDE /epoc32/include/mw/hb/hbwidgets
+
APP_LAYER_SYSTEMINCLUDE // dependency to app layer (Profiles)
LIBRARY eikcoctl.lib
LIBRARY euser.lib
LIBRARY apparc.lib
LIBRARY cone.lib
-LIBRARY avkon.lib
-LIBRARY eikdlg.lib
+
LIBRARY eikcore.lib
LIBRARY efsrv.lib
LIBRARY fbscli.lib
@@ -89,23 +75,18 @@
LIBRARY commonengine.lib //use of SharedData
LIBRARY starterclient.lib //use of Starter to remove splash screen
LIBRARY ws32.lib
-LIBRARY aknnotify.lib //AknGlobalNote
+
LIBRARY apgrfx.lib //
-LIBRARY Egul.lib //DrawUtils
+LIBRARY egul.lib //DrawUtils
LIBRARY featmgr.lib
LIBRARY bafl.lib
-LIBRARY timezonelocalization.lib
-LIBRARY tzclient.lib
-LIBRARY AknIcon.lib
LIBRARY mediatorclient.lib
-#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION
+
LIBRARY sanimctrl.lib
-#else // RD_STARTUP_ANIMATION_CUSTOMIZATION
-LIBRARY CdlEngine.lib
-LIBRARY MediaClientAudio.lib //for playing startup tone
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
+
+LIBRARY hbwidgets.lib
+LIBRARY hbCore.lib
LIBRARY bmpanim.lib
-#ifdef RD_UI_TRANSITION_EFFECTS_PHASE2
-LIBRARY gfxtrans.lib
-#endif
-LIBRARY aknskins.lib
+
+
+SMPSAFE
--- a/startupservices/Startup/inc/StartupAppUi.h Thu Aug 19 10:05:08 2010 +0300
+++ b/startupservices/Startup/inc/StartupAppUi.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2002-2008 Nokia Corporation and/or its subsidiary(-ies).
+* 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"
@@ -27,53 +27,27 @@
#ifndef STARTUPAPPUI_H
#define STARTUPAPPUI_H
-// FLAGS
-//#define USE_STARTUPTEST_APP
-
-
-// SYSTEM INCLUDES
-#include <aknappui.h> //appui
-
-#include <data_caging_path_literals.hrh>
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
- #include <secondarydisplay/SecondaryDisplaySystemStateAPI.h>
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-#include <secondarydisplay/SecondaryDisplayStartupAPI.h>
+#include <SecondaryDisplay/SecondaryDisplayStartupAPI.h>
// USER INCLUDES
#include "startup.hrh" //internal state types
#include "StartupDefines.h" //some common defines
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
- #include "StartupTone.h"
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-
-
-// CONSTANTS
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
- const TInt KConnectionRetryTime = 50000; // 50 ms
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
+ #include <eikappui.h>
// FORWARD DECLARATIONS
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
- class CStartupWelcomeAnimation;
- class CStartupOperatorAnimation;
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
+
class CStartupUserWelcomeNote;
class CStartupPubSubObserver;
-#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION
+
class CStartupAnimationWrapper;
class CStartupView;
-#else // RD_STARTUP_ANIMATION_CUSTOMIZATION
- class CStartupTone;
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-class CStartupMediatorObserver;
/**
* 'AppUi' class.
*
*/
-class CStartupAppUi : public CAknAppUi
+class CStartupAppUi : public CEikAppUi //: public CAknAppUi
{
public: // Constructors and destructor
@@ -125,65 +99,13 @@
*/
TBool HiddenReset();
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
- /**
- * Continue startup when startup tone completes.
- * @param None
- * @return void
- */
- void ContinueStartupAfterToneL(TToneType aToneType);
/**
- * Stop startuptone
- * @param None
- * @return void
- */
- void StopStartupTone();
-
- /**
- * Stop startuptone
- * @param None
- * @return void
- */
- void StopOperatorTone();
-
- /**
- * Checks if StartupTone is playing
- * @param None
- * @return TBool
- */
- TBool StartupTonePlaying();
-
- /**
- * Checks if OperatorTone is playing
- * @param None
- * @return TBool
- */
- TBool OperatorTonePlaying();
-
-#else // RD_STARTUP_ANIMATION_CUSTOMIZATION
- /**
* Called when welcome or operator animation has finished.
*
* @since S60 3.2
*/
void AnimationFinished();
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
- /**
- * Brings Startup application to foregound after Touch Screen Calibration and emergency call from PIN query.
- * @param None
- * @return void
- */
- void BringToForeground();
-
- /**
- * Send Startup application to background before Touch Screen Calibration.
- * @param None
- * @return void
- */
- void SendToBackground();
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
/**
* Sets iCleanBoot to EStartupCleanBoot.
@@ -192,77 +114,6 @@
*/
void SetCleanBoot();
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
- /**
- *
- * @param None
- * @return void
- */
- void WaitingTouchScreenCalibL();
-
-#ifdef RD_SCALABLE_UI_V2
- /**
- *
- * @param None
- * @return void
- */
- void TouchScreenCalibrationDoneL();
-#endif // RD_SCALABLE_UI_V2
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-
-
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
- /**
- *
- * @param None
- * @return void
- */
- void CoverUIWelcomeAnimationSyncOKL();
-
- /**
- *
- * @param None
- * @return void
- */
- void WaitingCoverUIWelcomeAnimationSyncL();
-
- /**
- *
- * @param None
- * @return void
- */
- void CoverUIOperatorAnimationSyncOKL();
-
- /**
- *
- * @param None
- * @return void
- */
- void WaitingCoverUIOperatorAnimationSyncL();
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-
- /**
- *
- * @param None
- * @return void
- */
- void WaitingCoverUIStartupReadySyncL();
-
- /**
- *
- * @param None
- * @return void
- */
- void CoverUIStartupReadySyncOKL();
-
- /**
- *
- * @param None
- * @return void
- */
- void RaiseCoverUIEvent( TUid aCategory,
- TInt aEventId,
- const TDesC8& aData );
void SetCriticalBlockEndedL();
@@ -285,12 +136,12 @@
/** System state has changed to EmergencyCallsOnly. Skip the animations. */
void SetEmergencyCallsOnlyL();
-#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION
+
/**
* Check if animation should be loaded in advance and do it.
*/
void TryPreLoadAnimation();
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
+
/**
* Propagates fatal startup error state.
@@ -300,22 +151,6 @@
*/
void SwStateFatalStartupErrorL( TBool aPropertyChanged );
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
- /**
- * Returns value of iOfflineModeQueryShown.
- * @param None
- * @return TBool
- */
- TBool GetOfflineModeQueryShown();
-
- /**
- * Sets value of iOfflineModeQueryShown.
- * @param TBool
- * @return void
- */
- void SetOfflineModeQueryShown(TBool aValue);
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-
/**
* Return value of the__SIMCARD feature
* @param None
@@ -323,12 +158,7 @@
*/
TBool SimSupported();
- /**
- * Return value of KFeatureIdCoverDisplay feature
- * @param None
- * @return TBool
- */
- TBool CoverUISupported();
+
/**
* Checks if DOS is in Offline Mode
@@ -349,31 +179,7 @@
*/
TBool SimStatusChangedReset();
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
- private:
- /**
- * For starting startup tone initialization timer when needed
- * @param None
- * @return void
- */
- void WaitingStartupToneL();
-
- /**
- * Callback function of startup tone initialization timer
- * @param TAny*
- * @return TInt
- */
- static TInt ToneInitTimerTimeoutL(TAny* aObject);
-
- /**
- * For checking startup tone initialization status
- * @param None
- * @return void
- */
- void StartupToneWaitStatusL();
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-
- private: // from MEikMenuObserver
+ public: // from MEikMenuObserver
/**
* EPOC default constructor.
@@ -382,8 +188,9 @@
private: // from CEikAppUi
-#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION
+
/**
+ * Functionality Commented as no support from Qt
* From CAknAppUi.
* Handles a change to the application's resources which are shared across
* the environment.
@@ -391,11 +198,10 @@
* @since S60 3.2
*
* @param aType The type of resources that have changed.
- */
+
void HandleResourceChangeL( TInt aType );
-
- void IsFTUAvailableL(TBool& aFTUAvailable);
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
+ */
+
/**
* Takes care of command handling.
@@ -441,19 +247,6 @@
void DoStartupShowOperatorAnimationL();
/**
- * This part of the startup phases
- * shows the user welcome note.
- */
- void DoStartupShowUserWelcomeNoteL();
-
- /**
- * Returns EFalse if date, time and city
- * queries are disabled for testing purposes
- * @return TBool
- */
- TBool StartupQueriesEnabled();
-
- /**
* Predictive Time and Country selection support
* Returns ETrue when enabled.
* @return TBool
@@ -469,13 +262,6 @@
void DoStartupFirstBootAndRTCCheckL();
/**
- * Shows the needed startup queries in first boot
- * or when real time clock value is invalid
- * @return void
- */
- void ShowStartupQueriesL();
-
- /**
* Last part of the startup phases.
* This part does some cleaning things and
* calls the Exit().
@@ -526,48 +312,7 @@
*/
TBool UiInOfflineMode();
- /**
- * Shows country and city selection lists to the user.
- * This is shown in first boot.
- */
- void ShowCountryAndCityListsL();
-
- /**
- * Shows country selection list to the user.
- * This is shown in first boot.
- * @return TInt
- */
- TInt ShowCountryListL();
-
- /**
- * Shows city selection list to the user.
- * This is shown in first boot.
- * @return TBool
- */
- TBool ShowCityListL(TUint8 cityGroupId);
-
- /**
- * Shows time query to the user.
- * This is shown in first boot or when
- * real time clock isn't valid.
- * @return TBool
- */
- TBool ShowTimeQueryL();
-
- /**
- * Shows date query to the user.
- * This is shown in first boot or when
- * real time clock isn't valid.
- * @return TBool
- */
- TBool ShowDateQueryL();
-
- /**
- * Gets default time and date from cenrep
- * @param aTime
- * @return void
- */
- void GetDefaultTimeAndDate( TTime& aTime );
+
/**
* Returns information about is this the first boot happening.
@@ -588,74 +333,40 @@
*/
void SystemFatalErrorL();
-#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION
+
/**
* Updates startup UI phase to Publish&Subscribe key KPSStartupUiPhase.
*
* @param aValue the new value to be written to the key KPSStartupUiPhase.
*/
void UpdateStartupUiPhase( TInt aValue );
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
+
private: // ***** Member Data ********************************************
-#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION
+
// The only window-owning control of the Startup application.
CStartupView* iMainView;
// Used for showing Welcome Animation. Owned. May not be NULL.
CStartupAnimationWrapper* iAnimation;
-#else // RD_STARTUP_ANIMATION_CUSTOMIZATION
- //used for showing Welcome Animation
- CStartupWelcomeAnimation* iWelcomeAnimation; //owns
- //used for showing Operator Animation
- CStartupOperatorAnimation* iOperatorAnimation; //owns
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
+
- //used for showing User Welcome Note
- CStartupUserWelcomeNote* iUserWelcomeNote; //owns
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
- //used for showing welcome animation
- CPeriodic* iAnimTimer; //owns
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
//used for showing user welcome note
CPeriodic* iNoteTimer; //owns
//used for exiting application, smoothly without tricky errors
CPeriodic* iExitTimer; //owns
-
-
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
- // Used for playing startup tone
- CStartupTone* iStartupTone; //owns
-
- // Used for waiting startup tone initialization
- CPeriodic* iToneInitTimer; //owns
-
- // Used for playing operator startup tone
- CStartupTone* iOpStartupTone; //owns
-
- // Used for following tone initialization time
- TInt iToneInitWaitTime;
-
- //used for telling if the user welcome note is animation
- TBool iAnimation;
-#endif RD_STARTUP_ANIMATION_CUSTOMIZATION
-
+
+
//internal execution state
TStartupInternalState iInternalState;
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
- //is used for telling the application that
- //splashscreen should be removed for showing the code queries
- //or welcome note
- TBool iSplashScreenShouldBeRemoved;
-#endif RD_STARTUP_ANIMATION_CUSTOMIZATION
//is used for quarantee only one time continuing
TBool iStartupFirstBootAndRTCCheckAlreadyCalled;
@@ -692,18 +403,14 @@
//is used for telling if SIM card is supported
TBool iSimSupported;
- CStartupMediatorObserver* iStartupMediatorObserver; //owns
+
+
- TBool iCoverUISupported;
-
- TInt iCounryListIndex;
+
TTime iTime;
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
- TBool iTouchScreenCalibSupport;
- TBool iTouchScreenCalibrationDone;
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
+
};
#endif // STARTUPAPPUI_H
--- a/startupservices/Startup/inc/StartupApplication.h Thu Aug 19 10:05:08 2010 +0300
+++ b/startupservices/Startup/inc/StartupApplication.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies).
+* 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"
@@ -21,7 +21,9 @@
#define STARTUPAPPLICATION_H
// INCLUDES
-#include <aknapp.h>
+
+
+#include <eikapp.h>
// CONSTANTS
@@ -32,7 +34,7 @@
/**
* CStartupApp application class.
*/
-class CStartupApplication : public CAknApplication
+class CStartupApplication : public CEikApplication
{
private: // from CApaApplication
/**
--- a/startupservices/Startup/inc/StartupDocument.h Thu Aug 19 10:05:08 2010 +0300
+++ b/startupservices/Startup/inc/StartupDocument.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies).
+* 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"
@@ -21,7 +21,7 @@
#define STARTUPDOCUMENT_H
// INCLUDES
-#include <AknDoc.h>
+#include <eikdoc.h>
// FORWARD DECLARATIONS
class CEikAppUi;
@@ -31,14 +31,14 @@
/**
* CStartupDocument application class.
*/
-class CStartupDocument : public CAknDocument
+class CStartupDocument : public CEikDocument
{
public:
/**
* C++ default constructor.
*/
- CStartupDocument(CEikApplication& aApp): CAknDocument(aApp) { }
+ CStartupDocument(CEikApplication& aApp): CEikDocument(aApp) { }
/**
* Two-phased constructor.
--- a/startupservices/Startup/inc/StartupOperatorAnimation.h Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,77 +0,0 @@
-/*
-* Copyright (c) 2004 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:
-* This class is the container class of the CStartupOperatorAnimation.
-* It is used for showing predefined animation.
-*
-*/
-
-
-
-#ifndef STARTUPOPERATORANIMATION_H
-#define STARTUPOPERATORANIMATION_H
-
-// INCLUDES
-#include <coecntrl.h>
-#include "Startup.hrh"
-#include "StartupWelcomeAnimation.h"
-
-// CONSTANTS
-
-// FORWARD DECLARATIONS
-class CStartupModel;
-class CAknBitmapAnimation;
-class CStartupAppUi;
-
-// CLASS DECLARATION
-
-/**
-* This class takes care of showing welcome animatio to the user.
-*/
-class CStartupOperatorAnimation : public CStartupWelcomeAnimation
- {
- public:
-
-
- /**
- * Two-phased constructor.
- */
- static CStartupOperatorAnimation* NewL( CStartupAppUi* aStartupAppUi, const TRect& aRect);
-
- /**
- * This handles the key events in this control.
- */
- TKeyResponse OfferKeyEventL(const TKeyEvent& aKeyEvent, TEventCode aType);
-
- private:
- /**
- * C++ default constructor.
- */
- CStartupOperatorAnimation( CStartupAppUi* aStartupAppUi );
-
- /**
- * EPOC default constructor
- */
- void ConstructL(const TRect& aRect);
-
- /**
- * Is called by Draw()-function and contains
- * the drawing intelligence about different states of the execution.
- */
- void DoDrawing() const;
- };
-
-#endif // STARTUPOPERATORANIMATION_H
-
-// End of File
--- a/startupservices/Startup/inc/StartupPopupList.h Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
-/*
-* Copyright (c) 2006 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: This class implements a customized pop-up
- which disables LSK if no city/country match is there
-*
-*/
-
-
-#ifndef STARTUPPOPUPLIST_H
-#define STARTUPPOPUPLIST_H
-
-#include <aknPopup.h>
-#include <aknlists.h>
-#include <eiklbx.h>
-
-NONSHARABLE_CLASS(CStartupPopupList) : public CAknPopupList,
- public MListBoxItemChangeObserver
-{
- private:
-
- /**
- * Constructor
- */
- CStartupPopupList();
-
- /**
- * @param aListBox Pre-existing listbox-derived class
- * @param aCbaResource Softkey pane to display while pop-up is active
- */
- void ConstructL(CAknSinglePopupMenuStyleListBox* aListBox,
- TInt aCbaResource, AknPopupLayouts::TAknPopupLayouts aType);
-
- public:
- /**
- * Destructor
- */
- ~CStartupPopupList();
-
- /**
- * Two-phased constructor.
- * @param aListBox Pre-existing listbox-derived class
- * @param aCbaResource Softkey pane to display while pop-up is active
- * @return CStartupPopupList*
- */
- static CStartupPopupList* NewL(CAknSinglePopupMenuStyleListBox*
- aListBox, TInt aCbaResource,
- AknPopupLayouts::TAknPopupLayouts aType);
-
- /**
- * From CCoeControl, handle activation of control.
- */
- void ActivateL();
-
- /**
- * From MListBoxItemChangeObserver, handle enable/disable LSK
- */
- void ListBoxItemsChanged(CEikListBox* aListBox);
-
- /**
- * From CCoeControl, handles pointer events in this control.
- */
- void HandlePointerEventL(const TPointerEvent& aPointerEvent);
-};
-
-#endif //STARTUPPOPUPLIST_H
-
-
-
--- a/startupservices/Startup/inc/StartupQueryDialog.h Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,90 +0,0 @@
-/*
-* Copyright (c) 2004 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:
-* This class adds send-key to acknowledge the time/date query.
-* Feature is implemented to needs of the PET-chamber in production tests.
-* More information can be found in Change Request-database.
-*
-*/
-
-
-#ifndef STARTUPQUERYDIALOG_H
-#define STARTUPQUERYDIALOG_H
-
-// INCLUDES
-#include <AknQueryDialog.h> //used for Time and Date query
-
-// FORWARD DECLARATIONS
-
-// CLASS DECLARATION
-
-// CONSTANTS
-
-// CLASS DECLARATION
-
-/**
-* CStartupQueryDialog class.
-*/
-class CStartupQueryDialog : public CAknTimeQueryDialog
- {
- public://construction and destruction
- /**
- * C++ Constructor.
- */
- CStartupQueryDialog(TTime& aTime,const TTone aTone = ENoTone);
-
- /**
- * C++ Destructor.
- */
- virtual ~CStartupQueryDialog();
-
- public:// from CCoeControl
-
- /**
- * From CCoeControl Handle key events. When a key event occurs,
- * CONE calls this function for each control on the control stack,
- * until one of them returns EKeyWasConsumed to indicate that it processed the key event.
- * @param aKeyEvent The key event.
- * @param aType The type of the event: EEventKey, EEventKeyUp or EEventKeyDown.
- * @return Indicates whether or not the key event was used by this control.
- */
- TKeyResponse OfferKeyEventL(const TKeyEvent& aKeyEvent, TEventCode aType);
-
- public://from MAknQueryControlObeserver
-
- /**
- * Called by OfferkeyEventL(), gives a change to dismiss the query with
- * send/answer key.
- */
- virtual TBool NeedToDismissQueryL(const TKeyEvent& aKeyEvent);
-
- /**
- * Called by NeedToDismissQueryL(), gives a change to either accept or reject
- * the query. Default implementation is to accept the query if the Left soft
- * key is displayed and reject it otherwise. Left softkey is only displayed if
- * the query has valid data into it.
- */
- virtual void DismissQueryL();
-
- /**
- * Returns whether the left softkey is visible
- * @return ETrue is the left softkey is visible
- */
- TBool IsLeftSoftkeyVisible();
-
- };
-
-#endif // STARTUPAPPLICATION_H
-
-// End of file
--- a/startupservices/Startup/inc/StartupTone.h Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,124 +0,0 @@
-/*
-* Copyright (c) 2005-2007 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:
-* This class is the container class of the CStartupTone.
-* It is used for playing startup tone.
-*
-*/
-
-
-#ifndef __STARTUPTONE_H__
-#define __STARTUPTONE_H__
-
-// INCLUDES
-#include <MdaAudioSamplePlayer.h>
-#include "startupdefines.h"
-#include "startup.hrh"
-
-// CLASS DECLARATION
-/**
-* CStartupTone
-* This class is used for playing of startup tone.
-*/
-class CStartupAppUi;
-
-class CStartupTone : public CBase, public MMdaAudioPlayerCallback
- {
- public: //Constructors and destructor
- /**
- * C++ constructor.
- */
- CStartupTone( CStartupAppUi* aStartupAppUi );
-
- /**
- * Two-phased constructor.
- */
- static CStartupTone* NewL( CStartupAppUi* aStartupAppUi, TToneType aToneType );
-
- /**
- * Destructor
- */
- virtual ~CStartupTone();
-
- /**
- * Two phase constructor - this creates the audio player object
- */
- void ConstructL(TToneType aToneType);
-
- public: // New Functions
-
- /**
- * Play tone
- */
- TInt Play();
-
- /**
- * Stop tone
- */
- void Stop();
-
- /**
- * Check is tone currectly playing
- */
- TBool Playing();
-
- /**
- * Audio ready query
- * @return ETrue= audio ready, EFalse=audio not ready
- */
- TBool AudioReady();
-
- /**
- * Check if Startup tone is defined and found
- */
- TBool ToneFound();
-
- /**
- */
- void StartupWaiting(TBool aValue);
- private:
-
- /**
- */
- TInt GetRingingToneVolumeL();
-
- public: // Functions from base classes
-
- /**
- * From MMdaAudioPlayerCallback, audio initialization complete (Audio ready)
- * @param aError
- * @param aDuration not used internally
- */
- void MapcInitComplete(TInt aError, const TTimeIntervalMicroSeconds& aDuration);
-
- /**
- * From MMdaAudioPlayerCallback, audio playing complete
- * @param aError
- */
- void MapcPlayComplete(TInt aError);
-
- private: //data
- CMdaAudioPlayerUtility* iTone;
- TBool iAudioReady;
- TBool iPlaying;
- TToneType iToneType;
- CStartupAppUi* iStartupAppUi; //uses
- TBool iHiddenReset;
- TInt iVolume;
- TBool iStartupWaitingForTone;
- };
-
-#endif // __STARTUPTONE_H__
-
-// End of File
--- a/startupservices/Startup/inc/StartupUserWelcomeNote.h Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,247 +0,0 @@
-/*
-* Copyright (c) 2002 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:
-* This class is the container class of the CStartupUerWelcomeNote.
-* It is used for showing user defined image or text.
-*
-*/
-
-
-#ifndef STARTUPUSERWELCOMENOTE_H
-#define STARTUPUSERWELCOMENOTE_H
-
-// INCLUDES
-#include <coecntrl.h>
-#include "startup.hrh"
-#include "startupdomaincrkeys.h"
-
-// CONSTANTS
-const TInt KStartupTBufMaxLength( 100 );
-
-// FORWARD DECLARATIONS
-#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION
-class CStartupView;
-#else // RD_STARTUP_ANIMATION_CUSTOMIZATION
-class CStartupModel;
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-class CStartupAppUi;
-
-// CLASS DECLARATION
-
-/**
-* This class takes care of showing user welcome note to the user.
-* User welcome note type can be predefined default animation,
-* user defined image or text.
-*/
-class CStartupUserWelcomeNote
- : public CCoeControl
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
- , MCoeControlObserver
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
- {
- public: // Constructors and destructor
-
-#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION
- /**
- * Two-phased constructor.
- *
- * @param aView The compound control that is the container for this
- * control.
- */
- static CStartupUserWelcomeNote* NewL(
- CStartupAppUi& aStartupAppUi,
- const TRect& aRect,
- CStartupView& aView );
-#else // RD_STARTUP_ANIMATION_CUSTOMIZATION
- /**
- * C++ default constructor.
- */
- CStartupUserWelcomeNote( CStartupAppUi& aStartupAppUi );
-
- /**
- * Two-phased constructor.
- */
- static CStartupUserWelcomeNote* NewL( CStartupAppUi& aStartupAppUi, const TRect& aRect);
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-
- /**
- * Destructor
- */
- ~CStartupUserWelcomeNote();
-
- /**
- * Returns the information about the type of
- * the selected welcome note. This also consider
- * the product variant types of welcome note.
- * Return type can be animation, text or image.
- */
- TStartupNoteTypeInformation NoteTypeInformation();
-
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
- /**
- * This handles the key events in this control.
- */
- TKeyResponse OfferKeyEventL(const TKeyEvent& aKeyEvent, TEventCode aType);
-
- /**
- * This cancels iNoteCancelTimer
- */
- void CancelNoteCancelTimer();
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-
- /**
- * This function performs the actual user welcome note showing.
- */
- void StartL();
-
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
- /**
- * Update screen with white bitmap.
- */
- void DrawBlankScreen() const;
-
- /**
- * EPOC default constructor
- */
- void ConstructL(const TRect& aRect);
-
- /**
- * Sets the iUserWelcomeNoteShowing member value
- * @return void
- */
- void SetUserWelcomeNoteShowing(TBool aValue);
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-
- private:
-
- /**
- * Returns the component specified by aIndex parameter.
- */
- CCoeControl* ComponentControl(TInt aIndex) const;
-
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
- /**
- * Handles the event of the control.
- */
- void HandleControlEventL(CCoeControl* aControl,TCoeEvent aEventType);
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-
- /**
- * Loads the data about selected welcome note info from the Cental Repository.
- */
- TInt GetUserWelcomeNoteTypeInfo();
-
- /**
- * Shows the text type of user welcome note.
- */
- void ShowInformationNoteWrapperL();
-
- /**
- * Returns information about the selected user welcome note type.
- * Text, image or default(no note).
- */
- TStartupWelcomeNoteType UserWelcomeNoteType();
-
- /**
- * Draws a image type of welcome note to the center of
- * the screen. Both user selected image and operator
- * image as a product variant feature.
- */
- void DrawImageWelcomeNote();
-
- TInt CheckImage( const TDesC& aPath);
-
-#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION
- private:
-
- /**
- * C++ default constructor.
- *
- * @param aView The compound control that is the container for this
- * control.
- */
- CStartupUserWelcomeNote( CStartupAppUi& aStartupAppUi, CStartupView& aView );
-
- /**
- * Second phase constructor.
- */
- void ConstructL( const TRect& aRect );
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-
- private: // Data
-
-#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION
- /** Parent control for the animation control(s). */
- CStartupView& iView;
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-
- //Used for showing user selected image
- CFbsBitmap* iBitmap; //owns
-
- //contains the type information of the user welcome note as selected from
- //General Settings (variant information doesn't include in this)
- TStartupWelcomeNoteType iNoteType;
-
- //contains the possible variation information of the default user welcome note
- TStartupUserWelcomeNoteDefaultVariationType iNoteDefaultVariationType;
-
- //is used for storing image path information
- TBuf<KStartupTBufMaxLength> iNotePath;
-
- //is used for storing text note information
- TBuf<KStartupTBufMaxLength> iNoteText;
-
- //is used for storing image path information
- TBuf<KStartupTBufMaxLength> iNoteOperPath;
-
- //is used for storing text note information
- TBuf<KStartupTBufMaxLength> iNoteOperText;
-
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
- //stores the information about the execution state
- //of the application. This information is used
- //in drawing properly in current situation.
- TStartupDrawInfo iDrawUpdateInfo;
-
- //is uded for guarantee that RStarterSession is made
- //and used only once when RemoveSplashScreen is called.
- //In other words it is used for preventing needless work...
- TBool iSplashScreenRemoved;
-
- //is used in redrawing in various execution phases (DoDrawingL()-function)
- TStartupNoteTypeInformation iWelcomeNoteType;
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-
- //is used when user cancels the welcome note showing by
- //pressing any key.
- CStartupAppUi& iStartupAppUi; //uses
-
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
- //is used when user cancels the welcome note showing by
- //pressing any key. The reason for using callback in OfferKeyEvent()
- //guarantees that EKeyWasConsumed is returned properly before application
- //continues the tight execution.
- CPeriodic* iNoteCancelTimer; //owns
-
- //used for telling when the UWN is showing
- TBool iUserWelcomeNoteShowing;
-
- //used for telling if UWN is cancelled by user.
- TBool iUserWelcomeNoteCancelled;
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
- };
-
-#endif // STARTUPUSERWELCOMENOTE_H
-
-// End of File
--- a/startupservices/Startup/inc/StartupWelcomeAnimation.h Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,208 +0,0 @@
-/*
-* Copyright (c) 2003-2007 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:
-* This class is the container class of the CStartupUerWelcomeNote.
-* It is used for showing predefined animation.
-*
-*/
-
-
-
-#ifndef STARTUPWELCOMEANIMATION_H
-#define STARTUPWELCOMEANIMATION_H
-
-// INCLUDES
-#include <coecntrl.h>
-#include "Startup.hrh"
-
-// CONSTANTS
-
-// FORWARD DECLARATIONS
-class CStartupModel;
-class CAknBitmapAnimation;
-class CStartupAppUi;
-
-// CLASS DECLARATION
-
-/**
-* This class takes care of showing welcome animatio to the user.
-*/
-class CStartupWelcomeAnimation : public CCoeControl , MCoeControlObserver
- {
- public: // Constructors and destructor
-
- /**
- * C++ default constructor.
- */
- CStartupWelcomeAnimation( CStartupAppUi* aStartupAppUi );
-
- /**
- * Two-phased constructor.
- */
- static CStartupWelcomeAnimation* NewL( CStartupAppUi* aStartupAppUi, const TRect& aRect);
-
- /**
- * Destructor
- */
- ~CStartupWelcomeAnimation();
-
- /**
- * This handles the pointer events in this control.
- */
- void HandlePointerEventL(const TPointerEvent& aPointerEvent);
-
- /**
- * This handles the key events in this control.
- */
- TKeyResponse OfferKeyEventL(const TKeyEvent& aKeyEvent, TEventCode aType);
-
- /**
- * This cancels the animation.
- */
- void CancelAnimation();
-
- /**
- * This function performs the actual user welcome note showing.
- */
- void StartL();
-
- /**
- * This makes the animation module to stop showing animation.
- */
- void EndAnimation() const;
-
- /**
- * Returns the whole duration of the animation, in milliseconds.
- */
- TInt ShowingTime();
-
- /**
- * Update screen with white bitmap.
- */
- void DrawBlankScreen() const;
-
- /**
- * EPOC default constructor
- */
- void ConstructL(const TRect& aRect);
-
- /**
- * Set the info about which state in execution the
- * application is, so that view class can draw window
- * properly.
- */
- void UpdateDrawInfo( TStartupDrawInfo aValue );
-
- /**
- * Removes the splashscreen
- * @return void
- */
- void RemoveSplashScreen() const;
-
- /**
- * Tells is the animation cancelled by user
- * @return TBool
- */
- TBool IsAnimationCancelled();
-
- /**
- * Sets the iAnimationShowing member value
- * @return void
- */
- void SetAnimationShowing(TBool aValue);
-
- /**
- * Handle resource change
- * @param aType Type of change
- */
- void HandleResourceChange(TInt aType);
-
- //TEJ
- void CancelAnimCancelTimer();
- private:
-
- /**
- * Is called when size is changed.
- */
- void SizeChanged();
-
- /**
- * Returns the count of the components in the container.
- */
- TInt CountComponentControls() const;
-
- /**
- * Returns the component specified by aIndex parameter.
- */
- CCoeControl* ComponentControl(TInt aIndex) const;
-
- /**
- * Handles the event of the control.
- */
- void HandleControlEventL(CCoeControl* aControl,TCoeEvent aEventType);
-
- /**
- * Is called by Draw()-function and contains
- * the drawing intelligence about different states of the execution.
- */
- virtual void DoDrawingL() const;
-
- private: // Functions from base classes
-
- /**
- * Returns the count of the components in the container.
- */
- void Draw(const TRect& aRect) const;
-
- protected: // Data
-
- //Used for showing animation
- CAknBitmapAnimation *iAnim; //owns
-
- //Used for showing white background
- CFbsBitmap* iBackgroundBitmap; //owns
-
- //Is used for setting the timer over the animation
- TInt iShowingTime; //in milli
-
- //stores the information about the execution state
- //of the application. This information is used
- //in drawing properly in current situation.
- TStartupDrawInfo iDrawUpdateInfo;
-
- //is uded for guarantee that RStarterSession is made
- //and used only once when RemoveSplashScreen is called.
- //In other words it is used for preventing needless work...
- TBool iSplashScreenRemoved;
-
- //is used when user cancels the welcome note showing by
- //pressing any key.
- CStartupAppUi* iStartupAppUi; //uses
-
- //is used when user cancels the welcome note showing by
- //pressing any key. The reason for using callback in OfferKeyEvent()
- //guarantees that EKeyWasConsumed is returned properly before application
- //continues the tight execution.
- CPeriodic* iAnimCancelTimer; //owns
-
- //used for telling when the animation is showing
- TBool iAnimationShowing;
-
- //used for telling if animation is cancelled by user.
- TBool iAnimationCancelled;
- };
-
-#endif // STARTUPWELCOMEANIMATION_H
-
-// End of File
--- a/startupservices/Startup/inc/StartupWelcomeCrKeys.h Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +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: Startup Welcome keys
-*/
-
-#ifndef __STARTUPWELCOMECRKEYS_H
-#define __STARTUPWELCOMECRKEYS_H
-
-/**
- * The Uid for the repository itself
- * This repository holds the settings for Welcome2
- */
-const TUid KCRUidWelcome6 = { 0x200122A4 };
-
-/*
- * Used by PA to indicate if it has accomplished the task.
- */
-
-const TUint32 KPhoneActicationCompleted = 0x0000000B;
-#endif // STARTUPWELCOMCRKEYS_H
-
-// End of file
\ No newline at end of file
--- a/startupservices/Startup/inc/startupview.h Thu Aug 19 10:05:08 2010 +0300
+++ b/startupservices/Startup/inc/startupview.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007,2008 Nokia Corporation and/or its subsidiary(-ies).
+* 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"
@@ -21,7 +21,6 @@
#include <coecntrl.h>
-class CAknsBasicBackgroundControlContext; // Skin support
/**
* Main view for the Startup application.
@@ -108,8 +107,7 @@
/** Component control. */
CCoeControl* iComponent;
- /** Skin support */
- CAknsBasicBackgroundControlContext* iBgContext;
+
};
--- a/startupservices/Startup/src/StartupAppUi.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/startupservices/Startup/src/StartupAppUi.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2002-2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-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"
@@ -18,14 +18,7 @@
// SYSTEM INCLUDES
#include <StringLoader.h>
-#include <AknGlobalNote.h> //used for Selftest failed note
-#include <aknPopup.h>
-#include <aknlists.h>
-#include <aknSDData.h>
-#include <badesca.h>
-#include <tzlocalizationdatatypes.h>
-#include <tzlocalizer.h>
-#include <tz.h>
+
#include <featmgr.h> // Feature Manager
#include <centralrepository.h>
#include <startup.rsg>
@@ -35,53 +28,21 @@
#include <startupdomaincrkeys.h>
#include <CoreApplicationUIsSDKCRKeys.h>
#include <starterclient.h>
-#include "StartupWelcomeCrKeys.h"
-
-#ifdef RD_UI_TRANSITION_EFFECTS_PHASE2
-// Transition effects
-#include <gfxtranseffect/gfxtranseffect.h>
-#include <akntranseffect.h>
-#endif
-
-#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION
- #include "sanimstartupctrl.h"
-#else // RD_STARTUP_ANIMATION_CUSTOMIZATION
- #include <akndef.h> // For layout change event definitions
- #include <AknSoundSystem.h>
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
+#include <hbdevicemessageboxsymbian.h>
+#include "sanimstartupctrl.h"
+#include <apgtask.h>
// USER INCLUDES
#include "StartupAppUi.h"
#include "StartupApplication.h"
-#include "StartupUserWelcomeNote.h"
-#include "StartupQueryDialog.h" //used for Startup own Time and Date queries
-#include "StartupPopupList.h" //used for Startup own City and Country queries
-#include "StartupMediatorObserver.h"
+
#include "StartupPubSubObserver.h"
-
-#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION
- #include "startupanimationwrapper.h"
- #include "startupview.h"
-#else // RD_STARTUP_ANIMATION_CUSTOMIZATION
- #include "StartupDocument.h"
- #include "StartupOperatorAnimation.h"
- #include "StartupTone.h"
- #include "StartupWelcomeAnimation.h"
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
+#include "startupanimationwrapper.h"
+#include "startupview.h"
+
+#include <eikenv.h>
-// CONSTANTS
-const TInt KUserWelcomeNoteShowPeriodTime = 3000000; // 3 sec
-
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
- const TInt KOneMilliSecondInMicroSeconds = 1000;
- const TInt KMaxToneInitWait = 200; // 200 ms
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-
-static const TInt KMaxCityLength(120);
-static const TInt KMaxCountryLength(120);
-
-#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION
static const CSAnimStartupCtrl::TAnimationParams KStartupAnimationParams =
{
KCRUidStartupConf,
@@ -91,15 +52,7 @@
KStartupTonePath,
KStartupToneVolume
};
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-_LIT(KEmpty, " ");
-
-// Default date and time value is used if cenrep string is not valid
-// Default date is 01.01.2007 and default time is 09:00 AM
-_LIT( KDefaultDateTimeValue, "20070000:090000" ); // YYYYMMDD:HHMMSS
-
-static const TInt KTimeFormatLength(16); // "20070000:090000."
_LIT_SECURITY_POLICY_C1(KReadDeviceDataPolicy, ECapabilityReadDeviceData);
_LIT_SECURITY_POLICY_C1(KWriteDeviceDataPolicy, ECapabilityWriteDeviceData);
@@ -107,7 +60,6 @@
// ======== LOCAL FUNCTIONS ==================================================
-#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION
namespace
{
TInt AnimationFinishedFunc( TAny* aPtr )
@@ -116,7 +68,7 @@
return KErrNone;
}
}
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
+
// ================= MEMBER FUNCTIONS ========================================
@@ -125,17 +77,8 @@
// CStartupAppUi::CStartupAppUi()
// ---------------------------------------------------------------------------
CStartupAppUi::CStartupAppUi() :
- iUserWelcomeNote( NULL ),
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
- iStartupTone( NULL ),
- iOpStartupTone( NULL ),
- iToneInitWaitTime( 0 ),
- iAnimation( EFalse ),
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
- iInternalState( EStartupStartingUp ),
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
- iSplashScreenShouldBeRemoved( EFalse ),
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
+ iInternalState( EStartupStartingUp ),
+
iStartupFirstBootAndRTCCheckAlreadyCalled( EFalse ),
iChargingOrAlarmBoot( EFalse ),
iFirstBoot( ETrue ),
@@ -145,15 +88,8 @@
iCriticalBlockEnded( EFalse ),
iSwStateFatalStartupError( EFalse ),
iStartupWaitingShowStartupAnimation( EFalse ),
- iSimSupported( ETrue ),
- iStartupMediatorObserver( NULL ),
- iCoverUISupported( EFalse ),
- iCounryListIndex( 0 )
- , iTime( 0 )
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
- , iTouchScreenCalibSupport( EFalse )
- , iTouchScreenCalibrationDone( EFalse )
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
+ iSimSupported( ETrue )
+
{
TRACES("CStartupAppUi::CStartupAppUi");
}
@@ -163,18 +99,18 @@
// ---------------------------------------------------------------------------
void CStartupAppUi::ConstructL()
{
+ RThread thread; //increase the thread priority to smooth the animation
+ thread.SetPriority(EPriorityAbsoluteForeground);
+ thread.Close();
TRACES("CStartupAppUi::ConstructL()");
- TInt flags = EStandardApp|EAknEnableSkin|EAknEnableMSK ;
-
- BaseConstructL(flags);
+ TInt flags = EStandardApp;
+ BaseConstructL( flags );
+
+ iMainView = CStartupView::NewL( ApplicationRect() );
+
+
+ iAnimation = CStartupAnimationWrapper::NewL( *iMainView );
- iAvkonAppUi->SetKeyEventFlags( CAknAppUiBase::EDisableSendKeyShort |
- CAknAppUiBase::EDisableSendKeyLong );
-
-#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION
- iMainView = CStartupView::NewL( ApplicationRect() );
- iAnimation = CStartupAnimationWrapper::NewL( *iMainView );
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
TInt err = RProperty::Define( KPSUidStartupApp,
KPSStartupAppState,
@@ -199,42 +135,9 @@
iStartupPubSubObserver = CStartupPubSubObserver::NewL( this );
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
- err = RProperty::Define( KPSUidStartup,
- KStartupBootIntoOffline,
- RProperty::EInt,
- KReadDeviceDataPolicy,
- KWriteDeviceDataPolicy );
- if( KErrNone != err &&
- KErrAlreadyExists != err )
- {
- TRACES1("CStartupAppUi::ConstructL(): KStartupBootIntoOffline define err %d", err);
- }
- err = RProperty::Define( KPSUidStartup,
- KStartupSecurityCodeQueryStatus,
- RProperty::EInt,
- KReadDeviceDataPolicy,
- KWriteDeviceDataPolicy );
- if( KErrNone != err &&
- KErrAlreadyExists != err )
- {
- TRACES1("CStartupAppUi::ConstructL(): KStartupSecurityCodeQueryStatus define err %d", err);
- }
- err = RProperty::Define( KPSUidStartup,
- KStartupCleanBoot,
- RProperty::EInt,
- KReadDeviceDataPolicy,
- KWriteDeviceDataPolicy );
- if( KErrNone != err &&
- KErrAlreadyExists != err )
- {
- TRACES1("CStartupAppUi::ConstructL(): KStartupCleanBoot define err %d", err);
- }
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION
err = RProperty::Define( KPSUidStartup,
KPSStartupUiPhase,
RProperty::EInt,
@@ -248,7 +151,7 @@
}
UpdateStartupUiPhase( EStartupUiPhaseUninitialized );
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
+
FeatureManager::InitializeLibL();
if ( FeatureManager::FeatureSupported( KFeatureIdOfflineMode ) )
@@ -259,60 +162,30 @@
{
iSimSupported = EFalse;
}
- if ( FeatureManager::FeatureSupported( KFeatureIdCoverDisplay ) )
- {
- iCoverUISupported = ETrue;
- }
+
TRACES1("CStartupAppUi::ConstructL(): Offline mode supported: %d", iOfflineModeSupported );
TRACES1("CStartupAppUi::ConstructL(): SIM card supported: %d", iSimSupported );
- TRACES1("CStartupAppUi::ConstructL(): CoverUI supported: %d", iCoverUISupported );
-
-#if defined (RD_SCALABLE_UI_V2) && !defined(RD_STARTUP_ANIMATION_CUSTOMIZATION)
- if ( FeatureManager::FeatureSupported(KFeatureIdPenSupport) &&
- FeatureManager::FeatureSupported(KFeatureIdPenSupportCalibration) )
- {
- iTouchScreenCalibSupport = ETrue;
- }
-#endif // RD_SCALABLE_UI_V2 && !RD_STARTUP_ANIMATION_CUSTOMIZATION
-
- if (iCoverUISupported)
- {
- iStartupMediatorObserver = CStartupMediatorObserver::NewL( this );
- }
+
iFirstBoot = FirstBoot();
TRACES1("CStartupAppUi::ConstructL(): First boot: %d", iFirstBoot );
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
- iWelcomeAnimation = CStartupWelcomeAnimation::NewL( this, ClientRect());
- AddToStackL( iWelcomeAnimation );
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
+
+ CEikonEnv* eikEnv = CEikonEnv::Static();
// Set Startup application to be system application
- iEikonEnv->SetSystem( ETrue );
+ eikEnv->SetSystem( ETrue );
- iEikonEnv->RootWin().SetOrdinalPosition(0,0);
+ eikEnv->RootWin().SetOrdinalPosition(0,0);
// Disable priority changes of window server
- iEikonEnv->WsSession().ComputeMode(
+ eikEnv->WsSession().ComputeMode(
RWsSession::EPriorityControlDisabled );
+ iNoteTimer = CPeriodic::NewL( EPriorityNormal );
- iNoteTimer = CPeriodic::NewL( EPriorityNormal );
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
- iAnimTimer = CPeriodic::NewL( EPriorityNormal );
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
iExitTimer = CPeriodic::NewL( EPriorityNormal );
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
- TRACES("CStartupAppUi::ConstructL(): StartupTone: Initialising");
- iStartupTone = CStartupTone::NewL( this, EStartupTone );
- TRACES("CStartupAppUi::ConstructL(): StartupTone: Initialised");
-
- TRACES("CStartupAppUi::ConstructL(): Operator StartupTone: Initialising");
- iOpStartupTone = CStartupTone::NewL( this, EStartupOpTone );
- TRACES("CStartupAppUi::ConstructL(): Operator StartupTone: Initialised");
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
if ( iSwStateFatalStartupError )
{
@@ -334,43 +207,6 @@
{
TRACES("CStartupAppUi::~CStartupAppUi()");
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
- if (iWelcomeAnimation)
- {
- RemoveFromStack( iWelcomeAnimation );
- delete iWelcomeAnimation;
- }
-
- if (iOperatorAnimation)
- {
- RemoveFromStack( iOperatorAnimation);
- delete iOperatorAnimation;
- }
-
- if (iUserWelcomeNote)
- {
- RemoveFromStack( iUserWelcomeNote );
- delete iUserWelcomeNote;
- iUserWelcomeNote = NULL;
- }
-
- if (iStartupPubSubObserver)
- {
- delete iStartupPubSubObserver;
- }
- if (iStartupMediatorObserver)
- {
- delete iStartupMediatorObserver;
- }
- if (iStartupTone)
- {
- delete iStartupTone;
- }
- if (iOpStartupTone)
- {
- delete iOpStartupTone;
- }
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
if( iExitTimer )
{
@@ -378,13 +214,7 @@
delete iExitTimer;
}
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
- if( iAnimTimer )
- {
- iAnimTimer->Cancel();
- delete iAnimTimer;
- }
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
+
if( iNoteTimer )
{
@@ -392,13 +222,13 @@
delete iNoteTimer;
}
-#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION
- delete iUserWelcomeNote;
+
+
delete iAnimation;
delete iStartupPubSubObserver;
- delete iStartupMediatorObserver;
+
delete iMainView;
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
+
FeatureManager::UnInitializeLib();
@@ -412,26 +242,11 @@
{
TRACES("CStartupAppUi::PrepareToExit()");
-#ifdef RD_UI_TRANSITION_EFFECTS_PHASE2
- // Start the custom exit effect at boot time.
- // Note: Not allowed to call GfxTransEffect::EndFullScreen() as AVKON takes care of that when
- // EApplicationExit context is used!
+
-#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION
- if ( !( iAnimation->WasCancelled() ) )
-#else // RD_STARTUP_ANIMATION_CUSTOMIZATION
- if( !iWelcomeAnimation->IsAnimationCancelled() )
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
- {
- TRACES("CStartupAppUi::PrepareToExit(): Starting transition effect");
+
+ CEikAppUi::PrepareToExit();
- GfxTransEffect::BeginFullScreen( AknTransEffect::EApplicationExit, TRect(),
- AknTransEffect::EParameterType,
- AknTransEffect::GfxTransParam( KUidStartUp, AknTransEffect::TParameter::EAllowAtBoot ) );
- }
-#endif
-
- CEikAppUi::PrepareToExit();
#ifndef RD_BOOT_CUSTOMIZABLE_AI
if( !iChargingOrAlarmBoot )
{
@@ -475,6 +290,7 @@
return KErrNone;
}
+
// ---------------------------------------------------------------------------
// CStartupAppUi::HandleKeyEventL
// ---------------------------------------------------------------------------
@@ -513,13 +329,7 @@
iOfflineModeQueryShown = EFalse;
response = EKeyWasConsumed;
}
- else if ( iUserWelcomeNote )
- {
- TRACES("CStartupAppUi::HandleKeyEventL(): This key event is used to stop UserWelcomeAnimation");
- //this is used to stop User Welcome note showing
- StopTimingL();
- response = EKeyWasConsumed;
- }
+
else if ( ( iInternalState == EStartupShowingWelcomeAnimation ||
iInternalState == EStartupShowingOperatorAnimation ) &&
!( iAnimation->WasCancelled() ) )
@@ -535,7 +345,8 @@
return response;
}
-#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION
+/*
+ * Qt Support Not available..
// ---------------------------------------------------------------------------
// CStartupAppUi::HandleResourceChangeL
//
@@ -545,17 +356,20 @@
{
TRACES("CStartupAppUi::HandleResourceChangeL()");
TRACES1("CStartupAppUi::HandleResourceChangeL Type: %d", aType);
-
+
+
+ * No equivalent in Qt.
CAknAppUi::HandleResourceChangeL( aType );
if ( aType == KEikDynamicLayoutVariantSwitch )
{
iMainView->SetRect( ApplicationRect() );
}
-
+
TRACES("CStartupAppUi::HandleResourceChangeL(): End");
}
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
+
+*/
// ---------------------------------------------------------------------------
@@ -569,7 +383,8 @@
case EEikCmdExit:
{
TRACES("CStartupAppUi::HandleCommandL(): EEikCmdExit");
- Exit();
+
+ Exit();
}
break;
default:
@@ -584,14 +399,13 @@
void CStartupAppUi::DoStartupStartPartL()
{
TRACES("CStartupAppUi::DoStartupStartPartL()");
-#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION
+
TryPreLoadAnimation();
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
+
DoNextStartupPhaseL( EStartupWaitingCriticalBlock );
TRACES("CStartupAppUi::DoStartupStartPartL(): End");
}
-#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION
// ---------------------------------------------------------------------------
// CStartupAppUi::TryPreLoadAnimation()
// ---------------------------------------------------------------------------
@@ -622,7 +436,7 @@
{
iAnimation->PreLoad(
ClientRect(),
- *iMainView,
+ *iMainView,
KStartupAnimationParams,
ETrue,
SecondaryDisplay::EStartWelcomeAnimation );
@@ -630,7 +444,7 @@
TRACES("CStartupAppUi::TryPreLoadAnimation(): End");
}
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
+
// ---------------------------------------------------------------------------
@@ -645,44 +459,24 @@
//the same way like in the end of ShowUserWelcomeNoteL()
TRACES("CStartupAppUi::DoStartupShowWelcomeAnimationL(): Skip the animation and UWN because it's hidden reset");
TRACES("CStartupAppUi::DoStartupShowWelcomeAnimationL(): and change internal state directly to EStartupFirstBootAndRTCCheck");
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
- iWelcomeAnimation->RemoveSplashScreen();
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
+
DoNextStartupPhaseL( EStartupFirstBootAndRTCCheck );
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
- return;
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
+
}
-#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION
+
else
{
TRACES("CStartupAppUi::DoStartupShowWelcomeAnimationL(): Show animation");
iAnimation->Play(
ClientRect(),
- *iMainView,
+ *iMainView,
KStartupAnimationParams,
ETrue,
SecondaryDisplay::EStartWelcomeAnimation,
TCallBack( AnimationFinishedFunc, this ) );
}
-#else // RD_STARTUP_ANIMATION_CUSTOMIZATION
- TRACES("CStartupAppUi::DoStartupShowWelcomeAnimationL(): Play startup tone.");
-
- // Play startup tone
- if (iStartupTone->Play() != KErrNone)
- {
- // Play startup beep.
- TRACES("CStartupAppUi::DoStartupShowWelcomeAnimationL(): Play startup beep");
- static_cast<CAknAppUi*>(iEikonEnv->
- EikAppUi())->
- KeySounds()->
- PlaySound( EAvkonSIDPowerOnTone );
- }
- iWelcomeAnimation->SetAnimationShowing(ETrue);
- ShowWelcomeAnimationL();
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
TRACES("CStartupAppUi::DoStartupShowWelcomeAnimationL(): End");
}
@@ -700,11 +494,9 @@
TRACES("CStartupAppUi::DoStartupShowOperatorAnimationL(): Skip the animation and UWN because it's hidden reset");
TRACES("CStartupAppUi::DoStartupShowOperatorAnimationL(): and change internal state directly to EStartupFirstBootAndRTCCheck");
DoNextStartupPhaseL( EStartupFirstBootAndRTCCheck );
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
- return;
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
+
}
-#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION
+
else
{
TRACES("CStartupAppUi::DoStartupShowOperatorAnimationL(): Show animation");
@@ -718,61 +510,18 @@
params.iVolumeKey = KStartupOperatorToneVolume;
iAnimation->Play(
ClientRect(),
+
*iMainView,
params,
EFalse,
SecondaryDisplay::EStartOperatorAnimation,
TCallBack( AnimationFinishedFunc, this ) );
}
-#else // RD_STARTUP_ANIMATION_CUSTOMIZATION
- if ( iOperatorAnimation->ShowingTime() )
- {
- TRACES("CStartupAppUi::DoStartupShowOperatorAnimationL(): Operator animation time defined properly");
- iOperatorAnimation->SetAnimationShowing(ETrue);
- iOpStartupTone->Play();
- ShowOperatorAnimationL();
- }
- else
- {
- TRACES("CStartupAppUi::DoStartupShowOperatorAnimationL(): Operator animation not defined. Skip it.");
- iOperatorAnimation->SetAnimationShowing(EFalse);
- DoNextStartupPhaseL( EStartupShowingUserWelcomeNote );
- }
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
+
TRACES("CStartupAppUi::DoStartupShowOperatorAnimationL(): End");
}
-// ---------------------------------------------------------------------------
-// CStartupAppUi::DoStartupShowUserWelcomeNoteL()
-// ---------------------------------------------------------------------------
-void CStartupAppUi::DoStartupShowUserWelcomeNoteL()
- {
- TRACES("CStartupAppUi::DoStartupShowUserWelcomeNoteL()");
- ShowUserWelcomeNoteL();
- TRACES("CStartupAppUi::DoStartupShowUserWelcomeNoteL(): End");
- }
-
-// ---------------------------------------------------------------------------
-// CStartupAppUi::StartupQueriesEnabled()
-// ---------------------------------------------------------------------------
-TBool CStartupAppUi::StartupQueriesEnabled()
- {
- TRACES("CStartupAppUi::StartupQueriesEnabled()");
-
- TInt value( EStartupQueriesEnabled );
- CRepository* repository(NULL);
-
- TRAPD( err, repository = CRepository::NewL( KCRUidStartupConf ) );
- if ( err == KErrNone )
- {
- err = repository->Get( KStartupQueries, value );
- }
- delete repository;
-
- TRACES1("CStartupAppUi::StartupQueriesEnabled(): returns %d", value);
- return value;
- }
// ---------------------------------------------------------------------------
// CStartupAppUi::PredictiveTimeEnabled()
@@ -802,69 +551,46 @@
{
TRACES("CStartupAppUi::DoStartupFirstBootAndRTCCheckL()");
-#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION
+
RProperty::Set( KPSUidStartup, KStartupCleanBoot, iCleanBoot );
RProperty::Set( KPSUidStartup, KPSSplashShutdown, ESplashShutdown );
- delete iUserWelcomeNote;
- iUserWelcomeNote = NULL;
iMainView->DrawDeferred();
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
+
// When Predictive Time and Country Selection is enabled, no queries are
// shown to user during first boot. Instead, Clock application gets the
// time and location from the network and marks the first boot as done.
if( !PredictiveTimeEnabled() )
{
- if( iFirstBoot && !HiddenReset() && StartupQueriesEnabled() )
+ if( iFirstBoot && !HiddenReset() ) //&& StartupQueriesEnabled() )
{
TRACES("CStartupAppUi::DoStartupFirstBootAndRTCCheckL(): First boot. Show city, time and date queries.");
-
-
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
- iWelcomeAnimation->UpdateDrawInfo( EStartupDICityTimeDateQueries );
- iWelcomeAnimation->DrawNow();
-
- if (iOperatorAnimation)
- {
- RemoveFromStack( iOperatorAnimation );
- delete iOperatorAnimation;
- iOperatorAnimation = NULL;
- }
- if (iUserWelcomeNote)
- {
- RemoveFromStack( iUserWelcomeNote );
- delete iUserWelcomeNote;
- iUserWelcomeNote = NULL;
- }
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-
- ShowStartupQueriesL();
- TRACES("CStartupAppUi::DoStartupFirstBootAndRTCCheckL(): Mark first boot");
+ TRACES("CStartupAppUi::DoStartupFirstBootAndRTCCheckL(): Mark first boot");
MarkFirstBoot();
}
- else if( !RTCStatus() && !HiddenReset() && StartupQueriesEnabled())
+ else if( !RTCStatus() && !HiddenReset() ) // && StartupQueriesEnabled())
{
TRACES("CStartupAppUi::DoStartupFirstBootAndRTCCheckL(): No first boot but RTCStatus is corrupted. Ask time and date");
- #ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
- iWelcomeAnimation->UpdateDrawInfo( EStartupDICityTimeDateQueries );
- if (iUserWelcomeNote)
- {
- RemoveFromStack( iUserWelcomeNote );
- delete iUserWelcomeNote;
- iUserWelcomeNote = NULL;
- }
- #endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-
- ShowStartupQueriesL(); // Not first boot, so skips Country/City query
- }
- if( iFirstBoot && !StartupQueriesEnabled() )
+ }
+ if( iFirstBoot ) // && !StartupQueriesEnabled() )
{
TRACES("CStartupAppUi::DoStartupFirstBootAndRTCCheckL(): First boot ongoing and queries are disabled.");
MarkFirstBoot();
}
}
+ else
+ {
+ // Temporary fix for the defect VEZI-7YDEAR , as clock is not yet supported.
+ TRACES("CStartupAppUi::DoStartupFirstBootAndRTCCheckL(): if PredictiveTimeEnabled is set");
+ if( iFirstBoot && !HiddenReset() )
+ {
+ TRACES("CStartupAppUi::DoStartupFirstBootAndRTCCheckL(): Mark first boot");
+ MarkFirstBoot();
+ }
+ // End of temporary fix.
+ }
TRACES("CStartupAppUi::DoStartupFirstBootAndRTCCheckL(): Setting KPSStartupAppState = EStartupAppStateFinished");
TInt err = RProperty::Set( KPSUidStartupApp, KPSStartupAppState, EStartupAppStateFinished );
@@ -874,58 +600,11 @@
, err);
}
- DoNextStartupPhaseL( EStartupWaitingCUIStartupReady );
+ DoNextStartupPhaseL( EStartupStartupOK );
}
-// ---------------------------------------------------------------------------
-// CStartupAppUi::ShowStartupQueriesL()
-// ---------------------------------------------------------------------------
-void CStartupAppUi::ShowStartupQueriesL()
- {
- TRACES("CStartupAppUi::ShowStartupQueriesL()");
-
- TBool citysaved(EFalse);
- TBool timesaved(EFalse);
- TBool datesaved(EFalse);
-
- // Get default time ( to be used only in date query )
- GetDefaultTimeAndDate( iTime );
-
- // Show Country, Date and Time queries ( with possibility to go back ).
- // Country query is shown only in the first boot.
- while (!timesaved)
- {
- while (!datesaved)
- {
- while (!citysaved && iFirstBoot)
- {
- // 1. Select time zone
- ShowCountryAndCityListsL();
- citysaved = ETrue;
- TRACES1("CStartupAppUi::ShowStartupQueriesL(): citysaved = %d", citysaved );
- }
- // 2. Set date
- datesaved = ShowDateQueryL();
- TRACES1("CStartupAppUi::ShowStartupQueriesL(): datesaved = %d", datesaved );
- if (!datesaved)
- {
- citysaved = EFalse;
- }
- }
- // 3. Set time
- timesaved = ShowTimeQueryL();
- TRACES1("CStartupAppUi::ShowStartupQueriesL(): timesaved = %d", timesaved );
- if (!timesaved)
- {
- datesaved = EFalse;
- }
- }
- // All the queries completed.
-
- TRACES("CStartupAppUi::ShowStartupQueriesL() - END");
- }
// ---------------------------------------------------------------------------
// CStartupAppUi::DoStartupEndPart()
@@ -934,100 +613,31 @@
{
TRACES("CStartupAppUi::DoStartupEndPart()");
TRACES("CStartupAppUi::DoStartupEndPart(): STARTUP OK");
-
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
- RProperty::Set( KPSUidStartup, KStartupCleanBoot, iCleanBoot );
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-
-#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION
- TBool fTUDone = ETrue;
- TRAP_IGNORE(IsFTUAvailableL(fTUDone));
- if(fTUDone)
- {
- UpdateStartupUiPhase( EStartupUiPhaseAllDone );
- }
- else
+ TBool ftuenabled=EFalse;
+ TInt err=KErrNone;
+#ifndef __WINSCW__
+ TRAP(err,
+ TInt enabled=0;
+ //open cenrep;
+ CRepository *cenrep=CRepository::NewLC(KCRUidStartupConf);
+ //check if ftu is enabled or not
+ User::LeaveIfError(cenrep->Get(KFtuStartupEnabled,enabled));
+ ftuenabled=!!enabled; //make sure we only have a boolean value here
+ CleanupStack::PopAndDestroy(cenrep);
+ );
+#endif
+ if(!ftuenabled)
{
- UpdateStartupUiPhase(EStartupUiPhaseAllDone+1);
+ UpdateStartupUiPhase( EStartupUiPhaseAllDone );
}
- //UpdateStartupUiPhase( EStartupUiPhaseAllDone );
-
-
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-
TRACES("CStartupAppUi::DoStartupEndPart(): Exit application.");
iExitTimer->Start( 100000, 100000, TCallBack( DoExitApplication, this ) );
TRACES("CStartupAppUi::DoStartupEndPart(): DoExitApplication-timer called.");
TRACES("CStartupAppUi::DoStartupEndPart(): End");
}
-void CStartupAppUi::IsFTUAvailableL(TBool& aFTUAvailable)
- {
- //From Startupwelcomecrkeys.h
- CRepository* repo = CRepository::NewLC(KCRUidWelcome6);
- repo->Get(KPhoneActicationCompleted, aFTUAvailable);
- CleanupStack::PopAndDestroy(repo);
- }
-
-
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
-// ---------------------------------------------------------------------------
-// CStartupAppUi::ContinueStartupAfterToneL()
-// ---------------------------------------------------------------------------
-void CStartupAppUi::ContinueStartupAfterToneL(TToneType aToneType)
- {
- TRACES("CStartupAppUi::ContinueStartupAfterToneL()");
-
- if (aToneType == EStartupTone)
- {
- TRACES("CStartupAppUi::ContinueStartupAfterToneL(): Tone type EStartupTone");
- DoNextStartupPhaseL( EStartupWaitingCUIOperatorAnim );
- }
- else if (aToneType == EStartupOpTone)
- {
- TRACES("CStartupAppUi::ContinueStartupAfterToneL(): Tone type EStartupOpTone");
- DoNextStartupPhaseL( EStartupShowingUserWelcomeNote );
- }
- else
- {
- TRACES("CStartupAppUi::ContinueStartupAfterToneL(): Tone interrupted");
- DoNextStartupPhaseL( EStartupFirstBootAndRTCCheck );
- }
- TRACES("CStartupAppUi::ContinueStartupAfterToneL(): End");
- }
-
-// ---------------------------------------------------------------------------
-// CStartupAppUi::BringToForeground()
-// ---------------------------------------------------------------------------
-void CStartupAppUi::BringToForeground()
- {
- TRACES("CStartupAppUi::BringToForeground()");
- if ((iInternalState != EStartupWaitingTouchScreenCalib) ||
- (iTouchScreenCalibrationDone))
- {
- TRACES("CStartupAppUi::BringToForeground(): Bring to foreground");
- TApaTask self(iCoeEnv->WsSession());
- self.SetWgId(iCoeEnv->RootWin().Identifier());
- self.BringToForeground();
- }
- TRACES("CStartupAppUi::BringToForeground(): End");
- }
-
-// ---------------------------------------------------------------------------
-// CStartupAppUi::SendToBackground()
-// ---------------------------------------------------------------------------
-void CStartupAppUi::SendToBackground()
- {
- TRACES("CStartupAppUi::SendToBackground()");
- TApaTask self(iCoeEnv->WsSession());
- self.SetWgId(iCoeEnv->RootWin().Identifier());
- self.SendToBackground();
- TRACES("CStartupAppUi::SendToBackground(): End");
- }
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-
// ---------------------------------------------------------------------------
// CStartupAppUi::StopTimingL()
// ---------------------------------------------------------------------------
@@ -1043,87 +653,10 @@
TRACES("CStartupAppUi::StopTimingL(): Stopping UWN");
iStartupFirstBootAndRTCCheckAlreadyCalled = ETrue;
iNoteTimer->Cancel();
-#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION
+
UpdateStartupUiPhase( EStartupUiPhaseUserWelcomeDone );
DoNextStartupPhaseL( EStartupFirstBootAndRTCCheck );
-#else // RD_STARTUP_ANIMATION_CUSTOMIZATION
- iUserWelcomeNote->CancelNoteCancelTimer();
- iWelcomeAnimation->UpdateDrawInfo( EStartupDIWelcomeNoteEnd );
- iWelcomeAnimation->DrawNow();
- iUserWelcomeNote->SetUserWelcomeNoteShowing(EFalse);
- TRACES("CStartupAppUi::StopTimingL(): UWN stopped");
- if (iStartupTone->Playing())
- {
- TRACES("CStartupAppUi::StopTimingL(): Startup tone playing. Cannot continue to next phase");
- iStartupTone->StartupWaiting(ETrue);
- }
- else
- {
- DoNextStartupPhaseL( EStartupFirstBootAndRTCCheck );
- }
- }
- else if (iInternalState == EStartupShowingOperatorAnimation) // EStartupShowingOperatorAnimation
- {
- TRACES("CStartupAppUi::StopTimingL(): Stopping animation");
- iAnimTimer->Cancel();
- iWelcomeAnimation->CancelAnimCancelTimer();
- iOperatorAnimation->UpdateDrawInfo( EStartupDIOperatorAnimEnd );
- iOperatorAnimation->SetAnimationShowing(EFalse);
- TRACES("CStartupAppUi::StopTimingL(): operator animation showing stopped");
- if ( iOperatorAnimation->IsAnimationCancelled())
- {
- TRACES("CStartupAppUi::StopTimingL(): Animation is cancelled by user and therefore UWN is not shown");
- StopOperatorTone();
- iStartupFirstBootAndRTCCheckAlreadyCalled = ETrue;
- DoNextStartupPhaseL( EStartupFirstBootAndRTCCheck );
- }
- else
- {
- // If tone is still playing wait until it completes.
- if (iOpStartupTone->Playing())
- {
- TRACES("CStartupAppUi::StopTimingL(): Operator startup tone is still playing. Wait until it completes.");
- iOpStartupTone->StartupWaiting(ETrue);
- }
- else
- {
- TRACES("CStartupAppUi::StopTimingL(): Lets display UWN");
- DoNextStartupPhaseL( EStartupShowingUserWelcomeNote );
- }
- }
- TRACES("CStartupAppUi::StopTimingL(): Operator Animation stopped");
- }
- else // EStartupShowingWelcomeAnimation
- {
- TRACES("CStartupAppUi::StopTimingL(): Stopping animation");
- iAnimTimer->Cancel();
- iWelcomeAnimation->CancelAnimCancelTimer();
- iWelcomeAnimation->UpdateDrawInfo( EStartupDIWelcomeAnimEnd );
- iWelcomeAnimation->SetAnimationShowing(EFalse);
- TRACES("CStartupAppUi::StopTimingL(): Welcome animation showing stopped");
-
- if ( iWelcomeAnimation->IsAnimationCancelled())
- {
- TRACES("CStartupAppUi::StopTimingL(): Animation is cancelled by user and therefore operator animation and UWN is not shown");
- StopStartupTone();
- iStartupFirstBootAndRTCCheckAlreadyCalled = ETrue;
- DoNextStartupPhaseL( EStartupFirstBootAndRTCCheck );
- }
- else
- {
- if (iStartupTone->Playing())
- {
- // If tone is still playing wait until it completes.
- iStartupTone->StartupWaiting(ETrue);
- }
- else
- {
- DoNextStartupPhaseL( EStartupWaitingCUIOperatorAnim );
- }
- }
- TRACES("CStartupAppUi::StopTimingL(): Animation stopped");
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
}
}
@@ -1141,331 +674,6 @@
TRACES("CStartupAppUi::ExitApplication(): End");
}
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
-// ---------------------------------------------------------------------------
-// CStartupAppUi::ShowWelcomeAnimationL()
-// ---------------------------------------------------------------------------
-void CStartupAppUi::ShowWelcomeAnimationL()
- {
- TRACES("CStartupAppUi::ShowWelcomeAnimationL()");
- __ASSERT_DEBUG( iWelcomeAnimation , PANIC( EStartupPanicClassMemberVariableIsNull ) );
- TInt showtime = iWelcomeAnimation->ShowingTime();
- iAnimation = ETrue;
- TRACES("CStartupAppUi::ShowWelcomeAnimationL(): Animation timer started");
- iAnimTimer->Start(
- showtime*KOneMilliSecondInMicroSeconds,
- showtime*KOneMilliSecondInMicroSeconds,
- TCallBack( DoStopTimingL, this ) );
- iWelcomeAnimation->StartL();
- TRACES("CStartupAppUi::ShowWelcomeAnimationL(): End");
- }
-
-// ---------------------------------------------------------------------------
-// CStartupAppUi::ShowOperatorAnimationL()
-// ---------------------------------------------------------------------------
-void CStartupAppUi::ShowOperatorAnimationL()
- {
- TRACES("CStartupAppUi::ShowOperatorAnimationL()");
- __ASSERT_DEBUG( iOperatorAnimation , PANIC( EStartupPanicClassMemberVariableIsNull ) );
- TInt showtime = iOperatorAnimation->ShowingTime();
- iAnimation = ETrue;
- TRACES("CStartupAppUi::ShowWelcomeAnimationL(): Operator Animation timer started");
- iAnimTimer->Start(
- showtime*KOneMilliSecondInMicroSeconds,
- showtime*KOneMilliSecondInMicroSeconds,
- TCallBack( DoStopTimingL, this ) );
- iOperatorAnimation->StartL();
- TRACES("CStartupAppUi::ShowOperatorAnimationL(): End");
- }
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-
-// ---------------------------------------------------------------------------
-// CStartupAppUi::ShowUserWelcomeNoteL()
-// ---------------------------------------------------------------------------
-void CStartupAppUi::ShowUserWelcomeNoteL()
- {
- TRACES("CStartupAppUi::ShowUserWelcomeNoteL()");
-#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION
- iUserWelcomeNote = CStartupUserWelcomeNote::NewL( *this, ClientRect(), *iMainView );
- TStartupNoteTypeInformation type = iUserWelcomeNote->NoteTypeInformation();
-#else // RD_STARTUP_ANIMATION_CUSTOMIZATION
- __ASSERT_DEBUG( iUserWelcomeNote , PANIC( EStartupPanicClassMemberVariableIsNull ) );
- TStartupNoteTypeInformation type;
- type = iUserWelcomeNote->NoteTypeInformation();
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
- if( type == EStartupImage )
- {
- // UserWelcomeNote type is EStartupImage
- // This type of note is shown fixed (KUserWelcomeNoteShowPeriodTime) time
- TRACES("CStartupAppUi::ShowUserWelcomeNoteL(): UWNTimer started (graphic)");
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
- iAnimation = EFalse;
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
- iNoteTimer->Start(
- KUserWelcomeNoteShowPeriodTime,
- KUserWelcomeNoteShowPeriodTime,
- TCallBack( DoStopTimingL, this ) );
-#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION
- iUserWelcomeNote->StartL();
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
- }
-#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION
- else if ( type == EStartupText )
- {
- TRACES("CStartupAppUi::ShowUserWelcomeNoteL(): Text UWN");
-
- iUserWelcomeNote->StartL();
-
- UpdateStartupUiPhase( EStartupUiPhaseUserWelcomeDone );
-
- DoNextStartupPhaseL( EStartupFirstBootAndRTCCheck );
- }
- else
- {
- TRACES("CStartupAppUi::ShowUserWelcomeNoteL(): No UWN");
-
- DoNextStartupPhaseL( EStartupFirstBootAndRTCCheck );
-#else // RD_STARTUP_ANIMATION_CUSTOMIZATION
- else
- {
- //if User Welcome Note type is ETextWelcomeNote nothing to do here,
- //because it is implemented with Avkon globalnote
- //or if type is EDefaultWelcomeNote no User Welcome Note is shown.
- TRACES("CStartupAppUi::ShowUserWelcomeNoteL(): No UWN to show or UWN is text");
- }
- //invoke welcome note container to show note
- iUserWelcomeNote->StartL();
-
- if( type == EStartupText || type == EStartupNoNote)
- {
- //this is called already here because timer not activated in text uwn case
- //and so DoStopTimingL() is never called and should be called here.
- StopTimingL();
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
- }
-
- TRACES("CStartupAppUi::ShowUserWelcomeNoteL(): End");
- }
-
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
-// ---------------------------------------------------------------------------
-// CStartupAppUi::WaitingTouchScreenCalibL()
-// ---------------------------------------------------------------------------
-void CStartupAppUi::WaitingTouchScreenCalibL()
- {
- TRACES("CStartupAppUi::WaitingTouchScreenCalibL()");
-#ifdef RD_SCALABLE_UI_V2
-
- if( iFirstBoot && iTouchScreenCalibSupport )
- {
- if (iTouchScreenCalibrationDone)
- {
- TRACES("CStartupAppUi::WaitingTouchScreenCalibL(): Calibration already done. Continue boot up");
- DoNextStartupPhaseL( EStartupOfflineModeQuery );
- }
- else
- {
- SendToBackground();
-
- iWelcomeAnimation->UpdateDrawInfo( EStartupDITouchScreenCalib );
- iWelcomeAnimation->DrawNow();
- TRACES("CStartupAppUi::WaitingTouchScreenCalibL(): Startup sequence halted until Touch Screen Calibration is done");
- }
- }
- else
- {
- TRACES("CStartupAppUi::WaitingTouchScreenCalibL(): Not first boot or calibration not supported. Continue boot up");
- DoNextStartupPhaseL( EStartupOfflineModeQuery );
- }
-
-#else // !RD_SCALABLE_UI_V2
- TRACES("CStartupAppUi::WaitingTouchScreenCalibL(): Calibration not supported. Continue boot up");
- DoNextStartupPhaseL( EStartupOfflineModeQuery );
-
-#endif // RD_SCALABLE_UI_V2
- TRACES("CStartupAppUi::WaitingTouchScreenCalibL(): End");
- }
-
-#ifdef RD_SCALABLE_UI_V2
-// ---------------------------------------------------------------------------
-// CStartupAppUi::TouchScreenCalibrationDoneL()
-// ---------------------------------------------------------------------------
-void CStartupAppUi::TouchScreenCalibrationDoneL()
- {
- TRACES("CStartupAppUi::TouchScreenCalibrationDoneL()");
- if (iInternalState == EStartupWaitingTouchScreenCalib)
- {
- iTouchScreenCalibrationDone = ETrue;
- BringToForeground();
- DoNextStartupPhaseL( EStartupOfflineModeQuery );
- }
- else
- {
- iTouchScreenCalibrationDone = ETrue;
- }
- TRACES("CStartupAppUi::TouchScreenCalibrationDoneL(): End");
- }
-#endif // RD_SCALABLE_UI_V2
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
-// ---------------------------------------------------------------------------
-// CStartupAppUi::CoverUIWelcomeAnimationSyncOKL()
-// ---------------------------------------------------------------------------
-void CStartupAppUi::CoverUIWelcomeAnimationSyncOKL()
- {
- TRACES("CStartupAppUi::CoverUIWelcomeAnimationSyncOKL()");
- DoNextStartupPhaseL( EStartupWaitingStartupTone );
- TRACES("CStartupAppUi::CoverUIWelcomeAnimationSyncOKL(): End");
- }
-
-// ---------------------------------------------------------------------------
-// CStartupAppUi::WaitingCoverUIWelcomeAnimationSyncL()
-// ---------------------------------------------------------------------------
-void CStartupAppUi::WaitingCoverUIWelcomeAnimationSyncL()
- {
- TRACES("CStartupAppUi::WaitingCoverUIWelcomeAnimationSyncL()");
- if (iCoverUISupported)
- {
- iStartupMediatorObserver->IssueCommand(SecondaryDisplay::ECmdStartupSync,
- SecondaryDisplay::EStartWelcomeAnimation);
- }
- else
- {
- DoNextStartupPhaseL( EStartupWaitingStartupTone );
- }
- TRACES("CStartupAppUi::WaitingCoverUIWelcomeAnimationSyncL(): End");
- }
-
-// ---------------------------------------------------------------------------
-// CStartupAppUi::CoverUIOperatorAnimationSyncOKL()
-// ---------------------------------------------------------------------------
-void CStartupAppUi::CoverUIOperatorAnimationSyncOKL()
- {
- TRACES("CStartupAppUi::CoverUIOperatorAnimationSyncOKL()");
- DoNextStartupPhaseL( EStartupShowingOperatorAnimation );
- TRACES("CStartupAppUi::CoverUIOperatorAnimationSyncOKL(): End");
- }
-
-// ---------------------------------------------------------------------------
-// CStartupAppUi::WaitingCoverUIOperatorAnimationSyncL()
-// ---------------------------------------------------------------------------
-void CStartupAppUi::WaitingCoverUIOperatorAnimationSyncL()
- {
- TRACES("CStartupAppUi::WaitingCoverUIOperatorAnimationSyncL()");
- if (iCoverUISupported)
- {
- if (iOperatorAnimation->ShowingTime())
- {
- iStartupMediatorObserver->IssueCommand(SecondaryDisplay::ECmdStartupSync,
- SecondaryDisplay::EStartOperatorAnimation );
- }
- else
- {
- DoNextStartupPhaseL( EStartupShowingOperatorAnimation );
- }
- }
- else
- {
- DoNextStartupPhaseL( EStartupShowingOperatorAnimation );
- }
- TRACES("CStartupAppUi::WaitingCoverUIOperatorAnimationSyncL(): End");
- }
-
-// ---------------------------------------------------------------------------
-// CStartupAppUi::WaitingStartupToneL()
-// ---------------------------------------------------------------------------
-void CStartupAppUi::WaitingStartupToneL()
- {
- if( iStartupTone->ToneFound() && !iStartupTone->AudioReady() )
- {
- TRACES("CStartupAppUi::WaitingStartupToneL(): Startup tone found but not ready. Waiting tone to init");
- iToneInitTimer = CPeriodic::NewL( EPriorityNormal );
- iToneInitTimer->Start( KOneMilliSecondInMicroSeconds,
- KOneMilliSecondInMicroSeconds,
- TCallBack( ToneInitTimerTimeoutL, this ) );
- }
- else
- {
- TRACES("CStartupAppUi::WaitingStartupToneL(): Audio ready");
- DoNextStartupPhaseL( EStartupShowingWelcomeAnimation );
- }
- }
-
-// ---------------------------------------------------------------------------
-// CStartupAppUi::ToneInitTimerTimeoutL()
-// ---------------------------------------------------------------------------
-TInt CStartupAppUi::ToneInitTimerTimeoutL(TAny* aObject)
- {
- STATIC_CAST( CStartupAppUi*, aObject )->StartupToneWaitStatusL(); // cast, and call non-static function
- return KErrNone;
- }
-
-// ---------------------------------------------------------------------------
-// CStartupAppUi::StartupToneWaitStatusL()
-// ---------------------------------------------------------------------------
-void CStartupAppUi::StartupToneWaitStatusL()
- {
- iToneInitWaitTime++;
- TRACES1("CStartupAppUi::StartupToneWaitStatusL(): Total tone init wait time = %d ms", iToneInitWaitTime );
- TBool audioReady = iStartupTone->AudioReady();
- if ( audioReady || (iToneInitWaitTime>=KMaxToneInitWait) )
- {
- iToneInitTimer->Cancel();
- delete iToneInitTimer;
- iToneInitTimer = NULL;
-
- TRACES1("CStartupAppUi::StartupToneWaitStatusL(): AudioReady: %d, proceed", audioReady );
- DoNextStartupPhaseL( EStartupShowingWelcomeAnimation );
- }
- }
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-
-// ---------------------------------------------------------------------------
-// CStartupAppUi::CoverUIStartupReadySyncOKL()
-// ---------------------------------------------------------------------------
-void CStartupAppUi::CoverUIStartupReadySyncOKL()
- {
- TRACES("CStartupAppUi::CoverUIStartupReadySyncOKL()");
- DoNextStartupPhaseL( EStartupStartupOK );
- TRACES("CStartupAppUi::CoverUIStartupReadySyncOKL(): End");
- }
-
-// ---------------------------------------------------------------------------
-// CStartupAppUi::WaitingCoverUIStartupReadySyncL()
-// ---------------------------------------------------------------------------
-void CStartupAppUi::WaitingCoverUIStartupReadySyncL()
- {
- TRACES("CStartupAppUi::WaitingCoverUIStartupReadySyncL()");
- if (iCoverUISupported)
- {
- iStartupMediatorObserver->IssueCommand(SecondaryDisplay::ECmdStartupSync,
- SecondaryDisplay::EStartStartupReady);
- }
- else
- {
- DoNextStartupPhaseL( EStartupStartupOK );
- }
- TRACES("CStartupAppUi::WaitingCoverUIStartupReadySyncL(): End");
- }
-
-// ---------------------------------------------------------------------------
-// CStartupAppUi::RaiseCoverUIEvent()
-// ---------------------------------------------------------------------------
-void CStartupAppUi::RaiseCoverUIEvent( TUid aCategory,
- TInt aEventId,
- const TDesC8& aData )
- {
- TRACES("CStartupAppUi::RaiseCoverUIEvent()");
- if (iCoverUISupported)
- {
- iStartupMediatorObserver->RaiseEvent( aCategory,
- aEventId,
- aData );
- }
- TRACES("CStartupAppUi::RaiseCoverUIEvent(): End");
- }
-
// ---------------------------------------------------------------------------
// CStartupAppUi::SetCriticalBlockEndedL()
// ---------------------------------------------------------------------------
@@ -1490,11 +698,8 @@
if( iCriticalBlockEnded )
{
TRACES("CStartupAppUi::WaitingCriticalBlockEndingL(): CriticalBlock has ended. Continue.");
-#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION
+
DoNextStartupPhaseL( EStartupOfflineModeQuery );
-#else // RD_STARTUP_ANIMATION_CUSTOMIZATION
- DoNextStartupPhaseL( EStartupWaitingTouchScreenCalib );
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
}
TRACES("CStartupAppUi::WaitingCriticalBlockEndingL(): End");
}
@@ -1539,7 +744,7 @@
{
TRACES("CStartupAppUi::SetEmergencyCallsOnlyL(): Entered emergency calls only state.");
- DoNextStartupPhaseL( EStartupWaitingCUIStartupReady );
+ DoNextStartupPhaseL( EStartupStartupOK );
}
TRACES("CStartupAppUi::SetEmergencyCallsOnlyL(): End");
}
@@ -1561,28 +766,6 @@
TRACES("CStartupAppUi::SwStateFatalStartupErrorL(): End");
}
-
-
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
-// ---------------------------------------------------------------------------
-// CStartupAppUi::GetOfflineModeQueryShown()
-// ---------------------------------------------------------------------------
-TBool CStartupAppUi::GetOfflineModeQueryShown()
- {
- TRACES1("CStartupAppUi::GetOfflineModeQueryShown(): iOfflineModeQueryShown == %d ", iOfflineModeQueryShown );
- return iOfflineModeQueryShown;
- }
-
-// ---------------------------------------------------------------------------
-// CStartupAppUi::SetOfflineModeQueryShown()
-// ---------------------------------------------------------------------------
-void CStartupAppUi::SetOfflineModeQueryShown(TBool aValue)
- {
- TRACES1("CStartupAppUi::SetOfflineModeQueryShown(): iOfflineModeQueryShown == %d ", iOfflineModeQueryShown );
- iOfflineModeQueryShown = aValue;
- }
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-
// ----------------------------------------------------------------------------
// CStartAppUi::DosInOfflineModeL()
// ----------------------------------------------------------------------------
@@ -1665,20 +848,23 @@
else if ( iOfflineModeSupported && DosInOfflineModeL() )
{
TRACES("CStartupAppUi::ShowOfflineModeQueryL(): Offline mode query needed");
-#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION
RProperty::Set( KPSUidStartup, KPSSplashShutdown, ESplashShutdown );
iAnimation->BringToForeground();
iMainView->DrawDeferred();
-#else // RD_STARTUP_ANIMATION_CUSTOMIZATION
- iWelcomeAnimation->UpdateDrawInfo( EStartupDIQueriesOn );
- iWelcomeAnimation->DrawNow();
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
iOfflineModeQueryShown = ETrue;
- CAknQueryDialog* dlg = new (ELeave) CAknQueryDialog( CAknQueryDialog::ENoTone );
- TRACES("CStartupAppUi::ShowOfflineModeQueryL(): Publish dialog for Secondary UI");
- dlg->PublishDialogL(SecondaryDisplay::ECmdShowOfflineQuery,
- SecondaryDisplay::KCatStartup);
- if ( dlg->ExecuteLD( R_STARTUP_OFFLINE_MODE_QUERY ) )
+ CHbDeviceMessageBoxSymbian *aMessageBox = NULL;
+ aMessageBox = CHbDeviceMessageBoxSymbian::NewL(CHbDeviceMessageBoxSymbian::EQuestion);
+ _LIT(KText, "Continue using phone in Offline mode?");
+ aMessageBox->SetTextL(KText);
+ _LIT(KAcceptText, "Yes");
+ aMessageBox->SetButtonTextL(CHbDeviceMessageBoxSymbian::EAcceptButton, KAcceptText);
+ _LIT(KRejectText, "No");
+ aMessageBox->SetButtonTextL(CHbDeviceMessageBoxSymbian::ERejectButton, KRejectText);
+ //aMessageBox->SetDismissPolicy(HbPopup::NoDismiss);
+ //define the selection button to hold user's option choice
+ CHbDeviceMessageBoxSymbian::TButtonId selection;
+ selection = aMessageBox->ExecL();
+ if ( selection == CHbDeviceMessageBoxSymbian::EAcceptButton )
{
TRACES("CStartupAppUi::ShowOfflineModeQueryL(): Offline Mode query: YES -> Boot to Offline");
reply = 1;
@@ -1712,7 +898,7 @@
{
TRACES1("CStartupAppUi::ShowOfflineModeQueryL(): KStartupBootIntoOffline set err %d", err);
}
-
+
TRACES("CStartupAppUi::ShowOfflineModeQueryL(): End");
}
@@ -1722,395 +908,13 @@
void CStartupAppUi::CancelAnimation()
{
TRACES("CStartupAppUi::CancelAnimation()");
-#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION
+
iAnimation->Cancel();
-#else // RD_STARTUP_ANIMATION_CUSTOMIZATION
- iWelcomeAnimation->CancelAnimation();
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
+
TRACES("CStartupAppUi::CancelAnimation(): End");
}
-// ---------------------------------------------------------------------------
-// CStartupAppUi::ShowCountryAndCityListsL()
-// ---------------------------------------------------------------------------
-void CStartupAppUi::ShowCountryAndCityListsL()
- {
- TRACES("CStartupAppUi::ShowCountryAndCityListsL()");
- TInt cityselected( EFalse );
- while ( !cityselected )
- {
- TRACES1("CStartupAppUi::ShowCountryAndCityListsL(): City item to focus: %d", iCounryListIndex);
- TInt cityGroupId = ShowCountryListL();
- TRACES1("CStartupAppUi::ShowCountryAndCityListsL(): City group id: %d", cityGroupId);
- if ( cityGroupId != KErrCancel )
- {
- cityselected = ShowCityListL(cityGroupId);
- }
- else
- {
- cityselected = ETrue;
- }
- }
- TRACES("CStartupAppUi::ShowCountryAndCityListsL(): End");
- }
-
-// ---------------------------------------------------------------------------
-// CStartupAppUi::ShowCountryListL()
-// ---------------------------------------------------------------------------
-TInt CStartupAppUi::ShowCountryListL()
- {
- TRACES("CStartupAppUi::ShowCountryListL()");
-
- CAknSinglePopupMenuStyleListBox* listBox =
- new(ELeave) CAknSinglePopupMenuStyleListBox;
- CleanupStack::PushL(listBox);
-
- CStartupPopupList* popupList = CStartupPopupList::NewL(listBox, R_AVKON_SOFTKEYS_SELECT_CANCEL__SELECT,
- AknPopupLayouts::EMenuGraphicHeadingWindow );
-
- CleanupStack::PushL(popupList);
-
- listBox->ConstructL(popupList, EAknListBoxSelectionList | EAknListBoxScrollBarSizeExcluded);
- listBox->CreateScrollBarFrameL( ETrue );
- listBox->ScrollBarFrame()->SetScrollBarVisibilityL( CEikScrollBarFrame::EOff,
- CEikScrollBarFrame::EAuto );
-
- listBox->ItemDrawer()->FormattedCellData()->EnableMarqueeL( ETrue );
-
- CDesCArrayFlat *items = new(ELeave)CDesCArrayFlat(1);
-
- CleanupStack::PushL(items);
-
- CTzLocalizer* tzLocalizer = CTzLocalizer::NewL();
- CleanupStack::PushL(tzLocalizer);
-
- CTzLocalizedCityGroupArray* countryList;
- countryList = tzLocalizer->GetAllCityGroupsL(CTzLocalizer::ETzAlphaNameAscending);
- CleanupStack::PushL(countryList);
-
- TRACES("CStartupAppUi::ShowCountryListL(): Create list of cities");
- for(TInt i = 0; i <countryList->Count(); i++)
- {
- CTzLocalizedCityGroup& cityGroup = countryList->At(i);
-
- // Check if the country name is blank.
- // If it is blank, ignore it. Empty name shouldn't be shown in the list.
- if(cityGroup.Name().Compare(KEmpty) != 0)
- {
- TBuf<KMaxCountryLength> countryitem;
- countryitem.Insert(0,cityGroup.Name());
- TRACES1("CStartupAppUi::ShowCountryListL(): Create country to list: %S", &countryitem);
- items->AppendL(countryitem);
- }
- }
-
- CleanupStack::PopAndDestroy( countryList );
-
- CTextListBoxModel* model=listBox->Model();
- model->SetItemTextArray(items);
- model->SetOwnershipType(ELbmOwnsItemArray);
-
- TRACES("CStartupAppUi::ShowCountryListL(): Set title");
- // Set title
- HBufC* title = StringLoader::LoadLC( R_QTN_SU_SELECT_COUNTRY );
- popupList->SetTitleL(title->Des());
- CleanupStack::PopAndDestroy( title );
-
- popupList->EnableAdaptiveFind();
- listBox->SetCurrentItemIndex(iCounryListIndex);
-
- TInt cityGroupId;
-
- if (iCoverUISupported)
- {
- TRACES("CStartupAppUi::ShowCountryListL(): Publish country list for Secondary UI");
- TPckgBuf<TInt> data( SecondaryDisplay::EShowCountryQuery );
- iStartupMediatorObserver->RaiseEvent( SecondaryDisplay::KCatStartup,
- SecondaryDisplay::EMsgStartupEvent,
- data );
- }
-
- TRACES("CStartupAppUi::ShowCountryListL(): Show the list");
- if (popupList->ExecuteLD())
- {
- iCounryListIndex = listBox->CurrentItemIndex();
- TRACES1("CStartupAppUi::ShowCountryListL(): CurrentItemIndex: %d", iCounryListIndex);
- TPtrC countryName = listBox->Model()->ItemText(iCounryListIndex);
-
- CTzLocalizedCityGroup* tzLocalizedCityGroup = tzLocalizer->FindCityGroupByNameL(countryName);
- CleanupStack::PushL(tzLocalizedCityGroup);
-
- cityGroupId = tzLocalizedCityGroup->Id();
- CleanupStack::PopAndDestroy( tzLocalizedCityGroup );
-
- TRACES1("CStartupAppUi::ShowCountryListL(): Selected country %S", &countryName);
- }
- else
- {
- TRACES("CStartupAppUi::ShowCountryListL(): Country list cancelled");
- cityGroupId = KErrCancel;
- }
-
- CleanupStack::PopAndDestroy( tzLocalizer );
- CleanupStack::Pop( items );
- CleanupStack::Pop( popupList );
- CleanupStack::PopAndDestroy( listBox );
-
- TRACES1("CStartupAppUi::ShowCountryListL(): End. Return city group id: %d", cityGroupId);
- return cityGroupId;
- }
-
-// ---------------------------------------------------------------------------
-// CStartupAppUi::ShowCityListL()
-// ---------------------------------------------------------------------------
-TBool CStartupAppUi::ShowCityListL(TUint8 cityGroupId)
- {
- TRACES("CStartupAppUi::ShowCityListL()");
-
- TBool retval( ETrue );
-
- CTzLocalizer* tzLocalizer = CTzLocalizer::NewL();
- CleanupStack::PushL(tzLocalizer);
-
- CTzLocalizedCityArray* cityList;
-
- TRACES1("CStartupAppUi::ShowCityListL(): Create list of cities in group %d", cityGroupId);
-
- cityList = tzLocalizer->GetCitiesInGroupL(cityGroupId,//cityGroup.Id(),
- CTzLocalizer::ETzAlphaNameAscending );
- CleanupStack::PushL(cityList);
-
- if ( cityList->Count() == 1 )
- {
- TRACES("CStartupAppUi::ShowCityListL(): Only one city in citygroup. This can be selected automatically.");
-
- CTzLocalizedCity& city = cityList->At(0);
-
- CTzLocalizedCity* tzLocalizedCity = tzLocalizer->FindCityByNameL(city.Name());
- CleanupStack::PushL(tzLocalizedCity);
-
- TInt timeZoneId = tzLocalizedCity->TimeZoneId();
-
- tzLocalizer->SetTimeZoneL(timeZoneId);
- tzLocalizer->SetFrequentlyUsedZoneL(*tzLocalizedCity, CTzLocalizedTimeZone::ECurrentZone);
-
- CleanupStack::PopAndDestroy( tzLocalizedCity );
- CleanupStack::PopAndDestroy( cityList );
- CleanupStack::PopAndDestroy( tzLocalizer );
-
- TRACES1("CStartupAppUi::ShowCityListL(): End, returns %d", retval);
- return retval;
- }
-
- CAknSinglePopupMenuStyleListBox* listBox =
- new(ELeave) CAknSinglePopupMenuStyleListBox;
- CleanupStack::PushL(listBox);
-
- CStartupPopupList* popupList = CStartupPopupList::NewL(listBox, R_AVKON_SOFTKEYS_SELECT_CANCEL__SELECT,
- AknPopupLayouts::EMenuGraphicHeadingWindow );
-
- CleanupStack::PushL(popupList);
-
- CDesCArrayFlat *items = new(ELeave)CDesCArrayFlat(1);
-
- CleanupStack::PushL(items);
-
- for(TInt j = 0; j < cityList->Count(); j++)
- {
- CTzLocalizedCity& city = cityList->At(j);
-
- // Check if the city name is blank.
- // If it is blank, ignore it. Empty name shouldn't be shown in the list.
- if(city.Name().Compare(KEmpty) != 0)
- {
- TBuf<KMaxCityLength> homecityitem;
- homecityitem.Insert(0,city.Name());
- TRACES1("CStartupAppUi::ShowCityListL(): Create to list: %S", &homecityitem);
- items->AppendL(homecityitem);
- }
- }
-
- listBox->ConstructL(popupList, EAknListBoxSelectionList | EAknListBoxScrollBarSizeExcluded);
- listBox->CreateScrollBarFrameL( ETrue );
- listBox->ScrollBarFrame()->SetScrollBarVisibilityL( CEikScrollBarFrame::EOff,
- CEikScrollBarFrame::EAuto );
-
- listBox->ItemDrawer()->FormattedCellData()->EnableMarqueeL( ETrue );
-
- CTextListBoxModel* model=listBox->Model();
- model->SetItemTextArray(items);
- model->SetOwnershipType(ELbmOwnsItemArray);
-
- TRACES("CStartupAppUi::ShowCityListL(): Set title");
- // Set title
- HBufC* title = StringLoader::LoadLC( R_QTN_SU_SELECT_CITY );
- popupList->SetTitleL(title->Des());
- CleanupStack::PopAndDestroy(title);
-
- popupList->EnableAdaptiveFind();
-
- if (iCoverUISupported)
- {
- TRACES("CStartupAppUi::ShowCountryListL(): Publish city list for Secondary UI");
- TPckgBuf<TInt> data( SecondaryDisplay::EShowCityQuery );
- iStartupMediatorObserver->RaiseEvent( SecondaryDisplay::KCatStartup,
- SecondaryDisplay::EMsgStartupEvent,
- data );
- }
-
- TRACES("CStartupAppUi::ShowCityListL(): Show the list");
- if (popupList->ExecuteLD())
- {
- TInt index(listBox->CurrentItemIndex());
- TRACES1("CStartupAppUi::ShowCityListL(): CurrentItemIndex: %d", index);
- TPtrC cityName = listBox->Model()->ItemText(index);
-
- CTzLocalizedCity* tzLocalizedCity = tzLocalizer->FindCityByNameL(cityName);
- CleanupStack::PushL(tzLocalizedCity);
-
- TInt timeZoneId = tzLocalizedCity->TimeZoneId();
-
- tzLocalizer->SetTimeZoneL(timeZoneId);
- tzLocalizer->SetFrequentlyUsedZoneL(*tzLocalizedCity, CTzLocalizedTimeZone::ECurrentZone);
-
- CleanupStack::PopAndDestroy(tzLocalizedCity);
-
- TRACES1("CStartupAppUi::ShowCityListL(): Selected city %S", &cityName);
- }
- else
- {
- TRACES("CStartupAppUi::ShowCityListL(): City list cancelled");
- retval = EFalse;
- }
-
- CleanupStack::Pop(items);
- CleanupStack::Pop(popupList);
- CleanupStack::PopAndDestroy(listBox);
- CleanupStack::PopAndDestroy(cityList);
- CleanupStack::PopAndDestroy(tzLocalizer);
-
-
- TRACES("CStartupAppUi::ShowCityListL(): Home city selected");
- TRACES1("CStartupAppUi::ShowCityListL(): End, return %d", retval);
- return retval;
- }
-
-// ---------------------------------------------------------------------------
-// CStartupAppUi::ShowTimeQueryL()
-// ---------------------------------------------------------------------------
-TBool CStartupAppUi::ShowTimeQueryL()
- {
- TRACES("CStartupAppUi::ShowTimeQueryL()");
-
- TTime time;
- GetDefaultTimeAndDate( time );
-
- CStartupQueryDialog* dlg = new (ELeave) CStartupQueryDialog(time, CAknQueryDialog::ENoTone);
- TRACES("CStartupAppUi::ShowTimeQueryL(): Publish dialog for Secondary UI");
- dlg->PublishDialogL(SecondaryDisplay::ECmdShowTimeQuery, SecondaryDisplay::KCatStartup);
- if( dlg->ExecuteLD( R_STARTUP_TIME_SETTING_QUERY ) )
- {
- TTime current;
- current.HomeTime();
- TDateTime cTime = current.DateTime();
- TDateTime atime = time.DateTime();
- atime.SetYear(cTime.Year());
- atime.SetMonth(cTime.Month());
- atime.SetDay(cTime.Day());
- time = atime;
-
- RTz rtz;
- User::LeaveIfError(rtz.Connect());
- User::LeaveIfError(rtz.SetHomeTime(time));
- rtz.Close();
-
- TRACES("CStartupAppUi::ShowTimeQueryL(): End, return ETrue");
- return ETrue;
- }
- else
- {
- //in case of poweroff key was pressed and shutdown is occuring
- TRACES("CStartupAppUi::ShowTimeQueryL(): End, return EFalse");
- return EFalse;
- }
- }
-
-// ---------------------------------------------------------------------------
-// CStartupAppUi::ShowDateQueryL()
-// ---------------------------------------------------------------------------
-TBool CStartupAppUi::ShowDateQueryL()
- {
- TRACES("CStartupAppUi::ShowDateQueryL()");
-
-
- CStartupQueryDialog* dlg = new (ELeave) CStartupQueryDialog(iTime, CAknQueryDialog::ENoTone);
- TRACES("CStartupAppUi::ShowDateQueryL(): Publish dialog for Secondary UI");
- dlg->PublishDialogL(SecondaryDisplay::ECmdShowDateQuery, SecondaryDisplay::KCatStartup);
-
- TInt query( R_STARTUP_DATE_SETTING_QUERY_NOBACK );
- if ( iFirstBoot )
- {
- query = R_STARTUP_DATE_SETTING_QUERY;
- }
-
- if( dlg->ExecuteLD( query ) )
- {
- TTime current;
- current.HomeTime();
- TDateTime cTime = current.DateTime();
- TDateTime atime = iTime.DateTime();
- atime.SetHour(cTime.Hour());
- atime.SetMinute(cTime.Minute());
- atime.SetSecond(cTime.Second());
- atime.SetMicroSecond(cTime.MicroSecond());
- iTime = atime;
-
- RTz rtz;
- User::LeaveIfError(rtz.Connect());
- User::LeaveIfError(rtz.SetHomeTime(iTime));
- rtz.Close();
-
- TRACES("CStartupAppUi::ShowDateQueryL(): End, return ETrue");
- return ETrue;
- }
- else
- {
- // Back key pressed. ( Or poweroff key was pressed and shutdown is occuring )
- TRACES("CStartupAppUi::ShowDateQueryL(): End, return EFalse");
- return EFalse;
- }
- }
-
-// ---------------------------------------------------------------------------
-// CStartupAppUi::GetDefaultTimeAndDate()
-// ---------------------------------------------------------------------------
-void CStartupAppUi::GetDefaultTimeAndDate( TTime& aTime )
- {
- TRACES("CStartupAppUi::GetDefaultTimeAndDate(): Get Time and Date from CenRep");
-
- CRepository* repository(NULL);
-
- TRAPD( err, repository = CRepository::NewL( KCRUidStartupConf ) );
- if ( !err )
- {
- TBuf<KTimeFormatLength> buf;
- err = repository->Get( KStartupDefaultTime, buf );
- if( !err )
- {
- err = aTime.Set(buf); // returns error if cenrep time format not valid
- }
- }
-
- if ( err )
- {
- TRACES("CStartupAppUi::GetDefaultTimeAndDate(): Failed to get valid data from CenRep. Using default");
- aTime.Set(KDefaultDateTimeValue);
- }
-
- delete repository;
- TRACES("CStartupAppUi::GetDefaultTimeAndDate(): End");
- }
// ---------------------------------------------------------------------------
// CStartupAppUi::FirstBoot()
@@ -2212,7 +1016,7 @@
}
-#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION
+
// ---------------------------------------------------------------------------
// CStartupAppUi::AnimationFinished()
// ---------------------------------------------------------------------------
@@ -2254,7 +1058,7 @@
}
else if ( iInternalState == EStartupShowingOperatorAnimation )
{
- TRAP(err, DoNextStartupPhaseL( EStartupShowingUserWelcomeNote ));
+ TRAP(err, DoNextStartupPhaseL( EStartupFirstBootAndRTCCheck));
}
if ( err != KErrNone )
@@ -2264,51 +1068,6 @@
TRACES("CStartupAppUi::AnimationFinished(): End");
}
-#else // RD_STARTUP_ANIMATION_CUSTOMIZATION
-// ---------------------------------------------------------------------------
-// CStartupAppUi::StopStartupTone()
-// ---------------------------------------------------------------------------
-void CStartupAppUi::StopStartupTone()
- {
- TRACES("CStartupAppUi::StopStartupTone()");
- if ((iStartupTone) && (iStartupTone->Playing()))
- {
- iStartupTone->Stop();
- }
- TRACES("CStartupAppUi::StopStartupTone(): End");
- }
-
-// ---------------------------------------------------------------------------
-// CStartupAppUi::StopOperatorTone()
-// ---------------------------------------------------------------------------
-void CStartupAppUi::StopOperatorTone()
- {
- TRACES("CStartupAppUi::StopOperatorTone()");
- if ((iOpStartupTone) && (iOpStartupTone->Playing()))
- {
- iOpStartupTone->Stop();
- }
- TRACES("CStartupAppUi::StopOperatorTone(): End");
- }
-
-// ---------------------------------------------------------------------------
-// CStartupAppUi::StartupTonePlaying()
-// ---------------------------------------------------------------------------
-TBool CStartupAppUi::StartupTonePlaying()
- {
- TRACES("CStartupAppUi::StartupTonePlaying()");
- return iStartupTone->Playing();
- }
-
-// ---------------------------------------------------------------------------
-// CStartupAppUi::OperatorTonePlaying()
-// ---------------------------------------------------------------------------
-TBool CStartupAppUi::OperatorTonePlaying()
- {
- TRACES("CStartupAppUi::OperatorTonePlaying()");
- return iOpStartupTone->Playing();
- }
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
// ---------------------------------------------------------------------------
// CStartupAppUi::SetCleanBoot()
@@ -2329,14 +1088,7 @@
return iSimSupported;
}
-// ----------------------------------------------------------------------------
-// CStartupAppUi::CoverUISupported()
-// ----------------------------------------------------------------------------
-TBool CStartupAppUi::CoverUISupported()
- {
- TRACES("CStartupAppUi::CoverUISupported()");
- return iCoverUISupported;
- }
+
// ---------------------------------------------------------------------------
// CStartupAppUi::DoNextStartupPhaseL( TStartupInternalState toState )
@@ -2348,14 +1100,14 @@
// 5 EStartupWaitingTouchScreenCalib
// 6 EStartupWaitingPhoneLightIdle 8, 18
// 8 EStartupOfflineModeQuery 9, 18
-// 9 EStartupWaitingCUIWelcomeAnim 10, 18
+// 9 EStartupWaitingCUIWelcomeAnim 10, 18 Removed
// 10 EStartupWaitingStartupTone 11, 18
// 11 EStartupShowingWelcomeAnimation 12, 14, 18
// 12 EStartupWaitingCUIOperatorAnim 13, 18
// 13 EStartupShowingOperatorAnimation 14, 14, 18
-// 14 EStartupShowingUserWelcomeNote 15, 18
+// 14 EStartupShowingUserWelcomeNote 15, 18 Removed
// 15 EStartupFirstBootAndRTCCheck 16, 18
-// 16 EStartupWaitingCUIStartupReady 17, 18
+// 16 EStartupWaitingCUIStartupReady 17, 18 Removed
// 17 EStartupStartupOK -
// 18 EStartupSystemFatalError -
@@ -2391,42 +1143,18 @@
{
switch( toState )
{
- case EStartupWaitingCUIStartupReady:
- iInternalState = EStartupWaitingCUIStartupReady;
- TRACES("CStartupAppUi::DoNextStartupPhaseL(): InternalState : EStartupWaitingCUIStartupReady");
- WaitingCoverUIStartupReadySyncL();
- break;
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
- case EStartupWaitingTouchScreenCalib:
- iInternalState = EStartupWaitingTouchScreenCalib;
- TRACES("CStartupAppUi::DoNextStartupPhaseL(): InternalState : EStartupWaitingTouchScreenCalib");
- WaitingTouchScreenCalibL();
- break;
- case EStartupSystemFatalError:
- SystemFatalErrorL();
+ case EStartupStartupOK:
+ iInternalState = EStartupStartupOK;
+ TRACES("CStartupAppUi::DoNextStartupPhaseL(): InternalState : EStartupStartupOK");
+ DoStartupEndPart();
break;
- default:
- __ASSERT_DEBUG(
- EFalse,
- PANIC( EStartupInvalidInternalStateChange ) );
- break;
- }
- }
- break;
- case EStartupWaitingTouchScreenCalib:
- {
- switch( toState )
- {
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
+
case EStartupOfflineModeQuery:
iInternalState = EStartupOfflineModeQuery;
TRACES("CStartupAppUi::DoNextStartupPhaseL(): InternalState : EStartupOfflineModeQuery");
ShowOfflineModeQueryL();
-#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION
+
DoNextStartupPhaseL( EStartupWaitingShowStartupAnimation );
-#else // RD_STARTUP_ANIMATION_CUSTOMIZATION
- DoNextStartupPhaseL( EStartupWaitingCUIWelcomeAnim );
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
break;
case EStartupSystemFatalError:
SystemFatalErrorL();
@@ -2443,20 +1171,13 @@
{
switch( toState )
{
-#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION
+
case EStartupWaitingShowStartupAnimation:
iInternalState = EStartupWaitingShowStartupAnimation;
TRACES("CStartupAppUi::DoNextStartupPhaseL(): InternalState : EStartupWaitingShowStartupAnimation");
WaitingStartupAnimationStartL();
break;
-#else // RD_STARTUP_ANIMATION_CUSTOMIZATION
- case EStartupWaitingCUIWelcomeAnim:
- iInternalState = EStartupWaitingCUIWelcomeAnim;
- TRACES("CStartupAppUi::DoNextStartupPhaseL(): InternalState : EStartupWaitingCUIWelcomeAnim");
- WaitingCoverUIWelcomeAnimationSyncL();
- break;
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
- case EStartupSystemFatalError:
+ case EStartupSystemFatalError:
SystemFatalErrorL();
break;
default:
@@ -2467,50 +1188,6 @@
}
}
break;
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
- case EStartupWaitingCUIWelcomeAnim:
- {
- switch( toState )
- {
- case EStartupWaitingStartupTone:
- iInternalState = EStartupWaitingStartupTone;
- TRACES("CStartupAppUi::DoNextStartupPhaseL(): InternalState : EStartupWaitingStartupTone");
- WaitingStartupToneL();
- break;
- case EStartupSystemFatalError:
- SystemFatalErrorL();
- break;
- default:
- __ASSERT_DEBUG( EFalse,
- PANIC( EStartupInvalidInternalStateChange ) );
- break;
- }
- }
- break;
- case EStartupWaitingStartupTone:
- {
- switch( toState )
- {
- case EStartupShowingWelcomeAnimation:
- iInternalState = EStartupShowingWelcomeAnimation;
- TRACES("CStartupAppUi::DoNextStartupPhaseL(): InternalState : EStartupShowingWelcomeAnimation");
- iWelcomeAnimation->UpdateDrawInfo( EStartupDIWelcomeAnimStart );
- iWelcomeAnimation->DrawNow();
- DoStartupShowWelcomeAnimationL();
- iWelcomeAnimation->UpdateDrawInfo( EStartupDIWelcomeAnimEnd );
- iWelcomeAnimation->DrawNow();
- break;
- case EStartupSystemFatalError:
- SystemFatalErrorL();
- break;
- default:
- __ASSERT_DEBUG( EFalse,
- PANIC( EStartupInvalidInternalStateChange ) );
- break;
- }
- }
- break;
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
case EStartupWaitingShowStartupAnimation:
{
switch( toState )
@@ -2535,19 +1212,11 @@
{
switch( toState )
{
-#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION
+
case EStartupShowingOperatorAnimation:
iInternalState = EStartupShowingOperatorAnimation;
TRACES("CStartupAppUi::DoNextStartupPhaseL(): InternalState: EStartupShowingOperatorAnimation");
DoStartupShowOperatorAnimationL();
-#else // RD_STARTUP_ANIMATION_CUSTOMIZATION
- case EStartupWaitingCUIOperatorAnim:
- iOperatorAnimation = CStartupOperatorAnimation::NewL( this, ClientRect());
- AddToStackL( iOperatorAnimation);
- iInternalState = EStartupWaitingCUIOperatorAnim;
- TRACES("CStartupAppUi::DoNextStartupPhaseL(): InternalState: EStartupWaitingCUIOperatorAnim");
- WaitingCoverUIOperatorAnimationSyncL();
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
break;
case EStartupFirstBootAndRTCCheck:
iInternalState = EStartupFirstBootAndRTCCheck;
@@ -2564,45 +1233,12 @@
}
}
break;
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
- case EStartupWaitingCUIOperatorAnim:
- {
- switch( toState )
- {
- case EStartupShowingOperatorAnimation:
- iInternalState = EStartupShowingOperatorAnimation;
- TRACES("CStartupAppUi::DoNextStartupPhaseL(): InternalState: EStartupShowingOperatorAnimation");
- iOperatorAnimation->UpdateDrawInfo( EStartupDIOperatorAnimStart );
- DoStartupShowOperatorAnimationL();
- break;
- case EStartupSystemFatalError:
- SystemFatalErrorL();
- break;
- default:
- __ASSERT_DEBUG( EFalse,
- PANIC( EStartupInvalidInternalStateChange ) );
- break;
- }
- }
- break;
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
case EStartupShowingOperatorAnimation:
{
switch( toState )
{
- case EStartupShowingUserWelcomeNote:
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
- iUserWelcomeNote = CStartupUserWelcomeNote::NewL( *this, ClientRect());
- AddToStackL( iUserWelcomeNote );
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
- iInternalState = EStartupShowingUserWelcomeNote;
- TRACES("CStartupAppUi::DoNextStartupPhaseL(): InternalState: EStartupShowingUserWelcomeNote");
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
- iWelcomeAnimation->UpdateDrawInfo( EStartupDIWelcomeNoteStart );
- iUserWelcomeNote->SetUserWelcomeNoteShowing(ETrue);
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
- DoStartupShowUserWelcomeNoteL();
- break;
+
+
case EStartupFirstBootAndRTCCheck:
iInternalState = EStartupFirstBootAndRTCCheck;
TRACES("CStartupAppUi::DoNextStartupPhaseL(): InternalState : EStartupFirstBootAndRTCCheck");
@@ -2618,52 +1254,15 @@
}
}
break;
- case EStartupShowingUserWelcomeNote:
- {
- switch( toState )
- {
- case EStartupFirstBootAndRTCCheck:
- iInternalState = EStartupFirstBootAndRTCCheck;
- TRACES("CStartupAppUi::DoNextStartupPhaseL(): InternalState : EStartupFirstBootAndRTCCheck");
- DoStartupFirstBootAndRTCCheckL();
- break;
- case EStartupSystemFatalError:
- SystemFatalErrorL();
- break;
- default:
- __ASSERT_DEBUG( EFalse,
- PANIC( EStartupInvalidInternalStateChange ) );
- break;
- }
- }
- break;
+
case EStartupFirstBootAndRTCCheck:
{
switch( toState )
{
- case EStartupWaitingCUIStartupReady:
- iInternalState = EStartupWaitingCUIStartupReady;
- TRACES("CStartupAppUi::DoNextStartupPhaseL(): InternalState : EStartupWaitingCUIStartupReady");
- WaitingCoverUIStartupReadySyncL();
- break;
- case EStartupSystemFatalError:
- SystemFatalErrorL();
- break;
- default:
- __ASSERT_DEBUG( EFalse,
- PANIC( EStartupInvalidInternalStateChange ) );
- break;
- }
- }
- break;
- case EStartupWaitingCUIStartupReady:
- {
- switch( toState )
- {
case EStartupStartupOK:
- iInternalState = EStartupStartupOK;
- TRACES("CStartupAppUi::DoNextStartupPhaseL(): InternalState : EStartupStartupOK");
- DoStartupEndPart();
+ iInternalState = EStartupStartupOK;
+ TRACES("CStartupAppUi::DoNextStartupPhaseL(): InternalState : EStartupInvokeAndWaitForFtu");
+ DoStartupEndPart();
break;
case EStartupSystemFatalError:
SystemFatalErrorL();
@@ -2683,7 +1282,6 @@
case EStartupOfflineModeQuery:
case EStartupShowingWelcomeAnimation:
case EStartupShowingOperatorAnimation:
- case EStartupShowingUserWelcomeNote:
case EStartupFirstBootAndRTCCheck:
case EStartupWaitingCUIStartupReady:
case EStartupStartupOK:
@@ -2739,7 +1337,7 @@
return ret_val;
}
-#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION
+
// ---------------------------------------------------------------------------
// CStartupAppUi::UpdateStartupUiPhase()
// ---------------------------------------------------------------------------
@@ -2754,5 +1352,5 @@
TRACES1("CStartupAppUi::UpdateStartupUiPhase(): KPSStartupUiPhase set err %d", err);
}
}
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
+
// End of file
--- a/startupservices/Startup/src/StartupMediatorObserver.cpp Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,182 +0,0 @@
-/*
-* Copyright (c) 2005-2008 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: Implementation of CStartupMediatorObserver class
-*
-*/
-
-
-#include <MediatorDomainUIDs.h>
-
-#include "StartupMediatorObserver.h"
-#include "StartupAppUi.h"
-#include "startupdomainpskeys.h"
-
-// ================= MEMBER FUNCTIONS =======================
-
-// ----------------------------------------------------
-// CStartupMediatorObserver::ConstructL()
-// ----------------------------------------------------
-void CStartupMediatorObserver::ConstructL()
- {
- TRACES("CStartupMediatorObserver::ConstructL()");
-
- TRACES("CStartupMediatorObserver::ConstructL(): iCommandInitiator");
- iCommandInitiator = CMediatorCommandInitiator::NewL(this);
-
- TRACES("CStartupMediatorObserver::ConstructL(): iEventProvider");
- iEventProvider = CMediatorEventProvider::NewL();
-
- TRACES("CStartupMediatorObserver::ConstructL(): Register event: EMsgWelcomeImageEvent ");
- iEventProvider->RegisterEvent( KMediatorSecondaryDisplayDomain,
- SecondaryDisplay::KCatStartup,
- SecondaryDisplay::EMsgWelcomeImageEvent,
- TVersion(0,0,0),
- ECapabilitySwEvent );
-
- TRACES("CStartupMediatorObserver::ConstructL(): Register event: EMsgStartupEvent ");
- iEventProvider->RegisterEvent( KMediatorSecondaryDisplayDomain,
- SecondaryDisplay::KCatStartup,
- SecondaryDisplay::EMsgStartupEvent,
- TVersion(0,0,0),
- ECapabilitySwEvent );
-
- TRACES("CStartupMediatorObserver::ConstructL(): End");
- }
-
-// ----------------------------------------------------
-// CStartupMediatorObserver::NewL( CStartupAppUi* aStartupAppUi )
-// ----------------------------------------------------
-CStartupMediatorObserver* CStartupMediatorObserver::NewL( CStartupAppUi* aStartupAppUi )
- {
- TRACES("CStartupMediatorObserver::NewL()");
- CStartupMediatorObserver* self = new (ELeave) CStartupMediatorObserver( aStartupAppUi );
-
- CleanupStack::PushL( self );
- self->ConstructL();
- CleanupStack::Pop(); // self
-
- TRACES("CStartupMediatorObserver::NewL(): End");
- return self;
- }
-
-// ----------------------------------------------------
-// CStartupMediatorObserver::CStartupMediatorObserver( CStartupAppUi* aStartupAppUi )
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// ----------------------------------------------------
-CStartupMediatorObserver::CStartupMediatorObserver( CStartupAppUi* aStartupAppUi ) :
- iStartupAppUi( aStartupAppUi ),
- iSyncData( NULL )
- {
- TRACES("CStartupMediatorObserver::CStartupMediatorObserver()");
- }
-
-// ----------------------------------------------------
-// CStartupMediatorObserver::~CStartupMediatorObserver()
-// ----------------------------------------------------
-CStartupMediatorObserver::~CStartupMediatorObserver()
- {
- TRACES("CStartupMediatorObserver::~CStartupMediatorObserver()");
- delete iCommandInitiator;
- delete iEventProvider;
- TRACES("CStartupMediatorObserver::~CStartupMediatorObserver(): End");
- }
-
-// ---------------------------------------------------------
-//
-// ---------------------------------------------------------
-void CStartupMediatorObserver::IssueCommand(TInt aCommandId, TInt aData)
- {
- TRACES("CStartupMediatorObserver::IssueCommand()");
- TRACES1("CStartupMediatorObserver::IssueCommand(): aCommandId %d", aCommandId);
- TRACES1("CStartupMediatorObserver::IssueCommand(): aData: %d", aData);
- if (aCommandId == SecondaryDisplay::ECmdStartupSync)
- {
- iSyncData = aData;
- }
-
- TPckgBuf<TInt> data( aData );
- iCommandInitiator->IssueCommand( KMediatorSecondaryDisplayDomain,
- SecondaryDisplay::KCatStartup,
- aCommandId,
- TVersion(0,0,0),
- data);
-
- TRACES("CStartupMediatorObserver::IssueCommand(): End");
- }
-
-// ---------------------------------------------------------
-//
-// ---------------------------------------------------------
-void CStartupMediatorObserver::CommandResponseL( TUid /*aDomain*/,
- TUid /*aCategory*/,
- TInt aCommandId,
- TInt /*aStatus*/,
- const TDesC8& /*aData*/ )
- {
- TRACES("CStartupMediatorObserver::CommandResponseL()");
- if (aCommandId == SecondaryDisplay::ECmdStartupSync)
- {
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
- if ( iSyncData == SecondaryDisplay::EStartWelcomeAnimation )
- {
- TRACES("CStartupMediatorObserver::CommandResponseL(): EStartWelcomeAnimation");
- iStartupAppUi->CoverUIWelcomeAnimationSyncOKL();
- }
- else if ( iSyncData == SecondaryDisplay::EStartOperatorAnimation )
- {
- TRACES("CStartupMediatorObserver::CommandResponseL(): EStartOperatorAnimation");
- iStartupAppUi->CoverUIOperatorAnimationSyncOKL();
- }
- else
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
- if ( iSyncData == SecondaryDisplay::EStartStartupReady )
- {
- TRACES("CStartupMediatorObserver::CommandResponseL(): EStartStartupReady");
- iStartupAppUi->CoverUIStartupReadySyncOKL();
- }
- else
- {
- TRACES("CStartupMediatorObserver::CommandResponseL(): Unsupported command");
- }
- }
-
- TRACES("CStartupMediatorObserver::CommandResponseL(): End");
- }
-
-// ---------------------------------------------------------
-//
-// ---------------------------------------------------------
-void CStartupMediatorObserver::RaiseEvent( TUid aCategory,
- TInt aEventId,
- const TDesC8& aData )
- {
- TRACES("CStartupMediatorObserver::RaiseEvent()");
- TRACES1("CStartupMediatorObserver::RaiseEvent(): domain :%d", KMediatorSecondaryDisplayDomain);
- TRACES1("CStartupMediatorObserver::RaiseEvent(): category:%d", aCategory);
- TRACES1("CStartupMediatorObserver::RaiseEvent(): event id:%d", aEventId);
- TRACES1("CStartupMediatorObserver::RaiseEvent(): data :%S", &aData);
- TInt err = iEventProvider->RaiseEvent( KMediatorSecondaryDisplayDomain,
- aCategory,
- aEventId,
- TVersion(0,0,0),
- aData );
- if ( err != KErrNone )
- {
- TRACES1("CStartupMediatorObserver::RaiseEvent(): Error raising event: err = d", err);
- }
- TRACES("CStartupMediatorObserver::RaiseEvent(): End");
- }
-
-// End of File
--- a/startupservices/Startup/src/StartupOperatorAnimation.cpp Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,206 +0,0 @@
-/*
-* Copyright (c) 2003 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:
-* This class is the container class of the CStartupOperatorAnimation.
-* Is used to show operator animation.
-*
-*/
-
-
-// INCLUDE FILES
-#include <aknappui.h>
-#include <aknnotewrappers.h>
-#include <barsread.h> //use of TResourceReader
-#include <aknbitmapanimation.h>
-#include "StartupOperatorAnimation.h"
-#include <Startup.rsg>
-#include "StartupDefines.h"
-#include "Startup.hrh"
-#include "StartupAppUi.h"
-#include <operatoranimation.rsg>
-#include <ConeResLoader.h>
-
-// CONSTANTS
-
-// Path to operator variated animation
-_LIT( KOperatorAnimationResource, "z:operatoranimation.rsc" );
-
-//Constants used in OfferKeyEventL
-const TInt KTimerDelay( 10000);
-const TInt KTimerInterval( 10000);
-
-// ================= MEMBER FUNCTIONS =======================
-
-// ---------------------------------------------------------------------------
-// CStartupOperatorAnimation::ConstructL(const TRect& aRect)
-// Symbian 2nd phase constructor can leave.
-// Need different ConstructL from base class CStartupWelcomeAnimation
-// because different animation file and time are loaded.
-// ---------------------------------------------------------------------------
-void CStartupOperatorAnimation::ConstructL(const TRect& /*aRect*/)
- {
- TRACES("CStartupOperatorAnimation::ConstructL()");
- UpdateDrawInfo( EStartupDIStart );
- CreateWindowL();
- iAnimCancelTimer = CPeriodic::NewL( EPriorityNormal );
-
- TRACES("CStartupOperatorAnimation::ConstructL(): Animation loading started");
- iAnim = CAknBitmapAnimation::NewL();
- iAnim->ExcludeAnimationFramesFromCache();
- iAnim->SetContainerWindowL( *this );
- iAnim->SetScaleModeForAnimationFrames(EAspectRatioPreservedAndUnusedSpaceRemoved);
- TResourceReader rr;
- RConeResourceLoader loader( *CEikonEnv::Static() );
-
- TParse* fp = new(ELeave) TParse();
- fp->Set(KOperatorAnimationResource, &KDC_APP_RESOURCE_DIR, NULL);
- TRACES1("CStartupOperatorAnimation::ConstructL(): Operator animation resource path: '%S'", &fp->FullName());
- TFileName name( fp->FullName() );
- delete fp;
-
- TInt fileError = loader.Open( name );
- if ( fileError == KErrNone )
- {
- CleanupClosePushL( loader );
- iCoeEnv->CreateResourceReaderLC(rr, R_OPERATOR_IMAGE);
- TRAPD(err, iAnim->ConstructFromResourceL( rr ));
- TRACES1("CStartupOperatorAnimation::ConstructL(): Operator animation: err = %d", err);
- if( err == KErrNone )
- {
- TResourceReader timeReader;
- iCoeEnv->CreateResourceReaderLC(timeReader, R_ANIM_DURATION);
- iShowingTime = timeReader.ReadInt16();
- TRACES1("CStartupOperatorAnimation::ConstructL(): Operator animation showing time: %d", iShowingTime );
- CleanupStack::PopAndDestroy(); // pop timeReader
- }
- else
- {
- iShowingTime = 0;
- TRACES("CStartupOperatorAnimation::ConstructL(): Animation loading failed");
- }
- CleanupStack::PopAndDestroy(); //pop rr
- TRACES("CStartupOperatorAnimation::ConstructL(): Animation loading ended");
- CleanupStack::PopAndDestroy(); //pop loader
- }
- else
- {
- TRACES("CStartupOperatorAnimation::ConstructL(): Resource file loading failed");
- }
-
-
- SetRect(iAvkonAppUi->ApplicationRect());
- iAnim->SetPosition( TPoint( (iAvkonAppUi->ApplicationRect().Width()/2) - (iAnim->BitmapAnimData()->Size().iWidth/2),
- (iAvkonAppUi->ApplicationRect().Height()/2) - (iAnim->BitmapAnimData()->Size().iHeight/2) ) );
- ActivateL();
-
- TRACES("CStartupOperatorAnimation::ConstructL(): End");
- }
-
-// -----------------------------------------------------------------------------
-// CStartupOperatorAnimation::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CStartupOperatorAnimation* CStartupOperatorAnimation::NewL( CStartupAppUi* aStartupAppUi,
- const TRect& aRect)
- {
- TRACES("CStartupOperatorAnimation::NewL()");
- CStartupOperatorAnimation* self = new (ELeave) CStartupOperatorAnimation( aStartupAppUi );
- CleanupStack::PushL(self);
- self->ConstructL(aRect);
- CleanupStack::Pop();
- return self;
- }
-
-// ---------------------------------------------------------
-// CStartupOperatorAnimation::CStartupOperatorAnimation()
-// ---------------------------------------------------------
-CStartupOperatorAnimation::CStartupOperatorAnimation( CStartupAppUi* aStartupAppUi ) :
- CStartupWelcomeAnimation(aStartupAppUi)
- {
- TRACES("CStartupOperatorAnimation::CStartupOperatorAnimation()");
- iShowingTime = 0;
- }
-
-// ---------------------------------------------------------------------------
-// CStartupOperatorAnimation::OfferKeyEventL(...)
-// ---------------------------------------------------------------------------
-TKeyResponse CStartupOperatorAnimation::OfferKeyEventL(const TKeyEvent& /*aKeyEvent*/, TEventCode /*aType*/)
- {
- TRACES("CStartupWelcomeAnimation::OfferKeyEventL()");
- if( iAnimationShowing && !iStartupAppUi->HiddenReset() && !iAnimationCancelled )
- {
- // Cancel animation
- UpdateDrawInfo( EStartupDIOperatorAnimCancelled );
- EndAnimation();
- TRACES("CStartupWelcomeAnimation::OfferKeyEventL(): Timer activated - before");
- iAnimCancelTimer->Start( KTimerDelay, KTimerInterval,
- TCallBack( iStartupAppUi->DoStopTimingL, iStartupAppUi ) );
- TRACES("CStartupOperatorAnimation::OfferKeyEventL(): Timer activated - after");
- iAnimationCancelled = ETrue;
- }
- else if( !iAnimationShowing && iStartupAppUi->OperatorTonePlaying())
- {
- TRACES("CStartupOperatorAnimation::OfferKeyEventL() Animation has completed but tone is still playing. Stop it.");
- iStartupAppUi->StopOperatorTone();
- }
-
- TRACES("CStartupOperatorAnimation::OfferKeyEventL(): End");
- return EKeyWasConsumed;
- }
-
-// ---------------------------------------------------------------------------
-// CStartupOperatorAnimation::DoDrawing()
-// ---------------------------------------------------------------------------
-void CStartupOperatorAnimation::DoDrawing() const
- {
-// These are the cases handled in this function
-// EStartupDIOperatorAnimStart,
-// EStartupDIOperatorAnimCancelled,
-// EStartupDIOperatorAnimEnd
-// EStartupDISystemFatalError
- TRACES("CStartupOperatorAnimation::DoDrawing()");
- TRACES1("CStartupOperatorAnimation::DoDrawing(): %d ", iDrawUpdateInfo );
- switch ( iDrawUpdateInfo )
- {
-
- case EStartupDIOperatorAnimStart:
- {
- TRACES("CStartupOperatorAnimation::DoDrawing(): EStartupDIOperatorAnimStart");
- }
- break;
- case EStartupDIOperatorAnimCancelled:
- {
- TRACES("CStartupOperatorAnimation::DoDrawing(): EStartupDIOperatorAnimCancelled");
- EndAnimation();
- TRAPD(err,iStartupAppUi->StopTimingL());
- if (err != KErrNone)
- {
- TRACES1("CStartupOperatorAnimation::DoDrawing(): StopTimingL() leaves, err = %d", err );
- }
- }
- break;
- case EStartupDIOperatorAnimEnd:
- {
- TRACES("CStartupOperatorAnimation::DoDrawing(): EStartupDIOperatorAnimEnd");
- }
- break;
- case EStartupDISystemFatalError:
- {
- }
- break;
- default:
- break;
- }
- }
--- a/startupservices/Startup/src/StartupPopupList.cpp Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,141 +0,0 @@
-/*
-* 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: This class implements a customized pop-up
-* which disables LSK if no city/country match is there
-*
-*/
-
-
-// INCLUDE FILES
-
-#include "StartupPopupList.h"
-#include <aknsfld.h>
-#include "StartupDefines.h"
-
-// ---------------------------------------------------------------------------
-// CStartupPopupList::CStartupPopupList()
-//
-// ---------------------------------------------------------------------------
-CStartupPopupList::CStartupPopupList()
- {
- }
-
-// ---------------------------------------------------------------------------
-// CStartupPopupList::~CStartupPopupList()
-// ---------------------------------------------------------------------------
-//
-CStartupPopupList::~CStartupPopupList()
- {
- }
-
-// ---------------------------------------------------------------------------
-// CStartupPopupList::NewL()
-// ---------------------------------------------------------------------------
-//
-CStartupPopupList* CStartupPopupList::NewL(
- CAknSinglePopupMenuStyleListBox* aListBox,
- TInt aCbaResource,
- AknPopupLayouts::TAknPopupLayouts aType)
- {
- TRACES("CStartupPopupList::NewL()");
- CStartupPopupList* self = new(ELeave)CStartupPopupList();
- CleanupStack::PushL(self);
- self->ConstructL(aListBox, aCbaResource, aType);
- CleanupStack::Pop(); // self
- TRACES("CStartupPopupList::NewL(): End");
- return self;
- }
-
-// ---------------------------------------------------------------------------
-// CStartupPopupList::ConstructL()
-// Symbian OS second phase constructor
-// ---------------------------------------------------------------------------
-//
- void CStartupPopupList::ConstructL(CAknSinglePopupMenuStyleListBox* aListBox,
- TInt aCbaResource,
- AknPopupLayouts::TAknPopupLayouts aType)
- {
- TRACES("CStartupPopupList::ConstructL()");
- CAknPopupList::ConstructL(aListBox, aCbaResource,aType);
- TRACES("CStartupPopupList::ConstructL(): End");
- }
-
-
-// ---------------------------------------------------------------------------
-// CStartupPopupList::ListBoxItemsChanged()
-// Handle the ListBox Change Event and Disable "Select" & "MSK" CBA Buttons
-// ---------------------------------------------------------------------------
-//
-void CStartupPopupList::ListBoxItemsChanged(CEikListBox* aListBox)
- {
- TRACES("CStartupPopupList::ListBoxItemsChanged()");
- // get the CBA button group container
- CEikButtonGroupContainer* cbaContainer = ButtonGroupContainer();
- // check if there's no match of items
- if( !aListBox->Model()->NumberOfItems() )
- {
- // Disable the 'Select' button
- cbaContainer->MakeCommandVisible(EAknSoftkeySelect,EFalse);
- // Disable the 'Middle softkey' button
- cbaContainer->MakeCommandVisibleByPosition(
- CEikButtonGroupContainer::EMiddleSoftkeyPosition,EFalse);
- }
- // check if 'Select' is disabled
- else if(!cbaContainer->IsCommandVisible(EAknSoftkeySelect))
- {
- // Enable the 'Select' button if disabled
- cbaContainer->MakeCommandVisible(EAknSoftkeySelect,ETrue);
- // Enable the 'Middle softkey' button if disabled
- cbaContainer->MakeCommandVisibleByPosition(
- CEikButtonGroupContainer::EMiddleSoftkeyPosition,ETrue);
- }
- TRACES("CStartupPopupList::ListBoxItemsChanged(): End");
- }
-
-// ---------------------------------------------------------------------------
-// CStartupPopupList::ActivateL()
-// Activate the View and add the ListBox Observer
-// ---------------------------------------------------------------------------
-//
-void CStartupPopupList::ActivateL()
- {
- TRACES("CStartupPopupList::ActivateL()");
- // call Base class ActivateL()
- CAknPopupList::ActivateL();
- // add the listbox item change observer
- ListBox()->AddItemChangeObserverL(this);
- TRACES("CStartupPopupList::ActivateL(): End");
- }
-
-// ---------------------------------------------------------------------------
-// CStartupPopupList::HandlePointerEventL()
-// ---------------------------------------------------------------------------
-//
-void CStartupPopupList::HandlePointerEventL(const TPointerEvent& aPointerEvent)
- {
- TRACES("CStartupPopupList::HandlePointerEventL()");
- TRACES1("CStartupPopupList::HandlePointerEventL: aPointerEvent.iType == %d",aPointerEvent.iType );
-
- /* Handle all taps except when EButton1Down outside of country/city query
- -> query is not cancelled and scroll bar does not remain pressed down */
- if ( Rect().Contains( aPointerEvent.iPosition ) || ( !Rect().Contains( aPointerEvent.iPosition ) &&
- aPointerEvent.iType != TPointerEvent::EButton1Down ) )
- {
- CAknPopupList::HandlePointerEventL( aPointerEvent );
- }
-
- TRACES("CStartupPopupList::HandlePointerEventL(): End");
- }
-
-// End of File
--- a/startupservices/Startup/src/StartupQueryDialog.cpp Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,104 +0,0 @@
-/*
-* Copyright (c) 2002 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:
-* This class adds send-key to acknowledge the time/date query.
-* Feature is implemented to needs of the PET-chamber in production tests.
-* More information can be found in Change Request-database.
-*
-*/
-
-
-
-// INCLUDE FILES
-#include "StartupQueryDialog.h"
-
-// ========================= MEMBER FUNCTIONS ================================
-
-// -----------------------------------------------------------------------------
-// CStartupQueryDialog::CStartupQueryDialog
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CStartupQueryDialog::CStartupQueryDialog( TTime& aTime, const TTone aTone ) :
- CAknTimeQueryDialog( aTime, aTone )
- {
- }
-
-// Destructor
-CStartupQueryDialog::~CStartupQueryDialog()
- {
- }
-
-// -----------------------------------------------------------------------------
-// CStartupQueryDialog::OfferKeyEventL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-TKeyResponse CStartupQueryDialog::OfferKeyEventL(const TKeyEvent& aKeyEvent,
- TEventCode aType)
- {
- if( aType != EEventKey )
- return EKeyWasNotConsumed;
-
- if( NeedToDismissQueryL( aKeyEvent ) )
- return EKeyWasConsumed;
- return CAknDialog::OfferKeyEventL(aKeyEvent,aType);
- }
-
-// -----------------------------------------------------------------------------
-// CStartupQueryDialog::NeedToDismissQueryL
-// Allows user to acknowledge time and date queries with the send key.
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-TBool CStartupQueryDialog::NeedToDismissQueryL(const TKeyEvent& aKeyEvent)
- {
- if (aKeyEvent.iCode == EKeyPhoneSend)
- {
- DismissQueryL();
- return ETrue;
- }
- return EFalse;
- }
-
-// -----------------------------------------------------------------------------
-// CStartupQueryDialog::DismissQueryL
-// Query is accepted if the left softkey is displayed
-// (left softkey is displayed only if there is valid data in the query).
-// Query is discarded if the left softkey is not displayed.
-// Clients can override this and implement something different.
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CStartupQueryDialog::DismissQueryL()
- {
- if (IsLeftSoftkeyVisible())
- {
- TryExitL(EEikBidOk);
- }
- }
-
-// -----------------------------------------------------------------------------
-// CStartupQueryDialog::IsLeftSoftkeyVisible
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-TBool CStartupQueryDialog::IsLeftSoftkeyVisible()
- {
- return ButtonGroupContainer().ButtonGroup()->IsCommandVisible(
- ButtonGroupContainer().ButtonGroup()->CommandId(0));
- }
-
-// End of file
--- a/startupservices/Startup/src/StartupTone.cpp Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,324 +0,0 @@
-/*
-* Copyright (c) 2005-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:
-* This class is the container class of the CStartupTone.
-* Is used to play startup tone.
-*
-*/
-
-
-// INCLUDE FILES
-#include <Profile.hrh>
-#include <centralrepository.h>
-#include <StartupDomainCRKeys.h>
-#include <ProfileEngineSDKCRKeys.h>
-#include "StartupTone.h"
-#include "StartupAppUi.h"
-#include "AudioPreference.h"
-
-#define MIN_VOLUME 0
-#define MAX_VOLUME 10000
-
-//=============================== MEMBER FUNCTIONS ============================
-// ---------------------------------------------------------
-// Constructor & destructor
-// EPOC two phased constructor
-// ---------------------------------------------------------
-//
-CStartupTone::CStartupTone( CStartupAppUi* aStartupAppUi ) :
- iTone( NULL ),
- iAudioReady( EFalse ),
- iPlaying( EFalse ),
- iStartupAppUi( aStartupAppUi ),
- iHiddenReset (EFalse ),
- iStartupWaitingForTone ( EFalse )
- {
- }
-
-CStartupTone::~CStartupTone()
- {
- TRACES("CStartupTone::~CStartupTone()");
-
- if (iTone)
- {
- if (iPlaying)
- {
- TRACES("CStartupTone::~CStartupTone(): Still playing. Stop it!");
- iTone->Stop();
- }
- delete iTone;
- iTone = NULL;
- TRACES("CStartupTone::~CStartupTone(): iTone deleted");
- }
- TRACES("CStartupTone::~CStartupTone(): End");
- }
-
-// ----------------------------------------------------
-// CStartupTone::NewL( CStartupAppUi* aStartupAppUi )
-// ----------------------------------------------------
-CStartupTone* CStartupTone::NewL( CStartupAppUi* aStartupAppUi, TToneType aToneType )
- {
- TRACES("CStartupTone::NewL()");
- CStartupTone* self = new (ELeave) CStartupTone( aStartupAppUi );
-
- CleanupStack::PushL( self );
- self->ConstructL(aToneType);
- CleanupStack::Pop(); // self
-
- TRACES("CStartupTone::NewL(): End");
- return self;
- }
-
-void CStartupTone::ConstructL(TToneType aToneType)
- {
- TRACES("CStartupTone::ConstructL()");
- // Check tone volume
- iVolume = GetRingingToneVolumeL();
- // Check if hidden reset
- iHiddenReset = iStartupAppUi->HiddenReset();
-
- iToneType = aToneType;
-
- if ((!iHiddenReset) && (iVolume))
- {
- TPath tonePath;
- TRACES("CStartupTone::ConstructL(): Get tone path from CenRep");
-
- CRepository* repository(NULL);
-
- TRAPD( err, repository = CRepository::NewL( KCRUidStartupConf ) );
- if ( err != KErrNone )
- {
- TRACES("CStartupTone::ConstructL(): End, ERROR: Failed to get startup tone path");
- return;
- }
- if (iToneType == EStartupTone)
- {
- TRACES("CStartupTone::ConstructL(): Tone type EStartupTone");
- err = repository->Get( KStartupTonePath, tonePath );
- }
- else
- {
- TRACES("CStartupTone::ConstructL(): Tone type EStartupOpTone");
- err = repository->Get( KStartupOperatorTonePath, tonePath );
- }
- delete repository;
-
- TRACES2("CStartupTone::ConstructL(): Get tone to play. err = %d, Path = '%S'", err, &tonePath );
-
- RFs fs;
- err = fs.Connect();
- TFindFile findExe(fs);
- err = findExe.FindByPath( tonePath, NULL );
- fs.Close();
- if (err != KErrNone)
- {
- TRACES1("CStartupTone::ConstructL(): Tone to play: Cannot find tone. err = %d", err);
- }
- else
- {
- TRACES("CStartupTone::ConstructL(): Tone found");
- iTone = CMdaAudioPlayerUtility::NewFilePlayerL(
- tonePath,
- *this, KAudioPriorityPhonePower,
- TMdaPriorityPreference( KAudioPrefDefaultTone));
- }
- }
- }
-// ---------------------------------------------------------
-// void CStartupTone::Play()
-// ---------------------------------------------------------
-//
-
-TInt CStartupTone::Play()
- {
- TRACES("CStartupTone::Play()");
- TRACES1("CStartupTone::Play(): Tone type: %d", iToneType);
- if (iAudioReady && !iHiddenReset && iVolume && iTone)
- {
- TRACES("CStartupTone::Play(): Audio ready. Play tone");
- iVolume = Max( MIN_VOLUME, Min( iVolume, MAX_VOLUME ) );
- iTone->SetVolume(iVolume);
- iTone->Play();
- iPlaying = ETrue;
- TRACES("CStartupTone::Play(): End, return KErrNone");
- return KErrNone;
- }
- else
- {
- TRACES("CStartupTone::Play(): Audio not ready, hidden reset, volume null or tone is not initialized. Unable to play tone.");
- TRACES1("CStartupTone::Play(): Audio ready: %d",iAudioReady);
- TRACES1("CStartupTone::Play(): Hidden reset: %d",iHiddenReset);
- TRACES1("CStartupTone::Play(): Volume: %d",iVolume);
- TRACES1("CStartupTone::Play(): Tone: %d",iTone);
- TRACES("CStartupTone::Play(): End, return KErrNotReady");
- return KErrNotReady;
- }
- }
-
-// ---------------------------------------------------------
-// void CStartupTone::Stop()
-// ---------------------------------------------------------
-//
-
-void CStartupTone::Stop()
- {
- TRACES("CStartupTone::Stop()");
- if (iTone)
- {
- TRACES("CStartupTone::Stop(): Stop the tone");
- iPlaying=EFalse;
- iTone->Stop();
- iToneType = EStartupNoTone;
- MapcPlayComplete(KErrNone);
- }
- TRACES("CStartupTone::Stop(): End");
- }
-
-// ---------------------------------------------------------
-// CStartupTone::ToneFound()
-// ---------------------------------------------------------
-//
-TBool CStartupTone::ToneFound()
- {
- TBool status(EFalse);
- if(iTone)
- status = ETrue;
- return status;
- }
-
-// ---------------------------------------------------------
-// CStartupTone::AudioReady()
-// ---------------------------------------------------------
-//
-TBool CStartupTone::AudioReady()
- {
- return iAudioReady;
- }
-
-// ---------------------------------------------------------
-// void CStartupTone::MapcInitComplete(TInt aError, const TTimeIntervalMicroSeconds& /*aDuration*/)
-// ---------------------------------------------------------
-//
-void CStartupTone::MapcInitComplete(TInt aError, const TTimeIntervalMicroSeconds& /*aDuration*/)
- {
- TRACES("CStartupTone::MapcInitComplete()");
- if (aError == KErrNone)
- {
- TRACES("CStartupTone::MapcInitComplete(): Ready to play startup tone");
- iAudioReady = ETrue;
- }
- else
- {
- TRACES("CStartupTone::MapcInitComplete(): Unable to play startup tone");
- }
- TRACES("CStartupTone::MapcInitComplete(): End");
- }
-
-// ---------------------------------------------------------
-// void CStartupTone::MapcPlayComplete(TInt /*aError*/)
-// ---------------------------------------------------------
-//
-void CStartupTone::MapcPlayComplete(TInt /*aError*/)
- {
- TRACES("StartupTone::MapcPlayComplete()");
- iPlaying=EFalse;
- if (iStartupWaitingForTone)
- {
- TRACES("StartupTone::MapcPlayComplete(): Startup waiting ");
- TRAPD(err, iStartupAppUi->ContinueStartupAfterToneL(iToneType));
- if (err != KErrNone)
- {
- TRACES1("CStartupTone::MapcPlayComplete(): ContinueStartupAfterToneL() leaves, err = %d", err );
- }
- }
- TRACES("StartupTone::MapcPlayComplete(): End");
- }
-
-// ---------------------------------------------------------
-// TBool CStartupTone::Playing()
-// ---------------------------------------------------------
-//
-TBool CStartupTone::Playing()
- {
- TRACES1("StartupTone::Playing(): Return %d", iPlaying );
- return iPlaying;
- }
-
-// ---------------------------------------------------------
-// void CStartupTone::StartupWaiting()
-// ---------------------------------------------------------
-//
-void CStartupTone::StartupWaiting(TBool aValue)
- {
- TRACES1("StartupTone::StartupWaiting(): aValue == %d", aValue);
- iStartupWaitingForTone = aValue;
- }
-
-// ----------------------------------------------------------
-// CStartupTone::GetRingingToneVolumeL
-// Startup tone volume is always 4 but when ringing type is
-// silent or ringing volume is 0 or 1 startup tone is silent.
-// ----------------------------------------------------------
-//
-TInt CStartupTone::GetRingingToneVolumeL()
- {
- TRACES("StartupTone::GetRingingToneVolumeL()");
-
- TInt retval(0);
- TInt ringingType(EProfileRingingTypeSilent);
- TInt ringingVol(0);
-
- CRepository* repository(NULL);
-
- TRAPD( err, repository = CRepository::NewL( KCRUidProfileEngine ) );
- if ( err != KErrNone )
- {
- TRACES("StartupTone::GetRingingToneVolumeL(): End, ERROR, Cannot connect to CenRep");
- return 0;
- }
-
- User::LeaveIfError( repository->Get( KProEngActiveRingingVolume, ringingVol ));
- User::LeaveIfError( repository->Get( KProEngActiveRingingType, ringingType ));
- delete repository;
-
- TRACES1("StartupTone::GetRingingToneVolumeL(): Ringing tone volume = %d", ringingVol);
- TRACES1("StartupTone::GetRingingToneVolumeL(): Ringing type = %d", ringingType);
-
- if ((ringingType != EProfileRingingTypeSilent) &&
- (ringingVol != 0) &&
- (ringingVol != EProfileRingingVolumeLevel1))
- {
- TRACES("StartupTone::GetRingingToneVolumeL(): Get startup tone volume");
- TInt defaultRingingVol;
- CRepository* repository(NULL);
-
- TRAPD( err, repository = CRepository::NewL( KCRUidStartupConf ) );
- if ( err != KErrNone )
- {
- return 0;
- }
-
- User::LeaveIfError( repository->Get( KStartupToneVolume, defaultRingingVol ));
- delete repository;
-
- ringingVol = defaultRingingVol;
- retval = ringingVol;
- }
-
- TRACES1("StartupTone::GetRingingToneVolumeL(): End, return %d", retval);
- return retval;
- }
-
-// End of File
--- a/startupservices/Startup/src/StartupUserWelcomeNote.cpp Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,587 +0,0 @@
-/*
-* Copyright (c) 2002 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:
-* This class is the container class of the CStartupUerWelcomeNote.
-* Is user for showing user selected picture, text or predefined animation.
-*
-*/
-
-
-
-// INCLUDE FILES
-#include <aknappui.h>
-#include <coemain.h>
-#include <aknnotewrappers.h>
-#include <AknGlobalNote.h>
-#include <barsread.h> //use of TResourceReader
-#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION
-#include "startupview.h"
-#else // RD_STARTUP_ANIMATION_CUSTOMIZATION
-#include <StarterClient.h> //used for RemoveSplashScreen
-#include <startup.mbg>
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-#include <e32const.h>
-#include "StartupUserWelcomeNote.h"
-#include <startup.rsg>
-#include <centralrepository.h>
-#include <startupdomaincrkeys.h>
-#include "StartupDefines.h"
-#include "startup.hrh"
-#include "StartupAppUi.h"
-#include "aknSDData.h"
-
-// ================= MEMBER FUNCTIONS =======================
-
-// ---------------------------------------------------------------------------
-// CStartupUseWelcomeNote::ConstructL
-//
-// ---------------------------------------------------------------------------
-void CStartupUserWelcomeNote::ConstructL( const TRect& /*aRect*/ )
- {
- TRACES("CStartupUserWelcomeNote::ConstructL()");
-
- iAvkonAppUi->StatusPane()->MakeVisible( EFalse );
-
-#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION
-
- SetContainerWindowL( iView );
- iView.SetComponent( *this );
-
-#else // RD_STARTUP_ANIMATION_CUSTOMIZATION
-
- CreateWindowL();
- iNoteCancelTimer = CPeriodic::NewL( EPriorityNormal );
-
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-
- iBitmap = new(ELeave) CFbsBitmap();
-
- //get user selected userwelcomenotetype from Central Repository
- TInt err = GetUserWelcomeNoteTypeInfo();
-
- if( err != KErrNone )
- {
- TRACES("CStartupUserWelcomeNote::ConstructL(): Show default note");
- //in error case default uwn (no note) is shown
- iNoteType = EDefaultWelcomeNote;
- iNoteDefaultVariationType = EStartupUWNDefaultNoNote;
- }
- //Do some preparations for showing user welcome note later
- //This makes the starting to show much more quicker
- switch ( iNoteType )
- {
- case ETextWelcomeNote:
- {
- TRACES("CStartupUserWelcomeNote::ConstructL(): iNoteType == ETextWelcomeNote");
- }
- break;
- case EImageWelcomeNote:
- {
- TRACES("CStartupUserWelcomeNote::ConstructL(): iNoteType == EImageWelcomeNote");
- TInt errorCode = iBitmap->Load( TPtrC(iNotePath.Ptr()) );
- TRACES1("CStartupUserWelcomeNote::ConstructL(): Load returned %d", errorCode);
- if(iStartupAppUi.CoverUISupported())
- {
- SecondaryDisplay::TWelcomeImage data(TPtrC(iNotePath.Ptr()));
- SecondaryDisplay::TWelcomeImagePckg Pckg( data );
- iStartupAppUi.RaiseCoverUIEvent( SecondaryDisplay::KCatStartup,
- SecondaryDisplay::EMsgWelcomeImageEvent,
- Pckg);
- }
- }
- break;
- default:
- {
- TRACES("CStartupUserWelcomeNote::ConstructL(): iNoteType == EDefaultWelcomeNote");
- switch ( iNoteDefaultVariationType )
- {
- case EStartupUWNDefaultOperatorGraphic:
- {
- TRACES("CStartupUserWelcomeNote::ConstructL(): iNoteDefaultVariationType == EStartupUWNDefaultOperatorGraphic");
- iBitmap->Load( TPtrC(iNoteOperPath.Ptr()) );
- if(iStartupAppUi.CoverUISupported())
- {
- SecondaryDisplay::TWelcomeImage data(TPtrC(iNoteOperPath.Ptr()));
- SecondaryDisplay::TWelcomeImagePckg Pckg( data );
- iStartupAppUi.RaiseCoverUIEvent( SecondaryDisplay::KCatStartup,
- SecondaryDisplay::EMsgWelcomeImageEvent,
- Pckg);
- }
- }
- break;
- case EStartupUWNDefaultOperatorText:
- case EStartupUWNDefaultNoNote:
- default:
- {
- //nothing preparation
- TRACES("CStartupUserWelcomeNote::ConstructL(): iNoteDefaultVariationType == EStartupUWNDefaultOperatorText or EStartupUWNDefaultNoNote");
- }
- break;
- }
- }
- break;
- }
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
- //get information for draw-function
- iWelcomeNoteType = NoteTypeInformation();
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-
- SetRect(iAvkonAppUi->ApplicationRect());
- ActivateL();
- TRACES("CStartupUserWelcomeNote::ConstructL(): End");
- }
-
-// -----------------------------------------------------------------------------
-// CStartupUserWelcomeNote::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CStartupUserWelcomeNote* CStartupUserWelcomeNote::NewL(
- CStartupAppUi& aStartupAppUi,
- const TRect& aRect
-#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION
- , CStartupView& aView
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
- )
- {
- TRACES("CStartupUserWelcomeNote::NewL()");
-#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION
- CStartupUserWelcomeNote* self = new (ELeave) CStartupUserWelcomeNote( aStartupAppUi, aView );
-#else // RD_STARTUP_ANIMATION_CUSTOMIZATION
- CStartupUserWelcomeNote* self = new (ELeave) CStartupUserWelcomeNote( aStartupAppUi );
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
- CleanupStack::PushL(self);
- self->ConstructL(aRect);
- CleanupStack::Pop();
- TRACES("CStartupUserWelcomeNote::NewL(): End");
- return self;
- }
-
-// ---------------------------------------------------------
-// CStartupUserWelcomeNote::CStartupUserWelcomeNote()
-// ---------------------------------------------------------
-CStartupUserWelcomeNote::CStartupUserWelcomeNote( CStartupAppUi& aStartupAppUi
-#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION
- , CStartupView& aView
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
- ) :
-#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION
- iView( aView ),
-#else // RD_STARTUP_ANIMATION_CUSTOMIZATION
- iSplashScreenRemoved( EFalse ),
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
- iStartupAppUi( aStartupAppUi )
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
- , iUserWelcomeNoteShowing( EFalse ),
- iUserWelcomeNoteCancelled( EFalse)
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
- {
- TRACES("CStartupUserWelcomeNote::CStartupUserWelcomeNote()");
- }
-
-// ---------------------------------------------------------------------------
-// CStartupUseWelcomeNote::StartL()
-// ---------------------------------------------------------------------------
-void CStartupUserWelcomeNote::StartL()
- {
- TRACES("CStartupUserWelcomeNote::StartL()");
- switch ( iNoteType )
- {
- case ETextWelcomeNote:
- {
- TRACES("CStartupUserWelcomeNote::StartL(): ETextWelcomeNote");
- ShowInformationNoteWrapperL();
- }
- break;
- case EImageWelcomeNote:
- {
- TRACES("CStartupUserWelcomeNote::StartL(): EImageWelcomeNote");
- DrawImageWelcomeNote();
- }
- break;
- default:
- {
- TRACES("CStartupUserWelcomeNote::StartL(): default");
- switch ( iNoteDefaultVariationType )
- {
- case EStartupUWNDefaultOperatorGraphic:
- {
- TRACES("CStartupUserWelcomeNote::StartL(): EStartupUWNDefaultOperatorGraphic");
- DrawImageWelcomeNote();
- }
- break;
- case EStartupUWNDefaultOperatorText:
- {
- TRACES("CStartupUserWelcomeNote::StartL(): EStartupUWNDefaultOperatorText");
- ShowInformationNoteWrapperL();
- }
- break;
- case EStartupUWNDefaultNoNote:
- default:
- TRACES("CStartupUserWelcomeNote::StartL(): EStartupUWNDefaultNoNote");
- break;
- }
- }
- break;
- }
- ControlEnv()->WsSession().Flush(); // force draw of the context
- TRACES("CStartupUserWelcomeNote::StartL(): End");
- }
-
-// ---------------------------------------------------------
-// CStartupUserWelcomeNote::NoteTypeInformation()
-// ---------------------------------------------------------
-TStartupNoteTypeInformation CStartupUserWelcomeNote::NoteTypeInformation()
- {
- TRACES("CStartupUserWelcomeNote::NoteTypeInformation()");
- if( iNoteType == EDefaultWelcomeNote && iNoteDefaultVariationType == EStartupUWNDefaultNoNote )
- {
- TRACES("CStartupUserWelcomeNote::NoteTypeInformation(): End, return EStartupNoNote");
- return EStartupNoNote;
- }
- else if( ( iNoteType == ETextWelcomeNote ) ||
- ( iNoteType == EDefaultWelcomeNote &&
- iNoteDefaultVariationType == EStartupUWNDefaultOperatorText ) )
- {
- TRACES("CStartupUserWelcomeNote::NoteTypeInformation(): End, return EStartupText");
- return EStartupText;
- }
- else if( ( iNoteType == EImageWelcomeNote ) ||
- ( iNoteType == EDefaultWelcomeNote &&
- iNoteDefaultVariationType == EStartupUWNDefaultOperatorGraphic ) )
- {
- TRACES("CStartupUserWelcomeNote::NoteTypeInformation(): End, return EStartupImage");
- return EStartupImage;
- }
- else
- {
- __ASSERT_DEBUG( EFalse, PANIC( EStartupNeverShouldBeHere ) );
- return EStartupNoNote;
- }
- }
-
-// ---------------------------------------------------------------------------
-// CStartupUseWelcomeNote::DrawImageWelcomeNote
-// ---------------------------------------------------------------------------
-void CStartupUserWelcomeNote::DrawImageWelcomeNote()
- {
- TRACES("CStartupUserWelcomeNote::DrawImageWelcomeNote()");
-
- CWindowGc& gc = SystemGc();
- TInt xDelta=0; // for x coordinates
- TInt yDelta=0; // for y coordinates
- TSize bmpSizeInPixels = iBitmap->SizeInPixels();
- //center image to the center of the screen
- TRect rect = Rect();
- xDelta=( rect.Width() - bmpSizeInPixels.iWidth ) / 2;
- yDelta=( rect.Height() - bmpSizeInPixels.iHeight ) / 2;
- TPoint pos = TPoint( xDelta , yDelta ); // displacement vector
- ActivateGc();
- Window().Invalidate( rect );
- Window().BeginRedraw( rect );
- gc.BitBlt( pos, iBitmap ); // CWindowGc member function
- DrawUtils::ClearBetweenRects(gc, Rect(), TRect(pos,bmpSizeInPixels));
- Window().EndRedraw();
- DeactivateGc();
- TRACES("CStartupUserWelcomeNote::DrawImageWelcomeNote(): End");
- }
-
-// ---------------------------------------------------------------------------
-// CStartupUseWelcomeNote::~CStartupUserWelcomeNote()
-// ---------------------------------------------------------------------------
-CStartupUserWelcomeNote::~CStartupUserWelcomeNote()
- {
- TRACES("CStartupUserWelcomeNote::~CStartupUserWelcomeNote()");
-
- delete iBitmap;
-
-#ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION
- iView.RemoveComponent();
-#else // RD_STARTUP_ANIMATION_CUSTOMIZATION
- if( iNoteCancelTimer )
- {
- iNoteCancelTimer->Cancel();
- }
- delete iNoteCancelTimer;
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-
- TRACES("CStartupUserWelcomeNote::~CStartupUserWelcomeNote(): End");
- }
-
-// ---------------------------------------------------------------------------
-// CStartupUserWelcomeNote::ComponentControl(TInt aIndex)
-// ---------------------------------------------------------------------------
-CCoeControl* CStartupUserWelcomeNote::ComponentControl(TInt /*aIndex*/) const
- {
- return NULL;
- }
-
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
-// ---------------------------------------------------------------------------
-// CStartupUserWelcomeNote::DrawBlankScreen() const
-// ---------------------------------------------------------------------------
-void CStartupUserWelcomeNote::DrawBlankScreen() const
- {
- TRACES("CStartupUserWelcomeNote::DrawBlankScreen()");
- CWindowGc& gc = SystemGc();
- TRect rect = Rect();
- gc.SetPenStyle(CGraphicsContext::ENullPen);
- gc.SetBrushColor(KRgbWhite);
- gc.SetBrushStyle(CGraphicsContext::ESolidBrush);
- gc.DrawRect(rect);
- ControlEnv()->WsSession().Flush(); // force draw of the context
- TRACES("CStartupUserWelcomeNote::DrawBlankScreen(): End");
- }
-
-// ---------------------------------------------------------------------------
-// CStartupUserWelcomeNote::HandleControlEventL(...)
-// ---------------------------------------------------------------------------
-void CStartupUserWelcomeNote::HandleControlEventL(
- CCoeControl* /*aControl*/,
- TCoeEvent /*aEventType*/)
- {
- //pure virtual from MCoeControlObserver
- TRACES("CStartupUserWelcomeNote::HandleControlEventL()");
- }
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-
-// ---------------------------------------------------------------------------
-// CStartupUserWelcomeNote::UserWelcomeNoteType()
-// ---------------------------------------------------------------------------
-TStartupWelcomeNoteType CStartupUserWelcomeNote::UserWelcomeNoteType()
- {
- return ( iNoteType );
- }
-
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
-// ---------------------------------------------------------------------------
-// CStartupUserWelcomeNote::OfferKeyEventL(...)
-// ---------------------------------------------------------------------------
-TKeyResponse CStartupUserWelcomeNote::OfferKeyEventL(const TKeyEvent& /*aKeyEvent*/, TEventCode /*aType*/)
- {
- TRACES("CStartupUserWelcomeNote::OfferKeyEventL()");
- if( iUserWelcomeNoteShowing && !iStartupAppUi.HiddenReset() && !iUserWelcomeNoteCancelled )
- {
- // Cancel UWN
- TRACES("CStartupUserWelcomeNote::OfferKeyEventL(): Timer activated - before");
- iNoteCancelTimer->Start( 10000, 10000,
- TCallBack( iStartupAppUi.DoStopTimingL, &iStartupAppUi ) );
- iUserWelcomeNoteCancelled = ETrue;
- TRACES("CStartupUserWelcomeNote::OfferKeyEventL(): Timer activated - after");
- }
- TRACES("CStartupUserWelcomeNote::OfferKeyEventL(): End");
- return EKeyWasConsumed;
- }
-
-// ---------------------------------------------------------------------------
-// CStartupUserWelcomeNote::CancelNoteCancelTimer()
-// ---------------------------------------------------------------------------
-void CStartupUserWelcomeNote::CancelNoteCancelTimer()
- {
- TRACES("CStartupUserWelcomeNote::CancelNoteCancelTimer()");
- iNoteCancelTimer->Cancel();
- TRACES("CStartupUserWelcomeNote::CancelNoteCancelTimer(): End");
- }
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-
-// ---------------------------------------------------------------------------
-// CStartupUserWelcomeNote::GetUserWelcomeNoteTypeInfo()
-// ---------------------------------------------------------------------------
-TInt CStartupUserWelcomeNote::GetUserWelcomeNoteTypeInfo()
- {
- TRACES("CStartupUserWelcomeNote::GetUserWelcomeNoteTypeInfo()");
- TInt err( KErrGeneral );
-
- CRepository* repository(NULL);
-
- TRAP( err, repository = CRepository::NewL( KCRUidStartupConf ) );
- if ( err == KErrNone )
- {
- TInt type;
- TBuf<KStartupTBufMaxLength> atext;
- TBuf<KStartupTBufMaxLength> apath;
- TBuf<KStartupTBufMaxLength> aoperatortext;
- TBuf<KStartupTBufMaxLength> aoperatorpath;
-
- err = repository->Get( KStartupWelcomeNoteType, type );
- TRACES2("CStartupUserWelcomeNote::GetUserWelcomeNoteTypeInfo(): Welcome note type = %d, err = %d", type, err );
-
- err = repository->Get( KStartupWelcomeNoteText, atext );
- TRACES2("CStartupUserWelcomeNote::GetUserWelcomeNoteTypeInfo(): Welcome note text = '%S', err = %d", &atext, err );
-
- err = repository->Get( KStartupWelcomeNoteImage, apath );
- TRACES2("CStartupUserWelcomeNote::GetUserWelcomeNoteTypeInfo(): Welcome note image path = '%S', err = %d", &apath, err);
-
- switch (type)
- {
- case EDefaultWelcomeNote:
- {
- TRACES("CStartupUserWelcomeNote::GetUserWelcomeNoteTypeInfo(): EDefaultWelcomeNote");
- iNoteType = EDefaultWelcomeNote;
-
- repository->Get( KStartupOperatorNoteImage, aoperatorpath );
- TRACES1("CStartupUserWelcomeNote::GetUserWelcomeNoteTypeInfo(): Operator image path: '%S'", &aoperatorpath);
- TInt opImageStatus = CheckImage(aoperatorpath);
- TRACES1("CStartupUserWelcomeNote::GetUserWelcomeNoteTypeInfo(): Operator image status: %d", opImageStatus);
-
- repository->Get( KStartupOperatorNoteText, aoperatortext );
- TRACES1("CStartupUserWelcomeNote::GetUserWelcomeNoteTypeInfo(): Operator text: '%S'", &aoperatortext);
-
- if ( opImageStatus == KErrNone )
- {
- TRACES("CStartupUserWelcomeNote::GetUserWelcomeNoteTypeInfo(): Default note type is EStartupUWNDefaultOperatorGraphic");
- iNoteDefaultVariationType = EStartupUWNDefaultOperatorGraphic;
- }
- else if ( aoperatortext.Length() > 0 )
- {
- TRACES("CStartupUserWelcomeNote::GetUserWelcomeNoteTypeInfo(): Default note type is EStartupUWNDefaultOperatorText");
- iNoteDefaultVariationType = EStartupUWNDefaultOperatorText;
- }
- else
- {
- TRACES("CStartupUserWelcomeNote::GetUserWelcomeNoteTypeInfo(): Default note type is EStartupUWNDefaultNoNote");
- iNoteDefaultVariationType = EStartupUWNDefaultNoNote;
- }
- }
- break;
- case ETextWelcomeNote:
- {
- TRACES("CStartupUserWelcomeNote::GetUserWelcomeNoteTypeInfo(): ETextWelcomeNote");
- iNoteType = ETextWelcomeNote;
- }
- break;
- case EImageWelcomeNote:
- {
- TRACES("CStartupUserWelcomeNote::GetUserWelcomeNoteTypeInfo(): EImageWelcomeNote");
- if (CheckImage(apath) != KErrNone)
- {
- //in error case default uwn (no note) is shown
- iNoteType = EDefaultWelcomeNote;
- iNoteDefaultVariationType = EStartupUWNDefaultNoNote;
- }
- else
- {
- iNoteType = EImageWelcomeNote;
- }
- }
- break;
- default:
- {
- TRACES("CStartupUserWelcomeNote::GetUserWelcomeNoteTypeInfo(): default");
- delete repository;
- TRACES("CStartupUserWelcomeNote::GetUserWelcomeNoteTypeInfo(): End, return KErrNotFound");
- return KErrNotFound;
- }
- }
- iNoteText = atext;
- iNotePath = apath;
- iNoteOperText = aoperatortext;
- iNoteOperPath = aoperatorpath;
- }
-
- delete repository;
- TRACES("CStartupUserWelcomeNote::GetUserWelcomeNoteTypeInfo(): End, return KErrNone");
- return KErrNone;
- }
-
-// ---------------------------------------------------------------------------
-// CStartupUserWelcomeNote::ShowInformationNoteWrapperL()
-// ---------------------------------------------------------------------------
-void CStartupUserWelcomeNote::ShowInformationNoteWrapperL()
- {
- TRACES("CStartupUserWelcomeNote::ShowInformationNoteWrapperL()");
- TRACES1("CStartupUserWelcomeNote::ShowInformationNoteWrapperL(): Note type = %d", iNoteDefaultVariationType);
-
- TRequestStatus status;
- CAknGlobalNote* note = CAknGlobalNote::NewLC();
- if ( iNoteDefaultVariationType == EStartupUWNDefaultOperatorText)
- {
- // Set secondary display data if necessary
- if ( iStartupAppUi.CoverUISupported() )
- {
- SecondaryDisplay::TWelcomeNotePckg pckg(TPtrC(iNoteOperText.Ptr()));
- CAknSDData* sd = CAknSDData::NewL(SecondaryDisplay::KCatStartup, SecondaryDisplay::ECmdShowWelcomeNote, pckg);
- note->SetSecondaryDisplayData(sd); // ownership to notifier client
- }
- TRACES1("CStartupUserWelcomeNote::ShowInformationNoteWrapperL(): Operator text is '%S'", &iNoteOperText);
- note->ShowNoteL( status, EAknGlobalTextNote, TPtrC(iNoteOperText.Ptr()) );
- }
- else
- {
- // Set secondary display data if necessary
- if ( iStartupAppUi.CoverUISupported() )
- {
- SecondaryDisplay::TWelcomeNotePckg pckg(TPtrC(iNoteText.Ptr()));
- CAknSDData* sd = CAknSDData::NewL(SecondaryDisplay::KCatStartup, SecondaryDisplay::ECmdShowWelcomeNote, pckg);
- note->SetSecondaryDisplayData(sd); // ownership to notifier client
- }
- TRACES1("CStartupUserWelcomeNote::ShowInformationNoteWrapperL(): Welcome text is '%S'", &iNoteText);
- note->ShowNoteL( status, EAknGlobalTextNote, TPtrC(iNoteText.Ptr()) );
- }
- User::WaitForRequest( status );
- CleanupStack::PopAndDestroy(); // note
- TRACES("CStartupUserWelcomeNote::ShowInformationNoteWrapperL(): End");
- }
-
-#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION
-// ---------------------------------------------------------------------------
-// CStartupUserWelcomeNote::SetUserWelcomeNoteShowing(...)
-// ---------------------------------------------------------------------------
-void CStartupUserWelcomeNote::SetUserWelcomeNoteShowing(TBool aValue)
- {
- TRACES1("CStartupUserWelcomeNote::SetUserWelcomeNoteShowing(): aValue = %d", aValue);
- iUserWelcomeNoteShowing = aValue;
- }
-#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION
-
-// ---------------------------------------------------------------------------
-// CStartupUserWelcomeNote::SetUserWelcomeNoteShowing(...)
-// ---------------------------------------------------------------------------
-TInt CStartupUserWelcomeNote::CheckImage( const TDesC& aPath)
- {
- TRACES("CStartupUserWelcomeNote::CheckImage()");
- // Check if given welcome image is available
- RFile welcomeimage;
- TInt err( KErrNone );
- RFs fs;
-
- // Connect to file server
- err = fs.Connect();
- if (err != KErrNone)
- {
- TRACES("CStartupUserWelcomeNote::CheckImage(): Unable to connect to file server. Do not show welcome image.");
- fs.Close();
- TRACES1("CStartupUserWelcomeNote::CheckImage(): End, return %d", err);
- return err;
- }
-
- // Open welcome image
- err = welcomeimage.Open(fs, aPath, EFileRead);
- if (err != KErrNone)
- {
- TRACES("CStartupUserWelcomeNote::CheckImage(): Welcome image does not exists. Do not try to show it.");
- welcomeimage.Close();
- fs.Close();
- TRACES1("CStartupUserWelcomeNote::CheckImage(): End, return %d", err);
- return err;
- }
-
- welcomeimage.Close();
- fs.Close();
- TRACES1("CStartupUserWelcomeNote::CheckImage(): End, return %d", err);
- return err;
- }
-
-// End of File
-
--- a/startupservices/Startup/src/StartupWelcomeAnimation.cpp Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,520 +0,0 @@
-/*
-* Copyright (c) 2002 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:
-* This class is the container class of the CStartupWelcomeAnimation.
-* Is used to show welcome animation.
-*
-*/
-
-
-// INCLUDE FILES
-#include <aknappui.h>
-#include <aknnotewrappers.h>
-#include <barsread.h> //use of TResourceReader
-#include <StarterClient.h> //used for RemoveSplashScreen
-#include <aknbitmapanimation.h>
-#include <startup.mbg>
-#include "StartupWelcomeAnimation.h"
-#include <Startup.rsg>
-#include "StartupDefines.h"
-#include "Startup.hrh"
-#include "StartupAppUi.h"
-#include <akniconutils.h>
-
-// CONSTANTS
-const TInt KStartupAnimationShowingDuration( 4200 );//4.2 sec
-
-// ================= MEMBER FUNCTIONS =======================
-
-// ---------------------------------------------------------------------------
-// CStartupWelcomeAnimation::ConstructL(const TRect& aRect)
-// Symbian 2nd phase constructor can leave.
-// ---------------------------------------------------------------------------
-void CStartupWelcomeAnimation::ConstructL(const TRect& /*aRect*/)
- {
- TRACES("CStartupWelcomeAnimation::ConstructL()");
- iShowingTime = KStartupAnimationShowingDuration;
- UpdateDrawInfo( EStartupDIStart );
-
- iAvkonAppUi->StatusPane()->MakeVisible(EFalse);
- CreateWindowL();
- iAnimCancelTimer = CPeriodic::NewL( EPriorityNormal );
-
- TRACES("CStartupWelcomeAnimation::ConstructL(): animation loading started");
- iAnim = CAknBitmapAnimation::NewL();
- iAnim->ExcludeAnimationFramesFromCache();
- iAnim->SetContainerWindowL( *this );
- iAnim->SetScaleModeForAnimationFrames(EAspectRatioPreservedAndUnusedSpaceRemoved);
- TResourceReader rr;
- iCoeEnv->CreateResourceReaderLC(rr, R_ANIM_IMAGE);
- TRAPD(err, iAnim->ConstructFromResourceL( rr ))
- if (err != KErrNone)
- {
- TRACES1("CStartupWelcomeAnimation::ConstructL(): ConstructFromResourceL() leaves, err = %d", err );
- }
- CleanupStack::PopAndDestroy();
-
- SetRect(iAvkonAppUi->ApplicationRect()); // Results in a call to SizeChanged()
- ActivateL();
-
- TRACES("CStartupWelcomeAnimation::ConstructL(): animation loading ended");
- TRACES("CStartupWelcomeAnimation::ConstructL(): End");
- }
-
-// -----------------------------------------------------------------------------
-// CStartupWelcomeAnimation::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CStartupWelcomeAnimation* CStartupWelcomeAnimation::NewL( CStartupAppUi* aStartupAppUi,
- const TRect& aRect)
- {
- TRACES("CStartupWelcomeAnimation::NewL()");
- CStartupWelcomeAnimation* self = new (ELeave) CStartupWelcomeAnimation( aStartupAppUi );
- CleanupStack::PushL(self);
- self->ConstructL(aRect);
- CleanupStack::Pop();
- TRACES("CStartupWelcomeAnimation::NewL(): End");
- return self;
- }
-
-// ---------------------------------------------------------
-// CStartupWelcomeAnimation::CStartupWelcomeAnimation()
-// ---------------------------------------------------------
-CStartupWelcomeAnimation::CStartupWelcomeAnimation( CStartupAppUi* aStartupAppUi ) :
- iBackgroundBitmap( NULL ),
- iSplashScreenRemoved( EFalse ),
- iStartupAppUi( aStartupAppUi ),
- iAnimationShowing( EFalse ),
- iAnimationCancelled ( EFalse )
- {
- TRACES("CStartupWelcomeAnimation::CStartupWelcomeAnimation()");
- }
-
-// ---------------------------------------------------------------------------
-// CStartupWelcomeAnimation::StartL()
-// ---------------------------------------------------------------------------
-void CStartupWelcomeAnimation::StartL()
- {
- TRACES("CStartupWelcomeAnimation::StartL()");
- iAnim->StartAnimationL();
- ControlEnv()->WsSession().Flush(); // force draw of the context
- TRACES("CStartupWelcomeAnimation::StartL(): End");
- }
-
-// ---------------------------------------------------------------------------
-// CStartupWelcomeAnimation::UpdateDrawInfo( TStartupDrawInfo aValue )
-// ---------------------------------------------------------------------------
-void CStartupWelcomeAnimation::UpdateDrawInfo( TStartupDrawInfo aValue )
- {
- TRACES("CStartupWelcomeAnimation::UpdateDrawInfo()");
- TRACES1("CStartupWelcomeAnimation::UpdateDrawInfo(): Value %d", aValue);
- //Prevent state change if already EStartupDISystemFatalError
- if( iDrawUpdateInfo == EStartupDISystemFatalError )
- {
- TRACES("CStartupWelcomeAnimation::UpdateDrawInfo(): End, preventing state change - EStartupDISystemFatalError");
- return;
- }
-
- iDrawUpdateInfo = aValue;
- TRACES("CStartupWelcomeAnimation::UpdateDrawInfo(): End");
- }
-
-// ---------------------------------------------------------------------------
-// CStartupWelcomeAnimation::DoDrawingL()
-// ---------------------------------------------------------------------------
-void CStartupWelcomeAnimation::DoDrawingL() const
- {
- TRACES("CStartupWelcomeAnimation::DoDrawingL()");
- switch ( iDrawUpdateInfo )
- {
- case EStartupDIStart:
- {
- TRACES("CStartupWelcomeAnimation::DoDrawingL(): EStartupDIStart");
- DrawBlankScreen(); // clears screen after code query emergency call
- }
- break;
- case EStartupDITouchScreenCalib:
- {
- TRACES("CStartupWelcomeAnimation::DoDrawingL(): EStartupDITouchScreenCalib");
- RemoveSplashScreen();
- DrawBlankScreen();
- }
- break;
- case EStartupDICharging:
- {
- TRACES("CStartupWelcomeAnimation::DoDrawingL(): EStartupDICharging");
- RemoveSplashScreen();
- DrawBlankScreen();
- }
- break;
- case EStartupDIAlarm:
- {
- TRACES("CStartupWelcomeAnimation::DoDrawingL(): EStartupDIAlarm");
- RemoveSplashScreen();
- DrawBlankScreen();
- }
- break;
- case EStartupDIHiddenReset:
- {
- TRACES("CStartupWelcomeAnimation::DoDrawingL(): EStartupDIHiddenReset");
- RemoveSplashScreen();
- DrawBlankScreen();
- }
- break;
- case EStartupDIQueriesOn:
- {
- TRACES("CStartupWelcomeAnimation::DoDrawingL(): EStartupDIQueriesOn");
- RemoveSplashScreen();
- DrawBlankScreen();
- }
- break;
- case EStartupDIQueriesOff:
- {
- TRACES("CStartupWelcomeAnimation::DoDrawingL(): EStartupDIQueriesOff");
- }
- break;
- case EStartupDIWelcomeAnimStart:
- {
- TRACES("CStartupWelcomeAnimation::DoDrawingL(): EStartupDIWelcomeAnimStart");
- RemoveSplashScreen();
- DrawBlankScreen();
- }
- break;
- case EStartupDIWelcomeAnimCancelled:
- {
- TRACES("CStartupWelcomeAnimation::DoDrawingL(): EStartupDIWelcomeAnimCancelled");
- }
- break;
- case EStartupDIWelcomeAnimEnd:
- {
- TRACES("CStartupWelcomeAnimation::DoDrawingL(): EStartupDIWelcomeAnimEnd");
- DrawBlankScreen();
- }
- break;
- case EStartupDIOperatorAnimEnd:
- {
- TRACES("CStartupWelcomeAnimation::DoDrawingL(): EStartupDIOperatorAnimEnd");
- DrawBlankScreen();
- }
- break;
- case EStartupDICityTimeDateQueries:
- {
- TRACES("CStartupWelcomeAnimation::DoDrawingL(): EStartupDICityTimeDateQueries");
- DrawBlankScreen();
- }
- break;
- case EStartupDIEnd:
- {
- TRACES("CStartupWelcomeAnimation::DoDrawingL(): EStartupDIEnd");
- }
- break;
- case EStartupDISystemFatalError:
- {
- TRACES("CStartupWelcomeAnimation::DoDrawingL(): EStartupDISystemFatalError");
- }
- break;
- default:
- TRACES("CStartupWelcomeAnimation::DoDrawingL(): default");
- break;
- }
- TRACES("CStartupWelcomeAnimation::DoDrawingL(): End");
- }
-
-// ---------------------------------------------------------
-// CStartupWelcomeAnimation::RemoveSplashScreen()
-// ---------------------------------------------------------
-void CStartupWelcomeAnimation::RemoveSplashScreen() const
- {
- TRACES("CStartupWelcomeAnimation::RemoveSplashScreen()");
- //Remove SplashScreen
- if( !iSplashScreenRemoved )
- {
- TRACES("CStartupWelcomeAnimation::RemoveSplashScreen(): Connect to Starter");
- RStarterSession startersession;
- if( startersession.Connect() == KErrNone )
- {
- TRACES("CStartupWelcomeAnimation::RemoveSplashScreen(): Connected to Starter");
- startersession.EndSplashScreen();
- TRACES("CStartupWelcomeAnimation::RemoveSplashScreen(): Splash screen removed");
- startersession.Close();
- }
- }
- TRACES("CStartupWelcomeAnimation::RemoveSplashScreen(): End");
- }
-
-// ---------------------------------------------------------------------------
-// CStartupWelcomeAnimation::~CStartupWelcomeAnimation()
-// ---------------------------------------------------------------------------
-CStartupWelcomeAnimation::~CStartupWelcomeAnimation()
- {
- TRACES("CStartupWelcomeAnimation::~CStartupWelcomeAnimation()");
-
- if( iAnim )
- {
- if( iAnimationShowing )
- {
- iAnim->CancelAnimation();
- TRACES("CStartupWelcomeAnimation::~CStartupWelcomeAnimation(): Animation cancelled");
- }
- }
- delete iAnim;
- TRACES("CStartupWelcomeAnimation::~CStartupWelcomeAnimation(): iAnim deleted");
-
- if (iBackgroundBitmap)
- {
- delete iBackgroundBitmap;
- TRACES("CStartupWelcomeAnimation::~CStartupWelcomeAnimation(): iBackgroundBitmap deleted");
- }
-
- if( iAnimCancelTimer )
- {
- iAnimCancelTimer->Cancel();
- TRACES("CStartupWelcomeAnimation::~CStartupWelcomeAnimation(): Timer cancelled");
- }
- delete iAnimCancelTimer;
- TRACES("CStartupWelcomeAnimation::~CStartupWelcomeAnimation(): iAnimCancelTimer deleted");
-
- TRACES("CStartupWelcomeAnimation::~CStartupWelcomeAnimation(): End");
- }
-
-// ---------------------------------------------------------------------------
-// CStartupWelcomeAnimation::ComponentControl(TInt aIndex)
-// ---------------------------------------------------------------------------
-CCoeControl* CStartupWelcomeAnimation::ComponentControl(TInt aIndex) const
- {
- switch ( aIndex )
- {
- case 0:
- {
- return iAnim;
- }
- default:
- {
- return NULL;
- }
- }
- }
-
-// ---------------------------------------------------------------------------
-// CStartupWelcomeAnimation::CountComponentControls()
-// ---------------------------------------------------------------------------
-TInt CStartupWelcomeAnimation::CountComponentControls() const
- {
- return iAnim ? 1 : 0; // return nbr of controls inside this container
- }
-
-// ---------------------------------------------------------------------------
-// CStartupWelcomeAnimation::Draw(const TRect& aRect) const
-// ---------------------------------------------------------------------------
-void CStartupWelcomeAnimation::Draw(const TRect& /*aRect*/ ) const
- {
- TRACES("CStartupWelcomeAnimation::Draw()");
- TRAPD(err, DoDrawingL());
- if (err != KErrNone)
- {
- TRACES1("CStartupWelcomeAnimation::Draw(): DoDrawingL() leaves, err = %d", err );
- }
- }
-
-// ---------------------------------------------------------------------------
-// CStartupWelcomeAnimation::DrawBlankScreen() const
-// ---------------------------------------------------------------------------
-void CStartupWelcomeAnimation::DrawBlankScreen() const
- {
- TRACES("CStartupWelcomeAnimation::DrawBlankScreen()");
- CWindowGc& gc = SystemGc();
- TRect rect = Rect();
- gc.SetPenStyle(CGraphicsContext::ENullPen);
- gc.SetBrushColor(KRgbWhite);
- gc.SetBrushStyle(CGraphicsContext::ESolidBrush);
- gc.DrawRect(rect);
- ControlEnv()->WsSession().Flush(); // force draw of the context
- TRACES("CStartupWelcomeAnimation::DrawBlankScreen(): End");
- }
-
-// ---------------------------------------------------------------------------
-// CStartupWelcomeAnimation::ShowingTime()
-// ---------------------------------------------------------------------------
-TInt CStartupWelcomeAnimation::ShowingTime()
- {
- TRACES1("CStartupWelcomeAnimation::ShowingTime(): time = %d", iShowingTime);
- return iShowingTime;
- }
-
-// ---------------------------------------------------------------------------
-// CStartupWelcomeAnimation::SizeChanged()
-// ---------------------------------------------------------------------------
-void CStartupWelcomeAnimation::SizeChanged()
- {
- if( iAnim )
- {
- iAnim->SetRect(Rect());
- iAnim->SetPosition( TPoint(
- (iAvkonAppUi->ApplicationRect().Width()/2) - (iAnim->BitmapAnimData()->Size().iWidth/2),
- (iAvkonAppUi->ApplicationRect().Height()/2) - (iAnim->BitmapAnimData()->Size().iHeight/2)
- ) );
- }
- }
-
-// ---------------------------------------------------------------------------
-// CStartupWelcomeAnimation::EndAnimation()
-// ---------------------------------------------------------------------------
-void CStartupWelcomeAnimation::EndAnimation() const
- {
- TRACES("CStartupWelcomeAnimation::EndAnimation()");
- if( iAnim )
- {
- TRACES("CStartupWelcomeAnimation::EndAnimation(): Cancel animation");
- iAnim->CancelAnimation();
- }
- TRACES("CStartupWelcomeAnimation::EndAnimation(): End");
- }
-
-// ---------------------------------------------------------------------------
-// CStartupWelcomeAnimation::HandleControlEventL(...)
-// ---------------------------------------------------------------------------
-void CStartupWelcomeAnimation::HandleControlEventL(
- CCoeControl* /*aControl*/,
- TCoeEvent /*aEventType*/)
- {
- //pure virtual from MCoeControlObserver
- TRACES("CStartupWelcomeAnimation::HandleControlEventL()");
- }
-
-// ---------------------------------------------------------------------------
-// CStartupWelcomeAnimation::HandlePointerEventL(...)
-// ---------------------------------------------------------------------------
-void CStartupWelcomeAnimation::HandlePointerEventL(const TPointerEvent& aPointerEvent)
- {
- TRACES("CStartupWelcomeAnimation::HandlePointerEventL()");
- if (AknLayoutUtils::PenEnabled())
- {
- TRACES1("CStartupWelcomeAnimation::HandlePointerEventL: aPointerEvent.iType == %d",aPointerEvent.iType );
- switch (aPointerEvent.iType)
- {
- case TPointerEvent::EButton1Down:
- CancelAnimation();
- break;
-
- default:
- break;
- }
- }
- TRACES("CStartupWelcomeAnimation::HandlePointerEventL(): End");
- }
-
-// ---------------------------------------------------------------------------
-// CStartupWelcomeAnimation::OfferKeyEventL(...)
-// ---------------------------------------------------------------------------
-TKeyResponse CStartupWelcomeAnimation::OfferKeyEventL( const TKeyEvent& aKeyEvent, TEventCode /*aType*/ )
- {
- TRACES("CStartupWelcomeAnimation::OfferKeyEventL()");
- TRACES1("CStartupWelcomeAnimation::OfferKeyEventL(): aKeyEvent.iCode == %d",aKeyEvent.iCode);
- TRACES1("CStartupWelcomeAnimation::OfferKeyEventL(): aKeyEvent.iScanCode == %d",aKeyEvent.iScanCode);
- TRACES1("CStartupWelcomeAnimation::OfferKeyEventL(): iAnimationShowing == %d",iAnimationShowing);
- TRACES1("CStartupWelcomeAnimation::OfferKeyEventL(): iAnimationCancelled == %d",iAnimationCancelled);
-
- if ( iStartupAppUi->GetOfflineModeQueryShown() )
- {
- TRACES("CStartupWelcomeAnimation::OfferKeyEventL(): Key event from offline mode query");
- // first key event comes from Offline Mode Query
- iStartupAppUi->SetOfflineModeQueryShown( EFalse );
- }
- else
- {
- if( iAnimationShowing && !iStartupAppUi->HiddenReset() && !iAnimationCancelled )
- {
- if (aKeyEvent.iScanCode == EStdKeyNkpAsterisk || aKeyEvent.iScanCode == 0x2a)
- {
- TRACES("CStartupWelcomeAnimation::OfferKeyEventL(): Set clean boot");
- iStartupAppUi->SetCleanBoot();
- }
- // Cancel animation
- CancelAnimation();
- }
- else if( !iAnimationShowing && iStartupAppUi->StartupTonePlaying())
- {
- TRACES("CStartupWelcomeAnimation::OfferKeyEventL() Animation has completed but tone is still playing. Stop it.");
- iStartupAppUi->StopStartupTone();
- }
- }
-
- TRACES("CStartupWelcomeAnimation::OfferKeyEventL(): End");
- return EKeyWasConsumed;
- }
-
-// ---------------------------------------------------------------------------
-// CStartupWelcomeAnimation::CancelAnimCancelTimer()
-// ---------------------------------------------------------------------------
-void CStartupWelcomeAnimation::CancelAnimCancelTimer()
- {
- TRACES("CStartupWelcomeAnimation::CancelAnimCancelTimer()");
- iAnimCancelTimer->Cancel();
- TRACES("CStartupWelcomeAnimation::CancelAnimCancelTimer(): End");
- }
-
-// ---------------------------------------------------------------------------
-// CStartupWelcomeAnimation::CancelAnimation(...)
-// ---------------------------------------------------------------------------
-void CStartupWelcomeAnimation::CancelAnimation()
- {
- TRACES("CStartupWelcomeAnimation::CancelAnimation()");
- if( iAnimationShowing && !iStartupAppUi->HiddenReset() && !iAnimationCancelled )
- {
- UpdateDrawInfo( EStartupDIWelcomeAnimCancelled );
- EndAnimation();
- TRACES("CStartupWelcomeAnimation::CancelAnimation(): Timer activated - before");
- iAnimCancelTimer->Start( 10000, 10000,
- TCallBack( iStartupAppUi->DoStopTimingL, iStartupAppUi ) );
- TRACES("CStartupWelcomeAnimation::CancelAnimation(): Timer activated - after");
- iAnimationCancelled = ETrue;
- }
- TRACES("CStartupWelcomeAnimation::CancelAnimation(): End");
- }
-
-// ---------------------------------------------------------------------------
-// CStartupWelcomeAnimation::IsAnimationCancelled(...)
-// ---------------------------------------------------------------------------
-TBool CStartupWelcomeAnimation::IsAnimationCancelled()
- {
- TRACES1("CStartupWelcomeAnimation::IsAnimationCancelled(): iAnimationCancelled: %d", iAnimationCancelled);
- return iAnimationCancelled;
- }
-
-// ---------------------------------------------------------------------------
-// CStartupWelcomeAnimation::SetAnimationShowing(...)
-// ---------------------------------------------------------------------------
-void CStartupWelcomeAnimation::SetAnimationShowing(TBool aValue)
- {
- TRACES("CStartupWelcomeAnimation::SetAnimationShowing()");
- TRACES2("CStartupWelcomeAnimation::SetAnimationShowing(): iAnimationShowing changed from %d to %d",iAnimationShowing, aValue );
- iAnimationShowing = aValue;
- }
-
-// ---------------------------------------------------------------------------
-// CStartupWelcomeAnimation::HandleResourceChange(...)
-// ---------------------------------------------------------------------------
-void CStartupWelcomeAnimation::HandleResourceChange(TInt aType)
- {
- CCoeControl::HandleResourceChange(aType);
- if(aType==KEikDynamicLayoutVariantSwitch)
- {
- SetRect(iAvkonAppUi->ApplicationRect()); // update rect
- }
- }
-
-
-
-// End of File
--- a/startupservices/Startup/src/startupview.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/startupservices/Startup/src/startupview.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007,2008 Nokia Corporation and/or its subsidiary(-ies).
+* 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"
@@ -16,9 +16,7 @@
*/
-#include <aknappui.h>
-#include <AknsBasicBackgroundControlContext.h> // Skin support
-#include <AknsDrawUtils.h> // Skin support
+
#include "startupview.h"
#include "StartupDefines.h"
@@ -52,7 +50,7 @@
CStartupView::~CStartupView()
{
TRACES("CStartupView::~CStartupView()");
- delete iBgContext;
+
TRACES("CStartupView::~CStartupView(): End");
}
@@ -94,12 +92,6 @@
void CStartupView::SizeChanged()
{
TRACES("CStartupView::SizeChanged()");
-
- if (iBgContext)
- {
- iBgContext->SetRect( Rect() );
- }
-
if ( iComponent )
{
iComponent->SetRect( Rect() );
@@ -144,23 +136,15 @@
TRACES("CStartupView::Draw()");
CWindowGc& gc = SystemGc();
- MAknsSkinInstance* skin = AknsUtils::SkinInstance();
+
gc.SetPenStyle( CGraphicsContext::ENullPen );
gc.SetBrushStyle( CGraphicsContext::ESolidBrush );
-
- // Draw skin background
- if ( !AknsDrawUtils::Background( skin, iBgContext, gc, aRect ) )
- {
- // If Skin is missing, clear with default color
- gc.SetClippingRect( aRect );
- gc.SetBrushColor( KRgbWhite );
- gc.Clear();
- }
-
+ gc.SetClippingRect( aRect );
+ gc.SetBrushColor( KRgbWhite );
+ gc.Clear();
TRACES("CStartupView::Draw(): End");
}
-
// ---------------------------------------------------------------------------
// CStartupView::CStartupView
//
@@ -172,7 +156,6 @@
TRACES("CStartupView::CStartupView(): End");
}
-
// ---------------------------------------------------------------------------
// CStartupView::ConstructL
//
@@ -181,18 +164,11 @@
void CStartupView::ConstructL( const TRect& aRect )
{
TRACES("CStartupView::ConstructL()");
-
- iAvkonAppUi->StatusPane()->MakeVisible( EFalse );
CreateWindowL();
SetRect( aRect );
// Create background drawing context
TRect bgrect(aRect.Size());
- iBgContext = CAknsBasicBackgroundControlContext::NewL(
- KAknsIIDQsnBgScreen,
- bgrect, EFalse );
-
ActivateL();
-
TRACES("CStartupView::ConstructL(): End");
}
--- a/startupservices/Startup/syserrcmd/group/syserrcmd.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/startupservices/Startup/syserrcmd/group/syserrcmd.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* 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"
@@ -34,11 +34,11 @@
MW_LAYER_SYSTEMINCLUDE
-LIBRARY aknnotify.lib
LIBRARY efsrv.lib
LIBRARY euser.lib
LIBRARY featmgr.lib
LIBRARY commonengine.lib
+LIBRARY hbwidgets.lib
// >>> uncomment to enable function-level tracing
@@ -49,3 +49,5 @@
// MACRO __SSM_TRACE_INTO_FILE__
// LIBRARY flogger.lib
// <<< uncomment to direct trace output to file
+
+SMPSAFE
--- a/startupservices/Startup/syserrcmd/inc/syserrcmd.h Thu Aug 19 10:05:08 2010 +0300
+++ b/startupservices/Startup/syserrcmd/inc/syserrcmd.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* 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"
@@ -22,7 +22,7 @@
#include <e32base.h>
#include <ssm/ssmcustomcommand.h>
-class CAknGlobalNote;
+
/**
* A custom command for displaying a note about unrecoverable
@@ -79,11 +79,6 @@
// Custom command environment. Not owned. Set in Initialize.
CSsmCustomCommandEnv* iEnv;
- /** Global note object used to show the notification on UI. Own */
- CAknGlobalNote* iNote;
-
- /** Global note id for cancelling the note. */
- TInt iNoteId;
};
#endif // SYSERRCMD_H
--- a/startupservices/Startup/syserrcmd/src/syserrcmd.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/startupservices/Startup/syserrcmd/src/syserrcmd.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* 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"
@@ -19,73 +19,15 @@
#include "syserrcmd.h"
#include "trace.h"
-#include <AknGlobalNote.h>
-#include <aknSDData.h>
+
#include <data_caging_path_literals.hrh>
#include <featmgr.h>
-#include <secondarydisplay/SecondaryDisplayStartupAPI.h>
+#include <SecondaryDisplay/SecondaryDisplayStartupAPI.h>
#include <StringLoader.h>
#include <startup.rsg>
#include <stringresourcereader.h>
-
-
-_LIT( KResourceFileName, "Z:startup.rsc" );
-
-// ======== LOCAL FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-// CSysErrorPlugin::GetResourceFileNameLC
-//
-// ---------------------------------------------------------------------------
-//
-static TFileName* GetResourceFileNameLC()
- {
- FUNC_LOG;
-
- // TParse uses a lot of stack space, so allocate it from heap.
- TParse* parse = new ( ELeave ) TParse;
- CleanupDeletePushL( parse );
- TInt errorCode = parse->Set( KResourceFileName,
- &KDC_APP_RESOURCE_DIR,
- NULL );
- ERROR( errorCode, "parse::Set() failed with error code %d" );
- User::LeaveIfError( errorCode );
-
- TFileName* filename = new ( ELeave ) TFileName( parse->FullName() );
-
- CleanupStack::PopAndDestroy( parse );
- CleanupDeletePushL( filename );
+#include <hb/hbwidgets/hbdevicemessageboxsymbian.h>
- INFO_1( "Resource file name: %S", filename );
-
- return filename;
- }
-
-// ---------------------------------------------------------------------------
-// CSysErrorPlugin::GetFatalErrorStringLC
-//
-// ---------------------------------------------------------------------------
-//
-static TBool IsCoverUiSupported()
- {
- FUNC_LOG;
-
- // If this fails, default to false.
- TRAPD( errorCode, FeatureManager::InitializeLibL() );
- ERROR( errorCode, "Failed to initialize FeatureManager" );
-
- TBool retVal = EFalse;
- if ( errorCode == KErrNone &&
- FeatureManager::FeatureSupported( KFeatureIdCoverDisplay ) )
- {
- retVal = ETrue;
- }
-
- FeatureManager::UnInitializeLib();
-
- INFO_1( "CoverUiSupported = %d", retVal );
- return retVal;
- }
// ======== MEMBER FUNCTIONS ========
@@ -107,8 +49,6 @@
CSysErrCmd::~CSysErrCmd()
{
FUNC_LOG;
-
- delete iNote;
}
@@ -148,15 +88,6 @@
{
FUNC_LOG;
- if ( iNote )
- {
- TInt errorCode( KErrNone );
- TRAP( errorCode, iNote->CancelNoteL( iNoteId ) );
- ERROR( errorCode, "Failed to cancel global note" );
- }
-
- delete iNote; // Note must be deleted here! Otherwise it doesn't complete
- iNote = NULL; // request with KErrCancel and Cancel() gets stuck.
}
@@ -187,34 +118,14 @@
//
void CSysErrCmd::DoExecuteL( TRequestStatus& aRequest )
{
- delete iNote;
- iNote = NULL;
- iNote = CAknGlobalNote::NewL();
-
- if ( IsCoverUiSupported() )
- {
- CAknSDData* sdData = CAknSDData::NewL(
- SecondaryDisplay::KCatStartup,
- SecondaryDisplay::ECmdShowErrorNote,
- TPckgBuf<TInt>( SecondaryDisplay::EContactService ) );
-
- // ownership to notifier client
- iNote->SetSecondaryDisplayData( sdData );
- }
-
- TFileName* filename = GetResourceFileNameLC();
-
- RFs& fs = const_cast<RFs&>( iEnv->Rfs() );
-
- CStringResourceReader* resReader = CStringResourceReader::NewLC( *filename,
- fs );
-
- TPtrC errorStr( resReader->ReadResourceString(
- R_SU_SELFTEST_FAILED_NOTE_TEXT ) );
-
- iNoteId = iNote->ShowNoteL( aRequest, EAknGlobalPermanentNote, errorStr );
-
- CleanupStack::PopAndDestroy( resReader );
- CleanupStack::PopAndDestroy( filename );
-
+ aRequest = NULL;
+ //Hb device message box implementation for global permanent note goes here
+ CHbDeviceMessageBoxSymbian *aMessageBox = NULL;
+ aMessageBox = CHbDeviceMessageBoxSymbian::NewL(CHbDeviceMessageBoxSymbian::EWarning);
+ _LIT(KText, "Self-test failed. Contact retailer.");
+ aMessageBox->SetTextL(KText);
+ aMessageBox -> SetDismissPolicy(0);
+ aMessageBox -> SetTimeout(0);
+ aMessageBox->ExecL();
+ delete aMessageBox;
}
--- a/startupservices/Startup/syserrcmd/tsrc/group/bld.inf Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/*
-* 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:
-* Build information file for sf/mw/appsupport/startupservices/Startup/syserrcmd/tsrc tests.
-*
-*/
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_TESTEXPORTS
-
-PRJ_TESTMMPFILES
-#include "../syserrcmdtest/group/bld.inf"
-#include "../syserrcmdtestsstub/group/bld.inf"
-
--- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/bwins/syserrcmdtestu.def Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
- ?LibEntryL@@YAPAVCSysErrCmdTest@@AAVCTestModuleIf@@@Z @ 1 NONAME ; class CSysErrCmdTest * LibEntryL(class CTestModuleIf &)
-
--- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/conf/syserrcmdtest.cfg Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
-[Define]
-// Add general definitions here
-[Enddefine]
-
-[StifSettings]
-// Add stif settings here
-CheckHeapBalance= on
-[EndStifSettings]
-
-// ---------------------------------------------------------------------------
-// Test cases for Create and destroy
-// ---------------------------------------------------------------------------
-
-[Test]
-title Test Create and destroy
-create syserrcmdtest testClass
-testClass CreateAndDestroy
-pause 1000
-delete testClass
-[Endtest]
-
-// ---------------------------------------------------------------------------
-// Test cases for init and close
-// ---------------------------------------------------------------------------
-
-[Test]
-title Test Init and close
-create syserrcmdtest testClass
-testClass InitAndClose
-pause 1000
-delete testClass
-[Endtest]
-// ---------------------------------------------------------------------------
-// Test cases for execute
-// ---------------------------------------------------------------------------
-
-[Test]
-title Test Execute
-create syserrcmdtest testClass
-testClass Execute
-pause 1000
-delete testClass
-[Endtest]
-
-// ---------------------------------------------------------------------------
-// Test cases for execute and cancel
-// ---------------------------------------------------------------------------
-
-[Test]
-title Test Execute and cancel
-create syserrcmdtest testClass
-testClass ExecuteCancel
-pause 1000
-delete testClass
-[Endtest]
-
-// ---------------------------------------------------------------------------
-// Test cases for execute after global note
-// ---------------------------------------------------------------------------
-
-[Test]
-title Test Execute after global note
-create syserrcmdtest testClass
-testClass ExecuteAfterGlobalNote
-pause 1000
-delete testClass
-[Endtest]
-
-// ---------------------------------------------------------------------------
-// Test cases for execute after Ui service global note
-// ---------------------------------------------------------------------------
-
-[Test]
-title Test Execute after Ui service global note
-create syserrcmdtest testClass
-testClass ExecuteAfterUiServiceGlobalNote
-pause 1000
-delete testClass
-[Endtest]
\ No newline at end of file
--- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/eabi/syserrcmdtestu.def Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
- _Z9LibEntryLR13CTestModuleIf @ 1 NONAME
-
--- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/group/bld.inf Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-/*
-* 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:
-* Build information file for syserrcmdtest tests.
-*
-*/
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_TESTEXPORTS
-//../init/syserrcmdtest.ini /epoc32/winscw/c/testframework/syserrcmdtest.ini
-//../conf/syserrcmdtest.cfg /epoc32/winscw/c/testframework/syserrcmdtest.cfg
-
-PRJ_TESTMMPFILES
-syserrcmdtest.mmp
-
--- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/group/envrecall.cmd Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-@echo off
-REM Copyright (c) 2009 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: Environment setup for ssmlangselcmd tests.
-REM
-REM
-@echo on
-
-
-@echo Recall environment for syserrcmdtest...
-@echo Cleaning up stub...
-pushd ..\..\ssmlangselcmdteststub\group
-call bldmake bldfiles
-call abld test reallyclean -k
-popd
-
-@echo Recall environment for syserrcmdtest... Finished.
-
--- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/group/envsetup.cmd Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-@echo off
-REM Copyright (c) 2009 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: Environment setup for ssmlangselcmd tests.
-REM
-REM
-@echo on
-
-
-@echo Setup environment for syserrcmdtest...
-@echo Setting up stub...
-pushd ..\..\syserrcmdtestsstub\group
-call bldmake bldfiles
-call abld test reallyclean
-call abld test build
-popd
-@echo Setup environment for syserrcmdtest... Finished.
-
--- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/group/syserrcmdtest.mmp Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-/*
-* 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:
-* Project definition file for syserrcmdtest.
-*
-*/
-
-#include <platform_paths.hrh>
-
-TARGET syserrcmdtest.dll
-TARGETTYPE dll
-
-UID 0x1000008D 0x101FB3E7
-VENDORID VID_DEFAULT
-CAPABILITY ALL -TCB
-
-SOURCEPATH ../src
-SOURCE syserrcmdtest.cpp
-
-USERINCLUDE ../inc
-USERINCLUDE ../../inc
-USERINCLUDE ../../../inc
-
-MW_LAYER_SYSTEMINCLUDE
-
-OS_LAYER_SYSTEMINCLUDE
-
-LIBRARY syserrcmd.lib
-LIBRARY syserrcmdtestsstub.lib
-LIBRARY euser.lib
-LIBRARY stiftestinterface.lib
-LIBRARY efsrv.lib
-LIBRARY aknnotify.lib
-LIBRARY akncapserverclient.lib
-LIBRARY apparc.lib
-LIBRARY eikcore.lib
-//LIBRARY component_under_test.lib
-
--- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/group/syserrcmdtest.pkg Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-;
-; 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:
-;
-;Languages
-&EN
-
-#{"syserrcmdtest"},(0x101FB3E7),1,0,0,TYPE=SA
-
-;Localised Vendor name
-%{"syserrcmdtest EN"}
-
-; Vendor name
-: "syserrcmdtest"
-
-"\epoc32\release\armv5\urel\syserrcmdtest.dll"-"c:\sys\bin\syserrcmdtest.dll"
-"..\init\syserrcmdtest.ini"-"c:\testframework\syserrcmdtest.ini"
-"..\conf\syserrcmdtest.cfg"-"c:\testframework\syserrcmdtest.cfg"
-
-; Stub for tests
-"\epoc32\release\armv5\urel\syserrcmdtestsstub.dll"-"c:\sys\bin\syserrcmdtestsstub.dll"
-
-
--- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/inc/asyncrequesthandler.h Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,220 +0,0 @@
-/*
- * 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:
- *
- */
-
-#ifndef ASYNCREQUESTHANDLER_H
-#define ASYNCREQUESTHANDLER_H
-
-// SYSTEM INCLUDE FILES
-#include <e32base.h>
-
-// DATA TYPES
-_LIT( KPanicCat, "ASYNCREQUESTHANDLER" );
-
-/** Panic codes */
-enum TArhPanicCodes
- {
- EArhNone,
- EArhRequestPending
- };
-
-// CLASS DECLARATION
-
-/**
- * A template class for handling asynchronous requests.
- *
- * @lib None.
- * @since S60 TB9.2
- */
-template <class T>
-NONSHARABLE_CLASS( CAsyncRequestHandler ): public CActive
- {
-public:
-
- // TYPE DEFINTIONS
-
- /** HandleIssueRequest callback */
- typedef void ( T::*HandleIssueRequest )( TRequestStatus& );
-
- /** HandleRunL callback */
- typedef void ( T::*HandleRunL )( TInt );
-
- /** HandleRunError callback */
- typedef TInt ( T::*HandleRunError )( TInt );
-
- /** HandleDoCancel callback */
- typedef void ( T::*HandleDoCancel )();
-
- // DATA TYPES
-
- /** Request type */
- enum TAsyncRequestType
- {
- ERequestOneShot,
- ERequestContinuous
- };
-
-public:
-
- /**
- * Symbian two phased constructor.
- *
- * @since S60 TB9.2
- * @param None.
- * @return CAsyncRequestHandler*
- */
- static CAsyncRequestHandler* NewL( T& aPtr,
- HandleIssueRequest aHandleIssueRequest,
- HandleRunL aHandleRunL,
- HandleRunError aHandleRunError,
- HandleDoCancel aHandleDoCancel,
- TAsyncRequestType aType = ERequestContinuous )
- {
- CAsyncRequestHandler* self = CAsyncRequestHandler::NewLC( aPtr,
- aHandleIssueRequest,
- aHandleRunL,
- aHandleRunError,
- aHandleDoCancel,
- aType );
- CleanupStack::Pop( self );
- return self;
- }
-
- /**
- * Symbian two phased constructor.
- * Instance is left in the cleanup stack.
- *
- * @since S60 TB9.2
- * @param None.
- * @return CAsyncRequestHandler*
- */
- static CAsyncRequestHandler* NewLC( T& aPtr,
- HandleIssueRequest aHandleIssueRequest,
- HandleRunL aHandleRunL,
- HandleRunError aHandleRunError,
- HandleDoCancel aHandleDoCancel,
- TAsyncRequestType aType = ERequestContinuous )
- {
- CAsyncRequestHandler* self = new CAsyncRequestHandler( aPtr,
- aHandleIssueRequest,
- aHandleRunL,
- aHandleRunError,
- aHandleDoCancel,
- aType );
- CleanupStack::PushL( self );
- return self;
- }
-
- /**
- * C++ destructor.
- */
- virtual ~CAsyncRequestHandler()
- {
- Cancel();
- }
-
-public: // New methods
-
- /**
- * Issues a new request.
- * Panic will occur if there already is a request pending.
- *
- * @since TB9.2
- * @param None.
- * @return None.
- */
- void IssueRequest()
- {
- __ASSERT_DEBUG( !IsActive(),
- User::Panic( KPanicCat, EArhRequestPending ) );
-
- // Call the HandleIssueRequest from the template class and set active
- ( iPtr.*iHandleIssueRequest )( iStatus );
- SetActive();
- }
-
-protected: // From base classes
-
- // @see CActive
- void RunL()
- {
- // Check result and issue request again
- TInt status = iStatus.Int();
- if( iType == ERequestContinuous )
- {
- IssueRequest();
- }
-
- // Call the HandleRunL from the template class
- ( iPtr.*iHandleRunL )( status );
- }
-
- // @see CActive
- TInt RunError( TInt aError )
- {
- // Call the HandleRunError from the template class
- TInt err = ( iPtr.*iHandleRunError )( aError );
- return err;
- }
-
- // @see CActive
- void DoCancel()
- {
- // Call the HandleDoCancel from the template class
- ( iPtr.*iHandleDoCancel )();
- }
-
-private:
-
- CAsyncRequestHandler( T& aPtr,
- HandleIssueRequest aHandleIssueRequest,
- HandleRunL aHandleRunL,
- HandleRunError aHandleRunError,
- HandleDoCancel aHandleDoCancel,
- TAsyncRequestType aType = ERequestContinuous ):
- CActive( CActive::EPriorityStandard ),
- iPtr( aPtr ),
- iHandleIssueRequest( aHandleIssueRequest ),
- iHandleRunL( aHandleRunL ),
- iHandleRunError( aHandleRunError ),
- iHandleDoCancel( aHandleDoCancel ),
- iType( aType )
- {
- CActiveScheduler::Add( this );
- }
-
-private: // Data
-
- /** Pointer to the template class */
- T& iPtr;
-
- /** HandleIssueRequest function pointer */
- HandleIssueRequest iHandleIssueRequest;
-
- /** HandleRunL function pointer */
- HandleRunL iHandleRunL;
-
- /** HandleRunError function pointer */
- HandleRunError iHandleRunError;
-
- /** HandleDoCancel function pointer */
- HandleDoCancel iHandleDoCancel;
-
- /** Request type */
- TAsyncRequestType iType;
- };
-
-#endif // ASYNCREQUESTHANDLER_H
--- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/inc/syserrcmdtest.h Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,147 +0,0 @@
-/*
-* 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:
-* Csyserrcmdtest class declaration.
-*
-*/
-
-
-#ifndef SYSERRCMDTEST_H
-#define SYSERRCMDTEST_H
-
-#if defined (_MSC_VER) && (_MSC_VER >= 1000)
-#pragma once
-#endif
-
-// SYSTEM INCLUDES
-#include <testscripterinternal.h>
-
-#include "asyncrequesthandler.h"
-
-// FORWARD DECLARATIONS
-class TCaseInfo;
-class CSysErrCmdTest;
-class MSsmCustomCommand;
-class CSsmCustomCommandEnv;
-
-// DESCRIPTION
-// This a Test Module interface template
-// that does not really do anything.
-typedef TInt ( CSysErrCmdTest::*TestFunction )( TTestResult& );
-
-NONSHARABLE_CLASS( CSysErrCmdTest ) : public CScriptBase
- {
-public: // Constructors and destructor
-
- /**
- * Two-phased constructor.
- */
- static CSysErrCmdTest* NewL( CTestModuleIf& aTestModuleIf );
-
- /**
- * Destructor.
- */
- virtual ~CSysErrCmdTest();
-
-public: // Functions from base classes
-
- TInt RunMethodL( CStifItemParser& aItem );
-
-protected: // New functions
-
- TInt CreateAndDestroyL( CStifItemParser& aItem );
- TInt InitAndCloseL( CStifItemParser& aItem );
- TInt ExecuteL( CStifItemParser& aItem );
- TInt ExecuteCancelL( CStifItemParser& aItem );
- TInt ShowAfterAknGlobalNoteL( CStifItemParser& aItem );
- TInt ShowAfterUiServerGlobalNoteL( CStifItemParser& aItem );
-
- /** HandleIssueRequest callback */
- void HandleIssueRequest( TRequestStatus& );
-
- /** HandleRunL callback */
- void HandleRunL( TInt );
-
- /** HandleRunError callback */
- TInt HandleRunError( TInt );
-
- /** HandleDoCancel callback */
- void HandleDoCancel();
-
-private:
-
- /**
- * C++ default constructor.
- */
- CSysErrCmdTest( CTestModuleIf& aTestModuleIf );
-
- /**
- * By default Symbian OS constructor is private.
- */
- void ConstructL();
-
- /**
- * Function returning test case name and pointer to test case function
- */
- const TCaseInfo Case( const TInt aCaseNumber ) const;
-
-private: // Data
-
- TestFunction iMethod;
-
- CAsyncRequestHandler<CSysErrCmdTest>* iExecuteHandler;
-
- RFs iFs;
-
- MSsmCustomCommand* iSysErrCmd;
-
- CSsmCustomCommandEnv* iCustCmdEnvStub;
-
- TInt iExecutionResult;
- };
-
-// Function pointer related internal definitions
-
-// Hack around known GCC bug.
-#ifndef __GCC32__
- #define GETPTR
-#else
- #define GETPTR &
-#endif
-
-
-// An internal structure containing a test case name and
-// the pointer to function doing the test
-class TCaseInfoInternal
- {
- public:
- const TText* iCaseName;
- TestFunction iMethod;
- };
-
-// An internal structure containing a test case name and
-// the pointer to function doing the test
-class TCaseInfo
- {
- public:
- TPtrC iCaseName;
- TestFunction iMethod;
-
- TCaseInfo( const TText* a ) : iCaseName( ( TText* ) a )
- {
- };
- };
-
-#endif // SYSERRCMDTEST_H
-
--- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/inc/trace.h Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,596 +0,0 @@
-/*
-* 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:
-* Trace macro definitions.
-*
-*/
-
-#ifndef TRACE_H
-#define TRACE_H
-
-#include <e32base.h> // TCleanupItem
-#include "traceconfiguration.hrh"
-
-#ifdef TRACE_INTO_FILE
-#include <flogger.h> // RFileLogger
-#else
-#include <e32debug.h> // RDebug
-#endif
-
-//-----------------------------------------------------------------------------
-// Constants
-//-----------------------------------------------------------------------------
-//
-
-// NOTE!
-// Replace all COMPONENT_NAME occurnaces with your own component / module name.
-
-/**
-* Prefix trace macro to complete tracing with component name.
-* Returns TDesC which can be used directly with RDebug or RFileLogger.
-*/
-#define _PREFIX_TRACE( aMsg ) TPtrC( (const TText*)L"[syserrcmdtest]: " L##aMsg )
-
-/**
-* Prefix error trace
-*/
-#define _PREFIX_ERROR( aMsg ) _PREFIX_TRACE( "[ERROR: %d]: " L##aMsg )
-
-/**
-* Prefix info trace.
-*/
-#define _PREFIX_INFO( aMsg ) _PREFIX_TRACE( "[INFO]: " L##aMsg )
-
-/**
-* Prefix macro for strings
-*/
-#define _PREFIX_CHAR( aMsg ) (const char*)"[syserrcmdtest]: " ##aMsg
-
-/**
-* Define needed directories if TRACE_INTO_FILE macro in use
-*/
-#ifdef TRACE_INTO_FILE
-
- _LIT( KDir, "syserrcmdtest" );
- _LIT( KFile, "syserrcmdtest_log.txt" );
- _LIT( KFullPath, "c:\\logs\\syserrcmdtest\\" );
-
-#endif
-
-//-----------------------------------------------------------------------------
-// Error trace macros
-//-----------------------------------------------------------------------------
-//
-#ifdef ERROR_TRACE
-
- /**
- * Error trace definitions.
- */
- #ifdef TRACE_INTO_FILE
-
- #define ERROR( aErr, aMsg )\
- {\
- if( aErr < KErrNone )\
- {\
- RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_ERROR( aMsg ), aErr );\
- }\
- }
- #define ERROR_1( aErr, aMsg, aP1 )\
- {\
- if( aErr < KErrNone )\
- {\
- RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_ERROR( aMsg ), aErr, aP1 );\
- }\
- }
- #define ERROR_2( aErr, aMsg, aP1, aP2 )\
- {\
- if( aErr < KErrNone )\
- {\
- RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_ERROR( aMsg ), aErr, aP1, aP2 );\
- }\
- }
- #define ERROR_3( aErr, aMsg, aP1, aP2, aP3 )\
- {\
- if( aErr < KErrNone )\
- {\
- RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_ERROR( aMsg ), aErr, aP1, aP2, aP3 );\
- }\
- }
- #define ERROR_4( aErr, aMsg, aP1, aP2, aP3, aP4 )\
- {\
- if( aErr < KErrNone )\
- {\
- RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_ERROR( aMsg ), aErr, aP1, aP2, aP3, aP4 );\
- }\
- }
- #define ERROR_5( aErr, aMsg, aP1, aP2, aP3, aP4, aP5 )\
- {\
- if( aErr < KErrNone )\
- {\
- RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_ERROR( aMsg ), aErr, aP1, aP2, aP3, aP4, aP5 );\
- }\
- }
- #define ERROR_6( aErr, aMsg, aP1, aP2, aP3, aP4, aP5, aP6 )\
- {\
- if( aErr < KErrNone )\
- {\
- RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_ERROR( aMsg ), aErr, aP1, aP2, aP3, aP4, aP5 );\
- }\
- }
-
- #else//TRACE_INTO_FILE not defined
-
- #define ERROR( aErr, aMsg )\
- {\
- if( aErr < KErrNone )\
- {\
- RDebug::Print( _PREFIX_ERROR( aMsg ), aErr );\
- }\
- }
- #define ERROR_1( aErr, aMsg, aP1 )\
- {\
- if( aErr < KErrNone )\
- {\
- RDebug::Print( _PREFIX_ERROR( aMsg ), aErr, aP1 );\
- }\
- }
- #define ERROR_2( aErr, aMsg, aP1, aP2 )\
- {\
- if( aErr < KErrNone )\
- {\
- RDebug::Print( _PREFIX_ERROR( aMsg ), aErr, aP1, aP2 );\
- }\
- }
- #define ERROR_3( aErr, aMsg, aP1, aP2, aP3 )\
- {\
- if( aErr < KErrNone )\
- {\
- RDebug::Print( _PREFIX_ERROR( aMsg ), aErr, aP1, aP2, aP3 );\
- }\
- }
- #define ERROR_4( aErr, aMsg, aP1, aP2, aP3, aP4 )\
- {\
- if( aErr < KErrNone )\
- {\
- RDebug::Print( _PREFIX_ERROR( aMsg ), aErr, aP1, aP2, aP3, aP4 );\
- }\
- }
- #define ERROR_5( aErr, aMsg, aP1, aP2, aP3, aP4, aP5 )\
- {\
- if( aErr < KErrNone )\
- {\
- RDebug::Print( _PREFIX_ERROR( aMsg ), aErr, aP1, aP2, aP3, aP4, aP5 );\
- }\
- }
- #define ERROR_6( aErr, aMsg, aP1, aP2, aP3, aP4, aP5, aP6 )\
- {\
- if( aErr < KErrNone )\
- {\
- RDebug::Print( _PREFIX_ERROR( aMsg ), aErr, aP1, aP2, aP3, aP4, aP5, aP6 );\
- }\
- }
-
- #endif//TRACE_INTO_FILE
-
- #define ERROR_GEN( aMsg ) ERROR( KErrGeneral, aMsg )
- #define ERROR_GEN_1( aMsg, aP1 ) ERROR_1( KErrGeneral, aMsg, aP1 )
- #define ERROR_GEN_2( aMsg, aP1, aP2 ) ERROR_2( KErrGeneral, aMsg, aP1, aP2 )
- #define ERROR_GEN_3( aMsg, aP1, aP2, aP3 ) ERROR_3( KErrGeneral, aMsg, aP1, aP3 )
- #define ERROR_GEN_4( aMsg, aP1, aP2, aP3, aP4 ) ERROR_4( KErrGeneral, aMsg, aP1, aP3, aP4 )
- #define ERROR_GEN_5( aMsg, aP1, aP2, aP3, aP4, aP5 ) ERROR_5( KErrGeneral, aMsg, aP1, aP3, aP4, aP5 )
- #define ERROR_GEN_6( aMsg, aP1, aP2, aP3, aP4, aP5, aP6 ) ERROR_6( KErrGeneral, aMsg, aP1, aP3, aP4, aP5, aP6 )
-
-#else//ERROR_TRACE not defined
-
- #define ERROR( aErr, aMsg )
- #define ERROR_1( aErr, aMsg, aP1 )
- #define ERROR_2( aErr, aMsg, aP1, aP2 )
- #define ERROR_3( aErr, aMsg, aP1, aP2, aP3 )
- #define ERROR_4( aErr, aMsg, aP1, aP2, aP3, aP4 )
- #define ERROR_5( aErr, aMsg, aP1, aP2, aP3, aP4, aP5 )
- #define ERROR_6( aErr, aMsg, aP1, aP2, aP3, aP4, aP5, aP6 )
-
- #define ERROR_GEN( aMsg )
- #define ERROR_GEN_1( aMsg, aP1 )
- #define ERROR_GEN_2( aMsg, aP1, aP2 )
- #define ERROR_GEN_3( aMsg, aP1, aP2, aP3 )
- #define ERROR_GEN_4( aMsg, aP1, aP2, aP3, aP4 )
- #define ERROR_GEN_5( aMsg, aP1, aP2, aP3, aP4, aP5 )
- #define ERROR_GEN_6( aMsg, aP1, aP2, aP3, aP4, aP5, aP6 )
-
-#endif//ERROR_TRACE
-
-//-----------------------------------------------------------------------------
-// TRAP and trace with error macro
-//-----------------------------------------------------------------------------
-//
-#define TRAP_ERROR( aErr, aFunction )\
- {\
- TRAP( aErr, aFunction );\
- TPtrC8 file( ( TText8* )__FILE__ );\
- ERROR_2( aErr, "Trapped leave in '%S' line %d", &file, __LINE__);\
- }
-
-//-----------------------------------------------------------------------------
-// Info trace macros
-//-----------------------------------------------------------------------------
-//
-#ifdef INFO_TRACE
-
- /**
- * Info log message definitions.
- */
- #ifdef TRACE_INTO_FILE
-
- #define INFO( aMsg )\
- {\
- RFileLogger::Write( KDir, KFile, EFileLoggingModeAppend, _PREFIX_INFO( aMsg ) );\
- }
- #define INFO_1( aMsg, aP1 )\
- {\
- RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_INFO( aMsg ), aP1 );\
- }
- #define INFO_2( aMsg, aP1, aP2 )\
- {\
- RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_INFO( aMsg ), aP1, aP2 );\
- }
- #define INFO_3( aMsg, aP1, aP2, aP3 )\
- {\
- RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_INFO( aMsg ), aP1, aP2, aP3 );\
- }
- #define INFO_4( aMsg, aP1, aP2, aP3, aP4 )\
- {\
- RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_INFO( aMsg ), aP1, aP2, aP3, aP4 );\
- }
- #define INFO_5( aMsg, aP1, aP2, aP3, aP4, aP5 )\
- {\
- RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_INFO( aMsg ), aP1, aP2, aP3, aP4, aP5 );\
- }
- #define INFO_6( aMsg, aP1, aP2, aP3, aP4, aP5, aP6 )\
- {\
- RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_INFO( aMsg ), aP1, aP2, aP3, aP4, aP5, aP6 );\
- }
-
- #else//TRACE_INTO_FILE not defined
-
- #define INFO( aMsg )\
- {\
- RDebug::Print( _PREFIX_INFO( aMsg ) );\
- }
- #define INFO_1( aMsg, aP1 )\
- {\
- RDebug::Print( _PREFIX_INFO( aMsg ), aP1 );\
- }
- #define INFO_2( aMsg, aP1, aP2 )\
- {\
- RDebug::Print( _PREFIX_INFO( aMsg ), aP1, aP2 );\
- }
- #define INFO_3( aMsg, aP1, aP2, aP3 )\
- {\
- RDebug::Print( _PREFIX_INFO( aMsg ), aP1, aP2, aP3 );\
- }
- #define INFO_4( aMsg, aP1, aP2, aP3, aP4 )\
- {\
- RDebug::Print( _PREFIX_INFO( aMsg ), aP1, aP2, aP3, aP4 );\
- }
- #define INFO_5( aMsg, aP1, aP2, aP3, aP4, aP5 )\
- {\
- RDebug::Print( _PREFIX_INFO( aMsg ), aP1, aP2, aP3, aP4, aP5 );\
- }
- #define INFO_6( aMsg, aP1, aP2, aP3, aP4, aP5, aP6 )\
- {\
- RDebug::Print( _PREFIX_INFO( aMsg ), aP1, aP2, aP3, aP4, aP5, aP6 );\
- }
-
- #endif//TRACE_INTO_FILE
-
-#else//INFO_TRACE not defined
-
- #define INFO( aMsg )
- #define INFO_1( aMsg, aP1 )
- #define INFO_2( aMsg, aP1, aP2 )
- #define INFO_3( aMsg, aP1, aP2, aP3 )
- #define INFO_4( aMsg, aP1, aP2, aP3, aP4 )
- #define INFO_5( aMsg, aP1, aP2, aP3, aP4, aP5 )
- #define INFO_6( aMsg, aP1, aP2, aP3, aP4, aP5, aP6 )
-
-#endif//INFO_TRACE
-
-//-----------------------------------------------------------------------------
-// Trace current client thread name and process id
-//-----------------------------------------------------------------------------
-//
-#ifdef CLIENT_TRACE
-
- #define CLIENT_PROCESS\
- {\
- CLIENT_PROCESS_PREFIX( "" );\
- }
-
- #define CLIENT_PROCESS_PREFIX( aPrefix )\
- {\
- RProcess process;\
- TPtrC name( process.Name() );\
- TSecureId sid( process.SecureId() );\
- TPtrC prefix( _S( aPrefix ) );\
- if( prefix.Length() )\
- {\
- INFO_3( "%S: CLIENT - Name: [%S], Sid: [0x%x]", &prefix, &name, sid.iId );\
- }\
- else\
- {\
- INFO_2( "CLIENT - Name: [%S], Sid: [0x%x]", &name, sid.iId );\
- }\
- process.Close();\
- }
-
- #define CLIENT_MESSAGE( aMsg )\
- {\
- CLIENT_MESSAGE_PREFIX( "", aMsg );\
- }
-
- #define CLIENT_MESSAGE_PREFIX( aPrefix, aMsg )\
- {\
- RThread thread;\
- TInt err = aMsg.Client( thread );\
- if( err == KErrNone )\
- {\
- RProcess process;\
- err = thread.Process( process );\
- if( err == KErrNone )\
- {\
- TPtrC threadName( thread.Name() );\
- TUid processUid( process.SecureId() );\
- TPtrC prefix( _S( aPrefix ) );\
- if( prefix.Length() )\
- {\
- INFO_4( "%S: MSG - Name: [%S], Sid: [0x%x], Message ID: [%d]",\
- &prefix,\
- &threadName,\
- processUid,\
- aMsg.Function() );\
- }\
- else\
- {\
- INFO_3( "MSG - Name: [%S], Sid: [0x%x], Message ID: [%d]",\
- &threadName,\
- processUid,\
- aMsg.Function() );\
- }\
- }\
- process.Close();\
- }\
- thread.Close();\
- }
-
-#else
-
- #define CLIENT_PROCESS
- #define CLIENT_PROCESS_PREFIX( aPrefix )
- #define CLIENT_MESSAGE( aMsg )
- #define CLIENT_MESSAGE_PREFIX( aPrefix, aMsg )
-
-#endif
-
-//-----------------------------------------------------------------------------
-// Function trace macros
-//-----------------------------------------------------------------------------
-//
-#ifdef FUNC_TRACE
-
- /**
- * Function logging definitions.
- */
- #ifdef TRACE_INTO_FILE
-
- #define FUNC( aMsg, aP1 )\
- {\
- TPtrC8 trace( _S8( aMsg ) );\
- RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, trace, aP1 );\
- }\
-
- #else//TRACE_INTO_FILE not defined
-
- #define FUNC( aMsg, aP1 )\
- {\
- RDebug::Printf( aMsg, aP1 );\
- }\
-
- #endif//TRACE_INTO_FILE
-
- /**
- * Function trace helper class.
- *
- * NOTE:
- * LC -methods cannot be trapped. Therefore if LC -method leaves
- * END trace is used instead of LEAVE trace.
- * If you have an idea how to round this problem please tell.
- */
- _LIT8( KFuncNameTerminator, "(" );
- _LIT8( KFuncLeavePatternL, "L" );
- class TFuncLog
- {
- public:
- static void Cleanup( TAny* aPtr )
- {
- TFuncLog* self = static_cast< TFuncLog* >( aPtr );
- self->iLeft = ETrue;
- FUNC( _PREFIX_CHAR("%S-LEAVE"), &self->iFunc ); // Leave detected
- }
- inline TFuncLog( const char* aFunc ) :
- iFunc( aFunc ? _S8( aFunc ) : _S8("") ),
- iLeft( EFalse ),
- iCleanupItem( Cleanup, this ),
- iCanLeave( EFalse )
- {
- TInt pos( iFunc.Find( KFuncNameTerminator ) );
- if( pos != KErrNotFound )
- {
- iFunc.Set( iFunc.Left( pos ) );
- iCanLeave = !iFunc.Right( KFuncLeavePatternL().Length() ).Compare( KFuncLeavePatternL );
- if ( iCanLeave )
- {
- CleanupStack::PushL( iCleanupItem ); // Ignore warnings
- }
- }
- FUNC( _PREFIX_CHAR("%S-START"), &iFunc );
- }
-
- inline ~TFuncLog()
- {
- if ( !iLeft )
- {
- if ( iCanLeave )
- {
- CleanupStack::Pop( this ); // Pop the cleanup item
- }
- FUNC( _PREFIX_CHAR("%S-END"), &iFunc ); // Normally finished
- }
- }
-
- private: // Data
- TPtrC8 iFunc;
- TBool iLeft;
- TCleanupItem iCleanupItem;
- TBool iCanLeave;
- };
- #define FUNC_LOG TFuncLog _fl( __PRETTY_FUNCTION__ );
-
-#else//FUNC_TRACE not defined
-
- #define FUNC_LOG
-
-#endif//FUNC_TRACE
-
-//-----------------------------------------------------------------------------
-// Timestamp trace macros
-//-----------------------------------------------------------------------------
-//
-#ifdef TIMESTAMP_TRACE
-
- #ifdef TRACE_INTO_FILE
-
- #define TIMESTAMP( aCaption )\
- {\
- TTime t;\
- t.HomeTime();\
- TDateTime dt = t.DateTime();\
- _LIT( KCaption, aCaption );\
- RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend,\
- _PREFIX_TRACE("[TIMESTAMP] %S %d:%02d:%02d.%d us"),\
- &KCaption, dt.Hour(), dt.Minute(), dt.Second(), dt.MicroSecond() );\
- }
-
- #else//TRACE_INTO_FILE not defined
-
- #define TIMESTAMP( aCaption )\
- {\
- TTime t;\
- t.HomeTime();\
- TDateTime dt = t.DateTime();\
- _LIT( KCaption, aCaption );\
- RDebug::Print( _PREFIX_TRACE("[TIMESTAMP] %S %d:%02d:%02d.%d us"),\
- &KCaption, dt.Hour(), dt.Minute(), dt.Second(), dt.MicroSecond() );\
- }
-
- #endif//TRACE_INTO_FILE
-
-#else//TIMESTAMP_TRACE not defined
-
- #define TIMESTAMP( aCaption )
-
-#endif//TIMESTAMP_TRACE
-
-#ifdef HEAP_TRACE
-
- #ifdef TRACE_INTO_FILE
-
- #define HEAP( aMsg )\
- {\
- TInt totalAllocSpace = 0;\
- User::AllocSize( totalAllocSpace );\
- RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_HEAP( aMsg ), totalAllocSpace );\
- }
- #define HEAP_1( aMsg, aP1 )\
- {\
- TInt totalAllocSpace = 0;\
- User::AllocSize( totalAllocSpace );\
- RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_HEAP( aMsg ), totalAllocSpace, aP1 );\
- }
- #define HEAP_2( aMsg, aP1, aP2 )\
- {\
- TInt totalAllocSpace = 0;\
- User::AllocSize( totalAllocSpace );\
- RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_HEAP( aMsg ), totalAllocSpace, aP1, aP2 );\
- }
- #define HEAP_3( aMsg, aP1, aP2, aP3 )\
- {\
- TInt totalAllocSpace = 0;\
- User::AllocSize( totalAllocSpace );\
- RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_HEAP( aMsg ), totalAllocSpace, aP1, aP2, aP3 );\
- }
- #define HEAP_4( aMsg, aP1, aP2, aP3, aP4 )\
- {\
- TInt totalAllocSpace = 0;\
- User::AllocSize( totalAllocSpace );\
- RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, _PREFIX_HEAP( aMsg ), totalAllocSpace, aP1, aP2, aP3, aP4 );\
- }
-
- #else//TRACE_INTO_FILE not defined
-
- #define HEAP( aMsg )\
- {\
- TInt totalAllocSpace = 0;\
- User::AllocSize( totalAllocSpace );\
- RDebug::Print( _PREFIX_HEAP( aMsg ), totalAllocSpace );\
- }
- #define HEAP_1( aMsg, aP1 )\
- {\
- TInt totalAllocSpace = 0;\
- User::AllocSize( totalAllocSpace );\
- RDebug::Print( _PREFIX_HEAP( aMsg ), totalAllocSpace, aP1 );\
- }
- #define HEAP_2( aMsg, aP1, aP2 )\
- {\
- TInt totalAllocSpace = 0;\
- User::AllocSize( totalAllocSpace );\
- RDebug::Print( _PREFIX_HEAP( aMsg ), totalAllocSpace, aP1, aP2 );\
- }
- #define HEAP_3( aMsg, aP1, aP2, aP3 )\
- {\
- TInt totalAllocSpace = 0;\
- User::AllocSize( totalAllocSpace );\
- RDebug::Print( _PREFIX_HEAP( aMsg ), totalAllocSpace, aP1, aP2, aP3 );\
- }
- #define HEAP_4( aMsg, aP1, aP2, aP3, aP4 )\
- {\
- TInt totalAllocSpace = 0;\
- User::AllocSize( totalAllocSpace );\
- RDebug::Print( _PREFIX_HEAP( aMsg ), totalAllocSpace, aP1, aP2, aP3, aP4 );\
- }
-
- #endif//TRACE_INTO_FILE
-
-#else//HEAP_TRACE not defined
-
- #define HEAP( aMsg )
- #define HEAP_1( aMsg, aP1 )
- #define HEAP_2( aMsg, aP1, aP2 )
- #define HEAP_3( aMsg, aP1, aP2, aP3 )
- #define HEAP_4( aMsg, aP1, aP2, aP3, aP4 )
-
-#endif//HEAP_TRACE
-
-#endif
-
--- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/inc/traceconfiguration.hrh Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
-/*
-* 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:
-* Trace Macro Configurations.
-*
-*/
-
-
-#ifndef TRACECONFIGURATION_HRH
-#define TRACECONFIGURATION_HRH
-
-//-----------------------------------------------------------------------------
-// Trace definitions
-//-----------------------------------------------------------------------------
-//
-
-/**
-* Error trace enabled
-*/
-#ifdef _DEBUG
- #define ERROR_TRACE
-#else
- #undef ERROR_TRACE
-#endif
-
-/**
-* Info trace enabled
-*/
-#ifdef _DEBUG
- #define INFO_TRACE
-#else
- #undef INFO_TRACE
-#endif
-
-/**
-* Timestamp tracing on
-*/
-#ifdef _DEBUG
- #define TIMESTAMP_TRACE
-#else
- #undef TIMESTAMP_TRACE
-#endif
-
-/**
-* Tracing current client process and thread
-*/
-#ifdef _DEBUG
- #define CLIENT_TRACE
-#else
- #undef CLIENT_TRACE
-#endif
-
-/**
-* Function trace enabled
-*/
-#ifdef _DEBUG
- #define FUNC_TRACE
-#else
- #undef FUNC_TRACE
-#endif
-
-/**
-* Tracing into file enabled, default RDebug
-*/
-#undef TRACE_INTO_FILE
-
-#endif
-
--- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/init/syserrcmdtest.ini Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,186 +0,0 @@
-#
-# This is STIFTestFramework initialization file
-# Comment lines start with '#'-character.
-# See STIF TestFramework users guide.doc for instructions
-
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-# Set following test engine settings:
-# - Set Test Reporting mode. TestReportMode's possible values are:
-# + 'Summary': Summary of the tested test cases.
-# + 'Environment': Hardware and software info.
-# + 'TestCases': Test case report.
-# + 'FullReport': Set of all above ones.
-# + Example 'TestReportMode= Summary TestCases'
-#
-# - CreateTestReport setting controls report creation mode
-# + YES, Test report will created.
-# + NO, No Test report.
-#
-# - File path indicates the base path of the test report.
-# - File name indicates the name of the test report.
-#
-# - File format indicates the type of the test report.
-# + TXT, Test report file will be txt type, for example 'TestReport.txt'.
-# + HTML, Test report will be html type, for example 'TestReport.html'.
-#
-# - File output indicates output source of the test report.
-# + FILE, Test report logging to file.
-# + RDEBUG, Test report logging to using rdebug.
-#
-# - File Creation Mode indicates test report overwriting if file exist.
-# + OVERWRITE, Overwrites if the Test report file exist.
-# + APPEND, Continue logging after the old Test report information if
-# report exist.
-# - Sets a device reset module's dll name(Reboot).
-# + If Nokia specific reset module is not available or it is not correct one
-# StifHWResetStub module may use as a template for user specific reset
-# module.
-# - Sets STIF test measurement disable options. e.g. pluging1 and pluging2 disablation
-# DisableMeasurement= stifmeasurementplugin01 stifmeasurementplugin02
-#
-
-[Engine_Defaults]
-
-TestReportMode= FullReport # Possible values are: 'Empty', 'Summary', 'Environment', 'TestCases' or 'FullReport'
-
-CreateTestReport= YES # Possible values: YES or NO
-
-TestReportFilePath= c:\LOGS\TestFramework\
-TestReportFileName= TestReport
-
-TestReportFormat= TXT # Possible values: TXT or HTML
-TestReportOutput= FILE # Possible values: FILE or RDEBUG
-TestReportFileCreationMode= OVERWRITE # Possible values: OVERWRITE or APPEND
-
-DeviceResetDllName= StifResetForNokia.dll # e.g. 'StifHWResetStub.dll' for user specific reseting
-
-DisableMeasurement= stifmeasurementdisablenone # Possible values are:
- # 'stifmeasurementdisablenone', 'stifmeasurementdisableall'
- # 'stifmeasurementplugin01', 'stifmeasurementplugin02',
- # 'stifmeasurementplugin03', 'stifmeasurementplugin04',
- # 'stifmeasurementplugin05' or 'stifbappeaprofiler'
-
-[End_Defaults]
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-
-
-
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-# Module configurations start
-# Modules are added between module tags
-# tags. Module name is specified after ModuleName= tag, like
-# ModuleName= XXXXXXXXX
-# Modules might have initialisation file, specified as
-# IniFile= c:\testframework\YYYYYY
-# Modules might have several configuration files, like
-# TestCaseFile= c:\testframework\NormalCases.txt
-# TestCaseFile= c:\testframework\SmokeCases.txt
-# TestCaseFile= c:\testframework\ManualCases.txt
-
-# (TestCaseFile is synonym for old term ConfigFile)
-
-# Following case specifies demo module settings. Demo module
-# does not read any settings from file, so tags
-# IniFile and TestCaseFile are not used.
-# In the simplest case it is enough to specify only the
-# name of the test module when adding new test module
-[New_Module]
-ModuleName= TestScripter
-TestCaseFile= c:\testframework\syserrcmdtest.cfg
-[End_Module]
-
-# Load testmoduleXXX, optionally with initialization file and/or test case files
-#[New_Module]
-#ModuleName= testmodulexxx
-
-#TestModuleXXX used initialization file
-#IniFile= c:\testframework\init.txt
-
-#TestModuleXXX used configuration file(s)
-#TestCaseFile= c:\testframework\testcases1.cfg
-#TestCaseFile= c:\testframework\testcases2.cfg
-#TestCaseFile= c:\testframework\manualtestcases.cfg
-
-#[End_Module]
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-
-
-
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-# Set STIFTestFramework logging overwrite parameters for Logger.
-# Hardware and emulator environment logging path and styles can
-# be configured from here to overwrite the Logger's implemented values.
-#
-# Settings description:
-# - Indicates option for creation log directory/directories. If log directory/directories
-# is/are not created by user they will make by software.
-# + YES, Create log directory/directories if not allready exist.
-# + NO, Log directory/directories not created. Only created one is used.
-#
-# - Overwrite emulator path setting.
-# + Example: If 'EmulatorBasePath= C:\LOGS\TestFramework\' and in code is defined
-# Logger's path 'D:\LOGS\Module\' with those definition the path
-# will be 'C:\LOGS\TestFramework\LOGS\Module\'
-#
-# - Overwrite emulator's logging format.
-# + TXT, Log file(s) will be txt type(s), for example 'Module.txt'.
-# + HTML, Log file(s) will be html type(s), for example 'Module.html'.
-#
-# - Overwrited emulator logging output source.
-# + FILE, Logging to file(s).
-# + RDEBUG, Logging to using rdebug(s).
-#
-# - Overwrite hardware path setting (Same description as above in emulator path).
-# - Overwrite hardware's logging format(Same description as above in emulator format).
-# - Overwrite hardware's logging output source(Same description as above in emulator output).
-#
-# - File Creation Mode indicates file overwriting if file exist.
-# + OVERWRITE, Overwrites if file(s) exist.
-# + APPEND, Continue logging after the old logging information if file(s) exist.
-#
-# - Will thread id include to the log filename.
-# + YES, Thread id to log file(s) name, Example filename 'Module_b9.txt'.
-# + NO, No thread id to log file(s), Example filename 'Module.txt'.
-#
-# - Will time stamps include the to log file.
-# + YES, Time stamp added to each line in log file(s). Time stamp is
-# for example'12.Nov.2003 115958 LOGGING INFO'
-# + NO, No time stamp(s).
-#
-# - Will line breaks include to the log file.
-# + YES, Each logging event includes line break and next log event is in own line.
-# + NO, No line break(s).
-#
-# - Will event ranking include to the log file.
-# + YES, Event ranking number added to each line in log file(s). Ranking number
-# depends on environment's tics, for example(includes time stamp also)
-# '012 12.Nov.2003 115958 LOGGING INFO'
-# + NO, No event ranking.
-#
-
-[Logger_Defaults]
-
-#NOTE: If you want to set Logger using next setting(s) remove comment(s)'#'
-#NOTE: TestEngine and TestServer logging settings cannot change here
-
-#CreateLogDirectories= YES # Possible values: YES or NO
-
-#EmulatorBasePath= C:\LOGS\TestFramework\
-#EmulatorFormat= HTML # Possible values: TXT or HTML
-#EmulatorOutput= FILE # Possible values: FILE or RDEBUG
-
-#HardwareBasePath= D:\LOGS\TestFramework\
-#HardwareFormat= HTML # Possible values: TXT or HTML
-#HardwareOutput= FILE # Possible values: FILE or RDEBUG
-
-#FileCreationMode= OVERWRITE # Possible values: OVERWRITE or APPEND
-
-#ThreadIdToLogFile= YES # Possible values: YES or NO
-#WithTimeStamp= YES # Possible values: YES or NO
-#WithLineBreak= YES # Possible values: YES or NO
-#WithEventRanking= YES # Possible values: YES or NO
-
-[End_Logger_Defaults]
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-
-# End of file
--- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/src/syserrcmdtest.cpp Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,343 +0,0 @@
-/*
-* 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:
-* CSysErrCmdTest class implementation.
-*
-*/
-
-#include <e32debug.h>
-#include <stifparser.h>
-#include <stiftestinterface.h>
-
-#include <aknglobalnote.h>
-#include <akncapserverclient.h>
-#include <ssm/ssmcustomcommand.h>
-
-#include "syserrcmdtest.h"
-#include "syserrcmdfactory.h"
-#include "syserrcmdtestsstub.h"
-#include "trace.h"
-
-// INTERNAL INCLUDES
-NONSHARABLE_CLASS( TWaitInfo )
- {
- public:
-
- CPeriodic* iPeriodic;
- CActiveSchedulerWait* iWait;
- };
-
-
-/**
-* Call back method when we need to stop active scheduler wait.
-*/
-LOCAL_C TInt WaitCallBack( TAny* aSelf )
- {
- if( aSelf )
- {
- TWaitInfo* info = static_cast<TWaitInfo*>( aSelf );
- if( info->iPeriodic )
- {
- info->iPeriodic->Cancel();
- }
- if( info->iWait )
- {
- if( info->iWait->IsStarted() )
- {
- info->iWait->AsyncStop();
- }
- }
- }
-
- return KErrNone;
- }
-
-/**
-* Helper method to wait current scheduler before teardown is completed.
-*/
-LOCAL_C void WaitL( TInt aIntervalInMicorseconds )
- {
- TWaitInfo info;
-
- // Construct periodic
- CPeriodic* periodic = CPeriodic::NewL( CActive::EPriorityStandard );
- CleanupStack::PushL( periodic );
- info.iPeriodic = periodic;
-
- // Construct active scheduler wait
- CActiveSchedulerWait* wait = new( ELeave ) CActiveSchedulerWait;
- CleanupStack::PushL( wait );
- info.iWait = wait;
-
- // Start timer and wait
- TCallBack cb( WaitCallBack, &info );
- periodic->Start( aIntervalInMicorseconds, aIntervalInMicorseconds, cb );
- wait->Start();
-
- // Cleanup
- CleanupStack::PopAndDestroy( wait );
- CleanupStack::PopAndDestroy( periodic );
- }
-
-// ---------------------------------------------------------
-// CSysErrCmdTest::LibEntryL
-// Returns: Poiter to CSysErrCmdTest class
-// ---------------------------------------------------------
-EXPORT_C CSysErrCmdTest* LibEntryL( CTestModuleIf& aTestModuleIf )
- {
- FUNC_LOG;
-
- CSysErrCmdTest* libEntry( CSysErrCmdTest::NewL( aTestModuleIf ) );
- return libEntry;
- }
-
-// ---------------------------------------------------------
-// CSysErrCmdTest::CSysErrCmdTest
-// ---------------------------------------------------------
-CSysErrCmdTest::CSysErrCmdTest( CTestModuleIf& aTestModuleIf ) :
- CScriptBase( aTestModuleIf )
- {
- FUNC_LOG;
- }
-
-// ---------------------------------------------------------
-// CSysErrCmdTest::ConstructL
-// ---------------------------------------------------------
-void CSysErrCmdTest::ConstructL()
- {
- FUNC_LOG;
-
- iExecuteHandler = CAsyncRequestHandler<CSysErrCmdTest>::NewL(
- *this,
- HandleIssueRequest,
- HandleRunL,
- HandleRunError,
- HandleDoCancel,
- CAsyncRequestHandler<CSysErrCmdTest>::ERequestOneShot );
-
- User::LeaveIfError( iFs.Connect() );
-
- iCustCmdEnvStub = SysErrCmdTestsStub::CustomCommandEnvStubL( iFs );
- }
-
-// ---------------------------------------------------------
-// CSysErrCmdTest::NewL
-// ---------------------------------------------------------
-CSysErrCmdTest* CSysErrCmdTest::NewL( CTestModuleIf& aTestModuleIf )
- {
- FUNC_LOG;
-
- CSysErrCmdTest* self = new (ELeave) CSysErrCmdTest( aTestModuleIf );
- CleanupStack::PushL( self );
- self->ConstructL();
- CleanupStack::Pop( self );
- return self;
- }
-
-// ---------------------------------------------------------
-// CSysErrCmdTest::~CSysErrCmdTest
-// ---------------------------------------------------------
-CSysErrCmdTest::~CSysErrCmdTest()
- {
- iFs.Close();
- delete iExecuteHandler;
- delete iCustCmdEnvStub;
- FUNC_LOG;
- }
-
-// ---------------------------------------------------------
-// CSysErrCmdTest::RunMethodL
-// ---------------------------------------------------------
-TInt CSysErrCmdTest::RunMethodL( CStifItemParser& aItem )
- {
- FUNC_LOG;
-
- const TStifFunctionInfo KFunctions[] =
- {
- // Copy this line for every implemented function.
- // First string is the function name used in TestScripter script file.
- // Second is the actual implementation member function.
- ENTRY( "CreateAndDestroy", CSysErrCmdTest::CreateAndDestroyL ),
- ENTRY( "InitAndClose", CSysErrCmdTest::InitAndCloseL ),
- ENTRY( "Execute", CSysErrCmdTest::ExecuteL ),
- ENTRY( "ExecuteCancel", CSysErrCmdTest::ExecuteCancelL ),
- ENTRY( "ExecuteAfterGlobalNote", CSysErrCmdTest::ShowAfterAknGlobalNoteL ),
- ENTRY( "ExecuteAfterUiServiceGlobalNote", CSysErrCmdTest::ShowAfterUiServerGlobalNoteL )
- };
- const TInt count( sizeof( KFunctions ) / sizeof( TStifFunctionInfo ) );
- TInt ret( RunInternalL( KFunctions, count, aItem ) );
- return ret;
- }
-
-// ---------------------------------------------------------
-// CSysErrCmdTest::CreateAndDestroyL
-// ---------------------------------------------------------
-
-TInt CSysErrCmdTest::CreateAndDestroyL( CStifItemParser& aItem )
- {
- FUNC_LOG;
- ( void )aItem;
- MSsmCustomCommand* sysErrCmd = SysErrCmdFactory::SysErrCmdNewL();
- sysErrCmd->Release();
- return KErrNone;
- }
-
-// ---------------------------------------------------------
-// CSysErrCmdTest::InitAndCloseL
-// ---------------------------------------------------------
-TInt CSysErrCmdTest::InitAndCloseL( CStifItemParser& aItem )
- {
- FUNC_LOG;
- ( void )aItem;
-
- MSsmCustomCommand* sysErrCmd = SysErrCmdFactory::SysErrCmdNewL();
-
- TInt err( sysErrCmd->Initialize( iCustCmdEnvStub ) );
- ERROR( err, "Failed to init syserrcmd" );
- User::LeaveIfError( err );
-
- sysErrCmd->Close();
- sysErrCmd->Release();
-
- return KErrNone;
- }
-// ---------------------------------------------------------
-// CSysErrCmdTest::ExecuteL
-// ---------------------------------------------------------
-
-TInt CSysErrCmdTest::ExecuteL( CStifItemParser& aItem )
- {
- FUNC_LOG;
- ( void )aItem;
- iSysErrCmd = SysErrCmdFactory::SysErrCmdNewL();
- TInt err( iSysErrCmd->Initialize( iCustCmdEnvStub ) );
- ERROR( err, "Failed to init syserrcmd" );
- User::LeaveIfError( err );
-
- iExecuteHandler->IssueRequest();
-
- WaitL( 5000 );
-
- iSysErrCmd->Close();
- iSysErrCmd->Release();
-
- INFO_1( "Execution result %d", iExecutionResult );
-
- return iExecutionResult;
- }
-
-// ---------------------------------------------------------
-// CSysErrCmdTest::ExecuteL
-// ---------------------------------------------------------
-
-TInt CSysErrCmdTest::ExecuteCancelL( CStifItemParser& aItem )
- {
- FUNC_LOG;
- ( void )aItem;
- iSysErrCmd = SysErrCmdFactory::SysErrCmdNewL();
- TInt err( iSysErrCmd->Initialize( iCustCmdEnvStub ) );
- ERROR( err, "Failed to init syserrcmd" );
- User::LeaveIfError( err );
-
- iExecuteHandler->IssueRequest();
-
- WaitL( 5000 );
-
- iSysErrCmd->ExecuteCancel();
-
- WaitL( 5000 );
-
- iSysErrCmd->Close();
- iSysErrCmd->Release();
-
- INFO_1( "ExecutionCancel result %d", iExecutionResult );
-
- return ( iExecutionResult == KErrCancel ) ? KErrNone : KErrGeneral;
- }
-
-// ---------------------------------------------------------
-// CSysErrCmdTest::ShowAfterAknGlobalNoteL
-// ---------------------------------------------------------
-TInt CSysErrCmdTest::ShowAfterAknGlobalNoteL( CStifItemParser& aItem )
- {
- CAknGlobalNote* note = CAknGlobalNote::NewLC();
- note->ShowNoteL( EAknGlobalInformationNote, _L("CAknGlobalNote::ShowNoteL()") );
- CleanupStack::PopAndDestroy( note );
-
- return ExecuteL( aItem );
- }
-
-// ---------------------------------------------------------
-// CSysErrCmdTest::ShowAfterUiServerGlobalNoteL
-// ---------------------------------------------------------
-TInt CSysErrCmdTest::ShowAfterUiServerGlobalNoteL( CStifItemParser& aItem )
- {
- RAknUiServer aknSrv;
-
- User::LeaveIfError( aknSrv.Connect() );
-
- CleanupClosePushL( aknSrv );
-
- aknSrv.ShowGlobalNoteL( _L("RAknUiServer::ShowGlobalNoteL()"), EAknGlobalInformationNote );
-
- CleanupStack::PopAndDestroy( &aknSrv );
-
- return ExecuteL( aItem );
- }
-
-// ---------------------------------------------------------
-// CSysErrCmdTest::HandleIssueRequest
-// ---------------------------------------------------------
-
-void CSysErrCmdTest::HandleIssueRequest( TRequestStatus& aRequest )
- {
- FUNC_LOG;
-
- iSysErrCmd->Execute( KNullDesC8, aRequest );
-
- }
-// ---------------------------------------------------------
-// CSysErrCmdTest::HandleRunL
-// ---------------------------------------------------------
-
-void CSysErrCmdTest::HandleRunL( TInt aStatus )
- {
- FUNC_LOG;
- INFO_1( "CSysErrCmdTest::HandleRunL %d", aStatus );
-
- if ( KErrNone != aStatus )
- {
- iExecutionResult = aStatus;
- }
- }
-// ---------------------------------------------------------
-// CSysErrCmdTest::HandleRunError
-// ---------------------------------------------------------
-
-TInt CSysErrCmdTest::HandleRunError( TInt aError )
- {
- FUNC_LOG;
- ERROR( aError, "CSysErrCmdTest::HandleRunError" );
- return KErrNone;
- }
-// ---------------------------------------------------------
-// CSysErrCmdTest::HandleDoCancel
-// ---------------------------------------------------------
-
-void CSysErrCmdTest::HandleDoCancel()
- {
- FUNC_LOG;
- }
-
-
--- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/bwins/syserrcmdtestsstubu.def Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-EXPORTS
- ?CustomCommandEnvStubL@SysErrCmdTestsStub@@SAPAVCSsmCustomCommandEnv@@AAVRFs@@@Z @ 1 NONAME ; class CSsmCustomCommandEnv * SysErrCmdTestsStub::CustomCommandEnvStubL(class RFs &)
- ?Rfs@CSsmCustomCommandEnv@@UBEABVRFs@@XZ @ 2 NONAME ; class RFs const & CSsmCustomCommandEnv::Rfs(void) const
-
--- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/eabi/syserrcmdtestsstubu.def Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
- _ZN18SysErrCmdTestsStub21CustomCommandEnvStubLER3RFs @ 1 NONAME
-
--- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/group/bld.inf Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/*
-* 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:
-* Build information file for ssmlangselcmdtest tests.
-*
-*/
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_TESTEXPORTS
-../inc/syserrcmdtestsstub.h |../../inc/syserrcmdtestsstub.h
-
-PRJ_TESTMMPFILES
-syserrcmdtestsstub.mmp
-
--- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/group/syserrcmdtestsstub.mmp Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-/*
-* 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:
-* Project definition file for ssmlangselcmdtest.
-*
-*/
-
-#include <platform_paths.hrh>
-
-TARGET syserrcmdtestsstub.dll
-TARGETTYPE dll
-
-UID 0x1000008D 0x101FB3E9
-VENDORID VID_DEFAULT
-CAPABILITY ALL -TCB
-
-SOURCEPATH ../src
-SOURCE ssmcustomcommandenvstub.cpp
-SOURCE syserrcmdtestsstub.cpp
-
-
-USERINCLUDE ../inc
-
-OS_LAYER_SYSTEMINCLUDE
-
-LIBRARY euser.lib
-
-
-
-
--- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/inc/syserrcmdtestsstub.h Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-/*
-* 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:
-* Declaration of SsmLangSelCmdTestStub class.
-*
-*/
-
-#ifndef SYSERRCMDTESTSSTUB_H
-#define SYSERRCMDTESTSSTUB_H
-
-#include <e32base.h>
-
-class CSsmCustomCommandEnv;
-class RFs;
-/**
-* Stub class for syserrcmd tests
-*
-*/
-NONSHARABLE_CLASS( SysErrCmdTestsStub )
- {
-public:
- /**
- * Methods for mapping p&s, cenrep and feature Uids
- *
- * @param aUid The Uid to map
- * @return The mapped Uid
- */
-
- IMPORT_C static CSsmCustomCommandEnv* CustomCommandEnvStubL( RFs& aRfs );
-
- };
-
-#endif // SYSERRCMDTESTSSTUB_H
--- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/src/ssmcustomcommandenvstub.cpp Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-/*
- * 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:
- *
- */
-
-// SYSTEM INCLUDES
-
-// USER INCLUDES
-#include <ssm/ssmcustomcommand.h>
-
-// ======== MEMBER FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-// C++ constructor.
-// ---------------------------------------------------------------------------
-//
-CSsmCustomCommandEnv::CSsmCustomCommandEnv( RFs& aRfs )
-:iFs( aRfs )
- {
-
- }
-
-
-// ---------------------------------------------------------------------------
-// Symbian two phased constructor.
-// ---------------------------------------------------------------------------
-//
-CSsmCustomCommandEnv* CSsmCustomCommandEnv::NewL( RFs& aRfs )
- {
- CSsmCustomCommandEnv* self = new ( ELeave ) CSsmCustomCommandEnv( aRfs );
- return self;
- }
-
-
-// ---------------------------------------------------------------------------
-// C++ destructor.
-// ---------------------------------------------------------------------------
-//
-CSsmCustomCommandEnv::~CSsmCustomCommandEnv()
- {
-
- }
-// ---------------------------------------------------------------------------
-// CSsmCustomCommandEnv::Rfs
-// ---------------------------------------------------------------------------
-//
-const RFs& CSsmCustomCommandEnv::Rfs() const
- {
- return iFs;
- }
-// End of file
--- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/src/syserrcmdtestsstub.cpp Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-/*
- * 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:
- *
- */
-
-// SYSTEM INCLUDES
-
-// USER INCLUDES
-#include "syserrcmdtestsstub.h"
-#include <ssm/ssmcustomcommand.h>
-
-// ---------------------------------------------------------------------------
-// C++ destructor.
-// ---------------------------------------------------------------------------
-//
-EXPORT_C CSsmCustomCommandEnv* SysErrCmdTestsStub::CustomCommandEnvStubL(
- RFs& aRfs )
- {
- return CSsmCustomCommandEnv::NewL( aRfs );
- }
-
-// End of file
--- a/startupservices/startupanimation/sanimctrl/group/sanimctrl.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/startupservices/startupanimation/sanimctrl/group/sanimctrl.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
+* 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"
@@ -37,7 +37,7 @@
APP_LAYER_SYSTEMINCLUDE // dependency to app layer (Profiles)
-LIBRARY avkon.lib
+
LIBRARY centralrepository.lib
LIBRARY cone.lib
LIBRARY efsrv.lib
@@ -46,3 +46,5 @@
LIBRARY featmgr.lib
LIBRARY mediatorclient.lib
LIBRARY sanimengine.lib
+
+SMPSAFE
--- a/startupservices/startupanimation/sanimctrl/src/sanimstartupctrl.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/startupservices/startupanimation/sanimctrl/src/sanimstartupctrl.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* 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"
@@ -16,15 +16,16 @@
*/
-#include <aknappui.h>
-#include <aknsoundsystem.h>
+
+ #include <eikappui.h>
+
#include <centralrepository.h>
#include <featmgr.h>
#include <MediatorDomainUIDs.h>
#include <Profile.hrh>
#include <ProfileEngineSDKCRKeys.h>
#include "sanimengine.h"
-#include <secondarydisplay/SecondaryDisplayStartupAPI.h>
+#include <SecondaryDisplay/SecondaryDisplayStartupAPI.h>
#include "sanimstartupctrl.h"
#include "trace.h"
@@ -35,7 +36,7 @@
const TInt KDefaultRepeatCount( 1 ); /** Default repeat count for animation and tone. */
const TInt KDefaultVolumeRamp( 0 ); /** Default volume ramp value in microseconds. */
-static const TInt KMediatorTimeout( 1000000 ); /** Default timeout for Mediator commands. */
+//static const TInt KMediatorTimeout( 1000000 ); /** Default timeout for Mediator commands. */
// ======== LOCAL FUNCTIONS ========
@@ -197,7 +198,7 @@
else if ( iCommandInitiator )
{
INFO_1( "Secondary display data: %d", iSyncCommand );
-
+
iClientStatus = &aStatus;
iWaitingForSyncResponse = ETrue;
TInt errorCode = iCommandInitiator->IssueCommand(
@@ -314,7 +315,7 @@
{
iWaitingForSyncResponse = EFalse;
StartAnimation();
- }
+ }
}
@@ -349,21 +350,7 @@
FeatureManager::FeatureSupported( KFeatureIdCoverDisplay );
FeatureManager::UnInitializeLib();
- if ( secondaryDisplaySupported )
- {
- iCommandInitiator = CMediatorCommandInitiator::NewL( this );
- iCommandResponder = CMediatorCommandResponder::NewL( this );
-
- TInt errorCode = iCommandResponder->RegisterCommand(
- KMediatorSecondaryDisplayDomain,
- SecondaryDisplay::KCatStartup,
- SecondaryDisplay::ECmdStartupPhaseSkip,
- TVersion( 0, 0, 0 ),
- ECapabilitySwEvent,
- KMediatorTimeout );
- ERROR( errorCode, "Failed to register command ECmdStartupPhaseSkip with mediator" );
- User::LeaveIfError( errorCode );
- }
+
CSAnimCtrl::BaseConstructL( aRect, aContainer );
}
@@ -504,7 +491,7 @@
if ( iPlayDefaultBeep )
{
INFO( "Default startup beep requested" );
-
+ /*
CAknAppUi* appUi = static_cast<CAknAppUi*>( iEikonEnv->EikAppUi() );
if ( appUi )
{
@@ -512,6 +499,7 @@
appUi->KeySounds()->PlaySound( EAvkonSIDPowerOnTone );
}
+ */
}
iEngine->Start( *iClientStatus );
--- a/startupservices/startupanimation/sanimengine/group/sanimengine.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/startupservices/startupanimation/sanimengine/group/sanimengine.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -44,3 +44,5 @@
LIBRARY ecom.lib
LIBRARY euser.lib
LIBRARY fbscli.lib
+
+SMPSAFE
--- a/startupservices/startupanimation/sanimihlplugin/group/sanimihlplugin.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/startupservices/startupanimation/sanimihlplugin/group/sanimihlplugin.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -45,3 +45,5 @@
LIBRARY euser.lib
LIBRARY ihl.lib
LIBRARY sanimengine.lib
+
+SMPSAFE
--- a/startupservices/startupanimation/sanimmmfplugin/group/sanimmmfplugin.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/startupservices/startupanimation/sanimmmfplugin/group/sanimmmfplugin.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -43,3 +43,5 @@
LIBRARY euser.lib
LIBRARY mediaclientaudio.lib
LIBRARY sanimengine.lib
+
+SMPSAFE
--- a/startupservices/startupanimation/sanimsvgplugin/group/sanimsvgplugin.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/startupservices/startupanimation/sanimsvgplugin/group/sanimsvgplugin.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -48,3 +48,5 @@
LIBRARY gdi.lib
LIBRARY sanimengine.lib
LIBRARY svgengine.lib
+
+SMPSAFE
--- a/sysdef_1_4_0.dtd Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,86 +0,0 @@
- <!ELEMENT SystemDefinition (systemModel?, build?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (logicalset* | module*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- levels CDATA #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT logicalset (logicalsubset* | module* | unit* | package* | prebuilt*)*>
- <!ATTLIST logicalset name CDATA #REQUIRED>
- <!ELEMENT logicalsubset (module* | unit* | package* | prebuilt*)*>
- <!ATTLIST logicalsubset name CDATA #REQUIRED>
- <!ELEMENT module (component* | unit* | package* | prebuilt*)*>
- <!ATTLIST module
- name CDATA #REQUIRED
- level CDATA #IMPLIED>
- <!ELEMENT component (unit* | package* | prebuilt*)*>
- <!ATTLIST component name CDATA #REQUIRED>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- unitID ID #REQUIRED
- name CDATA #REQUIRED
- mrp CDATA #REQUIRED
- filter CDATA #IMPLIED
- bldFile CDATA #REQUIRED
- priority CDATA #IMPLIED
- contract CDATA #IMPLIED>
- <!ELEMENT package EMPTY>
- <!ATTLIST package
- name CDATA #REQUIRED
- mrp CDATA #REQUIRED
- filter CDATA #IMPLIED
- contract CDATA #IMPLIED>
- <!ELEMENT prebuilt EMPTY>
- <!ATTLIST prebuilt
- name CDATA #REQUIRED
- version CDATA #REQUIRED
- late (Y|N) #IMPLIED
- filter CDATA #IMPLIED
- contract CDATA #IMPLIED>
- <!ELEMENT build (option* | target+ | targetList+ | unitList+ | configuration+)*>
- <!ELEMENT unitList (unitRef+)>
- <!ATTLIST unitList
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT unitRef EMPTY>
- <!ATTLIST unitRef unit IDREF #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y | N | y | n) #REQUIRED>
- <!ELEMENT configuration (unitListRef+ | layerRef+ | task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task ( unitListRef* , (buildLayer | specialInstructions))>
- <!ELEMENT unitListRef EMPTY>
- <!ATTLIST unitListRef unitList IDREF #REQUIRED>
- <!ELEMENT layerRef EMPTY>
- <!ATTLIST layerRef layerName CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y | N | y | n) #REQUIRED
- targetParallel (Y | N | y | n) #IMPLIED>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- command CDATA #REQUIRED>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysdef_1_5_1.dtd Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,88 @@
+ <!ELEMENT SystemDefinition (systemModel?, build?)>
+ <!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED>
+ <!ELEMENT systemModel (layer+)>
+ <!ELEMENT layer (logicalset* | module*)*>
+ <!ATTLIST layer
+ name CDATA #REQUIRED
+ levels CDATA #IMPLIED
+ span CDATA #IMPLIED>
+ <!ELEMENT logicalset (logicalsubset* | module* | unit* | package* | prebuilt*)*>
+ <!ATTLIST logicalset name CDATA #REQUIRED>
+ <!ELEMENT logicalsubset (module* | unit* | package* | prebuilt*)*>
+ <!ATTLIST logicalsubset name CDATA #REQUIRED>
+ <!ELEMENT module (component* | unit* | package* | prebuilt*)*>
+ <!ATTLIST module
+ name CDATA #REQUIRED
+ level CDATA #IMPLIED>
+ <!ELEMENT component (unit* | package* | prebuilt*)*>
+ <!ATTLIST component name CDATA #REQUIRED>
+ <!ELEMENT unit EMPTY>
+ <!ATTLIST unit
+ unitID ID #REQUIRED
+ name CDATA #REQUIRED
+ mrp CDATA #REQUIRED
+ filter CDATA #IMPLIED
+ bldFile CDATA #REQUIRED
+ priority CDATA #IMPLIED
+ contract CDATA #IMPLIED
+ proFile CDATA #IMPLIED
+ qmakeArgs CDATA #IMPLIED>
+ <!ELEMENT package EMPTY>
+ <!ATTLIST package
+ name CDATA #REQUIRED
+ mrp CDATA #REQUIRED
+ filter CDATA #IMPLIED
+ contract CDATA #IMPLIED>
+ <!ELEMENT prebuilt EMPTY>
+ <!ATTLIST prebuilt
+ name CDATA #REQUIRED
+ version CDATA #REQUIRED
+ late (Y|N) #IMPLIED
+ filter CDATA #IMPLIED
+ contract CDATA #IMPLIED>
+ <!ELEMENT build (option* | target+ | targetList+ | unitList+ | configuration+)*>
+ <!ELEMENT unitList (unitRef+)>
+ <!ATTLIST unitList
+ name ID #REQUIRED
+ description CDATA #REQUIRED>
+ <!ELEMENT unitRef EMPTY>
+ <!ATTLIST unitRef unit IDREF #REQUIRED>
+ <!ELEMENT targetList EMPTY>
+ <!ATTLIST targetList
+ name ID #REQUIRED
+ description CDATA #REQUIRED
+ target IDREFS #REQUIRED>
+ <!ELEMENT target EMPTY>
+ <!ATTLIST target
+ name ID #REQUIRED
+ abldTarget CDATA #REQUIRED
+ description CDATA #REQUIRED>
+ <!ELEMENT option EMPTY>
+ <!ATTLIST option
+ name ID #REQUIRED
+ abldOption CDATA #REQUIRED
+ description CDATA #REQUIRED
+ enable (Y | N | y | n) #REQUIRED>
+ <!ELEMENT configuration (unitListRef+ | layerRef+ | task+)*>
+ <!ATTLIST configuration
+ name ID #REQUIRED
+ description CDATA #REQUIRED
+ filter CDATA #REQUIRED>
+ <!ELEMENT task ( unitListRef* , (buildLayer | specialInstructions))>
+ <!ELEMENT unitListRef EMPTY>
+ <!ATTLIST unitListRef unitList IDREF #REQUIRED>
+ <!ELEMENT layerRef EMPTY>
+ <!ATTLIST layerRef layerName CDATA #REQUIRED>
+ <!ELEMENT buildLayer EMPTY>
+ <!ATTLIST buildLayer
+ command CDATA #REQUIRED
+ targetList IDREFS #IMPLIED
+ unitParallel (Y | N | y | n) #REQUIRED
+ targetParallel (Y | N | y | n) #IMPLIED>
+ <!ELEMENT specialInstructions EMPTY>
+ <!ATTLIST specialInstructions
+ name CDATA #REQUIRED
+ cwd CDATA #REQUIRED
+ command CDATA #REQUIRED>
--- a/sysresmonitoring/oodmonitor/group/OODMonitor.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oodmonitor/group/OODMonitor.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-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"
@@ -27,11 +27,12 @@
VENDORID VID_DEFAULT
+SYSTEMINCLUDE /epoc32/include/mw/hb/hbwidgets
USERINCLUDE ../inc
-APP_LAYER_SYSTEMINCLUDE
-
+//APP_LAYER_SYSTEMINCLUDE
+MW_LAYER_SYSTEMINCLUDE
SOURCEPATH ../src
SOURCE lafshut.cpp
@@ -40,7 +41,7 @@
LIBRARY efsrv.lib
LIBRARY bafl.lib
LIBRARY ws32.lib
-LIBRARY aknnotify.lib
+LIBRARY HbWidgets.lib
SOURCEPATH ../resource
START RESOURCE lafmemorywatcher.rss
@@ -49,4 +50,7 @@
LANGUAGE_IDS
END
+
+SMPSAFE
// End of file.
+
--- a/sysresmonitoring/oodmonitor/inc/Ood.h Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oodmonitor/inc/Ood.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-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"
@@ -20,7 +20,7 @@
#define LAFSHUT_H
// SYSTEM INCLUDES
-
+#include "hbdevicemessageboxsymbian.h"
// USER INCLUDES
// CONSTANTS
@@ -116,7 +116,8 @@
private:
TMessageType iMessageType;
CMessageInfo* iMessageInfo[4];
- CAknGlobalNote* iQuery;
+
+
};
// ======================================================================
--- a/sysresmonitoring/oodmonitor/oodmonitor2/group/OODMonitor.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oodmonitor/oodmonitor2/group/OODMonitor.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-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"
@@ -26,11 +26,13 @@
CAPABILITY CAP_GENERAL_DLL
VENDORID VID_DEFAULT
+SYSTEMINCLUDE /epoc32/include/mw/hb/hbwidgets
USERINCLUDE ../inc
USERINCLUDE ../../inc
-APP_LAYER_SYSTEMINCLUDE
+
+MW_LAYER_SYSTEMINCLUDE
SOURCEPATH ../src
@@ -45,13 +47,12 @@
LIBRARY efsrv.lib
LIBRARY bafl.lib
LIBRARY ws32.lib
-LIBRARY aknnotify.lib
-LIBRARY PlatformEnv.lib
+LIBRARY platformenv.lib
LIBRARY disknotifyhandler.lib
LIBRARY commonengine.lib
LIBRARY cone.lib
-LIBRARY avkon.lib
LIBRARY centralrepository.lib
+LIBRARY HbWidgets.lib
SOURCEPATH ../../resource
START RESOURCE LafMemoryWatcher.rss
@@ -67,4 +68,7 @@
LANGUAGE_IDS
END
+
+SMPSAFE
// End of file.
+
--- a/sysresmonitoring/oodmonitor/oodmonitor2/inc/outofdiskglobalnote.h Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oodmonitor/oodmonitor2/inc/outofdiskglobalnote.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-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"
@@ -22,7 +22,8 @@
// SYSTEM INCLUDES
#include <uiklaf/private/lafshut.h>
#include <coemain.h>
-#include <AknGlobalNote.h>
+#include "hbdevicemessageboxsymbian.h"
+
// USER INCLUDES
@@ -44,7 +45,7 @@
* @lib None
* @since S60 3.2
*/
-NONSHARABLE_CLASS(COutOfDiskGlobalNote) : public CActive
+NONSHARABLE_CLASS(COutOfDiskGlobalNote) : public MHbDeviceMessageBoxObserver
{
public:
COutOfDiskGlobalNote( COutOfDiskMonitor* aOutOfDiskMonitor, RFs& aFs );
@@ -52,20 +53,21 @@
~COutOfDiskGlobalNote();
void DisplayL(const TDesC& aMessage);
void ShowGlobalQueryL(TInt aStatus, TInt aDrive);
- void CancelNoteL();
TBool NoteOnDisplay();
TNoteInfo GetNoteInfo();
+
+ void MessageBoxClosed(const CHbDeviceMessageBoxSymbian* aMessageBox,
+ CHbDeviceMessageBoxSymbian::TButtonId aButton);
+
private:
void ConstructL();
HBufC* FormatStringL(const TDesC& aSource, const MDesCArray& aStrings);
- private: // From CActive
- void DoCancel();
- void RunL();
+
private: // Data
COutOfDiskMonitor* iOutOfDiskMonitor; //uses
RFs& iFs;
- CAknGlobalNote* iQuery;
RResourceFile iOODResourceFile;
TNoteInfo iNoteInfo;
+ CHbDeviceMessageBoxSymbian *iNote;
};
#endif //__OUTOFDISKGLOBALNOTE_H__
--- a/sysresmonitoring/oodmonitor/oodmonitor2/src/outofdiskglobalnote.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oodmonitor/oodmonitor2/src/outofdiskglobalnote.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-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"
@@ -18,16 +18,12 @@
// SYSTEM INCLUDES
#include <e32property.h>
-#include <AknGlobalNote.h>
-#include <secondarydisplay/AknSecondaryDisplayDefs.h>
-#include <aknSDData.h>
-#include <avkon.rsg>
#include <data_caging_path_literals.hrh>
#include <driveinfo.h>
#include <outofdiskmonitor.rsg>
#include <bautils.h> // BaflUtils
#include <StringLoader.h>
-#include <aknnotewrappers.h>
+
// USER INCLUDES
#include "UiklafInternalCRKeys.h"
@@ -60,10 +56,9 @@
COutOfDiskGlobalNote::~COutOfDiskGlobalNote()
{
TRACES("COutOfDiskGlobalNote::~COutOfDiskGlobalNote");
- delete iQuery;
iOODResourceFile.Close();
- Cancel(); // Cancel active object
- TRACES("COutOfDiskGlobalNote::~COutOfDiskGlobalNote: End");
+ delete iNote;
+ iNote=NULL;
}
// ---------------------------------------------------------
@@ -71,12 +66,10 @@
// ---------------------------------------------------------
//
COutOfDiskGlobalNote::COutOfDiskGlobalNote( COutOfDiskMonitor* aOutOfDiskMonitor, RFs& aFs ) :
- CActive( EPriorityStandard ),
iOutOfDiskMonitor( aOutOfDiskMonitor ),
iFs( aFs )
{
TRACES("COutOfDiskGlobalNote::COutOfDiskGlobalNote");
- CActiveScheduler::Add( this );
TRACES("COutOfDiskGlobalNote::COutOfDiskGlobalNote: End");
}
@@ -90,7 +83,7 @@
iNoteInfo.iNoteId = KErrNotFound;
iNoteInfo.iStatus = DISK_SPACE_OK;
iNoteInfo.iDrive = KErrNotFound;
-
+ iNote= CHbDeviceMessageBoxSymbian::NewL(CHbDeviceMessageBoxSymbian::EWarning);
TRACES("COutOfDiskGlobalNote::ConstructL: Open OOD resource file");
TFileName OODFileName;
OODFileName.Append(_L("Z"));
@@ -110,19 +103,13 @@
void COutOfDiskGlobalNote::DisplayL(const TDesC& aMessage)
{
TRACES("COutOfDiskGlobalNote::DisplayL");
- if (iNoteInfo.iNoteId > KErrNotFound)
- {
- CancelNoteL();
- }
-
- if (!iQuery)
- {
- TRACES("COutOfDiskGlobalNote::COutOfDiskGlobalNote::DisplayL: Create iQuery");
- iQuery = CAknGlobalNote::NewL();
- iQuery->SetSoftkeys(R_AVKON_SOFTKEYS_OK_EMPTY);
- }
- iNoteInfo.iNoteId = iQuery->ShowNoteL(iStatus, EAknGlobalWarningNote, aMessage);
- SetActive();
+
+ TRACES("COutOfDiskGlobalNote::COutOfDiskGlobalNote::DisplayL: set text and observer for the note");
+ iNote->SetTextL(aMessage);
+ iNote->SetObserver(this);
+ iNote->SetTimeout(0);
+ iNote->ShowL();
+
TRACES("COutOfDiskGlobalNote::DisplayL: End");
}
@@ -143,8 +130,7 @@
if (iOutOfDiskMonitor->GetGlobalNotesAllowed())
{
- TInt sdDialogId = 0;
-
+
TResourceReader resReader;
HBufC8* str(NULL);
CDesCArray* strings = new ( ELeave ) CDesCArrayFlat( 2 );
@@ -169,7 +155,6 @@
if (aDrive == iOutOfDiskMonitor->GetDefaultPhoneMemory())
{
- sdDialogId = EAknDiskWarnignNote;
str = iOODResourceFile.AllocReadLC(R_QTN_MEMLO_DEVICE_MEMORY_LOW);
resReader.SetBuffer(str);
strings->AppendL( driveName );
@@ -177,7 +162,6 @@
else if (driveStatus & DriveInfo::EDriveRemovable)
{
TRACES1("COutOfDiskGlobalNote::ShowGlobalQueryL: Warning note! volNameLength: %d", nameLength);
- sdDialogId = EAknMMCWarningNote;
TBufC<KMaxFileName> name(volInfo.iName);
if (nameLength)
{
@@ -196,7 +180,6 @@
}
else
{
- sdDialogId = EAknDiskWarnignNote;
str = iOODResourceFile.AllocReadLC(R_QTN_MEMLO_MASS_STORAGE_MEMORY_LOW);
resReader.SetBuffer(str);
strings->AppendL( driveName );
@@ -207,14 +190,12 @@
TRACES1("COutOfDiskGlobalNote::ShowGlobalQueryL: Critical note! Drive: %c", aDrive+'A');
if (aDrive == iOutOfDiskMonitor->GetDefaultPhoneMemory())
{
- sdDialogId = EAknDiskFullNote;
str = iOODResourceFile.AllocReadLC(R_QTN_MEMLO_DEVICE_MEMORY_FULL);
resReader.SetBuffer(str);
strings->AppendL( driveName );
}
else if (driveStatus & DriveInfo::EDriveRemovable)
{
- sdDialogId = EAknMMCFullNote;
TBufC<KMaxFileName> name(volInfo.iName);
if (nameLength)
{
@@ -233,26 +214,19 @@
}
else
{
- sdDialogId = EAknDiskFullNote;
str = iOODResourceFile.AllocReadLC(R_QTN_MEMLO_MASS_STORAGE_FULL);
resReader.SetBuffer(str);
strings->AppendL( driveName );
}
}
resReader.SetBuffer(str);
- HBufC* resHandle = resReader.ReadHBufCL();
+ HBufC* resHandle = resReader.ReadHBufCL();
CleanupStack::PushL( resHandle );
HBufC* message(FormatStringL(resHandle->Des(),*strings));
CleanupStack::PushL( message );
- TRACES1("COutOfDiskMonitor::ShowGlobalQueryL: txt: %S",message);
+ TRACES1("COutOfDiskMonitor::ShowGlobalQueryL: txt: %S",message);
DisplayL(message->Des());
- TBuf8<2> sdDriveName;
- sdDriveName.Append(aDrive+'A');
- sdDriveName.Append(_L8(":"));
- CAknSDData* sd = CAknSDData::NewL(KAknSecondaryDisplayCategory, sdDialogId, sdDriveName);
- iQuery->SetSecondaryDisplayData(sd);
-
iNoteInfo.iStatus = aStatus;
iNoteInfo.iDrive = aDrive;
CleanupStack::PopAndDestroy(message);
@@ -310,21 +284,13 @@
}
// -----------------------------------------------------------------------------
-// COutOfDiskGlobalNote::DoCancel
+// COutOfDiskGlobalNote::MessageBoxClosed
// -----------------------------------------------------------------------------
//
-void COutOfDiskGlobalNote::DoCancel()
+void COutOfDiskGlobalNote::MessageBoxClosed(const CHbDeviceMessageBoxSymbian* aMessageBox,
+ CHbDeviceMessageBoxSymbian::TButtonId aButton)
{
- TRACES("COutOfDiskGlobalNote::DoCancel");
- }
-
-// -----------------------------------------------------------------------------
-// COutOfDiskGlobalNote::RunL
-// -----------------------------------------------------------------------------
-//
-void COutOfDiskGlobalNote::RunL()
- {
- TRACES("COutOfDiskGlobalNote::RunL");
+ TRACES("COutOfDiskGlobalNote::closed");
iNoteInfo.iNoteId = KErrNotFound;
iNoteInfo.iStatus = DISK_SPACE_OK;
iNoteInfo.iDrive = KErrNotFound;
@@ -338,21 +304,6 @@
TRACES("COutOfDiskGlobalNote::RunL: End");
}
-// -----------------------------------------------------------------------------
-// COutOfDiskGlobalNote::CancelNoteL
-// -----------------------------------------------------------------------------
-//
-void COutOfDiskGlobalNote::CancelNoteL()
- {
- TRACES("COutOfDiskGlobalNote::CancelNoteL");
-
- if (iNoteInfo.iNoteId > KErrNotFound)
- {
- iQuery->CancelNoteL(iNoteInfo.iNoteId);
- }
- Cancel();
- TRACES("COutOfDiskGlobalNote::CancelNoteL: End");
- }
// -----------------------------------------------------------------------------
// COutOfDiskGlobalNote::NoteOnDisplay
--- a/sysresmonitoring/oodmonitor/src/lafshut.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oodmonitor/src/lafshut.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
@@ -24,10 +24,6 @@
#include <bautils.h>
#include <e32property.h>
#include <UikonInternalPSKeys.h>
-#include <aknglobalnote.h>
-#include <secondarydisplay/aknsecondarydisplaydefs.h>
-#include <aknsddata.h>
-#include <avkon.rsg>
#include <data_caging_path_literals.hrh>
#include <coreapplicationuisdomainpskeys.h>
@@ -726,7 +722,6 @@
CLafShutdownManager::CGlobalQueryActive::~CGlobalQueryActive()
{
TRACES("CLafShutdownManager::CGlobalQueryActive::~CGlobalQueryActive");
- delete iQuery;
delete iMessageInfo[ECritical];
delete iMessageInfo[EWarning];
delete iMessageInfo[EWarningMMC];
@@ -801,50 +796,21 @@
return;
}
- if (!iQuery)
- {
- iQuery = CAknGlobalNote::NewL();
- iQuery->SetSoftkeys(R_AVKON_SOFTKEYS_OK_EMPTY);
- }
-
- if (aType != ECallBack)
+ if (aType != ECallBack)
{
iMessageType = aType;
}
CleanupL();
- if (iMessageType != ENone && (iMessageInfo[iMessageType]->iNoteId == KErrNotFound || aForcedNote))
- {
- TInt dialogId = 0;
- switch(iMessageType)
- {
- case EWarning:
- dialogId = EAknDiskWarnignNote;
- break;
- case ECritical:
- dialogId = EAknDiskFullNote;
- break;
- case ECriticalMMC:
- dialogId = EAknMMCFullNote;
- break;
- default:
- dialogId = EAknMMCWarningNote;
- break;
- }
+
+ CHbDeviceMessageBoxSymbian* globalNote = CHbDeviceMessageBoxSymbian::NewL(CHbDeviceMessageBoxSymbian::EWarning);
+ CleanupStack::PushL(globalNote);
+ globalNote->SetTextL((iMessageInfo[iMessageType]->iMessage)->Des());
+ globalNote->SetTimeoutL(0);
+ globalNote->ExecL();
+ CleanupStack::PopAndDestroy(globalNote);
- CAknSDData* sd = CAknSDData::NewL(KAknSecondaryDisplayCategory, dialogId, KNullDesC8);
- iQuery->SetSecondaryDisplayData(sd);
-
- TInt noteid = iQuery->ShowNoteL(EAknGlobalWarningNote,
- (iMessageInfo[iMessageType]->iMessage)->Des());
-
- if (noteid != KErrNotFound) // Note was added to queue successfully.
- {
- iMessageInfo[iMessageType]->iNoteId = noteid;
- }
- }
-
iMessageType = ENone;
TRACES("CLafShutdownManager::CGlobalQueryActive::DisplayL: End");
}
@@ -877,11 +843,7 @@
break;
}
- if (cancelNoteId != KErrNotFound && aCancel)
- {
- iQuery->CancelNoteL(cancelNoteId);
- }
- }
+ }
TRACES("CLafShutdownManager::CGlobalQueryActive::CleanupL: End");
}
--- a/sysresmonitoring/oommonitor/bwins/oommonitorU.DEF Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/bwins/oommonitorU.DEF Tue Aug 31 15:24:25 2010 +0300
@@ -17,5 +17,4 @@
?RequestOptionalRam@ROomMonitorSession@@QAEHHHHAAH@Z @ 16 NONAME ; int ROomMonitorSession::RequestOptionalRam(int, int, int, int &)
?RequestOptionalRam@ROomMonitorSession@@QAEXHHHAAVTRequestStatus@@@Z @ 17 NONAME ; void ROomMonitorSession::RequestOptionalRam(int, int, int, class TRequestStatus &)
?SetOomPriority@ROomMonitorSession@@QAEXW4TOomPriority@1@@Z @ 18 NONAME ; void ROomMonitorSession::SetOomPriority(enum ROomMonitorSession::TOomPriority)
- ?AppId@COomMonitorPlugin@@UBE?BVTUid@@XZ @ 19 NONAME ; class TUid const COomMonitorPlugin::AppId(void) const
--- a/sysresmonitoring/oommonitor/data/oomconfig.xml Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/data/oomconfig.xml Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
<!--
- Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+ Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
All rights reserved.
This component and the accompanying materials are made available
under the terms of the License "Eclipse Public License v1.0"
--- a/sysresmonitoring/oommonitor/eabi/oommonitorU.DEF Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/eabi/oommonitorU.DEF Tue Aug 31 15:24:25 2010 +0300
@@ -23,5 +23,4 @@
_ZTV19COomMonitorPluginV2 @ 22 NONAME ; #<VT>#
_ZN18ROomMonitorSession18RequestOptionalRamEiiiR14TRequestStatus @ 23 NONAME
_ZN18ROomMonitorSession14SetOomPriorityENS_12TOomPriorityE @ 24 NONAME
- _ZNK17COomMonitorPlugin5AppIdEv @ 25 NONAME
--- a/sysresmonitoring/oommonitor/group/bld.inf Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/group/bld.inf Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/group/oommonitor.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/group/oommonitor.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/group/oommonitorlib.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/group/oommonitorlib.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/inc/OomTraces.h Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/inc/OomTraces.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/inc/oomactionconfig.h Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/inc/oomactionconfig.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/inc/oomactionconfig.inl Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/inc/oomactionconfig.inl Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/inc/oomactionref.h Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/inc/oomactionref.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/inc/oomappclosetimer.h Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/inc/oomappclosetimer.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/inc/oomappclosewatcher.h Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/inc/oomappclosewatcher.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/inc/oomapplicationconfig.inl Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/inc/oomapplicationconfig.inl Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/inc/oomclientrequestqueue.h Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/inc/oomclientrequestqueue.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/inc/oomcloseapp.inl Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/inc/oomcloseapp.inl Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/inc/oomcloseappconfig.h Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/inc/oomcloseappconfig.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/inc/oomcloseappconfig.inl Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/inc/oomcloseappconfig.inl Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/inc/oomconfigparser.h Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/inc/oomconfigparser.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/inc/oomconstants.hrh Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/inc/oomconstants.hrh Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/inc/oomforegroundrule.h Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/inc/oomforegroundrule.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/inc/oomforegroundrule.inl Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/inc/oomforegroundrule.inl Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/inc/oomglobalconfig.inl Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/inc/oomglobalconfig.inl Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/inc/oomidletimerule.h Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/inc/oomidletimerule.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/inc/oomidletimerule.inl Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/inc/oomidletimerule.inl Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/inc/oomlog.h Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/inc/oomlog.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/inc/oommemorymonitor.h Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/inc/oommemorymonitor.h Tue Aug 31 15:24:25 2010 +0300
@@ -19,9 +19,8 @@
#ifndef OOMMEMORYMONITOR_H
#define OOMMEMORYMONITOR_H
-#include <u32hal.h>
#include <e32property.h>
-#include <f32file.h>
+#include <e32svr.h>
#include <w32std.h>
#include "oomglobalconfig.h"
#include "oomwindowgrouplist.h"
--- a/sysresmonitoring/oommonitor/inc/oommemorymonitorserver.h Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/inc/oommemorymonitorserver.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/inc/oommemorymonitorsession.h Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/inc/oommemorymonitorsession.h Tue Aug 31 15:24:25 2010 +0300
@@ -42,7 +42,6 @@
#endif
CMemoryMonitor& Monitor();
void ServiceL(const RMessage2& aMessage);
-
private:
RMessagePtr2 iRequestFreeRam;
#ifndef CLIENT_REQUEST_QUEUE
--- a/sysresmonitoring/oommonitor/inc/oommonitorclientserver.h Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/inc/oommonitorclientserver.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/inc/oompanic.h Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/inc/oompanic.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/inc/oompluginwaiter.h Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/inc/oompluginwaiter.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/inc/oomruleconfig.h Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/inc/oomruleconfig.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/inc/oomrunplugin.h Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/inc/oomrunplugin.h Tue Aug 31 15:24:25 2010 +0300
@@ -63,20 +63,8 @@
private:
- COomRunPlugin(TUint aPluginId, COomRunPluginConfig& aConfig,
- MOomActionObserver& aStateChangeObserver,
- COomMonitorPlugin& aPlugin, COomMonitorPluginV2* aV2Plugin);
+ COomRunPlugin(TUint aPluginId, COomRunPluginConfig& aConfig, MOomActionObserver& aStateChangeObserver, COomMonitorPlugin& aPlugin, COomMonitorPluginV2* aV2Plugin);
- /**
- * Function: IsAppDataPaged
- * Checks whether the application which implements the given
- * COomMonitorPlugin is data paged
- * @param instance of the monitor plugin.
- * @return ETrue if the application is data paged, else EFalse;
- */
- TBool IsAppDataPaged( COomMonitorPlugin& aPlugin ) const;
-
-private:
TUint iPluginId;
COomMonitorPlugin& iPlugin;
--- a/sysresmonitoring/oommonitor/inc/oomrunplugin.inl Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/inc/oomrunplugin.inl Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/inc/oomrunpluginconfig.h Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/inc/oomrunpluginconfig.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/inc/oomrunpluginconfig.inl Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/inc/oomrunpluginconfig.inl Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/inc/oomsubscribehelper.h Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/inc/oomsubscribehelper.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/inc/oomwindowgrouplist.h Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/inc/oomwindowgrouplist.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/inc/oomwindowgrouplist.inl Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/inc/oomwindowgrouplist.inl Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/inc/oomwserveventreceiver.h Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/inc/oomwserveventreceiver.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/inc/traceconfiguration.hrh Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/inc/traceconfiguration.hrh Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/inc/tracedefs.h Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/inc/tracedefs.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/src/oomIdletimerule.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/src/oomIdletimerule.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/src/oomaction.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/src/oomaction.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/src/oomactionconfig.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/src/oomactionconfig.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/src/oomactionlist.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/src/oomactionlist.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -18,6 +18,7 @@
#include <hal.h>
+#include <u32hal.h>
#include <apgwgnam.h>
#include "oommonitorplugin.h"
@@ -696,7 +697,7 @@
COomRunPluginConfig& pluginConfig = aConfig.GetPluginConfig(iPluginListV2->Uid(pluginIndex));
// Create an action acording to the config
- COomRunPlugin* action = COomRunPlugin::NewL(iPluginListV2->Uid(pluginIndex), pluginConfig, *this, iPluginListV2->Implementation(pluginIndex), &(iPluginListV2->Implementation(pluginIndex)));
+ COomRunPlugin* action = COomRunPlugin::NewL(iPluginList->Uid(pluginIndex), pluginConfig, *this, iPluginListV2->Implementation(pluginIndex), &(iPluginListV2->Implementation(pluginIndex)));
iRunPluginActions.AppendL(action);
}
--- a/sysresmonitoring/oommonitor/src/oomactionref.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/src/oomactionref.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/src/oomappclosetimer.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/src/oomappclosetimer.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/src/oomappclosewatcher.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/src/oomappclosewatcher.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/src/oomclientrequestqueue.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/src/oomclientrequestqueue.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -193,13 +193,17 @@
{
RProcess processName;
err = clientThread.Process(processName);
- dataPaged = processName.DefaultDataPaged();
+ if(err == KErrNone)
+ {
+ dataPaged = processName.DefaultDataPaged();
+ processName.Close();
+ }
+ clientThread.Close();
}
else
{
OomMonitorPanic(KInvalidClientRequestType);
- }
-
+ }
switch (request->iClientRequestType)
{
--- a/sysresmonitoring/oommonitor/src/oomcloseapp.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/src/oomcloseapp.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -62,12 +62,17 @@
if (err == KErrNone)
{
RProcess process;
- thread.Process(process);
- TBool isDataPaged = process.DefaultDataPaged();
- if((aIsDataPaged && isDataPaged) || (!aIsDataPaged && !isDataPaged ))
+ err = thread.Process(process);
+ if(err == KErrNone)
{
- iCurrentTask.EndTask();
+ TBool isDataPaged = process.DefaultDataPaged();
+ if((aIsDataPaged && isDataPaged) || (!aIsDataPaged && !isDataPaged ))
+ {
+ iCurrentTask.EndTask();
+ }
+ process.Close();
}
+ thread.Close();
}
}
--- a/sysresmonitoring/oommonitor/src/oomcloseappconfig.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/src/oomcloseappconfig.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/src/oomconfig.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/src/oomconfig.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/src/oomforegroundrule.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/src/oomforegroundrule.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/src/oomglobalconfig.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/src/oomglobalconfig.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/src/oomlog.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/src/oomlog.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
@@ -22,6 +22,7 @@
#include <hal.h>
#include <w32std.h>
#include <e32std.h>
+#include <e32hal.h>
#include <apgwgnam.h>
#include <flogger.h>
--- a/sysresmonitoring/oommonitor/src/oommemorymonitor.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/src/oommemorymonitor.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -17,7 +17,7 @@
#include <hal.h>
-
+#include <u32hal.h>
#include <UikonInternalPSKeys.h>
--- a/sysresmonitoring/oommonitor/src/oommemorymonitorserver.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/src/oommemorymonitorserver.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/src/oommemorymonitorsession.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/src/oommemorymonitorsession.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -73,9 +73,12 @@
if(err == KErrNone)
{
dataPaged = processName.DefaultDataPaged();
+ processName.Close();
+ clientThread.Close();
}
else
{
+ clientThread.Close();
PanicClient(aMessage, EPanicIllegalFunction);
}
}
@@ -100,7 +103,8 @@
case EOomMonitorRequestFreeMemory:
if (!iRequestFreeRam.IsNull())
PanicClient(aMessage, EPanicRequestActive);
- // message will be completed when CloseAppsFinished() is called.
+ // message will be completed when CloseAppsFinished() is called.
+
#ifdef CLIENT_REQUEST_QUEUE
ClientRequestQueue().RequestFreeMemoryL(aMessage);
#else
@@ -124,6 +128,7 @@
if (!iRequestFreeRam.IsNull())
PanicClient(aMessage, EPanicRequestActive);
// message will be completed when CloseAppsFinished() is called.
+
#ifdef CLIENT_REQUEST_QUEUE
ClientRequestQueue().RequestOptionalRamL(aMessage);
#else
--- a/sysresmonitoring/oommonitor/src/oommonitor.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/src/oommonitor.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/src/oommonitorplugin.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/src/oommonitorplugin.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -87,16 +87,7 @@
return iMemoryMonitor->iWs;
}
-//-----------------------------------------------------------------------------
-// Function: AppId
-// Function returns the UID3 of the application which implements the
-// plugin
-//-----------------------------------------------------------------------------
-//
-EXPORT_C const TUid COomMonitorPlugin::AppId() const
- {
- return KNullUid;
- }
+
EXPORT_C void COomMonitorPluginV2::FreeRam()
{
@@ -146,15 +137,3 @@
}
while (wgId>0);
}
-
-//-----------------------------------------------------------------------------
-// Function: AppId
-// Function returns the UID3 of the application which implements the
-// plugin
-//-----------------------------------------------------------------------------
-//
-const TUid CAppOomMonitorPlugin::AppId() const
- {
- return iAppUid;
- }
-
--- a/sysresmonitoring/oommonitor/src/oommonitorsession.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/src/oommonitorsession.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/src/oomoutofmemorywatcher.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/src/oomoutofmemorywatcher.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -20,6 +20,7 @@
#include "oomoutofmemorywatcher.h"
#include "oommemorymonitor.h"
#include "OomTraces.h"
+#include <u32hal.h>
// ======================================================================
// class COutOfMemoryWatcher
--- a/sysresmonitoring/oommonitor/src/oompanic.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/src/oompanic.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/src/oompluginwaiter.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/src/oompluginwaiter.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/src/oomrunplugin.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/src/oomrunplugin.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -21,9 +21,6 @@
#include "oommonitorplugin.h"
#include "oompanic.h"
-#include <apgtask.h>
-#include <w32std.h>
-
COomRunPlugin* COomRunPlugin::NewL(TUint aPluginId, COomRunPluginConfig& aConfig, MOomActionObserver& aStateChangeObserver, COomMonitorPlugin& aPlugin, COomMonitorPluginV2* aV2Plugin)
{
FUNC_LOG;
@@ -37,40 +34,21 @@
// Run the OOM plugin in order to free memory
// Call the COomAction::MemoryFreed when it is done
-void COomRunPlugin::FreeMemory(TInt aBytesRequested, TBool aIsDataPaged)
+void COomRunPlugin::FreeMemory(TInt aBytesRequested, TBool)
{
FUNC_LOG;
- iFreeMemoryCalled = ETrue;
-
+ TRACES1("COomRunPlugin::FreeMemory: iPluginId = %x", iPluginId);
+
+ // Ask the plugin to free some memory
+
// Do we have a V2 plugin, if so then use it
if (iV2Plugin)
- {
- //RDebug::Printf("COomRunPlugin::FreeMemory: Requesting to free the RAM iV2Plugin->FreeRam(%d) \n",aBytesRequested);
iV2Plugin->FreeRam(aBytesRequested);
- }
- else if( aIsDataPaged )
- {
- if (IsAppDataPaged(iPlugin) )
- {
- //the plugins implemented by the application which are WDP enabled
- //are notified.
- //RDebug::Printf("COomRunPlugin::FreeMemory: Requesting to free the RAM to Data paged app \n");
- iPlugin.FreeRam();
- }
- else
- {
- //Request is for freeing the paged memory(swap) but the App(iPlugin belongs to)
- //is non WDP no need to notify; as it can't free the swap memory
- iFreeMemoryCalled = EFalse;
- return;
- }
- }
- else
- {
- //Unpaged memory will be freed in case of non WDP app
- //RDebug::Printf("COomRunPlugin::FreeMemory: Requesting to free the RAM \n");
+ else
+ // If we only have a V1 plugin then use that
iPlugin.FreeRam();
- }
+
+ iFreeMemoryCalled = ETrue;
// Wait for the required time before we signal completion.
__ASSERT_DEBUG(!iPluginWaiter->IsActive(), OomMonitorPanic(KStartingActivePluginWaiter));
@@ -116,50 +94,3 @@
iPluginWaiter = COomPluginWaiter::NewL(waitDuration, *this);
}
-
-//-----------------------------------------------------------------------------
-// Function: IsAppDataPaged
-// Checks whether the application which implements the given
-// COomMonitorPlugin is data paged
-//-----------------------------------------------------------------------------
-//
-TBool COomRunPlugin::IsAppDataPaged
- ( COomMonitorPlugin& aPlugin ) const
- {
- FUNC_LOG;
- /*
- /TRACES1("COomRunPlugin::IsAppDataPaged: aPlugin.AppId() = %x ", aPlugin.AppId() );
- //RDebug::Printf("COomRunPlugin::IsAppDataPaged: aPlugin.AppId() = %x ", aPlugin.AppId() );
- */
- //the function find the process with given appid and check
- //application supports the data paging.
- RProcess clientprocess;
- TApaTaskList taskList(aPlugin.WsSession());
- RThread clientthread;
- TInt err = clientthread.Open
- (taskList.FindApp(aPlugin.AppId()).ThreadId());
-
- //RDebug::Printf("COomRunPlugin::IsAppDataPaged: clientthread.Open() err = %d ", err );
-
- if( !err )
- {
- //getting the process which provides the plugin
- err = clientthread.Process(clientprocess);
- RDebug::Printf("COomRunPlugin::IsAppDataPaged: clientthread.Process() err = %d ", err );
-
- if( !err )
- {
- //checking whether the process is Data paged or not
- TBool isdatapaged = clientprocess.DefaultDataPaged();
- clientprocess.Close();
- clientthread.Close();
- //RDebug::Printf("COomRunPlugin::IsAppDataPaged: isdatapaged = %d ", isdatapaged );
-
- return isdatapaged;
- }
- clientthread.Close();
- }
- //could not successfully open the handle of process or thread,
- //the return EFalse
- return EFalse;
- }
--- a/sysresmonitoring/oommonitor/src/oomrunpluginconfig.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/src/oomrunpluginconfig.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/src/oomsubscribehelper.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/src/oomsubscribehelper.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/src/oomwindowgrouplist.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/src/oomwindowgrouplist.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/src/oomwserveventreceiver.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/src/oomwserveventreceiver.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/data/oomconfig.xml Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/data/oomconfig.xml Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
<!--
- Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+ Copyright (c) 2004-20010 Nokia Corporation and/or its subsidiary(-ies).
All rights reserved.
This component and the accompanying materials are made available
under the terms of the License "Eclipse Public License v1.0"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/group/bld.inf Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/group/bld.inf Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/group/oomtest.pkg Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/group/oomtest.pkg Tue Aug 31 15:24:25 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: ?Description
-;
-
;Languages
&EN
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/group/oomtest_manualtestrun.pkg Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/group/oomtest_manualtestrun.pkg Tue Aug 31 15:24:25 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: ?Description
-;
-
;Languages
&EN
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/stub/group/bld.inf Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/stub/group/bld.inf Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomallocserver/clisrc/client.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomallocserver/clisrc/client.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomallocserver/group/bld.inf Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomallocserver/group/bld.inf Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomallocserver/group/t_oomallocclient.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomallocserver/group/t_oomallocclient.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomallocserver/group/t_oomallocserver.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomallocserver/group/t_oomallocserver.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomallocserver/inc/CAllocManager.h Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomallocserver/inc/CAllocManager.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomallocserver/inc/clientserver.h Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomallocserver/inc/clientserver.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomallocserver/inc/server.h Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomallocserver/inc/server.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomallocserver/inc/t_oomclient.h Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomallocserver/inc/t_oomclient.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomallocserver/srvsrc/CAllocManager.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomallocserver/srvsrc/CAllocManager.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomallocserver/srvsrc/server.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomallocserver/srvsrc/server.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/data/t_oomdummyapp.rls Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/data/t_oomdummyapp.rls Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
@@ -44,6 +44,6 @@
#define qtn_about_dialog_title "About"
-#define qtn_about_dialog_text "t_oomdummyapp Version 1.0.0\n\nAuthor: \n\nSupport:\n"
+#define qtn_about_dialog_text "t_oomdummyapp Version 1.0.0\n\nAuthor: \n\nSupport: support@mycompany.com\n\n(c) Your copyright notice"
// End of File
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/data/t_oomdummyapp.rss Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/data/t_oomdummyapp.rss Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/data/t_oomdummyapp_reg.rss Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/data/t_oomdummyapp_reg.rss Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/group/Icons_scalable_dc.mk Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/group/Icons_scalable_dc.mk Tue Aug 31 15:24:25 2010 +0300
@@ -1,19 +1,3 @@
-#
-# Copyright (c) 2005 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:
-#
-
# ============================================================================
# Name : Icons_scalable_dc.mk
# Part of : t_oomdummyapp
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/group/bld.inf Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/group/bld.inf Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/group/t_oomdummyapp.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/group/t_oomdummyapp.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/help/build_help.mk Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/help/build_help.mk Tue Aug 31 15:24:25 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:
-#
-
# ============================================================================
# Name : build_help.mk
# Part of : t_oomdummyapp
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/inc/CMsgHandler.h Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/inc/CMsgHandler.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/inc/t_oomdummyapp.hrh Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/inc/t_oomdummyapp.hrh Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/inc/t_oomdummyapp.pan Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/inc/t_oomdummyapp.pan Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/inc/t_oomdummyappAppUi.h Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/inc/t_oomdummyappAppUi.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/inc/t_oomdummyappAppView.h Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/inc/t_oomdummyappAppView.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/inc/t_oomdummyappApplication.h Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/inc/t_oomdummyappApplication.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/inc/t_oomdummyappDocument.h Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/inc/t_oomdummyappDocument.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/inc/t_oomdummyappmsgs.h Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/inc/t_oomdummyappmsgs.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,20 +1,3 @@
-/*
-* Copyright (c) 2006 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:
-*
-*/
-
#ifndef T_OOMDUMMAPPMSGS_H_
#define T_OOMDUMMAPPMSGS_H_
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/sis/t_oomdummyapp_S60_3_X_v_1_0_0.pkg Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/sis/t_oomdummyapp_S60_3_X_v_1_0_0.pkg Tue Aug 31 15:24:25 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: ?Description
-;
-
; Installation file for t_oomdummyapp application
;
; This is an auto-generated PKG file by Carbide.
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/src/CMsgHandler.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/src/CMsgHandler.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/src/t_oomdummyapp.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/src/t_oomdummyapp.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/src/t_oomdummyappAppUi.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/src/t_oomdummyappAppUi.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
@@ -23,7 +23,6 @@
#include <aknmessagequerydialog.h>
#include <aknnotewrappers.h>
#include <stringloader.h>
-#include <f32file.h>
#include <s32file.h>
#include <hlplch.h>
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/src/t_oomdummyappAppView.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/src/t_oomdummyappAppView.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/src/t_oomdummyappApplication.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/src/t_oomdummyappApplication.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/src/t_oomdummyappDocument.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/src/t_oomdummyappDocument.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin/data/t_oomdummyplugin.rss Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin/data/t_oomdummyplugin.rss Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
@@ -19,7 +19,7 @@
-#include <ecom/registryinfo.rh>
+#include <ecom\registryinfo.rh>
#include <oommonitorplugin.hrh>
RESOURCE REGISTRY_INFO theInfo
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin/group/bld.inf Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin/group/bld.inf Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin/group/t_oomdummyplugin.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin/group/t_oomdummyplugin.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin/inc/debug.h Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin/inc/debug.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin/inc/dummyplugin.h Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin/inc/dummyplugin.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin/inc/t_oomdummyplugin_properties.h Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin/inc/t_oomdummyplugin_properties.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin/src/dummyplugin.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin/src/dummyplugin.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin/src/ecom_entry.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin/src/ecom_entry.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
@@ -18,7 +18,7 @@
-#include <ecom/implementationproxy.h>
+#include <ecom\implementationproxy.h>
#include "dummyplugin.h"
#define DECLARE_CREATE_INSTANCE(UID) CDummyOomPlugin* CreateInstance##UID() { return CDummyOomPlugin::NewL(UID); }
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin2/data/t_oomdummyplugin2.rss Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin2/data/t_oomdummyplugin2.rss Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
@@ -20,7 +20,7 @@
-#include <ecom/registryinfo.rh>
+#include <ecom\registryinfo.rh>
#include <oommonitorplugin.hrh>
RESOURCE REGISTRY_INFO theInfo
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin2/group/bld.inf Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin2/group/bld.inf Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin2/group/t_oomdummyplugin2.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin2/group/t_oomdummyplugin2.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin2/inc/debug.h Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin2/inc/debug.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin2/inc/dummyplugin2.h Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin2/inc/dummyplugin2.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin2/inc/t_oomdummyplugin_properties2.h Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin2/inc/t_oomdummyplugin_properties2.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin2/src/dummyplugin2.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin2/src/dummyplugin2.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin2/src/ecom_entry2.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin2/src/ecom_entry2.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
@@ -18,7 +18,7 @@
-#include <ecom/implementationproxy.h>
+#include <ecom\implementationproxy.h>
#include "dummyplugin2.h"
#define DECLARE_CREATE_INSTANCEV2(UID) CDummyOomPluginV2* CreateInstance##UID() { return CDummyOomPluginV2::NewL(UID); }
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness/group/bld.inf Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness/group/bld.inf Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness/group/t_oomharness.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness/group/t_oomharness.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness/inc/CDummyApplicationHandle.h Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness/inc/CDummyApplicationHandle.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness/inc/cleanuputils.h Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness/inc/cleanuputils.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness/inc/cleanuputils.inl Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness/inc/cleanuputils.inl Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness/inc/t_oomharness.h Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness/inc/t_oomharness.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness/sis/t_oomharness_EKA2.pkg Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness/sis/t_oomharness_EKA2.pkg Tue Aug 31 15:24:25 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: ?Description
-;
-
; Installation file for Symbian OS 9.x for generic console application
; Installation file for t_oomharness EXE
;
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness/src/CDummyApplicationHandle.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness/src/CDummyApplicationHandle.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness/src/t_oomharness.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness/src/t_oomharness.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness_stif/group/bld.inf Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness_stif/group/bld.inf Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness_stif/group/t_oomharness_stif.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness_stif/group/t_oomharness_stif.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness_stif/inc/CDummyApplicationHandle.h Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness_stif/inc/CDummyApplicationHandle.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness_stif/inc/t_oomharness.h Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness_stif/inc/t_oomharness.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness_stif/src/CDummyApplicationHandle.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness_stif/src/CDummyApplicationHandle.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness_stif/src/t_oomharness.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness_stif/src/t_oomharness.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness_stif/src/t_oomharnesscases.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness_stif/src/t_oomharnesscases.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/data/t_oomtestapp.rss Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/data/t_oomtestapp.rss Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/data/t_oomtestapp_reg.rss Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/data/t_oomtestapp_reg.rss Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/bld.inf Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/bld.inf Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/oomtestapps.pkg Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/oomtestapps.pkg Tue Aug 31 15:24:25 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: ?Description
-;
-
;Languages
&EN
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/t_oomtestapp.mmh Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/t_oomtestapp.mmh Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/t_oomtestapp.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/t_oomtestapp.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/t_oomtestapp10.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/t_oomtestapp10.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/t_oomtestapp2.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/t_oomtestapp2.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/t_oomtestapp3.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/t_oomtestapp3.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/t_oomtestapp4.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/t_oomtestapp4.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/t_oomtestapp5.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/t_oomtestapp5.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/t_oomtestapp6.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/t_oomtestapp6.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/t_oomtestapp7.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/t_oomtestapp7.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/t_oomtestapp8.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/t_oomtestapp8.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/t_oomtestapp9.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/t_oomtestapp9.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/appdefs/t_oomtestapp.hrh Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/appdefs/t_oomtestapp.hrh Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/appdefs10/t_oomtestapp.hrh Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/appdefs10/t_oomtestapp.hrh Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/appdefs2/t_oomtestapp.hrh Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/appdefs2/t_oomtestapp.hrh Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/appdefs3/t_oomtestapp.hrh Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/appdefs3/t_oomtestapp.hrh Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/appdefs4/t_oomtestapp.hrh Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/appdefs4/t_oomtestapp.hrh Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/appdefs5/t_oomtestapp.hrh Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/appdefs5/t_oomtestapp.hrh Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/appdefs6/t_oomtestapp.hrh Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/appdefs6/t_oomtestapp.hrh Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/appdefs7/t_oomtestapp.hrh Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/appdefs7/t_oomtestapp.hrh Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/appdefs8/t_oomtestapp.hrh Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/appdefs8/t_oomtestapp.hrh Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/appdefs9/t_oomtestapp.hrh Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/appdefs9/t_oomtestapp.hrh Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/t_oomtestappapplication.h Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/t_oomtestappapplication.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,20 +1,3 @@
-/*
-* Copyright (c) 2006 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:
-*
-*/
-
/*
============================================================================
Name : t_oomtestappApplication.h
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/t_oomtestappappui.h Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/t_oomtestappappui.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,20 +1,3 @@
-/*
-* Copyright (c) 2006 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:
-*
-*/
-
/*
============================================================================
Name : t_oomtestappAppUi.h
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/t_oomtestappappview.h Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/t_oomtestappappview.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,20 +1,3 @@
-/*
-* Copyright (c) 2006 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:
-*
-*/
-
/*
============================================================================
Name : t_oomtestappAppView.h
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/t_oomtestappcmd.hrh Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/t_oomtestappcmd.hrh Tue Aug 31 15:24:25 2010 +0300
@@ -1,20 +1,3 @@
-/*
-* Copyright (c) 2006 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:
-*
-*/
-
/*
============================================================================
Name : t_oomtestappcmd.hrh
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/t_oomtestappdocument.h Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/t_oomtestappdocument.h Tue Aug 31 15:24:25 2010 +0300
@@ -1,20 +1,3 @@
-/*
-* Copyright (c) 2006 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:
-*
-*/
-
/*
============================================================================
Name : t_oomtestappDocument.h
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/src/t_oomtestappapplication.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/src/t_oomtestappapplication.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/src/t_oomtestappappui.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/src/t_oomtestappappui.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
@@ -23,7 +23,6 @@
#include <aknquerydialog.h>
#include <commondialogs.hrh>
#include <akncommondialogsdynmem.h>
-#include <f32file.h>
#include <t_oomtestapp.rsg>
#include "t_oomtestappcmd.hrh"
#include "t_oomtestappApplication.h"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/src/t_oomtestappappview.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/src/t_oomtestappappview.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
--- a/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/src/t_oomtestappdocument.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/src/t_oomtestappdocument.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
Binary file systemsettings/GSAccessoryPlugin/conf/GSAccessoriesPlugin_101F8779.crml has changed
--- a/systemsettings/GSAccessoryPlugin/data/gsaccessoryplugin.rss Thu Aug 19 10:05:08 2010 +0300
+++ b/systemsettings/GSAccessoryPlugin/data/gsaccessoryplugin.rss Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-2008 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"
@@ -68,7 +68,7 @@
{
menu_pane = r_gs_menu_item_help;
},
- MENU_TITLE
+ MENU_TITLE
{
menu_pane = r_acc_menu_item_set_as_default;
},
@@ -83,7 +83,7 @@
// R_ACC_MENU_ITEM_SET_AS_DEFAULT
//----------------------------------------------------------------------------
//
- RESOURCE MENU_PANE r_acc_menu_item_set_as_default
+RESOURCE MENU_PANE r_acc_menu_item_set_as_default
{
items =
{
@@ -94,7 +94,7 @@
flags = EEikMenuItemSpecific;
}
};
- }
+ }
//----------------------------------------------------------------------------
// R_ACC_MAIN_VIEW_CAPTION
@@ -788,7 +788,7 @@
{
number = EAknSettingPageNoOrdinalDisplayed;
label = qtn_acc_sett_def_prof;
- softkey_resource = R_AVKON_SOFTKEYS_CANCEL;
+ softkey_resource = R_AVKON_SOFTKEYS_SELECT_CANCEL__SELECT;
type = EAknSetListBox;
editor_resource_id = r_setting_listbox;
}
--- a/systemsettings/GSAccessoryPlugin/group/GSAccessoryPlugin.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/systemsettings/GSAccessoryPlugin/group/GSAccessoryPlugin.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -104,3 +104,5 @@
#endif //__WINS
LIBRARY hlplch.lib // "Help" options menu
LIBRARY profileeng.lib // Profile Engine
+
+SMPSAFE
--- a/systemsettings/GSAccessoryPlugin/group/bld.inf Thu Aug 19 10:05:08 2010 +0300
+++ b/systemsettings/GSAccessoryPlugin/group/bld.inf Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2005-2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-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"
@@ -23,9 +23,9 @@
PRJ_EXPORTS
../cenrep/AccessoriesCRKeys.h MW_LAYER_PLATFORM_EXPORT_PATH( accessoriescrkeys.h )
-../rom/GSAccsPlugin.iby CORE_MW_LAYER_IBY_EXPORT_PATH( gsaccsplugin.iby )
-../rom/GSAccsPluginResources.iby LANGUAGE_MW_LAYER_IBY_EXPORT_PATH( gsaccspluginresources.iby )
-../loc/GSAccsPlugin.loc MW_LAYER_LOC_EXPORT_PATH( gsaccsplugin.loc )
+// ../rom/GSAccsPlugin.iby CORE_MW_LAYER_IBY_EXPORT_PATH( gsaccsplugin.iby )
+// ../rom/GSAccsPluginResources.iby LANGUAGE_MW_LAYER_IBY_EXPORT_PATH( gsaccspluginresources.iby )
+// ../loc/GSAccsPlugin.loc MW_LAYER_LOC_EXPORT_PATH( gsaccsplugin.loc )
// Configurations
../conf/GSAccessoriesPlugin.confml MW_LAYER_CONFML(gsaccessoriesplugin.confml)
@@ -35,7 +35,7 @@
../conf/GSAccessoriesPlugin_10207194.crml MW_LAYER_CRML(gsaccessoriesplugin_10207194.crml)
PRJ_MMPFILES
-GSAccessoryPlugin.mmp
+// GSAccessoryPlugin.mmp
PRJ_EXTENSIONS
START EXTENSION s60/mifconv
--- a/systemsettings/GSAccessoryPlugin/src/gsacctvoutview.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/systemsettings/GSAccessoryPlugin/src/gsacctvoutview.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-2008 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"
@@ -262,27 +262,28 @@
void CGSAccTvoutView::ChangeTvSystemSettingL()
{
FUNC_LOG;
+
TInt currentValue = iServerEngine->TvSystemL();
- // If PALM is not supported only toggle values
- // pal = 0, palm = 1, ntsc = 2
- TInt pal = 0;
- TInt ntsc = 2;
- if( !iModel.PalmSupport() )
+ // If PALM is not supported, index correction
+ if( !iModel.PalmSupport() && currentValue )
{
- iServerEngine->SetTvSystemL( currentValue == pal ? ntsc : pal );
- UpdateListBoxL( EGSSettIdTvSystem );
- iSettingChanged = ETrue;
- return;
+ currentValue--;
}
- // otherwise when palm is supported and more than two options
- // available show the dialog
if ( ShowRadioButtonSettingsPageL(
R_ACC_TV_SYSTEM_SETTING_PAGE,
- R_ACC_TV_SYSTEM_SETTING_PAGE_LBX,
+ iModel.PalmSupport() ?
+ R_ACC_TV_SYSTEM_SETTING_PAGE_LBX :
+ R_ACC_TV_SYSTEM_SETTING_PAGE_NO_PALM_LBX,
currentValue ) )
{
+ if( !iModel.PalmSupport() && currentValue )
+ {
+ //In case PALM support is missing fix the NTSC value index
+ currentValue++;
+ }
+
iServerEngine->SetTvSystemL( currentValue );
UpdateListBoxL( EGSSettIdTvSystem );
iSettingChanged = ETrue;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/systemsettings/accindicatorplugin/accindicatorplugin.pro Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,26 @@
+# #####################################################################
+# Automatically generated by qmake (2.01a) Thu Mar 25 11:36:36 2010
+# #####################################################################
+TEMPLATE = lib
+TARGET = accindicatorplugin
+CONFIG += plugin
+CONFIG += hb
+INCLUDEPATH += .
+DEPENDPATH += .
+INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE
+
+# Input
+HEADERS += inc/accindicator.h
+SOURCES += src/accindicator.cpp
+RESOURCES =
+symbian {
+ TARGET.EPOCALLOWDLLDATA = 1
+ TARGET.CAPABILITY = CAP_GENERAL_DLL
+ SYMBIAN_PLATFORMS = WINSCW ARMV5
+ TARGET.UID3 = 0x2001FE6C
+ pluginstub.sources = accindicatorplugin.dll
+ pluginstub.path = /resource/plugins/indicators
+ DEPLOYMENT += pluginstub
+}
+BLD_INF_RULES.prj_exports += "$${LITERAL_HASH}include <platform_paths.hrh>" \
+ "rom/accindicatorplugin.iby CORE_MW_LAYER_IBY_EXPORT_PATH(accindicatorplugin.iby)"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/systemsettings/accindicatorplugin/accindicatorsettings/accindicatorsettings.pro Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,44 @@
+######################################################################
+# Automatically generated by qmake (2.01a) Sun Apr 11 14:15:37 2010
+######################################################################
+TEMPLATE = app
+TARGET =
+DEPENDPATH += . inc resources src
+INCLUDEPATH += .
+CONFIG += Hb
+CONFIG += no_icon
+INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE
+
+# Input
+HEADERS += inc/tvoutview.h inc/headsetttyview.h
+SOURCES += src/main.cpp src/tvoutview.cpp src/headsetttyview.cpp
+RESOURCES += resources/resources.qrc
+
+LIBS += -lcentralrepository
+LIBS += -laccclient
+LIBS += -lacccontrol
+
+symbian {
+TARGET.UID3 = 0x2002EA56
+SYMBIAN_PLATFORMS = WINSCW ARMV5
+
+incBlock = \
+ "$${LITERAL_HASH}if ( defined (__WINS__) || defined (WINSCW) )" \
+ "LIBRARY gsserverenginestub.lib " \
+ "$${LITERAL_HASH}else " \
+ "LIBRARY gsserverengine.lib " \
+ "$${LITERAL_HASH}endif"
+
+ MMP_RULES += incBlock
+ }
+
+BLD_INF_RULES.prj_exports += "$${LITERAL_HASH}include <platform_paths.hrh>" \
+ "rom/accindicatorsettings.iby CORE_MW_LAYER_IBY_EXPORT_PATH(accindicatorsettings.iby)" \
+ "conf/GSAccessoriesPlugin.confml MW_LAYER_CONFML(gsaccessoriesplugin.confml)" \
+ "conf/GSAccessoriesPlugin_101F877D.crml MW_LAYER_CRML(gsaccessoriesplugin_101F877D.crml)" \
+ "conf/GSAccessoriesPlugin_101F8779.crml MW_LAYER_CRML(gsaccessoriesplugin_101F8779.crml)" \
+ "conf/GSAccessoriesPlugin_1020730B.crml MW_LAYER_CRML(gsaccessoriesplugin_1020730B.crml)" \
+ "conf/GSAccessoriesPlugin_10207194.crml MW_LAYER_CRML(gsaccessoriesplugin_10207194.crml)" \
+ "cenrep/AccessoriesCRKeys.h MW_LAYER_PLATFORM_EXPORT_PATH( accessoriescrkeys.h )" \
+ "resources/wired_accessory.svg /epoc32/data/z/resource/accindicator/wired_accessory.svg" \
+ "resources/wireless_accessory.svg /epoc32/data/z/resource/accindicator/wireless_accessory.svg"
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/systemsettings/accindicatorplugin/accindicatorsettings/cenrep/AccessoriesCRKeys.h Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,311 @@
+/*
+* 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: Header file for central repository keys, used in GSAccessoryPlugin, and GSServerEngine
+*
+*/
+
+#ifndef ACCESSORIESCRKEYS_H
+#define ACCESSORIESCRKEYS_H
+
+#include <e32def.h>
+
+/**
+* Accessory settings CR UID
+*/
+const TUid KCRUidAccessorySettings = {0x101F8779};
+
+/**
+* Automatic answer in carkit
+*
+* Possible values are:
+* 0 = No automatic answer in headset
+* 1 = Automatic answer in headset
+*/
+const TUint32 KSettingsCarKitAutomaticAnswer = 0x00000001;
+
+/**
+* Automatic answer in headset
+*
+* Possible values are:
+* 0 = No automatic answer in headset
+* 1 = Automatic answer in headset
+*/
+const TUint32 KSettingsHeadsetAutomaticAnswer = 0x00000002;
+
+/**
+* Automatic answer in bluetooth
+*
+* Possible values are:
+* 0 = No automatic answer in bluetooth
+* 1 = Automatic answer in bluetooth
+*/
+const TUint32 KSettingsBTAudioAutomaticAnswer = 0x00000003;
+
+/**
+* Information about if the loopset is in use.
+*
+* Possible values are:
+* 0 = Loopset is not in use
+* 1 = Loopset is in use
+*/
+const TUint32 KSettingsLoopsetInUse = 0x00000004;
+
+/**
+* Automatic answer in loopset
+*
+* Possible values are:
+* 0 = No automatic answer in loopset
+* 1 = Automatic answer in loopset
+*/
+const TUint32 KSettingsLoopsetAutomaticAnswer = 0x00000005;
+
+/**
+* Information about which accessory is in use.
+*
+* Possible values are:
+* 0 = headset
+* 1 = loopset
+* 2 = TTY
+**/
+const TUint32 KSettingsAccessoryInUse = 0x00000006;
+
+/**
+* Automatic answer in music stand
+*
+* Possible values are:
+* 0 = No automatic answer in music stand
+* 1 = Automatic answer in music stand
+*/
+const TUint32 KSettingsMusicStandAutomaticAnswer = 0x00000007;
+
+/**
+* Automatic answer in car kit
+*
+* Possible values are:
+* 0 = No automatic answer in car kit
+* 1 = Automatic answer in car kit
+*/
+const TUint32 KSettingsTTYAutomaticAnswer = 0x00000008;
+
+/**
+* Use loopset
+*
+* Possible values are:
+* 0 = Loopset not in use
+* 1 = Loopset in use
+*/
+const TUint32 KSettingsUseLoopset = 0x00000009;
+
+/**
+* Wireless Carkit automatic answer
+*
+* Possible values are:
+* 0 = Automatic answer is off
+* 1 = Automatic answer is on
+*/
+const TUint32 KSettingsWirelessCarkitAutomaticAnswer = 0x00000010;
+
+/**
+* Headset Ringing Tone Routing
+*
+* Possible values are:
+* 0 = Routing is Headset and Handset
+* 1 = Routing is Headset
+*/
+const TUint32 KSettingsHeadsetRingingToneRouting = 0x00000011;
+
+/**
+* Headphones Ringing Tone Routing
+*
+* Possible values are:
+* 0 = Routing is Headset and Handset
+* 1 = Routing is Headset
+*/
+const TUint32 KSettingsHeadphonesRingingToneRouting = 0x00000012;
+
+/**
+* Default Accessory.
+* Possible values are:
+* 0 = Headset
+* 1 = Headphones
+* 2 = Wired Car kit
+* 3 = Wireless carkit
+* 4 = Music Stand
+* 5 = Tvout
+* 6 = Loopset
+* 7 = Textphone
+*/
+const TUint32 KSettingsAccDefaultInfo = 0x00000013;
+
+/**
+* Wired carkit accessory support
+*
+* Possible values are:
+* 0 = accessory is not supported
+* 1 = accessory is supported
+*/
+const TUint32 KSettingsAccWiredCarkitSupported = 0x00000014;
+
+/**
+* Wireless carkit accessory support
+*
+* Possible values are:
+* 0 = accessory is not supported
+* 1 = accessory is supported
+*/
+const TUint32 KSettingsAccWirelessCarkitSupported = 0x00000015;
+
+/**
+* Loopset accessory support
+*
+* Possible values are:
+* 0 = accessory is not supported
+* 1 = accessory is supported
+*/
+const TUint32 KSettingsAccLoopsetSupported = 0x00000016;
+
+/**
+* Profile settings CR UID.
+*/
+const TUid KCRUidProfileSettings = {0x101F877D};
+
+/**
+* Bluetooth default profile, profile id.
+*
+*/
+const TUint32 KSettingsBTDefaultProfile = 0x00000001;
+
+/**
+* Headset default profile, profile id.
+*/
+const TUint32 KSettingsHeadsetDefaultProfile = 0x00000002;
+
+/**
+* TTY default profile, profile id.
+*/
+const TUint32 KSettingsTTYDefaultProfile = 0x00000003;
+
+/**
+* Loopset default profile, profile id.
+*/
+const TUint32 KSettingsLoopsetDefaultProfile = 0x00000004;
+
+/**
+* Music Stand default profile, profile id.
+*/
+const TUint32 KSettingsMusicStandDefaultProfile = 0x00000005;
+
+/**
+* Car Kit default profile, profile id.
+*/
+const TUint32 KSettingsCarKitDefaultProfile = 0x00000006;
+
+/**
+* Wireless Car Kit default profile, profile id.
+*/
+const TUint32 KSettingsWirelessCarkitDefaultProfile = 0x00000007;
+
+/**
+* Headphones default profile, profile id.
+*/
+const TUint32 KSettingsHeadphonesDefaultProfile = 0x00000008;
+
+/**
+* Tv out default profile, profile id.
+*/
+const TUint32 KSettingsTvOutDefaultProfile = 0x00000009;
+
+/**
+* Settings for Lights features
+*/
+const TUid KCRUidAccessoryLightSettings = {0x10207194};
+
+/**
+* Defines the display light duration for Music Stand accessory.
+*
+* 0 = (Normal)
+* 1 = (Always ON)
+*/
+const TUint32 KSettingsMusicStandLights = 0x00000001;
+
+/**
+* Defines the display light duration for Car kit accessory.
+*
+* 0 = (Normal)
+* 1 = (Always ON)
+*/
+const TUint32 KSettingsCarKitLights = 0x00000002;
+
+
+/** Following keys belong to category KCRUidTvoutSettings */
+
+/**
+* TV-out settings CR UID
+*/
+const TUid KCRUidTvoutSettings = {0x1020730B};
+
+/**
+* TV-out aspect ratio.
+* Possible values are:
+* 0 = 4x3
+* 1 = 16x9
+*/
+const TUint32 KSettingsTvAspectRatio = 0x00000001;
+
+/**
+* TV-out system info.
+* Possible values are:
+* 0 = PAL
+* 1 = PALM
+* 2 = NTSC
+*/
+const TUint32 KSettingsTvSystemInfo = 0x00000002;
+
+/**
+* TV-out default text.
+* String value.
+*/
+const TUint32 KSettingsTvDefaultText = 0x00000003;
+
+
+/**
+* TV-out Flicker Filter.
+* Possible values are:
+* 0 = Off
+* 1 = On
+*/
+const TUint32 KSettingsTvoutFlickerFilter = 0x00000004;
+
+/**
+* TV-out Horizontal overscan
+* Default value: 500
+*/
+const TUint32 KSettingsTvoutHorizontalOverscan = 0x00000005;
+
+/**
+* TV-out Vertical overscan
+* Default value: 500
+*/
+const TUint32 KSettingsTvoutVerticalOverscan = 0x00000006;
+
+/**
+* PALM option visibility
+* 0 = not visible (default)
+* 1 = visible
+*/
+const TUint32 KSettingsTvoutPalmVisibility = 0x00000007;
+
+
+
+#endif // ACCESSORIESCRKEYS_H
Binary file systemsettings/accindicatorplugin/accindicatorsettings/conf/GSAccessoriesPlugin.confml has changed
Binary file systemsettings/accindicatorplugin/accindicatorsettings/conf/GSAccessoriesPlugin_101F8779.crml has changed
Binary file systemsettings/accindicatorplugin/accindicatorsettings/conf/GSAccessoriesPlugin_101F877D.crml has changed
Binary file systemsettings/accindicatorplugin/accindicatorsettings/conf/GSAccessoriesPlugin_10207194.crml has changed
Binary file systemsettings/accindicatorplugin/accindicatorsettings/conf/GSAccessoriesPlugin_1020730B.crml has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/systemsettings/accindicatorplugin/accindicatorsettings/inc/headsetttyview.h Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,56 @@
+/*
+ * 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:
+ *
+ */
+
+#ifndef HEADSETTTYVIEW_H
+#define HEADSETTTYVIEW_H
+
+#include <hbmainwindow.h>
+#include <QObject>
+#include <centralrepository.h>
+#include <AccessorySettings.h>
+#include <AccessoryServer.h>
+
+class CRepository;
+class CGSServerEngine;
+
+class HeadsetTtyView : public QObject
+ {
+ Q_OBJECT
+
+public:
+ HeadsetTtyView(HbMainWindow *window,int);
+ ~HeadsetTtyView();
+
+private slots:
+ void currentIndexModified(int);
+private:
+ int currentValue;
+ TInt defaultaccessory;
+
+ // Handle to the Central Repository.
+ CRepository* iAccessoryRepository;
+
+ /** Accessory server connection. */
+ RAccessoryServer iAccServer;
+
+ /** Accessory settings connection. */
+ RAccessorySettings iAccessorySettings;
+
+public:
+ };
+
+#endif // HEADSETTTYVIEW_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/systemsettings/accindicatorplugin/accindicatorsettings/inc/tvoutview.h Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,42 @@
+/*
+ * 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:
+ *
+ */
+
+#ifndef TVOUTVIEW_H
+#define TVOUTVIEW_H
+
+#include <hbmainwindow.h>
+#include <QObject>
+#include <GSServerEngine.h>
+
+class TvOutView : public QObject
+ {
+ Q_OBJECT
+
+public:
+ TvOutView(HbMainWindow *window,int);
+ ~TvOutView();
+
+private slots:
+ void currentIndexModified(int);
+private:
+ int currentValue;
+ CGSServerEngine* iServerEngine;
+
+public:
+ };
+
+#endif // TVOUTVIEW_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/systemsettings/accindicatorplugin/accindicatorsettings/resources/headset.docml Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<hbdocument version="0.4">
+ <widget name="view" type="HbView">
+ <widget name="content_1" role="HbView:widget" type="HbWidget">
+ <widget name="container" type="HbWidget">
+ <widget name="container_1" type="HbWidget">
+ <widget name="image" type="HbLabel">
+ <icon iconName=":/images/flower2.png" name="icon"/>
+ <sizehint height="5.223880745727788un" type="PREFERRED" width="7.014925572834458un"/>
+ </widget>
+ <widget name="label" type="HbLabel">
+ <sizehint height="4.4776120677666755un" type="PREFERRED" width="14.925373559222251un"/>
+ <string name="text" value="Headset"/>
+ <zvalue value="1.0"/>
+ </widget>
+ <sizehint height="23.8806un" type="PREFERRED" width="23.8806un"/>
+ <zvalue value="0.0"/>
+ <layout type="anchor" widget="container_1">
+ <anchoritem dst="image" dstEdge="LEFT" spacing="0.7462713220388874un" src="" srcEdge="LEFT"/>
+ <anchoritem dst="image" dstEdge="BOTTOM" spacing="-6.368150860990008un" src="" srcEdge="BOTTOM"/>
+ <anchoritem dst="label" dstEdge="LEFT" spacing="9.701492813494463un" src="" srcEdge="LEFT"/>
+ <anchoritem dst="label" dstEdge="TOP" spacing="3.283582183028895un" src="" srcEdge="TOP"/>
+ </layout>
+ </widget>
+ <widget name="container_2" type="HbWidget">
+ <widget name="label_2" type="HbLabel">
+ <sizehint height="4.4776120677666755un" type="PREFERRED" width="14.925373559222251un"/>
+ <string name="text" value="Accesory type"/>
+ <zvalue value="1.0"/>
+ </widget>
+ <widget name="label_3" type="HbLabel">
+ <sizehint height="4.4776120677666755un" type="PREFERRED" width="14.925373559222251un"/>
+ <zvalue value="2.0"/>
+ </widget>
+ <widget name="combobox" type="HbComboBox">
+ <sizehint height="4.4776120677666755un" type="PREFERRED" width="27.1641798777845un"/>
+ <zvalue value="3.0"/>
+ </widget>
+ <sizehint height="23.8806un" type="PREFERRED" width="23.8806un"/>
+ <zvalue value="0.0"/>
+ <layout type="anchor" widget="container_2">
+ <anchoritem dst="label_2" dstEdge="LEFT" spacing="1.3432836203300027un" src="" srcEdge="LEFT"/>
+ <anchoritem dst="label_2" dstEdge="TOP" spacing="-0.44776120677666753un" src="" srcEdge="TOP"/>
+ <anchoritem dst="label_3" dstEdge="LEFT" spacing="1.19402988473778un" src="" srcEdge="LEFT"/>
+ <anchoritem dst="label_3" dstEdge="BOTTOM" spacing="-0.6467661875662969un" src="" srcEdge="BOTTOM"/>
+ <anchoritem dst="combobox" dstEdge="RIGHT" spacing="-21.194030454095596un" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="combobox" dstEdge="BOTTOM" spacing="-5.373134481320008un" src="" srcEdge="BOTTOM"/>
+ </layout>
+ </widget>
+ <sizehint height="32.68656809469673un" type="PREFERRED" width="52.23880745727788un"/>
+ <zvalue value="0.0"/>
+ <layout orientation="Vertical" type="linear">
+ <linearitem itemname="container_1"/>
+ <linearitem itemname="container_2"/>
+ </layout>
+ </widget>
+ <zvalue value="0.0"/>
+ <layout type="anchor" widget="content_1">
+ <anchoritem dst="container" dstEdge="LEFT" spacing="0.59701un" src="" srcEdge="LEFT"/>
+ <anchoritem dst="container" dstEdge="TOP" spacing="0.0un" src="" srcEdge="TOP"/>
+ </layout>
+ </widget>
+ <string name="title" value="Accessory"/>
+ </widget>
+ <metadata display="QHD portrait" unit="un"/>
+</hbdocument>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/systemsettings/accindicatorplugin/accindicatorsettings/resources/qtg_large_wire_connect.svg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="60px" height="60px" viewBox="0 0 60 60" enable-background="new 0 0 60 60" xml:space="preserve">
+<defs>
+</defs>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="29.9995" y1="37.8149" x2="29.9995" y2="57.768">
+ <stop offset="0" style="stop-color:#707070"/>
+ <stop offset="0.7939" style="stop-color:#080808"/>
+ <stop offset="1" style="stop-color:#585858"/>
+</linearGradient>
+<path fill="url(#SVGID_1_)" d="M12.208,58c-0.875,0-1.592-0.717-1.592-1.594L9.022,43.764c0-0.875,0.682-1.814,1.516-2.084
+ l10.381-3.373c0.833-0.27,2.232-0.492,3.108-0.492h11.944c0.877,0,2.275,0.223,3.109,0.492l10.381,3.373
+ c0.834,0.27,1.516,1.209,1.516,2.084l-1.594,12.643c0,0.877-0.715,1.594-1.592,1.594H12.208z"/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="30.0005" y1="38.6118" x2="30.0005" y2="56.9895">
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="1" style="stop-color:#1A1A1A"/>
+</linearGradient>
+<path fill="url(#SVGID_2_)" d="M12.208,57.204c-0.438,0-0.796-0.357-0.796-0.797L9.819,43.764c0-0.531,0.46-1.164,0.965-1.328
+ l10.366-3.367c0.773-0.248,2.084-0.457,2.878-0.457h11.944c0.795,0,2.105,0.209,2.863,0.455l10.396,3.375
+ c0.49,0.158,0.951,0.791,0.951,1.322l-1.594,12.643c0,0.439-0.357,0.797-0.797,0.797H12.208z"/>
+<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="30" y1="40.2036" x2="30" y2="55.4324">
+ <stop offset="0" style="stop-color:#707070"/>
+ <stop offset="1" style="stop-color:#323232"/>
+</linearGradient>
+<path fill="url(#SVGID_3_)" d="M13.005,55.61l-1.593-11.699l10.198-3.314c0.638-0.207,1.782-0.393,2.418-0.393h11.944
+ c0.637,0,1.766,0.18,2.371,0.377l10.246,3.332L46.997,55.61H13.005z"/>
+<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="25.5205" y1="8.5112" x2="34.4795" y2="8.5112">
+ <stop offset="0" style="stop-color:#A8B1B3"/>
+ <stop offset="0.3818" style="stop-color:#FFFFFF"/>
+ <stop offset="0.7091" style="stop-color:#686E70"/>
+ <stop offset="1" style="stop-color:#A6B0B3"/>
+</linearGradient>
+<polygon fill="url(#SVGID_4_)" points="30.474,2 29.452,2 25.521,5.596 25.521,15.022 34.479,15.022 34.479,5.596 "/>
+<polygon opacity="0.6" fill="#FFFFFF" points="30.474,2 29.452,2 25.521,5.596 25.521,6.391 29.452,2.796 30.474,2.796
+ 34.479,6.391 34.479,5.596 "/>
+<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="24.8237" y1="26.0845" x2="35.1768" y2="26.0845">
+ <stop offset="0" style="stop-color:#A8B1B3"/>
+ <stop offset="0.3818" style="stop-color:#FFFFFF"/>
+ <stop offset="0.7091" style="stop-color:#686E70"/>
+ <stop offset="1" style="stop-color:#A6B0B3"/>
+</linearGradient>
+<rect x="24.824" y="14.354" fill="url(#SVGID_5_)" width="10.353" height="23.46"/>
+<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="24.8237" y1="22.1709" x2="35.1768" y2="22.1709">
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="0.3818" style="stop-color:#7A7A7A"/>
+ <stop offset="0.7091" style="stop-color:#1A1A1A"/>
+ <stop offset="1" style="stop-color:#4D4D4D"/>
+</linearGradient>
+<rect x="24.824" y="19.782" fill="url(#SVGID_6_)" width="10.353" height="4.777"/>
+<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="24.8237" y1="29.0718" x2="35.1768" y2="29.0718">
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="0.3818" style="stop-color:#7A7A7A"/>
+ <stop offset="0.7091" style="stop-color:#1A1A1A"/>
+ <stop offset="1" style="stop-color:#4D4D4D"/>
+</linearGradient>
+<rect x="24.824" y="27.877" fill="url(#SVGID_7_)" width="10.353" height="2.389"/>
+<rect x="24.824" y="30.266" opacity="0.3" fill="#FFFFFF" width="10.353" height="0.797"/>
+<rect x="24.824" y="36.985" opacity="0.3" width="10.353" height="0.797"/>
+<rect x="24.824" y="36.19" opacity="0.15" width="10.353" height="0.795"/>
+<rect x="24.824" y="24.56" opacity="0.3" fill="#FFFFFF" width="10.353" height="0.796"/>
+<rect x="24.824" y="14.354" opacity="0.6" fill="#FFFFFF" width="10.353" height="0.797"/>
+<rect x="24.824" y="15.948" opacity="0.15" fill="#FFFFFF" width="10.353" height="0.797"/>
+<rect x="24.824" y="15.152" opacity="0.3" fill="#FFFFFF" width="10.353" height="0.796"/>
+<rect fill="none" width="60.001" height="60"/>
+</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/systemsettings/accindicatorplugin/accindicatorsettings/resources/qtg_large_wlan.svg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g>
+<rect fill="none" height="60" width="60"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="24.43" x2="35.83" y1="31.4" y2="31.4">
+<stop offset="0" stop-color="#DBDBDB"/>
+<stop offset="0.1" stop-color="#DBDBDB"/>
+<stop offset="0.68" stop-color="#919191"/>
+<stop offset="1" stop-color="#B8B8B8"/>
+</linearGradient>
+<path d="M35.525,46.779h-11l3-28.25c0-1.381,1.119-2.5,2.5-2.5l0,0c1.381,0,2.5,1.119,2.5,2.5 L35.525,46.779z" fill="url(#SVGID_1)"/>
+<polygon fill-opacity="0.2" points="24.724,44.779 35.327,44.779 35.228,43.779 24.823,43.779 "/>
+<polygon fill-opacity="0.1" points="24.823,43.779 35.228,43.779 35.129,42.779 24.922,42.779 "/>
+<polygon fill-opacity="0.3" points="24.624,45.779 35.427,45.779 35.327,44.779 24.724,44.779 "/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="15.62" x2="44.54" y1="48.81" y2="48.81">
+<stop offset="0" stop-color="#F2F2F2"/>
+<stop offset="1" stop-color="#919191"/>
+</linearGradient>
+<path d="M44.525,51.814v-3c0-1.657-1.344-3-3-3h-23c-1.656,0-3,1.343-3,3v3H44.525z" fill="url(#SVGID_2)"/>
+<path d="M41.525,45.814h-23c-1.656,0-3,1.343-3,3v1c0-1.657,1.344-3,3-3h23c1.656,0,3,1.343,3,3v-1 C44.525,47.157,43.182,45.814,41.525,45.814z" fill="#FFFFFF" fill-opacity="0.5"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="13.24" x2="13.39" y1="8.21" y2="30.15">
+<stop offset="0" stop-color="#C6FF45"/>
+<stop offset="0.73" stop-color="#66A00E"/>
+<stop offset="1" stop-color="#387300"/>
+</linearGradient>
+<path d="M13.918,8.287l3.23,3.228c-4.215,4.214-4.213,11.071,0,15.285l-3.229,3.229 C7.926,24.033,7.926,14.281,13.918,8.287z" fill="url(#SVGID_3)"/>
+<path d="M21.246,12.379l3.229,3.228c-1.959,1.958-1.959,5.144,0,7.101l-3.229,3.229 C17.508,22.199,17.508,16.117,21.246,12.379z" fill="url(#SVGID_3)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5" x1="13.29" x2="13.29" y1="29.77" y2="4.35">
+<stop offset="0" stop-color="#AAE535"/>
+<stop offset="1" stop-color="#5D9C0A"/>
+</linearGradient>
+<path d="M13.92,29.029c-2.87-2.871-4.351-6.604-4.472-10.372c-0.133,4.102,1.348,8.246,4.472,11.372 l3.229-3.229c-0.169-0.169-0.319-0.349-0.475-0.525L13.92,29.029z" fill="url(#SVGID_5)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6" x1="21.46" x2="21.46" y1="25.95" y2="13.77">
+<stop offset="0" stop-color="#AAE535"/>
+<stop offset="1" stop-color="#5D9C0A"/>
+</linearGradient>
+<path d="M21.246,24.936c-1.742-1.741-2.661-3.992-2.78-6.278c-0.136,2.619,0.784,5.283,2.78,7.278 l3.229-3.229c-0.171-0.171-0.309-0.362-0.449-0.55L21.246,24.936z" fill="url(#SVGID_6)"/>
+<path d="M13.918,9.287l2.756,2.753c0.155-0.177,0.306-0.356,0.475-0.525l-3.23-3.228 c-3.123,3.124-4.603,7.269-4.47,11.37C9.569,15.889,11.049,12.157,13.918,9.287z" fill="#FFFFFF" fill-opacity="0.6"/>
+<path d="M21.246,13.379l2.779,2.778c0.141-0.188,0.278-0.379,0.449-0.551l-3.229-3.228 c-1.996,1.996-2.916,4.66-2.78,7.278C18.585,17.372,19.504,15.121,21.246,13.379z" fill="#FFFFFF" fill-opacity="0.6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7" x1="46.76" x2="46.61" y1="8.21" y2="30.15">
+<stop offset="0" stop-color="#C6FF45"/>
+<stop offset="0.73" stop-color="#66A00E"/>
+<stop offset="1" stop-color="#387300"/>
+</linearGradient>
+<path d="M46.082,8.287l-3.23,3.228c4.215,4.214,4.213,11.071,0,15.285l3.229,3.229 C52.074,24.033,52.074,14.281,46.082,8.287z" fill="url(#SVGID_7)"/>
+<path d="M38.754,12.379l-3.229,3.228c1.959,1.958,1.959,5.144,0,7.101l3.229,3.229 C42.492,22.199,42.492,16.117,38.754,12.379z" fill="url(#SVGID_7)"/>
+<path d="M46.08,29.029c2.87-2.871,4.351-6.604,4.472-10.372c0.133,4.102-1.348,8.246-4.472,11.372 L42.852,26.8c0.169-0.169,0.319-0.349,0.475-0.525L46.08,29.029z" fill="url(#SVGID_5)"/>
+<path d="M38.754,24.936c1.742-1.741,2.661-3.992,2.78-6.278c0.136,2.619-0.784,5.283-2.78,7.278 l-3.229-3.229c0.171-0.171,0.309-0.362,0.449-0.55L38.754,24.936z" fill="url(#SVGID_6)"/>
+<path d="M46.082,9.287l-2.756,2.753c-0.155-0.177-0.306-0.356-0.475-0.525l3.23-3.228 c3.123,3.124,4.603,7.269,4.47,11.37C50.431,15.889,48.951,12.157,46.082,9.287z" fill="#FFFFFF" fill-opacity="0.6"/>
+<path d="M38.754,13.379l-2.779,2.778c-0.141-0.188-0.278-0.379-0.449-0.551l3.229-3.228 c1.996,1.996,2.916,4.66,2.78,7.278C41.415,17.372,40.496,15.121,38.754,13.379z" fill="#FFFFFF" fill-opacity="0.6"/>
+<rect fill-opacity="0.1" height="1" width="29" x="15.525" y="50.814"/>
+</g>
+</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/systemsettings/accindicatorplugin/accindicatorsettings/resources/resources.qrc Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,10 @@
+<RCC>
+ <qresource prefix="/xml" >
+ <file alias="headset.docml" >headset.docml</file>
+ <file alias="tvout.docml" >tvout.docml</file>
+ </qresource>
+ <qresource prefix="/images" >
+ <file>wired_accessory.svg</file>
+ <file>wireless_accessory.svg</file>
+ </qresource>
+</RCC>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/systemsettings/accindicatorplugin/accindicatorsettings/resources/tvout.docml Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<hbdocument version="0.4">
+ <widget name="view" type="HbView">
+ <widget name="content_1" role="HbView:widget" type="HbWidget">
+ <widget name="container" type="HbWidget">
+ <widget name="container_1" type="HbWidget">
+ <widget name="image" type="HbLabel">
+ <icon iconName=":/images/wired_accessory.svg" name="icon"/>
+ <sizehint height="5.223880745727788un" type="PREFERRED" width="7.014925572834458un"/>
+ </widget>
+ <widget name="label" type="HbLabel">
+ <sizehint height="4.4776120677666755un" type="PREFERRED" width="14.925373559222251un"/>
+ <string name="text" value="TV Out"/>
+ <zvalue value="1.0"/>
+ </widget>
+ <sizehint height="23.8806un" type="PREFERRED" width="23.8806un"/>
+ <zvalue value="0.0"/>
+ <layout type="anchor" widget="container_1">
+ <anchoritem dst="image" dstEdge="LEFT" spacing="0.7462713220388874un" src="" srcEdge="LEFT"/>
+ <anchoritem dst="image" dstEdge="BOTTOM" spacing="-5.323374711844449un" src="" srcEdge="BOTTOM"/>
+ <anchoritem dst="label" dstEdge="LEFT" spacing="12.089552582970024un" src="" srcEdge="LEFT"/>
+ <anchoritem dst="label" dstEdge="TOP" spacing="3.1343284474366726un" src="" srcEdge="TOP"/>
+ </layout>
+ </widget>
+ <widget name="container_3" type="HbWidget">
+ <widget name="label_4" type="HbLabel">
+ <sizehint height="4.4776120677666755un" type="PREFERRED" width="19.850746833765594un"/>
+ <string name="text" value="TV Aspect Ratio"/>
+ <zvalue value="1.0"/>
+ </widget>
+ <widget name="combobox" type="HbComboBox">
+ <sizehint height="5.970149423688901un" type="PREFERRED" width="26.71641867100783un"/>
+ <zvalue value="2.0"/>
+ </widget>
+ <sizehint height="23.8806un" type="PREFERRED" width="23.8806un"/>
+ <zvalue value="0.0"/>
+ <layout type="anchor" widget="container_3">
+ <anchoritem dst="label_4" dstEdge="LEFT" spacing="2.089552298291115un" src="" srcEdge="LEFT"/>
+ <anchoritem dst="label_4" dstEdge="TOP" spacing="0.2985074711844451un" src="" srcEdge="TOP"/>
+ <anchoritem dst="combobox" dstEdge="LEFT" spacing="2.089552298291115un" src="" srcEdge="LEFT"/>
+ <anchoritem dst="combobox" dstEdge="BOTTOM" spacing="-1.9402985626988927un" src="" srcEdge="BOTTOM"/>
+ </layout>
+ </widget>
+ <sizehint height="31.044777003182283un" type="PREFERRED" width="52.23880745727788un"/>
+ <zvalue value="0.0"/>
+ <layout orientation="Vertical" type="linear">
+ <linearitem itemname="container_1"/>
+ <linearitem itemname="container_3"/>
+ </layout>
+ </widget>
+ <zvalue value="0.0"/>
+ <layout type="anchor" widget="content_1">
+ <anchoritem dst="container" dstEdge="LEFT" spacing="0.59701un" src="" srcEdge="LEFT"/>
+ <anchoritem dst="container" dstEdge="TOP" spacing="0.0un" src="" srcEdge="TOP"/>
+ </layout>
+ </widget>
+ <string name="title" value="Accessory"/>
+ </widget>
+ <metadata display="QHD portrait" unit="un"/>
+</hbdocument>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/systemsettings/accindicatorplugin/accindicatorsettings/resources/wired_accessory.svg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="60px" height="60px" viewBox="0 0 60 60" enable-background="new 0 0 60 60" xml:space="preserve">
+<defs>
+</defs>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="29.9995" y1="37.8149" x2="29.9995" y2="57.768">
+ <stop offset="0" style="stop-color:#707070"/>
+ <stop offset="0.7939" style="stop-color:#080808"/>
+ <stop offset="1" style="stop-color:#585858"/>
+</linearGradient>
+<path fill="url(#SVGID_1_)" d="M12.208,58c-0.875,0-1.592-0.717-1.592-1.594L9.022,43.764c0-0.875,0.682-1.814,1.516-2.084
+ l10.381-3.373c0.833-0.27,2.232-0.492,3.108-0.492h11.944c0.877,0,2.275,0.223,3.109,0.492l10.381,3.373
+ c0.834,0.27,1.516,1.209,1.516,2.084l-1.594,12.643c0,0.877-0.715,1.594-1.592,1.594H12.208z"/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="30.0005" y1="38.6118" x2="30.0005" y2="56.9895">
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="1" style="stop-color:#1A1A1A"/>
+</linearGradient>
+<path fill="url(#SVGID_2_)" d="M12.208,57.204c-0.438,0-0.796-0.357-0.796-0.797L9.819,43.764c0-0.531,0.46-1.164,0.965-1.328
+ l10.366-3.367c0.773-0.248,2.084-0.457,2.878-0.457h11.944c0.795,0,2.105,0.209,2.863,0.455l10.396,3.375
+ c0.49,0.158,0.951,0.791,0.951,1.322l-1.594,12.643c0,0.439-0.357,0.797-0.797,0.797H12.208z"/>
+<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="30" y1="40.2036" x2="30" y2="55.4324">
+ <stop offset="0" style="stop-color:#707070"/>
+ <stop offset="1" style="stop-color:#323232"/>
+</linearGradient>
+<path fill="url(#SVGID_3_)" d="M13.005,55.61l-1.593-11.699l10.198-3.314c0.638-0.207,1.782-0.393,2.418-0.393h11.944
+ c0.637,0,1.766,0.18,2.371,0.377l10.246,3.332L46.997,55.61H13.005z"/>
+<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="25.5205" y1="8.5112" x2="34.4795" y2="8.5112">
+ <stop offset="0" style="stop-color:#A8B1B3"/>
+ <stop offset="0.3818" style="stop-color:#FFFFFF"/>
+ <stop offset="0.7091" style="stop-color:#686E70"/>
+ <stop offset="1" style="stop-color:#A6B0B3"/>
+</linearGradient>
+<polygon fill="url(#SVGID_4_)" points="30.474,2 29.452,2 25.521,5.596 25.521,15.022 34.479,15.022 34.479,5.596 "/>
+<polygon opacity="0.6" fill="#FFFFFF" points="30.474,2 29.452,2 25.521,5.596 25.521,6.391 29.452,2.796 30.474,2.796
+ 34.479,6.391 34.479,5.596 "/>
+<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="24.8237" y1="26.0845" x2="35.1768" y2="26.0845">
+ <stop offset="0" style="stop-color:#A8B1B3"/>
+ <stop offset="0.3818" style="stop-color:#FFFFFF"/>
+ <stop offset="0.7091" style="stop-color:#686E70"/>
+ <stop offset="1" style="stop-color:#A6B0B3"/>
+</linearGradient>
+<rect x="24.824" y="14.354" fill="url(#SVGID_5_)" width="10.353" height="23.46"/>
+<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="24.8237" y1="22.1709" x2="35.1768" y2="22.1709">
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="0.3818" style="stop-color:#7A7A7A"/>
+ <stop offset="0.7091" style="stop-color:#1A1A1A"/>
+ <stop offset="1" style="stop-color:#4D4D4D"/>
+</linearGradient>
+<rect x="24.824" y="19.782" fill="url(#SVGID_6_)" width="10.353" height="4.777"/>
+<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="24.8237" y1="29.0718" x2="35.1768" y2="29.0718">
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="0.3818" style="stop-color:#7A7A7A"/>
+ <stop offset="0.7091" style="stop-color:#1A1A1A"/>
+ <stop offset="1" style="stop-color:#4D4D4D"/>
+</linearGradient>
+<rect x="24.824" y="27.877" fill="url(#SVGID_7_)" width="10.353" height="2.389"/>
+<rect x="24.824" y="30.266" opacity="0.3" fill="#FFFFFF" width="10.353" height="0.797"/>
+<rect x="24.824" y="36.985" opacity="0.3" width="10.353" height="0.797"/>
+<rect x="24.824" y="36.19" opacity="0.15" width="10.353" height="0.795"/>
+<rect x="24.824" y="24.56" opacity="0.3" fill="#FFFFFF" width="10.353" height="0.796"/>
+<rect x="24.824" y="14.354" opacity="0.6" fill="#FFFFFF" width="10.353" height="0.797"/>
+<rect x="24.824" y="15.948" opacity="0.15" fill="#FFFFFF" width="10.353" height="0.797"/>
+<rect x="24.824" y="15.152" opacity="0.3" fill="#FFFFFF" width="10.353" height="0.796"/>
+<rect fill="none" width="60.001" height="60"/>
+</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/systemsettings/accindicatorplugin/accindicatorsettings/resources/wireless_accessory.svg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g>
+<rect fill="none" height="60" width="60"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="24.43" x2="35.83" y1="31.4" y2="31.4">
+<stop offset="0" stop-color="#DBDBDB"/>
+<stop offset="0.1" stop-color="#DBDBDB"/>
+<stop offset="0.68" stop-color="#919191"/>
+<stop offset="1" stop-color="#B8B8B8"/>
+</linearGradient>
+<path d="M35.525,46.779h-11l3-28.25c0-1.381,1.119-2.5,2.5-2.5l0,0c1.381,0,2.5,1.119,2.5,2.5 L35.525,46.779z" fill="url(#SVGID_1)"/>
+<polygon fill-opacity="0.2" points="24.724,44.779 35.327,44.779 35.228,43.779 24.823,43.779 "/>
+<polygon fill-opacity="0.1" points="24.823,43.779 35.228,43.779 35.129,42.779 24.922,42.779 "/>
+<polygon fill-opacity="0.3" points="24.624,45.779 35.427,45.779 35.327,44.779 24.724,44.779 "/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="15.62" x2="44.54" y1="48.81" y2="48.81">
+<stop offset="0" stop-color="#F2F2F2"/>
+<stop offset="1" stop-color="#919191"/>
+</linearGradient>
+<path d="M44.525,51.814v-3c0-1.657-1.344-3-3-3h-23c-1.656,0-3,1.343-3,3v3H44.525z" fill="url(#SVGID_2)"/>
+<path d="M41.525,45.814h-23c-1.656,0-3,1.343-3,3v1c0-1.657,1.344-3,3-3h23c1.656,0,3,1.343,3,3v-1 C44.525,47.157,43.182,45.814,41.525,45.814z" fill="#FFFFFF" fill-opacity="0.5"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="13.24" x2="13.39" y1="8.21" y2="30.15">
+<stop offset="0" stop-color="#C6FF45"/>
+<stop offset="0.73" stop-color="#66A00E"/>
+<stop offset="1" stop-color="#387300"/>
+</linearGradient>
+<path d="M13.918,8.287l3.23,3.228c-4.215,4.214-4.213,11.071,0,15.285l-3.229,3.229 C7.926,24.033,7.926,14.281,13.918,8.287z" fill="url(#SVGID_3)"/>
+<path d="M21.246,12.379l3.229,3.228c-1.959,1.958-1.959,5.144,0,7.101l-3.229,3.229 C17.508,22.199,17.508,16.117,21.246,12.379z" fill="url(#SVGID_3)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5" x1="13.29" x2="13.29" y1="29.77" y2="4.35">
+<stop offset="0" stop-color="#AAE535"/>
+<stop offset="1" stop-color="#5D9C0A"/>
+</linearGradient>
+<path d="M13.92,29.029c-2.87-2.871-4.351-6.604-4.472-10.372c-0.133,4.102,1.348,8.246,4.472,11.372 l3.229-3.229c-0.169-0.169-0.319-0.349-0.475-0.525L13.92,29.029z" fill="url(#SVGID_5)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6" x1="21.46" x2="21.46" y1="25.95" y2="13.77">
+<stop offset="0" stop-color="#AAE535"/>
+<stop offset="1" stop-color="#5D9C0A"/>
+</linearGradient>
+<path d="M21.246,24.936c-1.742-1.741-2.661-3.992-2.78-6.278c-0.136,2.619,0.784,5.283,2.78,7.278 l3.229-3.229c-0.171-0.171-0.309-0.362-0.449-0.55L21.246,24.936z" fill="url(#SVGID_6)"/>
+<path d="M13.918,9.287l2.756,2.753c0.155-0.177,0.306-0.356,0.475-0.525l-3.23-3.228 c-3.123,3.124-4.603,7.269-4.47,11.37C9.569,15.889,11.049,12.157,13.918,9.287z" fill="#FFFFFF" fill-opacity="0.6"/>
+<path d="M21.246,13.379l2.779,2.778c0.141-0.188,0.278-0.379,0.449-0.551l-3.229-3.228 c-1.996,1.996-2.916,4.66-2.78,7.278C18.585,17.372,19.504,15.121,21.246,13.379z" fill="#FFFFFF" fill-opacity="0.6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7" x1="46.76" x2="46.61" y1="8.21" y2="30.15">
+<stop offset="0" stop-color="#C6FF45"/>
+<stop offset="0.73" stop-color="#66A00E"/>
+<stop offset="1" stop-color="#387300"/>
+</linearGradient>
+<path d="M46.082,8.287l-3.23,3.228c4.215,4.214,4.213,11.071,0,15.285l3.229,3.229 C52.074,24.033,52.074,14.281,46.082,8.287z" fill="url(#SVGID_7)"/>
+<path d="M38.754,12.379l-3.229,3.228c1.959,1.958,1.959,5.144,0,7.101l3.229,3.229 C42.492,22.199,42.492,16.117,38.754,12.379z" fill="url(#SVGID_7)"/>
+<path d="M46.08,29.029c2.87-2.871,4.351-6.604,4.472-10.372c0.133,4.102-1.348,8.246-4.472,11.372 L42.852,26.8c0.169-0.169,0.319-0.349,0.475-0.525L46.08,29.029z" fill="url(#SVGID_5)"/>
+<path d="M38.754,24.936c1.742-1.741,2.661-3.992,2.78-6.278c0.136,2.619-0.784,5.283-2.78,7.278 l-3.229-3.229c0.171-0.171,0.309-0.362,0.449-0.55L38.754,24.936z" fill="url(#SVGID_6)"/>
+<path d="M46.082,9.287l-2.756,2.753c-0.155-0.177-0.306-0.356-0.475-0.525l3.23-3.228 c3.123,3.124,4.603,7.269,4.47,11.37C50.431,15.889,48.951,12.157,46.082,9.287z" fill="#FFFFFF" fill-opacity="0.6"/>
+<path d="M38.754,13.379l-2.779,2.778c-0.141-0.188-0.278-0.379-0.449-0.551l3.229-3.228 c1.996,1.996,2.916,4.66,2.78,7.278C41.415,17.372,40.496,15.121,38.754,13.379z" fill="#FFFFFF" fill-opacity="0.6"/>
+<rect fill-opacity="0.1" height="1" width="29" x="15.525" y="50.814"/>
+</g>
+</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/systemsettings/accindicatorplugin/accindicatorsettings/rom/accindicatorsettings.iby Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,26 @@
+/*
+* 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:
+*
+*/
+#ifndef __ACCINDICATORSETTINGS_IBY__
+#define __ACCINDICATORSETTINGS_IBY__
+
+REM DLL
+file = ABI_DIR\BUILD_DIR\accindicatorsettings.exe \sys\bin\accindicatorsettings.exe
+data = \epoc32\data\z\resource\apps\accindicatorsettings.rsc \resource\apps\accindicatorsettings.rsc
+data = \epoc32\data\z\private\10003a3f\import\apps\accindicatorsettings_reg.rsc \private\10003a3f\import\apps\accindicatorsettings_reg.rsc
+data=\epoc32\data\z\resource\accindicator\wired_accessory.svg \resource\accindicator\wired_accessory.svg
+data=\epoc32\data\z\resource\accindicator\wireless_accessory.svg \resource\accindicator\wireless_accessory.svg
+#endif
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/systemsettings/accindicatorplugin/accindicatorsettings/src/headsetttyview.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,122 @@
+/*
+* 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:
+*
+* Name : headsetttyview.cpp
+*
+* Description:
+*
+*
+*/
+
+#include <hbview.h>
+#include <hbdocumentloader.h>
+#include <hblabel.h>
+#include <hbcombobox.h>
+#include <accpolaccessorymode.h>
+#include <accpolgenericiddefinitions.h>
+#include <accessoriescrkeys.h>
+#include <AccessoryTypes.h>
+#include <QDebug>
+
+#include "headsetttyview.h"
+
+HeadsetTtyView::HeadsetTtyView(HbMainWindow *window,int accessoryType)
+ {
+ // Handle to the central repository.
+ iAccessoryRepository = CRepository::NewL( KCRUidAccessorySettings );
+
+ TInt error = iAccServer.Connect();
+ if(error != KErrNone)
+ {
+ qDebug() << "Failed to connect to accessory server";
+ return;
+ }
+ error = iAccessorySettings.CreateSubSession( iAccServer );
+ if(error != KErrNone)
+ {
+ qDebug() << "Failed to connect to accessory sub session";
+ return;
+ }
+
+ HbDocumentLoader loader;
+ bool viewLoaded(false);
+ loader.load(":/xml/headset.docml", &viewLoaded);
+ Q_ASSERT_X(viewLoaded, "MainView", "Invalid xml file");
+
+ HbLabel *image;
+ HbLabel *acctype;
+ // set the image to be displayed.
+ if( accessoryType == KPCWired || accessoryType == KPCUSB ) //wired
+ {
+ image = qobject_cast<HbLabel*>(loader.findWidget("image"));
+ image->setIcon(HbIcon(":/images/wired_accessory.svg"));
+ }
+ else // wireless
+ {
+ image = qobject_cast<HbLabel*>(loader.findWidget("image"));
+ image->setIcon(HbIcon(":/images/wireless_accessory.svg"));
+ }
+
+ HbComboBox *comboHandler = qobject_cast<HbComboBox*>(loader.findWidget("combobox"));
+ QStringList comboItems;
+ comboItems <<"HeadSet" <<"TTY";
+ comboHandler->addItems(comboItems);
+
+ connect(comboHandler , SIGNAL(currentIndexChanged(int)) , this , SLOT(currentIndexModified(int)));
+
+ User::LeaveIfError( iAccessoryRepository->Get(KSettingsAccDefaultInfo, defaultaccessory ));
+
+ // set the name to be displayed along with the image.
+ if( defaultaccessory == 0) // HeadSet
+ {
+ acctype = qobject_cast<HbLabel*>(loader.findWidget("label"));
+ acctype->setPlainText("HeadSet");
+ acctype->setTextWrapping(Hb::TextWordWrap);
+ comboHandler->setCurrentIndex(0); // set headset as default
+ }
+ else
+ {
+ acctype = qobject_cast<HbLabel*>(loader.findWidget("label"));
+ acctype->setPlainText("TTY");
+ acctype->setTextWrapping(Hb::TextWordWrap);
+ comboHandler->setCurrentIndex(1); // set TTY as default
+ }
+
+ // heading for the combobox for user selection
+ acctype = qobject_cast<HbLabel*>(loader.findWidget("label_2"));
+ acctype->setPlainText("Accessory Type");
+ acctype->setTextWrapping(Hb::TextWordWrap);
+
+ window->addView(loader.findWidget("view"));
+ }
+
+HeadsetTtyView::~HeadsetTtyView()
+ {
+ iAccessorySettings.CloseSubSession();
+ iAccServer.Disconnect();
+ delete iAccessoryRepository;
+ }
+
+void HeadsetTtyView::currentIndexModified(int var)
+ {
+ if(var == 0) // make headset as default
+ {
+ User::LeaveIfError((iAccessoryRepository->Set(KSettingsAccDefaultInfo, 0))); // 0 is for Headset
+ iAccessorySettings.SetHWDeviceSettingsL( KASHeadset );
+ }
+ else
+ {
+ User::LeaveIfError((iAccessoryRepository->Set(KSettingsAccDefaultInfo, 7))); // 7 is for TTY
+ iAccessorySettings.SetHWDeviceSettingsL( KASTTY );
+ }
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/systemsettings/accindicatorplugin/accindicatorsettings/src/main.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,51 @@
+/*
+ * 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: Process launched by the accessory indicator plugin to
+ * show the view and user can change the settings.
+ *
+ */
+
+#include <hbapplication.h>
+
+#include "headsetttyview.h"
+#include "tvoutview.h"
+
+int main(int argc, char *argv[])
+ {
+ HbApplication app(argc, argv);
+ int retVal;
+ // Get the params from the process.
+ QStringList args(app.arguments());
+ int accessoryMode = QString(args.at(1)).toInt(); // HeadSet,TTY,TV-OUT
+ int accessoryType = QString(args.at(2)).toULong();// Wired or Wireless
+
+ HbMainWindow *window = new HbMainWindow();
+
+ // If accessory mode is Tv-Out load tvout.docml or else load headset.docml
+ QObject *view;
+ if( accessoryMode == EAccModeTVOut )
+ {
+ view = new TvOutView(window,accessoryType);
+ }
+ else
+ {
+ view = new HeadsetTtyView(window,accessoryType);
+ }
+
+ window->show();
+ retVal = app.exec();
+ delete window;
+ delete view;
+ return retVal;
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/systemsettings/accindicatorplugin/accindicatorsettings/src/tvoutview.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,84 @@
+/*
+ * 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: Shows the view of the TV-OUT accessory.
+ *
+ */
+
+#include "tvoutview.h"
+
+#include <hbdocumentloader.h>
+#include <hbapplication.h>
+#include <hblabel.h>
+#include <hbcombobox.h>
+#include <accpolaccessorymode.h>
+#include <accpolgenericiddefinitions.h>
+
+TvOutView::TvOutView(HbMainWindow *window,int accessoryType)
+ {
+ HbDocumentLoader loader;
+ bool viewLoaded(false);
+ loader.load(":/xml/tvout.docml", &viewLoaded);
+ Q_ASSERT_X(viewLoaded, "AccSettings", "Invalid docml file");
+
+ HbLabel *label;
+ if( accessoryType == KPCWired || accessoryType == KPCUSB ) // wired
+ {
+ label = qobject_cast<HbLabel*>(loader.findWidget("image"));
+ label->setIcon(HbIcon(":/images/wired_accessory.svg"));
+ }
+ else // wireless
+ {
+ label = qobject_cast<HbLabel*>(loader.findWidget("image"));
+ label->setIcon(HbIcon(":/images/wireless_accessory.svg"));
+ }
+
+ label = qobject_cast<HbLabel*>(loader.findWidget("label"));
+ label->setPlainText("Tv-Out");
+ label->setTextWrapping(Hb::TextWordWrap);
+
+ label = qobject_cast<HbLabel*>(loader.findWidget("label_4"));
+ label->setPlainText("TV Aspect Ratio");
+ label->setTextWrapping(Hb::TextWordWrap);
+
+ HbComboBox *comboHandler = qobject_cast<HbComboBox*>(loader.findWidget("combobox"));
+
+ // prepare the list of items to be there in combobox.
+ QStringList comboItems;
+ comboItems <<"4:3" <<"16:9";
+ comboHandler->addItems(comboItems);
+
+ //set the current index of combobox to the current AspectRatio.
+ iServerEngine = CGSServerEngine::NewL();
+ currentValue = iServerEngine->AspectRatioL();
+ comboHandler->setCurrentIndex(currentValue);
+
+ //If the index changed in the combobox update the AspectRatio of the TV-Out Settings.
+ QObject::connect(comboHandler , SIGNAL(currentIndexChanged(int)) , this , SLOT(currentIndexModified(int)));
+
+ window->addView(loader.findWidget("view"));
+
+ }
+
+TvOutView::~TvOutView()
+ {
+ if(iServerEngine)
+ {
+ delete iServerEngine;
+ }
+ }
+
+void TvOutView::currentIndexModified(int modifiedSlot)
+ {
+ iServerEngine->SetAspectRatioL( modifiedSlot );
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/systemsettings/accindicatorplugin/inc/accindicator.h Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,80 @@
+/*
+ * 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: Accessory Indicator class
+ *
+ */
+
+#ifndef ACCINDICATOR_H
+#define ACCINDICATOR_H
+
+#include <QObject>
+
+#include <QVariant>
+#include <QtCore/QProcess>
+
+#include <hbindicatorinterface.h>
+#include <hbindicatorplugininterface.h>
+
+#include <accpolaccessorymode.h>
+
+/**
+ * Accessory indicator class.
+ * Handles client request and shows the indications.
+ */
+class AccIndicatorPlugin : public HbIndicatorInterface, public HbIndicatorPluginInterface
+{
+ Q_OBJECT
+ Q_INTERFACES(HbIndicatorPluginInterface)
+public:
+
+ AccIndicatorPlugin();
+ ~AccIndicatorPlugin();
+public:
+ //from HbindicatorInterface
+ bool handleInteraction(InteractionType type);
+ QVariant indicatorData(int role) const;
+
+public:
+ //from HbIndicatorPluginInterface
+ QStringList indicatorTypes() const;
+ bool accessAllowed(const QString &indicatorType, const QVariantMap &securityInfo) const;
+ HbIndicatorInterface* createIndicator(const QString &indicatorType);
+ int error() const;
+
+protected:
+ //from HbindicatorInterface
+ bool handleClientRequest(RequestType type, const QVariant ¶meter);
+
+private:
+ void prepareDisplayName();
+
+private:
+
+ QString mDisplayName;
+ QProcess mProcess;
+ TAccMode mAccMode;
+ int mAccType;
+ QStringList mIndicatorTypes;
+ QStringList mArgs;
+
+private slots:
+ void processError(QProcess::ProcessError err); // handler for error codes
+
+private:
+ Q_DISABLE_COPY(AccIndicatorPlugin)
+ int mError;
+ };
+
+#endif // ACCINDICATOR_H
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/systemsettings/accindicatorplugin/rom/accindicatorplugin.iby Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,23 @@
+/*
+* 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:
+*
+*/
+#ifndef __ACCINDICATORPLUGIN_IBY__
+#define __ACCINDICATORPLUGIN_IBY__
+
+REM DLL
+file=ABI_DIR\UREL\accindicatorplugin.dll SHARED_LIB_DIR\accindicatorplugin.dll UNPAGED
+data=\epoc32\data\z\resource\plugins\indicators\accindicatorplugin.qtplugin \resource\plugins\indicators\accindicatorplugin.qtplugin
+#endif
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/systemsettings/accindicatorplugin/src/accindicator.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,250 @@
+/*
+ * 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:
+ *
+ */
+#include "accindicator.h"
+
+#include <QtPlugin>
+#include <QProcess>
+#include <accpolgenericiddefinitions.h>
+
+Q_EXPORT_PLUGIN(AccIndicatorPlugin)
+const static char IndicatorType[] = "com.nokia.accessory.indicatorplugin/1.0";
+QString KAccMode = "AccMode";
+QString KAccType = "AccType";
+
+AccIndicatorPlugin::AccIndicatorPlugin() :
+HbIndicatorInterface(IndicatorType,
+ HbIndicatorInterface::SettingCategory,
+ InteractionActivated)
+ {
+ mIndicatorTypes << "com.nokia.accessory.indicatorplugin/1.0";
+ }
+
+AccIndicatorPlugin::~AccIndicatorPlugin()
+ {
+ }
+
+// ----------------------------------------------------------------------------
+// AccIndicatorPlugin::indicatorTypes
+// returns the indicator types handled by this plugin
+// ----------------------------------------------------------------------------
+
+QStringList AccIndicatorPlugin::indicatorTypes() const
+ {
+ return mIndicatorTypes;
+ }
+
+// ----------------------------------------------------------------------------
+// AccIndicatorPlugin::createIndicator
+// creates an indicator.
+// ----------------------------------------------------------------------------
+
+HbIndicatorInterface* AccIndicatorPlugin::createIndicator(
+ const QString &indicatorType)
+ {
+ Q_UNUSED(indicatorType)
+ return this;
+ }
+
+// ----------------------------------------------------------------------------
+// AccIndicatorPlugin::error
+// returns the error code.
+// ----------------------------------------------------------------------------
+
+int AccIndicatorPlugin::error() const
+ {
+ return mError;
+ }
+
+// ----------------------------------------------------------------------------
+// AccIndicatorPlugin::accessAllowed
+// check for the access rights of the client. As there are no restrictions for
+// this plugin it always returns true.
+// ----------------------------------------------------------------------------
+
+bool AccIndicatorPlugin::accessAllowed(const QString &indicatorType,const QVariantMap &securityInfo) const
+ {
+ Q_UNUSED(indicatorType)
+ Q_UNUSED(securityInfo)
+
+ return true;
+ }
+
+// ----------------------------------------------------------------------------
+// AccIndicator::handleInteraction
+// called when the user interacts with the indicator.Enable the interaction only
+// for headset,tty and tv-out for user to change the settings.
+// ----------------------------------------------------------------------------
+bool AccIndicatorPlugin::handleInteraction(InteractionType type)
+ {
+ bool handled = false;
+ if (type == InteractionActivated)
+ {
+ // If it is 3-pole ( i.e., HeadSet or TTY ) and TV-Out enable the handleInteraction() to change the settings.
+ if(mAccMode == EAccModeWiredHeadset || mAccMode == EAccModeWirelessHeadset || mAccMode == EAccModeTextDevice || mAccMode == EAccModeTVOut )
+ {
+ QObject::connect( &mProcess, SIGNAL(error(QProcess::ProcessError)),
+ this, SLOT(processError(QProcess::ProcessError)));
+
+ QVariant mode,type;
+ mode.setValue((int)mAccMode);
+ type.setValue((int)mAccType);
+ mArgs.append(mode.toString());
+ mArgs.append(type.toString());
+
+ // Launch the process to show the view.
+ mProcess.start("accindicatorsettings" , mArgs);
+ handled = true;
+ }
+ }
+ return handled;
+ }
+
+// ----------------------------------------------------------------------------
+// AccIndicator::indicatorData
+// returns the name and icon to be displayed in the universal indicator menu.
+// ----------------------------------------------------------------------------
+QVariant AccIndicatorPlugin::indicatorData(int role) const
+ {
+ switch(role)
+ {
+ //for displaying the string in indicator.
+ case PrimaryTextRole:
+ {
+ QString type(mDisplayName);
+ return type;
+ }
+ //for displaying the icon in indicator.
+ case MonoDecorationNameRole:
+ {
+ QString iconName;
+ if(mAccType == KPCWired || mAccType == KPCUSB)
+ {
+ iconName = QString("z:/resource/accindicator/wired_accessory.svg");
+ }
+ else if (mAccType == KPCBluetooth || mAccType == KPCInfraRed)
+ {
+ iconName = QString("z:/resource/accindicator/wireless_accessory.svg");
+ }
+ return iconName;
+ }
+ default:
+ return QVariant();
+ }
+ }
+
+// ----------------------------------------------------------------------------
+// AccIndicatorPlugin::handleClientRequest
+// this function gets called when client activates plugin
+// ----------------------------------------------------------------------------
+bool AccIndicatorPlugin::handleClientRequest( RequestType type,
+ const QVariant ¶meter)
+ {
+ bool handled(false);
+ switch (type) {
+ case RequestActivate:
+ {
+ // Get the params(acctype and mode) from the hbindicator.activate() which is called from sysap.
+
+ QVariantMap mapValues = parameter.toMap();
+ if(mapValues.contains(KAccMode))
+ {
+ mAccMode = static_cast<TAccMode>(mapValues.value(KAccMode).toInt());
+ }
+ if(mapValues.contains(KAccType))
+ {
+ mAccType = mapValues.value(KAccType).toInt();
+ }
+
+ // prepare the name to be displayed in the universal indicator menu.
+ prepareDisplayName();
+ emit dataChanged();
+ handled = true;
+ }
+ break;
+ case RequestDeactivate:
+ {
+ // reset data
+ mDisplayName = QString();
+ emit deactivate();
+ }
+ break;
+ default:
+ break;
+ }
+ return handled;
+ }
+
+// ----------------------------------------------------------------------------
+// AccIndicator::prepareDisplayName
+// prepare the name to be displayed in the indicator menu.
+// ----------------------------------------------------------------------------
+void AccIndicatorPlugin::prepareDisplayName()
+ {
+ mDisplayName.clear();
+ switch(mAccMode)
+ {
+ case EAccModeWiredHeadset:
+ mDisplayName.append(QString("Wired Headset"));
+ break;
+ case EAccModeWirelessHeadset:
+ mDisplayName.append(QString("Wireless Headset"));
+ break;
+ case EAccModeWiredCarKit:
+ mDisplayName.append(QString("Wired CarKit"));
+ break;
+ case EAccModeWirelessCarKit:
+ mDisplayName.append(QString("Wireless Carkit"));
+ break;
+ case EAccModeTextDevice:
+ mDisplayName.append(QString("TTY"));
+ break;
+ case EAccModeLoopset:
+ mDisplayName.append(QString("LoopSet"));
+ break;
+ case EAccModeMusicStand:
+ mDisplayName.append(QString("Music Stand"));
+ break;
+ case EAccModeTVOut:
+ mDisplayName.append(QString("TV Out"));
+ break;
+ case EAccModeHeadphones:
+ mDisplayName.append(QString("Head Phones"));
+ break;
+ default :
+ mDisplayName.append(QString("Unknown"));
+ }
+ }
+
+// ----------------------------------------------------------------------------
+// AccIndicator::processError
+// handle the error conditions reurned by the QProcess.
+// ----------------------------------------------------------------------------
+
+void AccIndicatorPlugin::processError(QProcess::ProcessError err)
+ {
+ switch (err) {
+ case QProcess::FailedToStart:
+ case QProcess::Crashed:
+ case QProcess::Timedout:
+ case QProcess::ReadError:
+ case QProcess::WriteError:
+ case QProcess::UnknownError:
+ break;
+ default:
+ break;
+ }
+ }
--- a/systemsettings/group/bld.inf Thu Aug 19 10:05:08 2010 +0300
+++ b/systemsettings/group/bld.inf Tue Aug 31 15:24:25 2010 +0300
@@ -24,7 +24,6 @@
PRJ_MMPFILES
#include "../gssensorplugin/group/bld.inf"
-#include "../GSAccessoryPlugin/group/bld.inf"
PRJ_TESTMMPFILES
Binary file systemsettings/gssensorplugin/conf/sensorplugin_10282DF0.crml has changed
--- a/systemsettings/gssensorplugin/data/gssensorpluginrsc.rss Thu Aug 19 10:05:08 2010 +0300
+++ b/systemsettings/gssensorplugin/data/gssensorpluginrsc.rss Tue Aug 31 15:24:25 2010 +0300
@@ -404,9 +404,7 @@
//
RESOURCE AVKON_VIEW r_gs_checkbox_view
{
- //cba = r_gs_sen_softkeys_ok_back__change; ou1cimx1#467503
- menubar = r_gs_sen_menubar_change_exit;
- cba =R_GS_SOFTKEYS_OPTIONS_BACK_CHANGE;
+ cba = r_gs_sen_softkeys_ok_back__change;
}
// *** SENSOR ACTIVE STATUS ***
--- a/systemsettings/gssensorplugin/group/bld.inf Thu Aug 19 10:05:08 2010 +0300
+++ b/systemsettings/gssensorplugin/group/bld.inf Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
@@ -25,14 +25,14 @@
../conf/sensorplugin.confml MW_LAYER_CONFML(sensorplugin.confml)
../conf/sensorplugin_10282DF0.crml MW_LAYER_CRML(sensorplugin_10282DF0.crml)
-../loc/gssensorplugin.loc MW_LAYER_LOC_EXPORT_PATH(gssensorplugin.loc)
+// ../loc/gssensorplugin.loc MW_LAYER_LOC_EXPORT_PATH(gssensorplugin.loc)
// Iby file exports
-../rom/gssensorplugin.iby CORE_MW_LAYER_IBY_EXPORT_PATH(gssensorplugin.iby)
-../rom/gssenpluginresources.iby LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(gssenpluginresources.iby)
+// ../rom/gssensorplugin.iby CORE_MW_LAYER_IBY_EXPORT_PATH(gssensorplugin.iby)
+// ../rom/gssenpluginresources.iby LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(gssenpluginresources.iby)
PRJ_MMPFILES
-gssensorplugin.mmp
+// gssensorplugin.mmp
PRJ_EXTENSIONS
--- a/systemsettings/gssensorplugin/group/gssensorplugin.mmp Thu Aug 19 10:05:08 2010 +0300
+++ b/systemsettings/gssensorplugin/group/gssensorplugin.mmp Tue Aug 31 15:24:25 2010 +0300
@@ -74,11 +74,13 @@
LIBRARY egul.lib // For GulIcon in checkbox icons
LIBRARY eikctl.lib // For checkbox icons
-LIBRARY CommonEngine.lib // For RConeResourceLoader
-LIBRARY FeatMgr.lib // Feature manager
-LIBRARY CentralRepository.lib // for CenRep
+LIBRARY commonengine.lib // For RConeResourceLoader
+LIBRARY featmgr.lib // Feature manager
+LIBRARY centralrepository.lib // for CenRep
LIBRARY aknskins.lib // for enhanced skinning
LIBRARY hlplch.lib // for "Help" options menu
-LIBRARY GSFramework.lib // For base classes
-LIBRARY GSListBox.lib // For CGSListBoxItemTextArray
-LIBRARY GSEcomPlugin.lib // For base classes
+LIBRARY gsframework.lib // For base classes
+LIBRARY gslistbox.lib // For CGSListBoxItemTextArray
+LIBRARY gsecomplugin.lib // For base classes
+
+SMPSAFE
--- a/systemsettings/gssensorplugin/inc/gssenturnctrlview.h Thu Aug 19 10:05:08 2010 +0300
+++ b/systemsettings/gssensorplugin/inc/gssenturnctrlview.h Tue Aug 31 15:24:25 2010 +0300
@@ -71,11 +71,6 @@
* Checks currently activated item in list and updates MSK label if needed
*/
void CheckMiddleSoftkeyLabelL();
-
- /**
- * Deactivates current view.
- */
- void DoDeactivate();
private:
--- a/systemsettings/gssensorplugin/src/gssenbasecontainer.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/systemsettings/gssensorplugin/src/gssenbasecontainer.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006-2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
@@ -189,7 +189,11 @@
// cleanup checkboxOnIcon, checkboxOffIcon, iconArray
CleanupStack::Pop( checkboxOffIcon );
CleanupStack::Pop( checkboxOnIcon );
- CleanupStack::Pop( iconArray );
+
+ if(iconArray)
+ {
+ CleanupStack::Pop( iconArray );
+ }
TRACE_( "[GSSensorPlugin] CGSSenBaseContainer::AddCheckboxIconsL() - return" );
}
--- a/systemsettings/gssensorplugin/src/gssensorplugin.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/systemsettings/gssensorplugin/src/gssensorplugin.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
@@ -235,8 +235,8 @@
case EGSSenMenuExit:
{
CheckExitStatusL();
- // Proceed with the command
- aCommand = EAknCmdExit;
+ aCommand = EAknCmdExit; //"break" is removed to continue the flow to default case with the exit command
+ // coverity[MISSING_BREAK]
}
default:
iAppUi->HandleCommandL( aCommand );
--- a/systemsettings/gssensorplugin/src/gssenturnctrlview.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/systemsettings/gssensorplugin/src/gssenturnctrlview.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -29,8 +29,6 @@
#include <gssensorpluginrsc.rsg>
#include <gscommon.hrh>
#include <eikbtgpc.h>
-#include <featmgr.h>
-#include <hlplch.h>
// ========================= MEMBER FUNCTIONS ================================
@@ -123,52 +121,24 @@
break;
}
case EGSCmdOk:
- case EAknSoftkeyBack:
- {
- // Check selections
+ // Check selections
Container()->CheckSelections();
// Store changes and show previous view
Container()->StoreSelectionsL();
// cont. to next case
+ case EAknSoftkeyBack:
+ {
// activate previous view
iAppUi->ActivateLocalViewL( KGSSensorPluginUid );
break;
}
- case EAknCmdHelp:
- {
- if ( FeatureManager::FeatureSupported( KFeatureIdHelp ) )
- {
- HlpLauncher::LaunchHelpApplicationL(
- iEikonEnv->WsSession(), iAppUi->AppHelpContextL() );
- }
- break;
- }
- case EGSSenMenuExit:
- {
- aCommand=EAknCmdExit;
- iAppUi->HandleCommandL( aCommand );
- break;
- }
-
default:
iAppUi->HandleCommandL( aCommand );
break;
}
TRACE_( "[GSSensorPlugin] CGSSenTurnCtrlView::HandleCommandL() - return" );
}
-// ---------------------------------------------------------------------------
-// CGSSenTurnCtrlView::DoDeactivate
-// Deactivates the current view
-// ---------------------------------------------------------------------------
-void CGSSenTurnCtrlView::DoDeactivate()
- {
- // Check selections
- Container()->CheckSelections();
- // Store changes and show previous view
- Container()->StoreSelectionsL();
- CGSSensorBaseView::DoDeactivate();
-
- }
+
// ---------------------------------------------------------------------------
// CGSSenTurnCtrlView::Container
// Returns call container item
Binary file tzpcside/tzcompiler/doc_pub/SGL.GT0197.232 App-Services Tz 9.1 How-To Create the Tz Database.doc has changed
Binary file tzpcside/tzcompiler/test/integration/TzCompilerTests/doc_pub/TestTzCompiler Description Document.doc has changed
Binary file tzservices/tzloc/doc_pub/SGL.GT0284.216 - Time Zone Services CR1606 How-To.doc has changed
--- a/tzservices/tzloc/inc/TzLocalizationDbAccessor.h Thu Aug 19 10:05:08 2010 +0300
+++ b/tzservices/tzloc/inc/TzLocalizationDbAccessor.h Tue Aug 31 15:24:25 2010 +0300
@@ -88,8 +88,10 @@
private:
TInt CreateFrequentlyUsedZoneTableL();
TInt CreateUserCityTableL();
+ TBool IsTableCreatedL(const TDesC& aTableName) const;
void CloseDb();
void OpenDbL();
+
protected:
//Member data
--- a/tzservices/tzloc/src/TzLocalizationDbAccessor.cpp Thu Aug 19 10:05:08 2010 +0300
+++ b/tzservices/tzloc/src/TzLocalizationDbAccessor.cpp Tue Aug 31 15:24:25 2010 +0300
@@ -103,29 +103,21 @@
{
//Database file doesn't exist. Attempt to create a new one.
error = iLocalizedTimeZoneDb.Create(iDbsSession,KTzLocalizationDbName,KTzLocalizationDbSecurityPolicy);
- if (error == KErrNone)
- {
- User::LeaveIfError(CreateFrequentlyUsedZoneTableL());
- User::LeaveIfError(CreateUserCityTableL());
- }
- }
- User::LeaveIfError(error);
- // Check if both tables are created.
- CDbColSet *colSet = NULL;
- TRAP(error, colSet = iLocalizedTimeZoneDb.ColSetL(KCZTableName));
- delete colSet;
- if (error)
- {
- User::LeaveIfError(CreateFrequentlyUsedZoneTableL());
- }
- TRAP(error, colSet = iLocalizedTimeZoneDb.ColSetL(KUCTableName));
- delete colSet;
- if (error)
- {
- User::LeaveIfError(CreateUserCityTableL());
- }
+ User::LeaveIfError(error);
+
+ //Check whether tables exist and create them if they do not
+ if (!IsTableCreatedL(KCZTableName))
+ {
+ User::LeaveIfError(CreateFrequentlyUsedZoneTableL());
+ }
+ if (!IsTableCreatedL(KUCTableName))
+ {
+ User::LeaveIfError(CreateUserCityTableL());
+ }
+ }
}
+
/**
Destructor
Closes the database tables, the database and the database session
@@ -317,3 +309,24 @@
User::LeaveIfError(iZoneView.EvaluateAll());
}
+TBool CTzLocalizationDbAccessor::IsTableCreatedL(const TDesC& aTableName) const
+ {
+ TBool result = EFalse;
+ CDbTableNames* tableNames = iLocalizedTimeZoneDb.TableNamesL();
+ CleanupStack::PushL(tableNames);
+ if(tableNames)
+ {
+ const TInt count = tableNames->Count();
+ for(TInt i = 0; i < count; i++)
+ {
+ if((*tableNames)[i] == aTableName)
+ {
+ result = ETrue;
+ break;
+ }
+ }
+ }
+ CleanupStack::PopAndDestroy(tableNames);
+ return result;
+ }
+
--- a/tzservices/tzserver/analysis/DAYLIGHT SAVINGS ANALYSIS.mdl Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6210 +0,0 @@
-
-(object Petal
- version 43
- _written "Rose 6.5.9232.10"
- charSet 0)
-
-(object Design "Logical View"
- is_unit TRUE
- is_loaded TRUE
- quid "36D487460258"
- defaults (object defaults
- rightMargin 0.250000
- leftMargin 0.250000
- topMargin 0.250000
- bottomMargin 0.500000
- pageOverlap 0.250000
- clipIconLabels TRUE
- autoResize TRUE
- snapToGrid FALSE
- gridX 16
- gridY 16
- defaultFont (object Font
- size 9
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- showMessageNum 1
- showClassOfObject TRUE
- notation "Unified")
- root_usecase_package (object Class_Category "Use Case View"
- quid "34DBB4830142"
- documentation
-|The Use Case View organizes the Use-Case Model and the optional Business Use-Case Model.
-|
-
- exportControl "Public"
- global TRUE
- logical_models (list unit_reference_list
- (object Class_Category "Business Use-Case Model"
- quid "35B677D701B8"
- documentation
-|Optional Model:
-|The business modeling workflow in Rational Unified Process produces two models: the business use-case model, and the business object model. Both show the business
-|processes, but different aspects of them. In the business use-case model each business use case represents a business process, described (text and/or activity diagrams) from an "external" view point without worrying about who does what to whom inside of the organization.
-|In the business object model, you include realizations of each business use case to show how workers and entities collaborate to perform the process. You do that using class diagrams, activity diagrams with swimlanes, collaboration diagrams, and/or interaction diagrams.
-|
-|<Any additional description of the Business Use Case Model, such as modeling conventions that the reader/reviewer may need to understand the model, should be described here.>
-
- exportControl "Public"
- logical_models (list unit_reference_list)
- logical_presentations (list unit_reference_list
- (object UseCaseDiagram "Global View of Business Actors and Business Use Cases"
- quid "35C0DFF50172"
- title "Global View of Business Actors and Business Use Cases"
- documentation "This is a global view of the system showing all Busines Use Cases and Business Actors. It is intended to be an overview diagram, so if the diagram becomes too complex for easy comprehension, use several diagrams, each of which should focus on a different aspect of the system. Usually, organizing use case diagrams around actors is a good approach."
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list
- (object NoteView @1
- location (464, 352)
- label (object ItemLabel
- Parent_View @1
- location (42, 11)
- fill_color 13434879
- nlines 14
- max_width 809
- label
-|Global View of Business Actors and BusinessUse Cases
-|
-|This diagram presents all Business Actors and all concrete Business Use Cases (those that are directly instantiable).
-|
-|Related Rational Unified Process Activities:
-|- Activity: Find Business Actors and Use Cases
-|- Activity: Structure the Business Use Case Model
-|
-|*Note: this note may be deleted once the diagram is created.
- )
- line_color 3342489
- fill_color 13434879
- width 869
- height 694)
- (object NoteView @2
- location (1280, 160)
- label (object ItemLabel
- Parent_View @2
- location (942, 29)
- fill_color 13434879
- nlines 5
- max_width 640
- label
-|Created/modified by: <name>
-|Date: <creation/modification date>
-|
-|Approved by: <name>
-|Date: <approval date>
- )
- line_color 3342489
- fill_color 13434879
- width 700
- height 275)))))
- (object Class_Category "Use-Case Model"
- is_unit TRUE
- is_loaded FALSE
- file_name "M:\\DST\\analysis\\UseCases.cat"
- quid "35B677F4010E"))
- logical_presentations (list unit_reference_list
- (object UseCaseDiagram "Main"
- quid "35C6339B029F"
- title "Main"
- documentation
-|This diagram depicts the relationships between the packages (models) contained in the 'Use-Case View": the Use-Case Model (for the system) and the Business Use-Case Model (describing the business).
-
- zoom 90
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list
- (object CategoryView "Use Case View::Use-Case Model" @3
- location (400, 864)
- font (object Font
- size 10)
- label (object ItemLabel
- Parent_View @3
- location (256, 780)
- fill_color 13434879
- nlines 2
- max_width 288
- justify 0
- label "Use-Case Model")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "35B677F4010E"
- width 300
- height 180)
- (object NoteView @4
- location (1168, 592)
- font (object Font
- size 10)
- label (object ItemLabel
- Parent_View @4
- location (941, 390)
- fill_color 13434879
- nlines 9
- max_width 419
- label "The Use-Case Model is traceable to (and derives from) the Business Model. The system (as described in the Use Case Model) provides behavior that supports the business.")
- line_color 3342489
- fill_color 13434879
- width 479
- height 416)
- (object CategoryView "Use Case View::Business Use-Case Model" @5
- location (384, 320)
- label (object ItemLabel
- Parent_View @5
- location (189, 229)
- fill_color 13434879
- nlines 2
- max_width 390
- justify 0
- label "Business Use-Case Model")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "35B677D701B8"
- width 403
- height 194)
- (object ImportView "" @6
- stereotype TRUE
- line_color 3342489
- quidu "35C633DA030C"
- client @3
- supplier @5
- line_style 0)
- (object AttachView "" @7
- stereotype TRUE
- line_color 3342489
- client @6
- supplier @4
- line_style 0)))))
- root_category (object Class_Category "Logical View"
- quid "34DBB4830141"
- documentation
-|Rational Unified Process uses the "Logical View in Rose" to organize the Design Model and the Process View and the optional Business Object Model and Analysis Model.
-
- exportControl "Public"
- global TRUE
- subsystem "Component View"
- quidu "34DBB4830143"
- logical_models (list unit_reference_list
- (object Class_Category "Analysis Model"
- quid "35B678170028"
- documentation
-|This model is optional.
-|The Analysis Model contains a set of Analysis Classes, which describe an abstract realization of the use cases of the system. The analysis classes evolve into associated design elements which are modeled in the Design Model.
-
- exportControl "Public"
- logical_models (list unit_reference_list
- (object Class_Category "Business Object Model"
- is_unit TRUE
- is_loaded FALSE
- file_name "M:\\DST\\analysis\\LogicalBusinessObjects.cat"
- quid "35B678080064")
- (object Class_Category "TZ Compiler"
- is_unit TRUE
- is_loaded FALSE
- file_name "M:\\DST\\analysis\\TZCOMPILER.CAT"
- quid "40E569BC024F")
- (object Class_Category "LTClasses"
- is_unit TRUE
- is_loaded FALSE
- file_name "M:\\DST\\analysis\\Classes.cat"
- quid "40A89DC203B0")
- (object Class_Category "Time Zone Database Management"
- is_unit TRUE
- is_loaded FALSE
- file_name "M:\\DST\\analysis\\LogicalTZDBM.cat"
- quid "40B1E4A6003A")
- (object Class_Category "Local Time Conversion"
- is_unit TRUE
- is_loaded FALSE
- file_name "M:\\DST\\analysis\\LogicalLocaltimeConv.cat"
- quid "40B1D43200B7")
- (object Class_Category "System Time Management"
- is_unit TRUE
- is_loaded FALSE
- file_name "M:\\DST\\analysis\\LogicalSysTimeMngmt.cat"
- quid "40B1D49203C5")
- (object Class_Category "TZClasses"
- is_unit TRUE
- is_loaded FALSE
- file_name "M:\\DST\\analysis\\TZClasses.cat"
- quid "40F3CEAF0324")
- (object Class_Category "BClasses"
- is_unit TRUE
- is_loaded FALSE
- file_name "M:\\DST\\analysis\\BClasses.cat"
- quid "40F3CFB10172"))
- logical_presentations (list unit_reference_list))
- (object Class_Category "Design Model"
- quid "35B6782302DA"
- documentation
-|The Design Model in Rational Unified Process.
-|The design model is adapted to model the real implementation environment, and serves as an abstraction of the source code. It is a "blueprint" of how the source code is structured and written.
-|
-|The design model is a hierarchy of packages (design subsystems and design-service packages), with "leaves" that are classes. Subsystems are a design "view" of the components that are defined in the Implementation Model.
-|
-|The design model hierarchy consists of layers.
-|
-|Classes represent abstractions of classes in the system's implementation. They define the objects, which in turn are abstractions of the objects in the system's implementation. The use cases are realized by the objects, and this is represented by use-case realizations in the Design Model. Each use-case realization has a realize dependency to a use case in the Use-Case Model.
-
- exportControl "Public"
- logical_models (list unit_reference_list
- (object Class_Category "<Layer Name> Layer"
- quid "34E3686A00F0"
- documentation
-|The design model is normally organized in layers. The number of layers is not fixed, but varies from situation to situation.
-|
-|During architectural analysis, focus is normally on the two high-level layers, that is, the application and business-specific layers; this is what is meant by the "high-level organization of subsystems." The other lower-level layers are in focus during architectural design, refer to the activity Architectural Design for more information.
-|
-|Layers are identified using the naming conventions shown in the name of this package.
-
- exportControl "Public"
- logical_models (list unit_reference_list
- (object Class_Category "<package name>"
- quid "34E36BB7017C"
- documentation
-|<Enter a short description of the package here. A package should be used in cases where a set of classes and/or other packages need to be grouped together for model organization purposes. Though the contents of the package can have public visibility, which makes them visible to model elements outside the containing package, packages are primarily just grouping mechanisms.
-|
-|If a set of classes is to be encapsulated and can be hidden behind a well-defined interface, a subsystem is a more appropriate container>
-
- exportControl "Public"
- logical_models (list unit_reference_list)
- logical_presentations (list unit_reference_list
- (object ClassDiagram "<package name> - Dependencies"
- quid "37BC2256004D"
- title "<package name> - Dependencies"
- documentation "This diagram shows the package itself and the packages that it is dependent of. That is useful to know for instance when the package is a separate unit that can be reused in other systems."
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list))
- (object ClassDiagram "<package name> - Interfaces"
- quid "37BC226D026D"
- title "<package name> - Interfaces"
- documentation "This diagram shows only the classes that are visible outside this package. The interfaces of the package."
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list))))
- (object Class_Category "<Subsystem Name>"
- quid "35C0F38200B4"
- documentation
-|<Enter a short description of the subsystem here. A subsystem should be used in cases where a set of classes and/or other packages need to be encapsulated within a container and hidden behind a set of well-defined interfaces. By convention, none of the contents of subsystem are visible except the interfaces of the subsystem. This allows subsystems to be easily replaced, and the implementations changed, provided the interfaces remain unchanged. It offers a degree of encapsulation greater than that of the package.
-|
-|If a set of classes is merely to be grouped together, but public visibility of classes is still desirable, a package is a more appropriate container.>
-
- stereotype "subsystem"
- exportControl "Public"
- logical_models (list unit_reference_list)
- logical_presentations (list unit_reference_list
- (object ClassDiagram "<subsystem name> - Dependencies"
- quid "35C0F4220190"
- title "<subsystem name> - Dependencies"
- documentation "This diagram shows the package itself and the packages that it is dependent of. That is useful to know for instance when the package is a separate unit that can be reused in other systems."
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list))
- (object ClassDiagram "<subsystem name> - Interfaces"
- quid "37BC21080165"
- title "<subsystem name> - Interfaces"
- documentation
-|The Process View in Rational Unified Process
-|This package is used to organize the active classes in the system and will be presented in the SoDA-generated Software Architecture Document, under the "Process View"
-
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list)))))
- logical_presentations (list unit_reference_list
- (object ClassDiagram "All Packages in <Layer Name> - Layer"
- quid "34E36C2903C0"
- title "All Packages in <Layer Name> - Layer"
- documentation "This diagram shows all packages in this - Layer."
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list))))
- (object Class_Category "Use-Case Realizations"
- quid "34E36D3203CA"
- documentation
-|In this Package we will describe "Use Case Realizations" as stereotyped use cases.
-|
-|A use-case realization describes how a particular use case is realized within the design model, in terms of collaborating objects.
-|
-|A realize dependency is used between the "Use Case Realization" and the "Use Case" in the use-case model that is realized.
-|
-|
-
- exportControl "Public"
- logical_models (list unit_reference_list
- (object Association "$UNNAMED$0"
- quid "35409E9D02A8"
- stereotype "realize"
- roles (list role_list
- (object Role "$UNNAMED$1"
- quid "35409E9E0294"
- supplier "Use Case View::Use-Case Model::Use Cases::<Use Case Name>::<Use Case Name>"
- quidu "34E37FB203D4"
- is_navigable TRUE)
- (object Role "$UNNAMED$2"
- quid "35409E9E0295"
- supplier "Logical View::Design Model::Use-Case Realizations::<Use-Case Name>::<Use-Case Name>"
- quidu "352F38180276")))
- (object Class_Category "<Use-Case Name>"
- quid "35D083E100BE"
- documentation " A separate package is recommended for each Use Case Realization to facilitate access and version control of related use case artifacts."
- exportControl "Public"
- logical_models (list unit_reference_list
- (object UseCase "<Use-Case Name>"
- attributes (list Attribute_Set
- (object Attribute
- tool "RequisitePro"
- name "ReqProProjectPath"
- value "")
- (object Attribute
- tool "RequisitePro"
- name "ReqProProjectGuid"
- value "")
- (object Attribute
- tool "RequisitePro"
- name "ReqProDocumentName"
- value "")
- (object Attribute
- tool "RequisitePro"
- name "ReqProDocumentGuid"
- value "")
- (object Attribute
- tool "RequisitePro"
- name "ReqProDocType"
- value "")
- (object Attribute
- tool "RequisitePro"
- name "ReqProReqType"
- value "")
- (object Attribute
- tool "RequisitePro"
- name "ReqProRequirementId"
- value ""))
- quid "352F38180276"
- documentation
-|This will be a stereotype on a usecase.
-|In UML it is a stereotype on a collaboration and that does not exist in Rose.
-
- stereotype "use-case realization"
- logical_models (list unit_reference_list
- (object Mechanism @8
- logical_models (list unit_reference_list))
- (object Mechanism @9
- logical_models (list unit_reference_list)))
- logical_presentations (list unit_reference_list
- (object ClassDiagram "<Use Case Name> - Realize Dependencies"
- quid "37BC23B801F1"
- title "<Use Case Name> - Realize Dependencies"
- documentation "This diagram shows the Use Case and the Use Case Realization and the realize dependency between them. This information is used to connect the use case with the use case realization."
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list))
- (object ClassDiagram "<Use Case Name> - Participating Classes"
- quid "37BC23E0036B"
- title "<Use Case Name> - Participating Classes"
- documentation "This Diagram shows all participating classes in this Use Case Realization"
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list))
- (object InteractionDiagram "<Use Case Name> - Basic Flow"
- mechanism_ref @8
- quid "35081E3603A2"
- title "<Use Case Name> - Basic Flow"
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list))
- (object InteractionDiagram "<Use Case Name> - <Flow Type>"
- mechanism_ref @9
- quid "3540A0B901AE"
- title "<Use Case Name> - <Flow Type>"
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list)))))
- logical_presentations (list unit_reference_list
- (object ClassDiagram "Realize Dependency"
- quid "34E39DA90302"
- title "Realize Dependency"
- documentation "This diagram shows the Use Case and the Use Case Realization and the realizes dependency between them."
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list
- (object NoteView @10
- location (704, 144)
- label (object ItemLabel
- Parent_View @10
- location (38, 25)
- fill_color 13434879
- nlines 5
- max_width 1296
- label
-|
-|This diagram shows the Use Case and the Use Case Realization and the realize dependency between them.
- )
- line_color 3342489
- fill_color 13434879
- width 1356
- height 250)
- (object UseCaseView "Use Case View::Use-Case Model::Use Cases::<Use Case Name>::<Use Case Name>" @11
- location (1152, 528)
- label (object ItemLabel
- Parent_View @11
- location (1152, 666)
- anchor_loc 1
- nlines 2
- max_width 631
- justify 0
- label "<Use Case Name>")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "34E37FB203D4"
- autoResize TRUE)
- (object UseCaseView "Logical View::Design Model::Use-Case Realizations::<Use-Case Name>::<Use-Case Name>" @12
- location (608, 960)
- label (object ItemLabel
- Parent_View @12
- location (608, 1148)
- anchor_loc 1
- nlines 2
- max_width 651
- justify 0
- label "<Use-Case Name>")
- stereotype (object ItemLabel
- Parent_View @12
- location (608, 1078)
- anchor 10
- anchor_loc 1
- nlines 1
- max_width 434
- justify 0
- label "<<use-case realization>>")
- icon "use-case realization"
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "352F38180276"
- autoResize TRUE)
- (object AssociationViewNew "$UNNAMED$0" @13
- location (876, 741)
- stereotype (object SegLabel @14
- Parent_View @13
- location (874, 746)
- anchor 10
- anchor_loc 1
- nlines 1
- max_width 450
- justify 0
- label "<<realize>>"
- pctDist 0.483333
- height 5
- orientation 1)
- line_color 3342489
- quidu "35409E9D02A8"
- roleview_list (list RoleViews
- (object RoleView "$UNNAMED$1" @15
- Parent_View @13
- location (236, -539)
- stereotype TRUE
- line_color 3342489
- quidu "35409E9E0294"
- client @13
- supplier @11
- line_style 0)
- (object RoleView "$UNNAMED$2" @16
- Parent_View @13
- location (236, -539)
- stereotype TRUE
- line_color 3342489
- quidu "35409E9E0295"
- client @13
- supplier @12
- line_style 0))))))))
- logical_presentations (list unit_reference_list))
- (object Class_Category "Process View"
- quid "35D227B103C0"
- documentation "An architectural view that describes the concurrent aspect of the system: tasks (processes) and their interactions."
- exportControl "Public"
- logical_models (list unit_reference_list
- (object Class "<Process Name>"
- quid "35DB3C8302D0"
- documentation "This process provides <enter a description here of what the role of the process in the system is>. A separate process was chosen for this to be able to <enter the rationale for needing a separate process>."
- stereotype "process")
- (object Class "<Thread Name>"
- quid "35DB3CB002BC"
- documentation "This is a sub-process or thread within the <name of process of which this thread is a sub-process> process which handles <enter a description of what this thread does>. A separate thread was chosen for this to be able to <enter the rationale for creating a separate thread>."
- stereotype "thread")
- (object Association "$UNNAMED$3"
- quid "35DB3E72017C"
- roles (list role_list
- (object Role "$UNNAMED$4"
- quid "35DB3E73005A"
- supplier "Logical View::Design Model::Process View::<Process Name>"
- quidu "35DB3C8302D0"
- is_navigable TRUE
- is_aggregate TRUE)
- (object Role "$UNNAMED$5"
- quid "35DB3E730096"
- supplier "Logical View::Design Model::Process View::<Thread Name>"
- quidu "35DB3CB002BC"
- Containment "By Value"
- is_navigable TRUE))))
- logical_presentations (list unit_reference_list
- (object ClassDiagram "Process View"
- quid "35DB3C2A02B2"
- title "Process View"
- documentation "This diagram illustrates the composition of processes and threads, and the mapping of classes onto those processes and threads."
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list
- (object ClassView "Class" "Logical View::Design Model::Process View::<Process Name>" @17
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (288, 464)
- label (object ItemLabel
- Parent_View @17
- location (122, 436)
- fill_color 13434879
- nlines 1
- max_width 332
- justify 0
- label "<Process Name>")
- stereotype (object ItemLabel
- Parent_View @17
- location (122, 389)
- fill_color 13434879
- anchor 10
- nlines 1
- max_width 332
- justify 0
- label "<<process>>")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "35DB3C8302D0"
- width 350
- height 172
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::Design Model::Process View::<Thread Name>" @18
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (896, 464)
- label (object ItemLabel
- Parent_View @18
- location (740, 436)
- fill_color 13434879
- nlines 1
- max_width 312
- justify 0
- label "<Thread Name>")
- stereotype (object ItemLabel
- Parent_View @18
- location (740, 389)
- fill_color 13434879
- anchor 10
- nlines 1
- max_width 312
- justify 0
- label "<<thread>>")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "35DB3CB002BC"
- width 330
- height 172
- annotation 8
- autoResize TRUE)
- (object AssociationViewNew "$UNNAMED$3" @19
- location (596, 464)
- stereotype TRUE
- line_color 3342489
- quidu "35DB3E72017C"
- roleview_list (list RoleViews
- (object RoleView "$UNNAMED$4" @20
- Parent_View @19
- location (-300, 0)
- stereotype TRUE
- line_color 3342489
- quidu "35DB3E73005A"
- client @19
- supplier @17
- line_style 0)
- (object RoleView "$UNNAMED$5" @21
- Parent_View @19
- location (-300, 0)
- stereotype TRUE
- line_color 3342489
- quidu "35DB3E730096"
- client @19
- supplier @18
- line_style 0))))))))
- logical_presentations (list unit_reference_list
- (object ClassDiagram "Architecturally Significant Model Elements"
- quid "34E36BDE02C6"
- title "Architecturally Significant Model Elements"
- documentation "Elements of the Design Model which are considered architecturally significant should be presented in this diagram. This diagram will be presented in the document generated using the SoDA Software Architecture Document."
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list
- (object NoteView @22
- location (672, 304)
- label (object ItemLabel
- Parent_View @22
- location (28, 19)
- fill_color 13434879
- nlines 13
- max_width 1253
- label
-|
-|This diagram is just produced for architectural significant packages.
-|
-|This diagram shows the Architectural Significant Classes and Packages in this package. Only significant operations and attributes are shown on the classes in this diagram.
-|
-|See Rational Unified Process:
-|Activity: Architectural Design
-|Step: Include Architecturally Significant Model Elements in the Logical View
-|
-|This will be a part of the "Software Architecture Document" :
-|- "Logical View"
-|- "Architecturally Significant Model Elements"
- )
- line_color 3342489
- fill_color 13434879
- width 1313
- height 582)
- (object NoteView @23
- location (1696, 160)
- label (object ItemLabel
- Parent_View @23
- location (1358, 29)
- fill_color 13434879
- nlines 5
- max_width 640
- label
-|Created/modified by: <name>
-|Date: <creation/modification date>
-|
-|Approved by: <name>
-|Date: <approval date>
- )
- line_color 3342489
- fill_color 13434879
- width 700
- height 275)))
- (object ClassDiagram "Architecture Overview - Package and Subsystem Layering"
- quid "354A9751015E"
- title "Architecture Overview - Package and Subsystem Layering"
- documentation
-|This diagram depicts the organization of the design model into layers. This diagram will be presented in the document generated using the SoDA Software Architecture Document.
-|
-|See Rational Unified Process:
-|Activity: Architectural Analysis
-|Step: Define the High-Level Organization of Subsystems
-|
-|Activity: Incorporate Existing Design Elements
-|Step: Update the Organization of the Design Model
-
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list
- (object NoteView @24
- location (576, 256)
- label (object ItemLabel
- Parent_View @24
- location (44, 31)
- fill_color 13434879
- nlines 9
- max_width 1028
- label
-|This diagram shows the design model layers.
-|
-|See Rational Unified Process:
-|Activity: Architectural Analysis
-|Step: Define the High-Level Organization of Subsystems
-|
-|Activity: Architectural Design
-|Step: Define the Low-level Organization of Subsystems
- )
- line_color 3342489
- fill_color 13434879
- width 1088
- height 463)
- (object NoteView @25
- location (1520, 176)
- label (object ItemLabel
- Parent_View @25
- location (1182, 45)
- fill_color 13434879
- nlines 5
- max_width 640
- label
-|Created/modified by: <name>
-|Date: <creation/modification date>
-|
-|Approved by: <name>
-|Date: <approval date>
- )
- line_color 3342489
- fill_color 13434879
- width 700
- height 275))))))
- logical_presentations (list unit_reference_list
- (object ClassDiagram "Welcome"
- quid "3512226B0028"
- title "Welcome"
- documentation
-|Welcome to the Rational Unified Process Frame Work
-|
-|Purpose of the FrameWork:
-|a) provide a good structure for a Rose model
-|b) provide a style guide with naming conventions/suggestions
-|c) identify a minimal set of diagrams to produce
-|d) relate activities in RUP to Rose diagrams
-|e) provide a basis for sophisticated SoDA reports. For instance based on this structure most of the Rose parts of the "Software Architecture Document" are generated from SoDA.
-|
-
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list
- (object NoteView @26
- location (768, 384)
- label (object ItemLabel
- Parent_View @26
- location (121, 96)
- fill_color 13434879
- nlines 14
- max_width 1259
- label
-|Welcome to the Rational Unified Process Rose Model Framework
-|
-|Purpose of the Framework:
-|a) provide a good structure for a Rose model
-|b) provide a style guide with naming conventions/suggestions
-|c) identify a minimal set of diagrams to produce
-|d) relate activities in RUP to Rose diagrams
-|e) provide a basis for sophisticated SoDA reports. For instance based on this structure most of the Rose parts of the "Software Architecture Document" are generated from SoDA.
- )
- line_color 3342489
- fill_color 13434879
- width 1319
- height 588)
- (object CategoryView "Logical View::Analysis Model::TZ Compiler" @27
- location (1136, 1008)
- label (object ItemLabel
- Parent_View @27
- location (951, 924)
- fill_color 13434879
- nlines 2
- max_width 370
- justify 0
- label "TZ Compiler")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "40E569BC024F"
- width 382
- height 180)
- (object CategoryView "Logical View::Analysis Model::LTClasses" @28
- location (432, 1008)
- label (object ItemLabel
- Parent_View @28
- location (247, 924)
- fill_color 13434879
- nlines 2
- max_width 370
- justify 0
- label "LTClasses")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "40A89DC203B0"
- width 382
- height 180)
- (object CategoryView "Logical View::Analysis Model::Time Zone Database Management" @29
- location (1872, 1040)
- label (object ItemLabel
- Parent_View @29
- location (1638, 956)
- fill_color 13434879
- nlines 2
- max_width 468
- justify 0
- label "Time Zone Database Management")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "40B1E4A6003A"
- width 480
- height 180)
- (object CategoryView "Logical View::Analysis Model::Business Object Model" @30
- location (512, 1408)
- label (object ItemLabel
- Parent_View @30
- location (327, 1324)
- fill_color 13434879
- nlines 2
- max_width 370
- justify 0
- label "Business Object Model")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "35B678080064"
- width 382
- height 180)
- (object CategoryView "Logical View::Analysis Model::Local Time Conversion" @31
- location (1728, 1392)
- label (object ItemLabel
- Parent_View @31
- location (1543, 1308)
- fill_color 13434879
- nlines 2
- max_width 370
- justify 0
- label "Local Time Conversion")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "40B1D43200B7"
- width 382
- height 180)
- (object CategoryView "Logical View::Analysis Model::System Time Management" @32
- location (1040, 1392)
- label (object ItemLabel
- Parent_View @32
- location (855, 1308)
- fill_color 13434879
- nlines 2
- max_width 370
- justify 0
- label "System Time Management")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "40B1D49203C5"
- width 382
- height 180)))))
- root_subsystem (object SubSystem "Component View"
- quid "34DBB4830143"
- documentation
-|In Rational Unified Process the "Component View in Rose" is used to organize the implemetation model.
-|
-|The Implementaition View in Rational Unified Process
-|
-|
-
- physical_models (list unit_reference_list
- (object SubSystem "Implementation Model"
- quid "35B67C9A0348"
- documentation
-|The Implementation Model in Rational Unified Process is a collection of components, and the implementation subsystems that contain them.
-|
-|An architectural view that describes one or several system configurations; the mapping of software components (tasks, modules) to the computing nodes in these configurations.
-|
-|Defines, executables, dll's, files, subsystems, compilation order etc.
-|
-|Rational Unified Process:
-|Activity: Define the Organization of Subsystems
-|
-|These diagram will be presented in the Implementation View section in the document generated using the SoDA Software Architecture Document.
-|
-|It is recommended that, in most cases, the mapping should be
-|1:1 between design and implementation, that is, for each package in design there is one subsystem in the implementation model.
-|
-
- physical_models (list unit_reference_list)
- physical_presentations (list unit_reference_list
- (object Module_Diagram "Implementation Model Structure"
- quid "34DBB487006E"
- title "Implementation Model Structure"
- documentation "This diagram presents the organization of the Implementation Model."
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list
- (object NoteView @33
- location (624, 160)
- label (object ItemLabel
- Parent_View @33
- location (21, 26)
- fill_color 13434879
- nlines 5
- max_width 1170
- label
-|
-|RationalUnified Process:
-|Activity: Structure the implementation model
-|Step: Create the Initial Implementation Model Structure
- )
- line_color 3342489
- fill_color 13434879
- width 1230
- height 281)))))
- (object SubSystem "Components Analysis"
- is_unit TRUE
- is_loaded FALSE
- file_name "M:\\DST\\analysis\\Components.sub"
- quid "40D969B300E0"))
- physical_presentations (list unit_reference_list
- (object Module_Diagram "Main"
- quid "35C6339B029E"
- title "Main"
- documentation "This diagram, required by Rose, simply provides a way of navigating to the Implementation Model."
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list
- (object SubSysView "Component View::Implementation Model" @34
- location (736, 800)
- label (object ItemLabel
- Parent_View @34
- location (552, 713)
- fill_color 13434879
- nlines 2
- max_width 368
- justify 0
- label "Implementation Model")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "35B67C9A0348"
- width 381
- height 187)
- (object SubSysView "Component View::Components Analysis" @35
- location (1408, 1392)
- label (object ItemLabel
- Parent_View @35
- location (1264, 1323)
- fill_color 13434879
- nlines 2
- max_width 288
- justify 0
- label "Components Analysis")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "40D969B300E0"
- width 300
- height 150)))))
- process_structure (object Processes
- quid "34DBB4830144"
- ProcsNDevs (list
- (object Processor "<processor name>"
- quid "34DBBD4300B4"
- documentation "This node provides <enter a short description here of the functionality and capability of the node>."
- connections (list connection_list
- (object Connection_Relationship
- quid "34DBBD4B008C"
- supplier "<device name>"
- quidu "34DBBD47019A"
- supplier_is_device TRUE))
- characteristics ""
- scheduling "Preemptive"
- processes (list processes
- (object Process "<process name>"
- quid "35DB411001D6"
- documentation "This process corresponds to the process with the same name in the Logical View::Process Model."
- stereotype "process"
- priority "")
- (object Process "<thread name>"
- quid "35DB41720348"
- documentation "This process corresponds to the thread with the same name in the Logical View::Process Model."
- stereotype "thread"
- priority "")))
- (object Device "<device name>"
- quid "34DBBD47019A"
- documentation "This device provides <enter a short description of the capability the device provides> for the system."
- characteristics "")
- (object Process_Diagram "Deployment View"
- quid "34DBB4830146"
- title "Deployment View"
- documentation
-|The Deployment View in Rational Unified Process
-|
-|Defines the typical physical network configurations, including those typically used by end users, as well as special configurations used for development and test.
-|
-|See Rational Unified Process:
-|Activity: Describe Distribution
-|
-|This diagram will be a part of the SoDA template-generated Software Architecture Document under the "Deployment View" .
-
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list
- (object ProcessorView "<processor name>" @36
- location (512, 1056)
- label (object ItemLabel
- Parent_View @36
- location (276, 900)
- nlines 2
- max_width 400
- justify 0
- label "<processor name>")
- icon_style "Label"
- quidu "34DBBD4300B4"
- width 475
- height 381
- annotation 3)
- (object DeviceView "<device name>" @37
- location (1040, 1056)
- label (object ItemLabel
- Parent_View @37
- location (867, 950)
- nlines 2
- max_width 275
- justify 0
- label "<device name>")
- icon_style "Icon"
- quidu "34DBBD47019A"
- width 350
- height 282
- annotation 0)
- (object ConnectionView "" @38
- stereotype TRUE
- quidu "34DBBD4B008C"
- client @36
- supplier @37
- line_style 0)
- (object NoteView @39
- location (816, 304)
- label (object ItemLabel
- Parent_View @39
- location (38, 29)
- fill_color 13434879
- nlines 11
- max_width 1521
- label
-|This Diagram defines the typical physical network configurations, including those typically used by end users, as well as special configurations used for development and test.
-|
-|· Allocate processes to the various nodes. Allocation takes into account the capacity of the nodes (in terms of
-|both memory and processing), bandwidth of the communication medium (bus, LANs, WANs), and the
-|availability of the hardware and communication links, rerouting, and so on.
-|
-|See, Rational Unified Process:
-|Activity: Describe Distribution
- )
- line_color 3342489
- fill_color 13434879
- width 1581
- height 563)))))
- properties (object Properties
- attributes (list Attribute_Set
- (object Attribute
- tool "Visual Basic"
- name "propertyId"
- value "783606378")
- (object Attribute
- tool "Visual Basic"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "Visual Basic"
- name "CreatableSet"
- value (list Attribute_Set
- (object Attribute
- tool "Visual Basic"
- name "Private"
- value 221)
- (object Attribute
- tool "Visual Basic"
- name "PublicNotCreatable"
- value 213)
- (object Attribute
- tool "Visual Basic"
- name "SingleUse"
- value 214)
- (object Attribute
- tool "Visual Basic"
- name "GlobalSingleUse"
- value 215)
- (object Attribute
- tool "Visual Basic"
- name "MultiUse"
- value 219)
- (object Attribute
- tool "Visual Basic"
- name "GlobalMultiUse"
- value 220)))
- (object Attribute
- tool "Visual Basic"
- name "OptionBase"
- value ("BaseSet" 222))
- (object Attribute
- tool "Visual Basic"
- name "OptionExplicit"
- value TRUE)
- (object Attribute
- tool "Visual Basic"
- name "OptionCompare"
- value ("CompareSet" 202))
- (object Attribute
- tool "Visual Basic"
- name "Creatable"
- value ("CreatableSet" 221))
- (object Attribute
- tool "Visual Basic"
- name "GenerateInitialization"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "GenerateTermination"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "CollectionClass"
- value "Collection")
- (object Attribute
- tool "Visual Basic"
- name "CompareSet"
- value (list Attribute_Set
- (object Attribute
- tool "Visual Basic"
- name "(none)"
- value 202)
- (object Attribute
- tool "Visual Basic"
- name "Binary"
- value 203)
- (object Attribute
- tool "Visual Basic"
- name "Text"
- value 204)))
- (object Attribute
- tool "Visual Basic"
- name "UpdateCode"
- value TRUE)
- (object Attribute
- tool "Visual Basic"
- name "UpdateModel"
- value TRUE)
- (object Attribute
- tool "Visual Basic"
- name "InstancingSet"
- value (list Attribute_Set
- (object Attribute
- tool "Visual Basic"
- name "Private"
- value 221)
- (object Attribute
- tool "Visual Basic"
- name "PublicNotCreatable"
- value 213)
- (object Attribute
- tool "Visual Basic"
- name "SingleUse"
- value 214)
- (object Attribute
- tool "Visual Basic"
- name "GlobalSingleUse"
- value 215)
- (object Attribute
- tool "Visual Basic"
- name "MultiUse"
- value 219)
- (object Attribute
- tool "Visual Basic"
- name "GlobalMultiUse"
- value 220)))
- (object Attribute
- tool "Visual Basic"
- name "BaseSet"
- value (list Attribute_Set
- (object Attribute
- tool "Visual Basic"
- name "(none)"
- value 222)
- (object Attribute
- tool "Visual Basic"
- name "0"
- value 223)
- (object Attribute
- tool "Visual Basic"
- name "1"
- value 224)))
- (object Attribute
- tool "Visual Basic"
- name "Instancing"
- value ("InstancingSet" 221))))
- (object Attribute
- tool "Visual Basic"
- name "default__Operation"
- value (list Attribute_Set
- (object Attribute
- tool "Visual Basic"
- name "OperationName"
- value "$operation")
- (object Attribute
- tool "Visual Basic"
- name "LibraryName"
- value "")
- (object Attribute
- tool "Visual Basic"
- name "AliasName"
- value "")
- (object Attribute
- tool "Visual Basic"
- name "IsStatic"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "EntryCode"
- value (value Text ""))
- (object Attribute
- tool "Visual Basic"
- name "ExitCode"
- value (value Text ""))
- (object Attribute
- tool "Visual Basic"
- name "ReplaceExistingBody"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "DefaultBody"
- value (value Text ""))))
- (object Attribute
- tool "Visual Basic"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "Visual Basic"
- name "IsConst"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "New"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "WithEvents"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "Subscript"
- value "")
- (object Attribute
- tool "Visual Basic"
- name "NameIfUnlabeled"
- value "the$supplier")
- (object Attribute
- tool "Visual Basic"
- name "GenerateDataMember"
- value TRUE)
- (object Attribute
- tool "Visual Basic"
- name "DataMemberName"
- value "$relationship")
- (object Attribute
- tool "Visual Basic"
- name "GenerateGetOperation"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "GenerateSetOperation"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "GenerateLetOperation"
- value FALSE)))
- (object Attribute
- tool "Visual Basic"
- name "default__Role"
- value (list Attribute_Set
- (object Attribute
- tool "Visual Basic"
- name "New"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "WithEvents"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "Subscript"
- value "")
- (object Attribute
- tool "Visual Basic"
- name "NameIfUnlabeled"
- value "the$supplier")
- (object Attribute
- tool "Visual Basic"
- name "GenerateDataMember"
- value TRUE)
- (object Attribute
- tool "Visual Basic"
- name "DataMemberName"
- value "$relationship")
- (object Attribute
- tool "Visual Basic"
- name "GenerateGetOperation"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "GenerateSetOperation"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "GenerateLetOperation"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "UpdateCode"
- value TRUE)
- (object Attribute
- tool "Visual Basic"
- name "FullName"
- value FALSE)))
- (object Attribute
- tool "Visual Basic"
- name "default__Inherit"
- value (list Attribute_Set
- (object Attribute
- tool "Visual Basic"
- name "ImplementsDelegation"
- value TRUE)
- (object Attribute
- tool "Visual Basic"
- name "FullName"
- value FALSE)))
- (object Attribute
- tool "Visual Basic"
- name "default__Module-Spec"
- value (list Attribute_Set
- (object Attribute
- tool "Visual Basic"
- name "ProjectFile"
- value "")
- (object Attribute
- tool "Visual Basic"
- name "UpdateCode"
- value TRUE)
- (object Attribute
- tool "Visual Basic"
- name "UpdateModel"
- value TRUE)
- (object Attribute
- tool "Visual Basic"
- name "ImportReferences"
- value TRUE)
- (object Attribute
- tool "Visual Basic"
- name "QuickImport"
- value TRUE)))
- (object Attribute
- tool "Visual Basic"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "VisualStudio"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Repository"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "SCC"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Oracle8"
- name "propertyId"
- value "360000002")
- (object Attribute
- tool "Oracle8"
- name "default__Project"
- value (list Attribute_Set
- (object Attribute
- tool "Oracle8"
- name "DDLScriptFilename"
- value "DDL1.SQL")
- (object Attribute
- tool "Oracle8"
- name "DropClause"
- value FALSE)
- (object Attribute
- tool "Oracle8"
- name "PrimaryKeyColumnName"
- value "_ID")
- (object Attribute
- tool "Oracle8"
- name "PrimaryKeyColumnType"
- value "NUMBER(5,0)")
- (object Attribute
- tool "Oracle8"
- name "SchemaNamePrefix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "SchemaNameSuffix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "TableNamePrefix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "TableNameSuffix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "TypeNamePrefix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "TypeNameSuffix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "ViewNamePrefix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "ViewNameSuffix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "VarrayNamePrefix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "VarrayNameSuffix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "NestedTableNamePrefix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "NestedTableNameSuffix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "ObjectTableNamePrefix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "ObjectTableNameSuffix"
- value "")))
- (object Attribute
- tool "Oracle8"
- name "default__Module-Spec"
- value (list Attribute_Set
- (object Attribute
- tool "Oracle8"
- name "IsSchema"
- value FALSE)))
- (object Attribute
- tool "Oracle8"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "Oracle8"
- name "OID"
- value "")
- (object Attribute
- tool "Oracle8"
- name "WhereClause"
- value "")
- (object Attribute
- tool "Oracle8"
- name "CheckConstraint"
- value "")
- (object Attribute
- tool "Oracle8"
- name "CollectionTypeLength"
- value "")
- (object Attribute
- tool "Oracle8"
- name "CollectionTypePrecision"
- value "")
- (object Attribute
- tool "Oracle8"
- name "CollectionTypeScale"
- value "")
- (object Attribute
- tool "Oracle8"
- name "CollectionOfREFS"
- value FALSE)))
- (object Attribute
- tool "Oracle8"
- name "default__Operation"
- value (list Attribute_Set
- (object Attribute
- tool "Oracle8"
- name "MethodKind"
- value ("MethodKindSet" 1903))
- (object Attribute
- tool "Oracle8"
- name "OverloadID"
- value "")
- (object Attribute
- tool "Oracle8"
- name "OrderNumber"
- value "")
- (object Attribute
- tool "Oracle8"
- name "IsReadNoDataState"
- value FALSE)
- (object Attribute
- tool "Oracle8"
- name "IsReadNoProcessState"
- value FALSE)
- (object Attribute
- tool "Oracle8"
- name "IsWriteNoDataState"
- value FALSE)
- (object Attribute
- tool "Oracle8"
- name "IsWriteNoProcessState"
- value FALSE)
- (object Attribute
- tool "Oracle8"
- name "IsSelfish"
- value FALSE)
- (object Attribute
- tool "Oracle8"
- name "TriggerType"
- value ("TriggerTypeSet" 1801))
- (object Attribute
- tool "Oracle8"
- name "TriggerEvent"
- value ("TriggerEventSet" 1601))
- (object Attribute
- tool "Oracle8"
- name "TriggerText"
- value "")
- (object Attribute
- tool "Oracle8"
- name "TriggerReferencingNames"
- value "")
- (object Attribute
- tool "Oracle8"
- name "TriggerForEach"
- value ("TriggerForEachSet" 1701))
- (object Attribute
- tool "Oracle8"
- name "TriggerWhenClause"
- value "")
- (object Attribute
- tool "Oracle8"
- name "MethodKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "Oracle8"
- name "MapMethod"
- value 1901)
- (object Attribute
- tool "Oracle8"
- name "OrderMethod"
- value 1902)
- (object Attribute
- tool "Oracle8"
- name "Function"
- value 1903)
- (object Attribute
- tool "Oracle8"
- name "Procedure"
- value 1904)
- (object Attribute
- tool "Oracle8"
- name "Operator"
- value 1905)
- (object Attribute
- tool "Oracle8"
- name "Constructor"
- value 1906)
- (object Attribute
- tool "Oracle8"
- name "Destructor"
- value 1907)
- (object Attribute
- tool "Oracle8"
- name "Trigger"
- value 1908)
- (object Attribute
- tool "Oracle8"
- name "Calculated"
- value 1909)))
- (object Attribute
- tool "Oracle8"
- name "TriggerTypeSet"
- value (list Attribute_Set
- (object Attribute
- tool "Oracle8"
- name "AFTER"
- value 1801)
- (object Attribute
- tool "Oracle8"
- name "BEFORE"
- value 1802)
- (object Attribute
- tool "Oracle8"
- name "INSTEAD OF"
- value 1803)))
- (object Attribute
- tool "Oracle8"
- name "TriggerForEachSet"
- value (list Attribute_Set
- (object Attribute
- tool "Oracle8"
- name "ROW"
- value 1701)
- (object Attribute
- tool "Oracle8"
- name "STATEMENT"
- value 1702)))
- (object Attribute
- tool "Oracle8"
- name "TriggerEventSet"
- value (list Attribute_Set
- (object Attribute
- tool "Oracle8"
- name "INSERT"
- value 1601)
- (object Attribute
- tool "Oracle8"
- name "UPDATE"
- value 1602)
- (object Attribute
- tool "Oracle8"
- name "DELETE"
- value 1603)
- (object Attribute
- tool "Oracle8"
- name "INSERT OR UPDATE"
- value 1604)
- (object Attribute
- tool "Oracle8"
- name "INSERT OR DELETE"
- value 1605)
- (object Attribute
- tool "Oracle8"
- name "UPDATE OR DELETE"
- value 1606)
- (object Attribute
- tool "Oracle8"
- name "INSERT OR UPDATE OR DELETE"
- value 1607)))))
- (object Attribute
- tool "Oracle8"
- name "default__Role"
- value (list Attribute_Set
- (object Attribute
- tool "Oracle8"
- name "OrderNumber"
- value "")))
- (object Attribute
- tool "Oracle8"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "Oracle8"
- name "OrderNumber"
- value "")
- (object Attribute
- tool "Oracle8"
- name "IsUnique"
- value FALSE)
- (object Attribute
- tool "Oracle8"
- name "NullsAllowed"
- value TRUE)
- (object Attribute
- tool "Oracle8"
- name "Length"
- value "")
- (object Attribute
- tool "Oracle8"
- name "Precision"
- value "2")
- (object Attribute
- tool "Oracle8"
- name "Scale"
- value "6")
- (object Attribute
- tool "Oracle8"
- name "IsIndex"
- value FALSE)
- (object Attribute
- tool "Oracle8"
- name "IsPrimaryKey"
- value FALSE)
- (object Attribute
- tool "Oracle8"
- name "CompositeUnique"
- value FALSE)
- (object Attribute
- tool "Oracle8"
- name "CheckConstraint"
- value "")))
- (object Attribute
- tool "Oracle8"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "cg"
- name "propertyId"
- value "809135966")
- (object Attribute
- tool "cg"
- name "default__Project"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "UseMSVC"
- value FALSE)
- (object Attribute
- tool "cg"
- name "HeaderFileExtension"
- value "h")
- (object Attribute
- tool "cg"
- name "HeaderFileBackupExtension"
- value "h~")
- (object Attribute
- tool "cg"
- name "HeaderFileTemporaryExtension"
- value "h#")
- (object Attribute
- tool "cg"
- name "PrecompiledHeader"
- value "stdafx.h")
- (object Attribute
- tool "cg"
- name "CodeFileExtension"
- value "cpp")
- (object Attribute
- tool "cg"
- name "CodeFileBackupExtension"
- value "cp~")
- (object Attribute
- tool "cg"
- name "CodeFileTemporaryExtension"
- value "cp#")
- (object Attribute
- tool "cg"
- name "CreateMissingDirectories"
- value TRUE)
- (object Attribute
- tool "cg"
- name "StopOnError"
- value FALSE)
- (object Attribute
- tool "cg"
- name "ErrorLimit"
- value 30)
- (object Attribute
- tool "cg"
- name "Directory"
- value "AUTO GENERATE")
- (object Attribute
- tool "cg"
- name "PathSeparator"
- value "")
- (object Attribute
- tool "cg"
- name "FileNameFormat"
- value "")
- (object Attribute
- tool "cg"
- name "BooleanType"
- value "int")
- (object Attribute
- tool "cg"
- name "AllowTemplates"
- value TRUE)
- (object Attribute
- tool "cg"
- name "AllowProtectedInheritance"
- value TRUE)
- (object Attribute
- tool "cg"
- name "CommentWidth"
- value 60)
- (object Attribute
- tool "cg"
- name "OneByValueContainer"
- value "$targetClass")
- (object Attribute
- tool "cg"
- name "OneByReferenceContainer"
- value "$targetClass *")
- (object Attribute
- tool "cg"
- name "OptionalByValueContainer"
- value "OptionalByValue<$targetClass>")
- (object Attribute
- tool "cg"
- name "OptionalByReferenceContainer"
- value "$targetClass *")
- (object Attribute
- tool "cg"
- name "FixedByValueContainer"
- value "$targetClass[$limit]")
- (object Attribute
- tool "cg"
- name "UnorderedFixedByValueContainer"
- value "$targetClass[$limit]")
- (object Attribute
- tool "cg"
- name "FixedByReferenceContainer"
- value "$targetClass *[$limit]")
- (object Attribute
- tool "cg"
- name "UnorderedFixedByReferenceContainer"
- value "$targetClass *[$limit]")
- (object Attribute
- tool "cg"
- name "BoundedByValueContainer"
- value "BoundedListByValue<$targetClass,$limit>")
- (object Attribute
- tool "cg"
- name "UnorderedBoundedByValueContainer"
- value "BoundedSetByValue<$targetClass,$limit>")
- (object Attribute
- tool "cg"
- name "BoundedByReferenceContainer"
- value "BoundedListByReference<$targetClass,$limit>")
- (object Attribute
- tool "cg"
- name "UnorderedBoundedByReferenceContainer"
- value "BoundedSetByReference<$targetClass,$limit>")
- (object Attribute
- tool "cg"
- name "UnboundedByValueContainer"
- value "UnboundedListByValue<$targetClass>")
- (object Attribute
- tool "cg"
- name "UnorderedUnboundedByValueContainer"
- value "UnboundedSetByValue<$targetClass>")
- (object Attribute
- tool "cg"
- name "UnboundedByReferenceContainer"
- value "UnboundedListByReference<$targetClass>")
- (object Attribute
- tool "cg"
- name "UnorderedUnboundedByReferenceContainer"
- value "UnboundedSetByReference<$targetClass>")
- (object Attribute
- tool "cg"
- name "QualifiedByValueContainer"
- value "AssociationByValue<$qualtype, $qualcont>")
- (object Attribute
- tool "cg"
- name "UnorderedQualifiedByValueContainer"
- value "DictionaryByValue<$qualtype, $qualcont>")
- (object Attribute
- tool "cg"
- name "QualifiedByReferenceContainer"
- value "AssociationByReference<$qualtype, $qualcont>")
- (object Attribute
- tool "cg"
- name "UnorderedQualifiedByReferenceContainer"
- value "DictionaryByReference<$qualtype, $qualcont>")
- (object Attribute
- tool "cg"
- name "GeneratePreserveRegions"
- value TRUE)
- (object Attribute
- tool "cg"
- name "AllowExplicitInstantiations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "AlwaysKeepOrphanedCode"
- value FALSE)
- (object Attribute
- tool "cg"
- name "AllowGenerateOverNewerAnnotations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "AllowGenerateOverNewerVersion"
- value FALSE)))
- (object Attribute
- tool "cg"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "CodeName"
- value "")
- (object Attribute
- tool "cg"
- name "ImplementationType"
- value "")
- (object Attribute
- tool "cg"
- name "ClassKey"
- value "class")
- (object Attribute
- tool "cg"
- name "GenerateEmptyRegions"
- value ("GenerateEmptyRegionSet" 3))
- (object Attribute
- tool "cg"
- name "GenerateEmptyRegionSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "None"
- value 0)
- (object Attribute
- tool "cg"
- name "Preserved"
- value 1)
- (object Attribute
- tool "cg"
- name "Unpreserved"
- value 2)
- (object Attribute
- tool "cg"
- name "All"
- value 3)))
- (object Attribute
- tool "cg"
- name "PutBodiesInSpec"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateDefaultConstructor"
- value ("GenerateSet" 206))
- (object Attribute
- tool "cg"
- name "DefaultConstructorVisibility"
- value ("VisibilitySet" 45))
- (object Attribute
- tool "cg"
- name "InlineDefaultConstructor"
- value FALSE)
- (object Attribute
- tool "cg"
- name "ExplicitDefaultConstructor"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateCopyConstructor"
- value ("GenerateSet" 206))
- (object Attribute
- tool "cg"
- name "CopyConstructorVisibility"
- value ("VisibilitySet" 45))
- (object Attribute
- tool "cg"
- name "InlineCopyConstructor"
- value FALSE)
- (object Attribute
- tool "cg"
- name "ExplicitCopyConstructor"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateDestructor"
- value FALSE)
- (object Attribute
- tool "cg"
- name "DestructorVisibility"
- value ("VisibilitySet" 45))
- (object Attribute
- tool "cg"
- name "DestructorKind"
- value ("ThreeKindSet" 200))
- (object Attribute
- tool "cg"
- name "InlineDestructor"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateAssignmentOperation"
- value ("GenerateSet" 206))
- (object Attribute
- tool "cg"
- name "AssignmentVisibility"
- value ("VisibilitySet" 45))
- (object Attribute
- tool "cg"
- name "AssignmentKind"
- value ("ThreeKindSet" 200))
- (object Attribute
- tool "cg"
- name "InlineAssignmentOperation"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateEqualityOperations"
- value ("GenerateSet" 206))
- (object Attribute
- tool "cg"
- name "EqualityVisibility"
- value ("VisibilitySet" 45))
- (object Attribute
- tool "cg"
- name "EqualityKind"
- value ("FriendKindSet" 200))
- (object Attribute
- tool "cg"
- name "InlineEqualityOperations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateRelationalOperations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "RelationalVisibility"
- value ("VisibilitySet" 45))
- (object Attribute
- tool "cg"
- name "RelationalKind"
- value ("FriendKindSet" 200))
- (object Attribute
- tool "cg"
- name "InlineRelationalOperations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateStorageMgmtOperations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "StorageMgmtVisibility"
- value ("VisibilitySet" 45))
- (object Attribute
- tool "cg"
- name "InlineStorageMgmtOperations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateSubscriptOperation"
- value FALSE)
- (object Attribute
- tool "cg"
- name "SubscriptVisibility"
- value ("VisibilitySet" 45))
- (object Attribute
- tool "cg"
- name "SubscriptKind"
- value ("ThreeKindSet" 200))
- (object Attribute
- tool "cg"
- name "SubscriptResultType"
- value "")
- (object Attribute
- tool "cg"
- name "InlineSubscriptOperation"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateDereferenceOperation"
- value FALSE)
- (object Attribute
- tool "cg"
- name "DereferenceVisibility"
- value ("VisibilitySet" 45))
- (object Attribute
- tool "cg"
- name "DereferenceKind"
- value ("ThreeKindSet" 200))
- (object Attribute
- tool "cg"
- name "DereferenceResultType"
- value "")
- (object Attribute
- tool "cg"
- name "InlineDereferenceOperation"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateIndirectionOperation"
- value FALSE)
- (object Attribute
- tool "cg"
- name "IndirectionVisibility"
- value ("VisibilitySet" 45))
- (object Attribute
- tool "cg"
- name "IndirectionKind"
- value ("ThreeKindSet" 200))
- (object Attribute
- tool "cg"
- name "IndirectionResultType"
- value "")
- (object Attribute
- tool "cg"
- name "InlineIndirectionOperation"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateStreamOperations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "StreamVisibility"
- value ("VisibilitySet" 45))
- (object Attribute
- tool "cg"
- name "InlineStreamOperations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "ThreeKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Common"
- value 200)
- (object Attribute
- tool "cg"
- name "Virtual"
- value 201)
- (object Attribute
- tool "cg"
- name "Abstract"
- value 202)))
- (object Attribute
- tool "cg"
- name "KindSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Common"
- value 200)
- (object Attribute
- tool "cg"
- name "Virtual"
- value 201)
- (object Attribute
- tool "cg"
- name "Abstract"
- value 202)
- (object Attribute
- tool "cg"
- name "Static"
- value 203)))
- (object Attribute
- tool "cg"
- name "FriendKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Common"
- value 200)
- (object Attribute
- tool "cg"
- name "Virtual"
- value 201)
- (object Attribute
- tool "cg"
- name "Abstract"
- value 202)
- (object Attribute
- tool "cg"
- name "Friend"
- value 204)))
- (object Attribute
- tool "cg"
- name "GenerateSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "DeclareAndDefine"
- value 199)
- (object Attribute
- tool "cg"
- name "DeclareOnly"
- value 205)
- (object Attribute
- tool "cg"
- name "DoNotDeclare"
- value 206)))
- (object Attribute
- tool "cg"
- name "VisibilitySet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Public"
- value 45)
- (object Attribute
- tool "cg"
- name "Protected"
- value 44)
- (object Attribute
- tool "cg"
- name "Private"
- value 43)
- (object Attribute
- tool "cg"
- name "Implementation"
- value 14)))
- (object Attribute
- tool "cg"
- name "ConstValue"
- value "")
- (object Attribute
- tool "cg"
- name "GenerateDefaultSpecifier"
- value FALSE)
- (object Attribute
- tool "cg"
- name "DefaultSpecifier"
- value "")))
- (object Attribute
- tool "cg"
- name "default__Module-Spec"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Generate"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GenerateEmptyRegions"
- value ("GenerateEmptyRegionSet" 3))
- (object Attribute
- tool "cg"
- name "GenerateEmptyRegionSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "None"
- value 0)
- (object Attribute
- tool "cg"
- name "Preserved"
- value 1)
- (object Attribute
- tool "cg"
- name "Unpreserved"
- value 2)
- (object Attribute
- tool "cg"
- name "All"
- value 3)))
- (object Attribute
- tool "cg"
- name "CmIdentification"
- value (value Text " %X% %Q% %Z% %W%"))
- (object Attribute
- tool "cg"
- name "CopyrightNotice"
- value (value Text ""))
- (object Attribute
- tool "cg"
- name "FileName"
- value "AUTO GENERATE")
- (object Attribute
- tool "cg"
- name "AllowExtensionlessFileName"
- value FALSE)
- (object Attribute
- tool "cg"
- name "InclusionProtectionSymbol"
- value "AUTO GENERATE")
- (object Attribute
- tool "cg"
- name "IncludeFormat"
- value (value Text
-|// $package
-|#include "$file"
-|
- ))
- (object Attribute
- tool "cg"
- name "IncludeBySimpleName"
- value FALSE)
- (object Attribute
- tool "cg"
- name "IncludePrecompiledHeader"
- value FALSE)
- (object Attribute
- tool "cg"
- name "IncludeOrder"
- value "AMIR")
- (object Attribute
- tool "cg"
- name "AdditionalIncludes"
- value (value Text ""))
- (object Attribute
- tool "cg"
- name "InliningStyle"
- value ("InliningStyleSet" 207))
- (object Attribute
- tool "cg"
- name "InliningStyleSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "InClassDeclaration"
- value 208)
- (object Attribute
- tool "cg"
- name "FollowingClassDeclaration"
- value 207)))
- (object Attribute
- tool "cg"
- name "TypesDefined"
- value (value Text ""))
- (object Attribute
- tool "cg"
- name "IncludeClosure"
- value (value Text ""))))
- (object Attribute
- tool "cg"
- name "default__Module-Body"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Generate"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GenerateEmptyRegions"
- value ("GenerateEmptyRegionSet" 3))
- (object Attribute
- tool "cg"
- name "GenerateEmptyRegionSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "None"
- value 0)
- (object Attribute
- tool "cg"
- name "Preserved"
- value 1)
- (object Attribute
- tool "cg"
- name "Unpreserved"
- value 2)
- (object Attribute
- tool "cg"
- name "All"
- value 3)))
- (object Attribute
- tool "cg"
- name "CmIdentification"
- value (value Text " %X% %Q% %Z% %W%"))
- (object Attribute
- tool "cg"
- name "CopyrightNotice"
- value (value Text ""))
- (object Attribute
- tool "cg"
- name "FileName"
- value "AUTO GENERATE")
- (object Attribute
- tool "cg"
- name "AllowExtensionlessFileName"
- value FALSE)
- (object Attribute
- tool "cg"
- name "IncludeFormat"
- value (value Text
-|// $package
-|#include "$file"
-|
- ))
- (object Attribute
- tool "cg"
- name "IncludeBySimpleName"
- value FALSE)
- (object Attribute
- tool "cg"
- name "IncludePrecompiledHeader"
- value TRUE)
- (object Attribute
- tool "cg"
- name "IncludeOrder"
- value "AMIR")
- (object Attribute
- tool "cg"
- name "AdditionalIncludes"
- value (value Text ""))
- (object Attribute
- tool "cg"
- name "InliningStyle"
- value ("InliningStyleSet" 207))
- (object Attribute
- tool "cg"
- name "InliningStyleSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "InClassDeclaration"
- value 208)
- (object Attribute
- tool "cg"
- name "FollowingClassDeclaration"
- value 207)))
- (object Attribute
- tool "cg"
- name "TypesDefined"
- value (value Text ""))
- (object Attribute
- tool "cg"
- name "IncludeClosure"
- value (value Text ""))))
- (object Attribute
- tool "cg"
- name "default__Operation"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "CodeName"
- value "")
- (object Attribute
- tool "cg"
- name "OperationKind"
- value ("OperationKindSet" 200))
- (object Attribute
- tool "cg"
- name "OperationKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Common"
- value 200)
- (object Attribute
- tool "cg"
- name "Virtual"
- value 201)
- (object Attribute
- tool "cg"
- name "Abstract"
- value 202)
- (object Attribute
- tool "cg"
- name "Static"
- value 203)
- (object Attribute
- tool "cg"
- name "Friend"
- value 204)))
- (object Attribute
- tool "cg"
- name "OperationIsConst"
- value FALSE)
- (object Attribute
- tool "cg"
- name "OperationIsExplicit"
- value FALSE)
- (object Attribute
- tool "cg"
- name "Inline"
- value FALSE)
- (object Attribute
- tool "cg"
- name "EntryCode"
- value (value Text ""))
- (object Attribute
- tool "cg"
- name "ExitCode"
- value (value Text ""))
- (object Attribute
- tool "cg"
- name "GenerateEmptyRegions"
- value ("GenerateEmptyRegionSet" 3))
- (object Attribute
- tool "cg"
- name "GenerateEmptyRegionSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "None"
- value 0)
- (object Attribute
- tool "cg"
- name "Preserved"
- value 1)
- (object Attribute
- tool "cg"
- name "Unpreserved"
- value 2)
- (object Attribute
- tool "cg"
- name "All"
- value 3)))
- (object Attribute
- tool "cg"
- name "BodyAnnotations"
- value "")
- (object Attribute
- tool "cg"
- name "OperationIsOneWay"
- value FALSE)
- (object Attribute
- tool "cg"
- name "Context"
- value "")
- (object Attribute
- tool "cg"
- name "Raises"
- value "")
- (object Attribute
- tool "cg"
- name "CCRegion"
- value "")
- (object Attribute
- tool "cg"
- name "GenerateAbstractBody"
- value FALSE)))
- (object Attribute
- tool "cg"
- name "default__Has"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "CodeName"
- value "")
- (object Attribute
- tool "cg"
- name "Ordered"
- value TRUE)
- (object Attribute
- tool "cg"
- name "NameIfUnlabeled"
- value "the_$supplier")
- (object Attribute
- tool "cg"
- name "GenerateDataMember"
- value TRUE)
- (object Attribute
- tool "cg"
- name "DataMemberName"
- value "$relationship")
- (object Attribute
- tool "cg"
- name "DataMemberVisibility"
- value ("DataMemberVisibilitySet" 14))
- (object Attribute
- tool "cg"
- name "DataMemberVisibilitySet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Public"
- value 45)
- (object Attribute
- tool "cg"
- name "Protected"
- value 44)
- (object Attribute
- tool "cg"
- name "Private"
- value 43)
- (object Attribute
- tool "cg"
- name "Implementation"
- value 14)
- (object Attribute
- tool "cg"
- name "AtRelationshipVisibility"
- value 210)))
- (object Attribute
- tool "cg"
- name "DataMemberMutability"
- value ("DataMemberMutabilitySet" 0))
- (object Attribute
- tool "cg"
- name "DataMemberMutabilitySet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Unrestricted"
- value 0)
- (object Attribute
- tool "cg"
- name "Mutable"
- value 1)
- (object Attribute
- tool "cg"
- name "Const"
- value 2)))
- (object Attribute
- tool "cg"
- name "DataMemberIsVolatile"
- value FALSE)
- (object Attribute
- tool "cg"
- name "DataMemberFieldSize"
- value "")
- (object Attribute
- tool "cg"
- name "InitialValue"
- value (value Text ""))
- (object Attribute
- tool "cg"
- name "GenerateGetOperation"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GenerateSetOperation"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GetName"
- value "get_$relationship")
- (object Attribute
- tool "cg"
- name "SetName"
- value "set_$relationship")
- (object Attribute
- tool "cg"
- name "GetSetKinds"
- value ("GetSetKindsSet" 200))
- (object Attribute
- tool "cg"
- name "GetSetKindsSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Common"
- value 200)
- (object Attribute
- tool "cg"
- name "Virtual"
- value 201)
- (object Attribute
- tool "cg"
- name "Abstract"
- value 202)
- (object Attribute
- tool "cg"
- name "Static"
- value 203)
- (object Attribute
- tool "cg"
- name "Friend"
- value 204)))
- (object Attribute
- tool "cg"
- name "ContainerClass"
- value "")
- (object Attribute
- tool "cg"
- name "SelectorName"
- value "")
- (object Attribute
- tool "cg"
- name "SelectorType"
- value "")
- (object Attribute
- tool "cg"
- name "GetIsConst"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GetResultIsConst"
- value ("GetResultIsConstSet" 2))
- (object Attribute
- tool "cg"
- name "GetResultIsConstSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "False"
- value 0)
- (object Attribute
- tool "cg"
- name "True"
- value 1)
- (object Attribute
- tool "cg"
- name "Same_As_Function"
- value 2)))
- (object Attribute
- tool "cg"
- name "GetSetByReference"
- value FALSE)
- (object Attribute
- tool "cg"
- name "InlineGet"
- value TRUE)
- (object Attribute
- tool "cg"
- name "SetReturnsValue"
- value FALSE)
- (object Attribute
- tool "cg"
- name "InlineSet"
- value TRUE)
- (object Attribute
- tool "cg"
- name "ForwardReferenceOnly"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateForwardReference"
- value FALSE)
- (object Attribute
- tool "cg"
- name "IsReadOnly"
- value FALSE)
- (object Attribute
- tool "cg"
- name "BoundedHasRelType"
- value ("HasRelTypeSet" 47))
- (object Attribute
- tool "cg"
- name "HasRelTypeSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Array"
- value 24)
- (object Attribute
- tool "cg"
- name "Sequence"
- value 47)))))
- (object Attribute
- tool "cg"
- name "default__Association"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "NameIfUnlabeled"
- value "the_$targetClass")))
- (object Attribute
- tool "cg"
- name "default__Inherit"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "InstanceArguments"
- value "")))
- (object Attribute
- tool "cg"
- name "default__Role"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "CodeName"
- value "")
- (object Attribute
- tool "cg"
- name "ForwardReferenceOnly"
- value FALSE)
- (object Attribute
- tool "cg"
- name "NameIfUnlabeled"
- value "the_$targetClass")
- (object Attribute
- tool "cg"
- name "GenerateDataMember"
- value TRUE)
- (object Attribute
- tool "cg"
- name "DataMemberName"
- value "$target")
- (object Attribute
- tool "cg"
- name "DataMemberVisibility"
- value ("DataMemberVisibilitySet" 14))
- (object Attribute
- tool "cg"
- name "DataMemberVisibilitySet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Public"
- value 45)
- (object Attribute
- tool "cg"
- name "Protected"
- value 44)
- (object Attribute
- tool "cg"
- name "Private"
- value 43)
- (object Attribute
- tool "cg"
- name "Implementation"
- value 14)
- (object Attribute
- tool "cg"
- name "AtRelationshipVisibility"
- value 210)))
- (object Attribute
- tool "cg"
- name "DataMemberMutability"
- value ("DataMemberMutabilitySet" 0))
- (object Attribute
- tool "cg"
- name "DataMemberMutabilitySet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Unrestricted"
- value 0)
- (object Attribute
- tool "cg"
- name "Mutable"
- value 1)
- (object Attribute
- tool "cg"
- name "Const"
- value 2)))
- (object Attribute
- tool "cg"
- name "DataMemberIsVolatile"
- value FALSE)
- (object Attribute
- tool "cg"
- name "DataMemberFieldSize"
- value "")
- (object Attribute
- tool "cg"
- name "InitialValue"
- value (value Text ""))
- (object Attribute
- tool "cg"
- name "ContainerClass"
- value "")
- (object Attribute
- tool "cg"
- name "ContainerGet"
- value "$data.get($keys)")
- (object Attribute
- tool "cg"
- name "ContainerSet"
- value "$data.set($keys,$value)")
- (object Attribute
- tool "cg"
- name "QualifiedContainer"
- value "")
- (object Attribute
- tool "cg"
- name "AssocClassContainer"
- value "$supplier *")
- (object Attribute
- tool "cg"
- name "AssocClassInitialValue"
- value (value Text ""))
- (object Attribute
- tool "cg"
- name "GetSetKinds"
- value ("GetSetKindsSet" 200))
- (object Attribute
- tool "cg"
- name "GetSetKindsSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Common"
- value 200)
- (object Attribute
- tool "cg"
- name "Virtual"
- value 201)
- (object Attribute
- tool "cg"
- name "Abstract"
- value 202)
- (object Attribute
- tool "cg"
- name "Static"
- value 203)
- (object Attribute
- tool "cg"
- name "Friend"
- value 204)))
- (object Attribute
- tool "cg"
- name "GetSetByReference"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateGetOperation"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GetName"
- value "get_$target")
- (object Attribute
- tool "cg"
- name "GetIsConst"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GetResultIsConst"
- value ("GetResultIsConstSet" 2))
- (object Attribute
- tool "cg"
- name "GetResultIsConstSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "False"
- value 0)
- (object Attribute
- tool "cg"
- name "True"
- value 1)
- (object Attribute
- tool "cg"
- name "Same_As_Function"
- value 2)))
- (object Attribute
- tool "cg"
- name "InlineGet"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GenerateSetOperation"
- value TRUE)
- (object Attribute
- tool "cg"
- name "SetName"
- value "set_$target")
- (object Attribute
- tool "cg"
- name "SetReturnsValue"
- value FALSE)
- (object Attribute
- tool "cg"
- name "InlineSet"
- value TRUE)
- (object Attribute
- tool "cg"
- name "QualifiedGetSetByReference"
- value ("QualifiedGetSetByReferenceSet" 2))
- (object Attribute
- tool "cg"
- name "QualifiedGetSetByReferenceSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "False"
- value 0)
- (object Attribute
- tool "cg"
- name "True"
- value 1)
- (object Attribute
- tool "cg"
- name "Same_As_GetSetByReference"
- value 2)))
- (object Attribute
- tool "cg"
- name "GenerateQualifiedGetOperation"
- value TRUE)
- (object Attribute
- tool "cg"
- name "QualifiedGetName"
- value "get_$target")
- (object Attribute
- tool "cg"
- name "QualifiedGetIsConst"
- value TRUE)
- (object Attribute
- tool "cg"
- name "QualifiedGetResultIsConst"
- value ("GetResultIsConstSet" 2))
- (object Attribute
- tool "cg"
- name "InlineQualifiedGet"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GenerateQualifiedSetOperation"
- value TRUE)
- (object Attribute
- tool "cg"
- name "QualifiedSetName"
- value "set_$target")
- (object Attribute
- tool "cg"
- name "QualifiedSetReturnsValue"
- value FALSE)
- (object Attribute
- tool "cg"
- name "InlineQualifiedSet"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GenerateAssocClassDataMember"
- value TRUE)
- (object Attribute
- tool "cg"
- name "AssocClassDataMemberName"
- value "$target")
- (object Attribute
- tool "cg"
- name "AssocClassDataMemberVisibility"
- value ("DataMemberVisibilitySet" 14))
- (object Attribute
- tool "cg"
- name "DataMemberVisibilitySet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Public"
- value 45)
- (object Attribute
- tool "cg"
- name "Protected"
- value 44)
- (object Attribute
- tool "cg"
- name "Private"
- value 43)
- (object Attribute
- tool "cg"
- name "Implementation"
- value 14)
- (object Attribute
- tool "cg"
- name "AtRelationshipVisibility"
- value 210)))
- (object Attribute
- tool "cg"
- name "AssocClassDataMemberMutability"
- value ("DataMemberMutabilitySet" 0))
- (object Attribute
- tool "cg"
- name "DataMemberMutabilitySet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Unrestricted"
- value 0)
- (object Attribute
- tool "cg"
- name "Mutable"
- value 1)
- (object Attribute
- tool "cg"
- name "Const"
- value 2)))
- (object Attribute
- tool "cg"
- name "AssocClassDataMemberIsVolatile"
- value FALSE)
- (object Attribute
- tool "cg"
- name "AssocClassGetSetKinds"
- value ("GetSetKindsSet" 200))
- (object Attribute
- tool "cg"
- name "GenerateAssocClassGetOperation"
- value TRUE)
- (object Attribute
- tool "cg"
- name "AssocClassGetName"
- value "get_$target")
- (object Attribute
- tool "cg"
- name "AssocClassGetIsConst"
- value TRUE)
- (object Attribute
- tool "cg"
- name "AssocClassGetResultIsConst"
- value ("GetResultIsConstSet" 2))
- (object Attribute
- tool "cg"
- name "InlineAssocClassGet"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GenerateAssocClassSetOperation"
- value TRUE)
- (object Attribute
- tool "cg"
- name "AssocClassSetName"
- value "set_$target")
- (object Attribute
- tool "cg"
- name "AssocClassSetReturnsValue"
- value FALSE)
- (object Attribute
- tool "cg"
- name "InlineAssocClassSet"
- value TRUE)
- (object Attribute
- tool "cg"
- name "AssocClassForwardReferenceOnly"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GenerateForwardReference"
- value FALSE)
- (object Attribute
- tool "cg"
- name "IsReadOnly"
- value FALSE)
- (object Attribute
- tool "cg"
- name "BoundedRoleType"
- value ("AssocTypeSet" 47))
- (object Attribute
- tool "cg"
- name "AssocTypeSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Array"
- value 24)
- (object Attribute
- tool "cg"
- name "Sequence"
- value 47)))))
- (object Attribute
- tool "cg"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "CodeName"
- value "")
- (object Attribute
- tool "cg"
- name "GenerateDataMember"
- value TRUE)
- (object Attribute
- tool "cg"
- name "DataMemberName"
- value "$attribute")
- (object Attribute
- tool "cg"
- name "DataMemberVisibility"
- value ("DataMemberVisibilitySet" 14))
- (object Attribute
- tool "cg"
- name "DataMemberVisibilitySet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Public"
- value 45)
- (object Attribute
- tool "cg"
- name "Protected"
- value 44)
- (object Attribute
- tool "cg"
- name "Private"
- value 43)
- (object Attribute
- tool "cg"
- name "Implementation"
- value 14)
- (object Attribute
- tool "cg"
- name "AtAttributeVisibility"
- value 211)))
- (object Attribute
- tool "cg"
- name "DataMemberMutability"
- value ("DataMemberMutabilitySet" 0))
- (object Attribute
- tool "cg"
- name "DataMemberMutabilitySet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Unrestricted"
- value 0)
- (object Attribute
- tool "cg"
- name "Mutable"
- value 1)
- (object Attribute
- tool "cg"
- name "Const"
- value 2)))
- (object Attribute
- tool "cg"
- name "DataMemberIsVolatile"
- value FALSE)
- (object Attribute
- tool "cg"
- name "DataMemberFieldSize"
- value "")
- (object Attribute
- tool "cg"
- name "GenerateGetOperation"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GenerateSetOperation"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GetName"
- value "get_$attribute")
- (object Attribute
- tool "cg"
- name "SetName"
- value "set_$attribute")
- (object Attribute
- tool "cg"
- name "GetSetKinds"
- value ("GetSetKindsSet" 200))
- (object Attribute
- tool "cg"
- name "GetSetKindsSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Common"
- value 200)
- (object Attribute
- tool "cg"
- name "Virtual"
- value 201)
- (object Attribute
- tool "cg"
- name "Abstract"
- value 202)
- (object Attribute
- tool "cg"
- name "Static"
- value 203)
- (object Attribute
- tool "cg"
- name "Friend"
- value 204)))
- (object Attribute
- tool "cg"
- name "GetIsConst"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GetResultIsConst"
- value ("GetResultIsConstSet" 2))
- (object Attribute
- tool "cg"
- name "GetResultIsConstSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "False"
- value 0)
- (object Attribute
- tool "cg"
- name "True"
- value 1)
- (object Attribute
- tool "cg"
- name "Same_As_Function"
- value 2)))
- (object Attribute
- tool "cg"
- name "GetSetByReference"
- value FALSE)
- (object Attribute
- tool "cg"
- name "InlineGet"
- value TRUE)
- (object Attribute
- tool "cg"
- name "SetReturnsValue"
- value FALSE)
- (object Attribute
- tool "cg"
- name "InlineSet"
- value TRUE)
- (object Attribute
- tool "cg"
- name "CaseSpecifier"
- value "")
- (object Attribute
- tool "cg"
- name "IsReadOnly"
- value FALSE)
- (object Attribute
- tool "cg"
- name "CCRegion"
- value "")))
- (object Attribute
- tool "cg"
- name "default__Uses"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "ForwardReferenceOnly"
- value FALSE)
- (object Attribute
- tool "cg"
- name "BodyReferenceOnly"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateForwardReference"
- value FALSE)))
- (object Attribute
- tool "cg"
- name "default__Subsystem"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Directory"
- value "AUTO GENERATE")
- (object Attribute
- tool "cg"
- name "DirectoryIsOnSearchList"
- value FALSE)
- (object Attribute
- tool "cg"
- name "PrecompiledHeader"
- value "stdafx.h")))
- (object Attribute
- tool "cg"
- name "default__Category"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "IsNamespace"
- value FALSE)
- (object Attribute
- tool "cg"
- name "CodeName"
- value "")
- (object Attribute
- tool "cg"
- name "Indent"
- value 2)
- (object Attribute
- tool "cg"
- name "GenerateEmptyRegions"
- value ("GenerateEmptyRegionSet" 3))
- (object Attribute
- tool "cg"
- name "GenerateEmptyRegionSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "None"
- value 0)
- (object Attribute
- tool "cg"
- name "Preserved"
- value 1)
- (object Attribute
- tool "cg"
- name "Unpreserved"
- value 2)
- (object Attribute
- tool "cg"
- name "All"
- value 3)))))
- (object Attribute
- tool "MSVC"
- name "propertyId"
- value "809135966")
- (object Attribute
- tool "MSVC"
- name "default__Project"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "Version"
- value "5.0")))
- (object Attribute
- tool "MSVC"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "Type"
- value ("MSVCClassTypeSet" 0))
- (object Attribute
- tool "MSVC"
- name "MSVCClassTypeSet"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "Normal"
- value 0)
- (object Attribute
- tool "MSVC"
- name "Interface_Part"
- value 1)
- (object Attribute
- tool "MSVC"
- name "Connection_Part"
- value 2)
- (object Attribute
- tool "MSVC"
- name "Class_Factory"
- value 3)))
- (object Attribute
- tool "MSVC"
- name "CObjectFunctionality"
- value ("CObjectFunctionalitySet" 0))
- (object Attribute
- tool "MSVC"
- name "CObjectFunctionalitySet"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "None"
- value 0)
- (object Attribute
- tool "MSVC"
- name "Dynamic"
- value 1)
- (object Attribute
- tool "MSVC"
- name "Dyncreate"
- value 2)
- (object Attribute
- tool "MSVC"
- name "Serial"
- value 3)))
- (object Attribute
- tool "MSVC"
- name "GenerateOverrideGroup"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "GenerateDataGroup"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "AFX_DATA_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GenerateFieldGroup"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "AFX_FIELD_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GenerateMessageGroup"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "GenerateMessageMap"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "AFX_MSG_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "MESSAGE_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "OLEFactory"
- value ("OLEFactorySet" 0))
- (object Attribute
- tool "MSVC"
- name "OLEFactorySet"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "None"
- value 0)
- (object Attribute
- tool "MSVC"
- name "Built_in"
- value 1)
- (object Attribute
- tool "MSVC"
- name "Simple"
- value 2)
- (object Attribute
- tool "MSVC"
- name "Licensed"
- value 3)))
- (object Attribute
- tool "MSVC"
- name "OLEName"
- value "")
- (object Attribute
- tool "MSVC"
- name "OLEClassID"
- value "")
- (object Attribute
- tool "MSVC"
- name "GenerateOLECtlType"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "OLECtlType"
- value "")
- (object Attribute
- tool "MSVC"
- name "GenerateOLETypeLib"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "OLETypeLibID"
- value "")
- (object Attribute
- tool "MSVC"
- name "OLETypeLibMajor"
- value "")
- (object Attribute
- tool "MSVC"
- name "OLETypeLibMinor"
- value "")
- (object Attribute
- tool "MSVC"
- name "GeneratePropPageIDs"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "OLEPropPageIDs"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GenerateDispatchMap"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "AFX_DISPATCH_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "AFX_DISPATCH_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "DISPATCH_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "StockProperties"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "StockFunctions"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "DispatchDefValue"
- value "")
- (object Attribute
- tool "MSVC"
- name "GenerateDispIdEnum"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "AFX_DISP_ID_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GenerateInterfaceMap"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "INTERFACE_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "InitInterface"
- value "")
- (object Attribute
- tool "MSVC"
- name "GenerateEventMap"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "AFX_EVENT_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "AFX_EVENT_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "EVENT_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "StockEvents"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GenerateEventSinkMap"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "AFX_EVENTSINK_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "AFX_EVENTSINK_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "EVENTSINK_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "PropNotifySinks"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GenerateConnectionMap"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "CONNECTION_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "ConnectionPointIID"
- value "")
- (object Attribute
- tool "MSVC"
- name "InheritanceType"
- value "")
- (object Attribute
- tool "MSVC"
- name "DeclSpec"
- value "")
- (object Attribute
- tool "MSVC"
- name "OLECommands"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "MFCDeclares"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "ATL_Declares"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GenerateCOMMap"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "COM_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GenerateConnectionPointMap"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "CONNECTION_POINT_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GenerateMsgMap"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "MSG_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GeneratePropertyMap"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "PROPERTY_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "MFCImplements"
- value (value Text ""))))
- (object Attribute
- tool "MSVC"
- name "default__Operation"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "Type"
- value ("MSVCOperationTypeSet" 0))
- (object Attribute
- tool "MSVC"
- name "MSVCOperationTypeSet"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "Normal"
- value 0)
- (object Attribute
- tool "MSVC"
- name "Virtual_Override"
- value 1)
- (object Attribute
- tool "MSVC"
- name "Message_Handler"
- value 2)
- (object Attribute
- tool "MSVC"
- name "Dispatch_Handler"
- value 3)
- (object Attribute
- tool "MSVC"
- name "Event_Firing_Function"
- value 4)
- (object Attribute
- tool "MSVC"
- name "Event_Sink_Handler"
- value 5)
- (object Attribute
- tool "MSVC"
- name "Std_OLE_Method"
- value 6)
- (object Attribute
- tool "MSVC"
- name "Command_Parser"
- value 7)
- (object Attribute
- tool "MSVC"
- name "Property_Get_Function"
- value 8)
- (object Attribute
- tool "MSVC"
- name "Property_Set_Function"
- value 9)
- (object Attribute
- tool "MSVC"
- name "Property_Notify_Function"
- value 10)
- (object Attribute
- tool "MSVC"
- name "Macro_Generated_Function"
- value 11)))
- (object Attribute
- tool "MSVC"
- name "AFX_MSG_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "MESSAGE_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "AFX_DISPATCH_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "DISPATCH_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "AFX_EVENT_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "EVENT_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "AFX_EVENTSINK_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "EVENTSINK_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "CallType"
- value "")
- (object Attribute
- tool "MSVC"
- name "DeclSpec"
- value "")
- (object Attribute
- tool "MSVC"
- name "BodyImage"
- value (value Text ""))))
- (object Attribute
- tool "MSVC"
- name "default__Role"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "Type"
- value ("MSVCAttributeTypeSet" 0))
- (object Attribute
- tool "MSVC"
- name "MSVCAttributeTypeSet"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "Normal"
- value 0)
- (object Attribute
- tool "MSVC"
- name "Member_Property"
- value 1)
- (object Attribute
- tool "MSVC"
- name "Get_Set_Property"
- value 2)
- (object Attribute
- tool "MSVC"
- name "Dialog_Data"
- value 3)
- (object Attribute
- tool "MSVC"
- name "Field_Data"
- value 4)
- (object Attribute
- tool "MSVC"
- name "Stock_Property"
- value 5)))
- (object Attribute
- tool "MSVC"
- name "AFX_DISPATCH_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "DISPATCH_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "DeclSpec"
- value "")
- (object Attribute
- tool "MSVC"
- name "PointerBase"
- value "")
- (object Attribute
- tool "MSVC"
- name "CallType"
- value "")
- (object Attribute
- tool "MSVC"
- name "StockPropertyImplementation"
- value "")))
- (object Attribute
- tool "MSVC"
- name "default__Has"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "Type"
- value ("MSVCAttributeTypeSet" 0))
- (object Attribute
- tool "MSVC"
- name "MSVCAttributeTypeSet"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "Normal"
- value 0)
- (object Attribute
- tool "MSVC"
- name "Member_Property"
- value 1)
- (object Attribute
- tool "MSVC"
- name "Get_Set_Property"
- value 2)
- (object Attribute
- tool "MSVC"
- name "Dialog_Data"
- value 3)
- (object Attribute
- tool "MSVC"
- name "Field_Data"
- value 4)
- (object Attribute
- tool "MSVC"
- name "Stock_Property"
- value 5)))
- (object Attribute
- tool "MSVC"
- name "AFX_DISPATCH_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "DISPATCH_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "DeclSpec"
- value "")
- (object Attribute
- tool "MSVC"
- name "PointerBase"
- value "")
- (object Attribute
- tool "MSVC"
- name "CallType"
- value "")
- (object Attribute
- tool "MSVC"
- name "StockPropertyImplementation"
- value "")))
- (object Attribute
- tool "MSVC"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "Type"
- value ("MSVCAttributeTypeSet" 0))
- (object Attribute
- tool "MSVC"
- name "MSVCAttributeTypeSet"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "Normal"
- value 0)
- (object Attribute
- tool "MSVC"
- name "Member_Property"
- value 1)
- (object Attribute
- tool "MSVC"
- name "Get_Set_Property"
- value 2)
- (object Attribute
- tool "MSVC"
- name "Dialog_Data"
- value 3)
- (object Attribute
- tool "MSVC"
- name "Field_Data"
- value 4)
- (object Attribute
- tool "MSVC"
- name "Stock_Property"
- value 5)))
- (object Attribute
- tool "MSVC"
- name "AFX_DISPATCH_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "DISPATCH_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "DeclSpec"
- value "")
- (object Attribute
- tool "MSVC"
- name "PointerBase"
- value "")
- (object Attribute
- tool "MSVC"
- name "CallType"
- value "")
- (object Attribute
- tool "MSVC"
- name "StockPropertyImplementation"
- value "")))
- (object Attribute
- tool "MSVC"
- name "default__Module-Spec"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "GenerateIncludesGroup"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "AFX_INCLUDES_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GenerateInsertLocation"
- value FALSE)))
- (object Attribute
- tool "MSVC"
- name "default__Module-Body"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "GenerateIncludesGroup"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "AFX_INCLUDES_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GenerateInsertLocation"
- value FALSE)))
- (object Attribute
- tool "cg"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "DDL"
- name "propertyId"
- value "809135966")
- (object Attribute
- tool "DDL"
- name "default__Project"
- value (list Attribute_Set
- (object Attribute
- tool "DDL"
- name "DataBase"
- value ("DataBaseSet" 800))
- (object Attribute
- tool "DDL"
- name "DataBaseSet"
- value (list Attribute_Set
- (object Attribute
- tool "DDL"
- name "ANSI"
- value 800)
- (object Attribute
- tool "DDL"
- name "Oracle"
- value 801)
- (object Attribute
- tool "DDL"
- name "SQLServer"
- value 802)
- (object Attribute
- tool "DDL"
- name "Sybase"
- value 803)
- (object Attribute
- tool "DDL"
- name "Watcom"
- value 804)))
- (object Attribute
- tool "DDL"
- name "PrimaryKeyColumnName"
- value "Id")
- (object Attribute
- tool "DDL"
- name "PrimaryKeyColumnType"
- value "NUMBER(5)")
- (object Attribute
- tool "DDL"
- name "ViewName"
- value "V_")
- (object Attribute
- tool "DDL"
- name "TableName"
- value "T_")
- (object Attribute
- tool "DDL"
- name "InheritSuffix"
- value "_V")
- (object Attribute
- tool "DDL"
- name "DropClause"
- value FALSE)
- (object Attribute
- tool "DDL"
- name "BaseViews"
- value FALSE)
- (object Attribute
- tool "DDL"
- name "DDLScriptFilename"
- value "DDL1.SQL")
- (object Attribute
- tool "DDL"
- name "Directory"
- value "AUTO GENERATE")))
- (object Attribute
- tool "DDL"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "DDL"
- name "ColumnType"
- value "VARCHAR")
- (object Attribute
- tool "DDL"
- name "Length"
- value "")
- (object Attribute
- tool "DDL"
- name "NullsOK"
- value TRUE)
- (object Attribute
- tool "DDL"
- name "PrimaryKey"
- value FALSE)
- (object Attribute
- tool "DDL"
- name "Unique"
- value FALSE)
- (object Attribute
- tool "DDL"
- name "CompositeUnique"
- value FALSE)
- (object Attribute
- tool "DDL"
- name "CheckConstraint"
- value "")))
- (object Attribute
- tool "DDL"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "framework"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "IDL"
- name "propertyId"
- value "809135966")
- (object Attribute
- tool "IDL"
- name "default__Project"
- value (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "CreateMissingDirectories"
- value TRUE)
- (object Attribute
- tool "IDL"
- name "StopOnError"
- value TRUE)
- (object Attribute
- tool "IDL"
- name "Directory"
- value "AUTO GENERATE")
- (object Attribute
- tool "IDL"
- name "GeneratePreserveRegions"
- value TRUE)))
- (object Attribute
- tool "IDL"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "ImplementationType"
- value "")
- (object Attribute
- tool "IDL"
- name "ConstValue"
- value "")
- (object Attribute
- tool "IDL"
- name "GenerateDefaultSpecifier"
- value FALSE)
- (object Attribute
- tool "IDL"
- name "DefaultSpecifier"
- value "")
- (object Attribute
- tool "IDL"
- name "IDLElement"
- value TRUE)
- (object Attribute
- tool "IDL"
- name "IDLSpecificationType"
- value ("IDLSpecSet" 22))
- (object Attribute
- tool "IDL"
- name "IDLSpecSet"
- value (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "Interface"
- value 22)
- (object Attribute
- tool "IDL"
- name "Typedef"
- value 54)
- (object Attribute
- tool "IDL"
- name "Enumeration"
- value 8)
- (object Attribute
- tool "IDL"
- name "Const"
- value 71)
- (object Attribute
- tool "IDL"
- name "Exception"
- value 61)
- (object Attribute
- tool "IDL"
- name "Struct"
- value 51)
- (object Attribute
- tool "IDL"
- name "Union"
- value 81)))))
- (object Attribute
- tool "IDL"
- name "default__Module-Spec"
- value (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "Generate"
- value TRUE)
- (object Attribute
- tool "IDL"
- name "CmIdentification"
- value (value Text " %X% %Q% %Z% %W%"))
- (object Attribute
- tool "IDL"
- name "CopyrightNotice"
- value (value Text ""))
- (object Attribute
- tool "IDL"
- name "FileName"
- value "AUTO GENERATE")
- (object Attribute
- tool "IDL"
- name "GenerateIDLModule"
- value FALSE)
- (object Attribute
- tool "IDL"
- name "InclusionProtectionSymbol"
- value "AUTO GENERATE")
- (object Attribute
- tool "IDL"
- name "AdditionalIncludes"
- value (value Text ""))
- (object Attribute
- tool "IDL"
- name "IncludeBySimpleName"
- value FALSE)))
- (object Attribute
- tool "IDL"
- name "default__Module-Body"
- value (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "CmIdentification"
- value (value Text " %X% %Q% %Z% %W%"))
- (object Attribute
- tool "IDL"
- name "CopyrightNotice"
- value (value Text ""))
- (object Attribute
- tool "IDL"
- name "FileName"
- value "AUTO GENERATE")
- (object Attribute
- tool "IDL"
- name "AdditionalIncludes"
- value (value Text ""))
- (object Attribute
- tool "IDL"
- name "IncludeBySimpleName"
- value FALSE)))
- (object Attribute
- tool "IDL"
- name "default__Operation"
- value (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "OperationIsOneWay"
- value FALSE)
- (object Attribute
- tool "IDL"
- name "Context"
- value "")
- (object Attribute
- tool "IDL"
- name "Raises"
- value "")))
- (object Attribute
- tool "IDL"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "CaseSpecifier"
- value "")
- (object Attribute
- tool "IDL"
- name "GenerateDataMember"
- value TRUE)
- (object Attribute
- tool "IDL"
- name "DataMemberName"
- value "$relationship")
- (object Attribute
- tool "IDL"
- name "IsReadOnly"
- value FALSE)
- (object Attribute
- tool "IDL"
- name "IsConst"
- value FALSE)
- (object Attribute
- tool "IDL"
- name "ConstValue"
- value "")))
- (object Attribute
- tool "IDL"
- name "default__Has"
- value (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "NameIfUnlabeled"
- value "the_$supplier")
- (object Attribute
- tool "IDL"
- name "GenerateDataMember"
- value TRUE)
- (object Attribute
- tool "IDL"
- name "DataMemberName"
- value "$relationship")
- (object Attribute
- tool "IDL"
- name "GenerateForwardReference"
- value FALSE)
- (object Attribute
- tool "IDL"
- name "IsReadOnly"
- value FALSE)
- (object Attribute
- tool "IDL"
- name "BoundedHasRelType"
- value ("HasRelTypeSet" 47))
- (object Attribute
- tool "IDL"
- name "HasRelTypeSet"
- value (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "Array"
- value 24)
- (object Attribute
- tool "IDL"
- name "Sequence"
- value 47)))))
- (object Attribute
- tool "IDL"
- name "default__Role"
- value (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "NameIfUnlabeled"
- value "the_$supplier")
- (object Attribute
- tool "IDL"
- name "GenerateDataMember"
- value TRUE)
- (object Attribute
- tool "IDL"
- name "DataMemberName"
- value "$relationship")
- (object Attribute
- tool "IDL"
- name "GenerateForwardReference"
- value FALSE)
- (object Attribute
- tool "IDL"
- name "IsReadOnly"
- value FALSE)
- (object Attribute
- tool "IDL"
- name "BoundedRoleType"
- value ("AssocTypeSet" 47))
- (object Attribute
- tool "IDL"
- name "AssocTypeSet"
- value (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "Array"
- value 24)
- (object Attribute
- tool "IDL"
- name "Sequence"
- value 47)))))
- (object Attribute
- tool "IDL"
- name "default__Uses"
- value (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "GenerateForwardReference"
- value FALSE)))
- (object Attribute
- tool "IDL"
- name "default__Subsystem"
- value (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "Directory"
- value "AUTO GENERATE")))
- (object Attribute
- tool "IDL"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Java"
- name "propertyId"
- value "809135966")
- (object Attribute
- tool "Java"
- name "default__Project"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "CreateMissingDirectories"
- value TRUE)
- (object Attribute
- tool "Java"
- name "StopOnError"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Directory"
- value "AUTO GENERATE")
- (object Attribute
- tool "Java"
- name "UsePrefixes"
- value FALSE)
- (object Attribute
- tool "Java"
- name "InstanceVariablePrefix"
- value "m_")
- (object Attribute
- tool "Java"
- name "ClassVariablePrefix"
- value "s_")
- (object Attribute
- tool "Java"
- name "DefaultAttributeDataType"
- value "int")
- (object Attribute
- tool "Java"
- name "DefaultOperationReturnType"
- value "void")
- (object Attribute
- tool "Java"
- name "Editor"
- value ("EditorType" 100))
- (object Attribute
- tool "Java"
- name "VM"
- value ("VMType" 200))
- (object Attribute
- tool "Java"
- name "ClassPath"
- value "")
- (object Attribute
- tool "Java"
- name "EditorType"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "BuiltIn"
- value 100)
- (object Attribute
- tool "Java"
- name "WindowsShell"
- value 101)))
- (object Attribute
- tool "Java"
- name "VMType"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "Sun"
- value 200)
- (object Attribute
- tool "Java"
- name "Microsoft"
- value 201)))
- (object Attribute
- tool "Java"
- name "GlobalImports"
- value (value Text ""))
- (object Attribute
- tool "Java"
- name "OpenBraceClassStyle"
- value TRUE)
- (object Attribute
- tool "Java"
- name "UseTabs"
- value FALSE)
- (object Attribute
- tool "Java"
- name "UseSpaces"
- value TRUE)
- (object Attribute
- tool "Java"
- name "SpacingItems"
- value 3)
- (object Attribute
- tool "Java"
- name "CommentLength"
- value 2)
- (object Attribute
- tool "Java"
- name "RoseDefaultCommentStyle"
- value TRUE)
- (object Attribute
- tool "Java"
- name "AsteriskCommentStyle"
- value FALSE)
- (object Attribute
- tool "Java"
- name "JavaCommentStyle"
- value FALSE)
- (object Attribute
- tool "Java"
- name "JavadocAuthor"
- value TRUE)
- (object Attribute
- tool "Java"
- name "JavadocDeprecated"
- value FALSE)
- (object Attribute
- tool "Java"
- name "JavadocException"
- value TRUE)
- (object Attribute
- tool "Java"
- name "JavadocParam"
- value TRUE)
- (object Attribute
- tool "Java"
- name "JavadocReturn"
- value TRUE)
- (object Attribute
- tool "Java"
- name "JavadocSee"
- value FALSE)
- (object Attribute
- tool "Java"
- name "JavadocSerial"
- value FALSE)
- (object Attribute
- tool "Java"
- name "JavadocSerialdata"
- value FALSE)
- (object Attribute
- tool "Java"
- name "JavadocSerialfield"
- value FALSE)
- (object Attribute
- tool "Java"
- name "JavadocSince"
- value FALSE)
- (object Attribute
- tool "Java"
- name "JavadocVersion"
- value FALSE)
- (object Attribute
- tool "Java"
- name "JavadocLink"
- value FALSE)))
- (object Attribute
- tool "Java"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "Final"
- value FALSE)
- (object Attribute
- tool "Java"
- name "GenerateDefaultConstructor"
- value TRUE)
- (object Attribute
- tool "Java"
- name "ConstructorIs"
- value ("Ctor_Set" 62))
- (object Attribute
- tool "Java"
- name "Ctor_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "public"
- value 62)
- (object Attribute
- tool "Java"
- name "protected"
- value 63)
- (object Attribute
- tool "Java"
- name "private"
- value 64)
- (object Attribute
- tool "Java"
- name "package"
- value 65)))
- (object Attribute
- tool "Java"
- name "GenerateFinalizer"
- value FALSE)
- (object Attribute
- tool "Java"
- name "GenerateStaticInitializer"
- value FALSE)
- (object Attribute
- tool "Java"
- name "GenerateInstanceInitializer"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Static"
- value FALSE)))
- (object Attribute
- tool "Java"
- name "default__Module-Spec"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "Generate"
- value TRUE)
- (object Attribute
- tool "Java"
- name "CmIdentification"
- value (value Text ""))
- (object Attribute
- tool "Java"
- name "CopyrightNotice"
- value (value Text ""))
- (object Attribute
- tool "Java"
- name "AdditionalImports"
- value (value Text ""))))
- (object Attribute
- tool "Java"
- name "default__Module-Body"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "Generate"
- value TRUE)
- (object Attribute
- tool "Java"
- name "CmIdentification"
- value (value Text ""))
- (object Attribute
- tool "Java"
- name "CopyrightNotice"
- value (value Text ""))
- (object Attribute
- tool "Java"
- name "AdditionalImports"
- value (value Text ""))))
- (object Attribute
- tool "Java"
- name "default__Operation"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "Abstract"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Static"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Final"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Native"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Synchronized"
- value FALSE)
- (object Attribute
- tool "Java"
- name "DefaultBody"
- value (value Text ""))
- (object Attribute
- tool "Java"
- name "ReplaceExistingBody"
- value FALSE)))
- (object Attribute
- tool "Java"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "GenerateDataMember"
- value TRUE)
- (object Attribute
- tool "Java"
- name "Final"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Transient"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Volatile"
- value FALSE)
- (object Attribute
- tool "Java"
- name "PropertyType"
- value ("BeanProperty_Set" 71))
- (object Attribute
- tool "Java"
- name "BeanProperty_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "Not A Property"
- value 71)
- (object Attribute
- tool "Java"
- name "Simple"
- value 72)
- (object Attribute
- tool "Java"
- name "Bound"
- value 73)
- (object Attribute
- tool "Java"
- name "Constrained"
- value 74)))
- (object Attribute
- tool "Java"
- name "IndividualChangeMgt"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Read/Write"
- value ("Read/Write_Set" 81))
- (object Attribute
- tool "Java"
- name "Read/Write_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "Read & Write"
- value 81)
- (object Attribute
- tool "Java"
- name "Read Only"
- value 82)
- (object Attribute
- tool "Java"
- name "Write Only"
- value 83)))
- (object Attribute
- tool "Java"
- name "GenerateFullyQualifiedTypes"
- value FALSE)))
- (object Attribute
- tool "Java"
- name "default__Role"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "GenerateDataMember"
- value TRUE)
- (object Attribute
- tool "Java"
- name "ContainerClass"
- value "")
- (object Attribute
- tool "Java"
- name "InitialValue"
- value "")
- (object Attribute
- tool "Java"
- name "Final"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Transient"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Volatile"
- value FALSE)
- (object Attribute
- tool "Java"
- name "PropertyType"
- value ("BeanProperty_Set" 71))
- (object Attribute
- tool "Java"
- name "BeanProperty_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "Not A Property"
- value 71)
- (object Attribute
- tool "Java"
- name "Simple"
- value 72)
- (object Attribute
- tool "Java"
- name "Bound"
- value 73)
- (object Attribute
- tool "Java"
- name "Constrained"
- value 74)))
- (object Attribute
- tool "Java"
- name "IndividualChangeMgt"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Read/Write"
- value ("Read/Write_Set" 81))
- (object Attribute
- tool "Java"
- name "Read/Write_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "Read & Write"
- value 81)
- (object Attribute
- tool "Java"
- name "Read Only"
- value 82)
- (object Attribute
- tool "Java"
- name "Write Only"
- value 83)))))
- (object Attribute
- tool "Java"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Objectory41"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "TypeLibImporter"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "ROBE"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "CORBA"
- name "propertyId"
- value "809135966")
- (object Attribute
- tool "CORBA"
- name "default__Project"
- value (list Attribute_Set
- (object Attribute
- tool "CORBA"
- name "CreateMissingDirectories"
- value TRUE)
- (object Attribute
- tool "CORBA"
- name "Editor"
- value ("EditorType" 100))
- (object Attribute
- tool "CORBA"
- name "IncludePath"
- value "")
- (object Attribute
- tool "CORBA"
- name "StopOnError"
- value TRUE)
- (object Attribute
- tool "CORBA"
- name "EditorType"
- value (list Attribute_Set
- (object Attribute
- tool "CORBA"
- name "BuiltIn"
- value 100)
- (object Attribute
- tool "CORBA"
- name "WindowsShell"
- value 101)))))
- (object Attribute
- tool "CORBA"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "CORBA"
- name "ArrayDimensions"
- value "")
- (object Attribute
- tool "CORBA"
- name "ConstValue"
- value "")
- (object Attribute
- tool "CORBA"
- name "ImplementationType"
- value "")))
- (object Attribute
- tool "CORBA"
- name "default__Module-Spec"
- value (list Attribute_Set
- (object Attribute
- tool "CORBA"
- name "AdditionalIncludes"
- value (value Text ""))
- (object Attribute
- tool "CORBA"
- name "CmIdentification"
- value (value Text " %X% %Q% %Z% %W%"))
- (object Attribute
- tool "CORBA"
- name "CopyrightNotice"
- value (value Text ""))
- (object Attribute
- tool "CORBA"
- name "InclusionProtectionSymbol"
- value "AUTO GENERATE")))
- (object Attribute
- tool "CORBA"
- name "default__Module-Body"
- value (list Attribute_Set
- (object Attribute
- tool "CORBA"
- name "AdditionalIncludes"
- value (value Text ""))
- (object Attribute
- tool "CORBA"
- name "CmIdentification"
- value (value Text " %X% %Q% %Z% %W%"))
- (object Attribute
- tool "CORBA"
- name "CopyrightNotice"
- value (value Text ""))
- (object Attribute
- tool "CORBA"
- name "InclusionProtectionSymbol"
- value "AUTO GENERATE")))
- (object Attribute
- tool "CORBA"
- name "default__Operation"
- value (list Attribute_Set
- (object Attribute
- tool "CORBA"
- name "Context"
- value "")
- (object Attribute
- tool "CORBA"
- name "OperationIsOneWay"
- value FALSE)))
- (object Attribute
- tool "CORBA"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "CORBA"
- name "ArrayDimensions"
- value "")
- (object Attribute
- tool "CORBA"
- name "CaseSpecifier"
- value "")
- (object Attribute
- tool "CORBA"
- name "IsReadOnly"
- value FALSE)
- (object Attribute
- tool "CORBA"
- name "Order"
- value "")))
- (object Attribute
- tool "CORBA"
- name "default__Role"
- value (list Attribute_Set
- (object Attribute
- tool "CORBA"
- name "ArrayDimensions"
- value "")
- (object Attribute
- tool "CORBA"
- name "CaseSpecifier"
- value "")
- (object Attribute
- tool "CORBA"
- name "GenerateForwardReference"
- value FALSE)
- (object Attribute
- tool "CORBA"
- name "IsReadOnly"
- value FALSE)
- (object Attribute
- tool "CORBA"
- name "Order"
- value "")
- (object Attribute
- tool "CORBA"
- name "BoundedRoleType"
- value ("AssocTypeSet" 47))
- (object Attribute
- tool "CORBA"
- name "AssocTypeSet"
- value (list Attribute_Set
- (object Attribute
- tool "CORBA"
- name "Array"
- value 24)
- (object Attribute
- tool "CORBA"
- name "Sequence"
- value 47)))))
- (object Attribute
- tool "CORBA"
- name "default__Uses"
- value (list Attribute_Set
- (object Attribute
- tool "CORBA"
- name "GenerateForwardReference"
- value FALSE)))
- (object Attribute
- tool "CORBA"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Rational Unified Process"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Rose Web Publisher"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "SoDA"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "COM"
- name "propertyId"
- value "783606378")
- (object Attribute
- tool "COM"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "COM"
- name "TypeKinds"
- value (list Attribute_Set
- (object Attribute
- tool "COM"
- name "enum"
- value 100)
- (object Attribute
- tool "COM"
- name "record"
- value 101)
- (object Attribute
- tool "COM"
- name "module"
- value 102)
- (object Attribute
- tool "COM"
- name "interface"
- value 103)
- (object Attribute
- tool "COM"
- name "dispinterface"
- value 104)
- (object Attribute
- tool "COM"
- name "coclass"
- value 105)
- (object Attribute
- tool "COM"
- name "alias"
- value 106)
- (object Attribute
- tool "COM"
- name "union"
- value 107)
- (object Attribute
- tool "COM"
- name "max"
- value 108)
- (object Attribute
- tool "COM"
- name "(none)"
- value 109)))
- (object Attribute
- tool "COM"
- name "kind"
- value ("TypeKinds" 105))
- (object Attribute
- tool "COM"
- name "uuid"
- value "")
- (object Attribute
- tool "COM"
- name "version"
- value "")
- (object Attribute
- tool "COM"
- name "helpstring"
- value "")
- (object Attribute
- tool "COM"
- name "helpcontext"
- value "")
- (object Attribute
- tool "COM"
- name "attributes"
- value "")
- (object Attribute
- tool "COM"
- name "dllname"
- value "")
- (object Attribute
- tool "COM"
- name "alias"
- value "")
- (object Attribute
- tool "COM"
- name "Generate"
- value TRUE)))
- (object Attribute
- tool "COM"
- name "default__Operation"
- value (list Attribute_Set
- (object Attribute
- tool "COM"
- name "helpstring"
- value "")
- (object Attribute
- tool "COM"
- name "attributes"
- value "")
- (object Attribute
- tool "COM"
- name "Generate"
- value TRUE)
- (object Attribute
- tool "COM"
- name "id"
- value "")))
- (object Attribute
- tool "COM"
- name "default__Module-Spec"
- value (list Attribute_Set
- (object Attribute
- tool "COM"
- name "filename"
- value "")
- (object Attribute
- tool "COM"
- name "library"
- value "")
- (object Attribute
- tool "COM"
- name "imports"
- value "")
- (object Attribute
- tool "COM"
- name "uuid"
- value "")
- (object Attribute
- tool "COM"
- name "version"
- value "")
- (object Attribute
- tool "COM"
- name "helpstring"
- value "")
- (object Attribute
- tool "COM"
- name "helpfile"
- value "")
- (object Attribute
- tool "COM"
- name "helpcontext"
- value "")
- (object Attribute
- tool "COM"
- name "lcid"
- value "")
- (object Attribute
- tool "COM"
- name "attributes"
- value "")
- (object Attribute
- tool "COM"
- name "Generate"
- value TRUE)))
- (object Attribute
- tool "COM"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Version Control"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Data Access"
- name "propertyId"
- value "809135966")
- (object Attribute
- tool "Data Access"
- name "default__Project"
- value (list Attribute_Set
- (object Attribute
- tool "Data Access"
- name "project"
- value " ")))
- (object Attribute
- tool "Data Access"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "RequisitePro"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "cg"
- name "compiler2.1__Project"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "AllowGenerateOverNewerAnnotations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "AllowGenerateOverNewerVersion"
- value FALSE)
- (object Attribute
- tool "cg"
- name "HeaderFileExtension"
- value "h")
- (object Attribute
- tool "cg"
- name "HeaderFileBackupExtension"
- value "h~")
- (object Attribute
- tool "cg"
- name "HeaderFileTemporaryExtension"
- value "h#")
- (object Attribute
- tool "cg"
- name "CodeFileExtension"
- value "cpp")
- (object Attribute
- tool "cg"
- name "CodeFileBackupExtension"
- value "cp~")
- (object Attribute
- tool "cg"
- name "CodeFileTemporaryExtension"
- value "cp#")
- (object Attribute
- tool "cg"
- name "CreateMissingDirectories"
- value TRUE)
- (object Attribute
- tool "cg"
- name "StopOnError"
- value FALSE)
- (object Attribute
- tool "cg"
- name "ErrorLimit"
- value 30)
- (object Attribute
- tool "cg"
- name "Directory"
- value "$ROSECPP_SOURCE")
- (object Attribute
- tool "cg"
- name "BooleanType"
- value "int")
- (object Attribute
- tool "cg"
- name "AllowTemplates"
- value FALSE)
- (object Attribute
- tool "cg"
- name "AllowExplicitInstantiations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "AllowProtectedInheritance"
- value FALSE)
- (object Attribute
- tool "cg"
- name "OneByValueContainer"
- value "$targetClass")
- (object Attribute
- tool "cg"
- name "OneByReferenceContainer"
- value "$targetClass *")
- (object Attribute
- tool "cg"
- name "OptionalByValueContainer"
- value "OptionalByValue(sizeof($targetClass))")
- (object Attribute
- tool "cg"
- name "OptionalByReferenceContainer"
- value "$targetClass *")
- (object Attribute
- tool "cg"
- name "FixedByValueContainer"
- value "$targetClass[$limit]")
- (object Attribute
- tool "cg"
- name "UnorderedFixedByValueContainer"
- value "$targetClass[$limit]")
- (object Attribute
- tool "cg"
- name "FixedByReferenceContainer"
- value "$targetClass *[$limit]")
- (object Attribute
- tool "cg"
- name "UnorderedFixedByReferenceContainer"
- value "$targetClass *[$limit]")
- (object Attribute
- tool "cg"
- name "BoundedByValueContainer"
- value "BoundedListByValue(sizeof($targetClass),$limit)")
- (object Attribute
- tool "cg"
- name "UnorderedBoundedByValueContainer"
- value "BoundedSetByValue(sizeof($targetClass),$limit)")
- (object Attribute
- tool "cg"
- name "BoundedByReferenceContainer"
- value "BoundedListByReference($limit)")
- (object Attribute
- tool "cg"
- name "UnorderedBoundedByReferenceContainer"
- value "BoundedSetByReference($limit)")
- (object Attribute
- tool "cg"
- name "UnboundedByValueContainer"
- value "UnboundedListByValue(sizeof($targetClass))")
- (object Attribute
- tool "cg"
- name "UnorderedUnboundedByValueContainer"
- value "UnboundedSetByValue(sizeof($targetClass))")
- (object Attribute
- tool "cg"
- name "UnboundedByReferenceContainer"
- value "UnboundedListByReference")
- (object Attribute
- tool "cg"
- name "UnorderedUnboundedByReferenceContainer"
- value "UnboundedSetByReference")
- (object Attribute
- tool "cg"
- name "QualifiedByValueContainer"
- value "AssociationByValue(sizeof($qualtype), sizeof($qualcont))")
- (object Attribute
- tool "cg"
- name "UnorderedQualifiedByValueContainer"
- value "DictionaryByValue(sizeof($qualtype), sizeof($qualcont))")
- (object Attribute
- tool "cg"
- name "QualifiedByReferenceContainer"
- value "AssociationByReference(sizeof($qualtype), sizeof($qualcont))")
- (object Attribute
- tool "cg"
- name "UnorderedQualifiedByReferenceContainer"
- value "DictionaryByReference(sizeof($qualtype), sizeof($qualcont))")
- (object Attribute
- tool "cg"
- name "PathSeparator"
- value "")
- (object Attribute
- tool "cg"
- name "FileNameFormat"
- value "128vx_b")
- (object Attribute
- tool "cg"
- name "AlwaysKeepOrphanedCode"
- value FALSE)
- (object Attribute
- tool "cg"
- name "UseMSVC"
- value FALSE)
- (object Attribute
- tool "cg"
- name "CommentWidth"
- value 60)))
- (object Attribute
- tool "cg"
- name "compiler3.0__Project"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "AllowGenerateOverNewerAnnotations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "AllowGenerateOverNewerVersion"
- value FALSE)
- (object Attribute
- tool "cg"
- name "HeaderFileExtension"
- value "h")
- (object Attribute
- tool "cg"
- name "HeaderFileBackupExtension"
- value "h~")
- (object Attribute
- tool "cg"
- name "HeaderFileTemporaryExtension"
- value "h#")
- (object Attribute
- tool "cg"
- name "CodeFileExtension"
- value "cpp")
- (object Attribute
- tool "cg"
- name "CodeFileBackupExtension"
- value "cp~")
- (object Attribute
- tool "cg"
- name "CodeFileTemporaryExtension"
- value "cp#")
- (object Attribute
- tool "cg"
- name "CreateMissingDirectories"
- value TRUE)
- (object Attribute
- tool "cg"
- name "StopOnError"
- value FALSE)
- (object Attribute
- tool "cg"
- name "ErrorLimit"
- value 30)
- (object Attribute
- tool "cg"
- name "Directory"
- value "$ROSECPP_SOURCE")
- (object Attribute
- tool "cg"
- name "BooleanType"
- value "int")
- (object Attribute
- tool "cg"
- name "AllowTemplates"
- value TRUE)
- (object Attribute
- tool "cg"
- name "AllowExplicitInstantiations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "AllowProtectedInheritance"
- value TRUE)
- (object Attribute
- tool "cg"
- name "OneByValueContainer"
- value "$targetClass")
- (object Attribute
- tool "cg"
- name "OneByReferenceContainer"
- value "$targetClass *")
- (object Attribute
- tool "cg"
- name "OptionalByValueContainer"
- value "OptionalByValue<$targetClass>")
- (object Attribute
- tool "cg"
- name "OptionalByReferenceContainer"
- value "$targetClass *")
- (object Attribute
- tool "cg"
- name "FixedByValueContainer"
- value "$targetClass[$limit]")
- (object Attribute
- tool "cg"
- name "UnorderedFixedByValueContainer"
- value "$targetClass[$limit]")
- (object Attribute
- tool "cg"
- name "FixedByReferenceContainer"
- value "$targetClass *[$limit]")
- (object Attribute
- tool "cg"
- name "UnorderedFixedByReferenceContainer"
- value "$targetClass *[$limit]")
- (object Attribute
- tool "cg"
- name "BoundedByValueContainer"
- value "BoundedListByValue<$targetClass,$limit>")
- (object Attribute
- tool "cg"
- name "UnorderedBoundedByValueContainer"
- value "BoundedSetByValue<$targetClass,$limit>")
- (object Attribute
- tool "cg"
- name "BoundedByReferenceContainer"
- value "BoundedListByReference<$targetClass,$limit>")
- (object Attribute
- tool "cg"
- name "UnorderedBoundedByReferenceContainer"
- value "BoundedSetByReference<$targetClass,$limit>")
- (object Attribute
- tool "cg"
- name "UnboundedByValueContainer"
- value "UnboundedListByValue<$targetClass>")
- (object Attribute
- tool "cg"
- name "UnorderedUnboundedByValueContainer"
- value "UnboundedSetByValue<$targetClass>")
- (object Attribute
- tool "cg"
- name "UnboundedByReferenceContainer"
- value "UnboundedListByReference<$targetClass>")
- (object Attribute
- tool "cg"
- name "UnorderedUnboundedByReferenceContainer"
- value "UnboundedSetByReference<$targetClass>")
- (object Attribute
- tool "cg"
- name "QualifiedByValueContainer"
- value "AssociationByValue<$qualtype, $qualcont>")
- (object Attribute
- tool "cg"
- name "UnorderedQualifiedByValueContainer"
- value "DictionaryByValue<$qualtype, $qualcont>")
- (object Attribute
- tool "cg"
- name "QualifiedByReferenceContainer"
- value "AssociationByReference<$qualtype, $qualcont>")
- (object Attribute
- tool "cg"
- name "UnorderedQualifiedByReferenceContainer"
- value "DictionaryByReference<$qualtype, $qualcont>")
- (object Attribute
- tool "cg"
- name "PathSeparator"
- value "")
- (object Attribute
- tool "cg"
- name "FileNameFormat"
- value "128vx_b")
- (object Attribute
- tool "cg"
- name "AlwaysKeepOrphanedCode"
- value FALSE)
- (object Attribute
- tool "cg"
- name "UseMSVC"
- value FALSE)
- (object Attribute
- tool "cg"
- name "CommentWidth"
- value 60)))
- (object Attribute
- tool "Rose Model Integrator"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "COM"
- name "default__Param"
- value (list Attribute_Set
- (object Attribute
- tool "COM"
- name "attributes"
- value "")))
- (object Attribute
- tool "Visual Basic"
- name "default__Param"
- value (list Attribute_Set
- (object Attribute
- tool "Visual Basic"
- name "ByVal"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "ByRef"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "Optional"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "ParamArray"
- value FALSE)))
- (object Attribute
- tool "COM"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "COM"
- name "Generate"
- value TRUE)
- (object Attribute
- tool "COM"
- name "id"
- value "")
- (object Attribute
- tool "COM"
- name "helpstring"
- value "")
- (object Attribute
- tool "COM"
- name "attributes"
- value "")))
- (object Attribute
- tool "VC++"
- name "propertyId"
- value "809135966")
- (object Attribute
- tool "VC++"
- name "default__Project"
- value (list Attribute_Set
- (object Attribute
- tool "VC++"
- name "UpdateATL"
- value TRUE)
- (object Attribute
- tool "VC++"
- name "SmartPointersOnAssoc"
- value TRUE)
- (object Attribute
- tool "VC++"
- name "GenerateImports"
- value TRUE)
- (object Attribute
- tool "VC++"
- name "PutImportsIn"
- value "stdafx.h")
- (object Attribute
- tool "VC++"
- name "FullPathInImports"
- value TRUE)
- (object Attribute
- tool "VC++"
- name "UseImportAttributes"
- value TRUE)
- (object Attribute
- tool "VC++"
- name "ImportAttributes"
- value "no_namespace named_guids")
- (object Attribute
- tool "VC++"
- name "ImportProjTypeLib"
- value TRUE)
- (object Attribute
- tool "VC++"
- name "DefaultTypeLib"
- value TRUE)
- (object Attribute
- tool "VC++"
- name "TypeLibLocation"
- value "")
- (object Attribute
- tool "VC++"
- name "CompileProjTypeLib"
- value TRUE)
- (object Attribute
- tool "VC++"
- name "RvcPtyVersion"
- value "1.0")
- (object Attribute
- tool "VC++"
- name "ModelIDStyle"
- value 2)
- (object Attribute
- tool "VC++"
- name "DocStyle"
- value 1)
- (object Attribute
- tool "VC++"
- name "GenerateIncludes"
- value TRUE)
- (object Attribute
- tool "VC++"
- name "ApplyPattern"
- value FALSE)
- (object Attribute
- tool "VC++"
- name "CreateBackupFiles"
- value TRUE)
- (object Attribute
- tool "VC++"
- name "SupportCodeName"
- value FALSE)
- (object Attribute
- tool "VC++"
- name "DocRevEngineer"
- value TRUE)
- (object Attribute
- tool "VC++"
- name "CreateOverviewDiagrams"
- value TRUE)
- (object Attribute
- tool "VC++"
- name "UpdateModelIDsInCode"
- value TRUE)
- (object Attribute
- tool "VC++"
- name "AttributeTypes"
- value (value Text
-|attr1=bool
-|attr2=short
-|attr3=int
-|attr4=long
-|attr5=char
-|attr6=float
-|attr7=double
-|attr8=void
-|attr9=clock_t
-|attr10=_complex
-|attr11=_dev_t
-|attr12=div_t
-|attr13=_exception
-|attr14=FILE
-|attr15=_finddata_t
-|attr16=_FPIEEE_RECORD
-|attr17=fpos_t
-|attr18=_HEAPINFO
-|attr19=jmp_buf
-|attr20=lconv
-|attr21=ldiv_t
-|attr22=_off_t
-|attr23=_onexit_t
-|attr24=_PNH
-|attr25=ptrdiff_t
-|attr26=sig_atomic_t
-|attr27=size_t
-|attr28=_stat
-|attr29=time_t
-|attr30=_timeb
-|attr31=tm
-|attr32=_utimbuf
-|attr33=va_list
-|attr34=wchar_t
-|attr35=wctrans_t
-|attr36=wctype_t
-|attr37=_wfinddata_t
-|attr38=_wfinddatai64_t
-|attr39=wint_t
-|attr40=ABORTPROC
-|attr41=ACMDRIVERENUMCB
-|attr42=ACMDRIVERPROC
-|attr43=ACMFILTERCHOOSEHOOKPROC
-|attr44=ACMFILTERENUMCB
-|attr45=ACMFILTERTAGENUMCB
-|attr46=ACMFORMATCHOOSEHOOKPROC
-|attr47=ACMFORMATENUMCB
-|attr48=ACMFORMATTAGENUMCB
-|attr49=APPLET_PROC
-|attr50=ATOM
-|attr51=BOOL
-|attr52=BOOLEAN
-|attr53=BYTE
-|attr54=CALINFO_ENUMPROC
-|attr55=CALLBACK
-|attr56=CHAR
-|attr57=COLORREF
-|attr58=CONST
-|attr59=CRITICAL_SECTION
-|attr60=CTRYID
-|attr61=DATEFMT_ENUMPROC
-|attr62=DESKTOPENUMPROC
-|attr63=DLGPROC
-|attr64=DRAWSTATEPROC
-|attr65=DWORD
-|attr66=EDITWORDBREAKPROC
-|attr67=ENHMFENUMPROC
-|attr68=ENUMRESLANGPROC
-|attr69=ENUMRESNAMEPROC
-|attr70=ENUMRESTYPEPROC
-|attr71=FARPROC
-|attr72=FILE_SEGMENT_ELEMENT
-|attr73=FLOAT
-|attr74=FONTENUMPROC
-|attr75=GOBJENUMPROC
-|attr76=GRAYSTRINGPROC
-|attr77=HACCEL
-|attr78=HANDLE
-|attr79=HBITMAP
-|attr80=HBRUSH
-|attr81=HCOLORSPACE
-|attr82=HCONV
-|attr83=HCONVLIST
-|attr84=HCURSOR
-|attr85=HDC
-|attr86=HDDEDATA
-|attr87=HDESK
-|attr88=HDROP
-|attr89=HDWP
-|attr90=HENHMETAFILE
-|attr91=HFILE
-|attr92=HFONT
-|attr93=HGDIOBJ
-|attr94=HGLOBAL
-|attr95=HHOOK
-|attr96=HICON
-|attr97=HIMAGELIST
-|attr98=HIMC
-|attr99=HINSTANCE
-|attr100=HKEY
-|attr101=HKL
-|attr102=HLOCAL
-|attr103=HMENU
-|attr104=HMETAFILE
-|attr105=HMODULE
-|attr106=HMONITOR
-|attr107=HOOKPROC
-|attr108=HPALETTE
-|attr109=HPEN
-|attr110=HRGN
-|attr111=HRSRC
-|attr112=HSZ
-|attr113=HTREEITEM
-|attr114=HWINSTA
-|attr115=HWND
-|attr116=INT
-|attr117=IPADDR
-|attr118=LANGID
-|attr119=LCID
-|attr120=LCSCSTYPE
-|attr121=LCSGAMUTMATCH
-|attr122=LCTYPE
-|attr123=LINEDDAPROC
-|attr124=LOCALE_ENUMPROC
-|attr125=LONG
-|attr126=LONGLONG
-|attr127=LPARAM
-|attr128=LPBOOL
-|attr129=LPBYTE
-|attr130=LPCCHOOKPROC
-|attr131=LPCFHOOKPROC
-|attr132=LPCOLORREF
-|attr133=LPCRITICAL_SECTION
-|attr134=LPCSTR
-|attr135=LPCTSTR
-|attr136=LPCVOID
-|attr137=LPCWSTR
-|attr138=LPDWORD
-|attr139=LPFIBER_START_ROUTINE
-|attr140=LPFRHOOKPROC
-|attr141=LPHANDLE
-|attr142=LPHANDLER_FUNCTION
-|attr143=LPINT
-|attr144=LPLONG
-|attr145=LPOFNHOOKPROC
-|attr146=LPPAGEPAINTHOOK
-|attr147=LPPAGESETUPHOOK
-|attr148=LPPRINTHOOKPROC
-|attr149=LPPROGRESS_ROUTINE
-|attr150=LPSETUPHOOKPROC
-|attr151=LPSTR
-|attr152=LPSTREAM
-|attr153=LPTHREAD_START_ROUTINE
-|attr154=LPTSTR
-|attr155=LPVOID
-|attr156=LPWORD
-|attr157=LPWSTR
-|attr158=LRESULT
-|attr159=LUID
-|attr160=PBOOL
-|attr161=PBOOLEAN
-|attr162=PBYTE
-|attr163=PCHAR
-|attr164=PCRITICAL_SECTION
-|attr165=PCSTR
-|attr166=PCTSTR
-|attr167=PCWCH
-|attr168=PCWSTR
-|attr169=PDWORD
-|attr170=PFLOAT
-|attr171=PFNCALLBACK
-|attr172=PHANDLE
-|attr173=PHANDLER_ROUTINE
-|attr174=PHKEY
-|attr175=PINT
-|attr176=PLCID
-|attr177=PLONG
-|attr178=PLUID
-|attr179=PROPENUMPROC
-|attr180=PROPENUMPROCEX
-|attr181=PSHORT
-|attr182=PSTR
-|attr183=PTBYTE
-|attr184=PTCHAR
-|attr185=PTIMERAPCROUTINE
-|attr186=PTSTR
-|attr187=PUCHAR
-|attr188=PUINT
-|attr189=PULONG
-|attr190=PUSHORT
-|attr191=PVOID
-|attr192=PWCHAR
-|attr193=PWORD
-|attr194=PWSTR
-|attr195=REGISTERWORDENUMPROC
-|attr196=REGSAM
-|attr197=SC_HANDLE
-|attr198=SC_LOCK
-|attr199=SENDASYNCPROC
-|attr200=SERVICE_STATUS_HANDLE
-|attr201=SHORT
-|attr202=TBYTE
-|attr203=TCHAR
-|attr204=TIMEFMT_ENUMPROC
-|attr205=TIMERPROC
-|attr206=UCHAR
-|attr207=UINT
-|attr208=ULONG
-|attr209=ULONGLONG
-|attr210=UNSIGNED
-|attr211=USHORT
-|attr212=VOID
-|attr213=WCHAR
-|attr214=WINAPI
-|attr215=WINSTAENUMPROC
-|attr216=WNDENUMPROC
-|attr217=WNDPROC
-|attr218=WORD
-|attr219=WPARAM
-|attr220=YIELDPROC
-|attr221=CPoint
-|attr222=CRect
-|attr223=CSize
-|attr224=CString
-|attr225=CTime
-|attr226=CTimeSpan
-|attr227=CCreateContext
-|attr228=CMemoryState
-|attr229=COleSafeArray
-|attr230=CPrintInfo
- ))
- (object Attribute
- tool "VC++"
- name "Containers"
- value (value Text
-|cont1=CArray<$TYPE, $TYPE&>
-|cont2=CByteArray
-|cont3=CDWordArray
-|cont4=CObArray
-|cont5=CPtrArray
-|cont6=CStringArray
-|cont7=CUIntArray
-|cont8=CWordArray
-|cont9=CList<$TYPE, $TYPE&>
-|cont10=CPtrList
-|cont11=CObList
-|cont12=CStringList
-|cont13=CMapWordToPtr
-|cont14=CMapPtrToWord
-|cont15=CMapPtrToPtr
-|cont16=CMapWordToOb
-|cont17=CMapStringToPtr
-|cont18=CMapStringToOb
-|cont19=CMapStringToString
-|cont20=CTypedPtrArray<CPtrArray, $TYPE*>
-|cont21=CTypedPtrArray<CObArray, $TYPE*>
-|cont22=CTypedPtrList<CObList, $TYPE*>
-|cont23=CTypedPtrList<CPtrList, $TYPE*>
- ))
- (object Attribute
- tool "VC++"
- name "ClassMethods"
- value (value Text
-|*_body=// ToDo: Add your specialized code here and/or call the base class
-|cm1=$NAME()
-|cm2=$NAME(orig:const $NAME&)
-|cm3=<<virtual>> ~$NAME()
-|cm4=operator=(rhs:$NAME&):$NAME&
-|cm4_body=// ToDo: Add your specialized code here and/or call the base class||return rhs;
-|cm5=<<const>> operator==(rhs:const $NAME&):bool
-|cm5_body=// ToDo: Add your specialized code here and/or call the base class||return false;
-|cm6=<<const>> operator!=(rhs:$NAME&):bool
-|cm6_body=// ToDo: Add your specialized code here and/or call the base class||return false;
-|cm7=<<const>> operator<(rhs:$NAME&):bool
-|cm7_body=// ToDo: Add your specialized code here and/or call the base class||return false;
-|cm8=<<const>> operator>(rhs:$NAME&):bool
-|cm8_body=// ToDo: Add your specialized code here and/or call the base class||return false;
-|cm9=<<const>> operator<=(rhs:$NAME&):bool
-|cm9_body=// ToDo: Add your specialized code here and/or call the base class||return false;
-|cm10=<<const>> operator>=(rhs:$NAME&):bool
-|cm10_body=// ToDo: Add your specialized code here and/or call the base class||return false;
-|cm11=<<friend>> operator>>(i:istream&, rhs:$NAME&):istream&
-|cm11_body=// ToDo: Add your specialized code here and/or call the base class||return i;
-|cm12=<<friend>> operator<<(o:ostream&, rhs:const $NAME&):ostream&
-|cm12_body=// ToDo: Add your specialized code here and/or call the base class||return o;
- ))
- (object Attribute
- tool "VC++"
- name "Accessors"
- value (value Text
-|agf=<<const>> get_$BASICNAME():const $TYPE
-|agf_body=return $NAME;
-|asf=set_$BASICNAME(value:$TYPE):void
-|asf_body=$NAME = value;|return;
-|agv=<<const>> get_$BASICNAME():const $TYPE&
-|agv_body=return $NAME;
-|asv=set_$BASICNAME(value:$TYPE&):void
-|asv_body=$NAME = value;|return;
-|agp=<<const>> get_$BASICNAME():const $TYPE
-|agp_body=return $NAME;
-|asp=set_$BASICNAME(value:$TYPE):void
-|asp_body=$NAME = value;|return;
-|agr=<<const>> get_$BASICNAME():const $TYPE
-|agr_body=return $NAME;
-|asr=set_$BASICNAME(value:$TYPE):void
-|asr_body=$NAME = value;|return;
-|aga=<<const>> get_$BASICNAME(index:int):const $TYPE
-|aga_body=return $NAME[index];
-|asa=set_$BASICNAME(index:int, value:$TYPE):void
-|asa_body=$NAME[index] = value;|return;
- ))
- (object Attribute
- tool "VC++"
- name "Conditionals"
- value (value Text
-|*_decl=#ifdef _DEBUG
-|*_base=CObject
-|cond1=<<virtual, const>> AssertValid():void
-|cond1_body=$SUPERNAME::AssertValid();
-|cond2=<<virtual, const>> Dump(dc:CDumpContext&):void
-|cond2_body=$SUPERNAME::Dump(dc);
- ))
- (object Attribute
- tool "VC++"
- name "Patterns"
- value (value Text
-|patrn1=cm1,cm3,cond1,cond2
-|Patrn1_name=Default
- ))))
- (object Attribute
- tool "VC++"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "VC++"
- name "Generate"
- value TRUE)))
- (object Attribute
- tool "VC++"
- name "default__Module-Spec"
- value (list Attribute_Set
- (object Attribute
- tool "VC++"
- name "InternalMap"
- value (value Text
-|*:AUTO:AUTO
-|
- ))
- (object Attribute
- tool "VC++"
- name "ExportMap"
- value (value Text
-|*:AUTO:AUTO
-|
- ))
- (object Attribute
- tool "VC++"
- name "InitialSourceIncludes"
- value (value Text
-|"stdafx.h"
- ))
- (object Attribute
- tool "VC++"
- name "InitialHeaderIncludes"
- value (value Text ""))
- (object Attribute
- tool "VC++"
- name "Copyright"
- value (value Text "Copyright (C) 1991 - 1999 Rational Software Corporation"))))
- (object Attribute
- tool "VC++"
- name "default__Role"
- value (list Attribute_Set
- (object Attribute
- tool "VC++"
- name "Const"
- value FALSE)
- (object Attribute
- tool "VC++"
- name "Generate"
- value TRUE)
- (object Attribute
- tool "VC++"
- name "InitialValue"
- value "")))
- (object Attribute
- tool "VC++"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "VC++"
- name "Generate"
- value TRUE)))
- (object Attribute
- tool "VC++"
- name "default__Operation"
- value (list Attribute_Set
- (object Attribute
- tool "VC++"
- name "Generate"
- value TRUE)
- (object Attribute
- tool "VC++"
- name "Inline"
- value FALSE)
- (object Attribute
- tool "VC++"
- name "DefaultBody"
- value (value Text ""))))
- (object Attribute
- tool "VC++"
- name "HiddenTool"
- value FALSE))
- quid "34DBB4830145"))
--- a/tzservices/tzserver/analysis/DAYLIGHT SAVINGS ANALYSIS.md~ Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6210 +0,0 @@
-
-(object Petal
- version 43
- _written "Rose 6.5.9232.10"
- charSet 0)
-
-(object Design "Logical View"
- is_unit TRUE
- is_loaded TRUE
- quid "36D487460258"
- defaults (object defaults
- rightMargin 0.250000
- leftMargin 0.250000
- topMargin 0.250000
- bottomMargin 0.500000
- pageOverlap 0.250000
- clipIconLabels TRUE
- autoResize TRUE
- snapToGrid TRUE
- gridX 16
- gridY 16
- defaultFont (object Font
- size 9
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- showMessageNum 1
- showClassOfObject TRUE
- notation "Unified")
- root_usecase_package (object Class_Category "Use Case View"
- quid "34DBB4830142"
- documentation
-|The Use Case View organizes the Use-Case Model and the optional Business Use-Case Model.
-|
-
- exportControl "Public"
- global TRUE
- logical_models (list unit_reference_list
- (object Class_Category "Business Use-Case Model"
- quid "35B677D701B8"
- documentation
-|Optional Model:
-|The business modeling workflow in Rational Unified Process produces two models: the business use-case model, and the business object model. Both show the business
-|processes, but different aspects of them. In the business use-case model each business use case represents a business process, described (text and/or activity diagrams) from an "external" view point without worrying about who does what to whom inside of the organization.
-|In the business object model, you include realizations of each business use case to show how workers and entities collaborate to perform the process. You do that using class diagrams, activity diagrams with swimlanes, collaboration diagrams, and/or interaction diagrams.
-|
-|<Any additional description of the Business Use Case Model, such as modeling conventions that the reader/reviewer may need to understand the model, should be described here.>
-
- exportControl "Public"
- logical_models (list unit_reference_list)
- logical_presentations (list unit_reference_list
- (object UseCaseDiagram "Global View of Business Actors and Business Use Cases"
- quid "35C0DFF50172"
- title "Global View of Business Actors and Business Use Cases"
- documentation "This is a global view of the system showing all Busines Use Cases and Business Actors. It is intended to be an overview diagram, so if the diagram becomes too complex for easy comprehension, use several diagrams, each of which should focus on a different aspect of the system. Usually, organizing use case diagrams around actors is a good approach."
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list
- (object NoteView @1
- location (464, 352)
- label (object ItemLabel
- Parent_View @1
- location (42, 11)
- fill_color 13434879
- nlines 14
- max_width 809
- label
-|Global View of Business Actors and BusinessUse Cases
-|
-|This diagram presents all Business Actors and all concrete Business Use Cases (those that are directly instantiable).
-|
-|Related Rational Unified Process Activities:
-|- Activity: Find Business Actors and Use Cases
-|- Activity: Structure the Business Use Case Model
-|
-|*Note: this note may be deleted once the diagram is created.
- )
- line_color 3342489
- fill_color 13434879
- width 869
- height 694)
- (object NoteView @2
- location (1280, 160)
- label (object ItemLabel
- Parent_View @2
- location (942, 29)
- fill_color 13434879
- nlines 5
- max_width 640
- label
-|Created/modified by: <name>
-|Date: <creation/modification date>
-|
-|Approved by: <name>
-|Date: <approval date>
- )
- line_color 3342489
- fill_color 13434879
- width 700
- height 275)))))
- (object Class_Category "Use-Case Model"
- is_unit TRUE
- is_loaded FALSE
- file_name "M:\\DST\\analysis\\UseCases.cat"
- quid "35B677F4010E"))
- logical_presentations (list unit_reference_list
- (object UseCaseDiagram "Main"
- quid "35C6339B029F"
- title "Main"
- documentation
-|This diagram depicts the relationships between the packages (models) contained in the 'Use-Case View": the Use-Case Model (for the system) and the Business Use-Case Model (describing the business).
-
- zoom 90
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list
- (object CategoryView "Use Case View::Use-Case Model" @3
- location (400, 864)
- font (object Font
- size 10)
- label (object ItemLabel
- Parent_View @3
- location (256, 780)
- fill_color 13434879
- nlines 2
- max_width 288
- justify 0
- label "Use-Case Model")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "35B677F4010E"
- width 300
- height 180)
- (object NoteView @4
- location (1168, 592)
- font (object Font
- size 10)
- label (object ItemLabel
- Parent_View @4
- location (941, 390)
- fill_color 13434879
- nlines 9
- max_width 419
- label "The Use-Case Model is traceable to (and derives from) the Business Model. The system (as described in the Use Case Model) provides behavior that supports the business.")
- line_color 3342489
- fill_color 13434879
- width 479
- height 416)
- (object CategoryView "Use Case View::Business Use-Case Model" @5
- location (384, 320)
- label (object ItemLabel
- Parent_View @5
- location (189, 229)
- fill_color 13434879
- nlines 2
- max_width 390
- justify 0
- label "Business Use-Case Model")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "35B677D701B8"
- width 403
- height 194)
- (object ImportView "" @6
- stereotype TRUE
- line_color 3342489
- quidu "35C633DA030C"
- client @3
- supplier @5
- line_style 0)
- (object AttachView "" @7
- stereotype TRUE
- line_color 3342489
- client @6
- supplier @4
- line_style 0)))))
- root_category (object Class_Category "Logical View"
- quid "34DBB4830141"
- documentation
-|Rational Unified Process uses the "Logical View in Rose" to organize the Design Model and the Process View and the optional Business Object Model and Analysis Model.
-
- exportControl "Public"
- global TRUE
- subsystem "Component View"
- quidu "34DBB4830143"
- logical_models (list unit_reference_list
- (object Class_Category "Analysis Model"
- quid "35B678170028"
- documentation
-|This model is optional.
-|The Analysis Model contains a set of Analysis Classes, which describe an abstract realization of the use cases of the system. The analysis classes evolve into associated design elements which are modeled in the Design Model.
-
- exportControl "Public"
- logical_models (list unit_reference_list
- (object Class_Category "Business Object Model"
- is_unit TRUE
- is_loaded FALSE
- file_name "M:\\DST\\analysis\\LogicalBusinessObjects.cat"
- quid "35B678080064")
- (object Class_Category "TZ Compiler"
- is_unit TRUE
- is_loaded FALSE
- file_name "M:\\DST\\analysis\\TZCOMPILER.CAT"
- quid "40E569BC024F")
- (object Class_Category "LTClasses"
- is_unit TRUE
- is_loaded FALSE
- file_name "M:\\DST\\analysis\\Classes.cat"
- quid "40A89DC203B0")
- (object Class_Category "Time Zone Database Management"
- is_unit TRUE
- is_loaded FALSE
- file_name "M:\\DST\\analysis\\LogicalTZDBM.cat"
- quid "40B1E4A6003A")
- (object Class_Category "Local Time Conversion"
- is_unit TRUE
- is_loaded FALSE
- file_name "M:\\DST\\analysis\\LogicalLocaltimeConv.cat"
- quid "40B1D43200B7")
- (object Class_Category "System Time Management"
- is_unit TRUE
- is_loaded FALSE
- file_name "M:\\DST\\analysis\\LogicalSysTimeMngmt.cat"
- quid "40B1D49203C5")
- (object Class_Category "TZClasses"
- is_unit TRUE
- is_loaded FALSE
- file_name "M:\\DST\\analysis\\TZClasses.cat"
- quid "40F3CEAF0324")
- (object Class_Category "BClasses"
- is_unit TRUE
- is_loaded FALSE
- file_name "M:\\DST\\analysis\\BClasses.cat"
- quid "40F3CFB10172"))
- logical_presentations (list unit_reference_list))
- (object Class_Category "Design Model"
- quid "35B6782302DA"
- documentation
-|The Design Model in Rational Unified Process.
-|The design model is adapted to model the real implementation environment, and serves as an abstraction of the source code. It is a "blueprint" of how the source code is structured and written.
-|
-|The design model is a hierarchy of packages (design subsystems and design-service packages), with "leaves" that are classes. Subsystems are a design "view" of the components that are defined in the Implementation Model.
-|
-|The design model hierarchy consists of layers.
-|
-|Classes represent abstractions of classes in the system's implementation. They define the objects, which in turn are abstractions of the objects in the system's implementation. The use cases are realized by the objects, and this is represented by use-case realizations in the Design Model. Each use-case realization has a realize dependency to a use case in the Use-Case Model.
-
- exportControl "Public"
- logical_models (list unit_reference_list
- (object Class_Category "<Layer Name> Layer"
- quid "34E3686A00F0"
- documentation
-|The design model is normally organized in layers. The number of layers is not fixed, but varies from situation to situation.
-|
-|During architectural analysis, focus is normally on the two high-level layers, that is, the application and business-specific layers; this is what is meant by the "high-level organization of subsystems." The other lower-level layers are in focus during architectural design, refer to the activity Architectural Design for more information.
-|
-|Layers are identified using the naming conventions shown in the name of this package.
-
- exportControl "Public"
- logical_models (list unit_reference_list
- (object Class_Category "<package name>"
- quid "34E36BB7017C"
- documentation
-|<Enter a short description of the package here. A package should be used in cases where a set of classes and/or other packages need to be grouped together for model organization purposes. Though the contents of the package can have public visibility, which makes them visible to model elements outside the containing package, packages are primarily just grouping mechanisms.
-|
-|If a set of classes is to be encapsulated and can be hidden behind a well-defined interface, a subsystem is a more appropriate container>
-
- exportControl "Public"
- logical_models (list unit_reference_list)
- logical_presentations (list unit_reference_list
- (object ClassDiagram "<package name> - Dependencies"
- quid "37BC2256004D"
- title "<package name> - Dependencies"
- documentation "This diagram shows the package itself and the packages that it is dependent of. That is useful to know for instance when the package is a separate unit that can be reused in other systems."
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list))
- (object ClassDiagram "<package name> - Interfaces"
- quid "37BC226D026D"
- title "<package name> - Interfaces"
- documentation "This diagram shows only the classes that are visible outside this package. The interfaces of the package."
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list))))
- (object Class_Category "<Subsystem Name>"
- quid "35C0F38200B4"
- documentation
-|<Enter a short description of the subsystem here. A subsystem should be used in cases where a set of classes and/or other packages need to be encapsulated within a container and hidden behind a set of well-defined interfaces. By convention, none of the contents of subsystem are visible except the interfaces of the subsystem. This allows subsystems to be easily replaced, and the implementations changed, provided the interfaces remain unchanged. It offers a degree of encapsulation greater than that of the package.
-|
-|If a set of classes is merely to be grouped together, but public visibility of classes is still desirable, a package is a more appropriate container.>
-
- stereotype "subsystem"
- exportControl "Public"
- logical_models (list unit_reference_list)
- logical_presentations (list unit_reference_list
- (object ClassDiagram "<subsystem name> - Dependencies"
- quid "35C0F4220190"
- title "<subsystem name> - Dependencies"
- documentation "This diagram shows the package itself and the packages that it is dependent of. That is useful to know for instance when the package is a separate unit that can be reused in other systems."
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list))
- (object ClassDiagram "<subsystem name> - Interfaces"
- quid "37BC21080165"
- title "<subsystem name> - Interfaces"
- documentation
-|The Process View in Rational Unified Process
-|This package is used to organize the active classes in the system and will be presented in the SoDA-generated Software Architecture Document, under the "Process View"
-
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list)))))
- logical_presentations (list unit_reference_list
- (object ClassDiagram "All Packages in <Layer Name> - Layer"
- quid "34E36C2903C0"
- title "All Packages in <Layer Name> - Layer"
- documentation "This diagram shows all packages in this - Layer."
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list))))
- (object Class_Category "Use-Case Realizations"
- quid "34E36D3203CA"
- documentation
-|In this Package we will describe "Use Case Realizations" as stereotyped use cases.
-|
-|A use-case realization describes how a particular use case is realized within the design model, in terms of collaborating objects.
-|
-|A realize dependency is used between the "Use Case Realization" and the "Use Case" in the use-case model that is realized.
-|
-|
-
- exportControl "Public"
- logical_models (list unit_reference_list
- (object Association "$UNNAMED$0"
- quid "35409E9D02A8"
- stereotype "realize"
- roles (list role_list
- (object Role "$UNNAMED$1"
- quid "35409E9E0294"
- supplier "Use Case View::Use-Case Model::Use Cases::<Use Case Name>::<Use Case Name>"
- quidu "34E37FB203D4"
- is_navigable TRUE)
- (object Role "$UNNAMED$2"
- quid "35409E9E0295"
- supplier "Logical View::Design Model::Use-Case Realizations::<Use-Case Name>::<Use-Case Name>"
- quidu "352F38180276")))
- (object Class_Category "<Use-Case Name>"
- quid "35D083E100BE"
- documentation " A separate package is recommended for each Use Case Realization to facilitate access and version control of related use case artifacts."
- exportControl "Public"
- logical_models (list unit_reference_list
- (object UseCase "<Use-Case Name>"
- attributes (list Attribute_Set
- (object Attribute
- tool "RequisitePro"
- name "ReqProProjectPath"
- value "")
- (object Attribute
- tool "RequisitePro"
- name "ReqProProjectGuid"
- value "")
- (object Attribute
- tool "RequisitePro"
- name "ReqProDocumentName"
- value "")
- (object Attribute
- tool "RequisitePro"
- name "ReqProDocumentGuid"
- value "")
- (object Attribute
- tool "RequisitePro"
- name "ReqProDocType"
- value "")
- (object Attribute
- tool "RequisitePro"
- name "ReqProReqType"
- value "")
- (object Attribute
- tool "RequisitePro"
- name "ReqProRequirementId"
- value ""))
- quid "352F38180276"
- documentation
-|This will be a stereotype on a usecase.
-|In UML it is a stereotype on a collaboration and that does not exist in Rose.
-
- stereotype "use-case realization"
- logical_models (list unit_reference_list
- (object Mechanism @8
- logical_models (list unit_reference_list))
- (object Mechanism @9
- logical_models (list unit_reference_list)))
- logical_presentations (list unit_reference_list
- (object ClassDiagram "<Use Case Name> - Realize Dependencies"
- quid "37BC23B801F1"
- title "<Use Case Name> - Realize Dependencies"
- documentation "This diagram shows the Use Case and the Use Case Realization and the realize dependency between them. This information is used to connect the use case with the use case realization."
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list))
- (object ClassDiagram "<Use Case Name> - Participating Classes"
- quid "37BC23E0036B"
- title "<Use Case Name> - Participating Classes"
- documentation "This Diagram shows all participating classes in this Use Case Realization"
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list))
- (object InteractionDiagram "<Use Case Name> - Basic Flow"
- mechanism_ref @8
- quid "35081E3603A2"
- title "<Use Case Name> - Basic Flow"
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list))
- (object InteractionDiagram "<Use Case Name> - <Flow Type>"
- mechanism_ref @9
- quid "3540A0B901AE"
- title "<Use Case Name> - <Flow Type>"
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list)))))
- logical_presentations (list unit_reference_list
- (object ClassDiagram "Realize Dependency"
- quid "34E39DA90302"
- title "Realize Dependency"
- documentation "This diagram shows the Use Case and the Use Case Realization and the realizes dependency between them."
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list
- (object NoteView @10
- location (704, 144)
- label (object ItemLabel
- Parent_View @10
- location (38, 25)
- fill_color 13434879
- nlines 5
- max_width 1296
- label
-|
-|This diagram shows the Use Case and the Use Case Realization and the realize dependency between them.
- )
- line_color 3342489
- fill_color 13434879
- width 1356
- height 250)
- (object UseCaseView "Use Case View::Use-Case Model::Use Cases::<Use Case Name>::<Use Case Name>" @11
- location (1152, 528)
- label (object ItemLabel
- Parent_View @11
- location (1152, 666)
- anchor_loc 1
- nlines 2
- max_width 631
- justify 0
- label "<Use Case Name>")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "34E37FB203D4"
- autoResize TRUE)
- (object UseCaseView "Logical View::Design Model::Use-Case Realizations::<Use-Case Name>::<Use-Case Name>" @12
- location (608, 960)
- label (object ItemLabel
- Parent_View @12
- location (608, 1148)
- anchor_loc 1
- nlines 2
- max_width 651
- justify 0
- label "<Use-Case Name>")
- stereotype (object ItemLabel
- Parent_View @12
- location (608, 1078)
- anchor 10
- anchor_loc 1
- nlines 1
- max_width 434
- justify 0
- label "<<use-case realization>>")
- icon "use-case realization"
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "352F38180276"
- autoResize TRUE)
- (object AssociationViewNew "$UNNAMED$0" @13
- location (876, 741)
- stereotype (object SegLabel @14
- Parent_View @13
- location (874, 746)
- anchor 10
- anchor_loc 1
- nlines 1
- max_width 450
- justify 0
- label "<<realize>>"
- pctDist 0.483333
- height 5
- orientation 1)
- line_color 3342489
- quidu "35409E9D02A8"
- roleview_list (list RoleViews
- (object RoleView "$UNNAMED$1" @15
- Parent_View @13
- location (236, -539)
- stereotype TRUE
- line_color 3342489
- quidu "35409E9E0294"
- client @13
- supplier @11
- line_style 0)
- (object RoleView "$UNNAMED$2" @16
- Parent_View @13
- location (236, -539)
- stereotype TRUE
- line_color 3342489
- quidu "35409E9E0295"
- client @13
- supplier @12
- line_style 0))))))))
- logical_presentations (list unit_reference_list))
- (object Class_Category "Process View"
- quid "35D227B103C0"
- documentation "An architectural view that describes the concurrent aspect of the system: tasks (processes) and their interactions."
- exportControl "Public"
- logical_models (list unit_reference_list
- (object Class "<Process Name>"
- quid "35DB3C8302D0"
- documentation "This process provides <enter a description here of what the role of the process in the system is>. A separate process was chosen for this to be able to <enter the rationale for needing a separate process>."
- stereotype "process")
- (object Class "<Thread Name>"
- quid "35DB3CB002BC"
- documentation "This is a sub-process or thread within the <name of process of which this thread is a sub-process> process which handles <enter a description of what this thread does>. A separate thread was chosen for this to be able to <enter the rationale for creating a separate thread>."
- stereotype "thread")
- (object Association "$UNNAMED$3"
- quid "35DB3E72017C"
- roles (list role_list
- (object Role "$UNNAMED$4"
- quid "35DB3E73005A"
- supplier "Logical View::Design Model::Process View::<Process Name>"
- quidu "35DB3C8302D0"
- is_navigable TRUE
- is_aggregate TRUE)
- (object Role "$UNNAMED$5"
- quid "35DB3E730096"
- supplier "Logical View::Design Model::Process View::<Thread Name>"
- quidu "35DB3CB002BC"
- Containment "By Value"
- is_navigable TRUE))))
- logical_presentations (list unit_reference_list
- (object ClassDiagram "Process View"
- quid "35DB3C2A02B2"
- title "Process View"
- documentation "This diagram illustrates the composition of processes and threads, and the mapping of classes onto those processes and threads."
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list
- (object ClassView "Class" "Logical View::Design Model::Process View::<Process Name>" @17
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (288, 464)
- label (object ItemLabel
- Parent_View @17
- location (122, 436)
- fill_color 13434879
- nlines 1
- max_width 332
- justify 0
- label "<Process Name>")
- stereotype (object ItemLabel
- Parent_View @17
- location (122, 389)
- fill_color 13434879
- anchor 10
- nlines 1
- max_width 332
- justify 0
- label "<<process>>")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "35DB3C8302D0"
- width 350
- height 172
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::Design Model::Process View::<Thread Name>" @18
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (896, 464)
- label (object ItemLabel
- Parent_View @18
- location (740, 436)
- fill_color 13434879
- nlines 1
- max_width 312
- justify 0
- label "<Thread Name>")
- stereotype (object ItemLabel
- Parent_View @18
- location (740, 389)
- fill_color 13434879
- anchor 10
- nlines 1
- max_width 312
- justify 0
- label "<<thread>>")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "35DB3CB002BC"
- width 330
- height 172
- annotation 8
- autoResize TRUE)
- (object AssociationViewNew "$UNNAMED$3" @19
- location (596, 464)
- stereotype TRUE
- line_color 3342489
- quidu "35DB3E72017C"
- roleview_list (list RoleViews
- (object RoleView "$UNNAMED$4" @20
- Parent_View @19
- location (-300, 0)
- stereotype TRUE
- line_color 3342489
- quidu "35DB3E73005A"
- client @19
- supplier @17
- line_style 0)
- (object RoleView "$UNNAMED$5" @21
- Parent_View @19
- location (-300, 0)
- stereotype TRUE
- line_color 3342489
- quidu "35DB3E730096"
- client @19
- supplier @18
- line_style 0))))))))
- logical_presentations (list unit_reference_list
- (object ClassDiagram "Architecturally Significant Model Elements"
- quid "34E36BDE02C6"
- title "Architecturally Significant Model Elements"
- documentation "Elements of the Design Model which are considered architecturally significant should be presented in this diagram. This diagram will be presented in the document generated using the SoDA Software Architecture Document."
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list
- (object NoteView @22
- location (672, 304)
- label (object ItemLabel
- Parent_View @22
- location (28, 19)
- fill_color 13434879
- nlines 13
- max_width 1253
- label
-|
-|This diagram is just produced for architectural significant packages.
-|
-|This diagram shows the Architectural Significant Classes and Packages in this package. Only significant operations and attributes are shown on the classes in this diagram.
-|
-|See Rational Unified Process:
-|Activity: Architectural Design
-|Step: Include Architecturally Significant Model Elements in the Logical View
-|
-|This will be a part of the "Software Architecture Document" :
-|- "Logical View"
-|- "Architecturally Significant Model Elements"
- )
- line_color 3342489
- fill_color 13434879
- width 1313
- height 582)
- (object NoteView @23
- location (1696, 160)
- label (object ItemLabel
- Parent_View @23
- location (1358, 29)
- fill_color 13434879
- nlines 5
- max_width 640
- label
-|Created/modified by: <name>
-|Date: <creation/modification date>
-|
-|Approved by: <name>
-|Date: <approval date>
- )
- line_color 3342489
- fill_color 13434879
- width 700
- height 275)))
- (object ClassDiagram "Architecture Overview - Package and Subsystem Layering"
- quid "354A9751015E"
- title "Architecture Overview - Package and Subsystem Layering"
- documentation
-|This diagram depicts the organization of the design model into layers. This diagram will be presented in the document generated using the SoDA Software Architecture Document.
-|
-|See Rational Unified Process:
-|Activity: Architectural Analysis
-|Step: Define the High-Level Organization of Subsystems
-|
-|Activity: Incorporate Existing Design Elements
-|Step: Update the Organization of the Design Model
-
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list
- (object NoteView @24
- location (576, 256)
- label (object ItemLabel
- Parent_View @24
- location (44, 31)
- fill_color 13434879
- nlines 9
- max_width 1028
- label
-|This diagram shows the design model layers.
-|
-|See Rational Unified Process:
-|Activity: Architectural Analysis
-|Step: Define the High-Level Organization of Subsystems
-|
-|Activity: Architectural Design
-|Step: Define the Low-level Organization of Subsystems
- )
- line_color 3342489
- fill_color 13434879
- width 1088
- height 463)
- (object NoteView @25
- location (1520, 176)
- label (object ItemLabel
- Parent_View @25
- location (1182, 45)
- fill_color 13434879
- nlines 5
- max_width 640
- label
-|Created/modified by: <name>
-|Date: <creation/modification date>
-|
-|Approved by: <name>
-|Date: <approval date>
- )
- line_color 3342489
- fill_color 13434879
- width 700
- height 275))))))
- logical_presentations (list unit_reference_list
- (object ClassDiagram "Welcome"
- quid "3512226B0028"
- title "Welcome"
- documentation
-|Welcome to the Rational Unified Process Frame Work
-|
-|Purpose of the FrameWork:
-|a) provide a good structure for a Rose model
-|b) provide a style guide with naming conventions/suggestions
-|c) identify a minimal set of diagrams to produce
-|d) relate activities in RUP to Rose diagrams
-|e) provide a basis for sophisticated SoDA reports. For instance based on this structure most of the Rose parts of the "Software Architecture Document" are generated from SoDA.
-|
-
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list
- (object NoteView @26
- location (768, 384)
- label (object ItemLabel
- Parent_View @26
- location (121, 96)
- fill_color 13434879
- nlines 14
- max_width 1259
- label
-|Welcome to the Rational Unified Process Rose Model Framework
-|
-|Purpose of the Framework:
-|a) provide a good structure for a Rose model
-|b) provide a style guide with naming conventions/suggestions
-|c) identify a minimal set of diagrams to produce
-|d) relate activities in RUP to Rose diagrams
-|e) provide a basis for sophisticated SoDA reports. For instance based on this structure most of the Rose parts of the "Software Architecture Document" are generated from SoDA.
- )
- line_color 3342489
- fill_color 13434879
- width 1319
- height 588)
- (object CategoryView "Logical View::Analysis Model::TZ Compiler" @27
- location (1136, 1008)
- label (object ItemLabel
- Parent_View @27
- location (951, 924)
- fill_color 13434879
- nlines 2
- max_width 370
- justify 0
- label "TZ Compiler")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "40E569BC024F"
- width 382
- height 180)
- (object CategoryView "Logical View::Analysis Model::LTClasses" @28
- location (432, 1008)
- label (object ItemLabel
- Parent_View @28
- location (247, 924)
- fill_color 13434879
- nlines 2
- max_width 370
- justify 0
- label "LTClasses")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "40A89DC203B0"
- width 382
- height 180)
- (object CategoryView "Logical View::Analysis Model::Time Zone Database Management" @29
- location (1872, 1040)
- label (object ItemLabel
- Parent_View @29
- location (1638, 956)
- fill_color 13434879
- nlines 2
- max_width 468
- justify 0
- label "Time Zone Database Management")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "40B1E4A6003A"
- width 480
- height 180)
- (object CategoryView "Logical View::Analysis Model::Business Object Model" @30
- location (512, 1408)
- label (object ItemLabel
- Parent_View @30
- location (327, 1324)
- fill_color 13434879
- nlines 2
- max_width 370
- justify 0
- label "Business Object Model")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "35B678080064"
- width 382
- height 180)
- (object CategoryView "Logical View::Analysis Model::Local Time Conversion" @31
- location (1728, 1392)
- label (object ItemLabel
- Parent_View @31
- location (1543, 1308)
- fill_color 13434879
- nlines 2
- max_width 370
- justify 0
- label "Local Time Conversion")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "40B1D43200B7"
- width 382
- height 180)
- (object CategoryView "Logical View::Analysis Model::System Time Management" @32
- location (1040, 1392)
- label (object ItemLabel
- Parent_View @32
- location (855, 1308)
- fill_color 13434879
- nlines 2
- max_width 370
- justify 0
- label "System Time Management")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "40B1D49203C5"
- width 382
- height 180)))))
- root_subsystem (object SubSystem "Component View"
- quid "34DBB4830143"
- documentation
-|In Rational Unified Process the "Component View in Rose" is used to organize the implemetation model.
-|
-|The Implementaition View in Rational Unified Process
-|
-|
-
- physical_models (list unit_reference_list
- (object SubSystem "Implementation Model"
- quid "35B67C9A0348"
- documentation
-|The Implementation Model in Rational Unified Process is a collection of components, and the implementation subsystems that contain them.
-|
-|An architectural view that describes one or several system configurations; the mapping of software components (tasks, modules) to the computing nodes in these configurations.
-|
-|Defines, executables, dll's, files, subsystems, compilation order etc.
-|
-|Rational Unified Process:
-|Activity: Define the Organization of Subsystems
-|
-|These diagram will be presented in the Implementation View section in the document generated using the SoDA Software Architecture Document.
-|
-|It is recommended that, in most cases, the mapping should be
-|1:1 between design and implementation, that is, for each package in design there is one subsystem in the implementation model.
-|
-
- physical_models (list unit_reference_list)
- physical_presentations (list unit_reference_list
- (object Module_Diagram "Implementation Model Structure"
- quid "34DBB487006E"
- title "Implementation Model Structure"
- documentation "This diagram presents the organization of the Implementation Model."
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list
- (object NoteView @33
- location (624, 160)
- label (object ItemLabel
- Parent_View @33
- location (21, 26)
- fill_color 13434879
- nlines 5
- max_width 1170
- label
-|
-|RationalUnified Process:
-|Activity: Structure the implementation model
-|Step: Create the Initial Implementation Model Structure
- )
- line_color 3342489
- fill_color 13434879
- width 1230
- height 281)))))
- (object SubSystem "Components Analysis"
- is_unit TRUE
- is_loaded FALSE
- file_name "M:\\DST\\analysis\\Components.sub"
- quid "40D969B300E0"))
- physical_presentations (list unit_reference_list
- (object Module_Diagram "Main"
- quid "35C6339B029E"
- title "Main"
- documentation "This diagram, required by Rose, simply provides a way of navigating to the Implementation Model."
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list
- (object SubSysView "Component View::Implementation Model" @34
- location (736, 800)
- label (object ItemLabel
- Parent_View @34
- location (552, 713)
- fill_color 13434879
- nlines 2
- max_width 368
- justify 0
- label "Implementation Model")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "35B67C9A0348"
- width 381
- height 187)
- (object SubSysView "Component View::Components Analysis" @35
- location (1408, 1392)
- label (object ItemLabel
- Parent_View @35
- location (1264, 1323)
- fill_color 13434879
- nlines 2
- max_width 288
- justify 0
- label "Components Analysis")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "40D969B300E0"
- width 300
- height 150)))))
- process_structure (object Processes
- quid "34DBB4830144"
- ProcsNDevs (list
- (object Processor "<processor name>"
- quid "34DBBD4300B4"
- documentation "This node provides <enter a short description here of the functionality and capability of the node>."
- connections (list connection_list
- (object Connection_Relationship
- quid "34DBBD4B008C"
- supplier "<device name>"
- quidu "34DBBD47019A"
- supplier_is_device TRUE))
- characteristics ""
- scheduling "Preemptive"
- processes (list processes
- (object Process "<process name>"
- quid "35DB411001D6"
- documentation "This process corresponds to the process with the same name in the Logical View::Process Model."
- stereotype "process"
- priority "")
- (object Process "<thread name>"
- quid "35DB41720348"
- documentation "This process corresponds to the thread with the same name in the Logical View::Process Model."
- stereotype "thread"
- priority "")))
- (object Device "<device name>"
- quid "34DBBD47019A"
- documentation "This device provides <enter a short description of the capability the device provides> for the system."
- characteristics "")
- (object Process_Diagram "Deployment View"
- quid "34DBB4830146"
- title "Deployment View"
- documentation
-|The Deployment View in Rational Unified Process
-|
-|Defines the typical physical network configurations, including those typically used by end users, as well as special configurations used for development and test.
-|
-|See Rational Unified Process:
-|Activity: Describe Distribution
-|
-|This diagram will be a part of the SoDA template-generated Software Architecture Document under the "Deployment View" .
-
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list
- (object ProcessorView "<processor name>" @36
- location (512, 1056)
- label (object ItemLabel
- Parent_View @36
- location (276, 900)
- nlines 2
- max_width 400
- justify 0
- label "<processor name>")
- icon_style "Label"
- quidu "34DBBD4300B4"
- width 475
- height 381
- annotation 3)
- (object DeviceView "<device name>" @37
- location (1040, 1056)
- label (object ItemLabel
- Parent_View @37
- location (867, 950)
- nlines 2
- max_width 275
- justify 0
- label "<device name>")
- icon_style "Icon"
- quidu "34DBBD47019A"
- width 350
- height 282
- annotation 0)
- (object ConnectionView "" @38
- stereotype TRUE
- quidu "34DBBD4B008C"
- client @36
- supplier @37
- line_style 0)
- (object NoteView @39
- location (816, 304)
- label (object ItemLabel
- Parent_View @39
- location (38, 29)
- fill_color 13434879
- nlines 11
- max_width 1521
- label
-|This Diagram defines the typical physical network configurations, including those typically used by end users, as well as special configurations used for development and test.
-|
-|· Allocate processes to the various nodes. Allocation takes into account the capacity of the nodes (in terms of
-|both memory and processing), bandwidth of the communication medium (bus, LANs, WANs), and the
-|availability of the hardware and communication links, rerouting, and so on.
-|
-|See, Rational Unified Process:
-|Activity: Describe Distribution
- )
- line_color 3342489
- fill_color 13434879
- width 1581
- height 563)))))
- properties (object Properties
- attributes (list Attribute_Set
- (object Attribute
- tool "Visual Basic"
- name "propertyId"
- value "783606378")
- (object Attribute
- tool "Visual Basic"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "Visual Basic"
- name "CreatableSet"
- value (list Attribute_Set
- (object Attribute
- tool "Visual Basic"
- name "Private"
- value 221)
- (object Attribute
- tool "Visual Basic"
- name "PublicNotCreatable"
- value 213)
- (object Attribute
- tool "Visual Basic"
- name "SingleUse"
- value 214)
- (object Attribute
- tool "Visual Basic"
- name "GlobalSingleUse"
- value 215)
- (object Attribute
- tool "Visual Basic"
- name "MultiUse"
- value 219)
- (object Attribute
- tool "Visual Basic"
- name "GlobalMultiUse"
- value 220)))
- (object Attribute
- tool "Visual Basic"
- name "OptionBase"
- value ("BaseSet" 222))
- (object Attribute
- tool "Visual Basic"
- name "OptionExplicit"
- value TRUE)
- (object Attribute
- tool "Visual Basic"
- name "OptionCompare"
- value ("CompareSet" 202))
- (object Attribute
- tool "Visual Basic"
- name "Creatable"
- value ("CreatableSet" 221))
- (object Attribute
- tool "Visual Basic"
- name "GenerateInitialization"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "GenerateTermination"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "CollectionClass"
- value "Collection")
- (object Attribute
- tool "Visual Basic"
- name "CompareSet"
- value (list Attribute_Set
- (object Attribute
- tool "Visual Basic"
- name "(none)"
- value 202)
- (object Attribute
- tool "Visual Basic"
- name "Binary"
- value 203)
- (object Attribute
- tool "Visual Basic"
- name "Text"
- value 204)))
- (object Attribute
- tool "Visual Basic"
- name "UpdateCode"
- value TRUE)
- (object Attribute
- tool "Visual Basic"
- name "UpdateModel"
- value TRUE)
- (object Attribute
- tool "Visual Basic"
- name "InstancingSet"
- value (list Attribute_Set
- (object Attribute
- tool "Visual Basic"
- name "Private"
- value 221)
- (object Attribute
- tool "Visual Basic"
- name "PublicNotCreatable"
- value 213)
- (object Attribute
- tool "Visual Basic"
- name "SingleUse"
- value 214)
- (object Attribute
- tool "Visual Basic"
- name "GlobalSingleUse"
- value 215)
- (object Attribute
- tool "Visual Basic"
- name "MultiUse"
- value 219)
- (object Attribute
- tool "Visual Basic"
- name "GlobalMultiUse"
- value 220)))
- (object Attribute
- tool "Visual Basic"
- name "BaseSet"
- value (list Attribute_Set
- (object Attribute
- tool "Visual Basic"
- name "(none)"
- value 222)
- (object Attribute
- tool "Visual Basic"
- name "0"
- value 223)
- (object Attribute
- tool "Visual Basic"
- name "1"
- value 224)))
- (object Attribute
- tool "Visual Basic"
- name "Instancing"
- value ("InstancingSet" 221))))
- (object Attribute
- tool "Visual Basic"
- name "default__Operation"
- value (list Attribute_Set
- (object Attribute
- tool "Visual Basic"
- name "OperationName"
- value "$operation")
- (object Attribute
- tool "Visual Basic"
- name "LibraryName"
- value "")
- (object Attribute
- tool "Visual Basic"
- name "AliasName"
- value "")
- (object Attribute
- tool "Visual Basic"
- name "IsStatic"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "EntryCode"
- value (value Text ""))
- (object Attribute
- tool "Visual Basic"
- name "ExitCode"
- value (value Text ""))
- (object Attribute
- tool "Visual Basic"
- name "ReplaceExistingBody"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "DefaultBody"
- value (value Text ""))))
- (object Attribute
- tool "Visual Basic"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "Visual Basic"
- name "IsConst"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "New"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "WithEvents"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "Subscript"
- value "")
- (object Attribute
- tool "Visual Basic"
- name "NameIfUnlabeled"
- value "the$supplier")
- (object Attribute
- tool "Visual Basic"
- name "GenerateDataMember"
- value TRUE)
- (object Attribute
- tool "Visual Basic"
- name "DataMemberName"
- value "$relationship")
- (object Attribute
- tool "Visual Basic"
- name "GenerateGetOperation"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "GenerateSetOperation"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "GenerateLetOperation"
- value FALSE)))
- (object Attribute
- tool "Visual Basic"
- name "default__Role"
- value (list Attribute_Set
- (object Attribute
- tool "Visual Basic"
- name "New"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "WithEvents"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "Subscript"
- value "")
- (object Attribute
- tool "Visual Basic"
- name "NameIfUnlabeled"
- value "the$supplier")
- (object Attribute
- tool "Visual Basic"
- name "GenerateDataMember"
- value TRUE)
- (object Attribute
- tool "Visual Basic"
- name "DataMemberName"
- value "$relationship")
- (object Attribute
- tool "Visual Basic"
- name "GenerateGetOperation"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "GenerateSetOperation"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "GenerateLetOperation"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "UpdateCode"
- value TRUE)
- (object Attribute
- tool "Visual Basic"
- name "FullName"
- value FALSE)))
- (object Attribute
- tool "Visual Basic"
- name "default__Inherit"
- value (list Attribute_Set
- (object Attribute
- tool "Visual Basic"
- name "ImplementsDelegation"
- value TRUE)
- (object Attribute
- tool "Visual Basic"
- name "FullName"
- value FALSE)))
- (object Attribute
- tool "Visual Basic"
- name "default__Module-Spec"
- value (list Attribute_Set
- (object Attribute
- tool "Visual Basic"
- name "ProjectFile"
- value "")
- (object Attribute
- tool "Visual Basic"
- name "UpdateCode"
- value TRUE)
- (object Attribute
- tool "Visual Basic"
- name "UpdateModel"
- value TRUE)
- (object Attribute
- tool "Visual Basic"
- name "ImportReferences"
- value TRUE)
- (object Attribute
- tool "Visual Basic"
- name "QuickImport"
- value TRUE)))
- (object Attribute
- tool "Visual Basic"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "VisualStudio"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Repository"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "SCC"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Oracle8"
- name "propertyId"
- value "360000002")
- (object Attribute
- tool "Oracle8"
- name "default__Project"
- value (list Attribute_Set
- (object Attribute
- tool "Oracle8"
- name "DDLScriptFilename"
- value "DDL1.SQL")
- (object Attribute
- tool "Oracle8"
- name "DropClause"
- value FALSE)
- (object Attribute
- tool "Oracle8"
- name "PrimaryKeyColumnName"
- value "_ID")
- (object Attribute
- tool "Oracle8"
- name "PrimaryKeyColumnType"
- value "NUMBER(5,0)")
- (object Attribute
- tool "Oracle8"
- name "SchemaNamePrefix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "SchemaNameSuffix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "TableNamePrefix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "TableNameSuffix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "TypeNamePrefix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "TypeNameSuffix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "ViewNamePrefix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "ViewNameSuffix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "VarrayNamePrefix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "VarrayNameSuffix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "NestedTableNamePrefix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "NestedTableNameSuffix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "ObjectTableNamePrefix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "ObjectTableNameSuffix"
- value "")))
- (object Attribute
- tool "Oracle8"
- name "default__Module-Spec"
- value (list Attribute_Set
- (object Attribute
- tool "Oracle8"
- name "IsSchema"
- value FALSE)))
- (object Attribute
- tool "Oracle8"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "Oracle8"
- name "OID"
- value "")
- (object Attribute
- tool "Oracle8"
- name "WhereClause"
- value "")
- (object Attribute
- tool "Oracle8"
- name "CheckConstraint"
- value "")
- (object Attribute
- tool "Oracle8"
- name "CollectionTypeLength"
- value "")
- (object Attribute
- tool "Oracle8"
- name "CollectionTypePrecision"
- value "")
- (object Attribute
- tool "Oracle8"
- name "CollectionTypeScale"
- value "")
- (object Attribute
- tool "Oracle8"
- name "CollectionOfREFS"
- value FALSE)))
- (object Attribute
- tool "Oracle8"
- name "default__Operation"
- value (list Attribute_Set
- (object Attribute
- tool "Oracle8"
- name "MethodKind"
- value ("MethodKindSet" 1903))
- (object Attribute
- tool "Oracle8"
- name "OverloadID"
- value "")
- (object Attribute
- tool "Oracle8"
- name "OrderNumber"
- value "")
- (object Attribute
- tool "Oracle8"
- name "IsReadNoDataState"
- value FALSE)
- (object Attribute
- tool "Oracle8"
- name "IsReadNoProcessState"
- value FALSE)
- (object Attribute
- tool "Oracle8"
- name "IsWriteNoDataState"
- value FALSE)
- (object Attribute
- tool "Oracle8"
- name "IsWriteNoProcessState"
- value FALSE)
- (object Attribute
- tool "Oracle8"
- name "IsSelfish"
- value FALSE)
- (object Attribute
- tool "Oracle8"
- name "TriggerType"
- value ("TriggerTypeSet" 1801))
- (object Attribute
- tool "Oracle8"
- name "TriggerEvent"
- value ("TriggerEventSet" 1601))
- (object Attribute
- tool "Oracle8"
- name "TriggerText"
- value "")
- (object Attribute
- tool "Oracle8"
- name "TriggerReferencingNames"
- value "")
- (object Attribute
- tool "Oracle8"
- name "TriggerForEach"
- value ("TriggerForEachSet" 1701))
- (object Attribute
- tool "Oracle8"
- name "TriggerWhenClause"
- value "")
- (object Attribute
- tool "Oracle8"
- name "MethodKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "Oracle8"
- name "MapMethod"
- value 1901)
- (object Attribute
- tool "Oracle8"
- name "OrderMethod"
- value 1902)
- (object Attribute
- tool "Oracle8"
- name "Function"
- value 1903)
- (object Attribute
- tool "Oracle8"
- name "Procedure"
- value 1904)
- (object Attribute
- tool "Oracle8"
- name "Operator"
- value 1905)
- (object Attribute
- tool "Oracle8"
- name "Constructor"
- value 1906)
- (object Attribute
- tool "Oracle8"
- name "Destructor"
- value 1907)
- (object Attribute
- tool "Oracle8"
- name "Trigger"
- value 1908)
- (object Attribute
- tool "Oracle8"
- name "Calculated"
- value 1909)))
- (object Attribute
- tool "Oracle8"
- name "TriggerTypeSet"
- value (list Attribute_Set
- (object Attribute
- tool "Oracle8"
- name "AFTER"
- value 1801)
- (object Attribute
- tool "Oracle8"
- name "BEFORE"
- value 1802)
- (object Attribute
- tool "Oracle8"
- name "INSTEAD OF"
- value 1803)))
- (object Attribute
- tool "Oracle8"
- name "TriggerForEachSet"
- value (list Attribute_Set
- (object Attribute
- tool "Oracle8"
- name "ROW"
- value 1701)
- (object Attribute
- tool "Oracle8"
- name "STATEMENT"
- value 1702)))
- (object Attribute
- tool "Oracle8"
- name "TriggerEventSet"
- value (list Attribute_Set
- (object Attribute
- tool "Oracle8"
- name "INSERT"
- value 1601)
- (object Attribute
- tool "Oracle8"
- name "UPDATE"
- value 1602)
- (object Attribute
- tool "Oracle8"
- name "DELETE"
- value 1603)
- (object Attribute
- tool "Oracle8"
- name "INSERT OR UPDATE"
- value 1604)
- (object Attribute
- tool "Oracle8"
- name "INSERT OR DELETE"
- value 1605)
- (object Attribute
- tool "Oracle8"
- name "UPDATE OR DELETE"
- value 1606)
- (object Attribute
- tool "Oracle8"
- name "INSERT OR UPDATE OR DELETE"
- value 1607)))))
- (object Attribute
- tool "Oracle8"
- name "default__Role"
- value (list Attribute_Set
- (object Attribute
- tool "Oracle8"
- name "OrderNumber"
- value "")))
- (object Attribute
- tool "Oracle8"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "Oracle8"
- name "OrderNumber"
- value "")
- (object Attribute
- tool "Oracle8"
- name "IsUnique"
- value FALSE)
- (object Attribute
- tool "Oracle8"
- name "NullsAllowed"
- value TRUE)
- (object Attribute
- tool "Oracle8"
- name "Length"
- value "")
- (object Attribute
- tool "Oracle8"
- name "Precision"
- value "2")
- (object Attribute
- tool "Oracle8"
- name "Scale"
- value "6")
- (object Attribute
- tool "Oracle8"
- name "IsIndex"
- value FALSE)
- (object Attribute
- tool "Oracle8"
- name "IsPrimaryKey"
- value FALSE)
- (object Attribute
- tool "Oracle8"
- name "CompositeUnique"
- value FALSE)
- (object Attribute
- tool "Oracle8"
- name "CheckConstraint"
- value "")))
- (object Attribute
- tool "Oracle8"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "cg"
- name "propertyId"
- value "809135966")
- (object Attribute
- tool "cg"
- name "default__Project"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "UseMSVC"
- value FALSE)
- (object Attribute
- tool "cg"
- name "HeaderFileExtension"
- value "h")
- (object Attribute
- tool "cg"
- name "HeaderFileBackupExtension"
- value "h~")
- (object Attribute
- tool "cg"
- name "HeaderFileTemporaryExtension"
- value "h#")
- (object Attribute
- tool "cg"
- name "PrecompiledHeader"
- value "stdafx.h")
- (object Attribute
- tool "cg"
- name "CodeFileExtension"
- value "cpp")
- (object Attribute
- tool "cg"
- name "CodeFileBackupExtension"
- value "cp~")
- (object Attribute
- tool "cg"
- name "CodeFileTemporaryExtension"
- value "cp#")
- (object Attribute
- tool "cg"
- name "CreateMissingDirectories"
- value TRUE)
- (object Attribute
- tool "cg"
- name "StopOnError"
- value FALSE)
- (object Attribute
- tool "cg"
- name "ErrorLimit"
- value 30)
- (object Attribute
- tool "cg"
- name "Directory"
- value "AUTO GENERATE")
- (object Attribute
- tool "cg"
- name "PathSeparator"
- value "")
- (object Attribute
- tool "cg"
- name "FileNameFormat"
- value "")
- (object Attribute
- tool "cg"
- name "BooleanType"
- value "int")
- (object Attribute
- tool "cg"
- name "AllowTemplates"
- value TRUE)
- (object Attribute
- tool "cg"
- name "AllowProtectedInheritance"
- value TRUE)
- (object Attribute
- tool "cg"
- name "CommentWidth"
- value 60)
- (object Attribute
- tool "cg"
- name "OneByValueContainer"
- value "$targetClass")
- (object Attribute
- tool "cg"
- name "OneByReferenceContainer"
- value "$targetClass *")
- (object Attribute
- tool "cg"
- name "OptionalByValueContainer"
- value "OptionalByValue<$targetClass>")
- (object Attribute
- tool "cg"
- name "OptionalByReferenceContainer"
- value "$targetClass *")
- (object Attribute
- tool "cg"
- name "FixedByValueContainer"
- value "$targetClass[$limit]")
- (object Attribute
- tool "cg"
- name "UnorderedFixedByValueContainer"
- value "$targetClass[$limit]")
- (object Attribute
- tool "cg"
- name "FixedByReferenceContainer"
- value "$targetClass *[$limit]")
- (object Attribute
- tool "cg"
- name "UnorderedFixedByReferenceContainer"
- value "$targetClass *[$limit]")
- (object Attribute
- tool "cg"
- name "BoundedByValueContainer"
- value "BoundedListByValue<$targetClass,$limit>")
- (object Attribute
- tool "cg"
- name "UnorderedBoundedByValueContainer"
- value "BoundedSetByValue<$targetClass,$limit>")
- (object Attribute
- tool "cg"
- name "BoundedByReferenceContainer"
- value "BoundedListByReference<$targetClass,$limit>")
- (object Attribute
- tool "cg"
- name "UnorderedBoundedByReferenceContainer"
- value "BoundedSetByReference<$targetClass,$limit>")
- (object Attribute
- tool "cg"
- name "UnboundedByValueContainer"
- value "UnboundedListByValue<$targetClass>")
- (object Attribute
- tool "cg"
- name "UnorderedUnboundedByValueContainer"
- value "UnboundedSetByValue<$targetClass>")
- (object Attribute
- tool "cg"
- name "UnboundedByReferenceContainer"
- value "UnboundedListByReference<$targetClass>")
- (object Attribute
- tool "cg"
- name "UnorderedUnboundedByReferenceContainer"
- value "UnboundedSetByReference<$targetClass>")
- (object Attribute
- tool "cg"
- name "QualifiedByValueContainer"
- value "AssociationByValue<$qualtype, $qualcont>")
- (object Attribute
- tool "cg"
- name "UnorderedQualifiedByValueContainer"
- value "DictionaryByValue<$qualtype, $qualcont>")
- (object Attribute
- tool "cg"
- name "QualifiedByReferenceContainer"
- value "AssociationByReference<$qualtype, $qualcont>")
- (object Attribute
- tool "cg"
- name "UnorderedQualifiedByReferenceContainer"
- value "DictionaryByReference<$qualtype, $qualcont>")
- (object Attribute
- tool "cg"
- name "GeneratePreserveRegions"
- value TRUE)
- (object Attribute
- tool "cg"
- name "AllowExplicitInstantiations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "AlwaysKeepOrphanedCode"
- value FALSE)
- (object Attribute
- tool "cg"
- name "AllowGenerateOverNewerAnnotations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "AllowGenerateOverNewerVersion"
- value FALSE)))
- (object Attribute
- tool "cg"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "CodeName"
- value "")
- (object Attribute
- tool "cg"
- name "ImplementationType"
- value "")
- (object Attribute
- tool "cg"
- name "ClassKey"
- value "class")
- (object Attribute
- tool "cg"
- name "GenerateEmptyRegions"
- value ("GenerateEmptyRegionSet" 3))
- (object Attribute
- tool "cg"
- name "GenerateEmptyRegionSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "None"
- value 0)
- (object Attribute
- tool "cg"
- name "Preserved"
- value 1)
- (object Attribute
- tool "cg"
- name "Unpreserved"
- value 2)
- (object Attribute
- tool "cg"
- name "All"
- value 3)))
- (object Attribute
- tool "cg"
- name "PutBodiesInSpec"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateDefaultConstructor"
- value ("GenerateSet" 206))
- (object Attribute
- tool "cg"
- name "DefaultConstructorVisibility"
- value ("VisibilitySet" 45))
- (object Attribute
- tool "cg"
- name "InlineDefaultConstructor"
- value FALSE)
- (object Attribute
- tool "cg"
- name "ExplicitDefaultConstructor"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateCopyConstructor"
- value ("GenerateSet" 206))
- (object Attribute
- tool "cg"
- name "CopyConstructorVisibility"
- value ("VisibilitySet" 45))
- (object Attribute
- tool "cg"
- name "InlineCopyConstructor"
- value FALSE)
- (object Attribute
- tool "cg"
- name "ExplicitCopyConstructor"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateDestructor"
- value FALSE)
- (object Attribute
- tool "cg"
- name "DestructorVisibility"
- value ("VisibilitySet" 45))
- (object Attribute
- tool "cg"
- name "DestructorKind"
- value ("ThreeKindSet" 200))
- (object Attribute
- tool "cg"
- name "InlineDestructor"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateAssignmentOperation"
- value ("GenerateSet" 206))
- (object Attribute
- tool "cg"
- name "AssignmentVisibility"
- value ("VisibilitySet" 45))
- (object Attribute
- tool "cg"
- name "AssignmentKind"
- value ("ThreeKindSet" 200))
- (object Attribute
- tool "cg"
- name "InlineAssignmentOperation"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateEqualityOperations"
- value ("GenerateSet" 206))
- (object Attribute
- tool "cg"
- name "EqualityVisibility"
- value ("VisibilitySet" 45))
- (object Attribute
- tool "cg"
- name "EqualityKind"
- value ("FriendKindSet" 200))
- (object Attribute
- tool "cg"
- name "InlineEqualityOperations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateRelationalOperations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "RelationalVisibility"
- value ("VisibilitySet" 45))
- (object Attribute
- tool "cg"
- name "RelationalKind"
- value ("FriendKindSet" 200))
- (object Attribute
- tool "cg"
- name "InlineRelationalOperations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateStorageMgmtOperations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "StorageMgmtVisibility"
- value ("VisibilitySet" 45))
- (object Attribute
- tool "cg"
- name "InlineStorageMgmtOperations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateSubscriptOperation"
- value FALSE)
- (object Attribute
- tool "cg"
- name "SubscriptVisibility"
- value ("VisibilitySet" 45))
- (object Attribute
- tool "cg"
- name "SubscriptKind"
- value ("ThreeKindSet" 200))
- (object Attribute
- tool "cg"
- name "SubscriptResultType"
- value "")
- (object Attribute
- tool "cg"
- name "InlineSubscriptOperation"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateDereferenceOperation"
- value FALSE)
- (object Attribute
- tool "cg"
- name "DereferenceVisibility"
- value ("VisibilitySet" 45))
- (object Attribute
- tool "cg"
- name "DereferenceKind"
- value ("ThreeKindSet" 200))
- (object Attribute
- tool "cg"
- name "DereferenceResultType"
- value "")
- (object Attribute
- tool "cg"
- name "InlineDereferenceOperation"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateIndirectionOperation"
- value FALSE)
- (object Attribute
- tool "cg"
- name "IndirectionVisibility"
- value ("VisibilitySet" 45))
- (object Attribute
- tool "cg"
- name "IndirectionKind"
- value ("ThreeKindSet" 200))
- (object Attribute
- tool "cg"
- name "IndirectionResultType"
- value "")
- (object Attribute
- tool "cg"
- name "InlineIndirectionOperation"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateStreamOperations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "StreamVisibility"
- value ("VisibilitySet" 45))
- (object Attribute
- tool "cg"
- name "InlineStreamOperations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "ThreeKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Common"
- value 200)
- (object Attribute
- tool "cg"
- name "Virtual"
- value 201)
- (object Attribute
- tool "cg"
- name "Abstract"
- value 202)))
- (object Attribute
- tool "cg"
- name "KindSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Common"
- value 200)
- (object Attribute
- tool "cg"
- name "Virtual"
- value 201)
- (object Attribute
- tool "cg"
- name "Abstract"
- value 202)
- (object Attribute
- tool "cg"
- name "Static"
- value 203)))
- (object Attribute
- tool "cg"
- name "FriendKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Common"
- value 200)
- (object Attribute
- tool "cg"
- name "Virtual"
- value 201)
- (object Attribute
- tool "cg"
- name "Abstract"
- value 202)
- (object Attribute
- tool "cg"
- name "Friend"
- value 204)))
- (object Attribute
- tool "cg"
- name "GenerateSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "DeclareAndDefine"
- value 199)
- (object Attribute
- tool "cg"
- name "DeclareOnly"
- value 205)
- (object Attribute
- tool "cg"
- name "DoNotDeclare"
- value 206)))
- (object Attribute
- tool "cg"
- name "VisibilitySet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Public"
- value 45)
- (object Attribute
- tool "cg"
- name "Protected"
- value 44)
- (object Attribute
- tool "cg"
- name "Private"
- value 43)
- (object Attribute
- tool "cg"
- name "Implementation"
- value 14)))
- (object Attribute
- tool "cg"
- name "ConstValue"
- value "")
- (object Attribute
- tool "cg"
- name "GenerateDefaultSpecifier"
- value FALSE)
- (object Attribute
- tool "cg"
- name "DefaultSpecifier"
- value "")))
- (object Attribute
- tool "cg"
- name "default__Module-Spec"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Generate"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GenerateEmptyRegions"
- value ("GenerateEmptyRegionSet" 3))
- (object Attribute
- tool "cg"
- name "GenerateEmptyRegionSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "None"
- value 0)
- (object Attribute
- tool "cg"
- name "Preserved"
- value 1)
- (object Attribute
- tool "cg"
- name "Unpreserved"
- value 2)
- (object Attribute
- tool "cg"
- name "All"
- value 3)))
- (object Attribute
- tool "cg"
- name "CmIdentification"
- value (value Text " %X% %Q% %Z% %W%"))
- (object Attribute
- tool "cg"
- name "CopyrightNotice"
- value (value Text ""))
- (object Attribute
- tool "cg"
- name "FileName"
- value "AUTO GENERATE")
- (object Attribute
- tool "cg"
- name "AllowExtensionlessFileName"
- value FALSE)
- (object Attribute
- tool "cg"
- name "InclusionProtectionSymbol"
- value "AUTO GENERATE")
- (object Attribute
- tool "cg"
- name "IncludeFormat"
- value (value Text
-|// $package
-|#include "$file"
-|
- ))
- (object Attribute
- tool "cg"
- name "IncludeBySimpleName"
- value FALSE)
- (object Attribute
- tool "cg"
- name "IncludePrecompiledHeader"
- value FALSE)
- (object Attribute
- tool "cg"
- name "IncludeOrder"
- value "AMIR")
- (object Attribute
- tool "cg"
- name "AdditionalIncludes"
- value (value Text ""))
- (object Attribute
- tool "cg"
- name "InliningStyle"
- value ("InliningStyleSet" 207))
- (object Attribute
- tool "cg"
- name "InliningStyleSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "InClassDeclaration"
- value 208)
- (object Attribute
- tool "cg"
- name "FollowingClassDeclaration"
- value 207)))
- (object Attribute
- tool "cg"
- name "TypesDefined"
- value (value Text ""))
- (object Attribute
- tool "cg"
- name "IncludeClosure"
- value (value Text ""))))
- (object Attribute
- tool "cg"
- name "default__Module-Body"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Generate"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GenerateEmptyRegions"
- value ("GenerateEmptyRegionSet" 3))
- (object Attribute
- tool "cg"
- name "GenerateEmptyRegionSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "None"
- value 0)
- (object Attribute
- tool "cg"
- name "Preserved"
- value 1)
- (object Attribute
- tool "cg"
- name "Unpreserved"
- value 2)
- (object Attribute
- tool "cg"
- name "All"
- value 3)))
- (object Attribute
- tool "cg"
- name "CmIdentification"
- value (value Text " %X% %Q% %Z% %W%"))
- (object Attribute
- tool "cg"
- name "CopyrightNotice"
- value (value Text ""))
- (object Attribute
- tool "cg"
- name "FileName"
- value "AUTO GENERATE")
- (object Attribute
- tool "cg"
- name "AllowExtensionlessFileName"
- value FALSE)
- (object Attribute
- tool "cg"
- name "IncludeFormat"
- value (value Text
-|// $package
-|#include "$file"
-|
- ))
- (object Attribute
- tool "cg"
- name "IncludeBySimpleName"
- value FALSE)
- (object Attribute
- tool "cg"
- name "IncludePrecompiledHeader"
- value TRUE)
- (object Attribute
- tool "cg"
- name "IncludeOrder"
- value "AMIR")
- (object Attribute
- tool "cg"
- name "AdditionalIncludes"
- value (value Text ""))
- (object Attribute
- tool "cg"
- name "InliningStyle"
- value ("InliningStyleSet" 207))
- (object Attribute
- tool "cg"
- name "InliningStyleSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "InClassDeclaration"
- value 208)
- (object Attribute
- tool "cg"
- name "FollowingClassDeclaration"
- value 207)))
- (object Attribute
- tool "cg"
- name "TypesDefined"
- value (value Text ""))
- (object Attribute
- tool "cg"
- name "IncludeClosure"
- value (value Text ""))))
- (object Attribute
- tool "cg"
- name "default__Operation"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "CodeName"
- value "")
- (object Attribute
- tool "cg"
- name "OperationKind"
- value ("OperationKindSet" 200))
- (object Attribute
- tool "cg"
- name "OperationKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Common"
- value 200)
- (object Attribute
- tool "cg"
- name "Virtual"
- value 201)
- (object Attribute
- tool "cg"
- name "Abstract"
- value 202)
- (object Attribute
- tool "cg"
- name "Static"
- value 203)
- (object Attribute
- tool "cg"
- name "Friend"
- value 204)))
- (object Attribute
- tool "cg"
- name "OperationIsConst"
- value FALSE)
- (object Attribute
- tool "cg"
- name "OperationIsExplicit"
- value FALSE)
- (object Attribute
- tool "cg"
- name "Inline"
- value FALSE)
- (object Attribute
- tool "cg"
- name "EntryCode"
- value (value Text ""))
- (object Attribute
- tool "cg"
- name "ExitCode"
- value (value Text ""))
- (object Attribute
- tool "cg"
- name "GenerateEmptyRegions"
- value ("GenerateEmptyRegionSet" 3))
- (object Attribute
- tool "cg"
- name "GenerateEmptyRegionSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "None"
- value 0)
- (object Attribute
- tool "cg"
- name "Preserved"
- value 1)
- (object Attribute
- tool "cg"
- name "Unpreserved"
- value 2)
- (object Attribute
- tool "cg"
- name "All"
- value 3)))
- (object Attribute
- tool "cg"
- name "BodyAnnotations"
- value "")
- (object Attribute
- tool "cg"
- name "OperationIsOneWay"
- value FALSE)
- (object Attribute
- tool "cg"
- name "Context"
- value "")
- (object Attribute
- tool "cg"
- name "Raises"
- value "")
- (object Attribute
- tool "cg"
- name "CCRegion"
- value "")
- (object Attribute
- tool "cg"
- name "GenerateAbstractBody"
- value FALSE)))
- (object Attribute
- tool "cg"
- name "default__Has"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "CodeName"
- value "")
- (object Attribute
- tool "cg"
- name "Ordered"
- value TRUE)
- (object Attribute
- tool "cg"
- name "NameIfUnlabeled"
- value "the_$supplier")
- (object Attribute
- tool "cg"
- name "GenerateDataMember"
- value TRUE)
- (object Attribute
- tool "cg"
- name "DataMemberName"
- value "$relationship")
- (object Attribute
- tool "cg"
- name "DataMemberVisibility"
- value ("DataMemberVisibilitySet" 14))
- (object Attribute
- tool "cg"
- name "DataMemberVisibilitySet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Public"
- value 45)
- (object Attribute
- tool "cg"
- name "Protected"
- value 44)
- (object Attribute
- tool "cg"
- name "Private"
- value 43)
- (object Attribute
- tool "cg"
- name "Implementation"
- value 14)
- (object Attribute
- tool "cg"
- name "AtRelationshipVisibility"
- value 210)))
- (object Attribute
- tool "cg"
- name "DataMemberMutability"
- value ("DataMemberMutabilitySet" 0))
- (object Attribute
- tool "cg"
- name "DataMemberMutabilitySet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Unrestricted"
- value 0)
- (object Attribute
- tool "cg"
- name "Mutable"
- value 1)
- (object Attribute
- tool "cg"
- name "Const"
- value 2)))
- (object Attribute
- tool "cg"
- name "DataMemberIsVolatile"
- value FALSE)
- (object Attribute
- tool "cg"
- name "DataMemberFieldSize"
- value "")
- (object Attribute
- tool "cg"
- name "InitialValue"
- value (value Text ""))
- (object Attribute
- tool "cg"
- name "GenerateGetOperation"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GenerateSetOperation"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GetName"
- value "get_$relationship")
- (object Attribute
- tool "cg"
- name "SetName"
- value "set_$relationship")
- (object Attribute
- tool "cg"
- name "GetSetKinds"
- value ("GetSetKindsSet" 200))
- (object Attribute
- tool "cg"
- name "GetSetKindsSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Common"
- value 200)
- (object Attribute
- tool "cg"
- name "Virtual"
- value 201)
- (object Attribute
- tool "cg"
- name "Abstract"
- value 202)
- (object Attribute
- tool "cg"
- name "Static"
- value 203)
- (object Attribute
- tool "cg"
- name "Friend"
- value 204)))
- (object Attribute
- tool "cg"
- name "ContainerClass"
- value "")
- (object Attribute
- tool "cg"
- name "SelectorName"
- value "")
- (object Attribute
- tool "cg"
- name "SelectorType"
- value "")
- (object Attribute
- tool "cg"
- name "GetIsConst"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GetResultIsConst"
- value ("GetResultIsConstSet" 2))
- (object Attribute
- tool "cg"
- name "GetResultIsConstSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "False"
- value 0)
- (object Attribute
- tool "cg"
- name "True"
- value 1)
- (object Attribute
- tool "cg"
- name "Same_As_Function"
- value 2)))
- (object Attribute
- tool "cg"
- name "GetSetByReference"
- value FALSE)
- (object Attribute
- tool "cg"
- name "InlineGet"
- value TRUE)
- (object Attribute
- tool "cg"
- name "SetReturnsValue"
- value FALSE)
- (object Attribute
- tool "cg"
- name "InlineSet"
- value TRUE)
- (object Attribute
- tool "cg"
- name "ForwardReferenceOnly"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateForwardReference"
- value FALSE)
- (object Attribute
- tool "cg"
- name "IsReadOnly"
- value FALSE)
- (object Attribute
- tool "cg"
- name "BoundedHasRelType"
- value ("HasRelTypeSet" 47))
- (object Attribute
- tool "cg"
- name "HasRelTypeSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Array"
- value 24)
- (object Attribute
- tool "cg"
- name "Sequence"
- value 47)))))
- (object Attribute
- tool "cg"
- name "default__Association"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "NameIfUnlabeled"
- value "the_$targetClass")))
- (object Attribute
- tool "cg"
- name "default__Inherit"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "InstanceArguments"
- value "")))
- (object Attribute
- tool "cg"
- name "default__Role"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "CodeName"
- value "")
- (object Attribute
- tool "cg"
- name "ForwardReferenceOnly"
- value FALSE)
- (object Attribute
- tool "cg"
- name "NameIfUnlabeled"
- value "the_$targetClass")
- (object Attribute
- tool "cg"
- name "GenerateDataMember"
- value TRUE)
- (object Attribute
- tool "cg"
- name "DataMemberName"
- value "$target")
- (object Attribute
- tool "cg"
- name "DataMemberVisibility"
- value ("DataMemberVisibilitySet" 14))
- (object Attribute
- tool "cg"
- name "DataMemberVisibilitySet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Public"
- value 45)
- (object Attribute
- tool "cg"
- name "Protected"
- value 44)
- (object Attribute
- tool "cg"
- name "Private"
- value 43)
- (object Attribute
- tool "cg"
- name "Implementation"
- value 14)
- (object Attribute
- tool "cg"
- name "AtRelationshipVisibility"
- value 210)))
- (object Attribute
- tool "cg"
- name "DataMemberMutability"
- value ("DataMemberMutabilitySet" 0))
- (object Attribute
- tool "cg"
- name "DataMemberMutabilitySet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Unrestricted"
- value 0)
- (object Attribute
- tool "cg"
- name "Mutable"
- value 1)
- (object Attribute
- tool "cg"
- name "Const"
- value 2)))
- (object Attribute
- tool "cg"
- name "DataMemberIsVolatile"
- value FALSE)
- (object Attribute
- tool "cg"
- name "DataMemberFieldSize"
- value "")
- (object Attribute
- tool "cg"
- name "InitialValue"
- value (value Text ""))
- (object Attribute
- tool "cg"
- name "ContainerClass"
- value "")
- (object Attribute
- tool "cg"
- name "ContainerGet"
- value "$data.get($keys)")
- (object Attribute
- tool "cg"
- name "ContainerSet"
- value "$data.set($keys,$value)")
- (object Attribute
- tool "cg"
- name "QualifiedContainer"
- value "")
- (object Attribute
- tool "cg"
- name "AssocClassContainer"
- value "$supplier *")
- (object Attribute
- tool "cg"
- name "AssocClassInitialValue"
- value (value Text ""))
- (object Attribute
- tool "cg"
- name "GetSetKinds"
- value ("GetSetKindsSet" 200))
- (object Attribute
- tool "cg"
- name "GetSetKindsSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Common"
- value 200)
- (object Attribute
- tool "cg"
- name "Virtual"
- value 201)
- (object Attribute
- tool "cg"
- name "Abstract"
- value 202)
- (object Attribute
- tool "cg"
- name "Static"
- value 203)
- (object Attribute
- tool "cg"
- name "Friend"
- value 204)))
- (object Attribute
- tool "cg"
- name "GetSetByReference"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateGetOperation"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GetName"
- value "get_$target")
- (object Attribute
- tool "cg"
- name "GetIsConst"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GetResultIsConst"
- value ("GetResultIsConstSet" 2))
- (object Attribute
- tool "cg"
- name "GetResultIsConstSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "False"
- value 0)
- (object Attribute
- tool "cg"
- name "True"
- value 1)
- (object Attribute
- tool "cg"
- name "Same_As_Function"
- value 2)))
- (object Attribute
- tool "cg"
- name "InlineGet"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GenerateSetOperation"
- value TRUE)
- (object Attribute
- tool "cg"
- name "SetName"
- value "set_$target")
- (object Attribute
- tool "cg"
- name "SetReturnsValue"
- value FALSE)
- (object Attribute
- tool "cg"
- name "InlineSet"
- value TRUE)
- (object Attribute
- tool "cg"
- name "QualifiedGetSetByReference"
- value ("QualifiedGetSetByReferenceSet" 2))
- (object Attribute
- tool "cg"
- name "QualifiedGetSetByReferenceSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "False"
- value 0)
- (object Attribute
- tool "cg"
- name "True"
- value 1)
- (object Attribute
- tool "cg"
- name "Same_As_GetSetByReference"
- value 2)))
- (object Attribute
- tool "cg"
- name "GenerateQualifiedGetOperation"
- value TRUE)
- (object Attribute
- tool "cg"
- name "QualifiedGetName"
- value "get_$target")
- (object Attribute
- tool "cg"
- name "QualifiedGetIsConst"
- value TRUE)
- (object Attribute
- tool "cg"
- name "QualifiedGetResultIsConst"
- value ("GetResultIsConstSet" 2))
- (object Attribute
- tool "cg"
- name "InlineQualifiedGet"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GenerateQualifiedSetOperation"
- value TRUE)
- (object Attribute
- tool "cg"
- name "QualifiedSetName"
- value "set_$target")
- (object Attribute
- tool "cg"
- name "QualifiedSetReturnsValue"
- value FALSE)
- (object Attribute
- tool "cg"
- name "InlineQualifiedSet"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GenerateAssocClassDataMember"
- value TRUE)
- (object Attribute
- tool "cg"
- name "AssocClassDataMemberName"
- value "$target")
- (object Attribute
- tool "cg"
- name "AssocClassDataMemberVisibility"
- value ("DataMemberVisibilitySet" 14))
- (object Attribute
- tool "cg"
- name "DataMemberVisibilitySet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Public"
- value 45)
- (object Attribute
- tool "cg"
- name "Protected"
- value 44)
- (object Attribute
- tool "cg"
- name "Private"
- value 43)
- (object Attribute
- tool "cg"
- name "Implementation"
- value 14)
- (object Attribute
- tool "cg"
- name "AtRelationshipVisibility"
- value 210)))
- (object Attribute
- tool "cg"
- name "AssocClassDataMemberMutability"
- value ("DataMemberMutabilitySet" 0))
- (object Attribute
- tool "cg"
- name "DataMemberMutabilitySet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Unrestricted"
- value 0)
- (object Attribute
- tool "cg"
- name "Mutable"
- value 1)
- (object Attribute
- tool "cg"
- name "Const"
- value 2)))
- (object Attribute
- tool "cg"
- name "AssocClassDataMemberIsVolatile"
- value FALSE)
- (object Attribute
- tool "cg"
- name "AssocClassGetSetKinds"
- value ("GetSetKindsSet" 200))
- (object Attribute
- tool "cg"
- name "GenerateAssocClassGetOperation"
- value TRUE)
- (object Attribute
- tool "cg"
- name "AssocClassGetName"
- value "get_$target")
- (object Attribute
- tool "cg"
- name "AssocClassGetIsConst"
- value TRUE)
- (object Attribute
- tool "cg"
- name "AssocClassGetResultIsConst"
- value ("GetResultIsConstSet" 2))
- (object Attribute
- tool "cg"
- name "InlineAssocClassGet"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GenerateAssocClassSetOperation"
- value TRUE)
- (object Attribute
- tool "cg"
- name "AssocClassSetName"
- value "set_$target")
- (object Attribute
- tool "cg"
- name "AssocClassSetReturnsValue"
- value FALSE)
- (object Attribute
- tool "cg"
- name "InlineAssocClassSet"
- value TRUE)
- (object Attribute
- tool "cg"
- name "AssocClassForwardReferenceOnly"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GenerateForwardReference"
- value FALSE)
- (object Attribute
- tool "cg"
- name "IsReadOnly"
- value FALSE)
- (object Attribute
- tool "cg"
- name "BoundedRoleType"
- value ("AssocTypeSet" 47))
- (object Attribute
- tool "cg"
- name "AssocTypeSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Array"
- value 24)
- (object Attribute
- tool "cg"
- name "Sequence"
- value 47)))))
- (object Attribute
- tool "cg"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "CodeName"
- value "")
- (object Attribute
- tool "cg"
- name "GenerateDataMember"
- value TRUE)
- (object Attribute
- tool "cg"
- name "DataMemberName"
- value "$attribute")
- (object Attribute
- tool "cg"
- name "DataMemberVisibility"
- value ("DataMemberVisibilitySet" 14))
- (object Attribute
- tool "cg"
- name "DataMemberVisibilitySet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Public"
- value 45)
- (object Attribute
- tool "cg"
- name "Protected"
- value 44)
- (object Attribute
- tool "cg"
- name "Private"
- value 43)
- (object Attribute
- tool "cg"
- name "Implementation"
- value 14)
- (object Attribute
- tool "cg"
- name "AtAttributeVisibility"
- value 211)))
- (object Attribute
- tool "cg"
- name "DataMemberMutability"
- value ("DataMemberMutabilitySet" 0))
- (object Attribute
- tool "cg"
- name "DataMemberMutabilitySet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Unrestricted"
- value 0)
- (object Attribute
- tool "cg"
- name "Mutable"
- value 1)
- (object Attribute
- tool "cg"
- name "Const"
- value 2)))
- (object Attribute
- tool "cg"
- name "DataMemberIsVolatile"
- value FALSE)
- (object Attribute
- tool "cg"
- name "DataMemberFieldSize"
- value "")
- (object Attribute
- tool "cg"
- name "GenerateGetOperation"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GenerateSetOperation"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GetName"
- value "get_$attribute")
- (object Attribute
- tool "cg"
- name "SetName"
- value "set_$attribute")
- (object Attribute
- tool "cg"
- name "GetSetKinds"
- value ("GetSetKindsSet" 200))
- (object Attribute
- tool "cg"
- name "GetSetKindsSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Common"
- value 200)
- (object Attribute
- tool "cg"
- name "Virtual"
- value 201)
- (object Attribute
- tool "cg"
- name "Abstract"
- value 202)
- (object Attribute
- tool "cg"
- name "Static"
- value 203)
- (object Attribute
- tool "cg"
- name "Friend"
- value 204)))
- (object Attribute
- tool "cg"
- name "GetIsConst"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GetResultIsConst"
- value ("GetResultIsConstSet" 2))
- (object Attribute
- tool "cg"
- name "GetResultIsConstSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "False"
- value 0)
- (object Attribute
- tool "cg"
- name "True"
- value 1)
- (object Attribute
- tool "cg"
- name "Same_As_Function"
- value 2)))
- (object Attribute
- tool "cg"
- name "GetSetByReference"
- value FALSE)
- (object Attribute
- tool "cg"
- name "InlineGet"
- value TRUE)
- (object Attribute
- tool "cg"
- name "SetReturnsValue"
- value FALSE)
- (object Attribute
- tool "cg"
- name "InlineSet"
- value TRUE)
- (object Attribute
- tool "cg"
- name "CaseSpecifier"
- value "")
- (object Attribute
- tool "cg"
- name "IsReadOnly"
- value FALSE)
- (object Attribute
- tool "cg"
- name "CCRegion"
- value "")))
- (object Attribute
- tool "cg"
- name "default__Uses"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "ForwardReferenceOnly"
- value FALSE)
- (object Attribute
- tool "cg"
- name "BodyReferenceOnly"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateForwardReference"
- value FALSE)))
- (object Attribute
- tool "cg"
- name "default__Subsystem"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Directory"
- value "AUTO GENERATE")
- (object Attribute
- tool "cg"
- name "DirectoryIsOnSearchList"
- value FALSE)
- (object Attribute
- tool "cg"
- name "PrecompiledHeader"
- value "stdafx.h")))
- (object Attribute
- tool "cg"
- name "default__Category"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "IsNamespace"
- value FALSE)
- (object Attribute
- tool "cg"
- name "CodeName"
- value "")
- (object Attribute
- tool "cg"
- name "Indent"
- value 2)
- (object Attribute
- tool "cg"
- name "GenerateEmptyRegions"
- value ("GenerateEmptyRegionSet" 3))
- (object Attribute
- tool "cg"
- name "GenerateEmptyRegionSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "None"
- value 0)
- (object Attribute
- tool "cg"
- name "Preserved"
- value 1)
- (object Attribute
- tool "cg"
- name "Unpreserved"
- value 2)
- (object Attribute
- tool "cg"
- name "All"
- value 3)))))
- (object Attribute
- tool "MSVC"
- name "propertyId"
- value "809135966")
- (object Attribute
- tool "MSVC"
- name "default__Project"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "Version"
- value "5.0")))
- (object Attribute
- tool "MSVC"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "Type"
- value ("MSVCClassTypeSet" 0))
- (object Attribute
- tool "MSVC"
- name "MSVCClassTypeSet"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "Normal"
- value 0)
- (object Attribute
- tool "MSVC"
- name "Interface_Part"
- value 1)
- (object Attribute
- tool "MSVC"
- name "Connection_Part"
- value 2)
- (object Attribute
- tool "MSVC"
- name "Class_Factory"
- value 3)))
- (object Attribute
- tool "MSVC"
- name "CObjectFunctionality"
- value ("CObjectFunctionalitySet" 0))
- (object Attribute
- tool "MSVC"
- name "CObjectFunctionalitySet"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "None"
- value 0)
- (object Attribute
- tool "MSVC"
- name "Dynamic"
- value 1)
- (object Attribute
- tool "MSVC"
- name "Dyncreate"
- value 2)
- (object Attribute
- tool "MSVC"
- name "Serial"
- value 3)))
- (object Attribute
- tool "MSVC"
- name "GenerateOverrideGroup"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "GenerateDataGroup"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "AFX_DATA_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GenerateFieldGroup"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "AFX_FIELD_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GenerateMessageGroup"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "GenerateMessageMap"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "AFX_MSG_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "MESSAGE_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "OLEFactory"
- value ("OLEFactorySet" 0))
- (object Attribute
- tool "MSVC"
- name "OLEFactorySet"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "None"
- value 0)
- (object Attribute
- tool "MSVC"
- name "Built_in"
- value 1)
- (object Attribute
- tool "MSVC"
- name "Simple"
- value 2)
- (object Attribute
- tool "MSVC"
- name "Licensed"
- value 3)))
- (object Attribute
- tool "MSVC"
- name "OLEName"
- value "")
- (object Attribute
- tool "MSVC"
- name "OLEClassID"
- value "")
- (object Attribute
- tool "MSVC"
- name "GenerateOLECtlType"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "OLECtlType"
- value "")
- (object Attribute
- tool "MSVC"
- name "GenerateOLETypeLib"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "OLETypeLibID"
- value "")
- (object Attribute
- tool "MSVC"
- name "OLETypeLibMajor"
- value "")
- (object Attribute
- tool "MSVC"
- name "OLETypeLibMinor"
- value "")
- (object Attribute
- tool "MSVC"
- name "GeneratePropPageIDs"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "OLEPropPageIDs"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GenerateDispatchMap"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "AFX_DISPATCH_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "AFX_DISPATCH_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "DISPATCH_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "StockProperties"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "StockFunctions"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "DispatchDefValue"
- value "")
- (object Attribute
- tool "MSVC"
- name "GenerateDispIdEnum"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "AFX_DISP_ID_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GenerateInterfaceMap"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "INTERFACE_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "InitInterface"
- value "")
- (object Attribute
- tool "MSVC"
- name "GenerateEventMap"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "AFX_EVENT_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "AFX_EVENT_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "EVENT_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "StockEvents"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GenerateEventSinkMap"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "AFX_EVENTSINK_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "AFX_EVENTSINK_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "EVENTSINK_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "PropNotifySinks"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GenerateConnectionMap"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "CONNECTION_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "ConnectionPointIID"
- value "")
- (object Attribute
- tool "MSVC"
- name "InheritanceType"
- value "")
- (object Attribute
- tool "MSVC"
- name "DeclSpec"
- value "")
- (object Attribute
- tool "MSVC"
- name "OLECommands"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "MFCDeclares"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "ATL_Declares"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GenerateCOMMap"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "COM_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GenerateConnectionPointMap"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "CONNECTION_POINT_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GenerateMsgMap"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "MSG_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GeneratePropertyMap"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "PROPERTY_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "MFCImplements"
- value (value Text ""))))
- (object Attribute
- tool "MSVC"
- name "default__Operation"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "Type"
- value ("MSVCOperationTypeSet" 0))
- (object Attribute
- tool "MSVC"
- name "MSVCOperationTypeSet"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "Normal"
- value 0)
- (object Attribute
- tool "MSVC"
- name "Virtual_Override"
- value 1)
- (object Attribute
- tool "MSVC"
- name "Message_Handler"
- value 2)
- (object Attribute
- tool "MSVC"
- name "Dispatch_Handler"
- value 3)
- (object Attribute
- tool "MSVC"
- name "Event_Firing_Function"
- value 4)
- (object Attribute
- tool "MSVC"
- name "Event_Sink_Handler"
- value 5)
- (object Attribute
- tool "MSVC"
- name "Std_OLE_Method"
- value 6)
- (object Attribute
- tool "MSVC"
- name "Command_Parser"
- value 7)
- (object Attribute
- tool "MSVC"
- name "Property_Get_Function"
- value 8)
- (object Attribute
- tool "MSVC"
- name "Property_Set_Function"
- value 9)
- (object Attribute
- tool "MSVC"
- name "Property_Notify_Function"
- value 10)
- (object Attribute
- tool "MSVC"
- name "Macro_Generated_Function"
- value 11)))
- (object Attribute
- tool "MSVC"
- name "AFX_MSG_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "MESSAGE_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "AFX_DISPATCH_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "DISPATCH_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "AFX_EVENT_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "EVENT_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "AFX_EVENTSINK_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "EVENTSINK_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "CallType"
- value "")
- (object Attribute
- tool "MSVC"
- name "DeclSpec"
- value "")
- (object Attribute
- tool "MSVC"
- name "BodyImage"
- value (value Text ""))))
- (object Attribute
- tool "MSVC"
- name "default__Role"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "Type"
- value ("MSVCAttributeTypeSet" 0))
- (object Attribute
- tool "MSVC"
- name "MSVCAttributeTypeSet"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "Normal"
- value 0)
- (object Attribute
- tool "MSVC"
- name "Member_Property"
- value 1)
- (object Attribute
- tool "MSVC"
- name "Get_Set_Property"
- value 2)
- (object Attribute
- tool "MSVC"
- name "Dialog_Data"
- value 3)
- (object Attribute
- tool "MSVC"
- name "Field_Data"
- value 4)
- (object Attribute
- tool "MSVC"
- name "Stock_Property"
- value 5)))
- (object Attribute
- tool "MSVC"
- name "AFX_DISPATCH_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "DISPATCH_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "DeclSpec"
- value "")
- (object Attribute
- tool "MSVC"
- name "PointerBase"
- value "")
- (object Attribute
- tool "MSVC"
- name "CallType"
- value "")
- (object Attribute
- tool "MSVC"
- name "StockPropertyImplementation"
- value "")))
- (object Attribute
- tool "MSVC"
- name "default__Has"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "Type"
- value ("MSVCAttributeTypeSet" 0))
- (object Attribute
- tool "MSVC"
- name "MSVCAttributeTypeSet"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "Normal"
- value 0)
- (object Attribute
- tool "MSVC"
- name "Member_Property"
- value 1)
- (object Attribute
- tool "MSVC"
- name "Get_Set_Property"
- value 2)
- (object Attribute
- tool "MSVC"
- name "Dialog_Data"
- value 3)
- (object Attribute
- tool "MSVC"
- name "Field_Data"
- value 4)
- (object Attribute
- tool "MSVC"
- name "Stock_Property"
- value 5)))
- (object Attribute
- tool "MSVC"
- name "AFX_DISPATCH_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "DISPATCH_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "DeclSpec"
- value "")
- (object Attribute
- tool "MSVC"
- name "PointerBase"
- value "")
- (object Attribute
- tool "MSVC"
- name "CallType"
- value "")
- (object Attribute
- tool "MSVC"
- name "StockPropertyImplementation"
- value "")))
- (object Attribute
- tool "MSVC"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "Type"
- value ("MSVCAttributeTypeSet" 0))
- (object Attribute
- tool "MSVC"
- name "MSVCAttributeTypeSet"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "Normal"
- value 0)
- (object Attribute
- tool "MSVC"
- name "Member_Property"
- value 1)
- (object Attribute
- tool "MSVC"
- name "Get_Set_Property"
- value 2)
- (object Attribute
- tool "MSVC"
- name "Dialog_Data"
- value 3)
- (object Attribute
- tool "MSVC"
- name "Field_Data"
- value 4)
- (object Attribute
- tool "MSVC"
- name "Stock_Property"
- value 5)))
- (object Attribute
- tool "MSVC"
- name "AFX_DISPATCH_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "DISPATCH_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "DeclSpec"
- value "")
- (object Attribute
- tool "MSVC"
- name "PointerBase"
- value "")
- (object Attribute
- tool "MSVC"
- name "CallType"
- value "")
- (object Attribute
- tool "MSVC"
- name "StockPropertyImplementation"
- value "")))
- (object Attribute
- tool "MSVC"
- name "default__Module-Spec"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "GenerateIncludesGroup"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "AFX_INCLUDES_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GenerateInsertLocation"
- value FALSE)))
- (object Attribute
- tool "MSVC"
- name "default__Module-Body"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "GenerateIncludesGroup"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "AFX_INCLUDES_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GenerateInsertLocation"
- value FALSE)))
- (object Attribute
- tool "cg"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "DDL"
- name "propertyId"
- value "809135966")
- (object Attribute
- tool "DDL"
- name "default__Project"
- value (list Attribute_Set
- (object Attribute
- tool "DDL"
- name "DataBase"
- value ("DataBaseSet" 800))
- (object Attribute
- tool "DDL"
- name "DataBaseSet"
- value (list Attribute_Set
- (object Attribute
- tool "DDL"
- name "ANSI"
- value 800)
- (object Attribute
- tool "DDL"
- name "Oracle"
- value 801)
- (object Attribute
- tool "DDL"
- name "SQLServer"
- value 802)
- (object Attribute
- tool "DDL"
- name "Sybase"
- value 803)
- (object Attribute
- tool "DDL"
- name "Watcom"
- value 804)))
- (object Attribute
- tool "DDL"
- name "PrimaryKeyColumnName"
- value "Id")
- (object Attribute
- tool "DDL"
- name "PrimaryKeyColumnType"
- value "NUMBER(5)")
- (object Attribute
- tool "DDL"
- name "ViewName"
- value "V_")
- (object Attribute
- tool "DDL"
- name "TableName"
- value "T_")
- (object Attribute
- tool "DDL"
- name "InheritSuffix"
- value "_V")
- (object Attribute
- tool "DDL"
- name "DropClause"
- value FALSE)
- (object Attribute
- tool "DDL"
- name "BaseViews"
- value FALSE)
- (object Attribute
- tool "DDL"
- name "DDLScriptFilename"
- value "DDL1.SQL")
- (object Attribute
- tool "DDL"
- name "Directory"
- value "AUTO GENERATE")))
- (object Attribute
- tool "DDL"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "DDL"
- name "ColumnType"
- value "VARCHAR")
- (object Attribute
- tool "DDL"
- name "Length"
- value "")
- (object Attribute
- tool "DDL"
- name "NullsOK"
- value TRUE)
- (object Attribute
- tool "DDL"
- name "PrimaryKey"
- value FALSE)
- (object Attribute
- tool "DDL"
- name "Unique"
- value FALSE)
- (object Attribute
- tool "DDL"
- name "CompositeUnique"
- value FALSE)
- (object Attribute
- tool "DDL"
- name "CheckConstraint"
- value "")))
- (object Attribute
- tool "DDL"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "framework"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "IDL"
- name "propertyId"
- value "809135966")
- (object Attribute
- tool "IDL"
- name "default__Project"
- value (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "CreateMissingDirectories"
- value TRUE)
- (object Attribute
- tool "IDL"
- name "StopOnError"
- value TRUE)
- (object Attribute
- tool "IDL"
- name "Directory"
- value "AUTO GENERATE")
- (object Attribute
- tool "IDL"
- name "GeneratePreserveRegions"
- value TRUE)))
- (object Attribute
- tool "IDL"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "ImplementationType"
- value "")
- (object Attribute
- tool "IDL"
- name "ConstValue"
- value "")
- (object Attribute
- tool "IDL"
- name "GenerateDefaultSpecifier"
- value FALSE)
- (object Attribute
- tool "IDL"
- name "DefaultSpecifier"
- value "")
- (object Attribute
- tool "IDL"
- name "IDLElement"
- value TRUE)
- (object Attribute
- tool "IDL"
- name "IDLSpecificationType"
- value ("IDLSpecSet" 22))
- (object Attribute
- tool "IDL"
- name "IDLSpecSet"
- value (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "Interface"
- value 22)
- (object Attribute
- tool "IDL"
- name "Typedef"
- value 54)
- (object Attribute
- tool "IDL"
- name "Enumeration"
- value 8)
- (object Attribute
- tool "IDL"
- name "Const"
- value 71)
- (object Attribute
- tool "IDL"
- name "Exception"
- value 61)
- (object Attribute
- tool "IDL"
- name "Struct"
- value 51)
- (object Attribute
- tool "IDL"
- name "Union"
- value 81)))))
- (object Attribute
- tool "IDL"
- name "default__Module-Spec"
- value (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "Generate"
- value TRUE)
- (object Attribute
- tool "IDL"
- name "CmIdentification"
- value (value Text " %X% %Q% %Z% %W%"))
- (object Attribute
- tool "IDL"
- name "CopyrightNotice"
- value (value Text ""))
- (object Attribute
- tool "IDL"
- name "FileName"
- value "AUTO GENERATE")
- (object Attribute
- tool "IDL"
- name "GenerateIDLModule"
- value FALSE)
- (object Attribute
- tool "IDL"
- name "InclusionProtectionSymbol"
- value "AUTO GENERATE")
- (object Attribute
- tool "IDL"
- name "AdditionalIncludes"
- value (value Text ""))
- (object Attribute
- tool "IDL"
- name "IncludeBySimpleName"
- value FALSE)))
- (object Attribute
- tool "IDL"
- name "default__Module-Body"
- value (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "CmIdentification"
- value (value Text " %X% %Q% %Z% %W%"))
- (object Attribute
- tool "IDL"
- name "CopyrightNotice"
- value (value Text ""))
- (object Attribute
- tool "IDL"
- name "FileName"
- value "AUTO GENERATE")
- (object Attribute
- tool "IDL"
- name "AdditionalIncludes"
- value (value Text ""))
- (object Attribute
- tool "IDL"
- name "IncludeBySimpleName"
- value FALSE)))
- (object Attribute
- tool "IDL"
- name "default__Operation"
- value (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "OperationIsOneWay"
- value FALSE)
- (object Attribute
- tool "IDL"
- name "Context"
- value "")
- (object Attribute
- tool "IDL"
- name "Raises"
- value "")))
- (object Attribute
- tool "IDL"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "CaseSpecifier"
- value "")
- (object Attribute
- tool "IDL"
- name "GenerateDataMember"
- value TRUE)
- (object Attribute
- tool "IDL"
- name "DataMemberName"
- value "$relationship")
- (object Attribute
- tool "IDL"
- name "IsReadOnly"
- value FALSE)
- (object Attribute
- tool "IDL"
- name "IsConst"
- value FALSE)
- (object Attribute
- tool "IDL"
- name "ConstValue"
- value "")))
- (object Attribute
- tool "IDL"
- name "default__Has"
- value (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "NameIfUnlabeled"
- value "the_$supplier")
- (object Attribute
- tool "IDL"
- name "GenerateDataMember"
- value TRUE)
- (object Attribute
- tool "IDL"
- name "DataMemberName"
- value "$relationship")
- (object Attribute
- tool "IDL"
- name "GenerateForwardReference"
- value FALSE)
- (object Attribute
- tool "IDL"
- name "IsReadOnly"
- value FALSE)
- (object Attribute
- tool "IDL"
- name "BoundedHasRelType"
- value ("HasRelTypeSet" 47))
- (object Attribute
- tool "IDL"
- name "HasRelTypeSet"
- value (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "Array"
- value 24)
- (object Attribute
- tool "IDL"
- name "Sequence"
- value 47)))))
- (object Attribute
- tool "IDL"
- name "default__Role"
- value (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "NameIfUnlabeled"
- value "the_$supplier")
- (object Attribute
- tool "IDL"
- name "GenerateDataMember"
- value TRUE)
- (object Attribute
- tool "IDL"
- name "DataMemberName"
- value "$relationship")
- (object Attribute
- tool "IDL"
- name "GenerateForwardReference"
- value FALSE)
- (object Attribute
- tool "IDL"
- name "IsReadOnly"
- value FALSE)
- (object Attribute
- tool "IDL"
- name "BoundedRoleType"
- value ("AssocTypeSet" 47))
- (object Attribute
- tool "IDL"
- name "AssocTypeSet"
- value (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "Array"
- value 24)
- (object Attribute
- tool "IDL"
- name "Sequence"
- value 47)))))
- (object Attribute
- tool "IDL"
- name "default__Uses"
- value (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "GenerateForwardReference"
- value FALSE)))
- (object Attribute
- tool "IDL"
- name "default__Subsystem"
- value (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "Directory"
- value "AUTO GENERATE")))
- (object Attribute
- tool "IDL"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Java"
- name "propertyId"
- value "809135966")
- (object Attribute
- tool "Java"
- name "default__Project"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "CreateMissingDirectories"
- value TRUE)
- (object Attribute
- tool "Java"
- name "StopOnError"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Directory"
- value "AUTO GENERATE")
- (object Attribute
- tool "Java"
- name "UsePrefixes"
- value FALSE)
- (object Attribute
- tool "Java"
- name "InstanceVariablePrefix"
- value "m_")
- (object Attribute
- tool "Java"
- name "ClassVariablePrefix"
- value "s_")
- (object Attribute
- tool "Java"
- name "DefaultAttributeDataType"
- value "int")
- (object Attribute
- tool "Java"
- name "DefaultOperationReturnType"
- value "void")
- (object Attribute
- tool "Java"
- name "Editor"
- value ("EditorType" 100))
- (object Attribute
- tool "Java"
- name "VM"
- value ("VMType" 200))
- (object Attribute
- tool "Java"
- name "ClassPath"
- value "")
- (object Attribute
- tool "Java"
- name "EditorType"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "BuiltIn"
- value 100)
- (object Attribute
- tool "Java"
- name "WindowsShell"
- value 101)))
- (object Attribute
- tool "Java"
- name "VMType"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "Sun"
- value 200)
- (object Attribute
- tool "Java"
- name "Microsoft"
- value 201)))
- (object Attribute
- tool "Java"
- name "GlobalImports"
- value (value Text ""))
- (object Attribute
- tool "Java"
- name "OpenBraceClassStyle"
- value TRUE)
- (object Attribute
- tool "Java"
- name "UseTabs"
- value FALSE)
- (object Attribute
- tool "Java"
- name "UseSpaces"
- value TRUE)
- (object Attribute
- tool "Java"
- name "SpacingItems"
- value 3)
- (object Attribute
- tool "Java"
- name "CommentLength"
- value 2)
- (object Attribute
- tool "Java"
- name "RoseDefaultCommentStyle"
- value TRUE)
- (object Attribute
- tool "Java"
- name "AsteriskCommentStyle"
- value FALSE)
- (object Attribute
- tool "Java"
- name "JavaCommentStyle"
- value FALSE)
- (object Attribute
- tool "Java"
- name "JavadocAuthor"
- value TRUE)
- (object Attribute
- tool "Java"
- name "JavadocDeprecated"
- value FALSE)
- (object Attribute
- tool "Java"
- name "JavadocException"
- value TRUE)
- (object Attribute
- tool "Java"
- name "JavadocParam"
- value TRUE)
- (object Attribute
- tool "Java"
- name "JavadocReturn"
- value TRUE)
- (object Attribute
- tool "Java"
- name "JavadocSee"
- value FALSE)
- (object Attribute
- tool "Java"
- name "JavadocSerial"
- value FALSE)
- (object Attribute
- tool "Java"
- name "JavadocSerialdata"
- value FALSE)
- (object Attribute
- tool "Java"
- name "JavadocSerialfield"
- value FALSE)
- (object Attribute
- tool "Java"
- name "JavadocSince"
- value FALSE)
- (object Attribute
- tool "Java"
- name "JavadocVersion"
- value FALSE)
- (object Attribute
- tool "Java"
- name "JavadocLink"
- value FALSE)))
- (object Attribute
- tool "Java"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "Final"
- value FALSE)
- (object Attribute
- tool "Java"
- name "GenerateDefaultConstructor"
- value TRUE)
- (object Attribute
- tool "Java"
- name "ConstructorIs"
- value ("Ctor_Set" 62))
- (object Attribute
- tool "Java"
- name "Ctor_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "public"
- value 62)
- (object Attribute
- tool "Java"
- name "protected"
- value 63)
- (object Attribute
- tool "Java"
- name "private"
- value 64)
- (object Attribute
- tool "Java"
- name "package"
- value 65)))
- (object Attribute
- tool "Java"
- name "GenerateFinalizer"
- value FALSE)
- (object Attribute
- tool "Java"
- name "GenerateStaticInitializer"
- value FALSE)
- (object Attribute
- tool "Java"
- name "GenerateInstanceInitializer"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Static"
- value FALSE)))
- (object Attribute
- tool "Java"
- name "default__Module-Spec"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "Generate"
- value TRUE)
- (object Attribute
- tool "Java"
- name "CmIdentification"
- value (value Text ""))
- (object Attribute
- tool "Java"
- name "CopyrightNotice"
- value (value Text ""))
- (object Attribute
- tool "Java"
- name "AdditionalImports"
- value (value Text ""))))
- (object Attribute
- tool "Java"
- name "default__Module-Body"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "Generate"
- value TRUE)
- (object Attribute
- tool "Java"
- name "CmIdentification"
- value (value Text ""))
- (object Attribute
- tool "Java"
- name "CopyrightNotice"
- value (value Text ""))
- (object Attribute
- tool "Java"
- name "AdditionalImports"
- value (value Text ""))))
- (object Attribute
- tool "Java"
- name "default__Operation"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "Abstract"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Static"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Final"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Native"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Synchronized"
- value FALSE)
- (object Attribute
- tool "Java"
- name "DefaultBody"
- value (value Text ""))
- (object Attribute
- tool "Java"
- name "ReplaceExistingBody"
- value FALSE)))
- (object Attribute
- tool "Java"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "GenerateDataMember"
- value TRUE)
- (object Attribute
- tool "Java"
- name "Final"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Transient"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Volatile"
- value FALSE)
- (object Attribute
- tool "Java"
- name "PropertyType"
- value ("BeanProperty_Set" 71))
- (object Attribute
- tool "Java"
- name "BeanProperty_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "Not A Property"
- value 71)
- (object Attribute
- tool "Java"
- name "Simple"
- value 72)
- (object Attribute
- tool "Java"
- name "Bound"
- value 73)
- (object Attribute
- tool "Java"
- name "Constrained"
- value 74)))
- (object Attribute
- tool "Java"
- name "IndividualChangeMgt"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Read/Write"
- value ("Read/Write_Set" 81))
- (object Attribute
- tool "Java"
- name "Read/Write_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "Read & Write"
- value 81)
- (object Attribute
- tool "Java"
- name "Read Only"
- value 82)
- (object Attribute
- tool "Java"
- name "Write Only"
- value 83)))
- (object Attribute
- tool "Java"
- name "GenerateFullyQualifiedTypes"
- value FALSE)))
- (object Attribute
- tool "Java"
- name "default__Role"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "GenerateDataMember"
- value TRUE)
- (object Attribute
- tool "Java"
- name "ContainerClass"
- value "")
- (object Attribute
- tool "Java"
- name "InitialValue"
- value "")
- (object Attribute
- tool "Java"
- name "Final"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Transient"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Volatile"
- value FALSE)
- (object Attribute
- tool "Java"
- name "PropertyType"
- value ("BeanProperty_Set" 71))
- (object Attribute
- tool "Java"
- name "BeanProperty_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "Not A Property"
- value 71)
- (object Attribute
- tool "Java"
- name "Simple"
- value 72)
- (object Attribute
- tool "Java"
- name "Bound"
- value 73)
- (object Attribute
- tool "Java"
- name "Constrained"
- value 74)))
- (object Attribute
- tool "Java"
- name "IndividualChangeMgt"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Read/Write"
- value ("Read/Write_Set" 81))
- (object Attribute
- tool "Java"
- name "Read/Write_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "Read & Write"
- value 81)
- (object Attribute
- tool "Java"
- name "Read Only"
- value 82)
- (object Attribute
- tool "Java"
- name "Write Only"
- value 83)))))
- (object Attribute
- tool "Java"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Objectory41"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "TypeLibImporter"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "ROBE"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "CORBA"
- name "propertyId"
- value "809135966")
- (object Attribute
- tool "CORBA"
- name "default__Project"
- value (list Attribute_Set
- (object Attribute
- tool "CORBA"
- name "CreateMissingDirectories"
- value TRUE)
- (object Attribute
- tool "CORBA"
- name "Editor"
- value ("EditorType" 100))
- (object Attribute
- tool "CORBA"
- name "IncludePath"
- value "")
- (object Attribute
- tool "CORBA"
- name "StopOnError"
- value TRUE)
- (object Attribute
- tool "CORBA"
- name "EditorType"
- value (list Attribute_Set
- (object Attribute
- tool "CORBA"
- name "BuiltIn"
- value 100)
- (object Attribute
- tool "CORBA"
- name "WindowsShell"
- value 101)))))
- (object Attribute
- tool "CORBA"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "CORBA"
- name "ArrayDimensions"
- value "")
- (object Attribute
- tool "CORBA"
- name "ConstValue"
- value "")
- (object Attribute
- tool "CORBA"
- name "ImplementationType"
- value "")))
- (object Attribute
- tool "CORBA"
- name "default__Module-Spec"
- value (list Attribute_Set
- (object Attribute
- tool "CORBA"
- name "AdditionalIncludes"
- value (value Text ""))
- (object Attribute
- tool "CORBA"
- name "CmIdentification"
- value (value Text " %X% %Q% %Z% %W%"))
- (object Attribute
- tool "CORBA"
- name "CopyrightNotice"
- value (value Text ""))
- (object Attribute
- tool "CORBA"
- name "InclusionProtectionSymbol"
- value "AUTO GENERATE")))
- (object Attribute
- tool "CORBA"
- name "default__Module-Body"
- value (list Attribute_Set
- (object Attribute
- tool "CORBA"
- name "AdditionalIncludes"
- value (value Text ""))
- (object Attribute
- tool "CORBA"
- name "CmIdentification"
- value (value Text " %X% %Q% %Z% %W%"))
- (object Attribute
- tool "CORBA"
- name "CopyrightNotice"
- value (value Text ""))
- (object Attribute
- tool "CORBA"
- name "InclusionProtectionSymbol"
- value "AUTO GENERATE")))
- (object Attribute
- tool "CORBA"
- name "default__Operation"
- value (list Attribute_Set
- (object Attribute
- tool "CORBA"
- name "Context"
- value "")
- (object Attribute
- tool "CORBA"
- name "OperationIsOneWay"
- value FALSE)))
- (object Attribute
- tool "CORBA"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "CORBA"
- name "ArrayDimensions"
- value "")
- (object Attribute
- tool "CORBA"
- name "CaseSpecifier"
- value "")
- (object Attribute
- tool "CORBA"
- name "IsReadOnly"
- value FALSE)
- (object Attribute
- tool "CORBA"
- name "Order"
- value "")))
- (object Attribute
- tool "CORBA"
- name "default__Role"
- value (list Attribute_Set
- (object Attribute
- tool "CORBA"
- name "ArrayDimensions"
- value "")
- (object Attribute
- tool "CORBA"
- name "CaseSpecifier"
- value "")
- (object Attribute
- tool "CORBA"
- name "GenerateForwardReference"
- value FALSE)
- (object Attribute
- tool "CORBA"
- name "IsReadOnly"
- value FALSE)
- (object Attribute
- tool "CORBA"
- name "Order"
- value "")
- (object Attribute
- tool "CORBA"
- name "BoundedRoleType"
- value ("AssocTypeSet" 47))
- (object Attribute
- tool "CORBA"
- name "AssocTypeSet"
- value (list Attribute_Set
- (object Attribute
- tool "CORBA"
- name "Array"
- value 24)
- (object Attribute
- tool "CORBA"
- name "Sequence"
- value 47)))))
- (object Attribute
- tool "CORBA"
- name "default__Uses"
- value (list Attribute_Set
- (object Attribute
- tool "CORBA"
- name "GenerateForwardReference"
- value FALSE)))
- (object Attribute
- tool "CORBA"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Rational Unified Process"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Rose Web Publisher"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "SoDA"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "COM"
- name "propertyId"
- value "783606378")
- (object Attribute
- tool "COM"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "COM"
- name "TypeKinds"
- value (list Attribute_Set
- (object Attribute
- tool "COM"
- name "enum"
- value 100)
- (object Attribute
- tool "COM"
- name "record"
- value 101)
- (object Attribute
- tool "COM"
- name "module"
- value 102)
- (object Attribute
- tool "COM"
- name "interface"
- value 103)
- (object Attribute
- tool "COM"
- name "dispinterface"
- value 104)
- (object Attribute
- tool "COM"
- name "coclass"
- value 105)
- (object Attribute
- tool "COM"
- name "alias"
- value 106)
- (object Attribute
- tool "COM"
- name "union"
- value 107)
- (object Attribute
- tool "COM"
- name "max"
- value 108)
- (object Attribute
- tool "COM"
- name "(none)"
- value 109)))
- (object Attribute
- tool "COM"
- name "kind"
- value ("TypeKinds" 105))
- (object Attribute
- tool "COM"
- name "uuid"
- value "")
- (object Attribute
- tool "COM"
- name "version"
- value "")
- (object Attribute
- tool "COM"
- name "helpstring"
- value "")
- (object Attribute
- tool "COM"
- name "helpcontext"
- value "")
- (object Attribute
- tool "COM"
- name "attributes"
- value "")
- (object Attribute
- tool "COM"
- name "dllname"
- value "")
- (object Attribute
- tool "COM"
- name "alias"
- value "")
- (object Attribute
- tool "COM"
- name "Generate"
- value TRUE)))
- (object Attribute
- tool "COM"
- name "default__Operation"
- value (list Attribute_Set
- (object Attribute
- tool "COM"
- name "helpstring"
- value "")
- (object Attribute
- tool "COM"
- name "attributes"
- value "")
- (object Attribute
- tool "COM"
- name "Generate"
- value TRUE)
- (object Attribute
- tool "COM"
- name "id"
- value "")))
- (object Attribute
- tool "COM"
- name "default__Module-Spec"
- value (list Attribute_Set
- (object Attribute
- tool "COM"
- name "filename"
- value "")
- (object Attribute
- tool "COM"
- name "library"
- value "")
- (object Attribute
- tool "COM"
- name "imports"
- value "")
- (object Attribute
- tool "COM"
- name "uuid"
- value "")
- (object Attribute
- tool "COM"
- name "version"
- value "")
- (object Attribute
- tool "COM"
- name "helpstring"
- value "")
- (object Attribute
- tool "COM"
- name "helpfile"
- value "")
- (object Attribute
- tool "COM"
- name "helpcontext"
- value "")
- (object Attribute
- tool "COM"
- name "lcid"
- value "")
- (object Attribute
- tool "COM"
- name "attributes"
- value "")
- (object Attribute
- tool "COM"
- name "Generate"
- value TRUE)))
- (object Attribute
- tool "COM"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Version Control"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Data Access"
- name "propertyId"
- value "809135966")
- (object Attribute
- tool "Data Access"
- name "default__Project"
- value (list Attribute_Set
- (object Attribute
- tool "Data Access"
- name "project"
- value " ")))
- (object Attribute
- tool "Data Access"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "RequisitePro"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "cg"
- name "compiler2.1__Project"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "AllowGenerateOverNewerAnnotations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "AllowGenerateOverNewerVersion"
- value FALSE)
- (object Attribute
- tool "cg"
- name "HeaderFileExtension"
- value "h")
- (object Attribute
- tool "cg"
- name "HeaderFileBackupExtension"
- value "h~")
- (object Attribute
- tool "cg"
- name "HeaderFileTemporaryExtension"
- value "h#")
- (object Attribute
- tool "cg"
- name "CodeFileExtension"
- value "cpp")
- (object Attribute
- tool "cg"
- name "CodeFileBackupExtension"
- value "cp~")
- (object Attribute
- tool "cg"
- name "CodeFileTemporaryExtension"
- value "cp#")
- (object Attribute
- tool "cg"
- name "CreateMissingDirectories"
- value TRUE)
- (object Attribute
- tool "cg"
- name "StopOnError"
- value FALSE)
- (object Attribute
- tool "cg"
- name "ErrorLimit"
- value 30)
- (object Attribute
- tool "cg"
- name "Directory"
- value "$ROSECPP_SOURCE")
- (object Attribute
- tool "cg"
- name "BooleanType"
- value "int")
- (object Attribute
- tool "cg"
- name "AllowTemplates"
- value FALSE)
- (object Attribute
- tool "cg"
- name "AllowExplicitInstantiations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "AllowProtectedInheritance"
- value FALSE)
- (object Attribute
- tool "cg"
- name "OneByValueContainer"
- value "$targetClass")
- (object Attribute
- tool "cg"
- name "OneByReferenceContainer"
- value "$targetClass *")
- (object Attribute
- tool "cg"
- name "OptionalByValueContainer"
- value "OptionalByValue(sizeof($targetClass))")
- (object Attribute
- tool "cg"
- name "OptionalByReferenceContainer"
- value "$targetClass *")
- (object Attribute
- tool "cg"
- name "FixedByValueContainer"
- value "$targetClass[$limit]")
- (object Attribute
- tool "cg"
- name "UnorderedFixedByValueContainer"
- value "$targetClass[$limit]")
- (object Attribute
- tool "cg"
- name "FixedByReferenceContainer"
- value "$targetClass *[$limit]")
- (object Attribute
- tool "cg"
- name "UnorderedFixedByReferenceContainer"
- value "$targetClass *[$limit]")
- (object Attribute
- tool "cg"
- name "BoundedByValueContainer"
- value "BoundedListByValue(sizeof($targetClass),$limit)")
- (object Attribute
- tool "cg"
- name "UnorderedBoundedByValueContainer"
- value "BoundedSetByValue(sizeof($targetClass),$limit)")
- (object Attribute
- tool "cg"
- name "BoundedByReferenceContainer"
- value "BoundedListByReference($limit)")
- (object Attribute
- tool "cg"
- name "UnorderedBoundedByReferenceContainer"
- value "BoundedSetByReference($limit)")
- (object Attribute
- tool "cg"
- name "UnboundedByValueContainer"
- value "UnboundedListByValue(sizeof($targetClass))")
- (object Attribute
- tool "cg"
- name "UnorderedUnboundedByValueContainer"
- value "UnboundedSetByValue(sizeof($targetClass))")
- (object Attribute
- tool "cg"
- name "UnboundedByReferenceContainer"
- value "UnboundedListByReference")
- (object Attribute
- tool "cg"
- name "UnorderedUnboundedByReferenceContainer"
- value "UnboundedSetByReference")
- (object Attribute
- tool "cg"
- name "QualifiedByValueContainer"
- value "AssociationByValue(sizeof($qualtype), sizeof($qualcont))")
- (object Attribute
- tool "cg"
- name "UnorderedQualifiedByValueContainer"
- value "DictionaryByValue(sizeof($qualtype), sizeof($qualcont))")
- (object Attribute
- tool "cg"
- name "QualifiedByReferenceContainer"
- value "AssociationByReference(sizeof($qualtype), sizeof($qualcont))")
- (object Attribute
- tool "cg"
- name "UnorderedQualifiedByReferenceContainer"
- value "DictionaryByReference(sizeof($qualtype), sizeof($qualcont))")
- (object Attribute
- tool "cg"
- name "PathSeparator"
- value "")
- (object Attribute
- tool "cg"
- name "FileNameFormat"
- value "128vx_b")
- (object Attribute
- tool "cg"
- name "AlwaysKeepOrphanedCode"
- value FALSE)
- (object Attribute
- tool "cg"
- name "UseMSVC"
- value FALSE)
- (object Attribute
- tool "cg"
- name "CommentWidth"
- value 60)))
- (object Attribute
- tool "cg"
- name "compiler3.0__Project"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "AllowGenerateOverNewerAnnotations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "AllowGenerateOverNewerVersion"
- value FALSE)
- (object Attribute
- tool "cg"
- name "HeaderFileExtension"
- value "h")
- (object Attribute
- tool "cg"
- name "HeaderFileBackupExtension"
- value "h~")
- (object Attribute
- tool "cg"
- name "HeaderFileTemporaryExtension"
- value "h#")
- (object Attribute
- tool "cg"
- name "CodeFileExtension"
- value "cpp")
- (object Attribute
- tool "cg"
- name "CodeFileBackupExtension"
- value "cp~")
- (object Attribute
- tool "cg"
- name "CodeFileTemporaryExtension"
- value "cp#")
- (object Attribute
- tool "cg"
- name "CreateMissingDirectories"
- value TRUE)
- (object Attribute
- tool "cg"
- name "StopOnError"
- value FALSE)
- (object Attribute
- tool "cg"
- name "ErrorLimit"
- value 30)
- (object Attribute
- tool "cg"
- name "Directory"
- value "$ROSECPP_SOURCE")
- (object Attribute
- tool "cg"
- name "BooleanType"
- value "int")
- (object Attribute
- tool "cg"
- name "AllowTemplates"
- value TRUE)
- (object Attribute
- tool "cg"
- name "AllowExplicitInstantiations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "AllowProtectedInheritance"
- value TRUE)
- (object Attribute
- tool "cg"
- name "OneByValueContainer"
- value "$targetClass")
- (object Attribute
- tool "cg"
- name "OneByReferenceContainer"
- value "$targetClass *")
- (object Attribute
- tool "cg"
- name "OptionalByValueContainer"
- value "OptionalByValue<$targetClass>")
- (object Attribute
- tool "cg"
- name "OptionalByReferenceContainer"
- value "$targetClass *")
- (object Attribute
- tool "cg"
- name "FixedByValueContainer"
- value "$targetClass[$limit]")
- (object Attribute
- tool "cg"
- name "UnorderedFixedByValueContainer"
- value "$targetClass[$limit]")
- (object Attribute
- tool "cg"
- name "FixedByReferenceContainer"
- value "$targetClass *[$limit]")
- (object Attribute
- tool "cg"
- name "UnorderedFixedByReferenceContainer"
- value "$targetClass *[$limit]")
- (object Attribute
- tool "cg"
- name "BoundedByValueContainer"
- value "BoundedListByValue<$targetClass,$limit>")
- (object Attribute
- tool "cg"
- name "UnorderedBoundedByValueContainer"
- value "BoundedSetByValue<$targetClass,$limit>")
- (object Attribute
- tool "cg"
- name "BoundedByReferenceContainer"
- value "BoundedListByReference<$targetClass,$limit>")
- (object Attribute
- tool "cg"
- name "UnorderedBoundedByReferenceContainer"
- value "BoundedSetByReference<$targetClass,$limit>")
- (object Attribute
- tool "cg"
- name "UnboundedByValueContainer"
- value "UnboundedListByValue<$targetClass>")
- (object Attribute
- tool "cg"
- name "UnorderedUnboundedByValueContainer"
- value "UnboundedSetByValue<$targetClass>")
- (object Attribute
- tool "cg"
- name "UnboundedByReferenceContainer"
- value "UnboundedListByReference<$targetClass>")
- (object Attribute
- tool "cg"
- name "UnorderedUnboundedByReferenceContainer"
- value "UnboundedSetByReference<$targetClass>")
- (object Attribute
- tool "cg"
- name "QualifiedByValueContainer"
- value "AssociationByValue<$qualtype, $qualcont>")
- (object Attribute
- tool "cg"
- name "UnorderedQualifiedByValueContainer"
- value "DictionaryByValue<$qualtype, $qualcont>")
- (object Attribute
- tool "cg"
- name "QualifiedByReferenceContainer"
- value "AssociationByReference<$qualtype, $qualcont>")
- (object Attribute
- tool "cg"
- name "UnorderedQualifiedByReferenceContainer"
- value "DictionaryByReference<$qualtype, $qualcont>")
- (object Attribute
- tool "cg"
- name "PathSeparator"
- value "")
- (object Attribute
- tool "cg"
- name "FileNameFormat"
- value "128vx_b")
- (object Attribute
- tool "cg"
- name "AlwaysKeepOrphanedCode"
- value FALSE)
- (object Attribute
- tool "cg"
- name "UseMSVC"
- value FALSE)
- (object Attribute
- tool "cg"
- name "CommentWidth"
- value 60)))
- (object Attribute
- tool "Rose Model Integrator"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "COM"
- name "default__Param"
- value (list Attribute_Set
- (object Attribute
- tool "COM"
- name "attributes"
- value "")))
- (object Attribute
- tool "Visual Basic"
- name "default__Param"
- value (list Attribute_Set
- (object Attribute
- tool "Visual Basic"
- name "ByVal"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "ByRef"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "Optional"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "ParamArray"
- value FALSE)))
- (object Attribute
- tool "COM"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "COM"
- name "Generate"
- value TRUE)
- (object Attribute
- tool "COM"
- name "id"
- value "")
- (object Attribute
- tool "COM"
- name "helpstring"
- value "")
- (object Attribute
- tool "COM"
- name "attributes"
- value "")))
- (object Attribute
- tool "VC++"
- name "propertyId"
- value "809135966")
- (object Attribute
- tool "VC++"
- name "default__Project"
- value (list Attribute_Set
- (object Attribute
- tool "VC++"
- name "UpdateATL"
- value TRUE)
- (object Attribute
- tool "VC++"
- name "SmartPointersOnAssoc"
- value TRUE)
- (object Attribute
- tool "VC++"
- name "GenerateImports"
- value TRUE)
- (object Attribute
- tool "VC++"
- name "PutImportsIn"
- value "stdafx.h")
- (object Attribute
- tool "VC++"
- name "FullPathInImports"
- value TRUE)
- (object Attribute
- tool "VC++"
- name "UseImportAttributes"
- value TRUE)
- (object Attribute
- tool "VC++"
- name "ImportAttributes"
- value "no_namespace named_guids")
- (object Attribute
- tool "VC++"
- name "ImportProjTypeLib"
- value TRUE)
- (object Attribute
- tool "VC++"
- name "DefaultTypeLib"
- value TRUE)
- (object Attribute
- tool "VC++"
- name "TypeLibLocation"
- value "")
- (object Attribute
- tool "VC++"
- name "CompileProjTypeLib"
- value TRUE)
- (object Attribute
- tool "VC++"
- name "RvcPtyVersion"
- value "1.0")
- (object Attribute
- tool "VC++"
- name "ModelIDStyle"
- value 2)
- (object Attribute
- tool "VC++"
- name "DocStyle"
- value 1)
- (object Attribute
- tool "VC++"
- name "GenerateIncludes"
- value TRUE)
- (object Attribute
- tool "VC++"
- name "ApplyPattern"
- value FALSE)
- (object Attribute
- tool "VC++"
- name "CreateBackupFiles"
- value TRUE)
- (object Attribute
- tool "VC++"
- name "SupportCodeName"
- value FALSE)
- (object Attribute
- tool "VC++"
- name "DocRevEngineer"
- value TRUE)
- (object Attribute
- tool "VC++"
- name "CreateOverviewDiagrams"
- value TRUE)
- (object Attribute
- tool "VC++"
- name "UpdateModelIDsInCode"
- value TRUE)
- (object Attribute
- tool "VC++"
- name "AttributeTypes"
- value (value Text
-|attr1=bool
-|attr2=short
-|attr3=int
-|attr4=long
-|attr5=char
-|attr6=float
-|attr7=double
-|attr8=void
-|attr9=clock_t
-|attr10=_complex
-|attr11=_dev_t
-|attr12=div_t
-|attr13=_exception
-|attr14=FILE
-|attr15=_finddata_t
-|attr16=_FPIEEE_RECORD
-|attr17=fpos_t
-|attr18=_HEAPINFO
-|attr19=jmp_buf
-|attr20=lconv
-|attr21=ldiv_t
-|attr22=_off_t
-|attr23=_onexit_t
-|attr24=_PNH
-|attr25=ptrdiff_t
-|attr26=sig_atomic_t
-|attr27=size_t
-|attr28=_stat
-|attr29=time_t
-|attr30=_timeb
-|attr31=tm
-|attr32=_utimbuf
-|attr33=va_list
-|attr34=wchar_t
-|attr35=wctrans_t
-|attr36=wctype_t
-|attr37=_wfinddata_t
-|attr38=_wfinddatai64_t
-|attr39=wint_t
-|attr40=ABORTPROC
-|attr41=ACMDRIVERENUMCB
-|attr42=ACMDRIVERPROC
-|attr43=ACMFILTERCHOOSEHOOKPROC
-|attr44=ACMFILTERENUMCB
-|attr45=ACMFILTERTAGENUMCB
-|attr46=ACMFORMATCHOOSEHOOKPROC
-|attr47=ACMFORMATENUMCB
-|attr48=ACMFORMATTAGENUMCB
-|attr49=APPLET_PROC
-|attr50=ATOM
-|attr51=BOOL
-|attr52=BOOLEAN
-|attr53=BYTE
-|attr54=CALINFO_ENUMPROC
-|attr55=CALLBACK
-|attr56=CHAR
-|attr57=COLORREF
-|attr58=CONST
-|attr59=CRITICAL_SECTION
-|attr60=CTRYID
-|attr61=DATEFMT_ENUMPROC
-|attr62=DESKTOPENUMPROC
-|attr63=DLGPROC
-|attr64=DRAWSTATEPROC
-|attr65=DWORD
-|attr66=EDITWORDBREAKPROC
-|attr67=ENHMFENUMPROC
-|attr68=ENUMRESLANGPROC
-|attr69=ENUMRESNAMEPROC
-|attr70=ENUMRESTYPEPROC
-|attr71=FARPROC
-|attr72=FILE_SEGMENT_ELEMENT
-|attr73=FLOAT
-|attr74=FONTENUMPROC
-|attr75=GOBJENUMPROC
-|attr76=GRAYSTRINGPROC
-|attr77=HACCEL
-|attr78=HANDLE
-|attr79=HBITMAP
-|attr80=HBRUSH
-|attr81=HCOLORSPACE
-|attr82=HCONV
-|attr83=HCONVLIST
-|attr84=HCURSOR
-|attr85=HDC
-|attr86=HDDEDATA
-|attr87=HDESK
-|attr88=HDROP
-|attr89=HDWP
-|attr90=HENHMETAFILE
-|attr91=HFILE
-|attr92=HFONT
-|attr93=HGDIOBJ
-|attr94=HGLOBAL
-|attr95=HHOOK
-|attr96=HICON
-|attr97=HIMAGELIST
-|attr98=HIMC
-|attr99=HINSTANCE
-|attr100=HKEY
-|attr101=HKL
-|attr102=HLOCAL
-|attr103=HMENU
-|attr104=HMETAFILE
-|attr105=HMODULE
-|attr106=HMONITOR
-|attr107=HOOKPROC
-|attr108=HPALETTE
-|attr109=HPEN
-|attr110=HRGN
-|attr111=HRSRC
-|attr112=HSZ
-|attr113=HTREEITEM
-|attr114=HWINSTA
-|attr115=HWND
-|attr116=INT
-|attr117=IPADDR
-|attr118=LANGID
-|attr119=LCID
-|attr120=LCSCSTYPE
-|attr121=LCSGAMUTMATCH
-|attr122=LCTYPE
-|attr123=LINEDDAPROC
-|attr124=LOCALE_ENUMPROC
-|attr125=LONG
-|attr126=LONGLONG
-|attr127=LPARAM
-|attr128=LPBOOL
-|attr129=LPBYTE
-|attr130=LPCCHOOKPROC
-|attr131=LPCFHOOKPROC
-|attr132=LPCOLORREF
-|attr133=LPCRITICAL_SECTION
-|attr134=LPCSTR
-|attr135=LPCTSTR
-|attr136=LPCVOID
-|attr137=LPCWSTR
-|attr138=LPDWORD
-|attr139=LPFIBER_START_ROUTINE
-|attr140=LPFRHOOKPROC
-|attr141=LPHANDLE
-|attr142=LPHANDLER_FUNCTION
-|attr143=LPINT
-|attr144=LPLONG
-|attr145=LPOFNHOOKPROC
-|attr146=LPPAGEPAINTHOOK
-|attr147=LPPAGESETUPHOOK
-|attr148=LPPRINTHOOKPROC
-|attr149=LPPROGRESS_ROUTINE
-|attr150=LPSETUPHOOKPROC
-|attr151=LPSTR
-|attr152=LPSTREAM
-|attr153=LPTHREAD_START_ROUTINE
-|attr154=LPTSTR
-|attr155=LPVOID
-|attr156=LPWORD
-|attr157=LPWSTR
-|attr158=LRESULT
-|attr159=LUID
-|attr160=PBOOL
-|attr161=PBOOLEAN
-|attr162=PBYTE
-|attr163=PCHAR
-|attr164=PCRITICAL_SECTION
-|attr165=PCSTR
-|attr166=PCTSTR
-|attr167=PCWCH
-|attr168=PCWSTR
-|attr169=PDWORD
-|attr170=PFLOAT
-|attr171=PFNCALLBACK
-|attr172=PHANDLE
-|attr173=PHANDLER_ROUTINE
-|attr174=PHKEY
-|attr175=PINT
-|attr176=PLCID
-|attr177=PLONG
-|attr178=PLUID
-|attr179=PROPENUMPROC
-|attr180=PROPENUMPROCEX
-|attr181=PSHORT
-|attr182=PSTR
-|attr183=PTBYTE
-|attr184=PTCHAR
-|attr185=PTIMERAPCROUTINE
-|attr186=PTSTR
-|attr187=PUCHAR
-|attr188=PUINT
-|attr189=PULONG
-|attr190=PUSHORT
-|attr191=PVOID
-|attr192=PWCHAR
-|attr193=PWORD
-|attr194=PWSTR
-|attr195=REGISTERWORDENUMPROC
-|attr196=REGSAM
-|attr197=SC_HANDLE
-|attr198=SC_LOCK
-|attr199=SENDASYNCPROC
-|attr200=SERVICE_STATUS_HANDLE
-|attr201=SHORT
-|attr202=TBYTE
-|attr203=TCHAR
-|attr204=TIMEFMT_ENUMPROC
-|attr205=TIMERPROC
-|attr206=UCHAR
-|attr207=UINT
-|attr208=ULONG
-|attr209=ULONGLONG
-|attr210=UNSIGNED
-|attr211=USHORT
-|attr212=VOID
-|attr213=WCHAR
-|attr214=WINAPI
-|attr215=WINSTAENUMPROC
-|attr216=WNDENUMPROC
-|attr217=WNDPROC
-|attr218=WORD
-|attr219=WPARAM
-|attr220=YIELDPROC
-|attr221=CPoint
-|attr222=CRect
-|attr223=CSize
-|attr224=CString
-|attr225=CTime
-|attr226=CTimeSpan
-|attr227=CCreateContext
-|attr228=CMemoryState
-|attr229=COleSafeArray
-|attr230=CPrintInfo
- ))
- (object Attribute
- tool "VC++"
- name "Containers"
- value (value Text
-|cont1=CArray<$TYPE, $TYPE&>
-|cont2=CByteArray
-|cont3=CDWordArray
-|cont4=CObArray
-|cont5=CPtrArray
-|cont6=CStringArray
-|cont7=CUIntArray
-|cont8=CWordArray
-|cont9=CList<$TYPE, $TYPE&>
-|cont10=CPtrList
-|cont11=CObList
-|cont12=CStringList
-|cont13=CMapWordToPtr
-|cont14=CMapPtrToWord
-|cont15=CMapPtrToPtr
-|cont16=CMapWordToOb
-|cont17=CMapStringToPtr
-|cont18=CMapStringToOb
-|cont19=CMapStringToString
-|cont20=CTypedPtrArray<CPtrArray, $TYPE*>
-|cont21=CTypedPtrArray<CObArray, $TYPE*>
-|cont22=CTypedPtrList<CObList, $TYPE*>
-|cont23=CTypedPtrList<CPtrList, $TYPE*>
- ))
- (object Attribute
- tool "VC++"
- name "ClassMethods"
- value (value Text
-|*_body=// ToDo: Add your specialized code here and/or call the base class
-|cm1=$NAME()
-|cm2=$NAME(orig:const $NAME&)
-|cm3=<<virtual>> ~$NAME()
-|cm4=operator=(rhs:$NAME&):$NAME&
-|cm4_body=// ToDo: Add your specialized code here and/or call the base class||return rhs;
-|cm5=<<const>> operator==(rhs:const $NAME&):bool
-|cm5_body=// ToDo: Add your specialized code here and/or call the base class||return false;
-|cm6=<<const>> operator!=(rhs:$NAME&):bool
-|cm6_body=// ToDo: Add your specialized code here and/or call the base class||return false;
-|cm7=<<const>> operator<(rhs:$NAME&):bool
-|cm7_body=// ToDo: Add your specialized code here and/or call the base class||return false;
-|cm8=<<const>> operator>(rhs:$NAME&):bool
-|cm8_body=// ToDo: Add your specialized code here and/or call the base class||return false;
-|cm9=<<const>> operator<=(rhs:$NAME&):bool
-|cm9_body=// ToDo: Add your specialized code here and/or call the base class||return false;
-|cm10=<<const>> operator>=(rhs:$NAME&):bool
-|cm10_body=// ToDo: Add your specialized code here and/or call the base class||return false;
-|cm11=<<friend>> operator>>(i:istream&, rhs:$NAME&):istream&
-|cm11_body=// ToDo: Add your specialized code here and/or call the base class||return i;
-|cm12=<<friend>> operator<<(o:ostream&, rhs:const $NAME&):ostream&
-|cm12_body=// ToDo: Add your specialized code here and/or call the base class||return o;
- ))
- (object Attribute
- tool "VC++"
- name "Accessors"
- value (value Text
-|agf=<<const>> get_$BASICNAME():const $TYPE
-|agf_body=return $NAME;
-|asf=set_$BASICNAME(value:$TYPE):void
-|asf_body=$NAME = value;|return;
-|agv=<<const>> get_$BASICNAME():const $TYPE&
-|agv_body=return $NAME;
-|asv=set_$BASICNAME(value:$TYPE&):void
-|asv_body=$NAME = value;|return;
-|agp=<<const>> get_$BASICNAME():const $TYPE
-|agp_body=return $NAME;
-|asp=set_$BASICNAME(value:$TYPE):void
-|asp_body=$NAME = value;|return;
-|agr=<<const>> get_$BASICNAME():const $TYPE
-|agr_body=return $NAME;
-|asr=set_$BASICNAME(value:$TYPE):void
-|asr_body=$NAME = value;|return;
-|aga=<<const>> get_$BASICNAME(index:int):const $TYPE
-|aga_body=return $NAME[index];
-|asa=set_$BASICNAME(index:int, value:$TYPE):void
-|asa_body=$NAME[index] = value;|return;
- ))
- (object Attribute
- tool "VC++"
- name "Conditionals"
- value (value Text
-|*_decl=#ifdef _DEBUG
-|*_base=CObject
-|cond1=<<virtual, const>> AssertValid():void
-|cond1_body=$SUPERNAME::AssertValid();
-|cond2=<<virtual, const>> Dump(dc:CDumpContext&):void
-|cond2_body=$SUPERNAME::Dump(dc);
- ))
- (object Attribute
- tool "VC++"
- name "Patterns"
- value (value Text
-|patrn1=cm1,cm3,cond1,cond2
-|Patrn1_name=Default
- ))))
- (object Attribute
- tool "VC++"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "VC++"
- name "Generate"
- value TRUE)))
- (object Attribute
- tool "VC++"
- name "default__Module-Spec"
- value (list Attribute_Set
- (object Attribute
- tool "VC++"
- name "InternalMap"
- value (value Text
-|*:AUTO:AUTO
-|
- ))
- (object Attribute
- tool "VC++"
- name "ExportMap"
- value (value Text
-|*:AUTO:AUTO
-|
- ))
- (object Attribute
- tool "VC++"
- name "InitialSourceIncludes"
- value (value Text
-|"stdafx.h"
- ))
- (object Attribute
- tool "VC++"
- name "InitialHeaderIncludes"
- value (value Text ""))
- (object Attribute
- tool "VC++"
- name "Copyright"
- value (value Text "Copyright (C) 1991 - 1999 Rational Software Corporation"))))
- (object Attribute
- tool "VC++"
- name "default__Role"
- value (list Attribute_Set
- (object Attribute
- tool "VC++"
- name "Const"
- value FALSE)
- (object Attribute
- tool "VC++"
- name "Generate"
- value TRUE)
- (object Attribute
- tool "VC++"
- name "InitialValue"
- value "")))
- (object Attribute
- tool "VC++"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "VC++"
- name "Generate"
- value TRUE)))
- (object Attribute
- tool "VC++"
- name "default__Operation"
- value (list Attribute_Set
- (object Attribute
- tool "VC++"
- name "Generate"
- value TRUE)
- (object Attribute
- tool "VC++"
- name "Inline"
- value FALSE)
- (object Attribute
- tool "VC++"
- name "DefaultBody"
- value (value Text ""))))
- (object Attribute
- tool "VC++"
- name "HiddenTool"
- value FALSE))
- quid "34DBB4830145"))
--- a/tzservices/tzserver/analysis/Integration Test Design.cat Thu Aug 19 10:05:08 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,469 +0,0 @@
-
-(object Petal
- version 43
- _written "Rose 6.1.9113.5"
- charSet 0)
-
-(object Class_Category "DST Integration Test"
- is_unit TRUE
- is_loaded TRUE
- quid "410F8AD50291"
- exportControl "Public"
- logical_models (list unit_reference_list
- (object Class "CIntTestStepCompareTimes"
- quid "410F6666011A"
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "410F66A001C6"
- supplier "Logical View::Design Model::DST Integration Test::CIntTestStep"
- quidu "410F5C850361")))
- (object Class "CTestServer"
- quid "410F5BEE03BF")
- (object Class "CIntTestStepImportVcal"
- quid "410F63D900AD"
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "410F669B0291"
- supplier "Logical View::Design Model::DST Integration Test::CIntTestStep"
- quidu "410F5C850361")))
- (object Class "CIntTestStepSetLocation"
- quid "410F63C4004F"
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "410F669503D9"
- supplier "Logical View::Design Model::DST Integration Test::CIntTestStep"
- quidu "410F5C850361")))
- (object Class "CIntTest02Step"
- quid "410F63120233")
- (object Class "CIntTestStepReadLocation"
- quid "410F5F110272"
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "410F6699010A"
- supplier "Logical View::Design Model::DST Integration Test::CIntTestStep"
- quidu "410F5C850361")))
- (object Class "CIntTestStep"
- quid "410F5C850361"
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "410F5CDC0233"
- supplier "Logical View::Design Model::DST Integration Test::CDSTTestStep"
- quidu "410F5C7A011F")))
- (object Class "CDSTTestStep"
- quid "410F5C7A011F"
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "410F5CE20243"
- supplier "Logical View::Design Model::DST Integration Test::CTestStep"
- quidu "410F5C6F0015"))
- operations (list Operations
- (object Operation "TestL"
- quid "411381F60235"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0)))
- (object Class "CTestStep"
- quid "410F5C6F0015"
- documentation
-|
-|
-
- operations (list Operations
- (object Operation "doTestStepPreamble"
- quid "41137E14015A"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0)
- (object Operation "doTestStep"
- quid "41137E49012B"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0)
- (object Operation "doTestStepPostamble"
- quid "41137E52037D"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0)))
- (object Class "CIntTestServer"
- quid "410F5C100286"
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "410F5C30019C"
- supplier "Logical View::Design Model::DST Integration Test::CDSTTestServer"
- quidu "410F5C050025"))
- used_nodes (list uses_relationship_list
- (object Uses_Relationship
- quid "410F5EE8009D"
- supplier "Logical View::Design Model::DST Integration Test::CTestStep"
- quidu "410F5C6F0015"
- supplier_cardinality (value cardinality "1..n"))))
- (object Class "CDSTTestServer"
- quid "410F5C050025"
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "410F5C290229"
- supplier "Logical View::Design Model::DST Integration Test::CTestServer"
- quidu "410F5BEE03BF"))))
- logical_presentations (list unit_reference_list
- (object ClassDiagram "DST Integration Test design"
- quid "410F8B1103C9"
- title "DST Integration Test design"
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list
- (object ClassView "Class" "Logical View::Design Model::DST Integration Test::CTestServer" @1
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (224, 249)
- label (object ItemLabel
- Parent_View @1
- location (96, 200)
- fill_color 13434879
- nlines 1
- max_width 256
- justify 0
- label "CTestServer")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "410F5BEE03BF"
- width 274
- height 120
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::Design Model::DST Integration Test::CDSTTestServer" @2
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (224, 489)
- label (object ItemLabel
- Parent_View @2
- location (61, 440)
- fill_color 13434879
- nlines 1
- max_width 326
- justify 0
- label "CDSTTestServer")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "410F5C050025"
- width 344
- height 120
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::Design Model::DST Integration Test::CIntTestServer" @3
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (224, 745)
- label (object ItemLabel
- Parent_View @3
- location (78, 696)
- fill_color 13434879
- nlines 1
- max_width 292
- justify 0
- label "CIntTestServer")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "410F5C100286"
- width 310
- height 120
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::Design Model::DST Integration Test::CTestStep" @4
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (743, 200)
- label (object ItemLabel
- Parent_View @4
- location (512, 77)
- fill_color 13434879
- nlines 1
- max_width 462
- justify 0
- label "CTestStep")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "410F5C6F0015"
- compartment (object Compartment
- Parent_View @4
- location (512, 135)
- icon_style "Icon"
- fill_color 16777215
- anchor 2
- nlines 4
- max_width 468)
- width 480
- height 268
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::Design Model::DST Integration Test::CDSTTestStep" @5
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (746, 506)
- label (object ItemLabel
- Parent_View @5
- location (583, 430)
- fill_color 13434879
- nlines 1
- max_width 326
- justify 0
- label "CDSTTestStep")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "410F5C7A011F"
- compartment (object Compartment
- Parent_View @5
- location (583, 488)
- icon_style "Icon"
- fill_color 16777215
- anchor 2
- nlines 2
- max_width 181)
- width 344
- height 174
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::Design Model::DST Integration Test::CIntTestStep" @6
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (741, 766)
- label (object ItemLabel
- Parent_View @6
- location (610, 718)
- fill_color 13434879
- nlines 1
- max_width 262
- justify 0
- label "CIntTestStep")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "410F5C850361"
- width 280
- height 118
- annotation 8
- autoResize TRUE)
- (object NoteView @7
- location (1565, 409)
- label (object ItemLabel
- Parent_View @7
- location (1171, 328)
- fill_color 13434879
- nlines 3
- max_width 753
- label "It is intended that the CDSTTestServer and CDSTTestStep are generic classes that implement OOM testing functionality.")
- line_color 3342489
- fill_color 13434879
- width 813
- height 174)
- (object NoteView @8
- location (1571, 665)
- label (object ItemLabel
- Parent_View @8
- location (1174, 565)
- fill_color 13434879
- nlines 4
- max_width 759
- label "Specific integration test server and integration test step are derived to support any integration specific functionality")
- line_color 3342489
- fill_color 13434879
- width 819
- height 213)
- (object ClassView "Class" "Logical View::Design Model::DST Integration Test::CIntTestStepReadLocation" @9
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (793, 1104)
- label (object ItemLabel
- Parent_View @9
- location (544, 1055)
- fill_color 13434879
- nlines 1
- max_width 498
- justify 0
- label "CIntTestStepReadLocation")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "410F5F110272"
- width 516
- height 120
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::Design Model::DST Integration Test::CIntTestStepImportVcal" @10
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (1300, 1107)
- label (object ItemLabel
- Parent_View @10
- location (1082, 1058)
- fill_color 13434879
- nlines 1
- max_width 436
- justify 0
- label "CIntTestStepImportVcal")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "410F63D900AD"
- width 454
- height 120
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::Design Model::DST Integration Test::CIntTestStepCompareTimes" @11
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (1815, 1107)
- label (object ItemLabel
- Parent_View @11
- location (1554, 1058)
- fill_color 13434879
- nlines 1
- max_width 522
- justify 0
- label "CIntTestStepCompareTimes")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "410F6666011A"
- width 540
- height 120
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::Design Model::DST Integration Test::CIntTestStepSetLocation" @12
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (280, 1104)
- label (object ItemLabel
- Parent_View @12
- location (53, 1055)
- fill_color 13434879
- nlines 1
- max_width 454
- justify 0
- label "CIntTestStepSetLocation")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "410F63C4004F"
- width 472
- height 120
- annotation 8
- autoResize TRUE)
- (object NoteView @13
- location (968, 1280)
- label (object ItemLabel
- Parent_View @13
- location (274, 1212)
- fill_color 13434879
- nlines 2
- max_width 1353
- label "There are many different test steps each intended to perform a simple operation. There are only four shown here to keep the diagram readable")
- line_color 3342489
- fill_color 13434879
- width 1413
- height 149)
- (object NoteView @14
- location (1562, 184)
- label (object ItemLabel
- Parent_View @14
- location (1171, 109)
- fill_color 13434879
- nlines 3
- max_width 746
- label "CTestServer and CTestStep are TestExecute framework base classes")
- line_color 3342489
- fill_color 13434879
- width 806
- height 163)
- (object InheritView "" @15
- stereotype TRUE
- line_color 3342489
- quidu "410F5C290229"
- client @2
- supplier @1
- line_style 0)
- (object InheritView "" @16
- stereotype TRUE
- line_color 3342489
- quidu "410F5C30019C"
- client @3
- supplier @2
- line_style 0)
- (object InheritView "" @17
- stereotype TRUE
- line_color 3342489
- quidu "410F5CE20243"
- client @5
- supplier @4
- line_style 0)
- (object InheritView "" @18
- stereotype TRUE
- line_color 3342489
- quidu "410F5CDC0233"
- client @6
- supplier @5
- line_style 0)
- (object InheritView "" @19
- stereotype TRUE
- line_color 3342489
- quidu "410F669B0291"
- client @10
- supplier @6
- line_style 0)
- (object InheritView "" @20
- stereotype TRUE
- line_color 3342489
- quidu "410F66A001C6"
- client @11
- supplier @6
- line_style 0)
- (object AttachView "" @21
- stereotype TRUE
- line_color 3342489
- client @5
- supplier @7
- line_style 0)
- (object AttachView "" @22
- stereotype TRUE
- line_color 3342489
- client @8
- supplier @6
- line_style 0)
- (object InheritView "" @23
- stereotype TRUE
- line_color 3342489
- quidu "410F6699010A"
- client @9
- supplier @6
- line_style 0)
- (object InheritView "" @24
- stereotype TRUE
- line_color 3342489
- quidu "410F669503D9"
- client @12
- supplier @6
- line_style 0)
- (object UsesView "" @25
- stereotype TRUE
- line_color 3342489
- quidu "410F5EE8009D"
- client @3
- supplier @4
- line_style 0)))))
Binary file tzservices/tzserver/doc_pub/SGL.GT0197.233 App-Services Tz 9.1 How-To Use the APIs.doc has changed
Binary file tzservices/tzserver/doc_pub/SGL.GT0403.210 SOS v9.5 Time Zone Services PREQ1776 How-To.doc has changed
--- a/tzservices/tzserver/group/BLD.INF Thu Aug 19 10:05:08 2010 +0300
+++ b/tzservices/tzserver/group/BLD.INF Tue Aug 31 15:24:25 2010 +0300
@@ -57,7 +57,6 @@
// ROM
TimeZoneServer.iby /epoc32/rom/include/timezoneserver.iby
-Timezoneserver.iby /epoc32/rom/include/core/mw/timezoneserver.iby
PRJ_MMPFILES
TimeZoneClient.mmp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tzservices/tzserver/group/timezonetests.pkg Tue Aug 31 15:24:25 2010 +0300
@@ -0,0 +1,41 @@
+;
+; 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:
+;
+
+;Languages
+&EN
+
+
+;Localised Vendor name
+%{"timezonetests.pkg EN"}
+
+; Vendor name
+: "timezonetests"
+
+"\epoc32\data\c\dstscripts\LocationTest.script"-"c:\Dstscripts\LocationTest.script"
+"\epoc32\data\c\dstscripts\ConversionTest.script"-"c:\Dstscripts\ConversionTest.script"
+"\epoc32\data\c\dstscripts\VCalTest.script"-"c:\Dstscripts\VCalTest.script"
+"\epoc32\data\c\dstscripts\PerformanceTest.script"-"c:\Dstscripts\PerformanceTest.script"
+"\epoc32\data\c\dstscripts\autoupdatetest.script"-"c:\Dstscripts\autoupdatetest.script"
+"\epoc32\data\c\dstscripts\utcoffsettest.script"-"c:\Dstscripts\utcoffsettest.script"
+"\epoc32\data\c\dstscripts\autoupdatenotificationtest.script"-"c:\Dstscripts\autoupdatenotificationtest.script"
+"\epoc32\data\c\dstscripts\utcalarmtest.script"-"c:\Dstscripts\utcalarmtest.script"
+"\epoc32\data\c\dstscripts\isdaylightsavingontest.script"-"c:\Dstscripts\isdaylightsavingontest.script"
+"\epoc32\data\c\dstscripts\ServerMsgSender.script"-"c:\Dstscripts\ServerMsgSender.script"
+"\epoc32\data\c\dstscripts\BackupRestore.script"-"c:\Dstscripts\BackupRestore.script"
+"\epoc32\data\c\dstscripts\TimeZoneOffsetCheck.script"-"c:\Dstscripts\TimeZoneOffsetCheck.script"
+"\epoc32\data\c\Dstscripts\unittest.script"-"c:\Dstscripts\unittest.script"
+"\epoc32\data\c\dstscripts\NextDSTChange.script"-"c:\Dstscripts\NextDSTChange.script"
+"\epoc32\data\c\dstscripts\UnknownZoneTime.script"-"c:\Dstscripts\UnknownZoneTime.script"
\ No newline at end of file
