--- a/gsprofilesrv_plat/settings_framework_api/inc/GSMainView.h Fri Mar 12 15:43:47 2010 +0200
+++ b/gsprofilesrv_plat/settings_framework_api/inc/GSMainView.h Mon Mar 15 12:41:46 2010 +0200
@@ -91,6 +91,26 @@
* are changed.
*/
void UpdateView();
+
+ /**
+ * represent the position of ListBox
+ */
+ struct TListBoxPosition
+ {
+ /**
+ * The three items are all set to -1 as an initial value because their legal
+ * value should be no less than 0.
+ */
+ inline void Reset()
+ {
+ iCurrentItemIndex = -1;
+ iItemOffsetInPixels = -1;
+ iTopItemIndex = -1;
+ }
+ TInt iCurrentItemIndex;
+ TInt iItemOffsetInPixels;
+ TInt iTopItemIndex;
+ };
public: // From CAknView
@@ -183,12 +203,13 @@
TUid iSelectedPluginUid;
//keep the exact position of the listbox including current item index,
- //iVerticalOffset and TopItemindex
- RArray<TInt> iPosition;
+ //ItemOffsetInPixels and TopItemindex
+ TListBoxPosition iPosition;
//record the screen mode, portrait/landscape
- TBool iScreenMode;
+ TBool iIsLandscapeOrientation;
};
+
#endif // GSMAINVIEW_H
// End of File
--- a/gsprofilesrv_plat/settings_framework_api/inc/GSParentContainer.h Fri Mar 12 15:43:47 2010 +0200
+++ b/gsprofilesrv_plat/settings_framework_api/inc/GSParentContainer.h Mon Mar 15 12:41:46 2010 +0200
@@ -113,17 +113,18 @@
void SetListBoxEmptyTextL(const TDes& aEmpty );
/**
- * @return the exact position of the listbox containing current item index,
- * iVerticalOffset and TopItemindex
- */
- void GetPositionL(RArray<TInt>& aPosition);
+ * Store listbox's exact position.
+ * @param aPosition includes the exact position of the listbox.
+ */
+ void StoreListBoxPositionL( CGSParentPlugin::TListBoxPosition& aPosition );
/**
- * set listbox's exact position.
- */
- void SetPosition(const RArray<TInt>& aPosition, TBool aChangeMode);
+ * Restore listbox's exact position.
+ * @param aPosition includes the exact position of the listbox.
+ * @param aScreenModeChanged indicates whether the screen mode is changed.
+ */
+ void RestoreListBoxPositionL( const CGSParentPlugin::TListBoxPosition& aPosition, TBool aScreenModeChanged );
-
public: // From CCoeControl
/**
--- a/gsprofilesrv_plat/settings_framework_api/inc/GSParentPlugin.h Fri Mar 12 15:43:47 2010 +0200
+++ b/gsprofilesrv_plat/settings_framework_api/inc/GSParentPlugin.h Mon Mar 15 12:41:46 2010 +0200
@@ -229,6 +229,26 @@
* @since S60 v3.1
*/
void SetMiddleSoftKeyLabelTextL( const TPtr aMskLabel, const TInt aCommandId );
+
+ /**
+ * represent the position of ListBox
+ */
+ struct TListBoxPosition
+ {
+ /**
+ * The three items are all set to -1 as an initial value because their legal
+ * value should be no less than 0.
+ */
+ inline void Reset()
+ {
+ iCurrentItemIndex = -1;
+ iItemOffsetInPixels = -1;
+ iTopItemIndex = -1;
+ }
+ TInt iCurrentItemIndex;
+ TInt iItemOffsetInPixels;
+ TInt iTopItemIndex;
+ };
public: // From MGSChildViewManager
@@ -330,11 +350,11 @@
TUid iTopPluginUid;
//keep the exact position of the listbox including current item index,
- //iVerticalOffset and TopItemindex
- RArray<TInt> iPosition;
+ //ItemOffsetInPixels and TopItemindex
+ TListBoxPosition iPosition;
//record the screen mode, portrait/landscape
- TBool iScreenMode;
+ TBool iIsLandscapeOrientation;
};
--- a/gssettingsuis/Gs/GSApplication/Inc/GSMainContainer.h Fri Mar 12 15:43:47 2010 +0200
+++ b/gssettingsuis/Gs/GSApplication/Inc/GSMainContainer.h Mon Mar 15 12:41:46 2010 +0200
@@ -22,7 +22,7 @@
#include <bldvariant.hrh>
#include <AknIconArray.h>
#include <AknsUtils.h> // For loading icons
-
+#include <gsmainview.h>
// CLASS DECLARATION
class CAknViewAppUi;
class CAknSingleLargeStyleListBox;
@@ -81,15 +81,17 @@
void SetListBoxEmptyTextL(const TDes& aEmpty);
/**
- * @return the exact position of the listbox containing current item index,
- * iVerticalOffset and TopItemindex
+ * Store listbox's exact position.
+ * @param aPosition includes the exact position of the listbox.
*/
- void GetPositionL(RArray<TInt>& aPosition);
+ void StoreListBoxPositionL( CGSMainView::TListBoxPosition& aPosition );
/**
- * set listbox's exact position.
+ * Restore listbox's exact position.
+ * @param aPosition includes the exact position of the listbox.
+ * @param aScreenModeChanged indicates whether the screen mode is changed.
*/
- void SetPosition(const RArray<TInt>& aPosition, TBool aChangeMode);
+ void RestoreListBoxPositionL( const CGSMainView::TListBoxPosition& aPosition, TBool aScreenModeChanged );
public: // From CCoeControl
--- a/gssettingsuis/Gs/GSApplication/Src/GSMainContainer.cpp Fri Mar 12 15:43:47 2010 +0200
+++ b/gssettingsuis/Gs/GSApplication/Src/GSMainContainer.cpp Mon Mar 15 12:41:46 2010 +0200
@@ -486,41 +486,40 @@
}
// -----------------------------------------------------------------------------
-// CGSParentContainer::GetPositionL()
+// CGSMainContainer::StoreListBoxPositionL
//
-//Get the exact position of listbox.
+//Store the exact position of listbox.
// -----------------------------------------------------------------------------
//
-void CGSMainContainer::GetPositionL(RArray<TInt>& aPosition)
+void CGSMainContainer::StoreListBoxPositionL( CGSMainView::TListBoxPosition& aPosition )
{
- aPosition.AppendL(iListBox->CurrentItemIndex());
- aPosition.AppendL(iListBox->View()->ItemOffsetInPixels());
- aPosition.AppendL(iListBox->View()->TopItemIndex());
- return;
+ aPosition.iCurrentItemIndex = iListBox->CurrentItemIndex();
+ aPosition.iItemOffsetInPixels = iListBox->View()->ItemOffsetInPixels();
+ aPosition.iTopItemIndex = iListBox->View()->TopItemIndex();
}
// -----------------------------------------------------------------------------
-// CGSParentContainer::GetPositionL()
+// CGSMainContainer::RestoreListBoxPositionL
//
-//Get the exact position of listbox.
+//Restore the exact position of listbox.
// -----------------------------------------------------------------------------
//
-void CGSMainContainer::SetPosition(const RArray<TInt>& aPosition, TBool aChangeMode)
+void CGSMainContainer::RestoreListBoxPositionL( const CGSMainView::TListBoxPosition& aPosition, TBool aScreenModeChanged )
{
- if ( aPosition.operator[](0) >= 0 )
+ if ( aPosition.iCurrentItemIndex >= 0 )
{
- iListBox->SetCurrentItemIndex( aPosition.operator[](0) );
+ iListBox->SetCurrentItemIndex( aPosition.iCurrentItemIndex );
}
- if (aChangeMode)
+ if ( aScreenModeChanged )
{
- iListBox->View()->VerticalMoveToItemL( aPosition.operator[](0 ),
- CListBoxView::ESingleSelection);
+ iListBox->View()->VerticalMoveToItemL( aPosition.iCurrentItemIndex,
+ CListBoxView::ESingleSelection );
}
else
{
- iListBox->View()->SetItemOffsetInPixels( aPosition.operator[](1) );
- iListBox->View()->SetTopItemIndex( aPosition.operator[](2) );
+ iListBox->View()->SetItemOffsetInPixels( aPosition.iItemOffsetInPixels );
+ iListBox->View()->SetTopItemIndex( aPosition.iTopItemIndex );
}
}
// End of File
--- a/gssettingsuis/Gs/GSApplication/Src/GSMainView.cpp Fri Mar 12 15:43:47 2010 +0200
+++ b/gssettingsuis/Gs/GSApplication/Src/GSMainView.cpp Mon Mar 15 12:41:46 2010 +0200
@@ -99,6 +99,7 @@
iPluginLoader->SetObserver( this );
iPluginLoader->LoadAsyncL( KGSPluginInterfaceUid, KGSMainViewUid,
iPluginArray );
+ iPosition.Reset();
}
@@ -132,10 +133,6 @@
iAppUi->RemoveFromViewStack( *this, iContainer );
delete iContainer;
}
- if (iPosition.Count() > 0)
- {
- iPosition.Close();
- }
}
@@ -207,15 +204,15 @@
// Do this to update listbox from already existing iPluginArray.
iContainer->UpdateListBoxL();
- if (iPosition.Count() > 0)
+ if ( iPosition.iCurrentItemIndex != -1 )
{
- if (iScreenMode == Layout_Meta_Data::IsLandscapeOrientation())
+ if ( iIsLandscapeOrientation == Layout_Meta_Data::IsLandscapeOrientation() )
{
- iContainer->SetPosition(iPosition, EFalse);
+ iContainer->RestoreListBoxPositionL( iPosition, EFalse );
}
else
{
- iContainer->SetPosition(iPosition, ETrue);
+ iContainer->RestoreListBoxPositionL( iPosition, ETrue );
}
}
iAppUi->AddToViewStackL( *this, iContainer );
@@ -243,12 +240,10 @@
if ( iContainer )
{
- if (iPosition.Count() > 0)
- {
- iPosition.Reset();
- }
- TRAPD(err, iContainer->GetPositionL(iPosition));
- iScreenMode = Layout_Meta_Data::IsLandscapeOrientation();
+
+ iPosition.Reset();
+ TRAPD( err, iContainer->StoreListBoxPositionL( iPosition ) );
+ iIsLandscapeOrientation = Layout_Meta_Data::IsLandscapeOrientation();
iAppUi->RemoveFromViewStack(*this, iContainer);
delete iContainer;
iContainer = NULL;
--- a/gssettingsuis/Gs/GSCallBarringPlugin/Src/GSCallBarringPlugin.cpp Fri Mar 12 15:43:47 2010 +0200
+++ b/gssettingsuis/Gs/GSCallBarringPlugin/Src/GSCallBarringPlugin.cpp Mon Mar 15 12:41:46 2010 +0200
@@ -36,7 +36,7 @@
#include <PsetContainer.h> //for CPsetContainer
#include <PsuiContainer.h> //for CPsuiContainer
#include <eikmenup.h> //for menu bar
-#include <SecUiCodeQueryDialog.h>
+#include <secuicodequerydialog.h>
#include <nwdefs.h>
#include <aknViewAppUi.h>
--- a/gssettingsuis/Gs/GSCallBarringPlugin/Src/GSCellularCallBarringView.cpp Fri Mar 12 15:43:47 2010 +0200
+++ b/gssettingsuis/Gs/GSCallBarringPlugin/Src/GSCellularCallBarringView.cpp Mon Mar 15 12:41:46 2010 +0200
@@ -35,7 +35,7 @@
#include <PsetContainer.h> //for CPsetContainer
#include <PsuiContainer.h> //for CPsuiContainer
#include <eikmenup.h> //for menu bar
-#include <SecUiCodeQueryDialog.h>
+#include <secuicodequerydialog.h>
#include <nwdefs.h>
#include <aknViewAppUi.h>
#include <gsfwviewuids.h>
--- a/gssettingsuis/Gs/GSCallPlugin/src/GSCallPlugin.cpp Fri Mar 12 15:43:47 2010 +0200
+++ b/gssettingsuis/Gs/GSCallPlugin/src/GSCallPlugin.cpp Mon Mar 15 12:41:46 2010 +0200
@@ -42,9 +42,9 @@
#include <PsetContainer.h> //for container
#include <PsuiContainer.h> //for CPsuiContainer
#include <featmgr.h>
-#include <SecUiSecurityHandler.h> //for PIN2 query
-#include <SecUi.h> //for TSecUi
-#include <SecUiSecuritySettings.h> //for CSecuritySettings
+#include <secuisecurityhandler.h> //for PIN2 query
+#include <secui.h> //for TSecUi
+#include <secuisecuritysettings.h> //for CSecuritySettings
#include <GSCallPluginRsc.rsg> //for resource IDs
#include <gscallplugin.mbg>
#include <gsfwviewuids.h>
--- a/gssettingsuis/Gs/GSDisplayPlugin/Data/GsDisplayPluginRsc.rss Fri Mar 12 15:43:47 2010 +0200
+++ b/gssettingsuis/Gs/GSDisplayPlugin/Data/GsDisplayPluginRsc.rss Mon Mar 15 12:41:46 2010 +0200
@@ -393,9 +393,9 @@
RESOURCE SLIDER r_setting_screen_saver_slider
{
layout = EAknSettingsItemSliderLayout;
- minvalue = 5;
- maxvalue = 90;
- step = 5;
+ minvalue = 1;
+ maxvalue = 30;
+ step = 1;
valuetype = EAknSliderValueBareFigure;
minlabel = qtn_sanim_time_out_slider_min_value;
maxlabel = qtn_sanim_time_out_slider_max_value;
--- a/gssettingsuis/Gs/GSDisplayPlugin/Inc/GSDisplayPluginModel.h Fri Mar 12 15:43:47 2010 +0200
+++ b/gssettingsuis/Gs/GSDisplayPlugin/Inc/GSDisplayPluginModel.h Mon Mar 15 12:41:46 2010 +0200
@@ -161,14 +161,14 @@
* if the keys are not pressed.
* @return Minutes between 1 and 30.
*/
- TInt ScreenSaverPeriodL();
+ TInt ScreenSaverAndKeyguardPeriodL();
/**
* Sets the period of time after which the screen saver starts
* if the keys are not pressed.
* @param aPeriod Screen saver period (minutes between 1 and 30).
*/
- void SetScreenSaverPeriodL( const TInt aPeriod );
+ void SetScreenSaverAndKeyguardPeriodL( const TInt aPeriod );
/**
* Returns the period of time after which the backlight fades out
@@ -336,6 +336,7 @@
CRepository* iStartupConfRepository;
CRepository* iScreensaverRepository;
CRepository* iLightRepository;
+ CRepository* iSecurityRepository;
CRepository* iGSVariationRepository;
CRepository* iAvkonRepository;
// Used for OperatorLogo
--- a/gssettingsuis/Gs/GSDisplayPlugin/Src/GSDisplayPlugin.cpp Fri Mar 12 15:43:47 2010 +0200
+++ b/gssettingsuis/Gs/GSDisplayPlugin/Src/GSDisplayPlugin.cpp Mon Mar 15 12:41:46 2010 +0200
@@ -565,7 +565,7 @@
//
void CGSDisplayPlugin::ShowScreenSaverPeriodSettingPageL()
{
- TInt sliderValue = iModel->ScreenSaverPeriodL();
+ TInt sliderValue = iModel->ScreenSaverAndKeyguardPeriodL();
CAknSettingPage* dlg = new( ELeave ) CAknSliderSettingPage(
R_SCREEN_SAVER_PERIOD_SETTING_PAGE, sliderValue );
@@ -580,7 +580,7 @@
else
{
#endif //FF_POWER_SAVE
- iModel->SetScreenSaverPeriodL( sliderValue );
+ iModel->SetScreenSaverAndKeyguardPeriodL( sliderValue );
#ifdef FF_POWER_SAVE
}
#endif //FF_POWER_SAVE
--- a/gssettingsuis/Gs/GSDisplayPlugin/Src/GSDisplayPluginContainer.cpp Fri Mar 12 15:43:47 2010 +0200
+++ b/gssettingsuis/Gs/GSDisplayPlugin/Src/GSDisplayPluginContainer.cpp Mon Mar 15 12:41:46 2010 +0200
@@ -392,7 +392,7 @@
//
void CGSDisplayPluginContainer::MakeSSPItemL()
{
- TInt timeOut = iModel->ScreenSaverPeriodL();
+ TInt timeOut = iModel->ScreenSaverAndKeyguardPeriodL();
HBufC* dynamicText = CAknSlider::CreateValueTextInHBufCL( timeOut,
R_SETTING_SCREEN_SAVER_SLIDER );
--- a/gssettingsuis/Gs/GSDisplayPlugin/Src/GSDisplayPluginModel.cpp Fri Mar 12 15:43:47 2010 +0200
+++ b/gssettingsuis/Gs/GSDisplayPlugin/Src/GSDisplayPluginModel.cpp Mon Mar 15 12:41:46 2010 +0200
@@ -149,6 +149,7 @@
iPersonalizationRepository =
CRepository::NewL( KCRUidPersonalizationSettings );
iLightRepository = CRepository::NewL( KCRUidLightSettings );
+ iSecurityRepository = CRepository::NewL( KCRUidSecuritySettings );
iGSVariationRepository = CRepository::NewL( KCRUidSettingsVariation );
iAvkonRepository = CRepository::NewL( KCRUidAvkon );
@@ -213,6 +214,8 @@
delete iAvkonRepository;
iAvkonRepository = NULL;
}
+ delete iSecurityRepository;
+ iSecurityRepository = NULL;
}
@@ -363,30 +366,32 @@
// ----------------------------------------------------------------------------
-// CGSDisplayPluginModel::ScreenSaverPeriodL
+// CGSDisplayPluginModel::ScreenSaverAndKeyguardPeriodL
//
// Reads screen saver period from shared data and returns it.
// ----------------------------------------------------------------------------
//
-TInt CGSDisplayPluginModel::ScreenSaverPeriodL()
+TInt CGSDisplayPluginModel::ScreenSaverAndKeyguardPeriodL()
{
TInt period = KGSSettingOff;
- User::LeaveIfError( iPersonalizationRepository->
- Get( KSettingsScreenSaverPeriod, period ) );
+ User::LeaveIfError( iSecurityRepository->
+ Get( KSettingsAutomaticKeyguardTime, period ) );
- return period;
+ // period is stored in seconds, but the user setting is in minutes
+ return period / 60;
}
// ----------------------------------------------------------------------------
-// CGSDisplayPluginModel::SetScreenSaverPeriodL
+// CGSDisplayPluginModel::SetScreenSaverAndKeyguardPeriodL
//
// Writes screen saver text to shared data.
// ----------------------------------------------------------------------------
//
-void CGSDisplayPluginModel::SetScreenSaverPeriodL( const TInt aPeriod )
+void CGSDisplayPluginModel::SetScreenSaverAndKeyguardPeriodL( const TInt aPeriod )
{
- User::LeaveIfError( iPersonalizationRepository->
- Set( KSettingsScreenSaverPeriod, aPeriod ) );
+ // value is in minutes but keyguard uses seconds
+ User::LeaveIfError( iSecurityRepository->
+ Set( KSettingsAutomaticKeyguardTime, aPeriod * 60 ) );
}
--- a/gssettingsuis/Gs/GSDisplayPlugin/Src/PSMDisplayPlugin.cpp Fri Mar 12 15:43:47 2010 +0200
+++ b/gssettingsuis/Gs/GSDisplayPlugin/Src/PSMDisplayPlugin.cpp Mon Mar 15 12:41:46 2010 +0200
@@ -148,7 +148,7 @@
TPsmsrvConfigInfo info5;
info5.iConfigId = EScreenSaverPeriod;
info5.iConfigType = EConfigTypeInt;
- info5.iIntValue = iModel->ScreenSaverPeriodL();
+ info5.iIntValue = iModel->ScreenSaverAndKeyguardPeriodL();
infoArray.Append( info5 );
#ifndef __WINS__
@@ -195,7 +195,7 @@
if ( iModel->CheckScreenSaverTimeoutSupportL() )
{
- iModel->SetScreenSaverPeriodL( infoArray[4].iIntValue );
+ iModel->SetScreenSaverAndKeyguardPeriodL( infoArray[4].iIntValue );
}
iModel->SetBacklightPeriodL( infoArray[1].iIntValue );
--- a/gssettingsuis/Gs/GSDisplayPlugin/loc/GsDisplPlugin.loc Fri Mar 12 15:43:47 2010 +0200
+++ b/gssettingsuis/Gs/GSDisplayPlugin/loc/GsDisplPlugin.loc Mon Mar 15 12:41:46 2010 +0200
@@ -64,7 +64,7 @@
//w:
//r:3.1
//
-#define qtn_sanim_time_out "Screen saver time-out"
+#define qtn_sanim_time_out "Screen and keyguard time-out"
//d:Text of a list item in Display setting list view's list
@@ -127,7 +127,7 @@
//w:
//r:3.2
//
-#define qtn_sanim_time_out_slider_cur_value "%U seconds"
+#define qtn_sanim_time_out_slider_cur_value "%U minutes"
//d:Text in slider control
@@ -137,7 +137,7 @@
//w:
//r:3.2
//
-#define qtn_sanim_time_out_slider_min_value "5 secs."
+#define qtn_sanim_time_out_slider_min_value "1 min."
//d:Text in slider control
//d:Screen saver time-out setting page
@@ -146,7 +146,7 @@
//w:
//r:3.2
//
-#define qtn_sanim_time_out_slider_max_value "90 secs."
+#define qtn_sanim_time_out_slider_max_value "30 min."
// ************************************
--- a/gssettingsuis/Gs/GSFramework/src/GSParentContainer.cpp Fri Mar 12 15:43:47 2010 +0200
+++ b/gssettingsuis/Gs/GSFramework/src/GSParentContainer.cpp Mon Mar 15 12:41:46 2010 +0200
@@ -834,42 +834,40 @@
}
// -----------------------------------------------------------------------------
-// CGSParentContainer::GetPositionL()
+// CGSParentContainer::StoreListBoxPositionL
//
-//Get the exact position of listbox.
+//Store the exact position of listbox.
// -----------------------------------------------------------------------------
//
-void CGSParentContainer::GetPositionL(RArray<TInt>& aPosition)
+void CGSParentContainer::StoreListBoxPositionL( CGSParentPlugin::TListBoxPosition& aPosition )
{
- aPosition.AppendL(iListBox->CurrentItemIndex());
- aPosition.AppendL(iListBox->View()->ItemOffsetInPixels());
- aPosition.AppendL(iListBox->View()->TopItemIndex());
- return;
+ aPosition.iCurrentItemIndex = iListBox->CurrentItemIndex();
+ aPosition.iItemOffsetInPixels = iListBox->View()->ItemOffsetInPixels();
+ aPosition.iTopItemIndex = iListBox->View()->TopItemIndex();
}
// -----------------------------------------------------------------------------
-// CGSParentContainer::GetPositionL()
+// CGSParentContainer::RestoreListBoxPositionL
//
-//Get the exact position of listbox.
+//Restore the exact position of listbox.
// -----------------------------------------------------------------------------
//
-void CGSParentContainer::SetPosition(const RArray<TInt>& aPosition, TBool aChangeMode)
+void CGSParentContainer::RestoreListBoxPositionL( const CGSParentPlugin::TListBoxPosition& aPosition, TBool aScreenModeChanged )
{
- if ( aPosition.operator[](0) >= 0 )
+ if ( aPosition.iCurrentItemIndex >= 0 )
{
- iListBox->SetCurrentItemIndex( aPosition.operator[](0) );
+ iListBox->SetCurrentItemIndex( aPosition.iCurrentItemIndex );
}
- //iListBox->View()->SetItemOffsetInPixels( aPosition.operator[](1) );
- if (aChangeMode)
+ if ( aScreenModeChanged )
{
- iListBox->View()->VerticalMoveToItemL( aPosition.operator[](0),
+ iListBox->View()->VerticalMoveToItemL( aPosition.iCurrentItemIndex,
CListBoxView::ESingleSelection );
}
else
{
- iListBox->View()->SetItemOffsetInPixels( aPosition.operator[](1) );
- iListBox->View()->SetTopItemIndex( aPosition.operator[](2) );
+ iListBox->View()->SetItemOffsetInPixels( aPosition.iItemOffsetInPixels );
+ iListBox->View()->SetTopItemIndex( aPosition.iTopItemIndex );
}
}
//End of File
--- a/gssettingsuis/Gs/GSFramework/src/GSParentPlugin.cpp Fri Mar 12 15:43:47 2010 +0200
+++ b/gssettingsuis/Gs/GSFramework/src/GSParentPlugin.cpp Mon Mar 15 12:41:46 2010 +0200
@@ -73,7 +73,7 @@
__GSLOGSTRING( "[CGSParentPlugin] ConstructL()" );
iAppUi = AppUi();
-
+ iPosition.Reset();
OpenLocalizedResourceFileL( KGSParentPluginResourceFileName,
iResourceLoader );
CAknView::BaseConstructL( aViewRscId );
@@ -139,10 +139,6 @@
iAppUi->RemoveFromViewStack( *this, iContainer );
delete iContainer;
}
- if ( iPosition.Count() > 0)
- {
- iPosition.Close();
- }
}
@@ -218,15 +214,15 @@
// Update listbox from already existing iPluginArray:
iContainer->UpdateListBoxL();
- if (iPosition.Count() > 0)
+ if ( iPosition.iCurrentItemIndex != -1 )
{
- if (iScreenMode == Layout_Meta_Data::IsLandscapeOrientation())
+ if ( iIsLandscapeOrientation == Layout_Meta_Data::IsLandscapeOrientation() )
{
- iContainer->SetPosition(iPosition, EFalse);
+ iContainer->RestoreListBoxPositionL( iPosition, EFalse );
}
else
{
- iContainer->SetPosition(iPosition, ETrue);
+ iContainer->RestoreListBoxPositionL( iPosition, ETrue );
}
}
iAppUi->AddToViewStackL(*this, iContainer);
@@ -272,12 +268,9 @@
if ( iContainer )
{
- if (iPosition.Count() > 0)
- {
- iPosition.Reset();
- }
- TRAPD(err, iContainer->GetPositionL(iPosition));
- iScreenMode = Layout_Meta_Data::IsLandscapeOrientation();
+ iPosition.Reset();
+ TRAPD( err, iContainer->StoreListBoxPositionL( iPosition ) );
+ iIsLandscapeOrientation = Layout_Meta_Data::IsLandscapeOrientation();
iAppUi->RemoveFromViewStack(*this, iContainer);
delete iContainer;
--- a/gssettingsuis/Gs/GSNetworkPlugin/GSNetworkPlugin.mmp Fri Mar 12 15:43:47 2010 +0200
+++ b/gssettingsuis/Gs/GSNetworkPlugin/GSNetworkPlugin.mmp Mon Mar 15 12:41:46 2010 +0200
@@ -98,5 +98,6 @@
#ifdef FF_POWER_SAVE
LIBRARY psmclient.lib
#endif // FF_POWER_SAVE
+LIBRARY customapi.lib
// End of File
--- a/gssettingsuis/Gs/GSNetworkPlugin/Inc/GSNetworkPluginModel.h Fri Mar 12 15:43:47 2010 +0200
+++ b/gssettingsuis/Gs/GSNetworkPlugin/Inc/GSNetworkPluginModel.h Mon Mar 15 12:41:46 2010 +0200
@@ -162,6 +162,11 @@
void StartAsynGetCurrentNetworkModeSelectionL();
/**
+ * StartSynGetCurrentNetworkModeSelectionL
+ */
+ void StartSynGetCurrentNetworkModeSelectionL();
+
+ /**
* GetNetworkSelectionMode
*/
MPsetNetworkSelect::TSelectMode GetNetworkSelectionMode();
--- a/gssettingsuis/Gs/GSNetworkPlugin/Src/GSNetworkPlugin.cpp Fri Mar 12 15:43:47 2010 +0200
+++ b/gssettingsuis/Gs/GSNetworkPlugin/Src/GSNetworkPlugin.cpp Mon Mar 15 12:41:46 2010 +0200
@@ -458,6 +458,8 @@
}
else // user selected "Cancel"
{
+ //Reset back to previously used network
+ iPhoneSettingsEngine->ResetNetworkSearch();
//After list has been used, clear it.
PurgeNetworkList();
if ( iPhoneSettingsEngine->IsCallActive() !=
@@ -862,19 +864,27 @@
{
//not required for network mode UI item.
//other items require calling this method.
- if ( aPage != EGSNetworkModeItemId )
- {
- CreateNetworkSsCallL( currentFeature, aPage );
- }
- else if ( prevSelection != currentIndex )
- {
- // Show the confirmation query. Uses TGSNetworkModeItems.
- Container()->SetCurrentNetworkModeSelectionL( currentFeature );
- }
- }
- CleanupStack::PopAndDestroy( itemArray );
- }
- //We'll update listbox for Network Mode when we're sure that phone is not
+ if (aPage != EGSNetworkModeItemId)
+ {
+ CreateNetworkSsCallL(currentFeature, aPage);
+ }
+ else if (prevSelection != currentIndex)
+ {
+ if ( iPsmActive->Mode() == EPsmsrvModePowerSave )
+ {
+ // If PSM is on, block setting:
+ DisplayBlockNoteL();
+ }
+ else
+ {
+ // Show the confirmation query. Uses TGSNetworkModeItems.
+ Container()->SetCurrentNetworkModeSelectionL(currentFeature);
+ }
+ }
+ }
+ CleanupStack::PopAndDestroy(itemArray);
+ }
+ //We'll update listbox for Network Mode when we're sure that phone is not
//in Offline mode
if ( aPage != EGSNetworkModeItemId )
{
--- a/gssettingsuis/Gs/GSNetworkPlugin/Src/GSNetworkPluginModel.cpp Fri Mar 12 15:43:47 2010 +0200
+++ b/gssettingsuis/Gs/GSNetworkPlugin/Src/GSNetworkPluginModel.cpp Mon Mar 15 12:41:46 2010 +0200
@@ -40,7 +40,7 @@
#include <PsetSAObserver.h> //ongoing call check
#include "GSNetworkDebugHelper.h"
#include <GsNetworkPluginRsc.rsg> //for resource IDs
-
+#include <mmtsy_names.h>
//CONSTANTS
// default value for autolock period
// default value for Sat operations
@@ -390,8 +390,17 @@
iPhoneSettingsEngine = iSettingsContainer->CreateNetworkModeObjectL( *this );
}
iPhoneSettingsEngine->SetNetworkModeObserver( *this );
- // get the current net mode asynchronously
- StartAsynGetCurrentNetworkModeSelectionL();
+ //CPSMNetworkPlugin will init iPlugin NULL.
+ if ( iPlugin == NULL )
+ {
+ // get the current net mode synchronously
+ StartSynGetCurrentNetworkModeSelectionL();
+ }
+ else
+ {
+ // get the current net mode asynchronously
+ StartAsynGetCurrentNetworkModeSelectionL();
+ }
__GSLOGSTRING("[GS] <--CGSNetworkPluginModel::CreatePhoneSettingsEngineL");
}
@@ -546,6 +555,79 @@
}
// ---------------------------------------------------------------------------
+// CGSNetworkPluginModel::StartSynGetCurrentNetworkModeSelectionL
+//
+// ---------------------------------------------------------------------------
+//
+void CGSNetworkPluginModel::StartSynGetCurrentNetworkModeSelectionL()
+ {
+ // Connects to Etel and loads Tsy module
+ RMobilePhone phone;
+ RTelServer server;
+ // Custom phone.
+ RMmCustomAPI customPhone;
+
+ TInt err = KErrNone;
+ for ( TInt a = 0; a < KPSetRetryCount; a++ )
+ {
+ err = server.Connect();
+
+ if ( err == KErrNone )
+ {
+ break;
+ }
+
+ User::After( KPSetRetryTimeout );
+ }
+
+ if ( err != KErrNone )
+ {
+ User::Leave( err );
+ }
+ else
+ {
+ server.LoadPhoneModule( KMmTsyModuleName );
+ }
+ User::LeaveIfError( server.SetExtendedErrorGranularity( RTelServer::EErrorExtended ) );
+
+ TInt numPhones;
+
+ User::LeaveIfError( server.EnumeratePhones( numPhones ) );
+ if ( !numPhones )
+ {
+ User::Leave( KErrGeneral );
+ }
+
+ //match phone name to correct one
+ RTelServer::TPhoneInfo phoneInfo;
+ TName matchTsyName;
+ TInt i = 0;
+ for (; i < numPhones; i++)
+ {
+ User::LeaveIfError(server.GetTsyName(i, matchTsyName));
+ if (matchTsyName.CompareF(KMmTsyModuleName) == 0)
+ {
+ User::LeaveIfError(server.GetPhoneInfo(i, phoneInfo));
+ break;
+ }
+ }
+ if (i == numPhones)
+ {
+ User::Leave(KErrGeneral);
+ }
+
+ //open phone subsession
+ User::LeaveIfError( phone.Open( server, phoneInfo.iName ) );
+ User::LeaveIfError( customPhone.Open( phone ) );
+ TUint32 currentNetworkModes;
+ customPhone.GetCurrentSystemNetworkModes( currentNetworkModes );
+ iNetworkMode = (TInt)currentNetworkModes;
+ customPhone.Close();
+ phone.Close();
+ server.Close();
+ }
+
+// ---------------------------------------------------------------------------
// CGSNetworkPluginModel::GetNetworkMode
//
// ---------------------------------------------------------------------------
@@ -662,6 +744,4 @@
return callActive;
}
-
-
// End of File
--- a/gssettingsuis/Gs/GSPDataConnectionPlugin/src/GSPDataConnectionPlugin.cpp Fri Mar 12 15:43:47 2010 +0200
+++ b/gssettingsuis/Gs/GSPDataConnectionPlugin/src/GSPDataConnectionPlugin.cpp Mon Mar 15 12:41:46 2010 +0200
@@ -261,12 +261,27 @@
R_GS_PDATACONNECTION_SETTING_PAGE_LBX );
CleanupStack::PushL( items );
- CAknRadioButtonSettingPage* dlg =
- new (ELeave) CAknRadioButtonSettingPage
- ( R_GS_PDATACONNECTION_SETTING_PAGE,
- aPDataConnectionState,
- items );
- dlg->ExecuteLD( CAknSettingPage::EUpdateWhenChanged );
+ if( items->Count() != 2 )
+ {
+ CAknRadioButtonSettingPage* dlg =
+ new (ELeave) CAknRadioButtonSettingPage
+ ( R_GS_PDATACONNECTION_SETTING_PAGE,
+ aPDataConnectionState,
+ items );
+ dlg->ExecuteLD( CAknSettingPage::EUpdateWhenChanged );
+ }
+ else
+ {
+ if (aPDataConnectionState == 0)
+ {
+ aPDataConnectionState = 1;
+ }
+ else
+ {
+ aPDataConnectionState = 0;
+ }
+ }
+
CleanupStack::PopAndDestroy( items );
// Check if aPDataConnectionState has been changed:
Binary file gssettingsuis/Gs/conf/s60settingsuis.confml has changed
--- a/gssettingsuis/Gs/group/bld.inf Fri Mar 12 15:43:47 2010 +0200
+++ b/gssettingsuis/Gs/group/bld.inf Mon Mar 15 12:41:46 2010 +0200
@@ -68,7 +68,7 @@
#include "../GSSynchronisationPlugin/bld.inf"
#include "../GSInstallationsPlugin/bld.inf"
#include "../GSAdminPlugin/bld.inf"
- #include "../GSAutoKeyguardPlugin/bld.inf"
+// #include "../GSAutoKeyguardPlugin/bld.inf"
#endif //RD_CONTROL_PANEL
#ifdef __HSXPA_SUPPORT
--- a/profilesservices/FileList/Src/CFLDBrowserLauncher.cpp Fri Mar 12 15:43:47 2010 +0200
+++ b/profilesservices/FileList/Src/CFLDBrowserLauncher.cpp Mon Mar 15 12:41:46 2010 +0200
@@ -24,13 +24,13 @@
#include "CFLDCommandAbsorbingControl.h"
// EXTERNAL INCLUDES
-#include <BrowserLauncher.h>
+#include <browserlauncher.h>
#include <DocumentHandler.h>
#include <eikenv.h>
#include <apmstd.h>
#include <AiwCommon.h>
-#include <BrowserOverriddenSettings.h>
-#include <FavouritesLimits.h> // Context Id:s
+#include <browseroverriddensettings.h>
+#include <favouriteslimits.h> // Context Id:s
// ============================ MEMBER FUNCTIONS ===============================
--- a/profilesservices/FileList/Src/CFLDPopupList.h Fri Mar 12 15:43:47 2010 +0200
+++ b/profilesservices/FileList/Src/CFLDPopupList.h Mon Mar 15 12:41:46 2010 +0200
@@ -136,11 +136,10 @@
/// FileList Model
CFLDFileListModel& iModel;
-#ifdef RD_VIDEO_AS_RINGING_TONE
+
/// Current softkeystate
MFLDFileListBoxObserver::TFileListSoftKeyState iSoftKeyState;
-#endif
TFileName iCurrentFileName;
--- a/profilesservices/MediaFileList/Src/mediafiledialogutils.cpp Fri Mar 12 15:43:47 2010 +0200
+++ b/profilesservices/MediaFileList/Src/mediafiledialogutils.cpp Mon Mar 15 12:41:46 2010 +0200
@@ -35,7 +35,7 @@
#include <AknsUtils.h> // AknsUtils
// for CWebBrowserLauncher
-#include <BrowserLauncher.h>
+#include <browserlauncher.h>
#include <DocumentHandler.h>
#include <AiwCommon.h>
--- a/profilesservices/ProfileEngine/EngInc/ProfileEnginePrivateCRKeys.h Fri Mar 12 15:43:47 2010 +0200
+++ b/profilesservices/ProfileEngine/EngInc/ProfileEnginePrivateCRKeys.h Mon Mar 15 12:41:46 2010 +0200
@@ -55,12 +55,7 @@
*/
const TUint32 KProEngSchedulerTaskId = 0x80000005;
-/**
- * If the current active profile is timed, this contains the Name of the previous
- * active profile. String.
- * Default value: Null
- */
-const TUint32 KProEngPreviousActiveName = 0x80000006;
+
//
// The rest of the constants are used with profile-specific settings. The
--- a/profilesservices/ProfileEngine/EngSrc/CProfileEngineImpl.cpp Fri Mar 12 15:43:47 2010 +0200
+++ b/profilesservices/ProfileEngine/EngSrc/CProfileEngineImpl.cpp Mon Mar 15 12:41:46 2010 +0200
@@ -745,9 +745,7 @@
TInt activeId( ( previousId != KErrNotFound )
? previousId
: User::LeaveIfError( ActiveProfileId() ) );
- iProfileTiming->SetTimedProfileL( activeId,
- *aTime,
- ActiveProfileL()->ProfileName().Name() );
+ iProfileTiming->SetTimedProfileL( activeId, *aTime );
}
TRAPD( error, UpdateActiveProfileSettingsL( *profile, ETrue ) );
--- a/profilesservices/ProfileEngine/EngSrc/CProfileTiming.cpp Fri Mar 12 15:43:47 2010 +0200
+++ b/profilesservices/ProfileEngine/EngSrc/CProfileTiming.cpp Mon Mar 15 12:41:46 2010 +0200
@@ -108,7 +108,7 @@
// (other items were commented in a header).
// -----------------------------------------------------------------------------
//
-void CProfileTiming::SetTimedProfileL( TInt aPreviousId, TTime aTime, const TDesC& aPreviousName )
+void CProfileTiming::SetTimedProfileL( TInt aPreviousId, TTime aTime )
{
PRODEBUG1( "CProfileTiming:SetTimedProfile( %d )", aPreviousId );
if( !iFeatures.IsFeatureSupported( KProEngFeatureIdTimedProfiles ) )
@@ -158,7 +158,7 @@
iTaskId = taskInfo.iTaskId;
PRODEBUG( "CProfileTiming:SetTimedProfile before SaveSchedulingData" );
SaveSchedulingData( aPreviousId, iSchedulerItemRef.iHandle,
- iTaskId, aPreviousName );
+ iTaskId );
PRODEBUG( "CProfileTiming:SetTimedProfile after SaveSchedulingData" );
}
}
@@ -256,13 +256,10 @@
// (other items were commented in a header).
// -----------------------------------------------------------------------------
//
-void CProfileTiming::SaveSchedulingData( TInt aPreviousId,
- TInt aHandleId,
- TInt aTaskId,
- const TDesC& aPreviousName )
+void CProfileTiming::SaveSchedulingData( TInt aPreviousId, TInt aHandleId,
+ TInt aTaskId )
{
iRepository.Set( KProEngSchedulerHandleId, aHandleId );
- iRepository.Set( KProEngPreviousActiveName, aPreviousName);
iRepository.Set( KProEngPreviousActiveId, aPreviousId );
iRepository.Set( KProEngSchedulerTaskId, aTaskId );
}
--- a/profilesservices/ProfileEngine/EngSrc/CProfileTiming.h Fri Mar 12 15:43:47 2010 +0200
+++ b/profilesservices/ProfileEngine/EngSrc/CProfileTiming.h Mon Mar 15 12:41:46 2010 +0200
@@ -62,11 +62,8 @@
* timer expires. This is the profile which was active before
* the current profile was timed.
* @param aTime the time when the timer expires.
- * @param aPreviousName the Name of the profile to be activated after the
- * timer expires. This is the profile which was active before
- * the current profile was timed.
*/
- void SetTimedProfileL( TInt aPreviousId, TTime aTime, const TDesC& aPreviousName = KNullDesC );
+ void SetTimedProfileL( TInt aPreviousId, TTime aTime );
/**
* Deletes the newly-scheduled task for timed profile. This is used
@@ -101,12 +98,10 @@
* when the timer goes off.
* @param aHandleId the scheduling handle ID of the timed profile task.
* @param aTaskId the task ID of the timed profile task.
- * @param aPreviousName the previous name of the timed profile task.
*/
void SaveSchedulingData( TInt aPreviousId = -1,
TInt aHandleId = -1,
- TInt aTaskId = -1,
- const TDesC& aPreviousName = KNullDesC );
+ TInt aTaskId = -1 );
/**
* Gets the information about current timed profile from Central
--- a/profilesservices/ProfileEngine/ProfileScheduleEventSrc/CProfileChangeEvent.cpp Fri Mar 12 15:43:47 2010 +0200
+++ b/profilesservices/ProfileEngine/ProfileScheduleEventSrc/CProfileChangeEvent.cpp Mon Mar 15 12:41:46 2010 +0200
@@ -28,7 +28,7 @@
#include <barsc.h>
#include <bautils.h>
-#include <SecondaryDisplay/SecondaryDisplayProfilesAPI.h>
+#include <secondarydisplay\SecondaryDisplayProfilesAPI.h>
#include <aknSDData.h>
#include <featmgr.h>
@@ -37,9 +37,6 @@
#include <ProfileEngineConstants.h>
#include "ProfilesDebug.h"
-#include <MProfileEngineExtended.h>
-#include <MProfileExtended.h>
-#include <MProfileName.h>
// CONSTANTS
namespace
@@ -83,8 +80,7 @@
error = iMutex.OpenGlobal( KProfileMutexName );
}
User::LeaveIfError( error );
- iProfileEngine = CreateProfileEngineExtendedL( &iFs );
- iCenRep = CRepository::NewL( KCRUidProfileEngine );
+ iProfileEngine = CreateProfileEngineL( &iFs );
iGlobalNote = CAknGlobalNote::NewL();
ReadResourcesL();
}
@@ -123,7 +119,6 @@
{
delete iNoteText;
delete iGlobalNote;
- delete iCenRep;
if( iProfileEngine )
{
iProfileEngine->Release();
@@ -180,21 +175,8 @@
{
PRODEBUG( " CProfileChangeEvent:ChangeProfileL" );
- TBool nameEqual = EFalse;
- HBufC* previousName = HBufC::NewL( PROFILES_MAX_NAME_LENGTH );
- CleanupStack::PushL( previousName );
- TPtr tempName = previousName->Des();
- User::LeaveIfError( iCenRep->Get( KProEngPreviousActiveName, tempName ) );
- if( tempName.Length() )
- {
- nameEqual = tempName.Compare( iProfileEngine->ProfileL( iPreviousId )->ProfileName().Name() );
- }
- if( !nameEqual )
- {
iProfileEngine->SetActiveProfileL( iPreviousId );
- }
- User::LeaveIfError( iCenRep->Set( KProEngPreviousActiveName, KNullDesC ) );
- CleanupStack::PopAndDestroy();
+
}
// -----------------------------------------------------------------------------
--- a/profilesservices/ProfileEngine/ProfileScheduleEventSrc/CProfileChangeEvent.h Fri Mar 12 15:43:47 2010 +0200
+++ b/profilesservices/ProfileEngine/ProfileScheduleEventSrc/CProfileChangeEvent.h Mon Mar 15 12:41:46 2010 +0200
@@ -26,9 +26,8 @@
#include <f32file.h>
// FORWARD DECLARATIONS
-class MProfileEngineExtended;
+class MProfileEngine;
class CAknGlobalNote;
-class CRepository;
// CLASS DECLARATION
@@ -110,7 +109,7 @@
private: // Data
// Own: Profiles Engine for profile activation
- MProfileEngineExtended* iProfileEngine;
+ MProfileEngine* iProfileEngine;
// Own: Global note to show the expiration conf. note to the user
CAknGlobalNote* iGlobalNote;
@@ -133,8 +132,7 @@
// Supported features
TBool iCoverDisplay;
- // Central Repository
- CRepository* iCenRep;
+
};
#endif // CPROFILECHANGEEVENT_H
--- a/profilesservices/RingingTone3DPlugin/inc/CRingingTone3DPlugin.h Fri Mar 12 15:43:47 2010 +0200
+++ b/profilesservices/RingingTone3DPlugin/inc/CRingingTone3DPlugin.h Mon Mar 15 12:41:46 2010 +0200
@@ -170,11 +170,13 @@
*/
void Init( CDrmPlayerUtility* aSamplePlayer );
+#ifdef RD_VIDEO_AS_RINGING_TONE
/**
* Initializes player utility.
* @param aSamplePlayer Player utility.
*/
void Init( CVideoPlayerUtility* aSamplePlayer );
+#endif
/**
* Plays 3D ringing tone.
@@ -324,8 +326,10 @@
// player utility
CDrmPlayerUtility* iDrmPlayerUtility;
+#ifdef RD_VIDEO_AS_RINGING_TONE
// player utility
CVideoPlayerUtility* iVideoPlayerUtility;
+#endif
// timer for updating 3D pattern position
C3DAudioTimeOutTimer* iTimer;
--- a/profilesservices/RingingTone3DPlugin/src/CRingingTone3DPlugin.cpp Fri Mar 12 15:43:47 2010 +0200
+++ b/profilesservices/RingingTone3DPlugin/src/CRingingTone3DPlugin.cpp Mon Mar 15 12:41:46 2010 +0200
@@ -217,7 +217,7 @@
//FLOG( _L("CRingingTone3DPlugin::InitL END") );
}
-
+#ifdef RD_VIDEO_AS_RINGING_TONE
// -----------------------------------------------------------------------------
// CRingingTone3DPlugin::Init
//
@@ -238,7 +238,7 @@
FLOG( _L("CRingingTone3DPlugin::InitL END") );
}
-
+#endif
// -----------------------------------------------------------------------------
// CRingingTone3DPlugin::SetAttr (from C3DRingingToneInterface.h)
@@ -327,12 +327,13 @@
Init( ( CDrmPlayerUtility* )aValue );
break;
}
+#ifdef RD_VIDEO_AS_RINGING_TONE
case E3DRTIAttrVideoPlayerUtility:
{
Init( ( CVideoPlayerUtility* )aValue );
break;
}
-
+#endif
default:
{
break;
@@ -859,11 +860,13 @@
ret = CEnvironmentalReverbUtility::NewL( *iDrmPlayerUtility );
break;
}
+#ifdef RD_VIDEO_AS_RINGING_TONE
case EVideoPlayerUtility:
{
ret = CEnvironmentalReverbUtility::NewL( *iVideoPlayerUtility );
break;
}
+#endif
default:
{
Panic(KErrArgument);
@@ -901,11 +904,13 @@
ret = CSourceLocation::NewL( *iDrmPlayerUtility );
break;
}
+#ifdef RD_VIDEO_AS_RINGING_TONE
case EVideoPlayerUtility:
{
ret = CSourceLocation::NewL( *iVideoPlayerUtility );
break;
}
+#endif
default:
{
Panic(KErrArgument);
@@ -943,11 +948,13 @@
ret = CListenerLocation::NewL( *iDrmPlayerUtility );
break;
}
+#ifdef RD_VIDEO_AS_RINGING_TONE
case EVideoPlayerUtility:
{
ret = CListenerLocation::NewL( *iVideoPlayerUtility );
break;
}
+#endif
default:
{
Panic(KErrArgument);
@@ -986,11 +993,13 @@
ret = CSourceDoppler::NewL( *iDrmPlayerUtility );
break;
}
+#ifdef RD_VIDEO_AS_RINGING_TONE
case EVideoPlayerUtility:
{
ret = CSourceDoppler::NewL( *iVideoPlayerUtility );
break;
}
+#endif
default:
{
Panic(KErrArgument);
@@ -1077,11 +1086,13 @@
iDrmPlayerUtility->Play();
break;
}
+#ifdef RD_VIDEO_AS_RINGING_TONE
case EVideoPlayerUtility:
{
iVideoPlayerUtility->Play();
break;
}
+#endif
default:
{
break;
@@ -1120,11 +1131,13 @@
iDrmPlayerUtility->Stop();
break;
}
+#ifdef RD_VIDEO_AS_RINGING_TONE
case EVideoPlayerUtility:
{
iVideoPlayerUtility->Stop();
break;
}
+#endif
default:
{
Panic(KErrArgument);