From 06698acfb981431e44b9b1444823033dfffac3ee Mon Sep 17 00:00:00 2001 From: Paul DiPietro Date: Tue, 13 Sep 2016 06:39:02 -0500 Subject: [A] Fix regression on NavAnimationInProgress (#341) --- Xamarin.Forms.Platform.Android/AppCompat/NavigationPageRenderer.cs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'Xamarin.Forms.Platform.Android/AppCompat') diff --git a/Xamarin.Forms.Platform.Android/AppCompat/NavigationPageRenderer.cs b/Xamarin.Forms.Platform.Android/AppCompat/NavigationPageRenderer.cs index 396fe130..b2b9108a 100644 --- a/Xamarin.Forms.Platform.Android/AppCompat/NavigationPageRenderer.cs +++ b/Xamarin.Forms.Platform.Android/AppCompat/NavigationPageRenderer.cs @@ -607,8 +607,6 @@ namespace Xamarin.Forms.Platform.Android.AppCompat transaction.Show(toShow); else transaction.Add(Id, toShow); - - ((Platform)Element.Platform).NavAnimationInProgress = false; } else { @@ -617,7 +615,6 @@ namespace Xamarin.Forms.Platform.Android.AppCompat transaction.Hide(currentToHide); transaction.Add(Id, fragment); fragments.Add(fragment); - ((Platform)Element.Platform).NavAnimationInProgress = false; } } transaction.Commit(); @@ -657,6 +654,7 @@ namespace Xamarin.Forms.Platform.Android.AppCompat } Context.HideKeyboard(this); + ((Platform)Element.Platform).NavAnimationInProgress = false; // 200ms is how long the animations are, and they are "reversible" in the sense that starting another one slightly before it's done is fine -- cgit v1.2.3