diff options
| author | adrianknight89 <adrianknight89@outlook.com> | 2016-11-03 13:38:38 -0500 |
|---|---|---|
| committer | Samantha Houts <samantha@teamredwall.com> | 2016-11-03 11:38:38 -0700 |
| commit | 84995a921221811d2e7047d54dcefde0c8063397 (patch) | |
| tree | 5868bf9bd5ffd6dd2fb0c8d8b22fd8728b9c4764 /Xamarin.Forms.Controls | |
| parent | a2fae62d8384f78c1b5f0ba3dc088000946479bc (diff) | |
| download | xamarin-forms-84995a921221811d2e7047d54dcefde0c8063397.tar.gz xamarin-forms-84995a921221811d2e7047d54dcefde0c8063397.tar.bz2 xamarin-forms-84995a921221811d2e7047d54dcefde0c8063397.zip | |
[Android] Allow path-based icons to be loaded as toolbar icons (#437)
* Created a bitmap method to check for resource as well as path
* Update platform and navigationrenderer to get images from two locations
* CellAdapter could use path-based icon finding
* sample app to test toolbaritem icons
Diffstat (limited to 'Xamarin.Forms.Controls')
| -rw-r--r-- | Xamarin.Forms.Controls/Xamarin.Forms.Controls.csproj | 8 | ||||
| -rw-r--r-- | Xamarin.Forms.Controls/packages.config | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/Xamarin.Forms.Controls/Xamarin.Forms.Controls.csproj b/Xamarin.Forms.Controls/Xamarin.Forms.Controls.csproj index 4f560a1d..2fdc657a 100644 --- a/Xamarin.Forms.Controls/Xamarin.Forms.Controls.csproj +++ b/Xamarin.Forms.Controls/Xamarin.Forms.Controls.csproj @@ -304,6 +304,14 @@ </EmbeddedResource> </ItemGroup> <ItemGroup> + <Reference Include="PCLStorage, Version=1.0.2.0, Culture=neutral, PublicKeyToken=286fe515a2c35b64, processorArchitecture=MSIL"> + <HintPath>..\packages\PCLStorage.1.0.2\lib\portable-net45+wp8+wpa81+win8+monoandroid+monotouch+Xamarin.iOS+Xamarin.Mac\PCLStorage.dll</HintPath> + <Private>True</Private> + </Reference> + <Reference Include="PCLStorage.Abstractions, Version=1.0.2.0, Culture=neutral, PublicKeyToken=286fe515a2c35b64, processorArchitecture=MSIL"> + <HintPath>..\packages\PCLStorage.1.0.2\lib\portable-net45+wp8+wpa81+win8+monoandroid+monotouch+Xamarin.iOS+Xamarin.Mac\PCLStorage.Abstractions.dll</HintPath> + <Private>True</Private> + </Reference> <Reference Include="Xamarin.Insights"> <HintPath>..\packages\Xamarin.Insights.1.12.3\lib\portable-win+net45+wp80+windows8+wpa+MonoAndroid10+MonoTouch10\Xamarin.Insights.dll</HintPath> </Reference> diff --git a/Xamarin.Forms.Controls/packages.config b/Xamarin.Forms.Controls/packages.config index d5db6b31..3d498915 100644 --- a/Xamarin.Forms.Controls/packages.config +++ b/Xamarin.Forms.Controls/packages.config @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <packages> + <package id="PCLStorage" version="1.0.2" targetFramework="portable45-net45+win8+wp8+wpa81" /> <package id="Xamarin.Insights" version="1.12.3" targetFramework="portable45-net45+win8+wp8+wpa81" /> </packages>
\ No newline at end of file |