--- a/gssettingsuis/Gs/GSApplication/Src/GSMainView.cpp Thu Jan 07 12:54:49 2010 +0200
+++ b/gssettingsuis/Gs/GSApplication/Src/GSMainView.cpp Mon Jan 18 20:31:08 2010 +0200
@@ -34,7 +34,7 @@
#include <hlplch.h>
#include <gscommon.hrh>
#include <gfxtranseffect/gfxtranseffect.h>
-#include <LayoutMetaData.cdl.h>
+#include <layoutmetadata.cdl.h>
// ========================= MEMBER FUNCTIONS ================================
--- a/gssettingsuis/Gs/GSAutoKeyguardPlugin/Inc/GSAutoKeyguardPlugin.h Thu Jan 07 12:54:49 2010 +0200
+++ b/gssettingsuis/Gs/GSAutoKeyguardPlugin/Inc/GSAutoKeyguardPlugin.h Mon Jan 18 20:31:08 2010 +0200
@@ -30,7 +30,7 @@
#include <gsplugininterface.h>
#include <gsfwviewuids.h>
#include <gsbaseview.h>
-#include <SecUiSecuritySettings.h>
+#include <secuisecuritysettings.h>
#include <RSSSettings.h>
// CONSTANTS
--- a/gssettingsuis/Gs/GSCallDivertPlugin/Src/GSCallDivertView.cpp Thu Jan 07 12:54:49 2010 +0200
+++ b/gssettingsuis/Gs/GSCallDivertPlugin/Src/GSCallDivertView.cpp Mon Jan 18 20:31:08 2010 +0200
@@ -255,7 +255,10 @@
{
case EGSCmdAppChange:
iRockerPress = EFalse;
- HandleListBoxEventL( iContainer->iListBox, EEventEnterKeyPressed );
+ if ( iContainer )
+ {
+ HandleListBoxEventL( iContainer->iListBox, EEventEnterKeyPressed );
+ }
break;
case EAknSoftkeyBack:
if( FeatureManager::FeatureSupported( KFeatureIdRestrictedCallDivert ) )
--- a/gssettingsuis/Gs/GSFramework/src/GSParentPlugin.cpp Thu Jan 07 12:54:49 2010 +0200
+++ b/gssettingsuis/Gs/GSFramework/src/GSParentPlugin.cpp Mon Jan 18 20:31:08 2010 +0200
@@ -37,7 +37,7 @@
#include <eikbtgpc.h>
#include <hlplch.h>
#include <StringLoader.h>
-#include <LayoutMetaData.cdl.h>
+#include <layoutmetadata.cdl.h>
// Middle Softkey control ID.
const TInt KGSMSKControlID = 3;
const TInt KGSMSKLength = 256;
--- a/gssettingsuis/Gs/GSNetworkPlugin/Src/GSNetworkPlugin.cpp Thu Jan 07 12:54:49 2010 +0200
+++ b/gssettingsuis/Gs/GSNetworkPlugin/Src/GSNetworkPlugin.cpp Mon Jan 18 20:31:08 2010 +0200
@@ -844,8 +844,10 @@
itemArray->SetRadioButtonSettingPage( *iSettingDlg );
const TInt prevSelection = currentIndex;
-
- iSettingDlg->SetSettingTextL( *settingPageTitle );
+ if ( settingPageTitle )
+ {
+ iSettingDlg->SetSettingTextL( *settingPageTitle );
+ }
//Start listening if call occurs
iPhoneSettingsEngine->SetNetSAObserver( *this );
Binary file gssettingsuis/Gs/help/data/xhtml.zip has changed
--- a/gssettingsuis/Gs/help/inc/cp.hlp.hrh Thu Jan 07 12:54:49 2010 +0200
+++ b/gssettingsuis/Gs/help/inc/cp.hlp.hrh Mon Jan 18 20:31:08 2010 +0200
@@ -22,7 +22,9 @@
#ifndef __CP_HLP_HRH__
#define __CP_HLP_HRH__
+_LIT(KSET_HLP_SETTINGS_KEYPAD_COVER, "SET_HLP_SETTINGS_KEYPAD_COVER"); //
_LIT(KCP_HLP_ADMINISTRATIVE_SETTINGS, "CP_HLP_ADMINISTRATIVE_SETTINGS"); //
+_LIT(KSET_HLP_TELEP_NETWORK_SET, "SET_HLP_TELEP_NETWORK_SET"); //
_LIT(KCP_HLP_DEVICE_MANAGEMENT, "CP_HLP_DEVICE_MANAGEMENT"); //
_LIT(KSET_HLP_WLAN_WPA_MAIN, "SET_HLP_WLAN_WPA_MAIN"); //
_LIT(KSET_HLP_WLAN_8021X_MAIN, "SET_HLP_WLAN_8021X_MAIN"); //
@@ -41,6 +43,7 @@
_LIT(KSET_HLP_WLAN_EAP_PEAP_SETT, "SET_HLP_WLAN_EAP_PEAP_SETT"); //
_LIT(KSET_HLP_WLAN_EAP_MSCHAPV2, "SET_HLP_WLAN_EAP_MSCHAPV2"); //
_LIT(KSET_HLP_WLAN_EAP_PLAIN_MSCHAP, "SET_HLP_WLAN_EAP_PLAIN_MSCHAP"); //
+_LIT(KDIV_HLP_CALL_FORW_DAT, "DIV_HLP_CALL_FORW_DAT"); //
_LIT(KSET_HLP_WLAN_EAP_LEAP, "SET_HLP_WLAN_EAP_LEAP"); //
_LIT(KSET_HLP_WLAN_EAP_FAST_TYPES, "SET_HLP_WLAN_EAP_FAST_TYPES"); //
_LIT(KSET_HLP_WLAN_EAP_FAST_SUITES, "SET_HLP_WLAN_EAP_FAST_SUITES"); //
@@ -49,10 +52,17 @@
_LIT(KSET_HLP_WLAN_WEP_KEY_SETT, "SET_HLP_WLAN_WEP_KEY_SETT"); //
_LIT(KSET_HLP_WLAN_WEP_MAIN, "SET_HLP_WLAN_WEP_MAIN"); //
_LIT(KACL_HLP_MAIN, "ACL_HLP_MAIN"); //
+_LIT(KSIP_HLP_PROF_PARAMS, "SIP_HLP_PROF_PARAMS"); //
+_LIT(KSIP_HLP_MAIN, "SIP_HLP_MAIN"); //
+_LIT(KSIP_HLP_PROXY_PARAMS, "SIP_HLP_PROXY_PARAMS"); //
+_LIT(KSIP_HLP_REGISTRAR_PARAM, "SIP_HLP_REGISTRAR_PARAM"); //
+_LIT(KHLP_OCC_CONN_SETTINGS, "HLP_OCC_CONN_SETTINGS"); //
_LIT(KSET_HLP_CONN_DEST_VIEW, "SET_HLP_CONN_DEST_VIEW"); //
_LIT(KSET_HLP_DEFAULT_CONN, "SET_HLP_DEFAULT_CONN"); //
_LIT(KSET_HLP_VPN_DEST_ASSOC_VIEW, "SET_HLP_VPN_DEST_ASSOC_VIEW"); //
_LIT(KSET_HLP_CONN_METHODS_VIEW, "SET_HLP_CONN_METHODS_VIEW"); //
+_LIT(KCP_HLP_DEVICE_LOCKING, "CP_HLP_DEVICE_LOCKING"); //
+_LIT(K0x100058EC, "0x100058EC"); // SSET_HLP_MAIN_VIEW
_LIT(KSET_HLP_APP_DEST_ASSOC_VIEW, "SET_HLP_APP_DEST_ASSOC_VIEW"); //
_LIT(KCP_HLP_APPILICATION_SETTINGS, "CP_HLP_APPILICATION_SETTINGS"); //
_LIT(KSCP_HLP_CALL, "SCP_HLP_CALL"); //
@@ -61,14 +71,19 @@
_LIT(KCP_HLP_DEVICE, "CP_HLP_DEVICE"); //
_LIT(KCP_HLP_LANGUAGE, "CP_HLP_LANGUAGE"); //
_LIT(KCP_HLP_MAIN_VIEW, "CP_HLP_MAIN_VIEW"); //
-//_LIT(KCP_HLP_NETWORK, "CP_HLP_NETWORK"); //
-//_LIT(KCP_HLP_PEN_INPUT, "CP_HLP_PEN_INPUT"); //
+_LIT(KCP_HLP_NETWORK, "CP_HLP_NETWORK"); //
+_LIT(KCP_HLP_PEN_INPUT, "CP_HLP_PEN_INPUT"); //
_LIT(KCP_HLP_PERSONAL, "CP_HLP_PERSONAL"); //
_LIT(KCP_HLP_SECURITY, "CP_HLP_SECURITY"); //
_LIT(KSET_HLP_SECURITY_DEVICE_SIM, "SET_HLP_SECURITY_DEVICE_SIM"); //
_LIT(KCP_HLP_IDLE, "CP_HLP_IDLE"); //
_LIT(KCP_HLP_TELEPHONY, "CP_HLP_TELEPHONY"); //
_LIT(KCP_HLP_WRITING_LANGUAGE, "CP_HLP_WRITING_LANGUAGE"); //
+_LIT(KDIAGNOSTICS_HLP_MAIN_VIEW, "DIAGNOSTICS_HLP_MAIN_VIEW"); //
+_LIT(KDIAGNOSTICS_HLP_CONNECT_VIEW, "DIAGNOSTICS_HLP_CONNECT_VIEW"); //
+_LIT(KDIAGNOSTICS_HLP_COVERAGE_VIEW, "DIAGNOSTICS_HLP_COVERAGE_VIEW"); //
+_LIT(KDIAGNOSTICS_HLP_HARDWARE_VIEW, "DIAGNOSTICS_HLP_HARDWARE_VIEW"); //
+_LIT(KDIAGNOSTICS_HLP_SERVICES_VIEW, "DIAGNOSTICS_HLP_SERVICES_VIEW"); //
_LIT(KES_HLP_LIGHT_MAIN, "ES_HLP_LIGHT_MAIN"); //
_LIT(KES_HLP_LIGHT_BLINKING, "ES_HLP_LIGHT_BLINKING"); //
_LIT(KSET_HLP_ACCESSORIES_LIST, "SET_HLP_ACCESSORIES_LIST"); //
@@ -87,10 +102,9 @@
_LIT(KCP_HLP_AUTOKEYGUARD, "CP_HLP_AUTOKEYGUARD"); //
_LIT(KRD_HLP_REMOTE_DRIVE_CONFIG, "RD_HLP_REMOTE_DRIVE_CONFIG"); //
_LIT(KRD_HLP_REMOTE_DRIVES, "RD_HLP_REMOTE_DRIVES"); //
-_LIT(KCP_HLP_NETWORK, "CP_HLP_NETWORK"); //
_LIT(KSET_HLP_BARRING_SETTINGS, "SET_HLP_BARRING_SETTINGS"); //
_LIT(KDIV_HLP_BARRING_MAIN, "DIV_HLP_BARRING_MAIN"); //
-_LIT(KDIV_HLP_CALL_FORW_DAT, "DIV_HLP_CALL_FORW_DAT"); //
+_LIT(KDIV_HLP_CALL_FORW_VID, "DIV_HLP_CALL_FORW_VID"); //
_LIT(KDIV_HLP_CALL_FORW_MAIN, "DIV_HLP_CALL_FORW_MAIN"); //
_LIT(KDIV_HLP_CALL_FORW_VOI, "DIV_HLP_CALL_FORW_VOI"); //
_LIT(KDIV_HLP_CALL_FORW_VOIP, "DIV_HLP_CALL_FORW_VOIP"); //
@@ -105,10 +119,11 @@
_LIT(KSET_HLP_ACCESSORIES_MUSIC_ST, "SET_HLP_ACCESSORIES_MUSIC_ST"); //
_LIT(KSET_HLP_ACCESSORIES_TTY, "SET_HLP_ACCESSORIES_TTY"); //
_LIT(KSET_HLP_ACCESSORIES_TVOUT, "SET_HLP_ACCESSORIES_TVOUT"); //
-_LIT(KCP_HLP_PEN_INPUT, "CP_HLP_PEN_INPUT"); //
+_LIT(KPREDINPUT_HLP_VIRTUAL_ITI_SETTINGS, "PREDINPUT_HLP_VIRTUAL_ITI_SETTINGS"); //
+_LIT(KPREDINPUT_HLP_VIRTUAL_ITI, "PREDINPUT_HLP_VIRTUAL_ITI"); //
+_LIT(KPREDINPUT_HLP_USERDICT, "PREDINPUT_HLP_USERDICT"); //
+_LIT(KSET_HLP_GENERAL_ORIG_SET, "SET_HLP_GENERAL_ORIG_SET"); //
+_LIT(KPREDINPUT_HLP_SHORTCUT, "PREDINPUT_HLP_SHORTCUT"); //
_LIT(KPREDINPUT_HLP_INPUT, "PREDINPUT_HLP_INPUT"); //
_LIT(KPREDINPUT_HLP_INPUT_SETTINGS, "PREDINPUT_HLP_INPUT_SETTINGS"); //
-_LIT(KPREDINPUT_HLP_USERDICT, "PREDINPUT_HLP_USERDICT"); //
-_LIT(KPREDINPUT_HLP_SHORTCUT, "PREDINPUT_HLP_SHORTCUT"); //
-
#endif
\ No newline at end of file
--- a/profilesservices/FileList/Src/CFLDBrowserLauncher.h Thu Jan 07 12:54:49 2010 +0200
+++ b/profilesservices/FileList/Src/CFLDBrowserLauncher.h Mon Jan 18 20:31:08 2010 +0200
@@ -22,7 +22,7 @@
// EXTERNAL INCLUDES
#include <e32base.h>
-#include <DownloadedContentHandler.h>
+#include <downloadedcontenthandler.h>
// FORWARD DECLARATIONS
class CDocumentHandler;
--- a/profilesservices/FileList/Src/CFLDFileListModel.cpp Thu Jan 07 12:54:49 2010 +0200
+++ b/profilesservices/FileList/Src/CFLDFileListModel.cpp Mon Jan 18 20:31:08 2010 +0200
@@ -320,7 +320,10 @@
iWait.Start(); // CSI: 10 # the state of iWait is checked above
// Close the wait note
- iWaitNote->CloseWaitNoteL();
+ if ( iWaitNote )
+ {
+ iWaitNote->CloseWaitNoteL();
+ }
}
// Back to default behavior
--- a/profilesservices/FileList/Src/CFLDPopupList.cpp Thu Jan 07 12:54:49 2010 +0200
+++ b/profilesservices/FileList/Src/CFLDPopupList.cpp Mon Jan 18 20:31:08 2010 +0200
@@ -37,7 +37,9 @@
#include <aknlists.h>
#include <commondialogs.mbg>
#include <filelist.mbg>
-
+#ifdef RD_TACTILE_FEEDBACK
+#include <touchfeedback.h>
+#endif //RD_TACTILE_FEEDBACK
// CONSTANTS
namespace
{
@@ -119,14 +121,17 @@
iPoint = aPointerEvent.iPosition;
CancelPreview();
}
- if ( Rect().Contains( iPoint ) )
- {
- CCoeControl::HandlePointerEventL( aPointerEvent );
- }
- else
- {
- AttemptExitL(EFalse);
- }
+ if (!Rect().Contains(iPoint))
+ {
+#ifdef RD_TACTILE_FEEDBACK
+ MTouchFeedback* feedback = MTouchFeedback::Instance();
+ if (feedback)
+ {
+ feedback->InstantFeedback(this, ETouchFeedbackBasic);
+ }
+#endif //RD_TACTILE_FEEDBACK }
+ }
+ CAknPopupList::HandlePointerEventL(aPointerEvent);
}
// -----------------------------------------------------------------------------
// CFLDPopupList::AttemptExitL
--- a/profilesservices/FileList/Src/CFLDWaitNote.cpp Thu Jan 07 12:54:49 2010 +0200
+++ b/profilesservices/FileList/Src/CFLDWaitNote.cpp Mon Jan 18 20:31:08 2010 +0200
@@ -51,6 +51,7 @@
{
// Do not delete CAknWaitDialog object:
// CAknWaitDialog::ProcessFinishedL should be used instead.
+ iWaitDialog->SetCallback( NULL );
TRAP_IGNORE( iWaitDialog->ProcessFinishedL() );
}
}
--- a/profilesservices/FileList/group/FileList.mmp Thu Jan 07 12:54:49 2010 +0200
+++ b/profilesservices/FileList/group/FileList.mmp Mon Jan 18 20:31:08 2010 +0200
@@ -101,7 +101,7 @@
#ifdef RD_DRM_COMMON_INTERFACE_FOR_OMA_AND_WMDRM
LIBRARY drmutility.lib
#endif
-
+LIBRARY touchfeedback.lib
LIBRARY caf.lib cafutils.lib // Content access framework
LIBRARY DrmAudioPlayUtility.lib
--- a/profilesservices/MediaFileList/Inc/mediafiledialogutils.h Thu Jan 07 12:54:49 2010 +0200
+++ b/profilesservices/MediaFileList/Inc/mediafiledialogutils.h Mon Jan 18 20:31:08 2010 +0200
@@ -32,7 +32,7 @@
#include <aknnavi.h> // CAknNavigationControlContainer
#include <eikimage.h> // CEikImage
-#include <DownloadedContentHandler.h> // MDownloadedContentHandler
+#include <downloadedcontenthandler.h> // MDownloadedContentHandler
// CONSTANTS
--- a/profilesservices/MediaFileList/Src/mediafiledialog.cpp Thu Jan 07 12:54:49 2010 +0200
+++ b/profilesservices/MediaFileList/Src/mediafiledialog.cpp Mon Jan 18 20:31:08 2010 +0200
@@ -1726,8 +1726,10 @@
}
CleanupStack::PushL( data );
-
- GetPopupText( data, iPopupText );
+ if ( data )
+ {
+ GetPopupText( data, iPopupText );
+ }
CleanupStack::PopAndDestroy( data );