diff options
author | ByteHamster <info@bytehamster.com> | 2020-09-30 10:50:25 +0200 |
---|---|---|
committer | ByteHamster <info@bytehamster.com> | 2020-09-30 10:50:25 +0200 |
commit | e9fa84af588a7d8bcdb50c581eeedd15da79e848 (patch) | |
tree | 407a8f36b9f610b7aab710854a492f748a0beff9 /app/src/main/java/de/danoeh/antennapod/activity | |
parent | bba5f224e6bef74585132c4095fd0f233d54050f (diff) | |
parent | af1a6a7ef92ed0ab6061c803f94bd22ad17a6243 (diff) | |
download | AntennaPod-e9fa84af588a7d8bcdb50c581eeedd15da79e848.zip |
Merge branch 'master' into develop
Diffstat (limited to 'app/src/main/java/de/danoeh/antennapod/activity')
-rw-r--r-- | app/src/main/java/de/danoeh/antennapod/activity/BugReportActivity.java | 2 | ||||
-rw-r--r-- | app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/BugReportActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/BugReportActivity.java index b1a0ba2a2..d2618eb08 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/BugReportActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/BugReportActivity.java @@ -7,7 +7,7 @@ import android.os.Bundle; import com.google.android.material.snackbar.Snackbar; import androidx.appcompat.app.AppCompatActivity; import android.widget.TextView; -import de.danoeh.antennapod.CrashReportWriter; +import de.danoeh.antennapod.error.CrashReportWriter; import de.danoeh.antennapod.R; import de.danoeh.antennapod.core.preferences.UserPreferences; import de.danoeh.antennapod.core.util.IntentUtils; diff --git a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java index a0ad99e7d..c3cb6b0ba 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java @@ -102,6 +102,7 @@ public class VideoplayerActivity extends MediaplayerActivity { if (!PictureInPictureUtil.isInPictureInPictureMode(this)) { videoControlsHider.stop(); } + progressIndicator.setVisibility(View.GONE); // Controller released; we will not receive buffering updates } @Override |