diff options
author | Kangho Hur <kangho.hur@samsung.com> | 2017-10-23 13:47:06 +0900 |
---|---|---|
committer | Kangho Hur <kangho.hur@samsung.com> | 2017-10-23 13:52:29 +0900 |
commit | db4c712c0b6aa849badb9ce6d557c0019e575d01 (patch) | |
tree | a1d051c629c7210e1e0f77c23156b274931d0117 /Xamarin.Forms.Xaml | |
parent | 1a7c36737dcbe6b2fc516cb72d9f3921b18c324a (diff) | |
download | xamarin-forms-db4c712c0b6aa849badb9ce6d557c0019e575d01.tar.gz xamarin-forms-db4c712c0b6aa849badb9ce6d557c0019e575d01.tar.bz2 xamarin-forms-db4c712c0b6aa849badb9ce6d557c0019e575d01.zip |
force sync with upstream 2.4.0-sr2
Change-Id: I36f0de33d03e804afd17f7ab2c60ae6f435ec402
Diffstat (limited to 'Xamarin.Forms.Xaml')
-rw-r--r-- | Xamarin.Forms.Xaml/FillResourceDictionariesVisitor.cs | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/Xamarin.Forms.Xaml/FillResourceDictionariesVisitor.cs b/Xamarin.Forms.Xaml/FillResourceDictionariesVisitor.cs index f339c879..d03682e9 100644 --- a/Xamarin.Forms.Xaml/FillResourceDictionariesVisitor.cs +++ b/Xamarin.Forms.Xaml/FillResourceDictionariesVisitor.cs @@ -1,6 +1,7 @@ using System; using System.Collections; using System.Collections.Generic; +using System.Reflection; using Xamarin.Forms.Internals; using Xamarin.Forms.Xaml.Internals; @@ -105,25 +106,12 @@ namespace Xamarin.Forms.Xaml if (ApplyPropertiesVisitor.TryGetPropertyName(node, parentNode, out propertyName)) { if ((propertyName.LocalName == "Resources" || - propertyName.LocalName == "MergedDictionaries" || - propertyName.LocalName.EndsWith(".Resources", StringComparison.Ordinal)) && value is ResourceDictionary) + propertyName.LocalName.EndsWith(".Resources", StringComparison.Ordinal)) && value is ResourceDictionary) { var source = Values[parentNode]; ApplyPropertiesVisitor.SetPropertyValue(source, propertyName, value, Context.RootElement, node, Context, node); } } - - //Add ResourceDictionary into MergedDictionaries - XmlName parentPropertyName; - if (parentNode is IListNode && ApplyPropertiesVisitor.TryGetPropertyName(parentNode, parentNode.Parent, out parentPropertyName)) - { - if (parentPropertyName.LocalName == "MergedDictionaries") - { - var source = Values[parentNode.Parent]; - node.Parent = node.Parent.Parent; - ApplyPropertiesVisitor.SetPropertyValue(source, parentPropertyName, value, Context.RootElement, node, Context, node); - } - } } public void Visit(RootNode node, INode parentNode) |