Skip to content
This repository has been archived by the owner on May 1, 2024. It is now read-only.

Cherry pick of iOS13 fixes for iPad #8201

Merged
merged 6 commits into from
Oct 29, 2019
Merged

Cherry pick of iOS13 fixes for iPad #8201

merged 6 commits into from
Oct 29, 2019

Conversation

PureWeen
Copy link
Contributor

Description of Change

Cherry pick of
#8164
#8181

Testing Procedure

  • Same as test procedures on above PRs

PR Checklist

  • Targets the correct branch
  • Tests are passing (or failures are unrelated)

… visible (#8164)

* Don't force master closed when on split

* - fix UI tests to correctly test for tablet

* - remove extra code

* - fix issue with rotation from Modal

# Conflicts:
#	Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1461.cs
#	Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/TestPages/ScreenshotConditionalApp.cs
#	Xamarin.Forms.Core.UITests.Shared/Utilities/AppExtensions.cs
# Conflicts:
#	Xamarin.Forms.Platform.iOS/Renderers/TabletMasterDetailRenderer.cs
@PureWeen PureWeen changed the base branch from 15-5-ios13 to 2.5.0 October 24, 2019 22:48
Co-Authored-By: Gerald Versluis <gerald.versluis@microsoft.com>
@samhouts samhouts merged commit 4060c17 into 2.5.0 Oct 29, 2019
@samhouts samhouts deleted the fix_mdp branch October 29, 2019 22:12
samhouts pushed a commit that referenced this pull request Oct 29, 2019
* Don't force the Master page closed on disappear if it's set to always visible (#8164)

* Don't force master closed when on split

* - fix UI tests to correctly test for tablet

* - remove extra code

* - fix issue with rotation from Modal

# Conflicts:
#	Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1461.cs
#	Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/TestPages/ScreenshotConditionalApp.cs
#	Xamarin.Forms.Core.UITests.Shared/Utilities/AppExtensions.cs

* Better detect IsCollapsed state/changes on master

# Conflicts:
#	Xamarin.Forms.Platform.iOS/Renderers/TabletMasterDetailRenderer.cs

* - fix target for ios

* - fix override

* - helpers

* Apply suggestions from code review

Co-Authored-By: Gerald Versluis <gerald.versluis@microsoft.com>
@samhouts samhouts added this to the 2.5.0 milestone Oct 29, 2019
@samhouts samhouts added the approved Has two approvals, no pending reviews, and no changes requested label Nov 12, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
approved Has two approvals, no pending reviews, and no changes requested ControlGallery p/iOS 🍎
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants