# HG changeset patch # User hgs # Date 1279875895 -28800 # Node ID fb04b611ffe7ffcde758a895a10654059579e029 # Parent 90362ffca16a105fb1a8675786841bc8395d0667 201029 diff -r 90362ffca16a -r fb04b611ffe7 tacticonserver/tacticonactionplugin/data/tacticon.rul --- 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 @@ - \ No newline at end of file diff -r 90362ffca16a -r fb04b611ffe7 tactilefeedback/tactilearearegistry/src/tactilearearegistry.cpp --- 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 ) ); } diff -r 90362ffca16a -r fb04b611ffe7 tactilefeedback/tactilearearegistry/traces/tracebuilder.cache --- 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 @@ - - 536917138 - tactilearearegistry - - 64 - TACTILE_PERFORMANCE - - e_TACTILE_REGISTRY_HIT_TEST 1 - 1 - TACTILE_REGISTRY_HIT_TEST_1 - - ../src/tactilearearegistry.cpp - 238 - CTactileAreaRegistry - HitTestPointerEvent - - - - e_TACTILE_REGISTRY_HIT_TEST 0 - 2 - TACTILE_REGISTRY_HIT_TEST_0 - - ../src/tactilearearegistry.cpp - 263 - CTactileAreaRegistry - HitTestPointerEvent - - - - + + 536917138 + tactilearearegistry + + 64 + TACTILE_PERFORMANCE + + e_TACTILE_REGISTRY_HIT_TEST 1 + 1 + TACTILE_REGISTRY_HIT_TEST_1 + + ../src/tactilearearegistry.cpp + 238 + CTactileAreaRegistry + HitTestPointerEvent + + + + e_TACTILE_REGISTRY_HIT_TEST 0 + 2 + TACTILE_REGISTRY_HIT_TEST_0 + + ../src/tactilearearegistry.cpp + 263 + CTactileAreaRegistry + HitTestPointerEvent + + + + diff -r 90362ffca16a -r fb04b611ffe7 tactilefeedback/tactileclickplugin/traces/tracebuilder.cache --- 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 @@ - - 536917139 - tactileclickplugin - - 64 - TACTILE_PERFORMANCE - - e_TACTILE_CLICK_PLUGIN_PEN_EVENT 1 - 1 - TACTILE_CLICK_PLUGIN_PEN_EVENT_1 - - ../src/tactileclickplugin.cpp - 134 - CTactileClickPlugin - OtherEvent - - - - e_TACTILE_CLICK_PLUGIN_PEN_EVENT 0 - 2 - TACTILE_CLICK_PLUGIN_PEN_EVENT_0 - - ../src/tactileclickplugin.cpp - 161 - CTactileClickPlugin - OtherEvent - - - - e_TACTILE_CLICK_PLUGIN_INSTANT_FEEDBACK_SERVER_API 1 - 3 - TACTILE_CLICK_PLUGIN_INSTANT_FEEDBACK_SERVER_API_1 - - ../src/tactileclickplugin.cpp - 242 - CTactileClickPlugin - InstantFeedback - - - - e_TACTILE_CLICK_PLUGIN_INSTANT_FEEDBACK_SERVER_API 0 - 4 - TACTILE_CLICK_PLUGIN_INSTANT_FEEDBACK_SERVER_API_0 - - ../src/tactileclickplugin.cpp - 246 - CTactileClickPlugin - InstantFeedback - - - - e_TACTILE_CLICK_PLUGIN_INSTANT_FEEDBACK_CLIENT_API 1 - 5 - TACTILE_CLICK_PLUGIN_INSTANT_FEEDBACK_CLIENT_API_1 - - ../src/tactileclickplugin.cpp - 343 - CTactileClickPlugin - HandleImmediateFeedback - - - - e_TACTILE_CLICK_PLUGIN_INSTANT_FEEDBACK_CLIENT_API 0 - 6 - TACTILE_CLICK_PLUGIN_INSTANT_FEEDBACK_CLIENT_API_0 - - ../src/tactileclickplugin.cpp - 349 - CTactileClickPlugin - HandleImmediateFeedback - - - - + + 536917139 + tactileclickplugin + + 64 + TACTILE_PERFORMANCE + + e_TACTILE_CLICK_PLUGIN_PEN_EVENT 1 + 1 + TACTILE_CLICK_PLUGIN_PEN_EVENT_1 + + ../src/tactileclickplugin.cpp + 134 + CTactileClickPlugin + OtherEvent + + + + e_TACTILE_CLICK_PLUGIN_PEN_EVENT 0 + 2 + TACTILE_CLICK_PLUGIN_PEN_EVENT_0 + + ../src/tactileclickplugin.cpp + 161 + CTactileClickPlugin + OtherEvent + + + + e_TACTILE_CLICK_PLUGIN_INSTANT_FEEDBACK_SERVER_API 1 + 3 + TACTILE_CLICK_PLUGIN_INSTANT_FEEDBACK_SERVER_API_1 + + ../src/tactileclickplugin.cpp + 242 + CTactileClickPlugin + InstantFeedback + + + + e_TACTILE_CLICK_PLUGIN_INSTANT_FEEDBACK_SERVER_API 0 + 4 + TACTILE_CLICK_PLUGIN_INSTANT_FEEDBACK_SERVER_API_0 + + ../src/tactileclickplugin.cpp + 246 + CTactileClickPlugin + InstantFeedback + + + + e_TACTILE_CLICK_PLUGIN_INSTANT_FEEDBACK_CLIENT_API 1 + 5 + TACTILE_CLICK_PLUGIN_INSTANT_FEEDBACK_CLIENT_API_1 + + ../src/tactileclickplugin.cpp + 343 + CTactileClickPlugin + HandleImmediateFeedback + + + + e_TACTILE_CLICK_PLUGIN_INSTANT_FEEDBACK_CLIENT_API 0 + 6 + TACTILE_CLICK_PLUGIN_INSTANT_FEEDBACK_CLIENT_API_0 + + ../src/tactileclickplugin.cpp + 349 + CTactileClickPlugin + HandleImmediateFeedback + + + + diff -r 90362ffca16a -r fb04b611ffe7 tactilefeedback/tactilefeedbackclient/src/touchfeedbackimpl.cpp --- 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 ) ); } } diff -r 90362ffca16a -r fb04b611ffe7 tactilefeedback/tactilefeedbackclient/traces/tracebuilder.cache --- 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 @@ - - 536917137 - touchfeedback - - 64 - TACTILE_PERFORMANCE - - e_TACTILE_CLIENT_INSTANT_FEEDBACK 1 - 1 - TACTILE_CLIENT_INSTANT_FEEDBACK_1 - - ../src/touchfeedbackclient.cpp - 502 - CTouchFeedbackClient - ImmediateFeedback - - - - e_TACTILE_CLIENT_INSTANT_FEEDBACK 0 - 2 - TACTILE_CLIENT_INSTANT_FEEDBACK_0 - - ../src/touchfeedbackclient.cpp - 509 - CTouchFeedbackClient - ImmediateFeedback - - - - + + 536917137 + touchfeedback + + 64 + TACTILE_PERFORMANCE + + e_TACTILE_CLIENT_INSTANT_FEEDBACK 1 + 1 + TACTILE_CLIENT_INSTANT_FEEDBACK_1 + + ../src/touchfeedbackclient.cpp + 502 + CTouchFeedbackClient + ImmediateFeedback + + + + e_TACTILE_CLIENT_INSTANT_FEEDBACK 0 + 2 + TACTILE_CLIENT_INSTANT_FEEDBACK_0 + + ../src/touchfeedbackclient.cpp + 509 + CTouchFeedbackClient + ImmediateFeedback + + + + diff -r 90362ffca16a -r fb04b611ffe7 tactilefeedback/tactilefeedbackresolver/plugins/tactileaudioplugin/src/tactileaudioplayer.cpp --- 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"); } diff -r 90362ffca16a -r fb04b611ffe7 tactilefeedback/tactilefeedbackresolver/plugins/tactiletoneplugin/src/tactiletoneplayer.cpp --- 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"); } diff -r 90362ffca16a -r fb04b611ffe7 tactilefeedback/tactilefeedbackresolver/plugins/tactilevibraplugin/src/tactilevibraplayer.cpp --- 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"); } diff -r 90362ffca16a -r fb04b611ffe7 tactilefeedback/tactilefeedbackresolver/src/tactilefeedbackresolver.cpp --- 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 ); diff -r 90362ffca16a -r fb04b611ffe7 tactilefeedback/tactilefeedbackresolver/traces/tracebuilder.cache --- 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 @@ - - 536917140 - tactilefeedbackresolver - - 64 - TACTILE_PERFORMANCE - - e_TACTILE_RESOLVER_PLAY_FEEDBACK 1 - 1 - TACTILE_RESOLVER_PLAY_FEEDBACK_1 - - ../src/tactilefeedbackresolver.cpp - 158 - CTactileFeedbackResolver - PlayFeedback - - - - e_TACTILE_RESOLVER_PLAY_FEEDBACK 0 - 2 - TACTILE_RESOLVER_PLAY_FEEDBACK_0 - - ../src/tactilefeedbackresolver.cpp - 183 - CTactileFeedbackResolver - PlayFeedback - - - - + + 536917140 + tactilefeedbackresolver + + 64 + TACTILE_PERFORMANCE + + e_TACTILE_RESOLVER_PLAY_FEEDBACK 1 + 1 + TACTILE_RESOLVER_PLAY_FEEDBACK_1 + + ../src/tactilefeedbackresolver.cpp + 158 + CTactileFeedbackResolver + PlayFeedback + + + + e_TACTILE_RESOLVER_PLAY_FEEDBACK 0 + 2 + TACTILE_RESOLVER_PLAY_FEEDBACK_0 + + ../src/tactilefeedbackresolver.cpp + 183 + CTactileFeedbackResolver + PlayFeedback + + + +