--- a/tacticonserver/tacticonactionplugin/data/tacticon.rul Tue Jun 08 18:37:57 2010 +0800
+++ b/tacticonserver/tacticonactionplugin/data/tacticon.rul Fri Jul 23 17:04:55 2010 +0800
@@ -1,59 +1,59 @@
-<script xmlns="http://www.nokia.com/ns/cep/script/1.0/"
-xmlns:cep="http://www.nokia.com/ns/cep/1.0/">
- <if>
- <equals>
- <contextRef source='Sensor' type='Event.Proximity'/>
- <string>Discernible</string>
- </equals>
- <actions>
- <!-- Proximity notify -->
- <Tacticon Mode='PROXIMITY_ON'/>
- </actions>
- </if>
- <elseIf>
- <equals>
- <contextRef source='Sensor' type='Event.Proximity'/>
- <string>Indiscernible</string>
- </equals>
- <actions>
- <!-- Proximity notify -->
- <Tacticon Mode='PROXIMITY_OFF'/>
- </actions>
- </elseIf>
- <elseIf>
- <equals>
- <contextRef source='Call' type='State'/>
- <string>Dialling</string>
- </equals>
- <actions>
- <!-- Disable Tacticons -->
- <Tacticon Mode='CALL_DIALLING'/>
- </actions>
- </elseIf>
- <elseIf>
- <equals>
- <contextRef source='Call' type='State'/>
- <string>Connected</string>
- </equals>
- <actions>
- <!-- Disable Tacticons -->
- <Tacticon Mode='CALL_CONNECTED'/>
- </actions>
- </elseIf>
- <elseIf>
- <or>
- <equals>
- <contextRef source='Call' type='State'/>
- <string>None</string>
- </equals>
- <equals>
- <contextRef source='Call' type='State'/>
- <string>Disconnecting</string>
- </equals>
- </or>
- <actions>
- <!-- Enable Tacticons -->
- <Tacticon Mode='CALL_DISCONNECTED'/>
- </actions>
- </elseIf>
+<script xmlns="http://www.nokia.com/ns/cep/script/1.0/"
+xmlns:cep="http://www.nokia.com/ns/cep/1.0/">
+ <if>
+ <equals>
+ <contextRef source='Sensor' type='Event.Proximity'/>
+ <string>Discernible</string>
+ </equals>
+ <actions>
+ <!-- Proximity notify -->
+ <Tacticon Mode='PROXIMITY_ON'/>
+ </actions>
+ </if>
+ <elseIf>
+ <equals>
+ <contextRef source='Sensor' type='Event.Proximity'/>
+ <string>Indiscernible</string>
+ </equals>
+ <actions>
+ <!-- Proximity notify -->
+ <Tacticon Mode='PROXIMITY_OFF'/>
+ </actions>
+ </elseIf>
+ <elseIf>
+ <equals>
+ <contextRef source='Call' type='State'/>
+ <string>Dialling</string>
+ </equals>
+ <actions>
+ <!-- Disable Tacticons -->
+ <Tacticon Mode='CALL_DIALLING'/>
+ </actions>
+ </elseIf>
+ <elseIf>
+ <equals>
+ <contextRef source='Call' type='State'/>
+ <string>Connected</string>
+ </equals>
+ <actions>
+ <!-- Disable Tacticons -->
+ <Tacticon Mode='CALL_CONNECTED'/>
+ </actions>
+ </elseIf>
+ <elseIf>
+ <or>
+ <equals>
+ <contextRef source='Call' type='State'/>
+ <string>None</string>
+ </equals>
+ <equals>
+ <contextRef source='Call' type='State'/>
+ <string>Disconnecting</string>
+ </equals>
+ </or>
+ <actions>
+ <!-- Enable Tacticons -->
+ <Tacticon Mode='CALL_DISCONNECTED'/>
+ </actions>
+ </elseIf>
</script>
\ No newline at end of file
--- a/tactilefeedback/tactilearearegistry/src/tactilearearegistry.cpp Tue Jun 08 18:37:57 2010 +0800
+++ b/tactilefeedback/tactilearearegistry/src/tactilearearegistry.cpp Fri Jul 23 17:04:55 2010 +0800
@@ -194,8 +194,8 @@
newItem.iWindowGroupId = aIdentifier;
newItem.iConnectionHandle = aConnectionHandle;
-
- iWgArray.Append( newItem );
+ // if append fail just make its action like before
+ TRAP_IGNORE( iWgArray.AppendL( newItem ) );
}
--- a/tactilefeedback/tactilearearegistry/traces/tracebuilder.cache Tue Jun 08 18:37:57 2010 +0800
+++ b/tactilefeedback/tactilearearegistry/traces/tracebuilder.cache Fri Jul 23 17:04:55 2010 +0800
@@ -1,30 +1,30 @@
-<model>
- <id>536917138</id>
- <name>tactilearearegistry</name>
- <group>
- <id>64</id>
- <name>TACTILE_PERFORMANCE</name>
- <trace>
- <text>e_TACTILE_REGISTRY_HIT_TEST 1</text>
- <id>1</id>
- <name>TACTILE_REGISTRY_HIT_TEST_1</name>
- <location>
- <file>../src/tactilearearegistry.cpp</file>
- <line>238</line>
- <class>CTactileAreaRegistry</class>
- <function>HitTestPointerEvent</function>
- </location>
- </trace>
- <trace>
- <text>e_TACTILE_REGISTRY_HIT_TEST 0</text>
- <id>2</id>
- <name>TACTILE_REGISTRY_HIT_TEST_0</name>
- <location>
- <file>../src/tactilearearegistry.cpp</file>
- <line>263</line>
- <class>CTactileAreaRegistry</class>
- <function>HitTestPointerEvent</function>
- </location>
- </trace>
- </group>
-</model>
+<model>
+ <id>536917138</id>
+ <name>tactilearearegistry</name>
+ <group>
+ <id>64</id>
+ <name>TACTILE_PERFORMANCE</name>
+ <trace>
+ <text>e_TACTILE_REGISTRY_HIT_TEST 1</text>
+ <id>1</id>
+ <name>TACTILE_REGISTRY_HIT_TEST_1</name>
+ <location>
+ <file>../src/tactilearearegistry.cpp</file>
+ <line>238</line>
+ <class>CTactileAreaRegistry</class>
+ <function>HitTestPointerEvent</function>
+ </location>
+ </trace>
+ <trace>
+ <text>e_TACTILE_REGISTRY_HIT_TEST 0</text>
+ <id>2</id>
+ <name>TACTILE_REGISTRY_HIT_TEST_0</name>
+ <location>
+ <file>../src/tactilearearegistry.cpp</file>
+ <line>263</line>
+ <class>CTactileAreaRegistry</class>
+ <function>HitTestPointerEvent</function>
+ </location>
+ </trace>
+ </group>
+</model>
--- a/tactilefeedback/tactileclickplugin/traces/tracebuilder.cache Tue Jun 08 18:37:57 2010 +0800
+++ b/tactilefeedback/tactileclickplugin/traces/tracebuilder.cache Fri Jul 23 17:04:55 2010 +0800
@@ -1,74 +1,74 @@
-<model>
- <id>536917139</id>
- <name>tactileclickplugin</name>
- <group>
- <id>64</id>
- <name>TACTILE_PERFORMANCE</name>
- <trace>
- <text>e_TACTILE_CLICK_PLUGIN_PEN_EVENT 1</text>
- <id>1</id>
- <name>TACTILE_CLICK_PLUGIN_PEN_EVENT_1</name>
- <location>
- <file>../src/tactileclickplugin.cpp</file>
- <line>134</line>
- <class>CTactileClickPlugin</class>
- <function>OtherEvent</function>
- </location>
- </trace>
- <trace>
- <text>e_TACTILE_CLICK_PLUGIN_PEN_EVENT 0</text>
- <id>2</id>
- <name>TACTILE_CLICK_PLUGIN_PEN_EVENT_0</name>
- <location>
- <file>../src/tactileclickplugin.cpp</file>
- <line>161</line>
- <class>CTactileClickPlugin</class>
- <function>OtherEvent</function>
- </location>
- </trace>
- <trace>
- <text>e_TACTILE_CLICK_PLUGIN_INSTANT_FEEDBACK_SERVER_API 1</text>
- <id>3</id>
- <name>TACTILE_CLICK_PLUGIN_INSTANT_FEEDBACK_SERVER_API_1</name>
- <location>
- <file>../src/tactileclickplugin.cpp</file>
- <line>242</line>
- <class>CTactileClickPlugin</class>
- <function>InstantFeedback</function>
- </location>
- </trace>
- <trace>
- <text>e_TACTILE_CLICK_PLUGIN_INSTANT_FEEDBACK_SERVER_API 0</text>
- <id>4</id>
- <name>TACTILE_CLICK_PLUGIN_INSTANT_FEEDBACK_SERVER_API_0</name>
- <location>
- <file>../src/tactileclickplugin.cpp</file>
- <line>246</line>
- <class>CTactileClickPlugin</class>
- <function>InstantFeedback</function>
- </location>
- </trace>
- <trace>
- <text>e_TACTILE_CLICK_PLUGIN_INSTANT_FEEDBACK_CLIENT_API 1</text>
- <id>5</id>
- <name>TACTILE_CLICK_PLUGIN_INSTANT_FEEDBACK_CLIENT_API_1</name>
- <location>
- <file>../src/tactileclickplugin.cpp</file>
- <line>343</line>
- <class>CTactileClickPlugin</class>
- <function>HandleImmediateFeedback</function>
- </location>
- </trace>
- <trace>
- <text>e_TACTILE_CLICK_PLUGIN_INSTANT_FEEDBACK_CLIENT_API 0</text>
- <id>6</id>
- <name>TACTILE_CLICK_PLUGIN_INSTANT_FEEDBACK_CLIENT_API_0</name>
- <location>
- <file>../src/tactileclickplugin.cpp</file>
- <line>349</line>
- <class>CTactileClickPlugin</class>
- <function>HandleImmediateFeedback</function>
- </location>
- </trace>
- </group>
-</model>
+<model>
+ <id>536917139</id>
+ <name>tactileclickplugin</name>
+ <group>
+ <id>64</id>
+ <name>TACTILE_PERFORMANCE</name>
+ <trace>
+ <text>e_TACTILE_CLICK_PLUGIN_PEN_EVENT 1</text>
+ <id>1</id>
+ <name>TACTILE_CLICK_PLUGIN_PEN_EVENT_1</name>
+ <location>
+ <file>../src/tactileclickplugin.cpp</file>
+ <line>134</line>
+ <class>CTactileClickPlugin</class>
+ <function>OtherEvent</function>
+ </location>
+ </trace>
+ <trace>
+ <text>e_TACTILE_CLICK_PLUGIN_PEN_EVENT 0</text>
+ <id>2</id>
+ <name>TACTILE_CLICK_PLUGIN_PEN_EVENT_0</name>
+ <location>
+ <file>../src/tactileclickplugin.cpp</file>
+ <line>161</line>
+ <class>CTactileClickPlugin</class>
+ <function>OtherEvent</function>
+ </location>
+ </trace>
+ <trace>
+ <text>e_TACTILE_CLICK_PLUGIN_INSTANT_FEEDBACK_SERVER_API 1</text>
+ <id>3</id>
+ <name>TACTILE_CLICK_PLUGIN_INSTANT_FEEDBACK_SERVER_API_1</name>
+ <location>
+ <file>../src/tactileclickplugin.cpp</file>
+ <line>242</line>
+ <class>CTactileClickPlugin</class>
+ <function>InstantFeedback</function>
+ </location>
+ </trace>
+ <trace>
+ <text>e_TACTILE_CLICK_PLUGIN_INSTANT_FEEDBACK_SERVER_API 0</text>
+ <id>4</id>
+ <name>TACTILE_CLICK_PLUGIN_INSTANT_FEEDBACK_SERVER_API_0</name>
+ <location>
+ <file>../src/tactileclickplugin.cpp</file>
+ <line>246</line>
+ <class>CTactileClickPlugin</class>
+ <function>InstantFeedback</function>
+ </location>
+ </trace>
+ <trace>
+ <text>e_TACTILE_CLICK_PLUGIN_INSTANT_FEEDBACK_CLIENT_API 1</text>
+ <id>5</id>
+ <name>TACTILE_CLICK_PLUGIN_INSTANT_FEEDBACK_CLIENT_API_1</name>
+ <location>
+ <file>../src/tactileclickplugin.cpp</file>
+ <line>343</line>
+ <class>CTactileClickPlugin</class>
+ <function>HandleImmediateFeedback</function>
+ </location>
+ </trace>
+ <trace>
+ <text>e_TACTILE_CLICK_PLUGIN_INSTANT_FEEDBACK_CLIENT_API 0</text>
+ <id>6</id>
+ <name>TACTILE_CLICK_PLUGIN_INSTANT_FEEDBACK_CLIENT_API_0</name>
+ <location>
+ <file>../src/tactileclickplugin.cpp</file>
+ <line>349</line>
+ <class>CTactileClickPlugin</class>
+ <function>HandleImmediateFeedback</function>
+ </location>
+ </trace>
+ </group>
+</model>
--- a/tactilefeedback/tactilefeedbackclient/src/touchfeedbackimpl.cpp Tue Jun 08 18:37:57 2010 +0800
+++ b/tactilefeedback/tactilefeedbackclient/src/touchfeedbackimpl.cpp Fri Jul 23 17:04:55 2010 +0800
@@ -755,8 +755,8 @@
newCacheEntry.iAudioDisabled = !aEnableAudio;
newCacheEntry.iVisible = aControl->IsVisible();
newCacheEntry.iDimmed = aControl->IsDimmed();
-
- iControlCache.Append( newCacheEntry );
+ // if append fail just make its action like before
+ TRAP_IGNORE( iControlCache.AppendL( newCacheEntry ) );
}
}
}
@@ -1767,8 +1767,8 @@
item.iFeedback = aFeedback;
item.iFeedbackType = aFeedbackType;
- iFbArray.Append(item);
- return KErrNone;
+ TInt err = iFbArray.Append(item);
+ return err;
}
// ---------------------------------------------------------------------------
@@ -1787,7 +1787,8 @@
item.iFeedback = iFbArray[i].iFeedback;
item.iEventType = iFbArray[i].iEventType;
item.iFeedbackType = iFbArray[i].iFeedbackType;
- aArray.Append(item);
+ // if append fail just make its action like before
+ TRAP_IGNORE( aArray.AppendL( item ) );
}
}
--- a/tactilefeedback/tactilefeedbackclient/traces/tracebuilder.cache Tue Jun 08 18:37:57 2010 +0800
+++ b/tactilefeedback/tactilefeedbackclient/traces/tracebuilder.cache Fri Jul 23 17:04:55 2010 +0800
@@ -1,30 +1,30 @@
-<model>
- <id>536917137</id>
- <name>touchfeedback</name>
- <group>
- <id>64</id>
- <name>TACTILE_PERFORMANCE</name>
- <trace>
- <text>e_TACTILE_CLIENT_INSTANT_FEEDBACK 1</text>
- <id>1</id>
- <name>TACTILE_CLIENT_INSTANT_FEEDBACK_1</name>
- <location>
- <file>../src/touchfeedbackclient.cpp</file>
- <line>502</line>
- <class>CTouchFeedbackClient</class>
- <function>ImmediateFeedback</function>
- </location>
- </trace>
- <trace>
- <text>e_TACTILE_CLIENT_INSTANT_FEEDBACK 0</text>
- <id>2</id>
- <name>TACTILE_CLIENT_INSTANT_FEEDBACK_0</name>
- <location>
- <file>../src/touchfeedbackclient.cpp</file>
- <line>509</line>
- <class>CTouchFeedbackClient</class>
- <function>ImmediateFeedback</function>
- </location>
- </trace>
- </group>
-</model>
+<model>
+ <id>536917137</id>
+ <name>touchfeedback</name>
+ <group>
+ <id>64</id>
+ <name>TACTILE_PERFORMANCE</name>
+ <trace>
+ <text>e_TACTILE_CLIENT_INSTANT_FEEDBACK 1</text>
+ <id>1</id>
+ <name>TACTILE_CLIENT_INSTANT_FEEDBACK_1</name>
+ <location>
+ <file>../src/touchfeedbackclient.cpp</file>
+ <line>502</line>
+ <class>CTouchFeedbackClient</class>
+ <function>ImmediateFeedback</function>
+ </location>
+ </trace>
+ <trace>
+ <text>e_TACTILE_CLIENT_INSTANT_FEEDBACK 0</text>
+ <id>2</id>
+ <name>TACTILE_CLIENT_INSTANT_FEEDBACK_0</name>
+ <location>
+ <file>../src/touchfeedbackclient.cpp</file>
+ <line>509</line>
+ <class>CTouchFeedbackClient</class>
+ <function>ImmediateFeedback</function>
+ </location>
+ </trace>
+ </group>
+</model>
--- a/tactilefeedback/tactilefeedbackresolver/plugins/tactileaudioplugin/src/tactileaudioplayer.cpp Tue Jun 08 18:37:57 2010 +0800
+++ b/tactilefeedback/tactilefeedbackresolver/plugins/tactileaudioplugin/src/tactileaudioplayer.cpp Fri Jul 23 17:04:55 2010 +0800
@@ -347,10 +347,9 @@
iRepository.Get( KTactileAudioWavFileBasicLevel2, basicFileName );
iRepository.Get( KTactileAudioWavFileSensitiveLevel2, sensitiveFileName );
-
- iVolumeLevels.Append( basicVolumeLevel );
- iVolumeLevels.Append( sensitiveVolumeLevel );
-
+ iVolumeLevels.AppendL( basicVolumeLevel );
+ iVolumeLevels.AppendL( sensitiveVolumeLevel );
+
TRACE("CTactileAudioPlayer::ReadSettingsL() - End");
}
--- a/tactilefeedback/tactilefeedbackresolver/plugins/tactiletoneplugin/src/tactiletoneplayer.cpp Tue Jun 08 18:37:57 2010 +0800
+++ b/tactilefeedback/tactilefeedbackresolver/plugins/tactiletoneplugin/src/tactiletoneplayer.cpp Fri Jul 23 17:04:55 2010 +0800
@@ -421,8 +421,9 @@
sensitiveParams.iVolume = ScaleVolume( sensitiveParams.iVolume );
// Store parameters for different feedback types
- iSoundParams.Append( basicParams );
- iSoundParams.Append( sensitiveParams );
+ // if append fail just make its action like before
+ TRAP_IGNORE( iSoundParams.AppendL( basicParams ) );
+ TRAP_IGNORE( iSoundParams.AppendL( sensitiveParams ) );
TRACE("CTactileTonePlayer::ReadSettingsL - End");
}
--- a/tactilefeedback/tactilefeedbackresolver/plugins/tactilevibraplugin/src/tactilevibraplayer.cpp Tue Jun 08 18:37:57 2010 +0800
+++ b/tactilefeedback/tactilefeedbackresolver/plugins/tactilevibraplugin/src/tactilevibraplayer.cpp Fri Jul 23 17:04:55 2010 +0800
@@ -317,8 +317,8 @@
iVibraParams.Reset();
- iVibraParams.Append( basicParams );
- iVibraParams.Append( sensitiveParams );
+ TRAP_IGNORE( iVibraParams.AppendL( basicParams ) );
+ TRAP_IGNORE( iVibraParams.AppendL( sensitiveParams ) );
TRACE("CTactileVibraPlayer::ReadSettings - End");
}
--- a/tactilefeedback/tactilefeedbackresolver/src/tactilefeedbackresolver.cpp Tue Jun 08 18:37:57 2010 +0800
+++ b/tactilefeedback/tactilefeedbackresolver/src/tactilefeedbackresolver.cpp Fri Jul 23 17:04:55 2010 +0800
@@ -145,6 +145,14 @@
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;
@@ -402,6 +410,13 @@
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 );
--- a/tactilefeedback/tactilefeedbackresolver/traces/tracebuilder.cache Tue Jun 08 18:37:57 2010 +0800
+++ b/tactilefeedback/tactilefeedbackresolver/traces/tracebuilder.cache Fri Jul 23 17:04:55 2010 +0800
@@ -1,30 +1,30 @@
-<model>
- <id>536917140</id>
- <name>tactilefeedbackresolver</name>
- <group>
- <id>64</id>
- <name>TACTILE_PERFORMANCE</name>
- <trace>
- <text>e_TACTILE_RESOLVER_PLAY_FEEDBACK 1</text>
- <id>1</id>
- <name>TACTILE_RESOLVER_PLAY_FEEDBACK_1</name>
- <location>
- <file>../src/tactilefeedbackresolver.cpp</file>
- <line>158</line>
- <class>CTactileFeedbackResolver</class>
- <function>PlayFeedback</function>
- </location>
- </trace>
- <trace>
- <text>e_TACTILE_RESOLVER_PLAY_FEEDBACK 0</text>
- <id>2</id>
- <name>TACTILE_RESOLVER_PLAY_FEEDBACK_0</name>
- <location>
- <file>../src/tactilefeedbackresolver.cpp</file>
- <line>183</line>
- <class>CTactileFeedbackResolver</class>
- <function>PlayFeedback</function>
- </location>
- </trace>
- </group>
-</model>
+<model>
+ <id>536917140</id>
+ <name>tactilefeedbackresolver</name>
+ <group>
+ <id>64</id>
+ <name>TACTILE_PERFORMANCE</name>
+ <trace>
+ <text>e_TACTILE_RESOLVER_PLAY_FEEDBACK 1</text>
+ <id>1</id>
+ <name>TACTILE_RESOLVER_PLAY_FEEDBACK_1</name>
+ <location>
+ <file>../src/tactilefeedbackresolver.cpp</file>
+ <line>158</line>
+ <class>CTactileFeedbackResolver</class>
+ <function>PlayFeedback</function>
+ </location>
+ </trace>
+ <trace>
+ <text>e_TACTILE_RESOLVER_PLAY_FEEDBACK 0</text>
+ <id>2</id>
+ <name>TACTILE_RESOLVER_PLAY_FEEDBACK_0</name>
+ <location>
+ <file>../src/tactilefeedbackresolver.cpp</file>
+ <line>183</line>
+ <class>CTactileFeedbackResolver</class>
+ <function>PlayFeedback</function>
+ </location>
+ </trace>
+ </group>
+</model>