Revert "Fix border on android buttons (#941)"

This reverts commit aa9bca1.

Xamarin.Forms.Platform.Android/AppCompat/ButtonRenderer.cs

@@ -1,9 +1,14 @@
 using System;
 using System.ComponentModel;
 using Android.Content;
+using Android.Content.Res;
 using Android.Graphics;
+using Android.Graphics.Drawables;
+using Android.Support.V4.Content;
 using Android.Support.V7.Widget;
 using Android.Util;
+using Xamarin.Forms.Internals;
+using GlobalResource = Android.Resource;
 using Object = Java.Lang.Object;
 using AView = Android.Views.View;
 using AMotionEvent = Android.Views.MotionEvent;
@@ -14,7 +19,6 @@ namespace Xamarin.Forms.Platform.Android.AppCompat
 {
     public class ButtonRenderer : ViewRenderer<Button, AppCompatButton>, AView.IOnAttachStateChangeListener
 	{
-		ButtonBackgroundTracker _backgroundTracker;
 		TextColorSwitcher _textColorSwitcher;
 		float _defaultFontSize;
 		Typeface _defaultTypeface;
@@ -85,7 +89,6 @@ protected override void Dispose(bool disposing)
 					Control.Tag = null;
 					_textColorSwitcher = null;
 				}
-				_backgroundTracker?.Dispose();
 			}
 
 			base.Dispose(disposing);
@@ -114,12 +117,8 @@ protected override void OnElementChanged(ElementChangedEventArgs<Button> e)
 					button.AddOnAttachStateChangeListener(this);
 				}
 
-				if (_backgroundTracker == null)
-					_backgroundTracker = new ButtonBackgroundTracker(Element, Control);
-				else
-					_backgroundTracker.Button = e.NewElement;
-
 				UpdateAll();
+				UpdateBackgroundColor();
 			}
 		}
 
@@ -146,7 +145,42 @@ protected override void UpdateBackgroundColor()
 			if (Element == null || Control == null)
 				return;
 
-			_backgroundTracker?.UpdateBackgroundColor();
+			Color backgroundColor = Element.BackgroundColor;
+			if (backgroundColor.IsDefault)
+			{
+				if (Control.SupportBackgroundTintList != null)
+				{
+					Context context = Context;
+					int id = GlobalResource.Attribute.ButtonTint;
+					unchecked
+					{
+						using (var value = new TypedValue())
+						{
+							try
+							{
+								Resources.Theme theme = context.Theme;
+								if (theme != null && theme.ResolveAttribute(id, value, true))
+#pragma warning disable 618
+									Control.SupportBackgroundTintList = Resources.GetColorStateList(value.Data);
+#pragma warning restore 618
+								else
+									Control.SupportBackgroundTintList = new ColorStateList(ColorExtensions.States, new[] { (int)0xffd7d6d6, 0x7fd7d6d6 });
+							}
+							catch (Exception ex)
+							{
+								Internals.Log.Warning("Xamarin.Forms.Platform.Android.ButtonRenderer", "Could not retrieve button background resource: {0}", ex);
+								Control.SupportBackgroundTintList = new ColorStateList(ColorExtensions.States, new[] { (int)0xffd7d6d6, 0x7fd7d6d6 });
+							}
+						}
+					}
+				}
+			}
+			else
+			{
+				int intColor = backgroundColor.ToAndroid().ToArgb();
+				int disableColor = backgroundColor.MultiplyAlpha(0.5).ToAndroid().ToArgb();
+				Control.SupportBackgroundTintList = new ColorStateList(ColorExtensions.States, new[] { intColor, disableColor });
+			}
 		}
 
 		void UpdateAll()
@@ -156,16 +190,6 @@ void UpdateAll()
 			UpdateBitmap();
 			UpdateTextColor();
 			UpdateEnabled();
-			UpdateBackgroundColor();
-			UpdateDrawable();
-		}
-
-		void UpdateDrawable()
-		{
-			if (Element == null || Control == null)
-				return;
-
-			_backgroundTracker?.UpdateDrawable();
 		}
 
 		void UpdateBitmap()

Xamarin.Forms.Platform.Android/FastRenderers/ButtonRenderer.cs

@@ -1,15 +1,19 @@
 using System;
 using System.ComponentModel;
 using Android.Content;
+using Android.Content.Res;
 using Android.Graphics;
 using Android.Graphics.Drawables;
 using Android.Support.V7.Widget;
 using Android.Util;
 using Android.Views;
 using Xamarin.Forms.Internals;
+using GlobalResource = Android.Resource;
 using AView = Android.Views.View;
+using AMotionEvent = Android.Views.MotionEvent;
 using AMotionEventActions = Android.Views.MotionEventActions;
 using static System.String;
+using Object = Java.Lang.Object;
 
 namespace Xamarin.Forms.Platform.Android.FastRenderers
 {
@@ -26,7 +30,6 @@ internal sealed class ButtonRenderer : AppCompatButton, IVisualElementRenderer,
 		readonly AutomationPropertiesProvider _automationPropertiesProvider;
 		readonly EffectControlProvider _effectControlProvider;
 		VisualElementTracker _tracker;
-		ButtonBackgroundTracker _backgroundTracker;
 
 		public event EventHandler<VisualElementChangedEventArgs> ElementChanged;
 		public event EventHandler<PropertyChangedEventArgs> ElementPropertyChanged;
@@ -131,11 +134,6 @@ void IVisualElementRenderer.SetElement(VisualElement element)
 				oldElement.PropertyChanged -= OnElementPropertyChanged;
 			}
 
-			if (_backgroundTracker == null)
-				_backgroundTracker = new ButtonBackgroundTracker(Button, this);
-			else
-				_backgroundTracker.Button = Button;
-
 			Color currentColor = oldElement?.BackgroundColor ?? Color.Default;
 			if (element.BackgroundColor != currentColor)
 			{
@@ -194,8 +192,6 @@ protected override void Dispose(bool disposing)
 				_automationPropertiesProvider?.Dispose();
 				_tracker?.Dispose();
 
-				_backgroundTracker?.Dispose();
-
 				if (Element != null)
 				{
 					Element.PropertyChanged -= OnElementPropertyChanged;
@@ -223,10 +219,6 @@ Size MinimumSize()
 
 		void OnElementChanged(ElementChangedEventArgs<Button> e)
 		{
-			if (e.OldElement != null)
-			{
-				_backgroundTracker?.Reset();
-			}
 			if (e.NewElement != null && !_isDisposed)
 			{
 				this.EnsureId();
@@ -238,7 +230,6 @@ void OnElementChanged(ElementChangedEventArgs<Button> e)
 				UpdateIsEnabled();
 				UpdateInputTransparent();
 				UpdateBackgroundColor();
-				UpdateDrawable();
 
 				ElevationHelper.SetElevation(this, e.NewElement);
 			}
@@ -275,6 +266,10 @@ void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e)
 			else if (e.PropertyName == VisualElement.InputTransparentProperty.PropertyName)
 			{
 				UpdateInputTransparent();
+            }
+			else if (e.PropertyName == VisualElement.BackgroundColorProperty.PropertyName)
+			{
+				UpdateBackgroundColor();
 			}
 
 			ElementPropertyChanged?.Invoke(this, e);
@@ -306,7 +301,54 @@ void SetTracker(VisualElementTracker tracker)
 
 		void UpdateBackgroundColor()
 		{
-			_backgroundTracker?.UpdateBackgroundColor();
+			if (Element == null)
+			{
+				return;
+			}
+
+			Color backgroundColor = Element.BackgroundColor;
+			if (backgroundColor.IsDefault)
+			{
+				if (SupportBackgroundTintList != null)
+				{
+					Context context = Context;
+					int id = GlobalResource.Attribute.ButtonTint;
+					unchecked
+					{
+						using (var value = new TypedValue())
+						{
+							try
+							{
+								Resources.Theme theme = context.Theme;
+								if (theme != null && theme.ResolveAttribute(id, value, true))
+#pragma warning disable 618
+								{
+									SupportBackgroundTintList = Resources.GetColorStateList(value.Data);
+								}
+#pragma warning restore 618
+								else
+								{
+									SupportBackgroundTintList = new ColorStateList(ColorExtensions.States,
+										new[] { (int)0xffd7d6d6, 0x7fd7d6d6 });
+								}
+							}
+							catch (Exception ex)
+							{
+								Internals.Log.Warning("Xamarin.Forms.Platform.Android.ButtonRenderer",
+									"Could not retrieve button background resource: {0}", ex);
+								SupportBackgroundTintList = new ColorStateList(ColorExtensions.States,
+									new[] { (int)0xffd7d6d6, 0x7fd7d6d6 });
+							}
+						}
+					}
+				}
+			}
+			else
+			{
+				int intColor = backgroundColor.ToAndroid().ToArgb();
+				int disableColor = backgroundColor.MultiplyAlpha(0.5).ToAndroid().ToArgb();
+				SupportBackgroundTintList = new ColorStateList(ColorExtensions.States, new[] { intColor, disableColor });
+			}
 		}
 
 		internal void OnNativeFocusChanged(bool hasFocus)
@@ -468,11 +510,5 @@ void UpdateTextColor()
 
 			_textColorSwitcher.Value.UpdateTextColor(this, Button.TextColor);
 		}
-
-		void UpdateDrawable()
-		{
-			_backgroundTracker?.UpdateDrawable();
-		}
-
 	}
 }

Xamarin.Forms.Platform.Android/Properties/AssemblyInfo.cs

@@ -38,6 +38,7 @@
 [assembly: ExportRenderer (typeof (Stepper), typeof (StepperRenderer))]
 [assembly: ExportRenderer (typeof (ProgressBar), typeof (ProgressBarRenderer))]
 [assembly: ExportRenderer (typeof (ScrollView), typeof (ScrollViewRenderer))]
+[assembly: ExportRenderer (typeof (Toolbar), typeof (ToolbarRenderer))]
 [assembly: ExportRenderer (typeof (ActivityIndicator), typeof (ActivityIndicatorRenderer))]
 [assembly: ExportRenderer (typeof (Frame), typeof (FrameRenderer))]
 [assembly: ExportRenderer (typeof (NavigationMenu), typeof (NavigationMenuRenderer))]

Xamarin.Forms.Platform.Android/Renderers/ButtonDrawable.cs

@@ -1,7 +1,6 @@
 using System.Linq;
 using Android.Graphics;
 using Android.Graphics.Drawables;
-using System;
 
 namespace Xamarin.Forms.Platform.Android
 {