Merge pull request #432 from xamarin/core-parameternames

moljac · web-flow · commit 08a6f89eb5fd · 2021-12-01T11:44:45.000+01:00
Use metadata from 1.6.0 to restore parameter names for AndroidX.Core.
diff --git a/source/AndroidXProject.cshtml b/source/AndroidXProject.cshtml
@@ -1,4 +1,4 @@
-﻿  @using System
+﻿@using System
 @using System.Linq
 <Project Sdk="Xamarin.Legacy.Sdk">
   <PropertyGroup>
@@ -71,25 +71,21 @@
       }
   </ItemGroup>
 
-    <ItemGroup>
+  <ItemGroup>
     @foreach (var art in @Model.MavenArtifacts)
     {
-      if (@Model.NuGetPackageId == "Xamarin.AndroidX.Core" )
-      {
     <JavaSourceJar
           Include="..\..\externals\@(art.MavenGroupId)\@(art.MavenArtifactId)-sources.jar"
-          Condition="Exists('..\..\externals\@(art.MavenGroupId)\@(art.MavenArtifactId)-sources.jar')"
+          Condition="Exists('..\..\..\externals\@(art.MavenGroupId)\@(art.MavenArtifactId)-sources.jar')"
           />
-      }
-      <!--
     <JavaDocJar
           Include="..\..\externals\@(art.MavenGroupId)\@(art.MavenArtifactId)-javadoc.jar"
-          Condition="Exists('..\..\externals\@(art.MavenGroupId)\@(art.MavenArtifactId)-javadoc.jar')"
+          Condition="Exists('..\..\..\externals\@(art.MavenGroupId)\@(art.MavenArtifactId)-javadoc.jar')"
           />
-      -->
     }
   </ItemGroup>
 
+
   <ItemGroup>
     @foreach (var art in @Model.MavenArtifacts) {
     <_AndroidDocumentationPath Include="..\..\externals\@(art.MavenGroupId)\@(art.MavenArtifactId)-paramnames.txt" Condition="Exists('..\..\..\externals\@(art.MavenGroupId)\@(art.MavenArtifactId)-paramnames.txt')" />
@@ -240,4 +236,4 @@
     </PropertyGroup>
   }
 
-</Project>
+</Project>
diff --git a/source/androidx.activity/activity/Transforms/Metadata.ParameterNames.xml b/source/androidx.activity/activity/Transforms/Metadata.ParameterNames.xml
@@ -1,2 +1,3 @@
 ﻿<metadata>
+  <attr path="/api/package[@name='androidx.activity.contextaware']/interface[@name='OnContextAvailableListener']/method[@name='onContextAvailable' and count(parameter)=1 and parameter[1][@type='android.content.Context']]/parameter[1]" name="name">context</attr>
 </metadata>
diff --git a/source/androidx.appcompat/appcompat/Additions/AndroidX.AppCompat.Widget.ActionBarOverlayLayout.cs b/source/androidx.appcompat/appcompat/Additions/AndroidX.AppCompat.Widget.ActionBarOverlayLayout.cs
@@ -13,28 +13,12 @@ public virtual void OnNestedScrollAccepted(Android.Views.View child, Android.Vie
 			return;
 		}
 
-		public void OnNestedScrollAccepted(Android.Views.View child, Android.Views.View target, int axes)
-		{
-			Android.Views.ScrollAxis scroll_axes = (Android.Views.ScrollAxis) axes;
-
-			OnStartNestedScroll(child, target, scroll_axes);
-
-			return;
-		}
-
 		public virtual bool OnStartNestedScroll(Android.Views.View child, Android.Views.View target, int axes, int @type)
 		{
 			Android.Views.ScrollAxis scroll_axes = (Android.Views.ScrollAxis) axes;
 
 			return OnStartNestedScroll(child, target, scroll_axes, @type);
 		}
-
-		public virtual bool OnStartNestedScroll (Android.Views.View child, Android.Views.View target, int axes)
-		{
-			Android.Views.ScrollAxis scroll_axes = (Android.Views.ScrollAxis) axes;
-
-			return OnStartNestedScroll(child, target, scroll_axes);
-		}
 	}
 }
 
diff --git a/source/androidx.constraintlayout/constraintlayout/Additions/AndroidX.ConstraintLayout.Motion.Widget.MotionLayout.cs b/source/androidx.constraintlayout/constraintlayout/Additions/AndroidX.ConstraintLayout.Motion.Widget.MotionLayout.cs
@@ -15,27 +15,11 @@ public virtual void OnNestedScrollAccepted (Android.Views.View child, Android.Vi
             return;
         }
 
-		public void OnNestedScrollAccepted(Android.Views.View child, Android.Views.View target, int axes)
-		{
-			Android.Views.ScrollAxis scroll_axes = (Android.Views.ScrollAxis) axes;
-
-			OnStartNestedScroll(child, target, scroll_axes);
-
-			return;
-		}
-
         public virtual bool OnStartNestedScroll (Android.Views.View child, Android.Views.View target, int axes, int @type)
         {
             Android.Views.ScrollAxis scroll_axes = (Android.Views.ScrollAxis) axes;
 
             return OnStartNestedScroll (child, target, scroll_axes, @type);
         }
-
-		public virtual bool OnStartNestedScroll (Android.Views.View child, Android.Views.View target, int axes)
-		{
-			Android.Views.ScrollAxis scroll_axes = (Android.Views.ScrollAxis) axes;
-
-			return OnStartNestedScroll(child, target, scroll_axes);
-		}
 	}
 }
diff --git a/source/androidx.coordinatorlayout/coordinatorlayout/Additions/AndroidX.CoordinatorLayout.Widget.CoordinatorLayout.cs b/source/androidx.coordinatorlayout/coordinatorlayout/Additions/AndroidX.CoordinatorLayout.Widget.CoordinatorLayout.cs
@@ -15,27 +15,11 @@ public virtual void OnNestedScrollAccepted (Android.Views.View child, Android.Vi
             return;
         }
 
-		public void OnNestedScrollAccepted(Android.Views.View child, Android.Views.View target, int axes)
-		{
-			Android.Views.ScrollAxis scroll_axes = (Android.Views.ScrollAxis) axes;
-
-			OnStartNestedScroll(child, target, scroll_axes);
-
-			return;
-		}
-
         public virtual bool OnStartNestedScroll (Android.Views.View child, Android.Views.View target, int axes, int @type)
         {
             Android.Views.ScrollAxis scroll_axes = (Android.Views.ScrollAxis) axes;
 
             return OnStartNestedScroll (child, target, scroll_axes, @type);
         }
-
-		public virtual bool OnStartNestedScroll (Android.Views.View child, Android.Views.View target, int axes)
-		{
-			Android.Views.ScrollAxis scroll_axes = (Android.Views.ScrollAxis) axes;
-
-			return OnStartNestedScroll(child, target, scroll_axes);
-		}
 	}
 }
diff --git a/source/androidx.core/core/Additions/AndroidX.Core.Widget.NestedScrollView.cs b/source/androidx.core/core/Additions/AndroidX.Core.Widget.NestedScrollView.cs
@@ -22,27 +22,13 @@ public override void OnNestedScrollAccepted(Android.Views.View child, Android.Vi
 			return;
 		}
 
-		public void OnNestedScrollAccepted(Android.Views.View child, Android.Views.View target, int axes)
-		{
-			Android.Views.ScrollAxis scroll_axes = (Android.Views.ScrollAxis) axes;
-
-			OnStartNestedScroll(child, target, scroll_axes);
-
-			return;
-		}
-
 		public virtual bool OnStartNestedScroll (Android.Views.View child, Android.Views.View target, int axes, int @type)
 		{
 			Android.Views.ScrollAxis scroll_axes = (Android.Views.ScrollAxis) axes;
 
 			return OnStartNestedScroll(child, target, scroll_axes, @type);
 		}
 
-		public virtual bool OnStartNestedScroll (Android.Views.View child, Android.Views.View target, int axes)
-		{
-			Android.Views.ScrollAxis scroll_axes = (Android.Views.ScrollAxis) axes;
 
-			return OnStartNestedScroll(child, target, scroll_axes);
-		}
 	}
 }
diff --git a/source/androidx.core/core/Transforms/Metadata.ParameterNames.xml b/source/androidx.core/core/Transforms/Metadata.ParameterNames.xml
@@ -108,14 +108,14 @@
     <attr path="/api/package[@name='androidx.core.view']/interface[@name='NestedScrollingParent2']/method[@name='onNestedScroll' and count(parameter)=6 and parameter[1][@type='android.view.View'] and parameter[2][@type='int'] and parameter[3][@type='int'] and parameter[4][@type='int'] and parameter[5][@type='int'] and parameter[6][@type='int']]/parameter[4]" name="managedName">dxUnconsumed</attr>
     <attr path="/api/package[@name='androidx.core.view']/interface[@name='NestedScrollingParent2']/method[@name='onNestedScroll' and count(parameter)=6 and parameter[1][@type='android.view.View'] and parameter[2][@type='int'] and parameter[3][@type='int'] and parameter[4][@type='int'] and parameter[5][@type='int'] and parameter[6][@type='int']]/parameter[5]" name="managedName">dyUnconsumed</attr>
     <attr path="/api/package[@name='androidx.core.view']/interface[@name='NestedScrollingParent2']/method[@name='onNestedScroll' and count(parameter)=6 and parameter[1][@type='android.view.View'] and parameter[2][@type='int'] and parameter[3][@type='int'] and parameter[4][@type='int'] and parameter[5][@type='int'] and parameter[6][@type='int']]/parameter[6]" name="managedName">@type</attr>
-    <attr 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']]/parameter[1]" name="name">child</attr>
-    <attr 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']]/parameter[2]" name="name">target</attr>
-    <attr 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']]/parameter[3]" name="name">axes</attr>
-    <attr 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']]/parameter[4]" name="name">@type</attr>
-    <attr 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']]/parameter[1]" name="name">child</attr>
-    <attr 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']]/parameter[2]" name="name">target</attr>
-    <attr 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']]/parameter[3]" name="name">axes</attr>
-    <attr 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']]/parameter[4]" name="name">@type</attr>
+    <attr 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']]/parameter[1]" name="managedName">child</attr>
+    <attr 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']]/parameter[2]" name="managedName">target</attr>
+    <attr 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']]/parameter[3]" name="managedName">axes</attr>
+    <attr 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']]/parameter[4]" name="managedName">@type</attr>
+    <attr 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']]/parameter[1]" name="managedName">child</attr>
+    <attr 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']]/parameter[2]" name="managedName">target</attr>
+    <attr 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']]/parameter[3]" name="managedName">axes</attr>
+    <attr 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']]/parameter[4]" name="managedName">@type</attr>
     <attr path="/api/package[@name='androidx.core.view']/interface[@name='NestedScrollingParent2']/method[@name='onStopNestedScroll' and count(parameter)=2 and parameter[1][@type='android.view.View'] and parameter[2][@type='int']]/parameter[1]" name="managedName">target</attr>
     <attr path="/api/package[@name='androidx.core.view']/interface[@name='NestedScrollingParent2']/method[@name='onStopNestedScroll' and count(parameter)=2 and parameter[1][@type='android.view.View'] and parameter[2][@type='int']]/parameter[2]" name="managedName">@type</attr>
     <attr path="/api/package[@name='androidx.core.view']/interface[@name='OnApplyWindowInsetsListener']/method[@name='onApplyWindowInsets' and count(parameter)=2 and parameter[1][@type='android.view.View'] and parameter[2][@type='androidx.core.view.WindowInsetsCompat']]/parameter[1]" name="managedName">v</attr>
diff --git a/source/androidx.core/core/Transforms/Metadata.TemporaryParameterNames.xml b/source/androidx.core/core/Transforms/Metadata.TemporaryParameterNames.xml
diff --git a/source/androidx.swiperefreshlayout/swiperefreshlayout/Additions/AndroidX.SwipeRefreshLayout.Widget.SwipeRefreshLayout.cs b/source/androidx.swiperefreshlayout/swiperefreshlayout/Additions/AndroidX.SwipeRefreshLayout.Widget.SwipeRefreshLayout.cs
diff --git a/source/androidx.wear/wear/Additions/AndroidX.Wear.Widget.Drawer.WearableDrawerLayout.cs b/source/androidx.wear/wear/Additions/AndroidX.Wear.Widget.Drawer.WearableDrawerLayout.cs

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`<metadata>`
	`2`	`+ <attr path="/api/package[@name='androidx.activity.contextaware']/interface[@name='OnContextAvailableListener']/method[@name='onContextAvailable' and count(parameter)=1 and parameter[1][@type='android.content.Context']]/parameter[1]" name="name">context</attr>`
`2`	`3`	`</metadata>`
Original file line number	Diff line number	Diff line change
`@@ -13,28 +13,12 @@ public virtual void OnNestedScrollAccepted(Android.Views.View child, Android.Vie`
`13`	`13`	`return;`
`14`	`14`	`}`
`15`	`15`
`16`		`- public void OnNestedScrollAccepted(Android.Views.View child, Android.Views.View target, int axes)`
`17`		`- {`
`18`		`- Android.Views.ScrollAxis scroll_axes = (Android.Views.ScrollAxis) axes;`
`19`		`-`
`20`		`- OnStartNestedScroll(child, target, scroll_axes);`
`21`		`-`
`22`		`- return;`
`23`		`- }`
`24`		`-`
`25`	`16`	`public virtual bool OnStartNestedScroll(Android.Views.View child, Android.Views.View target, int axes, int @type)`
`26`	`17`	`{`
`27`	`18`	`Android.Views.ScrollAxis scroll_axes = (Android.Views.ScrollAxis) axes;`
`28`	`19`
`29`	`20`	`return OnStartNestedScroll(child, target, scroll_axes, @type);`
`30`	`21`	`}`
`31`		`-`
`32`		`- public virtual bool OnStartNestedScroll (Android.Views.View child, Android.Views.View target, int axes)`
`33`		`- {`
`34`		`- Android.Views.ScrollAxis scroll_axes = (Android.Views.ScrollAxis) axes;`
`35`		`-`
`36`		`- return OnStartNestedScroll(child, target, scroll_axes);`
`37`		`- }`
`38`	`22`	`}`
`39`	`23`	`}`
`40`	`24`
Original file line number	Diff line number	Diff line change
`@@ -15,27 +15,11 @@ public virtual void OnNestedScrollAccepted (Android.Views.View child, Android.Vi`
`15`	`15`	`return;`
`16`	`16`	`}`
`17`	`17`
`18`		`- public void OnNestedScrollAccepted(Android.Views.View child, Android.Views.View target, int axes)`
`19`		`- {`
`20`		`- Android.Views.ScrollAxis scroll_axes = (Android.Views.ScrollAxis) axes;`
`21`		`-`
`22`		`- OnStartNestedScroll(child, target, scroll_axes);`
`23`		`-`
`24`		`- return;`
`25`		`- }`
`26`		`-`
`27`	`18`	`public virtual bool OnStartNestedScroll (Android.Views.View child, Android.Views.View target, int axes, int @type)`
`28`	`19`	`{`
`29`	`20`	`Android.Views.ScrollAxis scroll_axes = (Android.Views.ScrollAxis) axes;`
`30`	`21`
`31`	`22`	`return OnStartNestedScroll (child, target, scroll_axes, @type);`
`32`	`23`	`}`
`33`		`-`
`34`		`- public virtual bool OnStartNestedScroll (Android.Views.View child, Android.Views.View target, int axes)`
`35`		`- {`
`36`		`- Android.Views.ScrollAxis scroll_axes = (Android.Views.ScrollAxis) axes;`
`37`		`-`
`38`		`- return OnStartNestedScroll(child, target, scroll_axes);`
`39`		`- }`
`40`	`24`	`}`
`41`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,27 +22,13 @@ public override void OnNestedScrollAccepted(Android.Views.View child, Android.Vi`
`22`	`22`	`return;`
`23`	`23`	`}`
`24`	`24`
`25`		`- public void OnNestedScrollAccepted(Android.Views.View child, Android.Views.View target, int axes)`
`26`		`- {`
`27`		`- Android.Views.ScrollAxis scroll_axes = (Android.Views.ScrollAxis) axes;`
`28`		`-`
`29`		`- OnStartNestedScroll(child, target, scroll_axes);`
`30`		`-`
`31`		`- return;`
`32`		`- }`
`33`		`-`
`34`	`25`	`public virtual bool OnStartNestedScroll (Android.Views.View child, Android.Views.View target, int axes, int @type)`
`35`	`26`	`{`
`36`	`27`	`Android.Views.ScrollAxis scroll_axes = (Android.Views.ScrollAxis) axes;`
`37`	`28`
`38`	`29`	`return OnStartNestedScroll(child, target, scroll_axes, @type);`
`39`	`30`	`}`
`40`	`31`
`41`		`- public virtual bool OnStartNestedScroll (Android.Views.View child, Android.Views.View target, int axes)`
`42`		`- {`
`43`		`- Android.Views.ScrollAxis scroll_axes = (Android.Views.ScrollAxis) axes;`
`44`	`32`
`45`		`- return OnStartNestedScroll(child, target, scroll_axes);`
`46`		`- }`
`47`	`33`	`}`
`48`	`34`	`}`