Fixes #2948 Fixed unit testing defect where the space between the vol…

…ume button and slider was not hiding sliderFixes #2948
MozillaReality · Apr 22, 2020 · 975f53a · 975f53a
1 parent 5a7a1be
commit 975f53a
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/MediaControlsWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/MediaControlsWidget.java
@@ -192,8 +192,8 @@ public void onSeekPreview(String aText, double aRatio) {
                 childView.getDrawingRect(mOffsetViewBounds);
                 MediaControlsWidget.this.offsetDescendantRectToMyCoords(childView, mOffsetViewBounds);
 
-                FrameLayout.LayoutParams params = (FrameLayout.LayoutParams)mMediaSeekLabel.getLayoutParams();
-                params.setMarginStart(mOffsetViewBounds.left + (int)(aRatio * mOffsetViewBounds.width()) - mMediaSeekLabel.getMeasuredWidth() / 2);
+                FrameLayout.LayoutParams params = (FrameLayout.LayoutParams) mMediaSeekLabel.getLayoutParams();
+                params.setMarginStart(mOffsetViewBounds.left + (int) (aRatio * mOffsetViewBounds.width()) - mMediaSeekLabel.getMeasuredWidth() / 2);
                 mMediaSeekLabel.setLayoutParams(params);
             }
         });
@@ -205,12 +205,11 @@ public void onSeekPreview(String aText, double aRatio) {
             }
             mVolumeControl.requestFocusFromTouch();
         });
-
         mMediaVolumeButton.setOnHoverListener((v, event) -> {
             float startY = v.getY();
             float maxY = startY + v.getHeight();
             //for this we only hide on the left side of volume button or outside y area of button
-            if ((event.getX() <= 0) || (!(event.getY() > startY && event.getY() < maxY))) {
+            if ((event.getX() <= 0) || (event.getX() >= v.getWidth()) || (!(event.getY() > startY && event.getY() < maxY))) {
                 mHideVolumeSlider = true;
                 startVolumeCtrlHandler();
 
@@ -230,13 +229,14 @@ public void onSeekPreview(String aText, double aRatio) {
                 stopVolumeCtrlHandler();
             }
             //for this we only hide on the right side of volume button or outside y area of button
-            else if ((event.getX() < 0) || (event.getX() >= v.getWidth()) || (!(event.getY() > startY && event.getY() < maxY))) {
+            else if ((event.getX() <= 0) || (event.getX() >= v.getWidth()) || (!(event.getY() > startY && event.getY() < maxY))) {
                 mHideVolumeSlider = true;
                 startVolumeCtrlHandler();
             }
             return false;
         });
 
+
     }
 
     @Override