Change-Id: I41852f9541174a41d290c631d04de7df337b5bff
Signed-off-by: Amith Kumar Mahale <amith.m@samsung.com>
#ifndef _APPRESOURCEID_H_
#define _APPRESOURCEID_H_
#ifndef _APPRESOURCEID_H_
#define _APPRESOURCEID_H_
+extern const wchar_t* IDC_EDITFIELD1;
extern const wchar_t* IDF_FORM;
#endif // _APPRESOURCEID_H_
extern const wchar_t* IDF_FORM;
#endif // _APPRESOURCEID_H_
<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>
<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>
<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>
#include "AppResourceId.h"
#include "AppResourceId.h"
+const wchar_t* IDC_EDITFIELD1 = L"IDC_EDITFIELD1";
const wchar_t* IDF_FORM = L"IDF_FORM";
const wchar_t* IDF_FORM = L"IDF_FORM";
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_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";
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";
__pDTMFKeypad->Initialize(this, rect);
AddControl(*__pDTMFKeypad);
}
__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);
pTextBox->SetText(L"");
__pDTMFKeypad->SetShowState(true);
__pDTMFKeypad->Draw(true);
//in Portrait mode it is hidden beneath DTMF Keypad.
SetShowStateOnKeypad(false);
}
//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.
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);
}
}
pTextBox->SetText(dtmfText);
}
}
{
if(__pDTMFKeypad != null)
{
{
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->AppendText(dtmfStr);
pTextBox->Invalidate(true);
}
}
pTextBox->Invalidate(true);
}
}
const int W_DTMF_BTN = 212;
const int H_DTMF_BTN = 134;
const Color COLOR_KEYPAD_BG(0, 0, 0, 100);
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";
const wchar_t* IDC_BUTTON = L"IDC_BUTTON";
const wchar_t* IDC_DTMF_KEY_BG_LABEL = L"IDC_DTMF_KEY_BG_LABEL";
}
//disable auto link detection
}
//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);
if (pTextBox != null)
{
pTextBox->SetAutoLinkMask(0);
}
__pActionListener = pEventListener;
return true;
}
__pActionListener = pEventListener;
return true;
- 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);
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");
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);
DrawTextToCanvas(L"P", FONT_KEYPAD_P, canvasPressed, POSITION_RIGHT, BUTTON_STATUS_PRESSED);
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");
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);
String strText;
Application::GetInstance()->GetAppResource()->GetString(L"IDS_CANCEL", strText);
TryReturn(r == E_SUCCESS, r, "CallOptionPopup::AddControl() failed");
ListView* pListView = new (std::nothrow) ListView();
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);
pListView->AddListViewItemEventListener(*this);
pListView->SetItemProvider(*this);
r = AddControl(*pListView);
//If contact number is also not present show unknown
if(callInfo.GetContactNumber().IsEmpty() == false)
{
//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));
else
{
pDisplayName->Append(AppUtility::GetResourceString(IDS_NUMBER_UNKNOWN));
{
if(firstCallInfo.GetContactNumber().IsEmpty() == false)
{
{
if(firstCallInfo.GetContactNumber().IsEmpty() == false)
{
- pDisplayName->Append(firstCallInfo.GetContactNumber());
+ pDisplayName->Append(firstCallInfo.GetContactNumber());