Nabi issue fix and Messaging provider id changed

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

diff --git a/inc/AppResourceId.h b/inc/AppResourceId.h
index 8edfef6..7e755c5 100644 (file)
--- a/inc/AppResourceId.h
+++ b/inc/AppResourceId.h
@@ -1,7 +1,13 @@
-#ifndef _APPRESOURCEID_H_
-#define _APPRESOURCEID_H_
+#ifndef _APP_RESOURCE_ID_H_
+#define _APP_RESOURCE_ID_H_
 
-extern const wchar_t* IDC_EDITFIELD1;
-extern const wchar_t* IDF_FORM;
+extern const wchar_t* IDC_BACKGROUND_LABEL;
+extern const wchar_t* IDC_CALLER1_BIGPHOTO_LABEL;
+extern const wchar_t* IDC_CALLER1_LABEL;
+extern const wchar_t* IDC_CALLER1_TIME_LABEL;
+extern const wchar_t* IDC_KEY_BG_LABEL;
+extern const wchar_t* IDC_NUMBER1_LABEL;
+extern const wchar_t* IDC_VOICE_CALL_ICON_LABEL;
+extern const wchar_t* IDL_OUTCALL_FORM;
 
-#endif // _APPRESOURCEID_H_
+#endif // _APP_RESOURCE_ID_H_

diff --git a/inc/CallActiveCallForm.h b/inc/CallActiveCallForm.h
index 1c32230..57dd0a2 100644 (file)
--- a/inc/CallActiveCallForm.h
+++ b/inc/CallActiveCallForm.h
@@ -26,6 +26,7 @@
 #include <FBase.h>
 #include <FUi.h>
 #include "CallBaseForm.h"
+#include "CallIAppStateChangeListner.h"
 
 class CallButtonsPanel;
 class DtmfKeyPadPanel;
@@ -39,6 +40,7 @@ class AppCallInfo;
  */
 class ActiveCallForm
        : public BaseForm
+       , public IAppStateChangeListener
        , public Tizen::Ui::Controls::IListViewItemEventListener
        , public Tizen::Ui::Controls::IListViewItemProvider
        , public Tizen::Ui::Scenes::ISceneEventListener
@@ -68,6 +70,9 @@ public:
 
        //From IOrientationEventListener
        virtual void OnOrientationChanged(const Tizen::Ui::Control& source, Tizen::Ui::OrientationStatus orientationStatus);
+       //From IAppStateChangeListener
+       virtual void OnForeground(void);
+       virtual void OnBackground(void){};
 
 private:
        // Create the call buttons panel and add to form

diff --git a/res/screen-size-normal/IDL_OUTCALL_FORM.xml b/res/screen-size-normal/IDL_OUTCALL_FORM.xml
index 1581753..8b285d9 100644 (file)
--- a/res/screen-size-normal/IDL_OUTCALL_FORM.xml
+++ b/res/screen-size-normal/IDL_OUTCALL_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.201304161803" Dversion="20120315">
     <LogicalCoordinate>720</LogicalCoordinate>
     <Form id="IDL_OUTCALL_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"/>
@@ -12,7 +13,7 @@
     </Form>
     <Label id="IDC_CALLER1_BIGPHOTO_LABEL" parent="IDL_OUTCALL_FORM">
         <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="" textColor="" textSize="33.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_TOP"/>
-        <layout bottomRelation="IDL_OUTCALL_FORM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="true" centerVertical="false" height="720.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_OUTCALL_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="500.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDL_OUTCALL_FORM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0.0" y="0.0"/>
+        <layout bottomRelation="IDL_OUTCALL_FORM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="true" centerVertical="false" height="780.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_OUTCALL_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="500.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDL_OUTCALL_FORM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0.0" y="0.0"/>
         <layout bottomRelation="IDL_OUTCALL_FORM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="660.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_OUTCALL_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDL_OUTCALL_FORM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="560.0" x="0.0" y="0.0"/>
     </Label>
     <Label id="IDC_BACKGROUND_LABEL" parent="IDL_OUTCALL_FORM">
@@ -32,17 +33,17 @@
     </Label>
     <Label id="IDC_CALLER1_TIME_LABEL" parent="IDL_OUTCALL_FORM">
         <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="#FFFFFF" backgroundColorOpacity="0" horizontalAlign="ALIGN_RIGHT" leftMargin="16" text="Calling..." textColor="#8BF632" textSize="30.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_MIDDLE"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="46.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="24.0" marginTop="6.0" mode="Portrait" rightRelation="IDL_OUTCALL_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="142.0" x="554.0" y="99.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="46.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="24.0" marginTop="6.0" mode="Portrait" rightRelation="IDL_OUTCALL_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="177.0" x="519.0" y="99.0"/>
         <layout bottomRelation="IDC_BACKGROUND_LABEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="70.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="16.0" marginLeft="0.0" marginRight="24.0" marginTop="0.0" mode="Landscape" rightRelation="IDL_OUTCALL_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="172.0" x="1084.0" y="74.0"/>
     </Label>
     <Label id="IDC_NUMBER1_LABEL" parent="IDL_OUTCALL_FORM">
         <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="#FFFFFF" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="" textColor="#FFFFFF" textSize="38.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_MIDDLE"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="46.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_OUTCALL_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="24.0" marginRight="24.0" marginTop="6.0" mode="Portrait" rightRelation="IDC_CALLER1_TIME_LABEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="506.0" x="24.0" y="99.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="46.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_OUTCALL_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="24.0" marginRight="24.0" marginTop="6.0" mode="Portrait" rightRelation="IDC_CALLER1_TIME_LABEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="471.0" x="24.0" y="99.0"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="46.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_BACKGROUND_LABEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="24.0" marginRight="0.0" marginTop="6.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="IDC_CALLER1_LABEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="484.0" x="584.0" y="98.0"/>
     </Label>
     <Label id="IDC_KEY_BG_LABEL" parent="IDL_OUTCALL_FORM">
         <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="" textColor="" textSize="33.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_TOP"/>
-        <layout bottomRelation="IDL_OUTCALL_FORM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="500.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_OUTCALL_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_OUTCALL_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_CALLER1_BIGPHOTO_LABEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0.0" y="720.0"/>
+        <layout bottomRelation="IDL_OUTCALL_FORM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="500.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_OUTCALL_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_OUTCALL_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_CALLER1_BIGPHOTO_LABEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0.0" y="780.0"/>
         <layout bottomRelation="IDL_OUTCALL_FORM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="500.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_CALLER1_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_OUTCALL_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_BACKGROUND_LABEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="560.0" y="160.0"/>
     </Label>
 </Scene>

diff --git a/src/CallActiveCallForm.cpp b/src/CallActiveCallForm.cpp
index 0f06c69..840a65b 100644 (file)
--- a/src/CallActiveCallForm.cpp
+++ b/src/CallActiveCallForm.cpp
@@ -30,6 +30,7 @@
 #include "CallPresentationModel.h"
 #include "CallSceneRegister.h"
 #include "CallTypes.h"
+#include "CallApp.h"
 
 using namespace Tizen::App;
 using namespace Tizen::Base;
@@ -866,6 +867,9 @@ ActiveCallForm::OnSceneActivatedN(const SceneId& previousSceneId, const SceneId&
        __pCallPresentor->SetTelEventListener(this);
        AddOrientationEventListener(*this);
 
+       CallApp* pPhoneApp = static_cast<CallApp*>(CallApp::GetInstance());
+       pPhoneApp->AddAppStateChangeListener(*this);
+
        //Initialize keypad and buttons
        InitializeCallButtonsPanel();
 
@@ -1062,6 +1066,8 @@ ActiveCallForm::OnSceneDeactivated(const SceneId& currentSceneId, const SceneId&
                __pMoreOptionsList->SetShowState(false);
        }
        __DtmfString.Clear();
+       CallApp* pCallApp = static_cast<CallApp*>(CallApp::GetInstance());
+       pCallApp->RemoveAppStateChangeListener(*this);
 }
 
 void
@@ -1843,3 +1849,9 @@ ActiveCallForm::DeleteItem(int index, ListItemBase* pItem, int itemWidth)
        delete pItem;
        return true;
 }
+
+void
+ActiveCallForm::OnForeground(void)
+{
+       __pCallPresentor->OnAppForeground();
+}

diff --git a/src/CallPresentationModel.cpp b/src/CallPresentationModel.cpp
index 95f1e6b..32407f6 100644 (file)
--- a/src/CallPresentationModel.cpp
+++ b/src/CallPresentationModel.cpp
@@ -401,6 +401,12 @@ CallPresentationModel::RejectCall(int callHandle, bool sendMsg, const String& co
 
 void CallPresentationModel::OnAppForeground(void)
 {
+       if (__isDialAppControlRunning == true)
+       {
+               //This comes here, when Dialer AppControl is finished working.
+               __isDialAppControlRunning = false;
+               __pAppControlMgr->AppControlRequestCompleted();
+       }
        if (__isMessageAppControlRunning == true)
        {
                //This comes here, when Message AppControl is finished working.
@@ -419,6 +425,7 @@ void CallPresentationModel::OnAppForeground(void)
 void
 CallPresentationModel::OnAppControlCompleteResponseReceived(const AppId& appId, const String& operationId, AppCtrlResult appControlResult, const IMap* pExtraData)
 {
+       AppLogDebug("Enter");
        if (__isMessageAppControlRunning == true)
        {
                //This comes here, when Message AppControl is finished working.

diff --git a/src/CallTypes.cpp b/src/CallTypes.cpp
index 1a83742..225cf7b 100644 (file)
--- a/src/CallTypes.cpp
+++ b/src/CallTypes.cpp
@@ -285,7 +285,7 @@ const wchar_t* OPERATION_ID_DIAL = L"http://tizen.org/appcontrol/operation/dial"
 const wchar_t* PROVIDER_ID_CAMERA = L"http://tizen.org/appcontrol/provider/camera";
 const wchar_t* PROVIDER_ID_GALLERY = L"http://tizen.org/appcontrol/provider/gallery";
 //const wchar_t* PROVIDER_ID_CALL = L"http://tizen.org/appcontrol/provider/call";
-const wchar_t* PROVIDER_ID_MESSAGE = L"http://tizen.org/appcontrol/provider/message";
+const wchar_t* PROVIDER_ID_MESSAGE = L"tizen.messages";
 const wchar_t* PROVIDER_ID_EMAIL = L"http://tizen.org/appcontrol/provider/email";
 const wchar_t* PROVIDER_ID_MEDIA = L"http://tizen.org/appcontrol/provider/media";
 const wchar_t* PROVIDER_ID_CONTACTS = L"f9uev8hsyo.Contacts";