From fc7aa3f2169701075e4fa43b92d764fa3e159668 Mon Sep 17 00:00:00 2001
From: Peter Collins <peter.collins@xamarin.com>
Date: Tue, 9 Jun 2015 15:11:41 -0400
Subject: [PATCH] [CommonSampleLibrary] Use App.Activity over FragmentActivity

---
 CommonSampleLibrary/Activities/SampleActivityBase.cs | 3 +--
 CommonSampleLibrary/CommonSampleLibrary.csproj       | 8 +-------
 CommonSampleLibrary/Logger/LogFragment.cs            | 1 -
 CommonSampleLibrary/packages.config                  | 4 ----
 4 files changed, 2 insertions(+), 14 deletions(-)
 delete mode 100644 CommonSampleLibrary/packages.config

diff --git a/CommonSampleLibrary/Activities/SampleActivityBase.cs b/CommonSampleLibrary/Activities/SampleActivityBase.cs
index 45b44a9e0..66dc22693 100644
--- a/CommonSampleLibrary/Activities/SampleActivityBase.cs
+++ b/CommonSampleLibrary/Activities/SampleActivityBase.cs
@@ -24,7 +24,6 @@
 using Android.Runtime;
 using Android.Views;
 using Android.Widget;
-using Android.Support.V4.App;
 
 namespace CommonSampleLibrary
 {
@@ -32,7 +31,7 @@ namespace CommonSampleLibrary
  	* Base launcher activity, to handle most of the common plumbing for samples.
  	*/
 	[Activity (Label = "SampleActivityBase")]			
-	public class SampleActivityBase : FragmentActivity
+	public class SampleActivityBase : Activity
 	{
 		public virtual string TAG {
 			get { return "SampleActivityBase"; }
diff --git a/CommonSampleLibrary/CommonSampleLibrary.csproj b/CommonSampleLibrary/CommonSampleLibrary.csproj
index ab34d072a..845ea21f8 100644
--- a/CommonSampleLibrary/CommonSampleLibrary.csproj
+++ b/CommonSampleLibrary/CommonSampleLibrary.csproj
@@ -13,7 +13,7 @@
     <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
     <AndroidResgenClass>Resource</AndroidResgenClass>
     <AssemblyName>CommonSampleLibrary</AssemblyName>
-    <TargetFrameworkVersion>v2.3</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0.3</TargetFrameworkVersion>
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
@@ -43,9 +43,6 @@
     <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
     <Reference Include="Mono.Android" />
-    <Reference Include="Xamarin.Android.Support.v4">
-      <HintPath>packages\Xamarin.Android.Support.v4.20.0.0.4\lib\MonoAndroid10\Xamarin.Android.Support.v4.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Resources\Resource.designer.cs" />
@@ -61,7 +58,4 @@
     <AndroidResource Include="Resources\values\Strings.xml" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
 </Project>
diff --git a/CommonSampleLibrary/Logger/LogFragment.cs b/CommonSampleLibrary/Logger/LogFragment.cs
index 2b929c0ed..33f534fe5 100644
--- a/CommonSampleLibrary/Logger/LogFragment.cs
+++ b/CommonSampleLibrary/Logger/LogFragment.cs
@@ -26,7 +26,6 @@
 using Android.Widget;
 using Android.Graphics;
 using Android.Text;
-using Android.Support.V4.App;
 
 namespace CommonSampleLibrary
 {
diff --git a/CommonSampleLibrary/packages.config b/CommonSampleLibrary/packages.config
deleted file mode 100644
index a34d750a3..000000000
--- a/CommonSampleLibrary/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Xamarin.Android.Support.v4" version="20.0.0.4" targetFramework="MonoAndroid23" />
-</packages>
\ No newline at end of file