--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/package_definition.xml Wed Aug 18 10:04:18 2010 +0300
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+ <package id="hapticsservices" name="Haptics Services" levels="fw server api">
+ <collection id="hapticsservices_plat" name="Haptics Services Platform Interfaces" level="api">
+ <component id="tacticon_api" name="Tacticon API" introduced="^1" class="api" filter="s60">
+ <meta rel="Api" href="hapticsservices_plat/tacticon_api/tacticon_api.metaxml"/>
+ <unit bldFile="hapticsservices_plat/tacticon_api/group"/>
+ </component>
+ <component id="tactile_feedback_core_api" name="Tactile Feedback Core API" introduced="^1" class="api" filter="s60">
+ <meta rel="Api" href="hapticsservices_plat/tactile_feedback_core_api/tactile_feedback_core_api.metaxml"/>
+ <unit bldFile="hapticsservices_plat/tactile_feedback_core_api/group"/>
+ </component>
+ <component id="tactile_feedback_server_api" name="Tactile Feedback Server API" introduced="^1" class="api" filter="s60">
+ <meta rel="Api" href="hapticsservices_plat/tactile_feedback_server_api/tactile_feedback_server_api.metaxml"/>
+ <unit bldFile="hapticsservices_plat/tactile_feedback_server_api/group"/>
+ </component>
+ </collection>
+ <collection id="hapticsservices_pub" name="Haptics Services Public Interfaces" level="api">
+ <component id="tactile_feedback_client_api" name="Tactile Feedback Client API" introduced="^1" class="api" filter="s60">
+ <meta rel="Api" href="hapticsservices_pub/tactile_feedback_client_api/tactile_feedback_client_api.metaxml"/>
+ <unit bldFile="hapticsservices_pub/tactile_feedback_client_api/group"/>
+ </component>
+ </collection>
+ <collection id="tacticonserver" name="Tacticon Server" level="server">
+ <!-- collection is really a component. Move down a directory -->
+ <component id="tacticonserver_build" filter="s60" name="Tacticon Server Build" introduced="^3">
+ <unit bldFile="tacticonserver/group"/>
+ <!-- clients and servers are usualy the same component. Consider moving plugins to separate components if needed -->
+ </component>
+ <component id="tacticonhapticsplugin" name="Tacticon Haptics Plugin" introduced="^3" class="plugin" filter="s60,dfs_build">
+ <unit bldFile="tacticonserver/server/tacticonpluginfw/tacticonhapticsplugin/group"/>
+ </component>
+ </collection>
+ <collection id="tactilefeedback" name="Tactile Feedback" level="fw">
+ <component id="tactilearearegistry" filter="s60" name="Tactile Area Registry" introduced="^1">
+ <unit bldFile="tactilefeedback/tactilearearegistry/group"/>
+ </component>
+ <component id="tactilefeedbackresolver" filter="s60" name="Tactile Feedback Resolver" introduced="^1">
+ <unit bldFile="tactilefeedback/tactilefeedbackresolver/group"/>
+ </component>
+ <component id="tactilefeedbackresolver_plugins" name="Tactile Feedback Resolver Plugins" introduced="^1" class="plugin" filter="s60,dfs_build">
+ <unit bldFile="tactilefeedback/tactilefeedbackresolver/plugins/group"/>
+ </component>
+ <component id="tactileclickplugin" filter="s60" name="Tactile Click Plugin" class="plugin" introduced="^1">
+ <unit bldFile="tactilefeedback/tactileclickplugin/group"/>
+ </component>
+ <component id="tactilefeedbackclient" filter="s60" name="Tactile Feedback Client" introduced="^1">
+ <unit bldFile="tactilefeedback/tactilefeedbackclient/group"/>
+ </component>
+ <component id="tactileactionplugin" filter="s60" name="Tactile Action Plugin" class="plugin" introduced="^1">
+ <unit bldFile="tactilefeedback/tactileactionplugin/group"/>
+ </component>
+ <component id="tactilefeedback_rom" filter="s60" name="Tactile Feedback ROM" introduced="^1">
+ <unit bldFile="tactilefeedback/rom"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/package_map.xml Wed Aug 18 10:04:18 2010 +0300
@@ -0,0 +1,1 @@
+<PackageMap root="sf" layer="mw"/>
--- a/tactilefeedback/group/bld.inf Wed Jun 23 18:31:51 2010 +0300
+++ b/tactilefeedback/group/bld.inf Wed Aug 18 10:04:18 2010 +0300
@@ -18,8 +18,7 @@
#include <platform_paths.hrh>
-PRJ_EXPORTS
-../rom/tactilefeedback.iby CORE_IBY_EXPORT_PATH(mw, tactilefeedback.iby)
+#include "../rom/bld.inf"
#ifndef TOOLS
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tactilefeedback/rom/bld.inf Wed Aug 18 10:04:18 2010 +0300
@@ -0,0 +1,22 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Master bld.inf -file for Tactile Feedback ROM.
+* Part of: Tactile Feedback.
+*
+*/
+
+#include <platform_paths.hrh>
+
+PRJ_EXPORTS
+tactilefeedback.iby CORE_IBY_EXPORT_PATH(mw, tactilefeedback.iby)
--- a/tactilefeedback/tactilearearegistry/src/tactilearearegistry.cpp Wed Jun 23 18:31:51 2010 +0300
+++ b/tactilefeedback/tactilearearegistry/src/tactilearearegistry.cpp Wed Aug 18 10:04:18 2010 +0300
@@ -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/tactilefeedbackclient/src/touchfeedbackimpl.cpp Wed Jun 23 18:31:51 2010 +0300
+++ b/tactilefeedback/tactilefeedbackclient/src/touchfeedbackimpl.cpp Wed Aug 18 10:04:18 2010 +0300
@@ -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/tactilefeedbackresolver/plugins/tactileaudioplugin/src/tactileaudioplayer.cpp Wed Jun 23 18:31:51 2010 +0300
+++ b/tactilefeedback/tactilefeedbackresolver/plugins/tactileaudioplugin/src/tactileaudioplayer.cpp Wed Aug 18 10:04:18 2010 +0300
@@ -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 Wed Jun 23 18:31:51 2010 +0300
+++ b/tactilefeedback/tactilefeedbackresolver/plugins/tactiletoneplugin/src/tactiletoneplayer.cpp Wed Aug 18 10:04:18 2010 +0300
@@ -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 Wed Jun 23 18:31:51 2010 +0300
+++ b/tactilefeedback/tactilefeedbackresolver/plugins/tactilevibraplugin/src/tactilevibraplayer.cpp Wed Aug 18 10:04:18 2010 +0300
@@ -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 Wed Jun 23 18:31:51 2010 +0300
+++ b/tactilefeedback/tactilefeedbackresolver/src/tactilefeedbackresolver.cpp Wed Aug 18 10:04:18 2010 +0300
@@ -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 );