adj：hide #492 (Because this method does not take effect on the new ve…

…rsion of the system launcher, waiting for troubleshooting)
ReChronoRain · Mar 26, 2024 · 40e6590 · 40e6590
1 parent 3d780c5
commit 40e6590
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 14 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -75,7 +75,7 @@ jobs:
           BOT_TOKEN: ${{ secrets.BOT_TOKEN }}
           CANARY: ${{ env.APK_FILE_CANARY }}
           COMMIT_MESSAGE: |+
-            New push to GitHub Action
+            New push to GitHub
             ```
             ${{ github.event.head_commit.message }}
             ```by `${{ github.event.head_commit.author.name }}`

diff --git a/.github/workflows/android_pr.yml b/.github/workflows/android_pr.yml
@@ -57,7 +57,7 @@ jobs:
           BOT_TOKEN: ${{ secrets.BOT_TOKEN }}
           DEBUG: ${{ env.APK_FILE_DEBUG }}
           COMMIT_MESSAGE:  |+
-            New push to GitHub Action
+            New push to GitHub
             by `${{ github.triggering_actor }}`
             See commit detail [here](${{ github.event.head_commit.url }})
         run: |

diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/app/Home.java b/app/src/main/java/com/sevtinge/hyperceiler/module/app/Home.java
@@ -253,7 +253,7 @@ public void handleLoadPackage() {
         initHook(ShowDockIconTitle.INSTANCE, mPrefsMap.getBoolean("home_dock_icon_title"));
         initHook(new HideNavigationBar(), mPrefsMap.getBoolean("system_ui_hide_navigation_bar"));
         initHook(DisableRecentsIcon.INSTANCE, mPrefsMap.getBoolean("home_dock_disable_recents_icon"));
-        initHook(SlideUpOnlyShowDock.INSTANCE, mPrefsMap.getBoolean("home_dock_slide_up_only_show_dock"));
+        initHook(SlideUpOnlyShowDock.INSTANCE, mPrefsMap.getBoolean("home_dock_slide_up_only_show_dock") && !mPrefsMap.getBoolean("home_dock_hide_dock"));
         initHook(HideDock.INSTANCE, mPrefsMap.getBoolean("home_dock_hide_dock"));
 
         // 其他

diff --git a/app/src/main/res/xml/home_dock.xml b/app/src/main/res/xml/home_dock.xml
@@ -22,6 +22,22 @@
         android:key="prefs_key_home_dock_disable_recents_icon"
         android:title="@string/home_dock_disable_recents_icon" />
 
+    <SwitchPreference
+        android:defaultValue="false"
+        android:disableDependentsState="true"
+        android:key="prefs_key_home_dock_hide_dock"
+        android:summary="@string/home_dock_hide_dock_desc"
+        android:title="@string/home_dock_hide_dock"
+        app:isPreferenceVisible="false" />
+
+    <SwitchPreference
+        android:defaultValue="false"
+        android:dependency="prefs_key_home_dock_hide_dock"
+        android:key="prefs_key_home_dock_slide_up_only_show_dock"
+        android:summary="@string/home_dock_slide_up_only_show_dock_desc"
+        android:title="@string/home_dock_slide_up_only_show_dock"
+        app:isPreferenceVisible="false" />
+
     <PreferenceCategory>
         <SwitchPreference
             android:defaultValue="false"
@@ -128,15 +144,4 @@
             android:dependency="prefs_key_home_dock_bg_custom_enable" />-->
 
     </PreferenceCategory>
-    <SwitchPreference
-        android:defaultValue="false"
-        android:key="prefs_key_home_dock_slide_up_only_show_dock"
-        android:summary="@string/home_dock_slide_up_only_show_dock_desc"
-        android:title="@string/home_dock_slide_up_only_show_dock" />
-
-    <SwitchPreference
-        android:defaultValue="false"
-        android:key="prefs_key_home_dock_hide_dock"
-        android:summary="@string/home_dock_hide_dock_desc"
-        android:title="@string/home_dock_hide_dock" />
 </PreferenceScreen>