From 961f7f9b6d9069a058cbe16fcb4fda3e9ff9e459 Mon Sep 17 00:00:00 2001 From: arkon Date: Tue, 4 Aug 2020 08:56:30 -0400 Subject: [PATCH] Fix toolbar being expanded when opening preference dialogs (cherry picked from commit 885ace111e115454554dfa0f8fd8bb2b33271097) --- app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt index c2d62a427..abb8afee8 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt @@ -10,6 +10,7 @@ import android.view.ViewGroup import android.widget.Toast import androidx.coordinatorlayout.widget.CoordinatorLayout import androidx.core.view.isVisible +import androidx.preference.PreferenceDialogController import com.bluelinelabs.conductor.Conductor import com.bluelinelabs.conductor.Controller import com.bluelinelabs.conductor.ControllerChangeHandler @@ -393,6 +394,9 @@ class MainActivity : BaseActivity() { if (from is DialogController || to is DialogController) { return } + if (from is PreferenceDialogController || to is PreferenceDialogController) { + return + } supportActionBar?.setDisplayHomeAsUpEnabled(router.backstackSize != 1)