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

Commit 099ecf9

Browse files
authored
Merge pull request #31 from xamarin/dev/pjc/merge-ji-d3f0c5c-live
Fixes: dotnet/java-interop#931 Fixes: dotnet/java-interop#932 Fixes: dotnet/java-interop#933 Changes of note: * Includes a bunch of fixes for method overloads. * Documentation URLs have been fixed for type members with complex parameters.
2 parents 7631b47 + b67d99b commit 099ecf9

File tree

1,391 files changed

+23862
-21079
lines changed

Some content is hidden

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

1,391 files changed

+23862
-21079
lines changed

docs/Mono.Android/en/Android.AccessibilityServices/AccessibilityButtonController.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,8 @@
167167
<Parameter Name="handler" Type="Android.OS.Handler" />
168168
</Parameters>
169169
<Docs>
170-
<param name="handler">To be added.</param>
171170
<param name="callback">the callback to add, must be non-null</param>
171+
<param name="handler">To be added.</param>
172172
<summary>Registers the provided <c>AccessibilityButtonCallback</c> for interaction and state
173173
changes callbacks related to the accessibility button.</summary>
174174
<remarks>

docs/Mono.Android/en/Android.AccessibilityServices/AccessibilityService.xml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2332,13 +2332,15 @@
23322332
<Parameter Name="displayId" Type="System.Int32" />
23332333
</Parameters>
23342334
<Docs>
2335-
<param name="displayId">To be added.</param>
2336-
<summary>Returns the controller for the accessibility button within the system's navigation area.</summary>
2335+
<param name="displayId">The logic display id, use <c>Display#DEFAULT_DISPLAY</c> for default
2336+
display.</param>
2337+
<summary>Returns the controller of specified logical display for the accessibility button within the
2338+
system's navigation area.</summary>
23372339
<returns>the accessibility button controller for this <c>AccessibilityService</c></returns>
23382340
<remarks>
23392341
<para>
23402342
<format type="text/html">
2341-
<a href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityService#getAccessibilityButtonController()" title="Reference documentation">Java documentation for <code>android.accessibilityservice.AccessibilityService.getAccessibilityButtonController()</code>.</a>
2343+
<a href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityService#getAccessibilityButtonController(int)" title="Reference documentation">Java documentation for <code>android.accessibilityservice.AccessibilityService.getAccessibilityButtonController(int)</code>.</a>
23422344
</format>
23432345
</para>
23442346
<para>
@@ -3173,15 +3175,14 @@
31733175
<Parameter Name="gestureEvent" Type="Android.AccessibilityServices.AccessibilityGestureEvent" />
31743176
</Parameters>
31753177
<Docs>
3176-
<param name="gestureEvent">To be added.</param>
3177-
<param name="gestureId">The unique id of the performed gesture.</param>
3178-
<summary>Called by <c>#onGesture(AccessibilityGestureEvent)</c> when the user performs a specific
3179-
gesture on the default display.</summary>
3178+
<param name="gestureEvent">The information of gesture.</param>
3179+
<summary>Called by the system when the user performs a specific gesture on the
3180+
specific touch screen.</summary>
31803181
<returns>Whether the gesture was handled.</returns>
31813182
<remarks>
31823183
<para>
31833184
<format type="text/html">
3184-
<a href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityService#onGesture(int)" title="Reference documentation">Java documentation for <code>android.accessibilityservice.AccessibilityService.onGesture(int)</code>.</a>
3185+
<a href="https://developer.android.com/reference/android/accessibilityservice/AccessibilityService#onGesture(android.accessibilityservice.AccessibilityGestureEvent)" title="Reference documentation">Java documentation for <code>android.accessibilityservice.AccessibilityService.onGesture(android.accessibilityservice.AccessibilityGestureEvent)</code>.</a>
31853186
</format>
31863187
</para>
31873188
<para>

docs/Mono.Android/en/Android.Accounts/AccountManager.xml

Lines changed: 72 additions & 55 deletions
Large diffs are not rendered by default.

docs/Mono.Android/en/Android.Accounts/IAccountManagerFuture.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124
<remarks>
125125
<para>
126126
<format type="text/html">
127-
<a href="https://developer.android.com/reference/android/accounts/AccountManagerFuture#getResult()" title="Reference documentation">Java documentation for <code>android.accounts.AccountManagerFuture.getResult()</code>.</a>
127+
<a href="https://developer.android.com/reference/android/accounts/AccountManagerFuture#getResult(long,%20java.util.concurrent.TimeUnit)" title="Reference documentation">Java documentation for <code>android.accounts.AccountManagerFuture.getResult(long, java.util.concurrent.TimeUnit)</code>.</a>
128128
</format>
129129
</para>
130130
<para>

docs/Mono.Android/en/Android.Animation/AnimatorSet.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@
366366
<remarks>
367367
<para>
368368
<format type="text/html">
369-
<a href="https://developer.android.com/reference/android/animation/AnimatorSet#playSequentially(android.animation.Animator)" title="Reference documentation">Java documentation for <code>android.animation.AnimatorSet.playSequentially(android.animation.Animator)</code>.</a>
369+
<a href="https://developer.android.com/reference/android/animation/AnimatorSet#playSequentially(java.util.List%3Candroid.animation.Animator%3E)" title="Reference documentation">Java documentation for <code>android.animation.AnimatorSet.playSequentially(java.util.List&lt;android.animation.Animator&gt;)</code>.</a>
370370
</format>
371371
</para>
372372
<para>
@@ -451,7 +451,7 @@
451451
<remarks>
452452
<para>
453453
<format type="text/html">
454-
<a href="https://developer.android.com/reference/android/animation/AnimatorSet#playTogether(android.animation.Animator)" title="Reference documentation">Java documentation for <code>android.animation.AnimatorSet.playTogether(android.animation.Animator)</code>.</a>
454+
<a href="https://developer.android.com/reference/android/animation/AnimatorSet#playTogether(java.util.Collection%3Candroid.animation.Animator%3E)" title="Reference documentation">Java documentation for <code>android.animation.AnimatorSet.playTogether(java.util.Collection&lt;android.animation.Animator&gt;)</code>.</a>
455455
</format>
456456
</para>
457457
<para>

docs/Mono.Android/en/Android.Animation/BidirectionalTypeConverter.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@
118118
<remarks>
119119
<para>
120120
<format type="text/html">
121-
<a href="https://developer.android.com/reference/android/animation/BidirectionalTypeConverter#convertBack(java.lang.Object)" title="Reference documentation">Java documentation for <code>android.animation.BidirectionalTypeConverter.convertBack(java.lang.Object)</code>.</a>
121+
<a href="https://developer.android.com/reference/android/animation/BidirectionalTypeConverter#convertBack(V)" title="Reference documentation">Java documentation for <code>android.animation.BidirectionalTypeConverter.convertBack(V)</code>.</a>
122122
</format>
123123
</para>
124124
<para>

docs/Mono.Android/en/Android.Animation/FloatArrayEvaluator.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,12 +95,12 @@
9595
<Parameter Name="reuseArray" Type="System.Single[]" />
9696
</Parameters>
9797
<Docs>
98-
<param name="reuseArray">To be added.</param>
99-
<summary>Create a FloatArrayEvaluator that does not reuse the animated value.</summary>
98+
<param name="reuseArray">The array to modify and return from &lt;code&gt;evaluate&lt;/code&gt;.</param>
99+
<summary>Create a FloatArrayEvaluator that reuses &lt;code&gt;reuseArray&lt;/code&gt; for every evaluate() call.</summary>
100100
<remarks>
101101
<para>
102102
<format type="text/html">
103-
<a href="https://developer.android.com/reference/android/animation/FloatArrayEvaluator#FloatArrayEvaluator()" title="Reference documentation">Java documentation for <code>android.animation.FloatArrayEvaluator.FloatArrayEvaluator()</code>.</a>
103+
<a href="https://developer.android.com/reference/android/animation/FloatArrayEvaluator#FloatArrayEvaluator(float[])" title="Reference documentation">Java documentation for <code>android.animation.FloatArrayEvaluator.FloatArrayEvaluator(float[])</code>.</a>
104104
</format>
105105
</para>
106106
<para>

docs/Mono.Android/en/Android.Animation/ITypeEvaluator.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
<remarks>
7777
<para>
7878
<format type="text/html">
79-
<a href="https://developer.android.com/reference/android/animation/TypeEvaluator#evaluate(float,%20java.lang.Object,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>android.animation.TypeEvaluator.evaluate(float, java.lang.Object, java.lang.Object)</code>.</a>
79+
<a href="https://developer.android.com/reference/android/animation/TypeEvaluator#evaluate(float,%20T,%20T)" title="Reference documentation">Java documentation for <code>android.animation.TypeEvaluator.evaluate(float, T, T)</code>.</a>
8080
</format>
8181
</para>
8282
<para>

docs/Mono.Android/en/Android.Animation/IntArrayEvaluator.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,12 +95,12 @@
9595
<Parameter Name="reuseArray" Type="System.Int32[]" />
9696
</Parameters>
9797
<Docs>
98-
<param name="reuseArray">To be added.</param>
99-
<summary>Create an IntArrayEvaluator that does not reuse the animated value.</summary>
98+
<param name="reuseArray">The array to modify and return from &lt;code&gt;evaluate&lt;/code&gt;.</param>
99+
<summary>Create an IntArrayEvaluator that reuses &lt;code&gt;reuseArray&lt;/code&gt; for every evaluate() call.</summary>
100100
<remarks>
101101
<para>
102102
<format type="text/html">
103-
<a href="https://developer.android.com/reference/android/animation/IntArrayEvaluator#IntArrayEvaluator()" title="Reference documentation">Java documentation for <code>android.animation.IntArrayEvaluator.IntArrayEvaluator()</code>.</a>
103+
<a href="https://developer.android.com/reference/android/animation/IntArrayEvaluator#IntArrayEvaluator(int[])" title="Reference documentation">Java documentation for <code>android.animation.IntArrayEvaluator.IntArrayEvaluator(int[])</code>.</a>
104104
</format>
105105
</para>
106106
<para>

docs/Mono.Android/en/Android.Animation/Keyframe.xml

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -237,8 +237,7 @@
237237
</ReturnValue>
238238
<Docs>
239239
<summary>Gets the optional interpolator for this Keyframe. -or- Sets the optional interpolator for this Keyframe.</summary>
240-
<value>The optional interpolator for this Keyframe.</value>
241-
<value>The optional interpolator for this Keyframe.</value>
240+
<returns>The optional interpolator for this Keyframe.</returns>
242241
<remarks>
243242
<para>Property getter documentation:</para>
244243
<para>
@@ -361,18 +360,17 @@
361360
<Parameter Name="value" Type="System.Single" />
362361
</Parameters>
363362
<Docs>
364-
<param name="value">The value that the object will animate to as the animation time approaches
365-
the time in this keyframe, and the the value animated from as the time passes the time in
366-
this keyframe.
367-
</param>
368363
<param name="fraction">The time, expressed as a value between 0 and 1, representing the fraction
369364
of time elapsed of the overall animation duration.</param>
370-
<summary>Constructs a Keyframe object with the given time.</summary>
365+
<param name="value">The value that the object will animate to as the animation time approaches
366+
the time in this keyframe, and the value animated from as the time passes the time in
367+
this keyframe.</param>
368+
<summary>Constructs a Keyframe object with the given time and value.</summary>
371369
<returns>To be added.</returns>
372370
<remarks>
373371
<para>
374372
<format type="text/html">
375-
<a href="https://developer.android.com/reference/android/animation/Keyframe#ofFloat(float)" title="Reference documentation">Java documentation for <code>android.animation.Keyframe.ofFloat(float)</code>.</a>
373+
<a href="https://developer.android.com/reference/android/animation/Keyframe#ofFloat(float,%20float)" title="Reference documentation">Java documentation for <code>android.animation.Keyframe.ofFloat(float, float)</code>.</a>
376374
</format>
377375
</para>
378376
<para>
@@ -450,18 +448,17 @@
450448
<Parameter Name="value" Type="System.Int32" />
451449
</Parameters>
452450
<Docs>
453-
<param name="value">The value that the object will animate to as the animation time approaches
454-
the time in this keyframe, and the the value animated from as the time passes the time in
455-
this keyframe.
456-
</param>
457451
<param name="fraction">The time, expressed as a value between 0 and 1, representing the fraction
458452
of time elapsed of the overall animation duration.</param>
459-
<summary>Constructs a Keyframe object with the given time.</summary>
453+
<param name="value">The value that the object will animate to as the animation time approaches
454+
the time in this keyframe, and the value animated from as the time passes the time in
455+
this keyframe.</param>
456+
<summary>Constructs a Keyframe object with the given time and value.</summary>
460457
<returns>To be added.</returns>
461458
<remarks>
462459
<para>
463460
<format type="text/html">
464-
<a href="https://developer.android.com/reference/android/animation/Keyframe#ofInt(float)" title="Reference documentation">Java documentation for <code>android.animation.Keyframe.ofInt(float)</code>.</a>
461+
<a href="https://developer.android.com/reference/android/animation/Keyframe#ofInt(float,%20int)" title="Reference documentation">Java documentation for <code>android.animation.Keyframe.ofInt(float, int)</code>.</a>
465462
</format>
466463
</para>
467464
<para>
@@ -539,18 +536,17 @@
539536
<Parameter Name="value" Type="Java.Lang.Object" />
540537
</Parameters>
541538
<Docs>
542-
<param name="value">The value that the object will animate to as the animation time approaches
543-
the time in this keyframe, and the the value animated from as the time passes the time in
544-
this keyframe.
545-
</param>
546539
<param name="fraction">The time, expressed as a value between 0 and 1, representing the fraction
547540
of time elapsed of the overall animation duration.</param>
548-
<summary>Constructs a Keyframe object with the given time.</summary>
541+
<param name="value">The value that the object will animate to as the animation time approaches
542+
the time in this keyframe, and the value animated from as the time passes the time in
543+
this keyframe.</param>
544+
<summary>Constructs a Keyframe object with the given time and value.</summary>
549545
<returns>To be added.</returns>
550546
<remarks>
551547
<para>
552548
<format type="text/html">
553-
<a href="https://developer.android.com/reference/android/animation/Keyframe#ofObject(float)" title="Reference documentation">Java documentation for <code>android.animation.Keyframe.ofObject(float)</code>.</a>
549+
<a href="https://developer.android.com/reference/android/animation/Keyframe#ofObject(float,%20java.lang.Object)" title="Reference documentation">Java documentation for <code>android.animation.Keyframe.ofObject(float, java.lang.Object)</code>.</a>
554550
</format>
555551
</para>
556552
<para>

0 commit comments

Comments
 (0)