# HG changeset patch
# User hgs
# Date 1285924216 -28800
# Node ID f9a00adead4a451c7a8f71243051d408879a877e
# Parent  30ab61ef7897e5b44ffb7a27de996b213367c7a2
201039

diff -r 30ab61ef7897 -r f9a00adead4a hapticsservices_plat/tacticon_api/inc/tacticon.hrh
--- a/hapticsservices_plat/tacticon_api/inc/tacticon.hrh	Wed Sep 29 09:57:42 2010 +0800
+++ b/hapticsservices_plat/tacticon_api/inc/tacticon.hrh	Fri Oct 01 17:10:16 2010 +0800
@@ -26,7 +26,14 @@
     ENoTacticon = 0,
     EPositiveTacticon,
     ENegativeTacticon,
-    ENeutralTacticon     
+    ENeutralTacticon,
+    EAlertTacticon,
+    EInformationTacticon,
+    ENewMessageTacticon,
+    ENewEmailTacticon,
+    ECalendarTacticon,
+    EClockTacticon,
+    ERingingToneTacticon
     };
 
 #endif // TACTICON_HRH
diff -r 30ab61ef7897 -r f9a00adead4a tacticonserver/server/tacticonpluginfw/tacticonhapticsplugin/src/tacticonhapticsplayer.cpp
--- a/tacticonserver/server/tacticonpluginfw/tacticonhapticsplugin/src/tacticonhapticsplayer.cpp	Wed Sep 29 09:57:42 2010 +0800
+++ b/tacticonserver/server/tacticonpluginfw/tacticonhapticsplugin/src/tacticonhapticsplayer.cpp	Fri Oct 01 17:10:16 2010 +0800
@@ -30,11 +30,29 @@
 
 
 // Tacticons
-_LIT8( KPositiveTacticon,     "PositiveTacticon");
-_LIT8( KNegativeTacticon,     "NegativeTacticon");
+
+_LIT8( KPositiveTacticon,     "PositiveTacticon" );
+_LIT8( KNegativeTacticon,     "NegativeTacticon" );
 _LIT8( KNeutralTacticon,      "NeutralTacticon" );
-
-
+/*
+    _LIT8( KAlertTacticon,        "AlertTacticon" );
+    _LIT8( KInformationTacticon,  "InformationTacticon" );
+    _LIT8( KNewMessageTacticon,   "NewMessageTacticon" );
+    _LIT8( KNewEmailTacticon,     "NewEmailTacticon" );
+    _LIT8( KCalendarTacticon,     "CalendarTacticon" );
+    _LIT8( KClockTacticon,        "ClockTacticon" );
+    _LIT8( KRingingToneTacticon,  "RingingToneTacticon" );
+*/
+//  the tacticon names following are temporary mapped to NeutralTacticon,
+// they will be updated when the IVT files are ready.
+    _LIT8( KAlertTacticon,        "NeutralTacticon" );
+    _LIT8( KInformationTacticon,  "NeutralTacticon" );
+    _LIT8( KNewMessageTacticon,   "NeutralTacticon" );
+    _LIT8( KNewEmailTacticon,     "NeutralTacticon" );
+    _LIT8( KCalendarTacticon,     "NeutralTacticon" );
+    _LIT8( KClockTacticon,        "NeutralTacticon" );
+    _LIT8( KRingingToneTacticon,  "NeutralTacticon" );
+    
 // max length of tacticon names defined above
 const TInt KTacticonNameMaxLen = 128;
 
@@ -233,7 +251,28 @@
             break;
         case ENeutralTacticon:
             name = KNeutralTacticon;
-            break;                      
+            break;
+        case EAlertTacticon:
+            name = KAlertTacticon;
+            break;
+        case EInformationTacticon:
+            name = KInformationTacticon;
+            break;
+        case ENewMessageTacticon:
+            name = KNewMessageTacticon;
+            break;
+        case ENewEmailTacticon:
+            name = KNewEmailTacticon;
+            break;
+        case ECalendarTacticon:
+            name =KCalendarTacticon;
+            break;
+        case EClockTacticon:
+            name = KClockTacticon;
+            break;
+        case ERingingToneTacticon:
+            name = KRingingToneTacticon;
+            break;
         default:
             return;
         }
diff -r 30ab61ef7897 -r f9a00adead4a tactilefeedback/tactilefeedbackresolver/data/10.1_TactileFeedbackLevel1_A.ivt
Binary file tactilefeedback/tactilefeedbackresolver/data/10.1_TactileFeedbackLevel1_A.ivt has changed
diff -r 30ab61ef7897 -r f9a00adead4a tactilefeedback/tactilefeedbackresolver/data/10.1_TactileFeedbackLevel2_A.ivt
Binary file tactilefeedback/tactilefeedbackresolver/data/10.1_TactileFeedbackLevel2_A.ivt has changed
diff -r 30ab61ef7897 -r f9a00adead4a tactilefeedback/tactilefeedbackresolver/data/10.1_TactileFeedbackLevel3_A.ivt
Binary file tactilefeedback/tactilefeedbackresolver/data/10.1_TactileFeedbackLevel3_A.ivt has changed
diff -r 30ab61ef7897 -r f9a00adead4a tactilefeedback/tactilefeedbackresolver/data/10.1_TactileFeedbackLevel4_A.ivt
Binary file tactilefeedback/tactilefeedbackresolver/data/10.1_TactileFeedbackLevel4_A.ivt has changed
diff -r 30ab61ef7897 -r f9a00adead4a tactilefeedback/tactilefeedbackresolver/data/10.1_TactileFeedbackLevel5_A.ivt
Binary file tactilefeedback/tactilefeedbackresolver/data/10.1_TactileFeedbackLevel5_A.ivt has changed
diff -r 30ab61ef7897 -r f9a00adead4a tactilefeedback/tactilefeedbackresolver/src/tactilefeedbackresolver.cpp
--- a/tactilefeedback/tactilefeedbackresolver/src/tactilefeedbackresolver.cpp	Wed Sep 29 09:57:42 2010 +0800
+++ b/tactilefeedback/tactilefeedbackresolver/src/tactilefeedbackresolver.cpp	Fri Oct 01 17:10:16 2010 +0800
@@ -145,14 +145,6 @@
     TBool aPlayAudio )
     {
     // TRACE("CTactileFeedbackResolver::PlayFeedback - Begin");
-    
-    // A temporary solution to change effect of ETouchFeedbackSensitiveSlider,
-    // it will be removed when the IVT files is ready.
-    if( ETouchFeedbackSensitiveSlider == aFeedback )
-        {
-        aFeedback = ETouchFeedbackBasicSlider;
-        }
-
     // Feedback filtering in order to prevent too many feedbacks
     // in a short time (e.g. when doing text selection).    
     TTime now;
@@ -410,13 +402,6 @@
                           TTouchLogicalFeedback aFeedback,
                           TTouchFeedbackType aType )
     {
-    // A temporary solution to change effect of ETouchFeedbackSensitiveSlider,
-    // it will be removed when the IVT files is ready.
-    if( ETouchFeedbackSensitiveSlider == aFeedback )
-        {
-        aFeedback = ETouchFeedbackBasicSlider;
-        }
-    
     if ( aType & ETouchFeedbackVibra && iHapticsPlayer )
         {
         iHapticsPlayer->PlayPreviewFeedback( aLevel, aFeedback );