summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40704.cs9
-rw-r--r--Xamarin.Forms.Platform.Android/Renderers/ListViewAdapter.cs1
2 files changed, 8 insertions, 2 deletions
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40704.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40704.cs
index dcae4617..e53429e5 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40704.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40704.cs
@@ -102,7 +102,7 @@ namespace Xamarin.Forms.Controls
tapGesture = new TapGestureRecognizer();
tapGesture.Tapped += HeaderCell_OnTapped;
grd.GestureRecognizers.Add(tapGesture);
- var lbl = new Label { HorizontalOptions = LayoutOptions.FillAndExpand, TextColor = Color.Black, FontSize = 16 };
+ var lbl = new Label { VerticalOptions = LayoutOptions.Center, HorizontalOptions = LayoutOptions.FillAndExpand, TextColor = Color.Black, FontSize = 16 };
lbl.SetBinding(Label.TextProperty, new Binding("Title"));
grd.Children.Add(lbl);
@@ -212,7 +212,12 @@ namespace Xamarin.Forms.Controls
}
- #if UITEST
+#if UITEST
+ [Test]
+ public void Bugzilla40704HeaderPresentTest()
+ {
+ RunningApp.WaitForElement("Menu - 0");
+ }
[Test]
public void Bugzilla40704Test()
{
diff --git a/Xamarin.Forms.Platform.Android/Renderers/ListViewAdapter.cs b/Xamarin.Forms.Platform.Android/Renderers/ListViewAdapter.cs
index 64d9d180..5ac214cd 100644
--- a/Xamarin.Forms.Platform.Android/Renderers/ListViewAdapter.cs
+++ b/Xamarin.Forms.Platform.Android/Renderers/ListViewAdapter.cs
@@ -408,6 +408,7 @@ namespace Xamarin.Forms.Platform.Android
var groupContent = _listView.TemplatedItems.GroupHeaderTemplate.CreateContent(group.ItemsSource, _listView) as Cell;
if (groupContent != null)
{
+ groupContent.Parent = _listView;
groupContent.BindingContext = group.ItemsSource;
cells.Add(groupContent);
}