Modifications for Mono for Android 4.8

This commit is contained in:
Philipp Crocoll 2013-08-03 12:30:13 +02:00
parent 84efaae462
commit 28fb854fb1
5 changed files with 99 additions and 13 deletions

View File

@ -1,27 +1,37 @@
#pragma warning disable 1591 #pragma warning disable 1591
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// This code was generated by a tool. // Dieser Code wurde von einem Tool generiert.
// Runtime Version:4.0.30319.2012 // Laufzeitversion:4.0.30319.18051
// //
// Changes to this file may cause incorrect behavior and will be lost if // Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
// the code is regenerated. // der Code erneut generiert wird.
// </auto-generated> // </auto-generated>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
[assembly: Android.Runtime.ResourceDesignerAttribute("KeePassLib2Android.Resource", IsApplication=false)] [assembly: global::Android.Runtime.ResourceDesignerAttribute("KeePassLib2Android.Resource", IsApplication=false)]
namespace KeePassLib2Android namespace KeePassLib2Android
{ {
[System.CodeDom.Compiler.GeneratedCodeAttribute("Novell.MonoDroid.Build.Tasks", "1.0.0.0")] [System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")]
public partial class Resource public partial class Resource
{ {
static Resource()
{
global::Android.Runtime.ResourceIdManager.UpdateIdValues();
}
public partial class Attribute public partial class Attribute
{ {
static Attribute()
{
global::Android.Runtime.ResourceIdManager.UpdateIdValues();
}
private Attribute() private Attribute()
{ {
} }
@ -33,6 +43,11 @@ namespace KeePassLib2Android
// aapt resource value: 0x7f020000 // aapt resource value: 0x7f020000
public static int library_name = 2130837504; public static int library_name = 2130837504;
static String()
{
global::Android.Runtime.ResourceIdManager.UpdateIdValues();
}
private String() private String()
{ {
} }

View File

@ -105,7 +105,7 @@ namespace KeePassLib.Serialization
// Not implemented and ignored in Mono < 2.10 // Not implemented and ignored in Mono < 2.10
try try
{ {
request.CachePolicy = new RequestCachePolicy(RequestCacheLevel.NoCacheNoStore); //request.CachePolicy = new RequestCachePolicy(RequestCacheLevel.NoCacheNoStore);
} }
catch(NotImplementedException) { } catch(NotImplementedException) { }
catch(Exception) { Debug.Assert(false); } catch(Exception) { Debug.Assert(false); }

View File

@ -1,4 +1,5 @@
<metadata> <metadata>
<remove-node path="/api/package[@name='keepass2android.softkeyboard']/class[@name='KP2AKeyboard']" />
<!-- <!--
This sample removes the class: android.support.v4.content.AsyncTaskLoader.LoadTask: This sample removes the class: android.support.v4.content.AsyncTaskLoader.LoadTask:
<remove-node path="/api/package[@name='android.support.v4.content']/class[@name='AsyncTaskLoader.LoadTask']" /> <remove-node path="/api/package[@name='android.support.v4.content']/class[@name='AsyncTaskLoader.LoadTask']" />

View File

@ -1,24 +1,29 @@
#pragma warning disable 1591 #pragma warning disable 1591
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// This code was generated by a tool. // Dieser Code wurde von einem Tool generiert.
// Runtime Version:4.0.30319.2012 // Laufzeitversion:4.0.30319.18051
// //
// Changes to this file may cause incorrect behavior and will be lost if // Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
// the code is regenerated. // der Code erneut generiert wird.
// </auto-generated> // </auto-generated>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
[assembly: Android.Runtime.ResourceDesignerAttribute("keepass2android.Resource", IsApplication=true)] [assembly: global::Android.Runtime.ResourceDesignerAttribute("keepass2android.Resource", IsApplication=true)]
namespace keepass2android namespace keepass2android
{ {
[System.CodeDom.Compiler.GeneratedCodeAttribute("Novell.MonoDroid.Build.Tasks", "1.0.0.0")] [System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")]
public partial class Resource public partial class Resource
{ {
static Resource()
{
global::Android.Runtime.ResourceIdManager.UpdateIdValues();
}
public static void UpdateIdValues() public static void UpdateIdValues()
{ {
KeePassLib2Android.Resource.String.library_name = keepass2android.Resource.String.library_name; KeePassLib2Android.Resource.String.library_name = keepass2android.Resource.String.library_name;
@ -39,6 +44,11 @@ namespace keepass2android
// aapt resource value: 0x7f040003 // aapt resource value: 0x7f040003
public const int anim_leave_back = 2130968579; public const int anim_leave_back = 2130968579;
static Animation()
{
global::Android.Runtime.ResourceIdManager.UpdateIdValues();
}
private Animation() private Animation()
{ {
} }
@ -62,6 +72,11 @@ namespace keepass2android
// aapt resource value: 0x7f0a0001 // aapt resource value: 0x7f0a0001
public const int list_size_values = 2131361793; public const int list_size_values = 2131361793;
static Array()
{
global::Android.Runtime.ResourceIdManager.UpdateIdValues();
}
private Array() private Array()
{ {
} }
@ -70,6 +85,11 @@ namespace keepass2android
public partial class Attribute public partial class Attribute
{ {
static Attribute()
{
global::Android.Runtime.ResourceIdManager.UpdateIdValues();
}
private Attribute() private Attribute()
{ {
} }
@ -108,6 +128,11 @@ namespace keepass2android
// aapt resource value: 0x7f090002 // aapt resource value: 0x7f090002
public const int sort_default = 2131296258; public const int sort_default = 2131296258;
static Boolean()
{
global::Android.Runtime.ResourceIdManager.UpdateIdValues();
}
private Boolean() private Boolean()
{ {
} }
@ -158,6 +183,11 @@ namespace keepass2android
// aapt resource value: 0x7f06000c // aapt resource value: 0x7f06000c
public const int light_gray = 2131099660; public const int light_gray = 2131099660;
static Color()
{
global::Android.Runtime.ResourceIdManager.UpdateIdValues();
}
private Color() private Color()
{ {
} }
@ -175,6 +205,11 @@ namespace keepass2android
// aapt resource value: 0x7f070000 // aapt resource value: 0x7f070000
public const int key_height = 2131165184; public const int key_height = 2131165184;
static Dimension()
{
global::Android.Runtime.ResourceIdManager.UpdateIdValues();
}
private Dimension() private Dimension()
{ {
} }
@ -519,6 +554,11 @@ namespace keepass2android
// aapt resource value: 0x7f02006f // aapt resource value: 0x7f02006f
public const int YellowButton = 2130837615; public const int YellowButton = 2130837615;
static Drawable()
{
global::Android.Runtime.ResourceIdManager.UpdateIdValues();
}
private Drawable() private Drawable()
{ {
} }
@ -1043,6 +1083,11 @@ namespace keepass2android
// aapt resource value: 0x7f0d0002 // aapt resource value: 0x7f0d0002
public const int version_title = 2131558402; public const int version_title = 2131558402;
static Id()
{
global::Android.Runtime.ResourceIdManager.UpdateIdValues();
}
private Id() private Id()
{ {
} }
@ -1165,6 +1210,11 @@ namespace keepass2android
// aapt resource value: 0x7f030025 // aapt resource value: 0x7f030025
public const int url_credentials = 2130903077; public const int url_credentials = 2130903077;
static Layout()
{
global::Android.Runtime.ResourceIdManager.UpdateIdValues();
}
private Layout() private Layout()
{ {
} }
@ -1188,6 +1238,11 @@ namespace keepass2android
// aapt resource value: 0x7f0c0004 // aapt resource value: 0x7f0c0004
public const int password = 2131492868; public const int password = 2131492868;
static Menu()
{
global::Android.Runtime.ResourceIdManager.UpdateIdValues();
}
private Menu() private Menu()
{ {
} }
@ -2150,6 +2205,11 @@ namespace keepass2android
// aapt resource value: 0x7f0800b6 // aapt resource value: 0x7f0800b6
public const int yes = 2131230902; public const int yes = 2131230902;
static String()
{
global::Android.Runtime.ResourceIdManager.UpdateIdValues();
}
private String() private String()
{ {
} }
@ -2239,6 +2299,11 @@ namespace keepass2android
// aapt resource value: 0x7f0b000d // aapt resource value: 0x7f0b000d
public const int WhiteOnDarkSmall = 2131427341; public const int WhiteOnDarkSmall = 2131427341;
static Style()
{
global::Android.Runtime.ResourceIdManager.UpdateIdValues();
}
private Style() private Style()
{ {
} }
@ -2268,6 +2333,11 @@ namespace keepass2android
// aapt resource value: 0x7f050006 // aapt resource value: 0x7f050006
public const int symbols_shift = 2131034118; public const int symbols_shift = 2131034118;
static Xml()
{
global::Android.Runtime.ResourceIdManager.UpdateIdValues();
}
private Xml() private Xml()
{ {
} }