Oliver Brown [Tue, 15 Oct 2019 18:32:23 +0000 (19:32 +0100)]
[macOS] Add padding to Button (#7919) fixes #7851
* Add basic macOS button padding.
* Add NSButtonCell for offsetting title.
* Remove "private"
ShaneN [Tue, 15 Oct 2019 05:26:24 +0000 (23:26 -0600)]
merge fix with UWP scroll mode
ShaneN [Tue, 15 Oct 2019 05:19:46 +0000 (23:19 -0600)]
Merge 4.3.0 into master
Shane Neuville [Tue, 15 Oct 2019 05:10:00 +0000 (23:10 -0600)]
[Android] speed up development builds (#7834)
* speed up development builds android
* - remove extra property group
* - add cake descriptions
* - fix
* - remove shared runtime
* - add check for TF_Build
Javier Suárez Ruiz [Tue, 15 Oct 2019 00:07:11 +0000 (02:07 +0200)]
Fixed ItemSpacing, NumberOfSideItems, PeekAreaInsets and Snap in UWP CarouselView. (#7930)
Javier Suárez Ruiz [Mon, 14 Oct 2019 21:24:53 +0000 (23:24 +0200)]
[Android] Fixed a crash on CollectionView changing ItemsSource (#7945)
* Added repro sample
* Fixed the crash
Shane Neuville [Mon, 14 Oct 2019 19:32:06 +0000 (13:32 -0600)]
Set Continue On Error for parallel builds (#7914)
Gerald Versluis [Mon, 14 Oct 2019 16:18:09 +0000 (18:18 +0200)]
Make WkWebViewRenderer default for iOS WebView (#7367)
* Make WkWebViewRenderer default for iOS
* Update AssemblyInfo.cs
* Update Xamarin.Forms.Platform.cs
* Revert "Update AssemblyInfo.cs"
This reverts commit
ca0c034c3fa5c18630c2f7f505e73015a901dd17.
* Fix test 26993 iOS
* Update Bugzilla26993.cs
Glenn Versweyveld [Mon, 14 Oct 2019 15:56:57 +0000 (17:56 +0200)]
Validate on Date part only (#7766) fixes #5784
* Validate on Date part only
Fixes #5784
* Add unittest
* Both sides should be Date only validated
Javier Suárez Ruiz [Mon, 14 Oct 2019 15:48:33 +0000 (17:48 +0200)]
[Android] Fixed CarouselView string EmptyView not displayed (#7822) fixes #7792
* Added sample
* Updated sample
* Fixed CarouselView issue not displaying string EmptyView
* Fixed wrong controls shared projitems paths
melimion [Mon, 14 Oct 2019 11:57:44 +0000 (14:57 +0300)]
Fix [macOS] navigation page doesn't hide previous page (#7921)
* fix
* test added
* more transparency added to test
* test simplified
* test title fix
E.Z. Hart [Fri, 11 Oct 2019 23:11:42 +0000 (17:11 -0600)]
Move CollectionView UWP implementation to generics (#7911)
* Clean up implementation with generics and get rid of awkward casts
* Save some unnecessary casts and switching on CarouselView
Kangho Hur [Fri, 11 Oct 2019 00:46:57 +0000 (09:46 +0900)]
[Tizen] Fix RenderWith attributes for Forwarders (#7854)
E.Z. Hart [Thu, 10 Oct 2019 23:21:22 +0000 (17:21 -0600)]
Generics for CollectionView iOS implementation (#7918)
* Make the ItemsView type generic
* Make controller type generic
* Generic all the things, and split up the delegators
Fix rebase error
Javier Suárez Ruiz [Thu, 10 Oct 2019 15:31:05 +0000 (17:31 +0200)]
[Android/iOS] Fixed ItemsUpdatingScrollMode on CarouselView (#7872)
* Added repro sample
* Updated sample
* Fixed issue on Android
* Fixed issue on iOS
* Updated sample
* Updated instructions
* Fixed property changed propagation from CarouselViewRenderer to ItemsViewRenderer
E.Z. Hart [Thu, 10 Oct 2019 15:16:38 +0000 (09:16 -0600)]
[UWP] [iOS] Verify selected items exist when updating native selections (#7902)
* Add selection synchronization tests
* Resync native selection after ItemsSource is updated
* Update native selection on iOS when changing ItemsSource; prevent crash when
selection contains items not in source; fixes #6963
* Automated test
Stephane Delcroix [Thu, 10 Oct 2019 08:19:04 +0000 (10:19 +0200)]
[X] binding find the right indexer (#7896)
supports having multiple indexers on a bound source, try to invoke the right one
- fixes #7837
Pavel Yakovlev [Thu, 10 Oct 2019 01:33:33 +0000 (18:33 -0700)]
[Shell, Android, iOS] shell menu scrolling (#5974)
* [Android, iOS] add shell menu scrolling property
* fix UWP build
* - remove comment
Vũ Đức Tuyến [Wed, 9 Oct 2019 20:07:10 +0000 (03:07 +0700)]
#7664 Use FontSizeConverter for FontImageSource.Size property (#7887)
Javier Suárez Ruiz [Wed, 9 Oct 2019 18:14:38 +0000 (20:14 +0200)]
Fixed SnapPointsType discrepancy between CarouselView and LinearItemsLayout (#7893)
E.Z. Hart [Wed, 9 Oct 2019 17:56:18 +0000 (11:56 -0600)]
Implement grouping for UWP CollectionView (#7697)
* Implement grouping for UWP CollectionView
* Clean up CollectionViewSource on teardown
Andres G. Aragoneses [Wed, 9 Oct 2019 09:33:37 +0000 (17:33 +0800)]
build.cake: more readable way of using an enum (#7867)
* build.cake: cosmetic, less verbose GetMSBuildSettings() method
* build.cake: more readable way of using an enum
I had to look up what "1" meant in the documentation!
(https://cakebuild.net/api/Cake.Common.Tools.MSBuild/MSBuildPlatform/)
Javier Suárez Ruiz [Wed, 9 Oct 2019 07:52:27 +0000 (09:52 +0200)]
[iOS] Fixed crash displaying strings in CarouselView (#7858)
* Added repro sample
* Fixed the crash on DequeueReusableCell registering the correct cell types
* Added instructions to the test
* Fixed wrong paths on Controls Issues projitems
Javier Suárez Ruiz [Tue, 8 Oct 2019 18:06:07 +0000 (20:06 +0200)]
[iOS] Fix issue changing the ItemTemplate on CollectionView dynamically (#7743)
* Fixed Issue 7742: Change CollectionView ItemTemplate programmatically
* Fixed typo
* Removed invalid test
adrianknight89 [Tue, 8 Oct 2019 15:44:49 +0000 (10:44 -0500)]
[iOS] Alternative proposal for PR 7794 (#7811)
* emptyview fix
* fix
* added collectionview flag
* added using for List
* fix formatting
* fix formatting 2
* fix formatting 3
* fixes
* fix test
maexsp [Tue, 8 Oct 2019 11:11:44 +0000 (13:11 +0200)]
Spelling fix (#7868)
Minor spelling mistake
Samantha Houts [Mon, 7 Oct 2019 17:47:36 +0000 (10:47 -0700)]
Merge branch '4.3.0'
Stephane Delcroix [Mon, 7 Oct 2019 14:09:51 +0000 (16:09 +0200)]
[X] pass the RootAssembly to DT Context (#7853)
regression introduced by #7531
- fixes #7830
Rui Marinho [Mon, 7 Oct 2019 12:28:04 +0000 (13:28 +0100)]
[Build]Share git version (#6935)
Stephane Delcroix [Mon, 7 Oct 2019 09:55:25 +0000 (11:55 +0200)]
Merge branch '4.3.0'
Stephane Delcroix [Mon, 7 Oct 2019 09:54:46 +0000 (11:54 +0200)]
Merge branch '4.2.0' into 4.3.0
Stuart Lang [Sun, 6 Oct 2019 18:56:33 +0000 (19:56 +0100)]
Fix typo in RefreshViewRenderer (#7831)
Stephane Delcroix [Fri, 4 Oct 2019 14:09:41 +0000 (16:09 +0200)]
[C] rename file (#7818) fixes #7816
- fixes #7816
melimion [Fri, 4 Oct 2019 14:08:45 +0000 (17:08 +0300)]
[macOS] Fix Image Rotation issue (#7815) fixes #5395
* AnchorPoint fix
* rotation and translationY direction fix
* clipping fix
* test added
* anchor point and position translation fixed
* test update
adrianknight89 [Fri, 4 Oct 2019 00:36:53 +0000 (19:36 -0500)]
[iOS] Fix hard crash when horizontal GridViewLayout is refreshed (#7612) fixes #7593
* fix refreshview issue
* fix path
* remove extra line after rebase
Javier Suárez Ruiz [Fri, 4 Oct 2019 00:32:03 +0000 (02:32 +0200)]
[Android] Fix crash changing the Application MainPage (#7776) fixes #7283
* Fixed Issue 7283 - Fix crash changing the Application MainPage
* Update Xamarin.Forms.Platform.Android/AppCompat/NavigationPageRenderer.cs
* Fix build
Shane Neuville [Thu, 3 Oct 2019 23:20:07 +0000 (17:20 -0600)]
Remove Material Frame Renderer from Frame element on dispose of renderer (#7752) fixes #7339
* [iOS] remove renderer from Frame on dispose
* - add uitests
Javier Suárez Ruiz [Thu, 3 Oct 2019 22:47:16 +0000 (00:47 +0200)]
Fixed PeekAreaInsets not working on iOS (#7802)
shmin [Thu, 3 Oct 2019 21:50:52 +0000 (06:50 +0900)]
[Tizen] fix picker focus issue in TV profile (#7770)
Rui Marinho [Thu, 3 Oct 2019 12:36:49 +0000 (13:36 +0100)]
Merge branch '4.3.0'
Rui Marinho [Thu, 3 Oct 2019 12:35:23 +0000 (13:35 +0100)]
Merge branch '4.2.0' into 4.3.0
Rui Marinho [Thu, 3 Oct 2019 12:34:25 +0000 (13:34 +0100)]
Merge branch '4.1.0' into 4.2.0
Rui Marinho [Thu, 3 Oct 2019 08:50:00 +0000 (09:50 +0100)]
Revert "ios: raise touch event on touchbegin. (#6989) fixes #3320" (#7787)
This reverts commit
dca82ed828e3fc1b3fede8d376ea8c4abf56d4ca.
Rui Marinho [Wed, 2 Oct 2019 19:33:03 +0000 (20:33 +0100)]
Update Build.Locator (#7783)
Rui Marinho [Wed, 2 Oct 2019 16:11:18 +0000 (17:11 +0100)]
Merge branch '4.3.0'
Rui Marinho [Wed, 2 Oct 2019 14:20:44 +0000 (15:20 +0100)]
Remove duplicate items
Rui Marinho [Wed, 2 Oct 2019 13:42:26 +0000 (14:42 +0100)]
Fix merge
Stephane Delcroix [Wed, 2 Oct 2019 13:13:24 +0000 (15:13 +0200)]
[X] send VisualTreeChanged for root (#7747)
Stephane Delcroix [Wed, 2 Oct 2019 13:08:39 +0000 (15:08 +0200)]
Merge branch '4.3.0'
Stephane Delcroix [Wed, 2 Oct 2019 13:08:09 +0000 (15:08 +0200)]
Merge branch '4.2.0' into 4.3.0
Stephane Delcroix [Wed, 2 Oct 2019 13:06:24 +0000 (15:06 +0200)]
Merge branch '4.1.0' into 4.2.0
Stephane Delcroix [Wed, 2 Oct 2019 12:40:36 +0000 (14:40 +0200)]
[HR] allow the HR test harness to clear cache (#7774)
Gerald Versluis [Wed, 2 Oct 2019 07:57:22 +0000 (09:57 +0200)]
Fixed clipping when using FontImageSource (#7607) fixes #6491 fixes #7469 fixes #7414
* Fixed issue
* Fixes #7469
Javier Suárez Ruiz [Wed, 2 Oct 2019 07:56:00 +0000 (09:56 +0200)]
Fixed crash setting the MainPage on teh OnStart method on UWP (#7749) fixes #7537
kingces95 [Wed, 2 Oct 2019 07:54:12 +0000 (00:54 -0700)]
NRE fix reported in 7399 (#7704) fixes #7399
Javier Suárez Ruiz [Wed, 2 Oct 2019 07:53:15 +0000 (09:53 +0200)]
[UWP] Fix crash on Switch Renderer when a custom renderer provides Color objects instead of Brush (#7760) fixes #7253
* Fixed 7253 - UWP Switch custom Renderer using custom colors throws exception
* Fixed merge error in the code
Javier Suárez Ruiz [Wed, 2 Oct 2019 00:20:56 +0000 (02:20 +0200)]
[ControlGallery] Add more CarouselView samples (#7677)
* Added new CarouselView Core Gallery sample
* Fixed typo
Gerald Versluis [Tue, 1 Oct 2019 17:52:52 +0000 (19:52 +0200)]
Fix use of ToolbarItem.Order on Android Shell (#7718)
fixes #6127
E.Z. Hart [Tue, 1 Oct 2019 16:12:09 +0000 (10:12 -0600)]
[UWP] Make EmptyView work in UWP CarouselView (#7724)
* Make EmptyView work in UWP CarouselView
* Update Xamarin.Forms.Core/Items/CarouselView.cs
Co-Authored-By: Samantha Houts <samhouts@users.noreply.github.com>
Alexandre Santos Costa [Tue, 1 Oct 2019 16:11:03 +0000 (13:11 -0300)]
Setting ImportantForAccessibility when changing AutomationProperties.IsInAccessibleTree (#7370) fixes #7369
* Setting ImportantForAccessibility when applying IsInAccessibleTree
When setting control.Focused it's important to also set ImportantForAccessibility
* Important For AccessibilityExtensions
Fixed PR requests
* Removed alias
* Better handled default values
* Setting ImportantForAccessibility when applying IsInAccessibleTree
When setting control.Focused it's important to also set ImportantForAccessibility
* Important For AccessibilityExtensions
Fixed PR requests
* Removed alias
* Better handled default values
* Code Style and readability improvement
v-haroha [Tue, 1 Oct 2019 15:59:59 +0000 (11:59 -0400)]
ios: raise touch event on touchbegin. (#6989) fixes #3320
* ios: raise touch event on touchbegin.
* bugfix - listview highlight on tap, select on tap release
updated touch gester to highlight on Touchbegin and select on touchend. Also remove highlight when tab view is scrolling.
* - fix CI
* - fix CI
adrianknight89 [Tue, 1 Oct 2019 15:43:03 +0000 (10:43 -0500)]
[Android/iOS] Expose CollectionView scroll listener (#7737)
* expose scroll listener
* expose ios delegator creation
Shane Neuville [Tue, 1 Oct 2019 15:35:56 +0000 (09:35 -0600)]
Update iOS MDP Tablet Renderer to use current APIS for Master Behavior (#7705) fixes #7556
* Update iOS MDP Tablet Renderer to current APIS for Master Behavior
* - fix build
Shane Neuville [Tue, 1 Oct 2019 15:21:08 +0000 (09:21 -0600)]
Invalidate layout on ViewCell if Measurements change (#7755)
Javier Suárez Ruiz [Mon, 30 Sep 2019 18:07:21 +0000 (20:07 +0200)]
[Android] CarouselView problems updating ObservableCollection (#7693) fixes #7678
* Fixed 7678: [Android] CarouselView binded to a new ObservableCollection filled with Items does not render content
* Added test instructions
* Fixed build error
* Updated sample model name
Rui Marinho [Mon, 30 Sep 2019 01:30:37 +0000 (02:30 +0100)]
Merge branch '4.3.0'
Rui Marinho [Mon, 30 Sep 2019 01:29:36 +0000 (02:29 +0100)]
Merge branch '4.2.0' into 4.3.0
adrianknight89 [Mon, 30 Sep 2019 00:56:22 +0000 (19:56 -0500)]
[Android] Fix FlowDirection for Labels (#7614) fixes #7512
* fix textview flow direction
* removed Details from model
* Update Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7512.xaml.cs
Co-Authored-By: Rui Marinho <me@ruimarinho.net>
Shane Neuville [Mon, 30 Sep 2019 00:12:02 +0000 (18:12 -0600)]
Remove 7.3 features from wpf (#7738)
adrianknight89 [Sun, 29 Sep 2019 21:41:35 +0000 (16:41 -0500)]
[Android] Remove ripple effect on CollectionView item when SelectionMode is None (#7615)
* fix ripple effect
* revert changes in core
Stuart Lang [Sun, 29 Sep 2019 21:01:37 +0000 (22:01 +0100)]
Handle case where GetRenderer retuns null (#7566) Fixes #7563
Rui Marinho [Sun, 29 Sep 2019 20:38:19 +0000 (21:38 +0100)]
Merge branch '4.3.0'
adrianknight89 [Sat, 28 Sep 2019 23:50:22 +0000 (18:50 -0500)]
[Android/iOS] Handle dynamically switching between item layouts in CollectionView (#7613) fixes #5354
* switch between item layouts
* drop private
* added ui test
Shane Neuville [Sat, 28 Sep 2019 23:42:14 +0000 (17:42 -0600)]
UWP fixes for lower target sdk on VS 2017 (#7722)
* Set UWP to lower target framework
* - mono version
* - dotnet core
* - dotnet core
* - dotnet core
* - mono
* - remove sdks
* - new sdk for mac targets
* - mono path
* - fix mono version
* - update unit test
Rui Marinho [Sat, 28 Sep 2019 01:27:54 +0000 (02:27 +0100)]
Merge branch '4.2.0' into 4.3.0
Shane Neuville [Sat, 28 Sep 2019 01:01:00 +0000 (19:01 -0600)]
Setup public and provisionator based provisioning of SDKS (#7458)
* general provisioning
* - remove android
* - add android in
* - split up provisioning
* Update build.cake
* - increment versions
* Update azure-pipelines.yml
* Update azure-pipelines.yml
* - fix android
* - version
* - fix varialbes
* - NUGET_VERSION
* - set on parameters
* - fix parameters
* - nuget build step
* - fix powershell
* - merge UI Test fixes in
* - squash
* - cleanup provisionator
* - fix missing names
* - simplify
* - simplify
* - provisionator
* - provisionator
* JavaSDK build path hack
* - turn off default provisioning
* - windows image
* - remove sdk installs from cake
* - sdk manager installs
* Update azure-pipelines.yml
* Update azure-pipelines.yml
* - conditional core
* - conditional core
* - change to conditions
* - make the same
* - add better naming
* - sdks
* - user better links
Javier Suárez Ruiz [Fri, 27 Sep 2019 22:06:53 +0000 (00:06 +0200)]
[Android] Fixed issue changing the ItemTemplate on CarouselView (#7628) fixes #7395
* Fixed Issue 7395 - Changing ItemTemplate does not work as expected (Android)
* Added instructions to Issue7395
* Updated Core Gallery sample (instructions)
kingces95 [Fri, 27 Sep 2019 20:28:46 +0000 (10:28 -1000)]
Fix NRE for 7301 (#7706)
E.Z. Hart [Fri, 27 Sep 2019 17:41:04 +0000 (11:41 -0600)]
[UWP] Reduce allocations and fix memory leak in CollectionView (#7608)
* Checkpoint
* Fix leak caused by CollectionViewSource
* Simplify ItemTemplateEnumerator
* Reduce allocations in simple IList source scenarios on UWP
* Revert debugging changes
neolithos [Fri, 27 Sep 2019 16:05:16 +0000 (18:05 +0200)]
[Enhancement] Xamarin.Forms.Platform.WPF.ImageExtensions to public (#7462)
* Wpf api changes #7445
* Remove documentation comments
* Chg: C# language is not 7.3
fixes #7445
neolithos [Fri, 27 Sep 2019 16:04:33 +0000 (18:04 +0200)]
Fix NullReferenceException in Obfuscate (#7589) (#7591)
fixes #7589
E.Z. Hart [Fri, 27 Sep 2019 15:56:42 +0000 (09:56 -0600)]
Fix binding on test page to remove IsDragging errors
Shane Neuville [Fri, 27 Sep 2019 15:23:13 +0000 (09:23 -0600)]
Wait for test to load before scrolling images (#7702)
Shane Neuville [Fri, 27 Sep 2019 15:21:36 +0000 (09:21 -0600)]
centralize bottom nav behaviors so all the bottom navs work the same (#5904)
* Reuse Bottom Nav more behavior for non shell
* - apply issues comments
Yuriy Holembyovskyy [Fri, 27 Sep 2019 11:33:38 +0000 (14:33 +0300)]
Fix7320 font image source don't work on wpf (#7625) fixes #7320
* Added FontImageSourceHandler for WPF
* Spaces cleanup
* Replaced custom CreateBrush() method with built-in ToBrush() extension method
* Droped private.
Inverted if statement
* Added missing font.
Added Device case for WPF
* Fixed color conversion
Stephane Delcroix [Fri, 27 Sep 2019 05:59:52 +0000 (07:59 +0200)]
[X] Pass the current assembly to parsing context (#7550)
In case of Xaml-only RD, the rootAssembly is different from the assembly
of the rootType
- fixes #7531
Javier Suárez Ruiz [Fri, 27 Sep 2019 05:19:12 +0000 (07:19 +0200)]
[RefreshView] Fire RefreshCommand setting IsRefreshing (#7398)
* refresh view ui tests
* Fixed issue notifying changes in IsRefreshing property
* Fire RefreshCommand setting IsRefreshing to true
* Update Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems
* Update Xamarin.Forms.Core.UITests.Shared/UITestCategories.cs
* Added RefreshView UITests
* - ui test with swipe
* - change to drag
* - fix ui test
* - remove extra property changed event
Gerald Versluis [Fri, 27 Sep 2019 05:18:17 +0000 (22:18 -0700)]
[Android] 28+ Make non-visible pickers work again (#7289)
* Repro + fix
* Final fix
* Update Issue5159.cs
* Fixes #7311
* Test tweaks
* Update TimePickerRenderer.cs
* Revert "Update TimePickerRenderer.cs"
This reverts commit
06c1172d2501ec533cdf5b1eabafa1d402687980.
* Update TimePickerRenderer.cs
* Update TimePickerRenderer.cs
* - added instructions
Stephane Delcroix [Fri, 27 Sep 2019 00:52:38 +0000 (02:52 +0200)]
[C] Invoke ToString while setting string BP (#7651)
* [C] Invoke ToString while setting string BP
Invoke ToString with the CurrentUICulture when seeting a property of type string
from a non-convertible object.
- fixes #6281
* Update Xamarin.Forms.Core/BindableProperty.cs
Samantha Houts [Fri, 27 Sep 2019 00:28:48 +0000 (17:28 -0700)]
Merge branch '4.3.0'
Samantha Houts [Fri, 27 Sep 2019 00:23:42 +0000 (17:23 -0700)]
Merge branch '4.2.0' into 4.3.0
Shane Neuville [Fri, 27 Sep 2019 00:16:10 +0000 (18:16 -0600)]
JavaSDK build path hack (#7707)
adrianknight89 [Fri, 27 Sep 2019 00:16:03 +0000 (19:16 -0500)]
[iOS] Fix MeasureFirstItem for CollectionView (#7622)
* fix MeasureFirstItem
* added test
* changed file name
* fix path
* added text
* remove 5455
* drop private
fixes #7621
ksemenenko [Thu, 26 Sep 2019 17:43:56 +0000 (20:43 +0300)]
[iOS] Fixes for null check for Shell classes (#7583)
* null check
* currentElement null check
Gerald Versluis [Thu, 26 Sep 2019 17:23:41 +0000 (10:23 -0700)]
[BUG/iOS] Fixed CollectionView Insets ItemSpacing (#7158)
* Fix 7035
* Update Xamarin.Forms.Controls.Issues.Shared.projitems
* Update ItemsViewLayout.cs
* Update test case to show span issue
* Update AppDelegate.cs
Remove test setting
* Update Xamarin.Forms.Controls.Issues.Shared.projitems
* Update Issue7035.xaml
adrianknight89 [Thu, 26 Sep 2019 10:43:43 +0000 (05:43 -0500)]
Update Android UI test instructions (#7579)
* update readme file for Android ui tests
* added extra pounds
* added UI word
* fix error
* removed word
Shane Neuville [Thu, 26 Sep 2019 09:29:32 +0000 (03:29 -0600)]
fix android foreground tinting (#7682) fixes #7577
Rui Marinho [Thu, 26 Sep 2019 09:13:46 +0000 (10:13 +0100)]
Merge branch '4.3.0'
Rui Marinho [Thu, 26 Sep 2019 09:12:54 +0000 (10:12 +0100)]
Merge branch '4.2.0' into 4.3.0
Shane Neuville [Wed, 25 Sep 2019 16:49:26 +0000 (10:49 -0600)]
fix android apk path for ui tests (#7657)