Fixes #2948 - updated volume control delegate to handle when ACTION_C…

…ANCELLED (which seems to get triggered in pico) for when a user drags the volume seekbar outside of the area
MozillaReality · Jun 10, 2020 · 23ff996 · 23ff996
1 parent 0020e27
commit 23ff996
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 21 deletions.
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/views/VolumeControl.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/views/VolumeControl.java
@@ -48,9 +48,8 @@ private void initialize() {
         mSeekBar.setOnSeekBarChangeListener(this);
         mSeekBar.setOnTouchListener((v, event) -> {
 
-            if ((event.getAction() == MotionEvent.ACTION_UP) ||(event.getAction() == MotionEvent.ACTION_CANCEL)){
-                if((event.getAction() == MotionEvent.ACTION_CANCEL) && (mDelegate !=null))
-                {
+            if ((event.getAction() == MotionEvent.ACTION_UP) || (event.getAction() == MotionEvent.ACTION_CANCEL)) {
+                if ((event.getAction() == MotionEvent.ACTION_CANCEL) && (mDelegate != null)) {
                     mDelegate.onSeekBarActionCancelled();
                 }
 
@@ -107,6 +106,7 @@ public void onStopTrackingTouch(SeekBar seekBar) {
 
     public interface Delegate {
         void onVolumeChange(double aVolume);
+
         void onSeekBarActionCancelled();
     }
 }
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
@@ -209,24 +209,23 @@ public void onSeekPreview(String aText, double aRatio) {
         });
         */
 
-       mVolumeControl.setDelegate(new VolumeControl.Delegate()
-       {
-
-           @Override
-           public void onVolumeChange(double aVolume) {
-               mMedia.setVolume(aVolume);
-               if (mMedia.isMuted()) {
-                   mMedia.setMuted(false);
-               }
-               mVolumeControl.requestFocusFromTouch();
-           }
-
-           @Override
-           public void onSeekBarActionCancelled() {
-               mHideVolumeSlider = true;
-               startVolumeCtrlHandler();
-           }
-       });
+        mVolumeControl.setDelegate(new VolumeControl.Delegate() {
+
+            @Override
+            public void onVolumeChange(double aVolume) {
+                mMedia.setVolume(aVolume);
+                if (mMedia.isMuted()) {
+                    mMedia.setMuted(false);
+                }
+                mVolumeControl.requestFocusFromTouch();
+            }
+
+            @Override
+            public void onSeekBarActionCancelled() {
+                mHideVolumeSlider = true;
+                startVolumeCtrlHandler();
+            }
+        });
 
 
         this.setOnHoverListener((v, event) -> {