Fix for 38025 37967

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

diff --git a/LICENSE.Flora b/LICENSE.Flora
index fd90a36..03f0c77 100644 (file)
--- a/LICENSE.Flora
+++ b/LICENSE.Flora
@@ -1,6 +1,6 @@
 Flora License
 
-Version 1.0, April, 2013
+Version 1.1, April, 2013
 
 http://floralicense.org/license/
 
@@ -192,7 +192,7 @@ identification within third-party archives.
 
    Copyright [yyyy] [name of copyright owner]
 
-   Licensed under the Flora License, Version 1.0 (the "License");
+   Licensed under the Flora License, Version 1.1 (the "License");
    you may not use this file except in compliance with the License.
    You may obtain a copy of the License at
 

diff --git a/NOTICE b/NOTICE
index 9ec42be..a5964ea 100644 (file)
--- a/NOTICE
+++ b/NOTICE
@@ -1,3 +1,3 @@
 Copyright (c) 2012 Samsung Electronics Co., Ltd. All rights reserved.
-Except as noted, this software is licensed under Flora License, Version 1.
-Please, see the LICENSE.Flora file for Flora License, Version 1 terms and conditions.
\ No newline at end of file
+Except as noted, this software is licensed under Flora License, Version 1.1.
+Please, see the LICENSE.Flora file for Flora License, Version 1.1 terms and conditions.

diff --git a/res/screen-size-normal/IDL_SETTINGS_ADD_NUMBER_FORM.xml b/res/screen-size-normal/IDL_SETTINGS_ADD_NUMBER_FORM.xml
index 3f97a93..62da1f7 100644 (file)
--- a/res/screen-size-normal/IDL_SETTINGS_ADD_NUMBER_FORM.xml
+++ b/res/screen-size-normal/IDL_SETTINGS_ADD_NUMBER_FORM.xml
@@ -20,7 +20,7 @@
         <itemSet/>
     </Header>
     <GroupedTableView id="IDC_GROUPEDTABLEVIEW" parent="IDL_SETTINGS_ADD_NUMBER_FORM">
-        <property backgroundColor="" backgroundColorOpacity="0" collapseByPinchEnabled="false" fastScrollIndex="" groupedLookEnabled="true" itemDivider="true" itemDividerColor="" scrollBarStyle="TABLE_VIEW_SCROLL_BAR_STYLE_FADE_OUT" scrollInputMode="SCROLL_INPUT_MODE_ALLOW_ANY_DIRECTION" useSearchIcon="false"/>
+        <property backgroundColor="" backgroundColorOpacity="0" collapseByPinchEnabled="false" fastScrollIndex="" groupedLookEnabled="true" itemDivider="false" itemDividerColor="" scrollBarStyle="TABLE_VIEW_SCROLL_BAR_STYLE_FADE_OUT" scrollInputMode="SCROLL_INPUT_MODE_ALLOW_ANY_DIRECTION" useSearchIcon="false"/>\r
         <layout bottomRelation="IDL_SETTINGS_ADD_NUMBER_FORM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="931.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_SETTINGS_ADD_NUMBER_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="40.0" marginLeft="0.0" marginRight="10.0" marginTop="40.0" mode="Portrait" rightRelation="IDL_SETTINGS_ADD_NUMBER_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_SETTINGS_ADD_NUMBER_FORM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="710.0" x="0.0" y="40.0"/>
         <layout bottomRelation="IDL_SETTINGS_ADD_NUMBER_FORM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="479.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_SETTINGS_ADD_NUMBER_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="22.0" marginLeft="0.0" marginRight="10.0" marginTop="22.0" mode="Landscape" rightRelation="IDL_SETTINGS_ADD_NUMBER_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_SETTINGS_ADD_NUMBER_FORM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="1270.0" x="0.0" y="22.0"/>
     </GroupedTableView>

diff --git a/src/PhnPhoneApp.cpp b/src/PhnPhoneApp.cpp
index 1bff96d..bf800d4 100644 (file)
--- a/src/PhnPhoneApp.cpp
+++ b/src/PhnPhoneApp.cpp
@@ -427,6 +427,10 @@ PhoneApp::OnCallStateChange(keynode_t *node, void *user_data)
                pPhoneApp->DestroyLaunchOptionPopup();
 
        }
+       if((pPhoneApp->IsOpenAsAppControl() == true) && ((state == CALL_STATE_CALL_VOICE_CONNECTING)||(state == CALL_STATE_CALL_VIDEO_CONNECTING)))
+       {
+               pPhoneApp->Terminate();
+       }
 
 }
 

diff --git a/src/PhnSettingsAddNumberForm.cpp b/src/PhnSettingsAddNumberForm.cpp
index b94e19c..d38b7ed 100644 (file)
--- a/src/PhnSettingsAddNumberForm.cpp
+++ b/src/PhnSettingsAddNumberForm.cpp
@@ -813,6 +813,11 @@ SettingsAddNumberForm::UpdateItem(int groupIndex, int itemIndex, TableViewItem*
                //set Drop-down icon to item
                AppUtility::SetExpandIconToTableItem(pItem, __isCriteriaOptionsMenuExpanded);
        }
+       else if (groupIndex == GROUP_CRITERIA_OPTIONS)\r
+       {\r
+               TableViewItemPos position = TABLEVIEWITEMPOS_CENTER;\r
+               AppUtility::SetBackgroundBitmapToTableItem(pItem, position);\r
+       }\r
 }
 
 int