TizenRefApp-6040 SIP Displayed when Enabling Edit Mode

Change-Id: Iaaa7f2dae57beff8fefb09c5bc9a33823010dde0
Signed-off-by: Eugene Kurzberg <i.kurtsberg@samsung.com>

diff --git a/lib-contacts/src/Contacts/Input/InputView.cpp b/lib-contacts/src/Contacts/Input/InputView.cpp
index d13277ee7f20dfaab3c0a4dc02b8551df5ca5c25..bd3e19754b5fc832d8a02db78fbfc662ca76611a 100644 (file)
--- a/lib-contacts/src/Contacts/Input/InputView.cpp
+++ b/lib-contacts/src/Contacts/Input/InputView.cpp
@@ -131,7 +131,7 @@ Evas_Object *InputView::onCreate(Evas_Object *parent)
 void InputView::onCreated()
 {
        addFieldItem(addField(FieldImage));
-       addFieldItem(addField(FieldName))->focus();
+       ContactFieldItem *nameItem = addFieldItem(addField(FieldName));
 
        for (auto &&field : m_Contact) {
                ContactFieldId fieldId = ContactFieldId(field.getId());
@@ -156,8 +156,11 @@ void InputView::onCreated()
                }
        }
 
-       if (m_Contact.isNew() && m_Contact.getFieldById(FieldNumber)->isEmpty()) {
-               addFieldItem(addField(FieldNumber));
+       if (m_Contact.isNew()) {
+               if (m_Contact.getFieldById(FieldNumber)->isEmpty()) {
+                       addFieldItem(addField(FieldNumber));
+               }
+               nameItem->focus();
        }
 }