--- a/hapticsservices_plat/tactile_feedback_core_api/inc/tactilefeedback.h Tue May 11 16:29:36 2010 +0300
+++ b/hapticsservices_plat/tactile_feedback_core_api/inc/tactilefeedback.h Wed Jun 09 10:00:50 2010 +0300
@@ -92,7 +92,7 @@
IMPORT_C void ModifyFeedback( TInt aIntensity );
/**
- * Stops the ongoing continuous feedback.
+ * Stops the ongoing feedback.
*
* @since S60 5.2
*/
--- a/hapticsservices_pub/tactile_feedback_client_api/inc/touchfeedback.h Tue May 11 16:29:36 2010 +0300
+++ b/hapticsservices_pub/tactile_feedback_client_api/inc/touchfeedback.h Wed Jun 09 10:00:50 2010 +0300
@@ -584,10 +584,10 @@
/**
- * This function stops continuous feedback.
+ * This function stops feedback.
*
* @since S60 5.2
- * @param aControl - The control which continuous feedback is stopped.
+ * @param aControl - The control which feedback is stopped.
*/
virtual void StopFeedback( const CCoeControl* aControl ) = 0;
--- a/tactilefeedback/tactilefeedbackclient/inc/touchfeedbackclient.h Tue May 11 16:29:36 2010 +0300
+++ b/tactilefeedback/tactilefeedbackclient/inc/touchfeedbackclient.h Wed Jun 09 10:00:50 2010 +0300
@@ -120,11 +120,11 @@
TInt aIntensity );
/**
- * Stops the continuous feedback.
+ * Stops the feedback.
*
* @since S60 5.2
* @param aClientHandle - Handle of a client to check if caller started
- * the playing continuous feedback.
+ * the playing feedback.
*/
void StopFeedback( TUint32 aClientHandle );
--- a/tactilefeedback/tactilefeedbackclient/src/touchfeedbackclient.cpp Tue May 11 16:29:36 2010 +0300
+++ b/tactilefeedback/tactilefeedbackclient/src/touchfeedbackclient.cpp Wed Jun 09 10:00:50 2010 +0300
@@ -613,6 +613,10 @@
// Clear also client handle to indicate there's no ongoing feedback.
iClientHandle = 0;
}
+ else if ( !iClientHandle ) // Stop instant feedback
+ {
+ iFbClient.StopFeedback();
+ }
TRACE("CTouchFeedbackClient::StopFeedback - End");
}
--- a/tactilefeedback/tactilefeedbackclient/src/touchfeedbackimpl.cpp Tue May 11 16:29:36 2010 +0300
+++ b/tactilefeedback/tactilefeedbackclient/src/touchfeedbackimpl.cpp Wed Jun 09 10:00:50 2010 +0300
@@ -1730,9 +1730,8 @@
item.iEventType = aEventType;
// range check. update when logical feedback types are changed.
- if (! ( aFeedback >= ETouchFeedbackNone || aFeedback <= ETouchFeedbackSensitive)
- || ! ( aFeedback >= ETouchFeedbackBasicButton ||
- aFeedback <= ETouchFeedbackMultiTouchRecognized ) )
+ if ( !(aFeedback >= ETouchFeedbackNone && aFeedback <= ETouchFeedbackSensitive)
+ && !(aFeedback >= ETouchFeedbackBasicButton && aFeedback <= ETouchFeedbackMultiTouchRecognized) )
{
return KErrArgument;
}
Binary file tactilefeedback/tactilefeedbackresolver/data/9.2_TactileFeedbackLevel1_A.ivt has changed
Binary file tactilefeedback/tactilefeedbackresolver/data/9.2_TactileFeedbackLevel2_A.ivt has changed
Binary file tactilefeedback/tactilefeedbackresolver/data/9.2_TactileFeedbackLevel3_A.ivt has changed
--- a/tactilefeedback/tactilefeedbackresolver/inc/tactilefeedbackresolver.h Tue May 11 16:29:36 2010 +0300
+++ b/tactilefeedback/tactilefeedbackresolver/inc/tactilefeedbackresolver.h Wed Jun 09 10:00:50 2010 +0300
@@ -87,7 +87,7 @@
void ModifyFeedback( TInt aIntensity );
/**
- * Stops the ongoing continuous feedback.
+ * Stops the ongoing feedback.
*
* @since S60 5.2
*/
--- a/tactilefeedback/tactilefeedbackresolver/inc/tactilefeedbacksession.h Tue May 11 16:29:36 2010 +0300
+++ b/tactilefeedback/tactilefeedbackresolver/inc/tactilefeedbacksession.h Wed Jun 09 10:00:50 2010 +0300
@@ -74,7 +74,7 @@
void ModifyFeedback( const RMessage2& aMessage );
/**
- * Stop continuous feedback.
+ * Stop feedback.
*/
void StopFeedback( const RMessage2& aMessage );
--- a/tactilefeedback/tactilefeedbackresolver/inc/tactilefeedbacksrv.h Tue May 11 16:29:36 2010 +0300
+++ b/tactilefeedback/tactilefeedbackresolver/inc/tactilefeedbacksrv.h Wed Jun 09 10:00:50 2010 +0300
@@ -135,7 +135,7 @@
void ModifyFeedback( TInt aIntensity );
/**
- * Stop continuous feedback.
+ * Stop feedback.
*/
void StopFeedback();
--- a/tactilefeedback/tactilefeedbackresolver/inc/tactileplayer.h Tue May 11 16:29:36 2010 +0300
+++ b/tactilefeedback/tactilefeedbackresolver/inc/tactileplayer.h Wed Jun 09 10:00:50 2010 +0300
@@ -159,7 +159,7 @@
IMPORT_C virtual TInt ModifyFeedback( TInt aIntensity );
/**
- * Stops continuous feedback.
+ * Stops feedback.
*
* @since S60 5.2
*/
--- a/tactilefeedback/tactilefeedbackresolver/src/tactilefeedbackresolver.cpp Tue May 11 16:29:36 2010 +0300
+++ b/tactilefeedback/tactilefeedbackresolver/src/tactilefeedbackresolver.cpp Wed Jun 09 10:00:50 2010 +0300
@@ -130,13 +130,7 @@
iLastFeedback == ETouchFeedbackSensitiveButton ||
iLastFeedback == ETouchFeedbackSensitiveList ||
iLastFeedback == ETouchFeedbackList ||
- iLastFeedback == ETouchFeedbackCheckbox ) )
- || (
- aFeedback == ETouchFeedbackPopUp &&
- (iLastFeedback == ETouchFeedbackIncreasingPopUp ||
- iLastFeedback == ETouchFeedbackOptionsMenuOpened ||
- iLastFeedback == ETouchFeedbackSubMenuOpened)
- );
+ iLastFeedback == ETouchFeedbackCheckbox ) );
}
// ---------------------------------------------------------------------------
@@ -172,6 +166,7 @@
else if ( IsHigherThanPlaying( aFeedback ) )
{
willPlay = ETrue;
+ StopFeedback();
}
if ( willPlay )
@@ -374,7 +369,7 @@
}
// ---------------------------------------------------------------------------
-// Stop continuous feedback.
+// Stop feedback.
// ---------------------------------------------------------------------------
//
void CTactileFeedbackResolver::StopFeedback()
--- a/tactilefeedback/tactilefeedbackresolver/src/tactileplayer.cpp Tue May 11 16:29:36 2010 +0300
+++ b/tactilefeedback/tactilefeedbackresolver/src/tactileplayer.cpp Wed Jun 09 10:00:50 2010 +0300
@@ -118,8 +118,8 @@
//
EXPORT_C void CTactilePlayer::StopFeedback()
{
- // Empty implementation for plugins, which don't support
- // continuous feedback.
+ // Empty implementation for plugins, which needn't stop
+ // playing feedback.
}
// ---------------------------------------------------------------------------