Tab view is not ready to land yet.

Change-Id: I97a57248dfad7a67a4f62b597382dd09a30a5299

diff --git a/src/examples/efl/c/CMakeLists.txt b/src/examples/efl/c/CMakeLists.txt
index b8a8e9c83ebdeb5f062c5792f1df4b72f093397e..b8e476eabaed82f098a07e816e697a444e66e8bd 100644 (file)
--- a/src/examples/efl/c/CMakeLists.txt
+++ b/src/examples/efl/c/CMakeLists.txt
@@ -17,7 +17,7 @@ SET(SRCS
       page14.cpp
       page15.cpp
       page16.cpp
-      page17.cpp
+#page17.cpp
    )
 
 ADD_EXECUTABLE(${BINNAME} ${SRCS})

diff --git a/src/examples/efl/c/main.h b/src/examples/efl/c/main.h
index 9480a797d6780c99c13d630cfc84c6bb02bf0f88..9f41b12b7f92984eede08b4b232a32ae10dbcfaf 100644 (file)
--- a/src/examples/efl/c/main.h
+++ b/src/examples/efl/c/main.h
@@ -55,4 +55,3 @@ void create_page13();
 void create_page14();
 void create_page15();
 void create_page16();
-void create_page17();

diff --git a/src/examples/efl/c/page16.cpp b/src/examples/efl/c/page16.cpp
index 4a5e9f0a9c274fcd4521401b9a5243336d860803..08f3097838dace9119e2d2f256aa9325a0d9f19a 100644 (file)
--- a/src/examples/efl/c/page16.cpp
+++ b/src/examples/efl/c/page16.cpp
@@ -30,7 +30,11 @@ prev_btn_clicked_cb(void *data, Eo *obj, void *event_info)
 static void
 next_btn_clicked_cb(void *data, Eo *obj, void *event_info)
 {
-       create_page17();
+       int ret = ui_viewmgr_deactivate();
+       if (ret != UI_VIEWMGR_ERROR_NONE)
+       {
+               dlog_print(DLOG_ERROR, LOG_TAG, "ui_viewmgr_deactivate() is failed. err = %d", ret);
+       }
 }
 
 static void

diff --git a/src/examples/efl/cpp/main.cpp b/src/examples/efl/cpp/main.cpp
index ab45133e77e6d8586123c09189e0bcdfc7bc7218..6d6e7829d842546be7697390e6b67c50931a5b0a 100644 (file)
--- a/src/examples/efl/cpp/main.cpp
+++ b/src/examples/efl/cpp/main.cpp
@@ -15,7 +15,6 @@
  *
  */
 #include "main.h"
-#include "page17.h"
 #include "page16.h"
 #include "page15.h"
 #include "page14.h"

diff --git a/src/examples/efl/cpp/page16.h b/src/examples/efl/cpp/page16.h
index 226a563db563fbdda0fea566e8355977e8ceab11..5bb24941cca6babd790999dce442ae54ae909da0 100644 (file)
--- a/src/examples/efl/cpp/page16.h
+++ b/src/examples/efl/cpp/page16.h
@@ -35,7 +35,7 @@ protected:
                                                                                        //Next Button Callback
                                                                                        [](void *data, Eo *obj, void *event_info)
                                                                                        {
-                                                                                               UI_VIEWMGR->pushView(new page17());
+                                                                                               UI_VIEWMGR->deactivate();
                                                                                        },
                                                                                        //Title Show Button Callback
                                                                                        [](void *data, Eo *obj, void *event_info)

diff --git a/src/include/efl/mobile/c/ui_mobile_viewmanager.h b/src/include/efl/mobile/c/ui_mobile_viewmanager.h
index 855829c54acfed518d0d5ecb30bf2c99ce136309..37c50768ae5991521c2d3f734450b17b7b1be15f 100644 (file)
--- a/src/include/efl/mobile/c/ui_mobile_viewmanager.h
+++ b/src/include/efl/mobile/c/ui_mobile_viewmanager.h
@@ -40,7 +40,7 @@
 
 typedef struct ui_view_s ui_view;
 typedef ui_view ui_standard_view;
-typedef ui_view ui_tab_view;
+//typedef ui_view ui_tab_view;
 typedef struct ui_menu_s ui_menu;
 typedef struct ui_popup_s ui_popup;
 
@@ -54,6 +54,6 @@ typedef struct ui_popup_s ui_popup;
 #include "ui_viewmgr.h"
 #include "ui_view.h"
 #include "ui_standard_view.h"
-#include "ui_tab_view.h"
+//#include "ui_tab_view.h"
 
 #endif /* UI_MOBILE_VIEWMANAGER_CAPI_H */