fix: SettingsLib剩余AudioAttributes引用等待处理

SettingsLib/ActionButtonsPreference/res/drawable/half_rounded_left_bk.xml

@@ -20,7 +20,7 @@
        xmlns:tools="http://schemas.android.com/tools"
        tools:targetApi="28"
        android:shape="rectangle">
-    <solid android:color="?androidprv:attr/colorSurface" />
+    <solid android:color="?attr/colorSurface" />
     <corners
         android:topLeftRadius="?android:attr/dialogCornerRadius"
         android:topRightRadius="0dp"

SettingsLib/ActionButtonsPreference/res/drawable/half_rounded_right_bk.xml

@@ -20,7 +20,7 @@
        xmlns:tools="http://schemas.android.com/tools"
        tools:targetApi="28"
        android:shape="rectangle">
-    <solid android:color="?androidprv:attr/colorSurface" />
+    <solid android:color="?attr/colorSurface" />
     <corners
         android:topLeftRadius="0dp"
         android:topRightRadius="?android:attr/dialogCornerRadius"

SettingsLib/ActionButtonsPreference/res/drawable/rounded_bk.xml

@@ -20,7 +20,7 @@
        xmlns:tools="http://schemas.android.com/tools"
        tools:targetApi="28"
        android:shape="rectangle">
-    <solid android:color="?androidprv:attr/colorSurface" />
+    <solid android:color="?attr/colorSurface" />
     <corners
         android:radius="?android:attr/dialogCornerRadius"
     />

SettingsLib/ActionButtonsPreference/res/drawable/square_bk.xml

@@ -18,7 +18,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
        android:shape="rectangle">
-    <solid android:color="?androidprv:attr/colorSurface" />
+    <solid android:color="?attr/colorSurface" />
     <corners
         android:radius="0dp"
     />

SettingsLib/ActionButtonsPreference/res/values/attrs.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 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.
+-->
+
+<resources>
+    <!-- 自己添加的资源引用 -->
+    <attr name="textColorOnAccent" format="color" />
+    <attr name="colorAccentPrimaryVariant" format="color" />
+    <attr name="colorAccentPrimary" format="color" />
+    <attr name="colorSurface" format="color" />
+</resources>

SettingsLib/build.gradle

@@ -48,16 +48,18 @@ android {
 
 dependencies {
 //    implementation "androidx.annotation:annotation:1.0.0"
-//    implementation files('../libs/localbroadcastmanager-1.1.0-alpha02.aar')
+    implementation libs.localbroadcastmanager
     implementation libs.room.runtime
     implementation libs.sqlite
     implementation files('../libs/zxing-core.jar')
     // Android14\out\soong\.intermediates\external\guava\guava\android_common\turbine-combined
-//    implementation files('../libs/guava.jar')
+//    implementation(files('../libs/guava.jar'))
+    implementation libs.guava
 
-//    implementation files('../libs/WifiTrackerLibRes.jar')
+    implementation project(':WifiTrackerLib')
     implementation project(':iconloaderlib')
     implementation project(':setupdesign')
+    implementation project(':setupcompat')
 
     implementation project(':SettingsLib:ActionBarShadow')
     implementation project(':SettingsLib:ActionButtonsPreference')
@@ -95,4 +97,12 @@ dependencies {
 
 
     implementation libs.preference
+    implementation libs.concurrent.futures.ktx
+    implementation files('../libs/core-all.jar')
+}
+
+configurations.configureEach {
+    exclude group: 'com.google.common.util.concurrent', module: 'listenablefuture'
+    exclude group: 'android.icu.*', module: 'core-all'
+    exclude group: 'com.google.common.util.concurrent.ListenableFuture', module: 'guava'
 }

SettingsLib/res/drawable/broadcast_dialog_btn_bg.xml

@@ -18,6 +18,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
        android:shape="rectangle">
-    <solid android:color="?androidprv:attr/colorAccentPrimary" />
+    <solid android:color="?attr/colorAccentPrimary" />
     <corners android:radius="@dimen/broadcast_dialog_btn_radius" />
 </shape>

SettingsLib/res/drawable/dialog_btn_filled.xml

@@ -28,7 +28,7 @@
         <item>
             <shape android:shape="rectangle">
                 <corners android:radius="@dimen/button_corner_radius"/>
-                <solid android:color="?androidprv:attr/colorAccentPrimary"/>
+                <solid android:color="?attr/colorAccentPrimary"/>
                 <padding android:left="@dimen/dialog_button_horizontal_padding"
                          android:top="@dimen/dialog_button_vertical_padding"
                          android:right="@dimen/dialog_button_horizontal_padding"

SettingsLib/res/drawable/dialog_btn_outline.xml

@@ -29,7 +29,7 @@
             <shape android:shape="rectangle">
                 <corners android:radius="@dimen/button_corner_radius"/>
                 <solid android:color="@android:color/transparent"/>
-                <stroke android:color="?androidprv:attr/colorAccentPrimaryVariant"
+                <stroke android:color="?attr/colorAccentPrimaryVariant"
                         android:width="1dp"/>
                 <padding android:left="@dimen/dialog_button_horizontal_padding"
                          android:top="@dimen/dialog_button_vertical_padding"

SettingsLib/res/values/attrs.xml

@@ -50,4 +50,8 @@
     <attr name="preferenceStyle" format="reference" />
     <attr name="switchPreferenceStyle" format="reference" />
 
+    <!-- 自己添加的资源引用 -->
+    <attr name="textColorOnAccent" format="color" />
+    <attr name="colorAccentPrimaryVariant" format="color" />
+    <attr name="colorAccentPrimary" format="color" />
 </resources>

SettingsLib/res/values/styles.xml

@@ -74,7 +74,7 @@
     </style>
 
     <style name="TextAppearanceBroadcastDialogButton" parent="@android:TextAppearance.DeviceDefault.Headline">
-        <item name="android:textColor">?androidprv:attr/textColorOnAccent</item>
+        <item name="android:textColor">?attr/textColorOnAccent</item>
         <item name="android:textSize">@dimen/broadcast_dialog_btn_text_size</item>
     </style>
 
@@ -94,7 +94,7 @@
 
     <style name="DialogButtonPositive">
         <item name="android:background">@drawable/dialog_btn_filled</item>
-        <item name="android:textColor">?androidprv:attr/textColorOnAccent</item>
+        <item name="android:textColor">?attr/textColorOnAccent</item>
         <item name="android:textSize">14sp</item>
         <item name="android:lineHeight">20sp</item>
         <item name="android:fontFamily">@*android:string/config_bodyFontFamilyMedium</item>