From aec95edd8f710ade738c17bbe527a41e6ebf7938 Mon Sep 17 00:00:00 2001
From: Peter Collins <peter.collins@xamarin.com>
Date: Tue, 9 Jun 2015 15:13:12 -0400
Subject: [PATCH] [BasicImmersiveMode] Use Android.App over
 Android.Support.V4.App

Updates to work with new CommonSampleLibrary changes
---
 BasicImmersiveMode/BasicImmersiveMode.csproj      | 7 -------
 BasicImmersiveMode/BasicImmersiveModeFragment.cs  | 5 ++---
 BasicImmersiveMode/MainActivity.cs                | 8 ++++----
 BasicImmersiveMode/Properties/AndroidManifest.xml | 3 +--
 BasicImmersiveMode/packages.config                | 5 -----
 5 files changed, 7 insertions(+), 21 deletions(-)
 delete mode 100644 BasicImmersiveMode/packages.config

diff --git a/BasicImmersiveMode/BasicImmersiveMode.csproj b/BasicImmersiveMode/BasicImmersiveMode.csproj
index b23b1a228..63cde875e 100644
--- a/BasicImmersiveMode/BasicImmersiveMode.csproj
+++ b/BasicImmersiveMode/BasicImmersiveMode.csproj
@@ -45,12 +45,6 @@
     <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
     <Reference Include="Mono.Android" />
-    <Reference Include="Xamarin.Android.Support.v13">
-      <HintPath>packages\Xamarin.Android.Support.v13.20.0.0.4\lib\MonoAndroid32\Xamarin.Android.Support.v13.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Android.Support.v4">
-      <HintPath>packages\Xamarin.Android.Support.v4.20.0.0.4\lib\MonoAndroid32\Xamarin.Android.Support.v4.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="MainActivity.cs" />
@@ -61,7 +55,6 @@
   <ItemGroup>
     <None Include="Assets\AboutAssets.txt" />
     <None Include="Properties\AndroidManifest.xml" />
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\layout\Main.axml" />
diff --git a/BasicImmersiveMode/BasicImmersiveModeFragment.cs b/BasicImmersiveMode/BasicImmersiveModeFragment.cs
index 5a44c71ce..21b47aa7b 100644
--- a/BasicImmersiveMode/BasicImmersiveModeFragment.cs
+++ b/BasicImmersiveMode/BasicImmersiveModeFragment.cs
@@ -24,19 +24,18 @@
 using Android.Runtime;
 using Android.Views;
 using Android.Widget;
-using Android.Support.V4.App;
 using CommonSampleLibrary;
 
 namespace BasicImmersiveMode
 {
-	public class BasicImmersiveModeFragment : Android.Support.V4.App.Fragment
+	public class BasicImmersiveModeFragment : Fragment
 	{
 		public static readonly string TAG = "BasicImmersiveModeFragment";
 
 		public override void OnCreate (Bundle savedInstanceState)
 		{
 			base.OnCreate (savedInstanceState);
-			HasOptionsMenu = true;
+			SetHasOptionsMenu (true);
 		}
 
 		public override void OnActivityCreated (Bundle savedInstanceState)
diff --git a/BasicImmersiveMode/MainActivity.cs b/BasicImmersiveMode/MainActivity.cs
index 188138fb6..b033d23fc 100644
--- a/BasicImmersiveMode/MainActivity.cs
+++ b/BasicImmersiveMode/MainActivity.cs
@@ -30,7 +30,7 @@ namespace BasicImmersiveMode
 	* A simple launcher activity containing a summary sample description
 	* and a few action bar buttons.
 	*/
-	[Activity (Label = "@string/app_name", MainLauncher = true, 
+	[Activity (Label = "@string/app_name", MainLauncher = true, Theme="@style/AppTheme",
 		UiOptions = UiOptions.SplitActionBarWhenNarrow)]
 	public class MainActivity : SampleActivityBase
 	{
@@ -45,8 +45,8 @@ protected override void OnCreate (Bundle bundle)
 			base.OnCreate (bundle);
 			SetContentView (Resource.Layout.Main);
 
-			if (SupportFragmentManager.FindFragmentByTag (FRAGTAG) == null ) {
-				Android.Support.V4.App.FragmentTransaction transaction = SupportFragmentManager.BeginTransaction ();
+			if (FragmentManager.FindFragmentByTag (FRAGTAG) == null ) {
+				FragmentTransaction transaction = FragmentManager.BeginTransaction ();
 				var fragment = new BasicImmersiveModeFragment ();
 				transaction.Add (fragment,FRAGTAG);
 				transaction.Commit ();
@@ -72,7 +72,7 @@ public override void InitializeLogging ()
 			logWrapper.NextNode = msgFilter;
 
 			// On screen logging via a fragment with a TextView.
-			var logFragment = (LogFragment)SupportFragmentManager.FindFragmentById (Resource.Id.log_fragment);
+			var logFragment = (LogFragment)FragmentManager.FindFragmentById (Resource.Id.log_fragment);
 			msgFilter.NextNode = logFragment.LogView;
 
 			Log.Info (TAG, "Ready");
diff --git a/BasicImmersiveMode/Properties/AndroidManifest.xml b/BasicImmersiveMode/Properties/AndroidManifest.xml
index 6de7edb2a..00b974ccf 100644
--- a/BasicImmersiveMode/Properties/AndroidManifest.xml
+++ b/BasicImmersiveMode/Properties/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="BasicImmersiveMode.BasicImmersiveMode">
-	<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="19" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.xamarin.BasicImmersiveMode">
 	<application android:label="BasicImmersiveMode" android:icon="@drawable/icon">
 	</application>
 </manifest>
\ No newline at end of file
diff --git a/BasicImmersiveMode/packages.config b/BasicImmersiveMode/packages.config
deleted file mode 100644
index 1e1cb540e..000000000
--- a/BasicImmersiveMode/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Xamarin.Android.Support.v13" version="20.0.0.4" targetFramework="MonoAndroid44" />
-  <package id="Xamarin.Android.Support.v4" version="20.0.0.4" targetFramework="MonoAndroid44" />
-</packages>
\ No newline at end of file