Skip to content
This repository was archived by the owner on Jun 20, 2023. It is now read-only.

Commit d62f7b8

Browse files
mattleibowmattleibow
committed
several fixes
 - there were quite a few weird types like 4.app, 7.view and 13.xxx - several android.support changes - removed a few cases that had duplicate namespace changes for the same package - a few other fixes
1 parent 9ef8764 commit d62f7b8

File tree

304 files changed

+1713
-9740
lines changed

Some content is hidden

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

304 files changed

+1713
-9740
lines changed

‎source/Metadata.common.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
<metadata>
2-
<remove-node path="/api/package/class[contains(@name, 'IcsImpl') or contains(@name, 'JellyBeanImpl') or contains(@name, 'JellyBeanMr2Impl') or contains(@name, 'Api16') or contains(@name, 'Api17') or contains(@name, 'Api18') or contains(@name, 'Api19') or contains(@name, 'Api20') or contains(@name, 'Api21') or contains(@name, 'Api22') or contains(@name, 'Api23') or contains(@name, 'Api24') or contains(@name, 'Api25') or contains(@name, 'Api26') or contains(@name, 'Api27') or contains(@name, 'Api28') or contains(@name, 'Api29') or contains(@name, 'Api30') or contains(@name, 'Honeycomb') or contains(@name, 'IceCreamSandwich') or contains(@name, 'Jellybean') or contains(@name, 'KitKat') or contains(@name, 'Lollipop') or contains(@name, 'Marshmallow') or contains(@name, 'Nougat') or contains(@name, 'Oreo') or contains(@name, 'ImplJB') or contains(@name, 'ImplICS') or contains(@name, 'ImplIcs') or contains(@name, 'ImplHC') or contains(@name, 'HcMr1') or contains(@name, 'HcMr2') or contains(@name, 'HcMr3') or contains(@name, 'JbMr2') or contains(@name, 'JbMr2') or contains(@name, 'JbMr1') or contains(@name, 'ICSMr1') or contains(@name, 'ICSMr2') or contains(@name, 'ImplV11') or contains(@name, 'ImplV21')]" />>
3-
</metadata>
1+
<metadata>
2+
<remove-node path="/api/package/class[contains(@name, 'IcsImpl') or contains(@name, 'JellyBeanImpl') or contains(@name, 'JellyBeanMr2Impl') or contains(@name, 'Api16') or contains(@name, 'Api17') or contains(@name, 'Api18') or contains(@name, 'Api19') or contains(@name, 'Api20') or contains(@name, 'Api21') or contains(@name, 'Api22') or contains(@name, 'Api23') or contains(@name, 'Api24') or contains(@name, 'Api25') or contains(@name, 'Api26') or contains(@name, 'Api27') or contains(@name, 'Api28') or contains(@name, 'Api29') or contains(@name, 'Api30') or contains(@name, 'Honeycomb') or contains(@name, 'IceCreamSandwich') or contains(@name, 'Jellybean') or contains(@name, 'KitKat') or contains(@name, 'Lollipop') or contains(@name, 'Marshmallow') or contains(@name, 'Nougat') or contains(@name, 'Oreo') or contains(@name, 'ImplJB') or contains(@name, 'ImplICS') or contains(@name, 'ImplIcs') or contains(@name, 'ImplHC') or contains(@name, 'HcMr1') or contains(@name, 'HcMr2') or contains(@name, 'HcMr3') or contains(@name, 'JbMr2') or contains(@name, 'JbMr2') or contains(@name, 'JbMr1') or contains(@name, 'ICSMr1') or contains(@name, 'ICSMr2') or contains(@name, 'ImplV11') or contains(@name, 'ImplV21')]" />
3+
</metadata>

‎source/androidx.annotation/annotation/transforms/EnumFields.xml‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1 @@
1-
<enum-field-mappings>
2-
<!-- <mapping jni-class="android/support/v4/app/FragmentActivity$FragmentTag" clr-enum-type="4.App.FragmentTagType">
3-
<field jni-name="Fragment_id" clr-name="Id" value="1" />
4-
<field jni-name="Fragment_name" clr-name="Name" value="0" />
5-
<field jni-name="Fragment_tag" clr-name="Tag" value="2" />
6-
</mapping>-->
7-
</enum-field-mappings>
1+
<enum-field-mappings></enum-field-mappings>

‎source/androidx.annotation/annotation/transforms/EnumMethods.xml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
<enum-method-mappings>
2-
3-
</enum-method-mappings>
1+
<enum-method-mappings></enum-method-mappings>

‎source/androidx.annotation/annotation/transforms/Metadata.Namespaces.xml‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,5 @@
77
Package
88
</attr>
99
-->
10-
<attr
11-
path="/api/package[@name='androidx.annotation']"
12-
name="managedName"
13-
>
14-
AndroidX.Annotations
15-
</attr>
16-
10+
<attr path="/api/package[@name='androidx.annotation']" name="managedName">AndroidX.Annotations</attr>
1711
</metadata>

‎source/androidx.annotation/annotation/transforms/Metadata.ParameterNames.xml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
<metadata>
2-
3-
</metadata>
1+
<metadata></metadata>

‎source/androidx.annotation/annotation/transforms/Metadata.xml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
<metadata>
2-
3-
<attr path="/api/package[@name='android.support.annotations']" name="managedName">Android.Support.Annotations</attr>
4-
5-
</metadata>
1+
<metadata></metadata>

‎source/androidx.appcompat/appcompat/transforms/EnumFields.xml‎

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1 @@
1-
<enum-field-mappings>
2-
<!--
3-
This example converts the constants Fragment_id, Fragment_name,
4-
and Fragment_tag from 4.app.FragmentActivity.FragmentTag
5-
to an enum called 4.App.FragmentTagType with values
6-
Id, Name, and Tag.
7-
8-
<mapping clr-enum-type="4.App.FragmentTagType" jni-class="android/support/v4/app/FragmentActivity$FragmentTag">
9-
<field clr-name="Id" jni-name="Fragment_id" value="1" />
10-
<field clr-name="Name" jni-name="Fragment_name" value="0" />
11-
<field clr-name="Tag" jni-name="Fragment_tag" value="2" />
12-
</type>
13-
14-
Notes:
15-
- An optional "bitfield" attribute marks the enum type with [Flags].
16-
- For Java interfaces, use "jni-interface" attribute instead of "jni-class" attribute.
17-
-->
18-
</enum-field-mappings>
1+
<enum-field-mappings></enum-field-mappings>

‎source/androidx.appcompat/appcompat/transforms/EnumMethods.xml‎

Lines changed: 26 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,33 @@
11
<enum-method-mappings>
2-
<!--
3-
This example changes the Java method:
4-
4.app.Fragment.SavedState.writeToParcel (int flags)
5-
to be:
6-
4.app.Fragment.SavedState.writeToParcel (Android.OS.ParcelableWriteFlags flags)
7-
when bound in C#.
8-
9-
<mapping jni-class="androidx/core/app/Fragment.SavedState">
10-
<method jni-name="writeToParcel" parameter="flags" clr-enum-type="Android.OS.ParcelableWriteFlags" />
11-
</mapping>
12-
13-
Notes:
14-
- For Java interfaces, use "jni-interface" attribute instead of "jni-class" attribute.
15-
- To change the type of the return value, use "return" as the parameter name.
16-
- The parameter names will be p0, p1, ... unless you provide JavaDoc file in the project.
17-
-->
18-
<!-- path="/api/package[@name='7.widget']/class[@name='AbsActionBarView']/method[@name='setVisibility' and count(parameter)=1 and parameter[1][@type='int']]"-->
19-
<mapping jni-class="androidx/appcompat/widget/AbsActionBarView">
20-
<method jni-name="setVisibility" parameter="visibility" clr-enum-type="Android.Views.ViewStates" />
21-
</mapping>
22-
23-
<!--path="/api/package[@name='7.app']/class[@name='AppCompatActivity']/method[@name='onTitleChanged' and count(parameter)=2 and parameter[1][@type='java.lang.CharSequence'] and parameter[2][@type='int']]"-->
24-
<mapping jni-class="androidx/appcompat/app/AppCompatActivity">
25-
<method jni-name="onTitleChanged" parameter="color" clr-enum-type="Android.Graphics.Color" />
26-
</mapping>
27-
28-
<!--path="/api/package[@name='7.widget']/class[@name='ActionBarContainer']/method[@name='setVisibility' and count(parameter)=1 and parameter[1][@type='int']]"-->
29-
<mapping jni-class="androidx/appcompat/widget/ActionBarContainer">
30-
<method jni-name="setVisibility" parameter="visibility" clr-enum-type="Android.Views.ViewStates" />
31-
</mapping>
32-
33-
<!--path="/api/package[@name='7.widget']/class[@name='ActionBarContextView']/method[@name='setVisibility' and count(parameter)=1 and parameter[1][@type='int']]"-->
34-
<mapping jni-class="androidx/appcompat/widget/ActionBarContextView">
35-
<method jni-name="setVisibility" parameter="p0" clr-enum-type="Android.Views.ViewStates" />
36-
</mapping>
37-
38-
<!--path="/api/package[@name='7.view.menu']/class[@name='ActionMenuItem']/method[@name='setShowAsActionFlags' and count(parameter)=1 and parameter[1][@type='int']]"-->
39-
<mapping jni-class="androidx/appcompat/view/menu/ActionMenuItem">
40-
<method jni-name="setShowAsActionFlags" parameter="actionEnum" clr-enum-type="Android.Views.ShowAsAction" />
41-
</mapping>
42-
43-
<!--path="/api/package[@name='7.view.menu']/class[@name='MenuItemImpl']/method[@name='setShowAsActionFlags' and count(parameter)=1 and parameter[1][@type='int']]"-->
44-
<mapping jni-class="androidx/appcompat/view/menu/MenuItemImpl">
45-
<method jni-name="setShowAsActionFlags" parameter="actionEnum" clr-enum-type="Android.Views.ShowAsAction" />
46-
</mapping>
47-
48-
<!--path="/api/package[@name='7.graphics.drawable']/class[@name='AnimatedStateListDrawableCompat']/method[@name='getChangingConfigurations' and count(parameter)=0]"-->
2+
<!-- path="/api/package[@name='androidx.appcompat.widget']/class[@name='AbsActionBarView']/method[@name='setVisibility' and count(parameter)=1 and parameter[1][@type='int']]"-->
3+
<mapping jni-class="androidx/appcompat/widget/AbsActionBarView">
4+
<method jni-name="setVisibility" parameter="visibility" clr-enum-type="Android.Views.ViewStates" />
5+
</mapping>
6+
<!--path="/api/package[@name='androidx.appcompat.app']/class[@name='AppCompatActivity']/method[@name='onTitleChanged' and count(parameter)=2 and parameter[1][@type='java.lang.CharSequence'] and parameter[2][@type='int']]"-->
7+
<mapping jni-class="androidx/appcompat/app/AppCompatActivity">
8+
<method jni-name="onTitleChanged" parameter="color" clr-enum-type="Android.Graphics.Color" />
9+
</mapping>
10+
<!--path="/api/package[@name='androidx.appcompat.widget']/class[@name='ActionBarContainer']/method[@name='setVisibility' and count(parameter)=1 and parameter[1][@type='int']]"-->
11+
<mapping jni-class="androidx/appcompat/widget/ActionBarContainer">
12+
<method jni-name="setVisibility" parameter="visibility" clr-enum-type="Android.Views.ViewStates" />
13+
</mapping>
14+
<!--path="/api/package[@name='androidx.appcompat.widget']/class[@name='ActionBarContextView']/method[@name='setVisibility' and count(parameter)=1 and parameter[1][@type='int']]"-->
15+
<mapping jni-class="androidx/appcompat/widget/ActionBarContextView">
16+
<method jni-name="setVisibility" parameter="p0" clr-enum-type="Android.Views.ViewStates" />
17+
</mapping>
18+
<!--path="/api/package[@name='androidx.appcompat.view.menu']/class[@name='ActionMenuItem']/method[@name='setShowAsActionFlags' and count(parameter)=1 and parameter[1][@type='int']]"-->
19+
<mapping jni-class="androidx/appcompat/view/menu/ActionMenuItem">
20+
<method jni-name="setShowAsActionFlags" parameter="actionEnum" clr-enum-type="Android.Views.ShowAsAction" />
21+
</mapping>
22+
<!--path="/api/package[@name='androidx.appcompat.view.menu']/class[@name='MenuItemImpl']/method[@name='setShowAsActionFlags' and count(parameter)=1 and parameter[1][@type='int']]"-->
23+
<mapping jni-class="androidx/appcompat/view/menu/MenuItemImpl">
24+
<method jni-name="setShowAsActionFlags" parameter="actionEnum" clr-enum-type="Android.Views.ShowAsAction" />
25+
</mapping>
26+
<!--path="/api/package[@name='androidx.appcompat.graphics.drawable']/class[@name='AnimatedStateListDrawableCompat']/method[@name='getChangingConfigurations' and count(parameter)=0]"-->
4927
<mapping jni-class="androidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompat">
5028
<method jni-name="getChangingConfigurations" parameter="return" clr-enum-type="Android.Content.PM.ConfigChanges" />
5129
</mapping>
5230
<mapping jni-class="androidx/appcompat/graphics/drawable/DrawableContainer">
5331
<method jni-name="getChangingConfigurations" parameter="return" clr-enum-type="Android.Content.PM.ConfigChanges" />
5432
</mapping>
55-
56-
57-
</enum-method-mappings>
33+
</enum-method-mappings>

‎source/androidx.appcompat/appcompat/transforms/Metadata.Namespaces.xml‎

Lines changed: 7 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -7,47 +7,11 @@
77
Package
88
</attr>
99
-->
10-
<attr
11-
path="/api/package[@name='androidx.appcompat.app']"
12-
name="managedName"
13-
>
14-
AndroidX.AppCompat.App
15-
</attr>
16-
<attr
17-
path="/api/package[@name='androidx.appcompat.content.res']"
18-
name="managedName"
19-
>
20-
AndroidX.AppCompat.Content.Res
21-
</attr>
22-
<attr
23-
path="/api/package[@name='androidx.appcompat.graphics.drawable']"
24-
name="managedName"
25-
>
26-
AndroidX.AppCompat.Graphics.Drawable
27-
</attr>
28-
<attr
29-
path="/api/package[@name='androidx.appcompat.text']"
30-
name="managedName"
31-
>
32-
AndroidX.AppCompat.Text
33-
</attr>
34-
<attr
35-
path="/api/package[@name='androidx.appcompat.view']"
36-
name="managedName"
37-
>
38-
AndroidX.AppCompat.View
39-
</attr>
40-
<attr
41-
path="/api/package[@name='androidx.appcompat.view.menu']"
42-
name="managedName"
43-
>
44-
AndroidX.AppCompat.View.Menu
45-
</attr>
46-
<attr
47-
path="/api/package[@name='androidx.appcompat.widget']"
48-
name="managedName"
49-
>
50-
AndroidX.AppCompat.Widget
51-
</attr>
52-
10+
<attr path="/api/package[@name='androidx.appcompat.app']" name="managedName">AndroidX.AppCompat.App</attr>
11+
<attr path="/api/package[@name='androidx.appcompat.content.res']" name="managedName">AndroidX.AppCompat.Content.Res</attr>
12+
<attr path="/api/package[@name='androidx.appcompat.graphics.drawable']" name="managedName">AndroidX.AppCompat.Graphics.Drawable</attr>
13+
<attr path="/api/package[@name='androidx.appcompat.text']" name="managedName">AndroidX.AppCompat.Text</attr>
14+
<attr path="/api/package[@name='androidx.appcompat.view']" name="managedName">AndroidX.AppCompat.View</attr>
15+
<attr path="/api/package[@name='androidx.appcompat.view.menu']" name="managedName">AndroidX.AppCompat.View.Menu</attr>
16+
<attr path="/api/package[@name='androidx.appcompat.widget']" name="managedName">AndroidX.AppCompat.Widget</attr>
5317
</metadata>

‎source/androidx.appcompat/appcompat/transforms/Metadata.ParameterNames.xml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
2-
<metadata>
3-
<attr path="/api/package[@name='androidx.appcompat.widget']/class[@name='DrawableUtils']/method[@name='canSafelyMutateDrawable']/parameter[1]" name="managedName">drawable</attr>
4-
<attr path="/api/package[@name='androidx.appcompat.widget']/class[@name='DrawableUtils']/method[@name='getOpticalBounds']/parameter[1]" name="managedName">drawable</attr>
5-
<attr path="/api/package[@name='androidx.appcompat.widget']/class[@name='ActionBarContextView']/method[@name='setVisibility' and count(parameter)=1 and parameter[1][@type='int']]/parameter[1]" name="managedName">visibility</attr>
6-
<attr path="/api/package[@name='androidx.appcompat.widget']/interface[@name='FitWindowsViewGroup.OnFitSystemWindowsListener']/method[@name='onFitSystemWindows']/parameter[1]" name="managedName">insets</attr>
1+
<metadata>
2+
<attr path="/api/package[@name='androidx.appcompat.widget']/class[@name='DrawableUtils']/method[@name='canSafelyMutateDrawable']/parameter[1]" name="managedName">drawable</attr>
3+
<attr path="/api/package[@name='androidx.appcompat.widget']/class[@name='DrawableUtils']/method[@name='getOpticalBounds']/parameter[1]" name="managedName">drawable</attr>
4+
<attr path="/api/package[@name='androidx.appcompat.widget']/class[@name='ActionBarContextView']/method[@name='setVisibility' and count(parameter)=1 and parameter[1][@type='int']]/parameter[1]" name="managedName">visibility</attr>
5+
<attr path="/api/package[@name='androidx.appcompat.widget']/interface[@name='FitWindowsViewGroup.OnFitSystemWindowsListener']/method[@name='onFitSystemWindows']/parameter[1]" name="managedName">insets</attr>
76
</metadata>

0 commit comments

Comments
 (0)