diff options
author | Samantha Houts <samantha@teamredwall.com> | 2017-01-12 11:48:30 -0800 |
---|---|---|
committer | Jason Smith <jason.smith@xamarin.com> | 2017-01-12 11:48:30 -0800 |
commit | 3af99cbbe145a876cc9839af0adead83695b5445 (patch) | |
tree | a94639d66151591abac7ecc356cf947e12c8f4a2 /Xamarin.Forms.ControlGallery.Android | |
parent | e7a7a57e4b2f7db71137e702be2663cf4f37d1b4 (diff) | |
download | xamarin-forms-3af99cbbe145a876cc9839af0adead83695b5445.tar.gz xamarin-forms-3af99cbbe145a876cc9839af0adead83695b5445.tar.bz2 xamarin-forms-3af99cbbe145a876cc9839af0adead83695b5445.zip |
[iOS] Labels with WordWrap or CharacterWrap will Expand (#529)
* Add reproduction for 28650
* [iOS] Expand the label to fill width if wrapping
Also, simplify the `if` statement, since `LineBreakMode` is not a flags
enum and the only excluded member was `None`.
* Test two small labels next to each other in horizontal layout
Diffstat (limited to 'Xamarin.Forms.ControlGallery.Android')
-rw-r--r-- | Xamarin.Forms.ControlGallery.Android/Resources/drawable/caret_r.png | bin | 0 -> 404 bytes | |||
-rw-r--r-- | Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj | 3 |
2 files changed, 3 insertions, 0 deletions
diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/drawable/caret_r.png b/Xamarin.Forms.ControlGallery.Android/Resources/drawable/caret_r.png Binary files differnew file mode 100644 index 00000000..bcf0ffb9 --- /dev/null +++ b/Xamarin.Forms.ControlGallery.Android/Resources/drawable/caret_r.png diff --git a/Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj b/Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj index 9a907004..642f866b 100644 --- a/Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj +++ b/Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj @@ -262,6 +262,9 @@ <ItemGroup> <TransformFile Include="Properties\AndroidManifest.xml" /> </ItemGroup> + <ItemGroup> + <BundleResource Include="Resources\drawable\caret_r.png" /> + </ItemGroup> <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" /> <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" /> <Import Project="..\packages\Xamarin.Insights.1.11.4\build\MonoAndroid10\Xamarin.Insights.targets" Condition="Exists('..\packages\Xamarin.Insights.1.11.4\build\MonoAndroid10\Xamarin.Insights.targets')" /> |