Remove calling API not supported.

Change-Id: Id9f97e26583fd3c7c90f508013f482e318cba17f
Signed-off-by: Kyuho Jo <kyuho.jo@samsung.com>

40 files changed, 251 insertions, 317 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 13626f9..fd29826 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 
 ADD_SUBDIRECTORY(clock-viewer)
-ADD_SUBDIRECTORY(default-clock)
+#ADD_SUBDIRECTORY(default-clock)
diff --git a/clock-viewer/CMakeLists.txt b/clock-viewer/CMakeLists.txt
index b474ee3..58e7be7 100644
--- a/clock-viewer/CMakeLists.txt
+++ b/clock-viewer/CMakeLists.txt
@@ -13,16 +13,15 @@ INCLUDE(FindPkgConfig)
 pkg_check_modules(PKGS REQUIRED
 	capi-appfw-application
 	capi-system-device
+	capi-base-utils-i18n
 	elementary
-	minicontrol-viewer
-	minicontrol-monitor
-	minicontrol-handler
 	widget_viewer_evas
 	widget_service
 	alarm-service
 	pkgmgr-info
 	vconf
 	dlog
+	edbus
 )
 
 SET(PACKAGE_NAME "org.tizen.${PROJECT_NAME}")
@@ -75,7 +74,6 @@ ADD_EXECUTABLE(${PROJECT_NAME}
 	src/clock-viewer-util-alarm.c
 	src/clock-viewer-display.c
 	src/clock-viewer-window.c
-	src/clock-viewer-minicontrol.c
 	src/clock-viewer-widget.c
 	src/clock-viewer-default-clock.c
 	src/clock-viewer-default-clock-fallback.c
@@ -93,7 +91,6 @@ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE DESTINATION /usr/share/license
 
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${PACKAGE_NAME}.xml.in ${CMAKE_BINARY_DIR}/${PACKAGE_NAME}.xml)
 INSTALL(FILES ${CMAKE_BINARY_DIR}/${PACKAGE_NAME}.xml DESTINATION /usr/share/packages)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${PACKAGE_NAME}.rule DESTINATION /etc/smack/accesses.d)
 
 # data
 ADD_SUBDIRECTORY(data)
diff --git a/clock-viewer/LICENSE b/clock-viewer/LICENSE
index d645695..571fe79 100644
--- a/clock-viewer/LICENSE
+++ b/clock-viewer/LICENSE
@@ -1,202 +1,206 @@
-
-                                 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.
+Flora License
+
+Version 1.1, April, 2013
+
+http://floralicense.org/license/
+
+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.
+
+"Tizen Certified Platform" shall mean a software platform that complies
+with the standards set forth in the Tizen Compliance Specification
+and passes the Tizen Compliance Tests as defined from time to time
+by the Tizen Technical Steering Group and certified by the Tizen
+Association or its designated agent.
+
+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
+solely as incorporated into a Tizen Certified Platform, 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 solely
+as incorporated into a Tizen Certified Platform 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 pursuant to the copyright license
+above, in any medium, with or without modifications, and in Source or
+Object form, provided that You meet the following conditions:
+
+  1. You must give any other recipients of the Work or Derivative Works
+     a copy of this License; and
+  2. You must cause any modified files to carry prominent notices stating
+     that You changed the files; and
+  3. 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
+  4. 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
+     and your own copyright statement or terms and conditions do not conflict
+     the conditions stated in the License including section 3.
+
+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 Flora License to your work
+
+To apply the Flora 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");
+   Licensed under the Flora License, Version 1.1 (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
+       http://floralicense.org/license/
 
    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/clock-viewer/include/clock-viewer-debug.h b/clock-viewer/include/clock-viewer-debug.h
index 335e01c..b2f445f 100644
--- a/clock-viewer/include/clock-viewer-debug.h
+++ b/clock-viewer/include/clock-viewer-debug.h
@@ -1,7 +1,7 @@
 /*
  *  W Clock Viewer
  *
- * Copyright (c) 2000 - 2015 Samsung Electronics Co., Ltd. All rights reserved.
+ * Copyright (c) 2015 - 2016 Samsung Electronics Co., Ltd. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/clock-viewer/include/clock-viewer-default-clock-fallback.h b/clock-viewer/include/clock-viewer-default-clock-fallback.h
index e3df50e..b31f4e5 100644
--- a/clock-viewer/include/clock-viewer-default-clock-fallback.h
+++ b/clock-viewer/include/clock-viewer-default-clock-fallback.h
@@ -1,7 +1,7 @@
 /*
  *  W Clock Viewer
  *
- * Copyright (c) 2000 - 2015 Samsung Electronics Co., Ltd. All rights reserved.
+ * Copyright (c) 2015 - 2016 Samsung Electronics Co., Ltd. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/clock-viewer/include/clock-viewer-default-clock.h b/clock-viewer/include/clock-viewer-default-clock.h
index 785af86..6418035 100644
--- a/clock-viewer/include/clock-viewer-default-clock.h
+++ b/clock-viewer/include/clock-viewer-default-clock.h
@@ -1,7 +1,7 @@
 /*
  *  W Clock Viewer
  *
- * Copyright (c) 2000 - 2015 Samsung Electronics Co., Ltd. All rights reserved.
+ * Copyright (c) 2015 - 2016 Samsung Electronics Co., Ltd. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/clock-viewer/include/clock-viewer-display.h b/clock-viewer/include/clock-viewer-display.h
index 2d90538..f63e812 100644
--- a/clock-viewer/include/clock-viewer-display.h
+++ b/clock-viewer/include/clock-viewer-display.h
@@ -1,7 +1,7 @@
 /*
  *  W Clock Viewer
  *
- * Copyright (c) 2000 - 2015 Samsung Electronics Co., Ltd. All rights reserved.
+ * Copyright (c) 2015 - 2016 Samsung Electronics Co., Ltd. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/clock-viewer/include/clock-viewer-feature.h b/clock-viewer/include/clock-viewer-feature.h
index 5489d1e..b3a0cff 100644
--- a/clock-viewer/include/clock-viewer-feature.h
+++ b/clock-viewer/include/clock-viewer-feature.h
@@ -1,7 +1,7 @@
 /*
  *  W Clock Viewer
  *
- * Copyright (c) 2000 - 2015 Samsung Electronics Co., Ltd. All rights reserved.
+ * Copyright (c) 2015 - 2016 Samsung Electronics Co., Ltd. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/clock-viewer/include/clock-viewer-minicontrol.h b/clock-viewer/include/clock-viewer-minicontrol.h
index 500035a..3a19589 100644
--- a/clock-viewer/include/clock-viewer-minicontrol.h
+++ b/clock-viewer/include/clock-viewer-minicontrol.h
@@ -1,7 +1,7 @@
 /*
  *  W Clock Viewer
  *
- * Copyright (c) 2000 - 2015 Samsung Electronics Co., Ltd. All rights reserved.
+ * Copyright (c) 2015 - 2016 Samsung Electronics Co., Ltd. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/clock-viewer/include/clock-viewer-plugin.h b/clock-viewer/include/clock-viewer-plugin.h
index 23b4319..bba6b84 100644
--- a/clock-viewer/include/clock-viewer-plugin.h
+++ b/clock-viewer/include/clock-viewer-plugin.h
@@ -1,7 +1,7 @@
 /*
  *  W Clock Viewer
  *
- * Copyright (c) 2000 - 2015 Samsung Electronics Co., Ltd. All rights reserved.
+ * Copyright (c) 2015 - 2016 Samsung Electronics Co., Ltd. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/clock-viewer/include/clock-viewer-util-alarm.h b/clock-viewer/include/clock-viewer-util-alarm.h
index af8a899..38931d9 100644
--- a/clock-viewer/include/clock-viewer-util-alarm.h
+++ b/clock-viewer/include/clock-viewer-util-alarm.h
@@ -1,7 +1,7 @@
 /*
  * W Clock Viewer
  *
- * Copyright (c) 2000 - 2015 Samsung Electronics Co., Ltd. All rights reserved.
+ * Copyright (c) 2015 - 2016 Samsung Electronics Co., Ltd. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/clock-viewer/include/clock-viewer-util-pkginfo.h b/clock-viewer/include/clock-viewer-util-pkginfo.h
index 31bfc3c..550792c 100644
--- a/clock-viewer/include/clock-viewer-util-pkginfo.h
+++ b/clock-viewer/include/clock-viewer-util-pkginfo.h
@@ -1,7 +1,7 @@
 /*
  *  W Clock Viewer
  *
- * Copyright (c) 2000 - 2015 Samsung Electronics Co., Ltd. All rights reserved.
+ * Copyright (c) 2015 - 2016 Samsung Electronics Co., Ltd. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/clock-viewer/include/clock-viewer-util-status.h b/clock-viewer/include/clock-viewer-util-status.h
index 9f76d20..c1ad354 100644
--- a/clock-viewer/include/clock-viewer-util-status.h
+++ b/clock-viewer/include/clock-viewer-util-status.h
@@ -1,7 +1,7 @@
 /*
  *  W Clock Viewer
  *
- * Copyright (c) 2000 - 2015 Samsung Electronics Co., Ltd. All rights reserved.
+ * Copyright (c) 2015 - 2016 Samsung Electronics Co., Ltd. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/clock-viewer/include/clock-viewer-util-winset.h b/clock-viewer/include/clock-viewer-util-winset.h
index a773775..5cedb01 100644
--- a/clock-viewer/include/clock-viewer-util-winset.h
+++ b/clock-viewer/include/clock-viewer-util-winset.h
@@ -1,7 +1,7 @@
 /*
  *  W Clock Viewer
  *
- * Copyright (c) 2000 - 2015 Samsung Electronics Co., Ltd. All rights reserved.
+ * Copyright (c) 2015 - 2016 Samsung Electronics Co., Ltd. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/clock-viewer/include/clock-viewer-widget.h b/clock-viewer/include/clock-viewer-widget.h
index 6c23053..867f41a 100644
--- a/clock-viewer/include/clock-viewer-widget.h
+++ b/clock-viewer/include/clock-viewer-widget.h
@@ -1,7 +1,7 @@
 /*
  *  W Clock Viewer
  *
- * Copyright (c) 2000 - 2015 Samsung Electronics Co., Ltd. All rights reserved.
+ * Copyright (c) 2015 - 2016 Samsung Electronics Co., Ltd. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/clock-viewer/include/clock-viewer-window.h b/clock-viewer/include/clock-viewer-window.h
index c09ba2a..eb1e58a 100644
--- a/clock-viewer/include/clock-viewer-window.h
+++ b/clock-viewer/include/clock-viewer-window.h
@@ -1,7 +1,7 @@
 /*
  *  W Clock Viewer
  *
- * Copyright (c) 2000 - 2015 Samsung Electronics Co., Ltd. All rights reserved.
+ * Copyright (c) 2015 - 2016 Samsung Electronics Co., Ltd. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/clock-viewer/include/clock-viewer.h b/clock-viewer/include/clock-viewer.h
index dee879d..e87d977 100644
--- a/clock-viewer/include/clock-viewer.h
+++ b/clock-viewer/include/clock-viewer.h
@@ -1,7 +1,7 @@
 /*
  *  W Clock Viewer
  *
- * Copyright (c) 2000 - 2015 Samsung Electronics Co., Ltd. All rights reserved.
+ * Copyright (c) 2015 - 2016 Samsung Electronics Co., Ltd. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/clock-viewer/org.tizen.w-clock-viewer.manifest b/clock-viewer/org.tizen.w-clock-viewer.manifest
index 98a54ac..75b0fa5 100644
--- a/clock-viewer/org.tizen.w-clock-viewer.manifest
+++ b/clock-viewer/org.tizen.w-clock-viewer.manifest
@@ -1,8 +1,5 @@
 <manifest>
-    <define>
-        <domain name="org.tizen.w-clock-viewer"/>
-    </define>
     <request>
-        <domain name="org.tizen.w-clock-viewer"/>
+        <domain name="_"/>
     </request>
 </manifest>
diff --git a/clock-viewer/org.tizen.w-clock-viewer.rule b/clock-viewer/org.tizen.w-clock-viewer.rule
deleted file mode 100644
index 178521a..0000000
--- a/clock-viewer/org.tizen.w-clock-viewer.rule
+++ /dev/null
@@ -1,59 +0,0 @@
-org.tizen.w-clock-viewer system::use_internet r----- ------
-org.tizen.w-clock-viewer net-config r----- ------
-org.tizen.w-clock-viewer xorg rw---- ------
-org.tizen.w-clock-viewer isf rwx--- ------
-org.tizen.w-clock-viewer sound_server rw---- ------
-org.tizen.w-clock-viewer syspopup::db rw---- ------
-org.tizen.w-clock-viewer dbus rwx--- ------
-org.tizen.w-clock-viewer pulseaudio rwxat- ------
-org.tizen.w-clock-viewer ail::db rw---- ------
-org.tizen.w-clock-viewer connman r----- ------
-org.tizen.w-clock-viewer system rwx--- ------
-org.tizen.w-clock-viewer immvibed rw---- ------
-org.tizen.w-clock-viewer svi-data r-x--- ------
-org.tizen.w-clock-viewer e17 r-x--- ------
-org.tizen.w-clock-viewer deviced rwx--- ------
-org.tizen.w-clock-viewer deviced::display rw---- ------
-org.tizen.w-clock-viewer deviced::haptic rw---- ------
-org.tizen.w-clock-viewer data-provider-master::data --x--- ------
-org.tizen.w-clock-viewer data-provider-master::db rw---- ------
-org.tizen.w-clock-viewer data-provider-master::share rwxat- ------
-org.tizen.w-clock-viewer data-provider-master::client rw---- ------
-org.tizen.w-clock-viewer data-provider-master rw---- ------
-org.tizen.w-clock-viewer app-svc::db rw---- ------
-org.tizen.w-clock-viewer org.tizen.alarm rwx--- ------
-org.tizen.w-clock-viewer org.tizen.setting::system rwx--- ------
-org.tizen.w-clock-viewer org.tizen.wfmd rwx--- ------
-org.tizen.w-clock-viewer pkgmgr::db rwx--- ------
-org.tizen.w-clock-viewer pkgmgr-client r-x--- ------
-org.tizen.w-clock-viewer pkgmgr::svc r-x--- ------
-org.tizen.w-clock-viewer pkgmgr::info r----- ------
-org.tizen.w-clock-viewer efreet rwx--- ------
-org.tizen.w-clock-viewer org.tizen.clocksetting rwx--- ------
-org.tizen.w-clock-viewer org.tizen.clocksetting::default-resources r-x--- ------
-org.tizen.w-clock-viewer org.tizen.w-idle-clock-weather2 rwx--- ------
-org.tizen.w-clock-viewer org.tizen.idle-clock-pedometer rwx--- ------
-org.tizen.w-clock-viewer org.tizen.idle-clock-dual rwx--- ------
-org.tizen.w-clock-viewer org.tizen.idle-clock-digital rwx--- ------
-org.tizen.w-clock-viewer org.tizen.w-idle-clock-shortcut2 rwx--- ------
-org.tizen.w-clock-viewer org.tizen.idle-clock-style01 rwx--- ------
-org.tizen.w-clock-viewer org.tizen.idle-clock-style02 rwx--- ------
-org.tizen.w-clock-viewer org.tizen.idle-clock-style03 rwx--- ------
-org.tizen.w-clock-viewer org.tizen.idle-clock-style04 rwx--- ------
-org.tizen.w-clock-viewer org.tizen.idle-clock-style05 rwx--- ------
-org.tizen.w-clock-viewer org.tizen.idle-clock-style06 rwx--- ------
-org.tizen.w-clock-viewer org.tizen.idle-clock-style07 rwx--- ------
-org.tizen.w-clock-viewer org.tizen.idle-clock-style08 rwx--- ------
-org.tizen.w-clock-viewer org.tizen.idle-clock-style09 rwx--- ------
-org.tizen.w-clock-viewer org.tizen.idle-clock-style10 rwx--- ------
-org.tizen.w-clock-viewer org.tizen.alpm-clock-manager rwx--- ------
-org.tizen.w-clock-viewer tizen::vconf::setting::admin rw---- ------
-org.tizen.w-clock-viewer data-provider-master::badge rw---- ------
-org.tizen.w-clock-viewer data-provider-master::badge.client -w---- ------
-org.tizen.w-clock-viewer samsung::vconf::widget rw---- ------
-org.tizen.w-clock-viewer aul::launch --x--- ------
-org.tizen.w-clock-viewer aul::terminate --x--- ------
-org.tizen.w-clock-viewer alarm-server::alarm rw---l ------
-org.tizen.w-clock-viewer alarm-manager::alarm rw---l ------
-aul org.tizen.w-clock-viewer r-x--- ------
-dbus org.tizen.w-clock-viewer rwx--- ------
diff --git a/clock-viewer/src/clock-viewer-default-clock-fallback.c b/clock-viewer/src/clock-viewer-default-clock-fallback.c
index b5186b6..172865b 100644
--- a/clock-viewer/src/clock-viewer-default-clock-fallback.c
+++ b/clock-viewer/src/clock-viewer-default-clock-fallback.c
@@ -1,7 +1,7 @@
 /*
  *  W Clock Viewer
  *
- * Copyright (c) 2000 - 2015 Samsung Electronics Co., Ltd. All rights reserved.
+ * Copyright (c) 2015 - 2016 Samsung Electronics Co., Ltd. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/clock-viewer/src/clock-viewer-default-clock.c b/clock-viewer/src/clock-viewer-default-clock.c
index 8966e38..6441213 100644
--- a/clock-viewer/src/clock-viewer-default-clock.c
+++ b/clock-viewer/src/clock-viewer-default-clock.c
@@ -1,7 +1,7 @@
 /*
  *  W Clock Viewer
  *
- * Copyright (c) 2000 - 2015 Samsung Electronics Co., Ltd. All rights reserved.
+ * Copyright (c) 2015 - 2016 Samsung Electronics Co., Ltd. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/clock-viewer/src/clock-viewer-display.c b/clock-viewer/src/clock-viewer-display.c
index fd04e4f..a9d2b10 100644
--- a/clock-viewer/src/clock-viewer-display.c
+++ b/clock-viewer/src/clock-viewer-display.c
@@ -1,7 +1,7 @@
 /*
  *  W Clock Viewer
  *
- * Copyright (c) 2000 - 2015 Samsung Electronics Co., Ltd. All rights reserved.
+ * Copyright (c) 2015 - 2016 Samsung Electronics Co., Ltd. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/clock-viewer/src/clock-viewer-main.c b/clock-viewer/src/clock-viewer-main.c
index 5dc31a8..7a6b686 100644
--- a/clock-viewer/src/clock-viewer-main.c
+++ b/clock-viewer/src/clock-viewer-main.c
@@ -1,7 +1,7 @@
 /*
  *  W Clock Viewer
  *
- * Copyright (c) 2015 Samsung Electronics Co., Ltd. All rights reserved.
+ * Copyright (c) 2015 - 2016 Samsung Electronics Co., Ltd. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,9 +18,7 @@
  */
 
 #include <stdio.h>
-
 #include <app.h>
-
 #include "clock-viewer.h"
 
 static bool _app_create(void *data)
@@ -81,18 +79,13 @@ int main(int argc, char *argv[])
 		_ERR("Failed to create app data");
 	}
 
-	app_event_callback_s event_callback;
+	ui_app_lifecycle_callback_s event_callback;
 
 	event_callback.create = _app_create;
 	event_callback.terminate = _app_terminate;
 	event_callback.pause = _app_pause;
 	event_callback.resume = _app_resume;
 	event_callback.app_control = _app_control;
-	event_callback.language_changed = NULL;
-	event_callback.low_memory = NULL;
-	event_callback.low_battery = NULL;
-	event_callback.device_orientation = NULL;
-	event_callback.region_format_changed = NULL;
 
-	return app_efl_main(&argc, &argv, &event_callback, clock_viewer);
+	return ui_app_main(argc, argv, &event_callback, clock_viewer);
 }
diff --git a/clock-viewer/src/clock-viewer-minicontrol.c b/clock-viewer/src/clock-viewer-minicontrol.c
index 8008a53..510e913 100644
--- a/clock-viewer/src/clock-viewer-minicontrol.c
+++ b/clock-viewer/src/clock-viewer-minicontrol.c
@@ -1,7 +1,7 @@
 /*
  *  W Clock Viewer
  *
- * Copyright (c) 2000 - 2015 Samsung Electronics Co., Ltd. All rights reserved.
+ * Copyright (c) 2015 - 2016 Samsung Electronics Co., Ltd. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/clock-viewer/src/clock-viewer-plugin.c b/clock-viewer/src/clock-viewer-plugin.c
index d0d7cc8..d9d4e89 100644
--- a/clock-viewer/src/clock-viewer-plugin.c
+++ b/clock-viewer/src/clock-viewer-plugin.c
@@ -1,7 +1,7 @@
 /*
  *  W Clock Viewer
  *
- * Copyright (c) 2000 - 2015 Samsung Electronics Co., Ltd. All rights reserved.
+ * Copyright (c) 2015 - 2016 Samsung Electronics Co., Ltd. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/clock-viewer/src/clock-viewer-util-alarm.c b/clock-viewer/src/clock-viewer-util-alarm.c
index e15afb4..48bfaa0 100644
--- a/clock-viewer/src/clock-viewer-util-alarm.c
+++ b/clock-viewer/src/clock-viewer-util-alarm.c
@@ -1,7 +1,7 @@
 /*
  *  W Clock Viewer
  *
- * Copyright (c) 2000 - 2015 Samsung Electronics Co., Ltd. All rights reserved.
+ * Copyright (c) 2015 - 2016 Samsung Electronics Co., Ltd. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/clock-viewer/src/clock-viewer-util-dbus-emul.c b/clock-viewer/src/clock-viewer-util-dbus-emul.c
index 849d339..ea160ce 100644
--- a/clock-viewer/src/clock-viewer-util-dbus-emul.c
+++ b/clock-viewer/src/clock-viewer-util-dbus-emul.c
@@ -1,7 +1,7 @@
 /*
  *  W Clock Viewer
  *
- * Copyright (c) 2000 - 2015 Samsung Electronics Co., Ltd. All rights reserved.
+ * Copyright (c) 2015 - 2016 Samsung Electronics Co., Ltd. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/clock-viewer/src/clock-viewer-util-dbus.c b/clock-viewer/src/clock-viewer-util-dbus.c
index b64cbff..c82a2fc 100644
--- a/clock-viewer/src/clock-viewer-util-dbus.c
+++ b/clock-viewer/src/clock-viewer-util-dbus.c
@@ -1,7 +1,7 @@
 /*
  *  W Clock Viewer
  *
- * Copyright (c) 2000 - 2015 Samsung Electronics Co., Ltd. All rights reserved.
+ * Copyright (c) 2015 - 2016 Samsung Electronics Co., Ltd. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/clock-viewer/src/clock-viewer-util-pkginfo.c b/clock-viewer/src/clock-viewer-util-pkginfo.c
index 542e4e0..b77ad04 100644
--- a/clock-viewer/src/clock-viewer-util-pkginfo.c
+++ b/clock-viewer/src/clock-viewer-util-pkginfo.c
@@ -1,7 +1,7 @@
 /*
  *  W Clock Viewer
  *
- * Copyright (c) 2000 - 2015 Samsung Electronics Co., Ltd. All rights reserved.
+ * Copyright (c) 2015 - 2016 Samsung Electronics Co., Ltd. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -99,7 +99,9 @@ HAPI clock_viewer_ambient_type clock_viewer_util_pkginfo_get_ambient_type(char *
 		return CLOCK_VIEWER_AMBIENT_TYPE_ANALOG;
 	}
 
+	/* TODO : request below API or alternative on tizen 3.0
 	ret = pkgmgrinfo_appinfo_get_ambient_support(handle, &ambient_mode);
+	*/
 	pkgmgrinfo_appinfo_destroy_appinfo(handle);
 	if (ret != PMINFO_R_OK) {
 		return CLOCK_VIEWER_AMBIENT_TYPE_ANALOG;
@@ -118,7 +120,9 @@ HAPI int clock_viewer_util_pkginfo_is_widget(char *appid)
 	widget_id = widget_service_get_widget_id(appid);
 	if (widget_id != NULL) {
 		char *category = NULL;
+		/* TODO : Replace below line with watch core API
 		category = widget_service_get_category(widget_id);
+		*/
 
 		if (category != NULL) {
 			if (!strcmp(category, CLOCK_VIEWER_TIZEN_CLOCK_CATEGORY)) {
diff --git a/clock-viewer/src/clock-viewer-util-status.c b/clock-viewer/src/clock-viewer-util-status.c
index bb3f869..34ff418 100644
--- a/clock-viewer/src/clock-viewer-util-status.c
+++ b/clock-viewer/src/clock-viewer-util-status.c
@@ -1,7 +1,7 @@
 /*
  *  W Clock Viewer
  *
- * Copyright (c) 2000 - 2015 Samsung Electronics Co., Ltd. All rights reserved.
+ * Copyright (c) 2015 - 2016 Samsung Electronics Co., Ltd. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/clock-viewer/src/clock-viewer-util-winset.c b/clock-viewer/src/clock-viewer-util-winset.c
index 87b7e40..9b7ac96 100644
--- a/clock-viewer/src/clock-viewer-util-winset.c
+++ b/clock-viewer/src/clock-viewer-util-winset.c
@@ -1,7 +1,7 @@
 /*
  *  W Clock Viewer
  *
- * Copyright (c) 2000 - 2015 Samsung Electronics Co., Ltd. All rights reserved.
+ * Copyright (c) 2015 - 2016 Samsung Electronics Co., Ltd. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/clock-viewer/src/clock-viewer-widget.c b/clock-viewer/src/clock-viewer-widget.c
index fc7cb04..ebf729b 100644
--- a/clock-viewer/src/clock-viewer-widget.c
+++ b/clock-viewer/src/clock-viewer-widget.c
@@ -1,7 +1,7 @@
 /*
  *  W Clock Viewer
  *
- * Copyright (c) 2000 - 2015 Samsung Electronics Co., Ltd. All rights reserved.
+ * Copyright (c) 2015 - 2016 Samsung Electronics Co., Ltd. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,9 +19,7 @@
 
 #include <Elementary.h>
 #include <widget_service.h>
-#include <widget_service_internal.h>
 #include <widget_viewer_evas.h>
-#include <widget_viewer_evas_internal.h>
 
 #include "clock-viewer-widget.h"
 #include "clock-viewer-util-winset.h"
@@ -56,6 +54,7 @@ static struct _widget_info
 	.view_pos_timestamp = 0,
 };
 
+/*
 static void __clock_viewer_widget_raw_event_cb(struct widget_evas_raw_event_info *info, void *data)
 {
 	Evas_Object *widget = NULL;
@@ -96,6 +95,7 @@ static void __clock_viewer_widget_raw_event_cb(struct widget_evas_raw_event_info
 		}
 	}
 }
+*/
 
 HAPI void clock_viewer_widget_init(void *data, Evas_Object *parent, char *pkgname)
 {
@@ -128,6 +128,7 @@ HAPI void clock_viewer_widget_init(void *data, Evas_Object *parent, char *pkgnam
 
 	widget_viewer_evas_set_option(WIDGET_VIEWER_EVAS_MANUAL_PAUSE_RESUME, 1);
 
+	/* TODO : replace below lines with API set of watch core
 	ret = widget_viewer_evas_set_raw_event_callback(WIDGET_VIEWER_EVAS_RAW_CREATE, __clock_viewer_widget_raw_event_cb, data);
 	if (ret != 0) {
 		_ERR("Failed to set widget create callback[%d]", ret);
@@ -142,6 +143,7 @@ HAPI void clock_viewer_widget_init(void *data, Evas_Object *parent, char *pkgnam
 	if (ret != 0) {
 		_ERR("Failed to subscribe category[%d]", ret);
 	}
+	*/
 
 	if (pkgname) {
 		s_widget_info.pkgname = strdup(pkgname);
@@ -152,9 +154,9 @@ HAPI void clock_viewer_widget_init(void *data, Evas_Object *parent, char *pkgnam
 
 HAPI void clock_viewer_widget_fini(void *data)
 {
-	int ret = 0;
-
 	if (s_widget_info.is_widget_init) {
+		/* TODO : replace below lines with API set of watch core
+		int ret = 0;
 		ret = widget_viewer_evas_unset_raw_event_callback(WIDGET_VIEWER_EVAS_RAW_CREATE, __clock_viewer_widget_raw_event_cb, data);
 		if (ret != 0) {
 			_ERR("Failed to unset widget create callback[%d]", ret);
@@ -169,6 +171,7 @@ HAPI void clock_viewer_widget_fini(void *data)
 		if (ret != 0) {
 			_ERR("Failed to subscribe category[%d]", ret);
 		}
+		*/
 
 		widget_viewer_evas_fini();
 		s_widget_info.is_widget_init = 0;
diff --git a/clock-viewer/src/clock-viewer-window.c b/clock-viewer/src/clock-viewer-window.c
index 9d7b8bc..2c1a9b3 100644
--- a/clock-viewer/src/clock-viewer-window.c
+++ b/clock-viewer/src/clock-viewer-window.c
@@ -1,7 +1,7 @@
 /*
  *  W Clock Viewer
  *
- * Copyright (c) 2000 - 2015 Samsung Electronics Co., Ltd. All rights reserved.
+ * Copyright (c) 2015 - 2016 Samsung Electronics Co., Ltd. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,8 +17,6 @@
  *
  */
 
-#include <Ecore_X.h>
-
 #include "clock-viewer-window.h"
 
 static Evas_Object *_clock_viewer_window_create_window()
diff --git a/clock-viewer/src/clock-viewer.c b/clock-viewer/src/clock-viewer.c
index 42e427c..02a18f3 100644
--- a/clock-viewer/src/clock-viewer.c
+++ b/clock-viewer/src/clock-viewer.c
@@ -1,7 +1,7 @@
 /*
  *  W Clock Viewer
  *
- * Copyright (c) 2000 - 2015 Samsung Electronics Co., Ltd. All rights reserved.
+ * Copyright (c) 2015 - 2016 Samsung Electronics Co., Ltd. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -371,7 +371,7 @@ static void _clock_viewer_set_current_clock(clock_viewer_s *clock_viewer)
 
 	// unload clock
 	clock_viewer_default_clock_fini(clock_viewer);
-	clock_viewer_minicontrol_fini(clock_viewer);
+	// clock_viewer_minicontrol_fini(clock_viewer);
 	clock_viewer_widget_fini(clock_viewer);
 
 	// load clock
@@ -380,7 +380,7 @@ static void _clock_viewer_set_current_clock(clock_viewer_s *clock_viewer)
 			clock_viewer_widget_init(clock_viewer, clock_viewer->window, pkgname);
 			clock_viewer->current_type = CLOCK_VIEWER_TYPE_WIDGET;
 		} else {
-			clock_viewer_minicontrol_init(clock_viewer, clock_viewer->window);
+			// clock_viewer_minicontrol_init(clock_viewer, clock_viewer->window);
 			clock_viewer->current_type = CLOCK_VIEWER_TYPE_MINICTRL;
 		}
 	} else {
diff --git a/default-clock/CMakeLists.txt b/default-clock/CMakeLists.txt
index 124ce5b..582c9b3 100644
--- a/default-clock/CMakeLists.txt
+++ b/default-clock/CMakeLists.txt
@@ -15,7 +15,6 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
 INCLUDE(FindPkgConfig)
 pkg_check_modules(pkgs REQUIRED
 	elementary
-	ecore-x
 	evas
 	dlog
 	vconf
diff --git a/default-clock/include/alpm.h b/default-clock/include/alpm.h
index af67a5d..180e2f6 100644
--- a/default-clock/include/alpm.h
+++ b/default-clock/include/alpm.h
@@ -1,7 +1,7 @@
 /*
  *  W Clock Viewer
  *
- * Copyright (c) 2000 - 2015 Samsung Electronics Co., Ltd. All rights reserved.
+ * Copyright (c) 2015 - 2016 Samsung Electronics Co., Ltd. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/default-clock/include/clock-viewer-plugin.h b/default-clock/include/clock-viewer-plugin.h
index 2ed4698..9ea6612 100644
--- a/default-clock/include/clock-viewer-plugin.h
+++ b/default-clock/include/clock-viewer-plugin.h
@@ -1,7 +1,7 @@
 /*
  *  W Clock Viewer
  *
- * Copyright (c) 2000 - 2015 Samsung Electronics Co., Ltd. All rights reserved.
+ * Copyright (c) 2015 - 2016 Samsung Electronics Co., Ltd. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/default-clock/src/analog.c b/default-clock/src/analog.c
index ecd76d7..07d7d91 100644
--- a/default-clock/src/analog.c
+++ b/default-clock/src/analog.c
@@ -1,7 +1,7 @@
 /*
  *  W Clock Viewer
  *
- * Copyright (c) 2000 - 2015 Samsung Electronics Co., Ltd. All rights reserved.
+ * Copyright (c) 2015 - 2016 Samsung Electronics Co., Ltd. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/default-clock/src/digital.c b/default-clock/src/digital.c
index 032f543..92ed834 100644
--- a/default-clock/src/digital.c
+++ b/default-clock/src/digital.c
@@ -1,7 +1,7 @@
 /*
  *  W Clock Viewer
  *
- * Copyright (c) 2000 - 2015 Samsung Electronics Co., Ltd. All rights reserved.
+ * Copyright (c) 2015 - 2016 Samsung Electronics Co., Ltd. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/packaging/org.tizen.w-clock-viewer.spec b/packaging/org.tizen.w-clock-viewer.spec
index d20bb7d..69dae48 100644
--- a/packaging/org.tizen.w-clock-viewer.spec
+++ b/packaging/org.tizen.w-clock-viewer.spec
@@ -1,23 +1,22 @@
 Name:	org.tizen.w-clock-viewer
 Summary:	Clock viewer for the wearable devices
-Version:	0.0.1
+Version:	0.1.1
 Release:	1
 Group:	Applications/System
-License:	Apache-2.0
+License:	Flora-1.1
 Source0:	%{name}-%{version}.tar.gz
 
 BuildRequires: pkgconfig(capi-appfw-application)
 BuildRequires: pkgconfig(capi-system-device)
+BuildRequires: pkgconfig(capi-base-utils-i18n)
 BuildRequires: pkgconfig(elementary)
-BuildRequires: pkgconfig(minicontrol-monitor)
-BuildRequires: pkgconfig(minicontrol-viewer)
-BuildRequires: pkgconfig(minicontrol-handler)
 BuildRequires: pkgconfig(widget_viewer_evas)
 BuildRequires: pkgconfig(widget_service)
 BuildRequires: pkgconfig(alarm-service)
 BuildRequires: pkgconfig(pkgmgr-info)
 BuildRequires: pkgconfig(vconf)
 BuildRequires: pkgconfig(dlog)
+BuildRequires: pkgconfig(edbus)
 BuildRequires: edje-bin
 
 BuildRequires: cmake
@@ -78,8 +77,7 @@ vconftool set -t int "memory/clock_viewer/clockdraw" 0 -i -g $INHOUSE_ID -f -s $
 %defattr(-,root,root,-)
 /usr/share/license/%{name}
 /usr/share/packages/%{name}.xml
-/etc/smack/accesses.d/%{name}.rule
 %{PREFIX}/*.xml
 %{PREFIX}/bin/*
 %{PREFIX}/res/*
-%{PREFIX}/shared/*
+#%{PREFIX}/shared/*