Fix for 44692 44624

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

diff --git a/inc/CallOptionPopup.h b/inc/CallOptionPopup.h
index 732e08f..400d42e 100644 (file)
--- a/inc/CallOptionPopup.h
+++ b/inc/CallOptionPopup.h
@@ -41,6 +41,7 @@ class CallOptionPopup
        , public Tizen::Ui::Controls::IListViewItemEventListener
        , public Tizen::Ui::Controls::IListViewItemProvider
        , public Tizen::Ui::IActionEventListener
+       , public Tizen::Ui::IPropagatedKeyEventListener
 {
 
 public:
@@ -58,6 +59,12 @@ public:
        virtual int GetItemCount(void);
        // From IActionEventListener
        void OnActionPerformed(const Tizen::Ui::Control& source, int actionId);
+       //IPropagatedKeyEventListener
+       virtual bool OnKeyPressed(Control& source, const Tizen::Ui::KeyEventInfo& keyEventInfo){ return false; };
+       virtual bool OnKeyReleased(Control& source, const Tizen::Ui::KeyEventInfo& keyEventInfo);
+       virtual bool OnPreviewKeyPressed(Control& source, const Tizen::Ui::KeyEventInfo& keyEventInfo){ return false; }
+       virtual bool OnPreviewKeyReleased(Control& source, const Tizen::Ui::KeyEventInfo& keyEventInfo){ return false; }
+       virtual bool TranslateKeyEventInfo(Control& source, Tizen::Ui::KeyEventInfo& keyEventInfo) { return false; }
 
 private:
        result ConstructListData(void);

diff --git a/res/screen-size-normal/IDL_ERROR_MSG_POPUP.xml b/res/screen-size-normal/IDL_ERROR_MSG_POPUP.xml
index 1549383..3c64c5b 100644 (file)
--- a/res/screen-size-normal/IDL_ERROR_MSG_POPUP.xml
+++ b/res/screen-size-normal/IDL_ERROR_MSG_POPUP.xml
@@ -3,15 +3,15 @@
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
 <!DOCTYPE ScenePopup SYSTEM "UIForm.dtd">
-<ScenePopup Bversion="3.0.0.201301251814" Dversion="20120315">
+<ScenePopup Bversion="2.0.0.201307011454" Dversion="20120315">
     <Popup id="IDL_ERROR_MSG_POPUP">
-        <property color="" titleText="" titleTextColor=""/>
-        <layout height="213" mode="Portrait" style="" type="LAYOUT_RELATIVE" width="720"/>
-        <layout height="612" mode="Landscape" style="" type="LAYOUT_RELATIVE" width="414"/>
+        <property accessibilityHint="" color="" titleText="" titleTextColor=""/>
+        <layout height="213.0" mode="Portrait" style="" type="LAYOUT_RELATIVE" width="720.0"/>
+        <layout height="612.0" mode="Landscape" style="" type="LAYOUT_RELATIVE" width="414.0"/>
     </Popup>
     <TextBox id="IDC_MSG_TEXTBOX" parent="IDL_ERROR_MSG_POPUP">
-        <property disabledBackgroundBitmapPath="" disabledColor="#FFFFFF" disabledColorOpacity="0" disabledTextColor="" highlightedBackgroundBitmapPath="" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" lineSpacingExtra="1" lineSpacingMultiplier="1" normalBackgroundBitmapPath="" normalColor="#FFFFFF" normalColorOpacity="0" normalTextColor="" text="" textAlignment="" textSize="42" textboxBorder="TEXT_BOX_BORDER_NONE"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="true" centerVertical="true" height="54" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="648" x="16" y="79"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="498" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="58" x="33" y="30"/>
+        <property accessibilityHint="" disabledBackgroundBitmapPath="" disabledColor="#FFFFFF" disabledColorOpacity="0" disabledTextColor="" highlightedBackgroundBitmapPath="" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" lineSpacingExtra="1.0" lineSpacingMultiplier="1" normalBackgroundBitmapPath="" normalColor="#FFFFFF" normalColorOpacity="0" normalTextColor="" text="" textAlignment="ALIGNMENT_CENTER" textSize="42.0" textboxBorder="TEXT_BOX_BORDER_NONE"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="true" centerVertical="true" height="54.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="648.0" x="36.0" y="79.5"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="498.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="58.0" x="178.0" y="35.0"/>
     </TextBox>
 </ScenePopup>

diff --git a/src/CallConfCallerListForm.cpp b/src/CallConfCallerListForm.cpp
index 7f272bd..d3ce4cc 100644 (file)
--- a/src/CallConfCallerListForm.cpp
+++ b/src/CallConfCallerListForm.cpp
@@ -76,21 +76,6 @@ static const wchar_t* IDC_CALLER4_PANEL = L"IDC_CALLER4_PANEL";
 static const wchar_t* IDC__LINE_LABEL4 = L"IDC__LINE_LABEL4";
 static const wchar_t* IDC_CALLER5_PANEL = L"IDC_CALLER5_PANEL";
 static const wchar_t* IDC__LINE_LABEL5 = L"IDC__LINE_LABEL5";
-static const wchar_t* IDC_END_CALLER1 = L"IDC_END_CALLER1";
-static const wchar_t* IDC_SPLIT_CALLER1 = L"IDC_SPLIT_CALLER1";
-static const wchar_t* IDC_CALLER1_LABEL = L"IDC_CALLER1_LABEL";
-static const wchar_t* IDC_END_CALLER2 = L"IDC_END_CALLER2";
-static const wchar_t* IDC_SPLIT_CALLER2 = L"IDC_SPLIT_CALLER2";
-static const wchar_t* IDC_CALLER2_LABEL = L"IDC_CALLER2_LABEL";
-static const wchar_t* IDC_END_CALLER3 = L"IDC_END_CALLER3";
-static const wchar_t* IDC_SPLIT_CALLER3 = L"IDC_SPLIT_CALLER3";
-static const wchar_t* IDC_CALLER3_LABEL = L"IDC_CALLER3_LABEL";
-static const wchar_t* IDC_END_CALLER4 = L"IDC_END_CALLER4";
-static const wchar_t* IDC_SPLIT_CALLER4 = L"IDC_SPLIT_CALLER4";
-static const wchar_t* IDC_CALLER4_LABEL = L"IDC_CALLER4_LABEL";
-static const wchar_t* IDC_END_CALLER5 = L"IDC_END_CALLER5";
-static const wchar_t* IDC_SPLIT_CALLER5 = L"IDC_SPLIT_CALLER5";
-static const wchar_t* IDC_CALLER5_LABEL = L"IDC_CALLER5_LABEL";
 static const wchar_t* IDC_CONF_CALL_LIST_TABLEVIEW = L"IDC_CONF_CALL_LIST_TABLEVIEW";
 
 //color
@@ -297,6 +282,7 @@ ConfCallerListForm::OnActionPerformed(const Control& source, int actionId)
        case IDA_END_CALLER4:
        case IDA_END_CALLER5:
        {
+               __pList->SetEnabled(false);
                // User has pressed end conference call and we are waiting for TAPI response
                if(__pConfCallInfo == null)
                {
@@ -359,6 +345,7 @@ ConfCallerListForm::OnSceneActivatedN(const SceneId& previousSceneId, const Scen
        }
 
        __pList->UpdateTableView();
+       __pList->SetEnabled(true);
        AddOrientationEventListener(*this);
 }
 
@@ -442,6 +429,7 @@ ConfCallerListForm::HandleParticipantsChanged(void)
        __pConfCallInfo = new (std::nothrow) AppCallInfo();
        *__pConfCallInfo = *pCallInfo;
        __pList->UpdateTableView();
+       __pList->SetEnabled(true);
 }
 
 void

diff --git a/src/CallErrorMsgPopup.cpp b/src/CallErrorMsgPopup.cpp
index 2f67392..9746c73 100644 (file)
--- a/src/CallErrorMsgPopup.cpp
+++ b/src/CallErrorMsgPopup.cpp
@@ -91,7 +91,14 @@ ErrorMsgPopup::ConstructPopup(int errorCode)
        SetSize(popUpDimen);
 
        SetControlAlwaysOnTop(*pMsgTxtBox,true);
-       RelativeLayout* relPopUpLayout = static_cast<RelativeLayout*>(GetLayoutN());
+       RelativeLayout* relPopUpLayout = static_cast<RelativeLayout*>(GetLandscapeLayoutN());
+       if(relPopUpLayout != null)
+       {
+               // Set Relations between msgtextbox and Popup
+               relPopUpLayout->SetCenterAligned(*pMsgTxtBox, CENTER_ALIGN_HORIZONTAL);
+               relPopUpLayout->SetCenterAligned(*pMsgTxtBox, CENTER_ALIGN_VERTICAL);
+       }
+       relPopUpLayout = static_cast<RelativeLayout*>(GetPortraitLayoutN());
        if(relPopUpLayout != null)
        {
                // Set Relations between msgtextbox and Popup

diff --git a/src/CallOptionPopup.cpp b/src/CallOptionPopup.cpp
index b42ff9f..fc8110e 100644 (file)
--- a/src/CallOptionPopup.cpp
+++ b/src/CallOptionPopup.cpp
@@ -89,6 +89,7 @@ CallOptionPopup::Initialize(void)
        r = pCancelButton->Construct(Rectangle(VERTICAL_PADDING, listHeight + CANCEL_BUTTON_PADDING , W_CANCEL_BUTTON, H_CANCEL_BUTTON), strText);
        pCancelButton->SetActionId(IDA_BUTTON_CANCEL_OPTIONS_POPUP);
        pCancelButton->AddActionEventListener(*this);
+       SetPropagatedKeyEventListener(this);
        r = AddControl(pCancelButton);
        TryReturn(r == E_SUCCESS, r, "CallOptionPopup::AddControl() failed");
 
@@ -326,3 +327,12 @@ CallOptionPopup::OnActionPerformed(const Control& source, int actionId)
                break;
        }
 }
+
+bool
+CallOptionPopup::OnKeyReleased(Control& source, const KeyEventInfo& keyEventInfo)
+{
+       AppLogDebug("Enter");
+       Popup::SetShowState(false);
+       __popupListener.OnItemSelected(IDA_BUTTON_CANCEL_OPTIONS_POPUP);
+       return true;
+}