[Android] Take in account status bar padding on master when using split behaviour...

diff --git a/Xamarin.Forms.Platform.Android/AppCompat/MasterDetailPageRenderer.cs b/Xamarin.Forms.Platform.Android/AppCompat/MasterDetailPageRenderer.cs
index 1815321..50e99e5 100644 (file)
--- a/Xamarin.Forms.Platform.Android/AppCompat/MasterDetailPageRenderer.cs
+++ b/Xamarin.Forms.Platform.Android/AppCompat/MasterDetailPageRenderer.cs
@@ -122,6 +122,7 @@ namespace Xamarin.Forms.Platform.Android.AppCompat
 
                                        _masterLayout = new MasterDetailContainer(newElement, true, Context)
                                        {
+                                               TopPadding = ((IMasterDetailPageController)newElement).ShouldShowSplitMode ? statusBarHeight : 0,
                                                LayoutParameters = new LayoutParams(ViewGroup.LayoutParams.WrapContent, ViewGroup.LayoutParams.WrapContent) { Gravity = (int)GravityFlags.Start }
                                        };
 

diff --git a/Xamarin.Forms.Platform.Android/Renderers/MasterDetailContainer.cs b/Xamarin.Forms.Platform.Android/Renderers/MasterDetailContainer.cs
index 9184e26..7e28392 100644 (file)
--- a/Xamarin.Forms.Platform.Android/Renderers/MasterDetailContainer.cs
+++ b/Xamarin.Forms.Platform.Android/Renderers/MasterDetailContainer.cs
@@ -120,6 +120,7 @@ namespace Xamarin.Forms.Platform.Android
                        double width = Context.FromPixels(right - left);
                        double height = Context.FromPixels(bottom - top);
                        double xPos = 0;
+                       bool supressPadding = false;
 
                        //splitview
                        if (MasterDetailPageController.ShouldShowSplitMode)
@@ -131,11 +132,13 @@ namespace Xamarin.Forms.Platform.Android
                        }
                        else
                        {
+                               //if we are showing the normal popover master doesn't have padding
+                               supressPadding = isMasterPage;
                                //popover make the master smaller
                                width = isMasterPage && (Device.Info.CurrentOrientation.IsLandscape() || Device.Idiom == TargetIdiom.Tablet) ? DefaultWidthMaster : width;
                        }
 
-                       double padding = Context.FromPixels(TopPadding);
+                       double padding = supressPadding ? 0 : Context.FromPixels(TopPadding);
                        return new Rectangle(xPos, padding, width, height - padding);
                }