回退 'Pull Request !9329 : 新增2in1设备类型-demo-graphic'

demo/hjsunit_sample/src/main/config.json

@@ -18,8 +18,7 @@
     "deviceType": [
       "tablet",
       "default",
-            "phone",
-            "2in1"
+      "phone"
     ],
     "distro": {
       "deliveryWithInstall": true,

distributeddatamgr/Pasteboardjsapitest/entry/src/main/config.json

@@ -20,8 +20,7 @@
     "deviceType": [
       "tablet",
       "default",
-            "phone",
-            "2in1"
+      "phone"
     ],
     "distro": {
       "deliveryWithInstall": true,

distributeddatamgr/UDMFtest/UDMFtest/entry/src/main/module.json

@@ -10,8 +10,7 @@
     "deviceTypes": [
         "default",
         "tablet",
-            "phone",
-            "2in1"
+        "phone"
     ],
     "deliveryWithInstall": true,
     "installationFree": false,

distributeddatamgr/dataObjectjstest/hap/src/main/config.json

@@ -19,8 +19,7 @@
         "deviceType": [
             "default",
             "tablet",
-            "phone",
-            "2in1"
+            "phone"
         ],
         "distro": {
             "deliveryWithInstall": true,

distributeddatamgr/dataSharejstest/hap/src/main/config.json

@@ -18,8 +18,7 @@
         "deviceType": [
             "default",
             "tablet",
-            "phone",
-            "2in1"
+            "phone"
         ],
         "distro": {
             "deliveryWithInstall": true,

distributeddatamgr/distributedKVStoretest/distributedKVStorejstest/hap/src/main/config.json

@@ -16,12 +16,11 @@
     "package": "ohos.acts.distributedKvStore",
     "name": ".entry",
     "mainAbility": ".MainAbility",
-        "srcPath": "",
+    "srcPath":"",
     "deviceType": [
         "default",
         "tablet",
-            "phone",
-            "2in1"
+        "phone"
     ],
     "distro": {
       "deliveryWithInstall": true,

distributeddatamgr/kvStoretest/kvStorejstest/hap/src/main/config.json

@@ -16,12 +16,11 @@
     "package": "ohos.acts.kvStore",
     "name": ".entry",
     "mainAbility": ".MainAbility",
-        "srcPath": "",
+    "srcPath":"",
     "deviceType": [
       "tablet",
       "default",
-            "phone",
-            "2in1"
+      "phone"
     ],
     "distro": {
       "deliveryWithInstall": true,

distributeddatamgr/preferencesjstest/hap/src/main/config.json

@@ -18,8 +18,7 @@
         "deviceType": [
            "tablet",
            "default",
-            "phone",
-            "2in1"
+           "phone"
         ],
         "distro": {
             "deliveryWithInstall": true,

distributeddatamgr/relationalStoretest/RdbJstest/hap/src/main/config.json

@@ -18,8 +18,7 @@
         "deviceType": [
       "tablet",
       "default",
-            "phone",
-            "2in1"
+            "phone"
         ],
         "distro": {
             "deliveryWithInstall": true,

distributeddatamgr/relationalStoretest/relationalStoreJstest/hap/src/main/config.json

@@ -18,8 +18,7 @@
         "deviceType": [
       "tablet",
       "default",
-            "phone",
-            "2in1"
+            "phone"
         ],
         "distro": {
             "deliveryWithInstall": true,

distributeddatamgr/relationalStoretest/relationalStoreStagetest/entry/src/main/module.json

@@ -10,8 +10,7 @@
     "deviceTypes": [
         "default",
         "tablet",
-            "phone",
-            "2in1"
+        "phone"
     ],
     "deliveryWithInstall": true,
     "installationFree": false,

global/global_napi_test/entry/src/main/config.json

@@ -17,11 +17,11 @@
     "package": "ohos.global.napitest",
     "name": ".MyApplication",
     "mainAbility": "ohos.global.napitest.MainAbility",
+
     "deviceType": [
       "tablet",
       "default",
-            "phone",
-            "2in1"
+      "phone"
     ],
     "distro": {
       "deliveryWithInstall": true,

global/global_stage/entry/src/main/module.json

@@ -7,8 +7,7 @@
         "deviceTypes": [
             "tablet",
             "default",
-            "phone",
-            "2in1"
+            "phone"
         ],
         "deliveryWithInstall": true,
         "installationFree": false,

global/i18n_standard/intljs/src/main/config.json

@@ -18,8 +18,7 @@
         "deviceType": [
       "tablet",
       "default",
-            "phone",
-            "2in1"
+            "phone"
         ],
         "distro": {
             "deliveryWithInstall": true,

global/perf/perfjs/src/main/config.json

@@ -18,8 +18,7 @@
         "deviceType": [
       "tablet",
       "default",
-            "phone",
-            "2in1"
+            "phone"
         ],
         "distro": {
             "deliveryWithInstall": true,

global/resmgr_standard/resmgrjs/src/main/config.json

@@ -18,8 +18,7 @@
         "deviceType": [
       "tablet",
       "default",
-            "phone",
-            "2in1"
+            "phone"
         ],
         "distro": {
             "deliveryWithInstall": true,

graphic/effectKit/entry/src/main/module.json

@@ -8,15 +8,13 @@
         "deviceTypes": [
       "tablet",
       "default",
-            "phone",
-            "2in1"
+            "phone"
         ],
         "deliveryWithInstall": true,
         "installationFree": false,
         "uiSyntax": "ets",
         "pages": "$profile:main_pages",
-        "abilities": [
-            {
+        "abilities": [{
             "name": "com.example.ActsEffectKitTest.MainAbility",
             "srcEntrance": "./ets/MainAbility/MainAbility.ts",
             "description": "$string:phone_entry_main",
@@ -24,17 +22,14 @@
             "label": "$string:entry_label",
             "visible": true,
             "orientation": "portrait",
-                "skills": [
-                    {
+            "skills": [{
                 "actions": [
                     "action.system.home"
                 ],
                 "entities": [
                     "entity.system.home"
                 ]
-                    }
-                ]
-            }
-        ]
+            }]
+        }]
     }
 }
\ No newline at end of file

graphic/graphicColorSpace/entry/src/main/module.json

@@ -8,15 +8,13 @@
         "deviceTypes": [
       "tablet",
       "default",
-            "phone",
-            "2in1"
+            "phone"
         ],
         "deliveryWithInstall": true,
         "installationFree": false,
         "uiSyntax": "ets",
         "pages": "$profile:main_pages",
-        "abilities": [
-            {
+        "abilities": [{
             "name": "com.example.myapplication.MainAbility",
             "srcEntrance": "./ets/MainAbility/MainAbility.ts",
             "description": "$string:phone_entry_main",
@@ -24,17 +22,15 @@
             "label": "$string:entry_label",
             "visible": true,
             "orientation": "portrait",
-                "skills": [
-                    {
+            "skills": [{
                 "actions": [
                     "action.system.home"
                 ],
                 "entities": [
                     "entity.system.home"
                 ]
-                    }
-                ]
-            }
-        ]
+            }]
+        }]
+       
     }
 }
\ No newline at end of file

graphic/webGL/src/main/config.json

@@ -18,8 +18,7 @@
     "deviceType": [
       "tablet",
       "default",
-            "phone",
-            "2in1"
+      "phone"
     ],
     "distro": {
       "deliveryWithInstall": true,

graphic/windowStage/entry/src/main/module.json

@@ -8,15 +8,13 @@
         "deviceTypes": [
       "tablet",
       "default",
-            "phone",
-            "2in1"
+            "phone"
         ],
         "deliveryWithInstall": true,
         "installationFree": false,
         "uiSyntax": "ets",
         "pages": "$profile:main_pages",
-        "abilities": [
-            {
+        "abilities": [{
             "name": "com.example.myapplication.MainAbility",
             "srcEntrance": "./ets/MainAbility/MainAbility.ts",
             "description": "$string:phone_entry_main",
@@ -24,20 +22,16 @@
             "label": "$string:entry_label",
             "visible": true,
             "orientation": "portrait",
-                "skills": [
-                    {
+            "skills": [{
                 "actions": [
                     "action.system.home"
                 ],
                 "entities": [
                     "entity.system.home"
                 ]
-                    }
-                ]
-            }
-        ],
-        "requestPermissions": [
-            {
+            }]
+        }],
+        "requestPermissions": [{
                 "name": "ohos.permission.SYSTEM_FLOAT_WINDOW",
                 "reason": "need use ohos.permission.SYSTEM_FLOAT_WINDOW"
             },

graphic/windowstandard/src/main/config.json

@@ -18,8 +18,7 @@
         "deviceType": [
       "tablet",
       "default",
-            "phone",
-            "2in1"
+            "phone"
         ],
         "distro": {
             "deliveryWithInstall": true,