--- a/coreapplicationuis/SysAp/Src/SysApPubSubObserver.cpp Wed Aug 18 09:58:19 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/SysApPubSubObserver.cpp Thu Sep 02 20:36:53 2010 +0300
@@ -52,7 +52,7 @@
const TUint KCoreAppUIsMmcRemovedWithoutEjectCmdMask = 0xFFFF;
const TUint KCoreAppUIsMmcRemovedWithoutEjectValShift = 16;
-_LIT(KGpsIndicatorPlugin, "PositioningIndicator");
+_LIT(KGpsIndicatorPlugin, "com.nokia.positioning.indicatorplugin/1.0");
const TUid KPSUidSecurityUIs = { 0x100059b5 };
const TUint32 KSecurityUIsLights = 0x00000308;
@@ -410,16 +410,16 @@
TUint cmd( aValue & KCoreAppUIsMmcRemovedWithoutEjectCmdMask );
if ( cmd == ECoreAppUIsEjectCommandUsed )
{
- // iSysApAppUi.EjectStarted( ETrue );
+ iSysApAppUi.EjectStarted( ETrue );
}
else if ( cmd == ECoreAppUIsEjectCommandNotUsed )
{
- // iSysApAppUi.EjectStarted( EFalse );
+ iSysApAppUi.EjectStarted( EFalse );
}
else if ( cmd == ECoreAppUIsEjectCommandUsedToDrive )
{
TInt drive( aValue >> KCoreAppUIsMmcRemovedWithoutEjectValShift );
- // iSysApAppUi.EjectUsed( drive );
+ iSysApAppUi.EjectUsed( drive );
}
break;
}
@@ -520,6 +520,26 @@
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