Merge branch 'monodroid-4.1-preview'

Conflicts: AccelerometerPlay/SimulationView.cs ApiDemo/Animation/Transition3d.cs ApiDemo/ApiDemo.cs ApiDemo/Tutorials/GalleryTutorial.cs ApiDemo/Tutorials/GridViewTutorial.cs ApiDemo/Tutorials/ListViewTutorial.cs ApiDemo/Tutorials/SpinnerTutorial.cs BluetoothChat/BluetoothChat.cs BluetoothChat/DeviceListActivity.cs ContentControls/ContentControls/ContentControls.csproj ContentControls/ContentControls/Home_Adapter.cs ContentControls/ContentControls/Screens/Search/AutoCompleteTextViewScreen.cs GLCube/PaintingView.cs GLDiagnostics/GLDiag.csproj GLDiagnostics/GLDiag.sln GLDiagnostics/PaintingView.cs GLDiagnostics/Resources/layout/main.xml GLTriangle20/PaintingView.cs JetBoy/Classes/JetBoyView.cs LiveWallpaperDemo/CubeWallpaper.cs MapsDemo/RotateView.cs NotePad/Resources/Resource.Designer.cs SanityTests/Hello.cs Snake/Resources/values/strings.xml StandardControls/StandardControls/Screens/ContentControls/GalleryScreen.cs StandardControls/StandardControls/Screens/ContentControls/GridViewScreen.cs TablesAndCellStyles/TablesAndCellStyles/Screens/AccessoryStyles/SimpleListItemChecked.cs TablesAndCellStyles/TablesAndCellStyles/Screens/AccessoryStyles/SimpleListItemMultipleChoice.cs TablesAndCellStyles/TablesAndCellStyles/Screens/AccessoryStyles/SimpleListItemSingleChoice.cs TablesAndCellStyles/TablesAndCellStyles/Screens/CustomTables/GradientBackground/GradientBackground.cs TablesAndCellStyles/TablesAndCellStyles/Screens/CustomTables/LabelledSectionsIndexer/LabelledSectionsIndexer.cs TexturedCube/PaintingView.cs build.sh pre-commit.posix pre-commit.windows validate.posix
Mangopony · May 22, 2012 · 95412c6 · 95412c6
2 parents 82ddbc5 + 3905cc9
commit 95412c6
Show file tree

Hide file tree

Showing 453 changed files with 23,509 additions and 202 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,5 @@
-*/bin/*
-*/obj/*
-*/*/bin/*
-*/*/obj/*
+bin
+obj
 */_ReSharper.*/*
 *.user
 *.suo
@@ -10,3 +8,5 @@
 *.Designer.cs
 *.designer.cs
 *.DS_Store
+
+ContentControls/ContentControls/Resources/Values/PrivateStrings.xml
diff --git a/AccelerometerPlay/SimulationView.cs b/AccelerometerPlay/SimulationView.cs
@@ -137,9 +137,9 @@ protected override void OnDraw (Canvas canvas)
 
 
 		#region ISensorEventListener Members
-	    public void OnAccuracyChanged(Sensor sensor, SensorStatus accuracy)
-	    {
-	    }
+		public void OnAccuracyChanged (Sensor sensor, SensorStatus accuracy)
+		{
+		}
 
 	    public void OnSensorChanged (SensorEvent e)
 		{
@@ -172,4 +172,4 @@ public void OnSensorChanged (SensorEvent e)
 		}
 		#endregion
 	}
-}
+}
diff --git a/AdMob/AdMob.sln b/AdMob/AdMob.sln
@@ -0,0 +1,26 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdMob", "AdMob\AdMob.csproj", "{74B48A13-31DC-40C1-958F-F2979FD0C59D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdMobTest", "AdMobTest\AdMobTest.csproj", "{CD8DCF83-4A46-4B8C-AAF4-135552E2D4D2}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{74B48A13-31DC-40C1-958F-F2979FD0C59D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{74B48A13-31DC-40C1-958F-F2979FD0C59D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{74B48A13-31DC-40C1-958F-F2979FD0C59D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{74B48A13-31DC-40C1-958F-F2979FD0C59D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CD8DCF83-4A46-4B8C-AAF4-135552E2D4D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CD8DCF83-4A46-4B8C-AAF4-135552E2D4D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CD8DCF83-4A46-4B8C-AAF4-135552E2D4D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CD8DCF83-4A46-4B8C-AAF4-135552E2D4D2}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(MonoDevelopProperties) = preSolution
+		StartupItem = AdMobTest\AdMobTest.csproj
+	EndGlobalSection
+EndGlobal
diff --git a/AdMob/AdMob/AdMob.csproj b/AdMob/AdMob/AdMob.csproj
@@ -0,0 +1,65 @@
+<?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>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>10.0.0</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{74B48A13-31DC-40C1-958F-F2979FD0C59D}</ProjectGuid>
+    <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{10368E6C-D01B-4462-8E8B-01FC667A7035};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <RootNamespace>AdMob</RootNamespace>
+    <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
+    <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
+    <MonoAndroidJavaPrefix>Java</MonoAndroidJavaPrefix>
+    <MonoAndroidTransformPrefix>Transforms</MonoAndroidTransformPrefix>
+    <AssemblyName>AdMob</AssemblyName>
+    <TargetFrameworkVersion>v4.0.3</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug</OutputPath>
+    <DefineConstants>DEBUG;</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <AndroidLinkMode>None</AndroidLinkMode>
+    <ConsolePause>false</ConsolePause>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>none</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Release</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+    <AndroidLinkMode>SdkOnly</AndroidLinkMode>
+    <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Core" />
+    <Reference Include="Mono.Android" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Additions\AboutAdditions.txt" />
+    <None Include="Jars\AboutJars.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <TransformFile Include="Transforms\EnumFields.xml" />
+    <TransformFile Include="Transforms\EnumMethods.xml" />
+    <TransformFile Include="Transforms\Metadata.xml" />
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
+  <Import Project="$(MSBuildExtensionsPath)\Novell\Xamarin.Android.Bindings.targets" />
+  <ItemGroup>
+    <InputJar Include="GoogleAdMobAdsSdk-6.0.0.jar">
+      <Link>Jars\GoogleAdMobAdsSdk-6.0.0.jar</Link>
+    </InputJar>
+  </ItemGroup>
+</Project>
diff --git a/AdMob/AdMob/Additions/AboutAdditions.txt b/AdMob/AdMob/Additions/AboutAdditions.txt
@@ -0,0 +1,48 @@
+Additions allow you to add arbitrary C# to the generated classes
+before they are compiled.  This can be helpful for providing convenience
+methods or adding pure C# classes.
+
+== Adding Methods to Generated Classes ==
+
+Let's say the library being bound has a Rectangle class with a constructor
+that takes an x and y position, and a width and length size.  It will look like
+this:
+
+public partial class Rectangle
+{
+    public Rectangle (int x, int y, int width, int height)
+	{
+	    // JNI bindings
+	}
+}
+
+Imagine we want to add a constructor to this class that takes a Point and
+Size structure instead of 4 ints.  We can add a new file called Rectangle.cs
+with a partial class containing our new method:
+
+public partial class Rectangle
+{
+    public Rectangle (Point location, Size size) :
+	    this (location.X, location.Y, size.Width, size.Height)
+	{
+	}
+}
+
+At compile time, the additions class will be added to the generated class
+and the final assembly will a Rectangle class with both constructors.
+
+
+== Adding C# Classes ==
+
+Another thing that can be done is adding fully C# managed classes to the
+generated library.  In the above example, let's assume that there isn't a
+Point class available in Java or our library.  The one we create doesn't need
+to interact with Java, so we'll create it like a normal class in C#.
+
+By adding a Point.cs file with this class, it will end up in the binding library:
+
+public class Point
+{
+    public int X { get; set; }
+	public int Y { get; set; }
+}
diff --git a/AdMob/AdMob/Jars/AboutJars.txt b/AdMob/AdMob/Jars/AboutJars.txt
@@ -0,0 +1,24 @@
+This directory is for Android .jars.
+
+There are 2 types of jars that are supported:
+
+== Input Jar ==
+
+This is the jar that bindings should be generated for.
+
+For example, if you were binding the Google Maps library, this would
+be Google's "maps.jar".
+
+Set the build action for these jars in the properties page to "InputJar".
+
+
+== Reference Jars ==
+
+These are jars that are referenced by the input jar.  C# bindings will
+not be created for these jars.  These jars will be used to resolve
+types used by the input jar.
+
+NOTE: Do not add "android.jar" as a reference jar.  It will be added automatically
+based on the Target Framework selected.
+
+Set the build action for these jars in the properties page to "ReferenceJar".
diff --git a/AdMob/AdMob/Properties/AssemblyInfo.cs b/AdMob/AdMob/Properties/AssemblyInfo.cs
@@ -0,0 +1,28 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using Android.App;
+
+// Information about this assembly is defined by the following attributes. 
+// Change them to the values specific to your project.
+
+[assembly: AssemblyTitle("AdMob")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("")]
+[assembly: AssemblyCopyright("atsushi")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
+// The form "{Major}.{Minor}.*" will automatically update the build and revision,
+// and "{Major}.{Minor}.{Build}.*" will update just the revision.
+
+[assembly: AssemblyVersion("1.0.0")]
+
+// The following attributes are used to specify the signing key for the assembly, 
+// if desired. See the Mono documentation for more information about signing.
+
+//[assembly: AssemblyDelaySign(false)]
+//[assembly: AssemblyKeyFile("")]
+
diff --git a/AdMob/AdMob/Transforms/EnumFields.xml b/AdMob/AdMob/Transforms/EnumFields.xml
@@ -0,0 +1,14 @@
+<enum-field-mappings>
+	<!--
+  This example converts the constants Fragment_id, Fragment_name,
+  and Fragment_tag from android.support.v4.app.FragmentActivity.FragmentTag
+  to an enum called Android.Support.V4.App.FragmentTagType with values
+  Id, Name, and Tag.
+  
+  <type enum-type="Android\Support\V4\App\FragmentTagType" java-class="android/support/v4/app/FragmentActivity$FragmentTag">
+    <member enum="Id" java="Fragment_id" value="1" />
+    <member enum="Name" java="Fragment_name" value="0" />
+    <member enum="Tag" java="Fragment_tag" value="2" />
+  </type>
+  -->
+</enum-field-mappings>
diff --git a/AdMob/AdMob/Transforms/EnumMethods.xml b/AdMob/AdMob/Transforms/EnumMethods.xml
@@ -0,0 +1,11 @@
+<enum-method-mappings>
+	<!--
+  This example changes the Java method:
+    android.support.v4.app.Fragment.SavedState.writeToParcel (int flags)
+  to be:
+    android.support.v4.app.Fragment.SavedState.writeToParcel (Android.OS.ParcelableWriteFlags flags)
+  when bound in C#.
+  
+  <map package="android.support.v4.app" class="Fragment.SavedState" method="writeToParcel" parameter="flags" enum="Android.OS.ParcelableWriteFlags" />
+  -->
+</enum-method-mappings>
diff --git a/AdMob/AdMob/Transforms/Metadata.xml b/AdMob/AdMob/Transforms/Metadata.xml
@@ -0,0 +1,21 @@
+<metadata>
+  <remove-node path="/api/package[@name='com.google.ads.internal']" />
+  <remove-node path="/api/package[@name='com.google.ads']/class[starts-with (@name, 'a')]" />
+  <remove-node path="/api/package[@name='com.google.ads']/class[string-length (@name) = 1]" />
+  <remove-node path="/api/package[@name='com.google.ads']/class[string-length (@name) = 3 and contains (@name, '.')]" />
+  <remove-node path="/api/package[@name='com.google.ads']/class[@name='AdActivity']" />
+  <remove-node path="/api/package[@name='com.google.ads']/class[@name='InstallReceiver']" />
+  <remove-node path="/api/package[@name='com.google.ads.util']" />
+
+  <attr path="/api/package[@name='com.google.ads.mediation']/interface[@name='MediationBannerListener']/method[@name='onDismissScreen']" name="argsType">BannerDismissScreenEventArgs</attr>
+  <attr path="/api/package[@name='com.google.ads.mediation']/interface[@name='MediationBannerListener']/method[@name='onFailedToReceiveAd']" name="argsType">BannerFailedToReceiveAdEventArgs</attr>
+  <attr path="/api/package[@name='com.google.ads.mediation']/interface[@name='MediationBannerListener']/method[@name='onLeaveApplication']" name="argsType">BannerLeaveApplicationEventArgs</attr>
+  <attr path="/api/package[@name='com.google.ads.mediation']/interface[@name='MediationBannerListener']/method[@name='onPresentScreen']" name="argsType">BannerPresentScreenEventArgs</attr>
+  <attr path="/api/package[@name='com.google.ads.mediation']/interface[@name='MediationBannerListener']/method[@name='onReceivedAd']" name="argsType">BannerReceiveAdEventArgs</attr>
+
+  <attr path="/api/package[@name='com.google.ads.mediation']/interface[@name='MediationInterstitialListener']/method[@name='onDismissScreen']" name="argsType">IntersitionalDismissScreenEventArgs</attr>
+  <attr path="/api/package[@name='com.google.ads.mediation']/interface[@name='MediationInterstitialListener']/method[@name='onFailedToReceiveAd']" name="argsType">IntersitionalFailedToReceiveAdEventArgs</attr>
+  <attr path="/api/package[@name='com.google.ads.mediation']/interface[@name='MediationInterstitialListener']/method[@name='onLeaveApplication']" name="argsType">InterstitialLeaveApplicationEventArgs</attr>
+  <attr path="/api/package[@name='com.google.ads.mediation']/interface[@name='MediationInterstitialListener']/method[@name='onPresentScreen']" name="argsType">InterstitialPresentScreenEventArgs</attr>
+  <attr path="/api/package[@name='com.google.ads.mediation']/interface[@name='MediationInterstitialListener']/method[@name='onReceivedAd']" name="argsType">InterstitialReceiveAdEventArgs</attr>
+</metadata>
diff --git a/AdMob/AdMobTest/AdMobTest.csproj b/AdMob/AdMobTest/AdMobTest.csproj
@@ -0,0 +1,75 @@
+<?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>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>10.0.0</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{CD8DCF83-4A46-4B8C-AAF4-135552E2D4D2}</ProjectGuid>
+    <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <RootNamespace>AdMobTest</RootNamespace>
+    <AndroidApplication>True</AndroidApplication>
+    <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
+    <AndroidResgenClass>Resource</AndroidResgenClass>
+    <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
+    <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
+    <AssemblyName>AdMobTest</AssemblyName>
+    <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
+    <TargetFrameworkVersion>v3.2</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug</OutputPath>
+    <DefineConstants>DEBUG;</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <AndroidLinkMode>None</AndroidLinkMode>
+    <ConsolePause>false</ConsolePause>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>none</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Release</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+    <AndroidLinkMode>SdkOnly</AndroidLinkMode>
+    <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Core" />
+    <Reference Include="Mono.Android" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Resources\Resource.designer.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="MainActivity.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\AboutResources.txt" />
+    <None Include="Assets\AboutAssets.txt" />
+    <None Include="Properties\AndroidManifest.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\layout\Main.axml" />
+    <AndroidResource Include="Resources\values\Strings.xml" />
+    <AndroidResource Include="Resources\drawable\Icon.png" />
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
+  <ItemGroup>
+    <ProjectReference Include="..\AdMob\AdMob.csproj">
+      <Project>{74B48A13-31DC-40C1-958F-F2979FD0C59D}</Project>
+      <Name>AdMob</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidJavaLibrary Include="GoogleAdMobAdsSdk-4.3.1.jar">
+      <Link>GoogleAdMobAdsSdk-4.3.1.jar</Link>
+    </AndroidJavaLibrary>
+  </ItemGroup>
+</Project>
diff --git a/AdMob/AdMobTest/Assets/AboutAssets.txt b/AdMob/AdMobTest/Assets/AboutAssets.txt
@@ -0,0 +1,19 @@
+Any raw assets you want to be deployed with your application can be placed in
+this directory (and child directories) and given a Build Action of "AndroidAsset".
+
+These files will be deployed with you package and will be accessible using Android's
+AssetManager, like this:
+
+public class ReadAsset : Activity
+{
+	protected override void OnCreate (Bundle bundle)
+	{
+		base.OnCreate (bundle);
+
+		InputStream input = Assets.Open ("my_asset.txt");
+	}
+}
+
+Additionally, some Android functions will automatically load asset files:
+
+Typeface tf = Typeface.CreateFromAsset (Context.Assets, "fonts/samplefont.ttf");