Skip to content
This repository was archived by the owner on May 29, 2024. It is now read-only.

Commit 7631b47

Browse files
pjcollinspjcollins
authored
Merge pull request #28 from xamarin/dev/pecolli/api31-live
Merge branch 'origin/master' into 'live'
2 parents af96a68 + 1daf71c commit 7631b47

File tree

8,098 files changed

+1612168
-328281
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

8,098 files changed

+1612168
-328281
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
out
22
MonoAndroid-lib.tree
33
MonoAndroid-lib.zip
4+
.DS_Store

‎.openpublishing.publish.config.json‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,25 @@
66
"build_output_subfolder": "XamarinAndroidAPI",
77
"locale": "en-us",
88
"monikers": [
9-
"xamarin-android-sdk-9"
9+
"xamarin-android-sdk-12"
1010
],
1111
"moniker_ranges": [],
12-
"open_to_public_contributors": false,
12+
"open_to_public_contributors": false,
1313
"type_mapping": {
1414
"Conceptual": "Content",
1515
"ManagedReference": "Content",
16-
"RestApi": "Content"
16+
"RestApi": "Content",
17+
"NetEnum": "Content",
18+
"NetDelegate": "Content",
19+
"NetNamespace": "Content",
20+
"NetMember": "Content",
21+
"NetType": "Content"
1722
},
1823
"build_entry_point": "docs",
1924
"template_folder": "_themes",
2025
"base_path": "dotnet",
2126
"site_name": "Docs",
22-
"customized_template_paths": [
23-
"_dependentPackages/memberpage.plugins/content"
24-
],
27+
"customized_template_paths": [],
2528
"customized_tasks": {
2629
"docset_prebuild": [
2730
"_dependentPackages/ECMA2Yaml/tools/Run.ps1",
@@ -33,10 +36,11 @@
3336
]
3437
},
3538
"ECMA2Yaml": {
36-
"SourceXmlFolder": "docs/Mono.Android/en",
39+
"SourceXmlFolder": "docs/Mono.Android/en",
3740
"OutputYamlFolder": "docs/Mono.Android/en/api",
3841
"Flatten": true,
39-
"id": "XamarinAndroidAPI"
42+
"id": "XamarinAndroidAPI",
43+
"SDPMode": "true"
4044
},
4145
"SplitTOC": [
4246
"docs/Mono.Android/en/api/XamarinAndroidAPI/toc.yml"
@@ -86,5 +90,8 @@
8690
"target_framework": "net45",
8791
"version": "latest"
8892
}
89-
]
93+
],
94+
"docs_build_engine": {
95+
"name": "docfx_v3"
96+
}
9097
}

‎docs/Mono.Android/en/Android.AccessibilityServices/AccessibilityButtonController+AccessibilityButtonCallback.xml‎

Lines changed: 40 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
<Interfaces />
1414
<Attributes>
1515
<Attribute>
16-
<AttributeName>Android.Runtime.Register("android/accessibilityservice/AccessibilityButtonController$AccessibilityButtonCallback", ApiSince=26, DoNotGenerateAcw=true)</AttributeName>
16+
<AttributeName Language="C#">[Android.Runtime.Register("android/accessibilityservice/AccessibilityButtonController$AccessibilityButtonCallback", ApiSince=26, DoNotGenerateAcw=true)]</AttributeName>
17+
<AttributeName Language="F#">[&lt;Android.Runtime.Register("android/accessibilityservice/AccessibilityButtonController$AccessibilityButtonCallback", ApiSince=26, DoNotGenerateAcw=true)&gt;]</AttributeName>
1718
</Attribute>
1819
</Attributes>
1920
<Docs>
@@ -39,7 +40,8 @@
3940
</AssemblyInfo>
4041
<Attributes>
4142
<Attribute>
42-
<AttributeName>Android.Runtime.Register(".ctor", "()V", "")</AttributeName>
43+
<AttributeName Language="C#">[Android.Runtime.Register(".ctor", "()V", "", ApiSince=26)]</AttributeName>
44+
<AttributeName Language="F#">[&lt;Android.Runtime.Register(".ctor", "()V", "", ApiSince=26)&gt;]</AttributeName>
4345
</Attribute>
4446
</Attributes>
4547
<Parameters />
@@ -83,6 +85,16 @@
8385
<AssemblyName>Mono.Android</AssemblyName>
8486
<AssemblyVersion>0.0.0.0</AssemblyVersion>
8587
</AssemblyInfo>
88+
<Attributes>
89+
<Attribute>
90+
<AttributeName Language="C#">[System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]</AttributeName>
91+
<AttributeName Language="F#">[&lt;System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)&gt;]</AttributeName>
92+
</Attribute>
93+
<Attribute>
94+
<AttributeName Language="C#">[System.Diagnostics.DebuggerBrowsable(System.Diagnostics.DebuggerBrowsableState.Never)]</AttributeName>
95+
<AttributeName Language="F#">[&lt;System.Diagnostics.DebuggerBrowsable(System.Diagnostics.DebuggerBrowsableState.Never)&gt;]</AttributeName>
96+
</Attribute>
97+
</Attributes>
8698
<ReturnValue>
8799
<ReturnType>Java.Interop.JniPeerMembers</ReturnType>
88100
</ReturnValue>
@@ -95,7 +107,7 @@
95107
</Docs>
96108
</Member>
97109
<Member MemberName="OnAvailabilityChanged">
98-
<MemberSignature Language="C#" Value="public virtual void OnAvailabilityChanged (Android.AccessibilityServices.AccessibilityButtonController controller, bool available);" />
110+
<MemberSignature Language="C#" Value="public virtual void OnAvailabilityChanged (Android.AccessibilityServices.AccessibilityButtonController? controller, bool available);" />
99111
<MemberSignature Language="ILAsm" Value=".method public hidebysig newslot virtual instance void OnAvailabilityChanged(class Android.AccessibilityServices.AccessibilityButtonController controller, bool available) cil managed" />
100112
<MemberSignature Language="DocId" Value="M:Android.AccessibilityServices.AccessibilityButtonController.AccessibilityButtonCallback.OnAvailabilityChanged(Android.AccessibilityServices.AccessibilityButtonController,System.Boolean)" />
101113
<MemberSignature Language="F#" Value="abstract member OnAvailabilityChanged : Android.AccessibilityServices.AccessibilityButtonController * bool -&gt; unit&#xA;override this.OnAvailabilityChanged : Android.AccessibilityServices.AccessibilityButtonController * bool -&gt; unit" Usage="accessibilityButtonCallback.OnAvailabilityChanged (controller, available)" />
@@ -106,7 +118,8 @@
106118
</AssemblyInfo>
107119
<Attributes>
108120
<Attribute>
109-
<AttributeName>Android.Runtime.Register("onAvailabilityChanged", "(Landroid/accessibilityservice/AccessibilityButtonController;Z)V", "GetOnAvailabilityChanged_Landroid_accessibilityservice_AccessibilityButtonController_ZHandler")</AttributeName>
121+
<AttributeName Language="C#">[Android.Runtime.Register("onAvailabilityChanged", "(Landroid/accessibilityservice/AccessibilityButtonController;Z)V", "GetOnAvailabilityChanged_Landroid_accessibilityservice_AccessibilityButtonController_ZHandler", ApiSince=26)]</AttributeName>
122+
<AttributeName Language="F#">[&lt;Android.Runtime.Register("onAvailabilityChanged", "(Landroid/accessibilityservice/AccessibilityButtonController;Z)V", "GetOnAvailabilityChanged_Landroid_accessibilityservice_AccessibilityButtonController_ZHandler", ApiSince=26)&gt;]</AttributeName>
110123
</Attribute>
111124
</Attributes>
112125
<ReturnValue>
@@ -126,7 +139,7 @@
126139
</Docs>
127140
</Member>
128141
<Member MemberName="OnClicked">
129-
<MemberSignature Language="C#" Value="public virtual void OnClicked (Android.AccessibilityServices.AccessibilityButtonController controller);" />
142+
<MemberSignature Language="C#" Value="public virtual void OnClicked (Android.AccessibilityServices.AccessibilityButtonController? controller);" />
130143
<MemberSignature Language="ILAsm" Value=".method public hidebysig newslot virtual instance void OnClicked(class Android.AccessibilityServices.AccessibilityButtonController controller) cil managed" />
131144
<MemberSignature Language="DocId" Value="M:Android.AccessibilityServices.AccessibilityButtonController.AccessibilityButtonCallback.OnClicked(Android.AccessibilityServices.AccessibilityButtonController)" />
132145
<MemberSignature Language="F#" Value="abstract member OnClicked : Android.AccessibilityServices.AccessibilityButtonController -&gt; unit&#xA;override this.OnClicked : Android.AccessibilityServices.AccessibilityButtonController -&gt; unit" Usage="accessibilityButtonCallback.OnClicked controller" />
@@ -137,7 +150,8 @@
137150
</AssemblyInfo>
138151
<Attributes>
139152
<Attribute>
140-
<AttributeName>Android.Runtime.Register("onClicked", "(Landroid/accessibilityservice/AccessibilityButtonController;)V", "GetOnClicked_Landroid_accessibilityservice_AccessibilityButtonController_Handler")</AttributeName>
153+
<AttributeName Language="C#">[Android.Runtime.Register("onClicked", "(Landroid/accessibilityservice/AccessibilityButtonController;)V", "GetOnClicked_Landroid_accessibilityservice_AccessibilityButtonController_Handler", ApiSince=26)]</AttributeName>
154+
<AttributeName Language="F#">[&lt;Android.Runtime.Register("onClicked", "(Landroid/accessibilityservice/AccessibilityButtonController;)V", "GetOnClicked_Landroid_accessibilityservice_AccessibilityButtonController_Handler", ApiSince=26)&gt;]</AttributeName>
141155
</Attribute>
142156
</Attributes>
143157
<ReturnValue>
@@ -164,6 +178,16 @@
164178
<AssemblyName>Mono.Android</AssemblyName>
165179
<AssemblyVersion>0.0.0.0</AssemblyVersion>
166180
</AssemblyInfo>
181+
<Attributes>
182+
<Attribute>
183+
<AttributeName Language="C#">[System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]</AttributeName>
184+
<AttributeName Language="F#">[&lt;System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)&gt;]</AttributeName>
185+
</Attribute>
186+
<Attribute>
187+
<AttributeName Language="C#">[System.Diagnostics.DebuggerBrowsable(System.Diagnostics.DebuggerBrowsableState.Never)]</AttributeName>
188+
<AttributeName Language="F#">[&lt;System.Diagnostics.DebuggerBrowsable(System.Diagnostics.DebuggerBrowsableState.Never)&gt;]</AttributeName>
189+
</Attribute>
190+
</Attributes>
167191
<ReturnValue>
168192
<ReturnType>System.IntPtr</ReturnType>
169193
</ReturnValue>
@@ -185,6 +209,16 @@
185209
<AssemblyName>Mono.Android</AssemblyName>
186210
<AssemblyVersion>0.0.0.0</AssemblyVersion>
187211
</AssemblyInfo>
212+
<Attributes>
213+
<Attribute>
214+
<AttributeName Language="C#">[System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]</AttributeName>
215+
<AttributeName Language="F#">[&lt;System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)&gt;]</AttributeName>
216+
</Attribute>
217+
<Attribute>
218+
<AttributeName Language="C#">[System.Diagnostics.DebuggerBrowsable(System.Diagnostics.DebuggerBrowsableState.Never)]</AttributeName>
219+
<AttributeName Language="F#">[&lt;System.Diagnostics.DebuggerBrowsable(System.Diagnostics.DebuggerBrowsableState.Never)&gt;]</AttributeName>
220+
</Attribute>
221+
</Attributes>
188222
<ReturnValue>
189223
<ReturnType>System.Type</ReturnType>
190224
</ReturnValue>

0 commit comments

Comments
 (0)