changes to the android samples to match the activity changes

Samples/Android/ChaseAndEvade/Activity1.cs

@@ -11,8 +11,8 @@ namespace MonoGame.Samples.ChaseAndEvade.Droid
         protected override void OnCreate(Bundle bundle)
         {
             base.OnCreate(bundle);
-
-            ChaseAndEvadeGame g = new ChaseAndEvadeGame(this);
+			ChaseAndEvadeGame.Activity = this;			
+            ChaseAndEvadeGame g = new ChaseAndEvadeGame();			
             SetContentView(g.Window);
             g.Run();
         }

Samples/Android/ChaseAndEvade/MonoGame.Samples.ChaseAndEvade.Android.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -16,7 +16,6 @@
     <AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
     <AndroidSupportedAbis>armeabi</AndroidSupportedAbis>
     <AndroidStoreUncompressedFileExtensions />
-    <TargetFrameworkVersion>v2.2</TargetFrameworkVersion>
     <MandroidI18n />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

Samples/Android/ChaseAndEvade/Resources/Resource.Designer.cs

@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.235
+//     Runtime Version:4.0.30319.239
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.

Samples/Android/Draw2D/Activity1.cs

@@ -9,8 +9,8 @@ namespace Microsoft.Xna.Samples.Draw2D
         protected override void OnCreate(Bundle bundle)
         {
             base.OnCreate(bundle);
-
-            var g = new Game1(this);
+			Game1.Activity = this;
+            var g = new Game1();
             SetContentView(g.Window);
             g.Run();
         }

Samples/Android/Draw2D/MonoGame.Samples.Draw2D.Android.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -15,7 +15,6 @@
     <AndroidApplication>true</AndroidApplication>
     <AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
-    <TargetFrameworkVersion>v2.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

Samples/Android/Draw2D/Resources/Resource.Designer.cs

@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.235
+//     Runtime Version:4.0.30319.239
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.

Samples/Android/Peer2Peer/Activity1.cs

@@ -15,8 +15,8 @@ namespace MonoGame.Samples.PeerToPeerGame.Droid
         protected override void OnCreate(Bundle bundle)
         {
             base.OnCreate(bundle);
-
-            var g = new PeerToPeer.PeerToPeerGame(this);
+			PeerToPeer.PeerToPeerGame.Activity = this;
+            var g = new PeerToPeer.PeerToPeerGame();
             SetContentView(g.Window);
             g.Run();
         }

Samples/Android/Peer2Peer/MonoGame.Samples.Peer2Peer.Android.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -16,7 +16,6 @@
     <AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
     <AndroidSupportedAbis>armeabi</AndroidSupportedAbis>
     <AndroidStoreUncompressedFileExtensions />
-    <TargetFrameworkVersion>v2.2</TargetFrameworkVersion>
     <MandroidI18n />
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
   </PropertyGroup>

Samples/Android/Peer2Peer/Resources/Resource.Designer.cs

@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.235
+//     Runtime Version:4.0.30319.239
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.

Samples/Android/RenderTarget2D/Activity1.cs

@@ -14,10 +14,10 @@ namespace RenderTarget2DSample
 	public class Activity1 : Microsoft.Xna.Framework.AndroidGameActivity
 	{
 		protected override void OnCreate (Bundle bundle)
-		{
-			base.OnCreate (bundle);
-
-			var g = new Game1(this);
+		{					
+			base.OnCreate (bundle);		
+			Game1.Activity = this;
+			var g = new Game1();			
             SetContentView(g.Window);
             g.Run();
 		}

Samples/Android/RenderTarget2D/Resources/Resource.designer.cs

@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.237
+//     Runtime Version:4.0.30319.239
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.

Samples/Android/Sound/Activity1.cs

@@ -17,8 +17,8 @@ namespace Microsoft.Xna.Samples.Sound
         protected override void OnCreate(Bundle bundle)
         {
             base.OnCreate(bundle);
-
-            var g = new Game1(this);
+			Game1.Activity = this;
+            var g = new Game1();
             SetContentView(g.Window);
             g.Run();
                

Samples/Android/Sound/Resources/Resource.Designer.cs

@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.237
+//     Runtime Version:4.0.30319.239
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.

Samples/Android/Sound/Sound.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -24,7 +24,6 @@
     <DefineConstants>TRACE;DEBUG;ANDROID</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <AndroidUseSharedRuntime>True</AndroidUseSharedRuntime>
     <AndroidLinkMode>None</AndroidLinkMode>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -34,7 +33,7 @@
     <DefineConstants>TRACE;ANDROID</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
+    <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
     <AndroidLinkMode>SdkOnly</AndroidLinkMode>
   </PropertyGroup>
   <ItemGroup>

Samples/Linux/Sound/Game1.cs

@@ -26,11 +26,7 @@ namespace Microsoft.Xna.Samples.Sound
 		SoundEffectInstance soundInst;
 		SpriteFont font;
 		
-#if ANDROID 
-		public Game1 (AndroidGameActivity activity) : base (activity)
-#else 
         public Game1 ()  
-#endif
 		{
 			graphics = new GraphicsDeviceManager (this);
 			

Samples/MacOS/Peer2PeerSample/PeerToPeerGame.cs

@@ -54,12 +54,7 @@ namespace PeerToPeer
 	#region Initialization
 
 
-#if ANDROID 
-        public PeerToPeerGame(AndroidGameActivity activity)
-            : base(activity)
-#else 
         public PeerToPeerGame ()  
-#endif
 		{
 			graphics = new GraphicsDeviceManager (this);
 			

Samples/MacOS/RenderTarget2DSample/Game1.cs

@@ -50,12 +50,7 @@ namespace RenderTarget2DSample
 		/// <summary>
 		/// The constructor for our Game1 class.
 		/// </summary>
-#if ANDROID
-        public Game1(AndroidGameActivity activity)
-            : base(activity)
-#else 
         public Game1 ()  
-#endif
 		{
 			// Create the GraphicsDeviceManager for our game.
 			graphics = new GraphicsDeviceManager (this);
@@ -100,11 +95,13 @@ namespace RenderTarget2DSample
 			renderTarget = new RenderTarget2D (GraphicsDevice, GraphicsDevice.PresentationParameters.BackBufferWidth,
 				GraphicsDevice.PresentationParameters.BackBufferHeight, false, SurfaceFormat.Color, DepthFormat.None);
             
+			// Load in our wood tile.
+			wood = Content.Load<Texture2D> ("lava");
+			
 			// Load in the picture of Seamus.
 			mooTheMerciless = Content.Load<Texture2D> ("MooTheMerciless");
 
-			// Load in our wood tile.
-			wood = Content.Load<Texture2D> ("wood");
+			
 		}
 
 		/// <summary>
@@ -159,13 +156,14 @@ namespace RenderTarget2DSample
 		{
 			
 			// A one time only flag to help test for memory leaks
+			
 			if (oneTimeOnly) 
 			{				
 				oneTimeOnly = false;
 
 				// Set renderTarget as the surface to draw to instead of the back buffer
 				GraphicsDevice.SetRenderTarget (renderTarget);
-
+			 
 				// Clear the renderTarget. By default it's all a bright purple color. I like to use Color.Transparent to
 				// enable easy alpha blending.
 				GraphicsDevice.Clear (Color.Transparent);
@@ -224,9 +222,11 @@ namespace RenderTarget2DSample
 
 				// End the spriteBatch draw.
 				spriteBatch.End ();
-
+				 								
 				// Switch back to drawing onto the back buffer
 				GraphicsDevice.SetRenderTarget (null);
+				
+				//GrabScreenshot(renderTarget);
 			}
 			// Now that we're back to drawing onto the back buffer, we want to clear it. If we had done so earlier
 			// then when we switched to drawing to the render target, the old back buffer would've just be filled with
@@ -264,5 +264,13 @@ namespace RenderTarget2DSample
 
 			base.Draw (gameTime);
 		}
+		
+		public static void GrabScreenshot(RenderTarget2D rendertarget)
+        {
+			Color[] data = new Color[(rendertarget.Width * rendertarget.Height) * 3];
+            //OpenTK.Graphics.ES11.GL.ReadPixels(0, 0, rendertarget.Width, rendertarget.Height, OpenTK.Graphics.ES11.All.Rgb, OpenTK.Graphics.ES11.All.UnsignedByte, ref data);            
+			rendertarget.GetData<Color>(data);
+        }
+
 	}
 }

Samples/MonoGame.Samples.Android.sln

@@ -25,37 +25,37 @@ Global
 		{565129E0-4EE5-4F6F-B403-C3484C9740BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{565129E0-4EE5-4F6F-B403-C3484C9740BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{565129E0-4EE5-4F6F-B403-C3484C9740BE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BA9476CF-99BA-4D03-92F2-73D2C5E58883}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BA9476CF-99BA-4D03-92F2-73D2C5E58883}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BA9476CF-99BA-4D03-92F2-73D2C5E58883}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BA9476CF-99BA-4D03-92F2-73D2C5E58883}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F05F90DC-DD37-4967-A96A-8D36C1C23E81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F05F90DC-DD37-4967-A96A-8D36C1C23E81}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F05F90DC-DD37-4967-A96A-8D36C1C23E81}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F05F90DC-DD37-4967-A96A-8D36C1C23E81}.Release|Any CPU.Build.0 = Release|Any CPU
-		{616BBFA6-52F2-40A1-AA76-1CF2BD6390D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{616BBFA6-52F2-40A1-AA76-1CF2BD6390D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{616BBFA6-52F2-40A1-AA76-1CF2BD6390D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{616BBFA6-52F2-40A1-AA76-1CF2BD6390D5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{56F6C06F-6F07-402E-89A5-39EDB037A516}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{56F6C06F-6F07-402E-89A5-39EDB037A516}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{56F6C06F-6F07-402E-89A5-39EDB037A516}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{56F6C06F-6F07-402E-89A5-39EDB037A516}.Release|Any CPU.Build.0 = Release|Any CPU
+		{616BBFA6-52F2-40A1-AA76-1CF2BD6390D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{616BBFA6-52F2-40A1-AA76-1CF2BD6390D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{616BBFA6-52F2-40A1-AA76-1CF2BD6390D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{616BBFA6-52F2-40A1-AA76-1CF2BD6390D5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BA9476CF-99BA-4D03-92F2-73D2C5E58883}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BA9476CF-99BA-4D03-92F2-73D2C5E58883}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BA9476CF-99BA-4D03-92F2-73D2C5E58883}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BA9476CF-99BA-4D03-92F2-73D2C5E58883}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DEDD20B5-8F83-46FD-AD05-8F8FCC49FCD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{DEDD20B5-8F83-46FD-AD05-8F8FCC49FCD6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DEDD20B5-8F83-46FD-AD05-8F8FCC49FCD6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DEDD20B5-8F83-46FD-AD05-8F8FCC49FCD6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E2B6ED3C-A769-47AF-9605-A7410F194B1C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E2B6ED3C-A769-47AF-9605-A7410F194B1C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E2B6ED3C-A769-47AF-9605-A7410F194B1C}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
 		{E2B6ED3C-A769-47AF-9605-A7410F194B1C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E2B6ED3C-A769-47AF-9605-A7410F194B1C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F05F90DC-DD37-4967-A96A-8D36C1C23E81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F05F90DC-DD37-4967-A96A-8D36C1C23E81}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F05F90DC-DD37-4967-A96A-8D36C1C23E81}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F05F90DC-DD37-4967-A96A-8D36C1C23E81}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E2B6ED3C-A769-47AF-9605-A7410F194B1C}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
 		{E2B6ED3C-A769-47AF-9605-A7410F194B1C}.Release|Any CPU.Deploy.0 = Release|Any CPU
 	EndGlobalSection
+	GlobalSection(MonoDevelopProperties) = preSolution
+		StartupItem = Android\RenderTarget2D\MonoGame.Samples.RenderTarget2D.Android.csproj
+	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(MonoDevelopProperties) = preSolution
-		StartupItem = Android\Draw2D\MonoGame.Samples.Draw2D.Android.csproj
-	EndGlobalSection
 EndGlobal

Samples/iOS/ChaseAndEvade/ChaseAndEvadeGame.cs

@@ -131,12 +131,7 @@ namespace ChaseAndEvade
 
 	#region Initialization
 
-#if ANDROID 
-        public ChaseAndEvadeGame(AndroidGameActivity activity)
-            : base(activity)
-#else 
         public ChaseAndEvadeGame ()  
-#endif
         {
 
 			graphics = new GraphicsDeviceManager (this);

Samples/iOS/Draw2D/Game1.cs

@@ -27,11 +27,7 @@ namespace Microsoft.Xna.Samples.Draw2D
 		Color alphaColor = Color.White;
 		FPSCounterComponent fps;
 		
-#if ANDROID 
-		public Game1 (AndroidGameActivity activity) : base (activity)
-#else 
         public Game1 ()  
-#endif
 		{
 			graphics = new GraphicsDeviceManager (this);