Merge branch 'tizen_4.0' into tizen

Change-Id: Ib395d6c00c98ccb930b59ace32f71dbe360417ab

12 files changed, 84 insertions, 19 deletions

diff --git a/contacts-widget-edit-app/inc/WidgetEditView.h b/contacts-widget-edit-app/inc/WidgetEditView.h
index 9a7f7f3..5b70ca7 100644
--- a/contacts-widget-edit-app/inc/WidgetEditView.h
+++ b/contacts-widget-edit-app/inc/WidgetEditView.h
@@ -27,6 +27,7 @@ public:
 	 */
 	explicit WidgetEditView(Common::Model::ContactWidgetItems &contactItems,
 			bool isEditable = false);
+	virtual ~WidgetEditView() override;
 
 private:
 	virtual Evas_Object *onCreate(Evas_Object *parent) override;
diff --git a/contacts-widget-edit-app/src/OperationDefaultController.cpp b/contacts-widget-edit-app/src/OperationDefaultController.cpp
index 64e3e1a..59f50c6 100644
--- a/contacts-widget-edit-app/src/OperationDefaultController.cpp
+++ b/contacts-widget-edit-app/src/OperationDefaultController.cpp
@@ -35,30 +35,31 @@ void OperationDefaultController::onRequest(const char *operation, app_control_h
 {
 	bundle *content = parseRequest(request);
 
-	m_ContactItems.setContent(content);
-	m_ContactItems.setSaveContentCallback(std::bind(&OperationDefaultController::onSaveContent, this, _1));
-	bundle_free(content);
+	if (content) {
+		m_ContactItems.setContent(content);
+		m_ContactItems.setSaveContentCallback(std::bind(&OperationDefaultController::onSaveContent, this, _1));
+		bundle_free(content);
 
-	getNavigator()->navigateTo(new WidgetEditView(m_ContactItems, true));
+		getNavigator()->navigateTo(new WidgetEditView(m_ContactItems, true));
+	}
 }
 
 bundle *OperationDefaultController::parseRequest(app_control_h request)
 {
-	/* TODO: Use APP_CONTROL_DATA_WIDGET_CONTENT, APP_CONTROL_DATA_WIDGET_APP_ID and APP_CONTROL_DATA_WIDGET_INSTANCE_ID keys,
-	   when http://suprem.sec.samsung.net/jira/browse/TNEXT-1388 will be resolved */
-
-	m_InstanceId = App::getStringExtraData(request, "instance_id");
-	m_AppId = "org.tizen.w-contacts.widget";
+	m_InstanceId = App::getStringExtraData(request, APP_CONTROL_DATA_WIDGET_INSTANCE_ID);
+	m_AppId = App::getStringExtraData(request, APP_CONTROL_DATA_WIDGET_APP_ID);
 	char *serializedContent = nullptr;
-	app_control_get_extra_data(request, "content_info", &serializedContent);
-	if (!serializedContent) {
-		ERR("Unable to get widget content");
-		ui_app_exit();
+	app_control_get_extra_data(request, APP_CONTROL_DATA_WIDGET_CONTENT, &serializedContent);
+
+	if (serializedContent) {
+		bundle *content = bundle_decode((bundle_raw *) serializedContent, strlen(serializedContent));
+		free(serializedContent);
+		return content;
 	}
 
-	bundle *content = bundle_decode((bundle_raw *) serializedContent, strlen(serializedContent));
-	free(serializedContent);
-	return content;
+	ERR("Unable to get widget content");
+	ui_app_exit();
+	return nullptr;
 }
 
 void OperationDefaultController::onSaveContent(bundle *content)
diff --git a/contacts-widget-edit-app/src/WidgetEditView.cpp b/contacts-widget-edit-app/src/WidgetEditView.cpp
index d83ca15..de3756d 100644
--- a/contacts-widget-edit-app/src/WidgetEditView.cpp
+++ b/contacts-widget-edit-app/src/WidgetEditView.cpp
@@ -21,6 +21,8 @@
 
 #include "MultiWidgetLayouts.h"
 
+#include <feedback.h>
+
 #define CUBIC_BEZIER_PARAMS 0.25, 0.46, 0.45, 1.0
 
 using namespace Common;
@@ -33,6 +35,12 @@ WidgetEditView::WidgetEditView(Common::Model::ContactWidgetItems &contactItems,
 	  m_GrabbedItem(nullptr),
 	  m_IsItemMoving(false)
 {
+	feedback_initialize();
+}
+
+WidgetEditView::~WidgetEditView()
+{
+	feedback_deinitialize();
 }
 
 Evas_Object *WidgetEditView::onCreate(Evas_Object *parent)
@@ -78,6 +86,7 @@ Evas_Point WidgetEditView::getDestPoint(const WidgetItem *item) const
 
 void WidgetEditView::onItemGrabbed(WidgetItem *item)
 {
+	feedback_play(FEEDBACK_PATTERN_HOLD);
 	elm_object_part_content_unset(getEvasObject(), getPart(item->getIndex()));
 	m_GrabbedItem = item;
 }
diff --git a/contacts-widget-edit-app/tizen-manifest.xml b/contacts-widget-edit-app/tizen-manifest.xml
index 92de910..a41558c 100644
--- a/contacts-widget-edit-app/tizen-manifest.xml
+++ b/contacts-widget-edit-app/tizen-manifest.xml
@@ -7,5 +7,6 @@
     <privileges>
         <privilege>http://tizen.org/privilege/appmanager.launch</privilege>
         <privilege>http://tizen.org/privilege/contact.read</privilege>
+        <privilege>http://tizen.org/privilege/haptic</privilege>
     </privileges>
 </manifest>
diff --git a/dialer-app/tizen-manifest.xml b/dialer-app/tizen-manifest.xml
index cd8516c..730fe83 100644
--- a/dialer-app/tizen-manifest.xml
+++ b/dialer-app/tizen-manifest.xml
@@ -3,6 +3,55 @@
     <profile name="wearable"/>
     <ui-application appid="org.tizen.w-dialer" exec="dialer-app" hw-acceleration="on" multiple="false" nodisplay="true" process-pool="true" taskmanage="true" type="capp">
         <label>Dialer</label>
+        <label xml:lang="ar-ae">المتصل</label>
+        <label xml:lang="az-az">Nömrəyığan</label>
+        <label xml:lang="bg-bg">Набиране</label>
+        <label xml:lang="ca-es">Marcador</label>
+        <label xml:lang="cs-cz">Číselník</label>
+        <label xml:lang="da-dk">Opkald</label>
+        <label xml:lang="de-de">Telefon</label>
+        <label xml:lang="el-gr">Αυτόματη κλήση</label>
+        <label xml:lang="en-gb">Dialler</label>
+        <label xml:lang="en-ph">Dialer</label>
+        <label xml:lang="en-us">Dialer</label>
+        <label xml:lang="es-es">Marcador</label>
+        <label xml:lang="es-mx">Marcador</label>
+        <label xml:lang="et-ee">Valija</label>
+        <label xml:lang="eu-es">Markagailua</label>
+        <label xml:lang="fi-fi">Numeronvalitsin</label>
+        <label xml:lang="fr-ca">Numérotation</label>
+        <label xml:lang="fr-fr">Numérotation</label>
+        <label xml:lang="ga-ie">Diaileoir</label>
+        <label xml:lang="gl-es">Marcador</label>
+        <label xml:lang="hr-hr">Birač</label>
+        <label xml:lang="hu-hu">Tárcsázó</label>
+        <label xml:lang="hy-am">Համարահավաքիչ</label>
+        <label xml:lang="is-is">Númeraval</label>
+        <label xml:lang="it-it">Tastiera</label>
+        <label xml:lang="ja-jp">ダイヤル</label>
+        <label xml:lang="ka-ge">დამრეკი</label>
+        <label xml:lang="kk-kz">Нөмір теруші</label>
+        <label xml:lang="ko-kr">키패드</label>
+        <label xml:lang="lt-lt">Rinkiklis</label>
+        <label xml:lang="lv-lv">Zvanītājs</label>
+        <label xml:lang="mk-mk">Повикувач</label>
+        <label xml:lang="nb-no">Tastatur</label>
+        <label xml:lang="nl-nl">Toetsen</label>
+        <label xml:lang="pl-pl">Wybieranie</label>
+        <label xml:lang="pt-br">Discador</label>
+        <label xml:lang="pt-pt">Marcador</label>
+        <label xml:lang="ro-ro">Ecran formare</label>
+        <label xml:lang="ru-ru">Набор номера</label>
+        <label xml:lang="sk-sk">Vytáčanie</label>
+        <label xml:lang="sl-si">Izbirnik</label>
+        <label xml:lang="sr-rs">Birač</label>
+        <label xml:lang="sv-se">Knappsats</label>
+        <label xml:lang="tr-tr">Arayıcı</label>
+        <label xml:lang="uk-ua">Набір номера</label>
+        <label xml:lang="uz-uz">Terish ekrani</label>
+        <label xml:lang="zh-cn">拨号盘</label>
+        <label xml:lang="zh-hk">撥號器</label>
+        <label xml:lang="zh-tw">撥號程式</label>
         <icon>org.tizen.w-dialer.png</icon>
         <app-control>
             <operation name="http://tizen.org/appcontrol/operation/dial"/>
diff --git a/lib-apps-common/src/Ui/Editfield.cpp b/lib-apps-common/src/Ui/Editfield.cpp
index 078afdc..ab4c131 100644
--- a/lib-apps-common/src/Ui/Editfield.cpp
+++ b/lib-apps-common/src/Ui/Editfield.cpp
@@ -141,6 +141,7 @@ void Editfield::showEntryView()
 
 		Evas_Object *entry = view->getEntry();
 		elm_entry_entry_set(entry, elm_entry_entry_get(m_Entry));
+		elm_entry_cursor_end_set(entry);
 		elm_entry_autocapital_type_set(entry,
 				elm_entry_autocapital_type_get(m_Entry));
 		elm_entry_input_panel_layout_set(entry,
diff --git a/lib-apps-common/src/Ux/SelectView.cpp b/lib-apps-common/src/Ux/SelectView.cpp
index 040bab8..5012033 100644
--- a/lib-apps-common/src/Ux/SelectView.cpp
+++ b/lib-apps-common/src/Ux/SelectView.cpp
@@ -386,6 +386,7 @@ void SelectView::updateVisibleCount(CountChange change, SelectItem *item)
 	}
 
 	updateMultiSelector();
+	updateMultiSelectorState();
 }
 
 void SelectView::updateVisibleSelectCount(CountChange change, SelectItem *item)
diff --git a/lib-common/edje/widget/images/contacts_widget_no_contact.png b/lib-common/edje/widget/images/contacts_widget_no_contact.png
deleted file mode 100644
index a65ed27..0000000
--- a/lib-common/edje/widget/images/contacts_widget_no_contact.png
+++ /dev/null
diff --git a/lib-common/edje/widget/images/contacts_widget_no_contacts.png b/lib-common/edje/widget/images/contacts_widget_no_contacts.png
new file mode 100644
index 0000000..3d886d7
--- /dev/null
+++ b/lib-common/edje/widget/images/contacts_widget_no_contacts.png
diff --git a/lib-common/res/widget/edje/WidgetNoContactsLayout.h b/lib-common/res/widget/edje/WidgetNoContactsLayout.h
index b83067e..913fc31 100644
--- a/lib-common/res/widget/edje/WidgetNoContactsLayout.h
+++ b/lib-common/res/widget/edje/WidgetNoContactsLayout.h
@@ -21,7 +21,7 @@
 #define WIDGET_IMG_DIR              "widget/images/"
 
 #define PATH_NO_CONTACTS_LAYOUT     WIDGET_EDJ_DIR"widget-no-contacts-layout.edj"
-#define PATH_ICON_ADD_CONTACT       WIDGET_IMG_DIR"contacts_widget_no_contact.png"
+#define PATH_ICON_ADD_CONTACTS      WIDGET_IMG_DIR"contacts_widget_no_contacts.png"
 #define PATH_NO_CONTACTS_PRESS_BG   WIDGET_IMG_DIR"b_ic_press_full_circle_bg.png"
 
 #define LAYOUT_ADD_CONTACTS         "add_contacts"
diff --git a/lib-common/res/widget/edje/widget-no-contacts-layout.edc b/lib-common/res/widget/edje/widget-no-contacts-layout.edc
index 97ed36c..57a396d 100644
--- a/lib-common/res/widget/edje/widget-no-contacts-layout.edc
+++ b/lib-common/res/widget/edje/widget-no-contacts-layout.edc
@@ -63,14 +63,14 @@ collections {
 				}
 			}
 			image { "image.add_contacts"; scale;
-				images.image: PATH_ICON_ADD_CONTACT COMP;
+				images.image: PATH_ICON_ADD_CONTACTS COMP;
 				desc { "default";
 					fixed: 1 1;
 					min: ICON_W ICON_H;
 					align: 0.5 0.0;
 					rel1 { relative: 0.5 1.0; to_y: "spacer.image.top"; }
 					rel2 { relative: 0.5 1.0; to_y: "spacer.image.top"; }
-					image.normal: PATH_ICON_ADD_CONTACT;
+					image.normal: PATH_ICON_ADD_CONTACTS;
 				}
 			}
 			spacer { "spacer.text.top"; scale;
diff --git a/phone-app/tizen-manifest.xml b/phone-app/tizen-manifest.xml
index c43b6a8..a31c83e 100644
--- a/phone-app/tizen-manifest.xml
+++ b/phone-app/tizen-manifest.xml
@@ -114,6 +114,8 @@
         </app-control>
     </ui-application>
     <privileges>
+        <privilege>http://tizen.org/privilege/blocknumber.read</privilege>
+        <privilege>http://tizen.org/privilege/blocknumber.write</privilege>
         <privilege>http://tizen.org/privilege/callhistory.write</privilege>
         <privilege>http://tizen.org/privilege/call</privilege>
         <privilege>http://tizen.org/privilege/appmanager.launch</privilege>