solving nabi issues N_SE-33669 N_SE-34217 N_SE-33723

Change-Id: Idb76035a190549ddfd9219beb5690930b89e13aa

diff --git a/res/screen-size-normal/IDL_MEMO_LIST.xml b/res/screen-size-normal/IDL_MEMO_LIST.xml
index 64dfa30..4dd29b7 100644 (file)
--- a/res/screen-size-normal/IDL_MEMO_LIST.xml
+++ b/res/screen-size-normal/IDL_MEMO_LIST.xml
@@ -3,10 +3,10 @@
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
 <!DOCTYPE Scene SYSTEM "UIForm.dtd">
-<Scene Bversion="3.0.0.201301291730" Dversion="20120315">
+<Scene Bversion="2.0.0.201304110859" Dversion="20120315">
     <LogicalCoordinate>720</LogicalCoordinate>
     <Form id="IDL_MEMO_LIST">
-        <property backgroundColor="" backgroundColorOpacity="100" orientation="Portrait" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
+        <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"/>
     </Form>
@@ -15,11 +15,11 @@
         <itemSet/>
     </Footer>
     <Header>
-        <property backgroundBitmapPath="" color="" colorOpacity="100" descriptionText="" descriptionTextColor="" disabledButtonColor="" disabledButtonColorOpacity="100" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="100" disabledItemTextColor="" headerStyle="HEADER_STYLE_SEGMENTED" highlightedButtonColor="" highlightedButtonColorOpacity="100" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="100" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="100" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="100" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="100" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="100" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="100" selectedItemTextColor="" titleIconPath="" titleText="" titleTextColor=""/>
+        <property accessibilityHint="" backgroundBitmapPath="" color="" colorOpacity="100" descriptionText="" descriptionTextColor="" disabledButtonColor="" disabledButtonColorOpacity="100" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="100" disabledItemTextColor="" headerStyle="HEADER_STYLE_SEGMENTED" highlightedButtonColor="" highlightedButtonColorOpacity="100" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="100" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="100" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="100" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="100" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="100" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="100" selectedItemTextColor="" titleIconPath="" titleText="" titleTextColor=""/>
         <itemSet/>
     </Header>
     <SearchBar id="IDC_SEARCHBAR" parent="IDL_MEMO_LIST">
-        <property accessibilityHint="" backgroundBitmapPath="" buttonActionId="0" buttonText="" color="" colorOpacity="100" disabledButtonColor="" disabledButtonTextColor="" disabledSearchFieldColor="" disabledSearchFieldTextColor="" ellipsisPosition="ELLIPSIS_POSITION_END" guideText="::IDS_MEMO_SEARCH" guideTextColor="" highlightedButtonColor="" highlightedButtonTextColor="" highlightedSearchFieldColor="" highlightedSearchFieldTextColor="" keypadAction="KEYPAD_ACTION_SEARCH" limitLength="500" lowerCaseMode="false" normalButtonColor="" normalButtonTextColor="" normalSearchFieldColor="" normalSearchFieldTextColor="" pressedButtonColor="" pressedButtonTextColor="" searchFieldTextSize="32.0" showSearchBarButton="true" text="::IDS_COM_BODY_SEARCH" textPredictionEnabled="false"/>
+        <property accessibilityHint="" backgroundBitmapPath="" buttonActionId="0" buttonText="" color="" colorOpacity="100" disabledButtonColor="" disabledButtonTextColor="" disabledSearchFieldColor="" disabledSearchFieldTextColor="" ellipsisPosition="ELLIPSIS_POSITION_END" guideText="::IDS_COM_BODY_SEARCH" guideTextColor="" highlightedButtonColor="" highlightedButtonTextColor="" highlightedSearchFieldColor="" highlightedSearchFieldTextColor="" keypadAction="KEYPAD_ACTION_SEARCH" limitLength="500" lowerCaseMode="false" normalButtonColor="" normalButtonTextColor="" normalSearchFieldColor="" normalSearchFieldTextColor="" pressedButtonColor="" pressedButtonTextColor="" searchFieldTextSize="32.0" showSearchBarButton="true" text="" textPredictionEnabled="false"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="86.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="720.0" x="0.0" y="0.0"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="86.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="1272.0" x="8.0" y="0.0"/>
     </SearchBar>

diff --git a/src/MmDrawingDetailForm.cpp b/src/MmDrawingDetailForm.cpp
index 1e6f331..babb818 100644 (file)
--- a/src/MmDrawingDetailForm.cpp
+++ b/src/MmDrawingDetailForm.cpp
@@ -129,6 +129,7 @@ MemoDrawingDetailForm::OnInitializing(void)
                __pCommentEditArea->SetTextSize(FONT_SIZE_COMMENT);
                //__pCommentEditArea->AddTextEventListener(*this);
                __pCommentEditArea->AddTouchEventListener(*this);
+               __pCommentEditArea->SetKeypadEnabled(false);
                SetControlAlwaysOnTop(*__pCommentEditArea, true);
        }
 

diff --git a/src/MmDrawingEditorForm.cpp b/src/MmDrawingEditorForm.cpp
index 8221c03..1844291 100644 (file)
--- a/src/MmDrawingEditorForm.cpp
+++ b/src/MmDrawingEditorForm.cpp
@@ -175,6 +175,7 @@ MemoDrawingEditorForm::OnInitializing(void)
        __pComment->SetKeypadAction(KEYPAD_ACTION_ENTER);
        __pComment->SetTextSize(FONT_SIZE_COMMENT);
        __pComment->AddTouchEventListener(*this);
+       __pComment->SetKeypadEnabled(false);
 
        __pDrawingPanel = static_cast<Panel*>(GetControl("IDC_PANEL_DRAWING"));
        panelColor.SetAlpha(0);
@@ -936,7 +937,11 @@ MemoDrawingEditorForm::SaveMemoDrawing(String& filePath, String& fileName, bool
 
        if (pCanvasBitmap != null)
        {
-               pCanvasBitmap->Construct(*__pCanvas, __pCanvas->GetBounds());
+               result r = pCanvasBitmap->Construct(*__pCanvas, __pCanvas->GetBounds());
+               if (r != E_SUCCESS)
+               {
+                       return;
+               }
                ImageBuffer* pImage = new (std::nothrow) ImageBuffer();
                String appPath = (Application::GetInstance())->GetAppRootPath();
 
@@ -1506,6 +1511,15 @@ MemoDrawingEditorForm::OnTouchMoved(const Control& source, const Point& currentP
 void
 MemoDrawingEditorForm::OnTouchPressed(const Control& source, const Point& currentPosition, const TouchEventInfo& touchInfo)
 {
+       CloseDrawingControls();
+       DrawOnTouchPress();
+       ShowCommentControl();
+       return;
+}
+
+void
+MemoDrawingEditorForm::OnTouchReleased(const Control& source, const Point& currentPosition, const TouchEventInfo& touchInfo)
+{
        if(__pComment == &source)
        {
                SceneManager* pSceneManager = SceneManager::GetInstance();
@@ -1530,20 +1544,6 @@ MemoDrawingEditorForm::OnTouchPressed(const Control& source, const Point& curren
                }
                return;
        }
-
-       CloseDrawingControls();
-       DrawOnTouchPress();
-       ShowCommentControl();
-       return;
-}
-
-void
-MemoDrawingEditorForm::OnTouchReleased(const Control& source, const Point& currentPosition, const TouchEventInfo& touchInfo)
-{
-       if(__pComment == &source)
-       {
-               return;
-       }
        DrawOnTouchRelease();
        SetSaveEnabled(true);
        return;