From 0b116a0134da9e080489d6ea261a5b69197b748b Mon Sep 17 00:00:00 2001 From: Suchang Woo Date: Fri, 15 May 2015 10:28:20 +0900 Subject: [PATCH 02/11] Initial commit Copy from tizen_2.3 release branch in /sdk/model-config-emulator https://review.tizen.org/gerrit/gitweb?p=sdk/model-config-emulator.git;a=shortlog;h=refs/heads/tizen_2.3 Signed-off-by: Suchang Woo Change-Id: I1aa5171a75910cf490333ec1ce0b91aead628dbd --- AUTHORS | 13 +++ LICENSE.Apache-2.0 | 202 +++++++++++++++++++++++++++++++++++ NOTICE.APLv2 | 3 + model-config.manifest | 5 + model-config.xml | 148 +++++++++++++++++++++++++ model-config_mobile.xml | 170 +++++++++++++++++++++++++++++ model-config_wearable.xml | 176 ++++++++++++++++++++++++++++++ packaging/model-config-emulator.spec | 33 ++++++ 8 files changed, 750 insertions(+) create mode 100644 AUTHORS create mode 100644 LICENSE.Apache-2.0 create mode 100644 NOTICE.APLv2 create mode 100644 model-config.manifest create mode 100644 model-config.xml create mode 100644 model-config_mobile.xml create mode 100644 model-config_wearable.xml create mode 100644 packaging/model-config-emulator.spec diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 0000000..978df0f --- /dev/null +++ b/AUTHORS @@ -0,0 +1,13 @@ +YeongKyoon Lee +DaiYoung Kim +SeokYeon Hwang +SangJin Kim +KiTae Kim +JinHyung Jo +SungMin Ha +MunKyu Im +JiHye Kim +GiWoong Kim +SooYoung Ha +HyunGoo Kang + diff --git a/LICENSE.Apache-2.0 b/LICENSE.Apache-2.0 new file mode 100644 index 0000000..d645695 --- /dev/null +++ b/LICENSE.Apache-2.0 @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/NOTICE.APLv2 b/NOTICE.APLv2 new file mode 100644 index 0000000..1c1a4d0 --- /dev/null +++ b/NOTICE.APLv2 @@ -0,0 +1,3 @@ +Copyright (c) 2012 Samsung Electronics Co., Ltd. All rights reserved. +Except as noted, this software is licensed under Apache License, Version 2. +Please, see the LICENSE.APLv2 file for Apache License, Version 2 terms and conditions. diff --git a/model-config.manifest b/model-config.manifest new file mode 100644 index 0000000..97e8c31 --- /dev/null +++ b/model-config.manifest @@ -0,0 +1,5 @@ + + + + + diff --git a/model-config.xml b/model-config.xml new file mode 100644 index 0000000..705c506 --- /dev/null +++ b/model-config.xml @@ -0,0 +1,148 @@ + + + + Emulator + Tizen + 2.3.0 + Emulator + none + Tizen + true + false + false + true + false + false + false + true + false + none + false + true + true + false + true + true + 10 + false + false + false + false + false + false + false + false + false + false + false + true + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + true + false + false + true + false + false + false + true + true + false + false + true + false + true + false + false + false + 2.3 + false + 2.3 + mobile + true + 32 + false + true + 316 + 1280 + false + false + true + false + true + false + false + false + false + false + false + false + true + false + 720 + true + false + false + true + false + false + false + true + true + false + true + false + true + true + false + false + true + false + true + false + true + false + true + false + true + false + false + false + false + true + false + false + false + false + false + false + false + false + 15 + 15 + 15 + 15 + + diff --git a/model-config_mobile.xml b/model-config_mobile.xml new file mode 100644 index 0000000..ca22d74 --- /dev/null +++ b/model-config_mobile.xml @@ -0,0 +1,170 @@ + + + + Emulator + Tizen + 2.3.0 + Emulator + none + Tizen + true + true + true + true + true + true + true + false + false + true + false + true + false + true + false + true + true + true + true + true + true + false + none + false + true + false + true + false + true + true + 10 + false + false + false + false + false + false + false + false + false + false + false + true + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + true + true + false + false + true + false + false + false + true + true + false + false + true + false + true + false + false + false + 2.3 + false + 2.3 + mobile + true + 32 + false + true + 316 + 1280 + false + false + true + false + true + false + false + false + false + false + false + false + true + false + 720 + true + false + false + true + false + false + false + true + true + false + true + false + true + true + false + false + true + false + true + false + true + false + true + false + true + false + false + false + true + false + true + true + true + true + true + true + false + false + false + false + false + false + false + false + true + 15 + 15 + 15 + 15 + + diff --git a/model-config_wearable.xml b/model-config_wearable.xml new file mode 100644 index 0000000..a6dff5c --- /dev/null +++ b/model-config_wearable.xml @@ -0,0 +1,176 @@ + + + + Emulator + Tizen + 2.3.0 + emulator + emulator + Tizen + false + false + true + true + false + false + true + true + false + false + false + false + true + false + false + true + false + false + false + true + true + false + none + false + false + false + false + false + true + true + true + true + true + 2 + false + false + false + false + false + false + false + false + true + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + true + false + false + false + false + false + false + true + true + false + false + true + false + true + false + false + false + 2.3 + false + 2.3 + wearable + true + 32 + false + true + 300 + 480 + false + false + true + false + true + false + false + false + true + false + false + false + false + false + 360 + true + false + false + true + false + false + false + true + true + false + true + false + true + true + false + false + true + false + true + false + true + false + true + false + true + false + true + false + true + false + true + true + true + false + true + false + false + false + false + false + false + false + true + false + false + 15 + 15 + 15 + 15 + + + + diff --git a/packaging/model-config-emulator.spec b/packaging/model-config-emulator.spec new file mode 100644 index 0000000..dfaa3bf --- /dev/null +++ b/packaging/model-config-emulator.spec @@ -0,0 +1,33 @@ +Name: model-config-emulator +Summary: A Model configuration +Version: 0.0.2 +Release: 0 +Group: System/Configuration +License: Apache License, Version 2.0 +BuildArch: noarch +Source0: %{name}-%{version}.tar.gz + +%description +Model configuration data package + +%prep +%setup -q -n %{name}-%{version} + +%build + +%install +rm -rf %{buildroot} +mkdir -p %{buildroot}/etc/config +%if "%{?tizen_profile_name}" == "mobile" +cp -f model-config_mobile.xml %{buildroot}/etc/config/model-config.xml +%else +cp -f model-config_wearable.xml %{buildroot}/etc/config/model-config.xml +%endif + +mkdir -p %{buildroot}/usr/share/license +cp %{_builddir}/%{name}-%{version}/LICENSE.Apache-2.0 %{buildroot}/usr/share/license/%{name} + +%files +/usr/share/license/%{name} +/etc/config/model-config.xml +%manifest model-config.manifest -- 2.7.4 From e78e4689f7d55976ab79ea16cbfce34c010f0093 Mon Sep 17 00:00:00 2001 From: Suchang Woo Date: Fri, 15 May 2015 11:37:14 +0900 Subject: [PATCH 03/11] Revise the spec file to support multi-profile Signed-off-by: Suchang Woo Change-Id: I29248add465c7d74877b4c143dc179dc57fdfe5c --- model-config_tv.xml | 170 +++++++++++++++++++++++++++++++++++ packaging/model-config-emulator.spec | 30 ++++--- 2 files changed, 190 insertions(+), 10 deletions(-) create mode 100644 model-config_tv.xml diff --git a/model-config_tv.xml b/model-config_tv.xml new file mode 100644 index 0000000..ca22d74 --- /dev/null +++ b/model-config_tv.xml @@ -0,0 +1,170 @@ + + + + Emulator + Tizen + 2.3.0 + Emulator + none + Tizen + true + true + true + true + true + true + true + false + false + true + false + true + false + true + false + true + true + true + true + true + true + false + none + false + true + false + true + false + true + true + 10 + false + false + false + false + false + false + false + false + false + false + false + true + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + false + true + true + false + false + true + false + false + false + true + true + false + false + true + false + true + false + false + false + 2.3 + false + 2.3 + mobile + true + 32 + false + true + 316 + 1280 + false + false + true + false + true + false + false + false + false + false + false + false + true + false + 720 + true + false + false + true + false + false + false + true + true + false + true + false + true + true + false + false + true + false + true + false + true + false + true + false + true + false + false + false + true + false + true + true + true + true + true + true + false + false + false + false + false + false + false + false + true + 15 + 15 + 15 + 15 + + diff --git a/packaging/model-config-emulator.spec b/packaging/model-config-emulator.spec index dfaa3bf..5649724 100644 --- a/packaging/model-config-emulator.spec +++ b/packaging/model-config-emulator.spec @@ -1,9 +1,11 @@ +%define debug_package %{nil} + Name: model-config-emulator Summary: A Model configuration Version: 0.0.2 Release: 0 Group: System/Configuration -License: Apache License, Version 2.0 +License: Apache-2.0 BuildArch: noarch Source0: %{name}-%{version}.tar.gz @@ -17,17 +19,25 @@ Model configuration data package %install rm -rf %{buildroot} -mkdir -p %{buildroot}/etc/config -%if "%{?tizen_profile_name}" == "mobile" -cp -f model-config_mobile.xml %{buildroot}/etc/config/model-config.xml -%else -cp -f model-config_wearable.xml %{buildroot}/etc/config/model-config.xml +mkdir -p %{buildroot}%{_sysconfdir}/config + +%define config_xml model-config_mobile.xml + +%if "%{?profile}" == "wearable" +%define config_xml model-config_wearable.xml +%endif + +%if "%{?profile}" == "tv" +%define config_xml model-config_tv.xml +%endif + +%if "%{?profile}" == "mobile" +%define config_xml model-config_mobile.xml %endif -mkdir -p %{buildroot}/usr/share/license -cp %{_builddir}/%{name}-%{version}/LICENSE.Apache-2.0 %{buildroot}/usr/share/license/%{name} +cp -f %{config_xml} %{buildroot}%{_sysconfdir}/config/model-config.xml %files -/usr/share/license/%{name} -/etc/config/model-config.xml +%config %{_sysconfdir}/config/model-config.xml %manifest model-config.manifest +%license LICENSE.Apache-2.0 -- 2.7.4 From e9e4c92a913713db7fa2d88d5a74658c75ddb200 Mon Sep 17 00:00:00 2001 From: Jinhee Choi Date: Wed, 3 Jun 2015 16:32:13 +0900 Subject: [PATCH 04/11] platform version is modified from 2.3 to 3.0 Change-Id: I88bb181161b27127e1aabc81bbeb30a91a81a6ba --- model-config.xml | 8 ++++---- model-config_mobile.xml | 8 ++++---- model-config_tv.xml | 8 ++++---- model-config_wearable.xml | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/model-config.xml b/model-config.xml index 705c506..e55aa05 100644 --- a/model-config.xml +++ b/model-config.xml @@ -1,9 +1,9 @@ - + Emulator Tizen - 2.3.0 + 3.0 Emulator none Tizen @@ -77,9 +77,9 @@ false false false - 2.3 + 3.0 false - 2.3 + 3.0 mobile true 32 diff --git a/model-config_mobile.xml b/model-config_mobile.xml index ca22d74..6c0276c 100644 --- a/model-config_mobile.xml +++ b/model-config_mobile.xml @@ -1,9 +1,9 @@ - + Emulator Tizen - 2.3.0 + 3.0 Emulator none Tizen @@ -92,9 +92,9 @@ false false false - 2.3 + 3.0 false - 2.3 + 3.0 mobile true 32 diff --git a/model-config_tv.xml b/model-config_tv.xml index ca22d74..6c0276c 100644 --- a/model-config_tv.xml +++ b/model-config_tv.xml @@ -1,9 +1,9 @@ - + Emulator Tizen - 2.3.0 + 3.0 Emulator none Tizen @@ -92,9 +92,9 @@ false false false - 2.3 + 3.0 false - 2.3 + 3.0 mobile true 32 diff --git a/model-config_wearable.xml b/model-config_wearable.xml index a6dff5c..feb704e 100644 --- a/model-config_wearable.xml +++ b/model-config_wearable.xml @@ -1,9 +1,9 @@ - + Emulator Tizen - 2.3.0 + 3.0 emulator emulator Tizen @@ -96,9 +96,9 @@ false false false - 2.3 + 3.0 false - 2.3 + 3.0 wearable true 32 -- 2.7.4 From b5218e563d7dc7eedf84df4d38ab7b9012749f19 Mon Sep 17 00:00:00 2001 From: "Hongkuk, Son" Date: Mon, 16 Nov 2015 20:50:00 +0900 Subject: [PATCH 05/11] model-config: sync with 2.4 sensor features Signed-off-by: Hongkuk, Son Change-Id: I6de69d10f25bc541870846f3ad10e31461b31da8 --- model-config.xml | 31 +++++++++++++++++++------------ model-config_mobile.xml | 31 +++++++++++++++++++------------ model-config_tv.xml | 31 +++++++++++++++++++------------ model-config_wearable.xml | 31 +++++++++++++++++++------------ 4 files changed, 76 insertions(+), 48 deletions(-) diff --git a/model-config.xml b/model-config.xml index e55aa05..596d970 100644 --- a/model-config.xml +++ b/model-config.xml @@ -102,31 +102,38 @@ true false 720 - true + false false false - true + false false false + false false - true - true + false + false + false false - true + false + false + false + false + false false - true - true + false + false + false false false - true + false false - true + false false - true + false false - true + false false - true + false false false false diff --git a/model-config_mobile.xml b/model-config_mobile.xml index 6c0276c..2b0c691 100644 --- a/model-config_mobile.xml +++ b/model-config_mobile.xml @@ -117,31 +117,38 @@ true false 720 - true + false false false - true + false false false + false false - true - true + false + false + false false - true + false + false + false + false + false false - true - true + false + false + false false false - true + false false - true + false false - true + false false - true + false false - true + false false false false diff --git a/model-config_tv.xml b/model-config_tv.xml index 6c0276c..2b0c691 100644 --- a/model-config_tv.xml +++ b/model-config_tv.xml @@ -117,31 +117,38 @@ true false 720 - true + false false false - true + false false false + false false - true - true + false + false + false false - true + false + false + false + false + false false - true - true + false + false + false false false - true + false false - true + false false - true + false false - true + false false - true + false false false false diff --git a/model-config_wearable.xml b/model-config_wearable.xml index feb704e..70d145b 100644 --- a/model-config_wearable.xml +++ b/model-config_wearable.xml @@ -121,31 +121,38 @@ false false 360 - true + false false false - true + false false false + false false - true - true + false + false + false false - true + false + false + false + false + false false - true - true + false + false + false false false - true + false false - true + false false - true + false false - true + false false - true + false false true false -- 2.7.4 From 4f67f25b5343b87206e04ac1a111c70e87dcb763 Mon Sep 17 00:00:00 2001 From: Seonah Moon Date: Thu, 26 Nov 2015 14:18:08 +0900 Subject: [PATCH 06/11] Add ethernet feature to all config files Change-Id: Ic9d7a81f8ff6583526391c130caf82682fd16f0b Signed-off-by: Seonah Moon --- model-config.xml | 1 + model-config_mobile.xml | 1 + model-config_tv.xml | 1 + model-config_wearable.xml | 1 + 4 files changed, 4 insertions(+) diff --git a/model-config.xml b/model-config.xml index 596d970..b7f9c06 100644 --- a/model-config.xml +++ b/model-config.xml @@ -25,6 +25,7 @@ true 10 false + true false false false diff --git a/model-config_mobile.xml b/model-config_mobile.xml index 2b0c691..6ab584a 100644 --- a/model-config_mobile.xml +++ b/model-config_mobile.xml @@ -39,6 +39,7 @@ true 10 false + true false false false diff --git a/model-config_tv.xml b/model-config_tv.xml index 2b0c691..6ab584a 100644 --- a/model-config_tv.xml +++ b/model-config_tv.xml @@ -39,6 +39,7 @@ true 10 false + true false false false diff --git a/model-config_wearable.xml b/model-config_wearable.xml index 70d145b..afeec6b 100644 --- a/model-config_wearable.xml +++ b/model-config_wearable.xml @@ -42,6 +42,7 @@ true 2 false + true false false false -- 2.7.4 From 88f9f632cf233e0f62f465ddfd70e6593d068bda Mon Sep 17 00:00:00 2001 From: Young-Ae Kang Date: Tue, 26 Jan 2016 07:40:35 +0900 Subject: [PATCH 07/11] [Location] Sync with 2.4: add missed features Signed-off-by: Young-Ae Kang Change-Id: I284f506569cd96eb63222cd5e3715839b8d4a5e4 --- model-config.xml | 2 ++ model-config_mobile.xml | 2 ++ model-config_wearable.xml | 2 ++ 3 files changed, 6 insertions(+) diff --git a/model-config.xml b/model-config.xml index b7f9c06..38b523e 100644 --- a/model-config.xml +++ b/model-config.xml @@ -20,7 +20,9 @@ false true true + false false + true true true 10 diff --git a/model-config_mobile.xml b/model-config_mobile.xml index 6ab584a..4e11977 100644 --- a/model-config_mobile.xml +++ b/model-config_mobile.xml @@ -34,7 +34,9 @@ true false true + false false + true true true 10 diff --git a/model-config_wearable.xml b/model-config_wearable.xml index afeec6b..8293216 100644 --- a/model-config_wearable.xml +++ b/model-config_wearable.xml @@ -34,7 +34,9 @@ false false false + false false + false true true true -- 2.7.4 From a6841859ff7f4e694ec958b4a1bff6de51cd7e9a Mon Sep 17 00:00:00 2001 From: Wonnam Jang Date: Wed, 2 Mar 2016 10:17:50 +0900 Subject: [PATCH 08/11] add feature for voice control Change-Id: I108fbff86c4d22c109c3b3c4ea936486f429ea6b Signed-off-by: Wonnam Jang --- model-config.xml | 1 + model-config_mobile.xml | 1 + model-config_wearable.xml | 1 + 3 files changed, 3 insertions(+) diff --git a/model-config.xml b/model-config.xml index 38b523e..16d2ff2 100644 --- a/model-config.xml +++ b/model-config.xml @@ -142,6 +142,7 @@ false false true + true false false false diff --git a/model-config_mobile.xml b/model-config_mobile.xml index 4e11977..39c616b 100644 --- a/model-config_mobile.xml +++ b/model-config_mobile.xml @@ -158,6 +158,7 @@ true false true + true true true true diff --git a/model-config_wearable.xml b/model-config_wearable.xml index 8293216..5eef467 100644 --- a/model-config_wearable.xml +++ b/model-config_wearable.xml @@ -162,6 +162,7 @@ true false true + true true true false -- 2.7.4 From 3bca6567b8d170f4a8e54580fb334fd159e4d628 Mon Sep 17 00:00:00 2001 From: Younho Park Date: Wed, 2 Mar 2016 14:26:39 +0900 Subject: [PATCH 09/11] [Push] enabled network.push feature Change-Id: I2ef9ece315743dbd66e4949242b4eafe4a04f393 Signed-off-by: Younho Park --- model-config_wearable.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model-config_wearable.xml b/model-config_wearable.xml index 8293216..102e137 100644 --- a/model-config_wearable.xml +++ b/model-config_wearable.xml @@ -56,7 +56,7 @@ false false false - false + true false false false -- 2.7.4 From 7d4c6319b09d231f424ae729f5d3d465e6697fdf Mon Sep 17 00:00:00 2001 From: Hyunjin Park Date: Wed, 16 Mar 2016 13:48:33 +0900 Subject: [PATCH 10/11] enable feature - archive, exif, notification - cause : to add modules on Web TCT Change-Id: I029d31a9b3fcc8ae02de43ec20f4136ca7815ab6 --- model-config_wearable.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/model-config_wearable.xml b/model-config_wearable.xml index d61866d..785260c 100644 --- a/model-config_wearable.xml +++ b/model-config_wearable.xml @@ -8,7 +8,7 @@ emulator Tizen false - false + true true true false @@ -24,7 +24,7 @@ false true false - false + true false true true @@ -81,7 +81,7 @@ false false false - false + true true false false -- 2.7.4 From 2ce5c4945eeba29ae2db0816f431be7ffc0e5ae4 Mon Sep 17 00:00:00 2001 From: Seonah Moon Date: Wed, 16 Mar 2016 13:44:27 +0900 Subject: [PATCH 11/11] [VPN] Add feature for vpn service Change-Id: Iabbe4b2437916dca5f55f36c73b2815cb0dfc46a Signed-off-by: Seonah Moon --- model-config.xml | 1 + model-config_mobile.xml | 1 + model-config_tv.xml | 1 + model-config_wearable.xml | 1 + 4 files changed, 4 insertions(+) diff --git a/model-config.xml b/model-config.xml index 16d2ff2..eb2d9cd 100644 --- a/model-config.xml +++ b/model-config.xml @@ -59,6 +59,7 @@ false false false + false false false false diff --git a/model-config_mobile.xml b/model-config_mobile.xml index 39c616b..2803332 100644 --- a/model-config_mobile.xml +++ b/model-config_mobile.xml @@ -73,6 +73,7 @@ false false false + false false false false diff --git a/model-config_tv.xml b/model-config_tv.xml index 6ab584a..b324480 100644 --- a/model-config_tv.xml +++ b/model-config_tv.xml @@ -71,6 +71,7 @@ false false false + false false false false diff --git a/model-config_wearable.xml b/model-config_wearable.xml index 785260c..07617e1 100644 --- a/model-config_wearable.xml +++ b/model-config_wearable.xml @@ -77,6 +77,7 @@ false false false + false false false false -- 2.7.4