MCL/sf/app/homescreen: comparison taskswitcher/taskswitcherui/taskswitcherapp/src/tsfastswaparea.cpp

equal deleted inserted replaced

-:79311d856354
+:7be2816dbabd
 #include <layoutmetadata.cdl.h>
 #include <aknlists.h>
 #include <touchfeedback.h>
 #include <akntransitionutils.h>
 #include <akntranseffect.h>
+#include <aknlongtapanimation.h>
 #include "tsfastswaparea.h"
 #include "tsapplogging.h"
 #include "tsfswclient.h"
 #include "tsappui.h"
 const TInt KRedrawTime = 250000; // 0.25 sec
 const TInt KRedrawTimeForLayoutSwitch = 700000; // 0.7 sec
 const TInt KHighlighActivationTime = 100000; // 100 ms
 const TInt KUpdateGridTime = 0; // imediately
 const TInt KOrientationSwitchTime = 1000000; // 1 sec
+const TInt KLongTapAnimationInitTime = 150000; // 0.15 sec
+const TInt KLongTapAnimationTimeout = 1000000; // 1 sec
 const TInt KMaxGranularity = 4;
+const TUid KTsMenuUid = { 0x101f4cd2 };
+const TUid KTsHomescreenUid = { 0x102750f0 };
 // -----------------------------------------------------------------------------
 // CTsFastSwapArea::NewL
 // -----------------------------------------------------------------------------
 //
 //
 CTsFastSwapArea::CTsFastSwapArea(CCoeControl& aParent,
 CTsDeviceState& aDeviceState,
 CTsEventControler& aEventHandler) :
 iParent(aParent), iDeviceState(aDeviceState), iEvtHandler(aEventHandler),
-iIgnoreLayoutSwitch(EFalse), iWidgetClosingCount(0)
+iIgnoreLayoutSwitch(EFalse), iWidgetClosingCount(0), iLongTapAnimationRunning(EFalse)
 {
 // no implementation required
 }
 // -----------------------------------------------------------------------------
 delete iPopup;
 delete iHighlightTimer;
 delete iRedrawTimer;
 delete iUpdateGridTimer;
 delete iOrientationSignalTimer;
+delete iLongTapAnimation;
+delete iLongTapAnimationTimer;
 }
 // -----------------------------------------------------------------------------
 // CTsFastSwapArea::ConstructL
 // -----------------------------------------------------------------------------
 iUpdateGridTimer = new (ELeave) CTsFastSwapTimer( *this );
 iUpdateGridTimer->ConstructL();
 iOrientationSignalTimer = new (ELeave) CTsFastSwapTimer( *this );
 iOrientationSignalTimer->ConstructL();
+iLongTapAnimationTimer = new (ELeave) CTsFastSwapTimer( *this );
+iLongTapAnimationTimer->ConstructL();
+iActivateOnPointerRelease = TPoint();
+iHandlePointerCandidate = EFalse;
 ActivateL();
 }
 // -----------------------------------------------------------------------------
 {
 if ( aIndex >= 0 && aIndex < iArray.Count() )
 {
 TInt wgId = iArray[aIndex]->WgId();
 TUid appUid = iArray[aIndex]->AppUid();
-// Move other app to foreground and then move ourselves to background.
+SwitchToApp( wgId, appUid );
-// Order is important and cannot be reversed.
+}
-iFSClient->SwitchToApp( wgId );
+}
-// We do not want to come back to ts if the activated app is closed.
-// Therefore ts must be moved to background. Ignore orientation updates, it
+// --------------------------------------------------------------------------
-// will be done after task switcher is sent to background
+// CTsFastSwapArea::SwitchToApp
-iIgnoreLayoutSwitch = ETrue;
+// --------------------------------------------------------------------------
-CTsAppUi* appui =
+//
-static_cast<CTsAppUi*>( iEikonEnv->AppUi() );
+void CTsFastSwapArea::SwitchToApp( const TUid& aUid )
-appui->MoveAppToBackground( CTsAppUi::EActivationTransition, appUid, wgId );
+{
-iIgnoreLayoutSwitch = EFalse;
+TApaTaskList taskList( iEikonEnv->WsSession() );
+TApaTask task = taskList.FindApp( aUid );
-// Orientation update
+TInt wgId = task.WgId();
-iPrevScreenOrientation = -1; // force orientation reinit
+SwitchToApp( wgId, aUid );
-iOrientationSignalTimer->Cancel();
+}
-iOrientationSignalTimer->After(KOrientationSwitchTime);
-}
+// --------------------------------------------------------------------------
+// CTsFastSwapArea::SwitchToApp
+// --------------------------------------------------------------------------
+//
+void CTsFastSwapArea::SwitchToApp( TInt aWgId, const TUid& aUid )
+{
+CTsAppUi* appui =
+static_cast<CTsAppUi*>( iEikonEnv->AppUi() );
+TBool effectsEnabled = appui->EffectsEnabled();
+// Move other app to foreground
+if ( !effectsEnabled )
+{
+iFSClient->SwitchToApp( aWgId );
+}
+// We do not want to come back to ts if the activated app is closed.
+// Therefore ts must be moved to background. Ignore orientation updates, it
+// will be done after task switcher is sent to background
+iIgnoreLayoutSwitch = ETrue;
+appui->MoveAppToBackground( CTsAppUi::EActivationTransition, aUid, aWgId );
+iIgnoreLayoutSwitch = EFalse;
+// Move other app to foreground
+if ( effectsEnabled )
+{
+iFSClient->SwitchToApp( aWgId );
+}
+// Orientation update
+iPrevScreenOrientation = -1; // force orientation reinit
+iOrientationSignalTimer->Cancel();
+iOrientationSignalTimer->After(KOrientationSwitchTime);
 }
 // --------------------------------------------------------------------------
 // CTsFastSwapArea::TryCloseAppL
 // --------------------------------------------------------------------------
 // Orientation update
 iPrevScreenOrientation = GetCurrentScreenOrientation();
 iOrientationSignalTimer->Cancel();
 iOrientationSignalTimer->After(KOrientationSwitchTime);
+iPrevAppCount = iArray.Count();
 }
 TSLOG_OUT();
 }
 // --------------------------------------------------------------------------
 //
 TBool CTsFastSwapArea::CanClose( TInt aIndex ) const
 {
 CTsFswEntry* e = iArray[aIndex];
-return !e->AlwaysShown() && !e->SystemApp();
+TBool canClose = !e->AlwaysShown() && !e->SystemApp();
+// Special cases: Menu
+canClose |= e->AppUid() == KTsMenuUid;
+return canClose;
 }
 // --------------------------------------------------------------------------
 // CTsFastSwapArea::CanCloseOthers
 // --------------------------------------------------------------------------
 // Hide highlight
 if ( iGrid->GridBehaviour() == CTsFastSwapGrid::ETouchOnly )
 {
 iGrid->HideHighlight();
 }
+CancelLongTapAnimation();
 }
 // -----------------------------------------------------------------------------
 // CTsFastSwapArea::HandleSwitchToForegroundEvent
 // -----------------------------------------------------------------------------
 TSLOG_CONTEXT( CTsFastSwapArea::HandleSwitchToForegroundEvent, TSLOG_LOCAL );
 TSLOG_IN();
 iIsClosing.Reset();
 iWidgetClosingCount = 0;
+iHandlePointerCandidate = EFalse;
 CTsGridItemDrawer* itemDrawer =
 static_cast<CTsGridItemDrawer*>( iGrid->ItemDrawer() );
 itemDrawer->SetRedrawBackground(ETrue);
 itemDrawer->SetRedrawBackground(EFalse);
 // give feedback
 LaunchPopupFeedback();
+iPrevAppCount = iArray.Count();
 TSLOG_OUT();
 }
 // -----------------------------------------------------------------------------
 //
 TKeyResponse CTsFastSwapArea::OfferKeyEventL(
 const TKeyEvent& aKeyEvent,
 TEventCode aType )
 {
+CancelLongTapAnimation();
 iKeyEvent = ETrue;
 // handle the 'clear' key
 if ( aType == EEventKey && aKeyEvent.iCode == EKeyBackspace )
 {
 TInt idx = SelectedIndex();
 	}
 // pass the event to grid
 // do not pass down and up arrow key events
 if ( aKeyEvent.iScanCode != EStdKeyUpArrow &&
-aKeyEvent.iScanCode != EStdKeyDownArrow )
+aKeyEvent.iScanCode != EStdKeyDownArrow &&
+aKeyEvent.iScanCode != EStdKeyApplication0 )
 {
 TBool animate(ETrue);
 TBool redraw(EFalse);
 TInt prevItem = SelectedIndex();
 TKeyResponse response = iGrid->OfferKeyEventL( aKeyEvent, aType );
 void CTsFastSwapArea::HandlePointerEventL( const TPointerEvent& aPointerEvent )
 {
 iKeyEvent = EFalse;
 if(aPointerEvent.iType == TPointerEvent::EButton1Down)
 {
+iHandlePointerCandidate = ETrue;
 iTapEvent = aPointerEvent;
 iGrid->EnableAknEventHandling(EFalse);
 iGrid->HandlePointerEventL(aPointerEvent);
 iGrid->EnableAknEventHandling(ETrue);
+// Check if long tap animation should be launched
+if ( LongTapAnimForPos(aPointerEvent.iParentPosition) )
+{
+iLongTapAnimationTimer->Cancel();
+iLongTapAnimationTimer->After(KLongTapAnimationInitTime);
+}
+}
+else if ( aPointerEvent.iType == TPointerEvent::EButton1Up )
+{
+CancelLongTapAnimation( EFalse );
+if( iActivateOnPointerRelease != TPoint() )
+{
+TapL(iActivateOnPointerRelease);
+iActivateOnPointerRelease = TPoint();
+}
 }
 }
 // -----------------------------------------------------------------------------
 // CTsFastSwapArea::SelectedIndex
 {
 // Order layout change
 static_cast<CAknAppUi*>(iCoeEnv->AppUi())->HandleResourceChangeL(KEikDynamicLayoutVariantSwitch);
 iRedrawTimer->Cancel();
 iRedrawTimer->After(KRedrawTime);
+}
+}
+else if ( aSource == iLongTapAnimationTimer )
+{
+if ( iLongTapAnimationRunning )
+{
+CancelLongTapAnimation();
+}
+else
+{
+static_cast<CTsAppUi*>(iEikonEnv->AppUi())->RequestPopUpL();
+if ( iLongTapAnimation )
+{
+delete iLongTapAnimation;
+iLongTapAnimation = NULL;
+}
+iLongTapAnimation = CAknLongTapAnimation::NewL(EFalse);
+iLongTapAnimation->SetParent( this );
+iLongTapAnimation->ShowAnimationL( iTapEvent.iParentPosition.iX,
+iTapEvent.iParentPosition.iY );
+iLongTapAnimationRunning = ETrue;
+iLongTapAnimationTimer->Cancel();
+iLongTapAnimationTimer->After(KLongTapAnimationTimeout);
 }
 }
 }
 {
 if ( iArray.Count() )
 {
 if( aType == KAppKeyTypeShort )
 {
-if(iGrid->IsHighlightVisible())
+// Switch to homescreen
-{
+SwitchToApp( KTsHomescreenUid );
-SelectNextItem();
-}
-else
-{
-iGrid->ShowHighlight();
-}
 }
 else if( aType == KAppKeyTypeLong )
 {
-SwitchToApp( SelectedIndex() );
+// Dismiss task switcher
+TRAP_IGNORE( iEikonEnv->EikAppUi()->HandleCommandL(EAknSoftkeyExit) );
 }
 }
 else
 {
 TRAP_IGNORE( iEikonEnv->EikAppUi()->HandleCommandL(EAknSoftkeyExit) );
 {
 TSLOG_CONTEXT( CTsFastSwapArea::MoveOffset, TSLOG_LOCAL );
 TSLOG2_IN("Old position x: %d, y:%d", ViewPos().iX, ViewPos().iY);
 TSLOG2_IN("New position x: %d, y:%d", aPoint.iX, aPoint.iY);
 TSLOG_OUT();
+if( iHandlePointerCandidate )
+{
+		//pointer was pressed and it's being waiting for handling
+return;
+}
 //postpone center item request in case of being moved
 if(iUpdateGridTimer->IsActive())
 	{
 	iUpdateGridTimer->Cancel();
 // CTsFastSwapArea::Tap
 // --------------------------------------------------------------------------
 //
 void CTsFastSwapArea::TapL(const TPoint& aPoint)
 {
+CancelLongTapAnimation();
+if(!iHandlePointerCandidate)
+{
+return;
+}
 if(Rect().Contains(aPoint) && iArray.Count())
 {
 //provide tap pointer event to grid
 iGrid->HandlePointerEventL(iTapEvent);
 iHighlightTimer->Cancel();
 else
 {
 //move task switcher to background
 iEikonEnv->EikAppUi()->HandleCommandL(EAknSoftkeyExit);
 }
+	iHandlePointerCandidate = EFalse;
 }
 // --------------------------------------------------------------------------
 // CTsFastSwapArea::LongTap
 // --------------------------------------------------------------------------
 //
 void CTsFastSwapArea::LongTapL(const TPoint& aPoint)
 {
+CancelLongTapAnimation();
+if(!iHandlePointerCandidate)
+{
+return;
+}
 TInt index(KErrNotFound);
 if( iGrid->GridView()->XYPosToItemIndex(aPoint,index) && iArray.Count() )
 {
 iGrid->SetCurrentItemIndex(index);
 SaveSelectedIndex();
 if ( !ShowPopupL(iSavedSelectedIndex, aPoint) )
 {
-TapL(aPoint);
+iActivateOnPointerRelease = aPoint;
 }
-else
+iGrid->ShowHighlight();
-{
+DrawNow();
-iGrid->ShowHighlight();
+}
-DrawNow();
+	iHandlePointerCandidate = EFalse;
-}
-}
-else
-{
-TapL(aPoint);
-}
 }
 // --------------------------------------------------------------------------
 // CTsFastSwapArea::DragL
 // --------------------------------------------------------------------------
 //
 void CTsFastSwapArea::DragL(
 const MAknTouchGestureFwDragEvent& aEvent)
 {
+CancelLongTapAnimation();
+// Reset activation point
+iActivateOnPointerRelease = TPoint();
+	iHandlePointerCandidate = EFalse;
 	if( aEvent.State() == EAknTouchGestureFwStop)
 		{
 		CenterItem( KUpdateGridTime );
 		}
 // -----------------------------------------------------------------------------
 //
 TBool CTsFastSwapArea::GetVariety( TInt& aVariety )
 {
 aVariety = Layout_Meta_Data::IsLandscapeOrientation() ? 1 : 0;
-TInt screenOrientation = GetCurrentScreenOrientation();
+TBool foreground = static_cast<CTsAppUi*>(iEikonEnv->AppUi())->IsForeground();
-if ( aVariety != screenOrientation )
+if ( foreground )
 {
-aVariety = screenOrientation;
+TInt screenOrientation = GetCurrentScreenOrientation();
-return ETrue;
+if ( aVariety != screenOrientation )
+{
+aVariety = screenOrientation;
+return ETrue;
+}
 }
 return EFalse;
 }
 // -----------------------------------------------------------------------------
 {
 retVal = ETrue;
 iWidgetClosingCount--;
 }
 }
-else
+return retVal;
-{
+}
-// Check current item list
+// -----------------------------------------------------------------------------
+// CTsFastSwapArea::WgOnTaskList
+// -----------------------------------------------------------------------------
+//
+TBool CTsFastSwapArea::WgOnTaskList( TInt aWgId )
+{
+TBool retVal(EFalse);
+TInt appCount = iArray.Count();
+if ( iPrevAppCount != appCount )
+{
+TApaTaskList taskList( iEikonEnv->WsSession() );
+TApaTask task = taskList.FindApp( KTsHomescreenUid );
+TInt homescrWgId = task.WgId();
 for ( TInt i = 0; i < iArray.Count(); i++ )
 {
 TInt wgId = iArray[i]->WgId();
-if ( wgId == aWgId )
+if ( wgId == aWgId ||
+homescrWgId == aWgId )
 {
 retVal = ETrue;
 }
 }
 }
+iPrevAppCount = appCount;
 return retVal;
 }
+// -----------------------------------------------------------------------------
+// CTsFastSwapArea::CancelLongTapAnimation
+// -----------------------------------------------------------------------------
+//
+void CTsFastSwapArea::CancelLongTapAnimation(TBool aDisablePopup)
+{
+iLongTapAnimationRunning = EFalse;
+iLongTapAnimationTimer->Cancel();
+if ( iLongTapAnimation )
+{
+iLongTapAnimation->HideAnimation();
+delete iLongTapAnimation;
+iLongTapAnimation = NULL;
+}
+if( aDisablePopup )
+{
+TRAP_IGNORE(
+static_cast<CTsAppUi*>(iEikonEnv->AppUi())->DisablePopUpL() );
+}
+}
+// -----------------------------------------------------------------------------
+// CTsFastSwapArea::LongTapAnimForPos
+// -----------------------------------------------------------------------------
+//
+TBool CTsFastSwapArea::LongTapAnimForPos( const TPoint& aHitPoint )
+{
+if ( Rect().Contains(aHitPoint) )
+{
+for ( TInt i = 0; i < GridItemCount(); i++ )
+{
+TBool isItemHit = iGrid->GridView()->XYPosToItemIndex( aHitPoint, i );
+if ( isItemHit && ( CanClose( i ) || CanCloseAll( i ) ) )
+{
+return ETrue;
+}
+}
+}
+return EFalse;
+}
 // End of file

branch	RCL_3
changeset 23	7be2816dbabd
parent 19	79311d856354
child 25	137ebc85284b