From 4e9100e70631b4fce4800760fb8be5347e01c85d Mon Sep 17 00:00:00 2001 From: fanchenxuan Date: Tue, 22 Mar 2022 15:55:31 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=A3=80=E8=A7=86?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: fanchenxuan --- .../com.ohos.permissionmanager/build.gradle | 15 +++++++++++++++ .../com.ohos.permissionmanager/gradle.properties | 15 +++++++++++++++ .../src/main/resources/base/element/string.json | 4 ++-- .../main/resources/base/media/ic_call_logs.svg | 1 - .../src/main/resources/base/media/ic_exercise.svg | 1 - .../src/main/resources/base/media/ic_forward.svg | 1 - .../com.ohos.permissionmanager/settings.gradle | 15 +++++++++++++++ 7 files changed, 47 insertions(+), 5 deletions(-) diff --git a/frameworks/com.ohos.permissionmanager/build.gradle b/frameworks/com.ohos.permissionmanager/build.gradle index 924a888a1..c9491d0e8 100644 --- a/frameworks/com.ohos.permissionmanager/build.gradle +++ b/frameworks/com.ohos.permissionmanager/build.gradle @@ -1,3 +1,18 @@ +/* + * Copyright (c) 2021-2022 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. + */ + // Top-level build file where you can add configuration options common to all sub-projects/modules. apply plugin: 'com.huawei.ohos.app' diff --git a/frameworks/com.ohos.permissionmanager/gradle.properties b/frameworks/com.ohos.permissionmanager/gradle.properties index be492496f..eff9877ed 100644 --- a/frameworks/com.ohos.permissionmanager/gradle.properties +++ b/frameworks/com.ohos.permissionmanager/gradle.properties @@ -1,3 +1,18 @@ +# +# Copyright (c) 2021-2022 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. +# + # Project-wide Gradle settings. # IDE (e.g. DevEco Studio) users: # Gradle settings configured through the IDE *will override* diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/element/string.json b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/element/string.json index f505eefa0..bccb54162 100644 --- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/element/string.json +++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/element/string.json @@ -46,7 +46,7 @@ }, { "name": "authority_message", - "value": "近7天的应用访问权限" + "value": "近 7 天的应用访问权限" }, { "name": "other_permissions", @@ -78,7 +78,7 @@ }, { "name": "location_info_message", - "value": "系统定位服务开关开启时，已允许19个应用获取此设备的位置。" + "value": "系统定位服务开关开启时，已允许 19 个应用获取此设备的位置。" }, { "name": "description_grantability", diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/media/ic_call_logs.svg b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/media/ic_call_logs.svg index 42f8ad97c..792777f91 100644 --- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/media/ic_call_logs.svg +++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/media/ic_call_logs.svg @@ -1,5 +1,4 @@ - diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/media/ic_exercise.svg b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/media/ic_exercise.svg index b488a4243..e31feee74 100644 --- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/media/ic_exercise.svg +++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/media/ic_exercise.svg @@ -1,5 +1,4 @@ - - diff --git a/frameworks/com.ohos.permissionmanager/settings.gradle b/frameworks/com.ohos.permissionmanager/settings.gradle index 4bc3f8f55..e34e79a3b 100644 --- a/frameworks/com.ohos.permissionmanager/settings.gradle +++ b/frameworks/com.ohos.permissionmanager/settings.gradle @@ -1 +1,16 @@ +/* + * Copyright (c) 2021-2022 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. + */ + include ':entry', ':permissionmanager' -- Gitee From 390c8ea81f5fbe0e636314ad1bcb89a73f8fe016 Mon Sep 17 00:00:00 2001 From: fanchenxuan Date: Tue, 22 Mar 2022 16:30:42 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=A3=80=E8=A7=86?= =?UTF-8?q?=E4=BF=AE=E6=94=B9.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: fanchenxuan --- .../src/main/resources/base/element/string.json | 8 -------- 1 file changed, 8 deletions(-) diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/element/string.json b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/element/string.json index bccb54162..7d352989d 100644 --- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/element/string.json +++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/element/string.json @@ -44,10 +44,6 @@ "name": "authority_tertiary_description", "value": "个应用获取此权限" }, - { - "name": "authority_message", - "value": "近 7 天的应用访问权限" - }, { "name": "other_permissions", "value": "其它权限" @@ -76,10 +72,6 @@ "name": "banned", "value": "已禁止" }, - { - "name": "location_info_message", - "value": "系统定位服务开关开启时，已允许 19 个应用获取此设备的位置。" - }, { "name": "description_grantability", "value": "eTS_Empty Ability" -- Gitee