Nabi issue resolution for Messages App

Change-Id: If045153dc2049688ca9c909d41148e31e41967b7
Signed-off-by: GAURAV JAIN <gaurav.j3@samsung.com>

diff --git a/inc/MsgAttachmentSavePopup.h b/inc/MsgAttachmentSavePopup.h
index 8f71b3c..11b12d7 100644 (file)
--- a/inc/MsgAttachmentSavePopup.h
+++ b/inc/MsgAttachmentSavePopup.h
@@ -34,6 +34,7 @@ class MessageData;
 class AttachementSavePopup\r
        : public BaseCustomPopup\r
        , public Tizen::Ui::IActionEventListener\r
+       , public Tizen::Ui::IKeyEventListener\r
        , public Tizen::Ui::Controls::IListViewItemEventListener\r
        , public Tizen::Ui::Controls::IListViewItemProvider\r
 {\r
@@ -58,9 +59,15 @@ public:
        void SaveSelectedAttachments(void);\r
        Tizen::Graphics::Bitmap* GetIconN(const Tizen::Base::String& filePath) const;\r
        void ExitPopup(void);\r
+       //From IKeyEventListener\r
+       virtual void OnKeyPressed(const Tizen::Ui::Control& source, Tizen::Ui::KeyCode keyCode){};\r
+       virtual void OnKeyReleased(const Tizen::Ui::Control& source, Tizen::Ui::KeyCode keyCode);\r
+       virtual void OnKeyLongPressed(const Tizen::Ui::Control& source, Tizen::Ui::KeyCode keyCode){};\r
+\r
 private:\r
        class AttachMentsObject\r
                : public Tizen::Base::Object\r
+\r
        {\r
        public:\r
                AttachMentsObject(const Tizen::Base::String& filePath, Tizen::Graphics::Bitmap* pIconBitmap)\r
@@ -69,6 +76,8 @@ private:
                {}\r
                const Tizen::Base::String& GetAttachmentPath(void) const { return __pFilepath;}\r
                const Tizen::Graphics::Bitmap* GetIcon(void) const { return __pIconBitmap;}\r
+\r
+\r
        private:\r
                Tizen::Base::String __pFilepath;\r
                Tizen::Graphics::Bitmap* __pIconBitmap;\r

diff --git a/inc/MsgContactPopup.h b/inc/MsgContactPopup.h
index 19c83ab..3f18f39 100644 (file)
--- a/inc/MsgContactPopup.h
+++ b/inc/MsgContactPopup.h
@@ -47,6 +47,7 @@ private:
 class ContactPopup\r
        : public Tizen::Ui::Controls::Popup\r
        , public Tizen::Ui::IActionEventListener\r
+       , public Tizen::Ui::IKeyEventListener\r
        , public Tizen::Ui::Controls::IListViewItemEventListener\r
        , public Tizen::Ui::Controls::IListViewItemProvider\r
 {\r
@@ -69,6 +70,11 @@ public:
 \r
        // From IActionEventListener\r
        void OnActionPerformed(const Tizen::Ui::Control& source, int actionId);\r
+       //From IKeyEventListener\r
+       virtual void OnKeyPressed(const Tizen::Ui::Control& source, Tizen::Ui::KeyCode keyCode){};\r
+       virtual void OnKeyReleased(const Tizen::Ui::Control& source, Tizen::Ui::KeyCode keyCode);\r
+       virtual void OnKeyLongPressed(const Tizen::Ui::Control& source, Tizen::Ui::KeyCode keyCode){};\r
+\r
 \r
 protected:\r
        void InitalizePopupItems(void);\r

diff --git a/inc/MsgDurationPopup.h b/inc/MsgDurationPopup.h
index 734a819..2c9c4d6 100644 (file)
--- a/inc/MsgDurationPopup.h
+++ b/inc/MsgDurationPopup.h
@@ -30,6 +30,7 @@
 \r
 class DurationPopup\r
        : public BaseCustomPopup\r
+       , public Tizen::Ui::IKeyEventListener\r
        , public Tizen::Ui::IActionEventListener\r
        , public Tizen::Ui::ITextEventListener\r
 {\r
@@ -44,6 +45,11 @@ public:
        result ShowPopup(void);\r
        // From IActionEventListener\r
        virtual void OnActionPerformed(const Tizen::Ui::Control& source, int actionId);\r
+       //From IKeyEventListener\r
+       virtual void OnKeyPressed(const Tizen::Ui::Control& source, Tizen::Ui::KeyCode keyCode){};\r
+       virtual void OnKeyReleased(const Tizen::Ui::Control& source, Tizen::Ui::KeyCode keyCode);\r
+       virtual void OnKeyLongPressed(const Tizen::Ui::Control& source, Tizen::Ui::KeyCode keyCode){};\r
+\r
 protected:\r
        virtual void OnTextValueChanged(const Tizen::Ui::Control& source);\r
        virtual void OnTextValueChangeCanceled(const Tizen::Ui::Control& source){};\r

diff --git a/inc/MsgMessageComposePanel.h b/inc/MsgMessageComposePanel.h
index 6307879..9b82ad8 100644 (file)
--- a/inc/MsgMessageComposePanel.h
+++ b/inc/MsgMessageComposePanel.h
@@ -148,6 +148,8 @@ protected:
        bool IsConvertedToMms(void) const;
        Tizen::Base::Collection::IList* GetSelectedFileListN(const Tizen::Base::String& operationId, const Tizen::Base::Collection::IMap* pResultMap);
        void SetFormEnabled(bool);
+       void InitComposePanelDimensionByFont(void);
+
 private:
        IComposeEventObserver* __pCompseEventListener;
        ComposeBaseControl* __pFocusControl;
@@ -174,6 +176,10 @@ private:
        int __prevCurPosition;
        int __fontSize;
        int __prevScrollPosition;
+       int __sizeforOneLine;
+       int __sizeForTwoLine;
+       int __heightChangePerLine;
+
 };
 
 #endif // _MSG_MESSAGE_COMPOSE_PANEL_H_

diff --git a/inc/MsgOptionPopup.h b/inc/MsgOptionPopup.h
index ad3101b..e4b3a1a 100644 (file)
--- a/inc/MsgOptionPopup.h
+++ b/inc/MsgOptionPopup.h
@@ -34,6 +34,7 @@ class ConversationData;
 class OptionPopup\r
        : public BaseCustomPopup\r
        , public Tizen::Ui::IActionEventListener\r
+       , public Tizen::Ui::IKeyEventListener\r
        , public Tizen::Ui::Controls::IListViewItemEventListener\r
        , public Tizen::Ui::Controls::IListViewItemProvider\r
 {\r
@@ -58,6 +59,12 @@ public:
        // From IActionEventListener\r
        void OnActionPerformed(const Tizen::Ui::Control& source, int actionId);\r
 \r
+       //From IKeyEventListener\r
+       virtual void OnKeyPressed(const Tizen::Ui::Control& source, Tizen::Ui::KeyCode keyCode){};\r
+       virtual void OnKeyReleased(const Tizen::Ui::Control& source, Tizen::Ui::KeyCode keyCode);\r
+       virtual void OnKeyLongPressed(const Tizen::Ui::Control& source, Tizen::Ui::KeyCode keyCode){};\r
+\r
+\r
        /**\r
         * Show message details\r
         * @return void\r

diff --git a/inc/MsgPhoneNumberListPopup.h b/inc/MsgPhoneNumberListPopup.h
index 8845a7e..8d475c7 100644 (file)
--- a/inc/MsgPhoneNumberListPopup.h
+++ b/inc/MsgPhoneNumberListPopup.h
@@ -31,6 +31,7 @@ class IPopupEventListener;
 class PhoneNumberListPopup\r
        : public Tizen::Ui::Controls::Popup\r
        , public Tizen::Ui::IActionEventListener\r
+       , public Tizen::Ui::IKeyEventListener\r
        , public Tizen::Ui::Controls::IListViewItemEventListener\r
        , public Tizen::Ui::Controls::IListViewItemProvider\r
 {\r
@@ -52,6 +53,11 @@ public:
        virtual int GetItemCount(void);\r
        // From IActionEventListener\r
        void OnActionPerformed(const Tizen::Ui::Control& source, int actionId);\r
+       //From IKeyEventListener\r
+       virtual void OnKeyPressed(const Tizen::Ui::Control& source, Tizen::Ui::KeyCode keyCode){};\r
+       virtual void OnKeyReleased(const Tizen::Ui::Control& source, Tizen::Ui::KeyCode keyCode);\r
+       virtual void OnKeyLongPressed(const Tizen::Ui::Control& source, Tizen::Ui::KeyCode keyCode){};\r
+\r
 \r
 private:\r
        Tizen::Base::Collection::ArrayList* __pPhoneNumberList;\r

diff --git a/inc/MsgResendDeletePopup.h b/inc/MsgResendDeletePopup.h
index a82a810..090cabb 100644 (file)
--- a/inc/MsgResendDeletePopup.h
+++ b/inc/MsgResendDeletePopup.h
@@ -35,6 +35,7 @@ class IPopupEventListener;
 class MsgResendDeletePopup\r
        : public Tizen::Ui::Controls::Popup\r
        , public Tizen::Ui::IActionEventListener\r
+       , public Tizen::Ui::IKeyEventListener\r
        , public Tizen::Ui::Controls::IListViewItemEventListener\r
        , public Tizen::Ui::Controls::IListViewItemProvider\r
 {\r
@@ -60,6 +61,11 @@ public:
        // From IActionEventListener\r
        void OnActionPerformed(const Tizen::Ui::Control& source, int actionId);\r
 \r
+       //From IKeyEventListener\r
+       virtual void OnKeyPressed(const Tizen::Ui::Control& source, Tizen::Ui::KeyCode keyCode){};\r
+       virtual void OnKeyReleased(const Tizen::Ui::Control& source, Tizen::Ui::KeyCode keyCode);\r
+       virtual void OnKeyLongPressed(const Tizen::Ui::Control& source, Tizen::Ui::KeyCode keyCode){};\r
+\r
 private:\r
        ConversationData* __pConvData;\r
        Tizen::Ui::Controls::Button* __pCancelButton;\r

diff --git a/inc/MsgTokenOptionPopup.h b/inc/MsgTokenOptionPopup.h
index e501aa5..5e351f5 100644 (file)
--- a/inc/MsgTokenOptionPopup.h
+++ b/inc/MsgTokenOptionPopup.h
@@ -35,6 +35,7 @@ class AddressInfo;
 class TokenOptionPopup
        : public BaseCustomPopup
        , public Tizen::Ui::IActionEventListener
+       , public Tizen::Ui::IKeyEventListener
        , public Tizen::Ui::Controls::IListViewItemEventListener
        , public Tizen::Ui::Controls::IListViewItemProvider
 {
@@ -55,6 +56,10 @@ public:
        virtual int GetItemCount(void);
        // From IActionEventListener
        virtual void OnActionPerformed(const Tizen::Ui::Control& source, int actionId);
+       //From IKeyEventListener
+       virtual void OnKeyPressed(const Tizen::Ui::Control& source, Tizen::Ui::KeyCode keyCode){};
+       virtual void OnKeyReleased(const Tizen::Ui::Control& source, Tizen::Ui::KeyCode keyCode);
+       virtual void OnKeyLongPressed(const Tizen::Ui::Control& source, Tizen::Ui::KeyCode keyCode){};
 
 private:
        Tizen::Ui::Control& __parentCntl;

diff --git a/res/screen-density-xhigh/M01_play_btn_next_press.png b/res/screen-density-xhigh/M01_play_btn_next_press.png
index 18a21c1..0874dd1 100644 (file)
Binary files a/res/screen-density-xhigh/M01_play_btn_next_press.png and b/res/screen-density-xhigh/M01_play_btn_next_press.png differ

diff --git a/res/screen-density-xhigh/M01_play_btn_pause_press.png b/res/screen-density-xhigh/M01_play_btn_pause_press.png
index b851280..b39b66f 100644 (file)
Binary files a/res/screen-density-xhigh/M01_play_btn_pause_press.png and b/res/screen-density-xhigh/M01_play_btn_pause_press.png differ

diff --git a/res/screen-density-xhigh/M01_play_btn_play_press.png b/res/screen-density-xhigh/M01_play_btn_play_press.png
index cdccbb4..4425c44 100644 (file)
Binary files a/res/screen-density-xhigh/M01_play_btn_play_press.png and b/res/screen-density-xhigh/M01_play_btn_play_press.png differ

diff --git a/res/screen-density-xhigh/M01_play_btn_previous_press.png b/res/screen-density-xhigh/M01_play_btn_previous_press.png
index 7169310..dd510b9 100644 (file)
Binary files a/res/screen-density-xhigh/M01_play_btn_previous_press.png and b/res/screen-density-xhigh/M01_play_btn_previous_press.png differ

diff --git a/res/screen-density-xhigh/M01_play_btn_volume_press.png b/res/screen-density-xhigh/M01_play_btn_volume_press.png
index e209bd0..c43c7b8 100644 (file)
Binary files a/res/screen-density-xhigh/M01_play_btn_volume_press.png and b/res/screen-density-xhigh/M01_play_btn_volume_press.png differ

diff --git a/res/screen-size-normal/IDL_MMS_DETAIL_FORM.xml b/res/screen-size-normal/IDL_MMS_DETAIL_FORM.xml
index d48d813..dfad089 100644 (file)
--- a/res/screen-size-normal/IDL_MMS_DETAIL_FORM.xml
+++ b/res/screen-size-normal/IDL_MMS_DETAIL_FORM.xml
@@ -3,15 +3,15 @@
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
 <!DOCTYPE Scene SYSTEM "UIForm.dtd">
-<Scene Bversion="2.0.0.201305071547" Dversion="20120315">
+<Scene Bversion="2.0.0.201306251414" Dversion="20120315">
     <LogicalCoordinate>720</LogicalCoordinate>
     <Form id="IDL_MMS_DETAIL_FORM">
         <property backgroundColor="" backgroundColorOpacity="100" notificationTrayOpenEnabled="false" orientation="Portrait" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
-        <layout mode="Portrait" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/>
-        <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/>
+        <layout mode="Portrait" style="FORM_STYLE_PORTRAIT_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/>
+        <layout mode="Landscape" style="FORM_STYLE_PORTRAIT_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/>
     </Form>
     <Footer>
-        <property backgroundBitmapPath="" color="" colorOpacity="0" disabledButtonColor="" disabledButtonColorOpacity="0" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="100" disabledItemTextColor="" footerStyle="FOOTER_STYLE_BUTTON_ICON" highlightedButtonColor="" highlightedButtonColorOpacity="0" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="100" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="0" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="100" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="0" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="100" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="100" selectedItemTextColor="" showBackButton="true"/>
+        <property backgroundBitmapPath="" color="" colorOpacity="0" disabledButtonColor="" disabledButtonColorOpacity="0" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="100" disabledItemTextColor="" footerStyle="FOOTER_STYLE_BUTTON_ICON" highlightedButtonColor="" highlightedButtonColorOpacity="0" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="100" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="0" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="100" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="0" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="100" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="100" selectedItemTextColor="" showBackButton="false" showMenuButton="false"/>
         <itemSet/>
     </Footer>
     <Header>
@@ -20,27 +20,27 @@
     </Header>
     <Panel id="IDC_PLAY_CONTROLS_PANEL" parent="IDL_MMS_DETAIL_FORM">
         <property backgroundColor="#4D4D4D" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>
-        <layout bottomRelation="IDL_MMS_DETAIL_FORM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="216.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="" type="NONE" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0.0" y="795.0"/>
+        <layout bottomRelation="IDL_MMS_DETAIL_FORM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="216.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="" type="NONE" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0.0" y="810.0"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="46.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="" type="NONE" verticalFitPolicy="FIT_POLICY_FIXED" width="533.0" x="90.0" y="418.0"/>
     </Panel>
     <Button id="IDC_VOLUME_BUTTON" parent="IDC_PLAY_CONTROLS_PANEL">
         <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="M01_play_btn_volume_press.png" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="M01_play_btn_volume_press.png" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="20.0" verticalAlign="ALIGN_MIDDLE"/>
-        <layout height="74.0" mode="Portrait" width="74.0" x="32.0" y="120.0"/>
+        <layout height="74.0" mode="Portrait" width="74.0" x="32.0" y="100.0"/>
         <layout height="356.0" mode="Landscape" width="78.0" x="4.0" y="0.0"/>
     </Button>
     <Button id="IDC_NEXT_BUTTON" parent="IDC_PLAY_CONTROLS_PANEL">
         <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="M01_play_btn_next_press.png" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="M01_play_btn_next_press.png" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="M01_play_btn_next_press.png" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="33.0" verticalAlign="ALIGN_MIDDLE"/>
-        <layout height="74.0" mode="Portrait" width="74.0" x="466.0" y="120.0"/>
+        <layout height="74.0" mode="Portrait" width="74.0" x="466.0" y="100.0"/>
         <layout height="356.0" mode="Landscape" width="78.0" x="14.0" y="0.0"/>
     </Button>
     <Button id="IDC_PLAY_PAUSE_BUTTON" parent="IDC_PLAY_CONTROLS_PANEL">
         <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="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="33.0" verticalAlign="ALIGN_MIDDLE"/>
-        <layout height="74.0" mode="Portrait" width="74.0" x="322.0" y="120.0"/>
+        <layout height="74.0" mode="Portrait" width="74.0" x="322.0" y="100.0"/>
         <layout height="356.0" mode="Landscape" width="78.0" x="14.0" y="0.0"/>
     </Button>
     <Button id="IDC_PREVIOUS_BUTTON" parent="IDC_PLAY_CONTROLS_PANEL">
         <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="M01_play_btn_previous_press.png" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="M01_play_btn_previous_press.png" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="M01_play_btn_previous_press.png" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="33.0" verticalAlign="ALIGN_MIDDLE"/>
-        <layout height="74.0" mode="Portrait" width="74.0" x="178.0" y="120.0"/>
+        <layout height="74.0" mode="Portrait" width="74.0" x="178.0" y="100.0"/>
         <layout height="356.0" mode="Landscape" width="78.0" x="14.0" y="0.0"/>
     </Button>
     <Progress id="IDC_PROGRESS" parent="IDC_PLAY_CONTROLS_PANEL">

diff --git a/src/MsgAttachmentSavePopup.cpp b/src/MsgAttachmentSavePopup.cpp
index 2817721..eb20693 100644 (file)
--- a/src/MsgAttachmentSavePopup.cpp
+++ b/src/MsgAttachmentSavePopup.cpp
@@ -35,6 +35,7 @@ using namespace Tizen::Graphics;
 using namespace Tizen::Io;\r
 using namespace Tizen::Media;\r
 using namespace Tizen::System;\r
+using namespace Tizen::Ui;\r
 using namespace Tizen::Ui::Controls;\r
 \r
 \r
@@ -79,6 +80,7 @@ AttachementSavePopup::Construct(void)
 {\r
        AppLogDebug("ENTER");\r
        result r = Popup::Construct(L"IDL_ATTACHMENTS_POPUP");\r
+       Popup::AddKeyEventListener(*this);\r
        if (!IsFailed(r))\r
        {\r
                // Transfer ownership\r
@@ -424,3 +426,22 @@ AttachementSavePopup::ExitPopup(void)
        AppLogDebug("EXIT: %s", GetErrorMessage(GetLastResult()));\r
        return;\r
 }\r
+\r
+void\r
+AttachementSavePopup::OnKeyReleased(const Tizen::Ui::Control& source, Tizen::Ui::KeyCode keyCode)\r
+{\r
+       AppLogDebug("ENTER");\r
+       switch (keyCode)\r
+       {\r
+       case KEY_BACK:\r
+       {\r
+               Popup::SetShowState(false);\r
+               ExitPopup();\r
+       }\r
+       break;\r
+\r
+       default:\r
+               break;\r
+       }\r
+       AppLogDebug("EXIT: %s", GetErrorMessage(GetLastResult()));\r
+}\r

diff --git a/src/MsgComposerForm.cpp b/src/MsgComposerForm.cpp
index 0c13ccb..4dbf882 100644 (file)
--- a/src/MsgComposerForm.cpp
+++ b/src/MsgComposerForm.cpp
@@ -566,6 +566,7 @@ ComposerForm::OnSendButtonClick(void)
                                }
                                __pSendFailedPopup = new (std::nothrow) Popup();
                                __pSendFailedPopup->Construct(L"IDL_MSG_INFO_POPUP");
+                               __pSendFailedPopup->AddKeyEventListener(*this);
                                Button* pOkDelete = static_cast<Button*>(__pSendFailedPopup->GetControl(L"IDC_BUTTON1"));
                                Label* pLabel = static_cast<Label*>(__pSendFailedPopup->GetControl(L"IDC_LABEL1"));
                                pLabel->SetText(L"Message Sending Failed");
@@ -1039,35 +1040,44 @@ ComposerForm::OnKeyReleased(const Control& source, KeyCode keyCode)
        case KEY_SIDE_UP:
        case KEY_SIDE_DOWN:
        {
-               SettingPresentationModel* pSettingPrModel = SettingPresentationModel::GetInstance();
-               if (pSettingPrModel->IsVolumeKeyOn())
+//             SettingPresentationModel* pSettingPrModel = SettingPresentationModel::GetInstance();
+//             if (pSettingPrModel->IsVolumeKeyOn())
+//             {
+//                     if (keyCode == KEY_SIDE_UP)
+//                     {
+//                             FontSettings* pFontSettings = SettingPresentationModel::GetInstance()->GetFontSettings();
+//                             int fontType = (int) pFontSettings->GetMessageFontType();
+//                             if (fontType < SETTING_HUGE_FONT)
+//                             {
+//                                     fontType++;
+//                                     pFontSettings->SetMessageFonttype((SettingFontType) fontType);
+//                             }
+//                             int size = pFontSettings->GetMessageTextSize((SettingFontType) fontType);
+//                             __pMsgComposePanel->SetTextSize(size);
+//                             __pRecipientPanel->SetTextSize(size);
+//                     }
+//                     else if (keyCode == KEY_SIDE_DOWN)
+//                     {
+//                             FontSettings* pFontSettings = SettingPresentationModel::GetInstance()->GetFontSettings();
+//                             int fontType = pFontSettings->GetMessageFontType();
+//                             if (fontType > SETTING_TINY_FONT)
+//                             {
+//                                     fontType--;
+//                                     pFontSettings->SetMessageFonttype((SettingFontType) fontType);
+//                             }
+//                             int size = pFontSettings->GetMessageTextSize((SettingFontType) fontType);
+//                             __pMsgComposePanel->SetTextSize(size);
+//                             __pRecipientPanel->SetTextSize(size);
+//                     }
+//             }
+       }
+       break;
+
+       case KEY_BACK:
+       {
+               if (__pMessagePopup && __pMessagePopup->GetShowState())
                {
-                       if (keyCode == KEY_SIDE_UP)
-                       {
-                               FontSettings* pFontSettings = SettingPresentationModel::GetInstance()->GetFontSettings();
-                               int fontType = (int) pFontSettings->GetMessageFontType();
-                               if (fontType < SETTING_HUGE_FONT)
-                               {
-                                       fontType++;
-                                       pFontSettings->SetMessageFonttype((SettingFontType) fontType);
-                               }
-                               int size = pFontSettings->GetMessageTextSize((SettingFontType) fontType);
-                               __pMsgComposePanel->SetTextSize(size);
-                               __pRecipientPanel->SetTextSize(size);
-                       }
-                       else if (keyCode == KEY_SIDE_DOWN)
-                       {
-                               FontSettings* pFontSettings = SettingPresentationModel::GetInstance()->GetFontSettings();
-                               int fontType = pFontSettings->GetMessageFontType();
-                               if (fontType > SETTING_TINY_FONT)
-                               {
-                                       fontType--;
-                                       pFontSettings->SetMessageFonttype((SettingFontType) fontType);
-                               }
-                               int size = pFontSettings->GetMessageTextSize((SettingFontType) fontType);
-                               __pMsgComposePanel->SetTextSize(size);
-                               __pRecipientPanel->SetTextSize(size);
-                       }
+                       __pMessagePopup->SetShowState(false);
                }
        }
        break;
@@ -1207,6 +1217,7 @@ ComposerForm::ShowMessagePopup(const String& message, int leftActionId,
 
        __pMessagePopup = new (std::nothrow) Popup();
        __pMessagePopup->Construct(L"IDL_BLOCK_POPUP");
+       __pMessagePopup->AddKeyEventListener(*this);
        Button* pButtonOk = static_cast<Button*>(__pMessagePopup->GetControl(L"IDC_BUTTON_OK"));
        pButtonOk->SetActionId(leftActionId);
        pButtonOk->AddActionEventListener(*this);

diff --git a/src/MsgContactPopup.cpp b/src/MsgContactPopup.cpp
index 28d5db9..84a956c 100644 (file)
--- a/src/MsgContactPopup.cpp
+++ b/src/MsgContactPopup.cpp
@@ -25,6 +25,7 @@ using namespace Tizen::App;
 using namespace Tizen::Base;
 using namespace Tizen::Base::Collection;
 using namespace Tizen::Graphics;
+using namespace Tizen::Ui;
 using namespace Tizen::Ui::Controls;
 
 #define H_POPUP           550
@@ -54,6 +55,7 @@ ContactPopup::Construct(const String& contactName, const String& contactNumber)
        AppLogDebug("ENTER");
 
        result r = Popup::Construct(L"IDL_RECIPIENT_LIST_POPUP");
+       Popup::AddKeyEventListener(*this);
        if (!IsFailed(r))
        {
                __contactName = contactName;
@@ -139,6 +141,27 @@ ContactPopup::OnActionPerformed(const Control& source, int actionId)
 }
 
 void
+ContactPopup::OnKeyReleased(const Tizen::Ui::Control& source, Tizen::Ui::KeyCode keyCode)
+{
+       AppLogDebug("ENTER");
+
+       switch (keyCode)
+       {
+       case KEY_BACK:
+       {
+               Popup::SetShowState(false);
+               __popupListener.OnPopupClose(this);
+       }
+       break;
+
+       default:
+               break;
+       }
+
+       AppLogDebug("EXIT: %s", GetErrorMessage(GetLastResult()));
+}
+
+void
 ContactPopup::OnListViewItemStateChanged(ListView& listView, int index, int elementId,
                                                                                 ListItemStatus status)
 {

diff --git a/src/MsgConversationData.cpp b/src/MsgConversationData.cpp
index 0d4508e..263610b 100644 (file)
--- a/src/MsgConversationData.cpp
+++ b/src/MsgConversationData.cpp
@@ -610,7 +610,10 @@ ConversationData::UpdateGroupName(int day, int date, int month, int year)
        default:
                break;
        }
-       if (month != 5)
+       String displayLanguageValue;
+       SettingInfo::GetValue(IDS_KEY_LANGUAGE_CHANGE, displayLanguageValue);
+       String arabicLanguage(L"ara_AE");
+       if (month != 5 && !displayLanguageValue.Equals(arabicLanguage))
        {
                __groupName.Append(L".");
        }
@@ -620,6 +623,8 @@ ConversationData::UpdateGroupName(int day, int date, int month, int year)
                __groupName.Append(year);
        }
        __groupName.Append(L")");
+
+       AppLogDebug("EXIT: %s", GetErrorMessage(GetLastResult()));
 }
 
 

diff --git a/src/MsgConversationForm.cpp b/src/MsgConversationForm.cpp
index 6052b04..96a27f3 100644 (file)
--- a/src/MsgConversationForm.cpp
+++ b/src/MsgConversationForm.cpp
@@ -1553,6 +1553,7 @@ ConversationForm::OnUserEventReceivedN(RequestId requestId, IList* pArgs)
                                SetFormEnabled(false);
                                __pOptionPopup = new (std::nothrow) OptionPopup(*this, pConvData);
                                __pOptionPopup->Construct(__pCurrentThreadEntry->GetEntryId(), pDataIndex->ToInt());
+                               __pOptionPopup->AddKeyEventListener(*this);
                                __pOptionPopup->SetShowState(true);
                                __pOptionPopup->Show();
                                //      pConvData = null; // Transfer ownership to popup
@@ -2153,35 +2154,40 @@ ConversationForm::OnKeyReleased(const Control& source, KeyCode keyCode)
 {
        AppLogDebug("ENTER");
 
-       SettingPresentationModel* pSettingPrModel = SettingPresentationModel::GetInstance();
-       if (pSettingPrModel->IsVolumeKeyOn())
+       switch (keyCode)
        {
-               if (keyCode == KEY_SIDE_UP)
+       case KEY_BACK:
+       {
+               if (__pOptionPopup && __pOptionPopup->GetShowState())
                {
-                       FontSettings* pFontSettings = SettingPresentationModel::GetInstance()->GetFontSettings();
-                       int fontType = (int) pFontSettings->GetMessageFontType();
-                       if (fontType < SETTING_HUGE_FONT)
-                       {
-                               fontType++;
-                               pFontSettings->SetMessageFonttype((SettingFontType) fontType);
-                       }
-                       int size = pFontSettings->GetMessageTextSize((SettingFontType) fontType);
-                       __pMsgComposePanel->SetTextSize(size);
-                       __pConvMessageList->UpdateTableView();
+                       SetFormEnabled(true);
+                       __pOptionPopup->SetShowState(false);
                }
-               else if (keyCode == KEY_SIDE_DOWN)
+               else if (__pDeleteConfirmPopup && __pDeleteConfirmPopup->GetShowState())
                {
-                       FontSettings* pFontSettings = SettingPresentationModel::GetInstance()->GetFontSettings();
-                       int fontType = (int) pFontSettings->GetMessageFontType();
-                       if (fontType > SETTING_TINY_FONT)
-                       {
-                               fontType--;
-                               pFontSettings->SetMessageFonttype((SettingFontType) fontType);
-                       }
-                       int size = pFontSettings->GetMessageTextSize((SettingFontType) fontType);
-                       __pMsgComposePanel->SetTextSize(size);
-                       __pConvMessageList->UpdateTableView();
+                       __pDeleteConfirmPopup->SetShowState(false);
+               }
+
+               else if (__pResendDelete && __pResendDelete->GetShowState())
+               {
+                       __pResendDelete->SetShowState(false);
+               }
+
+               else if (__pSendFailedPopup && __pSendFailedPopup->GetShowState())
+               {
+                       __pSendFailedPopup->SetShowState(false);
+               }
+
+               else if (__pBlockPopup && __pBlockPopup->GetShowState())
+               {
+                       __pBlockPopup->SetShowState(false);
                }
+
+       }
+       break;
+
+       default:
+               break;
        }
 
        AppLogDebug("EXIT: r= %s", GetErrorMessage(GetLastResult()));
@@ -2266,6 +2272,7 @@ ConversationForm::BlockPopup(const String& phoneNumber)
 
        __pBlockPopup = new (std::nothrow) Popup();
        __pBlockPopup->Construct(L"IDL_BLOCK_POPUP");
+       __pBlockPopup->AddKeyEventListener(*this);
        Button* pButtonOk = static_cast<Button*>(__pBlockPopup->GetControl(L"IDC_BUTTON_OK"));
        pButtonOk->SetActionId(IDA_PHONENUMBER_BLOCK_OK);
        pButtonOk->AddActionEventListener(*this);
@@ -2844,12 +2851,14 @@ ConversationForm::ShowDeleteConfirmPopup(void)
                AppLogDebug("ENTER");
                __pDeleteConfirmPopup = new (std::nothrow) BaseCustomPopup();
                __pDeleteConfirmPopup->Construct(L"IDL_DELETE_POPUP");
+               __pDeleteConfirmPopup->AddKeyEventListener(*this);
                Button* pButtonDelete = static_cast<Button*>(__pDeleteConfirmPopup->GetControl(L"IDC_BUTTON_LEFT"));
                Button* pButtonCancel = static_cast<Button*>(__pDeleteConfirmPopup->GetControl(L"IDC_BUTTON_RIGHT"));
                pButtonDelete->SetActionId(IDA_CONVLISTEDIT_MESSAGE_DELETE);
                pButtonDelete->AddActionEventListener(*this);
                pButtonCancel->SetActionId(IDA_CONVLISTEDIT_MESSAGE_CANCEL);
                pButtonCancel->AddActionEventListener(*this);
+
                __pDeleteConfirmPopup->Show();
        }
        AppLogDebug("EXIT: %s", GetErrorMessage(GetLastResult()));

diff --git a/src/MsgDurationPopup.cpp b/src/MsgDurationPopup.cpp
index a12d46f..90939ec 100644 (file)
--- a/src/MsgDurationPopup.cpp
+++ b/src/MsgDurationPopup.cpp
@@ -25,6 +25,7 @@ using namespace Tizen::Base;
 using namespace Tizen::Base::Collection;\r
 using namespace Tizen::Base::Runtime;\r
 using namespace Tizen::Graphics;\r
+using namespace Tizen::Ui;\r
 using namespace Tizen::Ui::Controls;\r
 \r
 DurationPopup::DurationPopup(Control& parent)\r
@@ -45,6 +46,7 @@ DurationPopup::Construct(const String& resourceId)
 {\r
        AppLogDebug("ENTER");\r
        result r = Popup::Construct(resourceId);\r
+       Popup::AddKeyEventListener(*this);\r
        if (!IsFailed(r))\r
        {\r
                Button* pButtonOk = (Button*) GetControl(L"IDC_BUTTON_OK");\r
@@ -170,6 +172,30 @@ DurationPopup::OnActionPerformed(const Control& source, int actionId)
        AppLogDebug("EXIT: %s", GetErrorMessage(GetLastResult()));\r
 }\r
 \r
+void\r
+DurationPopup::OnKeyReleased(const Tizen::Ui::Control& source, Tizen::Ui::KeyCode keyCode)\r
+{\r
+       AppLogDebug("ENTER");\r
+       switch (keyCode)\r
+       {\r
+       case KEY_BACK:\r
+       {\r
+               SetDuration(__previousValue);\r
+               EditField* pDurationField = (EditField*) GetControl(L"IDC_EDITFIELD_DURATION");\r
+               pDurationField->HideKeypad();\r
+               SetShowState(false);\r
+               RequestId requestId = REQUEST_DESTROY_DURATION_POPUP;\r
+               __parentCntl.SendUserEvent(requestId, null);\r
+       }\r
+       break;\r
+\r
+       default:\r
+               break;\r
+       }\r
+       AppLogDebug("EXIT: %s", GetErrorMessage(GetLastResult()));\r
+}\r
+\r
+\r
 //ITextEventListener\r
 void\r
 DurationPopup::OnTextValueChanged(const Tizen::Ui::Control& source)\r

diff --git a/src/MsgMessageComposePanel.cpp b/src/MsgMessageComposePanel.cpp
index 5a8815b..9180037 100644 (file)
--- a/src/MsgMessageComposePanel.cpp
+++ b/src/MsgMessageComposePanel.cpp
@@ -100,6 +100,9 @@ MessageComposePanel::MessageComposePanel(void)
        , __prevCurPosition(0)
        , __fontSize(FONT_MAIN_TEXT_SIZE_NORMAL)
        , __prevScrollPosition(0)
+       , __sizeforOneLine(74)
+       , __sizeForTwoLine(122)
+       , __heightChangePerLine(51)
 {
        // Empty implementation
 }
@@ -200,6 +203,7 @@ MessageComposePanel::Construct(const String& resourceId)
        __pScrollPanel = static_cast<ScrollPanel*>(GetControl(L"IDC_SCROLLPANEL"));
        SetShowState(false);
        __fontSize = CommonUtil::GetFontSize(COMPOSER_FORM);
+       InitComposePanelDimensionByFont();
        AppLogDebug("EXIT: %s", GetErrorMessage(GetLastResult()));
        return r;
 }
@@ -1306,26 +1310,26 @@ MessageComposePanel::OnTextValueChanged(const Control& source)
                        GetControl(L"IDC_PANEL_IMAGE_TEXT"));
        if (source.GetParent()->GetParent()->Equals(*pImageTextSlidePanel))
        {
-//             ExpandableEditArea* pExpandableEditArea = dynamic_cast<ExpandableEditArea *>((ExpandableEditArea *)(&source));
-//             if(pExpandableEditArea)
-//             {
-//                     int currentLineCount = pExpandableEditArea->GetTextLineCount();
-//                     if (currentLineCount > 2 && pExpandableEditArea->GetHeight() > (122 + 51*(currentLineCount - 2)))
-//                     {
-//                             pExpandableEditArea->SetSize(pExpandableEditArea->GetWidth(), (122 + 51*(currentLineCount - 2)));
-//                             static_cast<MediaTextExpandEditArea*>(__pFocusControl)->OnExpandableEditAreaLineRemoved(*pExpandableEditArea, currentLineCount);
-//                     }
-//                     else if (currentLineCount == 2 && pExpandableEditArea->GetHeight() > 122 )
-//                     {
-//                             pExpandableEditArea->SetSize(pExpandableEditArea->GetWidth(), 122 );
-//                             static_cast<MediaTextExpandEditArea*>(__pFocusControl)->OnExpandableEditAreaLineRemoved(*pExpandableEditArea, currentLineCount);
-//                     }
-//                     else if ((currentLineCount == 1 || currentLineCount == 0) && pExpandableEditArea->GetHeight() > 74)
-//                     {
-//                             pExpandableEditArea->SetSize(pExpandableEditArea->GetWidth(), 74);
-//                             static_cast<MediaTextExpandEditArea*>(__pFocusControl)->OnExpandableEditAreaLineRemoved(*pExpandableEditArea, currentLineCount);
-//                     }
-//             }
+               ExpandableEditArea* pExpandableEditArea = dynamic_cast<ExpandableEditArea *>((ExpandableEditArea *)(&source));
+               if(pExpandableEditArea)
+               {
+                       int currentLineCount = pExpandableEditArea->GetTextLineCount();
+                       if (currentLineCount > 2 && pExpandableEditArea->GetHeight() > (__sizeForTwoLine + __heightChangePerLine*(currentLineCount - 2)))
+                       {
+                               pExpandableEditArea->SetSize(pExpandableEditArea->GetWidth(), (__sizeForTwoLine + __heightChangePerLine*(currentLineCount - 2)));
+                               static_cast<MediaTextExpandEditArea*>(__pFocusControl)->OnExpandableEditAreaLineRemoved(*pExpandableEditArea, currentLineCount);
+                       }
+                       else if (currentLineCount == 2 && pExpandableEditArea->GetHeight() > __sizeForTwoLine )
+                       {
+                               pExpandableEditArea->SetSize(pExpandableEditArea->GetWidth(), __sizeForTwoLine );
+                               static_cast<MediaTextExpandEditArea*>(__pFocusControl)->OnExpandableEditAreaLineRemoved(*pExpandableEditArea, currentLineCount);
+                       }
+                       else if ((currentLineCount == 1 || currentLineCount == 0) && pExpandableEditArea->GetHeight() > __sizeforOneLine)
+                       {
+                               pExpandableEditArea->SetSize(pExpandableEditArea->GetWidth(), __sizeforOneLine);
+                               static_cast<MediaTextExpandEditArea*>(__pFocusControl)->OnExpandableEditAreaLineRemoved(*pExpandableEditArea, currentLineCount);
+                       }
+               }
        }
        ShowComposeInfo();
        RequestId requestId = REQUEST_CHECK_COMPOSE_STATE;
@@ -2636,3 +2640,48 @@ MessageComposePanel::SetFormEnabled(bool state)
        }
        AppLogDebug("EXIT: %s", GetErrorMessage(GetLastResult()));
 }
+
+void
+MessageComposePanel::InitComposePanelDimensionByFont(void)
+{
+       AppLogDebug("ENTER");
+
+       switch (__fontSize)
+       {
+       case 44:
+       {
+               __sizeForTwoLine = 122;
+               __sizeforOneLine = 74;
+               __heightChangePerLine = 51;
+       }
+       break;
+
+       case 64:
+       {
+               __sizeForTwoLine = 174;
+               __sizeforOneLine = 99;
+               __heightChangePerLine = 77;
+       }
+       break;
+
+       case 81:
+       {
+               __sizeForTwoLine = 214;
+               __sizeforOneLine = 114;
+               __heightChangePerLine = 97;
+       }
+       break;
+
+       case 98:
+       {
+               __sizeForTwoLine = 256;
+               __sizeforOneLine = 134;
+               __heightChangePerLine = 118;
+       }
+       break;
+
+       default:
+               break;
+       }
+       AppLogDebug("EXIT: %s", GetErrorMessage(GetLastResult()));
+}

diff --git a/src/MsgMessageData.cpp b/src/MsgMessageData.cpp
index 72d4107..3697912 100644 (file)
--- a/src/MsgMessageData.cpp
+++ b/src/MsgMessageData.cpp
@@ -38,6 +38,7 @@ using namespace Tizen::Io;
 using namespace Tizen::Locales;\r
 using namespace Tizen::Media;\r
 using namespace Tizen::Social;\r
+using namespace Tizen::System;\r
 \r
 const wchar_t* IDS_PREVIEW = L"Preview";\r
 const wchar_t* IDS_CHAR = L"r";\r
@@ -733,7 +734,10 @@ MessageData::UpdateGroupName(int day, int date, int month, int year)
        default:\r
                break;\r
        }\r
-       if (month != 5)\r
+       String displayLanguageValue;\r
+       SettingInfo::GetValue(IDS_KEY_LANGUAGE_CHANGE, displayLanguageValue);\r
+       String arabicLanguage(L"ara_AE");\r
+       if (month != 5 && !displayLanguageValue.Equals(arabicLanguage))\r
        {\r
                __groupName.Append(L".");\r
        }\r
@@ -743,6 +747,8 @@ MessageData::UpdateGroupName(int day, int date, int month, int year)
                __groupName.Append(year);\r
        }\r
        __groupName.Append(L")");\r
+\r
+       AppLogDebug("EXIT: %s", GetErrorMessage(GetLastResult()));\r
 }\r
 \r
 const int\r

diff --git a/src/MsgMessagesApp.cpp b/src/MsgMessagesApp.cpp
index f5fb880..72983de 100644 (file)
--- a/src/MsgMessagesApp.cpp
+++ b/src/MsgMessagesApp.cpp
@@ -475,14 +475,15 @@ MessagesApp::OnAppControlRequestReceived(RequestId reqId, const String& operatio
                        String* pMsgId = (String*) pArgs->GetValue(key);
                        Integer integer ;
                        int msgId;
-                       integer.Decode(*pMsgId, msgId);
-
-
-                       ArrayList* pArrayList = new (std::nothrow) ArrayList();
-                       pArrayList->Construct();
-                       pArrayList->Add(new String(*pMsgId));
+                       if (pMsgId)
+                       {
+                               integer.Decode(*pMsgId, msgId);
+                               ArrayList* pArrayList = new (std::nothrow) ArrayList();
+                               pArrayList->Construct();
+                               pArrayList->Add(new String(*pMsgId));
 
-                       SendUserEvent(REQUEST_LAUNCH_CONV,pArrayList);
+                               SendUserEvent(REQUEST_LAUNCH_CONV,pArrayList);
+                       }
                        //pSceneManager->GoForward(ForwardSceneTransition(IDSCN_CONVERSATION_LIST, SCENE_TRANSITION_ANIMATION_TYPE_NONE), pArgList);
                }
        }

diff --git a/src/MsgMmsDetailForm.cpp b/src/MsgMmsDetailForm.cpp
index 86d74f3..18bc46f 100644 (file)
--- a/src/MsgMmsDetailForm.cpp
+++ b/src/MsgMmsDetailForm.cpp
@@ -404,6 +404,7 @@ MmsDetailForm::OnInitializing(void)
                Button* pVolumeButton = static_cast<Button*>(__pPlayControlPanel->GetControl(L"IDC_VOLUME_BUTTON"));
                if (pVolumeButton)
                {
+                       pVolumeButton->SetSize(W_PLAYCONTROL_BUTTON, H_PLAYCONTROL_BUTTON);
                        pVolumeButton->SetColor(BUTTON_STATUS_PRESSED, COLOR_PANEL_BORDER);
                        pVolumeButton->SetColor(BUTTON_STATUS_NORMAL, COLOR_PANEL_BORDER);
                        pVolumeButton->SetActionId(IDA_VOLUME);
@@ -413,6 +414,7 @@ MmsDetailForm::OnInitializing(void)
                __pPreviousButton = static_cast<Button*>(__pPlayControlPanel->GetControl(L"IDC_PREVIOUS_BUTTON"));
                if (__pPreviousButton)
                {
+                       __pPreviousButton->SetSize(W_PLAYCONTROL_BUTTON, H_PLAYCONTROL_BUTTON);
                        __pPreviousButton->SetColor(BUTTON_STATUS_PRESSED, COLOR_PANEL_BORDER);
                        __pPreviousButton->SetColor(BUTTON_STATUS_NORMAL, COLOR_PANEL_BORDER);
                        __pPreviousButton->SetColor(BUTTON_STATUS_DISABLED, COLOR_PANEL_BORDER);
@@ -446,6 +448,7 @@ MmsDetailForm::OnInitializing(void)
                __pNextbutton = static_cast<Button*>(__pPlayControlPanel->GetControl(L"IDC_NEXT_BUTTON"));
                if (__pNextbutton)
                {
+                       __pNextbutton->SetSize(W_PLAYCONTROL_BUTTON, H_PLAYCONTROL_BUTTON);
                        __pNextbutton->SetColor(BUTTON_STATUS_PRESSED, COLOR_PANEL_BORDER);
                        __pNextbutton->SetColor(BUTTON_STATUS_NORMAL, COLOR_PANEL_BORDER);
                        __pNextbutton->SetColor(BUTTON_STATUS_DISABLED, COLOR_PANEL_BORDER);

diff --git a/src/MsgOptionPopup.cpp b/src/MsgOptionPopup.cpp
index 81a58bd..7df7ac0 100644 (file)
--- a/src/MsgOptionPopup.cpp
+++ b/src/MsgOptionPopup.cpp
@@ -67,6 +67,7 @@ OptionPopup::Construct(int threadId, int selectedIndex)
        AppLogDebug("ENTER");\r
 \r
        result r = Popup::Construct(L"IDL_MSG_OPTION_POPUP");\r
+       Popup::AddKeyEventListener(*this);\r
        if (!__pConvData)\r
        {\r
                r = E_FAILURE;\r
@@ -405,6 +406,29 @@ OptionPopup::OnActionPerformed(const Control& source, int actionId)
 }\r
 \r
 void\r
+OptionPopup::OnKeyReleased(const Tizen::Ui::Control& source, Tizen::Ui::KeyCode keyCode)\r
+{\r
+       AppLogDebug("ENTER");\r
+\r
+       // Destroy Popup\r
+       switch (keyCode)\r
+       {\r
+       case KEY_BACK:\r
+       {\r
+               SetShowState(false);\r
+               RequestId requestId = REQUEST_DESTROY_OPTION_POPUP;\r
+               __pParentCnt.SendUserEvent(requestId, null);\r
+       }\r
+       break;\r
+\r
+       default:\r
+               break;\r
+       }\r
+\r
+       AppLogDebug("EXIT: %s", GetErrorMessage(GetLastResult()));\r
+       return;\r
+}\r
+void\r
 OptionPopup::ShowMessageDetails(void)\r
 {\r
        AppLogDebug("ENTER");\r

diff --git a/src/MsgPhoneNumberListPopup.cpp b/src/MsgPhoneNumberListPopup.cpp
index 43095d1..cf14e04 100644 (file)
--- a/src/MsgPhoneNumberListPopup.cpp
+++ b/src/MsgPhoneNumberListPopup.cpp
@@ -23,6 +23,7 @@ using namespace Tizen::App;
 using namespace Tizen::Base;\r
 using namespace Tizen::Base::Collection;\r
 using namespace Tizen::Graphics;\r
+using namespace Tizen::Ui;\r
 using namespace Tizen::Ui::Controls;\r
 \r
 PhoneNumberListPopup::PhoneNumberListPopup(IPopupEventListener& listener)\r
@@ -67,6 +68,7 @@ PhoneNumberListPopup::Construct(ArrayList* pPhoneNumberList)
 \r
        __pPhoneNumberList = pPhoneNumberList;\r
        result r = Popup::Construct(L"IDL_MSG_CONTACT_NUMBER_POPUP");\r
+       Popup::AddKeyEventListener(*this);\r
        if (!IsFailed(r))\r
        {\r
                String strText;\r
@@ -214,3 +216,23 @@ PhoneNumberListPopup::OnActionPerformed(const Control& source, int actionId)
        AppLogDebug("EXIT: %s", GetErrorMessage(GetLastResult()));\r
        return;\r
 }\r
+\r
+void\r
+PhoneNumberListPopup::OnKeyReleased(const Tizen::Ui::Control& source, Tizen::Ui::KeyCode keyCode)\r
+{\r
+       AppLogDebug("ENTER");\r
+       switch (keyCode)\r
+       {\r
+       case KEY_BACK:\r
+       {\r
+               SetShowState(false);\r
+               __popupListener.OnPopupClose(this);\r
+       }\r
+       break;\r
+\r
+       default:\r
+               break;\r
+       }\r
+       AppLogDebug("EXIT: %s", GetErrorMessage(GetLastResult()));\r
+}\r
+\r

diff --git a/src/MsgRecipientPanel.cpp b/src/MsgRecipientPanel.cpp
index 7bc3668..3b1aff1 100644 (file)
--- a/src/MsgRecipientPanel.cpp
+++ b/src/MsgRecipientPanel.cpp
@@ -1102,8 +1102,14 @@ RecipientPanel::OnKeyReleased(const Control& source, KeyCode keyCode)
 
        case KEY_BACK:
        {
-               if (__pErrorMessagePopup)
+               if (__pErrorMessagePopup && __pErrorMessagePopup->GetShowState())
                {
+                       SetFormEnabled(true);
+                       __pExpandEditArea->SetKeypadEnabled(true);
+                       if(!__pExpandEditArea->HasFocus())
+                       {
+                               __pExpandEditArea->SetFocus();
+                       }
                        __pErrorMessagePopup->SetShowState(false);
                }
        }

diff --git a/src/MsgResendDeletePopup.cpp b/src/MsgResendDeletePopup.cpp
index 6a41b23..d32e3b4 100644 (file)
--- a/src/MsgResendDeletePopup.cpp
+++ b/src/MsgResendDeletePopup.cpp
@@ -30,6 +30,7 @@ using namespace Tizen::App;
 using namespace Tizen::Base;\r
 using namespace Tizen::Base::Collection;\r
 using namespace Tizen::Graphics;\r
+using namespace Tizen::Ui;\r
 using namespace Tizen::Ui::Controls;\r
 \r
 MsgResendDeletePopup::MsgResendDeletePopup(ConversationData* pConvData, IPopupEventListener& listener)\r
@@ -60,6 +61,7 @@ MsgResendDeletePopup::Construct(void)
                return r;\r
        }\r
        r = Popup::Construct(L"IDL_MSG_RESEND_DELETE_POPUP");\r
+       Popup::AddKeyEventListener(*this);\r
        if (r == E_SUCCESS)\r
        {\r
                String strText;\r
@@ -99,6 +101,28 @@ MsgResendDeletePopup::OnActionPerformed(const Control& source, int actionId)
 }\r
 \r
 void\r
+MsgResendDeletePopup::OnKeyReleased(const Tizen::Ui::Control& source, Tizen::Ui::KeyCode keyCode)\r
+{\r
+       AppLogDebug("ENTER");\r
+\r
+       switch (keyCode)\r
+       {\r
+       case Tizen::Ui::KEY_BACK:\r
+       {\r
+               Popup::SetShowState(false);\r
+               __popupListener.OnPopupClose(this);\r
+               break;\r
+       }\r
+\r
+       default:\r
+               break;\r
+       }\r
+\r
+       AppLogDebug("EXIT: %s", GetErrorMessage(GetLastResult()));\r
+       return;\r
+}\r
+\r
+void\r
 MsgResendDeletePopup::OnUserEventReceivedN(RequestId requestId, IList* pArgs)\r
 {\r
        switch (requestId)\r

diff --git a/src/MsgThreadData.cpp b/src/MsgThreadData.cpp
index 9e8be59..25d8b71 100644 (file)
--- a/src/MsgThreadData.cpp
+++ b/src/MsgThreadData.cpp
@@ -594,7 +594,10 @@ ThreadData::UpdateGroupName(int day, int date, int month, int year)
                break;
        }
 
-       if (month != 5)
+       String displayLanguageValue;
+       SettingInfo::GetValue(IDS_KEY_LANGUAGE_CHANGE, displayLanguageValue);
+       String arabicLanguage(L"ara_AE");
+       if (month != 5 && !displayLanguageValue.Equals(arabicLanguage))
        {
                __groupName.Append(L".");
        }
@@ -604,6 +607,8 @@ ThreadData::UpdateGroupName(int day, int date, int month, int year)
                __groupName.Append(year);
        }
        __groupName.Append(L")");
+
+       AppLogDebug("EXIT: %s", GetErrorMessage(GetLastResult()));
 }
 
 const int

diff --git a/src/MsgThreadListForm.cpp b/src/MsgThreadListForm.cpp
index c1b68b3..de685e2 100644 (file)
--- a/src/MsgThreadListForm.cpp
+++ b/src/MsgThreadListForm.cpp
@@ -971,6 +971,19 @@ ThreadListForm::OnKeyReleased(const Control& source, KeyCode keyCode)
        }
        break;
 
+       case KEY_BACK:
+       {
+               if (__pDeletePopup && __pDeletePopup->GetShowState())
+               {
+                       __pDeletePopup->SetShowState(false);
+               }
+               if (__pBlockPopup && __pBlockPopup->GetShowState())
+               {
+                       __pBlockPopup->SetShowState(false);
+               }
+       }
+       break;
+
        default:
                break;
        }
@@ -1935,7 +1948,7 @@ ThreadListForm::DeletePopup(void)
        }
        __pDeletePopup = new (std::nothrow) BaseCustomPopup();
        __pDeletePopup->Construct(L"IDL_DELETE_POPUP");
-
+       __pDeletePopup->AddKeyEventListener(*this);
        Button* pButtonDelete = static_cast<Button*>(__pDeletePopup->GetControl(L"IDC_BUTTON_LEFT"));
        Button* pButtonCancel = static_cast<Button*>(__pDeletePopup->GetControl(L"IDC_BUTTON_RIGHT"));
 
@@ -2161,6 +2174,7 @@ ThreadListForm::BlockPopup(const String& phoneNumber)
 
                __pBlockPopup = new (std::nothrow) Popup();
                __pBlockPopup->Construct(L"IDL_BLOCK_POPUP");
+               __pBlockPopup->AddKeyEventListener(*this);
                Button* pButtonOk = static_cast<Button*>(__pBlockPopup->GetControl(L"IDC_BUTTON_OK"));
                pButtonOk->SetActionId(IDA_PHONENUMBER_BLOCK_OK);
                pButtonOk->AddActionEventListener(*this);

diff --git a/src/MsgTokenOptionPopup.cpp b/src/MsgTokenOptionPopup.cpp
index 4f61771..d252831 100644 (file)
--- a/src/MsgTokenOptionPopup.cpp
+++ b/src/MsgTokenOptionPopup.cpp
@@ -27,6 +27,7 @@ using namespace Tizen::App;
 using namespace Tizen::Base;
 using namespace Tizen::Base::Collection;
 using namespace Tizen::Graphics;
+using namespace Tizen::Ui;
 using namespace Tizen::Ui::Controls;
 
 TokenOptionPopup::TokenOptionPopup(Control& parent)
@@ -52,6 +53,7 @@ TokenOptionPopup::Construct(AddressInfo* pRecipient)
 {
        AppLogDebug("ENTER");
        result r = Popup::Construct(L"IDL_ATTACH_LIST_POPUP");
+       Popup::AddKeyEventListener(*this);
        if (!IsFailed(r) && pRecipient)
        {
                // Transfer ownership
@@ -215,3 +217,23 @@ TokenOptionPopup::OnActionPerformed(const Control& source, int actionId)
        }
        AppLogDebug("EXIT: %s", GetErrorMessage(GetLastResult()));
 }
+
+void
+TokenOptionPopup::OnKeyReleased(const Tizen::Ui::Control& source, Tizen::Ui::KeyCode keyCode)
+{
+       AppLogDebug("ENTER");
+       switch (keyCode)
+       {
+       case KEY_BACK:
+       {
+               SetShowState(false);
+               RequestId requestId = REQUEST_DESTROY_TOKEN_OPTION_POPUP;
+               __parentCntl.SendUserEvent(requestId, null);
+       }
+       break;
+
+       default:
+               break;
+       }
+       AppLogDebug("EXIT: %s", GetErrorMessage(GetLastResult()));
+}

diff --git a/src/MsgTypes.cpp b/src/MsgTypes.cpp
index 1834c99..c0b3077 100644 (file)
--- a/src/MsgTypes.cpp
+++ b/src/MsgTypes.cpp
@@ -34,8 +34,8 @@ const int H_CANCEL_BUTTON = 72;
 const int W_SEND_BUTTON = 108;
 const int W_ATTACH_BUTTON = 64;
 const int H_ATTACH_BUTTON = 64;
-const int W_PLAYCONTROL_BUTTON = 74;
-const int H_PLAYCONTROL_BUTTON = 74;
+const int W_PLAYCONTROL_BUTTON = 104;
+const int H_PLAYCONTROL_BUTTON = 104;
 
 //Check Box
 const int H_CHECKBOX = 75;