--- a/applicationmanagement/client/group/ApplicationManagementClient.mmp Thu Aug 19 17:35:23 2010 +0530
+++ b/applicationmanagement/client/group/ApplicationManagementClient.mmp Fri Sep 03 22:23:57 2010 +0530
@@ -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
--- a/applicationmanagement/rom/appmgmt.iby Thu Aug 19 17:35:23 2010 +0530
+++ b/applicationmanagement/rom/appmgmt.iby Fri Sep 03 22:23:57 2010 +0530
@@ -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
--- a/applicationmanagement/server/server.pro Thu Aug 19 17:35:23 2010 +0530
+++ b/applicationmanagement/server/server.pro Fri Sep 03 22:23:57 2010 +0530
@@ -31,6 +31,9 @@
TrustedUI \
AllFiles \
NetworkControl
+
+RSS_RULES += "hidden = KAppIsHidden;"
+
LIBS += -lWrtDownloadMgr \
-lwrtserviceipcclient \
-leuser \
--- a/clientprovisioning/cpqtsp/cpqtsp.pro Thu Aug 19 17:35:23 2010 +0530
+++ b/clientprovisioning/cpqtsp/cpqtsp.pro Fri Sep 03 22:23:57 2010 +0530
@@ -31,6 +31,9 @@
}
CONFIG += hb service
+
+RSS_RULES += "hidden = KAppIsHidden;"
+
INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
include(Cpqtsp.pri)
LIBS+=-lxqservice -lxqserviceutil -lflogger
Binary file deviceupdatesui/deviceupdates/conf/101F6DE5.txt has changed
Binary file deviceupdatesui/deviceupdates/conf/deviceupdates.confml has changed
Binary file deviceupdatesui/deviceupdates/conf/deviceupdates_101F6DE5.crml has changed
--- a/deviceupdatesui/deviceupdates/deviceupdates.pro Thu Aug 19 17:35:23 2010 +0530
+++ b/deviceupdatesui/deviceupdates/deviceupdates.pro Fri Sep 03 22:23:57 2010 +0530
@@ -20,8 +20,8 @@
:BLD_INF_RULES.prj_exports += "$${LITERAL_HASH}include <platform_paths.hrh>"
: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
--- a/deviceupdatesui/deviceupdates/inc/dmfotaview.h Thu Aug 19 17:35:23 2010 +0530
+++ b/deviceupdatesui/deviceupdates/inc/dmfotaview.h Fri Sep 03 22:23:57 2010 +0530
@@ -39,7 +39,7 @@
#include "dminforetrieval.h"
#include "deviceupdatemoniterobserver.h"
//_LIT( KSmlEOL, "\n" );
-
+const TUid KControlPanelAppUid ={0x20025fd9};
class HbDialog;
class HbPushButton;
--- a/deviceupdatesui/deviceupdates/inc/nsmldmsyncprivatecrkeys.h Thu Aug 19 17:35:23 2010 +0530
+++ b/deviceupdatesui/deviceupdates/inc/nsmldmsyncprivatecrkeys.h Fri Sep 03 22:23:57 2010 +0530
@@ -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
--- a/deviceupdatesui/deviceupdates/src/dmfotaview.cpp Thu Aug 19 17:35:23 2010 +0530
+++ b/deviceupdatesui/deviceupdates/src/dmfotaview.cpp Fri Sep 03 22:23:57 2010 +0530
@@ -22,8 +22,11 @@
#include <sysutil.h>
#include <hbscrollarea.h>
#include <etel.h>
+#include <eikenv.h>
#include <featmgr.h>
#include <etelmm.h>
+#include <apgtask.h>
+#include <coemain.h>
#include <hbnotificationdialog.h>
#include <centralrepository.h>
#include <sysversioninfo.h>
@@ -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 <<");
}
// -----------------------------------------------------------------------------
--- a/deviceupdatesui/deviceupdatesplugin/inc/deviceupdatesdata.h Thu Aug 19 17:35:23 2010 +0530
+++ b/deviceupdatesui/deviceupdatesplugin/inc/deviceupdatesdata.h Fri Sep 03 22:23:57 2010 +0530
@@ -26,8 +26,6 @@
const TUid KUidSmlSyncApp = { 0x101F6DE5 };
-const TUint32 KNsmlDmUILaunch = 0x00000009;
-
class DeviceUpdateData : public CpSettingFormEntryItemData
{
--- a/deviceupdatesui/deviceupdatesqtsp/deviceupdatesqtsp.pro Thu Aug 19 17:35:23 2010 +0530
+++ b/deviceupdatesui/deviceupdatesqtsp/deviceupdatesqtsp.pro Fri Sep 03 22:23:57 2010 +0530
@@ -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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/package_definition.xml Fri Sep 03 22:23:57 2010 +0530
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
+ <package id="devicecontrol" name="Device Control Daemons" levels="support mid app">
+ <collection id="devicemgmtdialogsplugin" name="Device Management Dialogs Plugin" level="support">
+ <!-- need to put component at the proper directory level -->
+ <component id="devicemanagementnotifiersplugin" name="Device Management Notifiers Plugin" filter="s60" introduced="^4" class="plugin">
+ <unit bldFile="devicemgmtdialogsplugin" qt:proFile="devicemgmtdialogsplugin.pro"/>
+ </component>
+ </collection>
+ <collection id="devicemgmtindicatorsplugin" name="Device Management Indicators Plugin" level="support">
+ <!-- collectino is really a component. Need to move down a dir -->
+ <component id="devicemgmtindicatorsplugin_build" name="Device Management Indicators Plugin Build" filter="s60" introduced="^4" class="plugin">
+ <unit bldFile="devicemgmtindicatorsplugin" qt:proFile="devicemgmtindicatorsplugin.pro"/>
+ </component>
+ </collection>
+ <collection id="deviceupdatesui" name="Device Updates UI" level="app">
+ <component id="deviceupdates" name="Device Updates" filter="s60" introduced="^4">
+ <unit bldFile="deviceupdatesui/deviceupdates" qt:proFile="deviceupdates.pro"/>
+ </component>
+ <component id="deviceupdatesplugin" name="Device Updates Plugin" filter="s60" introduced="^4" class="plugin">
+ <unit bldFile="deviceupdatesui/deviceupdatesplugin" qt:proFile="deviceupdatesplugin.pro"/>
+ </component>
+ <component id="deviceupdatesqtsp" name="Device Updates Qt Service Provider" filter="s60" introduced="^4">
+ <unit bldFile="deviceupdatesui/deviceupdatesqtsp" qt:proFile="deviceupdatesqtsp.pro"/>
+ </component>
+ </collection>
+ <collection id="clientprovisioning" name="Client Provisioning" level="mid">
+ <component id="cpqtsp" name="Client Provisioning Qt Service Provider" filter="s60" introduced="^4">
+ <unit bldFile="clientprovisioning/cpqtsp" qt:proFile="cpqtsp.pro"/>
+ </component>
+ </collection>
+ <collection id="applicationmanagement" name="Applicaton Management" level="mid">
+ <component id="applicationmgmtserver" name="Applicaton Management Server" filter="s60" introduced="^4">
+ <unit bldFile="applicationmanagement/server" qt:proFile="server.pro"/>
+ </component>
+ <component id="applicationmgmt_build" name="Applicaton Management Build" filter="s60" introduced="^4">
+ <!-- need to break up into components or move down a directory -->
+ <unit bldFile="applicationmanagement/group"/>
+ </component>
+ </collection>
+ <collection id="omadmadapters" name="OMA DM Adapters" level="support">
+ <component id="omadmadapters_build" name="OMA DM Adapters Build" filter="s60">
+ <!-- need to split IBY into the components or make this a ROM component -->
+ <unit bldFile="omadmadapters/bld"/>
+ </component>
+ <component id="devinfo" name="Device Info" filter="s60">
+ <unit bldFile="omadmadapters/devinfo/bld"/>
+ </component>
+ <component id="devdetail" name="Device Detail" filter="s60">
+ <unit bldFile="omadmadapters/devdetail/bld"/>
+ </component>
+ <component id="syncmldm" name="SyncML DM" filter="s60">
+ <unit bldFile="omadmadapters/syncmldm/bld"/>
+ </component>
+ <component id="syncmldm12" name="SyncML DM 1.2" filter="s60">
+ <unit bldFile="omadmadapters/syncmldm12/bld"/>
+ </component>
+ <component id="omadm_browseradapter" name="Browser Adapter" filter="s60" class="plugin">
+ <!-- <unit bldFile="omadmadapters/browseradapter/bld"/> -->
+ </component>
+ <component id="omadm_streamingadapter" name="Streaming Adapter" filter="s60" class="plugin">
+ <unit bldFile="omadmadapters/streamingadapter/bld"/>
+ </component>
+ <component id="globalwlansettings" name="Global WLAN Settings" filter="s60">
+ <unit bldFile="omadmadapters/globalwlansettings/group"/>
+ </component>
+ <component id="nsmldminternet" name="nsmldminternet" filter="s60">
+ <unit bldFile="omadmadapters/nsmldminternet/group"/>
+ </component>
+ <component id="nsmldmalwaysonadapter" name="Always Online Device Management Adapter" filter="s60" introduced="9.1" class="plugin">
+ <unit bldFile="omadmadapters/nsmldmalwaysonadapter/group"/>
+ </component>
+ <component id="nsmldmbmadapter" name="NSML DM BM Adapter" filter="s60" class="plugin">
+ <unit bldFile="omadmadapters/nsmldmbmadapter/group"/>
+ </component>
+ <component id="connmoadapter" name="Connection Management Object Adapter" filter="s60" class="plugin">
+ <unit bldFile="omadmadapters/connmoadapter/group"/>
+ </component>
+ <component id="syncmlds" name="SyncML Data Sync" filter="s60">
+ <meta rel="config">
+ <defined condition="__SYNCML_DM_DS"/>
+ </meta>
+ <unit bldFile="omadmadapters/syncmlds/bld"/>
+ </component>
+ <component id="omadm_email" name="OMA DM Email" filter="s60">
+ <meta rel="config">
+ <defined condition="__SYNCML_DM_EMAIL"/>
+ </meta>
+ <unit bldFile="omadmadapters/email/bld"/>
+ </component>
+ <component id="omadm_mms" name="OMA DM MMS" filter="s60">
+ <meta rel="config">
+ <defined condition="__SYNCML_DM_MMS"/>
+ </meta>
+ <unit bldFile="omadmadapters/mms/bld"/>
+ </component>
+ <component id="omadm_fota" name="OMA DM FOTA" filter="s60">
+ <meta rel="config">
+ <defined condition="__SYNCML_DM_FOTA"/>
+ </meta>
+ <unit bldFile="omadmadapters/fota/bld"/>
+ </component>
+ <component id="omadm_imps" name="OMA DM IMPS" filter="s60">
+ <meta rel="config">
+ <defined condition="__SYNCML_DM_IMPS"/>
+ </meta>
+ <!-- <unit bldFile="omadmadapters/imps/bld"/> -->
+ </component>
+ <component id="dcmodmadapter" name="DC Management Object DM Adapter" filter="s60" class="plugin">
+ <unit bldFile="omadmadapters/dcmodmadapter/group"/>
+ </component>
+ </collection>
+ <collection id="omadcmoadapters" name="OMA DC Management Object Adapters" level="support">
+ <component id="omadcmoadapters_build" name="OMA DCMA Adapters Build" filter="s60" introduced="^4">
+ <!-- need to break up into components -->
+ <unit bldFile="omadcmoadapters/group"/>
+ </component>
+ </collection>
+ <collection id="omacpadapters" name="OMA Client Provisioning Adapters" level="support">
+ <component id="omacpadapters_build" name="OMA CP Adapters Build" filter="s60" introduced="^4">
+ <!-- need to break up into components -->
+ <unit bldFile="omacpadapters/bld"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
+
+
+
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/package_map.xml Fri Sep 03 22:23:57 2010 +0530
@@ -0,0 +1,1 @@
+<PackageMap root="sf" layer="app"/>