From 926fa22909a0afb36311bd0a085ee2784217284e Mon Sep 17 00:00:00 2001 From: Jeff Boek Date: Thu, 24 Jan 2019 12:54:00 -0800 Subject: [PATCH] Fixes transition to browserFragment --- app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt | 2 +- app/src/main/res/layout/fragment_search.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt b/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt index 4d640c96c..b047ea37e 100644 --- a/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt @@ -70,7 +70,7 @@ class SearchFragment : Fragment() { private fun userDidSearch() { val extras = FragmentNavigator.Extras.Builder().addSharedElement( - toolbar_wrapper, ViewCompat.getTransitionName(toolbar_wrapper)!! + toolbar, ViewCompat.getTransitionName(toolbar)!! ).build() Navigation.findNavController(toolbar).navigate(R.id.action_searchFragment_to_browserFragment, null, null, extras) } diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml index f38461aa6..7f179d50c 100644 --- a/app/src/main/res/layout/fragment_search.xml +++ b/app/src/main/res/layout/fragment_search.xml @@ -21,7 +21,6 @@ android:clipToPadding="false" android:elevation="5dp" android:outlineProvider="paddedBounds" - android:transitionName="firstTransitionName" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"> @@ -34,7 +33,8 @@ android:background="@android:color/white" android:clickable="true" android:focusable="true" - android:focusableInTouchMode="true" /> + android:focusableInTouchMode="true" + android:transitionName="firstTransitionName" />