diff options
author | Tom Hennen <TomHennen@users.noreply.github.com> | 2015-12-13 18:58:32 -0500 |
---|---|---|
committer | Tom Hennen <TomHennen@users.noreply.github.com> | 2015-12-13 18:58:32 -0500 |
commit | 755bdc5afbbfc18fa14657cbc343d61253874146 (patch) | |
tree | 56330e6508581620b41effe48ef74500468e9eb2 /app/src/main/java/de/danoeh/antennapod/activity | |
parent | 07be0e2cdb2e8e15de0af64ef6e9c4d754de892b (diff) | |
parent | 32648ba17f3a2503e87584493ad3dc4188dd85c8 (diff) | |
download | AntennaPod-755bdc5afbbfc18fa14657cbc343d61253874146.zip |
Merge pull request #1465 from mfietz/issue/1464-oom
Lower memory usage
Diffstat (limited to 'app/src/main/java/de/danoeh/antennapod/activity')
-rw-r--r-- | app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java index c53a5257b..febaa68e5 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java @@ -1,10 +1,12 @@ package de.danoeh.antennapod.activity; +import android.annotation.TargetApi; import android.content.DialogInterface; import android.content.Intent; import android.graphics.PixelFormat; import android.media.AudioManager; import android.net.Uri; +import android.os.Build; import android.os.Bundle; import android.support.v7.app.ActionBarActivity; import android.support.v7.app.AlertDialog; @@ -12,7 +14,6 @@ import android.util.Log; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; - import android.view.View; import android.widget.ImageButton; import android.widget.SeekBar; @@ -20,9 +21,9 @@ import android.widget.SeekBar.OnSeekBarChangeListener; import android.widget.TextView; import com.afollestad.materialdialogs.MaterialDialog; +import com.bumptech.glide.Glide; import de.danoeh.antennapod.R; -import de.danoeh.antennapod.core.feed.FeedItem; import de.danoeh.antennapod.core.feed.FeedMedia; import de.danoeh.antennapod.core.preferences.UserPreferences; import de.danoeh.antennapod.core.service.playback.PlaybackService; @@ -239,6 +240,19 @@ public abstract class MediaplayerActivity extends ActionBarActivity Log.d(TAG, "onDestroy()"); } + @TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH) + @Override + public void onTrimMemory(int level) { + super.onTrimMemory(level); + Glide.get(this).trimMemory(level); + } + + @Override + public void onLowMemory() { + super.onLowMemory(); + Glide.get(this).clearMemory(); + } + @Override public boolean onCreateOptionsMenu(Menu menu) { super.onCreateOptionsMenu(menu); |