Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Android] Fix ProgressRing fails to display (bp #2764) #2794

Merged
merged 6 commits into from
Mar 12, 2020

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 11, 2020

This is an automated backport of pull request #2764 done by Mergify

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR
  • @Mergifyio backports <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the simulator.

Finally, you can contact us on https://mergify.io/

ProgressRing inside a StackPanel was failing to display because its desired size wasn't set. Fix this by introducing a flag to distinguish between managed views that have their own Layouter, and those that don't (like ProgressRing).

(cherry picked from commit 121a5fd)
Not needed with new project system.

(cherry picked from commit 957386f)
(cherry picked from commit 6a5ab6e)
(cherry picked from commit 237f9ed)
(cherry picked from commit ad6700a)
Width value isn't guaranteed across all platforms in this scenario.

(cherry picked from commit cc3f6ce)
@gitpod-io
Copy link

gitpod-io bot commented Mar 11, 2020

@github-actions github-actions bot added platform/android 🤖 Categorizes an issue or PR as relevant to the Android platform platform/ios 🍎 Categorizes an issue or PR as relevant to the iOS platform platform/wasm 🌐 Categorizes an issue or PR as relevant to the WebAssembly platform kind/documentation labels Mar 11, 2020
@nventive-devops
Copy link
Contributor

The build 12994 found UI Test snapshots differences.

  • android-28: 7 changed over 318

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • BasicNavigationView_SamplesApp_Samples_Windows_UI_Xaml_Controls_NavigationViewTests_NavigationView_Pane_Automated
    • ComboBoxTests_VisibleBounds_UITests_Shared_Windows_UI_Xaml_Controls_ComboBox_ComboBox_VisibleBounds
    • ImageStretch_None_Uno_UI_Samples_UITests_ImageTestsControl_Image_Stretch_None
    • Keyboard_Textbox_NoScrollViewer_Validation_4_-_Remove_Focus_on_multilineTextBox
    • PopupWithOverlay_After
    • TestManipulation_Result
    • ToggleSwitch_TemplateReuseTest_UITests_Shared_Windows_UI_Xaml_Controls_ToggleSwitchControl_ToggleSwitch_TemplateReuse
  • android-28-Snap: 21 changed over 683

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • ComboBox_UITests_Shared_Windows_UI_Xaml_Controls_ComboBox_ComboBox_DropDownPlacement_UITests_Shared_Windows_UI_Xaml_Controls_ComboBox_ComboBox_DropDownPlacement
    • CommandBar_Padding_Uno_UI_Samples_Content_UITests_CommandBar_CommandBar_Padding
    • Image_Uno_UI_Samples_UITests_Image_Image_Stretch_Alignment_Bigger_Uno_UI_Samples_UITests_Image_Image_Stretch_Alignment_Bigger
    • Image_Uno_UI_Samples_UITests_Image_Image_Stretch_Alignment_Equal_Uno_UI_Samples_UITests_Image_Image_Stretch_Alignment_Equal
    • Image_Uno_UI_Samples_UITests_Image_Image_Stretch_Alignment_Smaller_Uno_UI_Samples_UITests_Image_Image_Stretch_Alignment_Smaller
    • Image_Uno_UI_Samples_UITests_Image_Image_Stretch_Alignment_Wider_Uno_UI_Samples_UITests_Image_Image_Stretch_Alignment_Wider
    • ListView_HorizontalListView_Templates_SamplesApp_Windows_UI_Xaml_Controls_ListView_HorizontalListView_Templates
    • Routed_Events_Test_Page_SamplesApp_Samples_RoutedEvents_RoutedEventsPage
    • Image_UITests_Shared_Windows_UI_Xaml_Controls_ImageTests_Image_Stretch_Algmnt_Inf_Horizontal_UITests_Shared_Windows_UI_Xaml_Controls_ImageTests_Image_Stretch_Algmnt_Inf_Horizontal
    • Image_UITests_Shared_Windows_UI_Xaml_Controls_ImageTests_Image_Stretch_Algmnt_Inf_Vertical_UITests_Shared_Windows_UI_Xaml_Controls_ImageTests_Image_Stretch_Algmnt_Inf_Vertical
    • Image_UITests_Shared_Windows_UI_Xaml_Controls_ImageTests_Image_Stretch_Alignment_SizeOnControl_UITests_Shared_Windows_UI_Xaml_Controls_ImageTests_Image_Stretch_Alignment_SizeOnControl
    • Image_UITests_Windows_UI_Xaml_Controls_ImageTests_ImageAlignment2541_UITests_Windows_UI_Xaml_Controls_ImageTests_ImageAlignment2541
    • ListView_ListView_WithScrollViewer_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListView_WithScrollViewer
    • Shapes_SamplesApp_Windows_UI_Xaml_Shapes_StretchPage_SamplesApp_Windows_UI_Xaml_Shapes_StretchPage
    • Shapes_UITests_Windows_UI_Xaml_Shapes_LineStretchModes_UITests_Windows_UI_Xaml_Shapes_LineStretchModes
    • Shapes_UITests_Windows_UI_Xaml_Shapes_PathStretchModes_UITests_Windows_UI_Xaml_Shapes_PathStretchModes
    • Transform_Basics_UITests_Shared_Windows_UI_Xaml_Media_Transform_Basics
    • Transform_TransformToVisual_Translate2d_SamplesApp_Wasm_Windows_UI_Xaml_Media_Transform_TransformToVisual_Translate2d
    • TwoPaneView_MUX_Test_UITests_Shared_Microsoft_UI_Xaml_Controls_TwoPaneViewTests_TwoPaneViewPage
    • TextBlockControl_TextBlockMultilineInStarStackPanel_Uno_UI_Samples_Content_UITests_TextBlockControl_TextBlockMultilineInStarStackPanel
  • ios: 13 changed over 172

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • Keyboard_Textbox_InsideScrollViewer_Validation_5_-_Remove_Focus_on_numberTextBox
    • Large_Image_With_Margin_Ready
    • Large_Image_With_Margin_UITests_Windows_UI_Xaml_Controls_ImageTests_Image_Margin_Large
    • SequentialAnimations_SamplesApp_Windows_UI_Xaml_Media_Animation_SequentialAnimationsPage
    • TextBox_DeleteButton_UITests_Shared_Windows_UI_Xaml_Controls_TextBoxTests_TextBox_DeleteButton_Automated
    • TextBox_RoundedCorners_UITests_Shared_Windows_UI_Xaml_Controls_TextBoxTests_TextBox_RoundedCorners
    • UpDownEnabledTest_UITests_Shared_Microsoft_UI_Xaml_Controls_NumberBoxTests_MUX_Test
    • UpDownTest_UITests_Shared_Microsoft_UI_Xaml_Controls_NumberBoxTests_MUX_Test
    • Check_ListView_Swallows_Measure_after_scroll
    • Keyboard_Textbox_InsideScrollViewer_Validation_0_-_Remove_Focus_on_normalTextBox
    • Keyboard_Textbox_InsideScrollViewer_Validation_1_-_Remove_Focus_on_filledTextBox
    • Keyboard_Textbox_NoScrollViewer_Validation_1_-_Remove_Focus_on_filledTextBox
    • MinMaxTest_UITests_Shared_Microsoft_UI_Xaml_Controls_NumberBoxTests_MUX_Test
  • ios-Snap: 60 changed over 675

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • Border_Border_CornerRadius_Uno_UI_Samples_UITests_BorderTestsControl_Border_CornerRadius
    • Border_OnepxThicknessandRadiusAndTextBlock_Uno_UI_Samples_UITests_BorderTestsControl_OnepxThicknessandRadiusAndTextBlock
    • Border_OnepxThicknessandRadius_Uno_UI_Samples_UITests_BorderTestsControl_OnepxThicknessandRadius
    • Border_UITests_Shared_Windows_UI_Xaml_Controls_BorderTests_Border_Clipped_Change_Property_UITests_Shared_Windows_UI_Xaml_Controls_BorderTests_Border_Clipped_Change_Property
    • Border_Uniform_Thickness_and_Small_Radius_Uno_UI_Samples_UITests_BorderTestsControl_Uniform_Thickness_and_Small_Radius
    • ButtonTestsControl_Button_Opacity_Automated_Uno_UI_Samples_Content_UITests_ButtonTestsControl_Button_Opacity_Automated
    • Clipping_SamplesApp_Windows_UI_Xaml_Clipping_XamlButtonWithClipping_Scrollable_SamplesApp_Windows_UI_Xaml_Clipping_XamlButtonWithClipping_Scrollable
    • Clipping_UITests_Shared_Windows_UI_Xaml_Clipping_ClippingRoundedCorners_UITests_Shared_Windows_UI_Xaml_Clipping_ClippingRoundedCorners
    • ComboBox_Picker_Resizable_SamplesApp_Wasm_Windows_UI_Xaml_Controls_ComboBox_Picker_Resizable
    • ContentPresenter_ContentPresenter_Background_Uno_UI_Samples_Content_UITests_ContentPresenter_ContentPresenter_Background
    • FocusManager_FocusManagerTest_Uno_UI_Samples_Content_UITests_FocusManager_FocusManagerTest
    • FocusManager_GetFocus_Uno_UI_Samples_Content_UITests_FocusManager_FocusManager_GetFocus_Automated
    • FrameworkElement_UITests_Shared_Windows_UI_Xaml_FrameworkElementTests_FrameworkElement_NativeLayout_UITests_Shared_Windows_UI_Xaml_FrameworkElementTests_FrameworkElement_NativeLayout
    • Gesture_recognizer_Pointer_Events_test_bench_UITests_Shared_Windows_UI_Input_GestureRecognizer_PointersEvents
    • Border_Border_CornerRadius_Alignments_Uno_UI_Samples_UITests_BorderTestsControl_Border_CornerRadius_Alignments
    • Border_Circle_Uno_UI_Samples_UITests_BorderTestsControl_Circle
    • Border_NonUniformThicknessandRadius_Uno_UI_Samples_UITests_BorderTestsControl_NonUniformThicknessandRadius
    • Border_UniformThicknessandNonUniformRadius_Uno_UI_Samples_UITests_BorderTestsControl_UniformThicknessandNonUniformRadius
    • Border_Uniform_Thickness_and_Large_Radius_Uno_UI_Samples_UITests_BorderTestsControl_Uniform_Thickness_and_Large_Radius
    • ChatBox_ChatBox_UITests_Shared_Windows_UI_Xaml_Controls_ChatBox_ChatBox
  • wasm: 6 changed over 684

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • initial_state
    • UITests.Shared.Windows_UI_Xaml.Clipping.ClippingRoundedCorners
    • UITests.Shared.Windows_UI_Xaml_Controls.RepeatButton_Automated
    • UITests.Shared.Windows_UI_Xaml_Controls.TimePicker.TimePicker_Flyout_Automated
    • Uno.UI.Samples.Content.UITests.ContentPresenter.ContentPresenter_Background
    • Uno.UI.Samples.UITests.Image.Image_Margin
  • wasm-automated: 13 changed over 354

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • NoToolTip_On_Open_opened-textonly-tooltip
    • NoToolTip_On_Open_opened-tooltip
    • Simple_ContentDialog_01_Primary_Primary_Button
    • Simple_ContentDialog_01_Secondary_Secondary_Button
    • Simple_ContentDialog_01_TypeInner_Secondary_Button
    • Simple_ContentDialog_06_Reuse_Primary_Button
    • Simple_ContentDialog_06_Reuse_Secondary_Button
    • SequentialAnimations_SamplesApp_Windows_UI_Xaml_Media_Animation_SequentialAnimationsPage
    • Simple_ContentDialog_01_Close_Close_Button
    • Simple_ContentDialog_01_PrimaryCommand_Primary_Button
    • Simple_ContentDialog_01_Primary_Disabled_Primary_Button
    • Simple_ContentDialog_01_Primary_Disabled_Secondary_Button
    • When_TransformToVisual_ScrollViewer_UITests_Shared_Windows_UI_Xaml_UIElementTests_TransformToVisual_ScrollViewer

@jeromelaban jeromelaban merged commit 7a36cb1 into release/beta/2.1 Mar 12, 2020
@jeromelaban jeromelaban deleted the mergify/bp/release/beta/2.1/pr-2764 branch March 12, 2020 01:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
platform/android 🤖 Categorizes an issue or PR as relevant to the Android platform platform/ios 🍎 Categorizes an issue or PR as relevant to the iOS platform platform/wasm 🌐 Categorizes an issue or PR as relevant to the WebAssembly platform
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants