From a014a763a28f114703eb162811f95d4cc246259c Mon Sep 17 00:00:00 2001
From: Fan <732388462@qq.com>
Date: Thu, 13 Jun 2024 23:07:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E5=BC=80=E5=8F=91?=
 =?UTF-8?q?=E8=80=85=E9=80=89=E9=A1=B9=E9=97=AA=E9=80=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复 系统界面-状态栏-图标和时钟指示器白屏
---
 .../ui/sub/systemui/StatusBarSettings.java     |  8 ++++----
 app/src/main/res/xml/framework_volume.xml      |  4 ++--
 app/src/main/res/xml/home_dock.xml             | 18 +++++++++---------
 app/src/main/res/xml/home_drawer.xml           |  4 ++--
 app/src/main/res/xml/prefs_settings.xml        |  9 +++++----
 5 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/StatusBarSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/StatusBarSettings.java
index 349f8571de..5a200ab312 100644
--- a/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/StatusBarSettings.java
+++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/sub/systemui/StatusBarSettings.java
@@ -58,11 +58,11 @@ public void initPrefs() {
         mToastStatus.setVisible(isHyperOSVersion(1f));
 
         if (isMoreHyperOSVersion(1f)) {
-            mIconManager.setFragment("com.sevtinge.hyperceiler.ui.fragment.systemui.statusbar.IconManageNewSettings");
-            mClockStatus.setFragment("com.sevtinge.hyperceiler.ui.fragment.systemui.statusbar.NewClockIndicatorSettings");
+            mIconManager.setFragment("com.sevtinge.hyperceiler.ui.sub.systemui.statusbar.IconManageNewSettings");
+            mClockStatus.setFragment("com.sevtinge.hyperceiler.ui.sub.systemui.statusbar.NewClockIndicatorSettings");
         } else {
-            mIconManager.setFragment("com.sevtinge.hyperceiler.ui.fragment.systemui.statusbar.IconManageSettings");
-            mClockStatus.setFragment("com.sevtinge.hyperceiler.ui.fragment.systemui.statusbar.ClockIndicatorSettings");
+            mIconManager.setFragment("com.sevtinge.hyperceiler.ui.sub.systemui.statusbar.IconManageSettings");
+            mClockStatus.setFragment("com.sevtinge.hyperceiler.ui.sub.systemui.statusbar.ClockIndicatorSettings");
         }
 
         mStatusBarLayout.setVisible(!isMoreHyperOSVersion(1f));
diff --git a/app/src/main/res/xml/framework_volume.xml b/app/src/main/res/xml/framework_volume.xml
index cc37a11086..f7dfaedf4c 100644
--- a/app/src/main/res/xml/framework_volume.xml
+++ b/app/src/main/res/xml/framework_volume.xml
@@ -39,7 +39,7 @@
         android:summary="@string/system_framework_volume_media_steps_desc"
         android:title="@string/system_framework_volume_media_steps" />
 
-    <SeekBarPreferenceEx
+    <SeekBarPreference
         android:defaultValue="15"
         android:dependency="prefs_key_system_framework_volume_media_steps_enable"
         android:key="prefs_key_system_framework_volume_media_steps"
@@ -51,7 +51,7 @@
         app:showSeekBarValue="true"
         app:stepValue="1" />
 
-    <SeekBarPreferenceEx
+    <SeekBarPreference
         android:defaultValue="0"
         android:key="prefs_key_system_framework_volume_steps"
         android:title="@string/system_framework_volume_steps"
diff --git a/app/src/main/res/xml/home_dock.xml b/app/src/main/res/xml/home_dock.xml
index b098234340..990f1adacb 100644
--- a/app/src/main/res/xml/home_dock.xml
+++ b/app/src/main/res/xml/home_dock.xml
@@ -64,7 +64,7 @@
             android:key="prefs_key_home_dock_bg_custom"
             android:title="@string/home_dock_bg_custom" />
 
-        <SeekBarPreferenceEx
+        <SeekBarPreference
             android:defaultValue="150"
             android:dependency="prefs_key_home_dock_bg_custom_enable"
             android:key="prefs_key_home_dock_bg_height"
@@ -76,7 +76,7 @@
             app:showSeekBarValue="true"
             app:stepValue="1" />
 
-        <SeekBarPreferenceEx
+        <SeekBarPreference
             android:defaultValue="25"
             android:dependency="prefs_key_home_dock_bg_custom_enable"
             android:key="prefs_key_home_dock_bg_margin_horizontal"
@@ -88,7 +88,7 @@
             app:showSeekBarValue="true"
             app:stepValue="1" />
 
-        <!--SeekBarPreferenceEx
+        <!--SeekBarPreference
             android:key="prefs_key_home_dock_bg_margin_top"
             android:dependency="prefs_key_home_dock_bg_custom_enable"
             android:title="@string/top_margin"
@@ -100,7 +100,7 @@
             app:format="%d dp"
             app:showSeekBarValue="true" /-->
 
-        <SeekBarPreferenceEx
+        <SeekBarPreference
             android:defaultValue="15"
             android:dependency="prefs_key_home_dock_bg_custom_enable"
             android:key="prefs_key_home_dock_bg_margin_bottom"
@@ -112,7 +112,7 @@
             app:showSeekBarValue="true"
             app:stepValue="1" />
 
-        <SeekBarPreferenceEx
+        <SeekBarPreference
             android:defaultValue="30"
             android:dependency="prefs_key_home_dock_bg_custom_enable"
             android:key="prefs_key_home_dock_bg_radius"
@@ -123,7 +123,7 @@
             app:showSeekBarValue="true"
             app:stepValue="1" />
 
-        <SeekBarPreferenceEx
+        <SeekBarPreference
             android:defaultValue="200"
             android:dependency="prefs_key_home_dock_bg_custom_enable"
             android:key="prefs_key_custom_background_blur_degree"
@@ -140,7 +140,7 @@
             android:key="prefs_key_home_dock_bg_color"
             android:title="@string/home_dock_bg_color" />
 
-        <!--<SeekBarPreferenceEx
+        <!--<SeekBarPreference
             android:key="prefs_key_home_dock_icon_margin_bottom"
             android:title="@string/home_dock_icon_margin_bottom"
             android:summary="@string/home_dock_icon_margin_bottom_desc"
@@ -150,7 +150,7 @@
             app:stepValue="1"
             android:dependency="prefs_key_home_dock_bg_custom_enable" />
 
-        <SeekBarPreferenceEx
+        <SeekBarPreference
             android:key="prefs_key_home_dock_icon_bottom_margin"
             android:title="@string/home_dock_icon_bottom_margin"
             android:defaultValue="35"
@@ -158,7 +158,7 @@
             app:stepValue="1"
             android:dependency="prefs_key_home_dock_bg_custom_enable" />
 
-        <SeekBarPreferenceEx
+        <SeekBarPreference
             android:key="prefs_key_home_dock_margin_bottom"
             android:title="@string/home_dock_margin_bottom"
             android:defaultValue="60"
diff --git a/app/src/main/res/xml/home_drawer.xml b/app/src/main/res/xml/home_drawer.xml
index b6abed62e7..189c69309e 100644
--- a/app/src/main/res/xml/home_drawer.xml
+++ b/app/src/main/res/xml/home_drawer.xml
@@ -27,7 +27,7 @@
             android:summary="@string/home_drawer_blur_desc"
             android:title="@string/home_drawer_blur_super" />
 
-        <SeekBarPreferenceEx
+        <SeekBarPreference
             android:defaultValue="30"
             android:dependency="prefs_key_home_drawer_blur_super"
             android:key="prefs_key_home_drawer_blur_super_radius"
@@ -38,7 +38,7 @@
             app:showSeekBarValue="true"
             app:stepValue="1" />
 
-        <SeekBarPreferenceEx
+        <SeekBarPreference
             android:defaultValue="200"
             android:dependency="prefs_key_home_drawer_blur_super"
             android:key="prefs_key_drawer_background_blur_degree"
diff --git a/app/src/main/res/xml/prefs_settings.xml b/app/src/main/res/xml/prefs_settings.xml
index 16e5b9c60d..9e3528a309 100644
--- a/app/src/main/res/xml/prefs_settings.xml
+++ b/app/src/main/res/xml/prefs_settings.xml
@@ -71,10 +71,11 @@
         <Preference
             android:fragment="com.sevtinge.hyperceiler.ui.sub.CommonFragment"
             android:key="prefs_key_development"
-            android:title="@string/development" />
-        <extra
-            android:name="contentResId"
-            android:value="prefs_development" />
+            android:title="@string/development" >
+            <extra
+                android:name="contentResId"
+                android:value="prefs_development" />
+        </Preference>
     </PreferenceCategory>
 
 </PreferenceScreen>