From: Amith Kumar Mahale <amith.m@samsung.com>
Date: Sat, 30 Mar 2013 11:49:55 +0000 (+0530)
Subject: 1.Fixed the order of control deletion
X-Git-Tag: accepted/tizen_2.1/20130425.023544~16
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;ds=sidebyside;h=e72c495393ad90a8f72526c60e6d43a1efa01cb4;p=apps%2Fosp%2FCall.git

1.Fixed the order of control deletion

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

diff --git a/res/screen-size-normal/IDL_DTMF_KEYPAD_PANEL.xml b/res/screen-size-normal/IDL_DTMF_KEYPAD_PANEL.xml
index b8e3029..f5a3218 100644
--- a/res/screen-size-normal/IDL_DTMF_KEYPAD_PANEL.xml
+++ b/res/screen-size-normal/IDL_DTMF_KEYPAD_PANEL.xml
@@ -15,7 +15,7 @@
         <layout bottomRelation="IDL_DTMF_KEYPAD_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="500.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_DTMF_KEYPAD_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="20.0" marginLeft="20.0" marginRight="20.0" marginTop="16.0" mode="Landscape" rightRelation="IDL_DTMF_KEYPAD_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="520.0" x="20.0" y="140.0"/>
     </Label>
     <EditField id="IDC_NUM_EDITFIELD" parent="IDL_DTMF_KEYPAD_PANEL">
-        <property accessibilityHint="" commandButtonVisible="true" 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.0" inputStyle="INPUT_STYLE_OVERLAY" keypadAction="KEYPAD_ACTION_ENTER" 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.0" titleStyle="EDIT_FIELD_TITLE_STYLE_NONE" titleText="" titleTextColor="" verticalMargin="12.0" viewMode="false"/>
+        <property accessibilityHint="" commandButtonVisible="false" 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.0" inputStyle="INPUT_STYLE_OVERLAY" keypadAction="KEYPAD_ACTION_ENTER" 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.0" titleStyle="EDIT_FIELD_TITLE_STYLE_NONE" titleText="" titleTextColor="" verticalMargin="12.0" viewMode="false"/>
         <layout bottomRelation="IDC_DTMF_KEY_BG_LABEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="130.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_DTMF_KEYPAD_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="35.0" marginRight="35.0" marginTop="10.0" 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.0" x="35.0" y="10.0"/>
         <layout bottomRelation="IDC_DTMF_KEY_BG_LABEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="130.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_DTMF_KEYPAD_PANEL" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="20.0" marginRight="20.0" marginTop="10.0" mode="Landscape" 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="520.0" x="20.0" y="10.0"/>
     </EditField>
diff --git a/src/CallButtonsPanel.cpp b/src/CallButtonsPanel.cpp
index 0da8e83..ec50816 100644
--- a/src/CallButtonsPanel.cpp
+++ b/src/CallButtonsPanel.cpp
@@ -137,7 +137,7 @@ result
 CallButtonsPanel::OnTerminating(void)
 {
 	//remove all child controls...
-	RemoveAllControls();
+//	RemoveAllControls();
 	return E_SUCCESS;
 }
 
diff --git a/src/CallConfCallerListForm.cpp b/src/CallConfCallerListForm.cpp
index 9b82799..a1ec7f6 100644
--- a/src/CallConfCallerListForm.cpp
+++ b/src/CallConfCallerListForm.cpp
@@ -175,7 +175,7 @@ ConfCallerListForm::OnTerminating(void)
 		__pConfCallInfo = null;
 	}
 
-	RemoveAllControls();
+	//RemoveAllControls();
 	return r;
 }
 
diff --git a/src/CallDtmfKeypadPanel.cpp b/src/CallDtmfKeypadPanel.cpp
index cb62907..066e618 100644
--- a/src/CallDtmfKeypadPanel.cpp
+++ b/src/CallDtmfKeypadPanel.cpp
@@ -325,7 +325,7 @@ DtmfKeyPadPanel::SetBackgroundtoButton()
 	return E_SUCCESS;
 
 CATCH:
-	RemoveAllControls();
+	//RemoveAllControls();
 	return r;
 }
 
@@ -527,6 +527,6 @@ result
 DtmfKeyPadPanel::OnTerminating(void)
 {
 	result r = E_SUCCESS;
-	RemoveAllControls();
+	//RemoveAllControls();
 	return r;
 }