Add small image feature

Change-Id: I3d53a45a15ea22bf976c7feeec18d5c4a36bbc01
Signed-off-by: Jusung Son <jusung07.son@samsung.com>

diff --git a/packaging/libwatchface-complication.spec b/packaging/libwatchface-complication.spec
index e2abe4c..1b5ed53 100644 (file)
--- a/packaging/libwatchface-complication.spec
+++ b/packaging/libwatchface-complication.spec
@@ -125,7 +125,9 @@ install -m 0644 watchface-complication.zip %{buildroot}%{_datadir}/gcov/
 
 %files -n %{name}-devel
 %{_includedir}/watchface-complication/*.h
+%{_includedir}/watchface-complication/*.hh
 %{_includedir}/watchface-common/*.h
+%{_includedir}/watchface-common/*.hh
 %{_libdir}/pkgconfig/watchface-complication.pc
 %attr(0644,root,root) %{_libdir}/%{name}.so
 
@@ -233,6 +235,7 @@ Header & package configuration files to support development of the watchface lib
 
 %files -n libwatchface-common-devel
 %{_includedir}/watchface-common/*.h
+%{_includedir}/watchface-common/*.hh
 %{_libdir}/pkgconfig/watchface-common.pc
 %attr(0644,root,root) %{_libdir}/libwatchface-common.so
 

diff --git a/parser/complication_parser_plugin.cc b/parser/complication_parser_plugin.cc
index e109977..f36b667 100644 (file)
--- a/parser/complication_parser_plugin.cc
+++ b/parser/complication_parser_plugin.cc
@@ -33,10 +33,11 @@
 #include <memory>
 #include <list>
 
-#include "watchface-complication/complication-internal.h"
+#include "watchface-complication/complication-internal.hh"
 #include "watchface-complication/include/watchface-complication.h"
-#include "watchface-common/watchface-util.h"
-#include "watchface-common/watchface-common-internal.h"
+#include "watchface-common/watchface-util.hh"
+#include "watchface-common/watchface-common-internal.hh"
+#include "watchface-common/include/watchface-common-internal.h"
 
 #include "parser/complication_parser_plugin_internal.h"
 
@@ -52,6 +53,7 @@
 #define DEFAULT_MAX "default-max"
 #define DEFAULT_MIN "default-min"
 #define DEFAULT_IMAGE "default-image"
+#define DEFAULT_SMALL_IMAGE "default-small-image"
 #define DEFAULT_EXTRA_DATA "default-extra-data"
 
 using namespace std;
@@ -79,7 +81,8 @@ static struct support_type_tag_map __type_map[] = {
   {"ranged-value-type", WATCHFACE_COMPLICATION_TYPE_RANGED_VALUE},
   {"time-type", WATCHFACE_COMPLICATION_TYPE_TIME},
   {"icon-type", WATCHFACE_COMPLICATION_TYPE_ICON},
-  {"image-type", WATCHFACE_COMPLICATION_TYPE_IMAGE}
+  {"image-type", WATCHFACE_COMPLICATION_TYPE_IMAGE},
+  {"small-image-type", (watchface_complication_type_e)WATCHFACE_COMPLICATION_TYPE_SMALL_IMAGE},
 };
 
 struct xml_to_bundle_key_map {
@@ -100,7 +103,9 @@ static struct xml_to_bundle_key_map __budle_key_map[] = {
   {DEFAULT_MAX, RANGE_MAX_KEY},
   {DEFAULT_MIN, RANGE_MIN_KEY},
   {DEFAULT_IMAGE, IMAGE_KEY},
-  {DEFAULT_EXTRA_DATA, EXTRA_DATA_KEY}
+  {DEFAULT_EXTRA_DATA, EXTRA_DATA_KEY},
+  {DEFAULT_EXTRA_DATA, EXTRA_DATA_KEY},
+  {DEFAULT_SMALL_IMAGE, SMALL_IMAGE_KEY}
 };
 
 static uid_t __target_uid;
@@ -208,6 +213,7 @@ static bool _is_valid_element(int type, char* element_name) {
     if (strcmp(element_name, DEFAULT_TITLE) != 0 &&
       strcmp(element_name, DEFAULT_LONG_TEXT) != 0 &&
       strcmp(element_name, DEFAULT_ICON) != 0 &&
+      strcmp(element_name, DEFAULT_SMALL_IMAGE) != 0 &&
       strcmp(element_name, DEFAULT_EXTRA_DATA) != 0) {
       LOGE("type (%d) do not support (%s)", type, element_name);
       is_valid = false;
@@ -239,6 +245,13 @@ static bool _is_valid_element(int type, char* element_name) {
       is_valid = false;
     }
     break;
+  case WATCHFACE_COMPLICATION_TYPE_SMALL_IMAGE :
+    if (strcmp(element_name, DEFAULT_SMALL_IMAGE) != 0 &&
+      strcmp(element_name, DEFAULT_EXTRA_DATA) != 0) {
+      LOGE("type (%d) do not support (%s) %s", type, element_name, DEFAULT_SMALL_IMAGE);
+      is_valid = false;
+    }
+    break;
   case WATCHFACE_COMPLICATION_TYPE_TIME :
     if (strcmp(element_name, DEFAULT_SHORT_TEXT) != 0 &&
       strcmp(element_name, DEFAULT_TIMEZONE_ID) != 0 &&

diff --git a/parser/complication_parser_plugin_internal.cc b/parser/complication_parser_plugin_internal.cc
index ce67ee9..09b378e 100644 (file)
--- a/parser/complication_parser_plugin_internal.cc
+++ b/parser/complication_parser_plugin_internal.cc
@@ -23,7 +23,7 @@
 #include <dlog.h>
 #include <tzplatform_config.h>
 
-#include "watchface-common/watchface-util.h"
+#include "watchface-common/watchface-util.hh"
 #include "parser/complication_parser_plugin_internal.h"
 
 #define BUSY_WAITING_USEC 50000 /* 0.05 sec */

diff --git a/unittest/data/test.sql b/unittest/data/test.sql
index 2ec263f..39ca2db 100644 (file)
--- a/unittest/data/test.sql
+++ b/unittest/data/test.sql
@@ -87,6 +87,13 @@ INSERT INTO provider_support_types (
   'test'
 );
 
+INSERT INTO provider_support_types (
+  provider_id, support_type, default_data) VALUES (
+  'org.tizen.gmock_comp_provider/test',
+  128,
+  'test'
+);
+
 INSERT INTO complication_provider (
   pkgid, appid, provider_id, trusted, period) VALUES (
   'org.tizen.gmock_comp_provider2',

diff --git a/unittest/src/test-complication-provider.cc b/unittest/src/test-complication-provider.cc
index df14a0b..27299cd 100644 (file)
--- a/unittest/src/test-complication-provider.cc
+++ b/unittest/src/test-complication-provider.cc
@@ -22,7 +22,7 @@
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 
-#include "watchface-complication-provider/complication-provider.h"
+#include "watchface-complication-provider/complication-provider.hh"
 #include "watchface-complication-provider/include/watchface-complication-provider.h"
 #include "mock/tzplatform_config_mock.h"
 #include "mock/app_common.h"

diff --git a/unittest/src/test-complication.cc b/unittest/src/test-complication.cc
index 7544ca6..ce1b861 100644 (file)
--- a/unittest/src/test-complication.cc
+++ b/unittest/src/test-complication.cc
@@ -28,7 +28,7 @@
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 
-#include "watchface-complication/complication.h"
+#include "watchface-complication/complication.hh"
 #include "mock/tzplatform_config_mock.h"
 #include "mock/app_common.h"
 #include "mock/mock_util.h"

diff --git a/unittest/src/test-db-manager.cc b/unittest/src/test-db-manager.cc
index 404f6f0..35bdb14 100644 (file)
--- a/unittest/src/test-db-manager.cc
+++ b/unittest/src/test-db-manager.cc
@@ -27,7 +27,7 @@
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 
-#include "watchface-complication/db-manager.h"
+#include "watchface-complication/db-manager.hh"
 
 using namespace std;
 using namespace watchface_complication;

diff --git a/unittest/src/test-design-element.cc b/unittest/src/test-design-element.cc
index efd4127..064a5be 100644 (file)
--- a/unittest/src/test-design-element.cc
+++ b/unittest/src/test-design-element.cc
@@ -27,7 +27,7 @@
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 
-#include "watchface-complication/design-element.h"
+#include "watchface-complication/design-element.hh"
 
 using namespace std;
 using namespace tizen_base;

diff --git a/unittest/src/test-editables-container.cc b/unittest/src/test-editables-container.cc
index c80189a..620b7da 100644 (file)
--- a/unittest/src/test-editables-container.cc
+++ b/unittest/src/test-editables-container.cc
@@ -29,9 +29,9 @@
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 
-#include "watchface-complication/design-element.h"
-#include "watchface-complication/editables-container.h"
-#include "watchface-complication/received-editable.h"
+#include "watchface-complication/design-element.hh"
+#include "watchface-complication/editables-container.hh"
+#include "watchface-complication/received-editable.hh"
 #include "watchface-complication/include/watchface-complication.h"
 #include "watchface-complication/include/watchface-editable.h"
 

diff --git a/unittest/src/test-editables-manager.cc b/unittest/src/test-editables-manager.cc
index 660a58e..3c34d0f 100644 (file)
--- a/unittest/src/test-editables-manager.cc
+++ b/unittest/src/test-editables-manager.cc
@@ -27,7 +27,7 @@
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 
-#include "watchface-complication/editables-manager.h"
+#include "watchface-complication/editables-manager.hh"
 
 using namespace std;
 using namespace tizen_base;

diff --git a/unittest/src/test-editor.cc b/unittest/src/test-editor.cc
index d467afc..afa7ffc 100644 (file)
--- a/unittest/src/test-editor.cc
+++ b/unittest/src/test-editor.cc
@@ -23,8 +23,8 @@
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 
-#include "watchface-editor/editables-editor.h"
-#include "watchface-complication/received-editable.h"
+#include "watchface-editor/editables-editor.hh"
+#include "watchface-complication/received-editable.hh"
 #include "watchface-complication/include/watchface-editable.h"
 #include "watchface-editor/include/watchface-editor.h"
 #include "mock/cynara_mock.h"

diff --git a/unittest/src/test-received-editable.cc b/unittest/src/test-received-editable.cc
index 447852f..a1082dc 100644 (file)
--- a/unittest/src/test-received-editable.cc
+++ b/unittest/src/test-received-editable.cc
@@ -29,7 +29,7 @@
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 
-#include "watchface-complication/received-editable.h"
+#include "watchface-complication/received-editable.hh"
 
 using namespace std;
 using namespace tizen_base;

diff --git a/unittest/src/test-watchface-complication-provider.cc b/unittest/src/test-watchface-complication-provider.cc
index 2e79da0..fd77c56 100644 (file)
--- a/unittest/src/test-watchface-complication-provider.cc
+++ b/unittest/src/test-watchface-complication-provider.cc
@@ -20,9 +20,10 @@
 #include <watchface-complication-provider-internal.h>
 #include <app_control_internal.h>
 
-#include "watchface-complication/design-element.h"
-#include "watchface-complication/editables-container.h"
-#include "watchface-complication/received-editable.h"
+#include "watchface-common/include/watchface-common-internal.h"
+#include "watchface-complication/design-element.hh"
+#include "watchface-complication/editables-container.hh"
+#include "watchface-complication/received-editable.hh"
 
 #include "mock/system_info_mock.h"
 #include "mock/tzplatform_config_mock.h"
@@ -275,6 +276,13 @@ TEST_F(CWCP, watchface_complication_provider_data_is_valid)
   ret = watchface_complication_provider_data_is_valid(shared, &is_valid);
   EXPECT_EQ(WATCHFACE_COMPLICATION_ERROR_NONE, ret);
   EXPECT_EQ(is_valid, true);
+
+  watchface_complication_provider_data_set_type(shared,
+    static_cast<watchface_complication_type_e>(WATCHFACE_COMPLICATION_TYPE_SMALL_IMAGE));
+  watchface_complication_provider_data_set_small_image_path(shared, "res/data.png");
+  ret = watchface_complication_provider_data_is_valid(shared, &is_valid);
+  EXPECT_EQ(WATCHFACE_COMPLICATION_ERROR_NONE, ret);
+  EXPECT_EQ(is_valid, true);
 }
 
 TEST_F(CWCP, watchface_complication_provider_event_get_type)

diff --git a/unittest/src/test-watchface-complication.cc b/unittest/src/test-watchface-complication.cc
index c92366b..de4843f 100644 (file)
--- a/unittest/src/test-watchface-complication.cc
+++ b/unittest/src/test-watchface-complication.cc
@@ -21,7 +21,7 @@
 #include <watchface-complication-provider.h>
 #include <watchface-complication-provider-internal.h>
 
-#include "watchface-complication/complication.h"
+#include "watchface-complication/complication.hh"
 #include "mock/system_info_mock.h"
 #include "mock/tzplatform_config_mock.h"
 #include "mock/app_common.h"
@@ -335,6 +335,8 @@ guint __fake_signal_subscribe_on_data_updated(GDBusConnection* connection,
     snprintf(num_str, sizeof(num_str), "%d", LongText);
     b.Add("__DATA_TYPE_KEY__", num_str);
     watchface_complication_provider_data_set_long_text(b.GetHandle(), "longtext");
+    watchface_complication_provider_data_set_small_image_path_with_aod(b.GetHandle(),
+        "data/small.png", "data/aod_small.png");
     parameters = g_variant_new("(siis)", "org.tizen.gmock_comp_provider/test",
                           LongText,
                           777,
@@ -403,6 +405,21 @@ guint __fake_signal_subscribe_on_data_updated(GDBusConnection* connection,
                         "__COMP_UPDATED__",
                         parameters);
 
+    b.Delete("__DATA_TYPE_KEY__");
+    snprintf(num_str, sizeof(num_str), "%d", SmallImage);
+    b.Add("__DATA_TYPE_KEY__", num_str);
+    watchface_complication_provider_data_set_small_image_path_with_aod(
+        b.GetHandle(), "data/small_img.png", "data/aod_small_img.png");
+    parameters = g_variant_new("(siis)", "org.tizen.gmock_comp_provider/test",
+                          SmallImage,
+                          777,
+                          reinterpret_cast<char*>(b.ToRaw().first.get()));
+    rs->OnSignal(nullptr, "org.tizen.gmock_comp_provider",
+                        "test path",
+                        "test interface",
+                        "__COMP_UPDATED__",
+                        parameters);
+
     if (g_main_loop_is_running(loop_))
       g_main_loop_quit(loop_);
     return G_SOURCE_CONTINUE;
@@ -446,10 +463,19 @@ void _complication_updated_cb_get_test(
     free(sc_text);
 
   } else if (type == WATCHFACE_COMPLICATION_TYPE_LONG_TEXT) {
-    char *longtext;
+    char *longtext, *image, *aod_image;
     watchface_complication_data_get_long_text(data, &longtext);
     EXPECT_STREQ(longtext, "longtext");
     free(longtext);
+
+    watchface_complication_data_get_small_image_path(data, &image);
+    EXPECT_STREQ(image, "data/small.png");
+    free(image);
+
+    watchface_complication_data_get_aod_small_image_path(data, &aod_image);
+    EXPECT_STREQ(aod_image, "data/aod_small.png");
+    free(aod_image);
+
   } else if (type == WATCHFACE_COMPLICATION_TYPE_TIME) {
     long time;
     watchface_complication_data_get_timestamp(data, &time);
@@ -500,6 +526,15 @@ void _complication_updated_cb_get_test(
     EXPECT_EQ(cur, 10);
     EXPECT_EQ(min, 0);
     EXPECT_EQ(max, 100);
+  } else if (type ==
+      static_cast<watchface_complication_type_e>(WATCHFACE_COMPLICATION_TYPE_SMALL_IMAGE)) {
+    char* image, *aod_image;
+    watchface_complication_data_get_small_image_path(data, &image);
+    EXPECT_STREQ(image, "data/small_img.png");
+    free(image);
+    watchface_complication_data_get_aod_small_image_path(data, &aod_image);
+    EXPECT_STREQ(aod_image, "data/aod_small_img.png");
+    free(aod_image);
   }
 }
 
@@ -579,6 +614,25 @@ TEST_F(CWC, watchface_complication_data_get_image_path)
   RunLoop();
 }
 
+TEST_F(CWC, watchface_complication_data_get_small_image_path)
+{
+  g_dbus_connection_signal_subscribe_fake.custom_fake = __fake_signal_subscribe_on_data_updated;
+  int comp_id = 777;
+  int ret = watchface_complication_create(comp_id,
+    "org.tizen.gmock_comp_provider/test",
+    (watchface_complication_type_e)WATCHFACE_COMPLICATION_TYPE_SMALL_IMAGE,
+    (watchface_complication_type_e)WATCHFACE_COMPLICATION_TYPE_SMALL_IMAGE,
+    WATCHFACE_COMPLICATION_EVENT_TAP,
+    &complication_);
+  EXPECT_EQ(WATCHFACE_COMPLICATION_ERROR_NONE, ret);
+
+  ret = watchface_complication_add_updated_cb(complication_,
+      _complication_updated_cb_get_test,
+      _complication_error_cb, nullptr);
+  EXPECT_EQ(WATCHFACE_COMPLICATION_ERROR_NONE, ret);
+  RunLoop();
+}
+
 TEST_F(CWC, watchface_complication_data_get_ranged_value)
 {
   g_dbus_connection_signal_subscribe_fake.custom_fake =

diff --git a/unittest/src/test-watchface-editable.cc b/unittest/src/test-watchface-editable.cc
index 6e87dd0..7ccc095 100644 (file)
--- a/unittest/src/test-watchface-editable.cc
+++ b/unittest/src/test-watchface-editable.cc
@@ -19,9 +19,9 @@
 #include <watchface-editable.h>
 #include <watchface-editable-internal.h>
 
-#include "watchface-complication/design-element.h"
-#include "watchface-complication/editables-container.h"
-#include "watchface-complication/received-editable.h"
+#include "watchface-complication/design-element.hh"
+#include "watchface-complication/editables-container.hh"
+#include "watchface-complication/received-editable.hh"
 
 #include "mock/system_info_mock.h"
 #include "mock/tzplatform_config_mock.h"

diff --git a/unittest/src/test-watchface-editor.cc b/unittest/src/test-watchface-editor.cc
index d28adf1..3c062c3 100644 (file)
--- a/unittest/src/test-watchface-editor.cc
+++ b/unittest/src/test-watchface-editor.cc
@@ -19,9 +19,9 @@
 #include <watchface-editor.h>
 #include <vector>
 
-#include "watchface-complication/design-element.h"
-#include "watchface-complication/editables-container.h"
-#include "watchface-complication/received-editable.h"
+#include "watchface-complication/design-element.hh"
+#include "watchface-complication/editables-container.hh"
+#include "watchface-complication/received-editable.hh"
 
 #include "mock/system_info_mock.h"
 #include "mock/tzplatform_config_mock.h"

diff --git a/watchface-common/CMakeLists.txt b/watchface-common/CMakeLists.txt
index b8f45b6..3b8e4c0 100644 (file)
--- a/watchface-common/CMakeLists.txt
+++ b/watchface-common/CMakeLists.txt
@@ -52,4 +52,5 @@ INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR})
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/watchface-common.h DESTINATION include/watchface-common)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/watchface-common-internal.h DESTINATION include/watchface-common)
\ No newline at end of file
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/watchface-common-internal.hh DESTINATION include/watchface-common)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/watchface-common-internal.h DESTINATION include/watchface-common)
\ No newline at end of file

diff --git a/watchface-common/include/watchface-common-internal.h b/watchface-common/include/watchface-common-internal.h
new file mode 100644 (file)
index 0000000..caf563d
--- /dev/null
+++ b/watchface-common/include/watchface-common-internal.h
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ *
+ * 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.
+ */
+
+#ifndef __TIZEN_APPFW_WATCHFACE_COMMON_INTERNAL_H__
+#define __TIZEN_APPFW_WATCHFACE_COMMON_INTERNAL_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define        WATCHFACE_COMPLICATION_TYPE_SMALL_IMAGE  0x80 /**< Small Image */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  /* __TIZEN_APPFW_WATCHFACE_COMMON_INTERNAL_H__ */

diff --git a/watchface-common/shared-handle.h b/watchface-common/shared-handle.hh
similarity index 100%
rename from watchface-common/shared-handle.h
rename to watchface-common/shared-handle.hh

diff --git a/watchface-common/watchface-common-internal.h b/watchface-common/watchface-common-internal.hh
similarity index 96%
rename from watchface-common/watchface-common-internal.h
rename to watchface-common/watchface-common-internal.hh
index 0b56832..ba47a5f 100644 (file)
--- a/watchface-common/watchface-common-internal.h
+++ b/watchface-common/watchface-common-internal.hh
@@ -42,7 +42,9 @@
 #define RANGE_MAX_KEY "__MAX_KEY__"
 #define RANGE_MIN_KEY "__MIN_KEY__"
 #define IMAGE_KEY "__IMAGE_KEY__"
+#define SMALL_IMAGE_KEY "__SMALL_IMAGE_KEY__"
 #define AOD_IMAGE_KEY "__AOD_IMAGE_KEY__"
+#define AOD_SMALL_IMAGE_KEY "__AOD_SMALL_IMAGE_KEY__"
 #define DATA_TYPE_KEY "__DATA_TYPE_KEY__"
 #define EXTRA_DATA_KEY "__EXTRA_DATA_KEY__"
 #define SCREEN_READER_TEXT_KEY "__SCREEN_READER_TEXT_KEY__"

diff --git a/watchface-common/watchface-exception.h b/watchface-common/watchface-exception.hh
similarity index 100%
rename from watchface-common/watchface-exception.h
rename to watchface-common/watchface-exception.hh

diff --git a/watchface-common/watchface-util.cc b/watchface-common/watchface-util.cc
index d1e3861..e4056d2 100644 (file)
--- a/watchface-common/watchface-util.cc
+++ b/watchface-common/watchface-util.cc
@@ -31,9 +31,10 @@
 #include <map>
 #include <list>
 
-#include "watchface-common/watchface-util.h"
+#include "watchface-common/watchface-util.hh"
 #include "watchface-common/include/watchface-common.h"
-#include "watchface-common/watchface-common-internal.h"
+#include "watchface-common/watchface-common-internal.hh"
+#include "watchface-common/include/watchface-common-internal.h"
 
 #ifdef LOG_TAG
 #undef LOG_TAG
@@ -269,6 +270,8 @@ out:
       return true;
     case WATCHFACE_COMPLICATION_TYPE_IMAGE:
       return true;
+    case WATCHFACE_COMPLICATION_TYPE_SMALL_IMAGE:
+      return true;
     default:
       return false;
     }
@@ -457,6 +460,11 @@ out:
           is_valid = false;
         break;
       }
+      case WATCHFACE_COMPLICATION_TYPE_SMALL_IMAGE : {
+        if (shared_data.GetString(SMALL_IMAGE_KEY).empty())
+          is_valid = false;
+        break;
+      }
       case WATCHFACE_COMPLICATION_TYPE_NO_DATA :
         is_valid = true;
         break;
@@ -481,7 +489,8 @@ out:
   }
 
   int ConvertPathToAppPath(const char* appid, bundle* data) {
-    list<string> key_list {ICON_KEY, IMAGE_KEY, AOD_ICON_KEY, AOD_IMAGE_KEY};
+    list<string> key_list {ICON_KEY, IMAGE_KEY, AOD_ICON_KEY,
+           AOD_IMAGE_KEY, SMALL_IMAGE_KEY, AOD_SMALL_IMAGE_KEY};
     for (auto& i : key_list) {
       char* path;
       int ret = bundle_get_str(data, i.c_str(), &path);

diff --git a/watchface-common/watchface-util.h b/watchface-common/watchface-util.hh
similarity index 98%
rename from watchface-common/watchface-util.h
rename to watchface-common/watchface-util.hh
index a45c729..b670733 100644 (file)
--- a/watchface-common/watchface-util.h
+++ b/watchface-common/watchface-util.hh
@@ -25,7 +25,7 @@
 
 #include <string>
 #include "watchface-common/include/watchface-common.h"
-#include "watchface-common/watchface-common-internal.h"
+#include "watchface-common/watchface-common-internal.hh"
 
 #define PRIVILEGE_DATASHARING "http://tizen.org/privilege/datasharing"
 

diff --git a/watchface-complication-provider/complication-provider-event-interface.h b/watchface-complication-provider/complication-provider-event-interface.hh
similarity index 95%
rename from watchface-complication-provider/complication-provider-event-interface.h
rename to watchface-complication-provider/complication-provider-event-interface.hh
index 62479af..38bac5e 100644 (file)
--- a/watchface-complication-provider/complication-provider-event-interface.h
+++ b/watchface-complication-provider/complication-provider-event-interface.hh
@@ -21,7 +21,7 @@
 
 #include <string>
 
-#include "watchface-complication/complication-internal.h"
+#include "watchface-complication/complication-internal.hh"
 
 namespace watchface_complication {
 

diff --git a/watchface-complication-provider/complication-provider-implementation.h b/watchface-complication-provider/complication-provider-implementation.hh
similarity index 93%
rename from watchface-complication-provider/complication-provider-implementation.h
rename to watchface-complication-provider/complication-provider-implementation.hh
index 86c6137..1d1e8a0 100644 (file)
--- a/watchface-complication-provider/complication-provider-implementation.h
+++ b/watchface-complication-provider/complication-provider-implementation.hh
@@ -24,10 +24,10 @@
 #include <list>
 #include <map>
 
-#include "watchface-complication/complication.h"
-#include "watchface-complication/complication-connector.h"
-#include "watchface-complication/gdbus-interface.h"
-#include "watchface-common/watchface-util.h"
+#include "watchface-complication/complication.hh"
+#include "watchface-complication/complication-connector.hh"
+#include "watchface-complication/gdbus-interface.hh"
+#include "watchface-common/watchface-util.hh"
 
 namespace watchface_complication {
 

diff --git a/watchface-complication-provider/complication-provider.cc b/watchface-complication-provider/complication-provider.cc
index e177185..037f825 100644 (file)
--- a/watchface-complication-provider/complication-provider.cc
+++ b/watchface-complication-provider/complication-provider.cc
@@ -19,10 +19,10 @@
 
 #include <list>
 
-#include "watchface-common/watchface-util.h"
-#include "watchface-common/watchface-common-internal.h"
-#include "watchface-complication-provider/complication-provider.h"
-#include "watchface-complication-provider/complication-provider-implementation.h"
+#include "watchface-common/watchface-util.hh"
+#include "watchface-common/watchface-common-internal.hh"
+#include "watchface-complication-provider/complication-provider.hh"
+#include "watchface-complication-provider/complication-provider-implementation.hh"
 #include "watchface-complication-provider/include/watchface-complication-provider.h"
 
 #ifdef LOG_TAG

diff --git a/watchface-complication-provider/complication-provider.h b/watchface-complication-provider/complication-provider.hh
similarity index 93%
rename from watchface-complication-provider/complication-provider.h
rename to watchface-complication-provider/complication-provider.hh
index 24f67d0..479994e 100644 (file)
--- a/watchface-complication-provider/complication-provider.h
+++ b/watchface-complication-provider/complication-provider.hh
@@ -21,8 +21,8 @@
 #include <string>
 #include <memory>
 
-#include "watchface-complication/complication-event-interface.h"
-#include "watchface-complication/complication-connector.h"
+#include "watchface-complication/complication-event-interface.hh"
+#include "watchface-complication/complication-connector.hh"
 
 namespace watchface_complication {
 

diff --git a/watchface-complication-provider/include/watchface-complication-provider-internal.h b/watchface-complication-provider/include/watchface-complication-provider-internal.h
index 8f66aa2..4add505 100644 (file)
--- a/watchface-complication-provider/include/watchface-complication-provider-internal.h
+++ b/watchface-complication-provider/include/watchface-complication-provider-internal.h
@@ -53,7 +53,10 @@ int watchface_complication_provider_data_set_icon_path_with_aod(
        bundle *shared_data, const char *icon_path, const char *aod_icon_path);
 int watchface_complication_provider_data_set_image_path_with_aod(
        bundle *shared_data, const char *image_path, const char *aod_image_path);
-
+int watchface_complication_provider_data_set_small_image_path(
+    bundle* shared_data, const char* small_image_path);
+int watchface_complication_provider_data_set_small_image_path_with_aod(
+    bundle* shared_data, const char* image_path, const char* small_image_path);
 
 typedef enum _watchface_complication_consumer_status {
        WATCHFACE_COMPLICATION_CONSUMER_LISTENING_START = 0x1,

diff --git a/watchface-complication-provider/watchface-complication-provider.cc b/watchface-complication-provider/watchface-complication-provider.cc
index 636c4f4..f554bdd 100644 (file)
--- a/watchface-complication-provider/watchface-complication-provider.cc
+++ b/watchface-complication-provider/watchface-complication-provider.cc
@@ -29,13 +29,14 @@
 #include <map>
 #include <list>
 
-#include "watchface-common/watchface-util.h"
-#include "watchface-common/watchface-common-internal.h"
-#include "watchface-complication-provider/complication-provider.h"
+#include "watchface-common/watchface-util.hh"
+#include "watchface-common/watchface-common-internal.hh"
+#include "watchface-common/include/watchface-common-internal.h"
+#include "watchface-complication-provider/complication-provider.hh"
 #include "watchface-complication-provider/include/watchface-complication-provider.h"
 #include "watchface-complication-provider/include/watchface-complication-provider-internal.h"
-#include "watchface-complication/db-manager.h"
-#include "watchface-complication/complication-internal.h"
+#include "watchface-complication/db-manager.hh"
+#include "watchface-complication/complication-internal.hh"
 
 #ifdef LOG_TAG
 #undef LOG_TAG
@@ -488,6 +489,37 @@ extern "C" EXPORT_API int watchface_complication_provider_data_set_image_path_wi
   return _add_bundle_data(shared_data, IMAGE_KEY, image_path);
 }
 
+extern "C" EXPORT_API int watchface_complication_provider_data_set_small_image_path_with_aod(
+    bundle* shared_data, const char* image_path, const char* aod_image_path) {
+  int ret;
+  watchface_complication_type_e type;
+
+  if (!watchface_complication::util::CheckWatchFeatureEnabled())
+    return WATCHFACE_COMPLICATION_ERROR_NOT_SUPPORTED;
+
+  if (shared_data == nullptr || image_path == nullptr) {
+    LOGE("Invalid param");
+    return WATCHFACE_COMPLICATION_ERROR_INVALID_PARAMETER;
+  }
+
+  ret = _get_data_type(shared_data, &type);
+  if (ret != WATCHFACE_COMPLICATION_ERROR_NONE)
+      return ret;
+  if (type != WATCHFACE_COMPLICATION_TYPE_SMALL_IMAGE &&
+      type != WATCHFACE_COMPLICATION_TYPE_LONG_TEXT) {
+    LOGE("Invalid type, not allowed for this type !!");
+    return WATCHFACE_COMPLICATION_ERROR_INVALID_PARAMETER;
+  }
+
+  if (aod_image_path != nullptr) {
+    ret = _add_bundle_data(shared_data, AOD_SMALL_IMAGE_KEY, aod_image_path);
+    if (ret != WATCHFACE_COMPLICATION_ERROR_NONE)
+      return ret;
+  }
+
+  return _add_bundle_data(shared_data, SMALL_IMAGE_KEY, image_path);
+}
+
 extern "C" EXPORT_API int watchface_complication_provider_data_set_title(
     bundle* shared_data, const char* title) {
   int ret;
@@ -790,6 +822,31 @@ extern "C" EXPORT_API int watchface_complication_provider_data_set_image_path(
   return _add_bundle_data(shared_data, IMAGE_KEY, image_path);
 }
 
+extern "C" EXPORT_API int watchface_complication_provider_data_set_small_image_path(
+    bundle* shared_data, const char* image_path) {
+  int ret;
+  watchface_complication_type_e type;
+
+  if (!watchface_complication::util::CheckWatchFeatureEnabled())
+    return WATCHFACE_COMPLICATION_ERROR_NOT_SUPPORTED;
+
+  if (shared_data == nullptr || image_path == nullptr) {
+    LOGE("Invalid param");
+    return WATCHFACE_COMPLICATION_ERROR_INVALID_PARAMETER;
+  }
+
+  ret = _get_data_type(shared_data, &type);
+  if (ret != WATCHFACE_COMPLICATION_ERROR_NONE)
+      return ret;
+  if (type != WATCHFACE_COMPLICATION_TYPE_SMALL_IMAGE &&
+      type != WATCHFACE_COMPLICATION_TYPE_LONG_TEXT) {
+    LOGE("Invalid type, not allowed for this type !!");
+    return WATCHFACE_COMPLICATION_ERROR_INVALID_PARAMETER;
+  }
+
+  return _add_bundle_data(shared_data, SMALL_IMAGE_KEY, image_path);
+}
+
 extern "C" EXPORT_API int watchface_complication_provider_data_set_ranged_value(
     bundle* shared_data, double current_value, double min_value,
     double max_value) {

diff --git a/watchface-complication/CMakeLists.txt b/watchface-complication/CMakeLists.txt
index ca0a2f2..54cf930 100644 (file)
--- a/watchface-complication/CMakeLists.txt
+++ b/watchface-complication/CMakeLists.txt
@@ -57,4 +57,4 @@ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/watchface-editable-internal.h
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/watchface-editable.h DESTINATION include/${PROJECT_NAME})
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/watchface-complication.h DESTINATION include/${PROJECT_NAME})
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/watchface-complication-internal.h DESTINATION include/${PROJECT_NAME})
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/complication-internal.h DESTINATION include/${PROJECT_NAME})
\ No newline at end of file
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/complication-internal.hh DESTINATION include/${PROJECT_NAME})
\ No newline at end of file

diff --git a/watchface-complication/complication-connector-implementation.h b/watchface-complication/complication-connector-implementation.h
index 29e1bd0..7e7acaf 100644 (file)
--- a/watchface-complication/complication-connector-implementation.h
+++ b/watchface-complication/complication-connector-implementation.h
@@ -24,8 +24,8 @@
 #include <string>
 #include <list>
 
-#include "watchface-complication/complication.h"
-#include "watchface-complication/complication-connector.h"
+#include "watchface-complication/complication.hh"
+#include "watchface-complication/complication-connector.hh"
 
 #ifdef LOG_TAG
 #undef LOG_TAG

diff --git a/watchface-complication/complication-connector.cc b/watchface-complication/complication-connector.cc
index 24822d4..cfcdfd9 100644 (file)
--- a/watchface-complication/complication-connector.cc
+++ b/watchface-complication/complication-connector.cc
@@ -23,11 +23,11 @@
 
 #include <list>
 
-#include "watchface-complication/complication-connector.h"
+#include "watchface-complication/complication-connector.hh"
 #include "watchface-complication/complication-connector-implementation.h"
-#include "watchface-common/watchface-exception.h"
-#include "watchface-complication/package-manager.h"
-#include "watchface-complication/gdbus.h"
+#include "watchface-common/watchface-exception.hh"
+#include "watchface-complication/package-manager.hh"
+#include "watchface-complication/gdbus.hh"
 
 #ifdef LOG_TAG
 #undef LOG_TAG

diff --git a/watchface-complication/complication-connector.h b/watchface-complication/complication-connector.hh
similarity index 86%
rename from watchface-complication/complication-connector.h
rename to watchface-complication/complication-connector.hh
index f3f2f63..f87319f 100644 (file)
--- a/watchface-complication/complication-connector.h
+++ b/watchface-complication/complication-connector.hh
@@ -21,10 +21,10 @@
 #include <string>
 #include <memory>
 
-#include "watchface-complication/complication-internal.h"
-#include "watchface-common/watchface-exception.h"
-#include "watchface-complication/gdbus-interface.h"
-#include "watchface-complication/package-manager-interface.h"
+#include "watchface-complication/complication-internal.hh"
+#include "watchface-common/watchface-exception.hh"
+#include "watchface-complication/gdbus-interface.hh"
+#include "watchface-complication/package-manager-interface.hh"
 
 namespace watchface_complication {
 

diff --git a/watchface-complication/complication-event-interface.h b/watchface-complication/complication-event-interface.hh
similarity index 96%
rename from watchface-complication/complication-event-interface.h
rename to watchface-complication/complication-event-interface.hh
index 6ce27b3..0e7bd13 100644 (file)
--- a/watchface-complication/complication-event-interface.h
+++ b/watchface-complication/complication-event-interface.hh
@@ -21,7 +21,7 @@
 
 #include <string>
 
-#include "watchface-complication/complication-internal.h"
+#include "watchface-complication/complication-internal.hh"
 #include "watchface-complication-provider/include/watchface-complication-provider-internal.h"
 
 namespace watchface_complication {

diff --git a/watchface-complication/complication-implementation.h b/watchface-complication/complication-implementation.hh
similarity index 96%
rename from watchface-complication/complication-implementation.h
rename to watchface-complication/complication-implementation.hh
index f9f05e9..a41e880 100644 (file)
--- a/watchface-complication/complication-implementation.h
+++ b/watchface-complication/complication-implementation.hh
@@ -26,9 +26,9 @@
 #include <map>
 #include <list>
 
-#include "watchface-complication/complication.h"
-#include "watchface-complication/complication-connector.h"
-#include "watchface-complication/gdbus-interface.h"
+#include "watchface-complication/complication.hh"
+#include "watchface-complication/complication-connector.hh"
+#include "watchface-complication/gdbus-interface.hh"
 
 #ifdef LOG_TAG
 #undef LOG_TAG

diff --git a/watchface-complication/complication-internal.h b/watchface-complication/complication-internal.hh
similarity index 89%
rename from watchface-complication/complication-internal.h
rename to watchface-complication/complication-internal.hh
index 1f07b02..2688847 100644 (file)
--- a/watchface-complication/complication-internal.h
+++ b/watchface-complication/complication-internal.hh
@@ -18,6 +18,7 @@
 #define __TIZEN_APPFW_COMPLICATION_INTERNAL_H__
 
 #include <watchface-common.h>
+#include "watchface-common/include/watchface-common-internal.h"
 
 namespace watchface_complication {
 
@@ -28,7 +29,8 @@ typedef enum {
   RangedValue = WATCHFACE_COMPLICATION_TYPE_RANGED_VALUE,
   Time = WATCHFACE_COMPLICATION_TYPE_TIME,
   Icon = WATCHFACE_COMPLICATION_TYPE_ICON,
-  Image = WATCHFACE_COMPLICATION_TYPE_IMAGE
+  Image = WATCHFACE_COMPLICATION_TYPE_IMAGE,
+  SmallImage = WATCHFACE_COMPLICATION_TYPE_SMALL_IMAGE
 } ComplicationType;
 
 typedef enum {

diff --git a/watchface-complication/complication.cc b/watchface-complication/complication.cc
index d7975f7..e385fc3 100644 (file)
--- a/watchface-complication/complication.cc
+++ b/watchface-complication/complication.cc
@@ -22,11 +22,11 @@
 #include <pkgmgr-info.h>
 #include <stdexcept>
 
-#include "watchface-complication/complication.h"
-#include "watchface-complication/complication-implementation.h"
-#include "watchface-common/watchface-util.h"
-#include "watchface-common/watchface-common-internal.h"
-#include "watchface-complication/complication-internal.h"
+#include "watchface-complication/complication.hh"
+#include "watchface-complication/complication-implementation.hh"
+#include "watchface-common/watchface-util.hh"
+#include "watchface-common/watchface-common-internal.hh"
+#include "watchface-complication/complication-internal.hh"
 #include "watchface-complication/include/watchface-complication-internal.h"
 
 #include <iostream>

diff --git a/watchface-complication/complication.h b/watchface-complication/complication.hh
similarity index 93%
rename from watchface-complication/complication.h
rename to watchface-complication/complication.hh
index d154c81..8bdfa47 100644 (file)
--- a/watchface-complication/complication.h
+++ b/watchface-complication/complication.hh
@@ -24,13 +24,13 @@
 #include <string>
 #include <list>
 
-#include "watchface-complication-provider/complication-provider-event-interface.h"
-#include "watchface-complication/editable-interface.h"
-#include "watchface-complication/gdbus-interface.h"
-#include "watchface-complication/complication-connector.h"
-#include "watchface-complication/editables-manager.h"
-#include "watchface-complication/db-manager.h"
-#include "watchface-common/watchface-exception.h"
+#include "watchface-complication-provider/complication-provider-event-interface.hh"
+#include "watchface-complication/editable-interface.hh"
+#include "watchface-complication/gdbus-interface.hh"
+#include "watchface-complication/complication-connector.hh"
+#include "watchface-complication/editables-manager.hh"
+#include "watchface-complication/db-manager.hh"
+#include "watchface-common/watchface-exception.hh"
 #include "watchface-complication-provider/include/watchface-complication-provider-internal.h"
 
 namespace watchface_complication {

diff --git a/watchface-complication/db-manager.cc b/watchface-complication/db-manager.cc
index d4def18..b84a137 100644 (file)
--- a/watchface-complication/db-manager.cc
+++ b/watchface-complication/db-manager.cc
@@ -22,9 +22,9 @@
 #include <pkgmgr_installer_info.h>
 #include <vconf.h>
 
-#include "watchface-complication/complication-internal.h"
-#include "watchface-complication/db-manager.h"
-#include "watchface-common/watchface-util.h"
+#include "watchface-complication/complication-internal.hh"
+#include "watchface-complication/db-manager.hh"
+#include "watchface-common/watchface-util.hh"
 
 #ifdef LOG_TAG
 #undef LOG_TAG

diff --git a/watchface-complication/db-manager.h b/watchface-complication/db-manager.hh
similarity index 100%
rename from watchface-complication/db-manager.h
rename to watchface-complication/db-manager.hh

diff --git a/watchface-complication/design-element-implementation.h b/watchface-complication/design-element-implementation.hh
similarity index 91%
rename from watchface-complication/design-element-implementation.h
rename to watchface-complication/design-element-implementation.hh
index 40b0fd3..df490cf 100644 (file)
--- a/watchface-complication/design-element-implementation.h
+++ b/watchface-complication/design-element-implementation.hh
@@ -24,9 +24,9 @@
 #include <string>
 #include <list>
 
-#include "watchface-complication/design-element.h"
-#include "watchface-complication/complication-connector.h"
-#include "watchface-complication/editables-manager.h"
+#include "watchface-complication/design-element.hh"
+#include "watchface-complication/complication-connector.hh"
+#include "watchface-complication/editables-manager.hh"
 
 namespace watchface_complication {
 

diff --git a/watchface-complication/design-element.cc b/watchface-complication/design-element.cc
index c66d170..73ccb4b 100644 (file)
--- a/watchface-complication/design-element.cc
+++ b/watchface-complication/design-element.cc
@@ -18,9 +18,9 @@
 #include <unistd.h>
 #include <utility>
 
-#include "watchface-complication/design-element.h"
-#include "watchface-complication/design-element-implementation.h"
-#include "watchface-complication/editables-manager.h"
+#include "watchface-complication/design-element.hh"
+#include "watchface-complication/design-element-implementation.hh"
+#include "watchface-complication/editables-manager.hh"
 
 #ifdef LOG_TAG
 #undef LOG_TAG

diff --git a/watchface-complication/design-element.h b/watchface-complication/design-element.hh
similarity index 97%
rename from watchface-complication/design-element.h
rename to watchface-complication/design-element.hh
index ac9f619..2c2c7bb 100644 (file)
--- a/watchface-complication/design-element.h
+++ b/watchface-complication/design-element.hh
@@ -24,7 +24,7 @@
 #include <string>
 #include <list>
 
-#include "watchface-complication/editable-interface.h"
+#include "watchface-complication/editable-interface.hh"
 
 namespace watchface_complication {
 

diff --git a/watchface-complication/editable-interface.h b/watchface-complication/editable-interface.hh
similarity index 100%
rename from watchface-complication/editable-interface.h
rename to watchface-complication/editable-interface.hh

diff --git a/watchface-complication/editables-container-event-interface.h b/watchface-complication/editables-container-event-interface.hh
similarity index 96%
rename from watchface-complication/editables-container-event-interface.h
rename to watchface-complication/editables-container-event-interface.hh
index 779f1f4..e9b7f27 100644 (file)
--- a/watchface-complication/editables-container-event-interface.h
+++ b/watchface-complication/editables-container-event-interface.hh
@@ -22,7 +22,7 @@
 #include <list>
 #include <memory>
 
-#include "watchface-complication/complication.h"
+#include "watchface-complication/complication.hh"
 
 namespace watchface_complication {
 

diff --git a/watchface-complication/editables-container-implementation.h b/watchface-complication/editables-container-implementation.hh
similarity index 92%
rename from watchface-complication/editables-container-implementation.h
rename to watchface-complication/editables-container-implementation.hh
index 7e71326..4d3d555 100644 (file)
--- a/watchface-complication/editables-container-implementation.h
+++ b/watchface-complication/editables-container-implementation.hh
@@ -23,9 +23,9 @@
 #include <string>
 #include <list>
 
-#include "watchface-complication/editables-container.h"
-#include "watchface-complication/complication-connector.h"
-#include "watchface-complication/gdbus-interface.h"
+#include "watchface-complication/editables-container.hh"
+#include "watchface-complication/complication-connector.hh"
+#include "watchface-complication/gdbus-interface.hh"
 
 namespace watchface_complication {
 

diff --git a/watchface-complication/editables-container.cc b/watchface-complication/editables-container.cc
index 6a6cee7..c29bbdd 100644 (file)
--- a/watchface-complication/editables-container.cc
+++ b/watchface-complication/editables-container.cc
@@ -23,11 +23,11 @@
 #include <utility>
 #include <vector>
 
-#include "watchface-complication/editables-container.h"
-#include "watchface-complication/editables-container-implementation.h"
-#include "watchface-complication/complication-internal.h"
-#include "watchface-common/watchface-util.h"
-#include "watchface-complication/gdbus-interface.h"
+#include "watchface-complication/editables-container.hh"
+#include "watchface-complication/editables-container-implementation.hh"
+#include "watchface-complication/complication-internal.hh"
+#include "watchface-common/watchface-util.hh"
+#include "watchface-complication/gdbus-interface.hh"
 
 #ifdef LOG_TAG
 #undef LOG_TAG

diff --git a/watchface-complication/editables-container.h b/watchface-complication/editables-container.hh
similarity index 96%
rename from watchface-complication/editables-container.h
rename to watchface-complication/editables-container.hh
index bb0b1a8..9a38649 100644 (file)
--- a/watchface-complication/editables-container.h
+++ b/watchface-complication/editables-container.hh
@@ -23,7 +23,7 @@
 #include <string>
 #include <list>
 
-#include "watchface-editor/editables-editor-event-interface.h"
+#include "watchface-editor/editables-editor-event-interface.hh"
 
 namespace watchface_complication {
 

diff --git a/watchface-complication/editables-manager-implementation.h b/watchface-complication/editables-manager-implementation.hh
similarity index 94%
rename from watchface-complication/editables-manager-implementation.h
rename to watchface-complication/editables-manager-implementation.hh
index a1663b1..3e3b29c 100644 (file)
--- a/watchface-complication/editables-manager-implementation.h
+++ b/watchface-complication/editables-manager-implementation.hh
@@ -24,8 +24,8 @@
 #include <string>
 #include <list>
 
-#include "watchface-complication/complication.h"
-#include "watchface-complication/complication-connector.h"
+#include "watchface-complication/complication.hh"
+#include "watchface-complication/complication-connector.hh"
 
 namespace watchface_complication {
 

diff --git a/watchface-complication/editables-manager.cc b/watchface-complication/editables-manager.cc
index 33ef6c0..0b5df46 100644 (file)
--- a/watchface-complication/editables-manager.cc
+++ b/watchface-complication/editables-manager.cc
@@ -20,8 +20,8 @@
 #include <aul.h>
 #include <sqlite3.h>
 
-#include "watchface-complication/editables-manager.h"
-#include "watchface-complication/editables-manager-implementation.h"
+#include "watchface-complication/editables-manager.hh"
+#include "watchface-complication/editables-manager-implementation.hh"
 
 #ifdef LOG_TAG
 #undef LOG_TAG

diff --git a/watchface-complication/editables-manager.h b/watchface-complication/editables-manager.hh
similarity index 100%
rename from watchface-complication/editables-manager.h
rename to watchface-complication/editables-manager.hh

diff --git a/watchface-complication/gdbus-interface.h b/watchface-complication/gdbus-interface.hh
similarity index 100%
rename from watchface-complication/gdbus-interface.h
rename to watchface-complication/gdbus-interface.hh

diff --git a/watchface-complication/gdbus.h b/watchface-complication/gdbus.hh
similarity index 98%
rename from watchface-complication/gdbus.h
rename to watchface-complication/gdbus.hh
index 0a8bd35..d47ec47 100644 (file)
--- a/watchface-complication/gdbus.h
+++ b/watchface-complication/gdbus.hh
@@ -24,8 +24,8 @@
 #include <list>
 #include <string>
 
-#include "watchface-common/watchface-util.h"
-#include "watchface-complication/gdbus-interface.h"
+#include "watchface-common/watchface-util.hh"
+#include "watchface-complication/gdbus-interface.hh"
 
 #define COMPLICATION_INTERFACE "org.tizen.watchface_complication"
 

diff --git a/watchface-complication/include/watchface-complication-internal.h b/watchface-complication/include/watchface-complication-internal.h
index 9a73cd3..fac7fef 100644 (file)
--- a/watchface-complication/include/watchface-complication-internal.h
+++ b/watchface-complication/include/watchface-complication-internal.h
@@ -29,6 +29,10 @@ int watchface_complication_data_get_aod_icon_path(const bundle *shared_data,
         char **icon_path);
 int watchface_complication_data_get_aod_image_path(const bundle *shared_data,
         char **image_path);
+int watchface_complication_data_get_aod_small_image_path(const bundle* data,
+        char** image_path);
+int watchface_complication_data_get_small_image_path(const bundle* data,
+        char** image_path);
 
 typedef struct complication_denied_list_ *complication_denied_list_h;
 typedef struct complication_priority_list_ *complication_priority_list_h;

diff --git a/watchface-complication/package-manager-interface.h b/watchface-complication/package-manager-interface.hh
similarity index 100%
rename from watchface-complication/package-manager-interface.h
rename to watchface-complication/package-manager-interface.hh

diff --git a/watchface-complication/package-manager.h b/watchface-complication/package-manager.hh
similarity index 100%
rename from watchface-complication/package-manager.h
rename to watchface-complication/package-manager.hh

diff --git a/watchface-complication/received-editable-implementation.h b/watchface-complication/received-editable-implementation.hh
similarity index 97%
rename from watchface-complication/received-editable-implementation.h
rename to watchface-complication/received-editable-implementation.hh
index de19fb0..7303085 100644 (file)
--- a/watchface-complication/received-editable-implementation.h
+++ b/watchface-complication/received-editable-implementation.hh
@@ -24,7 +24,7 @@
 #include <string>
 #include <list>
 
-#include "watchface-complication/received-editable.h"
+#include "watchface-complication/received-editable.hh"
 
 namespace watchface_complication {
 

diff --git a/watchface-complication/received-editable.cc b/watchface-complication/received-editable.cc
index 252bf80..0ac5971 100644 (file)
--- a/watchface-complication/received-editable.cc
+++ b/watchface-complication/received-editable.cc
@@ -19,9 +19,9 @@
 #include <utility>
 #include <vector>
 
-#include "watchface-complication/received-editable.h"
-#include "watchface-complication/received-editable-implementation.h"
-#include "watchface-common/watchface-exception.h"
+#include "watchface-complication/received-editable.hh"
+#include "watchface-complication/received-editable-implementation.hh"
+#include "watchface-common/watchface-exception.hh"
 
 #ifdef LOG_TAG
 #undef LOG_TAG

diff --git a/watchface-complication/received-editable.h b/watchface-complication/received-editable.hh
similarity index 97%
rename from watchface-complication/received-editable.h
rename to watchface-complication/received-editable.hh
index 7eadb1d..7a60797 100644 (file)
--- a/watchface-complication/received-editable.h
+++ b/watchface-complication/received-editable.hh
@@ -24,7 +24,7 @@
 #include <string>
 #include <list>
 
-#include "watchface-complication/editable-interface.h"
+#include "watchface-complication/editable-interface.hh"
 
 namespace watchface_complication {
 

diff --git a/watchface-complication/watchface-complication.cc b/watchface-complication/watchface-complication.cc
index 83ae20e..077dcd4 100644 (file)
--- a/watchface-complication/watchface-complication.cc
+++ b/watchface-complication/watchface-complication.cc
@@ -28,11 +28,11 @@
 
 #include "watchface-complication/include/watchface-complication.h"
 #include "watchface-complication/include/watchface-complication-internal.h"
-#include "watchface-complication/complication-internal.h"
-#include "watchface-complication/complication.h"
-#include "watchface-common/shared-handle.h"
-#include "watchface-common/watchface-util.h"
-#include "watchface-common/watchface-common-internal.h"
+#include "watchface-complication/complication-internal.hh"
+#include "watchface-complication/complication.hh"
+#include "watchface-common/shared-handle.hh"
+#include "watchface-common/watchface-util.hh"
+#include "watchface-common/watchface-common-internal.hh"
 
 #ifdef LOG_TAG
 #undef LOG_TAG
@@ -263,7 +263,8 @@ extern "C" EXPORT_API int watchface_complication_create(int complication_id,
                       WATCHFACE_COMPLICATION_TYPE_RANGED_VALUE |
                       WATCHFACE_COMPLICATION_TYPE_TIME |
                       WATCHFACE_COMPLICATION_TYPE_ICON |
-                      WATCHFACE_COMPLICATION_TYPE_IMAGE)) {
+                      WATCHFACE_COMPLICATION_TYPE_IMAGE |
+                      WATCHFACE_COMPLICATION_TYPE_SMALL_IMAGE)) {
     LOGE("Invalid param : supported_types(%d)", supported_types);
     return WATCHFACE_COMPLICATION_ERROR_INVALID_PARAMETER;
   }
@@ -362,7 +363,7 @@ extern "C" EXPORT_API int watchface_complication_get_current_type(
   auto ptr = SharedHandle<WatchComplicationStub>::Share(sh);
   int ret = ptr.get()->GetCurType();
   if (WATCHFACE_COMPLICATION_TYPE_NO_DATA <= ret &&
-      WATCHFACE_COMPLICATION_TYPE_IMAGE >= ret) {
+      WATCHFACE_COMPLICATION_TYPE_SMALL_IMAGE >= ret) {
     *cur_type = static_cast<watchface_complication_type_e>(ret);
   } else {
     LOGW("cur type : %d", ret);
@@ -464,6 +465,32 @@ extern "C" EXPORT_API int watchface_complication_data_get_aod_image_path(
   return __get_complication_data(data, AOD_IMAGE_KEY, image_path);
 }
 
+extern "C" EXPORT_API int watchface_complication_data_get_aod_small_image_path(
+    const bundle* data, char** image_path) {
+  if (!watchface_complication::util::CheckWatchFeatureEnabled())
+    return WATCHFACE_COMPLICATION_ERROR_NOT_SUPPORTED;
+
+  if (data == nullptr || image_path == nullptr) {
+    LOGE("Invalid param !!");
+    return WATCHFACE_COMPLICATION_ERROR_INVALID_PARAMETER;
+  }
+
+  return __get_complication_data(data, AOD_SMALL_IMAGE_KEY, image_path);
+}
+
+extern "C" EXPORT_API int watchface_complication_data_get_small_image_path(
+    const bundle* data, char** image_path) {
+  if (!watchface_complication::util::CheckWatchFeatureEnabled())
+    return WATCHFACE_COMPLICATION_ERROR_NOT_SUPPORTED;
+
+  if (data == nullptr || image_path == nullptr) {
+    LOGE("Invalid param !!");
+    return WATCHFACE_COMPLICATION_ERROR_INVALID_PARAMETER;
+  }
+
+  return __get_complication_data(data, SMALL_IMAGE_KEY, image_path);
+}
+
 extern "C" EXPORT_API int watchface_complication_data_get_long_text(
     const bundle* data, char** long_text) {
   if (!watchface_complication::util::CheckWatchFeatureEnabled())

diff --git a/watchface-complication/watchface-editable.cc b/watchface-complication/watchface-editable.cc
index ba80e25..d7ea1a2 100644 (file)
--- a/watchface-complication/watchface-editable.cc
+++ b/watchface-complication/watchface-editable.cc
@@ -22,12 +22,12 @@
 
 #include "watchface-complication/include/watchface-editable.h"
 #include "watchface-complication/include/watchface-editable-internal.h"
-#include "watchface-complication/editables-container.h"
-#include "watchface-complication/design-element.h"
-#include "watchface-common/shared-handle.h"
-#include "watchface-complication/editables-manager.h"
-#include "watchface-common/watchface-util.h"
-#include "watchface-common/watchface-exception.h"
+#include "watchface-complication/editables-container.hh"
+#include "watchface-complication/design-element.hh"
+#include "watchface-common/shared-handle.hh"
+#include "watchface-complication/editables-manager.hh"
+#include "watchface-common/watchface-util.hh"
+#include "watchface-common/watchface-exception.hh"
 
 #ifdef LOG_TAG
 #undef LOG_TAG

diff --git a/watchface-editor/editables-editor-event-interface.h b/watchface-editor/editables-editor-event-interface.hh
similarity index 95%
rename from watchface-editor/editables-editor-event-interface.h
rename to watchface-editor/editables-editor-event-interface.hh
index 1e826d0..b52b103 100644 (file)
--- a/watchface-editor/editables-editor-event-interface.h
+++ b/watchface-editor/editables-editor-event-interface.hh
@@ -20,7 +20,7 @@
 #include <string>
 #include <memory>
 
-#include "watchface-complication/complication.h"
+#include "watchface-complication/complication.hh"
 
 namespace watchface_complication {
 

diff --git a/watchface-editor/editables-editor-implementation.h b/watchface-editor/editables-editor-implementation.hh
similarity index 88%
rename from watchface-editor/editables-editor-implementation.h
rename to watchface-editor/editables-editor-implementation.hh
index 08055be..0390794 100644 (file)
--- a/watchface-editor/editables-editor-implementation.h
+++ b/watchface-editor/editables-editor-implementation.hh
@@ -23,11 +23,11 @@
 #include <string>
 #include <list>
 
-#include "watchface-complication/editables-container.h"
-#include "watchface-complication/complication-connector.h"
-#include "watchface-complication/gdbus-interface.h"
-#include "watchface-common/watchface-util.h"
-#include "watchface-common/shared-handle.h"
+#include "watchface-complication/editables-container.hh"
+#include "watchface-complication/complication-connector.hh"
+#include "watchface-complication/gdbus-interface.hh"
+#include "watchface-common/watchface-util.hh"
+#include "watchface-common/shared-handle.hh"
 
 namespace watchface_complication {
 

diff --git a/watchface-editor/editables-editor.cc b/watchface-editor/editables-editor.cc
index 7ea4e80..2024f3c 100644 (file)
--- a/watchface-editor/editables-editor.cc
+++ b/watchface-editor/editables-editor.cc
@@ -20,13 +20,13 @@
 #include <stdexcept>
 #include <vector>
 
-#include "watchface-editor/editables-editor.h"
-#include "watchface-editor/editables-editor-implementation.h"
-#include "watchface-complication/received-editable.h"
-#include "watchface-common/watchface-util.h"
-#include "watchface-common/shared-handle.h"
+#include "watchface-editor/editables-editor.hh"
+#include "watchface-editor/editables-editor-implementation.hh"
+#include "watchface-complication/received-editable.hh"
+#include "watchface-common/watchface-util.hh"
+#include "watchface-common/shared-handle.hh"
 
-#include "watchface-complication/gdbus-interface.h"
+#include "watchface-complication/gdbus-interface.hh"
 
 #ifdef LOG_TAG
 #undef LOG_TAG

diff --git a/watchface-editor/editables-editor.h b/watchface-editor/editables-editor.hh
similarity index 99%
rename from watchface-editor/editables-editor.h
rename to watchface-editor/editables-editor.hh
index bba638e..d447793 100644 (file)
--- a/watchface-editor/editables-editor.h
+++ b/watchface-editor/editables-editor.hh
@@ -24,7 +24,7 @@
 #include <string>
 #include <list>
 
-#include "watchface-complication/editables-container-event-interface.h"
+#include "watchface-complication/editables-container-event-interface.hh"
 
 namespace watchface_complication {
 

diff --git a/watchface-editor/include/watchface-editor.h b/watchface-editor/include/watchface-editor.h
index b637b4e..c3a3776 100644 (file)
--- a/watchface-editor/include/watchface-editor.h
+++ b/watchface-editor/include/watchface-editor.h
@@ -23,7 +23,7 @@
 
 #include <watchface-complication.h>
 #include <watchface-editable.h>
-#include <watchface-common-internal.h>
+#include <watchface-common-internal.hh>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/watchface-editor/watchface-editor.cc b/watchface-editor/watchface-editor.cc
index ab1a005..b3408ff 100644 (file)
--- a/watchface-editor/watchface-editor.cc
+++ b/watchface-editor/watchface-editor.cc
@@ -25,10 +25,10 @@
 #include <string>
 
 #include "watchface-editor/include/watchface-editor.h"
-#include "watchface-complication/complication.h"
-#include "watchface-editor/editables-editor.h"
-#include "watchface-common/watchface-util.h"
-#include "watchface-common/shared-handle.h"
+#include "watchface-complication/complication.hh"
+#include "watchface-editor/editables-editor.hh"
+#include "watchface-common/watchface-util.hh"
+#include "watchface-common/shared-handle.hh"
 
 #ifdef LOG_TAG
 #undef LOG_TAG