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

equal deleted inserted replaced

-:5456b4e8b3a8
+:3321d3e205b6
 // our application ( so that it represent our app )
 //iApplicationTask.SetWgId( iCoeEnv->RootWin().Identifier() );
 iApplicationTask.SetWgId( iWg.Identifier() );
 // And finally, go to background.
+iForeground = ETrue;
 MoveAppToBackground( ENoneTransition );
 iEikonEnv->RootWin().SetOrdinalPosition(-1, ECoeWinPriorityNeverAtFront);
 iEikonEnv->RootWin().EnableReceiptOfFocus(EFalse);
 iIsPopUpShown = EFalse;
 iUiStarted = EFalse;
 iDisableAppKeyHandling = EFalse;
-// Set process priority to high to avoid being
-// locked by heavy ui apps processing
-iEikonEnv->WsSession().ComputeMode(RWsSession::EPriorityControlDisabled);
-RProcess().SetPriority(EPriorityHigh);
 iForegroundDelayed = EFalse;
 iDelayedForegroundInProgress = EFalse;
 TSLOG_OUT();
 }
 // -----------------------------------------------------------------------------
 // CTsAppUi::CTsAppUi()
 // Perform the first phase of two phase construction
 // -----------------------------------------------------------------------------
 //
-CTsAppUi::CTsAppUi(): iForeground( ETrue ),
+CTsAppUi::CTsAppUi(): iForeground( EFalse ),
 iApplicationTask( iCoeEnv->WsSession() )
 {
 // no implementation required
 }
 // Destructor
 // -----------------------------------------------------------------------------
 //
 CTsAppUi::~CTsAppUi()
 {
-if( GfxTransEffect::IsRegistered( iAppView ) )
+if( iAppView && GfxTransEffect::IsRegistered( iAppView ) )
 {
 GfxTransEffect::Deregister(iAppView);
 }
 GfxTransEffect::SetTransitionObserver(0);
 TBool aVisibility,
 TBool /*aLayers*/,
 TUint aSubCom )
 {
 const TDesC8* ptr = reinterpret_cast<const TDesC8*>(iAppView);
+GfxTransEffect::AbortFullScreen();
 GfxTransEffect::Abort(iAppView);
 GfxTransEffect::Begin( iAppView, aTranstionId );
 GfxTransEffect::SetDemarcation( iAppView, iAppView->Rect() );
 GfxTransEffect::NotifyExternalState( ECaptureComponentsBegin, ptr );
 iAppView->MakeVisible( aVisibility );
 }
 else
 {
 // App start animation
 const TDesC8* ptr = reinterpret_cast<const TDesC8*>(iAppView);
+GfxTransEffect::AbortFullScreen();
 GfxTransEffect::Abort(iAppView);
 TInt groupId = GfxTransEffect::BeginGroup();
 GfxTransEffect::BeginFullScreen(
 EActivationAppShowTransition, ApplicationRect(),
 AknTransEffect::EParameterType,
 // CTsAppUi::GoToBackgroundTimerCallback
 // -----------------------------------------------------------------------------
 //
 TInt CTsAppUi::GoToBackgroundTimerCallback( TAny* aParam )
 {
+TSLOG_STATIC_CONTEXT( GoToBackgroundTimerCallback, TSLOG_LOCAL, RThread().Id() );
+TSLOG_IN();
 CTsAppUi* self = static_cast<CTsAppUi*>( aParam );
 if ( self->iGoToBackgroundTimer )
 {
 self->iGoToBackgroundTimer->Cancel();
 }
 // to background
 self->iApplicationTask.SendToBackground();
 // Notify
 self->HandleSwitchToBackgroundEvent();
+TSLOG_OUT();
 return 0;
 }
 // -----------------------------------------------------------------------------
 // CTsAppUi::DelayedForegroundCallback
 void CTsAppUi::MoveAppToForeground( TUint  /*aTransitionType*/ )
 {
 TSLOG_CONTEXT( MoveAppToForeground, TSLOG_LOCAL );
 TSLOG_IN();
+if ( !iUiStarted )
+{
+TRAP_IGNORE( iUnderAppWgId = WgIdOfUnderlyingAppL(EFalse) );
+}
 iUiStarted = ETrue;
 // Request window server to bring our application
 // to foreground
 iApplicationTask.BringToForeground();
 if( iForeground  )
 {
 iForeground = EFalse;
 SetTaskswitcherStateProperty( KTaskswitcherBackgroundValue );
+iAppView->MakeVisible( EFalse );
 // notify view
 iAppView->HandleSwitchToBackgroundEvent();
 iWg.SetOrdinalPosition(-1, ECoeWinPriorityNormal);
 }
 else
 {
 SetOrientationL(EAppUiOrientationPortrait);
 }
-RProcess().SetPriority(EPriorityForeground);
 SetFullScreenApp(EFalse);
 iEikonEnv->RootWin().SetOrdinalPosition(0, ECoeWinPriorityAlwaysAtFront);
 }
 TSLOG_OUT();
 }
 {
 iIsPopUpShown = EFalse;
 iEikonEnv->RootWin().SetOrdinalPosition(-1, ECoeWinPriorityNeverAtFront);
 SetOrientationL(EAppUiOrientationAutomatic);
 SetFullScreenApp(EFalse);
-RProcess().SetPriority(EPriorityHigh);
 }
 TSLOG_OUT();
 }
 // -----------------------------------------------------------------------------
 //
 void CTsAppUi::HandleWsEventL(const TWsEvent& aEvent,
 CCoeControl* aDestination)
 {
+TSLOG_CONTEXT( CTsAppUi::HandleWsEventL, TSLOG_LOCAL );
 CAknAppUi::HandleWsEventL(aEvent, aDestination);
 TInt eventType = aEvent.Type();
 if ( eventType == EEventWindowGroupListChanged )
 {
 TInt wgId = WgIdOfUnderlyingAppL(EFalse);
+TSLOG2( TSLOG_INFO, "WgIdOfUnderlyingAppL: %d appId: %d",
+wgId, GetAppIdL( wgId ).iUid );
 if ( iForeground &&
+wgId &&
 wgId != iUnderAppWgId &&
 !iAppView->AppCloseInProgress(iUnderAppWgId) &&
 !iAppView->WgOnTaskList(wgId) )
 {
 MoveAppToBackground( ENoneTransition );
 {
 HandleResourceChangeL(KEikDynamicLayoutVariantSwitch);
 }
 iUnderAppWgId = wgId;
 }
+TSLOG_OUT();
 }
 // -----------------------------------------------------------------------------
 // CTsAppUi::WgIdOfUnderlyingApp
 // -----------------------------------------------------------------------------
 //
 TInt CTsAppUi::WgIdOfUnderlyingAppL( TBool aIgnoreParentChild )
 {
+TSLOG_CONTEXT( CTsAppUi::WgIdOfUnderlyingAppL, TSLOG_LOCAL );
 TInt retVal(0);
 TInt underlyingWg = CheckForUnderlyingHiddenAppsL();
 if ( !underlyingWg )
 {
-TApaTaskList taskList( iEikonEnv->WsSession() );
+TApaTaskList taskList(iEikonEnv->WsSession());
 underlyingWg = taskList.FindByPos(0).WgId();
+if ( !(GetAppIdL(underlyingWg).iUid) )
+{
+TSLOG1 (TSLOG_INFO, "Incorrect  underlying window group: %d.", underlyingWg );
+TSLOG0 (TSLOG_INFO, "No association to appId, nor special handling for underlying hidden apps.Change return value into 0.");
+underlyingWg = 0;
+}
 }
 if ( aIgnoreParentChild )
 {
 retVal = underlyingWg;
 else
 {
 TInt parentWg = GetTopParentWg( underlyingWg );
 retVal = parentWg ? parentWg : underlyingWg;
 }
+TSLOG_OUT();
 return retVal;
 }
 // -----------------------------------------------------------------------------
 // CTsAppUi::GetTopParentWg
 CleanupClosePushL(allWgIds);
 User::LeaveIfError(iEikonEnv->WsSession().WindowGroupList(0, &allWgIds));
 TInt underlyingWg(allWgIds[0].iId);
 CleanupStack::PopAndDestroy(&allWgIds);
-CApaWindowGroupName* windowName =
+TUid appUid = GetAppIdL( underlyingWg );
-CApaWindowGroupName::NewLC( iEikonEnv->WsSession(), underlyingWg );
-TUid appUid = windowName->AppUid();
-CleanupStack::PopAndDestroy( windowName );
 if( appUid == KTsCameraUid ||
 appUid == KTsTelephoneUid )
 {
 wgId = underlyingWg;
 }
 TBool retVal(EFalse);
 TApaTaskList taskList( iEikonEnv->WsSession() );
 TInt underlyingWg = taskList.FindByPos(0).WgId();
+TUid appUid = GetAppIdL( underlyingWg );
+if ( appUid == KTsCameraUid )
+{
+retVal = ETrue;
+}
+return retVal;
+}
+// -----------------------------------------------------------------------------
+// CTsAppUi::DelayedForegroundLaunched
+// -----------------------------------------------------------------------------
+//
+TBool CTsAppUi::DelayedForegroundLaunched()
+{
+return iDelayedForegroundInProgress;
+}
+// -----------------------------------------------------------------------------
+// CTsAppUi::GetAppIdL
+// -----------------------------------------------------------------------------
+//
+TUid CTsAppUi::GetAppIdL( TInt aWgId )
+{
+TUid retVal;
 CApaWindowGroupName* windowName =
-CApaWindowGroupName::NewLC( iEikonEnv->WsSession(), underlyingWg );
+CApaWindowGroupName::NewLC( iEikonEnv->WsSession(), aWgId );
-TUid appUid = windowName->AppUid();
+retVal = windowName->AppUid();
 CleanupStack::PopAndDestroy( windowName );
-if ( appUid == KTsCameraUid )
-{
-retVal = ETrue;
-}
 return retVal;
 }
-// -----------------------------------------------------------------------------
-// CTsAppUi::DelayedForegroundLaunched
-// -----------------------------------------------------------------------------
-//
-TBool CTsAppUi::DelayedForegroundLaunched()
-{
-return iDelayedForegroundInProgress;
-}
 // End of file

branch	RCL_3
changeset 35	3321d3e205b6
parent 34	5456b4e8b3a8