diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/XFIssue/Issue892.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/XFIssue/Issue892.cs index 931e726d5339..1fd55826eae0 100644 --- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/XFIssue/Issue892.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/XFIssue/Issue892.cs @@ -31,7 +31,7 @@ public void Issue892TestsNavigateChangePagesNavigate() App.Tap("Present Flyout"); App.Tap(Page5); -#if ANDROID || WINDOWS // IsPresented value not reflected when changing on ItemTapped in FlyoutPage More Information: https://github.com/dotnet/maui/issues/26324. +#if WINDOWS // IsPresented value not reflected when changing on ItemTapped in FlyoutPage. App.WaitForElementTillPageNavigationSettled(Page5); App.TapInFlyoutPageFlyout("Close Flyout"); #else @@ -42,10 +42,10 @@ public void Issue892TestsNavigateChangePagesNavigate() void NavigateToEndAndBack(string BackButtonId) { - App.WaitForElement("Push next page"); + App.WaitForElement("Push next page"); App.Tap("Push next page"); - App.WaitForElement("Push next next page"); - App.Tap("Push next next page"); + App.WaitForElement("Push next next page"); + App.Tap("Push next next page"); App.WaitForElement("You are at the end of the line"); App.Tap("Check back one"); App.WaitForElement("Pop one"); diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/XFIssue/Issue973.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/XFIssue/Issue973.cs index 5efa742f189c..b9f8831f0070 100644 --- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/XFIssue/Issue973.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/XFIssue/Issue973.cs @@ -1,5 +1,4 @@ -#if TEST_FAILS_ON_ANDROID // IsPresented value is not reflected when change this on list view item tapped in flyout. Issue: https://github.com/dotnet/maui/issues/26324 -using NUnit.Framework; +using NUnit.Framework; using UITest.Appium; using UITest.Core; @@ -37,4 +36,3 @@ public void Issue973TestsTabResetAfterDetailSwap() App.WaitForElement("Page 4 Right aligned"); } } -#endif diff --git a/src/Core/src/Handlers/FlyoutView/FlyoutViewHandler.Android.cs b/src/Core/src/Handlers/FlyoutView/FlyoutViewHandler.Android.cs index 2f12a9f710e9..ee7db43b125a 100644 --- a/src/Core/src/Handlers/FlyoutView/FlyoutViewHandler.Android.cs +++ b/src/Core/src/Handlers/FlyoutView/FlyoutViewHandler.Android.cs @@ -255,8 +255,6 @@ void LayoutAsFlyout() DrawerLayout.AddView(flyoutView, layoutParameters); } - DrawerLayout.CloseDrawer(flyoutView); - if (VirtualView is IToolbarElement te && te.Toolbar?.Handler is ToolbarHandler th) th.SetupWithDrawerLayout(DrawerLayout); }