Fix merge conflicts

Author: litetex

app/src/main/java/org/schabi/newpipe/player/helper/PlaybackParameterDialog.java

@@ -27,6 +27,7 @@
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.databinding.DialogPlaybackParameterBinding;
 import org.schabi.newpipe.player.Player;
+import org.schabi.newpipe.util.SimpleOnSeekBarChangeListener;
 import org.schabi.newpipe.util.SliderStrategy;
 
 import java.util.HashMap;
@@ -37,6 +38,8 @@
 import java.util.function.DoubleFunction;
 import java.util.function.DoubleSupplier;
 
+import javax.annotation.Nonnull;
+
 import icepick.Icepick;
 import icepick.State;
 
@@ -493,25 +496,16 @@ private SeekBar.OnSeekBarChangeListener getTempoOrPitchSeekbarChangeListener(
             final SliderStrategy sliderStrategy,
             final DoubleConsumer newValueConsumer
     ) {
-        return new SeekBar.OnSeekBarChangeListener() {
+        return new SimpleOnSeekBarChangeListener() {
             @Override
-            public void onProgressChanged(final SeekBar seekBar, final int progress,
+            public void onProgressChanged(@Nonnull final SeekBar seekBar,
+                                          final int progress,
                                           final boolean fromUser) {
                 if (fromUser) { // ensure that the user triggered the change
                     newValueConsumer.accept(sliderStrategy.valueOf(progress));
                     updateCallback();
                 }
             }
-
-            @Override
-            public void onStartTrackingTouch(final SeekBar seekBar) {
-                // Do nothing
-            }
-
-            @Override
-            public void onStopTrackingTouch(final SeekBar seekBar) {
-                // Do nothing
-            }
         };
     }