From: nibha2 Date: Thu, 26 Oct 2017 04:32:56 +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%2Fheads%2Ftizen_3.0_mobile;p=test%2Ftct%2Fnative%2Fbehavior.git [TBT][tbtcoreapp][Non-ACR][DPTTIZEN-2947,Removed d2d-con-manager tc] Change-Id: I6ec47201c01e9f68234a65114bd18ff97160d8ea 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 index 2956119..67258fc 100644 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 index eb1f281..d49f6de 100644 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/.cproject b/tbtcoreapp/.cproject index ffd3c50..e20c5da 100644 --- a/tbtcoreapp/.cproject +++ b/tbtcoreapp/.cproject @@ -21,21 +21,16 @@ - + - + @@ -322,21 +312,16 @@ - + - + diff --git a/tbtcoreapp/inc/model/tbt-info.h b/tbtcoreapp/inc/model/tbt-info.h index de6c189..5982431 100755 --- a/tbtcoreapp/inc/model/tbt-info.h +++ b/tbtcoreapp/inc/model/tbt-info.h @@ -240,10 +240,6 @@ typedef enum { TBT_APP_CONTACTS, - TBT_APP_D2D_CLIENT, - - TBT_APP_D2D_SERVER, - TBT_APP_TTS, TBT_APP_STT, @@ -408,7 +404,6 @@ typedef enum FEATURE_CAMERA_FRONT_FLASH, FEATURE_CONSUMER_IR, FEATURE_CONTACT, - FEATURE_CONVERGENCE_D2D, FEATURE_DATABASE_ENCRYPTION, FEATURE_DATACONTROL, FEATURE_DATASYNC, @@ -619,7 +614,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 3099ada..d20e9aa 100755 --- 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.4/mobile/d2d_viewer.edc b/tbtcoreapp/res/edje/2.4/mobile/d2d_viewer.edc deleted file mode 100644 index 85772d8..0000000 --- a/tbtcoreapp/res/edje/2.4/mobile/d2d_viewer.edc +++ /dev/null @@ -1,51 +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: "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.8; } - } - } - - part{ - name: "others"; - type: SWALLOW; - description{ - state: "default" 0.0; - align: 0.0 0.0; - visible: 1; - rel1 {relative: 0.0 0.8; } - rel2 {relative: 1.0 1.0; } - } - } - } - } -} diff --git a/tbtcoreapp/res/edje/3.0/mobile/d2d_viewer.edc b/tbtcoreapp/res/edje/3.0/mobile/d2d_viewer.edc deleted file mode 100644 index 85772d8..0000000 --- a/tbtcoreapp/res/edje/3.0/mobile/d2d_viewer.edc +++ /dev/null @@ -1,51 +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: "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.8; } - } - } - - part{ - name: "others"; - type: SWALLOW; - description{ - state: "default" 0.0; - align: 0.0 0.0; - visible: 1; - rel1 {relative: 0.0 0.8; } - rel2 {relative: 1.0 1.0; } - } - } - } - } -} diff --git a/tbtcoreapp/src/model/tbt-list.c b/tbtcoreapp/src/model/tbt-list.c index 31d3af3..e970a7d 100755 --- a/tbtcoreapp/src/model/tbt-list.c +++ b/tbtcoreapp/src/model/tbt-list.c @@ -2373,35 +2373,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. /tizen/remote-app-control will be shown
" - "4. Select /tizen/remote-app-control. Then cortbt_uiapp will be launch in D2D Server.
", - .result = 0 - }, - #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 - }, - #endif -#endif #ifdef TBT_MODULE_TTS #ifdef TBT_MODULE_APP_TTS { diff --git a/tbtcoreapp/tizen-manifest.xml b/tbtcoreapp/tizen-manifest.xml index bc1dd06..b41a3e9 100644 --- a/tbtcoreapp/tizen-manifest.xml +++ b/tbtcoreapp/tizen-manifest.xml @@ -13,7 +13,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/bluetooth http://tizen.org/privilege/nfc http://tizen.org/privilege/callhistory.read