From: ABHISHEK JAIN Date: Tue, 1 Oct 2019 11:46:32 +0000 (+0530) Subject: [TBT][Operation Pick/View][NonACR][TFDF-5525 Service app launching behaviour is changed] X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=02060b8049d85a1cb650cc8ed6471ab83264359d;p=test%2Ftct%2Fnative%2Fbehavior.git [TBT][Operation Pick/View][NonACR][TFDF-5525 Service app launching behaviour is changed] Change-Id: Iabbc75dc22b0270d858bd9a41964646015dc1864 Signed-off-by: ABHISHEK JAIN --- diff --git a/release/binary-armv7l/install.sh b/release/binary-armv7l/install.sh index 60c8be6..d77ea78 100755 --- a/release/binary-armv7l/install.sh +++ b/release/binary-armv7l/install.sh @@ -29,7 +29,6 @@ MOD_NAME=tbtcoreapp sdb root on sdb push org.tizen.coretbt_dataprovider-1.0.0-arm.tpk /tmp -sdb push org.tizen.coretbt_serviceapp-1.0.0-arm.tpk /tmp sdb push org.tizen.coretbt_uiapp-1.0.0-arm.tpk /tmp sdb push org.tizen.operationpickviewapp-1.0.0-arm.tpk /tmp sdb push org.tizen.coretbtwidgetapp-1.0.0-arm.tpk /tmp @@ -49,7 +48,6 @@ sdb shell su -c "rpm -Uvh /tmp/org.tizen.autofill-service-0.1.5-1.armv7l.rpm --n sdb shell su -c "tpk-backend -y org.tizen.autofill-service --preload" sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.tizen.coretbt_dataprovider-1.0.0-arm.tpk" $EXECUTION_USER -sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.tizen.coretbt_serviceapp-1.0.0-arm.tpk" $EXECUTION_USER sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.tizen.coretbt_uiapp-1.0.0-arm.tpk" $EXECUTION_USER sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.tizen.operationpickviewapp-1.0.0-arm.tpk" $EXECUTION_USER sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.tizen.coretbtwidgetapp-1.0.0-arm.tpk" $EXECUTION_USER diff --git a/release/binary-armv7l/org.tizen.coretbt_serviceapp-1.0.0-arm.tpk b/release/binary-armv7l/org.tizen.coretbt_serviceapp-1.0.0-arm.tpk deleted file mode 100755 index 95f4861..0000000 Binary files a/release/binary-armv7l/org.tizen.coretbt_serviceapp-1.0.0-arm.tpk and /dev/null differ diff --git a/release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk b/release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk old mode 100755 new mode 100644 index 542f38a..990cdad Binary files a/release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk and b/release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk differ diff --git a/tbtcoreapp/inc/utils/config.h b/tbtcoreapp/inc/utils/config.h index 1620f03..24e6f2a 100644 --- a/tbtcoreapp/inc/utils/config.h +++ b/tbtcoreapp/inc/utils/config.h @@ -84,8 +84,8 @@ extern bool __is_efl_test_running; #endif -#define PICK_VIEW_APP_PACKAGE_NAME "org.tizen.coretbt_uiapp"; -#define PICK_VIEW_SERVICEAPP_PACKAGE_NAME "org.tizen.coretbt_serviceapp"; +#define PICK_VIEW_APP_PACKAGE_NAME "org.tizen.coretbt_uiapp" +#define PICK_VIEW_SERVICEAPP_PACKAGE_NAME "org.tizen.coretbt_serviceapp" #define UI_VIEWMGR_APP_PACKAGE_NAME "org.tizen.tbt_ui_viewmgr" diff --git a/tbtcoreapp/src/view/tbt-pick-view.c b/tbtcoreapp/src/view/tbt-pick-view.c index f3d04a2..47cd7cc 100644 --- a/tbtcoreapp/src/view/tbt-pick-view.c +++ b/tbtcoreapp/src/view/tbt-pick-view.c @@ -85,6 +85,7 @@ static void _view_button_pressed_cb(void *data, Evas_Object *obj, void *event_in static void _view_service_button_pressed_cb(void *data, Evas_Object *obj, void *event_info); static void _single_button_pressed_cb(void *data, Evas_Object *obj, void *event_info); static void _multiple_button_pressed_cb(void *data, Evas_Object *obj, void *event_info); +static void app_control_view_ui_reply_cb(app_control_h request, app_control_h reply, app_control_result_e result, void *data); static void app_control_view_reply_cb(app_control_h request, app_control_h reply, app_control_result_e result, void *data); static void app_control_pick_single_reply_cb(app_control_h request, app_control_h reply, app_control_result_e result, void *data); static void app_control_pick_multiple_reply_cb(app_control_h request, app_control_h reply, app_control_result_e result, void *data); @@ -724,7 +725,7 @@ static void _view_button_pressed_cb(void *data, Evas_Object *obj, void *event_in RETM_IF(NULL == view->service, "Service NULL! "); ret = app_control_set_app_id(view->service, appid); RETM_IF(APP_CONTROL_ERROR_NONE != ret, "app_control_set_app_id failed :%s", get_app_control_error(ret)); - ret = app_control_send_launch_request(view->service , app_control_view_reply_cb, view); + ret = app_control_send_launch_request(view->service , app_control_view_ui_reply_cb, view); RETM_IF(APP_CONTROL_ERROR_NONE != ret, "app_control_send_launch_request failed :%s", get_app_control_error(ret)); ui_utils_label_set_text(view->label, "App launch requested.", "left"); } @@ -753,7 +754,6 @@ static void _view_service_button_pressed_cb(void *data, Evas_Object *obj, void * RETM_IF(APP_CONTROL_ERROR_NONE != ret, "app_control_set_app_id failed :%s", get_app_control_error(ret)); ret = app_control_send_launch_request(view->service , app_control_view_reply_cb, view); RETM_IF(APP_CONTROL_ERROR_NONE != ret, "app_control_send_launch_request failed :%s", get_app_control_error(ret)); - ui_utils_label_set_text(view->label, "App launch requested.", "left"); } @@ -832,6 +832,22 @@ static void _multiple_button_pressed_cb(void *data, Evas_Object *obj, void *even ui_utils_label_set_text(view->label, "App launch requested.", "left"); } +/** + * @function app_control_view_ui_reply_cb + * @since_tizen 2.3 + * @description App Control View Reply Cb + * @parameter app_control_h: App Control H, void*: Void Pointer + * @return static void + */ +static void app_control_view_ui_reply_cb(app_control_h request, app_control_h reply, app_control_result_e result, void *data) +{ + DBG("Inside app_control_view_ui_reply_cb"); + RETM_IF(NULL == data, "data is NULL"); + + pick_view *view = NULL; + view = (pick_view*)data; + RETM_IF(NULL == view, "view is NULL"); +} /** * @function app_control_view_reply_cb