diff options
| author | Kangho Hur <kangho.hur@samsung.com> | 2017-04-24 15:37:51 +0900 |
|---|---|---|
| committer | Kangho Hur <kangho.hur@samsung.com> | 2017-07-10 11:11:23 +0900 |
| commit | f823b1f41d283fcde1e385b515f8b7a5b902d028 (patch) | |
| tree | 9a3dc736ba11b3f0475a8699265e2f9c53cac8fe /Xamarin.Forms.Core | |
| parent | 2e7be85cf19c1db5417b3ea030428413b26bc46c (diff) | |
| download | xamarin-forms-f823b1f41d283fcde1e385b515f8b7a5b902d028.tar.gz xamarin-forms-f823b1f41d283fcde1e385b515f8b7a5b902d028.tar.bz2 xamarin-forms-f823b1f41d283fcde1e385b515f8b7a5b902d028.zip | |
rebase to tags/beta-2.3.5-pre1
- this is base code of xamarin.forms 2.3.5-pre1 (https://github.com/xamarin/Xamarin.Forms/commit/fc778eb9789f50634d48fb9ad127f211b3fcfcc7)
Diffstat (limited to 'Xamarin.Forms.Core')
| -rw-r--r-- | Xamarin.Forms.Core/NavigationPage.cs | 6 | ||||
| -rw-r--r-- | Xamarin.Forms.Core/Properties/AssemblyInfo.cs | 3 |
2 files changed, 1 insertions, 8 deletions
diff --git a/Xamarin.Forms.Core/NavigationPage.cs b/Xamarin.Forms.Core/NavigationPage.cs index a199670a..f20a617a 100644 --- a/Xamarin.Forms.Core/NavigationPage.cs +++ b/Xamarin.Forms.Core/NavigationPage.cs @@ -312,9 +312,6 @@ namespace Xamarin.Forms if (index == 0) RootPage = page; - if (index == 0) - RootPage = page; - // Shouldn't be required? if (Width > 0 && Height > 0) ForceLayout(); @@ -373,9 +370,6 @@ namespace Xamarin.Forms if (InternalChildren.Count == 1) RootPage = page; - if (PageController.InternalChildren.Count == 1) - RootPage = page; - CurrentPage = page; } diff --git a/Xamarin.Forms.Core/Properties/AssemblyInfo.cs b/Xamarin.Forms.Core/Properties/AssemblyInfo.cs index 84b9f313..429aca99 100644 --- a/Xamarin.Forms.Core/Properties/AssemblyInfo.cs +++ b/Xamarin.Forms.Core/Properties/AssemblyInfo.cs @@ -40,7 +40,6 @@ using Xamarin.Forms.Internals; [assembly: InternalsVisibleTo("Xamarin.Forms.Maps.iOS")] [assembly: InternalsVisibleTo("Xamarin.Forms.Maps.iOS.Classic")] [assembly: InternalsVisibleTo("Xamarin.Forms.Maps.Android")] -[assembly: InternalsVisibleTo("Xamarin.Forms.Maps.Tizen")] [assembly: InternalsVisibleTo("Xamarin.Forms.Xaml.UnitTests")] [assembly: InternalsVisibleTo("Xamarin.Forms.UITests")] [assembly: InternalsVisibleTo("Xamarin.Forms.FlexLayout.UnitTests")] @@ -60,4 +59,4 @@ using Xamarin.Forms.Internals; [assembly: InternalsVisibleTo("Xamarin.Forms.CarouselView")] [assembly: Preserve] -[assembly: XmlnsDefinition("http://xamarin.com/schemas/2014/forms", "Xamarin.Forms")] +[assembly: XmlnsDefinition("http://xamarin.com/schemas/2014/forms", "Xamarin.Forms")]
\ No newline at end of file |