Skip to content

Commit 4a84d0e

Browse files
committed
metadata fixes
1 parent 1e07c81 commit 4a84d0e

File tree

9 files changed

+151
-32
lines changed

9 files changed

+151
-32
lines changed

source/androidx.appcompat/appcompat/Additions/AndroidX.AppCompat.Widget.ActionBarOverlayLayout.cs

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,38 @@ namespace AndroidX.AppCompat.Widget
44
{
55
public partial class ActionBarOverlayLayout
66
{
7-
public virtual void OnNestedScrollAccepted(Android.Views.View child, Android.Views.View target, int axes, int @type)
7+
public virtual void OnNestedScrollAccepted(Android.Views.View child, Android.Views.View target, int axes)
88
{
99
Android.Views.ScrollAxis scroll_axes = (Android.Views.ScrollAxis) axes;
1010

11-
OnNestedScrollAccepted(child, target, scroll_axes, @type);
11+
OnNestedScrollAccepted(child, target, scroll_axes);
1212

1313
return;
1414
}
1515

16-
public virtual bool OnStartNestedScroll(Android.Views.View child, Android.Views.View target, int axes, int @type)
16+
public virtual bool OnStartNestedScroll(Android.Views.View child, Android.Views.View target, int axes)
1717
{
1818
Android.Views.ScrollAxis scroll_axes = (Android.Views.ScrollAxis) axes;
1919

20-
return OnStartNestedScroll(child, target, scroll_axes, @type);
20+
return OnStartNestedScroll(child, target, scroll_axes);
2121
}
22+
23+
public virtual void OnNestedScrollAccepted2(Android.Views.View child, Android.Views.View target, int axes, int @type)
24+
{
25+
Android.Views.ScrollAxis scroll_axes = (Android.Views.ScrollAxis) axes;
26+
27+
OnNestedScrollAccepted2(child, target, axes, @type);
28+
29+
return;
30+
}
31+
32+
public virtual bool OnStartNestedScroll2(Android.Views.View child, Android.Views.View target, int axes, int @type)
33+
{
34+
Android.Views.ScrollAxis scroll_axes = (Android.Views.ScrollAxis) axes;
35+
36+
return OnStartNestedScroll2(child, target, axes, @type);
37+
}
38+
2239
}
2340
}
2441

source/androidx.constraintlayout/constraintlayout/Additions/AndroidX.ConstraintLayout.Motion.Widget.MotionLayout.cs

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,36 @@ namespace AndroidX.ConstraintLayout.Motion.Widget
66
{
77
public partial class MotionLayout
88
{
9-
public virtual void OnNestedScrollAccepted (Android.Views.View child, Android.Views.View target, int axes, int @type)
9+
public virtual void OnNestedScrollAccepted (Android.Views.View child, Android.Views.View target, int axes)
1010
{
1111
Android.Views.ScrollAxis scroll_axes = (Android.Views.ScrollAxis) axes;
1212

13-
OnNestedScrollAccepted (child, target, scroll_axes, @type);
13+
OnNestedScrollAccepted (child, target, axes);
1414

1515
return;
1616
}
1717

18-
public virtual bool OnStartNestedScroll (Android.Views.View child, Android.Views.View target, int axes, int @type)
18+
public virtual void OnNestedScrollAccepted2 (Android.Views.View child, Android.Views.View target, int axes, int @type)
1919
{
2020
Android.Views.ScrollAxis scroll_axes = (Android.Views.ScrollAxis) axes;
2121

22-
return OnStartNestedScroll (child, target, scroll_axes, @type);
22+
OnNestedScrollAccepted2 (child, target, axes, @type);
23+
24+
return;
25+
}
26+
27+
public virtual bool OnStartNestedScroll (Android.Views.View child, Android.Views.View target, int axes)
28+
{
29+
Android.Views.ScrollAxis scroll_axes = (Android.Views.ScrollAxis) axes;
30+
31+
return OnStartNestedScroll (child, target, scroll_axes);
32+
}
33+
34+
public virtual bool OnStartNestedScroll2 (Android.Views.View child, Android.Views.View target, int axes, int @type)
35+
{
36+
Android.Views.ScrollAxis scroll_axes = (Android.Views.ScrollAxis) axes;
37+
38+
return OnStartNestedScroll2 (child, target, axes, @type);
2339
}
2440
}
2541
}

source/androidx.coordinatorlayout/coordinatorlayout/Additions/AndroidX.CoordinatorLayout.Widget.CoordinatorLayout.cs

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,32 @@ namespace AndroidX.CoordinatorLayout.Widget
66
{
77
public partial class CoordinatorLayout
88
{
9-
public virtual void OnNestedScrollAccepted (Android.Views.View child, Android.Views.View target, int nestedScrollAxes, int @type)
9+
public virtual void OnNestedScrollAccepted (Android.Views.View child, Android.Views.View target, int nestedScrollAxes)
1010
{
1111
Android.Views.ScrollAxis scroll_axes = (Android.Views.ScrollAxis) nestedScrollAxes;
1212

13-
OnNestedScrollAccepted (child, target, scroll_axes, @type);
13+
OnNestedScrollAccepted (child, target, scroll_axes);
1414

1515
return;
1616
}
1717

18-
public virtual bool OnStartNestedScroll (Android.Views.View child, Android.Views.View target, int axes, int @type)
18+
public virtual void OnNestedScrollAccepted2 (Android.Views.View child, Android.Views.View target, int nestedScrollAxes, int @type)
19+
{
20+
OnNestedScrollAccepted (child, target, nestedScrollAxes, @type);
21+
22+
return;
23+
}
24+
25+
public virtual bool OnStartNestedScroll (Android.Views.View child, Android.Views.View target, int axes)
1926
{
2027
Android.Views.ScrollAxis scroll_axes = (Android.Views.ScrollAxis) axes;
2128

22-
return OnStartNestedScroll (child, target, scroll_axes, @type);
29+
return OnStartNestedScroll (child, target, scroll_axes);
30+
}
31+
32+
public virtual bool OnStartNestedScroll2 (Android.Views.View child, Android.Views.View target, int axes, int @type)
33+
{
34+
return OnStartNestedScroll2 (child, target, axes, @type);
2335
}
2436
}
2537
}

source/androidx.core/core/Additions/AndroidX.Core.View.INestedScrollingParent2.cs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,15 @@ public partial interface INestedScrollingParent2
88
{
99
public virtual void OnNestedScrollAccepted (Android.Views.View child, Android.Views.View target, int axis, int @type)
1010
{
11-
Android.Views.ScrollAxis scroll_axis = (Android.Views.ScrollAxis) axis;
1211

13-
OnNestedScrollAccepted(child, target, scroll_axis, @type);
12+
OnNestedScrollAccepted2(child, target, axis, @type);
1413

1514
return;
1615
}
1716

1817
public virtual bool OnStartNestedScroll (Android.Views.View child, Android.Views.View target, int axis, int @type)
1918
{
20-
Android.Views.ScrollAxis scroll_axis = (Android.Views.ScrollAxis) axis;
21-
22-
return OnStartNestedScroll(child, target, scroll_axis, @type);
19+
return OnStartNestedScroll2(child, target, axis, @type);
2320
}
2421
}
2522
}

source/androidx.core/core/Additions/AndroidX.Core.Widget.NestedScrollView.cs

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,23 @@ public virtual void OnNestedScrollAccepted (Android.Views.View child, Android.Vi
1414

1515
return;
1616
}
17+
public virtual void OnNestedScrollAccepted (Android.Views.View child, Android.Views.View target, int axes)
18+
{
19+
Android.Views.ScrollAxis scroll_axes = (Android.Views.ScrollAxis) axes;
20+
21+
OnNestedScrollAccepted(child, target, scroll_axes);
22+
23+
return;
24+
}
25+
26+
public virtual void OnNestedScrollAccepted2 (Android.Views.View child, Android.Views.View target, int axes, int @type)
27+
{
28+
Android.Views.ScrollAxis scroll_axes = (Android.Views.ScrollAxis) axes;
29+
30+
OnNestedScrollAccepted(child, target, scroll_axes, @type);
31+
32+
return;
33+
}
1734

1835
public override void OnNestedScrollAccepted(Android.Views.View child, Android.Views.View target, Android.Views.ScrollAxis axes)
1936
{
@@ -29,6 +46,17 @@ public virtual bool OnStartNestedScroll (Android.Views.View child, Android.Views
2946
return OnStartNestedScroll(child, target, scroll_axes, @type);
3047
}
3148

49+
public virtual bool OnStartNestedScroll (Android.Views.View child, Android.Views.View target, int axes)
50+
{
51+
Android.Views.ScrollAxis scroll_axes = (Android.Views.ScrollAxis) axes;
52+
53+
return OnStartNestedScroll(child, target, scroll_axes);
54+
}
55+
56+
public virtual bool OnStartNestedScroll2 (Android.Views.View child, Android.Views.View target, int axes, int @type)
57+
{
58+
return OnStartNestedScroll(child, target, axes, @type);
59+
}
3260

3361
}
3462
}

source/androidx.core/core/Transforms/Metadata.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,5 +96,17 @@
9696
path="/api/package[@name='androidx.core.util']/class[@name='Preconditions']/method[@name='checkStringNotEmpty' and count(parameter)=3 and parameter[1][@type='T'] and parameter[2][@type='java.lang.String'] and parameter[3][@type='java.lang.Object...']]"
9797
/>
9898

99+
<attr
100+
path="/api/package[@name='androidx.core.view']/interface[@name='NestedScrollingParent2']/method[@name='onNestedScrollAccepted' and count(parameter)=4 and parameter[1][@type='android.view.View'] and parameter[2][@type='android.view.View'] and parameter[3][@type='int'] and parameter[4][@type='int']]"
101+
name="managedName"
102+
>
103+
OnNestedScrollAccepted2
104+
</attr>
105+
<attr
106+
path="/api/package[@name='androidx.core.view']/interface[@name='NestedScrollingParent2']/method[@name='onStartNestedScroll' and count(parameter)=4 and parameter[1][@type='android.view.View'] and parameter[2][@type='android.view.View'] and parameter[3][@type='int'] and parameter[4][@type='int']]"
107+
name="managedName"
108+
>
109+
OnStartNestedScroll2
110+
</attr>
99111

100112
</metadata>
Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
<metadata>
2-
<!--
32
<attr
4-
path=""
5-
name="managedName"
3+
path="/api/package[@name='androidx.lifecycle']/class[@name='ProcessLifecycleInitializer']/method[@name='create' and count(parameter)=1 and parameter[1][@type='android.content.Context']]"
4+
name="managedReturn"
65
>
7-
parameterName
6+
Java.Lang.Object
87
</attr>
98
-->
109
</metadata>

source/androidx.swiperefreshlayout/swiperefreshlayout/Additions/AndroidX.SwipeRefreshLayout.Widget.SwipeRefreshLayout.cs

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,32 @@ namespace AndroidX.SwipeRefreshLayout.Widget
66
{
77
public partial class SwipeRefreshLayout
88
{
9-
public virtual void OnNestedScrollAccepted (Android.Views.View child, Android.Views.View target, int axes, int @type)
10-
{
11-
Android.Views.ScrollAxis scroll_axes = (Android.Views.ScrollAxis) axes;
9+
public virtual void OnNestedScrollAccepted(Android.Views.View child, Android.Views.View target, int axes)
10+
{
11+
Android.Views.ScrollAxis scroll_axes = (Android.Views.ScrollAxis) axes;
1212

13-
OnNestedScrollAccepted (child, target, scroll_axes, @type);
13+
OnNestedScrollAccepted(child, target, scroll_axes);
1414

15-
return;
16-
}
15+
return;
16+
}
1717

18-
public virtual bool OnStartNestedScroll (Android.Views.View child, Android.Views.View target, int axes, int @type)
19-
{
20-
Android.Views.ScrollAxis scroll_axes = (Android.Views.ScrollAxis) axes;
18+
public virtual bool OnStartNestedScroll(Android.Views.View child, Android.Views.View target, int axes)
19+
{
20+
Android.Views.ScrollAxis scroll_axes = (Android.Views.ScrollAxis) axes;
2121

22-
return OnStartNestedScroll (child, target, scroll_axes, @type);
23-
}
22+
return OnStartNestedScroll(child, target, scroll_axes);
23+
}
24+
25+
public virtual void OnNestedScrollAccepted2(Android.Views.View child, Android.Views.View target, int axes, int @type)
26+
{
27+
OnNestedScrollAccepted(child, target, axes, @type);
28+
29+
return;
30+
}
31+
32+
public virtual bool OnStartNestedScroll2(Android.Views.View child, Android.Views.View target, int axes, int @type)
33+
{
34+
return OnStartNestedScroll(child, target, axes, @type);
35+
}
2436
}
2537
}
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using Android.Runtime;
4+
5+
namespace AndroidX.Wear.Widget.Drawer
6+
{
7+
public partial class WearableDrawerLayout
8+
{
9+
10+
public virtual void OnNestedScrollAccepted(Android.Views.View child, Android.Views.View target, int axes)
11+
{
12+
Android.Views.ScrollAxis scroll_axes = (Android.Views.ScrollAxis) axes;
13+
14+
OnNestedScrollAccepted(child, target, scroll_axes);
15+
16+
return;
17+
}
18+
19+
public virtual bool OnStartNestedScroll(Android.Views.View child, Android.Views.View target, int axes)
20+
{
21+
Android.Views.ScrollAxis scroll_axes = (Android.Views.ScrollAxis) axes;
22+
23+
return OnStartNestedScroll(child, target, scroll_axes);
24+
}
25+
}
26+
}

0 commit comments

Comments
 (0)