be-gay-do-crimes
/
NewPipe
mirror of https://github.com/TeamNewPipe/NewPipe
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed conflicts

This commit is contained in:
litetex 2022-03-16 15:58:46 +01:00
parent cefb52471f
commit 67651354d5
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/schabi/newpipe/player/listeners/view/PlaybackSpeedClickListener.kt
View File

@ -2,7 +2,7 @@ package org.schabi.newpipe.player.listeners.view
import android.util.Log import android.util.Log
import android.view.View import android.view.View
import android.widget.PopupMenu import androidx.appcompat.widget.PopupMenu
import org.schabi.newpipe.MainActivity import org.schabi.newpipe.MainActivity
import org.schabi.newpipe.player.Player import org.schabi.newpipe.player.Player
import org.schabi.newpipe.player.helper.PlaybackParameterDialog import org.schabi.newpipe.player.helper.PlaybackParameterDialog

2
app/src/main/java/org/schabi/newpipe/player/listeners/view/QualityClickListener.kt
View File

@ -3,7 +3,7 @@ package org.schabi.newpipe.player.listeners.view
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.util.Log import android.util.Log
import android.view.View import android.view.View
import android.widget.PopupMenu import androidx.appcompat.widget.PopupMenu
import org.schabi.newpipe.MainActivity import org.schabi.newpipe.MainActivity
import org.schabi.newpipe.extractor.MediaFormat import org.schabi.newpipe.extractor.MediaFormat
import org.schabi.newpipe.player.Player import org.schabi.newpipe.player.Player