Fixed Nabi issues N_SE-29062 N_SE-28663 N_SE-26280 N_SE-26281 N_SE-25992 N_SE-29298...

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

diff --git a/inc/AppResourceId.h b/inc/AppResourceId.h
index 9e259f8..8edfef6 100644 (file)
--- a/inc/AppResourceId.h
+++ b/inc/AppResourceId.h
@@ -1,6 +1,7 @@
 #ifndef _APPRESOURCEID_H_
 #define _APPRESOURCEID_H_
 
+extern const wchar_t* IDC_EDITFIELD1;
 extern const wchar_t* IDF_FORM;
 
 #endif // _APPRESOURCEID_H_

diff --git a/res/screen-size-normal/IDL_DTMF_KEYPAD_PANEL.xml b/res/screen-size-normal/IDL_DTMF_KEYPAD_PANEL.xml
index 4b24d62..11a2fa3 100644 (file)
--- a/res/screen-size-normal/IDL_DTMF_KEYPAD_PANEL.xml
+++ b/res/screen-size-normal/IDL_DTMF_KEYPAD_PANEL.xml
@@ -10,14 +10,14 @@
         <layout height="720" mode="Portrait" type="LAYOUT_RELATIVE" width="720" x="0" y="0"/>
         <layout height="660" mode="Landscape" type="LAYOUT_RELATIVE" width="560" x="0" y="0"/>
     </Panel>
-    <TextBox id="IDC_TEXTBOX" parent="IDL_DTMF_KEYPAD_PANEL">
-        <property disabledBackgroundBitmapPath="" disabledColor="#FFFFFF" disabledColorOpacity="0" disabledTextColor="" highlightedBackgroundBitmapPath="" highlightedColor="#FFFFFF" highlightedColorOpacity="0" highlightedTextColor="#FFFFFF" lineSpacingExtra="1" lineSpacingMultiplier="1" normalBackgroundBitmapPath="" normalColor="#FFFFFF" normalColorOpacity="0" normalTextColor="#FFFFFF" text="" textAlignment="ALIGNMENT_LEFT" textSize="94" textboxBorder="TEXT_BOX_BORDER_NONE"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="114" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_DTMF_KEYPAD_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="35" marginRight="35" marginTop="10" mode="Portrait" rightRelation="IDL_DTMF_KEYPAD_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_DTMF_KEYPAD_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="650" x="35" y="10"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="114" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_DTMF_KEYPAD_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="35" marginRight="35" marginTop="10" mode="Landscape" rightRelation="IDL_DTMF_KEYPAD_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_DTMF_KEYPAD_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="490" x="35" y="10"/>
-    </TextBox>
     <Label id="IDC_DTMF_KEY_BG_LABEL" parent="IDL_DTMF_KEYPAD_PANEL">
         <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" text="" textColor="" textSize="33" textStyle="LABEL_TEXT_STYLE_NORMAL" verticalAlign="ALIGN_TOP"/>
         <layout bottomRelation="IDL_DTMF_KEYPAD_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="560" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_DTMF_KEYPAD_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="20" marginLeft="35" marginRight="35" marginTop="16" mode="Portrait" rightRelation="IDL_DTMF_KEYPAD_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_TEXTBOX" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="650" x="35" y="140"/>
         <layout bottomRelation="IDL_DTMF_KEYPAD_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="500" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_DTMF_KEYPAD_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="20" marginLeft="35" marginRight="35" marginTop="16" mode="Landscape" rightRelation="IDL_DTMF_KEYPAD_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_TEXTBOX" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="490" x="35" y="140"/>
     </Label>
+    <EditField id="IDC_NUM_EDITFIELD" parent="IDL_DTMF_KEYPAD_PANEL">
+        <property disabledBGBitmapPath="" disabledColor="#FFFFFF" disabledColorOpacity="0" disabledTextColor="" ellipsisPosition="ELLIPSIS_POSITION_START" enableClear="false" groupStyle="GROUP_STYLE_NONE" guideText="" guideTextColor="" highlightedBGBitmapPath="" highlightedColor="#FFFFFF" highlightedColorOpacity="0" highlightedTextColor="#FFFFFF" horizontalMargin="16" inputStyle="INPUT_STYLE_FULLSCREEN" keypadAction="" keypadEnabled="false" limitLength="100" linkTextColor="" lowerCaseMode="false" normalBGBitmapPath="" normalColor="#FFFFFF" normalColorOpacity="0" normalTextColor="#FFFFFF" pressedBGBitmapPath="" pressedColor="#FFFFFF" pressedColorOpacity="0" text="" textHorizontalAlignment="ALIGNMENT_LEFT" textSize="94" titleStyle="EDIT_FIELD_TITLE_STYLE_NONE" titleText="" titleTextColor="" verticalMargin="12" viewMode="false"/>
+        <layout bottomRelation="IDC_DTMF_KEY_BG_LABEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="130" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_DTMF_KEYPAD_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="35" marginRight="35" marginTop="10" mode="Portrait" rightRelation="IDL_DTMF_KEYPAD_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="EDIT_FIELD_STYLE_PHONE_NUMBER" topRelation="IDL_DTMF_KEYPAD_PANEL" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="650" x="35" y="10"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="159" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" style="EDIT_FIELD_STYLE_PHONE_NUMBER" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="240" x="320" y="75"/>
+    </EditField>
 </ScenePanel>

diff --git a/src/AppResourceId.cpp b/src/AppResourceId.cpp
index f563fb2..4ca9d6b 100644 (file)
--- a/src/AppResourceId.cpp
+++ b/src/AppResourceId.cpp
@@ -1,3 +1,4 @@
 #include "AppResourceId.h"
 
+const wchar_t* IDC_EDITFIELD1 = L"IDC_EDITFIELD1";
 const wchar_t* IDF_FORM = L"IDF_FORM";

diff --git a/src/CallActiveCallForm.cpp b/src/CallActiveCallForm.cpp
index 1bdc61f..c502712 100644 (file)
--- a/src/CallActiveCallForm.cpp
+++ b/src/CallActiveCallForm.cpp
@@ -78,7 +78,7 @@ static const wchar_t* IDC_CONF_CALL_MORE_BUTTON = L"IDC_CONF_CALL_MORE_BUTTON";
 static const wchar_t* IDC_HOLD_BUTTON = L"IDC_HOLD_BUTTON";
 static const wchar_t* IDC_SWAP_BUTTON = L"IDC_SWAP_BUTTON";
 static const wchar_t* IDC_HOLD_LABEL = L"IDC_HOLD_LABEL";
-static const wchar_t* IDC_TEXTBOX = L"IDC_TEXTBOX";
+static const wchar_t* IDC_TEXTBOX = L"IDC_NUM_EDITFIELD";
 static const wchar_t* IDC_CALLER1_LABEL = L"IDC_CALLER1_LABEL";
 static const wchar_t* IDC_BACKGROUND_LABEL = L"IDC_BACKGROUND_LABEL";
 static const wchar_t* IDC_CALLER1_TIME_LABEL = L"IDC_CALLER1_TIME_LABEL";
@@ -224,7 +224,7 @@ ActiveCallForm::ShowDTMFKeypad(void)
                __pDTMFKeypad->Initialize(this, rect);
                AddControl(*__pDTMFKeypad);
        }
-       TextBox* pTextBox = static_cast<TextBox*>(__pDTMFKeypad->GetControl(IDC_TEXTBOX));
+       EditField* pTextBox = static_cast<EditField*>(__pDTMFKeypad->GetControl(IDC_TEXTBOX));
        pTextBox->SetText(L"");
        __pDTMFKeypad->SetShowState(true);
        __pDTMFKeypad->Draw(true);
@@ -271,10 +271,10 @@ ActiveCallForm::OnOrientationChanged(const Tizen::Ui::Control& source, Tizen::Ui
                                //in Portrait mode it is hidden beneath DTMF Keypad.
                                SetShowStateOnKeypad(false);
                        }
-                       String dtmfText = static_cast<TextBox*>(__pDTMFKeypad->GetControl(IDC_TEXTBOX))->GetText();
+                       String dtmfText = static_cast<EditField*>(__pDTMFKeypad->GetControl(IDC_TEXTBOX))->GetText();
                        ShowDTMFKeypad();
                        //get new text box.
-                       TextBox* pTextBox = static_cast<TextBox*>(__pDTMFKeypad->GetControl(IDC_TEXTBOX));
+                       EditField* pTextBox = static_cast<EditField*>(__pDTMFKeypad->GetControl(IDC_TEXTBOX));
                        pTextBox->SetText(dtmfText);
                }
        }
@@ -838,8 +838,9 @@ ActiveCallForm::SetTextToDTMFTextField(const String& dtmfStr)
 {
        if(__pDTMFKeypad != null)
        {
-               TextBox* pTextBox = static_cast<TextBox*>(__pDTMFKeypad->GetControl(IDC_TEXTBOX));
+               EditField* pTextBox = static_cast<EditField*>(__pDTMFKeypad->GetControl(IDC_TEXTBOX));
                pTextBox->AppendText(dtmfStr);
+               pTextBox->SetFocus();
                pTextBox->Invalidate(true);
        }
 }

diff --git a/src/CallDtmfKeypadPanel.cpp b/src/CallDtmfKeypadPanel.cpp
index c3bfcf4..cb62907 100644 (file)
--- a/src/CallDtmfKeypadPanel.cpp
+++ b/src/CallDtmfKeypadPanel.cpp
@@ -45,7 +45,7 @@ const int RIGHT_TEXT_X_OFFSET = 94;
 const int W_DTMF_BTN = 212;
 const int H_DTMF_BTN = 134;
 const Color COLOR_KEYPAD_BG(0, 0, 0, 100);
-const wchar_t* IDC_TEXTBOX = L"IDC_TEXTBOX";
+const wchar_t* IDC_TEXTBOX = L"IDC_NUM_EDITFIELD";
 const wchar_t* IDC_BUTTON = L"IDC_BUTTON";
 const wchar_t* IDC_DTMF_KEY_BG_LABEL = L"IDC_DTMF_KEY_BG_LABEL";
 
@@ -74,10 +74,11 @@ DtmfKeyPadPanel::Initialize(IActionEventListener* pEventListener, Rectangle& bou
        }
 
        //disable auto link detection
-       TextBox* pTextBox = static_cast<TextBox*>(GetControl(IDC_TEXTBOX));
+       EditField* pTextBox = static_cast<EditField*>(GetControl(IDC_TEXTBOX));
        if (pTextBox != null)
        {
                pTextBox->SetAutoLinkMask(0);
+               pTextBox->SetFocus();
        }
        __pActionListener = pEventListener;
        return true;
@@ -284,14 +285,13 @@ DtmfKeyPadPanel::SetBackgroundtoButton()
 
                case PAUSE_KEY:
                {
-                       DrawImageToCanvas(IDB_DIALER_STAR_ICON, Dimension(75, 36), canvasNormal, POSITION_LEFT);
+                       DrawTextToCanvas(L"*", FONT_KEYPAD_NUMBER, canvasNormal, POSITION_LEFT, BUTTON_STATUS_NORMAL);
                        DrawTextToCanvas(L"P", FONT_KEYPAD_P, canvasNormal, POSITION_RIGHT, BUTTON_STATUS_NORMAL);
-
                        r = SetPressedBgToCanvas(canvasPressed, IDB_KEYPAD_BUTTON_PRESS);
                        TryCatch(r == E_SUCCESS,,"DtmfKeyPadPanel::AddButtonsToKeypad() SetPressedBgToCanvas failed");
-                       DrawImageToCanvas(IDB_DIALER_STAR_ICON, Dimension(75, 36), canvasPressed, POSITION_LEFT);
+                       DrawTextToCanvas(L"*", FONT_KEYPAD_NUMBER, canvasPressed, POSITION_LEFT, BUTTON_STATUS_PRESSED);
                        DrawTextToCanvas(L"P", FONT_KEYPAD_P, canvasPressed, POSITION_RIGHT, BUTTON_STATUS_PRESSED);
-               }
+       }
                break;
 
                case NUM_KEY0:

diff --git a/src/CallOptionPopup.cpp b/src/CallOptionPopup.cpp
index ce619b6..05333a2 100644 (file)
--- a/src/CallOptionPopup.cpp
+++ b/src/CallOptionPopup.cpp
@@ -80,6 +80,8 @@ CallOptionPopup::Initialize(void)
        int popupHeight = H_CANCEL_BUTTON + listHeight + CANCEL_BUTTON_PADDING + VERTICAL_PADDING;
        r = SetSize(Dimension(W_POPUP + HORIZONTAL_PADDING, popupHeight));
        TryReturn(r == E_SUCCESS, r, "CallOptionPopup::SetSize() failed");
+       SetMinimumSize(Dimension(W_POPUP + HORIZONTAL_PADDING, popupHeight));
+       TryReturn(r == E_SUCCESS, r, "CallOptionPopup::SetMinSize() failed");
 
        String strText;
        Application::GetInstance()->GetAppResource()->GetString(L"IDS_CANCEL", strText);
@@ -91,11 +93,13 @@ CallOptionPopup::Initialize(void)
        TryReturn(r == E_SUCCESS, r, "CallOptionPopup::AddControl() failed");
 
        ListView* pListView = new (std::nothrow) ListView();
-       pListView->Construct(Rectangle(0, 0, W_POPUP - HORIZONTAL_PADDING, listHeight), true, SCROLL_STYLE_FADE_OUT);
+       pListView->Construct(Rectangle(0, 0, W_POPUP, listHeight), true, SCROLL_STYLE_FADE_OUT);
        pListView->AddListViewItemEventListener(*this);
        pListView->SetItemProvider(*this);
        r = AddControl(*pListView);
 
+
+
        return r;
 }
 
@@ -139,8 +143,8 @@ CallOptionPopup::ConstructListData(void)
                                                //If contact number is also not present show unknown
                                                if(callInfo.GetContactNumber().IsEmpty() == false)
                                                {
-                                               pDisplayName->Append(callInfo.GetContactNumber());
-                                       }
+                                                       pDisplayName->Append(callInfo.GetContactNumber());
+                                               }
                                                else
                                                {
                                                        pDisplayName->Append(AppUtility::GetResourceString(IDS_NUMBER_UNKNOWN));
@@ -178,7 +182,7 @@ CallOptionPopup::ConstructListData(void)
                                {
                                        if(firstCallInfo.GetContactNumber().IsEmpty() == false)
                                        {
-                                       pDisplayName->Append(firstCallInfo.GetContactNumber());
+                                               pDisplayName->Append(firstCallInfo.GetContactNumber());
                                        }
                                        else
                                        {