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
MozillaReality · Nov 14, 2019 · 1d392fb · 1d392fb
1 parent b6f4f7d
commit 1d392fb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/browser/Media.java b/app/src/common/shared/org/mozilla/vrbrowser/browser/Media.java
@@ -15,6 +15,7 @@ public class Media implements MediaElement.Delegate {
     private double mPlaybackRate = 1.0f;
     private int mReadyState = MediaElement.MEDIA_READY_STATE_HAVE_NOTHING;
     private boolean mPlaying = false;
+    private boolean mWasPlayed = false;
     private boolean mEnded = false;
     private double mVolume = 1.0f;
     private boolean mIsMuted = false;
@@ -68,6 +69,10 @@ public boolean isPlaying() {
         return mPlaying;
     }
 
+    public boolean isPlayed() {
+        return mWasPlayed;
+    }
+
     public boolean isEnded() {
         return mEnded;
     }
@@ -133,6 +138,7 @@ public void setResizeDelegate(ResizeDelegate aResizeDelegate) {
     @Override
     public void onPlaybackStateChange(MediaElement mediaElement, int playbackState) {
         if (playbackState == MediaElement.MEDIA_STATE_PLAY) {
+            mWasPlayed = true;
             mPlaying = true;
         } else if (playbackState == MediaElement.MEDIA_STATE_PAUSE) {
             mPlaying = false;

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/TitleBarWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/TitleBarWidget.java
@@ -185,9 +185,11 @@ public void mediaAvailabilityChanged(boolean available) {
         if (available) {
             mMedia = mAttachedWindow.getSession().getFullScreenVideo();
             if (mMedia != null) {
-                mBinding.setIsMediaAvailable(true);
-                mBinding.setIsMediaPlaying(mMedia.isPlaying());
                 mMedia.addMediaListener(mMediaDelegate);
+                if (mMedia.isPlayed()) {
+                    mBinding.setIsMediaAvailable(true);
+                    mBinding.setIsMediaPlaying(true);
+                }
             }
         } else {
             mBinding.setIsMediaAvailable(false);