MCL/sf/mw/securitysrv: comparison securitydialogs/Autolock/src/AutolockAppUi.cpp

equal deleted inserted replaced

-:bbcfd14ce6a7
+:9971b621ef6c
 #include <apgwgnam.h>
 #include <aknlayoutscalable_avkon.cdl.h>
 //  LOCAL CONSTANTS AND MACROS
 #define KSysApUid TUid::Uid(0x100058F3)
+#define KPhoneAppUid TUid::Uid(0x100058B3)
 const TInt KTriesToConnectServer( 2 );
 const TInt KTimeBeforeRetryingServerConnection( 50000 );
 const TInt PhoneIndex( 0 );
 	iSideKey1 = 0;
 	iSideKey2 = 0;
 	iAppKey = 0;
 	aCallButtonRect = TRect (0,0,0,0);
+	iGotEventDownDuringCall = -1;
 	//connect to ETel
 	TInt err( KErrGeneral );
 TInt thisTry( 0 );
 	iWait->SetRequestType(EMobilePhoneGetLockInfo);
 	iPhone.GetLockInfo(iWait->iStatus, lockType, lockInfoPkg);
 	TInt res = iWait->WaitForRequestL();
 	User::LeaveIfError(res);
+// Eventhough we might lock the device on boot-up (systemLocked == ETrue), we
+// want to hide the app until the handshake is done. StartUp application will
+// active the app when it is finished.
+TApaTask self(iCoeEnv->WsSession());
+self.SetWgId(iCoeEnv->RootWin().Identifier());
+self.SendToBackground();
+// flush
+iCoeEnv->WsSession().Flush();
 TInt lockValue = 0;
 CRepository* repository = CRepository::NewL(KCRUidSecuritySettings);
 TInt cRresult = repository->Get(KSettingsAutolockStatus, lockValue);
 TBool hiddenReset = HiddenReset();
 #if defined(_DEBUG)
 			// lock voice key
 			LockSideKeyL();
 			CAknView* view = View(KAutoLockViewId);
 			if(view)
 				{
-		  		TRect aCallRect;
+		  		TRect aInitialRect;
-				STATIC_CAST(CAutolockView*, view)->HandleCall(0x15, aCallRect);
+				STATIC_CAST(CAutolockView*, view)->HandleCall(0x15, aInitialRect);
 				}
 			}
 		else
 			{
 			{
 			// try put autolock back to foreground
 			CAknView* view = View(KAutoLockViewId);
 			if(view)
 				{
-				TRect aCallRect;
+				TRect aInitialRect;
-				STATIC_CAST(CAutolockView*, view)->HandleCall(0x19, aCallRect);
+				STATIC_CAST(CAutolockView*, view)->HandleCall(0x19, aInitialRect);
 				}
 			TApaTask self(iCoeEnv->WsSession());
 			self.SetWgId(iCoeEnv->RootWin().Identifier());
 			self.BringToForeground();
 			}
 			// unlock voice key while there is active call
 			UnLockSideKey();
 			CAknView* view = View(KAutoLockViewId);
 			if(view)
 				{
-			  	TRect aCallRect;
+			  	TRect aInitialRect;
-				STATIC_CAST(CAutolockView*, view)->HandleCall(0x16, aCallRect);
+				STATIC_CAST(CAutolockView*, view)->HandleCall(0x16, aInitialRect);
 				}
 			}
 		}
 	CAknAppUi::HandleForegroundEventL(aForeground);
 			{
 			iDeviceLockQueryStatus = ETrue;
 			TBool iAppKeyBelongedToBigClock=EFalse;
 			if(!iAppKey)
 				{
-				RDebug::Printf( "%s %s (%u) stealing EStdKeyApplication0 from BigClock=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, 0 );
+				// RDebug::Printf( "%s %s (%u) stealing EStdKeyApplication0 from BigClock=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, 0 );
 				RWindowGroup& groupWin=iCoeEnv->RootWin();
 				iAppKey = groupWin.CaptureKeyUpAndDowns(EStdKeyApplication0, 0, 0); // Capture app key now, in case that it was given to BigClock
 				iAppKeyBelongedToBigClock=ETrue;
 				}
 			if(handler->AskSecCodeInAutoLockL())
 				}
 else
 				{  // make sure that we will be topmost still
 					if(iAppKey && iAppKeyBelongedToBigClock)
 						{
-						RDebug::Printf( "%s %s (%u) giving EStdKeyApplication0 to BigClock=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, 0 );
+						// RDebug::Printf( "%s %s (%u) giving EStdKeyApplication0 to BigClock=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, 0 );
 						RWindowGroup& groupWin=iCoeEnv->RootWin();
 						groupWin.CancelCaptureKeyUpAndDowns(iAppKey);	// give S60-Application key back to BigClock
 						iAppKey = 0;
 						}
 				    iDeviceLockQueryStatus = EFalse;
 	// in case Telephone-app is topmost, then the user is confused because he sees but can't use it.
 	// therefore it's required to hide it, by sending to background. ETMA-7M8A2Y 20090105
 	if ( AknLayoutUtils::PenEnabled() )
 	{
 			TApaTaskList apaTaskList(CCoeEnv::Static()->WsSession());
-			#define KPhoneAppUid TUid::Uid(0x100058B3)
 			TApaTask apaTask = apaTaskList.FindApp(KPhoneAppUid);
 			if (apaTask.Exists())
 	{
 			 		#if defined(_DEBUG)
 	self.BringToForeground();
 	ActivateLocalViewL(KAutoLockViewId);
 	CAknView* view = View(KAutoLockViewId);
 	if(view)
 	  {
-	  TRect aCallRect;
+	  TRect aInitialRect;
-STATIC_CAST(CAutolockView*, view)->HandleCall(0x17, aCallRect);
+STATIC_CAST(CAutolockView*, view)->HandleCall(0x17, aInitialRect);
 	  STATIC_CAST(CAutolockView*, view)->MakeVisible(ETrue);
 	  }
 	else
 	  {
 	  #if defined(_DEBUG)
 		    case KAknFullOrPartialForegroundGained: // partial or full fg gained
 		    	if( iIncallBubble )
 		           	{
 		             	#if defined(_DEBUG)
 		    			RDebug::Print(_L("(AUTOLOCK)CAutolockAppUi::HandleWsEventL: ENABLE call bubble"));
 		    			#endif
+						CAknView* view = View(KAutoLockViewId);
+							if(view)
+								{
+								TRect aInitialRect;
+								STATIC_CAST(CAutolockView*, view)->HandleCall(0x1A, aInitialRect);
+								}
 		                iIncallBubble->SetIncallBubbleAllowedInIdleL( ETrue );
 		            }
 		    	break;
 	    case EEventWindowGroupListChanged:
 	        HandleWindowGroupListChange();
 	    case EEventPointer:
 	    case EEventDragDrop:
 	    		{
 	    		TInt callState = 0;
 	    		RProperty::Get( KPSUidCtsyCallInformation, KCTsyCallState, callState );
-			        if ( 1==1 || callState == EPSCTsyCallStateNone || callState == EPSCTsyCallStateUninitialized )
-			        	{
 	    	        TPointerEvent *pointer = aEvent.Pointer();
 	    	          CAknView* view = View(KAutoLockViewId);
 								  if(view)
 								    {
 								        STATIC_CAST(CAutolockView*, view)->ScreenDeviceChanged();
-								    	TRect aCallRect;
+								    	TRect aInitialRect;
-								        STATIC_CAST(CAutolockView*, view)->HandleCall(0x1, aCallRect);
+								        STATIC_CAST(CAutolockView*, view)->HandleCall(0x1, aInitialRect);
-								    	if(aCallButtonRect.iBr.iX==0)
+								    	if(aCallButtonRect.iBr.iX==0)	// initialize if not done already
-								    		aCallButtonRect = TRect (aCallRect);
+								    		aCallButtonRect = TRect (aInitialRect);
 								    }
+			        if ( callState != EPSCTsyCallStateNone && callState != EPSCTsyCallStateUninitialized )
+			        	{
+	    	        if(pointer->iType==TPointerEvent::EButton1Down)
+	    	        	{
+		    	        TPoint iPosition = pointer->iPosition;
+									if(aCallButtonRect.iBr.iX<iPosition.iX && iPosition.iX<aCallButtonRect.iBr.iX+aCallButtonRect.iTl.iX && iPosition.iY>400 )
+	    		        	{
+	    		        	iGotEventDownDuringCall=1;
+	    		        	}
+	    		        }
 	    	        if(pointer->iType==TPointerEvent::EButton1Up)
 	    	        	{
 		    	        TPoint iPosition = pointer->iPosition;
-						if(aCallButtonRect.iBr.iX<iPosition.iX && iPosition.iX<aCallButtonRect.iBr.iX+aCallButtonRect.iTl.iX && iPosition.iY>400 )
+		    	        // touching at any point inside and below the BigRedButton. This is to handle the case where another dialog overlaps
+						if(iGotEventDownDuringCall==1 && aCallButtonRect.iBr.iX<iPosition.iX && iPosition.iX<aCallButtonRect.iBr.iX+aCallButtonRect.iTl.iX && iPosition.iY>400 )
 	    		        	{
-	    		        		#define KPhoneAppUid1 TUid::Uid(0x100058B3)
 	    		        		TApaTaskList tasklist( iCoeEnv->WsSession() );
-TApaTask phonetask = tasklist.FindApp( KPhoneAppUid1 );
+TApaTask phonetask = tasklist.FindApp( KPhoneAppUid );
 	    		        		if ( phonetask.Exists() )
-{
+{	// send End key to Telephony to end the call
 										    TRawEvent event;
 										    event.Set(TRawEvent::EKeyDown, EStdKeyNo);
 										    iEikonEnv->WsSession().SimulateRawEvent(event);
 					User::After(1000);
 										    event.Set(TRawEvent::EKeyUp, EStdKeyNo);
 										    iEikonEnv->WsSession().SimulateRawEvent(event);
 }
 	    		        	}
+	    		        iGotEventDownDuringCall=0;	// even if outside
 	    		        }
 	    		      }
 		      }
 	        break;
 	    case EEventKeyUp:	// on touch devices, this happens only for the switch-key, which should turn on the lights.
 	    case EEventKeyDown:
 		if(iLocked)
 	    	        SendMessageToSysAp( EEikSecurityQueryLights );
 	    	        break;
 		    default:
+		    	iGotEventDownDuringCall=0;	// any other event invalidates the Press inside the BigRedButton
 		    	break;
 	}
 	// All events are sent to base class.
 	CAknViewAppUi::HandleWsEventL( aEvent, aDestination );
 else
 {
 		            CAknView* view = View(KAutoLockViewId);
 								  if(view)
 								    {
-								    	TRect aCallRect;
+								    	TRect aInitialRect;
-								        STATIC_CAST(CAutolockView*, view)->HandleCall(0x10, aCallRect);
+								        STATIC_CAST(CAutolockView*, view)->HandleCall(0x10, aInitialRect);
-												if(aCallButtonRect.iBr.iX==0)
+												if(aCallButtonRect.iBr.iX==0)	// initialize if not done already
-								    		aCallButtonRect = TRect (aCallRect);
+								    		aCallButtonRect = TRect (aInitialRect);
 								    }
 // So now system is locked. When call is not ongoing, autolock should
 // be on the foreground.
 TInt callState = 0;
 RProperty::Get( KPSUidCtsyCallInformation, KCTsyCallState, callState );

branch	RCL_3
changeset 11	9971b621ef6c
parent 10	bbcfd14ce6a7
child 13	53af9c3d61e4