# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1276253691 -10800 # Node ID 56e9a0aaad899bb7ea84b05a63a01a7b08a73bac # Parent 62ef28f7b435d2fbc831fa7d4c70a1ca8161c700 Revision: 201021 Kit: 2010123 diff -r 62ef28f7b435 -r 56e9a0aaad89 akntouchgesturefw/inc/akntouchgesturefwdefs.h --- a/akntouchgesturefw/inc/akntouchgesturefwdefs.h Thu May 27 13:07:04 2010 +0300 +++ b/akntouchgesturefw/inc/akntouchgesturefwdefs.h Fri Jun 11 13:54:51 2010 +0300 @@ -99,7 +99,7 @@ const TUint32 KAknTouchGestureFwAllGestureTypes = 0x7fffffff; /// Default feedback intensity. -const TInt KAknTouchGestureFwFeedbackIntensity = 50; +const TInt KAknTouchGestureFwFeedbackIntensity = 100; /// Pinch feedback timeout (in microseconds). const TInt KAknTouchGestureFwPinchFeedbackTimeout = 200000; diff -r 62ef28f7b435 -r 56e9a0aaad89 classicui_info/classicui_metadata/classicui_metadata.mrp --- a/classicui_info/classicui_metadata/classicui_metadata.mrp Thu May 27 13:07:04 2010 +0300 +++ b/classicui_info/classicui_metadata/classicui_metadata.mrp Fri Jun 11 13:54:51 2010 +0300 @@ -11,7 +11,7 @@ # # Contributors: # -# Description: +# Description: # component classicui_metadata diff -r 62ef28f7b435 -r 56e9a0aaad89 classicui_plat/find_item_ui_api/inc/finditemdialog.h --- a/classicui_plat/find_item_ui_api/inc/finditemdialog.h Thu May 27 13:07:04 2010 +0300 +++ b/classicui_plat/find_item_ui_api/inc/finditemdialog.h Fri Jun 11 13:54:51 2010 +0300 @@ -54,7 +54,6 @@ #endif // !RD_VIRTUAL_PHONEBOOK class TCoeHelpContext; class CFindItemVoIPExtension; -class CSchemeHandler; class CAknsBasicBackgroundControlContext; class CRichTextEditorContainer; class CSendUi; @@ -475,8 +474,6 @@ // Contains information of the VoIP profiles. CFindItemVoIPExtension* iFindItemVoIPExtension; - CSchemeHandler* iSchemeHandler; - CAknsBasicBackgroundControlContext* iBgContext; CRichTextEditorContainer* iEdwinContainer; diff -r 62ef28f7b435 -r 56e9a0aaad89 classicui_plat/find_item_ui_api/inc/finditemmenu.h --- a/classicui_plat/find_item_ui_api/inc/finditemmenu.h Thu May 27 13:07:04 2010 +0300 +++ b/classicui_plat/find_item_ui_api/inc/finditemmenu.h Fri Jun 11 13:54:51 2010 +0300 @@ -43,7 +43,6 @@ class CPbkDataSaveAppUi; class RPbkViewResourceFile; #endif // !RD_VIRTUAL_PHONEBOOK -class CSchemeHandler; class CFindItemVoIPExtension; class CCommonUiMPEngineApiLoader; @@ -445,7 +444,6 @@ // Possible callback number, owned. HBufC* iCallbackNumber; - CSchemeHandler* iSchemeHandler; // Contains information of the VoIP profiles. CFindItemVoIPExtension* iFindItemVoIPExtension; diff -r 62ef28f7b435 -r 56e9a0aaad89 commonuis/CommonUi/group/CommonUI.mmp --- a/commonuis/CommonUi/group/CommonUI.mmp Thu May 27 13:07:04 2010 +0300 +++ b/commonuis/CommonUi/group/CommonUI.mmp Fri Jun 11 13:54:51 2010 +0300 @@ -102,15 +102,11 @@ LIBRARY CommonEngine.lib // For class Stringloader, etc. LIBRARY apgrfx.lib // For class RApaLsSession, class TApaTask LIBRARY FeatMgr.lib // For class FeatureManager -#ifdef __SERIES60_MMC -LIBRARY CommonDialogs.lib -#endif // FindUI LIBRARY etext.lib // For class CPlainText, class TCharFormat LIBRARY form.lib // For class CTextLayout LIBRARY eikctl.lib // For class CRichText -LIBRARY FavouritesEngine.lib // For class CFavouritesItem, etc. LIBRARY sendui.lib // For class CSendUi, class CMessageData #ifndef RD_VIRTUAL_PHONEBOOK LIBRARY PbkView.lib // For class RPbkViewResourceFile, class CPbkDataSaveAppUi diff -r 62ef28f7b435 -r 56e9a0aaad89 commonuis/CommonUi/src/FindItemDialog.cpp --- a/commonuis/CommonUi/src/FindItemDialog.cpp Thu May 27 13:07:04 2010 +0300 +++ b/commonuis/CommonUi/src/FindItemDialog.cpp Fri Jun 11 13:54:51 2010 +0300 @@ -35,11 +35,6 @@ #include // for ButtonGroupContainer #include // for EKeyOk -#include // KFavouritesMaxUrl -#include // for CBookmarkItem - -#include - #include // RApaLsSession for WMLBrowser launch #ifndef RD_VIRTUAL_PHONEBOOK @@ -60,8 +55,6 @@ #include // For CClipboard -#include // For CSchemeHandler - #include #include @@ -319,8 +312,6 @@ delete iServiceHandler; delete iFindItemVoIPExtension; - delete iSchemeHandler; - delete iBgContext; delete iTitleText; @@ -707,23 +698,6 @@ } // If current app is other than Browser, use schemehandler for launching // file - else - { - if ( iSchemeHandler ) - { - delete iSchemeHandler; - iSchemeHandler = 0; - } - iSchemeHandler = CSchemeHandler::NewL( itemtextPtr ); - if ( itemtext->FindF( KRtspUrlAddress ) != KErrNotFound ) - { - iSchemeHandler->HandleUrlEmbeddedL(); - } - else - { - iSchemeHandler->HandleUrlStandaloneL(); - } - } CleanupStack::PopAndDestroy(); // itemtext return EFalse; @@ -744,9 +718,7 @@ TPtr paramPtr = parameters->Des(); paramPtr.Copy( KWmlBrowserParameter ); paramPtr.Append( KSpace ); - paramPtr.Append( - aItemtextPtr.Mid( - 0, Min( aItemtextPtr.Length(), KFavouritesMaxUrl ) ) ); + paramPtr.Append( aItemtextPtr.Mid( 0, aItemtextPtr.Length() ) ); TApaTaskList taskList( iEikonEnv->WsSession() ); TApaTask task = taskList.FindApp( KWapUid ); @@ -778,10 +750,6 @@ { __ASSERT_DEBUG( iEdwin->SelectionLength() > 0, Panic( ENoItemSelected ) ); - // Create an item and fill with meaningful data. - CFavouritesItem* item = CFavouritesItem::NewLC(); - item->SetParentFolder( KFavouritesRootUid ); - item->SetType( CFavouritesItem::EItem ); // Read default name from resources HBufC* defaultName = iEikonEnv->AllocReadResourceLC( R_FINDITEM_DEFAULT_BOOKMARK_NAME ); @@ -796,33 +764,17 @@ if ( !dlg->ExecuteLD( R_FINDITEM_BOOKMARK_QUERY_DIALOG ) ) { // User press cancel - do not add bookmark - CleanupStack::PopAndDestroy( ); // item return; } - - item->SetNameL( retName ); + TCursorSelection selection = iEdwin->Selection(); - item->SetUrlL( iPlainText.Mid( selection.LowerPos(), selection.Length() ) ); - - RFavouritesSession sess; - RFavouritesDb db; - - User::LeaveIfError( sess.Connect() ); - CleanupClosePushL( sess ); - User::LeaveIfError( db.Open( sess, KBrowserBookmarks ) ); - CleanupClosePushL( db ); - - // Add item. - db.Add( *item, ETrue ); - // Close the database. - db.Close(); - + HBufC* msgBuffer = iCoeEnv->AllocReadResourceLC( R_FINDITEM_BOOKMARK_SAVED ); CAknConfirmationNote* note = new (ELeave)CAknConfirmationNote( ETrue ); note->ExecuteLD( *msgBuffer ); - CleanupStack::PopAndDestroy( 4 ); // magBuffer, db, sess, item + CleanupStack::PopAndDestroy(); // magBuffer } // ----------------------------------------------------------------------------- diff -r 62ef28f7b435 -r 56e9a0aaad89 commonuis/CommonUi/src/FindItemMenu.cpp --- a/commonuis/CommonUi/src/FindItemMenu.cpp Thu May 27 13:07:04 2010 +0300 +++ b/commonuis/CommonUi/src/FindItemMenu.cpp Fri Jun 11 13:54:51 2010 +0300 @@ -34,11 +34,6 @@ #include // Phonenumber parser #include // Mtm uids -#include // KFavouritesMaxUrl -#include // for CBookmarkItem - -#include - #include // RApaLsSession for WMLBrowser launch #include @@ -62,7 +57,6 @@ #include #include -#include // Callback query #include @@ -225,7 +219,6 @@ delete iCallbackNumber; - delete iSchemeHandler; delete iDialData; @@ -958,12 +951,12 @@ case EFindItemCmdGoToUrl: { - LaunchGenericUriL(); + break; } case EFindItemCmdGoToRstp: { - LaunchGenericUriL(); + break; } @@ -1015,7 +1008,6 @@ case EFindItemCmdUse: { - LaunchGenericUriL(); break; } @@ -1174,10 +1166,6 @@ void CFindItemMenu::AddToBookmarkL() { - // Create an item - CFavouritesItem* item = CFavouritesItem::NewLC(); - item->SetParentFolder( KFavouritesRootUid ); - item->SetType( CFavouritesItem::EItem ); // Read default name from resources RConeResourceLoader ldr( *iCoeEnv ); @@ -1199,31 +1187,15 @@ if ( !dlg->ExecuteLD( R_FINDITEM_BOOKMARK_QUERY_DIALOG ) ) { // User press cancel - do not add bookmark - CleanupStack::PopAndDestroy( 3 ); // item, defaultName, resourceLoader + CleanupStack::PopAndDestroy( 2 ); // defaultName, resourceLoader return; } - item->SetNameL( retName ); - item->SetUrlL( iAutomaticFind->CurrentItemExt().iItemDescriptor->Des() ); - - RFavouritesSession sess; - RFavouritesDb db; - - User::LeaveIfError( sess.Connect() ); - CleanupClosePushL( sess ); - User::LeaveIfError( db.Open( sess, KBrowserBookmarks ) ); - CleanupClosePushL( db ); - - // add item - db.Add( *item, ETrue ); - // Close the database. - db.Close(); - HBufC* msgBuffer = iCoeEnv->AllocReadResourceLC( R_FINDITEM_BOOKMARK_SAVED ); CAknConfirmationNote* note = new (ELeave)CAknConfirmationNote( ETrue ); note->ExecuteLD( *msgBuffer ); - CleanupStack::PopAndDestroy( 6 ); // item, db, sess, resourceLoader, + CleanupStack::PopAndDestroy( 3 ); // resourceLoader, // defaultName, msgBuffer } @@ -1533,20 +1505,7 @@ void CFindItemMenu::LaunchGenericUriL() { - if ( iSchemeHandler ) - { - delete iSchemeHandler; - iSchemeHandler = 0; - } - iSchemeHandler = CSchemeHandler::NewL( iAutomaticFind->CurrentItemExt().iItemDescriptor->Des() ); - if ( iAutomaticFind->CurrentItemExt().iItemDescriptor->FindF( KRtspUrlAddress ) != KErrNotFound ) - { - iSchemeHandler->HandleUrlEmbeddedL(); - } - else - { - iSchemeHandler->HandleUrlStandaloneL(); - } + } EXPORT_C void CFindItemMenu::SetCallbackNumber( const TDesC& aPhoneNumber ) diff -r 62ef28f7b435 -r 56e9a0aaad89 commonuisupport/uifwsdocs/app-framework_documentation.mrp --- a/commonuisupport/uifwsdocs/app-framework_documentation.mrp Thu May 27 13:07:04 2010 +0300 +++ b/commonuisupport/uifwsdocs/app-framework_documentation.mrp Fri Jun 11 13:54:51 2010 +0300 @@ -11,7 +11,7 @@ # # Contributors: # -# Description: +# Description: # component app-framework_documentation diff -r 62ef28f7b435 -r 56e9a0aaad89 commonuisupport/uikon/coresrc/EIKAPP.CPP --- a/commonuisupport/uikon/coresrc/EIKAPP.CPP Thu May 27 13:07:04 2010 +0300 +++ b/commonuisupport/uikon/coresrc/EIKAPP.CPP Fri Jun 11 13:54:51 2010 +0300 @@ -20,7 +20,7 @@ #include #include #include -#include "apfdef.h" +#include "APFDEF.H" #include #include #include diff -r 62ef28f7b435 -r 56e9a0aaad89 commonuisupport/uikon/coresrc/EIKENV.CPP --- a/commonuisupport/uikon/coresrc/EIKENV.CPP Thu May 27 13:07:04 2010 +0300 +++ b/commonuisupport/uikon/coresrc/EIKENV.CPP Fri Jun 11 13:54:51 2010 +0300 @@ -70,7 +70,7 @@ #include #include #include -#include "eiksrvc.h" +#include "EIKSRVC.H" #include "eikdebugprefs.h" #include "eikprivate.h" @@ -80,8 +80,8 @@ #include #include "eikdefconst.h" #include "eikdefconstinternal.h" -#include "eiklibry.h" -#include "eikdgfty.h" +#include "EIKLIBRY.H" +#include "EIKDGFTY.H" GLDEF_C void Panic(TEikPanic aPanic) { diff -r 62ef28f7b435 -r 56e9a0aaad89 commonuisupport/uikon/coresrc/EIKFCTRY.CPP --- a/commonuisupport/uikon/coresrc/EIKFCTRY.CPP Thu May 27 13:07:04 2010 +0300 +++ b/commonuisupport/uikon/coresrc/EIKFCTRY.CPP Fri Jun 11 13:54:51 2010 +0300 @@ -15,7 +15,7 @@ #include #include -#include "eikdgfty.h" +#include "EIKDGFTY.H" /** Creates the specified type of control by going through the dynamically loaded DLLs' Control Factories until one is found which successfully creates the diff -r 62ef28f7b435 -r 56e9a0aaad89 commonuisupport/uikon/coresrc/EIKPROC.CPP --- a/commonuisupport/uikon/coresrc/EIKPROC.CPP Thu May 27 13:07:04 2010 +0300 +++ b/commonuisupport/uikon/coresrc/EIKPROC.CPP Fri Jun 11 13:54:51 2010 +0300 @@ -20,7 +20,7 @@ #include #include #include -#include "apfdef.h" +#include "APFDEF.H" #include diff -r 62ef28f7b435 -r 56e9a0aaad89 commonuisupport/uikon/group/BLD.INF --- a/commonuisupport/uikon/group/BLD.INF Thu May 27 13:07:04 2010 +0300 +++ b/commonuisupport/uikon/group/BLD.INF Fri Jun 11 13:54:51 2010 +0300 @@ -20,7 +20,7 @@ */ // include test code -#include "../test/group/BLD.INF" +#include "../test/group/bld.inf" PRJ_EXPORTS // specify the source file followed by its destination here @@ -88,16 +88,16 @@ ../group/uikon.iby /epoc32/rom/include/uikon.iby -../bwins/Eikinitu.def /epoc32/release/wins/eikinitu.def -../EABI/EIKINITU.DEF /epoc32/include/def/eabi/eikinitu.def +../bwins/EIKINITU.DEF /epoc32/release/wins/eikinitu.def +../eabi/EIKINITU.DEF /epoc32/include/def/eabi/eikinitu.def // from ..\docs -../docs/extended_notifier_design_spec.doc /epoc32/engdoc/application_framework/uikon/proposed/extended_notifier_design_spec.doc -../docs/status_pane_design.doc /epoc32/engdoc/application_framework/uikon/status_pane_design.doc -../docs/uikon_1.2_menu_extensions.doc /epoc32/engdoc/application_framework/uikon/uikon_1.2_menu_extensions.doc -../docs/uikon_1.2_border_extensions.doc /epoc32/engdoc/application_framework/uikon/uikon_1.2_border_extensions.doc -../docs/uikon_1.2_border_colours_utilities_extensions.doc /epoc32/engdoc/application_framework/uikon/uikon_1.2_border_colours_utilities_extensions.doc -../docs/Uikon_1.2_Caps_Lock_Extension.doc /epoc32/engdoc/application_framework/uikon/uikon_1.2_caps_lock_extension.doc +//../docs/extended_notifier_design_spec.doc /epoc32/engdoc/application_framework/uikon/proposed/extended_notifier_design_spec.doc +//../docs/status_pane_design.doc /epoc32/engdoc/application_framework/uikon/status_pane_design.doc +//../docs/uikon_1.2_menu_extensions.doc /epoc32/engdoc/application_framework/uikon/uikon_1.2_menu_extensions.doc +//../docs/uikon_1.2_border_extensions.doc /epoc32/engdoc/application_framework/uikon/uikon_1.2_border_extensions.doc +//../docs/uikon_1.2_border_colours_utilities_extensions.doc /epoc32/engdoc/application_framework/uikon/uikon_1.2_border_colours_utilities_extensions.doc +//../docs/Uikon_1.2_Caps_Lock_Extension.doc /epoc32/engdoc/application_framework/uikon/uikon_1.2_caps_lock_extension.doc PRJ_MMPFILES diff -r 62ef28f7b435 -r 56e9a0aaad89 commonuisupport/uikon/srvsrc/EIKNFYSV.CPP --- a/commonuisupport/uikon/srvsrc/EIKNFYSV.CPP Thu May 27 13:07:04 2010 +0300 +++ b/commonuisupport/uikon/srvsrc/EIKNFYSV.CPP Fri Jun 11 13:54:51 2010 +0300 @@ -988,6 +988,7 @@ void CEikSrvNotifierManager::LookForNotifierInObservedListL(TUid aNotifierUid, TUid aChannelUid, RArray& aNotifierPositions) { + CleanupClosePushL(aNotifierPositions); const TInt count = iObservedList->Count(); for (TInt ii = 0; ii < count; ii++) { @@ -996,6 +997,7 @@ if (info.iUid == aNotifierUid && (aChannelUid == KNonExistentUid || info.iChannel == aChannelUid)) User::LeaveIfError(aNotifierPositions.Append(ii)); } + CleanupStack::Pop(&aNotifierPositions); } void CEikSrvNotifierManager::NotifierStartAndGetResponseL(TUid aNotifierUid, const TDesC8& aBuffer, TInt aReplySlot, diff -r 62ef28f7b435 -r 56e9a0aaad89 commonuisupport/uikon/srvsrc/EIKSRVC.CPP --- a/commonuisupport/uikon/srvsrc/EIKSRVC.CPP Thu May 27 13:07:04 2010 +0300 +++ b/commonuisupport/uikon/srvsrc/EIKSRVC.CPP Fri Jun 11 13:54:51 2010 +0300 @@ -17,7 +17,7 @@ #include #include #include -#include "coedatastorage.h" +#include "CoeDataStorage.h" #include #include #include diff -r 62ef28f7b435 -r 56e9a0aaad89 commonuisupport/uikon/srvsrc/UpdateSystemColorList.cpp --- a/commonuisupport/uikon/srvsrc/UpdateSystemColorList.cpp Thu May 27 13:07:04 2010 +0300 +++ b/commonuisupport/uikon/srvsrc/UpdateSystemColorList.cpp Fri Jun 11 13:54:51 2010 +0300 @@ -23,7 +23,7 @@ #include #include #include -#include "coedatastorage.h" +#include "CoeDataStorage.h" #include void PopulateColorListL() { diff -r 62ef28f7b435 -r 56e9a0aaad89 commonuisupport/uikon/srvsrc/eiksrv_securedata.cpp --- a/commonuisupport/uikon/srvsrc/eiksrv_securedata.cpp Thu May 27 13:07:04 2010 +0300 +++ b/commonuisupport/uikon/srvsrc/eiksrv_securedata.cpp Fri Jun 11 13:54:51 2010 +0300 @@ -17,7 +17,7 @@ #include #include #include -#include "coedatastorage.h" +#include "CoeDataStorage.h" // // class CEikServSecureData diff -r 62ef28f7b435 -r 56e9a0aaad89 commonuisupport/uikon/test/scripts/uiktest_T_Backup.script --- a/commonuisupport/uikon/test/scripts/uiktest_T_Backup.script Thu May 27 13:07:04 2010 +0300 +++ b/commonuisupport/uikon/test/scripts/uiktest_T_Backup.script Fri Jun 11 13:54:51 2010 +0300 @@ -16,6 +16,10 @@ // PRINT Run TBackup test // + +// Init MTM before it will be used by backup service +RUN_WS_PROGRAM mailinit.exe + LOAD_SUITE UiktestServer RUN_TEST_STEP 1000 UiktestServer TBackup diff -r 62ef28f7b435 -r 56e9a0aaad89 commonuisupport/uilaf/GROUP/BLD.INF --- a/commonuisupport/uilaf/GROUP/BLD.INF Thu May 27 13:07:04 2010 +0300 +++ b/commonuisupport/uilaf/GROUP/BLD.INF Fri Jun 11 13:54:51 2010 +0300 @@ -27,7 +27,7 @@ // to the same name in \epoc32\include ../bwins/uiklaf_unbranchedu.def /epoc32/include/uiklaf/private/bwins/uiklafu.def -../EABI/uiklaf_unbranchedu.def /epoc32/include/uiklaf/private/eabi/uiklafu.def +../eabi/uiklaf_unbranchedu.def /epoc32/include/uiklaf/private/eabi/uiklafu.def // from \uiklaf\inc ../inc/uikon.hrh /epoc32/include/uikon.hrh diff -r 62ef28f7b435 -r 56e9a0aaad89 lafagnosticuifoundation/animation/tef/TFrames.cpp --- a/lafagnosticuifoundation/animation/tef/TFrames.cpp Thu May 27 13:07:04 2010 +0300 +++ b/lafagnosticuifoundation/animation/tef/TFrames.cpp Fri Jun 11 13:54:51 2010 +0300 @@ -265,8 +265,9 @@ iTransSpriteAnimWin->Window()->Invalidate(); iFrameWin->Window()->Invalidate(); iTransFrameWin->Window()->Invalidate(); - Ws().Flush(); + Ws().Finish(); WaitForRedrawsToFinish(); + Ws().Finish(); // Start the animations: TAnimationConfig config; @@ -288,17 +289,27 @@ break; } iBasicAnimations[frame]->Start(config); + Wait(KFramesFrameLength); + Ws().Finish(); + WaitForRedrawsToFinish(); + iSpriteAnimations[frame]->Start(config); + Wait(KFramesFrameLength); + Ws().Finish(); + WaitForRedrawsToFinish(); } // Why * 4? because we seem to go very slowly? Wait(KFramesFrameLength * iBasicAnimations.Count() * 4); - - // Verify output: + Ws().Finish(); WaitForRedrawsToFinish(); - ANIMTESTRECT(TRect(iBasicAnimWinPosition, iWinSize), TRect(iFrameWinPosition, iWinSize)); + Ws().Finish(); + + // When verifying output, + // Should have at least one animation frame drawn + ANIMTESTRECT(TRect(iBasicAnimWinPosition, TSize(KFramesWindowHeight,KFramesWindowHeight)), TRect(iFrameWinPosition, TSize(KFramesWindowHeight,KFramesWindowHeight))); if(!(aFlags & ENoSprites)) - ANIMTESTRECT(TRect(iSpriteAnimWinPosition, iWinSize), TRect(iFrameWinPosition, iWinSize)); + ANIMTESTRECT(TRect(iSpriteAnimWinPosition, TSize(KFramesWindowHeight,KFramesWindowHeight)), TRect(iFrameWinPosition, TSize(KFramesWindowHeight,KFramesWindowHeight))); } /** @SYMTestCaseID UIF-animation-TFrames-TestFramesL2 diff -r 62ef28f7b435 -r 56e9a0aaad89 lafagnosticuifoundation/bmpanimation/group/BLD.INF --- a/lafagnosticuifoundation/bmpanimation/group/BLD.INF Thu May 27 13:07:04 2010 +0300 +++ b/lafagnosticuifoundation/bmpanimation/group/BLD.INF Fri Jun 11 13:54:51 2010 +0300 @@ -30,7 +30,7 @@ ../inc/bmpansrv.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(bmpansrv.h) ../inc/bmpanconsts.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(bmpanconsts.h) -../docs/animation_design_spec.doc /epoc32/engdoc/application_framework/bmpanim/animation_design_spec.doc +//../docs/animation_design_spec.doc /epoc32/engdoc/application_framework/bmpanim/animation_design_spec.doc ../group/BmpAnim.iby /epoc32/rom/include/bmpanim.iby PRJ_MMPFILES diff -r 62ef28f7b435 -r 56e9a0aaad89 lafagnosticuifoundation/bmpanimation/inc/bmpansrv.h --- a/lafagnosticuifoundation/bmpanimation/inc/bmpansrv.h Thu May 27 13:07:04 2010 +0300 +++ b/lafagnosticuifoundation/bmpanimation/inc/bmpansrv.h Fri Jun 11 13:54:51 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 1997-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -272,7 +272,7 @@ // Returns ETrue every time the index frame is valid, otherwise it returns EFalse. inline TBool CBitmapAnim::IsFrameDisplayable() const - { return ( (iIndex >= 0) && iBitmapAnimFrameDataArray[iIndex]->iBitmap ); } + { return ( (iIndex >= 0) && (iIndex < Count()) && iBitmapAnimFrameDataArray[iIndex]->iBitmap ); } // Returns ETrue if the animation is running, otherwise it returns EFalse. inline TBool CBitmapAnim::IsRunning() const diff -r 62ef28f7b435 -r 56e9a0aaad89 lafagnosticuifoundation/cone/group/BLD.INF --- a/lafagnosticuifoundation/cone/group/BLD.INF Thu May 27 13:07:04 2010 +0300 +++ b/lafagnosticuifoundation/cone/group/BLD.INF Fri Jun 11 13:54:51 2010 +0300 @@ -52,7 +52,7 @@ ../inc/coeerrorconsts.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(graphics/cone/coeerrorconsts.h) ../bwins/COEFEPU.DEF /epoc32/release/wins/coefepu.def -../EABI/COEFEPU.DEF /epoc32/include/def/eabi/coefepu.def +../eabi/COEFEPU.DEF /epoc32/include/def/eabi/coefepu.def ../group/cone.iby /epoc32/rom/include/cone.iby diff -r 62ef28f7b435 -r 56e9a0aaad89 lafagnosticuifoundation/cone/src/COECNTSS.CPP --- a/lafagnosticuifoundation/cone/src/COECNTSS.CPP Thu May 27 13:07:04 2010 +0300 +++ b/lafagnosticuifoundation/cone/src/COECNTSS.CPP Fri Jun 11 13:54:51 2010 +0300 @@ -208,6 +208,7 @@ @param aLogicalToPixelSizes TInt array to be poulated with font sizes */ EXPORT_C void CCoeControlStaticSettings::GetLogicalToPixelFontSizesL(RArray& aLogicalToPixelSizes) { + CleanupClosePushL(aLogicalToPixelSizes); CCoeControlStaticSettings* self = Self(); aLogicalToPixelSizes.Reset(); @@ -224,6 +225,7 @@ User::LeaveIfError(aLogicalToPixelSizes.Append(22)); User::LeaveIfError(aLogicalToPixelSizes.Append(26)); } + CleanupStack::Pop(&aLogicalToPixelSizes); } /** diff -r 62ef28f7b435 -r 56e9a0aaad89 lafagnosticuifoundation/cone/src/COEFEP.CPP --- a/lafagnosticuifoundation/cone/src/COEFEP.CPP Thu May 27 13:07:04 2010 +0300 +++ b/lafagnosticuifoundation/cone/src/COEFEP.CPP Fri Jun 11 13:54:51 2010 +0300 @@ -18,7 +18,7 @@ #include #include #include -#include "coedatastorage.h" +#include "CoeDataStorage.h" #include "coepanic.h" #include #include "coedefkeys.h" diff -r 62ef28f7b435 -r 56e9a0aaad89 lafagnosticuifoundation/cone/src/COEMAIN.CPP --- a/lafagnosticuifoundation/cone/src/COEMAIN.CPP Thu May 27 13:07:04 2010 +0300 +++ b/lafagnosticuifoundation/cone/src/COEMAIN.CPP Fri Jun 11 13:54:51 2010 +0300 @@ -21,7 +21,7 @@ #include "COETLS.H" #include "COEFEP.H" // class FepName #include "coepanic.h" -#include "coever.h" +#include "COEVER.H" #include #include #include "coeenvextra.h" @@ -30,7 +30,7 @@ #include #include #include -#include "coedatastorage.h" +#include "CoeDataStorage.h" #include #include #ifdef SYMBIAN_ENABLE_SPLIT_HEADERS diff -r 62ef28f7b435 -r 56e9a0aaad89 lafagnosticuifoundation/cone/src/COEMAINSECUREFEP.CPP --- a/lafagnosticuifoundation/cone/src/COEMAINSECUREFEP.CPP Thu May 27 13:07:04 2010 +0300 +++ b/lafagnosticuifoundation/cone/src/COEMAINSECUREFEP.CPP Fri Jun 11 13:54:51 2010 +0300 @@ -18,7 +18,7 @@ #include "coepanic.h" #include #include "COEFEP.H" -#include "coedatastorage.h" +#include "CoeDataStorage.h" #include @@ -74,6 +74,7 @@ @param aDisplayNames The array of FEP display names to be filled. May be passed as NULL if display names are not required. */ { + CleanupClosePushL(aUids); aUids.Reset(); if(aDisplayNames) { @@ -93,6 +94,7 @@ } } CleanupStack::PopAndDestroy(&implementationArray); + CleanupStack::Pop(&aUids); } EXPORT_C void CCoeEnv::InstallFepL(TUid aFepUid) diff -r 62ef28f7b435 -r 56e9a0aaad89 lafagnosticuifoundation/cone/src/CoeDataStorage.cpp --- a/lafagnosticuifoundation/cone/src/CoeDataStorage.cpp Thu May 27 13:07:04 2010 +0300 +++ b/lafagnosticuifoundation/cone/src/CoeDataStorage.cpp Fri Jun 11 13:54:51 2010 +0300 @@ -17,7 +17,7 @@ #include #include #include -#include "coedatastorage.h" +#include "CoeDataStorage.h" #include #include #include diff -r 62ef28f7b435 -r 56e9a0aaad89 lafagnosticuifoundation/cone/src/CoeEnvExtra.cpp --- a/lafagnosticuifoundation/cone/src/CoeEnvExtra.cpp Thu May 27 13:07:04 2010 +0300 +++ b/lafagnosticuifoundation/cone/src/CoeEnvExtra.cpp Fri Jun 11 13:54:51 2010 +0300 @@ -169,11 +169,13 @@ void CCoeEnvExtra::AddObserverL(RArray& aArrayOfObservers, TAny* aObserver) { __ASSERT_ALWAYS(aObserver!=NULL, Panic(ECoePanicIllegalNullParameter3)); + CleanupClosePushL(aArrayOfObservers); for (TInt i=aArrayOfObservers.Count()-1; i>=0; --i) { __ASSERT_ALWAYS(aArrayOfObservers[i]!=aObserver, Panic(ECoePanicFocusObserverHasAlreadyBeenAdded)); } User::LeaveIfError(aArrayOfObservers.Append(aObserver)); + CleanupStack::Pop(&aArrayOfObservers); } void CCoeEnvExtra::RemoveObserver(RArray& aArrayOfObservers, const TAny* aObserver) diff -r 62ef28f7b435 -r 56e9a0aaad89 lafagnosticuifoundation/graphicseffects/group/GfxTransAdapterStub.mmp --- a/lafagnosticuifoundation/graphicseffects/group/GfxTransAdapterStub.mmp Thu May 27 13:07:04 2010 +0300 +++ b/lafagnosticuifoundation/graphicseffects/group/GfxTransAdapterStub.mmp Fri Jun 11 13:54:51 2010 +0300 @@ -36,8 +36,8 @@ LIBRARY euser.lib #if defined(WINSCW) -deffile ../Adapter/BWINS/GFXTRANSADAPTER.DEF +deffile ../Adapter/bwins/GFXTRANSADAPTER.DEF #else -deffile ../Adapter/EABI/GFXTRANSADAPTER.DEF +deffile ../Adapter/eabi/GFXTRANSADAPTER.DEF #endif SMPSAFE diff -r 62ef28f7b435 -r 56e9a0aaad89 tsrc/group/bld.inf --- a/tsrc/group/bld.inf Thu May 27 13:07:04 2010 +0300 +++ b/tsrc/group/bld.inf Fri Jun 11 13:54:51 2010 +0300 @@ -24,7 +24,6 @@ #include "../../classicui_plat/avkon_secondary_display_support_api/tsrc/group/bld.inf" #include "../../classicui_plat/avkon_ui_server_api/tsrc/group/bld.inf" #include "../../classicui_plat/battery_pane_api/tsrc/group/bld.inf" -#include "../../classicui_plat/common_file_dialogs_filter_factory_api/tsrc/group/bld.inf" #include "../../classicui_plat/custom_cursors_api/tsrc/group/bld.inf" #include "../../classicui_plat/eikon_server_extension_client_api/tsrc/group/bld.inf" #include "../../classicui_plat/emergency_call_support_api/tsrc/group/bld.inf" @@ -81,7 +80,6 @@ #include "../../classicui_pub/base_controls_api/tsrc/group/bld.inf" #include "../../classicui_pub/buttons_api/tsrc/group/bld.inf" #include "../../classicui_pub/choice_list_api/tsrc/group/bld.inf" -#include "../../classicui_pub/common_file_dialogs_api/tsrc/group/bld.inf" #include "../../classicui_pub/context_pane_api/tsrc/group/bld.inf" #include "../../classicui_pub/dialog_shutter_api/tsrc/group/bld.inf" #include "../../classicui_pub/dialogs_api/tsrc/group/bld.inf" diff -r 62ef28f7b435 -r 56e9a0aaad89 uifw/AvKon/group/avkon.mmp --- a/uifw/AvKon/group/avkon.mmp Thu May 27 13:07:04 2010 +0300 +++ b/uifw/AvKon/group/avkon.mmp Fri Jun 11 13:54:51 2010 +0300 @@ -343,6 +343,7 @@ LIBRARY viewcli.lib LIBRARY aknphysics.lib LIBRARY HWRMLightClient.lib +LIBRARY lockclient.lib DEFFILE AVKON.def diff -r 62ef28f7b435 -r 56e9a0aaad89 uifw/AvKon/rom/avkon.iby --- a/uifw/AvKon/rom/avkon.iby Thu May 27 13:07:04 2010 +0300 +++ b/uifw/AvKon/rom/avkon.iby Fri Jun 11 13:54:51 2010 +0300 @@ -34,13 +34,11 @@ SCALABLE_IMAGE(BITMAP_DIR,BITMAP_DIR,avkon2) SCALABLE_IMAGE(BITMAP_DIR,BITMAP_DIR,callstatus) -SCALABLE_IMAGE(BITMAP_DIR,BITMAP_DIR,smiley) // Avkon2.mif CDL header ECOM_PLUGIN(102827CF.dll,102827CF.rsc) data=DATAZ_\resource\cdl\102827CF_cdl_detail.rsc Resource\Cdl\102827CF_cdl_detail.rsc data=ZRESOURCE\aknpriv.rsc RESOURCE_FILES_DIR\aknpriv.rsc -data=ZRESOURCE\smiley.rsc RESOURCE_FILES_DIR\smiley.rsc #include "aknglobalui.iby" diff -r 62ef28f7b435 -r 56e9a0aaad89 uifw/AvKon/src/AknKeyLock.cpp --- a/uifw/AvKon/src/AknKeyLock.cpp Thu May 27 13:07:04 2010 +0300 +++ b/uifw/AvKon/src/AknKeyLock.cpp Fri Jun 11 13:54:51 2010 +0300 @@ -37,6 +37,8 @@ #include #include "aknkeylock.h" #include "AknNotifierController.h" +#include +#include // RAknKeyLock @@ -60,6 +62,7 @@ EXPORT_C TBool RAknKeyLock::IsKeyLockEnabled() { TInt value; + /* TInt err = RProperty::Get(KPSUidAvkonDomain, KAknKeyguardStatus, value); if ( err != KErrNone ) return EFalse; @@ -72,6 +75,22 @@ default: return EFalse; } + */ + + TInt valueKeyguard; + CKeyguardAccessApi* iKeyguardAccess = CKeyguardAccessApi::NewL( ); + valueKeyguard = iKeyguardAccess->IsKeyguardEnabled( ); + delete iKeyguardAccess; + + TInt valueDevicelock; + CDevicelockAccessApi* iDevicelockAccess = CDevicelockAccessApi::NewL( ); + valueDevicelock = iDevicelockAccess->IsDevicelockEnabled( ); + delete iDevicelockAccess; + + value = EFalse; + if( valueKeyguard || valueDevicelock ) + value = ETrue; + return value; } EXPORT_C void RAknKeyLock::EnableSoftNotifications(TBool aEnable) @@ -103,12 +122,66 @@ void RAknKeyLock::SendMessage(TKeyLockNotifierReason aMessage) { + + switch(aMessage) + { + case ELockEnabled: + { + CKeyguardAccessApi* iKeyguardAccess = CKeyguardAccessApi::NewL( ); + iKeyguardAccess->EnableKeyguard( ETrue ); + delete iKeyguardAccess; + } + break; + case EEnableWithoutNote: + { + CKeyguardAccessApi* iKeyguardAccess = CKeyguardAccessApi::NewL( ); + iKeyguardAccess->EnableKeyguard( EFalse ); + delete iKeyguardAccess; + } + break; + case ELockDisabled: + { + CKeyguardAccessApi* iKeyguardAccess = CKeyguardAccessApi::NewL( ); + iKeyguardAccess->DisableKeyguard( ETrue ); + delete iKeyguardAccess; + } + break; + case EDisableWithoutNote: + { + CKeyguardAccessApi* iKeyguardAccess = CKeyguardAccessApi::NewL( ); + iKeyguardAccess->DisableKeyguard( EFalse ); + delete iKeyguardAccess; + } + break; + case EOfferKeylock: + { + CKeyguardAccessApi* iKeyguardAccess = CKeyguardAccessApi::NewL( ); + iKeyguardAccess->OfferKeyguard( ); + delete iKeyguardAccess; + } + break; + case EEnableAutoLockEmulation: + { + CDevicelockAccessApi* iDevicelockAccess = CDevicelockAccessApi::NewL( ); + iDevicelockAccess->OfferDevicelock( ); // TODO maybe EnableDevicelock ? + delete iDevicelockAccess; + } + break; + default: + { + } + break; + } + /* + This is the old method. Not used anymore because now KeyguardAccessApi and DeviceLockAccessApi send the requests to Autolock + TPckgBuf > data; TRequestStatus status; data().iParamData.iReason = aMessage; StartNotifierAndGetResponse(status,KAknKeyLockNotifierUid, data, data); User::WaitForRequest(status); CancelNotifier(KAknKeyLockNotifierUid); + */ } // RAknKeyLock2 diff -r 62ef28f7b435 -r 56e9a0aaad89 uifw/AvKon/src/Aknslider.cpp --- a/uifw/AvKon/src/Aknslider.cpp Thu May 27 13:07:04 2010 +0300 +++ b/uifw/AvKon/src/Aknslider.cpp Fri Jun 11 13:54:51 2010 +0300 @@ -63,7 +63,7 @@ // Default draw color const TInt KAknSliderDefaultDrawColor = 120; const TInt KScrollRepeatTimeout = 250000; // 0.25 seconds -const TInt KStableFeedbackIntesity = 50; +const TInt KStableFeedbackIntesity = 100; const TInt KFeedbackTimeout = 100000; const TInt KNoFeedbackTimeout = 0; const TInt KStepThreshold = 15; @@ -4282,7 +4282,7 @@ { intensity = FeedbackIntensity(); } - feedback->StartFeedback( this, ETouchContinuousSlider, aPointerEvent, intensity, aTimeout ); + feedback->StartFeedback( this, ETouchDynamicSlider, aPointerEvent, intensity, aTimeout ); iExt->SetFlag( CAknSliderExtension::EFlagPlayingContinuousFb ); } } diff -r 62ef28f7b435 -r 56e9a0aaad89 uifw/EikStd/coctlsrc/EIKMENUB.CPP --- a/uifw/EikStd/coctlsrc/EIKMENUB.CPP Thu May 27 13:07:04 2010 +0300 +++ b/uifw/EikStd/coctlsrc/EIKMENUB.CPP Fri Jun 11 13:54:51 2010 +0300 @@ -983,7 +983,7 @@ TTouchLogicalFeedback fbLogicalType = ETouchFeedbackPopUp; if ( CAknTransitionUtils::TransitionsEnabled( AknTransEffect::EComponentTransitionsOff ) ) { - fbLogicalType = ETouchFeedbackPopupOpen; + fbLogicalType = ETouchFeedbackOptionsMenuOpen; } feedback->InstantFeedback( this, @@ -1173,7 +1173,7 @@ TTouchLogicalFeedback fbLogicalType = ETouchFeedbackPopUp; if ( CAknTransitionUtils::TransitionsEnabled( AknTransEffect::EComponentTransitionsOff ) ) { - fbLogicalType = ETouchFeedbackPopupClose; + fbLogicalType = ETouchFeedbackOptionsMenuClosed; } feedback->InstantFeedback( this, diff -r 62ef28f7b435 -r 56e9a0aaad89 uifw/EikStd/coctlsrc/EIKMENUP.CPP --- a/uifw/EikStd/coctlsrc/EIKMENUP.CPP Thu May 27 13:07:04 2010 +0300 +++ b/uifw/EikStd/coctlsrc/EIKMENUP.CPP Fri Jun 11 13:54:51 2010 +0300 @@ -2794,7 +2794,7 @@ TTouchLogicalFeedback fbLogicalType = ETouchFeedbackPopUp; if ( CAknTransitionUtils::TransitionsEnabled( AknTransEffect::EComponentTransitionsOff ) ) { - fbLogicalType = ETouchFeedbackPopupOpen; + fbLogicalType = ETouchFeedbackSubMenuOpen; } iExtension->ImmediateFeedback( fbLogicalType, ETouchFeedbackVibra ); @@ -4953,7 +4953,7 @@ { if ( CAknTransitionUtils::TransitionsEnabled( AknTransEffect::EComponentTransitionsOff ) ) { - iExtension->ImmediateFeedback( ETouchFeedbackPopupClose ); + iExtension->ImmediateFeedback( ETouchFeedbackSubMenuClosed ); } else { @@ -5312,7 +5312,7 @@ { if ( CAknTransitionUtils::TransitionsEnabled( AknTransEffect::EComponentTransitionsOff ) ) { - iExtension->ImmediateFeedback( ETouchFeedbackPopupClose ); + iExtension->ImmediateFeedback( ETouchFeedbackSubMenuClosed ); } else { @@ -5440,7 +5440,7 @@ { if ( CAknTransitionUtils::TransitionsEnabled( AknTransEffect::EComponentTransitionsOff ) ) { - iExtension->ImmediateFeedback( ETouchFeedbackPopupClose ); + iExtension->ImmediateFeedback( ETouchFeedbackSubMenuClosed ); } else { @@ -5549,7 +5549,7 @@ AknTransEffect::EComponentTransitionsOff ) ) { iExtension->ImmediateFeedback( - ETouchFeedbackPopupClose ); + ETouchFeedbackSubMenuClosed ); } else { diff -r 62ef28f7b435 -r 56e9a0aaad89 uifw/EikStd/coctlsrc/EIKSCRLB.CPP --- a/uifw/EikStd/coctlsrc/EIKSCRLB.CPP Thu May 27 13:07:04 2010 +0300 +++ b/uifw/EikStd/coctlsrc/EIKSCRLB.CPP Fri Jun 11 13:54:51 2010 +0300 @@ -41,7 +41,7 @@ #include "eikscrlb.h" #include "EIKSBEXT.H" -const TInt KIntensity = 50; // 50% +const TInt KIntensity = 100; // 100% const TInt KScrollBarWidth=9; // const TInt KScrollButtonHeight=10; @@ -1324,7 +1324,7 @@ feedback->StartFeedback( this, ETouchContinuousSlider, &aPointerEvent, - KIntensity, // intensity 50% + KIntensity, // intensity 100% timeout ); } extension->SetModelThumbPosition(thumbPosition); diff -r 62ef28f7b435 -r 56e9a0aaad89 uifw/EikStd/srvuisrc/EIKSRVUI.CPP --- a/uifw/EikStd/srvuisrc/EIKSRVUI.CPP Thu May 27 13:07:04 2010 +0300 +++ b/uifw/EikStd/srvuisrc/EIKSRVUI.CPP Fri Jun 11 13:54:51 2010 +0300 @@ -126,7 +126,6 @@ #include #include -#include #if defined(__WINS__) const TInt KEikServSideBarWidth = 35; @@ -629,12 +628,13 @@ EXPORT_C void CEikServAppUiBase::HandleThreadExitL(RThread& aThread) { + _LIT(KAppArcServerThread, "AppArcServerThread"); if (aThread.Name() == ASCliDefinitions::ServerAndThreadName()) // alarm server died { aThread.Close(); // need to Close() before restarting with same name iServerToRestart |= EAlwlSvr; // restarted under active object } - else if (aThread.Name()==NameApaServServerThread()) // AppArc server died + else if (aThread.Name() == KAppArcServerThread) // AppArc server died { aThread.Close(); iServerToRestart|=EApaSvr;