# HG changeset patch
# User hgs
# Date 1286963962 -10800
# Node ID efda7c0771b9935d18580b7b4fe491ca43aae63a
# Parent  26079c1bb5616bea4be2b6964d9f5cbfe1b937cf
201039_02

diff -r 26079c1bb561 -r efda7c0771b9 package_definition.xml
--- a/package_definition.xml	Wed Oct 06 16:00:22 2010 +0300
+++ b/package_definition.xml	Wed Oct 13 12:59:22 2010 +0300
@@ -64,9 +64,6 @@
      <component id="ts_client" name="Task Switcher Client" introduced="^4" filter="s60">
       <unit bldFile="taskswitcher/client" qt:proFile="client.pro"/>
      </component>
-     <component id="ts_backstepping" name="Task Switcher Backstepping" introduced="^4" filter="s60">
-      <unit bldFile="taskswitcher/backstepping" qt:proFile="backstepping.pro"/>
-     </component>
      <component id="ts_server" name="Task Switcher Server" introduced="^4" filter="s60">
       <unit bldFile="taskswitcher/server" qt:proFile="server.pro"/>
      </component>
diff -r 26079c1bb561 -r efda7c0771b9 taskswitcher/backstepping/backstepping.pro
--- a/taskswitcher/backstepping/backstepping.pro	Wed Oct 06 16:00:22 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-#
-# Copyright (c) 2009 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:
-#
-
-TEMPLATE = subdirs
-symbian {
-    BLD_INF_RULES.prj_exports += "$${LITERAL_HASH}include \"group/bld.inf\""
-    }
diff -r 26079c1bb561 -r efda7c0771b9 taskswitcher/backstepping/bwins/tsbacksteppingu.def
--- a/taskswitcher/backstepping/bwins/tsbacksteppingu.def	Wed Oct 06 16:00:22 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-EXPORTS
-	??1CTsBacksteppingActivation@@UAE@XZ @ 1 NONAME ; CTsBacksteppingActivation::~CTsBacksteppingActivation(void)
-	?NewL@CTsBacksteppingActivation@@SAPAV1@AAVMTsWindowGroupsMonitor@@@Z @ 2 NONAME ; class CTsBacksteppingActivation * CTsBacksteppingActivation::NewL(class MTsWindowGroupsMonitor &)
-
diff -r 26079c1bb561 -r efda7c0771b9 taskswitcher/backstepping/eabi/tsbacksteppingu.def
--- a/taskswitcher/backstepping/eabi/tsbacksteppingu.def	Wed Oct 06 16:00:22 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-EXPORTS
-	_ZN25CTsBacksteppingActivation4NewLER22MTsWindowGroupsMonitor @ 1 NONAME
-	_ZN25CTsBacksteppingActivationD0Ev @ 2 NONAME
-	_ZN25CTsBacksteppingActivationD1Ev @ 3 NONAME
-	_ZN25CTsBacksteppingActivationD2Ev @ 4 NONAME
-	_ZTI25CTsBacksteppingActivation @ 5 NONAME
-	_ZTV25CTsBacksteppingActivation @ 6 NONAME
-	_ZTI27CTsWindowGroupsObserverBase @ 7 NONAME
-	_ZTV27CTsWindowGroupsObserverBase @ 8 NONAME
-
diff -r 26079c1bb561 -r efda7c0771b9 taskswitcher/backstepping/group/bld.inf
--- a/taskswitcher/backstepping/group/bld.inf	Wed Oct 06 16:00:22 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-/*
-* Copyright (c) 2009 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:
-*
-*/
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_MMPFILES
-tsbackstepping.mmp
diff -r 26079c1bb561 -r efda7c0771b9 taskswitcher/backstepping/group/tsbackstepping.mmp
--- a/taskswitcher/backstepping/group/tsbackstepping.mmp	Wed Oct 06 16:00:22 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-/*
-* Copyright (c) 2009 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:
-*
-*/
-
-TARGET         tsbackstepping.dll
-TARGETTYPE     dll
-UID            0x1000008d  0x200267AD
-SECUREID       0x200267AD
-CAPABILITY     ALL -TCB
-
-EPOCHEAPSIZE   0x100000 0x600000 // 1MB - 6MB
-
-MW_LAYER_SYSTEMINCLUDE
-
-USERINCLUDE    ../inc
-USERINCLUDE     ../../../inc
-USERINCLUDE     ../../utils/inc
-
-SOURCEPATH     ../src
-SOURCE         tsbackstepping.cpp
-SOURCE         tsbacksteppingfilter.cpp
-SOURCE         tsbacksteppingactivation.cpp
-
-SOURCEPATH     ../../utils/src
-SOURCE        tswindowgroupsobserverbase.cpp
-SOURCE        tsidlist.cpp
-
-LIBRARY        euser.lib 
-LIBRARY        ws32.lib // for RWsSession
-LIBRARY        afactivitylauncher.lib
-LIBRARY        estor.lib
-
-DEBUGLIBRARY    flogger.lib
-
-
-SMPSAFE
diff -r 26079c1bb561 -r efda7c0771b9 taskswitcher/backstepping/inc/tsbackstepping.h
--- a/taskswitcher/backstepping/inc/tsbackstepping.h	Wed Oct 06 16:00:22 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-/*
-* Copyright (c) 2009 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:
-*
-*/
-
-#ifndef __CBACKSTEPPING_H
-#define __CBACKSTEPPING_H
-
-#include <w32std.h>
-#include "tswindowgroupsobserverbase.h"
-
-class CTsBacksteppingFilter;
-
-NONSHARABLE_CLASS(CTsBackstepping) : public CTsWindowGroupsObserverBase
-{
-public:
-    static CTsBackstepping* NewL( MTsWindowGroupsMonitor& );
-    static CTsBackstepping* NewLC( MTsWindowGroupsMonitor& );
-    virtual ~CTsBackstepping();
-
-private:
-    CTsBackstepping( MTsWindowGroupsMonitor& );
-    void ConstructL();
-    void HandleWindowGroupChanged( MTsResourceManager &rsc, 
-                                   const MTsRunningApplicationStorage& aStorage );
-    void HandleWindowGroupChangedL( MTsResourceManager &rsc, 
-                                    const MTsRunningApplicationStorage& aStorage );
-    TInt HomescreenOffsetL( const MTsRunningApplicationStorage& aStorage )const;
-    void SwitchToIdleStateL( MTsResourceManager& aResources, TBool aIsFirst );
-
-private:
-    CTsBacksteppingFilter *iFilter;
-    TBool iHsWasFirst;
-
-};
-
-#endif // __CBACKSTEPPING_H
diff -r 26079c1bb561 -r efda7c0771b9 taskswitcher/backstepping/inc/tsbacksteppingactivation.h
--- a/taskswitcher/backstepping/inc/tsbacksteppingactivation.h	Wed Oct 06 16:00:22 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-/*
-* Copyright (c) 2009 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:
-*
-*/
-
-#ifndef CTSBACKSTEPPINGACTIVACTION_H
-#define CTSBACKSTEPPINGACTIVACTION_H
-
-#include <e32base.h>
-#include <e32property.h>
-
-class MTsWindowGroupsMonitor;
-
-
-class CTsBacksteppingActivation : public CActive
-    {
-public:
-    IMPORT_C static CTsBacksteppingActivation* NewL(
-                                            MTsWindowGroupsMonitor &aMonitor);
-    IMPORT_C virtual ~CTsBacksteppingActivation();
-
-protected:
-    void RunL();
-    TInt RunError(TInt);
-    void DoCancel();  
-
-private:
-    CTsBacksteppingActivation(MTsWindowGroupsMonitor &aMonitor);
-    void ConstructL();
-    void Subscribe();
-
-private:
-    MTsWindowGroupsMonitor &iMonitor;
-    RProperty iProperty;
-    CBase* iEngine;
-    };
-
-#endif /* CTSBACKSTEPPINGACTIVACTION_H*/
diff -r 26079c1bb561 -r efda7c0771b9 taskswitcher/backstepping/inc/tsbacksteppingfilter.h
--- a/taskswitcher/backstepping/inc/tsbacksteppingfilter.h	Wed Oct 06 16:00:22 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-/*
-* Copyright (c) 2009 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:
-*
-*/
-
-#ifndef TSBACKSTEPPINGFILTER_H
-#define TSBACKSTEPPINGFILTER_H
-#include <e32base.h>
-class CTsIdList;
-NONSHARABLE_CLASS(CTsBacksteppingFilter) : public CBase
-    {
-public:
-    static CTsBacksteppingFilter* NewL();
-    ~CTsBacksteppingFilter();
-    TBool isBlocked( TUid aApplicationUid ) const;
-
-private:
-    CTsBacksteppingFilter();
-    void ConstructL();
-
-private:
-    CTsIdList* iBlockedApps;
-
-    };
-
-#endif // TSBACKSTEPPINGFILTER_H
diff -r 26079c1bb561 -r efda7c0771b9 taskswitcher/backstepping/src/tsbackstepping.cpp
--- a/taskswitcher/backstepping/src/tsbackstepping.cpp	Wed Oct 06 16:00:22 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,218 +0,0 @@
-/*
-* Copyright (c) 2009 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:
-*
-*/
-
-#include "tsbackstepping.h"
-
-#include <w32std.h>// key event
-#include <apgwgnam.h>// for CApaWindowGroupName
-#include <apgtask.h>
-#include <coedef.h>
-#include <e32property.h>
-#include <e32debug.h>
-
-#include <homescreendomainpskeys.h>
-#include <afactivitylauncher.h>
-
-#include "tsbacksteppingfilter.h"
-#include "tsrunningapp.h"
-#include "tsrunningappstorage.h"
-#include "tsresourcemanager.h"
-/**
- * String to switch hsapplication to IDLE state using activity framework
- */
-_LIT(KHsActivactionUri, "appto://20022F35?activityname=HsIdleView&activityinbackground=true");
-
-// -----------------------------------------------------------------------------
-/** 
- *  Symbian two-phases constructor. Allocate create and initialize backstepping engine
- *  Instance is pushed int cleanup stack.
- *  @param aMonitor - window group changes monitor
- *  @return address to backstepping engine
- */
-CTsBackstepping* CTsBackstepping::NewL( MTsWindowGroupsMonitor& aMonitor )
-    {
-    CTsBackstepping* self = CTsBackstepping::NewLC( aMonitor );
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-/** 
- *  Symbian two-phases constructor. Allocate create and initialize backstepping engine
- *  @param aMonitor - window group changes monitor
- *  @return address to backstepping engine
- */
-CTsBackstepping* CTsBackstepping::NewLC( MTsWindowGroupsMonitor& aMonitor )
-    { 
-    CTsBackstepping* self = new (ELeave) CTsBackstepping( aMonitor );
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-/** 
- * Constructor.
- * @param aMonitor - window group changes monitor
- */
-CTsBackstepping::CTsBackstepping( MTsWindowGroupsMonitor &aMonitor )
-:
-CTsWindowGroupsObserverBase( aMonitor ), iHsWasFirst(ETrue)
-    {
-    }
-
-// -----------------------------------------------------------------------------
-/** 
- *  CTsBackstepping::~CTsBackstepping
- *  deconstructor
- */
-CTsBackstepping::~CTsBackstepping()
-    {
-    delete iFilter;
-    }
-
-// -----------------------------------------------------------------------------
-/** 
- *  Symbian second-phase constructor. 
- *  Subscribe to window group monitor events (using BaseConstructL) and allocate
- *  filtering list
- */
-void CTsBackstepping::ConstructL ()
-    {
-    BaseConstructL();
-    iFilter = CTsBacksteppingFilter::NewL();
-    }
-
-// -----------------------------------------------------------------------------
-/**
- * Analyzes window stack and move homescreen to proper position 
- * Interface implementation.
- * @see MTsWindowGroupsObserver::HandleWindowGroupChanged
- */
-void CTsBackstepping::HandleWindowGroupChanged( 
-                                MTsResourceManager &aResources, 
-                                const MTsRunningApplicationStorage& aStorage )
-
-    {
-    RDebug::Print(_L("[Backstepping] started"));
-    TRAP_IGNORE( HandleWindowGroupChangedL( aResources, aStorage ) );
-    RDebug::Print(_L("[Backstepping] finished"));
-    }
-
-// -----------------------------------------------------------------------------
-/** 
- * Analyzes window stack and move homescreen to proper position
- * @see MTsWindowGroupsObserver::HandleWindowGroupChanged from param info
- */
-void CTsBackstepping::HandleWindowGroupChangedL( 
-                                 MTsResourceManager &aResources, 
-                                 const MTsRunningApplicationStorage& aStorage )
-    {
-    // calculate the desired position of Homescreen
-    const TInt currentHsOffset( HomescreenOffsetL( aStorage ) );
-    TInt optimalOffset(1);
-    TInt targetHsOffset(currentHsOffset);
-    TBool isFirst(ETrue);
-    for( TInt offset(0); offset < currentHsOffset; ++offset ) 
-        {
-        RDebug::Print( _L("[Backstepping] application: %08x"), 
-                       aStorage[offset].UidL().iUid );
-        if( TUid::Null() != aStorage[offset].UidL() )
-            {
-            isFirst = EFalse;
-            if( aStorage[offset].IsEmbeded())
-                {
-                targetHsOffset = aStorage.ParentIndex(aStorage[offset])+ 1;
-                } 
-            else if (!iFilter->isBlocked( aStorage[offset].UidL() ))
-                {
-                if(offset + 1 < currentHsOffset && 
-                   aStorage[offset+1].UidL() == TUid::Null() ) 
-                    {
-                    ++optimalOffset;
-                    }
-                targetHsOffset = optimalOffset;
-                }
-            break;
-            } 
-        else
-            {
-            ++optimalOffset;
-            }
-        }
-    SwitchToIdleStateL(aResources, isFirst);
-    // change windows order if necessary
-    if(targetHsOffset != currentHsOffset)
-        {
-        RDebug::Print(_L("[Backstepping] about to change window groups order"));
-        aResources.WsSession().SetWindowGroupOrdinalPosition( 
-                                    aStorage[currentHsOffset].WindowGroupId(), 
-                                    targetHsOffset );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-/** 
- * Find and return current position of hsapplication on window server stack
- * @param aStorage - storage with running app info
- * @return position of hsapplication on window server stack
- */
-TInt CTsBackstepping::HomescreenOffsetL( 
-                        const MTsRunningApplicationStorage& aStorage ) const 
-    {
-    TInt offset( KErrNotFound );
-    for( TInt iter(0); KErrNotFound == offset && iter < aStorage.Count(); ++iter )
-        {
-        if( KHsCategoryUid == aStorage[iter].UidL() )
-            {
-            offset = iter;
-            }
-        }
-    User::LeaveIfError( offset );
-    return offset;
-    }
-
-// -----------------------------------------------------------------------------
-/**
- * Change hsapplication state to IDLE if moves to background
- * @param aResources - OS resources manager
- * @param aIsFrst - flag to inform if hsapplication is in foreground
- */
-void CTsBackstepping::SwitchToIdleStateL(MTsResourceManager& aResources, 
-                                         TBool aIsFirst)
-    {
-    // switch Homescreen to Idle state if Homescreen is not in foreground and is in different state
-    if( iHsWasFirst && !aIsFirst )
-        {
-        TInt hsState( EHomeScreenIdleState );
-        User::LeaveIfError(RProperty::Get( KHsCategoryUid, 
-                                           KHsCategoryStateKey, 
-                                           hsState ) );
-        if(!(hsState & EHomeScreenWidgetViewActive ) )
-            {
-            RDebug::Print(_L("[Backstepping] about to switch HS activity"));
-            CAfActivityLauncher *activityEnabler = 
-                CAfActivityLauncher::NewLC( aResources.ApaSession(), 
-                                            aResources.WsSession() );
-            activityEnabler->launchActivityL( KHsActivactionUri );
-            CleanupStack::PopAndDestroy( activityEnabler );
-            }
-        }
-    iHsWasFirst = aIsFirst;
-    }
-
-// end of file
diff -r 26079c1bb561 -r efda7c0771b9 taskswitcher/backstepping/src/tsbacksteppingactivation.cpp
--- a/taskswitcher/backstepping/src/tsbacksteppingactivation.cpp	Wed Oct 06 16:00:22 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,138 +0,0 @@
-/*
-* Copyright (c) 2009 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:
-*
-*/
-
-#include <startupdomainpskeys.h>
-#include <flogger.h>
-#include <w32std.h>
-
-#include "tsbacksteppingactivation.h"
-#include "tsbackstepping.h"
-
- 
-// -----------------------------------------------------------------------------
-// CBacksteppingActivation::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CTsBacksteppingActivation* CTsBacksteppingActivation::NewL( 
-                                            MTsWindowGroupsMonitor &aMonitor )
-{
-    CTsBacksteppingActivation* self = 
-        new( ELeave ) CTsBacksteppingActivation( aMonitor );
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-    return self;
-}
-
-// -----------------------------------------------------------------------------
-// CTsBacksteppingActivation::CTsBacksteppingActivation
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CTsBacksteppingActivation::CTsBacksteppingActivation( 
-                                            MTsWindowGroupsMonitor &aMonitor ) 
-:
-    CActive( EPriorityLow ),
-    iMonitor( aMonitor )
-    {
-    CActiveScheduler::Add( this );
-    }
-
-// -----------------------------------------------------------------------------
-// CTsBacksteppingActivation::ConstructL()
-// -----------------------------------------------------------------------------
-//
-void CTsBacksteppingActivation::ConstructL() 
-    {
-    User::LeaveIfError( iProperty.Attach( KPSUidStartup, KPSIdlePhase1Ok ) );
-    iStatus = KRequestPending;
-    SetActive();
-    TRequestStatus* status( &iStatus );
-    User::RequestComplete( status, KErrNone );
-    }
-
-// -----------------------------------------------------------------------------
-// CTsBacksteppingActivation::~CTsBacksteppingActivation
-// Destructor
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CTsBacksteppingActivation::~CTsBacksteppingActivation()
-    {
-    Cancel();
-    delete iEngine;
-    iProperty.Close();
-    }
-
-// -----------------------------------------------------------------------------
-// CBacksteppingActivation::DoCancel
-// 
-// -----------------------------------------------------------------------------
-//
-void CTsBacksteppingActivation::DoCancel()
-    {
-    if( IsActive() && iProperty.Handle() ) 
-        {
-        iProperty.Cancel();
-        }
-    }
-
-// -----------------------------------------------------------------------------
-/**
- * @see CActive.
- */
-void CTsBacksteppingActivation::RunL()
-{
-    User::LeaveIfError( iStatus.Int() );
-    TInt state( ~EIdlePhase1Ok );
-    User::LeaveIfError( iProperty.Get( state ) );
-    if( EIdlePhase1Ok == state )
-        {
-        if( 0 == iEngine )
-            {
-            iEngine = CTsBackstepping::NewL( iMonitor );
-            }
-        } 
-    else
-        {
-        delete iEngine;
-        iEngine = 0;
-        }
-    Subscribe();
-    }
-
-// -----------------------------------------------------------------------------
-/**
- * @see CActive::RunError(TInt)
- */
-TInt CTsBacksteppingActivation::RunError( TInt aError )
-    {
-    if (KErrCancel != aError) 
-        {
-        Subscribe();
-        }
-    return KErrNone;
-    }
-
-// -----------------------------------------------------------------------------
-void CTsBacksteppingActivation::Subscribe()
-    {
-    iProperty.Subscribe( iStatus );
-    SetActive();
-    }
-// end of file
diff -r 26079c1bb561 -r efda7c0771b9 taskswitcher/backstepping/src/tsbacksteppingfilter.cpp
--- a/taskswitcher/backstepping/src/tsbacksteppingfilter.cpp	Wed Oct 06 16:00:22 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +0,0 @@
-/*
-* Copyright (c) 2009 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:
-*
-*/
-#include "tsbacksteppingfilter.h"
-#include "tsidlist.h"
-
-const TInt KBlockedApps [] = {0x100058b3/* <-- phoneui */,
-                              0x2001843A/* <-- javainstaller */,
-                              0x200267D2/* <-- widgetinstallerapp */};
-
-// -----------------------------------------------------------------------------
-/** 
- * Symbian two-phase constructor. Allocate and initialize list blocked applications
- * @return backstepping filtering
- */
-CTsBacksteppingFilter* CTsBacksteppingFilter::NewL()
-    {
-    CTsBacksteppingFilter *self = new(ELeave)CTsBacksteppingFilter();
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-/** 
- * Destructor
- */
-CTsBacksteppingFilter::~CTsBacksteppingFilter()
-    {
-    delete iBlockedApps;
-    }
-
-// -----------------------------------------------------------------------------
-/** 
- * Inform if application is blocked for backstepping engine
- * @param aApplicationUid - tested application UID
- * @return EFalse if application is not blocked for backstepping engine, other value in other cases
- */
-TBool CTsBacksteppingFilter::isBlocked( TUid aApplicationUid ) const
-    {
-    return iBlockedApps->IsPresent( aApplicationUid.iUid );
-    }
-
-// -----------------------------------------------------------------------------
-/** 
- * Constructor
- */
-CTsBacksteppingFilter::CTsBacksteppingFilter()
-    {
-    //No implementation required
-    }
-
-// -----------------------------------------------------------------------------
-/** 
- * Symbian second-phase constructor. Initilaize blocked applications list
- */
-void CTsBacksteppingFilter::ConstructL()
-    {
-    const TInt count( sizeof( KBlockedApps ) / sizeof( TInt ) );
-    iBlockedApps = CTsIdList::NewL();
-    iBlockedApps->AppendL( KBlockedApps, count );
-    }
diff -r 26079c1bb561 -r efda7c0771b9 taskswitcher/rom/tstaskmonitor_core.iby
--- a/taskswitcher/rom/tstaskmonitor_core.iby	Wed Oct 06 16:00:22 2010 +0300
+++ b/taskswitcher/rom/tstaskmonitor_core.iby	Wed Oct 13 12:59:22 2010 +0300
@@ -27,9 +27,6 @@
 data=\epoc32\data\z\resource\qt\plugins\activitytsplugin.qtplugin    resource\qt\plugins\activitytsplugin.qtplugin
 data=\epoc32\data\z\resource\taskswitcher\activitytsplugin.xml    resource\taskswitcher\activitytsplugin.xml
 
-file=ABI_DIR\BUILD_DIR\tsbackstepping.dll                   SHARED_LIB_DIR\tsbackstepping.dll
-
-
 ECOM_PLUGIN( tsscreenshotplugin.dll, tsscreenshotplugin.rsc )
 
 // stub sis
diff -r 26079c1bb561 -r efda7c0771b9 taskswitcher/server/inc/tsrunningappserver.h
--- a/taskswitcher/server/inc/tsrunningappserver.h	Wed Oct 06 16:00:22 2010 +0300
+++ b/taskswitcher/server/inc/tsrunningappserver.h	Wed Oct 13 12:59:22 2010 +0300
@@ -60,7 +60,6 @@
     CTsStorage* iStorage; 
     CTsServiceProvider* iServiceProvider;
     CTsRunningAppModel* iAppsModel;
-    CBase *iBacksteppingEngine;
 };
 
 #endif // RUNNINGAPPSERVER_H
diff -r 26079c1bb561 -r efda7c0771b9 taskswitcher/server/server.pro
--- a/taskswitcher/server/server.pro	Wed Oct 06 16:00:22 2010 +0300
+++ b/taskswitcher/server/server.pro	Wed Oct 13 12:59:22 2010 +0300
@@ -27,7 +27,6 @@
                 ../inc \
                 ../../inc \
                 ../utils/inc \
-                ../backstepping/inc \
                 
 SOURCES +=  src/tsenv.cpp \
             src/tsdataobservertask.cpp \
@@ -103,7 +102,6 @@
             ../utils/inc/tsidlist.h \
 
 LIBS += -lxqutils \
-        -ltsbackstepping \
         -laknicon \
         -lfbscli \          #for CFbsBitmap
         -lestor \           #for RDesReadStream
diff -r 26079c1bb561 -r efda7c0771b9 taskswitcher/server/src/tsrunningappserver.cpp
--- a/taskswitcher/server/src/tsrunningappserver.cpp	Wed Oct 06 16:00:22 2010 +0300
+++ b/taskswitcher/server/src/tsrunningappserver.cpp	Wed Oct 13 12:59:22 2010 +0300
@@ -19,7 +19,6 @@
 #include "tsrunningappserver.h"
 #include "tsrunningappsession.h"
 #include "tsresourcemanagerimp.h"
-#include "tsbacksteppingactivation.h"
 #include "tswindowgroupsmonitorimp.h"
 #include "tsmodel.h"
 #include "tsstorage.h"
@@ -44,7 +43,6 @@
  */
 CTsRunningAppServer::~CTsRunningAppServer()
     {
-    delete iBacksteppingEngine;
     delete iStorage;
     delete iAppsModel;
     delete iServiceProvider;
@@ -91,8 +89,6 @@
 
     // load initial data
     iStorage->DataChanged();
-
-    TRAP_IGNORE(iBacksteppingEngine = CTsBacksteppingActivation::NewL(iResources->WsMonitor());)
     }
 
 // -----------------------------------------------------------------------------
diff -r 26079c1bb561 -r efda7c0771b9 taskswitcher/sis/stubs/taskmonitor_stub.pkg
--- a/taskswitcher/sis/stubs/taskmonitor_stub.pkg	Wed Oct 06 16:00:22 2010 +0300
+++ b/taskswitcher/sis/stubs/taskmonitor_stub.pkg	Wed Oct 13 12:59:22 2010 +0300
@@ -36,7 +36,6 @@
 "" - "Z:\sys\bin\hsrunningappmonitor.exe"
 "" - "Z:\sys\bin\tsscreenshotplugin.dll"
 "" - "Z:\resource\plugins\tsscreenshotplugin.rsc"
-"" - "Z:\sys\bin\tsbackstepping.dll"
 
 "" - "Z:\sys\bin\activitytsplugin.dll"
 "" - "Z:\resource\qt\plugins\activitytsplugin.qtplugin"
diff -r 26079c1bb561 -r efda7c0771b9 taskswitcher/sis/stubs/taskmonitor_stub.sis
Binary file taskswitcher/sis/stubs/taskmonitor_stub.sis has changed
diff -r 26079c1bb561 -r efda7c0771b9 taskswitcher/sis/taskmonitor.pkg
--- a/taskswitcher/sis/taskmonitor.pkg	Wed Oct 06 16:00:22 2010 +0300
+++ b/taskswitcher/sis/taskmonitor.pkg	Wed Oct 13 12:59:22 2010 +0300
@@ -31,7 +31,6 @@
 "/epoc32/release/armv5/urel/tstaskmonitorclient.dll"-"!:\sys\bin\tstaskmonitorclient.dll"
 "/epoc32/release/armv5/urel/tsscreenshotplugin.dll"-"!:\sys\bin\tsscreenshotplugin.dll"
 "/epoc32/data/z/resource/plugins/tsscreenshotplugin.rsc"-"!:\resource\plugins\tsscreenshotplugin.rsc"
-"/epoc32/release/armv5/urel/tsbackstepping.dll"-"!:\sys\bin\tsbackstepping.dll"
 
 "/epoc32/release/armv5/urel/activitytsplugin.dll" - "!:\sys\bin\activitytsplugin.dll"
 "/epoc32/data/z/resource/qt/plugins/activitytsplugin.qtplugin" - "!:\resource\qt\plugins\activitytsplugin.qtplugin"
diff -r 26079c1bb561 -r efda7c0771b9 taskswitcher/taskswitcher.pro
--- a/taskswitcher/taskswitcher.pro	Wed Oct 06 16:00:22 2010 +0300
+++ b/taskswitcher/taskswitcher.pro	Wed Oct 13 12:59:22 2010 +0300
@@ -19,8 +19,7 @@
 CONFIG += ordered
 SUBDIRS += client
 symbian {
-    SUBDIRS += backstepping \
-               server \
+    SUBDIRS += server \
                screenshotplugin \
                activitytsplugin \
                tsdevicedialogplugin \