Skip to content
This repository was archived by the owner on Jul 22, 2024. It is now read-only.

Commit 1d392fb

Browse files
keianhzoMortimerGoro
authored andcommitted
Show title media controls only if media has been already started (#2185)
* Show title media controls only when media has been already started * Show title bar media controls after switching tabs * Better use a flag to handle the already played state
1 parent b6f4f7d commit 1d392fb

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

app/src/common/shared/org/mozilla/vrbrowser/browser/Media.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ public class Media implements MediaElement.Delegate {
1515
private double mPlaybackRate = 1.0f;
1616
private int mReadyState = MediaElement.MEDIA_READY_STATE_HAVE_NOTHING;
1717
private boolean mPlaying = false;
18+
private boolean mWasPlayed = false;
1819
private boolean mEnded = false;
1920
private double mVolume = 1.0f;
2021
private boolean mIsMuted = false;
@@ -68,6 +69,10 @@ public boolean isPlaying() {
6869
return mPlaying;
6970
}
7071

72+
public boolean isPlayed() {
73+
return mWasPlayed;
74+
}
75+
7176
public boolean isEnded() {
7277
return mEnded;
7378
}
@@ -133,6 +138,7 @@ public void setResizeDelegate(ResizeDelegate aResizeDelegate) {
133138
@Override
134139
public void onPlaybackStateChange(MediaElement mediaElement, int playbackState) {
135140
if (playbackState == MediaElement.MEDIA_STATE_PLAY) {
141+
mWasPlayed = true;
136142
mPlaying = true;
137143
} else if (playbackState == MediaElement.MEDIA_STATE_PAUSE) {
138144
mPlaying = false;

app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/TitleBarWidget.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,9 +185,11 @@ public void mediaAvailabilityChanged(boolean available) {
185185
if (available) {
186186
mMedia = mAttachedWindow.getSession().getFullScreenVideo();
187187
if (mMedia != null) {
188-
mBinding.setIsMediaAvailable(true);
189-
mBinding.setIsMediaPlaying(mMedia.isPlaying());
190188
mMedia.addMediaListener(mMediaDelegate);
189+
if (mMedia.isPlayed()) {
190+
mBinding.setIsMediaAvailable(true);
191+
mBinding.setIsMediaPlaying(true);
192+
}
191193
}
192194
} else {
193195
mBinding.setIsMediaAvailable(false);

0 commit comments

Comments
 (0)