diff options
| author | Paul DiPietro <pauldipietro@users.noreply.github.com> | 2016-09-13 06:39:02 -0500 |
|---|---|---|
| committer | Rui Marinho <me@ruimarinho.net> | 2016-09-13 12:39:02 +0100 |
| commit | 06698acfb981431e44b9b1444823033dfffac3ee (patch) | |
| tree | a576d79fbdb22328e9ea18923950db728fbcc26f /Xamarin.Forms.Platform.Android/AppCompat | |
| parent | e49be51ad54690040fd78e6c4b5061e2ff6860f2 (diff) | |
| download | xamarin-forms-06698acfb981431e44b9b1444823033dfffac3ee.tar.gz xamarin-forms-06698acfb981431e44b9b1444823033dfffac3ee.tar.bz2 xamarin-forms-06698acfb981431e44b9b1444823033dfffac3ee.zip | |
[A] Fix regression on NavAnimationInProgress (#341)
Diffstat (limited to 'Xamarin.Forms.Platform.Android/AppCompat')
| -rw-r--r-- | Xamarin.Forms.Platform.Android/AppCompat/NavigationPageRenderer.cs | 4 |
1 files changed, 1 insertions, 3 deletions
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 |