diff --git a/src/Controls/src/Core/Handlers/Items/Android/MauiRecyclerView.cs b/src/Controls/src/Core/Handlers/Items/Android/MauiRecyclerView.cs index ab43bb156c0a..363e82a56ecc 100644 --- a/src/Controls/src/Core/Handlers/Items/Android/MauiRecyclerView.cs +++ b/src/Controls/src/Core/Handlers/Items/Android/MauiRecyclerView.cs @@ -576,7 +576,7 @@ internal void UpdateEmptyViewVisibility() SwapAdapter(_emptyViewAdapter, true); // TODO hartez 2018/10/24 17:34:36 If this works, cache this layout manager as _emptyLayoutManager - SetLayoutManager(new LinearLayoutManager(Context)); + SetLayoutManager(SelectLayoutManager(ItemsLayout)); UpdateEmptyView(); } else if (!showEmptyView && currentAdapter != ItemsViewAdapter) diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ItemsLayoutShouldRenderProperlyOnEmptyView.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ItemsLayoutShouldRenderProperlyOnEmptyView.png new file mode 100644 index 000000000000..800074c08486 Binary files /dev/null and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ItemsLayoutShouldRenderProperlyOnEmptyView.png differ diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue28622.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue28622.xaml new file mode 100644 index 000000000000..d69dfeb949b6 --- /dev/null +++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue28622.xaml @@ -0,0 +1,27 @@ + + + + + +