From fa8de2798c5c33239705f6ac70e08f2e6449b051 Mon Sep 17 00:00:00 2001
From: guoyiping <guoyiping1@huawei.com>
Date: Fri, 15 Apr 2022 16:32:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9base/profile=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: guoyiping <guoyiping1@huawei.com>
---
 .../AccessibilityService/build.gradle         | 47 -------------------
 .../profile/accessibility_ability_config.json | 17 +++++++
 .../profile/accessibility_ability_config.xml  | 28 -----------
 3 files changed, 17 insertions(+), 75 deletions(-)
 delete mode 100644 AccessibilityService/AccessibilityService/build.gradle
 create mode 100644 AccessibilityService/AccessibilityService/entry/src/main/resources/base/profile/accessibility_ability_config.json
 delete mode 100644 AccessibilityService/AccessibilityService/entry/src/main/resources/base/profile/accessibility_ability_config.xml

diff --git a/AccessibilityService/AccessibilityService/build.gradle b/AccessibilityService/AccessibilityService/build.gradle
deleted file mode 100644
index b25795fc..00000000
--- a/AccessibilityService/AccessibilityService/build.gradle
+++ /dev/null
@@ -1,47 +0,0 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-apply plugin: 'com.huawei.ohos.app'
-
-//For instructions on signature configuration, see https://developer.harmonyos.com/cn/docs/documentation/doc-guides/ide_debug_device-0000001053822404#section1112183053510
-ohos {
-    compileSdkVersion 6
-    defaultConfig {
-        compatibleSdkVersion 4
-    }
-}
-
-buildscript {
-    repositories {
-        maven {
-            url 'https://repo.huaweicloud.com/repository/maven/'
-        }
-        maven {
-            url 'https://developer.huawei.com/repo/'
-        }
-        maven {
-            url 'http://repo.ark.tools.huawei.com/artifactory/maven-public'
-        }
-        maven {
-            url 'http://mirrors.tools.huawei.com/maven/'
-        }
-    }
-    dependencies {
-        classpath 'com.huawei.ohos:hap:2.4.5.0'
-    }
-}
-
-allprojects {
-    repositories {
-        maven {
-            url 'https://repo.huaweicloud.com/repository/maven/'
-        }
-        maven {
-            url 'https://developer.huawei.com/repo/'
-        }
-        maven {
-            url 'http://repo.ark.tools.huawei.com/artifactory/maven-public'
-        }
-        maven {
-            url 'http://mirrors.tools.huawei.com/maven/'
-        }
-    }
-}
diff --git a/AccessibilityService/AccessibilityService/entry/src/main/resources/base/profile/accessibility_ability_config.json b/AccessibilityService/AccessibilityService/entry/src/main/resources/base/profile/accessibility_ability_config.json
new file mode 100644
index 00000000..647d178c
--- /dev/null
+++ b/AccessibilityService/AccessibilityService/entry/src/main/resources/base/profile/accessibility_ability_config.json
@@ -0,0 +1,17 @@
+{
+"accessibility-ability":
+	{
+      "xmlns:ohos":"http://schemas.huawei.com/res/ohos",
+      "ohos:description":"$string:accessibility_service_description",
+      "ohos:accessibilityEventTypes":"typeAllMask",
+      "ohos:accessibilityFlags":"flagDefault|flagRequestFilterKeyEvents",
+      "ohos:accessibilityFeedbackType":"feedbackSpoken",
+      "ohos:notificationTimeout":"100",
+      "ohos:canRetrieveWindowContent":"true",
+      "ohos:nonInteractiveUiTimeout":"100",
+      "ohos:interactiveUiTimeout":"100",
+      "ohos:canRequestTouchExplorationMode":"true",
+      "ohos:canRequestFilterKeyEvents":"true",
+      "ohos:canControlMagnification":"true"
+	}
+}
\ No newline at end of file
diff --git a/AccessibilityService/AccessibilityService/entry/src/main/resources/base/profile/accessibility_ability_config.xml b/AccessibilityService/AccessibilityService/entry/src/main/resources/base/profile/accessibility_ability_config.xml
deleted file mode 100644
index 007d5a18..00000000
--- a/AccessibilityService/AccessibilityService/entry/src/main/resources/base/profile/accessibility_ability_config.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Copyright (c) 2021 Huawei Device Co., Ltd.
- 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.
- -->
-<accessibility-ability xmlns:ohos="http://schemas.huawei.com/res/ohos"
-                       ohos:description="$string:accessibility_service_description"
-                       ohos:accessibilityEventTypes="typeAllMask"
-                       ohos:accessibilityFlags="flagDefault|flagRequestFilterKeyEvents"
-                       ohos:accessibilityFeedbackType="feedbackSpoken"
-                       ohos:notificationTimeout="100"
-                       ohos:canRetrieveWindowContent="true"
-                       ohos:nonInteractiveUiTimeout="100"
-                       ohos:interactiveUiTimeout="100"
-                       ohos:canRequestTouchExplorationMode="true"
-                       ohos:canRequestFilterKeyEvents="true"
-                       ohos:canControlMagnification="true"
-/>
\ No newline at end of file
-- 
Gitee