[TBT][tbtcoreapp][Non-ACR][DPTTIZEN-2947,removed d2d conv manager testcase]

Change-Id: Idc8c16fdd646caec65d2103b56ce0d44c6c06f16
Signed-off-by: nibha2 <nibha.sharma@samsung.com>

diff --git a/tbtcoreapp/inc/model/tbt-info.h b/tbtcoreapp/inc/model/tbt-info.h
index 613bfe7243099449356470a5faad8e148ed8af21..dbc2dbcfa0369be5280e3f1324581807b049b97d 100755 (executable)
--- 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,
@@ -410,7 +406,6 @@ typedef enum
        FEATURE_CAMERA_FRONT_FLASH,
        FEATURE_CONSUMER_IR,
        FEATURE_CONTACT,
-       //FEATURE_CONVERGENCE_D2D,
        FEATURE_DATABASE_ENCRYPTION,
        FEATURE_DATACONTROL,
        FEATURE_DATASYNC,
@@ -621,7 +616,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 b16fbc5018373fbf0cbc4e36c3936a182da5389c..e036b7e302184d04f8f82093ad9757f04b1a7b09 100755 (executable)
--- 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 (file)
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 (file)
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 bb26a7b9ba570cfee3c72ee7fb4fe59ee1477074..4fc6210420481c034e681f4892a9d6568d772fcd 100755 (executable)
--- a/tbtcoreapp/src/model/tbt-list.c
+++ b/tbtcoreapp/src/model/tbt-list.c
@@ -2372,37 +2372,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 <b>D2D Server</b> to Same WiFi Network.<br/>"
-                                       "2.     Run <b>D2D server</b> module of TBT.<br/>"
-                                       "3.     <b>/tizen/remote-app-control</b> will be shown<br/>"
-                                       "4.     Select <b>/tizen/remote-app-control</b>. Then <b>cortbt_uiapp</b> will be launch in <b>D2D Server</b>.<br/>",
-                       .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 <b>D2D Client</b> to Same WiFi Network.<br/>"
-                                       "2.     Run D2D Server Module from TBT again.<br/>"
-                                       "3.     Server <b>Ready</b> Message will be shown",
-                       .result = 0
-               },
-       #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 22da5641c6d349079903aaa5b7138b543e6271a0..8c8d083224008c8e1e1414c69587715184d5ce4f 100755 (executable)
--- 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-tts-view.h"
 #include "view/tbt-stt-view.h"
 #include "view/tbt-voice-control-view.h"
@@ -1126,14 +1125,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:
                        tts_view_add(view->navi, info, it);

diff --git a/tbtcoreapp/tizen-manifest.xml b/tbtcoreapp/tizen-manifest.xml
index 6a202dea0d9c79c5dd12f7bd3d1533b710c88989..3df7dc847dc0e6d5649841afed2fc82f7d79190b 100644 (file)
--- a/tbtcoreapp/tizen-manifest.xml
+++ b/tbtcoreapp/tizen-manifest.xml
@@ -13,7 +13,6 @@
         <privilege>http://tizen.org/privilege/mediastorage</privilege>
         <privilege>http://tizen.org/privilege/callhistory.write</privilege>
         <privilege>http://tizen.org/privilege/network.get</privilege>
-        <privilege>http://tizen.org/privilege/d2d.datasharing</privilege>
         <privilege>http://tizen.org/privilege/bluetooth</privilege>
         <privilege>http://tizen.org/privilege/nfc</privilege>
         <privilege>http://tizen.org/privilege/callhistory.read</privilege>