[generator] Remove androidx.annotation from Annotation names

src/Xamarin.Android.Tools.AnnotationSupport/Objects/AnnotatedItem.cs

@@ -98,5 +98,37 @@ IEnumerable<string> ParseArguments (string args)
 						yield return x;
 			}
 		}
+
+		public override string ToString ()
+		{
+			var s = new System.Text.StringBuilder ();
+			foreach (var a in Annotations) {
+				s.Append ("@").Append (a.Name);
+				if (a.Values.Count > 0) {
+					s.Append ("(");
+					AppendAnnotationValue (a.Values [0]);
+					for (int i = 1; i < a.Values.Count; ++i) {
+						s.Append (", ");
+						AppendAnnotationValue (a.Values [i]);
+					}
+					s.Append (")");
+				}
+				s.Append (" ");
+			}
+			s.Append (TypeName).Append (".").Append (MemberName);
+			if (Arguments?.Length > 0) {
+				s.Append ("(").Append (Arguments [0]);
+				for (int i = 1; i < Arguments.Length; ++i) {
+					s.Append (", ").Append (Arguments [i]);
+				}
+				s.Append (")");
+			}
+			return s.ToString ();
+
+			void AppendAnnotationValue (AnnotationValue d)
+			{
+				s.Append (d.Name).Append("=").Append (d.ValueAsArray);
+			}
+		}
 	}	
 }

src/Xamarin.Android.Tools.AnnotationSupport/Objects/AnnotationData.cs

@@ -7,13 +7,20 @@ namespace Xamarin.AndroidTools.AnnotationSupport
 {
 	public class AnnotationData : AnnotationObject
 	{
+		static readonly string[] Prefixes = new[] {
+			"android.support.annotation.",
+			"androidx.annotation.",
+		};
 		public AnnotationData (XElement e)
 		{
 			var a = e.Attribute ("name");
 			Name = a == null ? null : a.Value;
-			string predef = "android.support.annotation.";
-			if (Name.StartsWith (predef, StringComparison.Ordinal))
+			foreach (var predef in Prefixes) {
+				if (!Name.StartsWith (predef, StringComparison.Ordinal))
+					continue;
 				Name = Name.Substring (predef.Length);
+				break;
+			}
 			Values = e.Elements ("val").Select (c => new AnnotationValue (c)).ToArray ();
 		}