From 5ba49f66a0fd4df0cb538ce7b628f896b9986e0c Mon Sep 17 00:00:00 2001 From: Michael Debertol Date: Sat, 5 Sep 2020 22:28:39 +0200 Subject: [PATCH] Fix top tab tray entry/exit animations --- .../mozilla/fenix/tabtray/TabTrayDialogFragment.kt | 4 ++++ app/src/main/res/anim/fade_in_down.xml | 14 ++++++++++++++ app/src/main/res/anim/fade_out_up.xml | 14 ++++++++++++++ app/src/main/res/values/styles.xml | 5 +++++ 4 files changed, 37 insertions(+) create mode 100644 app/src/main/res/anim/fade_in_down.xml create mode 100644 app/src/main/res/anim/fade_out_up.xml 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 ca5dfa50c..20c110afc 100644 --- a/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayDialogFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayDialogFragment.kt @@ -169,6 +169,10 @@ class TabTrayDialogFragment : AppCompatDialogFragment(), UserInteractionHandler val activity = activity as HomeActivity val isPrivate = activity.browsingModeManager.mode.isPrivate + if (requireContext().settings().useTopTabsTray) { + dialog?.window?.attributes?.windowAnimations = R.style.TopTabTrayAnimation + } + val thumbnailLoader = ThumbnailLoader(requireContext().components.core.thumbnailStorage) val adapter = FenixTabsAdapter(requireContext(), thumbnailLoader) currentOrientation = resources.configuration.orientation diff --git a/app/src/main/res/anim/fade_in_down.xml b/app/src/main/res/anim/fade_in_down.xml new file mode 100644 index 000000000..f28805739 --- /dev/null +++ b/app/src/main/res/anim/fade_in_down.xml @@ -0,0 +1,14 @@ + + + + + + diff --git a/app/src/main/res/anim/fade_out_up.xml b/app/src/main/res/anim/fade_out_up.xml new file mode 100644 index 000000000..d7f1a58d6 --- /dev/null +++ b/app/src/main/res/anim/fade_out_up.xml @@ -0,0 +1,14 @@ + + + + + + diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index ec488d897..fbf1db2ec 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -274,6 +274,11 @@ @anim/fade_out + +