From b902c641412a45f929e413d9a7f08c3c40e81fcb Mon Sep 17 00:00:00 2001
From: Jonathan Dick <jondick@gmail.com>
Date: Mon, 22 Jul 2019 16:31:18 -0400
Subject: [PATCH 1/3] Initial CameraX bindings

---
 config.json                                   | 34 +++++++++++++++++--
 .../camera-core/transforms/Metadata.xml       |  5 +++
 .../core/transforms/Metadata.xml              |  2 ++
 3 files changed, 38 insertions(+), 3 deletions(-)
 create mode 100644 source/androidx.camera/camera-core/transforms/Metadata.xml

diff --git a/config.json b/config.json
index 1e129111..f0dde912 100644
--- a/config.json
+++ b/config.json
@@ -25,7 +25,7 @@
 		{
 			"groupId" : "androidx.annotation",
 			"artifactId" : "annotation",
-			"version" : "1.0.2",
+			"version" : "1.1.0",
 			"nugetId" : "Xamarin.AndroidX.Annotation",
 			"dependencyOnly" : false
 		}
@@ -67,10 +67,24 @@
 		,{
 			"groupId" : "androidx.core",
 			"artifactId" : "core",
-			"version" : "1.0.1",
+			"version" : "1.1.0-rc02",
 			"nugetId" : "Xamarin.AndroidX.Core",
 			"dependencyOnly" : false
 		}
+		,{
+			"groupId" : "androidx.camera",
+			"artifactId" : "camera-camera2",
+			"version" : "1.0.0-alpha03",
+			"nugetId" : "Xamarin.AndroidX.Camera.Camera2",
+			"dependencyOnly" : false
+		}
+		,{
+			"groupId" : "androidx.camera",
+			"artifactId" : "camera-core",
+			"version" : "1.0.0-alpha03",
+			"nugetId" : "Xamarin.AndroidX.Camera.Core",
+			"dependencyOnly" : false
+		}
 		,{
 			"groupId" : "androidx.cardview",
 			"artifactId" : "cardview",
@@ -85,6 +99,13 @@
 			"nugetId" : "Xamarin.AndroidX.Collection",
 			"dependencyOnly" : false
 		}
+		,{
+			"groupId" : "androidx.concurrent",
+			"artifactId" : "concurrent-futures",
+			"version" : "1.0.0-alpha03",
+			"nugetId" : "Xamarin.AndroidX.Concurrent.Futures",
+			"dependencyOnly" : false
+		}
 		,{
 			"groupId" : "androidx.constraintlayout",
 			"artifactId" : "constraintlayout",
@@ -487,7 +508,7 @@
 		,{
 			"groupId" : "androidx.versionedparcelable",
 			"artifactId" : "versionedparcelable",
-			"version" : "1.0.0",
+			"version" : "1.1.0-rc01",
 			"nugetId" : "Xamarin.AndroidX.VersionedParcelable",
 			"dependencyOnly" : false
 		}
@@ -548,6 +569,13 @@
 			"nugetId" : "Xamarin.Google.Guava.ListenableFuture",
 			"nugetVersion" : "1.0",
 			"dependencyOnly" : true
+		},
+		{
+			"groupId" : "com.google.auto.value",
+			"artifactId" : "auto-value-annotations",
+			"version" : "1.6.5",
+			"nugetId" : "Xamarin.Google.AutoValue.Annotations",
+			"dependencyOnly" : true
 		}
 	]
 }]
diff --git a/source/androidx.camera/camera-core/transforms/Metadata.xml b/source/androidx.camera/camera-core/transforms/Metadata.xml
new file mode 100644
index 00000000..353e510d
--- /dev/null
+++ b/source/androidx.camera/camera-core/transforms/Metadata.xml
@@ -0,0 +1,5 @@
+<metadata>
+  <remove-node path="/api/package[@name='androidx.camera.core']/class/implements[@name='androidx.camera.core.ThreadConfig']" />
+  <remove-node path="/api/package[@name='androidx.camera.core']/class/implements[@name='androidx.camera.core.UseCaseConfig.Builder']" />
+  <remove-node path="/api/package[@name='androidx.camera.core']/class/implements[@name='androidx.camera.core.TargetConfig.Builder']" />
+</metadata>
\ No newline at end of file
diff --git a/source/androidx.core/core/transforms/Metadata.xml b/source/androidx.core/core/transforms/Metadata.xml
index 98713294..0d2d33aa 100644
--- a/source/androidx.core/core/transforms/Metadata.xml
+++ b/source/androidx.core/core/transforms/Metadata.xml
@@ -37,4 +37,6 @@
         </method>
     </add-node>
     <attr path="/api/package[@name='androidx.core.view']/interface[@name='NestedScrollingParent']/method[@name='onNestedScrollAccepted' and count(parameter)=3 and parameter[1][@type='android.view.View'] and parameter[2][@type='android.view.View'] and parameter[3][@type='int']]/parameter[3]" name="managedType">Android.Views.ScrollAxis</attr>
+
+    <remove-node path="/api/package[@name='androidx.core.content.pm']/class[@name='ShortcutInfoCompatSaver.NoopImpl']" />
 </metadata>
\ No newline at end of file

From ad350fc91b52707c7dc156edbccc6cc68a067e3a Mon Sep 17 00:00:00 2001
From: Jonathan Dick <jondick@gmail.com>
Date: Wed, 24 Jul 2019 11:32:42 -0400
Subject: [PATCH 2/3] Metadata fixes for camera2

---
 source/androidx.appcompat/appcompat/transforms/Metadata.xml   | 1 +
 source/androidx.camera/camera-camera2/transforms/Metadata.xml | 3 +++
 source/androidx.fragment/fragment/additions/Additions.cs      | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 source/androidx.camera/camera-camera2/transforms/Metadata.xml

diff --git a/source/androidx.appcompat/appcompat/transforms/Metadata.xml b/source/androidx.appcompat/appcompat/transforms/Metadata.xml
index 653686dd..762cc6a1 100644
--- a/source/androidx.appcompat/appcompat/transforms/Metadata.xml
+++ b/source/androidx.appcompat/appcompat/transforms/Metadata.xml
@@ -225,4 +225,5 @@
     </add-node>
     -->
     <attr path="/api/package[@name='androidx.appcompat.widget']/class[@name='ActivityChooserModel.ActivityResolveInfo']/method[@name='compareTo' and count(parameter)=1 and parameter[1][@type='androidx.appcompat.widget.ActivityChooserModel.ActivityResolveInfo']]/parameter[1]" name="managedType">Java.Lang.Object</attr>
+    <remove-node path="/api/package/class/implements[@name='androidx.core.internal.view.SupportMenuItem']" />
 </metadata>
\ No newline at end of file
diff --git a/source/androidx.camera/camera-camera2/transforms/Metadata.xml b/source/androidx.camera/camera-camera2/transforms/Metadata.xml
new file mode 100644
index 00000000..b1a3e6e0
--- /dev/null
+++ b/source/androidx.camera/camera-camera2/transforms/Metadata.xml
@@ -0,0 +1,3 @@
+<metadata>
+  <remove-node path="/api/package/class/implements[@name='androidx.camera.core.ConfigProvider']" />
+</metadata>
\ No newline at end of file
diff --git a/source/androidx.fragment/fragment/additions/Additions.cs b/source/androidx.fragment/fragment/additions/Additions.cs
index 17de03a3..7884d42b 100644
--- a/source/androidx.fragment/fragment/additions/Additions.cs
+++ b/source/androidx.fragment/fragment/additions/Additions.cs
@@ -6,6 +6,6 @@ namespace AndroidX.Fragment.App
 {
 	public partial class FragmentActivity
 	{
-		public override AndroidX.Lifecycle.Lifecycle Lifecycle => base.Lifecycle;
+		//public override AndroidX.Lifecycle.Lifecycle Lifecycle => base.Lifecycle;
 	}
 }

From df6f1eeda502e907fd3887d5238400a7048b7745 Mon Sep 17 00:00:00 2001
From: Jonathan Dick <jondick@gmail.com>
Date: Wed, 24 Jul 2019 11:32:59 -0400
Subject: [PATCH 3/3] Fix casing in folders for generated project

---
 source/AndroidXProject.cshtml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/source/AndroidXProject.cshtml b/source/AndroidXProject.cshtml
index fe373b16..43556144 100644
--- a/source/AndroidXProject.cshtml
+++ b/source/AndroidXProject.cshtml
@@ -83,23 +83,23 @@
   }
 
   <ItemGroup>
-    <Folder Include="Additions\" />
-    <Folder Include="Jars\" />
-    <Folder Include="Transforms\" />
+    <Folder Include="additions\" />
+    <Folder Include="jars\" />
+    <Folder Include="transforms\" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\source\AssemblyInfo.cs" />
     <Compile Include="..\..\source\@(Model.MavenGroupId)\@(Model.Name)\additions\*.cs">
-        <Link>Additions/%(RecursiveDir)/%(Filename)%(Extension)</Link>
+        <Link>additions/%(RecursiveDir)/%(Filename)%(Extension)</Link>
     </Compile>
   </ItemGroup>
 
   <ItemGroup>
     <TransformFile Include="..\..\source\Metadata.common.xml" >
-      <Link>Transforms/Metadata.common.xml</Link>
+      <Link>transforms/Metadata.common.xml</Link>
     </TransformFile>
     <TransformFile Include="..\..\source\@(Model.MavenGroupId)\@(Model.Name)\transforms\*.xml">
-        <Link>Transforms/%(RecursiveDir)/%(Filename)%(Extension)</Link>
+        <Link>transforms/%(RecursiveDir)/%(Filename)%(Extension)</Link>
     </TransformFile>
   </ItemGroup>