--- a/hapticsservices_pub/tactile_feedback_client_api/inc/touchlogicalfeedback.h Tue Apr 27 16:57:17 2010 +0300
+++ b/hapticsservices_pub/tactile_feedback_client_api/inc/touchlogicalfeedback.h Tue May 11 16:29:36 2010 +0300
@@ -93,7 +93,6 @@
ETouchFeedbackSubMenuOpened,
ETouchFeedbackSubMenuClosed,
ETouchFeedbackLongTap,
- ETouchFeedbackDynamicSlider,
ETouchFeedbackMultiTouchRecognized
};
@@ -106,7 +105,8 @@
ETouchContinuousSmooth = 0x300, // For generic continuous feedback for custom controls
ETouchContinuousSlider,
ETouchContinuousInput,
- ETouchContinuousFlick
+ ETouchContinuousFlick,
+ ETouchDynamicSlider
};
/**
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/plugins/tactileaudioplugin/src/tactileaudioplayer.cpp Tue Apr 27 16:57:17 2010 +0300
+++ b/tactilefeedback/tactilefeedbackresolver/plugins/tactileaudioplugin/src/tactileaudioplayer.cpp Tue May 11 16:29:36 2010 +0300
@@ -138,7 +138,6 @@
case ETouchFeedbackBoundaryList: // flow through
case ETouchFeedbackSlider: // flow through
case ETouchFeedbackEdit: // flow through
- case ETouchFeedbackSensitiveInput:
case ETouchFeedbackLineSelection: // flow through
case ETouchFeedbackBlankSelection: // flow through
case ETouchFeedbackTextSelection: // flow through
@@ -155,13 +154,13 @@
case ETouchFeedbackSubMenuOpened:
case ETouchFeedbackSubMenuClosed:
case ETouchFeedbackLongTap:
- case ETouchFeedbackDynamicSlider:
case ETouchFeedbackMultiTouchRecognized:
volumeIndex = 0;
break;
case ETouchFeedbackSensitive: // flow through
case ETouchFeedbackSensitiveButton: // flow through
case ETouchFeedbackSensitiveList:
+ case ETouchFeedbackSensitiveInput:
volumeIndex = 1;
break;
default:
--- a/tactilefeedback/tactilefeedbackresolver/plugins/tactilehapticsplugin/src/tactilehapticsplayer.cpp Tue Apr 27 16:57:17 2010 +0300
+++ b/tactilefeedback/tactilefeedbackresolver/plugins/tactilehapticsplugin/src/tactilehapticsplayer.cpp Tue May 11 16:29:36 2010 +0300
@@ -68,7 +68,6 @@
_LIT8( KTFSubMenuOpened, "TFSubMenuOpened");
_LIT8( KTFSubMenuClosed, "TFSubMenuClosed");
_LIT8( KTFLongTap, "TFLongTap");
-_LIT8( KTFDynamicSlider, "TFDynamicSlider");
_LIT8( KTFMultiTouchRecognized, "TFMultiTouchRecognized");
// Continuous feedback's names
@@ -76,6 +75,7 @@
_LIT8( KTFContinuousSlider, "TFContinuousSlider");
_LIT8( KTFContinuousInput, "TFContinuousInput");
_LIT8( KTFContinuousFlick, "TFContinuousFlick");
+_LIT8( KTFDynamicSlider, "TFDynamicSlider");
// ---------------------------------------------------------------------------
// Constructor.
// ---------------------------------------------------------------------------
@@ -121,7 +121,7 @@
// profiles engine
InitializeProfilesEngineL();
- if ( iVibraLevel > EProfileAudioFeedbackLevel3 )
+ if ( iVibraLevel > EProfileTactileFeedbackLevel3 )
{
User::Leave( KErrGeneral );
}
@@ -298,9 +298,6 @@
case ETouchFeedbackLongTap:
name = KTFLongTap;
break;
- case ETouchFeedbackDynamicSlider:
- name = KTFDynamicSlider;
- break;
case ETouchFeedbackMultiTouchRecognized:
name = KTFMultiTouchRecognized;
break;
@@ -404,6 +401,9 @@
case ETouchContinuousFlick:
name = KTFContinuousFlick;
break;
+ case ETouchDynamicSlider:
+ name = KTFDynamicSlider;
+ break;
default:
ret = KErrArgument;
break;
--- a/tactilefeedback/tactilefeedbackresolver/plugins/tactiletoneplugin/src/tactiletoneplayer.cpp Tue Apr 27 16:57:17 2010 +0300
+++ b/tactilefeedback/tactilefeedbackresolver/plugins/tactiletoneplugin/src/tactiletoneplayer.cpp Tue May 11 16:29:36 2010 +0300
@@ -143,7 +143,6 @@
case ETouchFeedbackBoundaryList: // flow through
case ETouchFeedbackSlider: // flow through
case ETouchFeedbackEdit: // flow through
- case ETouchFeedbackSensitiveInput:
case ETouchFeedbackLineSelection: // flow through
case ETouchFeedbackBlankSelection: // flow through
case ETouchFeedbackTextSelection: // flow through
@@ -160,13 +159,13 @@
case ETouchFeedbackSubMenuOpened:
case ETouchFeedbackSubMenuClosed:
case ETouchFeedbackLongTap:
- case ETouchFeedbackDynamicSlider:
case ETouchFeedbackMultiTouchRecognized:
effectIndex = 0;
break;
case ETouchFeedbackSensitive: // flow through
case ETouchFeedbackSensitiveButton: // flow through
case ETouchFeedbackSensitiveList:
+ case ETouchFeedbackSensitiveInput:
effectIndex = 1;
break;
default:
--- a/tactilefeedback/tactilefeedbackresolver/plugins/tactilevibraplugin/src/tactilevibraplayer.cpp Tue Apr 27 16:57:17 2010 +0300
+++ b/tactilefeedback/tactilefeedbackresolver/plugins/tactilevibraplugin/src/tactilevibraplayer.cpp Tue May 11 16:29:36 2010 +0300
@@ -118,7 +118,6 @@
case ETouchFeedbackBoundaryList: // flow through
case ETouchFeedbackSlider: // flow through
case ETouchFeedbackEdit: // flow through
- case ETouchFeedbackSensitiveInput:
case ETouchFeedbackLineSelection: // flow through
case ETouchFeedbackBlankSelection: // flow through
case ETouchFeedbackTextSelection: // flow through
@@ -135,13 +134,13 @@
case ETouchFeedbackSubMenuOpened:
case ETouchFeedbackSubMenuClosed:
case ETouchFeedbackLongTap:
- case ETouchFeedbackDynamicSlider:
case ETouchFeedbackMultiTouchRecognized:
effectIndex = 0;
break;
case ETouchFeedbackSensitive: // flow through
case ETouchFeedbackSensitiveButton: // flow through
case ETouchFeedbackSensitiveList:
+ case ETouchFeedbackSensitiveInput:
effectIndex = 1;
break;
default:
--- a/tactilefeedback/tactilefeedbackresolver/src/tactilefeedbackresolver.cpp Tue Apr 27 16:57:17 2010 +0300
+++ b/tactilefeedback/tactilefeedbackresolver/src/tactilefeedbackresolver.cpp Tue May 11 16:29:36 2010 +0300
@@ -112,17 +112,31 @@
TBool CTactileFeedbackResolver::IsHigherThanPlaying(
TTouchLogicalFeedback aFeedback ) const
{
- return ( aFeedback == ETouchFeedbackPopUp ||
- aFeedback == ETouchFeedbackIncreasingPopUp ||
- aFeedback == ETouchFeedbackDecreasingPopUp ||
- aFeedback == ETouchFeedbackBoundaryList ||
- aFeedback == ETouchFeedbackOptionsMenuOpened ||
- aFeedback == ETouchFeedbackOptionsMenuClosed ||
- aFeedback == ETouchFeedbackSubMenuOpened ||
- aFeedback == ETouchFeedbackSubMenuClosed ) &&
- ( iLastFeedback == ETouchFeedbackBasicButton ||
- iLastFeedback == ETouchFeedbackSensitiveList ||
- iLastFeedback == ETouchFeedbackList );
+ if( aFeedback == ETouchFeedbackList &&
+ iLastFeedback == ETouchFeedbackSensitiveList )
+ {
+ return ETrue;
+ }
+
+ return ( ( aFeedback == ETouchFeedbackPopUp ||
+ aFeedback == ETouchFeedbackIncreasingPopUp ||
+ aFeedback == ETouchFeedbackDecreasingPopUp ||
+ aFeedback == ETouchFeedbackBoundaryList ||
+ aFeedback == ETouchFeedbackOptionsMenuOpened ||
+ aFeedback == ETouchFeedbackOptionsMenuClosed ||
+ aFeedback == ETouchFeedbackSubMenuOpened ||
+ aFeedback == ETouchFeedbackSubMenuClosed ) &&
+ ( iLastFeedback == ETouchFeedbackBasicButton ||
+ iLastFeedback == ETouchFeedbackSensitiveButton ||
+ iLastFeedback == ETouchFeedbackSensitiveList ||
+ iLastFeedback == ETouchFeedbackList ||
+ iLastFeedback == ETouchFeedbackCheckbox ) )
+ || (
+ aFeedback == ETouchFeedbackPopUp &&
+ (iLastFeedback == ETouchFeedbackIncreasingPopUp ||
+ iLastFeedback == ETouchFeedbackOptionsMenuOpened ||
+ iLastFeedback == ETouchFeedbackSubMenuOpened)
+ );
}
// ---------------------------------------------------------------------------
@@ -158,14 +172,6 @@
else if ( IsHigherThanPlaying( aFeedback ) )
{
willPlay = ETrue;
- if( iAudioPlayer )
- {
- iAudioPlayer->StopFeedback();
- }
- if( iHapticsPlayer )
- {
- iHapticsPlayer->StopFeedback();
- }
}
if ( willPlay )