From 914f95fc0e52fd289f275922f7f06b91b35759f7 Mon Sep 17 00:00:00 2001 From: Atsushi Eno Date: Tue, 21 Nov 2017 15:01:02 -0500 Subject: [PATCH] API Level 27 enumification. --- .../enum-conversion-mappings.xml | 4 ++- .../enumification-helpers/methodmap.ext.csv | 22 ++++++++++++++++ .../remaining-int-consts.txt | 3 --- .../remaining-int-methods-filtered.txt | 26 ++++++++++++++----- external/xamarin-android-api-compatibility | 2 +- src/Mono.Android/map.csv | 26 +++++++------------ src/Mono.Android/methodmap.csv | 22 ++++++++++++++++ 7 files changed, 77 insertions(+), 28 deletions(-) diff --git a/build-tools/enumification-helpers/enum-conversion-mappings.xml b/build-tools/enumification-helpers/enum-conversion-mappings.xml index 31904c5d1f5..01a55e6be2b 100644 --- a/build-tools/enumification-helpers/enum-conversion-mappings.xml +++ b/build-tools/enumification-helpers/enum-conversion-mappings.xml @@ -573,6 +573,7 @@ + @@ -799,7 +800,7 @@ - + @@ -840,6 +841,7 @@ + diff --git a/build-tools/enumification-helpers/methodmap.ext.csv b/build-tools/enumification-helpers/methodmap.ext.csv index 5a3f5a80007..320c7204e76 100644 --- a/build-tools/enumification-helpers/methodmap.ext.csv +++ b/build-tools/enumification-helpers/methodmap.ext.csv @@ -1756,3 +1756,25 @@ 26, android.widget, VideoView, setAudioFocusRequest, focusGain, Android.Media.AudioFocus 26, java.util, Calendar.Builder, set, field, Java.Util.CalendarField + +27, android.content.pm, PackageInstaller.SessionInfo, getInstallLocation, return, Android.Content.PM.PackageInstallLocation +27, android.content.pm, PackageInstaller.SessionParams, setInstallLocation, installLocation, Android.Content.PM.PackageInstallLocation +27, android.content.pm, PackageInstaller.SessionInfo, getMode, return, Android.Content.PM.PackageInstallMode +27, android.content.pm, PackageInstaller.SessionParams, ctor, mode, Android.Content.PM.PackageInstallMode +// It was a bit too late to notice this method, or it was added after our final enumification effort for API Level 26. +// 26, android.content.pm, PackageManager, setApplicationCategory, categoryHint, Android.Content.PM.ApplicationCategories +// There is AssetInt property (of int) which was removed at API Level 21. We don't/can't enumify it. + +27, android.database.sqlite, SQLiteDatabase.OpenParams.Builder, addOpenFlags, openFlags, Android.Database.Sqlite.DatabaseOpenFlags +27, android.database.sqlite, SQLiteDatabase.OpenParams.Builder, removeOpenFlags, openFlags, Android.Database.Sqlite.DatabaseOpenFlags +27, android.database.sqlite, SQLiteDatabase.OpenParams.Builder, setOpenFlags, openFlags, Android.Database.Sqlite.DatabaseOpenFlags +27, android.database.sqlite, SQLiteDatabase.OpenParams, getOpenFlags, return, Android.Database.Sqlite.DatabaseOpenFlags + +// Android reference doc says it was added at 24 but I'm 100% sure it wasn't. They just add members and docs, and claims that they were part of 24. +24, android.icu.util, TimeZone, getTimeZone, type, Android.Icu.Util.TimeZoneType + +27, android.media, MediaMetadataRetriever, getScaledFrameAtTime, option, Android.Media.Option +// 27, android.os, SharedMemory, map, prot, ... is part of OsConstants. +27, android.view.accessibility, AccessibilityRequestPreparer, ctor, requestTypes, Android.Views.Accessibility.AccessibilityRequestTypes +// android.view.ViewStructure.setInputType never appeared before - it seems Google keeps breaking API on the docs, which is rather likely they are filling doc bits by fixing their tools. +27, android.webkit.WebViewClient, onSafeBrowsingHit, threatType, Android.Webkit.SafeBrowsingThreat diff --git a/build-tools/enumification-helpers/remaining-int-consts.txt b/build-tools/enumification-helpers/remaining-int-consts.txt index 12b4030c244..c529e37d50d 100644 --- a/build-tools/enumification-helpers/remaining-int-consts.txt +++ b/build-tools/enumification-helpers/remaining-int-consts.txt @@ -1430,7 +1430,6 @@ ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Views.Animations.Animation.cs: public const int StartOnFirstFrame = (int) -1; ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Views.Display.cs: public const int DefaultDisplay = (int) 0; ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Views.Display.cs: public const int InvalidDisplay = (int) -1; -../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Views.Display.cs: public const int StateDozing = (int) 3; ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Views.IMenu.cs: public const int First = (int) 1; ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Views.IMenu.cs: public const int None = (int) 0; ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Views.IMenu.cs: public const int SupportedModifiersMask = (int) 69647; @@ -1440,7 +1439,6 @@ ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Views.IWindowManager.cs: public const int LastApplicationWindow = (int) 99; ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Views.IWindowManager.cs: public const int LastSubWindow = (int) 1999; ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Views.IWindowManager.cs: public const int LastSystemWindow = (int) 2999; -../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Views.IWindowManager.cs: public const int TypeKeyguard = (int) 2004; ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Views.KeyCharacterMap.cs: public const int CombiningAccent = (int) -2147483648; ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Views.KeyCharacterMap.cs: public const int CombiningAccentMask = (int) 2147483647; ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Views.KeyCharacterMap.cs: public const int MetaLength = (int) 4; @@ -1464,7 +1462,6 @@ ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Views.View.cs: public const int MeasuredStateMask = (int) -16777216; ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Views.View.cs: public const int MeasuredStateTooSmall = (int) 16777216; ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Views.View.cs: public const int NoId = (int) -1; -../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Views.View.cs: public const int TextAlignmentResolvedDefault = (int) 131072; ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Views.ViewGroup.cs: protected const int ClipToPaddingMask = (int) 34; ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Views.ViewGroup.cs: public const int FillParent = (int) -1; ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Views.ViewGroup.cs: public const int MatchParent = (int) -1; diff --git a/build-tools/enumification-helpers/remaining-int-methods-filtered.txt b/build-tools/enumification-helpers/remaining-int-methods-filtered.txt index 2b489f5fa78..916dc06699c 100644 --- a/build-tools/enumification-helpers/remaining-int-methods-filtered.txt +++ b/build-tools/enumification-helpers/remaining-int-methods-filtered.txt @@ -17,10 +17,9 @@ ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.App.FragmentHostCallback.cs: public virtual unsafe int OnGetWindowAnimations () ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.App.Job.JobInfo.cs: public virtual unsafe int ClipGrantFlags { ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.App.Job.JobParameters.cs: public virtual unsafe int ClipGrantFlags { -../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.App.Job.JobScheduler.cs: public abstract int Enqueue (Android.App.Job.JobInfo p0, Android.App.Job.JobWorkItem p1); -../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.App.Job.JobScheduler.cs: public override unsafe int Enqueue (Android.App.Job.JobInfo p0, Android.App.Job.JobWorkItem p1) +../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.App.Job.JobScheduler.cs: public abstract int Enqueue (Android.App.Job.JobInfo job, Android.App.Job.JobWorkItem work); +../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.App.Job.JobScheduler.cs: public override unsafe int Enqueue (Android.App.Job.JobInfo job, Android.App.Job.JobWorkItem work) ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.App.NotificationChannel.cs: public unsafe int LightColor { -../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.App.NotificationChannel.cs: public unsafe int LockscreenVisibility { ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.App.Notification.cs: public int Color { ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.App.Notification.cs: public int LedARGB { ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.App.Notification.cs: public int LedOffMS { @@ -54,12 +53,15 @@ ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Content.PM.PackageItemInfo.cs: public int Banner { ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Content.PM.PackageManager.cs: public abstract Android.Graphics.Drawables.Drawable GetUserBadgedDrawableForDensity (Android.Graphics.Drawables.Drawable drawable, Android.OS.UserHandle user, Android.Graphics.Rect badgeLocation, int badgeDensity); ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Content.PM.PackageManager.cs: public abstract int InstantAppCookieMaxBytes { +../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Content.PM.PackageManager.cs: public abstract void SetApplicationCategory(string packageName, int categoryHint); ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Content.PM.PackageManager.cs: public override unsafe Android.Graphics.Drawables.Drawable GetUserBadgedDrawableForDensity (Android.Graphics.Drawables.Drawable drawable, Android.OS.UserHandle user, Android.Graphics.Rect badgeLocation, int badgeDensity) ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Content.PM.PackageManager.cs: public override unsafe int InstantAppCookieMaxBytes { +../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Content.PM.PackageManager.cs: public override unsafe void SetApplicationCategory(string packageName, int categoryHint) ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Content.PM.PermissionGroupInfo.cs: public int Priority { ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Content.PM.ResolveInfo.cs: public int Priority { ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Content.PM.ShortcutInfo.cs: public unsafe int Rank { ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Content.PM.ShortcutInfo.cs: public virtual unsafe Android.Content.PM.ShortcutInfo.Builder SetRank (int rank) +../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Content.Res.AssetManager.cs: public unsafe int AssetInt { ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Content.Res.ColorStateList.cs: public virtual unsafe int DefaultColor { ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Content.Res.ColorStateList.cs: public virtual unsafe int GetColorForState (, Android.Graphics.Color defaultColor) ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Content.RestrictionEntry.cs: public unsafe RestrictionEntry (string key, int selectedInt) @@ -82,7 +84,11 @@ ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Graphics._Color.cs: public static unsafe void RGBToHSV (int red, int green, int blue, float[] hsv) ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Graphics._Color.cs: public virtual unsafe float GetComponent (int component) ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Graphics._Color.cs: public virtual unsafe int ToArgb () +../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Graphics.ColorSpace.cs: public abstract float GetMaxValue (int component); +../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Graphics.ColorSpace.cs: public abstract float GetMinValue (int component); ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Graphics.ColorSpace.cs: public override unsafe float GetMaxValue (int component) +../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Graphics.ColorSpace.cs: public override unsafe float GetMaxValue (int component) +../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Graphics.ColorSpace.cs: public override unsafe float GetMinValue (int component) ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Graphics.ColorSpace.cs: public override unsafe float GetMinValue (int component) ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Graphics.Drawables.GradientDrawable.cs: public virtual unsafe int[] GetColors () ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Graphics.Drawables.LayerDrawable.cs: public virtual unsafe int AddLayer (Android.Graphics.Drawables.Drawable dr) @@ -329,12 +335,15 @@ ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Media.ExifInterface.cs: public virtual unsafe (string tag, int defaultValue) ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Media.JetPlayer.cs: public int NbSegments { ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Media.JetPlayer.cs: public int Paused { -../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Media.MediaCas.cs: public int P1 { -../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Media.MediaCas.cs: public int P2 { +../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Media.MediaCas.cs: public int Arg { +../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Media.MediaCas.cs: public int Event { +../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Media.MediaCas.cs: public MediaCasEventArgs (Android.Media.MediaCas mediaCas, int e, int arg, byte[] data) ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Media.MediaCas.cs: public static unsafe bool IsSystemIdSupported (int CA_system_id) ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Media.MediaCas.cs: public unsafe MediaCas (int CA_system_id) +../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Media.MediaCas.cs: public unsafe void OnEvent (Android.Media.MediaCas mediaCas, int e, int arg, byte[] data) ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Media.MediaCas.cs: public unsafe void RefreshEntitlements (int refreshType, byte[] refreshData) ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Media.MediaCas.cs: public unsafe void SendEvent (int e, int arg, byte[] data) +../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Media.MediaCas.cs: public void OnEvent (Android.Media.MediaCas mediaCas, int e, int arg, byte[] data) ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Media.MediaCodec.cs: public unsafe int EncryptBlocks { ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Media.MediaCodec.cs: public unsafe int SkipBlocks { ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Media.MediaCodec.cs: public unsafe Pattern (int blocksToEncrypt, int blocksToSkip) @@ -344,7 +353,6 @@ ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Media.MediaDescrambler.cs: public unsafe MediaDescrambler (int CA_system_id) ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Media.MediaDrm.cs: public int Extra { ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Media.MediaDrm.cs: public unsafe int RequestType { -../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Media.MediaPlayer.cs: public int P1 { ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Media.MediaRouter.cs: public virtual unsafe void RequestUpdateVolume (int direction) ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Media.MediaSync.cs: public ErrorEventArgs (Android.Media.MediaSync sync, Android.Media.MediaSyncErrorCode what, int extra) ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Media.MediaSync.cs: public int Extra { @@ -422,6 +430,8 @@ ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.OS.Process.cs: public static unsafe int[] GetExclusiveCores () ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.OS.ProxyFileDescriptorCallback.cs: public virtual unsafe int OnRead (long offset, , byte[] data) ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.OS.ProxyFileDescriptorCallback.cs: public virtual unsafe int OnWrite (long offset, , byte[] data) +../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.OS.SharedMemory.cs: public unsafe bool SetProtect (int prot) +../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.OS.SharedMemory.cs: public unsafe Java.Nio.ByteBuffer Map (int prot, , ) ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.OS.TestLooperManager.cs: public virtual unsafe bool HasMessages (Android.OS.Handler h, Java.Lang.Object @object, int what) ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.OS.VibrationEffect.cs: public static unsafe Android.OS.VibrationEffect CreateOneShot (long milliseconds, int amplitude) ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.OS.VibrationEffect.cs: public static unsafe Android.OS.VibrationEffect CreateWaveform (long[] timings, int[] amplitudes, ) @@ -531,9 +541,11 @@ ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Views.ViewDebug.cs: public override unsafe int Mask () ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Views.ViewGroup.cs: public virtual unsafe void OnNestedPreScroll (Android.Views.View target, , int[] consumed) ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Views.ViewStructure.cs: public abstract void SetDimens (int left, , , ); +../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Views.ViewStructure.cs: public abstract void SetInputType (int inputType); ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Views.ViewStructure.cs: public abstract void SetText (Java.Lang.ICharSequence text, int selectionStart, int selectionEnd); ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Views.ViewStructure.cs: public abstract void SetTextLines (int[] charOffsets, int[] baselines); ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Views.ViewStructure.cs: public override unsafe void SetDimens (int left, , , ) +../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Views.ViewStructure.cs: public override unsafe void SetInputType (int inputType) ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Views.ViewStructure.cs: public override unsafe void SetText (Java.Lang.ICharSequence text, int selectionStart, int selectionEnd) ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Views.ViewStructure.cs: public override unsafe void SetTextLines (int[] charOffsets, int[] baselines) ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Android.Views.ViewStructure.cs: public void SetText (string text, int selectionStart, int selectionEnd) @@ -672,6 +684,8 @@ ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Java.Net.Socket.cs: public virtual unsafe void SetSoLinger (bool on, int linger) ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Java.Net.URLConnection.cs: public virtual unsafe int GetHeaderFieldInt (string name, int Default) ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Java.Nio.Channels.AsynchronousChannelGroup.cs: public static unsafe Java.Nio.Channels.AsynchronousChannelGroup WithFixedThreadPool (int nThreads, Java.Util.Concurrent.IThreadFactory threadFactory) +../../src/Mono.Android/obj/Debug/android-XXX/mcw/Java.Nio.Channels.Spi.AsynchronousChannelProvider.cs: public abstract Java.Nio.Channels.AsynchronousChannelGroup OpenAsynchronousChannelGroup (int nThreads, Java.Util.Concurrent.IThreadFactory threadFactory); +../../src/Mono.Android/obj/Debug/android-XXX/mcw/Java.Nio.Channels.Spi.AsynchronousChannelProvider.cs: public override unsafe Java.Nio.Channels.AsynchronousChannelGroup OpenAsynchronousChannelGroup (int nThreads, Java.Util.Concurrent.IThreadFactory threadFactory) ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Java.Security.Cert.X509CertSelector.cs: public virtual unsafe void AddSubjectAlternativeName (int type, byte[] name) ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Java.Security.Cert.X509CertSelector.cs: public virtual unsafe void AddSubjectAlternativeName (int type, string name) ../../src/Mono.Android/obj/Debug/android-XXX/mcw/Java.Sql.BatchUpdateException.cs: public unsafe BatchUpdateException (int[] updateCounts) diff --git a/external/xamarin-android-api-compatibility b/external/xamarin-android-api-compatibility index c050ba3c124..6a262943294 160000 --- a/external/xamarin-android-api-compatibility +++ b/external/xamarin-android-api-compatibility @@ -1 +1 @@ -Subproject commit c050ba3c124f628bee550756512a9ea7fbf4b4b7 +Subproject commit 6a26294329428a1369462bba32e91d5c83164994 diff --git a/src/Mono.Android/map.csv b/src/Mono.Android/map.csv index 74319bc9bca..dc707d02948 100644 --- a/src/Mono.Android/map.csv +++ b/src/Mono.Android/map.csv @@ -51,23 +51,6 @@ -// FIXME: They had better be converted to enums, they are missed ones. But cannot simply add without API changes. - -//18,Android.Util.DisplayMetricsDensity,None,android/graphics/Bitmap.DENSITY_NONE,0 -//14,Android.Views.GravityFlags, Start, android/view/Gravity.START, 14 -//1,Android.Views.WindowManagerTypes, FirstApplicationWindow, android/view/WindowManager$LayoutParams.FIRST_APPLICATION_WINDOW, 1 -//1,Android.Views.WindowManagerTypes, FirstSubWindow, android/view/WindowManager$LayoutParams.FIRST_SUB_WINDOW, 1000 -//1,Android.Views.WindowManagerTypes, FirstSystemWindow, android/view/WindowManager$LayoutParams.FIRST_SYSTEM_WINDOW, 2000 -//1,Android.Views.WindowManagerTypes, LastApplicationWindow, android/view/WindowManager$LayoutParams.LAST_APPLICATION_WINDOW, 99 -//1,Android.Views.WindowManagerTypes, LastSubWindow, android/view/WindowManager$LayoutParams.LAST_SUB_WINDOW, 1999 -//1,Android.Views.WindowManagerTypes, LastSystemWindow, android/view/WindowManager$LayoutParams.LAST_SYSTEM_WINDOW, 2999 -//11,Android.Views.KeyEventFlags, Fallback, android/view/KeyEvent.FLAG_FALLBACK, 1024 - - - - - - @@ -2977,6 +2960,10 @@ 26,Android.Webkit.ClientError,UnsafeResource,android/webkit/WebViewClient.ERROR_UNSAFE_RESOURCE,-16 10,Android.Webkit.ClientError,UnsupportedAuthScheme,android/webkit/WebViewClient.ERROR_UNSUPPORTED_AUTH_SCHEME,-3 10,Android.Webkit.ClientError,UnsupportedScheme,android/webkit/WebViewClient.ERROR_UNSUPPORTED_SCHEME,-10 +27,Android.Webkit.SafeBrowsingThreat,Malware,android/webkit/WebViewClient.SAFE_BROWSING_THREAT_MALWARE,1 +27,Android.Webkit.SafeBrowsingThreat,Phishing,android/webkit/WebViewClient.SAFE_BROWSING_THREAT_PHISHING,2 +27,Android.Webkit.SafeBrowsingThreat,Unknown,android/webkit/WebViewClient.SAFE_BROWSING_THREAT_UNKNOWN,0 +27,Android.Webkit.SafeBrowsingThreat,UnwantedSoftware,android/webkit/WebViewClient.SAFE_BROWSING_THREAT_UNWANTED_SOFTWARE,3 15,Android.Widget.ChoiceMode,Multiple,android/widget/AbsListView.CHOICE_MODE_MULTIPLE,2 15,Android.Widget.ChoiceMode,MultipleModal,android/widget/AbsListView.CHOICE_MODE_MULTIPLE_MODAL,3 15,Android.Widget.ChoiceMode,None,android/widget/AbsListView.CHOICE_MODE_NONE,0 @@ -4595,6 +4582,7 @@ 19,Android.Views.Accessibility.RangeType,Float,android/view/accessibility/AccessibilityNodeInfo.RangeInfo.RANGE_TYPE_FLOAT,1 19,Android.Views.Accessibility.RangeType,Int,android/view/accessibility/AccessibilityNodeInfo.RangeInfo.RANGE_TYPE_INT,0 19,Android.Views.Accessibility.RangeType,Percent,android/view/accessibility/AccessibilityNodeInfo.RangeInfo.RANGE_TYPE_PERCENT,2 +27,Android.Views.Accessibility.AccessibilityRequestTypes,ExtraData,android/view/accessibility/AccessibilityRequestPreparer.REQUEST_TYPE_EXTRA_DATA,1 22,Android.Views.Accessibility.AccessibilityWindowType,AccessibilityOverlay,android/view/accessibility/AccessibilityWindowInfo.TYPE_ACCESSIBILITY_OVERLAY,4 21,Android.Views.Accessibility.AccessibilityWindowType,Application,android/view/accessibility/AccessibilityWindowInfo.TYPE_APPLICATION,1 21,Android.Views.Accessibility.AccessibilityWindowType,InputMethod,android/view/accessibility/AccessibilityWindowInfo.TYPE_INPUT_METHOD,2 @@ -5095,9 +5083,13 @@ 17,Android.Views.TextDirection,Rtl,android/view/View.TEXT_DIRECTION_RTL,4 21,Android.Views.FeedbackConstants,ClockTick,android/view/HapticFeedbackConstants.CLOCK_TICK,4 23,Android.Views.FeedbackConstants,ContextClick,android/view/HapticFeedbackConstants.CONTEXT_CLICK,6 +27,Android.Views.FeedbackConstants,KeyboardPress,android/view/HapticFeedbackConstants.KEYBOARD_PRESS,3 +27,Android.Views.FeedbackConstants,KeyboardRelease,android/view/HapticFeedbackConstants.KEYBOARD_RELEASE,7 10,Android.Views.FeedbackConstants,KeyboardTap,android/view/HapticFeedbackConstants.KEYBOARD_TAP,3 10,Android.Views.FeedbackConstants,LongPress,android/view/HapticFeedbackConstants.LONG_PRESS,0 10,Android.Views.FeedbackConstants,VirtualKey,android/view/HapticFeedbackConstants.VIRTUAL_KEY,1 +27,Android.Views.FeedbackConstants,TextHandleMove,android/view/HapticFeedbackConstants.TEXT_HANDLE_MOVE,9 +27,Android.Views.FeedbackConstants,VirtualKeyRelease,android/view/HapticFeedbackConstants.VIRTUAL_KEY_RELEASE,8 10,Android.Views.FeedbackFlags,IgnoreGlobalSetting,android/view/HapticFeedbackConstants.FLAG_IGNORE_GLOBAL_SETTING,2 10,Android.Views.FeedbackFlags,IgnoreViewSetting,android/view/HapticFeedbackConstants.FLAG_IGNORE_VIEW_SETTING,1 24,Android.AccessibilityServices.AccessibilityServiceShowMode,Auto,android/accessibilityservice/AccessibilityService.SHOW_MODE_AUTO,0 diff --git a/src/Mono.Android/methodmap.csv b/src/Mono.Android/methodmap.csv index 2ea21109085..c83df0d2b0e 100644 --- a/src/Mono.Android/methodmap.csv +++ b/src/Mono.Android/methodmap.csv @@ -2352,3 +2352,25 @@ 26, android.widget, VideoView, setAudioFocusRequest, focusGain, Android.Media.AudioFocus 26, java.util, Calendar.Builder, set, field, Java.Util.CalendarField + +27, android.content.pm, PackageInstaller.SessionInfo, getInstallLocation, return, Android.Content.PM.PackageInstallLocation +27, android.content.pm, PackageInstaller.SessionParams, setInstallLocation, installLocation, Android.Content.PM.PackageInstallLocation +27, android.content.pm, PackageInstaller.SessionInfo, getMode, return, Android.Content.PM.PackageInstallMode +27, android.content.pm, PackageInstaller.SessionParams, ctor, mode, Android.Content.PM.PackageInstallMode +// It was a bit too late to notice this method, or it was added after our final enumification effort for API Level 26. +// 26, android.content.pm, PackageManager, setApplicationCategory, categoryHint, Android.Content.PM.ApplicationCategories +// There is AssetInt property (of int) which was removed at API Level 21. We don't/can't enumify it. + +27, android.database.sqlite, SQLiteDatabase.OpenParams.Builder, addOpenFlags, openFlags, Android.Database.Sqlite.DatabaseOpenFlags +27, android.database.sqlite, SQLiteDatabase.OpenParams.Builder, removeOpenFlags, openFlags, Android.Database.Sqlite.DatabaseOpenFlags +27, android.database.sqlite, SQLiteDatabase.OpenParams.Builder, setOpenFlags, openFlags, Android.Database.Sqlite.DatabaseOpenFlags +27, android.database.sqlite, SQLiteDatabase.OpenParams, getOpenFlags, return, Android.Database.Sqlite.DatabaseOpenFlags + +// Android reference doc says it was added at 24 but I'm 100% sure it wasn't. They just add members and docs, and claims that they were part of 24. +24, android.icu.util, TimeZone, getTimeZone, type, Android.Icu.Util.TimeZoneType + +27, android.media, MediaMetadataRetriever, getScaledFrameAtTime, option, Android.Media.Option +// 27, android.os, SharedMemory, map, prot, ... is part of OsConstants. +27, android.view.accessibility, AccessibilityRequestPreparer, ctor, requestTypes, Android.Views.Accessibility.AccessibilityRequestTypes +// android.view.ViewStructure.setInputType never appeared before - it seems Google keeps breaking API on the docs, which is rather likely they are filling doc bits by fixing their tools. +27, android.webkit, WebViewClient, onSafeBrowsingHit, threatType, Android.Webkit.SafeBrowsingThreat