[All] Rename Accessibility -> AutomationProperties (#912)

* [All] Renamed Accessibility -> AutomationProperties

* Update docs

* Restore doc summaries

* Revert unintended csproj changes

3 files changed, 47 insertions, 47 deletions

diff --git a/Xamarin.Forms.Controls/ControlGalleryPages/AccessibilityGallery.cs b/Xamarin.Forms.Controls/ControlGalleryPages/AutomationPropertiesGallery.cs
index f5f0b39c..d4c85d8c 100644
--- a/Xamarin.Forms.Controls/ControlGalleryPages/AccessibilityGallery.cs
+++ b/Xamarin.Forms.Controls/ControlGalleryPages/AutomationPropertiesGallery.cs
@@ -1,19 +1,19 @@
 
 namespace Xamarin.Forms.Controls
 {
-	public class AccessibilityGallery : ContentPage
+	public class AutomationPropertiesGallery : ContentPage
 	{
-		public AccessibilityGallery()
+		public AutomationPropertiesGallery()
 		{
 			// https://developer.xamarin.com/guides/android/advanced_topics/accessibility/
 			// https://developer.xamarin.com/guides/ios/advanced_topics/accessibility/
 			// https://msdn.microsoft.com/en-us/windows/uwp/accessibility/basic-accessibility-information
 
 			const string EntryPlaceholder = "Your name.";
-			const string EntryHint = "Type your name.";
+			const string EntryHelpText = "Type your name.";
 			const string ImageName = "Roof";
-			const string ImageHint = "Tap to show an alert.";
-			const string BoxHint = "Shows a purple box.";
+			const string ImageHelpText = "Tap to show an alert.";
+			const string BoxHelpText = "Shows a purple box.";
 			const string BoxName = "Box";
 
 			string screenReader = "";
@@ -30,16 +30,16 @@ namespace Xamarin.Forms.Controls
 					scrollFingers = "three fingers";
 					explore = "Use two fingers to swipe up or down the screen to read all of the elements on this page.";
 					labeledByInstructions = $"The following Entry should read aloud \"{EntryPlaceholder}.\", plus native instructions on how to use an Entry element. This text comes from the placeholder.";
-					imageInstructions = $"The following Image should read aloud \"{ImageName}. {ImageHint}\". You should be able to tap the image and hear an alert box.";
-					boxInstructions = $"The following Box should read aloud \"{BoxName}. {BoxHint}\". You should be able to tap the box and hear an alert box.";
+					imageInstructions = $"The following Image should read aloud \"{ImageName}. {ImageHelpText}\". You should be able to tap the image and hear an alert box.";
+					boxInstructions = $"The following Box should read aloud \"{BoxName}. {BoxHelpText}\". You should be able to tap the box and hear an alert box.";
 					break;
 				case Device.Android:
 					screenReader = "TalkBack";
 					scrollFingers = "two fingers";
 					explore = "Drag one finger across the screen to read each element on the page.";
-					labeledByInstructions = $"The following Entry should read aloud \"EditBox {EntryPlaceholder} for {EntryHint}.\", plus native instructions on how to use an Entry element. This text comes from the Entry placeholder and text of the Label.";
-					imageInstructions = $"The following Image should read aloud \"{ImageName}. {ImageHint}\". You should be able to tap the image and hear an alert box.";
-					boxInstructions = $"The following Box should read aloud \"{BoxName}. {BoxHint}\". You should be able to tap the box and hear an alert box.";
+					labeledByInstructions = $"The following Entry should read aloud \"EditBox {EntryPlaceholder} for {EntryHelpText}.\", plus native instructions on how to use an Entry element. This text comes from the Entry placeholder and text of the Label.";
+					imageInstructions = $"The following Image should read aloud \"{ImageName}. {ImageHelpText}\". You should be able to tap the image and hear an alert box.";
+					boxInstructions = $"The following Box should read aloud \"{BoxName}. {BoxHelpText}\". You should be able to tap the box and hear an alert box.";
 					break;
 				case Device.WinRT:
 				case Device.UWP:
@@ -47,21 +47,21 @@ namespace Xamarin.Forms.Controls
 					screenReader = "Narrator";
 					scrollFingers = "two fingers";
 					explore = "Use three fingers to swipe up the screen to read all of the elements on this page.";
-					labeledByInstructions = $"The following Entry should read aloud \"{EntryHint}\", plus native instructions on how to use an Entry element. This text comes from the text of the label.";
-					imageInstructions = $"The following Image should read aloud \"{ImageName}. {ImageHint}\". Windows does not currently support TapGestures while the Narrator is active.";
-					boxInstructions = $"The following Box should read aloud \"{BoxName}. {BoxHint}\". Windows does not currently support TapGestures while the Narrator is active.";
+					labeledByInstructions = $"The following Entry should read aloud \"{EntryHelpText}\", plus native instructions on how to use an Entry element. This text comes from the text of the label.";
+					imageInstructions = $"The following Image should read aloud \"{ImageName}. {ImageHelpText}\". Windows does not currently support TapGestures while the Narrator is active.";
+					boxInstructions = $"The following Box should read aloud \"{BoxName}. {BoxHelpText}\". Windows does not currently support TapGestures while the Narrator is active.";
 					break;
 				default:
 					screenReader = "the native screen reader";
 					break;
 			}
 
-			var instructions = new Label { Text = $"Please enable {screenReader}. {explore} Use {scrollFingers} to scroll the view. Tap an element once to hear the name and description and native instructions. Double tap anywhere on the screen to activate the selected element. Swipe left or right with one finger to switch to the previous or next element." };
+			var instructions = new Label { Text = $"Please enable {screenReader}. {explore} Use {scrollFingers} to scroll the view. Tap an element once to hear the name and HelpText and native instructions. Double tap anywhere on the screen to activate the selected element. Swipe left or right with one finger to switch to the previous or next element." };
 
 			var instructions2 = new Label { Text = labeledByInstructions };
-			var entryLabel = new Label { Text = EntryHint, VerticalOptions = LayoutOptions.Center };
+			var entryLabel = new Label { Text = EntryHelpText, VerticalOptions = LayoutOptions.Center };
 			var entry = new Entry { Placeholder = EntryPlaceholder };
-			entry.SetAccessibilityLabeledBy(entryLabel);
+			entry.SetAutomationPropertiesLabeledBy(entryLabel);
 
 			var entryGroup = new Grid();
 			entryGroup.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Auto) });
@@ -72,18 +72,18 @@ namespace Xamarin.Forms.Controls
 
 
 			var activityIndicator = new ActivityIndicator();
-			activityIndicator.SetAccessibilityName("Progress indicator");
+			activityIndicator.SetAutomationPropertiesName("Progress indicator");
 
 
 			const string ButtonText = "Update progress";
-			const string ButtonHint = "Tap to start/stop the activity indicator.";
+			const string ButtonHelpText = "Tap to start/stop the activity indicator.";
 			var instructions3 = new Label { Text = $"The following Button should read aloud \"{ButtonText}.\", plus native instructions on how to use a button." };
 			var button = new Button { Text = ButtonText };
-			button.SetAccessibilityHint(ButtonHint);
+			button.SetAutomationPropertiesHelpText(ButtonHelpText);
 			button.Clicked += (sender, e) =>
 			{
 				activityIndicator.IsRunning = !activityIndicator.IsRunning;
-				activityIndicator.SetAccessibilityHint(activityIndicator.IsRunning ? "Running." : "Not running");
+				activityIndicator.SetAutomationPropertiesHelpText(activityIndicator.IsRunning ? "Running." : "Not running");
 			};
 
 
@@ -91,22 +91,22 @@ namespace Xamarin.Forms.Controls
 			var image = new Image { Source = "photo.jpg" };
 			// The tap gesture will NOT work on Win
 			image.GestureRecognizers.Add(new TapGestureRecognizer { Command = new Command(() => DisplayAlert("Success", "You tapped the image", "OK")) });
-			image.SetAccessibilityName(ImageName);
-			image.SetAccessibilityHint(ImageHint);
+			image.SetAutomationPropertiesName(ImageName);
+			image.SetAutomationPropertiesHelpText(ImageHelpText);
 			// Images are ignored by default on iOS (at least, Forms Images are); 
 			// make accessible in order to enable the gesture and narration
-			image.SetIsInAccessibleTree(true);
+			image.SetAutomationPropertiesIsInAccessibleTree(true);
 
 
 			var instructions6 = new Label { Text = boxInstructions };
 			var boxView = new BoxView { Color = Color.Purple };
 			// The tap gesture will NOT work on Win
 			boxView.GestureRecognizers.Add(new TapGestureRecognizer { Command = new Command(() => DisplayAlert("Success", "You tapped the box", "OK")) });
-			boxView.SetAccessibilityName(BoxName);
-			boxView.SetAccessibilityHint(BoxHint);
+			boxView.SetAutomationPropertiesName(BoxName);
+			boxView.SetAutomationPropertiesHelpText(BoxHelpText);
 			// BoxViews are ignored by default on iOS and Win; 
 			// make accessible in order to enable the gesture and narration
-			boxView.SetIsInAccessibleTree(true);
+			boxView.SetAutomationPropertiesIsInAccessibleTree(true);
 
 
 			var stack = new StackLayout
@@ -130,46 +130,46 @@ namespace Xamarin.Forms.Controls
 		}
 	}
 
-	public static class AccessibilityExtensions
+	public static class AutomationPropertiesExtensions
 	{
-		public static void SetAccessibilityName(this VisualElement element, string name)
+		public static void SetAutomationPropertiesName(this VisualElement element, string name)
 		{
-			element.SetValue(Accessibility.NameProperty, name);
+			element.SetValue(AutomationProperties.NameProperty, name);
 		}
 
-		public static string GetAccessibilityName(this VisualElement element)
+		public static string GetAutomationPropertiesName(this VisualElement element)
 		{
-			return (string)element.GetValue(Accessibility.NameProperty);
+			return (string)element.GetValue(AutomationProperties.NameProperty);
 		}
 
-		public static void SetAccessibilityHint(this VisualElement element, string hint)
+		public static void SetAutomationPropertiesHelpText(this VisualElement element, string HelpText)
 		{
-			element.SetValue(Accessibility.HintProperty, hint);
+			element.SetValue(AutomationProperties.HelpTextProperty, HelpText);
 		}
 
-		public static string GetAccessibilityHint(this VisualElement element)
+		public static string GetAutomationPropertiesHelpText(this VisualElement element)
 		{
-			return (string)element.GetValue(Accessibility.HintProperty);
+			return (string)element.GetValue(AutomationProperties.HelpTextProperty);
 		}
 
-		public static void SetIsInAccessibleTree(this VisualElement element, bool value)
+		public static void SetAutomationPropertiesIsInAccessibleTree(this VisualElement element, bool value)
 		{
-			element.SetValue(Accessibility.IsInAccessibleTreeProperty, value);
+			element.SetValue(AutomationProperties.IsInAccessibleTreeProperty, value);
 		}
 
-		public static bool GetIsInAccessibleTree(this VisualElement element)
+		public static bool GetAutomationPropertiesIsInAccessibleTree(this VisualElement element)
 		{
-			return (bool)element.GetValue(Accessibility.IsInAccessibleTreeProperty);
+			return (bool)element.GetValue(AutomationProperties.IsInAccessibleTreeProperty);
 		}
 
-		public static void SetAccessibilityLabeledBy(this VisualElement element, Element value)
+		public static void SetAutomationPropertiesLabeledBy(this VisualElement element, Element value)
 		{
-			element.SetValue(Accessibility.LabeledByProperty, value);
+			element.SetValue(AutomationProperties.LabeledByProperty, value);
 		}
 
-		public static Element GetAccessibilityLabeledBy(this VisualElement element)
+		public static Element GetAutomationPropertiesLabeledBy(this VisualElement element)
 		{
-			return (Element)element.GetValue(Accessibility.LabeledByProperty);
+			return (Element)element.GetValue(AutomationProperties.LabeledByProperty);
 		}
 	}
 }
diff --git a/Xamarin.Forms.Controls/CoreGallery.cs b/Xamarin.Forms.Controls/CoreGallery.cs
index 924d4129..26e9a590 100644
--- a/Xamarin.Forms.Controls/CoreGallery.cs
+++ b/Xamarin.Forms.Controls/CoreGallery.cs
@@ -212,7 +212,7 @@ namespace Xamarin.Forms.Controls
 				}		
 			};
 #endif
-			SetValue(Accessibility.NameProperty, "SwapRoot");
+			SetValue(AutomationProperties.NameProperty, "SwapRoot");
 		}
 	}
 
@@ -245,7 +245,7 @@ namespace Xamarin.Forms.Controls
 		}
 
 		List<GalleryPageFactory> _pages = new List<GalleryPageFactory> {
-				new GalleryPageFactory(() => new AccessibilityGallery(), "Accessibility"),
+				new GalleryPageFactory(() => new AutomationPropertiesGallery(), "Accessibility"),
 				new GalleryPageFactory(() => new PlatformSpecificsGallery(), "Platform Specifics"),
 				new GalleryPageFactory(() => new NativeBindingGalleryPage(), "Native Binding Controls Gallery"),
 				new GalleryPageFactory(() => new XamlNativeViews(), "Xaml Native Views Gallery"),
@@ -377,7 +377,7 @@ namespace Xamarin.Forms.Controls
 				SelectedItem = null;
 			};
 
-			SetValue(Accessibility.NameProperty, "Core Pages");
+			SetValue(AutomationProperties.NameProperty, "Core Pages");
 		}
 
 		NavigationBehavior navigationBehavior;
diff --git a/Xamarin.Forms.Controls/Xamarin.Forms.Controls.csproj b/Xamarin.Forms.Controls/Xamarin.Forms.Controls.csproj
index 717f31e0..58997640 100644
--- a/Xamarin.Forms.Controls/Xamarin.Forms.Controls.csproj
+++ b/Xamarin.Forms.Controls/Xamarin.Forms.Controls.csproj
@@ -85,7 +85,7 @@
     <Compile Include="App.cs" />
     <Compile Include="AppLifeCycle.cs" />
     <Compile Include="Bugzilla44596SplashPage.cs" />
-    <Compile Include="ControlGalleryPages\AccessibilityGallery.cs" />
+    <Compile Include="ControlGalleryPages\AutomationPropertiesGallery.cs" />
     <Compile Include="ControlGalleryPages\CellForceUpdateSizeGalleryPage.cs" />
     <Compile Include="ControlGalleryPages\LayoutAddPerformance.xaml.cs">
       <DependentUpon>LayoutAddPerformance.xaml</DependentUpon>