force sync with upstream 2.4.0-sr2

Change-Id: I36f0de33d03e804afd17f7ab2c60ae6f435ec402

1 files changed, 10 insertions, 9 deletions

diff --git a/Xamarin.Forms.Maps.Android/MapRenderer.cs b/Xamarin.Forms.Maps.Android/MapRenderer.cs
index 79e5cc28..138cd57d 100644
--- a/Xamarin.Forms.Maps.Android/MapRenderer.cs
+++ b/Xamarin.Forms.Maps.Android/MapRenderer.cs
@@ -15,7 +15,8 @@ using Math = System.Math;
 
 namespace Xamarin.Forms.Maps.Android
 {
-	public class MapRenderer : ViewRenderer<Map, MapView>, GoogleMap.IOnCameraMoveListener, IOnMapReadyCallback 
+	public class MapRenderer : ViewRenderer<Map, MapView>,
+		GoogleMap.IOnCameraChangeListener, IOnMapReadyCallback
 	{
 		const string MoveMessageName = "MapMoveToRegion";
 
@@ -41,6 +42,11 @@ namespace Xamarin.Forms.Maps.Android
 			set { s_bundle = value; }
 		}
 
+		public void OnCameraChange(CameraPosition pos)
+		{
+			UpdateVisibleRegion(pos.Target);
+		}
+
 		public override SizeRequest GetDesiredSize(int widthConstraint, int heightConstraint)
 		{
 			return new SizeRequest(new Size(Context.ToPixels(40), Context.ToPixels(40)));
@@ -71,7 +77,7 @@ namespace Xamarin.Forms.Maps.Android
 				if (NativeMap != null)
  				{
  					NativeMap.MyLocationEnabled = false;
- 					NativeMap.SetOnCameraMoveListener(null);
+ 					NativeMap.SetOnCameraChangeListener(null);
  					NativeMap.InfoWindowClick -= MapOnMarkerClick;
  					NativeMap.Dispose();
 					NativeMap = null;
@@ -103,7 +109,7 @@ namespace Xamarin.Forms.Maps.Android
 
 				if (NativeMap != null)
 				{
-					NativeMap.SetOnCameraMoveListener(null);
+					NativeMap.SetOnCameraChangeListener(null);
 					NativeMap.InfoWindowClick -= MapOnMarkerClick;
 					NativeMap = null;
 				}
@@ -183,7 +189,7 @@ namespace Xamarin.Forms.Maps.Android
 				return;
 			}
 			
-			map.SetOnCameraMoveListener(this);
+			map.SetOnCameraChangeListener(this);
 			map.InfoWindowClick += MapOnMarkerClick;
 			
 			map.UiSettings.ZoomControlsEnabled = Map.HasZoomEnabled;
@@ -387,10 +393,5 @@ namespace Xamarin.Forms.Maps.Android
 			NativeMap = map;
 			OnMapReady(map);
 		}
-
-		void GoogleMap.IOnCameraMoveListener.OnCameraMove()
-		{
-			UpdateVisibleRegion(NativeMap.CameraPosition.Target);
-		}
 	}
 }