[tests] fully move to AndroidX.Wear

Author: jonathanpeppers

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/WearTests.cs

@@ -21,7 +21,6 @@ public void BasicProject ([Values (true, false)] bool isRelease)
 		[Test]
 		public void BundledWearApp ()
 		{
-			var target = "_UpdateAndroidResgen";
 			var path = Path.Combine ("temp", TestName);
 			var app = new XamarinAndroidApplicationProject {
 				ProjectName = "MyApp",

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/XamarinAndroidWearApplicationProject.cs

@@ -3,22 +3,25 @@
 using System.IO;
 using System.Diagnostics;
 using System.Runtime.CompilerServices;
+using System.Linq;
 
 namespace Xamarin.ProjectTools
 {
+	/// <summary>
+	/// Migrated from Android.Support to AndroidX
+	/// see: https://android-developers.googleblog.com/2016/04/build-beautifully-for-android-wear.html
+	/// </summary>
 	public class XamarinAndroidWearApplicationProject : XamarinAndroidApplicationProject
 	{
 		static readonly string default_strings_xml, default_main_activity;
-		static readonly string default_layout_main, default_layout_rect_main, default_layout_round_main;
+		static readonly string default_layout_rect_main, default_layout_round_main;
 
 		static XamarinAndroidWearApplicationProject ()
 		{
 			using (var sr = new StreamReader (typeof(XamarinAndroidApplicationProject).Assembly.GetManifestResourceStream ("Xamarin.ProjectTools.Resources.Wear.MainActivity.cs")))
 				default_main_activity = sr.ReadToEnd ();
 			using (var sr = new StreamReader (typeof(XamarinAndroidApplicationProject).Assembly.GetManifestResourceStream ("Xamarin.ProjectTools.Resources.Wear.Strings.xml")))
 				default_strings_xml = sr.ReadToEnd ();
-			using (var sr = new StreamReader (typeof(XamarinAndroidApplicationProject).Assembly.GetManifestResourceStream ("Xamarin.ProjectTools.Resources.Wear.LayoutMain.axml")))
-				default_layout_main = sr.ReadToEnd ();
 			using (var sr = new StreamReader (typeof(XamarinAndroidApplicationProject).Assembly.GetManifestResourceStream ("Xamarin.ProjectTools.Resources.Wear.LayoutRectMain.axml")))
 				default_layout_rect_main = sr.ReadToEnd ();
 			using (var sr = new StreamReader (typeof(XamarinAndroidApplicationProject).Assembly.GetManifestResourceStream ("Xamarin.ProjectTools.Resources.Wear.LayoutRoundMain.axml")))
@@ -30,14 +33,21 @@ public XamarinAndroidWearApplicationProject (string debugConfigurationName = "De
 		{
 			PackageReferences.Add (KnownPackages.XamarinAndroidXWear);
 
+			// uses-sdk:minSdkVersion 21 cannot be smaller than version 23 declared in library androidx.wear.wear.aar as the library might be using APIs not available in 21
+			SupportedOSPlatformVersion = "23";
+
 			MainActivity = default_main_activity;
 			StringsXml = default_strings_xml;
-			LayoutMain = default_layout_main;
 			LayoutRectMain = default_layout_rect_main;
 			LayoutRoundMain = default_layout_round_main;
 
-			AndroidResources.Add (new AndroidItem.AndroidResource ("Resources\\layout\\RectangleMain.axml") { TextContent = () => LayoutRectMain });
-			AndroidResources.Add (new AndroidItem.AndroidResource ("Resources\\layout\\RoundMain.axml") { TextContent = () => LayoutRoundMain });
+			// Remove Resources\layout\Main.axml
+			var main = AndroidResources.FirstOrDefault (a => a.Include () == "Resources\\layout\\Main.axml");
+			if (main != null)
+				AndroidResources.Remove (main);
+
+			AndroidResources.Add (new AndroidItem.AndroidResource ("Resources\\layout-notround\\activity_main.axml") { TextContent = () => LayoutRectMain });
+			AndroidResources.Add (new AndroidItem.AndroidResource ("Resources\\layout-round\\activity_main.axml") { TextContent = () => LayoutRoundMain });
 		}
 
 		public string LayoutRectMain { get; set; }

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Wear/LayoutMain.axml

@@ -1,13 +1,12 @@
-using System;
+using System;
 
 using Android.App;
 using Android.Content;
 using Android.OS;
 using Android.Runtime;
-using Android.Support.V4.App;
-using Android.Support.Wearable.Views;
 using Android.Views;
 using Android.Widget;
+using AndroidX.Core.App;
 //${USINGS}
 
 namespace ${ROOT_NAMESPACE}
@@ -22,26 +21,22 @@ protected override void OnCreate (Bundle bundle)
 			base.OnCreate (bundle);
 
 			// Set our view from the "main" layout resource
-			SetContentView (Resource.Layout.Main);
-
-			var v = FindViewById<WatchViewStub> (Resource.Id.watch_view_stub);
-			v.LayoutInflated += delegate {
-
-				// Get our button from the layout resource,
-				// and attach an event to it
-				Button button = FindViewById<Button> (Resource.Id.myButton);
-
-				button.Click += delegate {
-					var notification = new NotificationCompat.Builder (this)
-						.SetContentTitle ("Button tapped")
-						.SetContentText ("Button tapped " + count++ + " times!")
-						.SetSmallIcon (Android.Resource.Drawable.StatNotifyVoicemail)
-						.SetGroup ("group_key_demo").Build ();
-
-					var manager = NotificationManagerCompat.From (this);
-					manager.Notify (1, notification);
-					button.Text = "Check Notification!";
-				};
+			SetContentView (Resource.Layout.activity_main);
+
+			// Get our button from the layout resource,
+			// and attach an event to it
+			Button button = FindViewById<Button> (Resource.Id.myButton);
+
+			button.Click += delegate {
+				var notification = new NotificationCompat.Builder (this)
+					.SetContentTitle ("Button tapped")
+					.SetContentText ("Button tapped " + count++ + " times!")
+					.SetSmallIcon (Android.Resource.Drawable.StatNotifyVoicemail)
+					.SetGroup ("group_key_demo").Build ();
+
+				var manager = NotificationManagerCompat.From (this);
+				manager.Notify (1, notification);
+				button.Text = "Check Notification!";
 			};
 		}
 	}