From 49db53f7ca933b357f3ac4646fa3d878d6738bab Mon Sep 17 00:00:00 2001 From: Atsushi Eno Date: Thu, 11 Jan 2018 16:08:35 +0900 Subject: [PATCH] [enumification][Mono.Android] fix ChoiceMode enum generation. After the last API XML generation sanitization, ChoiceMode was removed because they were generated from AbsListView fields which DOES NOT EXIST in API Level 10. And getChoiceMode() and setChoiceMode are removed because they expect that nonexistent enum. Fortunately they are in ListView in API Level 10, so they can be generated from there. --- .../enumification-helpers/enum-conversion-mappings.xml | 2 +- src/Mono.Android/map.csv | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/build-tools/enumification-helpers/enum-conversion-mappings.xml b/build-tools/enumification-helpers/enum-conversion-mappings.xml index 54d7db80813..eb43a894be4 100644 --- a/build-tools/enumification-helpers/enum-conversion-mappings.xml +++ b/build-tools/enumification-helpers/enum-conversion-mappings.xml @@ -842,7 +842,7 @@ - + diff --git a/src/Mono.Android/map.csv b/src/Mono.Android/map.csv index daf14613097..a434d80f583 100644 --- a/src/Mono.Android/map.csv +++ b/src/Mono.Android/map.csv @@ -2967,10 +2967,9 @@ 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 -15,Android.Widget.ChoiceMode,Single,android/widget/AbsListView.CHOICE_MODE_SINGLE,1 +10,Android.Widget.ChoiceMode,Multiple,android/widget/ListView.CHOICE_MODE_MULTIPLE,2 +10,Android.Widget.ChoiceMode,None,android/widget/ListView.CHOICE_MODE_NONE,0 +10,Android.Widget.ChoiceMode,Single,android/widget/ListView.CHOICE_MODE_SINGLE,1 10,Android.Widget.TranscriptMode,AlwaysScroll,android/widget/AbsListView.TRANSCRIPT_MODE_ALWAYS_SCROLL,2 10,Android.Widget.TranscriptMode,Disabled,android/widget/AbsListView.TRANSCRIPT_MODE_DISABLED,0 10,Android.Widget.TranscriptMode,Normal,android/widget/AbsListView.TRANSCRIPT_MODE_NORMAL,1