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

Merge branch 'dev' into updated-urls

This commit is contained in:
Christian Schabesberger 2019-02-19 14:30:34 +01:00 committed by GitHub
parent ad354aca4e 0d3dd94559
commit c3a38e384a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/AndroidManifest.xml
View File

@ -35,12 +35,6 @@
</intent-filter> </intent-filter>
</receiver> </receiver>
<activity
android:name=".player.old.PlayVideoActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
android:theme="@style/OldVideoPlayerTheme"
tools:ignore="UnusedAttribute"/>
<service <service
android:name=".player.BackgroundPlayer" android:name=".player.BackgroundPlayer"
android:exported="false"> android:exported="false">

1
app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java
View File

@ -626,6 +626,7 @@ public final class PopupVideoPlayer extends Service {
@Override @Override
public void onLoadingComplete(String imageUri, View view, Bitmap loadedImage) { public void onLoadingComplete(String imageUri, View view, Bitmap loadedImage) {
super.onLoadingComplete(imageUri, view, loadedImage); super.onLoadingComplete(imageUri, view, loadedImage);
if (playerImpl == null) return;
// rebuild notification here since remote view does not release bitmaps, // rebuild notification here since remote view does not release bitmaps,
// causing memory leaks // causing memory leaks
resetNotification(); resetNotification();

2
app/src/main/java/org/schabi/newpipe/player/helper/AudioReactor.java
View File

@ -131,7 +131,7 @@ public class AudioReactor implements AudioManager.OnAudioFocusChangeListener,
private void onAudioFocusLossCanDuck() { private void onAudioFocusLossCanDuck() {
Log.d(TAG, "onAudioFocusLossCanDuck() called"); Log.d(TAG, "onAudioFocusLossCanDuck() called");
// Set the volume to 1/10 on ducking // Set the volume to 1/10 on ducking
animateAudio(player.getVolume(), DUCK_AUDIO_TO); player.setVolume(DUCK_AUDIO_TO);
} }
private void animateAudio(final float from, final float to) { private void animateAudio(final float from, final float to) {