TSAM-6044 Back to Phone screen instead of Create new contact screen when tapping...

Change-Id: Idf2a44ca6637be14742f00e75c2a2098c7ecb2c8
Signed-off-by: Eugene Kurzberg <i.kurtsberg@samsung.com>

diff --git a/contacts-app/inc/OperationController.h b/contacts-app/inc/OperationController.h
index 7ff18b3..40dada5 100644 (file)
--- a/contacts-app/inc/OperationController.h
+++ b/contacts-app/inc/OperationController.h
@@ -127,8 +127,6 @@ protected:
        virtual void onRequest(Operation operation, app_control_h request) = 0;
 
 private:
-       static void onWindowLowered(void *data, Evas_Object *obj, void *eventInfo);
-
        int m_SupportedOperations;
        app_control_h m_Request;
        bool m_IsMinimizable;

diff --git a/contacts-app/src/OperationController.cpp b/contacts-app/src/OperationController.cpp
index e5def28..1dc4c48 100644 (file)
--- a/contacts-app/src/OperationController.cpp
+++ b/contacts-app/src/OperationController.cpp
@@ -34,8 +34,6 @@ OperationController::~OperationController()
 
        if (!m_IsMinimizable) {
                m_Navigator->unsetLastPageCallback();
-               evas_object_smart_callback_del_full(m_Window->getEvasObject(),
-                               "iconified", &OperationController::onWindowLowered, this);
        }
 }
 
@@ -58,17 +56,6 @@ void OperationController::request(Operation operation, app_control_h request)
 {
        app_control_destroy(m_Request);
        app_control_clone(&m_Request, request);
-
-       if (!m_IsMinimizable) {
-               app_control_launch_mode_e launchMode = APP_CONTROL_LAUNCH_MODE_SINGLE;
-               app_control_get_launch_mode(m_Request, &launchMode);
-
-               if (launchMode == APP_CONTROL_LAUNCH_MODE_SINGLE) {
-                       evas_object_smart_callback_add(m_Window->getEvasObject(),
-                                       "iconified", &OperationController::onWindowLowered, this);
-               }
-       }
-
        onRequest(operation, m_Request);
 }
 
@@ -147,8 +134,3 @@ void OperationController::replyFailure()
        app_control_reply_to_launch_request(reply, m_Request, APP_CONTROL_RESULT_FAILED);
        app_control_destroy(reply);
 }
-
-void OperationController::onWindowLowered(void *data, Evas_Object *obj, void *eventInfo)
-{
-       ui_app_exit();
-}