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

[Gallery][Wasm/Android/iOS]MediaPlayerElement(First sample option)- when first click 'Full screen' and then click 'Enter Mini view' option then both option gets disappear. (backport #13272) #13290

Merged
merged 3 commits into from
Aug 17, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 17, 2023

This is an automatic backport of pull request #13272 done by Mergify.
Cherry-pick of e4bae18 has failed:

On branch mergify/bp/legacy/4x/pr-13272
Your branch is up to date with 'origin/legacy/4x'.

You are currently cherry-picking commit e4bae18347.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   src/Uno.UI/UI/Xaml/Controls/MediaPlayerElement/MediaPlayerElement.cs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/Uno.UI/UI/Xaml/Controls/MediaPlayerElement/MediaTransportControls.cs

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


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 on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <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 config editor.

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

(cherry picked from commit e4bae18)

# Conflicts:
#	src/Uno.UI/UI/Xaml/Controls/MediaPlayerElement/MediaTransportControls.cs
(cherry picked from commit 22444cb)
@agneszitte
Copy link
Contributor

@rafael-rosa-knowcode merge conflicts need to be resolved for this Backport PR please

@agneszitte agneszitte enabled auto-merge August 17, 2023 01:07
@nventive-devops
Copy link
Contributor

The build 90266 found UI Test snapshots differences: android-28-xamarin: 39, android-28-xamarin-Snap: 84, ios: 59, ios-Snap: 95, macOS-screenshots: 18, skia-gtk-screenshots: 19, skia-wpf-screenshots: 15, wasm: 36, wasm-automated-net7.0-UWP-Benchmarks: 0, wasm-automated-net7.0-UWP-Default: 12, wasm-automated-net7.0-UWP-RuntimeTests: 0, wasm-automated-net7.0-WinUI-RuntimeTests: 0

Details
  • android-28-xamarin: 39 changed over 832

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • BasicNavigationView_SamplesApp_Samples_Windows_UI_Xaml_Controls_NavigationViewTests_NavigationView_Pane_Automated
    • Check_ListView_Swallows_Measure_UITests_Shared_Windows_UI_Xaml_Controls_ListView_ListView_With_ListViews_Count_Measure
    • ComboBoxTests_VisibleBounds_UITests_Shared_Windows_UI_Xaml_Controls_ComboBox_ComboBox_VisibleBounds
    • CommandTest_UITests_Microsoft_UI_Xaml_Controls_SplitButtonTests_SplitButtonPage
    • FocusManager_GetFocusedElement_Grid_Validation_Uno_UI_Samples_Content_UITests_FocusTests_FocusManager_GetFocus_Automated
    • FocusManager_GetFocusedElement_TextBoxMultiLine_LostFocus_Validation_FocusManager_-_LostFocus_-_TextBoxMultiLine_-_1_-_Initial_State
    • FocusManager_GetFocusedElement_TextBoxMultiLine_LostFocus_Validation_FocusManager_-_LostFocus_-_TextBoxMultiLine_-_2_-_Click_outside
    • FocusManager_GetFocusedElement_TextBoxMultiLine_LostFocus_Validation_Uno_UI_Samples_Content_UITests_FocusTests_FocusManager_GetFocus_Automated
    • FocusManager_GetFocusedElement_TextBoxSingleLine_LostFocus_Validation_Uno_UI_Samples_Content_UITests_FocusTests_FocusManager_GetFocus_Automated
    • FocusManager_GetFocusedElement_TextBoxSingleLine_Validation_FocusManager_-_GetFocusedElement_-_TextBoxSingleLine_-_2_-_After_Selection
    • FocusManager_GetFocusedElement_ToggleButton_LostFocus_Validation_Uno_UI_Samples_Content_UITests_FocusTests_FocusManager_GetFocus_Automated
    • Keyboard_Textbox_NoScrollViewer_Validation_5_-_Remove_Focus_on_numberTextBox
    • ListView_ExpandableItem_ExpandMultipleItems_Expanded_State
    • ListView_ListViewWithHeader_InitializesTest_SamplesApp_Windows_UI_Xaml_Controls_ListView_HorizontalListViewGrouped
    • Manipulation_WhenInScrollViewerAndManipulationNoneAndDiagonal_ThenNoManipulation_UITests_Shared_Windows_UI_Input_GestureRecognizerTests_Manipulation_WhenInScrollViewer
    • ProgressRing_IsEnabled_Running_UITests_Windows_UI_Xaml_Controls_ProgressRing_WindowsProgressRing_GH1220
    • ProgressRing_Visibility_Collapsed_UITests_Windows_UI_Xaml_Controls_ProgressRing_WindowsProgressRing_GH1220
    • NativeCommandBar_Size_Uno_UI_Samples_Content_UITests_CommandBar_CommandBar_Dynamic
    • SelectionTest_UITests_Microsoft_UI_Xaml_Controls_RadioButtonsTests_RadioButtonsPage
    • SequentialAnimations_SamplesApp_Windows_UI_Xaml_Media_Animation_SequentialAnimationsPage
  • android-28-xamarin-Snap: 84 changed over 1043

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • BreadcrumbBar_MUXControlsTestApp_BreadcrumbBarPage_MUXControlsTestApp_BreadcrumbBarPage
    • ColorPicker_WinUIColorPickerPage_UITests_Shared_Microsoft_UI_Xaml_Controls_ColorPickerTests_WinUIColorPickerPage
    • ComboBox_UITests_Shared_Windows_UI_Xaml_Controls_ComboBox_ComboBox_VisibleBounds_UITests_Shared_Windows_UI_Xaml_Controls_ComboBox_ComboBox_VisibleBounds
    • Default_UITests_Toolkit_ElevatedView_Levels_UITests_Toolkit_ElevatedView_Levels
    • DragAndDrop_UITests_Windows_UI_Xaml_DragAndDrop_DragDrop_ListView_Custom_States_UITests_Windows_UI_Xaml_DragAndDrop_DragDrop_ListView_Custom_States
    • Default_SamplesApp_Wasm_Windows_UI_Xaml_Controls_ListView_ListView_IsSelected_SamplesApp_Wasm_Windows_UI_Xaml_Controls_ListView_ListView_IsSelected
    • GridView_Uno_UI_Samples_Content_UITests_GridView_GridViewFirstVisibleIndex_Uno_UI_Samples_Content_UITests_GridView_GridViewFirstVisibleIndex
    • GridView_Uno_UI_Samples_Content_UITests_GridView_GridViewVariableItemHeight_Uno_UI_Samples_Content_UITests_GridView_GridViewVariableItemHeight
    • Grid_Grid_with_MinWidth_MinHeight_Uno_UI_Samples_Content_UITests_GridTestsControl_Grid_with_MinWidth_MinHeight
    • Flyouts_Flyout_Simple_Uno_UI_Samples_Content_UITests_Flyout_Flyout_Simple
    • Flyouts_Flyout_Target_Uno_UI_Samples_Content_UITests_Flyout_Flyout_Target
    • Icons_Uno_UI_Samples_Content_UITests_FontIconTests_FontIconControlTest_Uno_UI_Samples_Content_UITests_FontIconTests_FontIconControlTest
    • Image_UITests_Windows_UI_Xaml_Controls_ImageTests_SvgImageSource_FromMsAppData_UITests_Windows_UI_Xaml_Controls_ImageTests_SvgImageSource_FromMsAppData
    • Image_UITests_Windows_UI_Xaml_Controls_ImageTests_SvgImageSource_FromStream_UITests_Windows_UI_Xaml_Controls_ImageTests_SvgImageSource_FromStream
    • Image_UITests_Windows_UI_Xaml_Controls_ImageTests_SvgImageSource_NoSize_UITests_Windows_UI_Xaml_Controls_ImageTests_SvgImageSource_NoSize
    • ItemsRepeater_UITests_Windows_UI_Xaml_Controls_Repeater_StackLayout_Simple_UITests_Windows_UI_Xaml_Controls_Repeater_StackLayout_Simple
    • ListView_ListViewChangeView_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewChangeView
    • ListView_ListViewHeaderUpdate_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewHeaderUpdate
    • ListView_ListViewIncrementalLoading_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewIncrementalLoading
    • ListView_ListViewItem_PressedState_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewItem_PressedState
  • ios: 59 changed over 291

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • Check_CornerRadius_Border_No_CornerRadius
    • Check_CornerRadius_Border_UITests_Shared_Windows_UI_Xaml_Controls_BorderTests_Border_CornerRadius_Toggle
    • ComboBoxTests_ToggleDisabled_ComboBox_Enabled
    • ComboBoxTests_ToggleDisabled_UITests_Windows_UI_Xaml_Controls_ComboBox_ComboBox_ToggleDisabled
    • DatePicker_Flyout_DatePicker_-_Flyout
    • Flyout_ShowAt_Window_Content_UITests_Windows_UI_Xaml_Controls_FlyoutTests_Flyout_ShowAt_Window_Content
    • Keyboard_Textbox_NoScrollViewer_Validation_2_-_Remove_Focus_on_placeholderTextTextBox
    • Keyboard_Textbox_NoScrollViewer_Validation_5_-_Remove_Focus_on_numberTextBox
    • ListView_ChangingText_Validation_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListView_Changing_Text
    • ListView_ObservableCollection_Creation_Count_Added
    • ListView_ObservableCollection_Creation_Count_Added_above
    • ListView_ObservableCollection_Creation_Count_Removed_above
    • ListView_ObservableCollection_Creation_Count_Scrolled1
    • PasswordBox_RevealInScrollViewer_Uno_UI_Samples_Content_UITests_TextBoxControl_PasswordBox_Reveal_Scroll
    • BasicExpressionTest_UITests_Microsoft_UI_Xaml_Controls_NumberBoxTests_NumberBox_ExpressionTest
    • Check_CornerRadius_Border_CornerRadius=5
    • ComboBoxTests_ToggleDisabled_ComboBox_Disabled
    • Keyboard_Textbox_NoScrollViewer_Validation_0_-_Remove_Focus_on_normalTextBox
    • Keyboard_Textbox_NoScrollViewer_Validation_1_-_Remove_Focus_on_filledTextBox
    • ListView_ObservableCollection_Creation_Count_Scrolled2
  • ios-Snap: 95 changed over 1034

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • Animations_DoubleAnimation_TranslateX_GenericApp_Views_Content_UITests_Animations_DoubleAnimation_TranslateX
    • Animations_UITests_Windows_UI_Xaml_Media_Animation_ColorAnimation_Background_UITests_Windows_UI_Xaml_Media_Animation_ColorAnimation_Background
    • AutoSuggestBox_UITests_Windows_UI_Xaml_Controls_AutoSuggestBoxTests_AutoSuggestBox_Description_UITests_Windows_UI_Xaml_Controls_AutoSuggestBoxTests_AutoSuggestBox_Description
    • Border_BorderLeftwithmargins_Uno_UI_Samples_UITests_BorderTestsControl_BorderLeftwithmargins
    • Border_Border_Corner_Overlap_UITests_Shared_Windows_UI_Xaml_Controls_BorderTests_Border_CornerOverlap
    • Brushes_ImageBrushStretch_Uno_UI_Samples_UITests_ImageBrushTestControl_ImageBrushStretch
    • Brushes_UITests_Windows_UI_Xaml_Media_BrushesTests_SolidColorBrush_Color_Changed_UITests_Windows_UI_Xaml_Media_BrushesTests_SolidColorBrush_Color_Changed
    • Animations_UITests_Windows_UI_Xaml_Media_Animation_FadeInOutThemeAnimationPage_UITests_Windows_UI_Xaml_Media_Animation_FadeInOutThemeAnimationPage
    • AutoSuggestBox_UITests_Windows_UI_Xaml_Controls_AutoSuggestBoxTests_AutoSuggestBox_BitmapIcon_UITests_Windows_UI_Xaml_Controls_AutoSuggestBoxTests_AutoSuggestBox_BitmapIcon
    • Border_BorderRightwithmargins_Uno_UI_Samples_UITests_BorderTestsControl_BorderRightwithmargins
    • Border_BorderTopwithmargins_Uno_UI_Samples_UITests_BorderTestsControl_BorderTopwithmargins
    • Border_NonUniformThicknessandRadius_Uno_UI_Samples_UITests_BorderTestsControl_NonUniformThicknessandRadius
    • Border_UITests_Shared_Windows_UI_Xaml_Controls_BorderTests_Border_CornerRadius_Toggle_UITests_Shared_Windows_UI_Xaml_Controls_BorderTests_Border_CornerRadius_Toggle
    • Border_Uno_UI_Samples_UITests_BorderTestsControl_Border_BorderThickness_Uno_UI_Samples_UITests_BorderTestsControl_Border_BorderThickness
    • Brushes_ImageBrushAlignmentXY_Uno_UI_Samples_UITests_ImageBrushTestControl_ImageBrushAlignmentXY
    • Brushes_Uno_UI_Samples_UITests_ImageBrushTestControl_DoubleImageBrushInList_Uno_UI_Samples_UITests_ImageBrushTestControl_DoubleImageBrushInList
    • ContentControl_ContentControl_WithPadding_Uno_UI_Samples_Content_UITests_ContentControlTestsControl_ContentControl_WithPadding
    • ContentControl_ContentControl_DefaultText_Uno_UI_Samples_Content_UITests_ContentControlTestsControl_ContentControl_DefaultText
    • ContentControl_ContentControl_Inheritance_Uno_UI_Samples_Content_UITests_ContentControlTestsControl_ContentControl_Inheritance
    • ContentControl_ContentControl_MultiLevelInheritance_Uno_UI_Samples_Content_UITests_ContentControlTestsControl_ContentControl_MultiLevelInheritance
  • macOS-screenshots: 18 changed over 1120

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • BreadcrumbBar-BreadcrumbBarPage.png
    • Image-ImageSourceStream.png
    • Image-Image_Fixed_Size_Alignment.png
    • Image-LoadFromBytes.png
    • Image-SvgImageSource_FromMsAppData.png
    • ListView-ListView_IsSelected.png
    • MUX-WinUIProgressRingPage.png
    • MUX-WinUIProgressRing_CustomSources.png
    • NavigationView-NavigationViewPage.png
    • ListView-ListView_Weird_Measure.png
    • MUX-NavigationViewPage.png
    • Progress-ProgressRingHeightTest.png
    • Progress-WindowsProgressRing_GH1220.png
    • Progress-WinUIProgressRingPage.png
    • Progress-WinUIProgressRing_CustomSources.png
    • Progress-WinUIProgressRing_Features.png
    • WebView-WebView2_NavigationProperties.png
    • Windows.Security-AuthenticationBroker_Demo.png
  • skia-gtk-screenshots: 19 changed over 1118

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • Brushes-ImageBrushChangingCornerRadius.png
    • DragAndDrop-DragDrop_TestPage.png
    • Image-Image_Stretch.png
    • Image-UniformToFill100x100.png
    • Image-ImageSourceStream.png
    • ListView-ListViewSelectedItems.png
    • MUX-WinUIProgressRingPage.png
    • MUX-WinUIProgressRing_CustomSources.png
    • NavigationView-NavigationViewRS4Page.png
    • ListView-ListView_Selection_Pointers.png
    • MUX-NavigationViewPage.png
    • Pickers-CalendarView_Theming.png
    • PipsPager-PipsPagerExamples.png
    • Progress-ProgressRingHeightTest.png
    • Progress-WindowsProgressRing_GH1220.png
    • Progress-WinUIProgressRingPage.png
    • Progress-WinUIProgressRing_CustomSources.png
    • Progress-WinUIProgressRing_Features.png
    • WinUI-PipsPagerExamples.png
  • skia-wpf-screenshots: 15 changed over 1118

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • Automation-AutomationProperties_Name.png
    • DragAndDrop-DragDrop_TestPage.png
    • Image-UniformToFill100x100.png
    • ListView-ListViewSelectedItems.png
    • MUX-TabViewPage.png
    • MUX-WinUIProgressRingPage.png
    • MUX-WinUIProgressRing_CustomSources.png
    • Pickers-CalendarView_Theming.png
    • PipsPager-PipsPagerExamples.png
    • Progress-ProgressRingHeightTest.png
    • Progress-WindowsProgressRing_GH1220.png
    • Progress-WinUIProgressRingPage.png
    • Progress-WinUIProgressRing_CustomSources.png
    • Progress-WinUIProgressRing_Features.png
    • WinUI-PipsPagerExamples.png
  • wasm: 36 changed over 1040

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • initial_state
    • MUXControlsTestApp.NavigationViewAnimationPage
    • MUXControlsTestApp.NavigationViewMinimalPage
    • MUXControlsTestApp.NavigationViewPage
    • MUXControlsTestApp.NavigationViewStretchPage
    • MUXControlsTestApp.NavigationViewTopNavOnlyPage
    • MUXControlsTestApp.NavigationViewTopNavPage
    • MUXControlsTestApp.PipsPagerExamples
    • SamplesApp.Wasm.Windows_UI_Xaml_Controls.ListView.ListView_IsSelected
    • SamplesApp.Windows_UI_Xaml_Controls.ListView.ListViewContainerFromItem
    • SamplesApp.Windows_UI_Xaml_Controls.ListView.ListViewLargeHeader
    • SamplesApp.Windows_UI_Xaml_Controls.ListView.ListViewSelectedItems
    • UITests.Microsoft_UI_Xaml_Controls.ProgressRing.WinUIProgressRingPage
    • UITests.Microsoft_UI_Xaml_Controls.ProgressRing.WinUIProgressRing_CustomSources
    • UITests.Microsoft_UI_Xaml_Controls.ProgressRing.WinUIProgressRing_Features
    • UITests.Microsoft_UI_Xaml_Controls.RatingControlTests.RatingControlPage
    • UITests.Microsoft_UI_Xaml_Controls.TabViewTests.TabViewPage
    • UITests.Shared.Windows_UI_Xaml_Controls.ListView.ListView_Explicit_Items
    • UITests.Shared.Windows_UI_Xaml_Controls.ListView.ListView_Infinite_Breadth
    • UITests.Shared.Windows_UI_Xaml_Controls.MediaPlayerElement.MediaPlayerElement_3gp_Extension
  • wasm-automated-net7.0-UWP-Benchmarks: 0 changed over 1

  • wasm-automated-net7.0-UWP-Default: 12 changed over 890

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • ListView_SelectedItems_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewSelectedItems
    • MinMaxTest_UITests_Shared_Microsoft_UI_Xaml_Controls_NumberBoxTests_NumberBoxPage
    • TestProgressRing_InitialState_UITests_Microsoft_UI_Xaml_Controls_ProgressRing_WinUIProgressRing_Features
    • SequentialAnimations_SamplesApp_Windows_UI_Xaml_Media_Animation_SequentialAnimationsPage
    • When_ExtendedSelectionWithoutItemClick_Then_PointersEvents_UITests_Windows_UI_Xaml_Controls_ListView_ListView_Selection_Pointers
    • When_MultipleSelectionWithoutItemClick_Then_PointersEvents_UITests_Windows_UI_Xaml_Controls_ListView_ListView_Selection_Pointers
    • When_NoSelectionWithItemClick_Then_PointersEvents_UITests_Windows_UI_Xaml_Controls_ListView_ListView_Selection_Pointers
    • When_NoSelection_Then_PointersEvents_UITests_Windows_UI_Xaml_Controls_ListView_ListView_Selection_Pointers
    • When_SingleSelectionWithItemClick_Then_PointersEvents_UITests_Windows_UI_Xaml_Controls_ListView_ListView_Selection_Pointers
    • When_SingleSelectionWithoutItemClick_Then_PointersEvents_UITests_Windows_UI_Xaml_Controls_ListView_ListView_Selection_Pointers
    • When_Theme_Changed_No_Crash_UITests_Windows_UI_Xaml_Controls_CalendarView_CalendarView_Theming
    • When_TransformToVisual_ScrollViewer_UITests_Shared_Windows_UI_Xaml_UIElementTests_TransformToVisual_ScrollViewer
  • wasm-automated-net7.0-UWP-RuntimeTests: 0 changed over 1

  • wasm-automated-net7.0-WinUI-RuntimeTests: 0 changed over 1

@agneszitte agneszitte merged commit 6baf414 into legacy/4x Aug 17, 2023
@agneszitte agneszitte deleted the mergify/bp/legacy/4x/pr-13272 branch August 17, 2023 07:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment