Merge "Add asp feature" into tizen

diff --git a/model-config_mobile.xml b/model-config_mobile.xml
index 9414988..8227106 100644 (file)
--- a/model-config_mobile.xml
+++ b/model-config_mobile.xml
@@ -8,6 +8,7 @@
                <key name="tizen.org/system/platform.communication_processor" type="string">none</key>
                <key name="tizen.org/system/manufacturer" type="string">Tizen</key>
                <key name="tizen.org/feature/account" type="bool">true</key>
+               <key name="tizen.org/feature/account.sync" type="bool">true</key>
                <key name="tizen.org/feature/archive" type="bool">true</key>
                <key name="tizen.org/feature/badge" type="bool">true</key>
                <key name="tizen.org/feature/battery" type="bool">true</key>

diff --git a/model-config_mobile64.xml b/model-config_mobile64.xml
index e8a2484..ce57634 100644 (file)
--- a/model-config_mobile64.xml
+++ b/model-config_mobile64.xml
@@ -8,6 +8,7 @@
                <key name="tizen.org/system/platform.communication_processor" type="string">none</key>
                <key name="tizen.org/system/manufacturer" type="string">Tizen</key>
                <key name="tizen.org/feature/account" type="bool">true</key>
+               <key name="tizen.org/feature/account.sync" type="bool">true</key>
                <key name="tizen.org/feature/archive" type="bool">true</key>
                <key name="tizen.org/feature/badge" type="bool">true</key>
                <key name="tizen.org/feature/battery" type="bool">true</key>

diff --git a/model-config_tv.xml b/model-config_tv.xml
index 5c9d511..862b879 100644 (file)
--- a/model-config_tv.xml
+++ b/model-config_tv.xml
@@ -8,6 +8,7 @@
                <key name="tizen.org/system/platform.communication_processor" type="string">none</key>
                <key name="tizen.org/system/manufacturer" type="string">Tizen</key>
                <key name="tizen.org/feature/account" type="bool">false</key>
+               <key name="tizen.org/feature/account.sync" type="bool">false</key>
                <key name="tizen.org/feature/archive" type="bool">true</key>
                <key name="tizen.org/feature/badge" type="bool">true</key>
                <key name="tizen.org/feature/battery" type="bool">false</key>
@@ -17,7 +18,7 @@
                <key name="tizen.org/feature/camera.back.flash" type="bool">false</key>
                <key name="tizen.org/feature/camera.front" type="bool">false</key>
                <key name="tizen.org/feature/camera.front.flash" type="bool">false</key>
-               <key name="tizen.org/feature/contact" type="bool">true</key>
+               <key name="tizen.org/feature/contact" type="bool">false</key>
                <key name="tizen.org/feature/consumer_ir" type="bool">false</key>
                <key name="tizen.org/feature/convergence.d2d" type="bool">true</key>
                <key name="tizen.org/feature/database.encryption" type="bool">false</key>

diff --git a/model-config_tv64.xml b/model-config_tv64.xml
index fc12796..0110650 100644 (file)
--- a/model-config_tv64.xml
+++ b/model-config_tv64.xml
@@ -8,6 +8,7 @@
                <key name="tizen.org/system/platform.communication_processor" type="string">none</key>
                <key name="tizen.org/system/manufacturer" type="string">Tizen</key>
                <key name="tizen.org/feature/account" type="bool">false</key>
+               <key name="tizen.org/feature/account.sync" type="bool">false</key>
                <key name="tizen.org/feature/archive" type="bool">true</key>
                <key name="tizen.org/feature/badge" type="bool">true</key>
                <key name="tizen.org/feature/battery" type="bool">false</key>

diff --git a/model-config_wearable.xml b/model-config_wearable.xml
index 6b08977..436b102 100644 (file)
--- a/model-config_wearable.xml
+++ b/model-config_wearable.xml
@@ -7,7 +7,8 @@
                <key name="tizen.org/system/platform.processor" type="string">emulator</key>
                <key name="tizen.org/system/platform.communication_processor" type="string">emulator</key>
                <key name="tizen.org/system/manufacturer" type="string">Tizen</key>
-               <key name="tizen.org/feature/account" type="bool">false</key>
+               <key name="tizen.org/feature/account" type="bool">true</key>
+               <key name="tizen.org/feature/account.sync" type="bool">true</key>
                <key name="tizen.org/feature/archive" type="bool">true</key>
                <key name="tizen.org/feature/badge" type="bool">true</key>
                <key name="tizen.org/feature/battery" type="bool">true</key>
@@ -18,7 +19,7 @@
                <key name="tizen.org/feature/camera.front" type="bool">false</key>
                <key name="tizen.org/feature/camera.front.flash" type="bool">false</key>
                <key name="tizen.org/feature/consumer_ir" type="bool">false</key>
-               <key name="tizen.org/feature/contact" type="bool">false</key>
+               <key name="tizen.org/feature/contact" type="bool">true</key>
                <key name="tizen.org/feature/convergence.d2d" type="bool">true</key>
                <key name="tizen.org/feature/database.encryption" type="bool">true</key>
                <key name="tizen.org/feature/datacontrol" type="bool">true</key>