diff options
Diffstat (limited to 'Xamarin.Forms.Platform.Android/Platform.cs')
| -rw-r--r-- | Xamarin.Forms.Platform.Android/Platform.cs | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/Xamarin.Forms.Platform.Android/Platform.cs b/Xamarin.Forms.Platform.Android/Platform.cs index c0fc2099..ebdf5e96 100644 --- a/Xamarin.Forms.Platform.Android/Platform.cs +++ b/Xamarin.Forms.Platform.Android/Platform.cs @@ -1055,11 +1055,9 @@ namespace Xamarin.Forms.Platform.Android internal class DefaultRenderer : VisualElementRenderer<View> { bool _notReallyHandled; - Dictionary<int, float> _minimumElevation = new Dictionary<int, float>(); public DefaultRenderer() { - ChildrenDrawingOrderEnabled = true; } readonly MotionEventHelper _motionEventHelper = new MotionEventHelper(); @@ -1069,11 +1067,6 @@ namespace Xamarin.Forms.Platform.Android _notReallyHandled = true; } - internal void InvalidateMinimumElevation() - { - _minimumElevation = new Dictionary<int, float>(); - } - public override bool OnTouchEvent(MotionEvent e) { if (base.OnTouchEvent(e)) @@ -1128,31 +1121,8 @@ namespace Xamarin.Forms.Platform.Android } return result; - } - - protected override int GetChildDrawingOrder(int childCount, int i) - { - //On Material design the button states use Elevation property, we need to make sure - //we update the elevation of other controls to be over the previous one - if (Forms.IsLollipopOrNewer) - { - if (!_minimumElevation.ContainsKey(i)) - { - _minimumElevation[i] = GetChildAt(i).Elevation; - } - - for (int j = 0; j < _minimumElevation.Count() - 1; j++) { - while (_minimumElevation[j] > _minimumElevation[j + 1]) - { - _minimumElevation[j + 1] = _minimumElevation[j] + 1; - GetChildAt(j + 1).Elevation = _minimumElevation[j + 1]; - } - if (j == i) - break; } - } - return base.GetChildDrawingOrder(childCount, i); } } |