Merge branch 'tizen_6.0' into tizen

Change-Id: I246481d39f90103b73bef4b5156d1f5f345db93a

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 038a1e1..099112b 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,13 +16,13 @@ SET(ISE_SRCS
     src/SttFeedback.cpp
     src/SttManager.cpp
     src/WInputSttMicEffect.cpp
-    src/sdk/ise_lang_table.cpp
-    src/sdk/cji.cpp
-    src/sdk/sdk.cpp
-    src/candidate/candidate-factory.cpp
-    src/candidate/candidate.cpp
-    src/candidate/efl/candidate-efl.cpp
-    src/candidate/efl/candidate-multiline-efl.cpp
+    src/ise_lang_table.cpp
+    src/cji.cpp
+    src/sdk.cpp
+    src/candidate-factory.cpp
+    src/candidate.cpp
+    src/candidate-efl.cpp
+    src/candidate-multiline-efl.cpp
     src/autofill.cpp
     src/ise-dbus.cpp
 
@@ -38,10 +38,10 @@ SET(ISE_SETTING_SRCS
     src/config.cpp
     src/ise-stt-option.cpp
     src/option.cpp
-    src/sdk/sdk_option.cpp
+    src/sdk_option.cpp
     src/eflutil.cpp
     src/languages.cpp
-    src/sdk/ise_lang_table.cpp
+    src/ise_lang_table.cpp
     src/autofill.cpp
 )
 
@@ -59,8 +59,8 @@ MESSAGE(STATUS "Build type: ${CMAKE_BUILD_TYPE}")
 
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/include
     ${CMAKE_SOURCE_DIR}/src
-    ${CMAKE_SOURCE_DIR}/src/candidate/include
-    ${CMAKE_SOURCE_DIR}/src/candidate/efl
+    ${CMAKE_SOURCE_DIR}/src/
+    ${CMAKE_SOURCE_DIR}/src/
 )
 
 INCLUDE(FindPkgConfig)

diff --git a/ise-default.xml b/ise-default.xml
index b02e052..cb90188 100644 (file)
--- a/ise-default.xml
+++ b/ise-default.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns="http://tizen.org/ns/packages" api-version="4.0" package="ise-default" version="1.7.23" install-location="internal-only" support-mode="ultra-power-saving">
+<manifest xmlns="http://tizen.org/ns/packages" api-version="4.0" package="ise-default" version="1.8.9" install-location="internal-only" support-mode="ultra-power-saving">
 <author/>
 <description/>
 <label>Tizen keyboard</label>

diff --git a/packaging/ise-default.spec b/packaging/ise-default.spec
index ce96a01..a54bd66 100644 (file)
--- a/packaging/ise-default.spec
+++ b/packaging/ise-default.spec
@@ -1,6 +1,6 @@
 Name:       ise-default
 Summary:    Tizen keyboard
-Version:    1.7.23
+Version:    1.8.9
 Release:    1
 Group:      Graphics & UI Framework/Input
 License:    Apache-2.0

diff --git a/src/candidate/efl/candidate-efl.cpp b/src/candidate-efl.cpp
similarity index 100%
rename from src/candidate/efl/candidate-efl.cpp
rename to src/candidate-efl.cpp

diff --git a/src/candidate/candidate-factory.cpp b/src/candidate-factory.cpp
similarity index 100%
rename from src/candidate/candidate-factory.cpp
rename to src/candidate-factory.cpp

diff --git a/src/candidate/efl/candidate-multiline-efl.cpp b/src/candidate-multiline-efl.cpp
similarity index 100%
rename from src/candidate/efl/candidate-multiline-efl.cpp
rename to src/candidate-multiline-efl.cpp

diff --git a/src/candidate/candidate.cpp b/src/candidate.cpp
similarity index 100%
rename from src/candidate/candidate.cpp
rename to src/candidate.cpp

diff --git a/src/sdk/cji.cpp b/src/cji.cpp
similarity index 100%
rename from src/sdk/cji.cpp
rename to src/cji.cpp

diff --git a/src/sdk/cji.h b/src/cji.h
similarity index 100%
rename from src/sdk/cji.h
rename to src/cji.h

diff --git a/src/candidate/efl/candidate-efl.h b/src/include/candidate-efl.h
similarity index 100%
rename from src/candidate/efl/candidate-efl.h
rename to src/include/candidate-efl.h

diff --git a/src/candidate/include/candidate-factory.h b/src/include/candidate-factory.h
similarity index 100%
rename from src/candidate/include/candidate-factory.h
rename to src/include/candidate-factory.h

diff --git a/src/candidate/efl/candidate-multiline-efl.h b/src/include/candidate-multiline-efl.h
similarity index 100%
rename from src/candidate/efl/candidate-multiline-efl.h
rename to src/include/candidate-multiline-efl.h

diff --git a/src/candidate/include/candidate.h b/src/include/candidate.h
similarity index 100%
rename from src/candidate/include/candidate.h
rename to src/include/candidate.h

diff --git a/src/candidate/include/configure.h b/src/include/configure.h
similarity index 100%
rename from src/candidate/include/configure.h
rename to src/include/configure.h

diff --git a/src/sdk/ise_lang_table.cpp b/src/ise_lang_table.cpp
similarity index 100%
rename from src/sdk/ise_lang_table.cpp
rename to src/ise_lang_table.cpp

diff --git a/src/sdk/ise_lang_table.h b/src/ise_lang_table.h
similarity index 100%
rename from src/sdk/ise_lang_table.h
rename to src/ise_lang_table.h

diff --git a/src/option.cpp b/src/option.cpp
index cf53796..d3b3584 100644 (file)
--- a/src/option.cpp
+++ b/src/option.cpp
@@ -26,7 +26,7 @@
 #include "option.h"
 #include "languages.h"
 #include "eflutil.h"
-#include "sdk/ise_lang_table.h"
+#include "ise_lang_table.h"
 #include "ise-stt-option.h"
 #include "autofill.h"
 
@@ -1128,9 +1128,6 @@ static Elm_Object_Item * append_item(Evas_Object *genlist, enum SETTING_ITEM_ID
 Evas_Object* create_option_main_view(Evas_Object *parent, Evas_Object *naviframe, SCLOptionWindowType type)
 {
     Evas_Object *genlist = NULL;
-#ifdef _COMMON
-    Evas_Object *layout = NULL;
-#endif
 
     if (CHECK_ARRAY_INDEX(type, OPTION_WINDOW_TYPE_MAX)) {
         create_genlist_item_classes(type);
@@ -1146,11 +1143,6 @@ Evas_Object* create_option_main_view(Evas_Object *parent, Evas_Object *naviframe
 
 #ifdef _COMMON
         evas_object_smart_callback_add(genlist, "realized", _gl_realized_cb, NULL);
-
-        layout = elm_layout_add(naviframe);
-        elm_layout_file_set(layout, OPTION_LAYOUT_EDJ, "main_layout");
-        elm_object_content_set(layout, genlist);
-        evas_object_show(layout);
 #endif
 
 #ifdef _CIRCLE
@@ -1266,11 +1258,7 @@ Evas_Object* create_option_main_view(Evas_Object *parent, Evas_Object *naviframe
 #endif
     }
 
-#ifdef _COMMON
-    return layout;
-#else
     return genlist;
-#endif
 }
 
 static Evas_Object* create_option_language_view(Evas_Object *naviframe)
@@ -1706,8 +1694,20 @@ option_window_created(Evas_Object *window, SCLOptionWindowType type)
     option_elements[type].back_button = naviframe_item_push(naviframe, OPTIONS, mlayout, NULL, NULL, navi_back_cb, NULL, EINA_FALSE);
 
 #else
+    Evas_Object *nf_content = NULL;
     Evas_Object *list = create_option_main_view(conformant, naviframe, type);
-    option_elements[type].back_button = naviframe_item_push(naviframe, OPTIONS, list, NULL, NULL, navi_back_cb, NULL);
+    nf_content = list;
+
+#ifdef _COMMON
+    Evas_Object *layout = elm_layout_add(naviframe);
+    elm_layout_file_set(layout, OPTION_LAYOUT_EDJ, "main_layout");
+    elm_object_content_set(layout, list);
+    evas_object_show(layout);
+
+    nf_content = layout;
+#endif
+
+    option_elements[type].back_button = naviframe_item_push(naviframe, OPTIONS, nf_content, NULL, NULL, navi_back_cb, NULL);
     elm_object_content_set(conformant, naviframe);
 #endif
 

diff --git a/src/sdk/sdk.cpp b/src/sdk.cpp
similarity index 100%
rename from src/sdk/sdk.cpp
rename to src/sdk.cpp

diff --git a/src/sdk/sdk.h b/src/sdk.h
similarity index 100%
rename from src/sdk/sdk.h
rename to src/sdk.h

diff --git a/src/sdk/sdk_option.cpp b/src/sdk_option.cpp
similarity index 100%
rename from src/sdk/sdk_option.cpp
rename to src/sdk_option.cpp