From 7c0e15200d5de8551baa94906b4f02d07fddb8ec Mon Sep 17 00:00:00 2001
From: "xiaoyan159@6800H" <xiaoyan159@163.com>
Date: Wed, 11 Dec 2024 18:08:28 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E6=89=93=E5=8C=85?=
 =?UTF-8?q?=E7=AD=BE=E5=90=8D=E7=9A=84=E8=84=9A=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Settings/build.gradle                         | 35 +++++++++++++
 ...content_protection_preference_fragment.xml | 50 -------------------
 .../layout/private_space_confirm_deletion.xml | 33 ------------
 3 files changed, 35 insertions(+), 83 deletions(-)
 delete mode 100644 Settings/res/layout/content_protection_preference_fragment.xml
 delete mode 100644 app/src/main/res/layout/private_space_confirm_deletion.xml

diff --git a/Settings/build.gradle b/Settings/build.gradle
index 30c98931..e895afa1 100644
--- a/Settings/build.gradle
+++ b/Settings/build.gradle
@@ -71,6 +71,40 @@ android {
     composeOptions {
         kotlinCompilerExtensionVersion = '1.5.0' // 假设1.4.0支持Kotlin 1.9.0
     }
+
+    lintOptions {
+        checkReleaseBuilds false
+        abortOnError false
+    }
+
+    signingConfigs {
+        platform {
+            storeFile file("platform.jks")
+            storePassword 'android'
+            keyAlias 'androidkey'
+            keyPassword 'android'
+        }
+    }
+
+    buildTypes {
+        release {
+            debuggable false
+            minifyEnabled false
+            signingConfig signingConfigs.platform
+        }
+
+        debug {
+            debuggable false
+            minifyEnabled false
+            signingConfig signingConfigs.platform
+        }
+
+        applicationVariants.all { variant ->
+            variant.outputs.all {
+                outputFileName = "BSettings.apk"
+            }
+        }
+    }
 }
 
 dependencies {
@@ -183,6 +217,7 @@ dependencies {
     implementation libs.zxing
     implementation files('../libs/settingslib_media_flags_lib.jar')
     implementation files('../libs/core-all.jar')
+    implementation files('../libs/android.hidl.base-V1.0-java.jar')
     implementation libs.dagger
     annotationProcessor libs.dagger.compiler
 }
diff --git a/Settings/res/layout/content_protection_preference_fragment.xml b/Settings/res/layout/content_protection_preference_fragment.xml
deleted file mode 100644
index f85f2d1f..00000000
--- a/Settings/res/layout/content_protection_preference_fragment.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2023 The Android Open Source Project
-
-     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.
--->
-<PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res-auto"
-    android:key="content_protection_preference_subpage"
-    android:title="@string/content_protection_preference_title">
-
-    <com.android.settingslib.widget.TopIntroPreference
-        android:key="content_protection_preference_top_intro"
-        android:title="@string/content_protection_preference_subpage_summary"
-        settings:searchable="false"/>
-
-    <com.android.settings.widget.SettingsMainSwitchPreference
-        android:key="content_protection_preference_user_consent_switch"
-        android:title="@string/content_protection_preference_user_consent_switch_title"
-        settings:controller=
-              "com.android.settings.security.ContentProtectionTogglePreferenceController"/>
-
-    <com.android.settingslib.widget.IllustrationPreference
-        android:key="content_protection_preference_subpage_illustration"
-        android:selectable="false"
-        settings:lottie_rawRes="@drawable/content_protection_preference_illustration"
-        settings:searchable="false" />
-
-    <com.android.settingslib.RestrictedSwitchPreference
-        android:key="content_protection_preference_user_consent_work_profile_switch"
-        android:title="@string/content_protection_preference_user_consent_work_profile_switch_title"
-        settings:controller="com.android.settings.security.ContentProtectionWorkSwitchController"
-        settings:restrictedSwitchSummary="@string/summary_placeholder"
-        settings:useAdditionalSummary="true"/>
-
-    <com.android.settingslib.widget.FooterPreference
-        android:key="content_protection_preference_subpage_footer"
-        android:title="@string/content_protection_preference_subpage_info" />
-</PreferenceScreen>
diff --git a/app/src/main/res/layout/private_space_confirm_deletion.xml b/app/src/main/res/layout/private_space_confirm_deletion.xml
deleted file mode 100644
index 7a0476de..00000000
--- a/app/src/main/res/layout/private_space_confirm_deletion.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2024 The Android Open Source Project
-  ~
-  ~ 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.
-  -->
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <com.google.android.setupdesign.GlifLoadingLayout
-        android:id="@+id/private_space_delete_confirm"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:icon="@drawable/ic_delete_accent"
-        app:sudUsePartnerHeavyTheme="true"
-        app:sudIllustrationType="default"
-        app:sudDescriptionText="@string/private_space_confirm_deletion_summary"
-        app:sucHeaderText="@string/private_space_confirm_deletion_header" />
-</FrameLayout>
\ No newline at end of file