diff options
| author | Jason Smith <jason.smith@xamarin.com> | 2016-04-24 12:25:26 -0400 |
|---|---|---|
| committer | Rui Marinho <me@ruimarinho.net> | 2016-04-24 12:25:26 -0400 |
| commit | 5907152c50ee2c658b266f2804e6b383bb15a6f1 (patch) | |
| tree | 9beb907623359723456c5c03b08922bebc4f41f3 /Xamarin.Forms.ControlGallery.Android | |
| parent | feac1ba3ed6df5e27b3fa2076bd15c190cbacd1c (diff) | |
| download | xamarin-forms-5907152c50ee2c658b266f2804e6b383bb15a6f1.tar.gz xamarin-forms-5907152c50ee2c658b266f2804e6b383bb15a6f1.tar.bz2 xamarin-forms-5907152c50ee2c658b266f2804e6b383bb15a6f1.zip | |
Evolve feature branch (#117)
* Initial import of evolve features
* [Android] Add Xamarin.Forms.Platform.Android.AppLinks project
* [iOS] Fix issues with c# 6 features on iOS AppLinks
* Added naive stanza to update-docs-windows.bat to produce Pages docs. Not tested. (#69)
* Update packages
* Add AppLinks android nuspec and fix linker issues
* Fix build
* Fix nusepc
* Fix nuspec
* Update android support nugets to 23.2.1
* Update Xamarin.UITest
* Add CardView
* [iOS] Fix app link for CoreSpotlight
* [Android] Update AppLinks android support libs
* Add Newtonsoft.Json dependency to nuspec
* Fix NRE when setting ControlTemplate to null
* Move to ModernHttpClient for download
* Try fix build
* Preserve android app links
* Fix margin issue
* General coding and simple fixes
Diffstat (limited to 'Xamarin.Forms.ControlGallery.Android')
4 files changed, 12 insertions, 2 deletions
diff --git a/Xamarin.Forms.ControlGallery.Android/Activity1.cs b/Xamarin.Forms.ControlGallery.Android/Activity1.cs index 4b36a548..bc1772c6 100644 --- a/Xamarin.Forms.ControlGallery.Android/Activity1.cs +++ b/Xamarin.Forms.ControlGallery.Android/Activity1.cs @@ -15,6 +15,7 @@ using Xamarin.Forms.ControlGallery.Android; using Xamarin.Forms.Controls; using Xamarin.Forms.Maps.Android; using Xamarin.Forms.Platform.Android; +using Xamarin.Forms.Platform.Android.AppLinks; using System.IO; using System.IO.IsolatedStorage; @@ -316,6 +317,7 @@ namespace Xamarin.Forms.ControlGallery.Android Forms.Init (this, bundle); FormsMaps.Init (this, bundle); + AndroidAppLinks.Init(this); Forms.ViewInitialized += (sender, e) => { // if (!string.IsNullOrWhiteSpace(e.View.StyleId)) { // e.NativeView.ContentDescription = e.View.StyleId; diff --git a/Xamarin.Forms.ControlGallery.Android/Properties/AndroidManifest.xml b/Xamarin.Forms.ControlGallery.Android/Properties/AndroidManifest.xml index 9bbcafdf..693419a7 100644 --- a/Xamarin.Forms.ControlGallery.Android/Properties/AndroidManifest.xml +++ b/Xamarin.Forms.ControlGallery.Android/Properties/AndroidManifest.xml @@ -1,6 +1,6 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="AndroidControlGallery.AndroidControlGallery" android:installLocation="auto"> - <uses-sdk android:minSdkVersion="15" /> + <uses-sdk android:minSdkVersion="15" android:targetSdkVersion="23" /> <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> diff --git a/Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj b/Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj index cfaa1c22..6ba585d9 100644 --- a/Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj +++ b/Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj @@ -230,6 +230,10 @@ <Project>{7d13bac2-c6a4-416a-b07e-c169b199e52b}</Project> <Name>Xamarin.Forms.Maps</Name> </ProjectReference> + <ProjectReference Include="..\Xamarin.Forms.Platform.Android.AppLinks\Xamarin.Forms.Platform.Android.AppLinks.csproj"> + <Project>{42db052e-0909-45d2-8240-187f99f393fb}</Project> + <Name>Xamarin.Forms.Platform.Android.AppLinks</Name> + </ProjectReference> <ProjectReference Include="..\Xamarin.Forms.Platform.Android.FormsViewGroup\Xamarin.Forms.Platform.Android.FormsViewGroup.csproj"> <Project>{3b72465b-acae-43ae-9327-10f372fe5f80}</Project> <Name>Xamarin.Forms.Platform.Android.FormsViewGroup</Name> diff --git a/Xamarin.Forms.ControlGallery.Android/app.config b/Xamarin.Forms.ControlGallery.Android/app.config index b1d2a5a3..83b882b7 100644 --- a/Xamarin.Forms.ControlGallery.Android/app.config +++ b/Xamarin.Forms.ControlGallery.Android/app.config @@ -6,6 +6,10 @@ <assemblyIdentity name="Mono.Cecil" publicKeyToken="0738eb9f132ed756" culture="neutral" /> <bindingRedirect oldVersion="0.0.0.0-0.9.6.0" newVersion="0.9.6.0" /> </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> + <bindingRedirect oldVersion="0.0.0.0-1.5.0.0" newVersion="1.5.0.0" /> + </dependentAssembly> </assemblyBinding> </runtime> </configuration>
\ No newline at end of file |