From 33eb26861d7fa06cbf4e4ce584e3ae8726d50f20 Mon Sep 17 00:00:00 2001
From: Emily Kager <ekager@mozilla.com>
Date: Wed, 5 Jun 2019 18:37:58 -0700
Subject: [PATCH] For #3141 For #3142 Do not try to fade BrowserFragment in
 transitions (#3195)

---
 .../mozilla/fenix/components/toolbar/ToolbarIntegration.kt    | 2 +-
 app/src/main/res/navigation/nav_graph.xml                     | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarIntegration.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarIntegration.kt
index e4e224dd7..67274c1ad 100644
--- a/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarIntegration.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarIntegration.kt
@@ -58,7 +58,7 @@ class ToolbarIntegration(
                         toolbar.hideKeyboard()
                         // We need to dynamically add the options here because if you do it in XML it overwrites
                         val options = NavOptions.Builder().setPopUpTo(R.id.homeFragment, true)
-                            .setEnterAnim(R.anim.fade_in).setExitAnim(R.anim.fade_out).build()
+                            .setEnterAnim(R.anim.fade_in).build()
                         val extras =
                             FragmentNavigator.Extras.Builder()
                                 .addSharedElement(
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
index 60c6f8eba..322de0cf6 100644
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -32,10 +32,8 @@
         <action
             android:id="@+id/action_homeFragment_to_browserFragment"
             app:destination="@id/browserFragment"
-            app:enterAnim="@anim/fade_in"
             app:exitAnim="@anim/fade_out"
-            app:popEnterAnim="@anim/fade_in"
-            app:popExitAnim="@anim/fade_out" />
+            app:popEnterAnim="@anim/fade_in" />
         <action
             android:id="@+id/action_homeFragment_to_libraryFragment"
             app:destination="@id/libraryFragment" />