# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1282200974 -10800
# Node ID 8ce15fced3a6978a8796fdb50dd5107da57c8f28
# Parent  33b357311f1486a3db2c6791dab3aead4351d81f
Revision: 201031
Kit: 201033

diff -r 33b357311f14 -r 8ce15fced3a6 speechsrv_plat/vas_api/inc/vascvpbkhandler.h
--- a/speechsrv_plat/vas_api/inc/vascvpbkhandler.h	Mon Jun 21 15:41:55 2010 +0300
+++ b/speechsrv_plat/vas_api/inc/vascvpbkhandler.h	Thu Aug 19 09:56:14 2010 +0300
@@ -24,14 +24,14 @@
 
 #include <cntdef.h> 
 
-#include <vpbkfieldtype.hrh>
+#include <VPbkFieldType.hrh>
 
-#include <mvpbkcontactstorelistobserver.h>
-#include <mvpbksinglecontactoperationobserver.h>
-#include <mvpbkcontactobserver.h>
-#include <mvpbkcontactattributemanager.h>
-#include <mvpbkbatchoperationobserver.h> 
-#include <mvpbkcontactviewobserver.h> 
+#include <MVPbkContactStoreListObserver.h>
+#include <MVPbkSingleContactOperationObserver.h>
+#include <MVPbkContactObserver.h>
+#include <MVPbkContactAttributeManager.h>
+#include <MVPbkBatchOperationObserver.h> 
+#include <MVPbkContactViewObserver.h> 
 
 #include <vasmbasepbkhandler.h>
 #include <vasmcontactobserver.h>
diff -r 33b357311f14 -r 8ce15fced3a6 srsf/nssvascontacthdlr/src/nssvasccontacthandlerimpl.cpp
--- a/srsf/nssvascontacthdlr/src/nssvasccontacthandlerimpl.cpp	Mon Jun 21 15:41:55 2010 +0300
+++ b/srsf/nssvascontacthdlr/src/nssvasccontacthandlerimpl.cpp	Thu Aug 19 09:56:14 2010 +0300
@@ -1914,7 +1914,23 @@
                             CleanupStack::PushL( extIds );
 
                             extIds->AppendL( iContactQueue[k].iID ); 
-                            extIds->AppendL( fieldId ); 
+                            if ( iExtensionList[i].iCommand == EMessageCommand ||
+                                  iExtensionList[i].iCommand == EVideoCommand )
+                                {
+                                TInt id = iPbkHandler->FieldIdL();
+                                if ( id )
+                                    {
+                                    extIds->AppendL( id );
+                                    }
+                                else
+                                    {
+                                    extIds->AppendL( fieldId );
+                                    }
+                                }
+                            else
+                                {
+                                extIds->AppendL( fieldId );
+                                }
                             extIds->AppendL( action );
                             extIds->AppendL( iContactQueue[k].iType );
                             extIds->AppendL( iExtensionList[i].iCommand );
diff -r 33b357311f14 -r 8ce15fced3a6 voiceui/vcommand/data/vcommand.rss
--- a/voiceui/vcommand/data/vcommand.rss	Mon Jun 21 15:41:55 2010 +0300
+++ b/voiceui/vcommand/data/vcommand.rss	Thu Aug 19 09:56:14 2010 +0300
@@ -770,8 +770,9 @@
 //
 //-----------------------------------------------------------------------------
 //
-RESOURCE SLIDER r_vc_setting_rejection_control 
+RESOURCE SLIDER_WITH_FEEDBACK_STYLE  r_vc_setting_rejection_control 
     {
+    feedbackstyle = EAknSliderFbDynamic;
     layout = EAknSettingsItemSliderLayout;
     minvalue = 0;
     maxvalue = 10;
diff -r 33b357311f14 -r 8ce15fced3a6 voiceui/voiceuivoicerecognition/src/vuictutorial.cpp
--- a/voiceui/voiceuivoicerecognition/src/vuictutorial.cpp	Mon Jun 21 15:41:55 2010 +0300
+++ b/voiceui/voiceuivoicerecognition/src/vuictutorial.cpp	Thu Aug 19 09:56:14 2010 +0300
@@ -22,6 +22,8 @@
 #include <avkon.hrh>
 #include <centralrepository.h>
 #include <vcommanddomaincrkeys.h>
+#include <e32property.h>
+#include <ScreensaverInternalPSKeys.h>
 
 #include <vuivoicerecognition.rsg>
 
@@ -341,6 +343,12 @@
                                      iTutorialMode ) );
 
     CleanupStack::PopAndDestroy( client );
+    
+    if ( iTutorialMode )
+        {
+        //Allow screensaver if in tutorial mode
+        RProperty::Set( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 0 );
+        }
     }
 
 // ---------------------------------------------------------------------------