# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1271253066 -10800 # Node ID bbcfd14ce6a7d88815ff664e06a4c22577f187fb # Parent a005fc61b02ac6aa48bdc01eeaadfd2b541f4a9e Revision: 201013 Kit: 201015 diff -r a005fc61b02a -r bbcfd14ce6a7 devencdiskutils/DevEncStarter/rom/DevEncStarter.iby --- a/devencdiskutils/DevEncStarter/rom/DevEncStarter.iby Wed Mar 31 23:00:46 2010 +0300 +++ b/devencdiskutils/DevEncStarter/rom/DevEncStarter.iby Wed Apr 14 16:51:06 2010 +0300 @@ -24,7 +24,6 @@ //S60_APP_BITMAP( DevEncStarter ) S60_APP_AIF_ICONS( DevEncStarter ) S60_APP_AIF_RSC( DevEncStarter ) -data=DATAZ_\private\10003a3f\apps\DevEncStarter_reg.rsc private\10003a3f\import\apps\DevEncStarter_reg.rsc #endif // __DEVENCSTARTER_IBY__ diff -r a005fc61b02a -r bbcfd14ce6a7 devencdiskutils/rom/DevEncDiskUtils.iby --- a/devencdiskutils/rom/DevEncDiskUtils.iby Wed Mar 31 23:00:46 2010 +0300 +++ b/devencdiskutils/rom/DevEncDiskUtils.iby Wed Apr 14 16:51:06 2010 +0300 @@ -41,7 +41,6 @@ //--------------------------------------------------------------------------- S60_APP_EXE( DevEncStarter ) //S60_APP_AIF_RSC( DevEncStarter ) -data=DATAZ_\private\10003a3f\apps\DevEncStarter_reg.rsc private\10003a3f\import\apps\DevEncStarter_reg.rsc data=DATAZ_\resource\apps\DevEncStarter.rsc resource\apps\DevEncStarter.rsc #endif // FF_DEVICE_ENCRYPTION_FEATURE diff -r a005fc61b02a -r bbcfd14ce6a7 securitydialogs/Autolock/src/AutolockAppUi.cpp --- a/securitydialogs/Autolock/src/AutolockAppUi.cpp Wed Mar 31 23:00:46 2010 +0300 +++ b/securitydialogs/Autolock/src/AutolockAppUi.cpp Wed Apr 14 16:51:06 2010 +0300 @@ -661,9 +661,11 @@ TKeyResponse CAutolockAppUi::HandleKeyEventL( const TKeyEvent& aKeyEvent,TEventCode aType) { - if ( aKeyEvent.iCode == EKeyBell) - { - HandleCommandL(ESecUiCmdUnlock); + + if ( aKeyEvent.iCode == EKeyBell || (aType == EEventKeyUp && aKeyEvent.iScanCode == EStdKeyDeviceF) ) + { + if(iLocked) + HandleCommandL(ESecUiCmdUnlock); return EKeyWasConsumed; } diff -r a005fc61b02a -r bbcfd14ce6a7 securitydialogs/SecUi/GSSimSecPlugin/Src/GSSimSecPlugin.cpp --- a/securitydialogs/SecUi/GSSimSecPlugin/Src/GSSimSecPlugin.cpp Wed Mar 31 23:00:46 2010 +0300 +++ b/securitydialogs/SecUi/GSSimSecPlugin/Src/GSSimSecPlugin.cpp Wed Apr 14 16:51:06 2010 +0300 @@ -82,6 +82,12 @@ * C++ constructor. */ CCugQuery( TInt& aNumber,const TTone aTone = ENoTone ); + /** + * Prepares the dialog, by constructing it from the specified resource. Overwrite the base class. + * @param aResourceId The resource ID of the dialog. + */ + void PrepareLC( TInt aResourceId ); + protected: // From base classes /** * From CCAknNumberQueryDialog Left softkey is allways OK. @@ -541,8 +547,8 @@ { CCugQuery* dlg = new( ELeave ) CCugQuery( aCugIndex, CAknQueryDialog::ENoTone ); - - if ( dlg->ExecuteLD( R_CUG_INDEX ) ) + dlg->PrepareLC( R_CUG_INDEX ); + if ( dlg->RunLD() ) { // check content validity (?-32767), // ui spec concerned only values above limit @@ -591,6 +597,24 @@ MakeLeftSoftkeyVisible( ETrue ); } +// --------------------------------------------------------------------------- +// CCugQuery::PrepareLC( TInt aResourceId ) +// +// --------------------------------------------------------------------------- +// +void CCugQuery::PrepareLC( TInt aResourceId ) + { + CAknNumberQueryDialog::PrepareLC( aResourceId ); + CAknQueryControl* queryControl = QueryControl(); + if( queryControl ) + { + CEikEdwin* edwin = static_cast< CEikEdwin* >( queryControl->ControlByLayoutOrNull( ENumberLayout ) ); + if( edwin ) + { + edwin->SetAknEditorNumericKeymap( EAknEditorPlainNumberModeKeymap ); + } + } + } // --------------------------------------------------------------------------- // CGSSimSecPlugin::HandleResourceChangeL( TInt aType ) diff -r a005fc61b02a -r bbcfd14ce6a7 securitydialogs/SecUi/Inc/SecUiAutoLockSettingPage.h --- a/securitydialogs/SecUi/Inc/SecUiAutoLockSettingPage.h Wed Mar 31 23:00:46 2010 +0300 +++ b/securitydialogs/SecUi/Inc/SecUiAutoLockSettingPage.h Wed Apr 14 16:51:06 2010 +0300 @@ -59,7 +59,6 @@ void HandlePointerEventL(const TPointerEvent& aPointerEvent); private: // data - CEikButtonGroupContainer* iPopoutCba; TInt& iAutoLockValue; TInt iMaximum; TInt iOriginalIndex; diff -r a005fc61b02a -r bbcfd14ce6a7 securitydialogs/SecUi/Inc/SecUiRemoteLockSettingPage.h --- a/securitydialogs/SecUi/Inc/SecUiRemoteLockSettingPage.h Wed Mar 31 23:00:46 2010 +0300 +++ b/securitydialogs/SecUi/Inc/SecUiRemoteLockSettingPage.h Wed Apr 14 16:51:06 2010 +0300 @@ -71,8 +71,6 @@ private: // data - CEikButtonGroupContainer* iPopoutCba; - /** Remote lock status */ TInt& iRemoteLockStatus; TInt iPrevSelectionItem; diff -r a005fc61b02a -r bbcfd14ce6a7 securitydialogs/SecUi/Src/SecUiAutoLockSettingPage.cpp --- a/securitydialogs/SecUi/Src/SecUiAutoLockSettingPage.cpp Wed Mar 31 23:00:46 2010 +0300 +++ b/securitydialogs/SecUi/Src/SecUiAutoLockSettingPage.cpp Wed Apr 14 16:51:06 2010 +0300 @@ -63,8 +63,6 @@ { CAknRadioButtonSettingPage::ConstructL(); const TSize screenSize = iCoeEnv->ScreenDevice()->SizeInPixels(); - iPopoutCba = CEikButtonGroupContainer::NewL(CEikButtonGroupContainer::ECba, CEikButtonGroupContainer::EHorizontal, this, R_AVKON_SOFTKEYS_OK_CANCEL__OK); - iPopoutCba->SetBoundingRect(TRect(screenSize)); FeatureManager::InitializeLibL(); } @@ -76,7 +74,6 @@ // CAutoLockSettingPage::~CAutoLockSettingPage() { - delete iPopoutCba; FeatureManager::UnInitializeLib(); } diff -r a005fc61b02a -r bbcfd14ce6a7 securitydialogs/SecUi/Src/SecUiRemoteLockSettingPage.cpp --- a/securitydialogs/SecUi/Src/SecUiRemoteLockSettingPage.cpp Wed Mar 31 23:00:46 2010 +0300 +++ b/securitydialogs/SecUi/Src/SecUiRemoteLockSettingPage.cpp Wed Apr 14 16:51:06 2010 +0300 @@ -54,8 +54,6 @@ CAknRadioButtonSettingPage::ConstructL(); const TSize screenSize = iCoeEnv->ScreenDevice()->SizeInPixels(); - iPopoutCba = CEikButtonGroupContainer::NewL( CEikButtonGroupContainer::ECba, CEikButtonGroupContainer::EHorizontal, this, R_AVKON_SOFTKEYS_OK_CANCEL__OK ); - iPopoutCba->SetBoundingRect( TRect( screenSize ) ); #ifdef _DEBUG RDebug::Print( _L( "(SecUi)CRemoteLockSettingPage::ConstructL() - Exit" ) ); @@ -76,9 +74,6 @@ RDebug::Print( _L( "(SecUi)CRemoteLockSettingPage::~CRemoteLockSettingPage() - Enter" ) ); #endif // DEBUG - delete iPopoutCba; - iPopoutCba = NULL; - #ifdef _DEBUG RDebug::Print( _L( "(SecUi)CRemoteLockSettingPage::~CRemoteLockSettingPage() - Exit" ) ); #endif // DEBUG diff -r a005fc61b02a -r bbcfd14ce6a7 securitydialogs/SecUi/Src/SecUiSecurityHandler.cpp --- a/securitydialogs/SecUi/Src/SecUiSecurityHandler.cpp Wed Mar 31 23:00:46 2010 +0300 +++ b/securitydialogs/SecUi/Src/SecUiSecurityHandler.cpp Wed Apr 14 16:51:06 2010 +0300 @@ -975,7 +975,6 @@ RDebug::Print(_L("(SECUI)CSecurityHandler::PassPhraseRequiredL() KErrNone")); #endif // code approved - CSecuritySettings::ShowResultNoteL(R_CONFIRMATION_NOTE, CAknNoteDialog::EConfirmationTone); if(FeatureManager::FeatureSupported(KFeatureIdSapTerminalControlFw)) { // Unset the admin flag if set diff -r a005fc61b02a -r bbcfd14ce6a7 securitydialogs/simlockui/data/SimLockUI_reg.rss --- a/securitydialogs/simlockui/data/SimLockUI_reg.rss Wed Mar 31 23:00:46 2010 +0300 +++ b/securitydialogs/simlockui/data/SimLockUI_reg.rss Wed Apr 14 16:51:06 2010 +0300 @@ -36,9 +36,9 @@ app_file="SimLockUI"; // Application is not in the menu - //hidden = KAppIsHidden; + hidden = KAppIsHidden; // Uncomment and comment previous line to un-hide - hidden = KAppNotHidden; + //hidden = KAppNotHidden; localisable_resource_file="\\resource\\apps\\SimLockUI"; embeddability = KAppNotEmbeddable; newfile = KAppDoesNotSupportNewFile; diff -r a005fc61b02a -r bbcfd14ce6a7 wim/WimServer/src/WimSatRefreshObserver.cpp --- a/wim/WimServer/src/WimSatRefreshObserver.cpp Wed Mar 31 23:00:46 2010 +0300 +++ b/wim/WimServer/src/WimSatRefreshObserver.cpp Wed Apr 14 16:51:06 2010 +0300 @@ -23,8 +23,8 @@ #include "WimServer.h" #include "WimSession.h" #include "WimTrace.h" -#include -#include +#include +#include #include #if defined SAT_REFRESH_TIMER_TRIGGER #include "SatRefreshTimerTrigger.h" // for simulated sat refresh