From: nibha2 Date: Thu, 26 Oct 2017 05:02:27 +0000 (+0530) Subject: [TBT][tbtcoreapp][Non-ACR][DPTTIZEN-2947,Removed d2d-con-manager tc] X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F39%2F157739%2F2;p=test%2Ftct%2Fnative%2Fbehavior.git [TBT][tbtcoreapp][Non-ACR][DPTTIZEN-2947,Removed d2d-con-manager tc] Change-Id: Ibf1315c762e9e80101de8e49e957ddc4bcd28728 Signed-off-by: nibha2 --- 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 5422932..f68c802 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/org.tizen.tbtcoreapp-1.0.0-x86.tpk b/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-x86.tpk old mode 100755 new mode 100644 index 4539877..c72f671 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/model/tbt-info.h b/tbtcoreapp/inc/model/tbt-info.h index 1d1ad3c..4d4c35a 100644 --- a/tbtcoreapp/inc/model/tbt-info.h +++ b/tbtcoreapp/inc/model/tbt-info.h @@ -243,8 +243,6 @@ typedef enum { TBT_APP_SYSTEM_SETTINGS_FILGHTMODE, TBT_APP_SYSTEM_SETTINGS_LOCKSTATE, TBT_APP_CONTACTS, - //TBT_APP_D2D_CLIENT, - //TBT_APP_D2D_SERVER, TBT_APP_TTS, TBT_APP_STT, TBT_APP_STT_ERROR, @@ -348,7 +346,6 @@ typedef enum FEATURE_CAMERA_FRONT_FLASH, FEATURE_CONSUMER_IR, FEATURE_CONTACT, - //FEATURE_CONVERGENCE_D2D, FEATURE_DATABASE_ENCRYPTION, FEATURE_DATACONTROL, FEATURE_DATASYNC, @@ -559,7 +556,6 @@ static char* feature_list[1024]= [FEATURE_CAMERA_FRONT_FLASH] = "tizen.org/feature/camera.front.flash", [FEATURE_CONSUMER_IR] = "tizen.org/feature/consumer_ir", [FEATURE_CONTACT] = "tizen.org/feature/contact", - //[FEATURE_CONVERGENCE_D2D] = "tizen.org/feature/convergence.d2d", [FEATURE_DATABASE_ENCRYPTION] = "tizen.org/feature/database.encryption", [FEATURE_DATACONTROL] = "tizen.org/feature/datacontrol", [FEATURE_DATASYNC] = "tizen.org/feature/datasync", diff --git a/tbtcoreapp/inc/utils/app_module_config.h b/tbtcoreapp/inc/utils/app_module_config.h index 45598cc..e62aac2 100644 --- a/tbtcoreapp/inc/utils/app_module_config.h +++ b/tbtcoreapp/inc/utils/app_module_config.h @@ -236,10 +236,6 @@ #define TBT_MODULE_CONTACTS #define TBT_MODULE_APP_CONTACTS -//#define TBT_MODULE_D2D -//#define TBT_MODULE_APP_D2D_CLIENT -//#define TBT_MODULE_APP_D2D_SERVER - #define TBT_MODULE_TTS #define TBT_MODULE_APP_TTS #define TBT_MODULE_STT diff --git a/tbtcoreapp/res/edje/2.3.1/wearable_360_360/d2d_viewer.edc b/tbtcoreapp/res/edje/2.3.1/wearable_360_360/d2d_viewer.edc deleted file mode 100644 index 4afeab6..0000000 --- a/tbtcoreapp/res/edje/2.3.1/wearable_360_360/d2d_viewer.edc +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Copyright (c) 2014 Samsung Electronics Co., Ltd All Rights Reserved - * - * Licensed under the Apache License, Version 2.0 (the License); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#define TEXT_HEIGHT 0.08 - -collections -{ - base_scale: 1.8; - group - { - name: "d2d_viewer"; - parts{ - part{ - name: "base"; - type: RECT; - description{ - state: "default" 0.0; - visible: 1; - color: 0 0 0 255; - } - } - part{ - name: "list_container"; - type: SWALLOW; - description{ - state: "default" 0.0; - align: 0.0 0.0; - visible: 1; - rel1 {relative: 0.0 0.0; } - rel2 {relative: 1.0 0.6; } - fixed: 1 1; - } - } - - part{ - name: "others"; - type: SWALLOW; - description{ - state: "default" 0.0; - align: 0.0 0.0; - visible: 1; - rel1 {relative: 0.0 0.6; } - rel2 {relative: 1.0 0.8; } - fixed: 1 1; - } - } - - part { name: "wearable_toolbar"; - type: SWALLOW; - description { - state: "default" 0.0; - rel1 { - relative: 0.0 1.0; - } - rel2 { - relative: 1.0 1.0; - } - visible: 1; - fixed: 1 1; - } - } - } - } -} diff --git a/tbtcoreapp/src/model/tbt-list.c b/tbtcoreapp/src/model/tbt-list.c index 54438c1..de840a7 100644 --- a/tbtcoreapp/src/model/tbt-list.c +++ b/tbtcoreapp/src/model/tbt-list.c @@ -2358,41 +2358,6 @@ static tbt_info tbtapps[] = #endif #endif -/*#ifdef TBT_MODULE_D2D - #ifdef TBT_MODULE_APP_D2D_CLIENT - - //NSD DNSSD - { - .name = "D2D Client", - .parent = "D2D Convergence", - .apptype = TBT_APP_D2D_CLIENT, - .icon_name = "dummy", - .info = "1. Connect D2D Server to Same WiFi Network.
" - "2. Run D2D server module of TBT.
" - "3. A list of two elements http://192.168.43.54:8001/api/v2/ and /tizen/remote-app-control will be shown
" - "4. Select /tizen/remote-app-control first. Then cortbt_uiapp will be launch in D2D Server.
" - "5. Select http://192.168.43.54:8001/api/v2/ then Connect will be shown in D2D Server and Publish will be shown in D2D Client.
" - "6. Select Publish on Client side and GoodNews Received will be shown in D2D Server.", - .result = 0, - .required_features_count = 1, - .features_required = { FEATURE_NETWORK_WIFI } - }, - #endif - #ifdef TBT_MODULE_APP_D2D_SERVER - { - .name = "D2D Server", - .parent = "D2D Convergence", - .apptype = TBT_APP_D2D_SERVER, - .icon_name = "dummy", - .info = "1. Connect D2D Client to Same WiFi Network.
" - "2. Run D2D Server Module from TBT again.
" - "3. Server Ready Message will be shown", - .result = 0, - .required_features_count = 1, - .features_required = { FEATURE_NETWORK_WIFI } - }, - #endif -#endif*/ #ifdef TBT_MODULE_TTS #ifdef TBT_MODULE_APP_TTS { diff --git a/tbtcoreapp/src/view/tbt-genlist-view.c b/tbtcoreapp/src/view/tbt-genlist-view.c index 35c86e1..f1c23d4 100644 --- a/tbtcoreapp/src/view/tbt-genlist-view.c +++ b/tbtcoreapp/src/view/tbt-genlist-view.c @@ -93,7 +93,6 @@ #include "view/tbt-connection-view.h" #include "view/tbt-systemsettings-view.h" #include "view/tbt-contacts-view.h" -//#include "view/tbt-d2d-view.h" #include "view/tbt-nfc-hce-preferred-view.h" #include "view/tbt-nfc-ese-view.h" #include "view/tbt-tts-view.h" @@ -1227,14 +1226,6 @@ static void _gl_item_selected_cb(void *data, Evas_Object *obj EINA_UNUSED, void contacts_view_add(view->navi, info, it); break; #endif - /*#ifdef TBT_MODULE_D2D - case TBT_APP_D2D_CLIENT: - d2d_view_add(view->navi, info, it); - break; - case TBT_APP_D2D_SERVER: - d2d_view_add(view->navi, info, it); - break; - #endif*/ #ifdef TBT_MODULE_TTS case TBT_APP_TTS: diff --git a/tbtcoreapp/tizen-manifest.xml b/tbtcoreapp/tizen-manifest.xml index 3ce2cf7..05720ed 100644 --- a/tbtcoreapp/tizen-manifest.xml +++ b/tbtcoreapp/tizen-manifest.xml @@ -18,7 +18,6 @@ http://tizen.org/privilege/mediastorage http://tizen.org/privilege/callhistory.write http://tizen.org/privilege/network.get - http://tizen.org/privilege/d2d.datasharing http://tizen.org/privilege/appmanager.launch http://tizen.org/privilege/contact.write http://tizen.org/privilege/push