diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 42e42ccb00..fc7ef31afa 100644 --- 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 index d1a6787592..da91ca9123 100644 --- 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 index 6b6b4d57dc..6bb6582541 100644 --- 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 index 98a415489c..8af2c6d5d1 100644 --- 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" /> + + + + --> - - - \ No newline at end of file