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

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

diff --git a/AdvancedImmersiveMode/AdvancedImmersiveMode.csproj b/AdvancedImmersiveMode/AdvancedImmersiveMode.csproj
index 51ee87ec3..f66f763ab 100644
--- a/AdvancedImmersiveMode/AdvancedImmersiveMode.csproj
+++ b/AdvancedImmersiveMode/AdvancedImmersiveMode.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/AdvancedImmersiveMode/AdvancedImmersiveModeFragment.cs b/AdvancedImmersiveMode/AdvancedImmersiveModeFragment.cs
index b51f587ce..7b2e79011 100644
--- a/AdvancedImmersiveMode/AdvancedImmersiveModeFragment.cs
+++ b/AdvancedImmersiveMode/AdvancedImmersiveModeFragment.cs
@@ -24,7 +24,6 @@
 using Android.Runtime;
 using Android.Views;
 using Android.Widget;
-using Android.Support.V4.App;
 using CommonSampleLibrary;
 
 namespace AdvancedImmersiveMode
@@ -34,7 +33,7 @@ namespace AdvancedImmersiveMode
  	* Checkboxes are also made available for toggling other UI flags which can
  	* alter the behavior of immersive mode.
  	*/
-	public class AdvancedImmersiveModeFragment : Android.Support.V4.App.Fragment
+	public class AdvancedImmersiveModeFragment : Fragment
 	{
 		public static readonly String TAG = "AdvancedImmersiveModeFragment";
 		public CheckBox mHideNavCheckbox;
@@ -46,7 +45,7 @@ public class AdvancedImmersiveModeFragment : Android.Support.V4.App.Fragment
 		public override void OnCreate (Bundle savedInstanceState)
 		{
 			base.OnCreate (savedInstanceState);
-			HasOptionsMenu = true;
+			SetHasOptionsMenu (true);
 		}
 
 		public override void OnActivityCreated (Bundle savedInstanceState)
diff --git a/AdvancedImmersiveMode/MainActivity.cs b/AdvancedImmersiveMode/MainActivity.cs
index eca842962..8c1f05316 100644
--- a/AdvancedImmersiveMode/MainActivity.cs
+++ b/AdvancedImmersiveMode/MainActivity.cs
@@ -22,7 +22,6 @@
 using Android.Views;
 using Android.Widget;
 using Android.OS;
-using Android.Support.V4.App;
 using CommonSampleLibrary;
 
 
@@ -32,7 +31,7 @@ namespace AdvancedImmersiveMode
  	* 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
 	{
@@ -47,8 +46,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 AdvancedImmersiveModeFragment ();
 				transaction.Add (fragment,FRAGTAG);
 				transaction.Commit ();
@@ -74,7 +73,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/AdvancedImmersiveMode/Properties/AndroidManifest.xml b/AdvancedImmersiveMode/Properties/AndroidManifest.xml
index 7a39a47bf..9b30771f2 100644
--- a/AdvancedImmersiveMode/Properties/AndroidManifest.xml
+++ b/AdvancedImmersiveMode/Properties/AndroidManifest.xml
@@ -1,5 +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="AdvancedImmersiveMode.AdvancedImmersiveMode">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.xamarin.AdvancedImmersiveMode">
 	<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="19" />
 	<application android:label="AdvancedImmersiveMode" android:icon="@drawable/icon">
 	</application>
diff --git a/AdvancedImmersiveMode/packages.config b/AdvancedImmersiveMode/packages.config
deleted file mode 100644
index 1e1cb540e..000000000
--- a/AdvancedImmersiveMode/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