# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1284701259 -10800 # Node ID f2a9f5a3b8ba0fe07866f36207fb7cf3d19ef54c # Parent b7be70e619ea8821c1cd2cb13445f8acc3ca328e Revision: 201035 Kit: 201037 diff -r b7be70e619ea -r f2a9f5a3b8ba applicationmanagement/client/group/ApplicationManagementClient.mmp --- a/applicationmanagement/client/group/ApplicationManagementClient.mmp Thu Sep 02 20:16:47 2010 +0300 +++ b/applicationmanagement/client/group/ApplicationManagementClient.mmp Fri Sep 17 08:27:39 2010 +0300 @@ -40,7 +40,6 @@ LIBRARY efsrv.lib LIBRARY apparc.lib LIBRARY apgrfx.lib -LIBRARY avkon.lib LIBRARY estor.lib LIBRARY cone.lib LIBRARY eikcore.lib diff -r b7be70e619ea -r f2a9f5a3b8ba applicationmanagement/rom/appmgmt.iby --- a/applicationmanagement/rom/appmgmt.iby Thu Sep 02 20:16:47 2010 +0300 +++ b/applicationmanagement/rom/appmgmt.iby Fri Sep 17 08:27:39 2010 +0300 @@ -29,7 +29,7 @@ file=ABI_DIR\BUILD_DIR\ApplicationManagementClient.dll SHARED_LIB_DIR\ApplicationManagementClient.dll - ECOM_PLUGIN(RfsAppMgmtPlugin.dll,102073BF.rsc) +// ECOM_PLUGIN(RfsAppMgmtPlugin.dll,102073BF.rsc) ECOM_PLUGIN(omascomoadapter.dll, omascomoadapter.rsc) data=ZPRIVATE\100012a5\policy\20021335.spd PRIVATE\100012a5\policy\20021335.spd diff -r b7be70e619ea -r f2a9f5a3b8ba applicationmanagement/server/server.pro --- a/applicationmanagement/server/server.pro Thu Sep 02 20:16:47 2010 +0300 +++ b/applicationmanagement/server/server.pro Fri Sep 17 08:27:39 2010 +0300 @@ -31,6 +31,9 @@ TrustedUI \ AllFiles \ NetworkControl + +RSS_RULES += "hidden = KAppIsHidden;" + LIBS += -lWrtDownloadMgr \ -lwrtserviceipcclient \ -leuser \ diff -r b7be70e619ea -r f2a9f5a3b8ba clientprovisioning/cpqtsp/cpqtsp.pro --- a/clientprovisioning/cpqtsp/cpqtsp.pro Thu Sep 02 20:16:47 2010 +0300 +++ b/clientprovisioning/cpqtsp/cpqtsp.pro Fri Sep 17 08:27:39 2010 +0300 @@ -31,6 +31,9 @@ } CONFIG += hb service + +RSS_RULES += "hidden = KAppIsHidden;" + INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE include(Cpqtsp.pri) LIBS+=-lxqservice -lxqserviceutil -lflogger diff -r b7be70e619ea -r f2a9f5a3b8ba deviceupdatesui/deviceupdates/conf/101F6DE5.txt Binary file deviceupdatesui/deviceupdates/conf/101F6DE5.txt has changed diff -r b7be70e619ea -r f2a9f5a3b8ba deviceupdatesui/deviceupdates/conf/deviceupdates.confml Binary file deviceupdatesui/deviceupdates/conf/deviceupdates.confml has changed diff -r b7be70e619ea -r f2a9f5a3b8ba deviceupdatesui/deviceupdates/conf/deviceupdates_101F6DE5.crml Binary file deviceupdatesui/deviceupdates/conf/deviceupdates_101F6DE5.crml has changed diff -r b7be70e619ea -r f2a9f5a3b8ba deviceupdatesui/deviceupdates/deviceupdates.pro --- a/deviceupdatesui/deviceupdates/deviceupdates.pro Thu Sep 02 20:16:47 2010 +0300 +++ b/deviceupdatesui/deviceupdates/deviceupdates.pro Fri Sep 17 08:27:39 2010 +0300 @@ -20,8 +20,8 @@ :BLD_INF_RULES.prj_exports += "$${LITERAL_HASH}include " :BLD_INF_RULES.prj_exports += "./rom/deviceupdates.iby CORE_APP_LAYER_IBY_EXPORT_PATH(deviceupdates.iby)" :BLD_INF_RULES.prj_exports += "./rom/deviceupdates_resources.iby LANGUAGE_APP_LAYER_IBY_EXPORT_PATH(deviceupdates_resources.iby)" - :BLD_INF_RULES.prj_exports += "./conf/101F6DE5.txt /epoc32/data/z/private/10202be9/101F6DE5.txt" - :BLD_INF_RULES.prj_exports += "./conf/101F6DE5.txt /epoc32/winscw/c/private/10202be9/101F6DE5.txt" + :BLD_INF_RULES.prj_exports += "./conf/deviceupdates.confml APP_LAYER_CONFML(deviceupdates.confml)" + :BLD_INF_RULES.prj_exports += "./conf/deviceupdates_101F6DE5.crml APP_LAYER_CRML(deviceupdates_101F6DE5.crml)" TARGET.UID2 = 0x100039CE TARGET.UID3 = 0x101F6DE5 TARGET.CAPABILITY = CAP_APPLICATION @@ -44,7 +44,9 @@ -lfotaengine \ -leuser \ -lflogger \ - -lxqutils + -lxqutils \ + -lapgrfx \ + -lcone } TEMPLATE = app TARGET = deviceupdates diff -r b7be70e619ea -r f2a9f5a3b8ba deviceupdatesui/deviceupdates/inc/dmfotaview.h --- a/deviceupdatesui/deviceupdates/inc/dmfotaview.h Thu Sep 02 20:16:47 2010 +0300 +++ b/deviceupdatesui/deviceupdates/inc/dmfotaview.h Fri Sep 17 08:27:39 2010 +0300 @@ -39,7 +39,7 @@ #include "dminforetrieval.h" #include "deviceupdatemoniterobserver.h" //_LIT( KSmlEOL, "\n" ); - +const TUid KControlPanelAppUid ={0x20025fd9}; class HbDialog; class HbPushButton; diff -r b7be70e619ea -r f2a9f5a3b8ba deviceupdatesui/deviceupdates/inc/nsmldmsyncprivatecrkeys.h --- a/deviceupdatesui/deviceupdates/inc/nsmldmsyncprivatecrkeys.h Thu Sep 02 20:16:47 2010 +0300 +++ b/deviceupdatesui/deviceupdates/inc/nsmldmsyncprivatecrkeys.h Fri Sep 17 08:27:39 2010 +0300 @@ -30,56 +30,20 @@ //flash uid const TUid flashuid = {0x101FD693}; -// CenRep key used in variation of the aspects of -// the firmware update feature. The flag values are -// commented below. -const TUint32 KNSmlDMFotaConfigurationKey = 0x00000001; - -// Enables the menu option Check updates. -const TUint KNSmlDMFotaEnableManualCheckFlag = 0x0001; -// Enables the menu option that allows the user to access the default -// profile used in FOTA sessions. -const TUint KNSmlDMFotaUnlockedDefaultProfileFlag = 0x0002; -// Enables the FOTA view. -const TUint KNSmlDMFotaEnableFotaViewFlag = 0x0004; - // CenRep keys for default dm profile used in the // firmware update over the air. -const TUint32 KNSmlDMDefaultFotaProfileKey = 0x00000002; +const TUint32 KNSmlDMDefaultFotaProfileKey = 0x00000001; // CenRep key that can be used to hide a DM profile from the // profile list on the UI, but still retaining the UI functionality // during server alerted session. The server identifier used // to authenticate the server should be stored here. -const TUint32 KNSmlDMFotaHiddenProfileIdKey = 0x00000003; - -// CenRep key that can be used to Enable/Disable the -// Connect menu in servers view options.Default value is 1 -// which Enables the Connect menu -const TUint32 KNSmlDMEnableConnectMenuKey = 0x00000004; - -// CenRep key that can be used to Enable/Disable the -// Servers menu in Main view options.Default value is 1 -// which Enables the Servers menu -const TUint32 KNSmlDMServersMenuKey = 0x00000005; - -// CenRep key that can be used to Enable/Disable the -// Settings menu in Main view options.Default value is 1 -// which Enables the Settings menu -const TUint32 KNSmlDMSettingsMenuKey = 0x00000006; - -// CenRep key that can be used to allow manual check updates -// or not.Default value is 1 which Enables the check updates -// menu in the main view -const TUint32 KNsmlDmManualCheckAllowed = 0x00000007; +const TUint32 KNSmlDMFotaHiddenProfileIdKey = 0x00000002; // CenRep key that can be used to allow to show runtime versions // or not.Default value is 0 which makes it off -const TUint32 KNsmlDmRuntimeVerSupport = 0x00000008; +const TUint32 KNsmlDmRuntimeVerSupport = 0x00000003; -// CenRep key that can be used to know who launch DM UI -// Default value is 0 which makes DM launches other than CP -const TUint32 KNsmlDmUILaunch = 0x00000009; #endif // NSMLDMSYNCAPP_PRIVATE_CR_KEYS_H diff -r b7be70e619ea -r f2a9f5a3b8ba deviceupdatesui/deviceupdates/src/dmfotaview.cpp --- a/deviceupdatesui/deviceupdates/src/dmfotaview.cpp Thu Sep 02 20:16:47 2010 +0300 +++ b/deviceupdatesui/deviceupdates/src/dmfotaview.cpp Fri Sep 17 08:27:39 2010 +0300 @@ -22,8 +22,11 @@ #include #include #include +#include #include #include +#include +#include #include #include #include @@ -115,6 +118,8 @@ mSoftKeyBackAction = new HbAction(Hb::BackNaviAction ,this); mSoftKeyBackAction->setText("Back"); + fotaPortraitView->setNavigationAction(mSoftKeyBackAction); + fotaLandscapeView->setNavigationAction(mSoftKeyBackAction); connect(mSoftKeyBackAction, SIGNAL(triggered()), this, SLOT(backtoMainWindow())); @@ -547,8 +552,25 @@ void DMFotaView::backtoMainWindow() { qDebug("DMFotaView::backtoMainWindow >>"); - qApp->quit(); - qDebug("DMFotaView::backtoMainWindow <<"); + QString appName = qApp->applicationName(); + QString cpAppTitle("Control panel"); + mMainWindow->removeView(fotaPortraitView); + mMainWindow->removeView(fotaLandscapeView); + fotaPortraitView->deleteLater(); + fotaLandscapeView->deleteLater(); + fotaPortraitView = NULL; + fotaLandscapeView = NULL; + if (appName == cpAppTitle) + { + TApaTaskList taskList(CEikonEnv::Static()->WsSession()); + TApaTask task = taskList.FindApp(KControlPanelAppUid); + if (task.Exists()) + { + task.BringToForeground(); + } + } + qApp->quit(); + qDebug("DMFotaView::backtoMainWindow <<"); } // ----------------------------------------------------------------------------- diff -r b7be70e619ea -r f2a9f5a3b8ba deviceupdatesui/deviceupdatesplugin/inc/deviceupdatesdata.h --- a/deviceupdatesui/deviceupdatesplugin/inc/deviceupdatesdata.h Thu Sep 02 20:16:47 2010 +0300 +++ b/deviceupdatesui/deviceupdatesplugin/inc/deviceupdatesdata.h Fri Sep 17 08:27:39 2010 +0300 @@ -26,8 +26,6 @@ const TUid KUidSmlSyncApp = { 0x101F6DE5 }; -const TUint32 KNsmlDmUILaunch = 0x00000009; - class DeviceUpdateData : public CpSettingFormEntryItemData { diff -r b7be70e619ea -r f2a9f5a3b8ba deviceupdatesui/deviceupdatesqtsp/deviceupdatesqtsp.pro --- a/deviceupdatesui/deviceupdatesqtsp/deviceupdatesqtsp.pro Thu Sep 02 20:16:47 2010 +0300 +++ b/deviceupdatesui/deviceupdatesqtsp/deviceupdatesqtsp.pro Fri Sep 17 08:27:39 2010 +0300 @@ -37,6 +37,9 @@ /orbit/hb/include/hbservices/private \ /orbit/hb/include/hbcore \ /orbit/hb/include/hbcore/private + +RSS_RULES += "hidden = KAppIsHidden;" + INCLUDEPATH += . INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE diff -r b7be70e619ea -r f2a9f5a3b8ba package_definition.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/package_definition.xml Fri Sep 17 08:27:39 2010 +0300 @@ -0,0 +1,131 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r b7be70e619ea -r f2a9f5a3b8ba package_map.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/package_map.xml Fri Sep 17 08:27:39 2010 +0300 @@ -0,0 +1,1 @@ +