--- a/hapticsservices_pub/tactile_feedback_client_api/inc/touchlogicalfeedback.h Fri Apr 16 15:15:56 2010 +0300
+++ b/hapticsservices_pub/tactile_feedback_client_api/inc/touchlogicalfeedback.h Mon May 03 12:47:28 2010 +0300
@@ -89,14 +89,15 @@
ETouchFeedbackMultitouchActivate,
// New types for 10.1:
ETouchFeedbackBasicKeypad,
- ETouchFeedbackFlicked,
+ ETouchFeedbackFlick,
ETouchFeedbackItemDrop,
ETouchFeedbackItemMoveOver,
ETouchFeedbackItemPick,
ETouchFeedbackMultipleCheckbox,
ETouchFeedbackRotateStep,
ETouchFeedbackSensitiveSlider,
- ETouchFeedbackStopFlick
+ ETouchFeedbackStopFlick,
+ ETouchFeedbackLongPress
};
/**
--- a/tactilefeedback/tactilefeedbackclient/src/touchfeedbackimpl.cpp Fri Apr 16 15:15:56 2010 +0300
+++ b/tactilefeedback/tactilefeedbackclient/src/touchfeedbackimpl.cpp Mon May 03 12:47:28 2010 +0300
@@ -1732,7 +1732,7 @@
// range check. update when logical feedback types are changed.
if (! ( aFeedback >= ETouchFeedbackNone || aFeedback <= ETouchFeedbackSensitive)
|| ! ( aFeedback >= ETouchFeedbackBasicButton ||
- aFeedback <= ETouchFeedbackStopFlick ) )
+ aFeedback <= ETouchFeedbackLongPress ) )
{
return KErrArgument;
}
--- a/tactilefeedback/tactilefeedbackresolver/plugins/tactilehapticsplugin/src/tactilehapticsplayer.cpp Fri Apr 16 15:15:56 2010 +0300
+++ b/tactilefeedback/tactilefeedbackresolver/plugins/tactilehapticsplugin/src/tactilehapticsplayer.cpp Mon May 03 12:47:28 2010 +0300
@@ -63,7 +63,7 @@
_LIT8( KTFBasicKeypad, "TFBasic"); // To be released in IVT file version 10.1
_LIT8( KTFSensitiveKeypad, "TFSensitiveInput"); // Mapped to IVT file version 9.2
_LIT8( KTFMultitouchActivate, "TFMultiTouchRecognized"); // Mapped to IVT file version 9.2
-_LIT8( KTFFlicked, "TFBasic"); // To be released in IVT file version 10.1
+_LIT8( KTFFlick, "TFBasic"); // To be released in IVT file version 10.1
_LIT8( KTFItemDrop, "TFBasic"); // To be released in IVT file version 10.1
_LIT8( KTFItemMoveOver, "TFBasic"); // To be released in IVT file version 10.1
_LIT8( KTFItemPick, "TFBasic"); // To be released in IVT file version 10.1
@@ -71,6 +71,7 @@
_LIT8( KTFRotateStep, "TFBasic"); // To be released in IVT file version 10.1
_LIT8( KTFSensitiveSlider, "TFBasic"); // To be released in IVT file version 10.1
_LIT8( KTFStopFlick, "TFBasic"); // To be released in IVT file version 10.1
+_LIT8( KTFLongPress, "TFBasic"); // To be released in IVT file version 10.1
// Continuous feedback's names
_LIT8( KTFContinuousSmooth, "TFContinuousSmooth");
@@ -273,8 +274,8 @@
case ETouchFeedbackMultitouchActivate:
name = KTFMultitouchActivate;
break;
- case ETouchFeedbackFlicked:
- name = KTFFlicked;
+ case ETouchFeedbackFlick:
+ name = KTFFlick;
break;
case ETouchFeedbackItemDrop:
name = KTFItemDrop;
@@ -294,6 +295,9 @@
case ETouchFeedbackStopFlick:
name = KTFStopFlick;
break;
+ case ETouchFeedbackLongPress:
+ name = KTFLongPress;
+ break;
default:
User::Leave( KErrArgument );
break;