[TBT][NonACR][Operation Pick/View][TFDF-5560, TFDF-5525, TFDF-5086 Chnaged the launch...

Change-Id: I23b61cfc1ee02bd36a88011590d092929594331b
Signed-off-by: ABHISHEK JAIN <j.abhishek@samsung.com>

diff --git a/release/binary-armv7l/install.sh b/release/binary-armv7l/install.sh
index ab501bc9bf9ce450e0c2c14a27ea23c957a9cfaf..f9e029c077be2281eed64e56d2366554c94bb6d8 100755 (executable)
--- a/release/binary-armv7l/install.sh
+++ b/release/binary-armv7l/install.sh
@@ -27,7 +27,6 @@
 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.tbt_hcetestappa-1.0.0-arm.tpk /tmp
 sdb push org.tizen.tbt_hcetestappb-1.0.0-arm.tpk /tmp
@@ -50,7 +49,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 pkgcmd -i -t tpk -p /tmp/org.tizen.coretbt_dataprovider-1.0.0-arm.tpk
-sdb shell pkgcmd -i -t tpk -p /tmp/org.tizen.coretbt_serviceapp-1.0.0-arm.tpk
 sdb shell pkgcmd -i -t tpk -p /tmp/org.tizen.coretbt_uiapp-1.0.0-arm.tpk
 sdb shell pkgcmd -i -t tpk -p /tmp/org.tizen.tbt_hcetestappa-1.0.0-arm.tpk
 sdb shell pkgcmd -i -t tpk -p /tmp/org.tizen.tbt_hcetestappb-1.0.0-arm.tpk

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 (executable)
index 4ad8774..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 (executable)
new mode 100644 (file)
index e2fa758..49eb5f7
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/release/binary-x86/install.sh b/release/binary-x86/install.sh
index 73d892c2c0ea85fa30a6d5c0cedc67d56a4d5ea4..afa71e258e977a3f19a77445a75f00e612c6260e 100755 (executable)
--- a/release/binary-x86/install.sh
+++ b/release/binary-x86/install.sh
@@ -27,7 +27,6 @@
 sdb root on
 
 sdb push org.tizen.coretbt_dataprovider-1.0.0-x86.tpk /tmp
-sdb push org.tizen.coretbt_serviceapp-1.0.0-x86.tpk /tmp
 sdb push org.tizen.coretbt_uiapp-1.0.0-x86.tpk /tmp
 sdb push org.tizen.tbt_hcetestappa-1.0.0-x86.tpk /tmp
 sdb push org.tizen.tbt_hcetestappb-1.0.0-x86.tpk /tmp
@@ -50,7 +49,6 @@ sdb shell su -c "rpm -Uvh /tmp/org.tizen.autofill-service-0.1.6-1.i686.rpm --nod
 sdb shell su -c "tpk-backend -y org.tizen.autofill-service --preload"
 
 sdb shell pkgcmd -i -t tpk -p /tmp/org.tizen.coretbt_dataprovider-1.0.0-x86.tpk
-sdb shell pkgcmd -i -t tpk -p /tmp/org.tizen.coretbt_serviceapp-1.0.0-x86.tpk
 sdb shell pkgcmd -i -t tpk -p /tmp/org.tizen.coretbt_uiapp-1.0.0-x86.tpk
 sdb shell pkgcmd -i -t tpk -p /tmp/org.tizen.tbt_hcetestappa-1.0.0-x86.tpk
 sdb shell pkgcmd -i -t tpk -p /tmp/org.tizen.tbt_hcetestappb-1.0.0-x86.tpk

diff --git a/release/binary-x86/org.tizen.coretbt_serviceapp-1.0.0-x86.tpk b/release/binary-x86/org.tizen.coretbt_serviceapp-1.0.0-x86.tpk
deleted file mode 100755 (executable)
index ee5b590..0000000
Binary files a/release/binary-x86/org.tizen.coretbt_serviceapp-1.0.0-x86.tpk and /dev/null differ

diff --git a/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-x86.tpk b/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-x86.tpk
old mode 100755 (executable)
new mode 100644 (file)
index 4387baa..c613e9a
Binary files a/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-x86.tpk and b/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-x86.tpk differ

diff --git a/tbtcoreapp/inc/utils/config.h b/tbtcoreapp/inc/utils/config.h
index b7fb7749d76f7fbfdf38e5df06c8c58c7b14011d..1e60a31759218770467c30e8f5b99339996c58a6 100644 (file)
--- a/tbtcoreapp/inc/utils/config.h
+++ b/tbtcoreapp/inc/utils/config.h
@@ -87,8 +87,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 SMARTCARD_SIGNED_APPID "org.tizen.tbt_smartcardtestapp_signed"
 #define SMARTCARD_UNSIGNED_APPID "org.tizen.tbt_smartcardtestapp"

diff --git a/tbtcoreapp/src/view/tbt-pick-view.c b/tbtcoreapp/src/view/tbt-pick-view.c
index 0ddd3205d4051c3c61070fe51c7c3c9a404f2aa9..ccd597319c8532ff0f24098cde0f50597b7b404d 100644 (file)
--- a/tbtcoreapp/src/view/tbt-pick-view.c
+++ b/tbtcoreapp/src/view/tbt-pick-view.c
@@ -98,6 +98,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);
@@ -867,7 +868,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");
 }
@@ -896,7 +897,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");
 }
 
 
@@ -975,6 +975,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                5.5
+ * @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

diff --git a/tbtcoreapp/tizen-manifest.xml b/tbtcoreapp/tizen-manifest.xml
index d27003883e64e19c49f06e780908251858e238ba..a393afef32eef44e5849973b03462001f60eea46 100644 (file)
--- a/tbtcoreapp/tizen-manifest.xml
+++ b/tbtcoreapp/tizen-manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<manifest xmlns="http://tizen.org/ns/packages" api-version="5.0" package="org.tizen.tbtcoreapp" version="1.0.0">
+<manifest xmlns="http://tizen.org/ns/packages" api-version="5.5" package="org.tizen.tbtcoreapp" version="1.0.0">
     <profile name="wearable"/>
-    <ui-application appid="org.tizen.tbtcoreapp" exec="tbtcoreapp" multiple="false" nodisplay="false" taskmanage="true" type="capp">
+    <ui-application api-version="5.5" appid="org.tizen.tbtcoreapp" exec="tbtcoreapp" multiple="false" nodisplay="false" taskmanage="true" type="capp">
         <label>tbtcoreapp</label>
         <icon>tbtcoreapp.png</icon>
     </ui-application>