[Android] TalkBack now reads name and helptext on buttons.

.github/CONTRIBUTING.md

@@ -23,11 +23,13 @@ Follow the style used by the [.NET Foundation](https://github.com/dotnet/corefx/
 - We do not use the `private` keyword, as it is the default accessibility level in C#.
 - We use hard tabs over spaces.
 
-Read and follow our [Pull Request template](https://github.com/xamarin/Xamarin.Forms/blob/master/PULL_REQUEST_TEMPLATE.md).
+Read and follow our [Pull Request template](PULL_REQUEST_TEMPLATE.md).
 
 ### Pull Request Requirements
 
- We use red-green-refactor test driven development. If you're planning to work on a bug fix, please be sure to create a test case in the UI tests suite (or unit tests, if you're working on Core/XAML code) that proves that the behavior is broken and then proves that the behavior was resolved after your changes. If at all possible, the test should be automated. If the test cannot be automated, then it should include manual testing instructions on screen.
+We use red-green-refactor test driven development. If you're planning to work on a bug fix, please be sure to create a test case in the UI tests suite (or unit tests, if you're working on Core/XAML code) that proves that the behavior is broken and then proves that the behavior was resolved after your changes. If at all possible, the test should be automated. If the test cannot be automated, then it should include manual testing instructions on screen.
+
+Please check the "Allow edits from maintainers" checkbox on your pull request. This allows us to quickly make minor fixes and resolve conflicts for you.
 
 ## Proposals/Enhancements/Suggestions
 

.github/ISSUE_TEMPLATE/bug_report.md

@@ -41,3 +41,7 @@ assignees: ''
 ### Reproduction Link
 
 <!-- Please upload or provide a link to a reproduction case -->
+
+### Workaround
+
+<!-- Did you find any workaround for this issue? This can unblock other people while waiting for this issue to be resolved -->

.github/PULL_REQUEST_TEMPLATE.md

@@ -2,7 +2,7 @@
      - If this is an enhancement or contains API changes or breaking changes, target master.
      - If the issue you're working on has a milestone, target the corresponding branch.
      - If this is a bug fix, target the branch of the latest stable version (unless the bug is only in a prerelease or master, of course!).
-     See [Contributing](https://github.com/xamarin/Xamarin.Forms/blob/master/CONTRIBUTING.md) for more tips!
+     See [Contributing](https://github.com/xamarin/Xamarin.Forms/blob/master/.github/CONTRIBUTING.md) for more tips!
 
      PLEASE DELETE THE ALL THESE COMMENTS BEFORE SUBMITTING! THANKS!!!
  -->

.nuspec/Xamarin.Forms.nuspec

@@ -272,6 +272,7 @@
     <file src="..\Xamarin.Forms.Platform.UAP\obj\$Configuration$\uap10.0.14393\FormsCheckBoxStyle.xaml" target="lib\uap10.0.14393\Xamarin.Forms.Platform.UAP" />
     <file src="..\Xamarin.Forms.Platform.UAP\obj\$Configuration$\uap10.0.14393\FormsCommandBarStyle.xaml" target="lib\uap10.0.14393\Xamarin.Forms.Platform.UAP" />
     <file src="..\Xamarin.Forms.Platform.UAP\obj\$Configuration$\uap10.0.14393\FormsEmbeddedPageWrapper.xaml" target="lib\uap10.0.14393\Xamarin.Forms.Platform.UAP" />
+    <file src="..\Xamarin.Forms.Platform.UAP\obj\$Configuration$\uap10.0.14393\PromptDialog.xaml" target="lib\uap10.0.14393\Xamarin.Forms.Platform.UAP" />
 
     <!-- VS 2017 needs these 16299-->
     <file src="..\Xamarin.Forms.Platform.UAP\obj\$Configuration$\uap10.0.16299\FormsFlyout.xaml" target="lib\uap10.0.16299\Xamarin.Forms.Platform.UAP" />
@@ -292,6 +293,7 @@
     <file src="..\Xamarin.Forms.Platform.UAP\obj\$Configuration$\uap10.0.16299\FormsCheckBoxStyle.xaml" target="lib\uap10.0.16299\Xamarin.Forms.Platform.UAP" />
     <file src="..\Xamarin.Forms.Platform.UAP\obj\$Configuration$\uap10.0.16299\FormsCommandBarStyle.xaml" target="lib\uap10.0.16299\Xamarin.Forms.Platform.UAP" />
     <file src="..\Xamarin.Forms.Platform.UAP\obj\$Configuration$\uap10.0.16299\FormsEmbeddedPageWrapper.xaml" target="lib\uap10.0.16299\Xamarin.Forms.Platform.UAP" />
+    <file src="..\Xamarin.Forms.Platform.UAP\obj\$Configuration$\uap10.0.16299\PromptDialog.xaml" target="lib\uap10.0.16299\Xamarin.Forms.Platform.UAP" />
 
     <!--Mac-->
     <file src="..\Xamarin.Forms.Core\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Core.dll" target="lib\Xamarin.Mac" />

.nuspec/Xamarin.Forms.props

@@ -12,4 +12,8 @@
 	-->
 	<Import Project="$(MSBuildThisFileDirectory)Xamarin.Forms.DefaultItems.props" Condition="'$(MSBuildSDKsPath)'!=''" />
 
+	<PropertyGroup>
+		<_IsHotRestartDefined>$([System.Text.RegularExpressions.Regex]::IsMatch('$(DefineConstants.Trim())', '(^|;)HOTRESTART($|;)'))</_IsHotRestartDefined>
+		<DefineConstants Condition="!$(_IsHotRestartDefined) And '$(IsHotRestartBuild)' == 'true'">HOTRESTART;$(DefineConstants)</DefineConstants>
+	</PropertyGroup>
 </Project>

GitInfo.txt

@@ -1 +1 @@
-4.5.0
+4.6.0

README.md

@@ -48,23 +48,23 @@ If you want to use the latest dev build then you should read [this blog post](ht
 ## Getting Started ##
 
 ### Windows ###
-##### Install Visual Studio 2017+ #####
+##### Install Visual Studio 2019+ #####
 
-VS 2017+ is required for developing Xamarin.Forms. If you do not already have it installed, you can download it [here](https://www.visualstudio.com/downloads/download-visual-studio-vs). VS 2017+ Community is completely free. If you are installing VS 2017+ for the first time, select the "Custom" installation type and select the following from the features list to install:
+VS 2019+ is required for developing Xamarin.Forms. If you do not already have it installed, you can download it [here](https://www.visualstudio.com/downloads/download-visual-studio-vs). VS 2019+ Community is completely free. If you are installing VS 2019+ for the first time, select the "Custom" installation type and select the following from the features list to install:
 
 - .NET desktop development - In the `Summary > Optional select .NET Framework 4.7 SDK, .NET Framework 4.7 targeting pack`. 
 - Universal Windows Platform Development - In the `Summary > Optional select the Windows 10 Mobile Emulator`.
 - Mobile Development with .NET - In the `Summary > Optional select Xamarin Remoted Simulator, Xamarin SDK Manager, Intel Hardware Accelerated Execution Manager (HAXM)`
 
-The Android 7.0 Nougat API 24 SDK is required for developing Xamarin.Forms. It can be installed by using the [Xamarin Android SDK Manager](https://docs.microsoft.com/xamarin/android/get-started/installation/android-sdk).
+The Android 10.0 API 29 SDK is required for developing Xamarin.Forms. It can be installed by using the [Xamarin Android SDK Manager](https://docs.microsoft.com/xamarin/android/get-started/installation/android-sdk).
 
 We also recommend installing [Xamarin Android Device Manager](https://developer.xamarin.com/guides/android/getting_started/installation/android-emulator/xamarin-device-manager/) This will use the HAXM tools installed above and allow you to configure Android Virtual Devices (AVDs) that emulate Android devices.
-If you already have VS 2017+ installed, you can verify that these features are installed by modifying the VS 2017+ installation via the Visual Studio Installer.
+If you already have VS 2019+ installed, you can verify that these features are installed by modifying the VS 2019+ installation via the Visual Studio Installer.
 
 ### Mac ###
 #### Install Visual Studio for Mac 2019 ####
 
-If you do not already have it installed, instructions to download and setup can be found [here](https://docs.microsoft.com/en-us/visualstudio/mac/installation?view=vsmac-2017).
+If you do not already have it installed, instructions to download and setup can be found [here](https://docs.microsoft.com/en-us/visualstudio/mac/installation?view=vsmac-2019).
 
 Because of current Multi-Targeting limitations with Visual Studio for Mac you will need to manually build/restore some projects before you are able to work on the Xamarin Forms solution.
 
@@ -92,7 +92,7 @@ By default, the `Xamarin.Forms.Controls` project does not have a configuration f
 
     UWPMapsAuthKey:
 
-You will have to obtain your own API keys for each of these services, inserted directly after the identifier (e.g. `UWPMapsAuthKey:abcdefghijklmnopqrstuvwxyz`). You can find out how to obtain each of these as follows:
+If you aren't working with maps, you can ignore this. If you want to work with maps, you will have to obtain your own API keys for each of these services, inserted directly after the identifier (e.g. `UWPMapsAuthKey:abcdefghijklmnopqrstuvwxyz`). You can find out how to obtain each of these as follows:
 
 - `UWPMapsAuthKey` at https://microsoft.com/maps/create-a-bing-maps-key.aspx
 
@@ -134,7 +134,7 @@ You should now be able to run any of the UWP UI Tests.
 We follow the style used by the [.NET Foundation](https://github.com/dotnet/corefx/blob/master/Documentation/coding-guidelines/coding-style.md), with a few exceptions:
 
 - We do not use the `private` keyword as it is the default accessibility level in C#.
-- We use hard tabs over spaces. You can change this setting in VS 2015 via `Tools > Options` and navigating to `Text Editor > C#` and selecting the "Keep tabs" radio option. In Visual Studio for Mac it's set via preferences in `Source Code > Code Formatting > C# source code` and disabling the checkbox for `Convert tabs to spaces`.
+- We use hard tabs over spaces. You can change this setting in Visual Studio for Windows via `Tools > Options` and navigating to `Text Editor > C#` and selecting the "Keep tabs" radio option. In Visual Studio for Mac it's set via preferences in `Source Code > Code Formatting > C# source code` and disabling the checkbox for `Convert tabs to spaces`.
 - Lines should be limited to a max of 120 characters (or as close as possible within reason). This may be set in Visual Studio for Mac via preferences in `Source Code > Code Formatting > C# source code` and changing the `Desired file width` to `120`.
 
 ## Contributing ##

Stubs/Xamarin.Forms.Platform.cs

@@ -54,6 +54,13 @@ internal class _ButtonRenderer { }
 	[RenderWith(typeof(ImageButtonRenderer))]
 	internal class _ImageButtonRenderer { }
 
+#if __ANDROID__
+	[RenderWith(typeof(RadioButtonRenderer))]
+#elif !TIZEN4_0
+	[RenderWith(typeof(RadioButtonRenderer))]
+#endif
+	internal class _RadioButtonRenderer { }
+
 	[RenderWith (typeof (TableViewRenderer))]
 	internal class _TableViewRenderer { }
 

Xamarin.Forms.ControlGallery.Android/Activity1.cs

@@ -21,7 +21,6 @@
 [assembly: Dependency (typeof (TestCloudService))]
 [assembly: ExportRenderer (typeof (DisposePage), typeof (DisposePageRenderer))]
 [assembly: ExportRenderer (typeof (DisposeLabel), typeof (DisposeLabelRenderer))]
-[assembly: ExportRenderer (typeof (CustomButton), typeof (CustomButtonRenderer))]
 [assembly: ExportEffect (typeof (BorderEffect), "BorderEffect")]
 
 namespace Xamarin.Forms.ControlGallery.Android

Xamarin.Forms.ControlGallery.Android/Assets/googlemap.html

@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <style>
+    /* Always set the map height explicitly to define the size of the div
+    * element that contains the map. */
+    #map {
+        height: 100%;
+    }
+    /* Optional: Makes the sample page fill the window. */
+    html, body {
+        height: 100%;
+        margin: 0;
+        padding: 0;
+    }
+
+    </style>
+    <title>Google Maps</title>
+    <script src="https://maps.googleapis.com/maps/api/js?key=YOUR_API_KEY&sensor=false"></script>
+    <script>
+		var urlParams = new URLSearchParams(window.location.search);
+		lat = urlParams.get('lat');
+		lng = urlParams.get('lng');
+
+        var center = new google.maps.LatLng(lat, lng);
+        var map;
+
+		function initialize() {
+            var mapOptions = {
+                zoom: 12,
+                mapTypeId: google.maps.MapTypeId.ROADMAP,
+                center: center,
+                disableDefaultUI: true
+            };
+            map = new google.maps.Map(document.getElementById('map'),
+                    mapOptions);
+            var marker = new google.maps.Marker({
+                position: center,
+                map: map
+          });
+        }
+
+    </script>
+</head>
+<body onload="initialize()">
+<div id="map">map</div>
+</body>
+</html>

Xamarin.Forms.ControlGallery.Android/Assets/googlemapsearch.html

@@ -0,0 +1,84 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>Place Searches</title>
+    <meta name="viewport" content="initial-scale=1.0, user-scalable=no">
+    <meta charset="utf-8">
+    <style>
+      /* Always set the map height explicitly to define the size of the div
+       * element that contains the map. */
+      #map {
+        height: 100%;
+      }
+      /* Optional: Makes the sample page fill the window. */
+      html, body {
+        height: 100%;
+        margin: 0;
+        padding: 0;
+      }
+
+    </style>
+    <script>
+      var urlParams = new URLSearchParams(window.location.search);
+      var place = urlParams.get('place');
+      var map;
+      var service;
+      var infowindow;
+
+    function initMap() {
+
+        var msftVisitorCenter = new google.maps.LatLng(47.642232, -122.1389797);
+        infowindow = new google.maps.InfoWindow();
+
+        var mapOptions = {
+            zoom: 15,
+            mapTypeId: google.maps.MapTypeId.ROADMAP,
+            center: msftVisitorCenter,
+            disableDefaultUI: true
+        };
+        map = new google.maps.Map(
+            document.getElementById('map'), mapOptions);
+
+        var marker = new google.maps.Marker({
+            position: msftVisitorCenter,
+            map: map
+        });
+
+        var request = {
+          query: place,
+          fields: ['name', 'geometry'],
+        };
+
+        service = new google.maps.places.PlacesService(map);
+
+        service.findPlaceFromQuery(request, function(results, status) {
+          if (status === google.maps.places.PlacesServiceStatus.OK) {
+            for (var i = 0; i < results.length; i++) {
+              createMarker(results[i]);
+            }
+
+            map.setCenter(results[0].geometry.location);
+          }
+        });
+      }
+
+      function createMarker(place) {
+        var marker = new google.maps.Marker({
+          map: map,
+          position: place.geometry.location
+        });
+
+        google.maps.event.addListener(marker, 'click', function() {
+          infowindow.setContent(place.name);
+          infowindow.open(map, this);
+        });
+      }
+
+    </script>
+</head>
+<body>
+<div id="map"></div>
+<script src="https://maps.googleapis.com/maps/api/js?key=YOUR_API_KEY&libraries=places&callback=initMap"
+        async defer></script>
+</body>
+</html>

Xamarin.Forms.ControlGallery.Android/ContentDescriptionEffectRenderer.cs

@@ -0,0 +1,58 @@
+using System.ComponentModel;
+using AViews = Android.Views;
+using AWidget = Android.Widget;
+using Xamarin.Forms;
+using Xamarin.Forms.ControlGallery.Android;
+using Xamarin.Forms.Controls.Issues;
+using Xamarin.Forms.Platform.Android;
+using Android.Support.V4.View;
+using Android.Support.V4.View.Accessibility;
+using Android.AccessibilityServices;
+
+[assembly: ExportEffect(typeof(ContentDescriptionEffectRenderer), ContentDescriptionEffect.EffectName)]
+namespace Xamarin.Forms.ControlGallery.Android
+{
+	public class ContentDescriptionEffectRenderer : PlatformEffect
+	{
+		protected override void OnAttached()
+		{
+		}
+
+		protected override void OnDetached()
+		{
+		}
+
+		protected override void OnElementPropertyChanged(PropertyChangedEventArgs args)
+		{
+			System.Diagnostics.Debug.WriteLine("OnElementPropertyChanged" + args.PropertyName);
+
+			var viewGroup = Control as AViews.ViewGroup;
+			var nativeView = Control as AViews.View;
+
+			if (nativeView != null && viewGroup != null && viewGroup.ChildCount > 0)
+			{
+				nativeView = viewGroup.GetChildAt(0);
+			}
+
+			if (nativeView == null)
+			{
+				return;
+			}
+
+			var info = AccessibilityNodeInfoCompat.Obtain(nativeView);
+			ViewCompat.OnInitializeAccessibilityNodeInfo(nativeView, info);
+
+			System.Diagnostics.Debug.WriteLine(info.ContentDescription);
+			System.Diagnostics.Debug.WriteLine(nativeView.ContentDescription);
+
+			Element.SetValue(
+				ContentDescriptionEffectProperties.NameAndHelpTextProperty,
+				info.ContentDescription);
+
+			Element.SetValue(
+				ContentDescriptionEffectProperties.ContentDescriptionProperty,
+				nativeView.ContentDescription);
+		}
+
+	}
+}

Xamarin.Forms.ControlGallery.Android/CustomRenderers.cs

@@ -57,6 +57,7 @@
 [assembly: ExportRenderer(typeof(Issue7249Switch), typeof(Issue7249SwitchRenderer))]
 [assembly: ExportRenderer(typeof(Issue9360.Issue9360NavigationPage), typeof(Issue9360NavigationPageRenderer))]
 [assembly: ExportRenderer(typeof(Xamarin.Forms.Controls.GalleryPages.TwoPaneViewGalleries.HingeAngleLabel), typeof(HingeAngleLabelRenderer))]
+[assembly: ExportRenderer(typeof(Xamarin.Forms.Controls.Tests.TestClasses.CustomButton), typeof(CustomButtonRenderer))]
 
 #if PRE_APPLICATION_CLASS
 #elif FORMS_APPLICATION_ACTIVITY