nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1811603 - don't set orientation when going to full-screen and playing an element with 0 size r=android-reviewers,tthibaud

Browse source 
The .portrait property is used in MediaSessionFullscreenFeature::setOrientationForTabState and already handles the null case, so just

Differential Revision: https://phabricator.services.mozilla.com/D209447
This commit is contained in:
Greg Stoll 2024-05-20 13:07:30 +00:00
parent 365bfeb9ec
commit 4379d51910
2 changed files with 40 additions and 6 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

4
mobile/android/android-components/components/concept/engine/src/main/java/mozilla/components/concept/engine/mediasession/MediaSession.kt
View file

@ -29,8 +29,8 @@ class MediaSession {
val audioTrackCount: Int = 0,
val videoTrackCount: Int = 0,
) {
val portrait: Boolean
get() = height > width
val portrait: Boolean?
get() = if (height == 0L && width == 0L) null else height > width
}
/**

42
mobile/android/android-components/components/feature/media/src/test/java/mozilla/components/feature/media/fullscreen/MediaSessionFullscreenFeatureTest.kt
View file

@ -109,6 +109,40 @@ class MediaSessionFullscreenFeatureTest {
verify(activity).setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_USER_PORTRAIT)
}
@Test
fun `GIVEN the currently selected tab plays media with no size WHEN the feature is running THEN orientation is unchanged`() {
val activity: Activity = mock()
val window: Window = mock()
whenever(activity.window).thenReturn(window)
val elementMetadata = MediaSession.ElementMetadata(width = 0, height = 0)
val initialState = BrowserState(
tabs = listOf(
createTab(
"https://www.mozilla.org",
id = "tab1",
mediaSessionState = MediaSessionState(
mock(),
elementMetadata = elementMetadata,
playbackState = MediaSession.PlaybackState.PLAYING,
fullscreen = true,
),
),
),
selectedTabId = "tab1",
)
val store = BrowserStore(initialState)
val feature = MediaSessionFullscreenFeature(
activity,
store,
null,
)
feature.start()
verify(activity).setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_USER)
}
@Test
fun `GIVEN the currently selected tab plays landscape media WHEN it enters fullscreen THEN set orientation to landscape`() {
val activity: Activity = mock()
@ -148,7 +182,7 @@ class MediaSessionFullscreenFeatureTest {
@Config(sdk = [Build.VERSION_CODES.N])
fun `GIVEN the currently selected tab plays landscape media WHEN it enters pip mode THEN set orientation to unspecified`() {
val activity = Robolectric.buildActivity(Activity::class.java).setup().get()
val elementMetadata = MediaSession.ElementMetadata()
val elementMetadata = MediaSession.ElementMetadata(width = 100, height = 100)
val initialState = BrowserState(
tabs = listOf(
createTab(
@ -187,7 +221,7 @@ class MediaSessionFullscreenFeatureTest {
@Config(sdk = [Build.VERSION_CODES.N])
fun `GIVEN the currently selected tab is in pip mode WHEN an external intent arrives THEN set orientation to default`() {
val activity = Robolectric.buildActivity(Activity::class.java).setup().get()
val elementMetadata = MediaSession.ElementMetadata()
val elementMetadata = MediaSession.ElementMetadata(width = 100, height = 100)
val initialState = BrowserState(
tabs = listOf(
createTab(
@ -239,7 +273,7 @@ class MediaSessionFullscreenFeatureTest {
@Config(sdk = [Build.VERSION_CODES.N])
fun `GIVEN the currently selected tab is in pip mode WHEN it exits pip mode THEN set orientation to default`() {
val activity = Robolectric.buildActivity(Activity::class.java).setup().get()
val elementMetadata = MediaSession.ElementMetadata()
val elementMetadata = MediaSession.ElementMetadata(width = 100, height = 100)
val initialState = BrowserState(
tabs = listOf(
createTab(
@ -289,7 +323,7 @@ class MediaSessionFullscreenFeatureTest {
@Config(sdk = [Build.VERSION_CODES.N])
fun `GIVEN the currently selected tab is in pip mode WHEN a custom tab loads THEN display custom tab in device's current orientation`() {
val activity = Robolectric.buildActivity(Activity::class.java).setup().get()
val elementMetadata = MediaSession.ElementMetadata()
val elementMetadata = MediaSession.ElementMetadata(width = 100, height = 100)
val initialState = BrowserState(
tabs = listOf(
createTab(