From 27341eaaf44c966e07f114496a362b7742480ae1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hakk=C4=B1=20Kaan=20=C3=87al=C4=B1=C5=9Fkan?= Date: Wed, 15 Jul 2020 14:35:22 +0300 Subject: [PATCH] For #12585: Close tab tray menu on orientation changes --- .../java/org/mozilla/fenix/tabtray/TabTrayDialogFragment.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayDialogFragment.kt b/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayDialogFragment.kt index a4417ef15..cfe8b0f1c 100644 --- a/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayDialogFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayDialogFragment.kt @@ -61,6 +61,7 @@ class TabTrayDialogFragment : AppCompatDialogFragment(), UserInteractionHandler private val tabsFeature = ViewBoundFeatureWrapper() private var _tabTrayView: TabTrayView? = null + private var currentOrientation: Int? = null private val tabTrayView: TabTrayView get() = _tabTrayView!! private lateinit var tabTrayDialogStore: TabTrayDialogFragmentStore @@ -154,9 +155,10 @@ class TabTrayDialogFragment : AppCompatDialogFragment(), UserInteractionHandler val isLandscape = newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE tabTrayView.setTopOffset(isLandscape) - if (isLandscape) { + if (newConfig.orientation != currentOrientation) { tabTrayView.dismissMenu() tabTrayView.expand() + currentOrientation = newConfig.orientation } } @@ -168,6 +170,7 @@ class TabTrayDialogFragment : AppCompatDialogFragment(), UserInteractionHandler val thumbnailLoader = ThumbnailLoader(requireContext().components.core.thumbnailStorage) val adapter = FenixTabsAdapter(requireContext(), thumbnailLoader) + currentOrientation = resources.configuration.orientation _tabTrayView = TabTrayView( view.tabLayout,