diff --git a/CarSettings/build.gradle b/CarSettings/build.gradle
index 2bb8d003..d64d5d9c 100644
--- a/CarSettings/build.gradle
+++ b/CarSettings/build.gradle
@@ -75,6 +75,7 @@ dependencies {
     implementation libs.car.ui.lib
     implementation files('../libs/car-apps-common.jar')
     implementation files('../libs/car-setup-wizard-lib-utils.jar')
+    implementation files('../libs/car-admin-ui-lib.jar')
     implementation(project(':WifiTrackerLib'))
     implementation(project(':SettingsLib'))
     implementation libs.constraintlayout.solver
diff --git a/CarSettings/res/values/colors.xml b/CarSettings/res/values/colors.xml
index 8b947272..9fe4f347 100644
--- a/CarSettings/res/values/colors.xml
+++ b/CarSettings/res/values/colors.xml
@@ -72,4 +72,9 @@
     <color name="user_disclaimer_text_color">@android:color/white</color>
     <!-- Background color of button. -->
     <color name="user_disclaimer_action_button_background_color">@*android:color/car_grey_868</color>
+    <color name="car_grey_400">@android:color/darker_gray</color>
+    <color name="car_grey_800">@android:color/darker_gray</color>
+    <color name="car_card_ripple_background">@android:color/darker_gray</color>
+    <color name="hero_button_background_color">@android:color/darker_gray</color>
+    <color name="secondary_text_color">@android:color/darker_gray</color>
 </resources>
\ No newline at end of file
diff --git a/CarSettings/res/values/dimens.xml b/CarSettings/res/values/dimens.xml
index 865ddd27..905afd67 100644
--- a/CarSettings/res/values/dimens.xml
+++ b/CarSettings/res/values/dimens.xml
@@ -216,5 +216,6 @@
     <dimen name="block_by_admin_icon_padding">@*android:dimen/car_padding_2</dimen>
 
     <dimen name="rounded_corner_radius">16dp</dimen>
+    <dimen name="hero_button_corner_radius">6dp</dimen>
 
 </resources>
diff --git a/SettingsLib/ActionButtonsPreference/res/drawable/half_rounded_left_bk.xml b/SettingsLib/ActionButtonsPreference/res/drawable/half_rounded_left_bk.xml
index 8a25726e..c0482af3 100644
--- a/SettingsLib/ActionButtonsPreference/res/drawable/half_rounded_left_bk.xml
+++ b/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"
diff --git a/SettingsLib/ActionButtonsPreference/res/drawable/half_rounded_right_bk.xml b/SettingsLib/ActionButtonsPreference/res/drawable/half_rounded_right_bk.xml
index 7e626e50..4887c64c 100644
--- a/SettingsLib/ActionButtonsPreference/res/drawable/half_rounded_right_bk.xml
+++ b/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"
diff --git a/SettingsLib/ActionButtonsPreference/res/drawable/rounded_bk.xml b/SettingsLib/ActionButtonsPreference/res/drawable/rounded_bk.xml
index 9f4980be..1482b98c 100644
--- a/SettingsLib/ActionButtonsPreference/res/drawable/rounded_bk.xml
+++ b/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"
     />
diff --git a/SettingsLib/ActionButtonsPreference/res/drawable/square_bk.xml b/SettingsLib/ActionButtonsPreference/res/drawable/square_bk.xml
index 67b51075..3466d2fc 100644
--- a/SettingsLib/ActionButtonsPreference/res/drawable/square_bk.xml
+++ b/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"
     />
diff --git a/SettingsLib/ActionButtonsPreference/res/values/attrs.xml b/SettingsLib/ActionButtonsPreference/res/values/attrs.xml
new file mode 100644
index 00000000..e266186f
--- /dev/null
+++ b/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>
diff --git a/SettingsLib/build.gradle b/SettingsLib/build.gradle
index 930246f6..76f907a2 100644
--- a/SettingsLib/build.gradle
+++ b/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'
 }
\ No newline at end of file
diff --git a/SettingsLib/res/drawable/broadcast_dialog_btn_bg.xml b/SettingsLib/res/drawable/broadcast_dialog_btn_bg.xml
index 5fd7ee29..dcece127 100644
--- a/SettingsLib/res/drawable/broadcast_dialog_btn_bg.xml
+++ b/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>
diff --git a/SettingsLib/res/drawable/dialog_btn_filled.xml b/SettingsLib/res/drawable/dialog_btn_filled.xml
index 0614f9db..423cc6c2 100644
--- a/SettingsLib/res/drawable/dialog_btn_filled.xml
+++ b/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"
diff --git a/SettingsLib/res/drawable/dialog_btn_outline.xml b/SettingsLib/res/drawable/dialog_btn_outline.xml
index a920b505..e3f73c54 100644
--- a/SettingsLib/res/drawable/dialog_btn_outline.xml
+++ b/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"
diff --git a/SettingsLib/res/values/attrs.xml b/SettingsLib/res/values/attrs.xml
index 1e6cb334..bbffa444 100644
--- a/SettingsLib/res/values/attrs.xml
+++ b/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>
diff --git a/SettingsLib/res/values/styles.xml b/SettingsLib/res/values/styles.xml
index 1249c6b7..34bc6c3f 100644
--- a/SettingsLib/res/values/styles.xml
+++ b/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>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 0dfa5c43..4b466234 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -21,6 +21,10 @@ lottie = "6.1.0"
 lifecycle-extensions = "2.2.0"
 car-ui-lib = "2.6.0"
 constraintlayout-solver = "2.0.4"
+concurrent-futures-ktx = "1.2.0"
+guava = "33.3.1-android"
+error_prone_annotations = "2.28.0"
+localbroadcastmanager = "1.0.0"
 
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
@@ -46,6 +50,10 @@ lifecycle-common-java8 = { group = "androidx.lifecycle", name = "lifecycle-commo
 lifecycle-extensions = { group = "androidx.lifecycle", name = "lifecycle-extensions", version.ref = "lifecycle-extensions" }
 car-ui-lib = { group = "com.android.car.ui", name = "car-ui-lib", version.ref = "car-ui-lib" }
 constraintlayout-solver = { group = "androidx.constraintlayout", name = "constraintlayout-solver", version.ref = "constraintlayout-solver" }
+concurrent-futures-ktx = { group = "androidx.concurrent", name = "concurrent-futures-ktx", version.ref = "concurrent-futures-ktx" }
+guava = {group = "com.google.guava", name = "guava", version.ref = "guava"}
+error_prone_annotations = {group = "com.google.errorprone", name = "error_prone_annotations", version.ref = "error_prone_annotations"}
+localbroadcastmanager = {group = "androidx.localbroadcastmanager", name = "localbroadcastmanager", version.ref = "localbroadcastmanager"}
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }
diff --git a/libs/car-admin-ui-lib.jar b/libs/car-admin-ui-lib.jar
new file mode 100644
index 00000000..cc2886d8
Binary files /dev/null and b/libs/car-admin-ui-lib.jar differ
diff --git a/libs/core-all.jar b/libs/core-all.jar
index 2f6eb3ec..d2af682b 100644
Binary files a/libs/core-all.jar and b/libs/core-all.jar differ
diff --git a/setupcompat/build.gradle b/setupcompat/build.gradle
index 0c19b8b5..4aef8d21 100644
--- a/setupcompat/build.gradle
+++ b/setupcompat/build.gradle
@@ -54,6 +54,6 @@ android {
 dependencies {
 //    implementation "androidx.annotation:annotation:1.0.0"
     implementation libs.window.window
-    implementation files('../libs/error_prone_annotations.jar')
+    implementation libs.error.prone.annotations
     implementation libs.androidx.annotation.annotation
 }
\ No newline at end of file
diff --git a/setupdesign/build.gradle b/setupdesign/build.gradle
index 72759492..bf2f2026 100644
--- a/setupdesign/build.gradle
+++ b/setupdesign/build.gradle
@@ -57,5 +57,5 @@ dependencies {
     implementation libs.recyclerview
     implementation libs.window.window
     implementation libs.material
-    implementation files('../libs/error_prone_annotations.jar')
+    implementation libs.error.prone.annotations
 }