FCL/sf/app/homescreen: comparison idlehomescreen/nativeuicontroller/src/nativeuicontroller.cpp

equal deleted inserted replaced

-:c743ef5928ba
+:f966699dea19
 *
 */
 // System includes
 #include <bautils.h>
-#include <e32std.h>
 #include <e32property.h>
-#include <coemain.h>
-#include <avkon.rsg>
 #include <ecom/ecom.h>
 #include <ecom/implementationproxy.h>
-#include <data_caging_path_literals.hrh>
 #include <centralrepository.h>
 #include <activeidle2domainpskeys.h>
 #include <aipspropertyobserver.h>
 #include <eikstart.h>
-#include <AknLayout2ScalableDef.h>
 #include <avkondomainpskeys.h>
 #include <AknDlgShut.h>
 // User includes
+#include <aifwstatehandler.h>
+#include <hscontentpublisher.h>
+#include <hspublisherinfo.h>
 #include "nativeuicontroller.h"
 #include "ainativeui.hrh"
 #include "application.h"
 #include "appui.h"
 #include "aiutility.h"
 #include "aistrparser.h"
 #include "aidevicestatuscontentmodel.h"
-#include "aipropertyextension.h"
 #include "aistatuspanel.h"
 #include "ainativerenderer.h"
 #include "aititlepanerenderer.h"
 #include "ainavipanerenderer.h"
 #include "aidialogrenderer.h"
 #include "aisoftkeyrenderer.h"
 #include "ainotifierrenderer.h"
-#include "aitoolbarrenderer.h"
 #include "ainativeuiplugins.h"
 #include "activeidle2domaincrkeys.h"
 #include "aistatuspanetouchui.h"
 #include "ainativeuistrings.h" // string literals
 #include "aistrcnv.h"
-#include <aiscutplugindomaincrkeys.h>
 using namespace AiNativeUiController;
 // Constants
 _LIT( KResourceDrive, "Z:" );
 const TImplementationProxy KImplementationTable[] =
 {
 IMPLEMENTATION_PROXY_ENTRY(KImplementationUidNativeUiController, CNativeUiController::NewL)
 };
+// ======== LOCAL FUNCTIONS ========
+// ----------------------------------------------------------------------------
+// IsDeviceStatus()
+//
+// ----------------------------------------------------------------------------
+//
+TBool IsDeviceStatus( const THsPublisherInfo& aInfo )
+{
+return ( aInfo.Name() == KDeviceStatusPluginName &&
+aInfo.Uid() == KDeviceStatusPluginUid );
+}
+// ======== MEMBER FUNCTIONS ========
 // ----------------------------------------------------------------------------
 // CNativeUiController::NewL()
+//
 // ----------------------------------------------------------------------------
 //
 CNativeUiController* CNativeUiController::NewL()
 {
 CNativeUiController* self = new (ELeave) CNativeUiController;
 return self;
 }
 // ----------------------------------------------------------------------------
 // CNativeUiController::Exit()
+//
 // ----------------------------------------------------------------------------
 //
 void CNativeUiController::Exit()
 {
 if ( iExitTimer )
 iExitTimer->Cancel();
 iExitTimer->Start( 0, KOneSecondInMicroS,
 TCallBack( ExitTimerCallBack, this ) );
 }
 }
 // ----------------------------------------------------------------------------
 // CNativeUiController::ExitTimerCallBack()
+//
 // ----------------------------------------------------------------------------
 //
 TInt CNativeUiController::ExitTimerCallBack( TAny *aSelf )
 {
 CNativeUiController* self =
 return KErrNone;
 }
 // ----------------------------------------------------------------------------
 // CNativeUiController::~CNativeUiController()
+//
 // ----------------------------------------------------------------------------
 //
 CNativeUiController::~CNativeUiController()
 {
-iPlugins.Close();
+iPlugins.Reset();
 delete iExitTimer;
 PrepareToExit();
 // Reset TLS pointer to this set in NewL
 Dll::SetTls( NULL );
 }
 // ----------------------------------------------------------------------------
 // CNativeUiController::PrepareToExit()
+//
 // ----------------------------------------------------------------------------
 //
 void CNativeUiController::PrepareToExit()
 {
 iRenderers.ResetAndDestroy();
 }
 }
 // ----------------------------------------------------------------------------
 // CNativeUiController::CNativeUiController()
+//
 // ----------------------------------------------------------------------------
 //
 CNativeUiController::CNativeUiController()
 : iResourceOffset( KErrNotFound )
 {
 }
 // ----------------------------------------------------------------------------
+// CNativeUiController::SetAppUi()
+//
+// ----------------------------------------------------------------------------
+//
+void CNativeUiController::SetAppUi( CAppUi* aAppUi )
+{
+iAppUi = aAppUi;
+}
+// ----------------------------------------------------------------------------
 // CNativeUiController::AddRendererL()
+//
 // ----------------------------------------------------------------------------
 //
 void CNativeUiController::AddRendererL( CAiNativeRenderer* aRenderer )
 {
 User::LeaveIfError( iRenderers.Append( aRenderer ) );
 }
 // ----------------------------------------------------------------------------
 // CNativeUiController::RemoveRenderer()
+//
 // ----------------------------------------------------------------------------
 //
 TBool CNativeUiController::RemoveRenderer( CAiNativeRenderer *aRenderer,
 TBool aDelete )
 {
 return EFalse;
 }
 // ----------------------------------------------------------------------------
-// CNativeUiController::ExitTimerCallBack()
-// ----------------------------------------------------------------------------
-//
-void CNativeUiController::DeleteToolbarRenderer()
-{
-if ( iToolbarRenderer )
-{
-RemoveRenderer( iToolbarRenderer );
-delete iToolbarRenderer;
-iToolbarRenderer = NULL;
-}
-}
-// ----------------------------------------------------------------------------
-// CNativeUiController::RecreateToolbarRendererL()
-// ----------------------------------------------------------------------------
-//
-TBool CNativeUiController::RecreateToolbarRendererL()
-{
-TBool created( EFalse );
-// Remove the old renderer...
-DeleteToolbarRenderer();
-CAknToolbar* toolbar( iAvkonAppUi->CurrentFixedToolbar() );
-// ...and create the new if there is an existing toolbar that
-// we can use
-if ( toolbar )
-{
-iToolbarRenderer = CAiToolbarRenderer::NewL( *iFwEventHandler, *toolbar);
-AddRendererL( iToolbarRenderer );
-created = ETrue;
-}
-return created;
-}
-// ----------------------------------------------------------------------------
 // CNativeUiController::DoPublish()
+//
 // ----------------------------------------------------------------------------
 //
 template<class T>
-TInt CNativeUiController::DoPublish( MAiPropertyExtension& aPlugin,
+TInt CNativeUiController::DoPublish( CHsContentPublisher& aPlugin,
 TInt aContent, T& aData, TInt aIndex )
 {
-const TAiPublisherInfo* info( NULL );
+const THsPublisherInfo& info( aPlugin.PublisherInfo() );
-TRAP_IGNORE( info = aPlugin.PublisherInfoL() );
+if ( !IsDeviceStatus( info ) && info.Namespace() != KNativeUiNamespace )
-if ( !info || info->iNamespace != KNativeUiNamespace )
 {
 return KErrNotSupported;
 }
 const TInt count( iRenderers.Count() );
 return err;
 }
 // ----------------------------------------------------------------------------
 // CNativeUiController::HandleIdleStateEvent()
+//
 // ----------------------------------------------------------------------------
 //
 TInt CNativeUiController::HandleIdleStateEvent( TAny* aPtr )
 {
 CNativeUiController* self =
 return KErrNone;
 }
 // ----------------------------------------------------------------------------
 // CNativeUiController::HandleKeylockStateEvent()
+//
 // ----------------------------------------------------------------------------
 //
 TInt CNativeUiController::HandleKeylockStateEvent( TAny* aPtr )
 {
 CNativeUiController* self =
 return KErrNone;
 	}
 // ----------------------------------------------------------------------------
 // CNativeUiController::HandlePluginConfChange()
+//
 // ----------------------------------------------------------------------------
 //
 TInt CNativeUiController::HandlePluginConfChange( TAny* aPtr )
 	{
 	CNativeUiController* self =
 return KErrNone;
 	}
 // ----------------------------------------------------------------------------
 // CNativeUiController::LoadUIDefinitionL()
+//
 // ----------------------------------------------------------------------------
 //
 void CNativeUiController::LoadUIDefinitionL()
 {
 if ( iUiLoaded )
 {
 iRenderers[i]->LoadUIDefinitionL();
 }
 return;
 }
 if ( !iExitTimer )
 {
 iExitTimer = CPeriodic::NewL( CActive::EPriorityStandard );
 }
 {
 AddRendererL( CAiSoftKeyRenderer::NewLC() );
 CleanupStack::Pop();//CAiSoftKeyRenderer
 // Toolbar shown only when we are not the main ui controller
-DeleteToolbarRenderer();
+//DeleteToolbarRenderer();
-	    TRAP_IGNORE(
+THsPublisherInfo deviceStatus( KDeviceStatusPluginUid,
-	        iAppUi->StartL(); )
+KDeviceStatusPluginName, KNativeUiNamespace );
+iPlugins.Append( deviceStatus );
+iFwStateHandler->LoadPlugin( deviceStatus, EAiFwSystemStartup );
+THsPublisherInfo profile( KProfilePluginUid,
+KProfilePluginName, KNativeUiNamespace );
+iPlugins.Append( profile );
+iFwStateHandler->LoadPlugin( profile, EAiFwSystemStartup );
+	    TRAP_IGNORE( iAppUi->StartL() );
 }
 // We need to load the resource file here if we are not main controller.
 // If we are the main controller the loading is done in appui
 // Also the toolbar renderer is loaded here.
 if( iCoeEnv && iResourceOffset == KErrNotFound )
 {
 iResourceOffset = iCoeEnv->AddResourceFileL( resourceFile );
 }
 // Create the toolbar renderer
-RecreateToolbarRendererL();
+//RecreateToolbarRendererL();
 }
 // 4) Add an observer that informs us about the focus transition changes
 if( !iIdleStatusObserver )
 {
 iUiLoaded = ETrue;
 }
 // ----------------------------------------------------------------------------
-// CNativeUiController::GetPluginsL()
-// ----------------------------------------------------------------------------
-//
-void CNativeUiController::GetPluginsL( RAiPublisherInfoArray& aPlugins )
-{
-iPlugins.Reset();
-if( iRunningAsMain )
-{
-TAiPublisherInfo shortcutPublisherInfo;
-shortcutPublisherInfo.iUid = KShortcutPluginUid;
-shortcutPublisherInfo.iName.Copy( KShortcutPluginName );
-shortcutPublisherInfo.iNamespace.Copy( KNativeUiNamespace );
-User::LeaveIfError( iPlugins.Append( shortcutPublisherInfo ) );
-TAiPublisherInfo deviceStatusPublisherInfo;
-deviceStatusPublisherInfo.iUid = KDeviceStatusPluginUid;
-deviceStatusPublisherInfo.iName.Copy( KDeviceStatusPluginName );
-deviceStatusPublisherInfo.iNamespace.Copy( KNativeUiNamespace );
-User::LeaveIfError( iPlugins.Append( deviceStatusPublisherInfo ) );
-TAiPublisherInfo profilePublisherInfo;
-profilePublisherInfo.iUid = KProfilePluginUid;
-profilePublisherInfo.iName.Copy( KProfilePluginName );
-profilePublisherInfo.iNamespace.Copy( KNativeUiNamespace );
-User::LeaveIfError( iPlugins.Append( profilePublisherInfo ) );
-// Copy iPlugins to aPlugins
-aPlugins.ReserveL( aPlugins.Count() + iPlugins.Count() );
-for( TInt i = 0; i < iPlugins.Count(); ++i )
-{
-aPlugins.Append( iPlugins[i] );
-}
-}
-}
-// ----------------------------------------------------------------------------
 // CNativeUiController::GetSettingsL()
-// ----------------------------------------------------------------------------
+//
-//
+// ----------------------------------------------------------------------------
-void CNativeUiController::GetSettingsL( const TAiPublisherInfo& aPubInfo,
+//
+void CNativeUiController::GetSettingsL( const THsPublisherInfo& aPublisherInfo,
 RAiSettingsItemArray& aSettings )
 {
-if ( aPubInfo.iNamespace != KNativeUiNamespace )
+if ( aPublisherInfo.Namespace() != KNativeUiNamespace )
 {
 return;
 }
-if( iRunningAsMain && aPubInfo.iUid == KShortcutPluginUid )
+if( iRunningAsMain && aPublisherInfo.Uid() == KShortcutPluginUid )
 {
 RProperty::Set( KPSUidAiInformation, KActiveIdleExtHS_PluginConfChange, 0 );
 MAiPluginSettings* settings = AiUtility::CreatePluginSettingsL();
 CleanupDeletePushL( settings );
 MAiPluginSettingsItem& item = settings->AiPluginSettingsItem();
-item.SetPublisherId( aPubInfo.iUid );
+item.SetPublisherId( aPublisherInfo.Uid() );
 HBufC* appBuf;
 appBuf = HBufC::NewLC( RProperty::KMaxPropertySize );
 TPtr appPtr = appBuf->Des();
 RProperty::Get( KPSUidAiInformation, KActiveIdleExtHS_LSKLocked, appPtr );
 settings = AiUtility::CreatePluginSettingsL();
 CleanupDeletePushL( settings );
 MAiPluginSettingsItem& item2 = settings->AiPluginSettingsItem();
-item2.SetPublisherId( aPubInfo.iUid );
+item2.SetPublisherId( aPublisherInfo.Uid() );
 HBufC* app2Buf;
 app2Buf = HBufC::NewLC( RProperty::KMaxPropertySize );
 TPtr app2Ptr = app2Buf->Des();
 RProperty::Get( KPSUidAiInformation, KActiveIdleExtHS_RSKLocked, app2Ptr );
 CleanupStack::PopAndDestroy( app2Buf );
 app2Buf = NULL;
 // In case there are settings in the cenrep the settings
 // here are overwritten by them
-GetSettingsFromCRL( aPubInfo, aSettings );
+GetSettingsFromCRL( aPublisherInfo, aSettings );
 CleanupStack::Pop( settings );
 }
 }
 // ----------------------------------------------------------------------------
 // CNativeUiController::GetSettingsFromCRL()
-// ----------------------------------------------------------------------------
+//
-//
+// ----------------------------------------------------------------------------
-void CNativeUiController::GetSettingsFromCRL( const TAiPublisherInfo& aPubInfo,
+//
-RAiSettingsItemArray &aPluginSettings )
+void CNativeUiController::GetSettingsFromCRL(
-{
+const THsPublisherInfo& aPublisherInfo,
-if ( aPubInfo.iNamespace != KNativeUiNamespace )
+RAiSettingsItemArray &aPluginSettings )
+{
+if ( aPublisherInfo.Namespace() != KNativeUiNamespace )
 {
 return;
 }
 /*
 KSettingsIdSeparator().Length() +
 KSettings().Length());
 }
 // does the setting belong to this plugin
-if ( err == KErrNone && pluginIdPtr == aPubInfo.iName )
+if ( err == KErrNone && pluginIdPtr == aPublisherInfo.Name() )
 {
 // Get the settings id
 err = settingsRepository->Get(crKey++, settingKeyPtr);
 if ( err == KErrNone )
 {
 {
 MAiPluginSettings *setting = aPluginSettings[j];
 MAiPluginSettingsItem& item = setting->AiPluginSettingsItem();
 // Existing setting found => replace it
-if ( item.Key() == settingId && item.PublisherId() == aPubInfo.iUid )
+if ( item.Key() == settingId && item.PublisherId() == aPublisherInfo.Uid() )
 {
 item.SetValueL( settingValuePtr, EFalse );
 settingFound = ETrue;
 break;
 }
 }
 // Existing setting not found => append new one ONLY if we
 // are dealing with the icon overrides
+/* NOTE ai_shortcut_command_api has been removed!
 if ( !settingFound && ( settingId & KScutFlagBitIconOverride ) )
 {
 MAiPluginSettings* settings = AiUtility::CreatePluginSettingsL();
 CleanupDeletePushL( settings );
 MAiPluginSettingsItem& item = settings->AiPluginSettingsItem();
-item.SetPublisherId( aPubInfo.iUid );
+item.SetPublisherId( aPublisherInfo.Uid() );
 item.SetKey( settingId );
 item.SetValueL( settingValuePtr, EFalse );
 aPluginSettings.Append( settings );
 CleanupStack::Pop( settings );
 }
+*/
 }
 }
 }
 // name of the plugin not found => no more settings
 else if (err != KErrNone )
 CleanupStack::PopAndDestroy(pluginId);
 }
 // ----------------------------------------------------------------------------
 // CNativeUiController::ActivateUI()
+//
 // ----------------------------------------------------------------------------
 //
 void CNativeUiController::ActivateUI()
 {
 if( iAppUi )
 }
 }
 // ----------------------------------------------------------------------------
 // CNativeUiController::GetContentObserver()
+//
 // ----------------------------------------------------------------------------
 //
 MAiContentObserver& CNativeUiController::GetContentObserver()
 {
 return *this;
 }
 // ----------------------------------------------------------------------------
 // CNativeUiController::SetEventHandler()
+//
 // ----------------------------------------------------------------------------
 //
 void CNativeUiController::SetEventHandler( MAiFwEventHandler& aEventHandler )
 {
 iFwEventHandler = &aEventHandler;
 }
 // ----------------------------------------------------------------------------
+// CNativeUiController::SetStateHandler()
+//
+// ----------------------------------------------------------------------------
+//
+void CNativeUiController::SetStateHandler( MAiFwStateHandler& aStateHandler )
+{
+iFwStateHandler = &aStateHandler;
+}
+// ----------------------------------------------------------------------------
 // CNativeUiController::FwEventHandler()
+//
 // ----------------------------------------------------------------------------
 //
 MAiFwEventHandler* CNativeUiController::FwEventHandler()
 {
 return iFwEventHandler;
 }
 // ----------------------------------------------------------------------------
-// CNativeUiController::RemovePluginFromUI()
-// ----------------------------------------------------------------------------
-//
-void CNativeUiController::RemovePluginFromUI(
-MAiPropertyExtension& /*aPlugin*/ )
-{
-}
-// ----------------------------------------------------------------------------
 // CNativeUiController::MainInterface()
+//
 // ----------------------------------------------------------------------------
 //
 MAiMainUiController* CNativeUiController::MainInterface()
 {
 return this;
 }
 // ----------------------------------------------------------------------------
 // CNativeUiController::SecondaryInterface()
+//
 // ----------------------------------------------------------------------------
 //
 MAiSecondaryUiController* CNativeUiController::SecondaryInterface()
 {
 return this;
 }
 // ----------------------------------------------------------------------------
 // CNativeUiController::RunApplicationL()
+//
 // ----------------------------------------------------------------------------
 //
 void CNativeUiController::RunApplicationL()
 {
 VariateToMainUiController();
 EikStart::RunApplication( &CNativeUiController::NewApplication ) );
 }
 // ----------------------------------------------------------------------------
 // CNativeUiController::CoeEnv()
+//
 // ----------------------------------------------------------------------------
 //
 CCoeEnv& CNativeUiController::CoeEnv()
 {
 return *CCoeEnv::Static();
 }
 // ----------------------------------------------------------------------------
-// CNativeUiController::SetUiFrameworkObserver()
-// ----------------------------------------------------------------------------
-//
-void CNativeUiController::SetUiFrameworkObserver(
-MAiUiFrameworkObserver& aObserver )
-{
-iUiFrameworkObserver = &aObserver;
-}
-// ----------------------------------------------------------------------------
 // CNativeUiController::IsMenuOpen()
+//
 // ----------------------------------------------------------------------------
 //
 TBool CNativeUiController::IsMenuOpen()
 {
-return CoeEnv().AppUi()->IsDisplayingMenuOrDialog();
+return iAppUi->IsDisplayingMenuOrDialog();
 }
 // ----------------------------------------------------------------------------
 // CNativeUiController::SetCoeEnv()
+//
 // ----------------------------------------------------------------------------
 //
 void CNativeUiController::SetCoeEnv( CCoeEnv& aCoeEnv )
 {
 iCoeEnv = &aCoeEnv;
 }
 // ----------------------------------------------------------------------------
-// CNativeUiController::UiFrameworkObserver()
-// ----------------------------------------------------------------------------
-//
-MAiUiFrameworkObserver* CNativeUiController::UiFrameworkObserver()
-{
-return iUiFrameworkObserver;
-}
-// ----------------------------------------------------------------------------
-// CNativeUiController::HandleResourceChange()
-// ----------------------------------------------------------------------------
-//
-void CNativeUiController::HandleResourceChange( TInt /*aType*/ )
-{
-}
-// ----------------------------------------------------------------------------
-// CNativeUiController::HandleForegroundEvent()
-// ----------------------------------------------------------------------------
-//
-void CNativeUiController::HandleForegroundEvent( TBool /*aForeground*/ )
-{
-}
-// ----------------------------------------------------------------------------
 // CNativeUiController::StartTransaction()
+//
 // ----------------------------------------------------------------------------
 //
 TInt CNativeUiController::StartTransaction( TInt /*aTxId*/ )
 {
 return KErrNone;
 }
 // ----------------------------------------------------------------------------
 // CNativeUiController::Commit()
+//
 // ----------------------------------------------------------------------------
 //
 TInt CNativeUiController::Commit( TInt /*aTxId*/ )
 {
 TInt result( KErrNone );
 return result;
 }
 // ----------------------------------------------------------------------------
 // CNativeUiController::CancelTransaction()
+//
 // ----------------------------------------------------------------------------
 //
 TInt CNativeUiController::CancelTransaction( TInt /*aTxId*/ )
 {
 return KErrNone;
 }
 // ----------------------------------------------------------------------------
 // CNativeUiController::CanPublish()
-// ----------------------------------------------------------------------------
+//
-//
+// ----------------------------------------------------------------------------
-TBool CNativeUiController::CanPublish( MAiPropertyExtension& aPlugin,
+//
+TBool CNativeUiController::CanPublish( CHsContentPublisher& aPlugin,
 TInt /*aContent*/, TInt /*aIndex*/ )
 {
-const TAiPublisherInfo* info( NULL );
+const THsPublisherInfo& info( aPlugin.PublisherInfo() );
-TRAP_IGNORE( info = aPlugin.PublisherInfoL() );
+if ( IsDeviceStatus( info ) )
+{
-if ( !info || info->iNamespace != KNativeUiNamespace )
+return ETrue;
+}
+if ( info.Namespace() != KNativeUiNamespace )
 {
 return EFalse;
 }
 for( TInt i = 0; i < iPlugins.Count(); i++ )
 {
-if ( iPlugins[i] == *info )
+if ( iPlugins[i] == info )
 {
 return ETrue;
 }
 }
 return EFalse;
 }
 // ----------------------------------------------------------------------------
 // CNativeUiController::Publish()
-// ----------------------------------------------------------------------------
+//
-//
+// ----------------------------------------------------------------------------
-TInt CNativeUiController::Publish( MAiPropertyExtension& aPlugin,
+//
+TInt CNativeUiController::Publish( CHsContentPublisher& aPlugin,
 TInt aContent, TInt aResource, TInt aIndex )
 {
 TInt err = DoPublish( aPlugin, aContent, aResource, aIndex );
 return err;
 }
 // ----------------------------------------------------------------------------
 // CNativeUiController::Publish()
-// ----------------------------------------------------------------------------
+//
-//
+// ----------------------------------------------------------------------------
-TInt CNativeUiController::Publish( MAiPropertyExtension& aPlugin,
+//
+TInt CNativeUiController::Publish( CHsContentPublisher& aPlugin,
 TInt aContent, const TDesC16& aText, TInt aIndex )
 {
 TInt err = DoPublish( aPlugin, aContent, aText, aIndex );
 return err;
 }
 // ----------------------------------------------------------------------------
 // CNativeUiController::Publish()
-// ----------------------------------------------------------------------------
+//
-//
+// ----------------------------------------------------------------------------
-TInt CNativeUiController::Publish( MAiPropertyExtension& aPlugin,
+//
+TInt CNativeUiController::Publish( CHsContentPublisher& aPlugin,
 TInt aContent, const TDesC8& aBuf, TInt aIndex )
 {
 TInt err = DoPublish( aPlugin, aContent, aBuf, aIndex );
 return err;
 }
 // ----------------------------------------------------------------------------
 // CNativeUiController::Publish()
-// ----------------------------------------------------------------------------
+//
-//
+// ----------------------------------------------------------------------------
-TInt CNativeUiController::Publish( MAiPropertyExtension& aPlugin,
+//
+TInt CNativeUiController::Publish( CHsContentPublisher& aPlugin,
 TInt aContent, RFile& aFile, TInt aIndex )
 {
 TInt err = DoPublish( aPlugin, aContent, aFile, aIndex );
 return err;
 }
 // ----------------------------------------------------------------------------
 // CNativeUiController::Clean()
-// ----------------------------------------------------------------------------
+//
-//
+// ----------------------------------------------------------------------------
-TInt CNativeUiController::Clean( MAiPropertyExtension& aPlugin,
+//
+TInt CNativeUiController::Clean( CHsContentPublisher& aPlugin,
 TInt aContent, TInt /*aIndex*/ )
 {
 const TInt count( iRenderers.Count() );
 for( TInt i( 0 ); i < count; i++ )
 return KErrNone;
 }
 // ----------------------------------------------------------------------------
 // CNativeUiController::Extension()
+//
 // ----------------------------------------------------------------------------
 //
 TAny* CNativeUiController::Extension( TUid /*aUid*/ )
 {
 return NULL;
 }
 // ----------------------------------------------------------------------------
 // CNativeUiController::RequiresSubscription()
+//
 // ----------------------------------------------------------------------------
 //
 TBool CNativeUiController::RequiresSubscription(
-const TAiPublisherInfo& aPublisherInfo ) const
+const THsPublisherInfo& aPublisherInfo ) const
 {
-if ( aPublisherInfo.iNamespace == KNativeUiNamespace )
+if ( IsDeviceStatus( aPublisherInfo ) ||
+aPublisherInfo.Namespace() == KNativeUiNamespace )
 {
 // Targeted to this content renderer
 return ETrue;
 }
 // ----------------------------------------------------------------------------
 // CNativeUiController::SetProperty()
 // ----------------------------------------------------------------------------
 //
-TInt CNativeUiController::SetProperty( MAiPropertyExtension& /*aPlugin*/,
+TInt CNativeUiController::SetProperty( CHsContentPublisher& /*aPlugin*/,
 const TDesC8& /*aElementId*/,
 const TDesC8& /*aPropertyName*/,
 const TDesC8& /*aPropertyValue*/ )
 {
 return KErrNotSupported;
 }
 // ----------------------------------------------------------------------------
 // CNativeUiController::SetProperty()
 // ----------------------------------------------------------------------------
 //
-TInt CNativeUiController::SetProperty(MAiPropertyExtension& /*aPlugin*/,
+TInt CNativeUiController::SetProperty(CHsContentPublisher& /*aPlugin*/,
 const TDesC8& /*aElementId*/,
 const TDesC8& /*aPropertyName*/,
 const TDesC8& /*aPropertyValue*/,
 MAiContentObserver::TValueType /*aValueType*/)
 {
 return KErrNotSupported;
 }
 // ----------------------------------------------------------------------------
 // CNativeUiController::NewApplication()
+//
 // ----------------------------------------------------------------------------
 //
 CApaApplication* CNativeUiController::NewApplication()
 {
 CNativeUiController* self =
 return CApplication::New( self );
 }
 // ----------------------------------------------------------------------------
 // CNativeUiController::VariateToMainUiController()
+//
 // ----------------------------------------------------------------------------
 //
 void CNativeUiController::VariateToMainUiController()
 {
 iRunningAsMain = ETrue;

branch	RCL_3
changeset 9	f966699dea19
parent 4	4d54b72983ae
child 15	ff572dfe6d86