diff --git a/Java.Interop.sln b/Java.Interop.sln index e80a2ef2a..a3ae34768 100644 --- a/Java.Interop.sln +++ b/Java.Interop.sln @@ -79,7 +79,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build-Tools", "Build-Tools" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "jnienv-gen", "build-tools\jnienv-gen\jnienv-gen.csproj", "{6410DA0F-5E14-4FC0-9AEE-F4C542C96C7A}" EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Xamarin.Android.NamingCustomAttributes", "src\Xamarin.Android.NamingCustomAttributes\Xamarin.Android.NamingCustomAttributes.shproj", "{74598F5C-B8CC-4CE6-8EE2-AB9CA1400076}" +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Java.Interop.NamingCustomAttributes", "src\Java.Interop.NamingCustomAttributes\Java.Interop.NamingCustomAttributes.shproj", "{FE789F04-5E95-42C5-AEF1-E33F8DF06B3F}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Java.Interop.Tools.JavaCallableWrappers", "src\Java.Interop.Tools.JavaCallableWrappers\Java.Interop.Tools.JavaCallableWrappers.csproj", "{D18FCF91-8876-48A0-A693-2DC1E7D3D80A}" EndProject @@ -348,7 +348,7 @@ Global {4EEAB1A7-99C1-4302-9C18-01A7B481409B} = {271C9F30-F679-4793-942B-0D9527CB3E2F} {F3ECB73D-9263-4E42-A5B4-3FC0D1D829F9} = {D5A93398-AEB1-49F3-89DC-3904A47DB0C7} {6410DA0F-5E14-4FC0-9AEE-F4C542C96C7A} = {172B608B-E6F3-41CC-9949-203A76BA247C} - {74598F5C-B8CC-4CE6-8EE2-AB9CA1400076} = {0998E45F-8BCE-4791-A944-962CD54E2D80} + {FE789F04-5E95-42C5-AEF1-E33F8DF06B3F} = {0998E45F-8BCE-4791-A944-962CD54E2D80} {D18FCF91-8876-48A0-A693-2DC1E7D3D80A} = {0998E45F-8BCE-4791-A944-962CD54E2D80} {D48EE8D0-0A0A-4493-AEF5-DAF5F8CF86AD} = {0998E45F-8BCE-4791-A944-962CD54E2D80} {64CC4E44-CE3A-4319-BF3F-6CF8BD513870} = {0998E45F-8BCE-4791-A944-962CD54E2D80} diff --git a/src/Android.Interop/Resources/Resource.designer.cs b/src/Android.Interop/Resources/Resource.designer.cs index ed2570706..dc52e249a 100644 --- a/src/Android.Interop/Resources/Resource.designer.cs +++ b/src/Android.Interop/Resources/Resource.designer.cs @@ -2,7 +2,7 @@ // ------------------------------------------------------------------------------ // // This code was generated by a tool. -// Mono Runtime Version: 4.0.30319.17020 +// Mono Runtime Version: 4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. diff --git a/src/Java.Interop.NamingCustomAttributes/Android.App/ActivityAttribute.cs b/src/Java.Interop.NamingCustomAttributes/Android.App/ActivityAttribute.cs new file mode 100644 index 000000000..3a8b4b52c --- /dev/null +++ b/src/Java.Interop.NamingCustomAttributes/Android.App/ActivityAttribute.cs @@ -0,0 +1,8 @@ +using System; + +namespace Android.App +{ + sealed partial class ActivityAttribute : Attribute { + public string Name {get; set;} + } +} diff --git a/src/Java.Interop.NamingCustomAttributes/Android.App/ApplicationAttribute.cs b/src/Java.Interop.NamingCustomAttributes/Android.App/ApplicationAttribute.cs new file mode 100644 index 000000000..957f085a3 --- /dev/null +++ b/src/Java.Interop.NamingCustomAttributes/Android.App/ApplicationAttribute.cs @@ -0,0 +1,7 @@ +using System; + +namespace Android.App { + sealed partial class ApplicationAttribute : Attribute { + public string Name {get; set;} + } +} diff --git a/src/Java.Interop.NamingCustomAttributes/Android.App/InstrumentationAttribute.cs b/src/Java.Interop.NamingCustomAttributes/Android.App/InstrumentationAttribute.cs new file mode 100644 index 000000000..8e658616a --- /dev/null +++ b/src/Java.Interop.NamingCustomAttributes/Android.App/InstrumentationAttribute.cs @@ -0,0 +1,8 @@ +using System; + +namespace Android.App { + sealed partial class InstrumentationAttribute : Attribute { + public string Name { get; set; } + } +} + diff --git a/src/Java.Interop.NamingCustomAttributes/Android.App/ServiceAttribute.cs b/src/Java.Interop.NamingCustomAttributes/Android.App/ServiceAttribute.cs new file mode 100644 index 000000000..a62084cce --- /dev/null +++ b/src/Java.Interop.NamingCustomAttributes/Android.App/ServiceAttribute.cs @@ -0,0 +1,7 @@ +using System; + +namespace Android.App { + sealed partial class ServiceAttribute : Attribute { + public string Name {get; set;} + } +} diff --git a/src/Java.Interop.NamingCustomAttributes/Android.Content/BroadcastReceiverAttribute.cs b/src/Java.Interop.NamingCustomAttributes/Android.Content/BroadcastReceiverAttribute.cs new file mode 100644 index 000000000..ac730d1ab --- /dev/null +++ b/src/Java.Interop.NamingCustomAttributes/Android.Content/BroadcastReceiverAttribute.cs @@ -0,0 +1,8 @@ +using System; + +namespace Android.Content { + + partial class BroadcastReceiverAttribute : Attribute { + public string Name { get; set; } + } +} diff --git a/src/Java.Interop.NamingCustomAttributes/Android.Content/ContentProviderAttribute.cs b/src/Java.Interop.NamingCustomAttributes/Android.Content/ContentProviderAttribute.cs new file mode 100644 index 000000000..02f489042 --- /dev/null +++ b/src/Java.Interop.NamingCustomAttributes/Android.Content/ContentProviderAttribute.cs @@ -0,0 +1,8 @@ +using System; + +namespace Android.Content { + + partial class ContentProviderAttribute : Attribute { + public string Name { get; set; } + } +} diff --git a/src/Xamarin.Android.NamingCustomAttributes/Android.Runtime/RegisterAttribute.cs b/src/Java.Interop.NamingCustomAttributes/Android.Runtime/RegisterAttribute.cs similarity index 100% rename from src/Xamarin.Android.NamingCustomAttributes/Android.Runtime/RegisterAttribute.cs rename to src/Java.Interop.NamingCustomAttributes/Android.Runtime/RegisterAttribute.cs diff --git a/src/Xamarin.Android.NamingCustomAttributes/Xamarin.Android.NamingCustomAttributes.projitems b/src/Java.Interop.NamingCustomAttributes/Java.Interop.NamingCustomAttributes.projitems similarity index 88% rename from src/Xamarin.Android.NamingCustomAttributes/Xamarin.Android.NamingCustomAttributes.projitems rename to src/Java.Interop.NamingCustomAttributes/Java.Interop.NamingCustomAttributes.projitems index ecdd312cf..0515be0eb 100644 --- a/src/Xamarin.Android.NamingCustomAttributes/Xamarin.Android.NamingCustomAttributes.projitems +++ b/src/Java.Interop.NamingCustomAttributes/Java.Interop.NamingCustomAttributes.projitems @@ -3,10 +3,10 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) true - {74598F5C-B8CC-4CE6-8EE2-AB9CA1400076} + {FE789F04-5E95-42C5-AEF1-E33F8DF06B3F} - Xamarin.Android.NamingCustomAttributes + Java.Interop.NamingCustomAttributes @@ -21,4 +21,4 @@ - \ No newline at end of file + diff --git a/src/Xamarin.Android.NamingCustomAttributes/Xamarin.Android.NamingCustomAttributes.shproj b/src/Java.Interop.NamingCustomAttributes/Java.Interop.NamingCustomAttributes.shproj similarity index 83% rename from src/Xamarin.Android.NamingCustomAttributes/Xamarin.Android.NamingCustomAttributes.shproj rename to src/Java.Interop.NamingCustomAttributes/Java.Interop.NamingCustomAttributes.shproj index f788cf56b..4aee68e4f 100644 --- a/src/Xamarin.Android.NamingCustomAttributes/Xamarin.Android.NamingCustomAttributes.shproj +++ b/src/Java.Interop.NamingCustomAttributes/Java.Interop.NamingCustomAttributes.shproj @@ -3,11 +3,11 @@ 8.0.30703 2.0 - {74598F5C-B8CC-4CE6-8EE2-AB9CA1400076} + {FE789F04-5E95-42C5-AEF1-E33F8DF06B3F} - + - \ No newline at end of file + diff --git a/src/Xamarin.Android.NamingCustomAttributes/Java.Interop/ExportAttribute.cs b/src/Java.Interop.NamingCustomAttributes/Java.Interop/ExportAttribute.cs similarity index 100% rename from src/Xamarin.Android.NamingCustomAttributes/Java.Interop/ExportAttribute.cs rename to src/Java.Interop.NamingCustomAttributes/Java.Interop/ExportAttribute.cs diff --git a/src/Xamarin.Android.NamingCustomAttributes/Java.Interop/ExportFieldAttribute.cs b/src/Java.Interop.NamingCustomAttributes/Java.Interop/ExportFieldAttribute.cs similarity index 100% rename from src/Xamarin.Android.NamingCustomAttributes/Java.Interop/ExportFieldAttribute.cs rename to src/Java.Interop.NamingCustomAttributes/Java.Interop/ExportFieldAttribute.cs diff --git a/src/Xamarin.Android.NamingCustomAttributes/Java.Interop/ExportParameterAttribute.cs b/src/Java.Interop.NamingCustomAttributes/Java.Interop/ExportParameterAttribute.cs similarity index 100% rename from src/Xamarin.Android.NamingCustomAttributes/Java.Interop/ExportParameterAttribute.cs rename to src/Java.Interop.NamingCustomAttributes/Java.Interop/ExportParameterAttribute.cs diff --git a/src/Xamarin.Android.NamingCustomAttributes/Java.Interop/ExportParameterKind.cs b/src/Java.Interop.NamingCustomAttributes/Java.Interop/ExportParameterKind.cs similarity index 100% rename from src/Xamarin.Android.NamingCustomAttributes/Java.Interop/ExportParameterKind.cs rename to src/Java.Interop.NamingCustomAttributes/Java.Interop/ExportParameterKind.cs diff --git a/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers.csproj b/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers.csproj index 15a9964bd..d8a5fd238 100644 --- a/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers.csproj +++ b/src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers.csproj @@ -50,7 +50,7 @@ - + @@ -74,4 +74,4 @@ - \ No newline at end of file + diff --git a/src/Java.Interop.Tools.JavaCallableWrappers/Test/Java.Interop.Tools.JavaCallableWrappers-Tests.csproj b/src/Java.Interop.Tools.JavaCallableWrappers/Test/Java.Interop.Tools.JavaCallableWrappers-Tests.csproj index 89bcb5a08..7e7dde270 100644 --- a/src/Java.Interop.Tools.JavaCallableWrappers/Test/Java.Interop.Tools.JavaCallableWrappers-Tests.csproj +++ b/src/Java.Interop.Tools.JavaCallableWrappers/Test/Java.Interop.Tools.JavaCallableWrappers-Tests.csproj @@ -73,6 +73,6 @@ - + - \ No newline at end of file + diff --git a/src/Xamarin.Android.NamingCustomAttributes/Android.App/ActivityAttribute.cs b/src/Xamarin.Android.NamingCustomAttributes/Android.App/ActivityAttribute.cs deleted file mode 100644 index f6b7024bc..000000000 --- a/src/Xamarin.Android.NamingCustomAttributes/Android.App/ActivityAttribute.cs +++ /dev/null @@ -1,74 +0,0 @@ -using System; - -#if !JCW_ONLY_TYPE_NAMES -using Android.Content.PM; -using Android.Views; -#endif // !JCW_ONLY_TYPE_NAMES - -namespace Android.App -{ - - [Serializable] - [AttributeUsage (AttributeTargets.Class, - AllowMultiple=false, - Inherited=false)] -#if !JCW_ONLY_TYPE_NAMES - public -#endif // !JCW_ONLY_TYPE_NAMES - sealed partial class ActivityAttribute : Attribute { - - public ActivityAttribute () - { - } - - public string Name {get; set;} - -#if !JCW_ONLY_TYPE_NAMES -#if ANDROID_20 - public bool AllowEmbedded {get; set;} -#endif - public bool AllowTaskReparenting {get; set;} - public bool AlwaysRetainTaskState {get; set;} - public bool ClearTaskOnLaunch {get; set;} - public ConfigChanges ConfigurationChanges {get; set;} - public bool Enabled {get; set;} - public bool ExcludeFromRecents {get; set;} - public bool Exported {get; set;} - public bool FinishOnTaskLaunch {get; set;} -#if ANDROID_11 - public bool HardwareAccelerated {get; set;} -#endif - public string Icon {get; set;} - public string Label {get; set;} - public LaunchMode LaunchMode {get; set;} -#if ANDROID_17 - [Obsolete ("There is no //activity/@android:layoutDirection attribute. This was a mistake. " + - "Perhaps you wanted ConfigurationChanges=ConfigChanges.LayoutDirection?")] - public LayoutDirection LayoutDirection {get; set;} -#endif - public bool MainLauncher {get; set;} - public bool MultiProcess {get; set;} - public bool NoHistory {get; set;} -#if ANDROID_16 - public Type ParentActivity {get; set;} -#endif - public string Permission {get; set;} - public string Process {get; set;} -#if ANDROID_24 - public bool ResizeableActivity {get;set;} - public bool SupportsPictureInPicture {get;set;} -#endif - public ScreenOrientation ScreenOrientation {get; set;} - public bool StateNotNeeded {get; set;} - public string TaskAffinity {get; set;} - public string Theme {get; set;} -#if ANDROID_14 - public UiOptions UiOptions {get; set;} -#endif - public SoftInput WindowSoftInputMode {get; set;} -#if ANDROID_15 // this is not documented on http://developer.android.com/guide/topics/manifest/activity-element.html but on https://developers.google.com/glass/develop/gdk/immersions - public bool Immersive {get; set;} -#endif -#endif // JCW_ONLY_TYPE_NAMES - } -} diff --git a/src/Xamarin.Android.NamingCustomAttributes/Android.App/ApplicationAttribute.cs b/src/Xamarin.Android.NamingCustomAttributes/Android.App/ApplicationAttribute.cs deleted file mode 100644 index 3d5853113..000000000 --- a/src/Xamarin.Android.NamingCustomAttributes/Android.App/ApplicationAttribute.cs +++ /dev/null @@ -1,82 +0,0 @@ -using System; - -#if !JCW_ONLY_TYPE_NAMES -using Android.Content.PM; -using Android.Views; -#endif // !JCW_ONLY_TYPE_NAMES - -namespace Android.App { - - [Serializable] - [AttributeUsage (AttributeTargets.Assembly | AttributeTargets.Class, - AllowMultiple=false, - Inherited=false)] -#if !JCW_ONLY_TYPE_NAMES - public -#endif // !JCW_ONLY_TYPE_NAMES - sealed partial class ApplicationAttribute : Attribute { - - public ApplicationAttribute () - { - } - - public string Name {get; set;} - -#if !JCW_ONLY_TYPE_NAMES - public bool AllowBackup {get; set;} - public bool AllowClearUserData {get; set;} - public bool AllowTaskReparenting {get; set;} -#if ANDROID_8 - public Type BackupAgent {get; set;} -#endif -#if ANDROID_21 - public string Banner {get; set;} -#endif - public bool Debuggable {get; set;} - public string Description {get; set;} - public bool Enabled {get; set;} -#if ANDROID_23 - public bool ExtractNativeLibs {get; set;} - public bool FullBackupContent {get; set;} -#endif -#if ANDROID_11 - public bool HardwareAccelerated {get; set;} -#endif - public bool HasCode {get; set;} - public string Icon {get; set;} - public bool KillAfterRestore {get; set;} -#if ANDROID_11 - public bool LargeHeap {get; set;} -#endif - public string Label {get; set;} -#if ANDROID_11 - public string Logo {get; set;} -#endif - public Type ManageSpaceActivity {get; set;} - public string Permission {get; set;} - public bool Persistent {get; set;} - public string Process {get; set;} -#if ANDROID_18 - public string RequiredAccountType {get; set;} -#endif - public bool RestoreAnyVersion {get; set;} -#if ANDROID_18 - public string RestrictedAccountType {get; set;} -#endif -#if ANDROID_17 - public bool SupportsRtl {get; set;} -#endif - public string TaskAffinity {get; set;} - public string Theme {get; set;} -#if ANDROID_14 - public UiOptions UiOptions {get; set;} -#endif -#if ANDROID_10 - public bool VMSafeMode {get; set;} -#endif -#if ANDROID_24 - public bool ResizeableActivity {get; set;} -#endif -#endif // JCW_ONLY_TYPE_NAMES - } -} diff --git a/src/Xamarin.Android.NamingCustomAttributes/Android.App/InstrumentationAttribute.cs b/src/Xamarin.Android.NamingCustomAttributes/Android.App/InstrumentationAttribute.cs deleted file mode 100644 index f2fc09605..000000000 --- a/src/Xamarin.Android.NamingCustomAttributes/Android.App/InstrumentationAttribute.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System; - -namespace Android.App { - - [Serializable] - [AttributeUsage (AttributeTargets.Assembly | AttributeTargets.Class, - AllowMultiple=true, - Inherited=false)] -#if !JCW_ONLY_TYPE_NAMES - public -#endif // !JCW_ONLY_TYPE_NAMES - sealed partial class InstrumentationAttribute : Attribute { - - public InstrumentationAttribute () - { - } - - public bool FunctionalTest {get; set;} - public bool HandleProfiling {get; set;} - public string Icon {get; set;} - public string Label {get; set;} - public string Name {get; set;} - public string TargetPackage {get; set;} - } -} - diff --git a/src/Xamarin.Android.NamingCustomAttributes/Android.App/ServiceAttribute.cs b/src/Xamarin.Android.NamingCustomAttributes/Android.App/ServiceAttribute.cs deleted file mode 100644 index 51d658e2a..000000000 --- a/src/Xamarin.Android.NamingCustomAttributes/Android.App/ServiceAttribute.cs +++ /dev/null @@ -1,37 +0,0 @@ -using System; - -#if !JCW_ONLY_TYPE_NAMES -using Android.Content.PM; -using Android.Views; -#endif // !JCW_ONLY_TYPE_NAMES - -namespace Android.App { - - [Serializable] - [AttributeUsage (AttributeTargets.Class, - AllowMultiple=false, - Inherited=false)] -#if !JCW_ONLY_TYPE_NAMES - public -#endif // !JCW_ONLY_TYPE_NAMES - sealed partial class ServiceAttribute : Attribute { - - public ServiceAttribute () - { - } - - public string Name {get; set;} - -#if !JCW_ONLY_TYPE_NAMES - public bool Enabled {get; set;} - public bool Exported {get; set;} - public string Icon {get; set;} -#if ANDROID_16 - public bool IsolatedProcess {get; set;} -#endif - public string Label {get; set;} - public string Permission {get; set;} - public string Process {get; set;} -#endif // !JCW_ONLY_TYPE_NAMES - } -} diff --git a/src/Xamarin.Android.NamingCustomAttributes/Android.Content/BroadcastReceiverAttribute.cs b/src/Xamarin.Android.NamingCustomAttributes/Android.Content/BroadcastReceiverAttribute.cs deleted file mode 100644 index 7c4e1895a..000000000 --- a/src/Xamarin.Android.NamingCustomAttributes/Android.Content/BroadcastReceiverAttribute.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System; - -namespace Android.Content { - - [Serializable] - [AttributeUsage (AttributeTargets.Class, - AllowMultiple=false, - Inherited=false)] -#if !JCW_ONLY_TYPE_NAMES - public -#endif // !JCW_ONLY_TYPE_NAMES - partial class BroadcastReceiverAttribute : Attribute { - - public BroadcastReceiverAttribute () - { - } - - public bool DirectBootAware {get; set;} - public bool Enabled {get; set;} - public bool Exported {get; set;} - public string Icon {get; set;} - public string Label {get; set;} - public string Name {get; set;} - public string Permission {get; set;} - public string Process {get; set;} - } -} diff --git a/src/Xamarin.Android.NamingCustomAttributes/Android.Content/ContentProviderAttribute.cs b/src/Xamarin.Android.NamingCustomAttributes/Android.Content/ContentProviderAttribute.cs deleted file mode 100644 index 36e5d2ac2..000000000 --- a/src/Xamarin.Android.NamingCustomAttributes/Android.Content/ContentProviderAttribute.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System; - -namespace Android.Content { - - [Serializable] - [AttributeUsage (AttributeTargets.Class, - AllowMultiple=false, - Inherited=false)] -#if !JCW_ONLY_TYPE_NAMES - public -#endif // !JCW_ONLY_TYPE_NAMES - partial class ContentProviderAttribute : Attribute { - - public ContentProviderAttribute (string[] authorities) - { - if (authorities == null) - throw new ArgumentNullException ("authorities"); - if (authorities.Length < 1) - throw new ArgumentException ("At least one authority must be specified.", "authorities"); - Authorities = authorities; - } - - public string[] Authorities {get; private set;} - public bool Enabled {get; set;} - public bool Exported {get; set;} - public bool GrantUriPermissions {get; set;} - public string Icon {get; set;} - public int InitOrder {get; set;} - public string Label {get; set;} - public bool MultiProcess {get; set;} - public string Name {get; set;} - public string Permission {get; set;} - public string Process {get; set;} - public string ReadPermission {get; set;} - public bool Syncable {get; set;} - public string WritePermission {get; set;} - } -} diff --git a/tools/generator/generator.csproj b/tools/generator/generator.csproj index 4c8cd2936..21c8c2629 100644 --- a/tools/generator/generator.csproj +++ b/tools/generator/generator.csproj @@ -124,7 +124,7 @@ - +