Fix for 38495 38521 38396 38450

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

diff --git a/inc/PhnPhoneApp.h b/inc/PhnPhoneApp.h
index c59c156..f029fa1 100644 (file)
--- a/inc/PhnPhoneApp.h
+++ b/inc/PhnPhoneApp.h
@@ -111,6 +111,7 @@ private:
        Tizen::Base::String __currentDisplayLanguage;
        RequestId __appControlRequestId;
        Tizen::Ui::Controls::Popup* __pAppPopup;
+       Tizen::Base::String __operatioID;
 };
 
 #endif // _PHN_PHONE_APP_H_

diff --git a/inc/PhnSettingsSpeedDialForm.h b/inc/PhnSettingsSpeedDialForm.h
index 0d12ba4..217ae81 100644 (file)
--- a/inc/PhnSettingsSpeedDialForm.h
+++ b/inc/PhnSettingsSpeedDialForm.h
@@ -77,6 +77,7 @@ public:
        virtual void OnForeground(void);
        virtual void OnBackground(void) {};
 
+       void ShowInvalidContactPopup(void);
 
 private:
        // Function is used to initialise footer and footer items.
@@ -107,6 +108,7 @@ private:
        Tizen::Base::Collection::ArrayListT<int>* __pDeleteList;
        Tizen::Ui::Scenes::SceneId* __pPreviousSceneId;
        bool __isContactAppControlLaunched;
+       Tizen::Ui::Controls::Popup* __pInvalidContactPopup;
 };
 
 #endif  //_PHN_SETTINGS_SPEED_DIAL_FORM_H_

diff --git a/inc/PhnTypes.h b/inc/PhnTypes.h
index 9bd5732..d699344 100644 (file)
--- a/inc/PhnTypes.h
+++ b/inc/PhnTypes.h
@@ -290,6 +290,8 @@ extern const wchar_t* IDS_SETTING_AUTO_AREA_CODE_TITLE;
 extern const wchar_t* IDS_SETTING_ADD_REJECT_MSG_TITLE;
 extern const wchar_t* IDS_SETTING_SET_BARRING_PWD_TITLE;
 extern const wchar_t* IDS_SETTING_EDIT_REJECT_MSG_TITLE;
+extern const wchar_t* IDS_SPEED_DIAL_INVALID_CONTACT;
+extern const wchar_t* IDS_SPEED_DIAL_INVALID_CONTACT_OK;
 
 //control name
 extern const wchar_t* IDC_GROUPEDTABLEVIEW;
@@ -553,6 +555,7 @@ enum FooterActionId
        IDA_DELETE_FOOTER_ITEMID,
        IDA_CANCEL_FOOTER_ITEMID,
        IDA_SAVE_FOOTER_ITEMID,
+       IDA_POPUP_INVALID_OK,
        IDA_NOACTION_ITEMID,
 };
 

diff --git a/res/eng-GB.xml b/res/eng-GB.xml
index 7f8aa89..4b717fb 100644 (file)
--- a/res/eng-GB.xml
+++ b/res/eng-GB.xml
@@ -205,4 +205,6 @@
     <text id="IDS_LOW_MEMORY_MSG">Memory Low, Delete some data</text>
     <text id="IDS_DELETE_YES">Yes</text>
     <text id="IDS_DELETE_NO">No</text>
+    <text id="IDS_SPEED_DIAL_INVALID_CONTACT">Invalid Contact</text>
+    <text id="IDS_SPEED_DIAL_INVALID_CONTACT_OK">Ok</text>
 </string_table>

diff --git a/res/screen-size-normal/IDL_CALL_BLOCK_POPUP.xml b/res/screen-size-normal/IDL_CALL_BLOCK_POPUP.xml
index a8d4037..a5bb63d 100644 (file)
--- a/res/screen-size-normal/IDL_CALL_BLOCK_POPUP.xml
+++ b/res/screen-size-normal/IDL_CALL_BLOCK_POPUP.xml
@@ -3,7 +3,7 @@
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
 <!DOCTYPE ScenePopup SYSTEM "UIForm.dtd">
-<ScenePopup Bversion="2.0.0.201303182057" Dversion="20120315">
+<ScenePopup Bversion="2.0.0.201304261605" Dversion="20120315">
     <Popup id="IDL_CALL_BLOCK_POPUP">
         <property accessibilityHint="" color="" titleText="" titleTextColor=""/>
         <layout height="450.0" mode="Portrait" style="" type="LAYOUT_RELATIVE" width="600.0"/>
@@ -11,32 +11,32 @@
     </Popup>
     <Label id="IDC_POPUP_TITLE" parent="IDL_CALL_BLOCK_POPUP">
         <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_CENTER" leftMargin="16" text="Block" textColor="" textSize="33.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_MIDDLE"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="93.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="560.0" x="0.0" y="0.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="93.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CALL_BLOCK_POPUP" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDL_CALL_BLOCK_POPUP" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_CALL_BLOCK_POPUP" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="560.0" x="0.0" y="0.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="93.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="598.0" x="0.0" y="0.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="93.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CALL_BLOCK_POPUP" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDL_CALL_BLOCK_POPUP" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_CALL_BLOCK_POPUP" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="600.0" x="0.0" y="0.0"/>
     </Label>
     <CheckButton id="IDC_BLOCK_CALL" parent="IDL_CALL_BLOCK_POPUP">
         <property accessibilityHint1="" accessibilityHint2="" backgroundStyle="BACKGROUND_STYLE_DEFAULT" colorOfText="" colorOfTitleText="" disabledColor="" disabledColorOpacity="100" disabledTextColor="" disabledTitleTextColor="" groupId="0" groupStyle="GROUP_STYLE_NONE" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" highlightedTitleTextColor="" horizontalAlign="ALIGN_LEFT" normalColor="" normalColorOpacity="100" pressedColor="" pressedColorOpacity="100" pressedTextColor="" pressedTitleTextColor="" showTitleText="false" text="Call" titleText="" verticalAlign="ALIGN_MIDDLE"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="112.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CALL_BLOCK_POPUP" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_CALL_BLOCK_POPUP" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="560.0" x="0.0" y="93.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="112.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CALL_BLOCK_POPUP" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDL_CALL_BLOCK_POPUP" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="" topRelation="None" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="560.0" x="0.0" y="93.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="112.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CALL_BLOCK_POPUP" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_CALL_BLOCK_POPUP" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="600.0" x="0.0" y="93.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="112.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CALL_BLOCK_POPUP" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDL_CALL_BLOCK_POPUP" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="600.0" x="0.0" y="93.0"/>
     </CheckButton>
     <CheckButton id="IDC_BLOCK_MESSAGE" parent="IDL_CALL_BLOCK_POPUP">
         <property accessibilityHint1="" accessibilityHint2="" backgroundStyle="BACKGROUND_STYLE_DEFAULT" colorOfText="" colorOfTitleText="" disabledColor="" disabledColorOpacity="100" disabledTextColor="" disabledTitleTextColor="" groupId="0" groupStyle="GROUP_STYLE_NONE" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" highlightedTitleTextColor="" horizontalAlign="ALIGN_LEFT" normalColor="" normalColorOpacity="100" pressedColor="" pressedColorOpacity="100" pressedTextColor="" pressedTitleTextColor="" showTitleText="false" text="Message" titleText="" verticalAlign="ALIGN_MIDDLE"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="112.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CALL_BLOCK_POPUP" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_CALL_BLOCK_POPUP" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="560.0" x="0.0" y="205.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="112.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CALL_BLOCK_POPUP" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDL_CALL_BLOCK_POPUP" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="" topRelation="None" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="560.0" x="0.0" y="205.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="112.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CALL_BLOCK_POPUP" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_CALL_BLOCK_POPUP" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="600.0" x="0.0" y="205.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="112.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CALL_BLOCK_POPUP" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDL_CALL_BLOCK_POPUP" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="600.0" x="0.0" y="205.0"/>
     </CheckButton>
     <Button id="IDC_BLOCK_OK" parent="IDL_CALL_BLOCK_POPUP">
         <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="Ok" textSize="32.0" verticalAlign="ALIGN_MIDDLE"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="93.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="247.0" x="19.0" y="335.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="93.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="247.0" x="19.0" y="335.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="93.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="268.0" x="19.0" y="335.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="93.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="267.0" x="19.0" y="335.0"/>
     </Button>
     <Button id="IDC_BLOCK_CANCEL" parent="IDL_CALL_BLOCK_POPUP">
         <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="Cancel" textSize="32.0" verticalAlign="ALIGN_MIDDLE"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="93.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="247.0" x="291.0" y="335.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="93.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="247.0" x="291.0" y="335.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="93.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="267.0" x="313.0" y="335.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="93.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="267.0" x="310.0" y="335.0"/>
     </Button>
     <Label id="IDC_BLOCK_INFO" parent="IDL_CALL_BLOCK_POPUP">
         <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="Block info" textColor="" textSize="33.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_TOP"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="112.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CALL_BLOCK_POPUP" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_CALL_BLOCK_POPUP" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="560.0" x="0.0" y="93.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="112.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CALL_BLOCK_POPUP" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDL_CALL_BLOCK_POPUP" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="None" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="560.0" x="0.0" y="93.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="112.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CALL_BLOCK_POPUP" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_CALL_BLOCK_POPUP" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="600.0" x="0.0" y="93.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="112.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_CALL_BLOCK_POPUP" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDL_CALL_BLOCK_POPUP" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="600.0" x="0.0" y="93.0"/>
     </Label>
 </ScenePopup>

diff --git a/src/PhnCallLogViewByPopup.cpp b/src/PhnCallLogViewByPopup.cpp
index 229c8b6..dd06f53 100644 (file)
--- a/src/PhnCallLogViewByPopup.cpp
+++ b/src/PhnCallLogViewByPopup.cpp
@@ -300,6 +300,7 @@ CallLogViewByPopup::ConstructBlockPopup(Tizen::Base::String& phoneNumber, bool i
                //To make the block message checkbox invisible.
                __pButtonBlockOk->SetBounds(__pButtonBlockOk->GetX(), __pButtonBlockOk->GetY() - H_LIST_ITEM, __pButtonBlockOk->GetWidth(), __pButtonBlockOk->GetHeight());
                __pButtonBlockCancel->SetBounds(__pButtonBlockCancel->GetX(), __pButtonBlockCancel->GetY() - H_LIST_ITEM, __pButtonBlockCancel->GetWidth(), __pButtonBlockCancel->GetHeight());
+               SetBounds(GetX(), GetY(), GetWidth(), GetHeight()-112);
        }
 
        return r;

diff --git a/src/PhnCallSettingDataService.cpp b/src/PhnCallSettingDataService.cpp
index f42f866..4b91b0e 100644 (file)
--- a/src/PhnCallSettingDataService.cpp
+++ b/src/PhnCallSettingDataService.cpp
@@ -34,7 +34,7 @@ CallSettingDataService* CallSettingDataService::__pCallSettingDataService = null
 Database* CallSettingDataService::__pDatabase = null;
 
 CallSettingDataService::CallSettingDataService(void)
-: __strDbName(App::GetInstance()->GetAppRootPath() + L"data/CallRejectInfoListDataBase")
+: __strDbName(App::GetInstance()->GetAppSharedPath() + L"data/CallRejectInfoListDataBase")
 {
        __pStmt = null;
        __pEnum = null;
@@ -73,7 +73,7 @@ CallSettingDataService::OpenDatabase(void)
                return E_OBJ_ALREADY_EXIST;
        }
        __pDatabase = new (std::nothrow) Database();
-       r = __pDatabase->Construct(__strDbName, true);
+       r = __pDatabase->Construct(__strDbName, "a+");
        TryCatch(r == E_SUCCESS, , "CallSettingDataService::OpenDatabase() database construct failed");
 
        r = CreateCallRejectTableDatabase();

diff --git a/src/PhnPhoneApp.cpp b/src/PhnPhoneApp.cpp
index 2a6dc2f..9ba453c 100644 (file)
--- a/src/PhnPhoneApp.cpp
+++ b/src/PhnPhoneApp.cpp
@@ -247,6 +247,7 @@ void
 PhoneApp::ProcessAppControlRequest(RequestId reqId, const String& operationId,const String* pUriData, const IMap* pArgsMap)
 {
        __pLaunchArgs = null;
+       __operatioID = operationId;
        AppLogDebug("Enter %ls",operationId.GetPointer());
        if (operationId.Equals(OPERATION_ID_DIAL, true))
        {
@@ -427,7 +428,8 @@ 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)))
+       if((pPhoneApp->IsOpenAsAppControl() == true) && ((state == CALL_STATE_CALL_VOICE_CONNECTING)||(state == CALL_STATE_CALL_VIDEO_CONNECTING))
+                       && pPhoneApp->__operatioID.Equals(OPERATION_ID_DIAL,true))
        {
                pPhoneApp->Terminate();
        }

diff --git a/src/PhnSettingsSpeedDialForm.cpp b/src/PhnSettingsSpeedDialForm.cpp
index 3c7bd42..9eefcf8 100644 (file)
--- a/src/PhnSettingsSpeedDialForm.cpp
+++ b/src/PhnSettingsSpeedDialForm.cpp
@@ -50,6 +50,15 @@ const int H_SPEED_DIAL_CHECK_ICON = 64;
 const int W_SPEED_DIAL_NUM_ICON = 60;
 const int H_SPEED_DIAL_NUM_ICON = 85;
 
+
+const int X_OK_BUTTON = 170;
+const int Y_OK_BUTTON = 80;
+const int W_OK_BUTTON = 300;
+const int H_OK_BUTTON = 80;
+
+const int W_INVALID_CONTACT_POPUP = 640;
+const int H_INVALID_CONTACT_POPUP = 250;
+
 const unsigned int COLOR_EMPTY_PHOTO = Color32<103, 103, 103>::Value;
 const unsigned int COLOR_PRESSED_PHOTO = Color32<59, 115, 182>::Value;
 //String contants for control name
@@ -87,6 +96,7 @@ SettingsSpeedDialForm::SettingsSpeedDialForm(void)
        __pDeleteList = null;
        __pPreviousSceneId = null;
        __isContactAppControlLaunched = false;
+       __pInvalidContactPopup = null;
 }
 
 SettingsSpeedDialForm::~SettingsSpeedDialForm(void)
@@ -809,6 +819,15 @@ SettingsSpeedDialForm::OnActionPerformed(const Control& source, int actionId)
                        }
                }
                break;
+               case IDA_POPUP_INVALID_OK:
+               {
+                       if(__pInvalidContactPopup != null)
+                       {
+                               delete __pInvalidContactPopup;
+                               __pInvalidContactPopup = null;
+                       }
+               }
+               break;
        }
 }
 
@@ -860,6 +879,36 @@ SettingsSpeedDialForm::OnAppControlCompleteResponseReceived(const AppId& appId,
                        const String* pPickResult = static_cast<const String *>(rettype->GetAt(0));
                        if (pPickResult != null && pPickResult->IsEmpty() == false)
                        {
+                               RecordId recordId = INVALID_RECORD_ID;
+                               Integer::Parse(*pPickResult, recordId);
+                               Contact* pContact = __pAddressbook->GetContactN(recordId);
+                               IList* pPhoneNumberList = pContact->GetValuesN(CONTACT_MPROPERTY_ID_PHONE_NUMBERS);
+                               if (pPhoneNumberList != null)
+                               {
+
+                                       if(pPhoneNumberList->GetCount() == 0)
+                                       {
+                                               pPhoneNumberList->RemoveAll(true);
+                                               delete pPhoneNumberList;
+                                               __isUpdate = false;
+                                               __keyToMap = 0;
+                                               ShowInvalidContactPopup();
+                                               return;
+                                       }
+                                       else
+                                       {
+                                               pPhoneNumberList->RemoveAll(true);
+                                               delete pPhoneNumberList;
+                                       }
+
+                               }
+                               else
+                               {
+                                       __isUpdate = false;
+                                       __keyToMap = 0;
+                                       ShowInvalidContactPopup();
+                                       return;
+                               }
                                if (__isUpdate == true)
                                {
                                        SpeedDialInfo speedDialInfo;
@@ -1269,3 +1318,29 @@ SettingsSpeedDialForm::DrawNumericEnrichedTxtToCanvas(String& number, Canvas& ca
 
        delete pEnrichedNumber;
 }
+
+void
+SettingsSpeedDialForm::ShowInvalidContactPopup(void)
+{
+       if(__pInvalidContactPopup != null)
+       {
+               delete __pInvalidContactPopup;
+               __pInvalidContactPopup = null;
+       }
+
+       __pInvalidContactPopup = new (std::nothrow) Popup();
+       __pInvalidContactPopup->Construct(true, Dimension(W_INVALID_CONTACT_POPUP,H_INVALID_CONTACT_POPUP));
+       __pInvalidContactPopup->SetTitleText(AppUtility::GetResourceString(IDS_SPEED_DIAL_INVALID_CONTACT));
+
+       //Ok button
+       Rectangle yesRect(X_OK_BUTTON, Y_OK_BUTTON, W_OK_BUTTON, H_OK_BUTTON);
+       Button* pYesButton = new Button();
+       pYesButton->Construct(yesRect, AppUtility::GetResourceString(IDS_SPEED_DIAL_INVALID_CONTACT_OK));
+       pYesButton->SetActionId(IDA_POPUP_INVALID_OK);
+       pYesButton->AddActionEventListener(*this);
+       __pInvalidContactPopup->AddControl(pYesButton);
+       __pInvalidContactPopup->SetShowState(true);
+       __pInvalidContactPopup->Show();
+}
+
+

diff --git a/src/PhnTabLogs.cpp b/src/PhnTabLogs.cpp
index 9a96234..65350de 100644 (file)
--- a/src/PhnTabLogs.cpp
+++ b/src/PhnTabLogs.cpp
@@ -449,7 +449,7 @@ DialTabLogs::OnGroupedListViewContextItemStateChanged(GroupedListView& listView,
                        pYesButton->Construct(yesRect, AppUtility::GetResourceString(IDS_DELETE_YES));
                        pYesButton->SetActionId(IDA_POPUP_DELETE_YES);
                        pYesButton->AddActionEventListener(*this);
-                       __pDeletePopup->AddControl(*pYesButton);
+                       __pDeletePopup->AddControl(pYesButton);
 
                        //No button
                        yesRect.x = yesRect.x + yesRect.width + 10;
@@ -457,7 +457,7 @@ DialTabLogs::OnGroupedListViewContextItemStateChanged(GroupedListView& listView,
                        pNoButton->Construct(yesRect, AppUtility::GetResourceString(IDS_DELETE_NO));
                        pNoButton->SetActionId(IDA_POPUP_DELETE_NO);
                        pNoButton->AddActionEventListener(*this);
-                       __pDeletePopup->AddControl(*pNoButton);
+                       __pDeletePopup->AddControl(pNoButton);
                        __pDeletePopup->SetShowState(true);
                        __pDeletePopup->Show();
 

diff --git a/src/PhnTypes.cpp b/src/PhnTypes.cpp
index 1954ac1..17663ad 100644 (file)
--- a/src/PhnTypes.cpp
+++ b/src/PhnTypes.cpp
@@ -186,6 +186,8 @@ const wchar_t* IDS_LOW_MEMORY_MSG = L"IDS_LOW_MEMORY_MSG";
 const wchar_t* IDS_LOW_MEMORY_MSG_TITLE = L"IDS_LOW_MEMORY_MSG_TITLE";
 const wchar_t* IDS_DELETE_YES = L"IDS_DELETE_YES";
 const wchar_t* IDS_DELETE_NO = L"IDS_DELETE_NO";
+const wchar_t* IDS_SPEED_DIAL_INVALID_CONTACT = L"IDS_SPEED_DIAL_INVALID_CONTACT";
+const wchar_t* IDS_SPEED_DIAL_INVALID_CONTACT_OK = L"IDS_SPEED_DIAL_INVALID_CONTACT_OK";
 
 //resource string messages for settings module
 const wchar_t* IDS_ADD_BTN_STRING = L"IDS_ADD_BTN_STRING";