tactilefeedback/tactilefeedbackresolver/plugins/tactilevibraplugin/src/tactilevibraplayer.cpp
--- a/tactilefeedback/tactilefeedbackresolver/plugins/tactilevibraplugin/src/tactilevibraplayer.cpp Mon May 03 12:47:28 2010 +0300
+++ b/tactilefeedback/tactilefeedbackresolver/plugins/tactilevibraplugin/src/tactilevibraplayer.cpp Wed May 26 00:48:57 2010 +0300
@@ -52,7 +52,7 @@
User::LeaveIfError( iRepository.Get( KTactileFeedbackHapticsStrength,
iVibraLevel ) );
- if ( iVibraLevel > EProfileTactileFeedbackLevel3 )
+ if ( iVibraLevel > EProfileTactileFeedbackLevel5 )
{
User::Leave( KErrGeneral );
}
@@ -118,7 +118,6 @@
case ETouchFeedbackBounceEffect: // flow through
case ETouchFeedbackBasicSlider: // flow through
case ETouchFeedbackEditor: // flow through
- case ETouchFeedbackSensitiveKeypad:
case ETouchFeedbackLineSelection: // flow through
case ETouchFeedbackBlankSelection: // flow through
case ETouchFeedbackTextSelection: // flow through
@@ -129,11 +128,26 @@
case ETouchFeedbackItemScroll: // flow through
case ETouchFeedbackCheckbox: // flow through
case ETouchFeedbackMultitouchActivate:
+ case ETouchFeedbackBasicKeypad:
+ case ETouchFeedbackFlick:
+ case ETouchFeedbackItemDrop:
+ case ETouchFeedbackItemMoveOver:
+ case ETouchFeedbackItemPick:
+ case ETouchFeedbackMultipleCheckbox:
+ case ETouchFeedbackRotateStep:
+ case ETouchFeedbackStopFlick:
+ case ETouchFeedbackLongTap:
+ case ETouchFeedbackSubMenuOpen:
+ case ETouchFeedbackSubMenuClosed:
+ case ETouchFeedbackOptionsMenuOpen:
+ case ETouchFeedbackOptionsMenuClosed:
effectIndex = 0;
break;
case ETouchFeedbackSensitive: // flow through
case ETouchFeedbackSensitiveButton: // flow through
case ETouchFeedbackSensitiveItem:
+ case ETouchFeedbackSensitiveKeypad:
+ case ETouchFeedbackSensitiveSlider:
effectIndex = 1;
break;
default:
@@ -206,7 +220,7 @@
TInt ret( KErrArgument );
if ( aLevel > EProfileTactileFeedbackOff &&
- aLevel <= EProfileTactileFeedbackLevel3 )
+ aLevel <= EProfileTactileFeedbackLevel5 )
{
iOriginalLevel = iVibraLevel;
iVibraLevel = aLevel;
@@ -276,6 +290,34 @@
iRepository.Get( KTactileVibraDurationSensitiveLevel3,
sensitiveParams.iTime );
}
+ else if ( iVibraLevel == EProfileTactileFeedbackLevel4 )
+ {
+ // Read settings for ETouchFeedbackBasic
+ iRepository.Get( KTactileVibraIntensityBasicLevel4,
+ basicParams.iIntensity );
+ iRepository.Get( KTactileVibraDurationBasicLevel4,
+ basicParams.iTime );
+
+ // Read settings for ETouchFeedbackSensitive
+ iRepository.Get( KTactileVibraIntensitySensitiveLevel4,
+ sensitiveParams.iIntensity );
+ iRepository.Get( KTactileVibraDurationSensitiveLevel4,
+ sensitiveParams.iTime );
+ }
+ else if ( iVibraLevel == EProfileTactileFeedbackLevel5 )
+ {
+ // Read settings for ETouchFeedbackBasic
+ iRepository.Get( KTactileVibraIntensityBasicLevel5,
+ basicParams.iIntensity );
+ iRepository.Get( KTactileVibraDurationBasicLevel5,
+ basicParams.iTime );
+
+ // Read settings for ETouchFeedbackSensitive
+ iRepository.Get( KTactileVibraIntensitySensitiveLevel5,
+ sensitiveParams.iIntensity );
+ iRepository.Get( KTactileVibraDurationSensitiveLevel5,
+ sensitiveParams.iTime );
+ }
iVibraParams.Reset();