1.Changed appcontrol parameters of contacts 2.GUI changes 3.Changes to alert tone...

Change-Id: Id61a9e349df45e0a78c0c6e5ffadbbc9c727b8ec
Signed-off-by: Amith Kumar Mahale <amith.m@samsung.com>

diff --git a/inc/CallIncomingCallForm.h b/inc/CallIncomingCallForm.h
index 1d64224..3d1d0c2 100644 (file)
--- a/inc/CallIncomingCallForm.h
+++ b/inc/CallIncomingCallForm.h
@@ -30,6 +30,7 @@
 #include "CallTypes.h"
 #include "CallIPopupItemSelectListener.h"
 #include "CallOptionPopup.h"
+#include "CallIAppStateChangeListner.h"
 
 /**
  * @class IncomingCallForm
@@ -38,6 +39,7 @@
  */
 class IncomingCallForm
        : public BaseForm
+       , public IAppStateChangeListener
        , public Tizen::Ui::Controls::IFormBackEventListener
        , public Tizen::Ui::Controls::ITableViewItemEventListener
        , public Tizen::Ui::Controls::ITableViewItemProvider
@@ -100,6 +102,9 @@ public:
 
        //From IPopupEventListener
        void OnItemSelected(int itemIndex);
+       //From IAppStateChangeListener
+       virtual void OnForeground(void);
+       virtual void OnBackground(void){};
 private:
        // Method to fetch person details using phone number.
        void ShowPersonDetails(const Tizen::Base::String& phoneNumber, const Tizen::Base::String& contactLblName, const Tizen::Base::String& nameLblName, AppCallInfo* pCallInfo);

diff --git a/inc/CallPresentationModel.h b/inc/CallPresentationModel.h
index 14eadd2..58b7aec 100644 (file)
--- a/inc/CallPresentationModel.h
+++ b/inc/CallPresentationModel.h
@@ -142,6 +142,7 @@ public:
        virtual void HandleTelephonyError(int errorCode);
        //From IAppControlResponseListener
        virtual void OnAppControlCompleteResponseReceived(const Tizen::App::AppId& appId, const Tizen::Base::String& operationId, Tizen::App::AppCtrlResult appControlResult, const Tizen::Base::Collection::IMap* pExtraData);
+       virtual void OnAppForeground(void);
 
 private:
        static CallPresentationModel* __pInstance;

diff --git a/inc/CallSoundManager.h b/inc/CallSoundManager.h
index 9fd2e9b..b379a3d 100644 (file)
--- a/inc/CallSoundManager.h
+++ b/inc/CallSoundManager.h
@@ -37,6 +37,12 @@ using namespace Tizen::Base::Runtime;
  * @brief This class presents sound related functionality required in call module.
  *
  */
+enum CallAlertStatus
+{
+       CALL_ALERT_OFF = 0,
+       CALL_ALERT_SOUND,
+       CALL_ALERT_VIBRATE
+};
 class SoundManager
        : public Tizen::Media::IPlayerEventListener
        , public Tizen::Base::Runtime::ITimerEventListener

diff --git a/manifest.xml b/manifest.xml
index 69c6dbd..b4b2951 100644 (file)
--- a/manifest.xml
+++ b/manifest.xml
@@ -14,9 +14,8 @@
             <Privilege>http://tizen.org/privilege/application.launch</Privilege>
             <Privilege>http://tizen.org/privilege/power</Privilege>
             <Privilege>http://tizen.org/privilege/setting</Privilege>
-            <Privilege>http://tizen.org/privilege/lockmanager</Privilege>
-            <Privilege>http://tizen.org/privilege/messaging.sms</Privilege>
             <Privilege>http://tizen.org/privilege/telephony</Privilege>
+            <Privilege>http://tizen.org/privilege/messaging.sms</Privilege>
             <Privilege>http://tizen.org/privilege/vibrator</Privilege>
             <Privilege>http://tizen.org/privilege/contact.read</Privilege>
         </Privileges>

diff --git a/res/screen-size-normal/IDL_CALL_FORM.xml b/res/screen-size-normal/IDL_CALL_FORM.xml
index 72e5a8c..6a7cf1e 100644 (file)
--- a/res/screen-size-normal/IDL_CALL_FORM.xml
+++ b/res/screen-size-normal/IDL_CALL_FORM.xml
@@ -3,7 +3,8 @@
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
 <!DOCTYPE Scene SYSTEM "UIForm.dtd">
-<Scene Bversion="2.0.0.201303280947" Dversion="20120315">
+
+<Scene Bversion="2.0.0.201304041646" Dversion="20120315">
     <LogicalCoordinate>720</LogicalCoordinate>
     <Form id="IDL_CALL_FORM">
         <property backgroundColor="#000000" backgroundColorOpacity="100" notificationTrayOpenEnabled="false" orientation="Automatic:4Dir" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
@@ -41,7 +42,7 @@
         <layout bottomRelation="IDC_BACKGROUND_LABEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="46.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_BACKGROUND_LABEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="16.0" marginLeft="24.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_CALLER1_TIME_LABEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="522.0" x="584.0" y="98.0"/>
     </Label>
     <Button id="IDC_HOLD_BUTTON" parent="IDL_CALL_FORM">
-        <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="C01-1_button_hold_01_press.png" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="33.0" verticalAlign="ALIGN_MIDDLE"/>
+        <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="C01-1_button_hold_normal.png" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="C01-1_button_hold_01_press.png" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="33.0" verticalAlign="ALIGN_MIDDLE"/>
         <layout bottomRelation="IDC_CALLER1_BIGPHOTO_LABEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="74.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="10.0" marginLeft="0.0" marginRight="20.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_CALL_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="74.0" x="626.0" y="636.0"/>
         <layout bottomRelation="IDC_CALLER1_BIGPHOTO_LABEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="74.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="10.0" marginLeft="0.0" marginRight="20.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_CALLER1_BIGPHOTO_LABEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="74.0" x="466.0" y="576.0"/>
     </Button>

diff --git a/res/screen-size-normal/IDL_CONFCALL_FORM.xml b/res/screen-size-normal/IDL_CONFCALL_FORM.xml
index 25b1950..84677f9 100644 (file)
--- a/res/screen-size-normal/IDL_CONFCALL_FORM.xml
+++ b/res/screen-size-normal/IDL_CONFCALL_FORM.xml
@@ -3,7 +3,8 @@
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
 <!DOCTYPE Scene SYSTEM "UIForm.dtd">
-<Scene Bversion="2.0.0.201303280947" Dversion="20120315">
+
+<Scene Bversion="2.0.0.201304041646" Dversion="20120315">
     <LogicalCoordinate>720</LogicalCoordinate>
     <Form id="IDL_CONFCALL_FORM">
         <property backgroundColor="#000000" backgroundColorOpacity="100" notificationTrayOpenEnabled="false" orientation="Automatic:4Dir" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
@@ -21,7 +22,7 @@
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="160.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_CONFCALL_BIGPHOTO_LABEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDL_CONFCALL_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_CONFCALL_FORM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="560.0" y="0.0"/>
     </Label>
     <Button id="IDC_CONF_CALL_MORE_BUTTON" parent="IDL_CONFCALL_FORM">
-        <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="#FFFFFF" normalColorOpacity="0" normalTextColor="" pressedBGBitmapPath="C01-1_button_more_press.png" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="33.0" verticalAlign="ALIGN_MIDDLE"/>
+        <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="C01-1_button_more.png" normalBitmapPath="" normalColor="#FFFFFF" normalColorOpacity="0" normalTextColor="" pressedBGBitmapPath="C01-1_button_more_press.png" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="33.0" verticalAlign="ALIGN_MIDDLE"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="72.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="16.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_CONFCALL_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="72.0" x="632.0" y="23.0"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="70.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="24.0" marginTop="22.0" mode="Landscape" rightRelation="IDL_CONFCALL_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_CONFCALL_FORM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="70.0" x="1186.0" y="22.0"/>
     </Button>
@@ -41,7 +42,7 @@
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="52.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="24.0" marginTop="0.0" mode="Landscape" rightRelation="IDL_CONFCALL_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_CONF_CALL_MORE_BUTTON" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="184.0" x="1072.0" y="92.0"/>
     </Label>
     <Button id="IDC_HOLD_BUTTON" parent="IDL_CONFCALL_FORM">
-        <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="C01-1_button_press.png" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="33.0" verticalAlign="ALIGN_MIDDLE"/>
+        <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="C01-1_button_hold_01.png" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="C01-1_button_hold_01_press.png" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="33.0" verticalAlign="ALIGN_MIDDLE"/>
         <layout bottomRelation="IDC_CONFCALL_BIGPHOTO_LABEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="74.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="10.0" marginLeft="0.0" marginRight="20.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_CONFCALL_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="78.0" x="622.0" y="636.0"/>
         <layout bottomRelation="IDL_CONFCALL_FORM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="74.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="10.0" marginLeft="0.0" marginRight="20.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_CONFCALL_BIGPHOTO_LABEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="78.0" x="462.0" y="576.0"/>
     </Button>

diff --git a/res/screen-size-normal/IDL_MULTIPLE_CALL_FORM.xml b/res/screen-size-normal/IDL_MULTIPLE_CALL_FORM.xml
index 46d51cb..86ca93e 100644 (file)
--- a/res/screen-size-normal/IDL_MULTIPLE_CALL_FORM.xml
+++ b/res/screen-size-normal/IDL_MULTIPLE_CALL_FORM.xml
@@ -3,7 +3,8 @@
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
 <!DOCTYPE Scene SYSTEM "UIForm.dtd">
-<Scene Bversion="2.0.0.201303280947" Dversion="20120315">
+
+<Scene Bversion="2.0.0.201304041646" Dversion="20120315">
     <LogicalCoordinate>720</LogicalCoordinate>
     <Form id="IDL_MULTIPLE_CALL_FORM">
         <property backgroundColor="#000000" backgroundColorOpacity="100" notificationTrayOpenEnabled="false" orientation="Automatic:4Dir" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
@@ -71,7 +72,7 @@
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="52.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_MULTIPLE_CALL_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_CALLER2_TIME_LABEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="IDC_CALLER2_LABEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="399.0" x="0.0" y="400.0"/>
     </Label>
     <Button id="IDC_SWAP_BUTTON" parent="IDL_MULTIPLE_CALL_FORM">
-        <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="C01-1_button_hold_normal_01_press.png" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="33.0" verticalAlign="ALIGN_MIDDLE"/>
+        <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="C01-1_button_hold_01.png" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="C01-1_button_hold_normal_01_press.png" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="33.0" verticalAlign="ALIGN_MIDDLE"/>
         <layout bottomRelation="IDC_CALLER2_PHOTO_LABEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="78.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="15.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="78.0" x="458.0" y="647.0"/>
         <layout bottomRelation="IDC_CALLER2_PHOTO_LABEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="78.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="20.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="78.0" x="285.0" y="562.0"/>
     </Button>

diff --git a/src/CallApp.cpp b/src/CallApp.cpp
index 4c57277..093c423 100644 (file)
--- a/src/CallApp.cpp
+++ b/src/CallApp.cpp
@@ -23,7 +23,6 @@ using namespace Tizen::Ui::Scenes;
 using namespace Tizen::Base::Utility;
 using namespace Tizen::Base::Collection;
 using namespace Tizen::Base::Utility;
-using namespace Tizen::Shell;
 
 
 CallApp::CallApp(void):__initialSceneId(L""), __pLaunchArgs(null)
@@ -531,9 +530,9 @@ CallApp::SetTopMostWindow(bool bTopMost)
                PowerManager::KeepScreenOnState(false);
        }
        //Unlock the phone if its locked
-       if(LockManager::GetInstance()->IsLocked())
+/*     if(LockManager::GetInstance()->IsLocked())
        {
                LockManager::GetInstance()->Unlock();
-       }
+       }*/
 
 }

diff --git a/src/CallButtonsPanel.cpp b/src/CallButtonsPanel.cpp
index ec50816..11be7c8 100644 (file)
--- a/src/CallButtonsPanel.cpp
+++ b/src/CallButtonsPanel.cpp
@@ -442,7 +442,7 @@ CallButtonsPanel::SetBitmapsToButton(const String& buttonId, const String& butto
 
                //Create a new canvas
                Canvas* pCanvas = new (std::nothrow) Canvas;
-               pCanvas->Construct(Rectangle(0, 0, W_KEYPAD_BTN, H_KEYPAD_BTN));
+               pCanvas->Construct(Rectangle(0, 0, pButton->GetWidth(), pButton->GetHeight()));
 
                //Set Text to Canvas
                Point bitmapPos(0, 0);

diff --git a/src/CallEndCallForm.cpp b/src/CallEndCallForm.cpp
index 1da349e..785e929 100644 (file)
--- a/src/CallEndCallForm.cpp
+++ b/src/CallEndCallForm.cpp
@@ -572,6 +572,7 @@ EndCallForm::OnTimerExpired(Tizen::Base::Runtime::Timer& timer)
 void
 EndCallForm::OnAppControlCompleteResponseReceived(const AppId& appId, const String& operationId, AppCtrlResult appControlResult, const IMap* pExtraData)
 {
+       AppLogDebug("Enter");
        if (__isMsgAppControlLaunched == true)
        {
                //Message AppControl request completed.
@@ -603,6 +604,14 @@ EndCallForm::OnForeground(void)
                pPhoneApp->Terminate();
        }
        __isContactAppControlLaunched = false;
+
+       if (__isMsgAppControlLaunched == true)
+       {
+               //Message AppControl request completed.
+               CallApp* pPhoneApp = (static_cast<CallApp*>(UiApp::GetInstance()));
+               pPhoneApp->Terminate();
+               __isMsgAppControlLaunched = false;
+       }
        AppLogDebug("Exit");
 }
 

diff --git a/src/CallIncomingCallForm.cpp b/src/CallIncomingCallForm.cpp
index f4ec54e..85b0e36 100644 (file)
--- a/src/CallIncomingCallForm.cpp
+++ b/src/CallIncomingCallForm.cpp
@@ -732,6 +732,9 @@ void
 IncomingCallForm::OnSceneActivatedN(const SceneId& previousSceneId,    const SceneId& currentSceneId, IList* pArgs)
 {
        AddOrientationEventListener(*this);
+       //listen to Foreground events
+       CallApp* pPhoneApp = static_cast<CallApp*>(CallApp::GetInstance());
+       pPhoneApp->AddAppStateChangeListener(*this);
        if(__pCallPresentor == null)
        {
                __pCallPresentor = CallPresentationModel::GetInstance();
@@ -868,6 +871,7 @@ IncomingCallForm::OnSceneDeactivated(const SceneId& currentSceneId, const SceneI
        }
        CallApp* pCallApp = static_cast<CallApp*>(CallApp::GetInstance());
        pCallApp->SetTopMostWindow(false);
+       pCallApp->RemoveAppStateChangeListener(*this);
 }
 
 result
@@ -1311,9 +1315,10 @@ IncomingCallForm::OnTouchPressed(const Control& source, const Point& currentPosi
 void
 IncomingCallForm::OnTouchReleased(const Control& source, const Point& currentPosition, const TouchEventInfo& touchInfo)
 {
+       AppLogDebug("%d",currentPosition.x);
        if (__isAnswerCallStarted == true)
        {
-               if (currentPosition.x > REJECT_LABEL_X_OFFSET)
+               if (currentPosition.x > __pRejectLabel->GetBounds().x)
                {
                        //Right reject icon
                        if(__pRejectFinalVisElem == null)
@@ -1388,7 +1393,7 @@ IncomingCallForm::OnTouchReleased(const Control& source, const Point& currentPos
        }
        else if (__isRejectCallStarted == true)
        {
-               if (currentPosition.x < ACCEPT_LABEL_RELATIVE_POS)
+               if (currentPosition.x < ((__pAcceptLabel->GetBounds().x + __pAcceptLabel->GetWidth())- __pRejectLabel->GetBounds().x))
                {
                        //left dial icon
                        if(__pAcceptFinalVisElem == null)
@@ -1581,3 +1586,9 @@ IncomingCallForm::OnOrientationChanged(const Control& source, OrientationStatus
        }
 
 }
+
+void
+IncomingCallForm::OnForeground(void)
+{
+       __pCallPresentor->OnAppForeground();
+}

diff --git a/src/CallPresentationModel.cpp b/src/CallPresentationModel.cpp
index a0b98a1..baff300 100644 (file)
--- a/src/CallPresentationModel.cpp
+++ b/src/CallPresentationModel.cpp
@@ -411,6 +411,22 @@ CallPresentationModel::RejectCall(int callHandle, bool sendMsg, const String& co
        return true;
 }
 
+void CallPresentationModel::OnAppForeground(void)
+{
+       if (__isMessageAppControlRunning == true)
+       {
+               //This comes here, when Message AppControl is finished working.
+               __isMessageAppControlRunning = false;
+               //Check if this was the last call, then terminate application.
+               //And if any calls are active, then those cases are already handled from Other places.
+               if( GetCurrentCallCount() == 0)
+               {
+                       CallApp* pPhoneApp = static_cast<CallApp*>(UiApp::GetInstance());
+                       pPhoneApp->Terminate();
+               }
+       }
+}
+
 void
 CallPresentationModel::OnAppControlCompleteResponseReceived(const AppId& appId, const String& operationId, AppCtrlResult appControlResult, const IMap* pExtraData)
 {

diff --git a/src/CallSoundManager.cpp b/src/CallSoundManager.cpp
index efbc144..3e52598 100644 (file)
--- a/src/CallSoundManager.cpp
+++ b/src/CallSoundManager.cpp
@@ -235,29 +235,39 @@ void
 SoundManager::SetDisconnectTone(void)
 {
 
+       AppLogDebug("Enter");
        int unknownRejectStatus = -1;
-       String disconnectTonePath;
+       String disconnectTonePath=L"";
        vconf_get_bool(VCONFKEY_CISSAPPL_CALL_END_TONE_BOOL, &unknownRejectStatus);
        bool disconnectToneSetStatus = unknownRejectStatus;
 
        if(disconnectToneSetStatus == true)
        {
+               AppLogDebug("disconnectToneSetStatus == true");
                disconnectTonePath.Append(CALLDISCONNECTTONE_PATH);
                if(__pPlayer == null)
                {
+                       AppLogDebug("__pPlayer == null");
+
                        __pPlayer =  new (std::nothrow) Player();
                        __pPlayer->Construct(*this);
+                       AppLogDebug("__pPlayer Construct");
                }
                if(disconnectTonePath.IsEmpty() == false)
                {
-                       __pPlayer->Close();
+                       AppLogDebug("__pPlayer OpenFile %ls",disconnectTonePath.GetPointer());
                        __pPlayer->OpenFile(disconnectTonePath,false);
+                       AppLogDebug("__pPlayer OpenFile");
                        __pPlayer->SetLooping(false);
+                       AppLogDebug("__pPlayer SetLooping");
                        __pPlayer->SetVolume(80);
+                       AppLogDebug("__pPlayer SetVolume");
                        SetSoundMode(SOUND_MODE_MEDIA);
+                       AppLogDebug("__pPlayer SetVolume");
                        __pPlayer->Play();
                }
        }
+       AppLogDebug("Exit");
 
 }
 
@@ -315,22 +325,33 @@ SoundManager::StartAlert(String& contactRingTone)
        AppLogDebug("Enter");
        if(__pSoundCallSession != null)
        {
-               AppLogDebug("No Alert already in call");
-               String waitingTonePath;
-               waitingTonePath.Append(CALLWAITINGTONE_PATH);
-               if(__pPlayer == null)
+               CallAlertStatus status= CALL_ALERT_SOUND;
+               int alertStatus = -1;
+               int retVal = vconf_get_int(VCONFKEY_CISSAPPL_ALERT_ON_CALL_INT, &alertStatus);
+               if (retVal == 0)
                {
-                       __pPlayer =  new (std::nothrow) Player();
-                       __pPlayer->Construct(*this);
+                       status = (CallAlertStatus) alertStatus;
                }
-               if (waitingTonePath.IsEmpty() == false)
+               AppLogDebug("No Alert already in call");
+               if(status == CALL_ALERT_SOUND)
                {
-                       __pPlayer->Close();
-                       __pPlayer->OpenFile(waitingTonePath,false);
-                       __pPlayer->SetLooping(true);
-                       __pPlayer->SetVolume(80);
-                       SetSoundMode(SOUND_MODE_MEDIA);
-                       __pPlayer->Play();
+                       AppLogDebug("Playing alert tone");
+                       String waitingTonePath;
+                       waitingTonePath.Append(CALLWAITINGTONE_PATH);
+                       if(__pPlayer == null)
+                       {
+                               __pPlayer =  new (std::nothrow) Player();
+                               __pPlayer->Construct(*this);
+                       }
+                       if (waitingTonePath.IsEmpty() == false)
+                       {
+                               __pPlayer->Close();
+                               __pPlayer->OpenFile(waitingTonePath,false);
+                               __pPlayer->SetLooping(true);
+                               __pPlayer->SetVolume(80);
+                               SetSoundMode(SOUND_MODE_MEDIA);
+                               __pPlayer->Play();
+                       }
                }
                return;
        }